From 6b23a8221d20a240c270d87dad8930580bff81e9 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 15 Apr 2019 16:30:46 +0200
Subject: [PATCH 001/776] Bugfix Audit service

---
 .../Persistence/Mappers/AuditItemMapper.cs        |  3 ++-
 .../Querying/ModelToSqlExpressionVisitor.cs       | 11 +++++++++++
 .../Persistence/Repositories/IAuditRepository.cs  |  2 ++
 .../Repositories/Implement/AuditRepository.cs     | 12 ++++++++++++
 .../Services/Implement/AuditService.cs            |  8 ++++----
 src/Umbraco.Tests/Services/AuditServiceTests.cs   | 15 +++++++++++++++
 6 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Mappers/AuditItemMapper.cs b/src/Umbraco.Core/Persistence/Mappers/AuditItemMapper.cs
index 853cd9f99e..48e7afdc7e 100644
--- a/src/Umbraco.Core/Persistence/Mappers/AuditItemMapper.cs
+++ b/src/Umbraco.Core/Persistence/Mappers/AuditItemMapper.cs
@@ -18,7 +18,8 @@ namespace Umbraco.Core.Persistence.Mappers
             DefineMap<AuditItem, LogDto>(nameof(AuditItem.Id), nameof(LogDto.NodeId));
             DefineMap<AuditItem, LogDto>(nameof(AuditItem.CreateDate), nameof(LogDto.Datestamp));
             DefineMap<AuditItem, LogDto>(nameof(AuditItem.UserId), nameof(LogDto.UserId));
-            DefineMap<AuditItem, LogDto>(nameof(AuditItem.AuditType), nameof(LogDto.Header));
+            // we cannot map that one - because AuditType is an enum but Header is a string
+            //DefineMap<AuditItem, LogDto>(nameof(AuditItem.AuditType), nameof(LogDto.Header));
             DefineMap<AuditItem, LogDto>(nameof(AuditItem.Comment), nameof(LogDto.Comment));
         }
     }
diff --git a/src/Umbraco.Core/Persistence/Querying/ModelToSqlExpressionVisitor.cs b/src/Umbraco.Core/Persistence/Querying/ModelToSqlExpressionVisitor.cs
index 03d82a345f..c87937e41e 100644
--- a/src/Umbraco.Core/Persistence/Querying/ModelToSqlExpressionVisitor.cs
+++ b/src/Umbraco.Core/Persistence/Querying/ModelToSqlExpressionVisitor.cs
@@ -85,6 +85,17 @@ namespace Umbraco.Core.Persistence.Querying
             // I'm just unsure right now due to time constraints how to make it correct. It won't matter right now and has been working already with this bug but I've
             // only just discovered what it is actually doing.
 
+            // TODO
+            // in most cases we want to convert the value to a plain object,
+            // but for in some rare cases, we may want to do it differently,
+            // for instance a Models.AuditType (an enum) may in some cases
+            // need to be converted to its string value.
+            // but - we cannot have specific code here, really - and how would
+            // we configure this? is it even possible?
+            /*
+            var toString = typeof(object).GetMethod("ToString");
+            var member = Expression.Call(m, toString);
+            */
             var member = Expression.Convert(m, typeof(object));
             var lambda = Expression.Lambda<Func<object>>(member);
             var getter = lambda.Compile();
diff --git a/src/Umbraco.Core/Persistence/Repositories/IAuditRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IAuditRepository.cs
index 7c8a82bb85..b2dd6a3297 100644
--- a/src/Umbraco.Core/Persistence/Repositories/IAuditRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IAuditRepository.cs
@@ -33,5 +33,7 @@ namespace Umbraco.Core.Persistence.Repositories
             Direction orderDirection,
             AuditType[] auditTypeFilter,
             IQuery<IAuditItem> customFilter);
+
+        IEnumerable<IAuditItem> Get(AuditType type, IQuery<IAuditItem> query);
     }
 }
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/AuditRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/AuditRepository.cs
index cda89fd89a..c25328b10c 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/AuditRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/AuditRepository.cs
@@ -74,6 +74,18 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             return dtos.Select(x => new AuditItem(x.NodeId, Enum<AuditType>.Parse(x.Header), x.UserId ?? Constants.Security.UnknownUserId, x.EntityType, x.Comment, x.Parameters)).ToList();
         }
 
+        public IEnumerable<IAuditItem> Get(AuditType type, IQuery<IAuditItem> query)
+        {
+            var sqlClause = GetBaseQuery(false)
+                .Where<LogDto>(x => x.Header == type.ToString());
+            var translator = new SqlTranslator<IAuditItem>(sqlClause, query);
+            var sql = translator.Translate();
+
+            var dtos = Database.Fetch<LogDto>(sql);
+
+            return dtos.Select(x => new AuditItem(x.NodeId, Enum<AuditType>.Parse(x.Header), x.UserId ?? Constants.Security.UnknownUserId, x.EntityType, x.Comment, x.Parameters)).ToList();
+        }
+
         protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
         {
             var sql = SqlContext.Sql();
diff --git a/src/Umbraco.Core/Services/Implement/AuditService.cs b/src/Umbraco.Core/Services/Implement/AuditService.cs
index 46c851a789..5eb08f2dea 100644
--- a/src/Umbraco.Core/Services/Implement/AuditService.cs
+++ b/src/Umbraco.Core/Services/Implement/AuditService.cs
@@ -51,8 +51,8 @@ namespace Umbraco.Core.Services.Implement
             using (var scope = ScopeProvider.CreateScope())
             {
                 var result = sinceDate.HasValue == false
-                    ? _auditRepository.Get(Query<IAuditItem>().Where(x => x.UserId == userId && x.AuditType == type))
-                    : _auditRepository.Get(Query<IAuditItem>().Where(x => x.UserId == userId && x.AuditType == type && x.CreateDate >= sinceDate.Value));
+                    ? _auditRepository.Get(type, Query<IAuditItem>().Where(x => x.UserId == userId))
+                    : _auditRepository.Get(type, Query<IAuditItem>().Where(x => x.UserId == userId && x.CreateDate >= sinceDate.Value));
                 scope.Complete();
                 return result;
             }
@@ -63,8 +63,8 @@ namespace Umbraco.Core.Services.Implement
             using (var scope = ScopeProvider.CreateScope())
             {
                 var result = sinceDate.HasValue == false
-                    ? _auditRepository.Get(Query<IAuditItem>().Where(x => x.AuditType == type))
-                    : _auditRepository.Get(Query<IAuditItem>().Where(x => x.AuditType == type && x.CreateDate >= sinceDate.Value));
+                    ? _auditRepository.Get(type, Query<IAuditItem>())
+                    : _auditRepository.Get(type, Query<IAuditItem>().Where(x => x.CreateDate >= sinceDate.Value));
                 scope.Complete();
                 return result;
             }
diff --git a/src/Umbraco.Tests/Services/AuditServiceTests.cs b/src/Umbraco.Tests/Services/AuditServiceTests.cs
index 6064fe4acc..bfec246e61 100644
--- a/src/Umbraco.Tests/Services/AuditServiceTests.cs
+++ b/src/Umbraco.Tests/Services/AuditServiceTests.cs
@@ -4,6 +4,7 @@ using NUnit.Framework;
 using Umbraco.Core.Services.Implement;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing;
+using Umbraco.Core.Models;
 
 namespace Umbraco.Tests.Services
 {
@@ -48,5 +49,19 @@ namespace Umbraco.Tests.Services
             Assert.AreEqual(123 + 5, entries[0].PerformingUserId);
             Assert.AreEqual(123 + 4, entries[1].PerformingUserId);
         }
+
+        [Test]
+        public void CanReadEntries()
+        {
+            var yesterday = DateTime.UtcNow.AddDays(-1);
+
+            for (var i = 0; i < 10; i++)
+            {
+                yesterday = yesterday.AddMinutes(1);
+                ServiceContext.AuditService.Add(AuditType.Unpublish, -1, 33, "", "blah");
+            }
+
+            var logs = ServiceContext.AuditService.GetUserLogs(-1, AuditType.Unpublish);
+        }
     }
 }

From 463dfc45a60593bc3dd40a924b72fbf1b3ec8ce9 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Thu, 6 Jun 2019 09:34:27 +0200
Subject: [PATCH 002/776] Copy all items from one NC to another (WIP)

---
 .../nestedcontent/nestedcontent.controller.js | 52 +++++++++++++++++--
 .../nestedcontent/nestedcontent.html          |  3 ++
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml |  1 +
 .../Umbraco/config/lang/en_us.xml             |  1 +
 4 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
index 4e8b35a276..b02ab3ffff 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -93,8 +93,10 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
     "iconHelper",
     "clipboardService",
     "eventsService",
-    
-    function ($scope, $interpolate, $filter, $timeout, contentResource, localizationService, iconHelper, clipboardService, eventsService) {
+    "$routeParams",
+    "editorState",
+
+    function ($scope, $interpolate, $filter, $timeout, contentResource, localizationService, iconHelper, clipboardService, eventsService, $routeParams, editorState) {
         
         var contentTypeAliases = [];
         _.each($scope.model.config.contentTypes, function (contentType) {
@@ -160,7 +162,15 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
                 view: "itempicker",
                 event: $event,
                 clickPasteItem: function(item) {
-                    $scope.pasteFromClipboard(item.data);
+                    if (item.alias === "nc_pasteAllItems") {
+                        _.each(item.data, function (node) {
+                            delete node.$$hashKey;
+                            $scope.pasteFromClipboard(node);
+                        });
+                    } else {
+                        $scope.pasteFromClipboard(item.data);
+                    }
+
                     $scope.overlayMenu.show = false;
                     $scope.overlayMenu = null;
                 },
@@ -194,6 +204,20 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
             $scope.overlayMenu.size = $scope.overlayMenu.availableItems.length > 6 ? "medium" : "small";
             
             $scope.overlayMenu.pasteItems = [];
+            var nestedContentForPaste = clipboardService.retriveDataOfType("nestedContent", ["nc_copyOfAllItems"]);
+            _.each(nestedContentForPaste, function (nestedContent) {
+                if (_.every(nestedContent.nodes,
+                    function(node) {
+                        return contentTypeAliases.indexOf(node.contentTypeAlias) >= 0;
+                    })) {
+                    $scope.overlayMenu.pasteItems.push({
+                        alias: "nc_pasteAllItems",
+                        name: nestedContent.name, // source property name
+                        data: nestedContent.nodes, // all items from source property
+                        icon: "icon-bulleted-list"
+                    });
+                }
+            });
             var availableNodesForPaste = clipboardService.retriveDataOfType("elementType", contentTypeAliases);
             _.each(availableNodesForPaste, function (node) {
                 $scope.overlayMenu.pasteItems.push({
@@ -210,6 +234,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
                 $event.stopPropagation();
                 $event.preventDefault();
                 clipboardService.clearEntriesOfType("elementType", contentTypeAliases);
+                clipboardService.clearEntriesOfType("nestedContent", ["nc_copyOfAllItems"]);
                 $scope.overlayMenu.pasteItems = [];// This dialog is not connected via the clipboardService events, so we need to update manually.
             };
             
@@ -359,7 +384,26 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
             clipboardService.copy("elementType", node.contentTypeAlias, node);
             $event.stopPropagation();
         }
-        
+
+        $scope.clickCopyAll = function () {
+
+            syncCurrentNode();
+
+            var culture = $routeParams.cculture ? $routeParams.cculture : $routeParams.mculture;
+            var activeVariant = _.find(editorState.current.variants, function (v) {
+                return !v.language || v.language.culture === culture;
+            });
+
+            localizationService.localize("content_nestedContentCopyAllItemsName", [$scope.model.label, activeVariant.name]).then(function(data) {
+                var model = {
+                    nodes: $scope.nodes,
+                    key: "nc_" + $scope.model.alias,
+                    name: data
+                };
+                clipboardService.copy("nestedContent", "nc_copyOfAllItems", model);
+            });
+        }
+
         $scope.pasteFromClipboard = function(newNode) {
             
             if (newNode === undefined) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html
index 1eb7311ca7..a3196e8928 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html
@@ -42,6 +42,9 @@
             <a href class="umb-nested-content__add-content" ng-class="{ '--disabled': !scaffolds.length }" ng-click="openNodeTypePicker($event)" prevent-default>
                 <localize key="grid_addElement"></localize>
             </a>
+            <a class="umb-nested-content__icon umb-nested-content__icon--copy" title="{{copyIconTitle}}" ng-click="clickCopyAll();" ng-if="showCopy && nodes.length" prevent-default>
+                <i class="icon icon-documents"></i>
+            </a>
         </div>
 
     </ng-form>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 189bd9f10b..c439ed01c3 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -273,6 +273,7 @@
     <key alias="nestedContentDeleteItem">Are you sure you want to delete this item?</key>
     <key alias="nestedContentEditorNotSupported">Property %0% uses editor %1% which is not supported by Nested Content.</key>
     <key alias="nestedContentNoContentTypes">No content types are configured for this property.</key>
+    <key alias="nestedContentCopyAllItemsName">%0% from %1%</key>
     <key alias="addTextBox">Add another text box</key>
     <key alias="removeTextBox">Remove this text box</key>
     <key alias="contentRoot">Content root</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index 6ce6f82ccc..efcfcdc056 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -277,6 +277,7 @@
     <key alias="nestedContentDeleteItem">Are you sure you want to delete this item?</key>
     <key alias="nestedContentEditorNotSupported">Property %0% uses editor %1% which is not supported by Nested Content.</key>
     <key alias="nestedContentNoContentTypes">No content types are configured for this property.</key>
+    <key alias="nestedContentCopyAllItemsName">%0% from %1%</key>
     <key alias="addTextBox">Add another text box</key>
     <key alias="removeTextBox">Remove this text box</key>
     <key alias="contentRoot">Content root</key>

From 1dd2c1cb915a9b807ccb9425d0e61ac0d4a1bf6d Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 19 Jun 2019 14:30:44 +0200
Subject: [PATCH 003/776] Revert "Revert "U4 10147 - Bypass User Security
 option in pickers (#2441)""

This reverts commit 994c6eed
---
 .../tree/umbtreesearchbox.directive.js        |    7 +
 .../src/common/resources/content.resource.js  | 1577 +++++++++--------
 .../src/common/resources/entity.resource.js   |   49 +-
 .../src/common/resources/media.resource.js    |    6 +-
 .../src/common/services/search.service.js     |   22 +-
 .../overlays/contentpicker/contentpicker.html |    3 +-
 .../linkpicker/linkpicker.controller.js       |  301 ++--
 .../overlays/linkpicker/linkpicker.html       |    2 +
 .../mediaPicker/mediapicker.controller.js     |   55 +-
 .../treepicker/treepicker.controller.js       | 1047 +++++------
 .../overlays/treepicker/treepicker.html       |    1 +
 .../contentpicker/contentpicker.controller.js |    4 +-
 .../grid/editors/media.controller.js          |   17 +-
 .../grid/editors/rte.controller.js            |   17 +-
 .../mediapicker/mediapicker.controller.js     |   16 +-
 .../multiurlpicker.controller.js              |    3 +-
 .../relatedlinks/relatedlinks.controller.js   |    2 +
 .../propertyeditors/rte/rte.controller.js     |   15 +-
 .../propertyeditors/rte/rte.prevalues.html    |    1 +
 src/Umbraco.Web/Editors/ContentController.cs  |   12 +-
 src/Umbraco.Web/Editors/EntityController.cs   |  106 +-
 src/Umbraco.Web/Editors/MediaController.cs    |   14 +-
 .../ContentPicker2PropertyEditor.cs           |   14 +-
 .../PropertyEditors/GridPropertyEditor.cs     |    3 +
 .../MediaPicker2PropertyEditor.cs             |    9 +-
 .../MultiNodeTreePicker2PropertyEditor.cs     |   10 +-
 .../MultiUrlPickerPropertyEditor.cs           |    7 +
 .../RelatedLinks2PropertyEditor.cs            |    6 +-
 .../PropertyEditors/RichTextPreValueEditor.cs |    8 +
 src/Umbraco.Web/Search/UmbracoTreeSearcher.cs |   34 +-
 .../Trees/ContentTreeControllerBase.cs        |   12 +-
 src/Umbraco.Web/Trees/TreeControllerBase.cs   |   10 +
 .../Trees/TreeQueryStringParameters.cs        |    3 +-
 ...EnsureUserPermissionForContentAttribute.cs |   15 +-
 .../FilterAllowedOutgoingMediaAttribute.cs    |    9 +-
 35 files changed, 1861 insertions(+), 1556 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreesearchbox.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreesearchbox.directive.js
index 4ba4cf96bb..b81e62a66b 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreesearchbox.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreesearchbox.directive.js
@@ -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
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
index b695809eaa..77e587bcc6 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
@@ -1,782 +1,795 @@
-/**
-  * @ngdoc service
-  * @name umbraco.resources.contentResource
-  * @description Handles all transactions of content data
-  * from the angular application to the Umbraco database, using the Content WebApi controller
-  *
-  * all methods returns a resource promise async, so all operations won't complete untill .then() is completed.
-  *
-  * @requires $q
-  * @requires $http
-  * @requires umbDataFormatter
-  * @requires umbRequestHelper
-  *
-  * ##usage
-  * To use, simply inject the contentResource into any controller or service that needs it, and make
-  * sure the umbraco.resources module is accesible - which it should be by default.
-  *
-  * <pre>
-  *    contentResource.getById(1234)
-  *          .then(function(data) {
-  *              $scope.content = data;
-  *          });    
-  * </pre> 
-  **/
-
-function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
-
-    /** internal method process the saving of data and post processing the result */
-  function saveContentItem(content, action, files, restApiUrl) {
-        return umbRequestHelper.postSaveContent({
-          restApiUrl: restApiUrl,
-            content: content,
-            action: action,
-            files: files,
-            dataFormatter: function (c, a) {
-                return umbDataFormatter.formatContentPostData(c, a);
-            }
-        });
-    }
-
-    return {
-
-
-      savePermissions: function (saveModel) {
-        if (!saveModel) {
-          throw "saveModel cannot be null";
-        }
-        if (!saveModel.contentId) {
-          throw "saveModel.contentId cannot be null";
-        }
-        if (!saveModel.permissions) {
-          throw "saveModel.permissions cannot be null";
-        }
-
-        return umbRequestHelper.resourcePromise(
-          $http.post(umbRequestHelper.getApiUrl("contentApiBaseUrl", "PostSaveUserGroupPermissions"),
-            saveModel),
-          'Failed to save permissions');
-      },
-
-
-        getRecycleBin: function () {
-            return umbRequestHelper.resourcePromise(
-                  $http.get(
-                        umbRequestHelper.getApiUrl(
-                              "contentApiBaseUrl",
-                              "GetRecycleBin")),
-                  'Failed to retrieve data for content recycle bin');
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#sort
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Sorts all children below a given parent node id, based on a collection of node-ids
-          *
-          * ##usage
-          * <pre>
-          * var ids = [123,34533,2334,23434];
-          * contentResource.sort({ parentId: 1244, sortedIds: ids })
-          *    .then(function() {
-          *        $scope.complete = true;
-          *    });
-          * </pre> 
-          * @param {Object} args arguments object
-          * @param {Int} args.parentId the ID of the parent node
-          * @param {Array} options.sortedIds array of node IDs as they should be sorted
-          * @returns {Promise} resourcePromise object.
-          *
-          */
-        sort: function (args) {
-            if (!args) {
-                throw "args cannot be null";
-            }
-            if (!args.parentId) {
-                throw "args.parentId cannot be null";
-            }
-            if (!args.sortedIds) {
-                throw "args.sortedIds cannot be null";
-            }
-
-            return umbRequestHelper.resourcePromise(
-                   $http.post(umbRequestHelper.getApiUrl("contentApiBaseUrl", "PostSort"),
-                         {
-                             parentId: args.parentId,
-                             idSortOrder: args.sortedIds
-                         }),
-                   'Failed to sort content');
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#move
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Moves a node underneath a new parentId
-          *
-          * ##usage
-          * <pre>
-          * contentResource.move({ parentId: 1244, id: 123 })
-          *    .then(function() {
-          *        alert("node was moved");
-          *    }, function(err){
-          *      alert("node didnt move:" + err.data.Message); 
-          *    });
-          * </pre> 
-          * @param {Object} args arguments object
-          * @param {Int} args.idd the ID of the node to move
-          * @param {Int} args.parentId the ID of the parent node to move to
-          * @returns {Promise} resourcePromise object.
-          *
-          */
-        move: function (args) {
-            if (!args) {
-                throw "args cannot be null";
-            }
-            if (!args.parentId) {
-                throw "args.parentId cannot be null";
-            }
-            if (!args.id) {
-                throw "args.id cannot be null";
-            }
-
-            return umbRequestHelper.resourcePromise(
-                   $http.post(umbRequestHelper.getApiUrl("contentApiBaseUrl", "PostMove"),
-                         {
-                             parentId: args.parentId,
-                             id: args.id
-                         }),
-                   'Failed to move content');
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#copy
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Copies a node underneath a new parentId
-          *
-          * ##usage
-          * <pre>
-          * contentResource.copy({ parentId: 1244, id: 123 })
-          *    .then(function() {
-          *        alert("node was copied");
-          *    }, function(err){
-          *      alert("node wasnt copy:" + err.data.Message); 
-          *    });
-          * </pre> 
-          * @param {Object} args arguments object
-          * @param {Int} args.id the ID of the node to copy
-          * @param {Int} args.parentId the ID of the parent node to copy to
-          * @param {Boolean} args.relateToOriginal if true, relates the copy to the original through the relation api
-          * @returns {Promise} resourcePromise object.
-          *
-          */
-        copy: function (args) {
-            if (!args) {
-                throw "args cannot be null";
-            }
-            if (!args.parentId) {
-                throw "args.parentId cannot be null";
-            }
-            if (!args.id) {
-                throw "args.id cannot be null";
-            }
-
-            return umbRequestHelper.resourcePromise(
-                   $http.post(umbRequestHelper.getApiUrl("contentApiBaseUrl", "PostCopy"),
-                         args),
-                   'Failed to copy content');
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#unPublish
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Unpublishes a content item with a given Id
-          *
-          * ##usage
-          * <pre>
-          * contentResource.unPublish(1234)
-          *    .then(function() {
-          *        alert("node was unpulished");
-          *    }, function(err){
-          *      alert("node wasnt unpublished:" + err.data.Message); 
-          *    });
-          * </pre> 
-          * @param {Int} id the ID of the node to unpublish
-          * @returns {Promise} resourcePromise object.
-          *
-          */
-        unPublish: function (id) {
-            if (!id) {
-                throw "id cannot be null";
-            }
-
-            return umbRequestHelper.resourcePromise(
-                                    $http.post(
-                                          umbRequestHelper.getApiUrl(
-                                                "contentApiBaseUrl",
-                                                "PostUnPublish",
-                                                [{ id: id }])),
-                                    'Failed to publish content with id ' + id);
-        },
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#emptyRecycleBin
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Empties the content recycle bin
-          *
-          * ##usage
-          * <pre>
-          * contentResource.emptyRecycleBin()
-          *    .then(function() {
-          *        alert('its empty!');
-          *    });
-          * </pre> 
-          *         
-          * @returns {Promise} resourcePromise object.
-          *
-          */
-        emptyRecycleBin: function () {
-            return umbRequestHelper.resourcePromise(
-                   $http.post(
-                         umbRequestHelper.getApiUrl(
-                               "contentApiBaseUrl",
-                               "EmptyRecycleBin")),
-                   'Failed to empty the recycle bin');
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#deleteById
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Deletes a content item with a given id
-          *
-          * ##usage
-          * <pre>
-          * contentResource.deleteById(1234)
-          *    .then(function() {
-          *        alert('its gone!');
-          *    });
-          * </pre> 
-          * 
-          * @param {Int} id id of content item to delete        
-          * @returns {Promise} resourcePromise object.
-          *
-          */
-        deleteById: function (id) {
-            return umbRequestHelper.resourcePromise(
-                   $http.post(
-                         umbRequestHelper.getApiUrl(
-                               "contentApiBaseUrl",
-                               "DeleteById",
-                               [{ id: id }])),
-                   'Failed to delete item ' + id);
-        },
-
-        deleteBlueprint: function (id) {
-          return umbRequestHelper.resourcePromise(
-            $http.post(
-              umbRequestHelper.getApiUrl(
-                "contentApiBaseUrl",
-                "DeleteBlueprint",
-                [{ id: id }])),
-            'Failed to delete blueprint ' + id);
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#getById
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Gets a content item with a given id
-          *
-          * ##usage
-          * <pre>
-          * contentResource.getById(1234)
-          *    .then(function(content) {
-          *        var myDoc = content; 
-          *        alert('its here!');
-          *    });
-          * </pre> 
-          * 
-          * @param {Int} id id of content item to return        
-          * @returns {Promise} resourcePromise object containing the content item.
-          *
-          */
-        getById: function (id) {
-            return umbRequestHelper.resourcePromise(
-                  $http.get(
-                        umbRequestHelper.getApiUrl(
-                              "contentApiBaseUrl",
-                              "GetById",
-                              [{ id: id }])),
-                  'Failed to retrieve data for content id ' + id);
-        },
-
-        getBlueprintById: function (id) {
-          return umbRequestHelper.resourcePromise(
-            $http.get(
-              umbRequestHelper.getApiUrl(
-                "contentApiBaseUrl",
-                "GetBlueprintById",
-                [{ id: id }])),
-            'Failed to retrieve data for content id ' + id);
-        },
-
-        getNotifySettingsById: function (id) {
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "contentApiBaseUrl",
-                        "GetNotificationOptions",
-                        [{ contentId: id }])),
-                'Failed to retrieve data for content id ' + id);
-        },
-
-        setNotifySettingsById: function (id, options) {
-            if (!id) {
-                throw "contentId cannot be null";
-            }
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "contentApiBaseUrl",
-                        "PostNotificationOptions",
-                        { contentId: id, notifyOptions: options })),
-                'Failed to set notify settings for content id ' + id);
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#getByIds
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Gets an array of content items, given a collection of ids
-          *
-          * ##usage
-          * <pre>
-          * contentResource.getByIds( [1234,2526,28262])
-          *    .then(function(contentArray) {
-          *        var myDoc = contentArray; 
-          *        alert('they are here!');
-          *    });
-          * </pre> 
-          * 
-          * @param {Array} ids ids of content items to return as an array        
-          * @returns {Promise} resourcePromise object containing the content items array.
-          *
-          */
-        getByIds: function (ids) {
-
-            var idQuery = "";
-            _.each(ids, function (item) {
-                idQuery += "ids=" + item + "&";
-            });
-
-            return umbRequestHelper.resourcePromise(
-                  $http.get(
-                        umbRequestHelper.getApiUrl(
-                              "contentApiBaseUrl",
-                              "GetByIds",
-                              idQuery)),
-                  'Failed to retrieve data for content with multiple ids');
-        },
-
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#getScaffold
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Returns a scaffold of an empty content item, given the id of the content item to place it underneath and the content type alias.
-          * 
-          * - Parent Id must be provided so umbraco knows where to store the content
-          * - Content Type alias must be provided so umbraco knows which properties to put on the content scaffold 
-          * 
-          * The scaffold is used to build editors for content that has not yet been populated with data.
-          * 
-          * ##usage
-          * <pre>
-          * contentResource.getScaffold(1234, 'homepage')
-          *    .then(function(scaffold) {
-          *        var myDoc = scaffold;
-          *        myDoc.name = "My new document"; 
-          *
-          *        contentResource.publish(myDoc, true)
-          *            .then(function(content){
-          *                alert("Retrieved, updated and published again");
-          *            });
-          *    });
-          * </pre> 
-          * 
-          * @param {Int} parentId id of content item to return
-          * @param {String} alias contenttype alias to base the scaffold on        
-          * @returns {Promise} resourcePromise object containing the content scaffold.
-          *
-          */
-        getScaffold: function (parentId, alias) {
-
-            return umbRequestHelper.resourcePromise(
-                  $http.get(
-                        umbRequestHelper.getApiUrl(
-                              "contentApiBaseUrl",
-                              "GetEmpty",
-                              [{ contentTypeAlias: alias }, { parentId: parentId }])),
-                  'Failed to retrieve data for empty content item type ' + alias);
-        },
-
-        getBlueprintScaffold: function (parentId, blueprintId) {
-
-          return umbRequestHelper.resourcePromise(
-            $http.get(
-              umbRequestHelper.getApiUrl(
-                "contentApiBaseUrl",
-                      "GetEmpty",
-                      [{ blueprintId: blueprintId }, { parentId: parentId}])),
-            'Failed to retrieve blueprint for id ' + blueprintId);
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#getNiceUrl
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Returns a url, given a node ID
-          *
-          * ##usage
-          * <pre>
-          * contentResource.getNiceUrl(id)
-          *    .then(function(url) {
-          *        alert('its here!');
-          *    });
-          * </pre> 
-          * 
-          * @param {Int} id Id of node to return the public url to
-          * @returns {Promise} resourcePromise object containing the url.
-          *
-          */
-        getNiceUrl: function (id) {
-            return umbRequestHelper.resourcePromise(
-                  $http.get(
-                        umbRequestHelper.getApiUrl(
-                              "contentApiBaseUrl",
-                              "GetNiceUrl", [{ id: id }])),
-                  'Failed to retrieve url for id:' + id);
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#getChildren
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Gets children of a content item with a given id
-          *
-          * ##usage
-          * <pre>
-          * contentResource.getChildren(1234, {pageSize: 10, pageNumber: 2})
-          *    .then(function(contentArray) {
-          *        var children = contentArray; 
-          *        alert('they are here!');
-          *    });
-          * </pre> 
-          * 
-          * @param {Int} parentid id of content item to return children of
-          * @param {Object} options optional options object
-          * @param {Int} options.pageSize if paging data, number of nodes per page, default = 0
-          * @param {Int} options.pageNumber if paging data, current page index, default = 0
-          * @param {String} options.filter if provided, query will only return those with names matching the filter
-          * @param {String} options.orderDirection can be `Ascending` or `Descending` - Default: `Ascending`
-          * @param {String} options.orderBy property to order items by, default: `SortOrder`
-          * @returns {Promise} resourcePromise object containing an array of content items.
-          *
-          */
-        getChildren: function (parentId, options) {
-
-            var defaults = {
-                includeProperties: [],
-                pageSize: 0,
-                pageNumber: 0,
-                filter: '',
-                orderDirection: "Ascending",
-                orderBy: "SortOrder",
-                orderBySystemField: true
-            };
-            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;
-            //change asc/desct
-            if (options.orderDirection === "asc") {
-                options.orderDirection = "Ascending";
-            }
-            else if (options.orderDirection === "desc") {
-                options.orderDirection = "Descending";
-            }
-
-            //converts the value to a js bool
-            function toBool(v) {
-                if (angular.isNumber(v)) {
-                    return v > 0;
-                }
-                if (angular.isString(v)) {
-                    return v === "true";
-                }
-                if (typeof v === "boolean") {
-                    return v;
-                }
-                return false;
-            }
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "contentApiBaseUrl",
-                        "GetChildren",
-                        {
-                            id: parentId,
-                            includeProperties: _.pluck(options.includeProperties, 'alias').join(","),
-                            pageNumber: options.pageNumber,
-                            pageSize: options.pageSize,
-                            orderBy: options.orderBy,
-                            orderDirection: options.orderDirection,
-                            orderBySystemField: toBool(options.orderBySystemField),
-                            filter: options.filter
-                        })),
-                'Failed to retrieve children for content item ' + parentId);
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#hasPermission
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Returns true/false given a permission char to check against a nodeID
-          * for the current user
-          *
-          * ##usage
-          * <pre>
-          * contentResource.hasPermission('p',1234)
-          *    .then(function() {
-          *        alert('You are allowed to publish this item');
-          *    });
-          * </pre> 
-          *
-          * @param {String} permission char representing the permission to check
-          * @param {Int} id id of content item to delete        
-          * @returns {Promise} resourcePromise object.
-          *
-          */
-        checkPermission: function (permission, id) {
-            return umbRequestHelper.resourcePromise(
-                   $http.get(
-                         umbRequestHelper.getApiUrl(
-                               "contentApiBaseUrl",
-                               "HasPermission",
-                               [{ permissionToCheck: permission }, { nodeId: id }])),
-                   'Failed to check permission for item ' + id);
-        },
-
-        getDetailedPermissions: function (contentId) {
-          return umbRequestHelper.resourcePromise(
-            $http.get(
-              umbRequestHelper.getApiUrl(
-                "contentApiBaseUrl",
-                "GetDetailedPermissions", { contentId: contentId })),
-            'Failed to retrieve permissions for content item ' + contentId);
-        },
-
-        getPermissions: function (nodeIds) {
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "contentApiBaseUrl",
-                        "GetPermissions"),
-                    nodeIds),
-                'Failed to get permissions');
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#save
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Saves changes made to a content item to its current version, if the content item is new, the isNew paramater must be passed to force creation
-          * if the content item needs to have files attached, they must be provided as the files param and passed separately 
-          * 
-          * 
-          * ##usage
-          * <pre>
-          * contentResource.getById(1234)
-          *    .then(function(content) {
-          *          content.name = "I want a new name!";
-          *          contentResource.save(content, false)
-          *            .then(function(content){
-          *                alert("Retrieved, updated and saved again");
-          *            });
-          *    });
-          * </pre> 
-          * 
-          * @param {Object} content The content item object with changes applied
-          * @param {Bool} isNew set to true to create a new item or to update an existing 
-          * @param {Array} files collection of files for the document      
-          * @returns {Promise} resourcePromise object containing the saved content item.
-          *
-          */
-        save: function (content, isNew, files) {
-          var endpoint = umbRequestHelper.getApiUrl(
-            "contentApiBaseUrl",
-            "PostSave");
-          return saveContentItem(content, "save" + (isNew ? "New" : ""), files, endpoint);
-        },
-
-        saveBlueprint: function (content, isNew, files) {
-          var endpoint = umbRequestHelper.getApiUrl(
-            "contentApiBaseUrl",
-            "PostSaveBlueprint");
-          return saveContentItem(content, "save" + (isNew ? "New" : ""), files, endpoint);
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#publish
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Saves and publishes changes made to a content item to a new version, if the content item is new, the isNew paramater must be passed to force creation
-          * if the content item needs to have files attached, they must be provided as the files param and passed separately 
-          * 
-          * 
-          * ##usage
-          * <pre>
-          * contentResource.getById(1234)
-          *    .then(function(content) {
-          *          content.name = "I want a new name, and be published!";
-          *          contentResource.publish(content, false)
-          *            .then(function(content){
-          *                alert("Retrieved, updated and published again");
-          *            });
-          *    });
-          * </pre> 
-          * 
-          * @param {Object} content The content item object with changes applied
-          * @param {Bool} isNew set to true to create a new item or to update an existing 
-          * @param {Array} files collection of files for the document      
-          * @returns {Promise} resourcePromise object containing the saved content item.
-          *
-          */
-        publish: function (content, isNew, files) {
-          var endpoint = umbRequestHelper.getApiUrl(
-            "contentApiBaseUrl",
-            "PostSave");
-          return saveContentItem(content, "publish" + (isNew ? "New" : ""), files, endpoint);
-        },
-
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#sendToPublish
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Saves changes made to a content item, and notifies any subscribers about a pending publication
-          * 
-          * ##usage
-          * <pre>
-          * contentResource.getById(1234)
-          *    .then(function(content) {
-          *          content.name = "I want a new name, and be published!";
-          *          contentResource.sendToPublish(content, false)
-          *            .then(function(content){
-          *                alert("Retrieved, updated and notication send off");
-          *            });
-          *    });
-          * </pre> 
-          * 
-          * @param {Object} content The content item object with changes applied
-          * @param {Bool} isNew set to true to create a new item or to update an existing 
-          * @param {Array} files collection of files for the document      
-          * @returns {Promise} resourcePromise object containing the saved content item.
-          *
-          */
-        sendToPublish: function (content, isNew, files) {
-          var endpoint = umbRequestHelper.getApiUrl(
-            "contentApiBaseUrl",
-            "PostSave");
-          return saveContentItem(content, "sendPublish" + (isNew ? "New" : ""), files, endpoint);
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#publishByid
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Publishes a content item with a given ID
-          * 
-          * ##usage
-          * <pre>
-          * contentResource.publishById(1234)
-          *    .then(function(content) {
-          *        alert("published");
-          *    });
-          * </pre> 
-          * 
-          * @param {Int} id The ID of the conten to publish
-          * @returns {Promise} resourcePromise object containing the published content item.
-          *
-          */
-        publishById: function (id) {
-
-            if (!id) {
-                throw "id cannot be null";
-            }
-
-            return umbRequestHelper.resourcePromise(
-                                    $http.post(
-                                          umbRequestHelper.getApiUrl(
-                                                "contentApiBaseUrl",
-                                                "PostPublishById",
-                                                [{ id: id }])),
-                                    'Failed to publish content with id ' + id);
-
-        },
-
-        createBlueprintFromContent: function (contentId, name) {
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl("contentApiBaseUrl", "CreateBlueprintFromContent", {
-                        contentId: contentId, name: name
-                    })
-                ),
-                "Failed to create blueprint from content with id " + contentId
-            );
-        }
-
-
-    };
-}
-
-angular.module('umbraco.resources').factory('contentResource', contentResource);
+/**
+  * @ngdoc service
+  * @name umbraco.resources.contentResource
+  * @description Handles all transactions of content data
+  * from the angular application to the Umbraco database, using the Content WebApi controller
+  *
+  * all methods returns a resource promise async, so all operations won't complete untill .then() is completed.
+  *
+  * @requires $q
+  * @requires $http
+  * @requires umbDataFormatter
+  * @requires umbRequestHelper
+  *
+  * ##usage
+  * To use, simply inject the contentResource into any controller or service that needs it, and make
+  * sure the umbraco.resources module is accesible - which it should be by default.
+  *
+  * <pre>
+  *    contentResource.getById(1234)
+  *          .then(function(data) {
+  *              $scope.content = data;
+  *          });    
+  * </pre> 
+  **/
+
+function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
+
+    /** internal method process the saving of data and post processing the result */
+  function saveContentItem(content, action, files, restApiUrl) {
+        return umbRequestHelper.postSaveContent({
+          restApiUrl: restApiUrl,
+            content: content,
+            action: action,
+            files: files,
+            dataFormatter: function (c, a) {
+                return umbDataFormatter.formatContentPostData(c, a);
+            }
+        });
+    }
+
+    return {
+
+
+      savePermissions: function (saveModel) {
+        if (!saveModel) {
+          throw "saveModel cannot be null";
+        }
+        if (!saveModel.contentId) {
+          throw "saveModel.contentId cannot be null";
+        }
+        if (!saveModel.permissions) {
+          throw "saveModel.permissions cannot be null";
+        }
+
+        return umbRequestHelper.resourcePromise(
+          $http.post(umbRequestHelper.getApiUrl("contentApiBaseUrl", "PostSaveUserGroupPermissions"),
+            saveModel),
+          'Failed to save permissions');
+      },
+
+
+        getRecycleBin: function () {
+            return umbRequestHelper.resourcePromise(
+                  $http.get(
+                        umbRequestHelper.getApiUrl(
+                              "contentApiBaseUrl",
+                              "GetRecycleBin")),
+                  'Failed to retrieve data for content recycle bin');
+        },
+
+        /**
+          * @ngdoc method
+          * @name umbraco.resources.contentResource#sort
+          * @methodOf umbraco.resources.contentResource
+          *
+          * @description
+          * Sorts all children below a given parent node id, based on a collection of node-ids
+          *
+          * ##usage
+          * <pre>
+          * var ids = [123,34533,2334,23434];
+          * contentResource.sort({ parentId: 1244, sortedIds: ids })
+          *    .then(function() {
+          *        $scope.complete = true;
+          *    });
+          * </pre> 
+          * @param {Object} args arguments object
+          * @param {Int} args.parentId the ID of the parent node
+          * @param {Array} options.sortedIds array of node IDs as they should be sorted
+          * @returns {Promise} resourcePromise object.
+          *
+          */
+        sort: function (args) {
+            if (!args) {
+                throw "args cannot be null";
+            }
+            if (!args.parentId) {
+                throw "args.parentId cannot be null";
+            }
+            if (!args.sortedIds) {
+                throw "args.sortedIds cannot be null";
+            }
+
+            return umbRequestHelper.resourcePromise(
+                   $http.post(umbRequestHelper.getApiUrl("contentApiBaseUrl", "PostSort"),
+                         {
+                             parentId: args.parentId,
+                             idSortOrder: args.sortedIds
+                         }),
+                   'Failed to sort content');
+        },
+
+        /**
+          * @ngdoc method
+          * @name umbraco.resources.contentResource#move
+          * @methodOf umbraco.resources.contentResource
+          *
+          * @description
+          * Moves a node underneath a new parentId
+          *
+          * ##usage
+          * <pre>
+          * contentResource.move({ parentId: 1244, id: 123 })
+          *    .then(function() {
+          *        alert("node was moved");
+          *    }, function(err){
+          *      alert("node didnt move:" + err.data.Message); 
+          *    });
+          * </pre> 
+          * @param {Object} args arguments object
+          * @param {Int} args.idd the ID of the node to move
+          * @param {Int} args.parentId the ID of the parent node to move to
+          * @returns {Promise} resourcePromise object.
+          *
+          */
+        move: function (args) {
+            if (!args) {
+                throw "args cannot be null";
+            }
+            if (!args.parentId) {
+                throw "args.parentId cannot be null";
+            }
+            if (!args.id) {
+                throw "args.id cannot be null";
+            }
+
+            return umbRequestHelper.resourcePromise(
+                   $http.post(umbRequestHelper.getApiUrl("contentApiBaseUrl", "PostMove"),
+                         {
+                             parentId: args.parentId,
+                             id: args.id
+                         }),
+                   'Failed to move content');
+        },
+
+        /**
+          * @ngdoc method
+          * @name umbraco.resources.contentResource#copy
+          * @methodOf umbraco.resources.contentResource
+          *
+          * @description
+          * Copies a node underneath a new parentId
+          *
+          * ##usage
+          * <pre>
+          * contentResource.copy({ parentId: 1244, id: 123 })
+          *    .then(function() {
+          *        alert("node was copied");
+          *    }, function(err){
+          *      alert("node wasnt copy:" + err.data.Message); 
+          *    });
+          * </pre> 
+          * @param {Object} args arguments object
+          * @param {Int} args.id the ID of the node to copy
+          * @param {Int} args.parentId the ID of the parent node to copy to
+          * @param {Boolean} args.relateToOriginal if true, relates the copy to the original through the relation api
+          * @returns {Promise} resourcePromise object.
+          *
+          */
+        copy: function (args) {
+            if (!args) {
+                throw "args cannot be null";
+            }
+            if (!args.parentId) {
+                throw "args.parentId cannot be null";
+            }
+            if (!args.id) {
+                throw "args.id cannot be null";
+            }
+
+            return umbRequestHelper.resourcePromise(
+                   $http.post(umbRequestHelper.getApiUrl("contentApiBaseUrl", "PostCopy"),
+                         args),
+                   'Failed to copy content');
+        },
+
+        /**
+          * @ngdoc method
+          * @name umbraco.resources.contentResource#unPublish
+          * @methodOf umbraco.resources.contentResource
+          *
+          * @description
+          * Unpublishes a content item with a given Id
+          *
+          * ##usage
+          * <pre>
+          * contentResource.unPublish(1234)
+          *    .then(function() {
+          *        alert("node was unpulished");
+          *    }, function(err){
+          *      alert("node wasnt unpublished:" + err.data.Message); 
+          *    });
+          * </pre> 
+          * @param {Int} id the ID of the node to unpublish
+          * @returns {Promise} resourcePromise object.
+          *
+          */
+        unPublish: function (id) {
+            if (!id) {
+                throw "id cannot be null";
+            }
+
+            return umbRequestHelper.resourcePromise(
+                                    $http.post(
+                                          umbRequestHelper.getApiUrl(
+                                                "contentApiBaseUrl",
+                                                "PostUnPublish",
+                                                [{ id: id }])),
+                                    'Failed to publish content with id ' + id);
+        },
+        /**
+          * @ngdoc method
+          * @name umbraco.resources.contentResource#emptyRecycleBin
+          * @methodOf umbraco.resources.contentResource
+          *
+          * @description
+          * Empties the content recycle bin
+          *
+          * ##usage
+          * <pre>
+          * contentResource.emptyRecycleBin()
+          *    .then(function() {
+          *        alert('its empty!');
+          *    });
+          * </pre> 
+          *         
+          * @returns {Promise} resourcePromise object.
+          *
+          */
+        emptyRecycleBin: function () {
+            return umbRequestHelper.resourcePromise(
+                   $http.post(
+                         umbRequestHelper.getApiUrl(
+                               "contentApiBaseUrl",
+                               "EmptyRecycleBin")),
+                   'Failed to empty the recycle bin');
+        },
+
+        /**
+          * @ngdoc method
+          * @name umbraco.resources.contentResource#deleteById
+          * @methodOf umbraco.resources.contentResource
+          *
+          * @description
+          * Deletes a content item with a given id
+          *
+          * ##usage
+          * <pre>
+          * contentResource.deleteById(1234)
+          *    .then(function() {
+          *        alert('its gone!');
+          *    });
+          * </pre> 
+          * 
+          * @param {Int} id id of content item to delete        
+          * @returns {Promise} resourcePromise object.
+          *
+          */
+        deleteById: function (id) {
+            return umbRequestHelper.resourcePromise(
+                   $http.post(
+                         umbRequestHelper.getApiUrl(
+                               "contentApiBaseUrl",
+                               "DeleteById",
+                               [{ id: id }])),
+                   'Failed to delete item ' + id);
+        },
+
+        deleteBlueprint: function (id) {
+          return umbRequestHelper.resourcePromise(
+            $http.post(
+              umbRequestHelper.getApiUrl(
+                "contentApiBaseUrl",
+                "DeleteBlueprint",
+                [{ id: id }])),
+            'Failed to delete blueprint ' + id);
+        },
+
+        /**
+          * @ngdoc method
+          * @name umbraco.resources.contentResource#getById
+          * @methodOf umbraco.resources.contentResource
+          *
+          * @description
+          * Gets a content item with a given id
+          *
+          * ##usage
+          * <pre>
+          * contentResource.getById(1234)
+          *    .then(function(content) {
+          *        var myDoc = content; 
+          *        alert('its here!');
+          *    });
+          * </pre> 
+          * 
+          * @param {Int} id id of content item to return
+          * @param {Object} options optional options object
+          * @param {Bool} options.ignoreUserStartNodes set to true to allow a user to choose nodes that they normally don't have access to
+          * @returns {Promise} resourcePromise object containing the content item.
+          *
+          */
+        getById: function (id, 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(
+                              "contentApiBaseUrl",
+                              "GetById",
+                              [{ id: id }, { ignoreUserStartNodes: options.ignoreUserStartNodes }])),
+                  'Failed to retrieve data for content id ' + id);
+        },
+
+        getBlueprintById: function (id) {
+          return umbRequestHelper.resourcePromise(
+            $http.get(
+              umbRequestHelper.getApiUrl(
+                "contentApiBaseUrl",
+                "GetBlueprintById",
+                [{ id: id }])),
+            'Failed to retrieve data for content id ' + id);
+        },
+
+        getNotifySettingsById: function (id) {
+            return umbRequestHelper.resourcePromise(
+                $http.get(
+                    umbRequestHelper.getApiUrl(
+                        "contentApiBaseUrl",
+                        "GetNotificationOptions",
+                        [{ contentId: id }])),
+                'Failed to retrieve data for content id ' + id);
+        },
+
+        setNotifySettingsById: function (id, options) {
+            if (!id) {
+                throw "contentId cannot be null";
+            }
+            return umbRequestHelper.resourcePromise(
+                $http.post(
+                    umbRequestHelper.getApiUrl(
+                        "contentApiBaseUrl",
+                        "PostNotificationOptions",
+                        { contentId: id, notifyOptions: options })),
+                'Failed to set notify settings for content id ' + id);
+        },
+
+        /**
+          * @ngdoc method
+          * @name umbraco.resources.contentResource#getByIds
+          * @methodOf umbraco.resources.contentResource
+          *
+          * @description
+          * Gets an array of content items, given a collection of ids
+          *
+          * ##usage
+          * <pre>
+          * contentResource.getByIds( [1234,2526,28262])
+          *    .then(function(contentArray) {
+          *        var myDoc = contentArray; 
+          *        alert('they are here!');
+          *    });
+          * </pre> 
+          * 
+          * @param {Array} ids ids of content items to return as an array        
+          * @returns {Promise} resourcePromise object containing the content items array.
+          *
+          */
+        getByIds: function (ids) {
+
+            var idQuery = "";
+            _.each(ids, function (item) {
+                idQuery += "ids=" + item + "&";
+            });
+
+            return umbRequestHelper.resourcePromise(
+                  $http.get(
+                        umbRequestHelper.getApiUrl(
+                              "contentApiBaseUrl",
+                              "GetByIds",
+                              idQuery)),
+                  'Failed to retrieve data for content with multiple ids');
+        },
+
+
+        /**
+          * @ngdoc method
+          * @name umbraco.resources.contentResource#getScaffold
+          * @methodOf umbraco.resources.contentResource
+          *
+          * @description
+          * Returns a scaffold of an empty content item, given the id of the content item to place it underneath and the content type alias.
+          * 
+          * - Parent Id must be provided so umbraco knows where to store the content
+          * - Content Type alias must be provided so umbraco knows which properties to put on the content scaffold 
+          * 
+          * The scaffold is used to build editors for content that has not yet been populated with data.
+          * 
+          * ##usage
+          * <pre>
+          * contentResource.getScaffold(1234, 'homepage')
+          *    .then(function(scaffold) {
+          *        var myDoc = scaffold;
+          *        myDoc.name = "My new document"; 
+          *
+          *        contentResource.publish(myDoc, true)
+          *            .then(function(content){
+          *                alert("Retrieved, updated and published again");
+          *            });
+          *    });
+          * </pre> 
+          * 
+          * @param {Int} parentId id of content item to return
+          * @param {String} alias contenttype alias to base the scaffold on        
+          * @returns {Promise} resourcePromise object containing the content scaffold.
+          *
+          */
+        getScaffold: function (parentId, alias) {
+
+            return umbRequestHelper.resourcePromise(
+                  $http.get(
+                        umbRequestHelper.getApiUrl(
+                              "contentApiBaseUrl",
+                              "GetEmpty",
+                              [{ contentTypeAlias: alias }, { parentId: parentId }])),
+                  'Failed to retrieve data for empty content item type ' + alias);
+        },
+
+        getBlueprintScaffold: function (parentId, blueprintId) {
+
+          return umbRequestHelper.resourcePromise(
+            $http.get(
+              umbRequestHelper.getApiUrl(
+                "contentApiBaseUrl",
+                      "GetEmpty",
+                      [{ blueprintId: blueprintId }, { parentId: parentId}])),
+            'Failed to retrieve blueprint for id ' + blueprintId);
+        },
+
+        /**
+          * @ngdoc method
+          * @name umbraco.resources.contentResource#getNiceUrl
+          * @methodOf umbraco.resources.contentResource
+          *
+          * @description
+          * Returns a url, given a node ID
+          *
+          * ##usage
+          * <pre>
+          * contentResource.getNiceUrl(id)
+          *    .then(function(url) {
+          *        alert('its here!');
+          *    });
+          * </pre> 
+          * 
+          * @param {Int} id Id of node to return the public url to
+          * @returns {Promise} resourcePromise object containing the url.
+          *
+          */
+        getNiceUrl: function (id) {
+            return umbRequestHelper.resourcePromise(
+                  $http.get(
+                        umbRequestHelper.getApiUrl(
+                              "contentApiBaseUrl",
+                              "GetNiceUrl", [{ id: id }])),
+                  'Failed to retrieve url for id:' + id);
+        },
+
+        /**
+          * @ngdoc method
+          * @name umbraco.resources.contentResource#getChildren
+          * @methodOf umbraco.resources.contentResource
+          *
+          * @description
+          * Gets children of a content item with a given id
+          *
+          * ##usage
+          * <pre>
+          * contentResource.getChildren(1234, {pageSize: 10, pageNumber: 2})
+          *    .then(function(contentArray) {
+          *        var children = contentArray; 
+          *        alert('they are here!');
+          *    });
+          * </pre> 
+          * 
+          * @param {Int} parentid id of content item to return children of
+          * @param {Object} options optional options object
+          * @param {Int} options.pageSize if paging data, number of nodes per page, default = 0
+          * @param {Int} options.pageNumber if paging data, current page index, default = 0
+          * @param {String} options.filter if provided, query will only return those with names matching the filter
+          * @param {String} options.orderDirection can be `Ascending` or `Descending` - Default: `Ascending`
+          * @param {String} options.orderBy property to order items by, default: `SortOrder`
+          * @returns {Promise} resourcePromise object containing an array of content items.
+          *
+          */
+        getChildren: function (parentId, options) {
+
+            var defaults = {
+                includeProperties: [],
+                pageSize: 0,
+                pageNumber: 0,
+                filter: '',
+                orderDirection: "Ascending",
+                orderBy: "SortOrder",
+                orderBySystemField: true
+            };
+            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;
+            //change asc/desct
+            if (options.orderDirection === "asc") {
+                options.orderDirection = "Ascending";
+            }
+            else if (options.orderDirection === "desc") {
+                options.orderDirection = "Descending";
+            }
+
+            //converts the value to a js bool
+            function toBool(v) {
+                if (angular.isNumber(v)) {
+                    return v > 0;
+                }
+                if (angular.isString(v)) {
+                    return v === "true";
+                }
+                if (typeof v === "boolean") {
+                    return v;
+                }
+                return false;
+            }
+
+            return umbRequestHelper.resourcePromise(
+                $http.get(
+                    umbRequestHelper.getApiUrl(
+                        "contentApiBaseUrl",
+                        "GetChildren",
+                        {
+                            id: parentId,
+                            includeProperties: _.pluck(options.includeProperties, 'alias').join(","),
+                            pageNumber: options.pageNumber,
+                            pageSize: options.pageSize,
+                            orderBy: options.orderBy,
+                            orderDirection: options.orderDirection,
+                            orderBySystemField: toBool(options.orderBySystemField),
+                            filter: options.filter
+                        })),
+                'Failed to retrieve children for content item ' + parentId);
+        },
+
+        /**
+          * @ngdoc method
+          * @name umbraco.resources.contentResource#hasPermission
+          * @methodOf umbraco.resources.contentResource
+          *
+          * @description
+          * Returns true/false given a permission char to check against a nodeID
+          * for the current user
+          *
+          * ##usage
+          * <pre>
+          * contentResource.hasPermission('p',1234)
+          *    .then(function() {
+          *        alert('You are allowed to publish this item');
+          *    });
+          * </pre> 
+          *
+          * @param {String} permission char representing the permission to check
+          * @param {Int} id id of content item to delete        
+          * @returns {Promise} resourcePromise object.
+          *
+          */
+        checkPermission: function (permission, id) {
+            return umbRequestHelper.resourcePromise(
+                   $http.get(
+                         umbRequestHelper.getApiUrl(
+                               "contentApiBaseUrl",
+                               "HasPermission",
+                               [{ permissionToCheck: permission }, { nodeId: id }])),
+                   'Failed to check permission for item ' + id);
+        },
+
+        getDetailedPermissions: function (contentId) {
+          return umbRequestHelper.resourcePromise(
+            $http.get(
+              umbRequestHelper.getApiUrl(
+                "contentApiBaseUrl",
+                "GetDetailedPermissions", { contentId: contentId })),
+            'Failed to retrieve permissions for content item ' + contentId);
+        },
+
+        getPermissions: function (nodeIds) {
+            return umbRequestHelper.resourcePromise(
+                $http.post(
+                    umbRequestHelper.getApiUrl(
+                        "contentApiBaseUrl",
+                        "GetPermissions"),
+                    nodeIds),
+                'Failed to get permissions');
+        },
+
+        /**
+          * @ngdoc method
+          * @name umbraco.resources.contentResource#save
+          * @methodOf umbraco.resources.contentResource
+          *
+          * @description
+          * Saves changes made to a content item to its current version, if the content item is new, the isNew paramater must be passed to force creation
+          * if the content item needs to have files attached, they must be provided as the files param and passed separately 
+          * 
+          * 
+          * ##usage
+          * <pre>
+          * contentResource.getById(1234)
+          *    .then(function(content) {
+          *          content.name = "I want a new name!";
+          *          contentResource.save(content, false)
+          *            .then(function(content){
+          *                alert("Retrieved, updated and saved again");
+          *            });
+          *    });
+          * </pre> 
+          * 
+          * @param {Object} content The content item object with changes applied
+          * @param {Bool} isNew set to true to create a new item or to update an existing 
+          * @param {Array} files collection of files for the document      
+          * @returns {Promise} resourcePromise object containing the saved content item.
+          *
+          */
+        save: function (content, isNew, files) {
+          var endpoint = umbRequestHelper.getApiUrl(
+            "contentApiBaseUrl",
+            "PostSave");
+          return saveContentItem(content, "save" + (isNew ? "New" : ""), files, endpoint);
+        },
+
+        saveBlueprint: function (content, isNew, files) {
+          var endpoint = umbRequestHelper.getApiUrl(
+            "contentApiBaseUrl",
+            "PostSaveBlueprint");
+          return saveContentItem(content, "save" + (isNew ? "New" : ""), files, endpoint);
+        },
+
+        /**
+          * @ngdoc method
+          * @name umbraco.resources.contentResource#publish
+          * @methodOf umbraco.resources.contentResource
+          *
+          * @description
+          * Saves and publishes changes made to a content item to a new version, if the content item is new, the isNew paramater must be passed to force creation
+          * if the content item needs to have files attached, they must be provided as the files param and passed separately 
+          * 
+          * 
+          * ##usage
+          * <pre>
+          * contentResource.getById(1234)
+          *    .then(function(content) {
+          *          content.name = "I want a new name, and be published!";
+          *          contentResource.publish(content, false)
+          *            .then(function(content){
+          *                alert("Retrieved, updated and published again");
+          *            });
+          *    });
+          * </pre> 
+          * 
+          * @param {Object} content The content item object with changes applied
+          * @param {Bool} isNew set to true to create a new item or to update an existing 
+          * @param {Array} files collection of files for the document      
+          * @returns {Promise} resourcePromise object containing the saved content item.
+          *
+          */
+        publish: function (content, isNew, files) {
+          var endpoint = umbRequestHelper.getApiUrl(
+            "contentApiBaseUrl",
+            "PostSave");
+          return saveContentItem(content, "publish" + (isNew ? "New" : ""), files, endpoint);
+        },
+
+
+        /**
+          * @ngdoc method
+          * @name umbraco.resources.contentResource#sendToPublish
+          * @methodOf umbraco.resources.contentResource
+          *
+          * @description
+          * Saves changes made to a content item, and notifies any subscribers about a pending publication
+          * 
+          * ##usage
+          * <pre>
+          * contentResource.getById(1234)
+          *    .then(function(content) {
+          *          content.name = "I want a new name, and be published!";
+          *          contentResource.sendToPublish(content, false)
+          *            .then(function(content){
+          *                alert("Retrieved, updated and notication send off");
+          *            });
+          *    });
+          * </pre> 
+          * 
+          * @param {Object} content The content item object with changes applied
+          * @param {Bool} isNew set to true to create a new item or to update an existing 
+          * @param {Array} files collection of files for the document      
+          * @returns {Promise} resourcePromise object containing the saved content item.
+          *
+          */
+        sendToPublish: function (content, isNew, files) {
+          var endpoint = umbRequestHelper.getApiUrl(
+            "contentApiBaseUrl",
+            "PostSave");
+          return saveContentItem(content, "sendPublish" + (isNew ? "New" : ""), files, endpoint);
+        },
+
+        /**
+          * @ngdoc method
+          * @name umbraco.resources.contentResource#publishByid
+          * @methodOf umbraco.resources.contentResource
+          *
+          * @description
+          * Publishes a content item with a given ID
+          * 
+          * ##usage
+          * <pre>
+          * contentResource.publishById(1234)
+          *    .then(function(content) {
+          *        alert("published");
+          *    });
+          * </pre> 
+          * 
+          * @param {Int} id The ID of the conten to publish
+          * @returns {Promise} resourcePromise object containing the published content item.
+          *
+          */
+        publishById: function (id) {
+
+            if (!id) {
+                throw "id cannot be null";
+            }
+
+            return umbRequestHelper.resourcePromise(
+                                    $http.post(
+                                          umbRequestHelper.getApiUrl(
+                                                "contentApiBaseUrl",
+                                                "PostPublishById",
+                                                [{ id: id }])),
+                                    'Failed to publish content with id ' + id);
+
+        },
+
+        createBlueprintFromContent: function (contentId, name) {
+            return umbRequestHelper.resourcePromise(
+                $http.post(
+                    umbRequestHelper.getApiUrl("contentApiBaseUrl", "CreateBlueprintFromContent", {
+                        contentId: contentId, name: name
+                    })
+                ),
+                "Failed to create blueprint from content with id " + contentId
+            );
+        }
+
+
+    };
+}
+
+angular.module('umbraco.resources').factory('contentResource', contentResource);
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
index 72f8ad5539..4875491dc6 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
@@ -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);
         },
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
index 8c27f20aea..e968913047 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
@@ -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);
         },
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/search.service.js b/src/Umbraco.Web.UI.Client/src/common/services/search.service.js
index 8738c1011e..0d00678282 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/search.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/search.service.js
@@ -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;
             }
         };
-    });
\ No newline at end of file
+    });
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contentpicker/contentpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contentpicker/contentpicker.html
index 43eab532d4..4391e50c28 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contentpicker/contentpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contentpicker/contentpicker.html
@@ -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>
\ No newline at end of file
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
index fcce34621b..79b9362d3f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
@@ -1,57 +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) {
-			// 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) {
+                //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"
+                        });
+                    });
 
-				// 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"
-			            });
-			        });
-
-			        // get the content 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) {
@@ -60,124 +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);
 
-						// make sure the content tree has nothing highlighted 
-						$scope.dialogTreeEventHandler.syncTree({
-							path: "-1",
-							tree: "content"
-						});
-					}
-				};
-			});
-		};
+                        $scope.mediaPickerOverlay.show = false;
+                        $scope.mediaPickerOverlay = null;
 
-		$scope.hideSearch = function () {
-			$scope.searchInfo.showSearch = false;
-			$scope.searchInfo.searchFromId = null;
-			$scope.searchInfo.searchFromName = null;
-			$scope.searchInfo.results = [];
-		}
+                        // make sure the content tree has nothing highlighted 
+                        $scope.dialogTreeEventHandler.syncTree({
+                            path: "-1",
+                            tree: "content"
+                        });
+                    }
+                };
+            });
+        };
 
-		// 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.hideSearch = function () {
+            $scope.searchInfo.showSearch = false;
+            $scope.searchInfo.searchFromId = null;
+            $scope.searchInfo.searchFromName = null;
+            $scope.searchInfo.results = [];
+        }
 
-		//callback when there are search results
-		$scope.onSearchResults = function (results) {
-			$scope.searchInfo.results = results;
-			$scope.searchInfo.showSearch = true;
-		};
+        // 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.dialogTreeEventHandler.bind("treeNodeSelect", nodeSelectHandler);
-		$scope.dialogTreeEventHandler.bind("treeNodeExpanded", nodeExpandedHandler);
+        //callback when there are search results
+        $scope.onSearchResults = function (results) {
+            $scope.searchInfo.results = results;
+            $scope.searchInfo.showSearch = true;
+        };
 
-		$scope.$on('$destroy', function () {
-			$scope.dialogTreeEventHandler.unbind("treeNodeSelect", nodeSelectHandler);
-			$scope.dialogTreeEventHandler.unbind("treeNodeExpanded", nodeExpandedHandler);
-		});
+        $scope.dialogTreeEventHandler.bind("treeNodeSelect", nodeSelectHandler);
+        $scope.dialogTreeEventHandler.bind("treeNodeExpanded", nodeExpandedHandler);
 
-		// Mini list view
-		$scope.selectListViewNode = function (node) {
-			node.selected = node.selected === true ? false : true;
-			nodeSelectHandler({}, {
-				node: node
-			});
-		};
+        $scope.$on('$destroy', function () {
+            $scope.dialogTreeEventHandler.unbind("treeNodeSelect", nodeSelectHandler);
+            $scope.dialogTreeEventHandler.unbind("treeNodeExpanded", nodeExpandedHandler);
+        });
 
-		$scope.closeMiniListView = function () {
-			$scope.miniListView = undefined;
-		};
+        // Mini list view
+        $scope.selectListViewNode = function (node) {
+            node.selected = node.selected === true ? false : true;
+            nodeSelectHandler({}, {
+                node: node
+            });
+        };
 
-		function openMiniListView(node) {
-			$scope.miniListView = node;
-		}
+        $scope.closeMiniListView = function () {
+            $scope.miniListView = undefined;
+        };
 
-	});
+        function openMiniListView(node) {
+            $scope.miniListView = node;
+        }
+
+    });
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html
index deba19aa11..c9f3ad54a7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html
@@ -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"
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
index af07f5b37b..e3d9326c53 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
@@ -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 : [];
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
index 615f86b384..e1ce332b48 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
@@ -1,517 +1,530 @@
-//used for the media picker dialog
-angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController",
-    function ($scope, $q, entityResource, eventsService, $log, searchService, angularHelper, $timeout, localizationService, treeService, contentResource, mediaResource, memberResource) {
-
-        var tree = null;
-        var dialogOptions = $scope.model;
-        $scope.treeReady = false;
-        $scope.dialogTreeEventHandler = $({});
-        $scope.section = dialogOptions.section;
-        $scope.treeAlias = dialogOptions.treeAlias;
-        $scope.multiPicker = dialogOptions.multiPicker;
-        $scope.hideHeader = (typeof dialogOptions.hideHeader) === "boolean" ? dialogOptions.hideHeader : true;
-        // if you need to load a not initialized tree set this value to false - default is true
-        $scope.onlyInitialized = dialogOptions.onlyInitialized;
-        $scope.searchInfo = {
-            searchFromId: dialogOptions.startNodeId,
-            searchFromName: null,
-            showSearch: false,
-            results: [],
-            selectedSearchResults: []
-        }
-
-        $scope.model.selection = [];
-
-        //Used for toggling an empty-state message
-        //Some trees can have no items (dictionary & forms email templates)
-        $scope.hasItems = true;
-        $scope.emptyStateMessage = dialogOptions.emptyStateMessage;
-        var node = dialogOptions.currentNode;
-
-        //This is called from ng-init
-        //it turns out it is called from the angular html : / Have a look at views/common / overlays / contentpicker / contentpicker.html you'll see ng-init. 
-        //this is probably an anti pattern IMO and shouldn't be used
-        $scope.init = function (contentType) {
-
-            if (contentType === "content") {
-                $scope.entityType = "Document";
-                if (!$scope.model.title) {
-                    $scope.model.title = localizationService.localize("defaultdialogs_selectContent");
-                }
-            } else if (contentType === "member") {
-                $scope.entityType = "Member";
-                if (!$scope.model.title) {
-                    $scope.model.title = localizationService.localize("defaultdialogs_selectMember");
-                }
-            } else if (contentType === "media") {
-                $scope.entityType = "Media";
-                if (!$scope.model.title) {
-                    $scope.model.title = localizationService.localize("defaultdialogs_selectMedia");
-                }
-            }
-        }
-
-        var searchText = "Search...";
-        localizationService.localize("general_search").then(function (value) {
-            searchText = value + "...";
-        });
-
-        // Allow the entity type to be passed in but defaults to Document for backwards compatibility.
-        $scope.entityType = dialogOptions.entityType ? dialogOptions.entityType : "Document";
-
-
-        //min / max values
-        if (dialogOptions.minNumber) {
-            dialogOptions.minNumber = parseInt(dialogOptions.minNumber, 10);
-        }
-        if (dialogOptions.maxNumber) {
-            dialogOptions.maxNumber = parseInt(dialogOptions.maxNumber, 10);
-        }
-
-        if (dialogOptions.section === "member") {
-            $scope.entityType = "Member";
-        }
-        else if (dialogOptions.section === "media") {
-            $scope.entityType = "Media";
-        }
-
-        // Search and listviews is only working for content, media and member section
-        var searchableSections = ["content", "media", "member"];
-
-        $scope.enableSearh = searchableSections.indexOf($scope.section) !== -1;
-
-        //if a alternative startnode is used, we need to check if it is a container
-        if ($scope.enableSearh && dialogOptions.startNodeId && dialogOptions.startNodeId !== -1 && dialogOptions.startNodeId !== "-1") {
-            entityResource.getById(dialogOptions.startNodeId, $scope.entityType).then(function(node) {
-                if (node.metaData.IsContainer) {
-                    openMiniListView(node);
-                }
-                initTree();
-            });
-        }
-        else {
-            initTree();
-        }
-
-        //Configures filtering
-        if (dialogOptions.filter) {
-
-            dialogOptions.filterExclude = false;
-            dialogOptions.filterAdvanced = false;
-
-            //used advanced filtering
-            if (angular.isFunction(dialogOptions.filter)) {
-                dialogOptions.filterAdvanced = true;
-            }
-            else if (angular.isObject(dialogOptions.filter)) {
-                dialogOptions.filterAdvanced = true;
-            }
-            else {
-                if (dialogOptions.filter.startsWith("!")) {
-                    dialogOptions.filterExclude = true;
-                    dialogOptions.filterTypes = dialogOptions.filter.substring(1);
-                } else {
-                    dialogOptions.filterExclude = false;
-                    dialogOptions.filterTypes = dialogOptions.filter;
-                }
-
-                //used advanced filtering
-                if (dialogOptions.filter.startsWith("{")) {
-                    dialogOptions.filterAdvanced = true;
-                    //convert to object
-                    dialogOptions.filter = angular.fromJson(dialogOptions.filter);
-                }
-            }
-
-            $scope.filter = {
-                filterAdvanced: dialogOptions.filterAdvanced,
-                filterExclude: dialogOptions.filterExclude,
-                filter: dialogOptions.filterTypes
-            };
-        }
-
-        function initTree() {
-            //create the custom query string param for this tree
-            $scope.customTreeParams = dialogOptions.startNodeId ? "startNodeId=" + dialogOptions.startNodeId : "";
-            $scope.customTreeParams += dialogOptions.customTreeParams ? "&" + dialogOptions.customTreeParams : "";
-            $scope.treeReady = true;
-        }
-
-        function nodeExpandedHandler(ev, args) {
-
-            // open mini list view for list views
-            if (args.node.metaData.isContainer) {
-                openMiniListView(args.node);
-            }
-
-            if (angular.isArray(args.children)) {
-
-                //iterate children
-                _.each(args.children, function (child) {
-
-                    //now we need to look in the already selected search results and
-                    // toggle the check boxes for those ones that are listed
-                    var exists = _.find($scope.searchInfo.selectedSearchResults, function (selected) {
-                        return child.id == selected.id;
-                    });
-                    if (exists) {
-                        child.selected = true;
-                    }
-                });
-
-                //check filter
-                performFiltering(args.children);
-            }
-        }
-
-        //gets the tree object when it loads
-        function treeLoadedHandler(ev, args) {
-            //args.tree contains children (args.tree.root.children)
-            $scope.hasItems = args.tree.root.children.length > 0;
-
-            tree = args.tree;
-
-            var nodeHasPath = typeof node !== "undefined" && typeof node.path !== "undefined";
-            var startNodeNotDefined = typeof dialogOptions.startNodeId === "undefined" || dialogOptions.startNodeId === "" || dialogOptions.startNodeId === "-1";
-            if (startNodeNotDefined && nodeHasPath) {
-                $scope.dialogTreeEventHandler.syncTree({ path: node.path, activate: false });
-            }
-        }
-
-        //wires up selection
-        function nodeSelectHandler(ev, args) {
-            args.event.preventDefault();
-            args.event.stopPropagation();
-
-            if (args.node.metaData.isSearchResult) {
-                //check if the item selected was a search result from a list view
-
-                //unselect
-                select(args.node.name, args.node.id);
-
-                //remove it from the list view children
-                var listView = args.node.parent();
-                listView.children = _.reject(listView.children, function (child) {
-                    return child.id == args.node.id;
-                });
-
-                //remove it from the custom tracked search result list
-                $scope.searchInfo.selectedSearchResults = _.reject($scope.searchInfo.selectedSearchResults, function (i) {
-                    return i.id == args.node.id;
-                });
-            }
-            else {
-                eventsService.emit("dialogs.treePickerController.select", args);
-
-                if (args.node.filtered) {
-                    return;
-                }
-
-                //This is a tree node, so we don't have an entity to pass in, it will need to be looked up
-                //from the server in this method.
-                if ($scope.model.select) {
-                    $scope.model.select(args.node)
-                } else {
-                    select(args.node.name, args.node.id);
-                    //toggle checked state
-                    args.node.selected = args.node.selected === true ? false : true;
-                }
-
-            }
-        }
-
-        /** Method used for selecting a node */
-        function select(text, id, entity) {
-            //if we get the root, we just return a constructed entity, no need for server data
-            if (id < 0) {
-
-                var rootNode = {
-                    alias: null,
-                    icon: "icon-folder",
-                    id: id,
-                    name: text
-                };
-
-                if ($scope.multiPicker) {
-                    if (entity) {
-                        multiSelectItem(entity);
-                    } else {
-                        multiSelectItem(rootNode);
-                    }
-                }
-                else {
-                    $scope.model.selection.push(rootNode);
-                    $scope.model.submit($scope.model);
-                }
-            }
-            else {
-
-                if ($scope.multiPicker) {
-
-                    if (entity) {
-                        multiSelectItem(entity);
-                    } else {
-                        //otherwise we have to get it from the server
-                        entityResource.getById(id, $scope.entityType).then(function (ent) {
-                            multiSelectItem(ent);
-                        });
-                    }
-
-                }
-
-                else {
-
-                    $scope.hideSearch();
-
-                    //if an entity has been passed in, use it
-                    if (entity) {
-                        $scope.model.selection.push(entity);
-                        $scope.model.submit($scope.model);
-                    } else {
-                        //otherwise we have to get it from the server
-                        entityResource.getById(id, $scope.entityType).then(function (ent) {
-                            $scope.model.selection.push(ent);
-                            $scope.model.submit($scope.model);
-                        });
-                    }
-                }
-            }
-        }
-
-        function multiSelectItem(item) {
-
-            var found = false;
-            var foundIndex = 0;
-
-            if ($scope.model.selection.length > 0) {
-                for (i = 0; $scope.model.selection.length > i; i++) {
-                    var selectedItem = $scope.model.selection[i];
-                    if (selectedItem.id === item.id) {
-                        found = true;
-                        foundIndex = i;
-                    }
-                }
-            }
-
-            if (found) {
-                $scope.model.selection.splice(foundIndex, 1);
-            } else {
-                $scope.model.selection.push(item);
-            }
-
-        }
-
-        function performFiltering(nodes) {
-
-            if (!dialogOptions.filter) {
-                return;
-            }
-
-            //remove any list view search nodes from being filtered since these are special nodes that always must
-            // be allowed to be clicked on
-            nodes = _.filter(nodes, function (n) {
-                return !angular.isObject(n.metaData.listViewNode);
-            });
-
-            if (dialogOptions.filterAdvanced) {
-
-                //filter either based on a method or an object
-                var filtered = angular.isFunction(dialogOptions.filter)
-                    ? _.filter(nodes, dialogOptions.filter)
-                    : _.where(nodes, dialogOptions.filter);
-
-                angular.forEach(filtered, function (value, key) {
-                    value.filtered = true;
-                    if (dialogOptions.filterCssClass) {
-                        if (!value.cssClasses) {
-                            value.cssClasses = [];
-                        }
-                        value.cssClasses.push(dialogOptions.filterCssClass);
-                    }
-                });
-            } else {
-                var a = dialogOptions.filterTypes.toLowerCase().replace(/\s/g, '').split(',');
-                angular.forEach(nodes, function (value, key) {
-
-                    var found = a.indexOf(value.metaData.contentType.toLowerCase()) >= 0;
-
-                    if (!dialogOptions.filterExclude && !found || dialogOptions.filterExclude && found) {
-                        value.filtered = true;
-
-                        if (dialogOptions.filterCssClass) {
-                            if (!value.cssClasses) {
-                                value.cssClasses = [];
-                            }
-                            value.cssClasses.push(dialogOptions.filterCssClass);
-                        }
-                    }
-                });
-            }
-        }
-        
-        $scope.multiSubmit = function (result) {
-            entityResource.getByIds(result, $scope.entityType).then(function (ents) {
-                $scope.submit(ents);
-            });
-        };
-
-        /** method to select a search result */
-        $scope.selectResult = function (evt, result) {
-
-            if (result.filtered) {
-                return;
-            }
-
-            result.selected = result.selected === true ? false : true;
-
-            //since result = an entity, we'll pass it in so we don't have to go back to the server
-            select(result.name, result.id, result);
-
-            //add/remove to our custom tracked list of selected search results
-            if (result.selected) {
-                $scope.searchInfo.selectedSearchResults.push(result);
-            }
-            else {
-                $scope.searchInfo.selectedSearchResults = _.reject($scope.searchInfo.selectedSearchResults, function (i) {
-                    return i.id == result.id;
-                });
-            }
-
-            //ensure the tree node in the tree is checked/unchecked if it already exists there
-            if (tree) {
-                var found = treeService.getDescendantNode(tree.root, result.id);
-                if (found) {
-                    found.selected = result.selected;
-                }
-            }
-
-        };
-
-        $scope.hideSearch = function () {
-
-            //Traverse the entire displayed tree and update each node to sync with the selected search results
-            if (tree) {
-
-                //we need to ensure that any currently displayed nodes that get selected
-                // from the search get updated to have a check box!
-                function checkChildren(children) {
-                    _.each(children, function (child) {
-                        //check if the id is in the selection, if so ensure it's flagged as selected
-                        var exists = _.find($scope.searchInfo.selectedSearchResults, function (selected) {
-                            return child.id == selected.id;
-                        });
-                        //if the curr node exists in selected search results, ensure it's checked
-                        if (exists) {
-                            child.selected = true;
-                        }
-                        //if the curr node does not exist in the selected search result, and the curr node is a child of a list view search result
-                        else if (child.metaData.isSearchResult) {
-                            //if this tree node is under a list view it means that the node was added
-                            // to the tree dynamically under the list view that was searched, so we actually want to remove
-                            // it all together from the tree
-                            var listView = child.parent();
-                            listView.children = _.reject(listView.children, function (c) {
-                                return c.id == child.id;
-                            });
-                        }
-
-                        //check if the current node is a list view and if so, check if there's any new results
-                        // that need to be added as child nodes to it based on search results selected
-                        if (child.metaData.isContainer) {
-
-                            child.cssClasses = _.reject(child.cssClasses, function (c) {
-                                return c === 'tree-node-slide-up-hide-active';
-                            });
-
-                            var listViewResults = _.filter($scope.searchInfo.selectedSearchResults, function (i) {
-                                return i.parentId == child.id;
-                            });
-                            _.each(listViewResults, function (item) {
-                                var childExists = _.find(child.children, function (c) {
-                                    return c.id == item.id;
-                                });
-                                if (!childExists) {
-                                    var parent = child;
-                                    child.children.unshift({
-                                        id: item.id,
-                                        name: item.name,
-                                        cssClass: "icon umb-tree-icon sprTree " + item.icon,
-                                        level: child.level + 1,
-                                        metaData: {
-                                            isSearchResult: true
-                                        },
-                                        hasChildren: false,
-                                        parent: function () {
-                                            return parent;
-                                        }
-                                    });
-                                }
-                            });
-                        }
-
-                        //recurse
-                        if (child.children && child.children.length > 0) {
-                            checkChildren(child.children);
-                        }
-                    });
-                }
-                checkChildren(tree.root.children);
-            }
-
-
-            $scope.searchInfo.showSearch = false;
-            $scope.searchInfo.searchFromId = dialogOptions.startNodeId;
-            $scope.searchInfo.searchFromName = null;
-            $scope.searchInfo.results = [];
-        }
-
-        $scope.onSearchResults = function (results) {
-
-            //filter all items - this will mark an item as filtered
-            performFiltering(results);
-
-            //now actually remove all filtered items so they are not even displayed
-            results = _.filter(results, function (item) {
-                return !item.filtered;
-            });
-
-            $scope.searchInfo.results = results;
-
-            //sync with the curr selected results
-            _.each($scope.searchInfo.results, function (result) {
-                var exists = _.find($scope.model.selection, function (selectedId) {
-                    return result.id == selectedId;
-                });
-                if (exists) {
-                    result.selected = true;
-                }
-            });
-
-            $scope.searchInfo.showSearch = true;
-        };
-
-        $scope.dialogTreeEventHandler.bind("treeLoaded", treeLoadedHandler);
-        $scope.dialogTreeEventHandler.bind("treeNodeExpanded", nodeExpandedHandler);
-        $scope.dialogTreeEventHandler.bind("treeNodeSelect", nodeSelectHandler);
-
-        $scope.$on('$destroy', function () {
-            $scope.dialogTreeEventHandler.unbind("treeLoaded", treeLoadedHandler);
-            $scope.dialogTreeEventHandler.unbind("treeNodeExpanded", nodeExpandedHandler);
-            $scope.dialogTreeEventHandler.unbind("treeNodeSelect", nodeSelectHandler);
-        });
-
-        $scope.selectListViewNode = function (node) {
-            select(node.name, node.id);
-            //toggle checked state
-            node.selected = node.selected === true ? false : true;
-        };
-
-        $scope.closeMiniListView = function () {
-            $scope.miniListView = undefined;
-        };
-
-        function openMiniListView(node) {
-            $scope.miniListView = node;
-        }
-
-    });
+//used for the media picker dialog
+angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController",
+    function ($scope, $q, entityResource, eventsService, $log, searchService, angularHelper, $timeout, localizationService, treeService, contentResource, mediaResource, memberResource) {
+
+        var tree = null;
+        var dialogOptions = $scope.model;
+        $scope.treeReady = false;
+        $scope.dialogTreeEventHandler = $({});
+        $scope.section = dialogOptions.section;
+        $scope.treeAlias = dialogOptions.treeAlias;
+        $scope.multiPicker = dialogOptions.multiPicker;
+        $scope.hideHeader = (typeof dialogOptions.hideHeader) === "boolean" ? dialogOptions.hideHeader : true;
+        // if you need to load a not initialized tree set this value to false - default is true
+        $scope.onlyInitialized = dialogOptions.onlyInitialized;
+        $scope.searchInfo = {
+            searchFromId: dialogOptions.startNodeId,
+            searchFromName: null,
+            showSearch: false,
+            ignoreUserStartNodes: dialogOptions.ignoreUserStartNodes,
+            results: [],
+            selectedSearchResults: []
+        }
+
+        $scope.model.selection = [];
+
+        //Used for toggling an empty-state message
+        //Some trees can have no items (dictionary & forms email templates)
+        $scope.hasItems = true;
+        $scope.emptyStateMessage = dialogOptions.emptyStateMessage;
+        var node = dialogOptions.currentNode;
+
+        //This is called from ng-init
+        //it turns out it is called from the angular html : / Have a look at views/common / overlays / contentpicker / contentpicker.html you'll see ng-init.
+        //this is probably an anti pattern IMO and shouldn't be used
+        $scope.init = function (contentType) {
+
+            if (contentType === "content") {
+                $scope.entityType = "Document";
+                if (!$scope.model.title) {
+                    $scope.model.title = localizationService.localize("defaultdialogs_selectContent");
+                }
+            } else if (contentType === "member") {
+                $scope.entityType = "Member";
+                if (!$scope.model.title) {
+                    $scope.model.title = localizationService.localize("defaultdialogs_selectMember");
+                }
+            } else if (contentType === "media") {
+                $scope.entityType = "Media";
+                if (!$scope.model.title) {
+                    $scope.model.title = localizationService.localize("defaultdialogs_selectMedia");
+                }
+            }
+        }
+
+        var searchText = "Search...";
+        localizationService.localize("general_search").then(function (value) {
+            searchText = value + "...";
+        });
+
+        // Allow the entity type to be passed in but defaults to Document for backwards compatibility.
+        $scope.entityType = dialogOptions.entityType ? dialogOptions.entityType : "Document";
+
+
+        //min / max values
+        if (dialogOptions.minNumber) {
+            dialogOptions.minNumber = parseInt(dialogOptions.minNumber, 10);
+        }
+        if (dialogOptions.maxNumber) {
+            dialogOptions.maxNumber = parseInt(dialogOptions.maxNumber, 10);
+        }
+
+        if (dialogOptions.section === "member") {
+            $scope.entityType = "Member";
+        }
+        else if (dialogOptions.section === "media") {
+            $scope.entityType = "Media";
+        }
+
+        // Search and listviews is only working for content, media and member section
+        var searchableSections = ["content", "media", "member"];
+
+        $scope.enableSearh = searchableSections.indexOf($scope.section) !== -1;
+
+        //if a alternative startnode is used, we need to check if it is a container
+        if ($scope.enableSearh && dialogOptions.startNodeId && dialogOptions.startNodeId !== -1 && dialogOptions.startNodeId !== "-1") {
+            entityResource.getById(dialogOptions.startNodeId, $scope.entityType).then(function(node) {
+                if (node.metaData.IsContainer) {
+                    openMiniListView(node);
+                }
+                initTree();
+            });
+        }
+        else {
+            initTree();
+        }
+
+        //Configures filtering
+        if (dialogOptions.filter) {
+
+            dialogOptions.filterExclude = false;
+            dialogOptions.filterAdvanced = false;
+
+            //used advanced filtering
+            if (angular.isFunction(dialogOptions.filter)) {
+                dialogOptions.filterAdvanced = true;
+            }
+            else if (angular.isObject(dialogOptions.filter)) {
+                dialogOptions.filterAdvanced = true;
+            }
+            else {
+                if (dialogOptions.filter.startsWith("!")) {
+                    dialogOptions.filterExclude = true;
+                    dialogOptions.filterTypes = dialogOptions.filter.substring(1);
+                } else {
+                    dialogOptions.filterExclude = false;
+                    dialogOptions.filterTypes = dialogOptions.filter;
+                }
+
+                //used advanced filtering
+                if (dialogOptions.filter.startsWith("{")) {
+                    dialogOptions.filterAdvanced = true;
+                    //convert to object
+                    dialogOptions.filter = angular.fromJson(dialogOptions.filter);
+                }
+            }
+
+            $scope.filter = {
+                filterAdvanced: dialogOptions.filterAdvanced,
+                filterExclude: dialogOptions.filterExclude,
+                filter: dialogOptions.filterTypes
+            };
+        }
+
+        function initTree() {
+            //create the custom query string param for this tree
+            var params = [];
+
+            if (dialogOptions.startNodeId)
+                params.push("startNodeId=" + dialogOptions.startNodeId);
+
+            if (dialogOptions.ignoreUserStartNodes)
+                params.push("ignoreUserStartNodes=" + dialogOptions.ignoreUserStartNodes);
+
+            if (dialogOptions.customTreeParams)
+                params.push(dialogOptions.customTreeParams);
+
+            $scope.customTreeParams = params.join('&');
+
+            $scope.treeReady = true;
+        }
+
+        function nodeExpandedHandler(ev, args) {
+
+            // open mini list view for list views
+            if (args.node.metaData.isContainer) {
+                openMiniListView(args.node);
+            }
+
+            if (angular.isArray(args.children)) {
+
+                //iterate children
+                _.each(args.children, function (child) {
+
+                    //now we need to look in the already selected search results and
+                    // toggle the check boxes for those ones that are listed
+                    var exists = _.find($scope.searchInfo.selectedSearchResults, function (selected) {
+                        return child.id == selected.id;
+                    });
+                    if (exists) {
+                        child.selected = true;
+                    }
+                });
+
+                //check filter
+                performFiltering(args.children);
+            }
+        }
+
+        //gets the tree object when it loads
+        function treeLoadedHandler(ev, args) {
+            //args.tree contains children (args.tree.root.children)
+            $scope.hasItems = args.tree.root.children.length > 0;
+
+            tree = args.tree;
+
+            var nodeHasPath = typeof node !== "undefined" && typeof node.path !== "undefined";
+            var startNodeNotDefined = typeof dialogOptions.startNodeId === "undefined" || dialogOptions.startNodeId === "" || dialogOptions.startNodeId === "-1";
+            if (startNodeNotDefined && nodeHasPath) {
+                $scope.dialogTreeEventHandler.syncTree({ path: node.path, activate: false });
+            }
+
+        }
+
+        //wires up selection
+        function nodeSelectHandler(ev, args) {
+            args.event.preventDefault();
+            args.event.stopPropagation();
+
+            if (args.node.metaData.isSearchResult) {
+                //check if the item selected was a search result from a list view
+
+                //unselect
+                select(args.node.name, args.node.id);
+
+                //remove it from the list view children
+                var listView = args.node.parent();
+                listView.children = _.reject(listView.children, function (child) {
+                    return child.id == args.node.id;
+                });
+
+                //remove it from the custom tracked search result list
+                $scope.searchInfo.selectedSearchResults = _.reject($scope.searchInfo.selectedSearchResults, function (i) {
+                    return i.id == args.node.id;
+                });
+            }
+            else {
+                eventsService.emit("dialogs.treePickerController.select", args);
+
+                if (args.node.filtered) {
+                    return;
+                }
+
+                //This is a tree node, so we don't have an entity to pass in, it will need to be looked up
+                //from the server in this method.
+                if ($scope.model.select) {
+                    $scope.model.select(args.node)
+                } else {
+                    select(args.node.name, args.node.id);
+                    //toggle checked state
+                    args.node.selected = args.node.selected === true ? false : true;
+                }
+
+            }
+        }
+
+        /** Method used for selecting a node */
+        function select(text, id, entity) {
+            //if we get the root, we just return a constructed entity, no need for server data
+            if (id < 0) {
+
+                var rootNode = {
+                    alias: null,
+                    icon: "icon-folder",
+                    id: id,
+                    name: text
+                };
+
+                if ($scope.multiPicker) {
+                    if (entity) {
+                        multiSelectItem(entity);
+                    } else {
+                        multiSelectItem(rootNode);
+                    }
+                }
+                else {
+                    $scope.model.selection.push(rootNode);
+                    $scope.model.submit($scope.model);
+                }
+            }
+            else {
+
+                if ($scope.multiPicker) {
+
+                    if (entity) {
+                        multiSelectItem(entity);
+                    } else {
+                        //otherwise we have to get it from the server
+                        entityResource.getById(id, $scope.entityType).then(function (ent) {
+                            multiSelectItem(ent);
+                        });
+                    }
+
+                }
+
+                else {
+
+                    $scope.hideSearch();
+
+                    //if an entity has been passed in, use it
+                    if (entity) {
+                        $scope.model.selection.push(entity);
+                        $scope.model.submit($scope.model);
+                    } else {
+                        //otherwise we have to get it from the server
+                        entityResource.getById(id, $scope.entityType).then(function (ent) {
+                            $scope.model.selection.push(ent);
+                            $scope.model.submit($scope.model);
+                        });
+                    }
+                }
+            }
+        }
+
+        function multiSelectItem(item) {
+
+            var found = false;
+            var foundIndex = 0;
+
+            if ($scope.model.selection.length > 0) {
+                for (i = 0; $scope.model.selection.length > i; i++) {
+                    var selectedItem = $scope.model.selection[i];
+                    if (selectedItem.id === item.id) {
+                        found = true;
+                        foundIndex = i;
+                    }
+                }
+            }
+
+            if (found) {
+                $scope.model.selection.splice(foundIndex, 1);
+            } else {
+                $scope.model.selection.push(item);
+            }
+
+        }
+
+        function performFiltering(nodes) {
+
+            if (!dialogOptions.filter) {
+                return;
+            }
+
+            //remove any list view search nodes from being filtered since these are special nodes that always must
+            // be allowed to be clicked on
+            nodes = _.filter(nodes, function (n) {
+                return !angular.isObject(n.metaData.listViewNode);
+            });
+
+            if (dialogOptions.filterAdvanced) {
+
+                //filter either based on a method or an object
+                var filtered = angular.isFunction(dialogOptions.filter)
+                    ? _.filter(nodes, dialogOptions.filter)
+                    : _.where(nodes, dialogOptions.filter);
+
+                angular.forEach(filtered, function (value, key) {
+                    value.filtered = true;
+                    if (dialogOptions.filterCssClass) {
+                        if (!value.cssClasses) {
+                            value.cssClasses = [];
+                        }
+                        value.cssClasses.push(dialogOptions.filterCssClass);
+                    }
+                });
+            } else {
+                var a = dialogOptions.filterTypes.toLowerCase().replace(/\s/g, '').split(',');
+                angular.forEach(nodes, function (value, key) {
+
+                    var found = a.indexOf(value.metaData.contentType.toLowerCase()) >= 0;
+
+                    if (!dialogOptions.filterExclude && !found || dialogOptions.filterExclude && found) {
+                        value.filtered = true;
+
+                        if (dialogOptions.filterCssClass) {
+                            if (!value.cssClasses) {
+                                value.cssClasses = [];
+                            }
+                            value.cssClasses.push(dialogOptions.filterCssClass);
+                        }
+                    }
+                });
+            }
+        }
+
+        $scope.multiSubmit = function (result) {
+            entityResource.getByIds(result, $scope.entityType).then(function (ents) {
+                $scope.submit(ents);
+            });
+        };
+
+        /** method to select a search result */
+        $scope.selectResult = function (evt, result) {
+
+            if (result.filtered) {
+                return;
+            }
+
+            result.selected = result.selected === true ? false : true;
+
+            //since result = an entity, we'll pass it in so we don't have to go back to the server
+            select(result.name, result.id, result);
+
+            //add/remove to our custom tracked list of selected search results
+            if (result.selected) {
+                $scope.searchInfo.selectedSearchResults.push(result);
+            }
+            else {
+                $scope.searchInfo.selectedSearchResults = _.reject($scope.searchInfo.selectedSearchResults, function (i) {
+                    return i.id == result.id;
+                });
+            }
+
+            //ensure the tree node in the tree is checked/unchecked if it already exists there
+            if (tree) {
+                var found = treeService.getDescendantNode(tree.root, result.id);
+                if (found) {
+                    found.selected = result.selected;
+                }
+            }
+
+        };
+
+        $scope.hideSearch = function () {
+
+            //Traverse the entire displayed tree and update each node to sync with the selected search results
+            if (tree) {
+
+                //we need to ensure that any currently displayed nodes that get selected
+                // from the search get updated to have a check box!
+                function checkChildren(children) {
+                    _.each(children, function (child) {
+                        //check if the id is in the selection, if so ensure it's flagged as selected
+                        var exists = _.find($scope.searchInfo.selectedSearchResults, function (selected) {
+                            return child.id == selected.id;
+                        });
+                        //if the curr node exists in selected search results, ensure it's checked
+                        if (exists) {
+                            child.selected = true;
+                        }
+                        //if the curr node does not exist in the selected search result, and the curr node is a child of a list view search result
+                        else if (child.metaData.isSearchResult) {
+                            //if this tree node is under a list view it means that the node was added
+                            // to the tree dynamically under the list view that was searched, so we actually want to remove
+                            // it all together from the tree
+                            var listView = child.parent();
+                            listView.children = _.reject(listView.children, function (c) {
+                                return c.id == child.id;
+                            });
+                        }
+
+                        //check if the current node is a list view and if so, check if there's any new results
+                        // that need to be added as child nodes to it based on search results selected
+                        if (child.metaData.isContainer) {
+
+                            child.cssClasses = _.reject(child.cssClasses, function (c) {
+                                return c === 'tree-node-slide-up-hide-active';
+                            });
+
+                            var listViewResults = _.filter($scope.searchInfo.selectedSearchResults, function (i) {
+                                return i.parentId == child.id;
+                            });
+                            _.each(listViewResults, function (item) {
+                                var childExists = _.find(child.children, function (c) {
+                                    return c.id == item.id;
+                                });
+                                if (!childExists) {
+                                    var parent = child;
+                                    child.children.unshift({
+                                        id: item.id,
+                                        name: item.name,
+                                        cssClass: "icon umb-tree-icon sprTree " + item.icon,
+                                        level: child.level + 1,
+                                        metaData: {
+                                            isSearchResult: true
+                                        },
+                                        hasChildren: false,
+                                        parent: function () {
+                                            return parent;
+                                        }
+                                    });
+                                }
+                            });
+                        }
+
+                        //recurse
+                        if (child.children && child.children.length > 0) {
+                            checkChildren(child.children);
+                        }
+                    });
+                }
+                checkChildren(tree.root.children);
+            }
+
+
+            $scope.searchInfo.showSearch = false;
+            $scope.searchInfo.searchFromId = dialogOptions.startNodeId;
+            $scope.searchInfo.searchFromName = null;
+            $scope.searchInfo.results = [];
+        }
+
+        $scope.onSearchResults = function (results) {
+
+            //filter all items - this will mark an item as filtered
+            performFiltering(results);
+
+            //now actually remove all filtered items so they are not even displayed
+            results = _.filter(results, function (item) {
+                return !item.filtered;
+            });
+
+            $scope.searchInfo.results = results;
+
+            //sync with the curr selected results
+            _.each($scope.searchInfo.results, function (result) {
+                var exists = _.find($scope.model.selection, function (selectedId) {
+                    return result.id == selectedId;
+                });
+                if (exists) {
+                    result.selected = true;
+                }
+            });
+
+            $scope.searchInfo.showSearch = true;
+        };
+
+        $scope.dialogTreeEventHandler.bind("treeLoaded", treeLoadedHandler);
+        $scope.dialogTreeEventHandler.bind("treeNodeExpanded", nodeExpandedHandler);
+        $scope.dialogTreeEventHandler.bind("treeNodeSelect", nodeSelectHandler);
+
+        $scope.$on('$destroy', function () {
+            $scope.dialogTreeEventHandler.unbind("treeLoaded", treeLoadedHandler);
+            $scope.dialogTreeEventHandler.unbind("treeNodeExpanded", nodeExpandedHandler);
+            $scope.dialogTreeEventHandler.unbind("treeNodeSelect", nodeSelectHandler);
+        });
+
+        $scope.selectListViewNode = function (node) {
+            select(node.name, node.id);
+            //toggle checked state
+            node.selected = node.selected === true ? false : true;
+        };
+
+        $scope.closeMiniListView = function () {
+            $scope.miniListView = undefined;
+        };
+
+        function openMiniListView(node) {
+            $scope.miniListView = node;
+        }
+
+    });
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html
index a3a5fd6107..c338e3402c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html
@@ -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>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
index ee8c193b4b..ce836a8d68 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
@@ -66,6 +66,7 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
         showOpenButton: false,
         showEditButton: false,
         showPathOnHover: false,
+        ignoreUserStartNodes: false,
         maxNumber: 1,
         minNumber : 0,
         startNode: {
@@ -99,7 +100,8 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
     $scope.model.config.showOpenButton = ($scope.model.config.showOpenButton === "1" ? true : false);
     $scope.model.config.showEditButton = ($scope.model.config.showEditButton === "1" ? true : false);
     $scope.model.config.showPathOnHover = ($scope.model.config.showPathOnHover === "1" ? true : false);
-    
+    $scope.model.config.ignoreUserStartNodes = ($scope.model.config.ignoreUserStartNodes === "1" ? true : false);
+  
     var entityType = $scope.model.config.startNode.type === "member"
         ? "Member"
         : $scope.model.config.startNode.type === "media"
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
index 21f9534848..a093ccb034 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
@@ -1,12 +1,20 @@
 angular.module("umbraco")
     .controller("Umbraco.PropertyEditors.Grid.MediaController",
     function ($scope, $rootScope, $timeout, userService) {
+        
+        var ignoreUserStartNodes = $scope.model.config.ignoreUserStartNodes === "1" ? true : false;
 
         if (!$scope.model.config.startNodeId) {
-            userService.getCurrentUser().then(function (userData) {
-                $scope.model.config.startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
-                $scope.model.config.startNodeIsVirtual = userData.startMediaIds.length !== 1;
-            });
+            if (ignoreUserStartNodes === true) {
+                $scope.model.config.startNodeId = -1;
+                $scope.model.config.startNodeIsVirtual = true;
+
+            } else {
+                userService.getCurrentUser().then(function (userData) {
+                    $scope.model.config.startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
+                    $scope.model.config.startNodeIsVirtual = userData.startMediaIds.length !== 1;
+                });
+            }
         }
 
         $scope.setImage = function(){
@@ -14,6 +22,7 @@ angular.module("umbraco")
             $scope.mediaPickerOverlay.view = "mediapicker";
             $scope.mediaPickerOverlay.startNodeId = $scope.model.config && $scope.model.config.startNodeId ? $scope.model.config.startNodeId : undefined;
             $scope.mediaPickerOverlay.startNodeIsVirtual = $scope.mediaPickerOverlay.startNodeId ? $scope.model.config.startNodeIsVirtual : undefined;
+            $scope.mediaPickerOverlay.ignoreUserStartNodes = ignoreUserStartNodes;
             $scope.mediaPickerOverlay.cropSize = $scope.control.editor.config && $scope.control.editor.config.size ? $scope.control.editor.config.size : undefined;
             $scope.mediaPickerOverlay.showDetails = true;
             $scope.mediaPickerOverlay.disableFolderSelect = true;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js
index 397438d5a0..cf81300b32 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js
@@ -16,6 +16,7 @@
                 view: "linkpicker",
                 currentTarget: currentTarget,
 				anchors: tinyMceService.getAnchorNames(JSON.stringify(editorState.current.properties)),
+                ignoreUserStartNodes: $scope.model.config.ignoreUserStartNodes === "1",
                 show: true,
                 submit: function(model) {
                     tinyMceService.insertLinkInEditor(editor, model.target, anchorElement);
@@ -26,11 +27,23 @@
         }
 
         function openMediaPicker(editor, currentTarget, userData) {
+            var ignoreUserStartNodes = false;
+            var startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
+            var startNodeIsVirtual = userData.startMediaIds.length !== 1;
+
+            if ($scope.model.config.ignoreUserStartNodes === "1") {
+                ignoreUserStartNodes = true;
+                startNodeId = -1;
+                startNodeIsVirtual = true;
+            }
+
             vm.mediaPickerOverlay = {
                 currentTarget: currentTarget,
                 onlyImages: true,
-                showDetails: true,
-                startNodeId: userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0],
+                showDetails: true,                
+                startNodeId: startNodeId,
+                startNodeIsVirtual: startNodeIsVirtual,
+                ignoreUserStartNodes: ignoreUserStartNodes,
                 view: "mediapicker",
                 show: true,
                 submit: function(model) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
index 7b8445a4dc..1f1305b0f0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
@@ -7,12 +7,19 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
         var multiPicker = $scope.model.config.multiPicker && $scope.model.config.multiPicker !== '0' ? true : false;
         var onlyImages = $scope.model.config.onlyImages && $scope.model.config.onlyImages !== '0' ? true : false;
         var disableFolderSelect = $scope.model.config.disableFolderSelect && $scope.model.config.disableFolderSelect !== '0' ? true : false;
+        var ignoreUserStartNodes = $scope.model.config.ignoreUserStartNodes === "1" ? true : false;
 
         if (!$scope.model.config.startNodeId) {
-            userService.getCurrentUser().then(function(userData) {
-                $scope.model.config.startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
-                $scope.model.config.startNodeIsVirtual = userData.startMediaIds.length !== 1;
-            });
+            if (ignoreUserStartNodes === true) {
+                $scope.model.config.startNodeId = -1;
+                $scope.model.config.startNodeIsVirtual = true;
+
+            } else {
+                userService.getCurrentUser().then(function (userData) {
+                    $scope.model.config.startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
+                    $scope.model.config.startNodeIsVirtual = userData.startMediaIds.length !== 1;
+                });
+            }          
         }
 
         function setupViewModel() {
@@ -105,6 +112,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
                title: "Select media",
                startNodeId: $scope.model.config.startNodeId,
                startNodeIsVirtual: $scope.model.config.startNodeIsVirtual,
+               ignoreUserStartNodes: ignoreUserStartNodes,
                multiPicker: multiPicker,
                onlyImages: onlyImages,
                disableFolderSelect: disableFolderSelect,
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
index e4f2ae303f..c7e67a0a42 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
@@ -67,10 +67,11 @@ function multiUrlPickerController($scope, angularHelper, localizationService, en
             url: link.url,
             target: link.target
         } : null;
-
+        
         $scope.linkPickerOverlay = {
             view: "linkpicker",
             currentTarget: target,
+            ignoreUserStartNodes: $scope.model.config.ignoreUserStartNodes === "1",
             show: true,
             submit: function (model) {
                 if (model.target.url || model.target.anchor) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
index 142298e0d8..6047169c54 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
@@ -25,6 +25,7 @@
                $scope.contentPickerOverlay.view = "contentpicker";
                $scope.contentPickerOverlay.multiPicker = false;
                $scope.contentPickerOverlay.show = true;
+               $scope.contentPickerOverlay.ignoreUserStartNodes = $scope.model.config.ignoreUserStartNodes === "1" ? true:  false;
                $scope.contentPickerOverlay.idType = $scope.model.config.idType ? $scope.model.config.idType : "int";
 
                $scope.contentPickerOverlay.submit = function(model) {
@@ -50,6 +51,7 @@
                $scope.contentPickerOverlay.view = "contentpicker";
                $scope.contentPickerOverlay.multiPicker = false;
                $scope.contentPickerOverlay.show = true;
+               $scope.contentPickerOverlay.ignoreUserStartNodes = $scope.model.config.ignoreUserStartNodes === "1" ? true : false;
                $scope.contentPickerOverlay.idType = $scope.model.config.idType ? $scope.model.config.idType : "int";
 
                $scope.contentPickerOverlay.submit = function(model) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
index 1fc648083e..f8dea2ee8b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
@@ -274,6 +274,7 @@ angular.module("umbraco")
                             view: "linkpicker",
                             currentTarget: currentTarget,
 							              anchors: editorState.current ? tinyMceService.getAnchorNames(JSON.stringify(editorState.current.properties)) : [],
+                            ignoreUserStartNodes: $scope.model.config.ignoreUserStartNodes === "1",
                             show: true,
                             submit: function(model) {
                                 tinyMceService.insertLinkInEditor(editor, model.target, anchorElement);
@@ -285,14 +286,24 @@ angular.module("umbraco")
 
                     //Create the insert media plugin
                     tinyMceService.createMediaPicker(editor, $scope, function(currentTarget, userData){
+                        var ignoreUserStartNodes = false;
+                        var startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
+                        var startNodeIsVirtual = userData.startMediaIds.length !== 1;
+
+                        if ($scope.model.config.ignoreUserStartNodes === "1") {
+                            ignoreUserStartNodes = true;
+                            startNodeId = -1;
+                            startNodeIsVirtual = true;
+                        }
 
                         $scope.mediaPickerOverlay = {
                             currentTarget: currentTarget,
                             onlyImages: true,
                             showDetails: true,
                             disableFolderSelect: true,
-                            startNodeId: userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0],
-                            startNodeIsVirtual: userData.startMediaIds.length !== 1,
+                            startNodeId: startNodeId,
+                            startNodeIsVirtual: startNodeIsVirtual,
+                            ignoreUserStartNodes: ignoreUserStartNodes,
                             view: "mediapicker",
                             show: true,
                             submit: function(model) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html
index b9d63df9f3..9d7ff0cf40 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html
@@ -40,4 +40,5 @@
             <input type="number" min="0" ng-model="model.value.maxImageSize" class="umb-editor-tiny" placeholder="Width/Height" /> Pixels
         </div> 
     </umb-control-group>
+
 </div>
\ No newline at end of file
diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs
index beff2c2615..b8d9c8bcb6 100644
--- a/src/Umbraco.Web/Editors/ContentController.cs
+++ b/src/Umbraco.Web/Editors/ContentController.cs
@@ -262,10 +262,11 @@ namespace Umbraco.Web.Editors
         /// Gets the content json for the content id
         /// </summary>
         /// <param name="id"></param>
+        /// <param name="ignoreUserStartNodes">If set to true, user and group start node permissions will be ignored.</param>
         /// <returns></returns>
         [OutgoingEditorModelEvent]
         [EnsureUserPermissionForContent("id")]
-        public ContentItemDisplay GetById(int id)
+        public ContentItemDisplay GetById(int id, [FromUri]bool ignoreUserStartNodes = false)
         {
             var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
             if (foundContent == null)
@@ -1116,6 +1117,7 @@ namespace Umbraco.Web.Editors
         /// <param name="nodeId">The content to lookup, if the contentItem is not specified</param>
         /// <param name="permissionsToCheck"></param>
         /// <param name="contentItem">Specifies the already resolved content item to check against</param>
+        /// <param name="ignoreUserStartNodes">If set to true, user and group start node permissions will be ignored.</param>
         /// <returns></returns>
         internal static bool CheckPermissions(
                 IDictionary<string, object> storage,
@@ -1125,7 +1127,8 @@ namespace Umbraco.Web.Editors
                 IEntityService entityService,
                 int nodeId,
                 char[] permissionsToCheck = null,
-                IContent contentItem = null)
+                IContent contentItem = null,
+                bool ignoreUserStartNodes = false)
         {
             if (storage == null) throw new ArgumentNullException("storage");
             if (user == null) throw new ArgumentNullException("user");
@@ -1146,6 +1149,11 @@ namespace Umbraco.Web.Editors
                 throw new HttpResponseException(HttpStatusCode.NotFound);
             }
 
+            if(ignoreUserStartNodes)
+            {
+                return true;
+            }
+
             var hasPathAccess = (nodeId == Constants.System.Root)
                 ? user.HasContentRootAccess(entityService)
                 : (nodeId == Constants.System.RecycleBinContent)
diff --git a/src/Umbraco.Web/Editors/EntityController.cs b/src/Umbraco.Web/Editors/EntityController.cs
index 8bde435ef6..a3f76db4f2 100644
--- a/src/Umbraco.Web/Editors/EntityController.cs
+++ b/src/Umbraco.Web/Editors/EntityController.cs
@@ -83,8 +83,25 @@ namespace Umbraco.Web.Editors
         /// A starting point for the search, generally a node id, but for members this is a member type alias
         /// </param>
         /// <returns></returns>
+        [Obsolete("This method is obsolete, use the overload with ignoreUserStartNodes instead", false)]
         [HttpGet]
         public IEnumerable<EntityBasic> Search(string query, UmbracoEntityTypes type, string searchFrom = null)
+        {
+            return Search(query, type, false, searchFrom);
+        }
+        
+        /// <summary>
+        /// Searches for results based on the entity type
+        /// </summary>
+        /// <param name="query"></param>
+        /// <param name="type"></param>
+        /// <param name="searchFrom">
+        /// A starting point for the search, generally a node id, but for members this is a member type alias
+        /// </param>
+        /// <param name="ignoreUserStartNodes">If set to true, user and group start node permissions will be ignored.</param>
+        /// <returns></returns>
+        [HttpGet]
+        public IEnumerable<EntityBasic> Search(string query, UmbracoEntityTypes type, bool? ignoreUserStartNodes, string searchFrom = null)
         {
             //TODO: Should we restrict search results based on what app the user has access to?
             // - Theoretically you shouldn't be able to see member data if you don't have access to members right?
@@ -92,7 +109,7 @@ namespace Umbraco.Web.Editors
             if (string.IsNullOrEmpty(query))
                 return Enumerable.Empty<EntityBasic>();
 
-            return ExamineSearch(query, type, searchFrom);
+            return ExamineSearch(query, type, searchFrom, ignoreUserStartNodes != null && ignoreUserStartNodes.Value);
         }
 
         /// <summary>
@@ -527,6 +544,7 @@ namespace Umbraco.Web.Editors
             }
         }
 
+        [Obsolete("This method is obsolete, use the overload with ignoreUserStartNodes instead", false)]
         public PagedResult<EntityBasic> GetPagedDescendants(
             int id,
             UmbracoEntityTypes type,
@@ -535,6 +553,20 @@ namespace Umbraco.Web.Editors
             string orderBy = "SortOrder",
             Direction orderDirection = Direction.Ascending,
             string filter = "")
+        {
+            return GetPagedDescendants(id, type, pageNumber, pageSize,
+                false, orderBy, orderDirection, filter);
+        }
+
+        public PagedResult<EntityBasic> GetPagedDescendants(
+            int id,
+            UmbracoEntityTypes type,
+            int pageNumber,
+            int pageSize,
+            bool ignoreUserStartNodes,
+            string orderBy = "SortOrder",
+            Direction orderDirection = Direction.Ascending,
+            string filter = "")
         {
             if (pageNumber <= 0)
                 throw new HttpResponseException(HttpStatusCode.NotFound);
@@ -562,7 +594,7 @@ namespace Umbraco.Web.Editors
                             break;
                     }
 
-                    entities = aids == null || aids.Contains(Constants.System.Root)
+                    entities = aids == null || aids.Contains(Constants.System.Root) || ignoreUserStartNodes
                         ? Services.EntityService.GetPagedDescendantsFromRoot(objectType.Value, pageNumber - 1, pageSize, out totalRecords, orderBy, orderDirection, filter, includeTrashed: false)
                         : Services.EntityService.GetPagedDescendants(aids, objectType.Value, pageNumber - 1, pageSize, out totalRecords, orderBy, orderDirection, filter);
                 }
@@ -598,9 +630,15 @@ namespace Umbraco.Web.Editors
             }
         }
 
+        [Obsolete("This method is obsolete, use the overload with ignoreUserStartNodes instead", false)]
         public IEnumerable<EntityBasic> GetAncestors(int id, UmbracoEntityTypes type)
         {
-            return GetResultForAncestors(id, type);
+            return GetResultForAncestors(id, type, false);
+        }
+
+        public IEnumerable<EntityBasic> GetAncestors(int id, UmbracoEntityTypes type, bool ignoreUserStartNodes)
+        {
+            return GetResultForAncestors(id, type, ignoreUserStartNodes);
         }
 
         public IEnumerable<EntityBasic> GetAll(UmbracoEntityTypes type, string postFilter, [FromUri]IDictionary<string, object> postFilterParams)
@@ -614,11 +652,12 @@ namespace Umbraco.Web.Editors
         /// <param name="query"></param>
         /// <param name="entityType"></param>
         /// <param name="searchFrom"></param>
+        /// <param name="ignoreUserStartNodes">If set to true, user and group start node permissions will be ignored.</param>
         /// <returns></returns>
-        private IEnumerable<SearchResultItem> ExamineSearch(string query, UmbracoEntityTypes entityType, string searchFrom = null)
+        private IEnumerable<SearchResultItem> ExamineSearch(string query, UmbracoEntityTypes entityType, string searchFrom = null, bool ignoreUserStartNodes = false)
         {
             long total;
-            return _treeSearcher.ExamineSearch(Umbraco, query, entityType, 200, 0, out total, searchFrom);
+            return _treeSearcher.ExamineSearch(Umbraco, query, entityType, 200, 0, out total, ignoreUserStartNodes, searchFrom);
         }
         
 
@@ -645,7 +684,7 @@ namespace Umbraco.Web.Editors
             }
         }
 
-        private IEnumerable<EntityBasic> GetResultForAncestors(int id, UmbracoEntityTypes entityType)
+        private IEnumerable<EntityBasic> GetResultForAncestors(int id, UmbracoEntityTypes entityType, bool ignoreUserStartNodes = false)
         {
             var objectType = ConvertToObjectType(entityType);
             if (objectType.HasValue)
@@ -654,35 +693,38 @@ namespace Umbraco.Web.Editors
 
                 var ids = Services.EntityService.Get(id).Path.Split(',').Select(int.Parse).Distinct().ToArray();
 
-                int[] aids = null;
-                switch (entityType)
+                if (ignoreUserStartNodes == false)
                 {
-                    case UmbracoEntityTypes.Document:
-                        aids = Security.CurrentUser.CalculateContentStartNodeIds(Services.EntityService);
-                        break;
-                    case UmbracoEntityTypes.Media:
-                        aids = Security.CurrentUser.CalculateMediaStartNodeIds(Services.EntityService);
-                        break;
-                }
-
-                if (aids != null)
-                {
-                    var lids = new List<int>();
-                    var ok = false;
-                    foreach (var i in ids)
+                    int[] aids = null;
+                    switch (entityType)
                     {
-                        if (ok)
-                        {
-                            lids.Add(i);
-                            continue;
-                        }
-                        if (aids.Contains(i))
-                        {
-                            lids.Add(i);
-                            ok = true;
-                        }
+                        case UmbracoEntityTypes.Document:
+                            aids = Security.CurrentUser.CalculateContentStartNodeIds(Services.EntityService);
+                            break;
+                        case UmbracoEntityTypes.Media:
+                            aids = Security.CurrentUser.CalculateMediaStartNodeIds(Services.EntityService);
+                            break;
+                    }
+
+                    if (aids != null)
+                    {
+                        var lids = new List<int>();
+                        var ok = false;
+                        foreach (var i in ids)
+                        {
+                            if (ok)
+                            {
+                                lids.Add(i);
+                                continue;
+                            }
+                            if (aids.Contains(i))
+                            {
+                                lids.Add(i);
+                                ok = true;
+                            }
+                        }
+                        ids = lids.ToArray();
                     }
-                    ids = lids.ToArray();
                 }
 
                 return ids.Length == 0
diff --git a/src/Umbraco.Web/Editors/MediaController.cs b/src/Umbraco.Web/Editors/MediaController.cs
index d411bf2197..6c0c293572 100644
--- a/src/Umbraco.Web/Editors/MediaController.cs
+++ b/src/Umbraco.Web/Editors/MediaController.cs
@@ -264,11 +264,12 @@ namespace Umbraco.Web.Editors
             string orderBy = "SortOrder",
             Direction orderDirection = Direction.Ascending,
             bool orderBySystemField = true,
-            string filter = "")
+            string filter = "",
+            bool ignoreUserStartNodes = false)
         {
             //if a request is made for the root node data but the user's start node is not the default, then
             // we need to return their start nodes
-            if (id == Constants.System.Root && UserStartNodes.Length > 0 && UserStartNodes.Contains(Constants.System.Root) == false)
+            if (id == Constants.System.Root && UserStartNodes.Length > 0 && (UserStartNodes.Contains(Constants.System.Root) == false && ignoreUserStartNodes == false))
             {
                 if (pageNumber > 0)
                     return new PagedResult<ContentItemBasic<ContentPropertyBasic, IMedia>>(0, 0, 0);
@@ -346,6 +347,7 @@ namespace Umbraco.Web.Editors
         /// <param name="orderDirection"></param>
         /// <param name="orderBySystemField"></param>
         /// <param name="filter"></param>
+        /// <param name="ignoreUserStartNodes">If set to true, user and group start node permissions will be ignored.</param>
         /// <returns></returns>
         [FilterAllowedOutgoingMedia(typeof(IEnumerable<ContentItemBasic<ContentPropertyBasic, IMedia>>), "Items")]
         public PagedResult<ContentItemBasic<ContentPropertyBasic, IMedia>> GetChildren(Guid id,
@@ -360,7 +362,7 @@ namespace Umbraco.Web.Editors
             var entity = Services.EntityService.GetByKey(id);
             if (entity != null)
             {
-                return GetChildren(entity.Id, pageNumber, pageSize, orderBy, orderDirection, orderBySystemField, filter);
+                return GetChildren(entity.Id, pageNumber, pageSize, orderBy, orderDirection, orderBySystemField, filter, ignoreUserStartNodes);
             }
             throw new HttpResponseException(HttpStatusCode.NotFound);
         }
@@ -400,6 +402,7 @@ namespace Umbraco.Web.Editors
         /// <param name="orderDirection"></param>
         /// <param name="orderBySystemField"></param>
         /// <param name="filter"></param>
+        /// <param name="ignoreUserStartNodes">If set to true, user and group start node permissions will be ignored.</param>
         /// <returns></returns>
         [FilterAllowedOutgoingMedia(typeof(IEnumerable<ContentItemBasic<ContentPropertyBasic, IMedia>>), "Items")]
         public PagedResult<ContentItemBasic<ContentPropertyBasic, IMedia>> GetChildren(Udi id,
@@ -417,7 +420,7 @@ namespace Umbraco.Web.Editors
                 var entity = Services.EntityService.GetByKey(guidUdi.Guid);
                 if (entity != null)
                 {
-                    return GetChildren(entity.Id, pageNumber, pageSize, orderBy, orderDirection, orderBySystemField, filter);
+                    return GetChildren(entity.Id, pageNumber, pageSize, orderBy, orderDirection, orderBySystemField, filter, ignoreUserStartNodes);
                 }
             }
 
@@ -433,7 +436,8 @@ namespace Umbraco.Web.Editors
            string orderBy = "SortOrder",
            Direction orderDirection = Direction.Ascending,
            bool orderBySystemField = true,
-           string filter = "")
+           string filter = "",
+           bool ignoreUserStartNodes = false)
         {
             foreach (var type in new[] { typeof(int), typeof(Guid) })
             {
diff --git a/src/Umbraco.Web/PropertyEditors/ContentPicker2PropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/ContentPicker2PropertyEditor.cs
index 5b99264113..0039385e5f 100644
--- a/src/Umbraco.Web/PropertyEditors/ContentPicker2PropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/ContentPicker2PropertyEditor.cs
@@ -15,10 +15,11 @@ namespace Umbraco.Web.PropertyEditors
         {
             InternalPreValues = new Dictionary<string, object>
             {
-                {"startNodeId", "-1"},
+                {"startNodeId", "-1"},                
                 {"showOpenButton", "0"},
                 {"showEditButton", "0"},
                 {"showPathOnHover", "0"},
+                {"ignoreUserStartNodes", "0"},
                 {"idType", "udi"}
             };
         }
@@ -39,7 +40,7 @@ namespace Umbraco.Web.PropertyEditors
         {
             public ContentPickerPreValueEditor()
             {
-                //create the fields
+                //create the fields                
                 Fields.Add(new PreValueField()
                 {                    
                     Key = "showOpenButton",
@@ -48,6 +49,13 @@ namespace Umbraco.Web.PropertyEditors
                     Description = "Opens the node in a dialog"
                 });
                 Fields.Add(new PreValueField()
+                {
+                    Key = "ignoreUserStartNodes",
+                    View = "boolean",
+                    Name = "Ignore user start nodes",
+                    Description = "Selecting this option allows a user to choose nodes that they normally don't have access to."
+                });
+                Fields.Add(new PreValueField()
                 {
                     Key = "startNodeId",
                     View = "treepicker",
@@ -60,4 +68,4 @@ namespace Umbraco.Web.PropertyEditors
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
index af30b4ceeb..4a8803a099 100644
--- a/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
@@ -136,6 +136,9 @@ namespace Umbraco.Web.PropertyEditors
 
             [PreValueField("rte", "Rich text editor", "views/propertyeditors/rte/rte.prevalues.html", Description = "Rich text editor configuration")]
             public string Rte { get; set; }
+
+            [PreValueField("ignoreUserStartNodes", "Ignore user start nodes", "boolean", Description = "Selecting this option allows a user to choose nodes that they normally don't have access to.")]
+            public bool IgnoreUserStartNodes { get; set; }
         }
 
         #region Application event handler, used to bind to events on startup
diff --git a/src/Umbraco.Web/PropertyEditors/MediaPicker2PropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/MediaPicker2PropertyEditor.cs
index 2d9ee68b3b..6aa7ab4a54 100644
--- a/src/Umbraco.Web/PropertyEditors/MediaPicker2PropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MediaPicker2PropertyEditor.cs
@@ -57,6 +57,13 @@ namespace Umbraco.Web.PropertyEditors
                     Description = "Do not allow folders to be picked."
                 });
                 Fields.Add(new PreValueField()
+                {
+                    Key = "ignoreUserStartNodes",
+                    View = "boolean",
+                    Name = "Ignore user start nodes",
+                    Description = "Selecting this option allows a user to choose nodes that they normally don't have access to."
+                });
+                Fields.Add(new PreValueField()
                 {
                     Key = "startNodeId",
                     View = "mediapicker",
@@ -69,4 +76,4 @@ namespace Umbraco.Web.PropertyEditors
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web/PropertyEditors/MultiNodeTreePicker2PropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/MultiNodeTreePicker2PropertyEditor.cs
index f43ecd48be..f57a9951b6 100644
--- a/src/Umbraco.Web/PropertyEditors/MultiNodeTreePicker2PropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MultiNodeTreePicker2PropertyEditor.cs
@@ -16,6 +16,7 @@ namespace Umbraco.Web.PropertyEditors
                 {"showOpenButton", "0"},
                 {"showEditButton", "0"},
                 {"showPathOnHover", "0"},
+                {"ignoreUserStartNodes", "0"},
                 {"idType", "udi"}
             };
         }
@@ -38,6 +39,13 @@ namespace Umbraco.Web.PropertyEditors
             {
                 //create the fields
                 Fields.Add(new PreValueField()
+                {
+                    Key = "ignoreUserStartNodes",
+                    View = "boolean",
+                    Name = "Ignore user start nodes",
+                    Description = "Selecting this option allows a user to choose nodes that they normally don't have access to."
+                });
+                Fields.Add(new PreValueField()
                 {
                     Key = "startNode",
                     View = "treesource",
@@ -118,4 +126,4 @@ namespace Umbraco.Web.PropertyEditors
 
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs
index a058a16b8a..f3ae317efa 100644
--- a/src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs
@@ -32,6 +32,13 @@ namespace Umbraco.Web.PropertyEditors
         {
             public MultiUrlPickerPreValueEditor()
             {
+                Fields.Add(new PreValueField()
+                {
+                    Key = "ignoreUserStartNodes",
+                    View = "boolean",
+                    Name = "Ignore user start nodes",
+                    Description = "Selecting this option allows a user to choose nodes that they normally don't have access to."
+                });
                 Fields.Add(new PreValueField
                 {
                     Key = "minNumber",
diff --git a/src/Umbraco.Web/PropertyEditors/RelatedLinks2PropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/RelatedLinks2PropertyEditor.cs
index 541dccaa4e..a96c0724ff 100644
--- a/src/Umbraco.Web/PropertyEditors/RelatedLinks2PropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/RelatedLinks2PropertyEditor.cs
@@ -14,6 +14,7 @@ namespace Umbraco.Web.PropertyEditors
         {
             InternalPreValues = new Dictionary<string, object>
             {
+                {"ignoreUserStartNodes", "0"},
                 {"idType", "udi"}
             };
         }
@@ -32,8 +33,11 @@ namespace Umbraco.Web.PropertyEditors
 
         internal class RelatedLinksPreValueEditor : PreValueEditor
         {
+            [PreValueField("ignoreUserStartNodes", "Ignore user start nodes", "boolean", Description = "Selecting this option allows a user to choose nodes that they normally don't have access to.")]
+            public bool IgnoreUserStartNodes { get; set; }
+
             [PreValueField("max", "Maximum number of links", "number", Description = "Enter the maximum amount of links to be added, enter 0 for unlimited")]
-            public int Maximum { get; set; }
+            public int Maximum { get; set; }            
         }
     }
 }
diff --git a/src/Umbraco.Web/PropertyEditors/RichTextPreValueEditor.cs b/src/Umbraco.Web/PropertyEditors/RichTextPreValueEditor.cs
index cd08a8ad45..69445bc304 100644
--- a/src/Umbraco.Web/PropertyEditors/RichTextPreValueEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/RichTextPreValueEditor.cs
@@ -23,6 +23,14 @@ namespace Umbraco.Web.PropertyEditors
                 Key = "editor"
             });
 
+            Fields.Add(new PreValueField()
+            {
+                Key = "ignoreUserStartNodes",
+                View = "boolean",
+                Name = "Ignore user start nodes",
+                Description = "Selecting this option allows a user to choose nodes that they normally don't have access to."
+            });
+
             Fields.Add(new PreValueField()
             {
                 Name = "Hide Label",
diff --git a/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs b/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
index 38347de9ed..8845e9c323 100644
--- a/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
+++ b/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
@@ -16,6 +16,7 @@ namespace Umbraco.Web.Search
     internal class UmbracoTreeSearcher
     {
         /// <summary>
+        /// This method is obsolete, use the overload with ignoreUserStartNodes instead
         /// Searches for results based on the entity type
         /// </summary>
         /// <param name="umbracoHelper"></param>
@@ -28,12 +29,37 @@ namespace Umbraco.Web.Search
         /// <param name="pageSize"></param>
         /// <param name="pageIndex"></param>
         /// <returns></returns>
+        [Obsolete("This method is obsolete, use the overload with ignoreUserStartNodes instead", false)]
         public IEnumerable<SearchResultItem> ExamineSearch(
             UmbracoHelper umbracoHelper,
             string query,
             UmbracoEntityTypes entityType,
             int pageSize,
             long pageIndex, out long totalFound, string searchFrom = null)
+        {
+            return ExamineSearch(umbracoHelper, query, entityType, pageSize, pageIndex, out totalFound, false, searchFrom);
+        }
+
+        /// <summary>
+        /// Searches for results based on the entity type
+        /// </summary>
+        /// <param name="umbracoHelper"></param>
+        /// <param name="query"></param>
+        /// <param name="entityType"></param>
+        /// <param name="totalFound"></param>
+        /// <param name="searchFrom">
+        /// A starting point for the search, generally a node id, but for members this is a member type alias
+        /// </param>
+        /// <param name="pageSize"></param>
+        /// <param name="pageIndex"></param>
+        /// <param name="ignoreUserStartNodes">If set to true, user and group start node permissions will be ignored.</param>
+        /// <returns></returns>
+        public IEnumerable<SearchResultItem> ExamineSearch(
+        UmbracoHelper umbracoHelper,
+        string query,
+        UmbracoEntityTypes entityType,
+        int pageSize,
+        long pageIndex, out long totalFound, bool ignoreUserStartNodes, string searchFrom = null)
         {
             var sb = new StringBuilder();
 
@@ -61,12 +87,12 @@ namespace Umbraco.Web.Search
                 case UmbracoEntityTypes.Media:
                     type = "media";
                     var allMediaStartNodes = umbracoContext.Security.CurrentUser.CalculateMediaStartNodeIds(appContext.Services.EntityService);
-                    AppendPath(sb, UmbracoObjectTypes.Media,  allMediaStartNodes, searchFrom, appContext.Services.EntityService);
+                    AppendPath(sb, UmbracoObjectTypes.Media, allMediaStartNodes, searchFrom, ignoreUserStartNodes, appContext.Services.EntityService);
                     break;
                 case UmbracoEntityTypes.Document:
                     type = "content";
                     var allContentStartNodes = umbracoContext.Security.CurrentUser.CalculateContentStartNodeIds(appContext.Services.EntityService);
-                    AppendPath(sb, UmbracoObjectTypes.Document, allContentStartNodes, searchFrom, appContext.Services.EntityService);
+                    AppendPath(sb, UmbracoObjectTypes.Document, allContentStartNodes, searchFrom, ignoreUserStartNodes, appContext.Services.EntityService);
                     break;
                 default:
                     throw new NotSupportedException("The " + typeof(UmbracoTreeSearcher) + " currently does not support searching against object type " + entityType);
@@ -203,7 +229,7 @@ namespace Umbraco.Web.Search
             }
         }
 
-        private void AppendPath(StringBuilder sb, UmbracoObjectTypes objectType, int[] startNodeIds, string searchFrom, IEntityService entityService)
+        private void AppendPath(StringBuilder sb, UmbracoObjectTypes objectType, int[] startNodeIds, string searchFrom, bool ignoreUserStartNodes, IEntityService entityService)
         {
             if (sb == null) throw new ArgumentNullException("sb");
             if (entityService == null) throw new ArgumentNullException("entityService");
@@ -228,7 +254,7 @@ namespace Umbraco.Web.Search
                 // make sure we don't find anything
                 sb.Append("+__Path:none ");
             }
-            else if (startNodeIds.Contains(-1) == false) // -1 = no restriction
+            else if (startNodeIds.Contains(-1) == false && ignoreUserStartNodes == false) // -1 = no restriction
             {
                 var entityPaths = entityService.GetAllPaths(objectType, startNodeIds);
 
diff --git a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
index af38e21546..2624c89b56 100644
--- a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
+++ b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
@@ -69,7 +69,7 @@ namespace Umbraco.Web.Trees
         {
             var node = base.CreateRootNode(queryStrings);
 
-            if (IsDialog(queryStrings) && UserStartNodes.Contains(Constants.System.Root) == false)
+            if (IsDialog(queryStrings) && UserStartNodes.Contains(Constants.System.Root) == false && IgnoreUserStartNodes(queryStrings) == false)
             {
                 node.AdditionalData["noAccess"] = true;
             }
@@ -91,7 +91,7 @@ namespace Umbraco.Web.Trees
         {
             bool hasPathAccess;
             var entityIsAncestorOfStartNodes = Security.CurrentUser.IsInBranchOfStartNode(e, Services.EntityService, RecycleBinId, out hasPathAccess);
-            if (entityIsAncestorOfStartNodes == false)
+            if (IgnoreUserStartNodes(queryStrings) == false && entityIsAncestorOfStartNodes == false)
                 return null;
 
             var treeNode = GetSingleTreeNode(e, parentId, queryStrings);
@@ -101,7 +101,7 @@ namespace Umbraco.Web.Trees
                 //the node so we need to return null;
                 return null;
             }
-            if (hasPathAccess == false)
+            if (IgnoreUserStartNodes(queryStrings) == false && hasPathAccess == false)
             {
                 treeNode.AdditionalData["noAccess"] = true;
             }
@@ -141,7 +141,7 @@ namespace Umbraco.Web.Trees
 
                 // ensure that the user has access to that node, otherwise return the empty tree nodes collection
                 // TODO: in the future we could return a validation statement so we can have some UI to notify the user they don't have access
-                if (HasPathAccess(id, queryStrings) == false)
+                if (IgnoreUserStartNodes(queryStrings) == false && HasPathAccess(id, queryStrings) == false)
                 {
                     LogHelper.Warn<ContentTreeControllerBase>("User " + Security.CurrentUser.Username + " does not have access to node with id " + id);
                     return nodes;
@@ -158,7 +158,7 @@ namespace Umbraco.Web.Trees
 
             // get child entities - if id is root, but user's start nodes do not contain the
             // root node, this returns the start nodes instead of root's children
-            var entities = GetChildEntities(id).ToList();
+            var entities = GetChildEntities(id, queryStrings).ToList();
             nodes.AddRange(entities.Select(x => GetSingleTreeNodeWithAccessCheck(x, id, queryStrings)).Where(x => x != null));
 
             // if the user does not have access to the root node, what we have is the start nodes,
@@ -190,7 +190,7 @@ namespace Umbraco.Web.Trees
 
         protected abstract UmbracoObjectTypes UmbracoObjectType { get; }
 
-        protected IEnumerable<IUmbracoEntity> GetChildEntities(string id)
+        protected IEnumerable<IUmbracoEntity> GetChildEntities(string id, FormDataCollection queryStrings)
         {
             // try to parse id as an integer else use GetEntityFromId
             // which will grok Guids, Udis, etc and let use obtain the id
diff --git a/src/Umbraco.Web/Trees/TreeControllerBase.cs b/src/Umbraco.Web/Trees/TreeControllerBase.cs
index 98eb2ec8bc..2ea41ff128 100644
--- a/src/Umbraco.Web/Trees/TreeControllerBase.cs
+++ b/src/Umbraco.Web/Trees/TreeControllerBase.cs
@@ -349,6 +349,16 @@ namespace Umbraco.Web.Trees
             return queryStrings.GetValue<bool>(TreeQueryStringParameters.IsDialog);
         }
 
+        /// <summary>
+        /// If the request should allows a user to choose nodes that they normally don't have access to
+        /// </summary>
+        /// <param name="queryStrings"></param>
+        /// <returns></returns>
+        protected bool IgnoreUserStartNodes(FormDataCollection queryStrings)
+        {
+            return queryStrings.GetValue<bool>(TreeQueryStringParameters.IgnoreUserStartNodes);
+        }
+
         /// <summary>
         /// An event that allows developers to modify the tree node collection that is being rendered
         /// </summary>
diff --git a/src/Umbraco.Web/Trees/TreeQueryStringParameters.cs b/src/Umbraco.Web/Trees/TreeQueryStringParameters.cs
index 7f6fa28187..c79b9f8781 100644
--- a/src/Umbraco.Web/Trees/TreeQueryStringParameters.cs
+++ b/src/Umbraco.Web/Trees/TreeQueryStringParameters.cs
@@ -8,7 +8,8 @@
         public const string IsDialog = "isDialog";
         public const string Application = "application";
         public const string StartNodeId = "startNodeId";
+        public const string IgnoreUserStartNodes = "ignoreUserStartNodes";        
         //public const string OnNodeClick = "OnNodeClick";
         //public const string RenderParent = "RenderParent";
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs b/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
index 18880b9f96..64fe9a4b65 100644
--- a/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
+++ b/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
@@ -52,7 +52,7 @@ namespace Umbraco.Web.WebApi.Filters
 
             _paramName = paramName;
             _permissionToCheck = ActionBrowse.Instance.Letter;
-        }
+        }
 
         public EnsureUserPermissionForContentAttribute(string paramName, char permissionToCheck)
             : this(paramName)
@@ -72,6 +72,9 @@ namespace Umbraco.Web.WebApi.Filters
                 //not logged in
                 throw new HttpResponseException(System.Net.HttpStatusCode.Unauthorized);
             }
+            
+            var ignoreUserStartNodes = actionContext.ActionArguments.ContainsKey("ignoreUserStartNodes") &&
+                                       bool.Parse(actionContext.ActionArguments.GetValueAsString("ignoreUserStartNodes"));
 
             int nodeId;
             if (_nodeId.HasValue == false)
@@ -124,9 +127,11 @@ namespace Umbraco.Web.WebApi.Filters
                 actionContext.Request.Properties,
                 UmbracoContext.Current.Security.CurrentUser,
                 ApplicationContext.Current.Services.UserService,
-                ApplicationContext.Current.Services.ContentService, 
-                ApplicationContext.Current.Services.EntityService, 
-                nodeId, _permissionToCheck.HasValue ? new[]{_permissionToCheck.Value}: null))
+                ApplicationContext.Current.Services.ContentService, 
+                ApplicationContext.Current.Services.EntityService, 
+                nodeId,
+                _permissionToCheck.HasValue ? new[]{_permissionToCheck.Value}: null,
+                ignoreUserStartNodes: ignoreUserStartNodes))
             {
                 base.OnActionExecuting(actionContext);
             }
diff --git a/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs b/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs
index beb67f3395..23d4fb871c 100644
--- a/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs
+++ b/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs
@@ -3,11 +3,13 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
+using System.Web;
 using System.Web.Http.Filters;
 using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Web.Models.ContentEditing;
+using Umbraco.Web.Trees;
 
 namespace Umbraco.Web.WebApi.Filters
 {
@@ -77,7 +79,12 @@ namespace Umbraco.Web.WebApi.Filters
 
         protected virtual void FilterItems(IUser user, IList items)
         {
-            FilterBasedOnStartNode(items, user);
+            bool.TryParse(HttpContext.Current.Request.QueryString.Get(TreeQueryStringParameters.IgnoreUserStartNodes), out var ignoreUserStartNodes);
+
+            if (ignoreUserStartNodes == false)
+            {
+                FilterBasedOnStartNode(items, user);
+            }
         }
 
         internal void FilterBasedOnStartNode(IList items, IUser user)

From 7557c584d8331482ffb7157dcf2c4d083c5e226d Mon Sep 17 00:00:00 2001
From: Linus Elander <linus@perlin.nu>
Date: Wed, 19 Jun 2019 21:41:47 +0200
Subject: [PATCH 004/776] Adjusts conditions for which indexes should be
 affected when a node is unpublished

---
 src/Umbraco.Web/Search/ExamineComponent.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Search/ExamineComponent.cs b/src/Umbraco.Web/Search/ExamineComponent.cs
index 3583e5b7f9..74b9e720b1 100644
--- a/src/Umbraco.Web/Search/ExamineComponent.cs
+++ b/src/Umbraco.Web/Search/ExamineComponent.cs
@@ -737,7 +737,7 @@ namespace Umbraco.Web.Search
             {
                 var strId = id.ToString(CultureInfo.InvariantCulture);
                 foreach (var index in examineComponent._examineManager.Indexes.OfType<IUmbracoIndex>()
-                    .Where(x => (keepIfUnpublished && !x.PublishedValuesOnly) || !keepIfUnpublished)
+                    .Where(x => x.PublishedValuesOnly || !keepIfUnpublished)
                     .Where(x => x.EnableDefaultEventHandler))
                 {
                     index.DeleteFromIndex(strId);

From 4e4487167126d89dc2174592d529dc73b5f9828b Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 20 Jun 2019 15:57:31 +0200
Subject: [PATCH 005/776] The NuGet packages needs an extra
 DotNetCompilerPlatform transform to be sure it gets applied as it sometimes
 didn't

Added SignalR binding redirect for Umbraco Cloud
Added System.Web.Http.WebHost binding redirect for uCommerce
---
 build/NuSpecs/tools/Web.config.install.xdt | 18 ++++++++++++++++--
 src/Umbraco.Web.UI/web.Template.config     |  8 ++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/build/NuSpecs/tools/Web.config.install.xdt b/build/NuSpecs/tools/Web.config.install.xdt
index a381a58c3e..4f8a1927a8 100644
--- a/build/NuSpecs/tools/Web.config.install.xdt
+++ b/build/NuSpecs/tools/Web.config.install.xdt
@@ -324,7 +324,6 @@
         <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
             <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='HtmlAgilityPack')" xdt:Transform="Remove" />
             <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='AutoMapper')" xdt:Transform="Remove" />
-            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Net.Http')" xdt:Transform="Remove" />
             <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Newtonsoft.Json')" xdt:Transform="Remove" />
             <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Web.Mvc')" xdt:Transform="Remove" />
             <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Web.WebPages.Razor')" xdt:Transform="Remove" />
@@ -337,6 +336,9 @@
             <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.CodeAnalysis.CSharp')" xdt:Transform="Remove" />
             <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='log4net')" xdt:Transform="Remove" />
             <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Data.SqlServerCe')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.CodeDom.Providers.DotNetCompilerPlatform')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.AspNet.SignalR.Core')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Web.Http.WebHost')" xdt:Transform="Remove" />
         </assemblyBinding>
     </runtime>
 
@@ -369,7 +371,7 @@
             <dependentAssembly xdt:Transform="Insert">
                 <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
                 <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
-            </dependentAssembly>
+            </dependentAssembly> 
             <dependentAssembly xdt:Transform="Insert">
                 <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
                 <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
@@ -398,6 +400,18 @@
                 <assemblyIdentity name="System.Data.SqlServerCe" publicKeyToken="89845DCD8080CC91" culture="neutral"/>
                 <bindingRedirect oldVersion="0.0.0.0-4.0.0.1" newVersion="4.0.0.1"/>
             </dependentAssembly>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-2.0.1.0" newVersion="2.0.1.0" />
+            </dependentAssembly>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="Microsoft.AspNet.SignalR.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-2.4.1.0" newVersion="2.4.1.0" />
+            </dependentAssembly>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="System.Web.Http.WebHost" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+            </dependentAssembly>
         </assemblyBinding>
     </runtime>
 
diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config
index fe25dd0c0f..583952f29d 100644
--- a/src/Umbraco.Web.UI/web.Template.config
+++ b/src/Umbraco.Web.UI/web.Template.config
@@ -466,6 +466,14 @@
                 <assemblyIdentity name="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" publicKeyToken="31bf3856ad364e35" culture="neutral" />
                 <bindingRedirect oldVersion="0.0.0.0-2.0.1.0" newVersion="2.0.1.0" />
             </dependentAssembly>
+            <dependentAssembly>
+                <assemblyIdentity name="Microsoft.AspNet.SignalR.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-2.4.1.0" newVersion="2.4.1.0" />
+            </dependentAssembly>
+            <dependentAssembly>
+                <assemblyIdentity name="System.Web.Http.WebHost" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+            </dependentAssembly>
         </assemblyBinding>
     </runtime>
 

From 4df838c20c5f128d429602f4f933f851469dfe0c Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 20 Jun 2019 16:02:42 +0200
Subject: [PATCH 006/776] 
 https://umbraco.visualstudio.com/D-Team%20Tracker/_workitems/edit/1358 -
 Changed the ignoreUserStartNodes in public endpoints to the data type id, and
 then look up the setting

---
 src/Umbraco.Core/Services/DataTypeService.cs  | 1296 ++++-----
 src/Umbraco.Core/Services/IDataTypeService.cs |  335 +--
 .../tree/umbtreesearchbox.directive.js        |   10 +-
 .../src/common/resources/content.resource.js  |  122 +-
 .../src/common/resources/entity.resource.js   | 1168 ++++----
 .../src/common/resources/media.resource.js    | 1118 ++++----
 .../src/common/services/search.service.js     |  338 +--
 .../common/dialogs/linkpicker.controller.js   |  334 +--
 .../src/views/common/dialogs/linkpicker.html  |  173 +-
 .../common/dialogs/treepicker.controller.js   |  861 +++---
 .../overlays/contentpicker/contentpicker.html |    2 +-
 .../linkpicker/linkpicker.controller.js       |   12 +-
 .../overlays/linkpicker/linkpicker.html       |    3 +-
 .../mediaPicker/mediapicker.controller.js     |  852 +++---
 .../treepicker/treepicker.controller.js       |    6 +-
 .../overlays/treepicker/treepicker.html       |  112 +-
 .../contentpicker/contentpicker.controller.js |  732 ++---
 .../grid/editors/media.controller.js          |    6 +-
 .../grid/editors/rte.controller.js            |   12 +-
 .../mediapicker/mediapicker.controller.js     |  369 +--
 .../multiurlpicker.controller.js              |    5 +-
 .../relatedlinks/relatedlinks.controller.js   |  484 ++--
 .../propertyeditors/rte/rte.controller.js     |  805 +++---
 src/Umbraco.Web/Editors/ContentController.cs  | 2454 ++++++++---------
 src/Umbraco.Web/Editors/EntityController.cs   | 2003 +++++++-------
 src/Umbraco.Web/Editors/MediaController.cs    | 2031 +++++++-------
 .../ContentEditing/ContentPropertyBasic.cs    |   97 +-
 .../Mapping/ContentPropertyBasicConverter.cs  |  153 +-
 src/Umbraco.Web/Trees/TreeControllerBase.cs   |  808 +++---
 .../Trees/TreeQueryStringParameters.cs        |   30 +-
 ...EnsureUserPermissionForContentAttribute.cs |  302 +-
 .../FilterAllowedOutgoingMediaAttribute.cs    |   11 +-
 32 files changed, 8547 insertions(+), 8497 deletions(-)

diff --git a/src/Umbraco.Core/Services/DataTypeService.cs b/src/Umbraco.Core/Services/DataTypeService.cs
index 0ee3e9b823..43c2b69c47 100644
--- a/src/Umbraco.Core/Services/DataTypeService.cs
+++ b/src/Umbraco.Core/Services/DataTypeService.cs
@@ -1,640 +1,656 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Umbraco.Core.Events;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.Rdbms;
-using Umbraco.Core.Persistence;
-using Umbraco.Core.Persistence.Querying;
-using Umbraco.Core.Persistence.UnitOfWork;
-using Umbraco.Core.PropertyEditors;
-using umbraco.interfaces;
-using Umbraco.Core.Exceptions;
-
-namespace Umbraco.Core.Services
-{
-    /// <summary>
-    /// Represents the DataType Service, which is an easy access to operations involving <see cref="IDataTypeDefinition"/>
-    /// </summary>
-    public class DataTypeService : ScopeRepositoryService, IDataTypeService
-    {
-
-        public DataTypeService(IDatabaseUnitOfWorkProvider provider, RepositoryFactory repositoryFactory, ILogger logger, IEventMessagesFactory eventMessagesFactory)
-            : base(provider, repositoryFactory, logger, eventMessagesFactory)
-        {
-        }
-
-        #region Containers
-
-        public Attempt<OperationStatus<EntityContainer, OperationStatusType>> CreateContainer(int parentId, string name, int userId = 0)
-        {
-            var evtMsgs = EventMessagesFactory.Get();
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var repo = RepositoryFactory.CreateEntityContainerRepository(uow, Constants.ObjectTypes.DataTypeContainerGuid);
-
-                try
-                {
-                    var container = new EntityContainer(Constants.ObjectTypes.DataTypeGuid)
-                    {
-                        Name = name,
-                        ParentId = parentId,
-                        CreatorId = userId
-                    };
-
-                    if (uow.Events.DispatchCancelable(SavingContainer, this, new SaveEventArgs<EntityContainer>(container, evtMsgs)))
-                    {
-                        uow.Commit();
-                        return Attempt.Fail(new OperationStatus<EntityContainer, OperationStatusType>(container, OperationStatusType.FailedCancelledByEvent, evtMsgs));
-                    }
-
-                    repo.AddOrUpdate(container);
-                    uow.Commit();
-
-                    uow.Events.Dispatch(SavedContainer, this, new SaveEventArgs<EntityContainer>(container, evtMsgs));
-                    //TODO: Audit trail ?
-
-                    return Attempt.Succeed(new OperationStatus<EntityContainer, OperationStatusType>(container, OperationStatusType.Success, evtMsgs));
-                }
-                catch (Exception ex)
-                {
-                    return Attempt.Fail(new OperationStatus<EntityContainer, OperationStatusType>(null, OperationStatusType.FailedExceptionThrown, evtMsgs), ex);
-                }
-            }
-        }
-
-        public EntityContainer GetContainer(int containerId)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repo = RepositoryFactory.CreateEntityContainerRepository(uow, Constants.ObjectTypes.DataTypeContainerGuid);
-                return repo.Get(containerId);
-            }
-        }
-
-        public EntityContainer GetContainer(Guid containerId)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repo = RepositoryFactory.CreateEntityContainerRepository(uow, Constants.ObjectTypes.DataTypeContainerGuid);
-                return repo.Get(containerId);
-            }
-        }
-
-        public IEnumerable<EntityContainer> GetContainers(string name, int level)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repo = RepositoryFactory.CreateEntityContainerRepository(uow, Constants.ObjectTypes.DataTypeContainerGuid);
-                return repo.Get(name, level);
-            }
-        }
-
-        public IEnumerable<EntityContainer> GetContainers(IDataTypeDefinition dataTypeDefinition)
-        {
-            var ancestorIds = dataTypeDefinition.Path.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)
-                .Select(x =>
-                {
-                    var asInt = x.TryConvertTo<int>();
-                    if (asInt) return asInt.Result;
-                    return int.MinValue;
-                })
-                .Where(x => x != int.MinValue && x != dataTypeDefinition.Id)
-                .ToArray();
-
-            return GetContainers(ancestorIds);
-        }
-
-        public IEnumerable<EntityContainer> GetContainers(int[] containerIds)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repo = RepositoryFactory.CreateEntityContainerRepository(uow, Constants.ObjectTypes.DataTypeContainerGuid);
-                return repo.GetAll(containerIds);
-            }
-        }
-
-        public Attempt<OperationStatus> SaveContainer(EntityContainer container, int userId = 0)
-        {
-            var evtMsgs = EventMessagesFactory.Get();
-
-            if (container.ContainedObjectType != Constants.ObjectTypes.DataTypeGuid)
-            {
-                var ex = new InvalidOperationException("Not a " + Constants.ObjectTypes.DataTypeGuid + " container.");
-                return OperationStatus.Exception(evtMsgs, ex);
-            }
-
-            if (container.HasIdentity && container.IsPropertyDirty("ParentId"))
-            {
-                var ex = new InvalidOperationException("Cannot save a container with a modified parent, move the container instead.");
-                return OperationStatus.Exception(evtMsgs, ex);
-            }
-
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                if (uow.Events.DispatchCancelable(SavingContainer, this, new SaveEventArgs<EntityContainer>(container, evtMsgs)))
-                    return OperationStatus.Cancelled(evtMsgs);
-
-                var repo = RepositoryFactory.CreateEntityContainerRepository(uow, Constants.ObjectTypes.DataTypeContainerGuid);
-                repo.AddOrUpdate(container);
-                uow.Commit();
-                uow.Events.Dispatch(SavedContainer, this, new SaveEventArgs<EntityContainer>(container, evtMsgs));
-            }
-
-            //TODO: Audit trail ?
-
-            return OperationStatus.Success(evtMsgs);
-        }
-
-        public Attempt<OperationStatus> DeleteContainer(int containerId, int userId = 0)
-        {
-            var evtMsgs = EventMessagesFactory.Get();
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var repo = RepositoryFactory.CreateEntityContainerRepository(uow, Constants.ObjectTypes.DataTypeContainerGuid);
-                var container = repo.Get(containerId);
-                if (container == null) return OperationStatus.NoOperation(evtMsgs);
-
-                if (uow.Events.DispatchCancelable(DeletingContainer, this, new DeleteEventArgs<EntityContainer>(container, evtMsgs)))
-                {
-                    uow.Commit();
-                    return Attempt.Fail(new OperationStatus(OperationStatusType.FailedCancelledByEvent, evtMsgs));
-                }
-
-                repo.Delete(container);
-                uow.Commit();
-
-                uow.Events.Dispatch(DeletedContainer, this, new DeleteEventArgs<EntityContainer>(container, evtMsgs));
-
-                return OperationStatus.Success(evtMsgs);
-                //TODO: Audit trail ?
-            }
-        }
-
-        #endregion
-
-        /// <summary>
-        /// Gets a <see cref="IDataTypeDefinition"/> by its Name
-        /// </summary>
-        /// <param name="name">Name of the <see cref="IDataTypeDefinition"/></param>
-        /// <returns><see cref="IDataTypeDefinition"/></returns>
-        public IDataTypeDefinition GetDataTypeDefinitionByName(string name)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateDataTypeDefinitionRepository(uow);
-                return repository.GetByQuery(new Query<IDataTypeDefinition>().Where(x => x.Name == name)).FirstOrDefault();
-            }
-        }
-
-        /// <summary>
-        /// Gets a <see cref="IDataTypeDefinition"/> by its Id
-        /// </summary>
-        /// <param name="id">Id of the <see cref="IDataTypeDefinition"/></param>
-        /// <returns><see cref="IDataTypeDefinition"/></returns>
-        public IDataTypeDefinition GetDataTypeDefinitionById(int id)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateDataTypeDefinitionRepository(uow);
-                return repository.Get(id);
-            }
-        }
-
-        /// <summary>
-        /// Gets a <see cref="IDataTypeDefinition"/> by its unique guid Id
-        /// </summary>
-        /// <param name="id">Unique guid Id of the DataType</param>
-        /// <returns><see cref="IDataTypeDefinition"/></returns>
-        public IDataTypeDefinition GetDataTypeDefinitionById(Guid id)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateDataTypeDefinitionRepository(uow);
-                var query = Query<IDataTypeDefinition>.Builder.Where(x => x.Key == id);
-
-                var definitions = repository.GetByQuery(query);
-                return definitions.FirstOrDefault();
-            }
-        }
-
-        /// <summary>
-        /// Gets a <see cref="IDataTypeDefinition"/> by its control Id
-        /// </summary>
-        /// <param name="id">Id of the DataType control</param>
-        /// <returns>Collection of <see cref="IDataTypeDefinition"/> objects with a matching contorl id</returns>
-        [Obsolete("Property editor's are defined by a string alias from version 7 onwards, use the overload GetDataTypeDefinitionByPropertyEditorAlias instead")]
-        public IEnumerable<IDataTypeDefinition> GetDataTypeDefinitionByControlId(Guid id)
-        {
-            var alias = LegacyPropertyEditorIdToAliasConverter.GetAliasFromLegacyId(id, true);
-            return GetDataTypeDefinitionByPropertyEditorAlias(alias);
-        }
-
-        /// <summary>
-        /// Gets a <see cref="IDataTypeDefinition"/> by its control Id
-        /// </summary>
-        /// <param name="propertyEditorAlias">Alias of the property editor</param>
-        /// <returns>Collection of <see cref="IDataTypeDefinition"/> objects with a matching contorl id</returns>
-        public IEnumerable<IDataTypeDefinition> GetDataTypeDefinitionByPropertyEditorAlias(string propertyEditorAlias)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateDataTypeDefinitionRepository(uow);
-                var query = Query<IDataTypeDefinition>.Builder.Where(x => x.PropertyEditorAlias == propertyEditorAlias);
-                return repository.GetByQuery(query);
-            }
-        }
-
-        /// <summary>
-        /// Gets all <see cref="IDataTypeDefinition"/> objects or those with the ids passed in
-        /// </summary>
-        /// <param name="ids">Optional array of Ids</param>
-        /// <returns>An enumerable list of <see cref="IDataTypeDefinition"/> objects</returns>
-        public IEnumerable<IDataTypeDefinition> GetAllDataTypeDefinitions(params int[] ids)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateDataTypeDefinitionRepository(uow);
-                return repository.GetAll(ids);
-            }
-        }
-
-        /// <summary>
-        /// Gets all prevalues for an <see cref="IDataTypeDefinition"/>
-        /// </summary>
-        /// <param name="id">Id of the <see cref="IDataTypeDefinition"/> to retrieve prevalues from</param>
-        /// <returns>An enumerable list of string values</returns>
-        public IEnumerable<string> GetPreValuesByDataTypeId(int id)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateDataTypeDefinitionRepository(uow);
-                //now convert the collection to a string list
-                var collection = repository.GetPreValuesCollectionByDataTypeId(id);
-                //now convert the collection to a string list
-                return collection.FormatAsDictionary().Select(x => x.Value.Value).ToList();
-            }
-        }
-
-        /// <summary>
-        /// Returns the PreValueCollection for the specified data type
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        public PreValueCollection GetPreValuesCollectionByDataTypeId(int id)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateDataTypeDefinitionRepository(uow);
-                return repository.GetPreValuesCollectionByDataTypeId(id);
-            }
-        }
-
-        /// <summary>
-        /// Gets a specific PreValue by its Id
-        /// </summary>
-        /// <param name="id">Id of the PreValue to retrieve the value from</param>
-        /// <returns>PreValue as a string</returns>
-        public string GetPreValueAsString(int id)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateDataTypeDefinitionRepository(uow);
-                return repository.GetPreValueAsString(id);
-            }
-        }
-
-        public Attempt<OperationStatus<MoveOperationStatusType>> Move(IDataTypeDefinition toMove, int parentId)
-        {
-            var evtMsgs = EventMessagesFactory.Get();
-
-            var moveInfo = new List<MoveEventInfo<IDataTypeDefinition>>();
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var moveEventInfo = new MoveEventInfo<IDataTypeDefinition>(toMove, toMove.Path, parentId);
-                var moveEventArgs = new MoveEventArgs<IDataTypeDefinition>(evtMsgs, moveEventInfo);
-                if (uow.Events.DispatchCancelable(Moving, this, moveEventArgs))
-                {
-                    uow.Commit();
-                    return Attempt.Fail(new OperationStatus<MoveOperationStatusType>(MoveOperationStatusType.FailedCancelledByEvent, evtMsgs));
-                }
-
-                var containerRepository = RepositoryFactory.CreateEntityContainerRepository(uow, Constants.ObjectTypes.DataTypeContainerGuid);
-                var repository = RepositoryFactory.CreateDataTypeDefinitionRepository(uow);
-
-                try
-                {
-                    EntityContainer container = null;
-                    if (parentId > 0)
-                    {
-                        container = containerRepository.Get(parentId);
-                        if (container == null)
-                            throw new DataOperationException<MoveOperationStatusType>(MoveOperationStatusType.FailedParentNotFound);
-                    }
-                    moveInfo.AddRange(repository.Move(toMove, container));
-                }
-                catch (DataOperationException<MoveOperationStatusType> ex)
-                {
-                    return Attempt.Fail(
-                        new OperationStatus<MoveOperationStatusType>(ex.Operation, evtMsgs));
-                }
-                uow.Commit();
-                moveEventArgs.MoveInfoCollection = moveInfo;
-                moveEventArgs.CanCancel = false;
-                uow.Events.Dispatch(Moved, this, moveEventArgs);
-            }
-
-            return Attempt.Succeed(
-                new OperationStatus<MoveOperationStatusType>(MoveOperationStatusType.Success, evtMsgs));
-        }
-
-        /// <summary>
-        /// Saves an <see cref="IDataTypeDefinition"/>
-        /// </summary>
-        /// <param name="dataTypeDefinition"><see cref="IDataTypeDefinition"/> to save</param>
-        /// <param name="userId">Id of the user issueing the save</param>
-        public void Save(IDataTypeDefinition dataTypeDefinition, int userId = 0)
-        {
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var saveEventArgs = new SaveEventArgs<IDataTypeDefinition>(dataTypeDefinition);
-                if (uow.Events.DispatchCancelable(Saving, this, saveEventArgs))
-                {
-                    uow.Commit();
-                    return;
-                }
-
-                if (string.IsNullOrWhiteSpace(dataTypeDefinition.Name))
-                {
-                    throw new ArgumentException("Cannot save datatype with empty name.");
-                }
-
-                var repository = RepositoryFactory.CreateDataTypeDefinitionRepository(uow);
-
-                dataTypeDefinition.CreatorId = userId;
-                repository.AddOrUpdate(dataTypeDefinition);
-                saveEventArgs.CanCancel = false;
-                uow.Events.Dispatch(Saved, this, saveEventArgs);
-
-                Audit(uow, AuditType.Save, "Save DataTypeDefinition performed by user", userId, dataTypeDefinition.Id);
-                uow.Commit();
-            }
-        }
-
-        /// <summary>
-        /// Saves a collection of <see cref="IDataTypeDefinition"/>
-        /// </summary>
-        /// <param name="dataTypeDefinitions"><see cref="IDataTypeDefinition"/> to save</param>
-        /// <param name="userId">Id of the user issueing the save</param>
-        public void Save(IEnumerable<IDataTypeDefinition> dataTypeDefinitions, int userId = 0)
-        {
-            Save(dataTypeDefinitions, userId, true);
-        }
-
-        /// <summary>
-        /// Saves a collection of <see cref="IDataTypeDefinition"/>
-        /// </summary>
-        /// <param name="dataTypeDefinitions"><see cref="IDataTypeDefinition"/> to save</param>
-        /// <param name="userId">Id of the user issueing the save</param>
-        /// <param name="raiseEvents">Boolean indicating whether or not to raise events</param>
-        public void Save(IEnumerable<IDataTypeDefinition> dataTypeDefinitions, int userId, bool raiseEvents)
-        {
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var saveEventArgs = new SaveEventArgs<IDataTypeDefinition>(dataTypeDefinitions);
-                if (raiseEvents)
-                {                    
-                    if (uow.Events.DispatchCancelable(Saving, this, saveEventArgs))
-                    {
-                        uow.Commit();
-                        return;
-                    }
-                }
-
-                var repository = RepositoryFactory.CreateDataTypeDefinitionRepository(uow);
-
-                foreach (var dataTypeDefinition in dataTypeDefinitions)
-                {
-                    dataTypeDefinition.CreatorId = userId;
-                    repository.AddOrUpdate(dataTypeDefinition);
-                }
-
-                if (raiseEvents)
-                {
-                    saveEventArgs.CanCancel = false;
-                    uow.Events.Dispatch(Saved, this, saveEventArgs);
-                }
-
-                Audit(uow, AuditType.Save, string.Format("Save DataTypeDefinition performed by user"), userId, -1);
-                uow.Commit();
-            }
-        }
-
-        /// <summary>
-        /// Saves a list of PreValues for a given DataTypeDefinition
-        /// </summary>
-        /// <param name="dataTypeId">Id of the DataTypeDefinition to save PreValues for</param>
-        /// <param name="values">List of string values to save</param>
-        [Obsolete("This should no longer be used, use the alternative SavePreValues or SaveDataTypeAndPreValues methods instead. This will only insert pre-values without keys")]
-        public void SavePreValues(int dataTypeId, IEnumerable<string> values)
-        {
-            //TODO: Should we raise an event here since we are really saving values for the data type?
-
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var sortOrderObj =
-                uow.Database.ExecuteScalar<object>(
-                    "SELECT max(sortorder) FROM cmsDataTypePreValues WHERE datatypeNodeId = @DataTypeId", new { DataTypeId = dataTypeId });
-                int sortOrder;
-                if (sortOrderObj == null || int.TryParse(sortOrderObj.ToString(), out sortOrder) == false)
-                {
-                    sortOrder = 1;
-                }
-
-                foreach (var value in values)
-                {
-                    var dto = new DataTypePreValueDto { DataTypeNodeId = dataTypeId, Value = value, SortOrder = sortOrder };
-                    uow.Database.Insert(dto);
-                    sortOrder++;
-                }
-
-                uow.Commit();
-            }
-        }
-
-        /// <summary>
-        /// Saves/updates the pre-values
-        /// </summary>
-        /// <param name="dataTypeId"></param>
-        /// <param name="values"></param>
-        /// <remarks>
-        /// We need to actually look up each pre-value and maintain it's id if possible - this is because of silly property editors
-        /// like 'dropdown list publishing keys'
-        /// </remarks>
-        public void SavePreValues(int dataTypeId, IDictionary<string, PreValue> values)
-        {
-            var dtd = GetDataTypeDefinitionById(dataTypeId);
-            if (dtd == null)
-            {
-                throw new InvalidOperationException("No data type found for id " + dataTypeId);
-            }
-            SavePreValues(dtd, values);
-        }
-
-        /// <summary>
-        /// Saves/updates the pre-values
-        /// </summary>
-        /// <param name="dataTypeDefinition"></param>
-        /// <param name="values"></param>
-        /// <remarks>
-        /// We need to actually look up each pre-value and maintain it's id if possible - this is because of silly property editors
-        /// like 'dropdown list publishing keys'
-        /// </remarks>
-        public void SavePreValues(IDataTypeDefinition dataTypeDefinition, IDictionary<string, PreValue> values)
-        {
-            //TODO: Should we raise an event here since we are really saving values for the data type?
-
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var repository = RepositoryFactory.CreateDataTypeDefinitionRepository(uow);
-                repository.AddOrUpdatePreValues(dataTypeDefinition, values);
-                uow.Commit();
-            }
-        }
-
-        /// <summary>
-        /// This will save a data type and it's pre-values in one transaction
-        /// </summary>
-        /// <param name="dataTypeDefinition"></param>
-        /// <param name="values"></param>
-        /// <param name="userId"></param>
-        public void SaveDataTypeAndPreValues(IDataTypeDefinition dataTypeDefinition, IDictionary<string, PreValue> values, int userId = 0)
-        {
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var saveEventArgs = new SaveEventArgs<IDataTypeDefinition>(dataTypeDefinition);
-                if (uow.Events.DispatchCancelable(Saving, this, saveEventArgs))
-                {
-                    uow.Commit();
-                    return;
-                }
-
-                // if preValues contain the data type, override the data type definition accordingly
-                if (values != null && values.ContainsKey(Constants.PropertyEditors.PreValueKeys.DataValueType))
-                    dataTypeDefinition.DatabaseType = PropertyValueEditor.GetDatabaseType(values[Constants.PropertyEditors.PreValueKeys.DataValueType].Value);
-
-                var repository = RepositoryFactory.CreateDataTypeDefinitionRepository(uow);
-
-                dataTypeDefinition.CreatorId = userId;
-
-                //add/update the dtd
-                repository.AddOrUpdate(dataTypeDefinition);
-
-                //add/update the prevalues
-                repository.AddOrUpdatePreValues(dataTypeDefinition, values);
-
-                Audit(uow, AuditType.Save, string.Format("Save DataTypeDefinition performed by user"), userId, dataTypeDefinition.Id);
-                uow.Commit();
-                saveEventArgs.CanCancel = false;
-                uow.Events.Dispatch(Saved, this, saveEventArgs);
-            }
-        }
-
-        /// <summary>
-        /// Deletes an <see cref="IDataTypeDefinition"/>
-        /// </summary>
-        /// <remarks>
-        /// Please note that deleting a <see cref="IDataTypeDefinition"/> will remove
-        /// all the <see cref="PropertyType"/> data that references this <see cref="IDataTypeDefinition"/>.
-        /// </remarks>
-        /// <param name="dataTypeDefinition"><see cref="IDataTypeDefinition"/> to delete</param>
-        /// <param name="userId">Optional Id of the user issueing the deletion</param>
-        public void Delete(IDataTypeDefinition dataTypeDefinition, int userId = 0)
-        {
-			using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var deleteEventArgs = new DeleteEventArgs<IDataTypeDefinition>(dataTypeDefinition);
-                if (uow.Events.DispatchCancelable(Deleting, this, deleteEventArgs))
-                {
-                    uow.Commit();
-                    return;
-                }
-
-                var repository = RepositoryFactory.CreateDataTypeDefinitionRepository(uow);
-
-			    repository.Delete(dataTypeDefinition);
-
-                Audit(uow, AuditType.Delete, "Delete DataTypeDefinition performed by user", userId, dataTypeDefinition.Id);
-                uow.Commit();
-                deleteEventArgs.CanCancel = false;
-                uow.Events.Dispatch(Deleted, this, deleteEventArgs);
-            }
-        }
-
-        /// <summary>
-        /// Gets the <see cref="IDataType"/> specified by it's unique ID
-        /// </summary>
-        /// <param name="id">Id of the DataType, which corresponds to the Guid Id of the control</param>
-        /// <returns><see cref="IDataType"/> object</returns>
-        [Obsolete("IDataType is obsolete and is no longer used, it will be removed from the codebase in future versions")]
-        public IDataType GetDataTypeById(Guid id)
-        {
-            return DataTypesResolver.Current.GetById(id);
-        }
-
-        /// <summary>
-        /// Gets a complete list of all registered <see cref="IDataType"/>'s
-        /// </summary>
-        /// <returns>An enumerable list of <see cref="IDataType"/> objects</returns>
-        [Obsolete("IDataType is obsolete and is no longer used, it will be removed from the codebase in future versions")]
-        public IEnumerable<IDataType> GetAllDataTypes()
-        {
-            return DataTypesResolver.Current.DataTypes;
-        }
-
-        private void Audit(IScopeUnitOfWork uow, AuditType type, string message, int userId, int objectId)
-        {
-            var auditRepo = RepositoryFactory.CreateAuditRepository(uow);
-            auditRepo.AddOrUpdate(new AuditItem(objectId, message, type, userId));
-        }
-
-        #region Event Handlers
-
-        public static event TypedEventHandler<IDataTypeService, SaveEventArgs<EntityContainer>> SavingContainer;
-        public static event TypedEventHandler<IDataTypeService, SaveEventArgs<EntityContainer>> SavedContainer;
-        public static event TypedEventHandler<IDataTypeService, DeleteEventArgs<EntityContainer>> DeletingContainer;
-        public static event TypedEventHandler<IDataTypeService, DeleteEventArgs<EntityContainer>> DeletedContainer;
-
-        /// <summary>
-        /// Occurs before Delete
-        /// </summary>
-		public static event TypedEventHandler<IDataTypeService, DeleteEventArgs<IDataTypeDefinition>> Deleting;
-
-        /// <summary>
-        /// Occurs after Delete
-        /// </summary>
-		public static event TypedEventHandler<IDataTypeService, DeleteEventArgs<IDataTypeDefinition>> Deleted;
-
-        /// <summary>
-        /// Occurs before Save
-        /// </summary>
-		public static event TypedEventHandler<IDataTypeService, SaveEventArgs<IDataTypeDefinition>> Saving;
-
-        /// <summary>
-        /// Occurs after Save
-        /// </summary>
-		public static event TypedEventHandler<IDataTypeService, SaveEventArgs<IDataTypeDefinition>> Saved;
-
-        /// <summary>
-        /// Occurs before Move
-        /// </summary>
-        public static event TypedEventHandler<IDataTypeService, MoveEventArgs<IDataTypeDefinition>> Moving;
-
-        /// <summary>
-        /// Occurs after Move
-        /// </summary>
-        public static event TypedEventHandler<IDataTypeService, MoveEventArgs<IDataTypeDefinition>> Moved;
-        #endregion
-    }
-}
\ No newline at end of file
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Umbraco.Core.Events;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Persistence.UnitOfWork;
+using Umbraco.Core.PropertyEditors;
+using umbraco.interfaces;
+using Umbraco.Core.Exceptions;
+
+namespace Umbraco.Core.Services
+{
+    /// <summary>
+    /// Represents the DataType Service, which is an easy access to operations involving <see cref="IDataTypeDefinition"/>
+    /// </summary>
+    public class DataTypeService : ScopeRepositoryService, IDataTypeService
+    {
+
+        public DataTypeService(IDatabaseUnitOfWorkProvider provider, RepositoryFactory repositoryFactory, ILogger logger, IEventMessagesFactory eventMessagesFactory)
+            : base(provider, repositoryFactory, logger, eventMessagesFactory)
+        {
+        }
+
+        #region Containers
+
+        public Attempt<OperationStatus<EntityContainer, OperationStatusType>> CreateContainer(int parentId, string name, int userId = 0)
+        {
+            var evtMsgs = EventMessagesFactory.Get();
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var repo = RepositoryFactory.CreateEntityContainerRepository(uow, Constants.ObjectTypes.DataTypeContainerGuid);
+
+                try
+                {
+                    var container = new EntityContainer(Constants.ObjectTypes.DataTypeGuid)
+                    {
+                        Name = name,
+                        ParentId = parentId,
+                        CreatorId = userId
+                    };
+
+                    if (uow.Events.DispatchCancelable(SavingContainer, this, new SaveEventArgs<EntityContainer>(container, evtMsgs)))
+                    {
+                        uow.Commit();
+                        return Attempt.Fail(new OperationStatus<EntityContainer, OperationStatusType>(container, OperationStatusType.FailedCancelledByEvent, evtMsgs));
+                    }
+
+                    repo.AddOrUpdate(container);
+                    uow.Commit();
+
+                    uow.Events.Dispatch(SavedContainer, this, new SaveEventArgs<EntityContainer>(container, evtMsgs));
+                    //TODO: Audit trail ?
+
+                    return Attempt.Succeed(new OperationStatus<EntityContainer, OperationStatusType>(container, OperationStatusType.Success, evtMsgs));
+                }
+                catch (Exception ex)
+                {
+                    return Attempt.Fail(new OperationStatus<EntityContainer, OperationStatusType>(null, OperationStatusType.FailedExceptionThrown, evtMsgs), ex);
+                }
+            }
+        }
+
+        public EntityContainer GetContainer(int containerId)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repo = RepositoryFactory.CreateEntityContainerRepository(uow, Constants.ObjectTypes.DataTypeContainerGuid);
+                return repo.Get(containerId);
+            }
+        }
+
+        public EntityContainer GetContainer(Guid containerId)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repo = RepositoryFactory.CreateEntityContainerRepository(uow, Constants.ObjectTypes.DataTypeContainerGuid);
+                return repo.Get(containerId);
+            }
+        }
+
+        public IEnumerable<EntityContainer> GetContainers(string name, int level)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repo = RepositoryFactory.CreateEntityContainerRepository(uow, Constants.ObjectTypes.DataTypeContainerGuid);
+                return repo.Get(name, level);
+            }
+        }
+
+        public IEnumerable<EntityContainer> GetContainers(IDataTypeDefinition dataTypeDefinition)
+        {
+            var ancestorIds = dataTypeDefinition.Path.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)
+                .Select(x =>
+                {
+                    var asInt = x.TryConvertTo<int>();
+                    if (asInt) return asInt.Result;
+                    return int.MinValue;
+                })
+                .Where(x => x != int.MinValue && x != dataTypeDefinition.Id)
+                .ToArray();
+
+            return GetContainers(ancestorIds);
+        }
+
+        public IEnumerable<EntityContainer> GetContainers(int[] containerIds)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repo = RepositoryFactory.CreateEntityContainerRepository(uow, Constants.ObjectTypes.DataTypeContainerGuid);
+                return repo.GetAll(containerIds);
+            }
+        }
+
+        public Attempt<OperationStatus> SaveContainer(EntityContainer container, int userId = 0)
+        {
+            var evtMsgs = EventMessagesFactory.Get();
+
+            if (container.ContainedObjectType != Constants.ObjectTypes.DataTypeGuid)
+            {
+                var ex = new InvalidOperationException("Not a " + Constants.ObjectTypes.DataTypeGuid + " container.");
+                return OperationStatus.Exception(evtMsgs, ex);
+            }
+
+            if (container.HasIdentity && container.IsPropertyDirty("ParentId"))
+            {
+                var ex = new InvalidOperationException("Cannot save a container with a modified parent, move the container instead.");
+                return OperationStatus.Exception(evtMsgs, ex);
+            }
+
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                if (uow.Events.DispatchCancelable(SavingContainer, this, new SaveEventArgs<EntityContainer>(container, evtMsgs)))
+                    return OperationStatus.Cancelled(evtMsgs);
+
+                var repo = RepositoryFactory.CreateEntityContainerRepository(uow, Constants.ObjectTypes.DataTypeContainerGuid);
+                repo.AddOrUpdate(container);
+                uow.Commit();
+                uow.Events.Dispatch(SavedContainer, this, new SaveEventArgs<EntityContainer>(container, evtMsgs));
+            }
+
+            //TODO: Audit trail ?
+
+            return OperationStatus.Success(evtMsgs);
+        }
+
+        public Attempt<OperationStatus> DeleteContainer(int containerId, int userId = 0)
+        {
+            var evtMsgs = EventMessagesFactory.Get();
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var repo = RepositoryFactory.CreateEntityContainerRepository(uow, Constants.ObjectTypes.DataTypeContainerGuid);
+                var container = repo.Get(containerId);
+                if (container == null) return OperationStatus.NoOperation(evtMsgs);
+
+                if (uow.Events.DispatchCancelable(DeletingContainer, this, new DeleteEventArgs<EntityContainer>(container, evtMsgs)))
+                {
+                    uow.Commit();
+                    return Attempt.Fail(new OperationStatus(OperationStatusType.FailedCancelledByEvent, evtMsgs));
+                }
+
+                repo.Delete(container);
+                uow.Commit();
+
+                uow.Events.Dispatch(DeletedContainer, this, new DeleteEventArgs<EntityContainer>(container, evtMsgs));
+
+                return OperationStatus.Success(evtMsgs);
+                //TODO: Audit trail ?
+            }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Gets a <see cref="IDataTypeDefinition"/> by its Name
+        /// </summary>
+        /// <param name="name">Name of the <see cref="IDataTypeDefinition"/></param>
+        /// <returns><see cref="IDataTypeDefinition"/></returns>
+        public IDataTypeDefinition GetDataTypeDefinitionByName(string name)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateDataTypeDefinitionRepository(uow);
+                return repository.GetByQuery(new Query<IDataTypeDefinition>().Where(x => x.Name == name)).FirstOrDefault();
+            }
+        }
+
+        /// <summary>
+        /// Gets a <see cref="IDataTypeDefinition"/> by its Id
+        /// </summary>
+        /// <param name="id">Id of the <see cref="IDataTypeDefinition"/></param>
+        /// <returns><see cref="IDataTypeDefinition"/></returns>
+        public IDataTypeDefinition GetDataTypeDefinitionById(int id)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateDataTypeDefinitionRepository(uow);
+                return repository.Get(id);
+            }
+        }
+
+        /// <summary>
+        /// Gets a <see cref="IDataTypeDefinition"/> by its unique guid Id
+        /// </summary>
+        /// <param name="id">Unique guid Id of the DataType</param>
+        /// <returns><see cref="IDataTypeDefinition"/></returns>
+        public IDataTypeDefinition GetDataTypeDefinitionById(Guid id)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateDataTypeDefinitionRepository(uow);
+                var query = Query<IDataTypeDefinition>.Builder.Where(x => x.Key == id);
+
+                var definitions = repository.GetByQuery(query);
+                return definitions.FirstOrDefault();
+            }
+        }
+
+        /// <summary>
+        /// Gets a <see cref="IDataTypeDefinition"/> by its control Id
+        /// </summary>
+        /// <param name="id">Id of the DataType control</param>
+        /// <returns>Collection of <see cref="IDataTypeDefinition"/> objects with a matching contorl id</returns>
+        [Obsolete("Property editor's are defined by a string alias from version 7 onwards, use the overload GetDataTypeDefinitionByPropertyEditorAlias instead")]
+        public IEnumerable<IDataTypeDefinition> GetDataTypeDefinitionByControlId(Guid id)
+        {
+            var alias = LegacyPropertyEditorIdToAliasConverter.GetAliasFromLegacyId(id, true);
+            return GetDataTypeDefinitionByPropertyEditorAlias(alias);
+        }
+
+        /// <summary>
+        /// Gets a <see cref="IDataTypeDefinition"/> by its control Id
+        /// </summary>
+        /// <param name="propertyEditorAlias">Alias of the property editor</param>
+        /// <returns>Collection of <see cref="IDataTypeDefinition"/> objects with a matching contorl id</returns>
+        public IEnumerable<IDataTypeDefinition> GetDataTypeDefinitionByPropertyEditorAlias(string propertyEditorAlias)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateDataTypeDefinitionRepository(uow);
+                var query = Query<IDataTypeDefinition>.Builder.Where(x => x.PropertyEditorAlias == propertyEditorAlias);
+                return repository.GetByQuery(query);
+            }
+        }
+
+        /// <summary>
+        /// Gets all <see cref="IDataTypeDefinition"/> objects or those with the ids passed in
+        /// </summary>
+        /// <param name="ids">Optional array of Ids</param>
+        /// <returns>An enumerable list of <see cref="IDataTypeDefinition"/> objects</returns>
+        public IEnumerable<IDataTypeDefinition> GetAllDataTypeDefinitions(params int[] ids)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateDataTypeDefinitionRepository(uow);
+                return repository.GetAll(ids);
+            }
+        }
+
+        /// <summary>
+        /// Gets all prevalues for an <see cref="IDataTypeDefinition"/>
+        /// </summary>
+        /// <param name="id">Id of the <see cref="IDataTypeDefinition"/> to retrieve prevalues from</param>
+        /// <returns>An enumerable list of string values</returns>
+        public IEnumerable<string> GetPreValuesByDataTypeId(int id)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateDataTypeDefinitionRepository(uow);
+                //now convert the collection to a string list
+                var collection = repository.GetPreValuesCollectionByDataTypeId(id);
+                //now convert the collection to a string list
+                return collection.FormatAsDictionary().Select(x => x.Value.Value).ToList();
+            }
+        }
+
+        /// <summary>
+        /// Returns the PreValueCollection for the specified data type
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public PreValueCollection GetPreValuesCollectionByDataTypeId(int id)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateDataTypeDefinitionRepository(uow);
+                return repository.GetPreValuesCollectionByDataTypeId(id);
+            }
+        }
+
+        /// <summary>
+        /// Gets a specific PreValue by its Id
+        /// </summary>
+        /// <param name="id">Id of the PreValue to retrieve the value from</param>
+        /// <returns>PreValue as a string</returns>
+        public string GetPreValueAsString(int id)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateDataTypeDefinitionRepository(uow);
+                return repository.GetPreValueAsString(id);
+            }
+        }
+
+        public Attempt<OperationStatus<MoveOperationStatusType>> Move(IDataTypeDefinition toMove, int parentId)
+        {
+            var evtMsgs = EventMessagesFactory.Get();
+
+            var moveInfo = new List<MoveEventInfo<IDataTypeDefinition>>();
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var moveEventInfo = new MoveEventInfo<IDataTypeDefinition>(toMove, toMove.Path, parentId);
+                var moveEventArgs = new MoveEventArgs<IDataTypeDefinition>(evtMsgs, moveEventInfo);
+                if (uow.Events.DispatchCancelable(Moving, this, moveEventArgs))
+                {
+                    uow.Commit();
+                    return Attempt.Fail(new OperationStatus<MoveOperationStatusType>(MoveOperationStatusType.FailedCancelledByEvent, evtMsgs));
+                }
+
+                var containerRepository = RepositoryFactory.CreateEntityContainerRepository(uow, Constants.ObjectTypes.DataTypeContainerGuid);
+                var repository = RepositoryFactory.CreateDataTypeDefinitionRepository(uow);
+
+                try
+                {
+                    EntityContainer container = null;
+                    if (parentId > 0)
+                    {
+                        container = containerRepository.Get(parentId);
+                        if (container == null)
+                            throw new DataOperationException<MoveOperationStatusType>(MoveOperationStatusType.FailedParentNotFound);
+                    }
+                    moveInfo.AddRange(repository.Move(toMove, container));
+                }
+                catch (DataOperationException<MoveOperationStatusType> ex)
+                {
+                    return Attempt.Fail(
+                        new OperationStatus<MoveOperationStatusType>(ex.Operation, evtMsgs));
+                }
+                uow.Commit();
+                moveEventArgs.MoveInfoCollection = moveInfo;
+                moveEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Moved, this, moveEventArgs);
+            }
+
+            return Attempt.Succeed(
+                new OperationStatus<MoveOperationStatusType>(MoveOperationStatusType.Success, evtMsgs));
+        }
+
+        public bool IsDataTypeIgnoringUserStartNodes(Guid key)
+        {
+            var dataType = GetDataTypeDefinitionById(key);
+
+            if (dataType != null)
+            {
+                var preValues = GetPreValuesCollectionByDataTypeId(dataType.Id);
+                if (preValues.PreValuesAsDictionary.TryGetValue("ignoreUserStartNodes", out var preValue))
+                {
+                    return string.Equals(preValue.Value, "1", StringComparison.InvariantCulture);
+                }
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Saves an <see cref="IDataTypeDefinition"/>
+        /// </summary>
+        /// <param name="dataTypeDefinition"><see cref="IDataTypeDefinition"/> to save</param>
+        /// <param name="userId">Id of the user issueing the save</param>
+        public void Save(IDataTypeDefinition dataTypeDefinition, int userId = 0)
+        {
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var saveEventArgs = new SaveEventArgs<IDataTypeDefinition>(dataTypeDefinition);
+                if (uow.Events.DispatchCancelable(Saving, this, saveEventArgs))
+                {
+                    uow.Commit();
+                    return;
+                }
+
+                if (string.IsNullOrWhiteSpace(dataTypeDefinition.Name))
+                {
+                    throw new ArgumentException("Cannot save datatype with empty name.");
+                }
+
+                var repository = RepositoryFactory.CreateDataTypeDefinitionRepository(uow);
+
+                dataTypeDefinition.CreatorId = userId;
+                repository.AddOrUpdate(dataTypeDefinition);
+                saveEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Saved, this, saveEventArgs);
+
+                Audit(uow, AuditType.Save, "Save DataTypeDefinition performed by user", userId, dataTypeDefinition.Id);
+                uow.Commit();
+            }
+        }
+
+        /// <summary>
+        /// Saves a collection of <see cref="IDataTypeDefinition"/>
+        /// </summary>
+        /// <param name="dataTypeDefinitions"><see cref="IDataTypeDefinition"/> to save</param>
+        /// <param name="userId">Id of the user issueing the save</param>
+        public void Save(IEnumerable<IDataTypeDefinition> dataTypeDefinitions, int userId = 0)
+        {
+            Save(dataTypeDefinitions, userId, true);
+        }
+
+        /// <summary>
+        /// Saves a collection of <see cref="IDataTypeDefinition"/>
+        /// </summary>
+        /// <param name="dataTypeDefinitions"><see cref="IDataTypeDefinition"/> to save</param>
+        /// <param name="userId">Id of the user issueing the save</param>
+        /// <param name="raiseEvents">Boolean indicating whether or not to raise events</param>
+        public void Save(IEnumerable<IDataTypeDefinition> dataTypeDefinitions, int userId, bool raiseEvents)
+        {
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var saveEventArgs = new SaveEventArgs<IDataTypeDefinition>(dataTypeDefinitions);
+                if (raiseEvents)
+                {
+                    if (uow.Events.DispatchCancelable(Saving, this, saveEventArgs))
+                    {
+                        uow.Commit();
+                        return;
+                    }
+                }
+
+                var repository = RepositoryFactory.CreateDataTypeDefinitionRepository(uow);
+
+                foreach (var dataTypeDefinition in dataTypeDefinitions)
+                {
+                    dataTypeDefinition.CreatorId = userId;
+                    repository.AddOrUpdate(dataTypeDefinition);
+                }
+
+                if (raiseEvents)
+                {
+                    saveEventArgs.CanCancel = false;
+                    uow.Events.Dispatch(Saved, this, saveEventArgs);
+                }
+
+                Audit(uow, AuditType.Save, string.Format("Save DataTypeDefinition performed by user"), userId, -1);
+                uow.Commit();
+            }
+        }
+
+        /// <summary>
+        /// Saves a list of PreValues for a given DataTypeDefinition
+        /// </summary>
+        /// <param name="dataTypeId">Id of the DataTypeDefinition to save PreValues for</param>
+        /// <param name="values">List of string values to save</param>
+        [Obsolete("This should no longer be used, use the alternative SavePreValues or SaveDataTypeAndPreValues methods instead. This will only insert pre-values without keys")]
+        public void SavePreValues(int dataTypeId, IEnumerable<string> values)
+        {
+            //TODO: Should we raise an event here since we are really saving values for the data type?
+
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var sortOrderObj =
+                uow.Database.ExecuteScalar<object>(
+                    "SELECT max(sortorder) FROM cmsDataTypePreValues WHERE datatypeNodeId = @DataTypeId", new { DataTypeId = dataTypeId });
+                int sortOrder;
+                if (sortOrderObj == null || int.TryParse(sortOrderObj.ToString(), out sortOrder) == false)
+                {
+                    sortOrder = 1;
+                }
+
+                foreach (var value in values)
+                {
+                    var dto = new DataTypePreValueDto { DataTypeNodeId = dataTypeId, Value = value, SortOrder = sortOrder };
+                    uow.Database.Insert(dto);
+                    sortOrder++;
+                }
+
+                uow.Commit();
+            }
+        }
+
+        /// <summary>
+        /// Saves/updates the pre-values
+        /// </summary>
+        /// <param name="dataTypeId"></param>
+        /// <param name="values"></param>
+        /// <remarks>
+        /// We need to actually look up each pre-value and maintain it's id if possible - this is because of silly property editors
+        /// like 'dropdown list publishing keys'
+        /// </remarks>
+        public void SavePreValues(int dataTypeId, IDictionary<string, PreValue> values)
+        {
+            var dtd = GetDataTypeDefinitionById(dataTypeId);
+            if (dtd == null)
+            {
+                throw new InvalidOperationException("No data type found for id " + dataTypeId);
+            }
+            SavePreValues(dtd, values);
+        }
+
+        /// <summary>
+        /// Saves/updates the pre-values
+        /// </summary>
+        /// <param name="dataTypeDefinition"></param>
+        /// <param name="values"></param>
+        /// <remarks>
+        /// We need to actually look up each pre-value and maintain it's id if possible - this is because of silly property editors
+        /// like 'dropdown list publishing keys'
+        /// </remarks>
+        public void SavePreValues(IDataTypeDefinition dataTypeDefinition, IDictionary<string, PreValue> values)
+        {
+            //TODO: Should we raise an event here since we are really saving values for the data type?
+
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var repository = RepositoryFactory.CreateDataTypeDefinitionRepository(uow);
+                repository.AddOrUpdatePreValues(dataTypeDefinition, values);
+                uow.Commit();
+            }
+        }
+
+        /// <summary>
+        /// This will save a data type and it's pre-values in one transaction
+        /// </summary>
+        /// <param name="dataTypeDefinition"></param>
+        /// <param name="values"></param>
+        /// <param name="userId"></param>
+        public void SaveDataTypeAndPreValues(IDataTypeDefinition dataTypeDefinition, IDictionary<string, PreValue> values, int userId = 0)
+        {
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var saveEventArgs = new SaveEventArgs<IDataTypeDefinition>(dataTypeDefinition);
+                if (uow.Events.DispatchCancelable(Saving, this, saveEventArgs))
+                {
+                    uow.Commit();
+                    return;
+                }
+
+                // if preValues contain the data type, override the data type definition accordingly
+                if (values != null && values.ContainsKey(Constants.PropertyEditors.PreValueKeys.DataValueType))
+                    dataTypeDefinition.DatabaseType = PropertyValueEditor.GetDatabaseType(values[Constants.PropertyEditors.PreValueKeys.DataValueType].Value);
+
+                var repository = RepositoryFactory.CreateDataTypeDefinitionRepository(uow);
+
+                dataTypeDefinition.CreatorId = userId;
+
+                //add/update the dtd
+                repository.AddOrUpdate(dataTypeDefinition);
+
+                //add/update the prevalues
+                repository.AddOrUpdatePreValues(dataTypeDefinition, values);
+
+                Audit(uow, AuditType.Save, string.Format("Save DataTypeDefinition performed by user"), userId, dataTypeDefinition.Id);
+                uow.Commit();
+                saveEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Saved, this, saveEventArgs);
+            }
+        }
+
+        /// <summary>
+        /// Deletes an <see cref="IDataTypeDefinition"/>
+        /// </summary>
+        /// <remarks>
+        /// Please note that deleting a <see cref="IDataTypeDefinition"/> will remove
+        /// all the <see cref="PropertyType"/> data that references this <see cref="IDataTypeDefinition"/>.
+        /// </remarks>
+        /// <param name="dataTypeDefinition"><see cref="IDataTypeDefinition"/> to delete</param>
+        /// <param name="userId">Optional Id of the user issueing the deletion</param>
+        public void Delete(IDataTypeDefinition dataTypeDefinition, int userId = 0)
+        {
+			using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var deleteEventArgs = new DeleteEventArgs<IDataTypeDefinition>(dataTypeDefinition);
+                if (uow.Events.DispatchCancelable(Deleting, this, deleteEventArgs))
+                {
+                    uow.Commit();
+                    return;
+                }
+
+                var repository = RepositoryFactory.CreateDataTypeDefinitionRepository(uow);
+
+			    repository.Delete(dataTypeDefinition);
+
+                Audit(uow, AuditType.Delete, "Delete DataTypeDefinition performed by user", userId, dataTypeDefinition.Id);
+                uow.Commit();
+                deleteEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Deleted, this, deleteEventArgs);
+            }
+        }
+
+        /// <summary>
+        /// Gets the <see cref="IDataType"/> specified by it's unique ID
+        /// </summary>
+        /// <param name="id">Id of the DataType, which corresponds to the Guid Id of the control</param>
+        /// <returns><see cref="IDataType"/> object</returns>
+        [Obsolete("IDataType is obsolete and is no longer used, it will be removed from the codebase in future versions")]
+        public IDataType GetDataTypeById(Guid id)
+        {
+            return DataTypesResolver.Current.GetById(id);
+        }
+
+        /// <summary>
+        /// Gets a complete list of all registered <see cref="IDataType"/>'s
+        /// </summary>
+        /// <returns>An enumerable list of <see cref="IDataType"/> objects</returns>
+        [Obsolete("IDataType is obsolete and is no longer used, it will be removed from the codebase in future versions")]
+        public IEnumerable<IDataType> GetAllDataTypes()
+        {
+            return DataTypesResolver.Current.DataTypes;
+        }
+
+        private void Audit(IScopeUnitOfWork uow, AuditType type, string message, int userId, int objectId)
+        {
+            var auditRepo = RepositoryFactory.CreateAuditRepository(uow);
+            auditRepo.AddOrUpdate(new AuditItem(objectId, message, type, userId));
+        }
+
+        #region Event Handlers
+
+        public static event TypedEventHandler<IDataTypeService, SaveEventArgs<EntityContainer>> SavingContainer;
+        public static event TypedEventHandler<IDataTypeService, SaveEventArgs<EntityContainer>> SavedContainer;
+        public static event TypedEventHandler<IDataTypeService, DeleteEventArgs<EntityContainer>> DeletingContainer;
+        public static event TypedEventHandler<IDataTypeService, DeleteEventArgs<EntityContainer>> DeletedContainer;
+
+        /// <summary>
+        /// Occurs before Delete
+        /// </summary>
+		public static event TypedEventHandler<IDataTypeService, DeleteEventArgs<IDataTypeDefinition>> Deleting;
+
+        /// <summary>
+        /// Occurs after Delete
+        /// </summary>
+		public static event TypedEventHandler<IDataTypeService, DeleteEventArgs<IDataTypeDefinition>> Deleted;
+
+        /// <summary>
+        /// Occurs before Save
+        /// </summary>
+		public static event TypedEventHandler<IDataTypeService, SaveEventArgs<IDataTypeDefinition>> Saving;
+
+        /// <summary>
+        /// Occurs after Save
+        /// </summary>
+		public static event TypedEventHandler<IDataTypeService, SaveEventArgs<IDataTypeDefinition>> Saved;
+
+        /// <summary>
+        /// Occurs before Move
+        /// </summary>
+        public static event TypedEventHandler<IDataTypeService, MoveEventArgs<IDataTypeDefinition>> Moving;
+
+        /// <summary>
+        /// Occurs after Move
+        /// </summary>
+        public static event TypedEventHandler<IDataTypeService, MoveEventArgs<IDataTypeDefinition>> Moved;
+        #endregion
+    }
+}
diff --git a/src/Umbraco.Core/Services/IDataTypeService.cs b/src/Umbraco.Core/Services/IDataTypeService.cs
index 9e119cd28a..de8ee5f49c 100644
--- a/src/Umbraco.Core/Services/IDataTypeService.cs
+++ b/src/Umbraco.Core/Services/IDataTypeService.cs
@@ -1,167 +1,168 @@
-using System;
-using System.Collections.Generic;
-using Umbraco.Core.Models;
-using umbraco.interfaces;
-
-namespace Umbraco.Core.Services
-{
-    /// <summary>
-    /// Defines the DataType Service, which is an easy access to operations involving <see cref="IDataTypeDefinition"/> 
-    /// </summary>
-    public interface IDataTypeService : IService
-    {
-        Attempt<OperationStatus<EntityContainer, OperationStatusType>> CreateContainer(int parentId, string name, int userId = 0);
-        Attempt<OperationStatus> SaveContainer(EntityContainer container, int userId = 0);
-        EntityContainer GetContainer(int containerId);
-        EntityContainer GetContainer(Guid containerId);
-        IEnumerable<EntityContainer> GetContainers(string folderName, int level);
-        IEnumerable<EntityContainer> GetContainers(IDataTypeDefinition dataTypeDefinition);
-        IEnumerable<EntityContainer> GetContainers(int[] containerIds);
-        Attempt<OperationStatus> DeleteContainer(int containerId, int userId = 0);
-
-        /// <summary>
-        /// Gets a <see cref="IDataTypeDefinition"/> by its Name
-        /// </summary>
-        /// <param name="name">Name of the <see cref="IDataTypeDefinition"/></param>
-        /// <returns><see cref="IDataTypeDefinition"/></returns>
-        IDataTypeDefinition GetDataTypeDefinitionByName(string name);
-
-        /// <summary>
-        /// Gets a <see cref="IDataTypeDefinition"/> by its Id
-        /// </summary>
-        /// <param name="id">Id of the <see cref="IDataTypeDefinition"/></param>
-        /// <returns><see cref="IDataTypeDefinition"/></returns>
-        IDataTypeDefinition GetDataTypeDefinitionById(int id);
-
-        /// <summary>
-        /// Gets a <see cref="IDataTypeDefinition"/> by its unique guid Id
-        /// </summary>
-        /// <param name="id">Unique guid Id of the DataType</param>
-        /// <returns><see cref="IDataTypeDefinition"/></returns>
-        IDataTypeDefinition GetDataTypeDefinitionById(Guid id);
-
-        /// <summary>
-        /// Gets all <see cref="IDataTypeDefinition"/> objects or those with the ids passed in
-        /// </summary>
-        /// <param name="ids">Optional array of Ids</param>
-        /// <returns>An enumerable list of <see cref="IDataTypeDefinition"/> objects</returns>
-        IEnumerable<IDataTypeDefinition> GetAllDataTypeDefinitions(params int[] ids);
-
-        /// <summary>
-        /// Saves an <see cref="IDataTypeDefinition"/>
-        /// </summary>
-        /// <param name="dataTypeDefinition"><see cref="IDataTypeDefinition"/> to save</param>
-        /// <param name="userId">Id of the user issueing the save</param>
-        void Save(IDataTypeDefinition dataTypeDefinition, int userId = 0);
-
-        /// <summary>
-        /// Saves a collection of <see cref="IDataTypeDefinition"/>
-        /// </summary>
-        /// <param name="dataTypeDefinitions"><see cref="IDataTypeDefinition"/> to save</param>
-        /// <param name="userId">Id of the user issueing the save</param>
-        void Save(IEnumerable<IDataTypeDefinition> dataTypeDefinitions, int userId = 0);
-
-        /// <summary>
-        /// Saves a collection of <see cref="IDataTypeDefinition"/>
-        /// </summary>
-        /// <param name="dataTypeDefinitions"><see cref="IDataTypeDefinition"/> to save</param>
-        /// <param name="userId">Id of the user issueing the save</param>
-        /// <param name="raiseEvents">Boolean indicating whether or not to raise events</param>
-        void Save(IEnumerable<IDataTypeDefinition> dataTypeDefinitions, int userId, bool raiseEvents);
-
-        /// <summary>
-        /// Deletes an <see cref="IDataTypeDefinition"/>
-        /// </summary>
-        /// <remarks>
-        /// Please note that deleting a <see cref="IDataTypeDefinition"/> will remove
-        /// all the <see cref="PropertyType"/> data that references this <see cref="IDataTypeDefinition"/>.
-        /// </remarks>
-        /// <param name="dataTypeDefinition"><see cref="IDataTypeDefinition"/> to delete</param>
-        /// <param name="userId">Id of the user issueing the deletion</param>
-        void Delete(IDataTypeDefinition dataTypeDefinition, int userId = 0);
-
-        /// <summary>
-        /// Gets the <see cref="IDataType"/> specified by it's unique ID
-        /// </summary>
-        /// <param name="id">Id of the DataType, which corresponds to the Guid Id of the control</param>
-        /// <returns><see cref="IDataType"/> object</returns>
-        [Obsolete("IDataType is obsolete and is no longer used, it will be removed from the codebase in future versions")]
-        IDataType GetDataTypeById(Guid id);
-        
-        /// <summary>
-        /// Gets a complete list of all registered <see cref="IDataType"/>'s
-        /// </summary>
-        /// <returns>An enumerable list of <see cref="IDataType"/> objects</returns>
-        [Obsolete("IDataType is obsolete and is no longer used, it will be removed from the codebase in future versions")]
-        IEnumerable<IDataType> GetAllDataTypes();
-
-        /// <summary>
-        /// Gets a <see cref="IDataTypeDefinition"/> by its control Id
-        /// </summary>
-        /// <param name="id">Id of the DataType control</param>
-        /// <returns><see cref="IDataTypeDefinition"/></returns>
-        [Obsolete("Property editor's are defined by a string alias from version 7 onwards, use the overload GetDataTypeDefinitionByPropertyEditorAlias instead")]
-        IEnumerable<IDataTypeDefinition> GetDataTypeDefinitionByControlId(Guid id);
-
-        /// <summary>
-        /// Gets a <see cref="IDataTypeDefinition"/> by its control Id
-        /// </summary>
-        /// <param name="propertyEditorAlias">Alias of the property editor</param>
-        /// <returns>Collection of <see cref="IDataTypeDefinition"/> objects with a matching contorl id</returns>
-        IEnumerable<IDataTypeDefinition> GetDataTypeDefinitionByPropertyEditorAlias(string propertyEditorAlias);
-
-        /// <summary>
-        /// Gets all values for an <see cref="IDataTypeDefinition"/>
-        /// </summary>
-        /// <param name="id">Id of the <see cref="IDataTypeDefinition"/> to retrieve prevalues from</param>
-        /// <returns>An enumerable list of string values</returns>
-        IEnumerable<string> GetPreValuesByDataTypeId(int id);
-
-        /// <summary>
-        /// Gets a pre-value collection by data type id
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        PreValueCollection GetPreValuesCollectionByDataTypeId(int id);
-
-        /// <summary>
-        /// Saves a list of PreValues for a given DataTypeDefinition
-        /// </summary>
-        /// <param name="dataTypeId">Id of the DataTypeDefinition to save PreValues for</param>
-        /// <param name="values">List of string values to save</param>
-        [Obsolete("This should no longer be used, use the alternative SavePreValues or SaveDataTypeAndPreValues methods instead. This will only insert pre-values without keys")]
-        void SavePreValues(int dataTypeId, IEnumerable<string> values);
-
-        /// <summary>
-        /// Saves a list of PreValues for a given DataTypeDefinition
-        /// </summary>
-        /// <param name="dataTypeId">Id of the DataTypeDefinition to save PreValues for</param>
-        /// <param name="values">List of key/value pairs to save</param>
-        void SavePreValues(int dataTypeId, IDictionary<string, PreValue> values);
-
-        /// <summary>
-        /// Saves a list of PreValues for a given DataTypeDefinition
-        /// </summary>
-        /// <param name="dataTypeDefinition">The DataTypeDefinition to save PreValues for</param>
-        /// <param name="values">List of key/value pairs to save</param>
-        void SavePreValues(IDataTypeDefinition dataTypeDefinition, IDictionary<string, PreValue> values);
-
-        /// <summary>
-        /// Saves the data type and it's prevalues
-        /// </summary>
-        /// <param name="dataTypeDefinition"></param>
-        /// <param name="values"></param>
-        /// <param name="userId"></param>
-        void SaveDataTypeAndPreValues(IDataTypeDefinition dataTypeDefinition, IDictionary<string, PreValue> values, int userId = 0);
-
-        /// <summary>
-        /// Gets a specific PreValue by its Id
-        /// </summary>
-        /// <param name="id">Id of the PreValue to retrieve the value from</param>
-        /// <returns>PreValue as a string</returns>
-        string GetPreValueAsString(int id);
-
-        Attempt<OperationStatus<MoveOperationStatusType>> Move(IDataTypeDefinition toMove, int parentId);
-        
-    }
-}
\ No newline at end of file
+using System;
+using System.Collections.Generic;
+using Umbraco.Core.Models;
+using umbraco.interfaces;
+
+namespace Umbraco.Core.Services
+{
+    /// <summary>
+    /// Defines the DataType Service, which is an easy access to operations involving <see cref="IDataTypeDefinition"/>
+    /// </summary>
+    public interface IDataTypeService : IService
+    {
+        Attempt<OperationStatus<EntityContainer, OperationStatusType>> CreateContainer(int parentId, string name, int userId = 0);
+        Attempt<OperationStatus> SaveContainer(EntityContainer container, int userId = 0);
+        EntityContainer GetContainer(int containerId);
+        EntityContainer GetContainer(Guid containerId);
+        IEnumerable<EntityContainer> GetContainers(string folderName, int level);
+        IEnumerable<EntityContainer> GetContainers(IDataTypeDefinition dataTypeDefinition);
+        IEnumerable<EntityContainer> GetContainers(int[] containerIds);
+        Attempt<OperationStatus> DeleteContainer(int containerId, int userId = 0);
+
+        /// <summary>
+        /// Gets a <see cref="IDataTypeDefinition"/> by its Name
+        /// </summary>
+        /// <param name="name">Name of the <see cref="IDataTypeDefinition"/></param>
+        /// <returns><see cref="IDataTypeDefinition"/></returns>
+        IDataTypeDefinition GetDataTypeDefinitionByName(string name);
+
+        /// <summary>
+        /// Gets a <see cref="IDataTypeDefinition"/> by its Id
+        /// </summary>
+        /// <param name="id">Id of the <see cref="IDataTypeDefinition"/></param>
+        /// <returns><see cref="IDataTypeDefinition"/></returns>
+        IDataTypeDefinition GetDataTypeDefinitionById(int id);
+
+        /// <summary>
+        /// Gets a <see cref="IDataTypeDefinition"/> by its unique guid Id
+        /// </summary>
+        /// <param name="id">Unique guid Id of the DataType</param>
+        /// <returns><see cref="IDataTypeDefinition"/></returns>
+        IDataTypeDefinition GetDataTypeDefinitionById(Guid id);
+
+        /// <summary>
+        /// Gets all <see cref="IDataTypeDefinition"/> objects or those with the ids passed in
+        /// </summary>
+        /// <param name="ids">Optional array of Ids</param>
+        /// <returns>An enumerable list of <see cref="IDataTypeDefinition"/> objects</returns>
+        IEnumerable<IDataTypeDefinition> GetAllDataTypeDefinitions(params int[] ids);
+
+        /// <summary>
+        /// Saves an <see cref="IDataTypeDefinition"/>
+        /// </summary>
+        /// <param name="dataTypeDefinition"><see cref="IDataTypeDefinition"/> to save</param>
+        /// <param name="userId">Id of the user issueing the save</param>
+        void Save(IDataTypeDefinition dataTypeDefinition, int userId = 0);
+
+        /// <summary>
+        /// Saves a collection of <see cref="IDataTypeDefinition"/>
+        /// </summary>
+        /// <param name="dataTypeDefinitions"><see cref="IDataTypeDefinition"/> to save</param>
+        /// <param name="userId">Id of the user issueing the save</param>
+        void Save(IEnumerable<IDataTypeDefinition> dataTypeDefinitions, int userId = 0);
+
+        /// <summary>
+        /// Saves a collection of <see cref="IDataTypeDefinition"/>
+        /// </summary>
+        /// <param name="dataTypeDefinitions"><see cref="IDataTypeDefinition"/> to save</param>
+        /// <param name="userId">Id of the user issueing the save</param>
+        /// <param name="raiseEvents">Boolean indicating whether or not to raise events</param>
+        void Save(IEnumerable<IDataTypeDefinition> dataTypeDefinitions, int userId, bool raiseEvents);
+
+        /// <summary>
+        /// Deletes an <see cref="IDataTypeDefinition"/>
+        /// </summary>
+        /// <remarks>
+        /// Please note that deleting a <see cref="IDataTypeDefinition"/> will remove
+        /// all the <see cref="PropertyType"/> data that references this <see cref="IDataTypeDefinition"/>.
+        /// </remarks>
+        /// <param name="dataTypeDefinition"><see cref="IDataTypeDefinition"/> to delete</param>
+        /// <param name="userId">Id of the user issueing the deletion</param>
+        void Delete(IDataTypeDefinition dataTypeDefinition, int userId = 0);
+
+        /// <summary>
+        /// Gets the <see cref="IDataType"/> specified by it's unique ID
+        /// </summary>
+        /// <param name="id">Id of the DataType, which corresponds to the Guid Id of the control</param>
+        /// <returns><see cref="IDataType"/> object</returns>
+        [Obsolete("IDataType is obsolete and is no longer used, it will be removed from the codebase in future versions")]
+        IDataType GetDataTypeById(Guid id);
+
+        /// <summary>
+        /// Gets a complete list of all registered <see cref="IDataType"/>'s
+        /// </summary>
+        /// <returns>An enumerable list of <see cref="IDataType"/> objects</returns>
+        [Obsolete("IDataType is obsolete and is no longer used, it will be removed from the codebase in future versions")]
+        IEnumerable<IDataType> GetAllDataTypes();
+
+        /// <summary>
+        /// Gets a <see cref="IDataTypeDefinition"/> by its control Id
+        /// </summary>
+        /// <param name="id">Id of the DataType control</param>
+        /// <returns><see cref="IDataTypeDefinition"/></returns>
+        [Obsolete("Property editor's are defined by a string alias from version 7 onwards, use the overload GetDataTypeDefinitionByPropertyEditorAlias instead")]
+        IEnumerable<IDataTypeDefinition> GetDataTypeDefinitionByControlId(Guid id);
+
+        /// <summary>
+        /// Gets a <see cref="IDataTypeDefinition"/> by its control Id
+        /// </summary>
+        /// <param name="propertyEditorAlias">Alias of the property editor</param>
+        /// <returns>Collection of <see cref="IDataTypeDefinition"/> objects with a matching contorl id</returns>
+        IEnumerable<IDataTypeDefinition> GetDataTypeDefinitionByPropertyEditorAlias(string propertyEditorAlias);
+
+        /// <summary>
+        /// Gets all values for an <see cref="IDataTypeDefinition"/>
+        /// </summary>
+        /// <param name="id">Id of the <see cref="IDataTypeDefinition"/> to retrieve prevalues from</param>
+        /// <returns>An enumerable list of string values</returns>
+        IEnumerable<string> GetPreValuesByDataTypeId(int id);
+
+        /// <summary>
+        /// Gets a pre-value collection by data type id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        PreValueCollection GetPreValuesCollectionByDataTypeId(int id);
+
+        /// <summary>
+        /// Saves a list of PreValues for a given DataTypeDefinition
+        /// </summary>
+        /// <param name="dataTypeId">Id of the DataTypeDefinition to save PreValues for</param>
+        /// <param name="values">List of string values to save</param>
+        [Obsolete("This should no longer be used, use the alternative SavePreValues or SaveDataTypeAndPreValues methods instead. This will only insert pre-values without keys")]
+        void SavePreValues(int dataTypeId, IEnumerable<string> values);
+
+        /// <summary>
+        /// Saves a list of PreValues for a given DataTypeDefinition
+        /// </summary>
+        /// <param name="dataTypeId">Id of the DataTypeDefinition to save PreValues for</param>
+        /// <param name="values">List of key/value pairs to save</param>
+        void SavePreValues(int dataTypeId, IDictionary<string, PreValue> values);
+
+        /// <summary>
+        /// Saves a list of PreValues for a given DataTypeDefinition
+        /// </summary>
+        /// <param name="dataTypeDefinition">The DataTypeDefinition to save PreValues for</param>
+        /// <param name="values">List of key/value pairs to save</param>
+        void SavePreValues(IDataTypeDefinition dataTypeDefinition, IDictionary<string, PreValue> values);
+
+        /// <summary>
+        /// Saves the data type and it's prevalues
+        /// </summary>
+        /// <param name="dataTypeDefinition"></param>
+        /// <param name="values"></param>
+        /// <param name="userId"></param>
+        void SaveDataTypeAndPreValues(IDataTypeDefinition dataTypeDefinition, IDictionary<string, PreValue> values, int userId = 0);
+
+        /// <summary>
+        /// Gets a specific PreValue by its Id
+        /// </summary>
+        /// <param name="id">Id of the PreValue to retrieve the value from</param>
+        /// <returns>PreValue as a string</returns>
+        string GetPreValueAsString(int id);
+
+        Attempt<OperationStatus<MoveOperationStatusType>> Move(IDataTypeDefinition toMove, int parentId);
+
+        bool IsDataTypeIgnoringUserStartNodes(Guid dataTypeId);
+    }
+}
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreesearchbox.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreesearchbox.directive.js
index b81e62a66b..3b6fb5f9cd 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreesearchbox.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreesearchbox.directive.js
@@ -12,7 +12,7 @@ function treeSearchBox(localizationService, searchService, $q) {
             searchFromName: "@",
             showSearch: "@",
             section: "@",
-            ignoreUserStartNodes: "@",
+            datatypeId: "@",
             hideSearchCallback: "=",
             searchCallback: "="
         },
@@ -62,10 +62,10 @@ function treeSearchBox(localizationService, searchService, $q) {
                         searchArgs["searchFrom"] = scope.searchFromId;
                     }
 
-                    //append ignoreUserStartNodes value if there is one
-                    if (scope.ignoreUserStartNodes) {                        
-                        searchArgs["ignoreUserStartNodes"] = scope.ignoreUserStartNodes;
-                    }                   
+                    //append dataTypeId value if there is one
+                    if (scope.datatypeId) {
+                        searchArgs["dataTypeId"] = scope.datatypeId;
+                    }
 
                     searcher(searchArgs).then(function (data) {
                         scope.searchCallback(data);
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
index 77e587bcc6..31eccfb5aa 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
@@ -19,8 +19,8 @@
   *    contentResource.getById(1234)
   *          .then(function(data) {
   *              $scope.content = data;
-  *          });    
-  * </pre> 
+  *          });
+  * </pre>
   **/
 
 function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
@@ -83,7 +83,7 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
           *    .then(function() {
           *        $scope.complete = true;
           *    });
-          * </pre> 
+          * </pre>
           * @param {Object} args arguments object
           * @param {Int} args.parentId the ID of the parent node
           * @param {Array} options.sortedIds array of node IDs as they should be sorted
@@ -124,9 +124,9 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
           *    .then(function() {
           *        alert("node was moved");
           *    }, function(err){
-          *      alert("node didnt move:" + err.data.Message); 
+          *      alert("node didnt move:" + err.data.Message);
           *    });
-          * </pre> 
+          * </pre>
           * @param {Object} args arguments object
           * @param {Int} args.idd the ID of the node to move
           * @param {Int} args.parentId the ID of the parent node to move to
@@ -167,9 +167,9 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
           *    .then(function() {
           *        alert("node was copied");
           *    }, function(err){
-          *      alert("node wasnt copy:" + err.data.Message); 
+          *      alert("node wasnt copy:" + err.data.Message);
           *    });
-          * </pre> 
+          * </pre>
           * @param {Object} args arguments object
           * @param {Int} args.id the ID of the node to copy
           * @param {Int} args.parentId the ID of the parent node to copy to
@@ -208,9 +208,9 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
           *    .then(function() {
           *        alert("node was unpulished");
           *    }, function(err){
-          *      alert("node wasnt unpublished:" + err.data.Message); 
+          *      alert("node wasnt unpublished:" + err.data.Message);
           *    });
-          * </pre> 
+          * </pre>
           * @param {Int} id the ID of the node to unpublish
           * @returns {Promise} resourcePromise object.
           *
@@ -242,8 +242,8 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
           *    .then(function() {
           *        alert('its empty!');
           *    });
-          * </pre> 
-          *         
+          * </pre>
+          *
           * @returns {Promise} resourcePromise object.
           *
           */
@@ -270,9 +270,9 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
           *    .then(function() {
           *        alert('its gone!');
           *    });
-          * </pre> 
-          * 
-          * @param {Int} id id of content item to delete        
+          * </pre>
+          *
+          * @param {Int} id id of content item to delete
           * @returns {Promise} resourcePromise object.
           *
           */
@@ -308,20 +308,20 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
           * <pre>
           * contentResource.getById(1234)
           *    .then(function(content) {
-          *        var myDoc = content; 
+          *        var myDoc = content;
           *        alert('its here!');
           *    });
-          * </pre> 
-          * 
+          * </pre>
+          *
           * @param {Int} id id of content item to return
           * @param {Object} options optional options object
-          * @param {Bool} options.ignoreUserStartNodes set to true to allow a user to choose nodes that they normally don't have access to
+          * @param {Guid} options.dataTypeId set to determine whether to allow a user to choose nodes that they normally don't have access to
           * @returns {Promise} resourcePromise object containing the content item.
           *
           */
         getById: function (id, options) {
             var defaults = {
-                ignoreUserStartNodes: false
+                dataTypeId: null
             };
             if (options === undefined) {
                 options = {};
@@ -336,7 +336,7 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
                         umbRequestHelper.getApiUrl(
                               "contentApiBaseUrl",
                               "GetById",
-                              [{ id: id }, { ignoreUserStartNodes: options.ignoreUserStartNodes }])),
+                              [{ id: id }, { dataTypeId: options.dataTypeId }])),
                   'Failed to retrieve data for content id ' + id);
         },
 
@@ -385,12 +385,12 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
           * <pre>
           * contentResource.getByIds( [1234,2526,28262])
           *    .then(function(contentArray) {
-          *        var myDoc = contentArray; 
+          *        var myDoc = contentArray;
           *        alert('they are here!');
           *    });
-          * </pre> 
-          * 
-          * @param {Array} ids ids of content items to return as an array        
+          * </pre>
+          *
+          * @param {Array} ids ids of content items to return as an array
           * @returns {Promise} resourcePromise object containing the content items array.
           *
           */
@@ -418,28 +418,28 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
           *
           * @description
           * Returns a scaffold of an empty content item, given the id of the content item to place it underneath and the content type alias.
-          * 
+          *
           * - Parent Id must be provided so umbraco knows where to store the content
-          * - Content Type alias must be provided so umbraco knows which properties to put on the content scaffold 
-          * 
+          * - Content Type alias must be provided so umbraco knows which properties to put on the content scaffold
+          *
           * The scaffold is used to build editors for content that has not yet been populated with data.
-          * 
+          *
           * ##usage
           * <pre>
           * contentResource.getScaffold(1234, 'homepage')
           *    .then(function(scaffold) {
           *        var myDoc = scaffold;
-          *        myDoc.name = "My new document"; 
+          *        myDoc.name = "My new document";
           *
           *        contentResource.publish(myDoc, true)
           *            .then(function(content){
           *                alert("Retrieved, updated and published again");
           *            });
           *    });
-          * </pre> 
-          * 
+          * </pre>
+          *
           * @param {Int} parentId id of content item to return
-          * @param {String} alias contenttype alias to base the scaffold on        
+          * @param {String} alias contenttype alias to base the scaffold on
           * @returns {Promise} resourcePromise object containing the content scaffold.
           *
           */
@@ -479,8 +479,8 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
           *    .then(function(url) {
           *        alert('its here!');
           *    });
-          * </pre> 
-          * 
+          * </pre>
+          *
           * @param {Int} id Id of node to return the public url to
           * @returns {Promise} resourcePromise object containing the url.
           *
@@ -506,11 +506,11 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
           * <pre>
           * contentResource.getChildren(1234, {pageSize: 10, pageNumber: 2})
           *    .then(function(contentArray) {
-          *        var children = contentArray; 
+          *        var children = contentArray;
           *        alert('they are here!');
           *    });
-          * </pre> 
-          * 
+          * </pre>
+          *
           * @param {Int} parentid id of content item to return children of
           * @param {Object} options optional options object
           * @param {Int} options.pageSize if paging data, number of nodes per page, default = 0
@@ -594,10 +594,10 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
           *    .then(function() {
           *        alert('You are allowed to publish this item');
           *    });
-          * </pre> 
+          * </pre>
           *
           * @param {String} permission char representing the permission to check
-          * @param {Int} id id of content item to delete        
+          * @param {Int} id id of content item to delete
           * @returns {Promise} resourcePromise object.
           *
           */
@@ -637,9 +637,9 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
           *
           * @description
           * Saves changes made to a content item to its current version, if the content item is new, the isNew paramater must be passed to force creation
-          * if the content item needs to have files attached, they must be provided as the files param and passed separately 
-          * 
-          * 
+          * if the content item needs to have files attached, they must be provided as the files param and passed separately
+          *
+          *
           * ##usage
           * <pre>
           * contentResource.getById(1234)
@@ -650,11 +650,11 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
           *                alert("Retrieved, updated and saved again");
           *            });
           *    });
-          * </pre> 
-          * 
+          * </pre>
+          *
           * @param {Object} content The content item object with changes applied
-          * @param {Bool} isNew set to true to create a new item or to update an existing 
-          * @param {Array} files collection of files for the document      
+          * @param {Bool} isNew set to true to create a new item or to update an existing
+          * @param {Array} files collection of files for the document
           * @returns {Promise} resourcePromise object containing the saved content item.
           *
           */
@@ -679,9 +679,9 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
           *
           * @description
           * Saves and publishes changes made to a content item to a new version, if the content item is new, the isNew paramater must be passed to force creation
-          * if the content item needs to have files attached, they must be provided as the files param and passed separately 
-          * 
-          * 
+          * if the content item needs to have files attached, they must be provided as the files param and passed separately
+          *
+          *
           * ##usage
           * <pre>
           * contentResource.getById(1234)
@@ -692,11 +692,11 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
           *                alert("Retrieved, updated and published again");
           *            });
           *    });
-          * </pre> 
-          * 
+          * </pre>
+          *
           * @param {Object} content The content item object with changes applied
-          * @param {Bool} isNew set to true to create a new item or to update an existing 
-          * @param {Array} files collection of files for the document      
+          * @param {Bool} isNew set to true to create a new item or to update an existing
+          * @param {Array} files collection of files for the document
           * @returns {Promise} resourcePromise object containing the saved content item.
           *
           */
@@ -715,7 +715,7 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
           *
           * @description
           * Saves changes made to a content item, and notifies any subscribers about a pending publication
-          * 
+          *
           * ##usage
           * <pre>
           * contentResource.getById(1234)
@@ -726,11 +726,11 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
           *                alert("Retrieved, updated and notication send off");
           *            });
           *    });
-          * </pre> 
-          * 
+          * </pre>
+          *
           * @param {Object} content The content item object with changes applied
-          * @param {Bool} isNew set to true to create a new item or to update an existing 
-          * @param {Array} files collection of files for the document      
+          * @param {Bool} isNew set to true to create a new item or to update an existing
+          * @param {Array} files collection of files for the document
           * @returns {Promise} resourcePromise object containing the saved content item.
           *
           */
@@ -748,15 +748,15 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
           *
           * @description
           * Publishes a content item with a given ID
-          * 
+          *
           * ##usage
           * <pre>
           * contentResource.publishById(1234)
           *    .then(function(content) {
           *        alert("published");
           *    });
-          * </pre> 
-          * 
+          * </pre>
+          *
           * @param {Int} id The ID of the conten to publish
           * @returns {Promise} resourcePromise object containing the published content item.
           *
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
index 4875491dc6..fff4ddde37 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
@@ -1,584 +1,584 @@
-/**
-    * @ngdoc service
-    * @name umbraco.resources.entityResource
-    * @description Loads in basic data for all entities
-    * 
-    * ##What is an entity?
-    * An entity is a basic **read-only** representation of an Umbraco node. It contains only the most
-    * basic properties used to display the item in trees, lists and navigation. 
-    *
-    * ##What is the difference between entity and content/media/etc...?
-    * the entity only contains the basic node data, name, id and guid, whereas content
-    * nodes fetched through the content service also contains additional all of the content property data, etc..
-    * This is the same principal for all entity types. Any user that is logged in to the back office will have access
-    * to view the basic entity information for all entities since the basic entity information does not contain sensitive information.
-    *
-    * ##Entity object types?
-    * You need to specify the type of object you want returned.
-    * 
-    * The core object types are:
-    *
-    * - Document
-    * - Media
-    * - Member
-    * - Template
-    * - DocumentType
-    * - MediaType
-    * - MemberType
-    * - Macro
-    * - User
-    * - Language
-    * - Domain
-    * - DataType
-    **/
-function entityResource($q, $http, umbRequestHelper) {
-
-    //the factory object returned
-    return {
-        
-        getSafeAlias: function (value, camelCase) {
-
-            if (!value) {
-                return "";
-            }
-            value = value.replace("#", "");
-            return umbRequestHelper.resourcePromise(
-               $http.get(
-                   umbRequestHelper.getApiUrl(
-                       "entityApiBaseUrl",
-                       "GetSafeAlias", { value: value, camelCase: camelCase })),
-               'Failed to retrieve content type scaffold');
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.entityResource#getPath
-         * @methodOf umbraco.resources.entityResource
-         *
-         * @description
-         * Returns a path, given a node ID and type
-         *
-         * ##usage
-         * <pre>
-         * entityResource.getPath(id, type)
-         *    .then(function(pathArray) {
-         *        alert('its here!');
-         *    });
-         * </pre> 
-         * 
-         * @param {Int} id Id of node to return the public url to
-         * @param {string} type Object type name     
-         * @returns {Promise} resourcePromise object containing the url.
-         *
-         */
-        getPath: function (id, type) {
-
-            if (id === -1 || id === "-1") {
-                return "-1";
-            }
-
-            return umbRequestHelper.resourcePromise(
-               $http.get(
-                   umbRequestHelper.getApiUrl(
-                       "entityApiBaseUrl",
-                       "GetPath",
-                       [{ id: id }, {type: type }])),
-               'Failed to retrieve path for id:' + id);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.entityResource#getUrl
-         * @methodOf umbraco.resources.entityResource
-         *
-         * @description
-         * Returns a url, given a node ID and type
-         *
-         * ##usage
-         * <pre>
-         * entityResource.getUrl(id, type)
-         *    .then(function(url) {
-         *        alert('its here!');
-         *    });
-         * </pre> 
-         * 
-         * @param {Int} id Id of node to return the public url to
-         * @param {string} type Object type name
-         * @returns {Promise} resourcePromise object containing the url.
-         *
-         */
-        getUrl: function (id, type) {
-
-            if (id === -1 || id === "-1") {
-                return "";
-            }
-
-            return umbRequestHelper.resourcePromise(
-               $http.get(
-                   umbRequestHelper.getApiUrl(
-                       "entityApiBaseUrl",
-                       "GetUrl",
-                       [{ id: id }, {type: type }])),
-               'Failed to retrieve url for id:' + id);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.entityResource#getById
-         * @methodOf umbraco.resources.entityResource
-         *
-         * @description
-         * Gets an entity with a given id
-         *
-         * ##usage
-         * <pre>
-         * //get media by id
-         * entityResource.getEntityById(0, "Media")
-         *    .then(function(ent) {
-         *        var myDoc = ent; 
-         *        alert('its here!');
-         *    });
-         * </pre> 
-         * 
-         * @param {Int} id id of entity to return
-         * @param {string} type Object type name        
-         * @returns {Promise} resourcePromise object containing the entity.
-         *
-         */
-        getById: function (id, type) {      
-
-            if (id === -1 || id === "-1") {
-                return null;
-            }
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "entityApiBaseUrl",
-                        "GetById",
-                        [{ id: id }, { type: type }])),
-                'Failed to retrieve entity data for id ' + id);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.entityResource#getByIds
-         * @methodOf umbraco.resources.entityResource
-         *
-         * @description
-         * Gets an array of entities, given a collection of ids
-         *
-         * ##usage
-         * <pre>
-         * //Get templates for ids
-         * entityResource.getEntitiesByIds( [1234,2526,28262], "Template")
-         *    .then(function(templateArray) {
-         *        var myDoc = contentArray; 
-         *        alert('they are here!');
-         *    });
-         * </pre> 
-         * 
-         * @param {Array} ids ids of entities to return as an array
-         * @param {string} type type name        
-         * @returns {Promise} resourcePromise object containing the entity array.
-         *
-         */
-        getByIds: function (ids, type) {
-            
-            var query = "type=" + type;
-
-            return umbRequestHelper.resourcePromise(
-               $http.post(
-                   umbRequestHelper.getApiUrl(
-                       "entityApiBaseUrl",
-                       "GetByIds",
-                       query),
-                   {
-                       ids: ids
-                   }),
-               'Failed to retrieve entity data for ids ' + ids);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.entityResource#getByQuery
-         * @methodOf umbraco.resources.entityResource
-         *
-         * @description
-         * Gets an entity from a given xpath
-         *
-         * ##usage
-         * <pre>
-         * //get content by xpath
-         * entityResource.getByQuery("$current", -1, "Document")
-         *    .then(function(ent) {
-         *        var myDoc = ent; 
-         *        alert('its here!');
-         *    });
-         * </pre> 
-         * 
-         * @param {string} query xpath to use in query
-         * @param {Int} nodeContextId id id to start from
-         * @param {string} type Object type name        
-         * @returns {Promise} resourcePromise object containing the entity.
-         *
-         */
-        getByQuery: function (query, nodeContextId, type) {
-            return umbRequestHelper.resourcePromise(
-               $http.get(
-                   umbRequestHelper.getApiUrl(
-                       "entityApiBaseUrl",
-                       "GetByQuery",
-                       [{ query: query }, { nodeContextId: nodeContextId }, { type: type }])),
-               'Failed to retrieve entity data for query ' + query);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.entityResource#getAll
-         * @methodOf umbraco.resources.entityResource
-         *
-         * @description
-         * Gets an entity with a given id
-         *
-         * ##usage
-         * <pre>
-         *
-         * //Only return media
-         * entityResource.getAll("Media")
-         *    .then(function(ent) {
-         *        var myDoc = ent; 
-         *        alert('its here!');
-         *    });
-         * </pre> 
-         * 
-         * @param {string} type Object type name        
-         * @param {string} postFilter optional filter expression which will execute a dynamic where clause on the server
-         * @param {string} postFilterParams optional parameters for the postFilter expression
-         * @returns {Promise} resourcePromise object containing the entity.
-         *
-         */
-        getAll: function (type, postFilter, postFilterParams) {            
-
-            //need to build the query string manually
-            var query = "type=" + type + "&postFilter=" + (postFilter ? postFilter : "");
-            if (postFilter && postFilterParams) {
-                var counter = 0;
-                _.each(postFilterParams, function(val, key) {
-                    query += "&postFilterParams[" + counter + "].key=" + key + "&postFilterParams[" + counter + "].value=" + val;
-                    counter++;
-                });
-            } 
-
-            return umbRequestHelper.resourcePromise(
-               $http.get(
-                   umbRequestHelper.getApiUrl(
-                       "entityApiBaseUrl",
-                       "GetAll",
-                       query)),
-               'Failed to retrieve entity data for type ' + type);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.entityResource#getAncestors
-         * @methodOf umbraco.resources.entityResource
-         *
-         * @description
-         * Gets ancestor entities for a given item
-         *        
-         * 
-         * @param {string} type Object type name        
-         * @returns {Promise} resourcePromise object containing the entity.
-         *
-         */
-        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 },
-                           { ignoreUserStartNodes: options.ignoreUserStartNodes }
-                       ])),
-                       'Failed to retrieve ancestor data for id ' + id);
-        },
-        
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.entityResource#getChildren
-         * @methodOf umbraco.resources.entityResource
-         *
-         * @description
-         * Gets children entities for a given item
-         *        
-         * @param {Int} parentid id of content item to return children of
-         * @param {string} type Object type name        
-         * @returns {Promise} resourcePromise object containing the entity.
-         *
-         */
-        getChildren: function (id, type) {
-
-            return umbRequestHelper.resourcePromise(
-               $http.get(
-                   umbRequestHelper.getApiUrl(
-                       "entityApiBaseUrl",
-                       "GetChildren",
-                       [{ id: id }, { type: type }])),
-               'Failed to retrieve child data for id ' + id);
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.entityResource#getPagedChildren
-          * @methodOf umbraco.resources.entityResource
-          *
-          * @description
-          * Gets paged children of a content item with a given id
-          *
-          * ##usage
-          * <pre>
-          * entityResource.getPagedChildren(1234, "Content", {pageSize: 10, pageNumber: 2})
-          *    .then(function(contentArray) {
-          *        var children = contentArray; 
-          *        alert('they are here!');
-          *    });
-          * </pre> 
-          * 
-          * @param {Int} parentid id of content item to return children of
-          * @param {string} type Object type name
-          * @param {Object} options optional options object
-          * @param {Int} options.pageSize if paging data, number of nodes per page, default = 1
-          * @param {Int} options.pageNumber if paging data, current page index, default = 100
-          * @param {String} options.filter if provided, query will only return those with names matching the filter
-          * @param {String} options.orderDirection can be `Ascending` or `Descending` - Default: `Ascending`
-          * @param {String} options.orderBy property to order items by, default: `SortOrder`
-          * @returns {Promise} resourcePromise object containing an array of content items.
-          *
-          */
-        getPagedChildren: function (parentId, type, options) {
-
-            var defaults = {
-                pageSize: 1,
-                pageNumber: 100,
-                filter: '',
-                orderDirection: "Ascending",
-                orderBy: "SortOrder"
-            };
-            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;
-            //change asc/desct
-            if (options.orderDirection === "asc") {
-                options.orderDirection = "Ascending";
-            }
-            else if (options.orderDirection === "desc") {
-                options.orderDirection = "Descending";
-            }
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "entityApiBaseUrl",
-                        "GetPagedChildren",
-                        {
-                            id: parentId,
-                            type: type,
-                            pageNumber: options.pageNumber,
-                            pageSize: options.pageSize,
-                            orderBy: options.orderBy,
-                            orderDirection: options.orderDirection,
-                            filter: encodeURIComponent(options.filter)
-                        }
-                    )),
-                'Failed to retrieve child data for id ' + parentId);
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.entityResource#getPagedDescendants
-          * @methodOf umbraco.resources.entityResource
-          *
-          * @description
-          * Gets paged descendants of a content item with a given id
-          *
-          * ##usage
-          * <pre>
-          * entityResource.getPagedDescendants(1234, "Document", {pageSize: 10, pageNumber: 2})
-          *    .then(function(contentArray) {
-          *        var children = contentArray; 
-          *        alert('they are here!');
-          *    });
-          * </pre> 
-          * 
-          * @param {Int} parentid id of content item to return descendants of
-          * @param {string} type Object type name
-          * @param {Object} options optional options object
-          * @param {Int} options.pageSize if paging data, number of nodes per page, default = 100
-          * @param {Int} options.pageNumber if paging data, current page index, default = 1
-          * @param {String} options.filter if provided, query will only return those with names matching the filter
-          * @param {String} options.orderDirection can be `Ascending` or `Descending` - Default: `Ascending`
-          * @param {String} options.orderBy property to order items by, default: `SortOrder`
-          * @returns {Promise} resourcePromise object containing an array of content items.
-          *
-          */
-        getPagedDescendants: function (parentId, type, options) {
-
-            var defaults = {
-                pageSize: 100,
-                pageNumber: 1,
-                filter: '',
-                orderDirection: "Ascending",
-                orderBy: "SortOrder",
-                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;
-            //change asc/desct
-            if (options.orderDirection === "asc") {
-                options.orderDirection = "Ascending";
-            }
-            else if (options.orderDirection === "desc") {
-                options.orderDirection = "Descending";
-            }
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "entityApiBaseUrl",
-                        "GetPagedDescendants",
-                        {
-                            id: parentId,
-                            type: type,
-                            pageNumber: options.pageNumber,
-                            pageSize: options.pageSize,
-                            orderBy: options.orderBy,
-                            orderDirection: options.orderDirection,
-                            filter: encodeURIComponent(options.filter),
-                            ignoreUserStartNodes: options.ignoreUserStartNodes
-                        }
-                    )),
-                'Failed to retrieve child data for id ' + parentId);
-        },
-     
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.entityResource#search
-         * @methodOf umbraco.resources.entityResource
-         *
-         * @description
-         * Gets an array of entities, given a lucene query and a type
-         *
-         * ##usage
-         * <pre>
-         * entityResource.search("news", "Media")
-         *    .then(function(mediaArray) {
-         *        var myDoc = mediaArray; 
-         *        alert('they are here!');
-         *    });
-         * </pre> 
-         * 
-         * @param {String} Query search query 
-         * @param {String} Type type of conten to search        
-         * @returns {Promise} resourcePromise object containing the entity array.
-         *
-         */
-        search: function (query, type, options, canceler) {
-
-            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) {
-                httpConfig["timeout"] = canceler;
-            }
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "entityApiBaseUrl",
-                        "Search",
-                        {
-                            query: query,
-                            type: type,
-                            searchFrom: options.searchFrom,
-                            ignoreUserStartNodes: options.ignoreUserStartNodes
-                        }),
-                    httpConfig),
-                'Failed to retrieve entity data for query ' + query);
-        },
-        
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.entityResource#searchAll
-         * @methodOf umbraco.resources.entityResource
-         *
-         * @description
-         * Gets an array of entities from all available search indexes, given a lucene query
-         *
-         * ##usage
-         * <pre>
-         * entityResource.searchAll("bob")
-         *    .then(function(array) {
-         *        var myDoc = array; 
-         *        alert('they are here!');
-         *    });
-         * </pre> 
-         * 
-         * @param {String} Query search query 
-         * @returns {Promise} resourcePromise object containing the entity array.
-         *
-         */
-        searchAll: function (query, canceler) {
-
-            var httpConfig = {};
-            if (canceler) {
-                httpConfig["timeout"] = canceler;
-            }
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "entityApiBaseUrl",
-                        "SearchAll",
-                        [{ query: query }]),
-                    httpConfig),
-                'Failed to retrieve entity data for query ' + query);
-        }
-            
-    };
-}
-
-angular.module('umbraco.resources').factory('entityResource', entityResource);
+/**
+    * @ngdoc service
+    * @name umbraco.resources.entityResource
+    * @description Loads in basic data for all entities
+    *
+    * ##What is an entity?
+    * An entity is a basic **read-only** representation of an Umbraco node. It contains only the most
+    * basic properties used to display the item in trees, lists and navigation.
+    *
+    * ##What is the difference between entity and content/media/etc...?
+    * the entity only contains the basic node data, name, id and guid, whereas content
+    * nodes fetched through the content service also contains additional all of the content property data, etc..
+    * This is the same principal for all entity types. Any user that is logged in to the back office will have access
+    * to view the basic entity information for all entities since the basic entity information does not contain sensitive information.
+    *
+    * ##Entity object types?
+    * You need to specify the type of object you want returned.
+    *
+    * The core object types are:
+    *
+    * - Document
+    * - Media
+    * - Member
+    * - Template
+    * - DocumentType
+    * - MediaType
+    * - MemberType
+    * - Macro
+    * - User
+    * - Language
+    * - Domain
+    * - DataType
+    **/
+function entityResource($q, $http, umbRequestHelper) {
+
+    //the factory object returned
+    return {
+
+        getSafeAlias: function (value, camelCase) {
+
+            if (!value) {
+                return "";
+            }
+            value = value.replace("#", "");
+            return umbRequestHelper.resourcePromise(
+               $http.get(
+                   umbRequestHelper.getApiUrl(
+                       "entityApiBaseUrl",
+                       "GetSafeAlias", { value: value, camelCase: camelCase })),
+               'Failed to retrieve content type scaffold');
+        },
+
+        /**
+         * @ngdoc method
+         * @name umbraco.resources.entityResource#getPath
+         * @methodOf umbraco.resources.entityResource
+         *
+         * @description
+         * Returns a path, given a node ID and type
+         *
+         * ##usage
+         * <pre>
+         * entityResource.getPath(id, type)
+         *    .then(function(pathArray) {
+         *        alert('its here!');
+         *    });
+         * </pre>
+         *
+         * @param {Int} id Id of node to return the public url to
+         * @param {string} type Object type name
+         * @returns {Promise} resourcePromise object containing the url.
+         *
+         */
+        getPath: function (id, type) {
+
+            if (id === -1 || id === "-1") {
+                return "-1";
+            }
+
+            return umbRequestHelper.resourcePromise(
+               $http.get(
+                   umbRequestHelper.getApiUrl(
+                       "entityApiBaseUrl",
+                       "GetPath",
+                       [{ id: id }, {type: type }])),
+               'Failed to retrieve path for id:' + id);
+        },
+
+        /**
+         * @ngdoc method
+         * @name umbraco.resources.entityResource#getUrl
+         * @methodOf umbraco.resources.entityResource
+         *
+         * @description
+         * Returns a url, given a node ID and type
+         *
+         * ##usage
+         * <pre>
+         * entityResource.getUrl(id, type)
+         *    .then(function(url) {
+         *        alert('its here!');
+         *    });
+         * </pre>
+         *
+         * @param {Int} id Id of node to return the public url to
+         * @param {string} type Object type name
+         * @returns {Promise} resourcePromise object containing the url.
+         *
+         */
+        getUrl: function (id, type) {
+
+            if (id === -1 || id === "-1") {
+                return "";
+            }
+
+            return umbRequestHelper.resourcePromise(
+               $http.get(
+                   umbRequestHelper.getApiUrl(
+                       "entityApiBaseUrl",
+                       "GetUrl",
+                       [{ id: id }, {type: type }])),
+               'Failed to retrieve url for id:' + id);
+        },
+
+        /**
+         * @ngdoc method
+         * @name umbraco.resources.entityResource#getById
+         * @methodOf umbraco.resources.entityResource
+         *
+         * @description
+         * Gets an entity with a given id
+         *
+         * ##usage
+         * <pre>
+         * //get media by id
+         * entityResource.getEntityById(0, "Media")
+         *    .then(function(ent) {
+         *        var myDoc = ent;
+         *        alert('its here!');
+         *    });
+         * </pre>
+         *
+         * @param {Int} id id of entity to return
+         * @param {string} type Object type name
+         * @returns {Promise} resourcePromise object containing the entity.
+         *
+         */
+        getById: function (id, type) {
+
+            if (id === -1 || id === "-1") {
+                return null;
+            }
+
+            return umbRequestHelper.resourcePromise(
+                $http.get(
+                    umbRequestHelper.getApiUrl(
+                        "entityApiBaseUrl",
+                        "GetById",
+                        [{ id: id }, { type: type }])),
+                'Failed to retrieve entity data for id ' + id);
+        },
+
+        /**
+         * @ngdoc method
+         * @name umbraco.resources.entityResource#getByIds
+         * @methodOf umbraco.resources.entityResource
+         *
+         * @description
+         * Gets an array of entities, given a collection of ids
+         *
+         * ##usage
+         * <pre>
+         * //Get templates for ids
+         * entityResource.getEntitiesByIds( [1234,2526,28262], "Template")
+         *    .then(function(templateArray) {
+         *        var myDoc = contentArray;
+         *        alert('they are here!');
+         *    });
+         * </pre>
+         *
+         * @param {Array} ids ids of entities to return as an array
+         * @param {string} type type name
+         * @returns {Promise} resourcePromise object containing the entity array.
+         *
+         */
+        getByIds: function (ids, type) {
+
+            var query = "type=" + type;
+
+            return umbRequestHelper.resourcePromise(
+               $http.post(
+                   umbRequestHelper.getApiUrl(
+                       "entityApiBaseUrl",
+                       "GetByIds",
+                       query),
+                   {
+                       ids: ids
+                   }),
+               'Failed to retrieve entity data for ids ' + ids);
+        },
+
+        /**
+         * @ngdoc method
+         * @name umbraco.resources.entityResource#getByQuery
+         * @methodOf umbraco.resources.entityResource
+         *
+         * @description
+         * Gets an entity from a given xpath
+         *
+         * ##usage
+         * <pre>
+         * //get content by xpath
+         * entityResource.getByQuery("$current", -1, "Document")
+         *    .then(function(ent) {
+         *        var myDoc = ent;
+         *        alert('its here!');
+         *    });
+         * </pre>
+         *
+         * @param {string} query xpath to use in query
+         * @param {Int} nodeContextId id id to start from
+         * @param {string} type Object type name
+         * @returns {Promise} resourcePromise object containing the entity.
+         *
+         */
+        getByQuery: function (query, nodeContextId, type) {
+            return umbRequestHelper.resourcePromise(
+               $http.get(
+                   umbRequestHelper.getApiUrl(
+                       "entityApiBaseUrl",
+                       "GetByQuery",
+                       [{ query: query }, { nodeContextId: nodeContextId }, { type: type }])),
+               'Failed to retrieve entity data for query ' + query);
+        },
+
+        /**
+         * @ngdoc method
+         * @name umbraco.resources.entityResource#getAll
+         * @methodOf umbraco.resources.entityResource
+         *
+         * @description
+         * Gets an entity with a given id
+         *
+         * ##usage
+         * <pre>
+         *
+         * //Only return media
+         * entityResource.getAll("Media")
+         *    .then(function(ent) {
+         *        var myDoc = ent;
+         *        alert('its here!');
+         *    });
+         * </pre>
+         *
+         * @param {string} type Object type name
+         * @param {string} postFilter optional filter expression which will execute a dynamic where clause on the server
+         * @param {string} postFilterParams optional parameters for the postFilter expression
+         * @returns {Promise} resourcePromise object containing the entity.
+         *
+         */
+        getAll: function (type, postFilter, postFilterParams) {
+
+            //need to build the query string manually
+            var query = "type=" + type + "&postFilter=" + (postFilter ? postFilter : "");
+            if (postFilter && postFilterParams) {
+                var counter = 0;
+                _.each(postFilterParams, function(val, key) {
+                    query += "&postFilterParams[" + counter + "].key=" + key + "&postFilterParams[" + counter + "].value=" + val;
+                    counter++;
+                });
+            }
+
+            return umbRequestHelper.resourcePromise(
+               $http.get(
+                   umbRequestHelper.getApiUrl(
+                       "entityApiBaseUrl",
+                       "GetAll",
+                       query)),
+               'Failed to retrieve entity data for type ' + type);
+        },
+
+        /**
+         * @ngdoc method
+         * @name umbraco.resources.entityResource#getAncestors
+         * @methodOf umbraco.resources.entityResource
+         *
+         * @description
+         * Gets ancestor entities for a given item
+         *
+         *
+         * @param {string} type Object type name
+         * @returns {Promise} resourcePromise object containing the entity.
+         *
+         */
+        getAncestors: function (id, type, options) {
+            var defaults = {
+                dataTypeId: null
+            };
+            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 },
+                           { dataTypeId: options.dataTypeId }
+                       ])),
+                       'Failed to retrieve ancestor data for id ' + id);
+        },
+
+        /**
+         * @ngdoc method
+         * @name umbraco.resources.entityResource#getChildren
+         * @methodOf umbraco.resources.entityResource
+         *
+         * @description
+         * Gets children entities for a given item
+         *
+         * @param {Int} parentid id of content item to return children of
+         * @param {string} type Object type name
+         * @returns {Promise} resourcePromise object containing the entity.
+         *
+         */
+        getChildren: function (id, type) {
+
+            return umbRequestHelper.resourcePromise(
+               $http.get(
+                   umbRequestHelper.getApiUrl(
+                       "entityApiBaseUrl",
+                       "GetChildren",
+                       [{ id: id }, { type: type }])),
+               'Failed to retrieve child data for id ' + id);
+        },
+
+        /**
+          * @ngdoc method
+          * @name umbraco.resources.entityResource#getPagedChildren
+          * @methodOf umbraco.resources.entityResource
+          *
+          * @description
+          * Gets paged children of a content item with a given id
+          *
+          * ##usage
+          * <pre>
+          * entityResource.getPagedChildren(1234, "Content", {pageSize: 10, pageNumber: 2})
+          *    .then(function(contentArray) {
+          *        var children = contentArray;
+          *        alert('they are here!');
+          *    });
+          * </pre>
+          *
+          * @param {Int} parentid id of content item to return children of
+          * @param {string} type Object type name
+          * @param {Object} options optional options object
+          * @param {Int} options.pageSize if paging data, number of nodes per page, default = 1
+          * @param {Int} options.pageNumber if paging data, current page index, default = 100
+          * @param {String} options.filter if provided, query will only return those with names matching the filter
+          * @param {String} options.orderDirection can be `Ascending` or `Descending` - Default: `Ascending`
+          * @param {String} options.orderBy property to order items by, default: `SortOrder`
+          * @returns {Promise} resourcePromise object containing an array of content items.
+          *
+          */
+        getPagedChildren: function (parentId, type, options) {
+
+            var defaults = {
+                pageSize: 1,
+                pageNumber: 100,
+                filter: '',
+                orderDirection: "Ascending",
+                orderBy: "SortOrder"
+            };
+            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;
+            //change asc/desct
+            if (options.orderDirection === "asc") {
+                options.orderDirection = "Ascending";
+            }
+            else if (options.orderDirection === "desc") {
+                options.orderDirection = "Descending";
+            }
+
+            return umbRequestHelper.resourcePromise(
+                $http.get(
+                    umbRequestHelper.getApiUrl(
+                        "entityApiBaseUrl",
+                        "GetPagedChildren",
+                        {
+                            id: parentId,
+                            type: type,
+                            pageNumber: options.pageNumber,
+                            pageSize: options.pageSize,
+                            orderBy: options.orderBy,
+                            orderDirection: options.orderDirection,
+                            filter: encodeURIComponent(options.filter)
+                        }
+                    )),
+                'Failed to retrieve child data for id ' + parentId);
+        },
+
+        /**
+          * @ngdoc method
+          * @name umbraco.resources.entityResource#getPagedDescendants
+          * @methodOf umbraco.resources.entityResource
+          *
+          * @description
+          * Gets paged descendants of a content item with a given id
+          *
+          * ##usage
+          * <pre>
+          * entityResource.getPagedDescendants(1234, "Document", {pageSize: 10, pageNumber: 2})
+          *    .then(function(contentArray) {
+          *        var children = contentArray;
+          *        alert('they are here!');
+          *    });
+          * </pre>
+          *
+          * @param {Int} parentid id of content item to return descendants of
+          * @param {string} type Object type name
+          * @param {Object} options optional options object
+          * @param {Int} options.pageSize if paging data, number of nodes per page, default = 100
+          * @param {Int} options.pageNumber if paging data, current page index, default = 1
+          * @param {String} options.filter if provided, query will only return those with names matching the filter
+          * @param {String} options.orderDirection can be `Ascending` or `Descending` - Default: `Ascending`
+          * @param {String} options.orderBy property to order items by, default: `SortOrder`
+          * @returns {Promise} resourcePromise object containing an array of content items.
+          *
+          */
+        getPagedDescendants: function (parentId, type, options) {
+
+            var defaults = {
+                pageSize: 100,
+                pageNumber: 1,
+                filter: '',
+                orderDirection: "Ascending",
+                orderBy: "SortOrder",
+                dataTypeId: null
+            };
+            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;
+            //change asc/desct
+            if (options.orderDirection === "asc") {
+                options.orderDirection = "Ascending";
+            }
+            else if (options.orderDirection === "desc") {
+                options.orderDirection = "Descending";
+            }
+
+            return umbRequestHelper.resourcePromise(
+                $http.get(
+                    umbRequestHelper.getApiUrl(
+                        "entityApiBaseUrl",
+                        "GetPagedDescendants",
+                        {
+                            id: parentId,
+                            type: type,
+                            pageNumber: options.pageNumber,
+                            pageSize: options.pageSize,
+                            orderBy: options.orderBy,
+                            orderDirection: options.orderDirection,
+                            filter: encodeURIComponent(options.filter),
+                            dataTypeId: options.dataTypeId
+                        }
+                    )),
+                'Failed to retrieve child data for id ' + parentId);
+        },
+
+        /**
+         * @ngdoc method
+         * @name umbraco.resources.entityResource#search
+         * @methodOf umbraco.resources.entityResource
+         *
+         * @description
+         * Gets an array of entities, given a lucene query and a type
+         *
+         * ##usage
+         * <pre>
+         * entityResource.search("news", "Media")
+         *    .then(function(mediaArray) {
+         *        var myDoc = mediaArray;
+         *        alert('they are here!');
+         *    });
+         * </pre>
+         *
+         * @param {String} Query search query
+         * @param {String} Type type of conten to search
+         * @returns {Promise} resourcePromise object containing the entity array.
+         *
+         */
+        search: function (query, type, options, canceler) {
+
+            var defaults = {
+                searchFrom: null,
+                dataTypeId: null
+            };
+            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) {
+                httpConfig["timeout"] = canceler;
+            }
+
+            return umbRequestHelper.resourcePromise(
+                $http.get(
+                    umbRequestHelper.getApiUrl(
+                        "entityApiBaseUrl",
+                        "Search",
+                        {
+                            query: query,
+                            type: type,
+                            searchFrom: options.searchFrom,
+                            dataTypeId: options.dataTypeId
+                        }),
+                    httpConfig),
+                'Failed to retrieve entity data for query ' + query);
+        },
+
+
+        /**
+         * @ngdoc method
+         * @name umbraco.resources.entityResource#searchAll
+         * @methodOf umbraco.resources.entityResource
+         *
+         * @description
+         * Gets an array of entities from all available search indexes, given a lucene query
+         *
+         * ##usage
+         * <pre>
+         * entityResource.searchAll("bob")
+         *    .then(function(array) {
+         *        var myDoc = array;
+         *        alert('they are here!');
+         *    });
+         * </pre>
+         *
+         * @param {String} Query search query
+         * @returns {Promise} resourcePromise object containing the entity array.
+         *
+         */
+        searchAll: function (query, canceler) {
+
+            var httpConfig = {};
+            if (canceler) {
+                httpConfig["timeout"] = canceler;
+            }
+
+            return umbRequestHelper.resourcePromise(
+                $http.get(
+                    umbRequestHelper.getApiUrl(
+                        "entityApiBaseUrl",
+                        "SearchAll",
+                        [{ query: query }]),
+                    httpConfig),
+                'Failed to retrieve entity data for query ' + query);
+        }
+
+    };
+}
+
+angular.module('umbraco.resources').factory('entityResource', entityResource);
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
index e968913047..6600aec0c7 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
@@ -1,559 +1,559 @@
-/**
-    * @ngdoc service
-    * @name umbraco.resources.mediaResource
-    * @description Loads in data for media
-    **/
-function mediaResource($q, $http, umbDataFormatter, umbRequestHelper) {
-
-    /** internal method process the saving of data and post processing the result */
-    function saveMediaItem(content, action, files) {
-        return umbRequestHelper.postSaveContent({
-            restApiUrl: umbRequestHelper.getApiUrl(
-                   "mediaApiBaseUrl",
-                   "PostSave"),
-            content: content,
-            action: action,
-            files: files,
-            dataFormatter: function (c, a) {
-                return umbDataFormatter.formatMediaPostData(c, a);
-            }
-        });
-    }
-
-    return {
-
-        getRecycleBin: function () {
-            return umbRequestHelper.resourcePromise(
-                  $http.get(
-                        umbRequestHelper.getApiUrl(
-                              "mediaApiBaseUrl",
-                              "GetRecycleBin")),
-                  'Failed to retrieve data for media recycle bin');
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.mediaResource#sort
-          * @methodOf umbraco.resources.mediaResource
-          *
-          * @description
-          * Sorts all children below a given parent node id, based on a collection of node-ids
-          *
-          * ##usage
-          * <pre>
-          * var ids = [123,34533,2334,23434];
-          * mediaResource.sort({ sortedIds: ids })
-          *    .then(function() {
-          *        $scope.complete = true;
-          *    });
-          * </pre>
-          * @param {Object} args arguments object
-          * @param {Int} args.parentId the ID of the parent node
-          * @param {Array} options.sortedIds array of node IDs as they should be sorted
-          * @returns {Promise} resourcePromise object.
-          *
-          */
-        sort: function (args) {
-            if (!args) {
-                throw "args cannot be null";
-            }
-            if (!args.parentId) {
-                throw "args.parentId cannot be null";
-            }
-            if (!args.sortedIds) {
-                throw "args.sortedIds cannot be null";
-            }
-
-            return umbRequestHelper.resourcePromise(
-                   $http.post(umbRequestHelper.getApiUrl("mediaApiBaseUrl", "PostSort"),
-                         {
-                             parentId: args.parentId,
-                             idSortOrder: args.sortedIds
-                         }),
-                   'Failed to sort media');
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.mediaResource#move
-          * @methodOf umbraco.resources.mediaResource
-          *
-          * @description
-          * Moves a node underneath a new parentId
-          *
-          * ##usage
-          * <pre>
-          * mediaResource.move({ parentId: 1244, id: 123 })
-          *    .then(function() {
-          *        alert("node was moved");
-          *    }, function(err){
-          *      alert("node didnt move:" + err.data.Message);
-          *    });
-          * </pre>
-          * @param {Object} args arguments object
-          * @param {Int} args.idd the ID of the node to move
-          * @param {Int} args.parentId the ID of the parent node to move to
-          * @returns {Promise} resourcePromise object.
-          *
-          */
-        move: function (args) {
-            if (!args) {
-                throw "args cannot be null";
-            }
-            if (!args.parentId) {
-                throw "args.parentId cannot be null";
-            }
-            if (!args.id) {
-                throw "args.id cannot be null";
-            }
-
-            return umbRequestHelper.resourcePromise(
-                   $http.post(umbRequestHelper.getApiUrl("mediaApiBaseUrl", "PostMove"),
-                        {
-                            parentId: args.parentId,
-                            id: args.id
-                        }),
-                        {
-                        error: function(data){
-                            var errorMsg = 'Failed to move media';
-                            if (data.id !== undefined && data.parentId !== undefined) {
-                                if (data.id === data.parentId) {
-                                    errorMsg = 'Media can\'t be moved into itself';
-                                }
-                            }
-                            else if (data.notifications !== undefined) {
-                                if (data.notifications.length > 0) {
-                                    if (data.notifications[0].header.length > 0) {
-                                        errorMsg = data.notifications[0].header;
-                                    }
-                                    if (data.notifications[0].message.length > 0) {
-                                        errorMsg = errorMsg + ": " + data.notifications[0].message;
-                                    }
-                                }
-                            }
-
-                            return {
-                                errorMsg: errorMsg
-                            };
-                       }
-                   });
-        },
-
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.mediaResource#getById
-          * @methodOf umbraco.resources.mediaResource
-          *
-          * @description
-          * Gets a media item with a given id
-          *
-          * ##usage
-          * <pre>
-          * mediaResource.getById(1234)
-          *    .then(function(media) {
-          *        var myMedia = media;
-          *        alert('its here!');
-          *    });
-          * </pre>
-          *
-          * @param {Int} id id of media item to return
-          * @returns {Promise} resourcePromise object containing the media item.
-          *
-          */
-        getById: function (id) {
-
-            return umbRequestHelper.resourcePromise(
-                  $http.get(
-                        umbRequestHelper.getApiUrl(
-                              "mediaApiBaseUrl",
-                              "GetById",
-                              [{ id: id }])),
-                  'Failed to retrieve data for media id ' + id);
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.mediaResource#deleteById
-          * @methodOf umbraco.resources.mediaResource
-          *
-          * @description
-          * Deletes a media item with a given id
-          *
-          * ##usage
-          * <pre>
-          * mediaResource.deleteById(1234)
-          *    .then(function() {
-          *        alert('its gone!');
-          *    });
-          * </pre>
-          *
-          * @param {Int} id id of media item to delete
-          * @returns {Promise} resourcePromise object.
-          *
-          */
-        deleteById: function (id) {
-            return umbRequestHelper.resourcePromise(
-                   $http.post(
-                         umbRequestHelper.getApiUrl(
-                               "mediaApiBaseUrl",
-                               "DeleteById",
-                               [{ id: id }])),
-                   'Failed to delete item ' + id);
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.mediaResource#getByIds
-          * @methodOf umbraco.resources.mediaResource
-          *
-          * @description
-          * Gets an array of media items, given a collection of ids
-          *
-          * ##usage
-          * <pre>
-          * mediaResource.getByIds( [1234,2526,28262])
-          *    .then(function(mediaArray) {
-          *        var myDoc = contentArray;
-          *        alert('they are here!');
-          *    });
-          * </pre>
-          *
-          * @param {Array} ids ids of media items to return as an array
-          * @returns {Promise} resourcePromise object containing the media items array.
-          *
-          */
-        getByIds: function (ids) {
-
-            var idQuery = "";
-            _.each(ids, function (item) {
-                idQuery += "ids=" + item + "&";
-            });
-
-            return umbRequestHelper.resourcePromise(
-                  $http.get(
-                        umbRequestHelper.getApiUrl(
-                              "mediaApiBaseUrl",
-                              "GetByIds",
-                              idQuery)),
-                  'Failed to retrieve data for media ids ' + ids);
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.mediaResource#getScaffold
-          * @methodOf umbraco.resources.mediaResource
-          *
-          * @description
-          * Returns a scaffold of an empty media item, given the id of the media item to place it underneath and the media type alias.
-          *
-          * - Parent Id must be provided so umbraco knows where to store the media
-          * - Media Type alias must be provided so umbraco knows which properties to put on the media scaffold
-          *
-          * The scaffold is used to build editors for media that has not yet been populated with data.
-          *
-          * ##usage
-          * <pre>
-          * mediaResource.getScaffold(1234, 'folder')
-          *    .then(function(scaffold) {
-          *        var myDoc = scaffold;
-          *        myDoc.name = "My new media item";
-          *
-          *        mediaResource.save(myDoc, true)
-          *            .then(function(media){
-          *                alert("Retrieved, updated and saved again");
-          *            });
-          *    });
-          * </pre>
-          *
-          * @param {Int} parentId id of media item to return
-          * @param {String} alias mediatype alias to base the scaffold on
-          * @returns {Promise} resourcePromise object containing the media scaffold.
-          *
-          */
-        getScaffold: function (parentId, alias) {
-
-            return umbRequestHelper.resourcePromise(
-                  $http.get(
-                        umbRequestHelper.getApiUrl(
-                              "mediaApiBaseUrl",
-                              "GetEmpty",
-                              [{ contentTypeAlias: alias }, { parentId: parentId }])),
-                  'Failed to retrieve data for empty media item type ' + alias);
-
-        },
-
-        rootMedia: function () {
-
-            return umbRequestHelper.resourcePromise(
-                  $http.get(
-                        umbRequestHelper.getApiUrl(
-                              "mediaApiBaseUrl",
-                              "GetRootMedia")),
-                  'Failed to retrieve data for root media');
-
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.mediaResource#getChildren
-          * @methodOf umbraco.resources.mediaResource
-          *
-          * @description
-          * Gets children of a media item with a given id
-          *
-          * ##usage
-          * <pre>
-          * mediaResource.getChildren(1234, {pageSize: 10, pageNumber: 2})
-          *    .then(function(contentArray) {
-          *        var children = contentArray;
-          *        alert('they are here!');
-          *    });
-          * </pre>
-          *
-          * @param {Int} parentid id of content item to return children of
-          * @param {Object} options optional options object
-          * @param {Int} options.pageSize if paging data, number of nodes per page, default = 0
-          * @param {Int} options.pageNumber if paging data, current page index, default = 0
-          * @param {String} options.filter if provided, query will only return those with names matching the filter
-          * @param {String} options.orderDirection can be `Ascending` or `Descending` - Default: `Ascending`
-          * @param {String} options.orderBy property to order items by, default: `SortOrder`
-          * @returns {Promise} resourcePromise object containing an array of content items.
-          *
-          */
-        getChildren: function (parentId, options) {
-
-            var defaults = {
-                pageSize: 0,
-                pageNumber: 0,
-                filter: '',
-                orderDirection: "Ascending",
-                orderBy: "SortOrder",
-                orderBySystemField: true,
-                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;
-            //change asc/desct
-            if (options.orderDirection === "asc") {
-                options.orderDirection = "Ascending";
-            }
-            else if (options.orderDirection === "desc") {
-                options.orderDirection = "Descending";
-            }
-
-            //converts the value to a js bool
-            function toBool(v) {
-                if (angular.isNumber(v)) {
-                    return v > 0;
-                }
-                if (angular.isString(v)) {
-                    return v === "true";
-                }
-                if (typeof v === "boolean") {
-                    return v;
-                }
-                return false;
-            }
-
-            return umbRequestHelper.resourcePromise(
-                  $http.get(
-                        umbRequestHelper.getApiUrl(
-                              "mediaApiBaseUrl",
-                              "GetChildren",
-                              [
-                                    { id: parentId },
-                                    { pageNumber: options.pageNumber },
-                                    { pageSize: options.pageSize },
-                                    { orderBy: options.orderBy },
-                                    { orderDirection: options.orderDirection },
-                                    { orderBySystemField: toBool(options.orderBySystemField) },
-                                    { filter: options.filter },
-                                    { ignoreUserStartNodes: options.ignoreUserStartNodes }
-                              ])),
-                  'Failed to retrieve children for media item ' + parentId);
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.mediaResource#save
-          * @methodOf umbraco.resources.mediaResource
-          *
-          * @description
-          * Saves changes made to a media item, if the media item is new, the isNew paramater must be passed to force creation
-          * if the media item needs to have files attached, they must be provided as the files param and passed separately
-          *
-          *
-          * ##usage
-          * <pre>
-          * mediaResource.getById(1234)
-          *    .then(function(media) {
-          *          media.name = "I want a new name!";
-          *          mediaResource.save(media, false)
-          *            .then(function(media){
-          *                alert("Retrieved, updated and saved again");
-          *            });
-          *    });
-          * </pre>
-          *
-          * @param {Object} media The media item object with changes applied
-          * @param {Bool} isNew set to true to create a new item or to update an existing
-          * @param {Array} files collection of files for the media item
-          * @returns {Promise} resourcePromise object containing the saved media item.
-          *
-          */
-        save: function (media, isNew, files) {
-            return saveMediaItem(media, "save" + (isNew ? "New" : ""), files);
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.mediaResource#addFolder
-          * @methodOf umbraco.resources.mediaResource
-          *
-          * @description
-          * Shorthand for adding a media item of the type "Folder" under a given parent ID
-          *
-          * ##usage
-          * <pre>
-          * mediaResource.addFolder("My gallery", 1234)
-          *    .then(function(folder) {
-          *        alert('New folder');
-          *    });
-          * </pre>
-          *
-          * @param {string} name Name of the folder to create
-          * @param {int} parentId Id of the media item to create the folder underneath
-          * @returns {Promise} resourcePromise object.
-          *
-          */
-        addFolder: function (name, parentId) {
-            return umbRequestHelper.resourcePromise(
-                   $http.post(umbRequestHelper
-                         .getApiUrl("mediaApiBaseUrl", "PostAddFolder"),
-                         {
-                             name: name,
-                             parentId: parentId
-                         }),
-                   'Failed to add folder');
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.mediaResource#getChildFolders
-          * @methodOf umbraco.resources.mediaResource
-          *
-          * @description
-          * Retrieves all media children with types used as folders.
-          * Uses the convention of looking for media items with mediaTypes ending in
-          * *Folder so will match "Folder", "bannerFolder", "secureFolder" etc,
-          *
-          * NOTE: This will return a max of 500 folders, if more is required it needs to be paged
-          *
-          * ##usage
-          * <pre>
-          * mediaResource.getChildFolders(1234)
-          *    .then(function(data) {
-          *        alert('folders');
-          *    });
-          * </pre>
-          *
-          * @param {int} parentId Id of the media item to query for child folders
-          * @returns {Promise} resourcePromise object.
-          *
-          */
-        getChildFolders: function (parentId) {
-            if (!parentId) {
-                parentId = -1;
-            }
-
-            //NOTE: This will return a max of 500 folders, if more is required it needs to be paged
-            return umbRequestHelper.resourcePromise(
-                  $http.get(
-                        umbRequestHelper.getApiUrl(
-                              "mediaApiBaseUrl",
-                              "GetChildFolders",
-                            {
-                                id: parentId
-                            })),
-                  'Failed to retrieve child folders for media item ' + parentId);
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.mediaResource#emptyRecycleBin
-          * @methodOf umbraco.resources.mediaResource
-          *
-          * @description
-          * Empties the media recycle bin
-          *
-          * ##usage
-          * <pre>
-          * mediaResource.emptyRecycleBin()
-          *    .then(function() {
-          *        alert('its empty!');
-          *    });
-          * </pre>
-          *
-          * @returns {Promise} resourcePromise object.
-          *
-          */
-        emptyRecycleBin: function () {
-            return umbRequestHelper.resourcePromise(
-                   $http.post(
-                         umbRequestHelper.getApiUrl(
-                               "mediaApiBaseUrl",
-                               "EmptyRecycleBin")),
-                   'Failed to empty the recycle bin');
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.mediaResource#search
-          * @methodOf umbraco.resources.mediaResource
-          *
-          * @description
-          * Paginated search for media items starting on the supplied nodeId
-          *
-          * ##usage
-          * <pre>
-          * mediaResource.search("my search", 1, 100, -1)
-          *    .then(function(searchResult) {
-          *        alert('it's here!');
-          *    });
-          * </pre>
-          *
-          * @param {string} query The search query
-          * @param {int} pageNumber The page number
-          * @param {int} pageSize The number of media items on a page
-          * @param {int} searchFrom NodeId to search from (-1 for root)
-          * @returns {Promise} resourcePromise object.
-          *
-          */
-        search: function (query, pageNumber, pageSize, searchFrom) {
-
-            var args = [
-                { "query": query },
-                { "pageNumber": pageNumber },
-                { "pageSize": pageSize },
-                { "searchFrom": searchFrom }
-            ];
-
-            return umbRequestHelper.resourcePromise(
-                  $http.get(
-                        umbRequestHelper.getApiUrl(
-                              "mediaApiBaseUrl",
-                              "Search",
-                              args)),
-                  'Failed to retrieve media items for search: ' + query);
-        }
-
-    };
-}
-
-angular.module('umbraco.resources').factory('mediaResource', mediaResource);
+/**
+    * @ngdoc service
+    * @name umbraco.resources.mediaResource
+    * @description Loads in data for media
+    **/
+function mediaResource($q, $http, umbDataFormatter, umbRequestHelper) {
+
+    /** internal method process the saving of data and post processing the result */
+    function saveMediaItem(content, action, files) {
+        return umbRequestHelper.postSaveContent({
+            restApiUrl: umbRequestHelper.getApiUrl(
+                   "mediaApiBaseUrl",
+                   "PostSave"),
+            content: content,
+            action: action,
+            files: files,
+            dataFormatter: function (c, a) {
+                return umbDataFormatter.formatMediaPostData(c, a);
+            }
+        });
+    }
+
+    return {
+
+        getRecycleBin: function () {
+            return umbRequestHelper.resourcePromise(
+                  $http.get(
+                        umbRequestHelper.getApiUrl(
+                              "mediaApiBaseUrl",
+                              "GetRecycleBin")),
+                  'Failed to retrieve data for media recycle bin');
+        },
+
+        /**
+          * @ngdoc method
+          * @name umbraco.resources.mediaResource#sort
+          * @methodOf umbraco.resources.mediaResource
+          *
+          * @description
+          * Sorts all children below a given parent node id, based on a collection of node-ids
+          *
+          * ##usage
+          * <pre>
+          * var ids = [123,34533,2334,23434];
+          * mediaResource.sort({ sortedIds: ids })
+          *    .then(function() {
+          *        $scope.complete = true;
+          *    });
+          * </pre>
+          * @param {Object} args arguments object
+          * @param {Int} args.parentId the ID of the parent node
+          * @param {Array} options.sortedIds array of node IDs as they should be sorted
+          * @returns {Promise} resourcePromise object.
+          *
+          */
+        sort: function (args) {
+            if (!args) {
+                throw "args cannot be null";
+            }
+            if (!args.parentId) {
+                throw "args.parentId cannot be null";
+            }
+            if (!args.sortedIds) {
+                throw "args.sortedIds cannot be null";
+            }
+
+            return umbRequestHelper.resourcePromise(
+                   $http.post(umbRequestHelper.getApiUrl("mediaApiBaseUrl", "PostSort"),
+                         {
+                             parentId: args.parentId,
+                             idSortOrder: args.sortedIds
+                         }),
+                   'Failed to sort media');
+        },
+
+        /**
+          * @ngdoc method
+          * @name umbraco.resources.mediaResource#move
+          * @methodOf umbraco.resources.mediaResource
+          *
+          * @description
+          * Moves a node underneath a new parentId
+          *
+          * ##usage
+          * <pre>
+          * mediaResource.move({ parentId: 1244, id: 123 })
+          *    .then(function() {
+          *        alert("node was moved");
+          *    }, function(err){
+          *      alert("node didnt move:" + err.data.Message);
+          *    });
+          * </pre>
+          * @param {Object} args arguments object
+          * @param {Int} args.idd the ID of the node to move
+          * @param {Int} args.parentId the ID of the parent node to move to
+          * @returns {Promise} resourcePromise object.
+          *
+          */
+        move: function (args) {
+            if (!args) {
+                throw "args cannot be null";
+            }
+            if (!args.parentId) {
+                throw "args.parentId cannot be null";
+            }
+            if (!args.id) {
+                throw "args.id cannot be null";
+            }
+
+            return umbRequestHelper.resourcePromise(
+                   $http.post(umbRequestHelper.getApiUrl("mediaApiBaseUrl", "PostMove"),
+                        {
+                            parentId: args.parentId,
+                            id: args.id
+                        }),
+                        {
+                        error: function(data){
+                            var errorMsg = 'Failed to move media';
+                            if (data.id !== undefined && data.parentId !== undefined) {
+                                if (data.id === data.parentId) {
+                                    errorMsg = 'Media can\'t be moved into itself';
+                                }
+                            }
+                            else if (data.notifications !== undefined) {
+                                if (data.notifications.length > 0) {
+                                    if (data.notifications[0].header.length > 0) {
+                                        errorMsg = data.notifications[0].header;
+                                    }
+                                    if (data.notifications[0].message.length > 0) {
+                                        errorMsg = errorMsg + ": " + data.notifications[0].message;
+                                    }
+                                }
+                            }
+
+                            return {
+                                errorMsg: errorMsg
+                            };
+                       }
+                   });
+        },
+
+
+        /**
+          * @ngdoc method
+          * @name umbraco.resources.mediaResource#getById
+          * @methodOf umbraco.resources.mediaResource
+          *
+          * @description
+          * Gets a media item with a given id
+          *
+          * ##usage
+          * <pre>
+          * mediaResource.getById(1234)
+          *    .then(function(media) {
+          *        var myMedia = media;
+          *        alert('its here!');
+          *    });
+          * </pre>
+          *
+          * @param {Int} id id of media item to return
+          * @returns {Promise} resourcePromise object containing the media item.
+          *
+          */
+        getById: function (id) {
+
+            return umbRequestHelper.resourcePromise(
+                  $http.get(
+                        umbRequestHelper.getApiUrl(
+                              "mediaApiBaseUrl",
+                              "GetById",
+                              [{ id: id }])),
+                  'Failed to retrieve data for media id ' + id);
+        },
+
+        /**
+          * @ngdoc method
+          * @name umbraco.resources.mediaResource#deleteById
+          * @methodOf umbraco.resources.mediaResource
+          *
+          * @description
+          * Deletes a media item with a given id
+          *
+          * ##usage
+          * <pre>
+          * mediaResource.deleteById(1234)
+          *    .then(function() {
+          *        alert('its gone!');
+          *    });
+          * </pre>
+          *
+          * @param {Int} id id of media item to delete
+          * @returns {Promise} resourcePromise object.
+          *
+          */
+        deleteById: function (id) {
+            return umbRequestHelper.resourcePromise(
+                   $http.post(
+                         umbRequestHelper.getApiUrl(
+                               "mediaApiBaseUrl",
+                               "DeleteById",
+                               [{ id: id }])),
+                   'Failed to delete item ' + id);
+        },
+
+        /**
+          * @ngdoc method
+          * @name umbraco.resources.mediaResource#getByIds
+          * @methodOf umbraco.resources.mediaResource
+          *
+          * @description
+          * Gets an array of media items, given a collection of ids
+          *
+          * ##usage
+          * <pre>
+          * mediaResource.getByIds( [1234,2526,28262])
+          *    .then(function(mediaArray) {
+          *        var myDoc = contentArray;
+          *        alert('they are here!');
+          *    });
+          * </pre>
+          *
+          * @param {Array} ids ids of media items to return as an array
+          * @returns {Promise} resourcePromise object containing the media items array.
+          *
+          */
+        getByIds: function (ids) {
+
+            var idQuery = "";
+            _.each(ids, function (item) {
+                idQuery += "ids=" + item + "&";
+            });
+
+            return umbRequestHelper.resourcePromise(
+                  $http.get(
+                        umbRequestHelper.getApiUrl(
+                              "mediaApiBaseUrl",
+                              "GetByIds",
+                              idQuery)),
+                  'Failed to retrieve data for media ids ' + ids);
+        },
+
+        /**
+          * @ngdoc method
+          * @name umbraco.resources.mediaResource#getScaffold
+          * @methodOf umbraco.resources.mediaResource
+          *
+          * @description
+          * Returns a scaffold of an empty media item, given the id of the media item to place it underneath and the media type alias.
+          *
+          * - Parent Id must be provided so umbraco knows where to store the media
+          * - Media Type alias must be provided so umbraco knows which properties to put on the media scaffold
+          *
+          * The scaffold is used to build editors for media that has not yet been populated with data.
+          *
+          * ##usage
+          * <pre>
+          * mediaResource.getScaffold(1234, 'folder')
+          *    .then(function(scaffold) {
+          *        var myDoc = scaffold;
+          *        myDoc.name = "My new media item";
+          *
+          *        mediaResource.save(myDoc, true)
+          *            .then(function(media){
+          *                alert("Retrieved, updated and saved again");
+          *            });
+          *    });
+          * </pre>
+          *
+          * @param {Int} parentId id of media item to return
+          * @param {String} alias mediatype alias to base the scaffold on
+          * @returns {Promise} resourcePromise object containing the media scaffold.
+          *
+          */
+        getScaffold: function (parentId, alias) {
+
+            return umbRequestHelper.resourcePromise(
+                  $http.get(
+                        umbRequestHelper.getApiUrl(
+                              "mediaApiBaseUrl",
+                              "GetEmpty",
+                              [{ contentTypeAlias: alias }, { parentId: parentId }])),
+                  'Failed to retrieve data for empty media item type ' + alias);
+
+        },
+
+        rootMedia: function () {
+
+            return umbRequestHelper.resourcePromise(
+                  $http.get(
+                        umbRequestHelper.getApiUrl(
+                              "mediaApiBaseUrl",
+                              "GetRootMedia")),
+                  'Failed to retrieve data for root media');
+
+        },
+
+        /**
+          * @ngdoc method
+          * @name umbraco.resources.mediaResource#getChildren
+          * @methodOf umbraco.resources.mediaResource
+          *
+          * @description
+          * Gets children of a media item with a given id
+          *
+          * ##usage
+          * <pre>
+          * mediaResource.getChildren(1234, {pageSize: 10, pageNumber: 2})
+          *    .then(function(contentArray) {
+          *        var children = contentArray;
+          *        alert('they are here!');
+          *    });
+          * </pre>
+          *
+          * @param {Int} parentid id of content item to return children of
+          * @param {Object} options optional options object
+          * @param {Int} options.pageSize if paging data, number of nodes per page, default = 0
+          * @param {Int} options.pageNumber if paging data, current page index, default = 0
+          * @param {String} options.filter if provided, query will only return those with names matching the filter
+          * @param {String} options.orderDirection can be `Ascending` or `Descending` - Default: `Ascending`
+          * @param {String} options.orderBy property to order items by, default: `SortOrder`
+          * @returns {Promise} resourcePromise object containing an array of content items.
+          *
+          */
+        getChildren: function (parentId, options) {
+
+            var defaults = {
+                pageSize: 0,
+                pageNumber: 0,
+                filter: '',
+                orderDirection: "Ascending",
+                orderBy: "SortOrder",
+                orderBySystemField: true,
+                dataTypeId: null
+            };
+            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;
+            //change asc/desct
+            if (options.orderDirection === "asc") {
+                options.orderDirection = "Ascending";
+            }
+            else if (options.orderDirection === "desc") {
+                options.orderDirection = "Descending";
+            }
+
+            //converts the value to a js bool
+            function toBool(v) {
+                if (angular.isNumber(v)) {
+                    return v > 0;
+                }
+                if (angular.isString(v)) {
+                    return v === "true";
+                }
+                if (typeof v === "boolean") {
+                    return v;
+                }
+                return false;
+            }
+
+            return umbRequestHelper.resourcePromise(
+                  $http.get(
+                        umbRequestHelper.getApiUrl(
+                              "mediaApiBaseUrl",
+                              "GetChildren",
+                              [
+                                    { id: parentId },
+                                    { pageNumber: options.pageNumber },
+                                    { pageSize: options.pageSize },
+                                    { orderBy: options.orderBy },
+                                    { orderDirection: options.orderDirection },
+                                    { orderBySystemField: toBool(options.orderBySystemField) },
+                                    { filter: options.filter },
+                                    { dataTypeId: options.dataTypeId }
+                              ])),
+                  'Failed to retrieve children for media item ' + parentId);
+        },
+
+        /**
+          * @ngdoc method
+          * @name umbraco.resources.mediaResource#save
+          * @methodOf umbraco.resources.mediaResource
+          *
+          * @description
+          * Saves changes made to a media item, if the media item is new, the isNew paramater must be passed to force creation
+          * if the media item needs to have files attached, they must be provided as the files param and passed separately
+          *
+          *
+          * ##usage
+          * <pre>
+          * mediaResource.getById(1234)
+          *    .then(function(media) {
+          *          media.name = "I want a new name!";
+          *          mediaResource.save(media, false)
+          *            .then(function(media){
+          *                alert("Retrieved, updated and saved again");
+          *            });
+          *    });
+          * </pre>
+          *
+          * @param {Object} media The media item object with changes applied
+          * @param {Bool} isNew set to true to create a new item or to update an existing
+          * @param {Array} files collection of files for the media item
+          * @returns {Promise} resourcePromise object containing the saved media item.
+          *
+          */
+        save: function (media, isNew, files) {
+            return saveMediaItem(media, "save" + (isNew ? "New" : ""), files);
+        },
+
+        /**
+          * @ngdoc method
+          * @name umbraco.resources.mediaResource#addFolder
+          * @methodOf umbraco.resources.mediaResource
+          *
+          * @description
+          * Shorthand for adding a media item of the type "Folder" under a given parent ID
+          *
+          * ##usage
+          * <pre>
+          * mediaResource.addFolder("My gallery", 1234)
+          *    .then(function(folder) {
+          *        alert('New folder');
+          *    });
+          * </pre>
+          *
+          * @param {string} name Name of the folder to create
+          * @param {int} parentId Id of the media item to create the folder underneath
+          * @returns {Promise} resourcePromise object.
+          *
+          */
+        addFolder: function (name, parentId) {
+            return umbRequestHelper.resourcePromise(
+                   $http.post(umbRequestHelper
+                         .getApiUrl("mediaApiBaseUrl", "PostAddFolder"),
+                         {
+                             name: name,
+                             parentId: parentId
+                         }),
+                   'Failed to add folder');
+        },
+
+        /**
+          * @ngdoc method
+          * @name umbraco.resources.mediaResource#getChildFolders
+          * @methodOf umbraco.resources.mediaResource
+          *
+          * @description
+          * Retrieves all media children with types used as folders.
+          * Uses the convention of looking for media items with mediaTypes ending in
+          * *Folder so will match "Folder", "bannerFolder", "secureFolder" etc,
+          *
+          * NOTE: This will return a max of 500 folders, if more is required it needs to be paged
+          *
+          * ##usage
+          * <pre>
+          * mediaResource.getChildFolders(1234)
+          *    .then(function(data) {
+          *        alert('folders');
+          *    });
+          * </pre>
+          *
+          * @param {int} parentId Id of the media item to query for child folders
+          * @returns {Promise} resourcePromise object.
+          *
+          */
+        getChildFolders: function (parentId) {
+            if (!parentId) {
+                parentId = -1;
+            }
+
+            //NOTE: This will return a max of 500 folders, if more is required it needs to be paged
+            return umbRequestHelper.resourcePromise(
+                  $http.get(
+                        umbRequestHelper.getApiUrl(
+                              "mediaApiBaseUrl",
+                              "GetChildFolders",
+                            {
+                                id: parentId
+                            })),
+                  'Failed to retrieve child folders for media item ' + parentId);
+        },
+
+        /**
+          * @ngdoc method
+          * @name umbraco.resources.mediaResource#emptyRecycleBin
+          * @methodOf umbraco.resources.mediaResource
+          *
+          * @description
+          * Empties the media recycle bin
+          *
+          * ##usage
+          * <pre>
+          * mediaResource.emptyRecycleBin()
+          *    .then(function() {
+          *        alert('its empty!');
+          *    });
+          * </pre>
+          *
+          * @returns {Promise} resourcePromise object.
+          *
+          */
+        emptyRecycleBin: function () {
+            return umbRequestHelper.resourcePromise(
+                   $http.post(
+                         umbRequestHelper.getApiUrl(
+                               "mediaApiBaseUrl",
+                               "EmptyRecycleBin")),
+                   'Failed to empty the recycle bin');
+        },
+
+        /**
+          * @ngdoc method
+          * @name umbraco.resources.mediaResource#search
+          * @methodOf umbraco.resources.mediaResource
+          *
+          * @description
+          * Paginated search for media items starting on the supplied nodeId
+          *
+          * ##usage
+          * <pre>
+          * mediaResource.search("my search", 1, 100, -1)
+          *    .then(function(searchResult) {
+          *        alert('it's here!');
+          *    });
+          * </pre>
+          *
+          * @param {string} query The search query
+          * @param {int} pageNumber The page number
+          * @param {int} pageSize The number of media items on a page
+          * @param {int} searchFrom NodeId to search from (-1 for root)
+          * @returns {Promise} resourcePromise object.
+          *
+          */
+        search: function (query, pageNumber, pageSize, searchFrom) {
+
+            var args = [
+                { "query": query },
+                { "pageNumber": pageNumber },
+                { "pageSize": pageSize },
+                { "searchFrom": searchFrom }
+            ];
+
+            return umbRequestHelper.resourcePromise(
+                  $http.get(
+                        umbRequestHelper.getApiUrl(
+                              "mediaApiBaseUrl",
+                              "Search",
+                              args)),
+                  'Failed to retrieve media items for search: ' + query);
+        }
+
+    };
+}
+
+angular.module('umbraco.resources').factory('mediaResource', mediaResource);
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/search.service.js b/src/Umbraco.Web.UI.Client/src/common/services/search.service.js
index 0d00678282..24b946cdc8 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/search.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/search.service.js
@@ -1,174 +1,174 @@
-/**
- * @ngdoc service
- * @name umbraco.services.searchService
- *
- *  
- * @description
- * Service for handling the main application search, can currently search content, media and members
- *
- * ##usage
- * To use, simply inject the searchService into any controller that needs it, and make
- * sure the umbraco.services module is accesible - which it should be by default.
- *
- * <pre>
- *      searchService.searchMembers({term: 'bob'}).then(function(results){
- *          angular.forEach(results, function(result){
- *                  //returns:
- *                  {name: "name", id: 1234, menuUrl: "url", editorPath: "url", metaData: {}, subtitle: "/path/etc" }
- *           })          
- *           var result = 
- *       }) 
- * </pre> 
- */
-angular.module('umbraco.services')
-    .factory('searchService', function ($q, $log, entityResource, contentResource, umbRequestHelper, $injector, searchResultFormatter) {
-
-        return {
-
-            /**
-            * @ngdoc method
-            * @name umbraco.services.searchService#searchMembers
-            * @methodOf umbraco.services.searchService
-            *
-            * @description
-            * Searches the default member search index
-            * @param {Object} args argument object
-            * @param {String} args.term seach term
-            * @returns {Promise} returns promise containing all matching members
-            */
-            searchMembers: function (args) {
-
-                if (!args.term) {
-                    throw "args.term is required";
-                }
-
-                var options = {
-                    searchFrom: args.searchFrom                    
-                }
-
-                return entityResource.search(args.term, "Member", options).then(function (data) {
-                    _.each(data, function (item) {
-                        searchResultFormatter.configureMemberResult(item);
-                    });
-                    return data;
-                });
-            },
-
-            /**
-            * @ngdoc method
-            * @name umbraco.services.searchService#searchContent
-            * @methodOf umbraco.services.searchService
-            *
-            * @description
-            * Searches the default internal content search index
-            * @param {Object} args argument object
-            * @param {String} args.term seach term
-            * @returns {Promise} returns promise containing all matching content items
-            */
-            searchContent: function (args) {
-
-                if (!args.term) {
-                    throw "args.term is required";
-                }
-
-                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);
-                    });
-                    return data;
-                });
-            },
-
-            /**
-            * @ngdoc method
-            * @name umbraco.services.searchService#searchMedia
-            * @methodOf umbraco.services.searchService
-            *
-            * @description
-            * Searches the default media search index
-            * @param {Object} args argument object
-            * @param {String} args.term seach term
-            * @returns {Promise} returns promise containing all matching media items
-            */
-            searchMedia: function (args) {
-
-                if (!args.term) {
-                    throw "args.term is required";
-                }
-
-                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);
-                    });
-                    return data;
-                });
-            },
-
-            /**
-            * @ngdoc method
-            * @name umbraco.services.searchService#searchAll
-            * @methodOf umbraco.services.searchService
-            *
-            * @description
-            * Searches all available indexes and returns all results in one collection
-            * @param {Object} args argument object
-            * @param {String} args.term seach term
-            * @returns {Promise} returns promise containing all matching items
-            */
-            searchAll: function (args) {
-
-                if (!args.term) {
-                    throw "args.term is required";
-                }
-
-                return entityResource.searchAll(args.term, args.canceler).then(function (data) {
-
-                    _.each(data, function (resultByType) {
+/**
+ * @ngdoc service
+ * @name umbraco.services.searchService
+ *
+ *
+ * @description
+ * Service for handling the main application search, can currently search content, media and members
+ *
+ * ##usage
+ * To use, simply inject the searchService into any controller that needs it, and make
+ * sure the umbraco.services module is accesible - which it should be by default.
+ *
+ * <pre>
+ *      searchService.searchMembers({term: 'bob'}).then(function(results){
+ *          angular.forEach(results, function(result){
+ *                  //returns:
+ *                  {name: "name", id: 1234, menuUrl: "url", editorPath: "url", metaData: {}, subtitle: "/path/etc" }
+ *           })
+ *           var result =
+ *       })
+ * </pre>
+ */
+angular.module('umbraco.services')
+    .factory('searchService', function ($q, $log, entityResource, contentResource, umbRequestHelper, $injector, searchResultFormatter) {
+
+        return {
+
+            /**
+            * @ngdoc method
+            * @name umbraco.services.searchService#searchMembers
+            * @methodOf umbraco.services.searchService
+            *
+            * @description
+            * Searches the default member search index
+            * @param {Object} args argument object
+            * @param {String} args.term seach term
+            * @returns {Promise} returns promise containing all matching members
+            */
+            searchMembers: function (args) {
+
+                if (!args.term) {
+                    throw "args.term is required";
+                }
+
+                var options = {
+                    searchFrom: args.searchFrom
+                }
+
+                return entityResource.search(args.term, "Member", options).then(function (data) {
+                    _.each(data, function (item) {
+                        searchResultFormatter.configureMemberResult(item);
+                    });
+                    return data;
+                });
+            },
+
+            /**
+            * @ngdoc method
+            * @name umbraco.services.searchService#searchContent
+            * @methodOf umbraco.services.searchService
+            *
+            * @description
+            * Searches the default internal content search index
+            * @param {Object} args argument object
+            * @param {String} args.term seach term
+            * @returns {Promise} returns promise containing all matching content items
+            */
+            searchContent: function (args) {
+
+                if (!args.term) {
+                    throw "args.term is required";
+                }
+
+                var options = {
+                    searchFrom: args.searchFrom,
+                    dataTypeId: args.dataTypeId
+                }
+
+                return entityResource.search(args.term, "Document", options, args.canceler).then(function (data) {
+                    _.each(data, function (item) {
+                        searchResultFormatter.configureContentResult(item);
+                    });
+                    return data;
+                });
+            },
+
+            /**
+            * @ngdoc method
+            * @name umbraco.services.searchService#searchMedia
+            * @methodOf umbraco.services.searchService
+            *
+            * @description
+            * Searches the default media search index
+            * @param {Object} args argument object
+            * @param {String} args.term seach term
+            * @returns {Promise} returns promise containing all matching media items
+            */
+            searchMedia: function (args) {
+
+                if (!args.term) {
+                    throw "args.term is required";
+                }
+
+                var options = {
+                    searchFrom: args.searchFrom,
+                    dataTypeId: args.dataTypeId
+                }
+
+                return entityResource.search(args.term, "Media", options).then(function (data) {
+                    _.each(data, function (item) {
+                        searchResultFormatter.configureMediaResult(item);
+                    });
+                    return data;
+                });
+            },
+
+            /**
+            * @ngdoc method
+            * @name umbraco.services.searchService#searchAll
+            * @methodOf umbraco.services.searchService
+            *
+            * @description
+            * Searches all available indexes and returns all results in one collection
+            * @param {Object} args argument object
+            * @param {String} args.term seach term
+            * @returns {Promise} returns promise containing all matching items
+            */
+            searchAll: function (args) {
+
+                if (!args.term) {
+                    throw "args.term is required";
+                }
+
+                return entityResource.searchAll(args.term, args.canceler).then(function (data) {
+
+                    _.each(data, function (resultByType) {
 
                         //we need to format the search result data to include things like the subtitle, urls, etc...
-                        // this is done with registered angular services as part of the SearchableTreeAttribute, if that 
-                        // is not found, than we format with the default formatter
+                        // this is done with registered angular services as part of the SearchableTreeAttribute, if that
+                        // is not found, than we format with the default formatter
                         var formatterMethod = searchResultFormatter.configureDefaultResult;
                         //check if a custom formatter is specified...
-                        if (resultByType.jsSvc) {
-                            var searchFormatterService = $injector.get(resultByType.jsSvc);
-                            if (searchFormatterService) {
-                                if (!resultByType.jsMethod) {
-                                    resultByType.jsMethod = "format";
-                                }
-                                formatterMethod = searchFormatterService[resultByType.jsMethod];
-
-                                if (!formatterMethod) {
-                                    throw "The method " + resultByType.jsMethod + " on the angular service " + resultByType.jsSvc + " could not be found";
-                                }
-                            }
-                        }
-                        //now apply the formatter for each result
-                        _.each(resultByType.results, function (item) {
-                            formatterMethod.apply(this, [item, resultByType.treeAlias, resultByType.appAlias]);
+                        if (resultByType.jsSvc) {
+                            var searchFormatterService = $injector.get(resultByType.jsSvc);
+                            if (searchFormatterService) {
+                                if (!resultByType.jsMethod) {
+                                    resultByType.jsMethod = "format";
+                                }
+                                formatterMethod = searchFormatterService[resultByType.jsMethod];
+
+                                if (!formatterMethod) {
+                                    throw "The method " + resultByType.jsMethod + " on the angular service " + resultByType.jsSvc + " could not be found";
+                                }
+                            }
+                        }
+                        //now apply the formatter for each result
+                        _.each(resultByType.results, function (item) {
+                            formatterMethod.apply(this, [item, resultByType.treeAlias, resultByType.appAlias]);
                         });
-                        
-                    });
-
-                    return data;
-                });
-
-            },
-
-            //TODO: This doesn't do anything!
-            setCurrent: function (sectionAlias) {
-
-                var currentSection = sectionAlias;
-            }
-        };
-    });
+
+                    });
+
+                    return data;
+                });
+
+            },
+
+            //TODO: This doesn't do anything!
+            setCurrent: function (sectionAlias) {
+
+                var currentSection = sectionAlias;
+            }
+        };
+    });
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
index 5d6a3bf12c..67d62de223 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
@@ -1,170 +1,172 @@
-//used for the media picker dialog
-angular.module("umbraco").controller("Umbraco.Dialogs.LinkPickerController",
-	function ($scope, eventsService, dialogService, entityResource, contentResource, mediaHelper, userService, localizationService, tinyMceService) {
-		var dialogOptions = $scope.dialogOptions;
-
-		var searchText = "Search...";
-		localizationService.localize("general_search").then(function (value) {
-			searchText = value + "...";
-		});
-
-		$scope.dialogTreeEventHandler = $({});
-		$scope.target = {};
-		$scope.searchInfo = {
-			searchFromId: null,
-			searchFromName: null,
-			showSearch: false,
-			results: [],
-			selectedSearchResults: []
-		}
-
-		if (dialogOptions.currentTarget) {
-			$scope.target = dialogOptions.currentTarget;
-
-			//if we have a node ID, we fetch the current node to build the form data
-			if ($scope.target.id || $scope.target.udi) {
-
-				var id = $scope.target.udi ? $scope.target.udi : $scope.target.id;
-
-				if (!$scope.target.path) {
-					entityResource.getPath(id, "Document").then(function (path) {
-						$scope.target.path = path;
-						//now sync the tree to this path
-						$scope.dialogTreeEventHandler.syncTree({
-							path: $scope.target.path,
-							tree: "content"
-						});
-					});
-				}
-
-				// if a link exists, get the properties to build the anchor name list
-				contentResource.getById(id).then(function (resp) {
-					$scope.anchorValues = tinyMceService.getAnchorNames(JSON.stringify(resp.properties));
-					$scope.target.url = resp.urls[0];
-				});
-			} else if ($scope.target.url.length) {
+//used for the media picker dialog
+angular.module("umbraco").controller("Umbraco.Dialogs.LinkPickerController",
+	function ($scope, eventsService, dialogService, entityResource, contentResource, mediaHelper, userService, localizationService, tinyMceService) {
+		var dialogOptions = $scope.dialogOptions;
+
+		var searchText = "Search...";
+		localizationService.localize("general_search").then(function (value) {
+			searchText = value + "...";
+		});
+
+		debugger;
+		$scope.dialogTreeEventHandler = $({});
+		$scope.target = {};
+		$scope.searchInfo = {
+			searchFromId: null,
+			searchFromName: null,
+			showSearch: false,
+            dataTypeId: $scope.model.dataTypeId,
+			results: [],
+			selectedSearchResults: []
+		}
+
+		if (dialogOptions.currentTarget) {
+			$scope.target = dialogOptions.currentTarget;
+
+			//if we have a node ID, we fetch the current node to build the form data
+			if ($scope.target.id || $scope.target.udi) {
+
+				var id = $scope.target.udi ? $scope.target.udi : $scope.target.id;
+
+				if (!$scope.target.path) {
+					entityResource.getPath(id, "Document").then(function (path) {
+						$scope.target.path = path;
+						//now sync the tree to this path
+						$scope.dialogTreeEventHandler.syncTree({
+							path: $scope.target.path,
+							tree: "content"
+						});
+					});
+				}
+
+				// if a link exists, get the properties to build the anchor name list
+				contentResource.getById(id).then(function (resp) {
+					$scope.anchorValues = tinyMceService.getAnchorNames(JSON.stringify(resp.properties));
+					$scope.target.url = resp.urls[0];
+				});
+			} else if ($scope.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.target.url.search(/(#|\?)/);
-                if (indexOfAnchor > -1) {
-                    // populate the anchor
-                    $scope.target.anchor = $scope.target.url.substring(indexOfAnchor);
-                    // then rewrite the model and populate the link
+                if (indexOfAnchor > -1) {
+                    // populate the anchor
+                    $scope.target.anchor = $scope.target.url.substring(indexOfAnchor);
+                    // then rewrite the model and populate the link
                     $scope.target.url = $scope.target.url.substring(0, indexOfAnchor);
-                }
-			}
-		}
-
-		if (dialogOptions.anchors) {
-			$scope.anchorValues = dialogOptions.anchors;
-		}
-
-		function nodeSelectHandler(ev, args) {
-			args.event.preventDefault();
-			args.event.stopPropagation();
-
-			if (args.node.metaData.listViewNode) {
-				//check if list view 'search' node was selected
-
-				$scope.searchInfo.showSearch = true;
-				$scope.searchInfo.searchFromId = args.node.metaData.listViewNode.id;
-				$scope.searchInfo.searchFromName = args.node.metaData.listViewNode.name;
-			} else {
-				eventsService.emit("dialogs.linkPicker.select", args);
-
-				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.target.id = args.node.id;
-				$scope.target.udi = args.node.udi;
-				$scope.target.name = args.node.name;
-
-				if (args.node.id < 0) {
-					$scope.target.url = "/";
-				} else {
-					contentResource.getById(args.node.id).then(function (resp) {
-						$scope.anchorValues = tinyMceService.getAnchorNames(JSON.stringify(resp.properties));
-						$scope.target.url = resp.urls[0];
-					});
-				}
-
-				if (!angular.isUndefined($scope.target.isMedia)) {
-					delete $scope.target.isMedia;
-				}
-			}
-		}
-
-		function nodeExpandedHandler(ev, args) {
-			if (angular.isArray(args.children)) {
-
-				//iterate children
-				_.each(args.children, function (child) {
-					//check if any of the items are list views, if so we need to add a custom 
-					// child: A node to activate the search
-					if (child.metaData.isContainer) {
-						child.hasChildren = true;
-						child.children = [
-							{
-								level: child.level + 1,
-								hasChildren: false,
-								name: searchText,
-								metaData: {
-									listViewNode: child
-								},
-								cssClass: "icon umb-tree-icon sprTree icon-search",
-								cssClasses: ["not-published"]
-	                        }
-	                    ];
-					}
-				});
-			}
-		}
-
-		$scope.switchToMediaPicker = function () {
-			userService.getCurrentUser().then(function (userData) {
-				dialogService.mediaPicker({
-					startNodeId: userData.startMediaIds.length == 0 ? -1 : userData.startMediaIds[0],
-					callback: function (media) {
-						$scope.target.id = media.id;
-						$scope.target.isMedia = true;
-						$scope.target.name = media.name;
-						$scope.target.url = mediaHelper.resolveFile(media);
-					}
-				});
-			});
-		};
-
-		$scope.hideSearch = function () {
-			$scope.searchInfo.showSearch = false;
-			$scope.searchInfo.searchFromId = null;
-			$scope.searchInfo.searchFromName = null;
-			$scope.searchInfo.results = [];
-		}
-
-		// method to select a search result 
-		$scope.selectResult = function (evt, result) {
-			result.selected = result.selected === true ? false : true;
-			nodeSelectHandler(evt, {
-				event: evt,
-				node: result
-			});
-		};
-
-		//callback when there are search results 
-		$scope.onSearchResults = function (results) {
-			$scope.searchInfo.results = results;
-			$scope.searchInfo.showSearch = true;
-		};
-
-		$scope.dialogTreeEventHandler.bind("treeNodeSelect", nodeSelectHandler);
-		$scope.dialogTreeEventHandler.bind("treeNodeExpanded", nodeExpandedHandler);
-
-		$scope.$on('$destroy', function () {
-			$scope.dialogTreeEventHandler.unbind("treeNodeSelect", nodeSelectHandler);
-			$scope.dialogTreeEventHandler.unbind("treeNodeExpanded", nodeExpandedHandler);
-		});
-	});
+                }
+			}
+		}
+
+		if (dialogOptions.anchors) {
+			$scope.anchorValues = dialogOptions.anchors;
+		}
+
+		function nodeSelectHandler(ev, args) {
+			args.event.preventDefault();
+			args.event.stopPropagation();
+
+			if (args.node.metaData.listViewNode) {
+				//check if list view 'search' node was selected
+
+				$scope.searchInfo.showSearch = true;
+				$scope.searchInfo.searchFromId = args.node.metaData.listViewNode.id;
+				$scope.searchInfo.searchFromName = args.node.metaData.listViewNode.name;
+			} else {
+				eventsService.emit("dialogs.linkPicker.select", args);
+
+				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.target.id = args.node.id;
+				$scope.target.udi = args.node.udi;
+				$scope.target.name = args.node.name;
+
+				if (args.node.id < 0) {
+					$scope.target.url = "/";
+				} else {
+					contentResource.getById(args.node.id).then(function (resp) {
+						$scope.anchorValues = tinyMceService.getAnchorNames(JSON.stringify(resp.properties));
+						$scope.target.url = resp.urls[0];
+					});
+				}
+
+				if (!angular.isUndefined($scope.target.isMedia)) {
+					delete $scope.target.isMedia;
+				}
+			}
+		}
+
+		function nodeExpandedHandler(ev, args) {
+			if (angular.isArray(args.children)) {
+
+				//iterate children
+				_.each(args.children, function (child) {
+					//check if any of the items are list views, if so we need to add a custom
+					// child: A node to activate the search
+					if (child.metaData.isContainer) {
+						child.hasChildren = true;
+						child.children = [
+							{
+								level: child.level + 1,
+								hasChildren: false,
+								name: searchText,
+								metaData: {
+									listViewNode: child
+								},
+								cssClass: "icon umb-tree-icon sprTree icon-search",
+								cssClasses: ["not-published"]
+	                        }
+	                    ];
+					}
+				});
+			}
+		}
+
+		$scope.switchToMediaPicker = function () {
+			userService.getCurrentUser().then(function (userData) {
+				dialogService.mediaPicker({
+					startNodeId: userData.startMediaIds.length == 0 ? -1 : userData.startMediaIds[0],
+					callback: function (media) {
+						$scope.target.id = media.id;
+						$scope.target.isMedia = true;
+						$scope.target.name = media.name;
+						$scope.target.url = mediaHelper.resolveFile(media);
+					}
+				});
+			});
+		};
+
+		$scope.hideSearch = function () {
+			$scope.searchInfo.showSearch = false;
+			$scope.searchInfo.searchFromId = null;
+			$scope.searchInfo.searchFromName = null;
+			$scope.searchInfo.results = [];
+		}
+
+		// method to select a search result
+		$scope.selectResult = function (evt, result) {
+			result.selected = result.selected === true ? false : true;
+			nodeSelectHandler(evt, {
+				event: evt,
+				node: result
+			});
+		};
+
+		//callback when there are search results
+		$scope.onSearchResults = function (results) {
+			$scope.searchInfo.results = results;
+			$scope.searchInfo.showSearch = true;
+		};
+
+		$scope.dialogTreeEventHandler.bind("treeNodeSelect", nodeSelectHandler);
+		$scope.dialogTreeEventHandler.bind("treeNodeExpanded", nodeExpandedHandler);
+
+		$scope.$on('$destroy', function () {
+			$scope.dialogTreeEventHandler.unbind("treeNodeSelect", nodeSelectHandler);
+			$scope.dialogTreeEventHandler.unbind("treeNodeExpanded", nodeExpandedHandler);
+		});
+	});
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html
index 3b02853127..c4ac0c2e93 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html
@@ -1,86 +1,87 @@
-<div class="umb-panel" ng-controller="Umbraco.Dialogs.LinkPickerController">
-	<div class="umb-panel-body no-header with-footer compact">
-		<umb-pane>
-	<umb-control-group label="@defaultdialogs_urlLinkPicker" class="umb-property--pull">
-	    <input type="text"
-	           localize="placeholder"
-	           placeholder="@general_url"
-	           class="umb-editor umb-textstring"
-	           ng-model="target.url"
-	           ng-disabled="target.id || target.udi" />
-	</umb-control-group>
-
-	<umb-control-group label="@defaultdialogs_anchorLinkPicker" class="umb-property--push">
-	    <input type="text"
-	           list="anchors"
-	           localize="placeholder"
-	           placeholder="@placeholders_anchor"
-	           class="umb-editor umb-textstring"
-	           ng-model="target.anchor" />
-
-		<datalist id="anchors">
-					<option value="{{a}}" ng-repeat="a in anchorValues"></option>
-				</datalist>
-	</umb-control-group>			
-
-			<umb-control-group label="@defaultdialogs_nodeNameLinkPicker">
-				<input type="text"
-					localize="placeholder" 
-					placeholder="@placeholders_entername" 
-					class="umb-editor umb-textstring" 
-					ng-model="target.name" />
-			</umb-control-group>
-
-			<umb-control-group label="@content_target">
-				<select class="umb-editor umb-dropdown" ng-model="target.target">
-					<option value=""></option>
-					<option value="_blank"><localize key="defaultdialogs_openInNewWindow">Opens the linked document in a new window or tab</localize></option>
-				</select>
-			</umb-control-group>
-		</umb-pane>
-
-        <umb-tree-search-box hide-search-callback="hideSearch"
-                             search-callback="onSearchResults"
-                             search-from-id="{{searchInfo.searchFromId}}"
-                             search-from-name="{{searchInfo.searchFromName}}"
-                             show-search="{{searchInfo.showSearch}}"
-                             section="{{section}}">
-        </umb-tree-search-box>
-        
-        <br/>
-
-        <umb-tree-search-results ng-if="searchInfo.showSearch"
-                                 results="searchInfo.results"
-                                 select-result-callback="selectResult">
-        </umb-tree-search-results>
-        
-	    <div ng-hide="searchInfo.showSearch">
-            <umb-tree section="content"
-                      hideheader="true"
-                      hideoptions="true"
-                      eventhandler="dialogTreeEventHandler"
-                      isdialog="true"
-                      enablecheckboxes="true">
-            </umb-tree>    
-	    </div>
-        
-	</div>
-
-	<div class="umb-panel-footer">
-		<div class="umb-el-wrap umb-panel-buttons">
-	        <div class="btn-toolbar umb-btn-toolbar pull-right">
-	        	<a href ng-click="close()" class="btn btn-link">
-	        		<localize key="general_cancel">Cancel</localize>
-				</a>
-	            <a href ng-click="switchToMediaPicker()" class="btn">
-                    <localize key="defaultdialogs_selectMedia">Select media</localize>
-	            </a>
-				<button
-					class="btn btn-primary"
-					ng-click="submit(target)">
-					<localize key="buttons_select">Select</localize>
-				</button>
-	        </div>
-		</div>
-	</div>
-</div>
+<div class="umb-panel" ng-controller="Umbraco.Dialogs.LinkPickerController">
+	<div class="umb-panel-body no-header with-footer compact">
+		<umb-pane>
+	<umb-control-group label="@defaultdialogs_urlLinkPicker" class="umb-property--pull">
+	    <input type="text"
+	           localize="placeholder"
+	           placeholder="@general_url"
+	           class="umb-editor umb-textstring"
+	           ng-model="target.url"
+	           ng-disabled="target.id || target.udi" />
+	</umb-control-group>
+
+	<umb-control-group label="@defaultdialogs_anchorLinkPicker" class="umb-property--push">
+	    <input type="text"
+	           list="anchors"
+	           localize="placeholder"
+	           placeholder="@placeholders_anchor"
+	           class="umb-editor umb-textstring"
+	           ng-model="target.anchor" />
+
+		<datalist id="anchors">
+					<option value="{{a}}" ng-repeat="a in anchorValues"></option>
+				</datalist>
+	</umb-control-group>
+
+			<umb-control-group label="@defaultdialogs_nodeNameLinkPicker">
+				<input type="text"
+					localize="placeholder"
+					placeholder="@placeholders_entername"
+					class="umb-editor umb-textstring"
+					ng-model="target.name" />
+			</umb-control-group>
+
+			<umb-control-group label="@content_target">
+				<select class="umb-editor umb-dropdown" ng-model="target.target">
+					<option value=""></option>
+					<option value="_blank"><localize key="defaultdialogs_openInNewWindow">Opens the linked document in a new window or tab</localize></option>
+				</select>
+			</umb-control-group>
+		</umb-pane>
+
+        <umb-tree-search-box hide-search-callback="hideSearch"
+                             search-callback="onSearchResults"
+                             search-from-id="{{searchInfo.searchFromId}}"
+                             search-from-name="{{searchInfo.searchFromName}}"
+                             datatype-id="{{searchInfo.dataTypeId}}"
+                             show-search="{{searchInfo.showSearch}}"
+                             section="{{section}}">
+        </umb-tree-search-box>
+
+        <br/>
+
+        <umb-tree-search-results ng-if="searchInfo.showSearch"
+                                 results="searchInfo.results"
+                                 select-result-callback="selectResult">
+        </umb-tree-search-results>
+
+	    <div ng-hide="searchInfo.showSearch">
+            <umb-tree section="content"
+                      hideheader="true"
+                      hideoptions="true"
+                      eventhandler="dialogTreeEventHandler"
+                      isdialog="true"
+                      enablecheckboxes="true">
+            </umb-tree>
+	    </div>
+
+	</div>
+
+	<div class="umb-panel-footer">
+		<div class="umb-el-wrap umb-panel-buttons">
+	        <div class="btn-toolbar umb-btn-toolbar pull-right">
+	        	<a href ng-click="close()" class="btn btn-link">
+	        		<localize key="general_cancel">Cancel</localize>
+				</a>
+	            <a href ng-click="switchToMediaPicker()" class="btn">
+                    <localize key="defaultdialogs_selectMedia">Select media</localize>
+	            </a>
+				<button
+					class="btn btn-primary"
+					ng-click="submit(target)">
+					<localize key="buttons_select">Select</localize>
+				</button>
+	        </div>
+		</div>
+	</div>
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js
index 844ee6e240..539cb418c4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js
@@ -1,431 +1,430 @@
-//used for the media picker dialog
-angular.module("umbraco").controller("Umbraco.Dialogs.TreePickerController",
-	function ($scope, entityResource, eventsService, $log, searchService, angularHelper, $timeout, localizationService, treeService) {
-
-	    var tree = null;
-	    var dialogOptions = $scope.dialogOptions;
-	    $scope.dialogTreeEventHandler = $({});
-	    $scope.section = dialogOptions.section;
-	    $scope.treeAlias = dialogOptions.treeAlias;
-	    $scope.multiPicker = dialogOptions.multiPicker;
-        $scope.hideHeader = (typeof dialogOptions.hideHeader) === "boolean" ? dialogOptions.hideHeader : true;; 	    	    
-        $scope.searchInfo = {
-            searchFromId: dialogOptions.startNodeId,
-            searchFromName: null,
-            showSearch: false,
-            results: [],
-            selectedSearchResults: []
-        }
-
-	    //create the custom query string param for this tree
-	    $scope.customTreeParams = dialogOptions.startNodeId ? "startNodeId=" + dialogOptions.startNodeId : "";
-	    $scope.customTreeParams += dialogOptions.customTreeParams ? "&" + dialogOptions.customTreeParams : "";
-
-	    var searchText = "Search...";
-	    localizationService.localize("general_search").then(function (value) {
-	        searchText = value + "...";
-	    });
-
-        // Allow the entity type to be passed in but defaults to Document for backwards compatibility.
-	    var entityType = dialogOptions.entityType ? dialogOptions.entityType : "Document";
-	    
-
-	    //min / max values
-	    if (dialogOptions.minNumber) {
-	        dialogOptions.minNumber = parseInt(dialogOptions.minNumber, 10);
-	    }
-	    if (dialogOptions.maxNumber) {
-	        dialogOptions.maxNumber = parseInt(dialogOptions.maxNumber, 10);
-	    }
-
-	    if (dialogOptions.section === "member") {
-	        entityType = "Member";            
-	    }
-	    else if (dialogOptions.section === "media") {	    
-	        entityType = "Media";
-	    }
-
-	    //Configures filtering
-	    if (dialogOptions.filter) {
-
-	        dialogOptions.filterExclude = false;
-	        dialogOptions.filterAdvanced = false;
-
-	        //used advanced filtering
-	        if (angular.isFunction(dialogOptions.filter)) {
-	            dialogOptions.filterAdvanced = true;
-	        }
-            else if (angular.isObject(dialogOptions.filter)) {
-                dialogOptions.filterAdvanced = true;
-            }
-            else {
-                if (dialogOptions.filter.startsWith("!")) {
-                    dialogOptions.filterExclude = true;
-                    dialogOptions.filter = dialogOptions.filter.substring(1);
-                }
-
-                //used advanced filtering
-                if (dialogOptions.filter.startsWith("{")) {
-                    dialogOptions.filterAdvanced = true;
-                    //convert to object
-                    dialogOptions.filter = angular.fromJson(dialogOptions.filter);
-                }
-            }
-	    } 
-
-	    function nodeExpandedHandler(ev, args) {            
-	        if (angular.isArray(args.children)) {
-
-                //iterate children
-	            _.each(args.children, function (child) {
-
-	                //check if any of the items are list views, if so we need to add some custom 
-	                // children: A node to activate the search, any nodes that have already been 
-	                // selected in the search
-	                if (child.metaData.isContainer) {
-	                    child.hasChildren = true;
-	                    child.children = [
-	                        {
-                                level: child.level + 1,
-                                hasChildren: false,
-                                parent: function () {
-                                    return child;
-                                },
-	                            name: searchText,
-	                            metaData: {
-	                                listViewNode: child
-	                            },
-	                            cssClass: "icon-search",
-	                            cssClasses: ["not-published"]
-	                        }
-	                    ];
-                        //add base transition classes to this node
-	                    child.cssClasses.push("tree-node-slide-up");
-
-	                    var listViewResults = _.filter($scope.searchInfo.selectedSearchResults, function(i) {
-	                        return i.parentId == child.id;
-	                    });
-	                    _.each(listViewResults, function(item) {
-	                        child.children.unshift({
-	                            id: item.id,
-	                            name: item.name,
-	                            cssClass: "icon umb-tree-icon sprTree " + item.icon,
-	                            level: child.level + 1,
-	                            metaData: {
-	                                isSearchResult: true
-	                            },
-	                            hasChildren: false,
-	                            parent: function () {
-	                                return child;
-	                            }
-	                        });
-	                    });
-	                }
-
-	                //now we need to look in the already selected search results and 
-	                // toggle the check boxes for those ones that are listed
-	                var exists = _.find($scope.searchInfo.selectedSearchResults, function (selected) {
-	                    return child.id == selected.id;
-	                });
-	                if (exists) {
-	                    child.selected = true;
-	                }
-	            });
-
-	            //check filter
-	            performFiltering(args.children);	            
-	        }
-	    }
-
-        //gets the tree object when it loads
-	    function treeLoadedHandler(ev, args) {
-	        tree = args.tree;
-	    }
-
-	    //wires up selection
-	    function nodeSelectHandler(ev, args) {
-	        args.event.preventDefault();
-	        args.event.stopPropagation();
-	        
-	        if (args.node.metaData.listViewNode) {
-	            //check if list view 'search' node was selected
-
-                $scope.searchInfo.showSearch = true;                
-                $scope.searchInfo.searchFromId = args.node.metaData.listViewNode.id;
-                $scope.searchInfo.searchFromName = args.node.metaData.listViewNode.name;
-
-                //add transition classes
-	            var listViewNode = args.node.parent();
-	            listViewNode.cssClasses.push('tree-node-slide-up-hide-active');
-	        }
-            else if (args.node.metaData.isSearchResult) {
-                //check if the item selected was a search result from a list view
-
-                //unselect
-                select(args.node.name, args.node.id);
-
-                //remove it from the list view children
-                var listView = args.node.parent();
-	            listView.children = _.reject(listView.children, function(child) {
-	                return child.id == args.node.id;
-	            });
-
-                //remove it from the custom tracked search result list
-	            $scope.searchInfo.selectedSearchResults = _.reject($scope.searchInfo.selectedSearchResults, function (i) {
-	                return i.id == args.node.id;
-	            });
-	        }
-            else {
-                eventsService.emit("dialogs.treePickerController.select", args);
-
-                if (args.node.filtered) {
-                    return;
-                }
-
-                //This is a tree node, so we don't have an entity to pass in, it will need to be looked up
-                //from the server in this method.
-                select(args.node.name, args.node.id);
-
-                //toggle checked state
-                args.node.selected = args.node.selected === true ? false : true;
-            }	        
-	    }
-
-	    /** Method used for selecting a node */
-	    function select(text, id, entity) {
-	        //if we get the root, we just return a constructed entity, no need for server data
-	        if (id < 0) {
-	            if ($scope.multiPicker) {
-	                $scope.select(id);
-	            }
-	            else {
-	                var node = {
-	                    alias: null,
-	                    icon: "icon-folder",
-	                    id: id,
-	                    name: text
-	                };
-	                $scope.submit(node);
-	            }
-	        }
-	        else {
-	            
-	            if ($scope.multiPicker) {
-	                $scope.select(Number(id));
-	            }
-	            else {
-                    
-	                $scope.hideSearch();
-
-	                //if an entity has been passed in, use it
-	                if (entity) {
-	                    $scope.submit(entity);
-	                } else {
-	                    //otherwise we have to get it from the server
-	                    entityResource.getById(id, entityType).then(function (ent) {
-	                        $scope.submit(ent);
-	                    });
-	                }
-	            }
-	        }
-	    }
-
-	    function performFiltering(nodes) {
-
-	        if (!dialogOptions.filter) {
-	            return;
-	        }
-
-	        //remove any list view search nodes from being filtered since these are special nodes that always must
-	        // be allowed to be clicked on
-	        nodes = _.filter(nodes, function(n) {
-	            return !angular.isObject(n.metaData.listViewNode);
-	        });
-
-	        if (dialogOptions.filterAdvanced) {
-
-                //filter either based on a method or an object
-	            var filtered = angular.isFunction(dialogOptions.filter)
-	                ? _.filter(nodes, dialogOptions.filter)
-	                : _.where(nodes, dialogOptions.filter);
-
-	            angular.forEach(filtered, function (value, key) {
-	                value.filtered = true;
-	                if (dialogOptions.filterCssClass) {
-                        if (!value.cssClasses) {
-                            value.cssClasses = [];
-                        }
-	                    value.cssClasses.push(dialogOptions.filterCssClass);
-	                }
-	            });
-	        } else {
-	            var a = dialogOptions.filter.toLowerCase().replace(/\s/g, '').split(',');
-	            angular.forEach(nodes, function (value, key) {
-
-	                var found = a.indexOf(value.metaData.contentType.toLowerCase()) >= 0;
-
-	                if (!dialogOptions.filterExclude && !found || dialogOptions.filterExclude && found) {
-	                    value.filtered = true;
-
-	                    if (dialogOptions.filterCssClass) {
-	                        if (!value.cssClasses) {
-	                            value.cssClasses = [];
-	                        }
-	                        value.cssClasses.push(dialogOptions.filterCssClass);
-	                    }
-	                }
-	            });
-	        }
-	    }
-        
-	    $scope.multiSubmit = function (result) {
-	        entityResource.getByIds(result, entityType).then(function (ents) {
-	            $scope.submit(ents);
-	        });
-	    };
-        
-	    /** method to select a search result */
-	    $scope.selectResult = function (evt, result) {
-
-            if (result.filtered) {
-                return;
-            }
-
-	        result.selected = result.selected === true ? false : true;
-
-	        //since result = an entity, we'll pass it in so we don't have to go back to the server
-	        select(result.name, result.id, result);
-
-	        //add/remove to our custom tracked list of selected search results
-            if (result.selected) {
-                $scope.searchInfo.selectedSearchResults.push(result);
-            }
-            else {
-                $scope.searchInfo.selectedSearchResults = _.reject($scope.searchInfo.selectedSearchResults, function(i) {
-                    return i.id == result.id;
-                });
-            }
-
-	        //ensure the tree node in the tree is checked/unchecked if it already exists there
-	        if (tree) {	            
-	            var found = treeService.getDescendantNode(tree.root, result.id);
-                if (found) {
-                    found.selected = result.selected;
-                }
-	        }
-	        
-	    };
-
-	    $scope.hideSearch = function () {
-            	    
-            //Traverse the entire displayed tree and update each node to sync with the selected search results
-	        if (tree) {
-
-	            //we need to ensure that any currently displayed nodes that get selected
-	            // from the search get updated to have a check box!
-                function checkChildren(children) {
-                    _.each(children, function (child) {
-                        //check if the id is in the selection, if so ensure it's flagged as selected
-                        var exists = _.find($scope.searchInfo.selectedSearchResults, function (selected) {
-                            return child.id == selected.id;
-                        });
-                        //if the curr node exists in selected search results, ensure it's checked
-                        if (exists) {
-                            child.selected = true;
-                        }
-                        //if the curr node does not exist in the selected search result, and the curr node is a child of a list view search result
-                        else if (child.metaData.isSearchResult) {
-                            //if this tree node is under a list view it means that the node was added
-                            // to the tree dynamically under the list view that was searched, so we actually want to remove
-                            // it all together from the tree
-                            var listView = child.parent();
-                            listView.children = _.reject(listView.children, function(c) {
-                                return c.id == child.id;
-                            });
-                        }
-                        
-                        //check if the current node is a list view and if so, check if there's any new results
-                        // that need to be added as child nodes to it based on search results selected
-                        if (child.metaData.isContainer) {
-
-                            child.cssClasses = _.reject(child.cssClasses, function(c) {
-                                return c === 'tree-node-slide-up-hide-active';
-                            });
-
-                            var listViewResults = _.filter($scope.searchInfo.selectedSearchResults, function (i) {
-                                return i.parentId == child.id;
-                            });
-                            _.each(listViewResults, function (item) {
-                                var childExists = _.find(child.children, function(c) {
-                                    return c.id == item.id;
-                                });
-                                if (!childExists) {
-                                    var parent = child;
-                                    child.children.unshift({
-                                        id: item.id,
-                                        name: item.name,
-                                        cssClass: "icon umb-tree-icon sprTree " + item.icon,
-                                        level: child.level + 1,
-                                        metaData: {
-                                            isSearchResult: true
-                                        },
-                                        hasChildren: false,
-                                        parent: function () {
-                                            return parent;
-                                        }
-                                    });
-                                }                                
-                            });
-                        }
-
-                        //recurse
-                        if (child.children && child.children.length > 0) {
-                            checkChildren(child.children);
-                        }
-                    });
-                }
-                checkChildren(tree.root.children);
-	        }
-	        
-
-            $scope.searchInfo.showSearch = false;            
-            $scope.searchInfo.searchFromId = dialogOptions.startNodeId;
-            $scope.searchInfo.searchFromName = null;
-            $scope.searchInfo.results = [];
-        }
-
-	    $scope.onSearchResults = function(results) {
-	        
-            //filter all items - this will mark an item as filtered
-	        performFiltering(results);
-
-	        //now actually remove all filtered items so they are not even displayed
-	        results = _.filter(results, function(item) {
-	            return !item.filtered;
-	        });
-
-	        $scope.searchInfo.results = results;
-
-            //sync with the curr selected results
-	        _.each($scope.searchInfo.results, function (result) {
-	            var exists = _.find($scope.dialogData.selection, function (selectedId) {
-	                return result.id == selectedId;
-	            });
-	            if (exists) {
-	                result.selected = true;
-	            }	            
-	        });
-
-	        $scope.searchInfo.showSearch = true;
-	    };
-
-	    $scope.dialogTreeEventHandler.bind("treeLoaded", treeLoadedHandler);
-	    $scope.dialogTreeEventHandler.bind("treeNodeExpanded", nodeExpandedHandler);
-	    $scope.dialogTreeEventHandler.bind("treeNodeSelect", nodeSelectHandler);
-
-	    $scope.$on('$destroy', function () {
-	        $scope.dialogTreeEventHandler.unbind("treeLoaded", treeLoadedHandler);
-	        $scope.dialogTreeEventHandler.unbind("treeNodeExpanded", nodeExpandedHandler);
-	        $scope.dialogTreeEventHandler.unbind("treeNodeSelect", nodeSelectHandler);
-	    });
-	});
+//used for the media picker dialog
+angular.module("umbraco").controller("Umbraco.Dialogs.TreePickerController",
+	function ($scope, entityResource, eventsService, $log, searchService, angularHelper, $timeout, localizationService, treeService) {
+
+	    var tree = null;
+	    var dialogOptions = $scope.dialogOptions;
+	    $scope.dialogTreeEventHandler = $({});
+	    $scope.section = dialogOptions.section;
+	    $scope.treeAlias = dialogOptions.treeAlias;
+	    $scope.multiPicker = dialogOptions.multiPicker;
+        $scope.hideHeader = (typeof dialogOptions.hideHeader) === "boolean" ? dialogOptions.hideHeader : true;;
+        $scope.searchInfo = {
+            searchFromId: dialogOptions.startNodeId,
+            searchFromName: null,
+            showSearch: false,
+            results: [],
+            selectedSearchResults: []
+        }
+
+	    //create the custom query string param for this tree
+	    $scope.customTreeParams = dialogOptions.startNodeId ? "startNodeId=" + dialogOptions.startNodeId : "";
+	    $scope.customTreeParams += dialogOptions.customTreeParams ? "&" + dialogOptions.customTreeParams : "";
+
+	    var searchText = "Search...";
+	    localizationService.localize("general_search").then(function (value) {
+	        searchText = value + "...";
+	    });
+
+        // Allow the entity type to be passed in but defaults to Document for backwards compatibility.
+	    var entityType = dialogOptions.entityType ? dialogOptions.entityType : "Document";
+
+
+	    //min / max values
+	    if (dialogOptions.minNumber) {
+	        dialogOptions.minNumber = parseInt(dialogOptions.minNumber, 10);
+	    }
+	    if (dialogOptions.maxNumber) {
+	        dialogOptions.maxNumber = parseInt(dialogOptions.maxNumber, 10);
+	    }
+
+	    if (dialogOptions.section === "member") {
+	        entityType = "Member";
+	    }
+	    else if (dialogOptions.section === "media") {
+	        entityType = "Media";
+	    }
+
+	    //Configures filtering
+	    if (dialogOptions.filter) {
+
+	        dialogOptions.filterExclude = false;
+	        dialogOptions.filterAdvanced = false;
+
+	        //used advanced filtering
+	        if (angular.isFunction(dialogOptions.filter)) {
+	            dialogOptions.filterAdvanced = true;
+	        }
+            else if (angular.isObject(dialogOptions.filter)) {
+                dialogOptions.filterAdvanced = true;
+            }
+            else {
+                if (dialogOptions.filter.startsWith("!")) {
+                    dialogOptions.filterExclude = true;
+                    dialogOptions.filter = dialogOptions.filter.substring(1);
+                }
+
+                //used advanced filtering
+                if (dialogOptions.filter.startsWith("{")) {
+                    dialogOptions.filterAdvanced = true;
+                    //convert to object
+                    dialogOptions.filter = angular.fromJson(dialogOptions.filter);
+                }
+            }
+	    }
+
+	    function nodeExpandedHandler(ev, args) {
+	        if (angular.isArray(args.children)) {
+
+                //iterate children
+	            _.each(args.children, function (child) {
+
+	                //check if any of the items are list views, if so we need to add some custom
+	                // children: A node to activate the search, any nodes that have already been
+	                // selected in the search
+	                if (child.metaData.isContainer) {
+	                    child.hasChildren = true;
+	                    child.children = [
+	                        {
+                                level: child.level + 1,
+                                hasChildren: false,
+                                parent: function () {
+                                    return child;
+                                },
+	                            name: searchText,
+	                            metaData: {
+	                                listViewNode: child
+	                            },
+	                            cssClass: "icon-search",
+	                            cssClasses: ["not-published"]
+	                        }
+	                    ];
+                        //add base transition classes to this node
+	                    child.cssClasses.push("tree-node-slide-up");
+
+	                    var listViewResults = _.filter($scope.searchInfo.selectedSearchResults, function(i) {
+	                        return i.parentId == child.id;
+	                    });
+	                    _.each(listViewResults, function(item) {
+	                        child.children.unshift({
+	                            id: item.id,
+	                            name: item.name,
+	                            cssClass: "icon umb-tree-icon sprTree " + item.icon,
+	                            level: child.level + 1,
+	                            metaData: {
+	                                isSearchResult: true
+	                            },
+	                            hasChildren: false,
+	                            parent: function () {
+	                                return child;
+	                            }
+	                        });
+	                    });
+	                }
+
+	                //now we need to look in the already selected search results and
+	                // toggle the check boxes for those ones that are listed
+	                var exists = _.find($scope.searchInfo.selectedSearchResults, function (selected) {
+	                    return child.id == selected.id;
+	                });
+	                if (exists) {
+	                    child.selected = true;
+	                }
+	            });
+
+	            //check filter
+	            performFiltering(args.children);
+	        }
+	    }
+
+        //gets the tree object when it loads
+	    function treeLoadedHandler(ev, args) {
+	        tree = args.tree;
+	    }
+
+	    //wires up selection
+	    function nodeSelectHandler(ev, args) {
+	        args.event.preventDefault();
+	        args.event.stopPropagation();
+
+	        if (args.node.metaData.listViewNode) {
+	            //check if list view 'search' node was selected
+
+                $scope.searchInfo.showSearch = true;
+                $scope.searchInfo.searchFromId = args.node.metaData.listViewNode.id;
+                $scope.searchInfo.searchFromName = args.node.metaData.listViewNode.name;
+
+                //add transition classes
+	            var listViewNode = args.node.parent();
+	            listViewNode.cssClasses.push('tree-node-slide-up-hide-active');
+	        }
+            else if (args.node.metaData.isSearchResult) {
+                //check if the item selected was a search result from a list view
+
+                //unselect
+                select(args.node.name, args.node.id);
+
+                //remove it from the list view children
+                var listView = args.node.parent();
+	            listView.children = _.reject(listView.children, function(child) {
+	                return child.id == args.node.id;
+	            });
+
+                //remove it from the custom tracked search result list
+	            $scope.searchInfo.selectedSearchResults = _.reject($scope.searchInfo.selectedSearchResults, function (i) {
+	                return i.id == args.node.id;
+	            });
+	        }
+            else {
+                eventsService.emit("dialogs.treePickerController.select", args);
+
+                if (args.node.filtered) {
+                    return;
+                }
+
+                //This is a tree node, so we don't have an entity to pass in, it will need to be looked up
+                //from the server in this method.
+                select(args.node.name, args.node.id);
+
+                //toggle checked state
+                args.node.selected = args.node.selected === true ? false : true;
+            }
+	    }
+
+	    /** Method used for selecting a node */
+	    function select(text, id, entity) {
+	        //if we get the root, we just return a constructed entity, no need for server data
+	        if (id < 0) {
+	            if ($scope.multiPicker) {
+	                $scope.select(id);
+	            }
+	            else {
+	                var node = {
+	                    alias: null,
+	                    icon: "icon-folder",
+	                    id: id,
+	                    name: text
+	                };
+	                $scope.submit(node);
+	            }
+	        }
+	        else {
+
+	            if ($scope.multiPicker) {
+	                $scope.select(Number(id));
+	            }
+	            else {
+
+	                $scope.hideSearch();
+
+	                //if an entity has been passed in, use it
+	                if (entity) {
+	                    $scope.submit(entity);
+	                } else {
+	                    //otherwise we have to get it from the server
+	                    entityResource.getById(id, entityType).then(function (ent) {
+	                        $scope.submit(ent);
+	                    });
+	                }
+	            }
+	        }
+	    }
+
+	    function performFiltering(nodes) {
+
+	        if (!dialogOptions.filter) {
+	            return;
+	        }
+
+	        //remove any list view search nodes from being filtered since these are special nodes that always must
+	        // be allowed to be clicked on
+	        nodes = _.filter(nodes, function(n) {
+	            return !angular.isObject(n.metaData.listViewNode);
+	        });
+
+	        if (dialogOptions.filterAdvanced) {
+
+                //filter either based on a method or an object
+	            var filtered = angular.isFunction(dialogOptions.filter)
+	                ? _.filter(nodes, dialogOptions.filter)
+	                : _.where(nodes, dialogOptions.filter);
+
+	            angular.forEach(filtered, function (value, key) {
+	                value.filtered = true;
+	                if (dialogOptions.filterCssClass) {
+                        if (!value.cssClasses) {
+                            value.cssClasses = [];
+                        }
+	                    value.cssClasses.push(dialogOptions.filterCssClass);
+	                }
+	            });
+	        } else {
+	            var a = dialogOptions.filter.toLowerCase().replace(/\s/g, '').split(',');
+	            angular.forEach(nodes, function (value, key) {
+
+	                var found = a.indexOf(value.metaData.contentType.toLowerCase()) >= 0;
+
+	                if (!dialogOptions.filterExclude && !found || dialogOptions.filterExclude && found) {
+	                    value.filtered = true;
+
+	                    if (dialogOptions.filterCssClass) {
+	                        if (!value.cssClasses) {
+	                            value.cssClasses = [];
+	                        }
+	                        value.cssClasses.push(dialogOptions.filterCssClass);
+	                    }
+	                }
+	            });
+	        }
+	    }
+
+	    $scope.multiSubmit = function (result) {
+	        entityResource.getByIds(result, entityType).then(function (ents) {
+	            $scope.submit(ents);
+	        });
+	    };
+
+	    /** method to select a search result */
+	    $scope.selectResult = function (evt, result) {
+
+            if (result.filtered) {
+                return;
+            }
+
+	        result.selected = result.selected === true ? false : true;
+
+	        //since result = an entity, we'll pass it in so we don't have to go back to the server
+	        select(result.name, result.id, result);
+
+	        //add/remove to our custom tracked list of selected search results
+            if (result.selected) {
+                $scope.searchInfo.selectedSearchResults.push(result);
+            }
+            else {
+                $scope.searchInfo.selectedSearchResults = _.reject($scope.searchInfo.selectedSearchResults, function(i) {
+                    return i.id == result.id;
+                });
+            }
+
+	        //ensure the tree node in the tree is checked/unchecked if it already exists there
+	        if (tree) {
+	            var found = treeService.getDescendantNode(tree.root, result.id);
+                if (found) {
+                    found.selected = result.selected;
+                }
+	        }
+
+	    };
+
+	    $scope.hideSearch = function () {
+
+            //Traverse the entire displayed tree and update each node to sync with the selected search results
+	        if (tree) {
+
+	            //we need to ensure that any currently displayed nodes that get selected
+	            // from the search get updated to have a check box!
+                function checkChildren(children) {
+                    _.each(children, function (child) {
+                        //check if the id is in the selection, if so ensure it's flagged as selected
+                        var exists = _.find($scope.searchInfo.selectedSearchResults, function (selected) {
+                            return child.id == selected.id;
+                        });
+                        //if the curr node exists in selected search results, ensure it's checked
+                        if (exists) {
+                            child.selected = true;
+                        }
+                        //if the curr node does not exist in the selected search result, and the curr node is a child of a list view search result
+                        else if (child.metaData.isSearchResult) {
+                            //if this tree node is under a list view it means that the node was added
+                            // to the tree dynamically under the list view that was searched, so we actually want to remove
+                            // it all together from the tree
+                            var listView = child.parent();
+                            listView.children = _.reject(listView.children, function(c) {
+                                return c.id == child.id;
+                            });
+                        }
+
+                        //check if the current node is a list view and if so, check if there's any new results
+                        // that need to be added as child nodes to it based on search results selected
+                        if (child.metaData.isContainer) {
+
+                            child.cssClasses = _.reject(child.cssClasses, function(c) {
+                                return c === 'tree-node-slide-up-hide-active';
+                            });
+
+                            var listViewResults = _.filter($scope.searchInfo.selectedSearchResults, function (i) {
+                                return i.parentId == child.id;
+                            });
+                            _.each(listViewResults, function (item) {
+                                var childExists = _.find(child.children, function(c) {
+                                    return c.id == item.id;
+                                });
+                                if (!childExists) {
+                                    var parent = child;
+                                    child.children.unshift({
+                                        id: item.id,
+                                        name: item.name,
+                                        cssClass: "icon umb-tree-icon sprTree " + item.icon,
+                                        level: child.level + 1,
+                                        metaData: {
+                                            isSearchResult: true
+                                        },
+                                        hasChildren: false,
+                                        parent: function () {
+                                            return parent;
+                                        }
+                                    });
+                                }
+                            });
+                        }
+
+                        //recurse
+                        if (child.children && child.children.length > 0) {
+                            checkChildren(child.children);
+                        }
+                    });
+                }
+                checkChildren(tree.root.children);
+	        }
+
+
+            $scope.searchInfo.showSearch = false;
+            $scope.searchInfo.searchFromId = dialogOptions.startNodeId;
+            $scope.searchInfo.searchFromName = null;
+            $scope.searchInfo.results = [];
+        }
+
+	    $scope.onSearchResults = function(results) {;
+            //filter all items - this will mark an item as filtered
+	        performFiltering(results);
+
+	        //now actually remove all filtered items so they are not even displayed
+	        results = _.filter(results, function(item) {
+	            return !item.filtered;
+	        });
+
+	        $scope.searchInfo.results = results;
+
+            //sync with the curr selected results
+	        _.each($scope.searchInfo.results, function (result) {
+	            var exists = _.find($scope.dialogData.selection, function (selectedId) {
+	                return result.id == selectedId;
+	            });
+	            if (exists) {
+	                result.selected = true;
+	            }
+	        });
+
+	        $scope.searchInfo.showSearch = true;
+	    };
+
+	    $scope.dialogTreeEventHandler.bind("treeLoaded", treeLoadedHandler);
+	    $scope.dialogTreeEventHandler.bind("treeNodeExpanded", nodeExpandedHandler);
+	    $scope.dialogTreeEventHandler.bind("treeNodeSelect", nodeSelectHandler);
+
+	    $scope.$on('$destroy', function () {
+	        $scope.dialogTreeEventHandler.unbind("treeLoaded", treeLoadedHandler);
+	        $scope.dialogTreeEventHandler.unbind("treeNodeExpanded", nodeExpandedHandler);
+	        $scope.dialogTreeEventHandler.unbind("treeNodeSelect", nodeSelectHandler);
+	    });
+	});
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contentpicker/contentpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contentpicker/contentpicker.html
index 4391e50c28..14bcf58f5a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contentpicker/contentpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contentpicker/contentpicker.html
@@ -9,7 +9,7 @@
                 search-from-id="{{searchInfo.searchFromId}}"
                 search-from-name="{{searchInfo.searchFromName}}"
                 show-search="{{searchInfo.showSearch}}"
-                ignore-user-startnodes="{{searchInfo.ignoreUserStartNodes}}"
+                datatype-id="{{searchInfo.dataTypeId}}"
                 section="content">
             </umb-tree-search-box>
         </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
index 79b9362d3f..8a1c3eb9a9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
@@ -18,11 +18,11 @@ angular.module("umbraco").controller("Umbraco.Overlays.LinkPickerController",
             searchFromId: null,
             searchFromName: null,
             showSearch: false,
-            ignoreUserStartNodes: dialogOptions.ignoreUserStartNodes,
+            dataTypeId: dialogOptions.dataTypeId,
             results: [],
             selectedSearchResults: []
         };
-        $scope.customTreeParams = dialogOptions.ignoreUserStartNodes ? "ignoreUserStartNodes=" + dialogOptions.ignoreUserStartNodes : "";
+        $scope.customTreeParams = dialogOptions.dataTypeId ? "dataTypeId=" + dialogOptions.dataTypeId : "";
         $scope.showTarget = $scope.model.hideTarget !== true;
 
         if (dialogOptions.currentTarget) {
@@ -46,7 +46,7 @@ angular.module("umbraco").controller("Umbraco.Overlays.LinkPickerController",
                     });
 
                     // if a link exists, get the properties to build the anchor name list
-                    contentResource.getById(id, { ignoreUserStartNodes: dialogOptions.ignoreUserStartNodes }).then(function (resp) {
+                    contentResource.getById(id, { dataTypeId: dialogOptions.dataTypeId }).then(function (resp) {
                         $scope.model.target.url = resp.urls[0];
                         $scope.anchorValues = tinyMceService.getAnchorNames(JSON.stringify(resp.properties));
                     });
@@ -88,7 +88,7 @@ angular.module("umbraco").controller("Umbraco.Overlays.LinkPickerController",
             if (args.node.id < 0) {
                 $scope.model.target.url = "/";
             } else {
-                contentResource.getById(args.node.id, { ignoreUserStartNodes: dialogOptions.ignoreUserStartNodes }).then(function (resp) {
+                contentResource.getById(args.node.id, { dataTypeId: dialogOptions.dataTypeId }).then(function (resp) {
                     $scope.model.target.url = resp.urls[0];
                     $scope.anchorValues = tinyMceService.getAnchorNames(JSON.stringify(resp.properties));
                 });
@@ -120,7 +120,7 @@ angular.module("umbraco").controller("Umbraco.Overlays.LinkPickerController",
                     startNodeId: startNodeId,
                     startNodeIsVirtual: startNodeIsVirtual,
                     show: true,
-                    ignoreUserStartNodes: dialogOptions.ignoreUserStartNodes,
+                    dataTypeId: dialogOptions.dataTypeId,
                     submit: function (model) {
                         var media = model.selectedImages[0];
 
@@ -133,7 +133,7 @@ angular.module("umbraco").controller("Umbraco.Overlays.LinkPickerController",
                         $scope.mediaPickerOverlay.show = false;
                         $scope.mediaPickerOverlay = null;
 
-                        // make sure the content tree has nothing highlighted 
+                        // make sure the content tree has nothing highlighted
                         $scope.dialogTreeEventHandler.syncTree({
                             path: "-1",
                             tree: "content"
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html
index c9f3ad54a7..4cc7b0fd46 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html
@@ -43,14 +43,13 @@
         <h5>
             <localize key="defaultdialogs_linkToPage">Link to page</localize>
         </h5>
-
         <div ng-hide="miniListView">
             <umb-tree-search-box hide-search-callback="hideSearch"
                                  search-callback="onSearchResults"
                                  search-from-id="{{searchInfo.searchFromId}}"
                                  search-from-name="{{searchInfo.searchFromName}}"
+                                 datatype-id="{{searchInfo.dataTypeId}}"
                                  show-search="{{searchInfo.showSearch}}"
-								 ignore-user-startnodes="{{searchInfo.ignoreUserStartNodes}}"
                                  section="{{section}}">
             </umb-tree-search-box>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
index e3d9326c53..e7d14c9871 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
@@ -1,426 +1,426 @@
-//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, userService, $cookies, localStorageService, localizationService) {
-
-            if (!$scope.model.title) {
-                $scope.model.title = localizationService.localize("defaultdialogs_selectMedia");
-            }
-
-            var dialogOptions = $scope.model;
-
-            $scope.disableFolderSelect = dialogOptions.disableFolderSelect;
-            $scope.onlyImages = dialogOptions.onlyImages;
-            $scope.showDetails = dialogOptions.showDetails;
-            $scope.multiPicker = (dialogOptions.multiPicker && dialogOptions.multiPicker !== "0") ? true : false;
-            $scope.startNodeId = dialogOptions.startNodeId ? dialogOptions.startNodeId : -1;
-            $scope.cropSize = dialogOptions.cropSize;
-            $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) {
-                $scope.acceptedFileTypes = mediaHelper.formatFileTypes(umbracoSettings.imageFileTypes);
-            } else {
-                // Use whitelist of allowed file types if provided
-                if (allowedUploadFiles !== '') {
-                    $scope.acceptedFileTypes = allowedUploadFiles;
-                } else {
-                    // If no whitelist, we pass in a blacklist by adding ! to the file extensions, allowing everything EXCEPT for disallowedUploadFiles
-                    $scope.acceptedFileTypes = !mediaHelper.formatFileTypes(umbracoSettings.disallowedUploadFiles);
-                }
-            }
-
-            $scope.maxFileSize = umbracoSettings.maxFileSize + "KB";
-
-            $scope.model.selectedImages = [];
-
-            $scope.acceptedMediatypes = [];
-            mediaTypeHelper.getAllowedImagetypes($scope.startNodeId)
-                .then(function(types) {
-                    $scope.acceptedMediatypes = types;
-                });
-
-            $scope.searchOptions = {
-                pageNumber: 1,
-                pageSize: 100,
-                totalItems: 0,
-                totalPages: 0,
-                filter: '',
-                ignoreUserStartNodes: $scope.model.ignoreUserStartNodes
-            };
-
-            //preload selected item
-            $scope.target = undefined;
-            if (dialogOptions.currentTarget) {
-                $scope.target = dialogOptions.currentTarget;
-            }
-
-            function onInit() {
-                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() {
-                //default root item
-                if (!$scope.target) {
-                    if ($scope.lastOpenedNode && $scope.lastOpenedNode !== -1) {
-                        entityResource.getById($scope.lastOpenedNode, "media")
-                            .then(ensureWithinStartNode, gotoStartNode);
-                    } else {
-                        gotoStartNode();
-                    }
-                } else {
-                    //if a target is specified, go look it up - generally this target will just contain ids not the actual full
-                    //media object so we need to look it up
-                    var id = $scope.target.udi ? $scope.target.udi : $scope.target.id
-                    var altText = $scope.target.altText;
-                    if (id) {
-                        mediaResource.getById(id)
-                            .then(function (node) {
-                                $scope.target = node;
-                                if (ensureWithinStartNode(node)) {
-                                    selectImage(node);
-                                    $scope.target.url = mediaHelper.resolveFile(node);
-                                    $scope.target.altText = altText;
-                                    $scope.openDetailsDialog();
-                                }
-                            },
-                                gotoStartNode);
-                    } else {
-                        gotoStartNode();
-                    }
-                }
-            }
-
-            $scope.upload = function(v) {
-                angular.element(".umb-file-dropzone-directive .file-select").click();
-            };
-
-            $scope.dragLeave = function(el, event) {
-                $scope.activeDrag = false;
-            };
-
-            $scope.dragEnter = function(el, event) {
-                $scope.activeDrag = true;
-            };
-
-            $scope.submitFolder = function() {
-                if ($scope.newFolderName) {
-                    $scope.creatingFolder = true;
-                    mediaResource
-                        .addFolder($scope.newFolderName, $scope.currentFolder.id)
-                        .then(function(data) {
-                            //we've added a new folder so lets clear the tree cache for that specific item
-                            treeService.clearCache({
-                                cacheKey: "__media", //this is the main media tree cache key
-                                childrenOf: data.parentId //clear the children of the parent
-                            });
-                            $scope.creatingFolder = false;
-                            $scope.gotoFolder(data);
-                            $scope.showFolderInput = false;
-                            $scope.newFolderName = "";
-                        });
-                } else {
-                    $scope.showFolderInput = false;
-                }
-            };
-
-            $scope.enterSubmitFolder = function(event) {
-                if (event.keyCode === 13) {
-                    $scope.submitFolder();
-                    event.stopPropagation();
-                }
-            };
-
-            $scope.gotoFolder = function(folder) {
-                if (!$scope.multiPicker) {
-                    deselectAllImages($scope.model.selectedImages);
-                }
-
-                if (!folder) {
-                    folder = { id: -1, name: "Media", icon: "icon-folder" };
-                }
-
-                if (folder.id > 0) {
-                    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;
-                                });
-                        });
-
-                } else {
-                    $scope.path = [];
-                }
-              
-                mediaTypeHelper.getAllowedImagetypes(folder.id)
-                    .then(function (types) {
-                        $scope.acceptedMediatypes = types;
-                    });
-              
-                $scope.lockedFolder = (folder.id === -1 && $scope.model.startNodeIsVirtual) || hasFolderAccess(folder) === false;
-
-                $scope.currentFolder = folder;
-                localStorageService.set("umbLastOpenedMediaNodeId", folder.id);
-                return getChildren(folder.id);
-            };
-
-            $scope.clickHandler = function(image, event, index) {
-                if (image.isFolder) {
-                    if ($scope.disableFolderSelect) {
-                        $scope.gotoFolder(image);
-                    } else {
-                        eventsService.emit("dialogs.mediaPicker.select", image);
-                        selectImage(image);
-                    }
-                } else {
-                    eventsService.emit("dialogs.mediaPicker.select", image);
-                    if ($scope.showDetails) {
-
-                        $scope.target = image;
-
-                        // handle both entity and full media object
-                        if (image.image) {
-                            $scope.target.url = image.image;
-                        } else {
-                            $scope.target.url = mediaHelper.resolveFile(image);
-                        }
-
-                        $scope.openDetailsDialog();
-                    } else {
-                        selectImage(image);
-                    }
-                }
-            };
-
-            $scope.clickItemName = function(item) {
-                if (item.isFolder) {
-                    $scope.gotoFolder(item);
-                }
-            };
-
-            function selectImage(image) {
-                if (image.selected) {
-                    for (var i = 0; $scope.model.selectedImages.length > i; i++) {
-                        var imageInSelection = $scope.model.selectedImages[i];
-                        if (image.key === imageInSelection.key) {
-                            image.selected = false;
-                            $scope.model.selectedImages.splice(i, 1);
-                        }
-                    }
-                } else {
-                    if (!$scope.multiPicker) {
-                        deselectAllImages($scope.model.selectedImages);
-                    }
-                    image.selected = true;
-                    $scope.model.selectedImages.push(image);
-                }
-            }
-
-            function deselectAllImages(images) {
-                for (var i = 0; i < images.length; i++) {
-                    var image = images[i];
-                    image.selected = false;
-                }
-                images.length = 0;
-            }
-
-            $scope.onUploadComplete = function(files) {
-                $scope.gotoFolder($scope.currentFolder).then(function() {
-                    if (files.length === 1 && $scope.model.selectedImages.length === 0) {
-                        var image = $scope.images[$scope.images.length - 1];
-                        $scope.target = image;
-                        $scope.target.url = mediaHelper.resolveFile(image);
-                        selectImage(image);
-                    }
-                });
-            };
-
-            $scope.onFilesQueue = function() {
-                $scope.activeDrag = false;
-            };
-
-            function ensureWithinStartNode(node) {
-                // make sure that last opened node is on the same path as start node
-                var nodePath = node.path.split(",");
-
-                // also make sure the node is not trashed
-                if (nodePath.indexOf($scope.startNodeId.toString()) !== -1 && node.trashed === false) {
-                    $scope.gotoFolder({ id: $scope.lastOpenedNode, name: "Media", icon: "icon-folder" });
-                    return true;
-                } else {
-                    $scope.gotoFolder({ id: $scope.startNodeId, name: "Media", icon: "icon-folder" });
-                    return false;
-                }
-            }
-
-            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" });
-            }
-
-            $scope.openDetailsDialog = function() {
-
-                $scope.mediaPickerDetailsOverlay = {};
-                $scope.mediaPickerDetailsOverlay.show = true;
-
-                $scope.mediaPickerDetailsOverlay.submit = function(model) {
-                    $scope.model.selectedImages.push($scope.target);
-                    $scope.model.submit($scope.model);
-
-                    $scope.mediaPickerDetailsOverlay.show = false;
-                    $scope.mediaPickerDetailsOverlay = null;
-                };
-
-                $scope.mediaPickerDetailsOverlay.close = function(oldModel) {
-                    $scope.mediaPickerDetailsOverlay.show = false;
-                    $scope.mediaPickerDetailsOverlay = null;
-                };
-            };
-
-            var debounceSearchMedia = _.debounce(function() {
-                    $scope.$apply(function() {
-                        if ($scope.searchOptions.filter) {
-                            searchMedia();
-                        } else {
-                            // reset pagination
-                            $scope.searchOptions = {
-                                pageNumber: 1,
-                                pageSize: 100,
-                                totalItems: 0,
-                                totalPages: 0,
-                                filter: '',
-                                ignoreUserStartNodes: $scope.model.ignoreUserStartNodes
-                            };
-                            getChildren($scope.currentFolder.id);
-                        }
-                    });
-                }, 500);
-
-            $scope.changeSearch = function() {
-                $scope.loading = true;
-                debounceSearchMedia();
-            };
-
-            $scope.toggle = function() {
-                // Make sure to activate the changeSearch function everytime the toggle is clicked
-                $scope.changeSearch();
-            }
-
-            $scope.changePagination = function(pageNumber) {
-                $scope.loading = true;
-                $scope.searchOptions.pageNumber = pageNumber;
-                searchMedia();
-            };
-
-            function searchMedia() {
-                $scope.loading = true;
-                entityResource.getPagedDescendants($scope.currentFolder.id, "Media", $scope.searchOptions)
-                    .then(function(data) {
-                        // update image data to work with image grid
-                        angular.forEach(data.items,
-                            function(mediaItem) {
-                                // set thumbnail and src
-                                mediaItem.thumbnail = mediaHelper.resolveFileFromEntity(mediaItem, true);
-                                mediaItem.image = mediaHelper.resolveFileFromEntity(mediaItem, false);
-                                // set properties to match a media object
-                                mediaItem.properties = [];
-                                if (mediaItem.metaData) {
-                                    if (mediaItem.metaData.umbracoWidth && mediaItem.metaData.umbracoHeight) {
-                                        mediaItem.properties.push({
-                                            alias: "umbracoWidth",
-                                            value: mediaItem.metaData.umbracoWidth.Value
-                                        });
-                                        mediaItem.properties.push({
-                                            alias: "umbracoHeight",
-                                            value: mediaItem.metaData.umbracoHeight.Value
-                                        });
-                                    }
-                                    if (mediaItem.metaData.umbracoFile) {
-                                        mediaItem.properties.push({
-                                            alias: "umbracoFile",
-                                            editor: mediaItem.metaData.umbracoFile.PropertyEditorAlias,
-                                            value: mediaItem.metaData.umbracoFile.Value
-                                        });
-                                    }
-                                }
-                            });
-                        // update images
-                        $scope.images = data.items ? data.items : [];
-                        // update pagination
-                        if (data.pageNumber > 0)
-                            $scope.searchOptions.pageNumber = data.pageNumber;
-                        if (data.pageSize > 0)
-                            $scope.searchOptions.pageSize = data.pageSize;
-                        $scope.searchOptions.totalItems = data.totalItems;
-                        $scope.searchOptions.totalPages = data.totalPages;
-                        // set already selected images to selected
-                        preSelectImages();
-                        $scope.loading = false;
-                    });
-            }
-
-            function getChildren(id) {
-                $scope.loading = true;
-                return mediaResource.getChildren(id, { ignoreUserStartNodes: $scope.model.ignoreUserStartNodes })
-                    .then(function(data) {
-                        $scope.searchOptions.filter = "";
-                        $scope.images = data.items ? data.items : [];
-                        // set already selected images to selected
-                        preSelectImages();
-                        $scope.loading = false;
-                    });
-            }
-
-            function preSelectImages() {
-                for (var folderImageIndex = 0; folderImageIndex < $scope.images.length; folderImageIndex++) {
-                    var folderImage = $scope.images[folderImageIndex];
-                    var imageIsSelected = false;
-
-                    if ($scope.model && angular.isArray($scope.model.selectedImages)) {
-                        for (var selectedImageIndex = 0;
-                            selectedImageIndex < $scope.model.selectedImages.length;
-                            selectedImageIndex++) {
-                            var selectedImage = $scope.model.selectedImages[selectedImageIndex];
-
-                            if (folderImage.key === selectedImage.key) {
-                                imageIsSelected = true;
-                            }
-                        }
-                    }
-
-                    if (imageIsSelected) {
-                        folderImage.selected = true;
-                    }
-                }
-            }
-
-            onInit();
-
-        });
+//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, userService, $cookies, localStorageService, localizationService) {
+
+            if (!$scope.model.title) {
+                $scope.model.title = localizationService.localize("defaultdialogs_selectMedia");
+            }
+
+            var dialogOptions = $scope.model;
+
+            $scope.disableFolderSelect = dialogOptions.disableFolderSelect;
+            $scope.onlyImages = dialogOptions.onlyImages;
+            $scope.showDetails = dialogOptions.showDetails;
+            $scope.multiPicker = (dialogOptions.multiPicker && dialogOptions.multiPicker !== "0") ? true : false;
+            $scope.startNodeId = dialogOptions.startNodeId ? dialogOptions.startNodeId : -1;
+            $scope.cropSize = dialogOptions.cropSize;
+            $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) {
+                $scope.acceptedFileTypes = mediaHelper.formatFileTypes(umbracoSettings.imageFileTypes);
+            } else {
+                // Use whitelist of allowed file types if provided
+                if (allowedUploadFiles !== '') {
+                    $scope.acceptedFileTypes = allowedUploadFiles;
+                } else {
+                    // If no whitelist, we pass in a blacklist by adding ! to the file extensions, allowing everything EXCEPT for disallowedUploadFiles
+                    $scope.acceptedFileTypes = !mediaHelper.formatFileTypes(umbracoSettings.disallowedUploadFiles);
+                }
+            }
+
+            $scope.maxFileSize = umbracoSettings.maxFileSize + "KB";
+
+            $scope.model.selectedImages = [];
+
+            $scope.acceptedMediatypes = [];
+            mediaTypeHelper.getAllowedImagetypes($scope.startNodeId)
+                .then(function(types) {
+                    $scope.acceptedMediatypes = types;
+                });
+
+            $scope.searchOptions = {
+                pageNumber: 1,
+                pageSize: 100,
+                totalItems: 0,
+                totalPages: 0,
+                filter: '',
+                dataTypeId: $scope.model.dataTypeId
+            };
+
+            //preload selected item
+            $scope.target = undefined;
+            if (dialogOptions.currentTarget) {
+                $scope.target = dialogOptions.currentTarget;
+            }
+
+            function onInit() {
+                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() {
+                //default root item
+                if (!$scope.target) {
+                    if ($scope.lastOpenedNode && $scope.lastOpenedNode !== -1) {
+                        entityResource.getById($scope.lastOpenedNode, "media")
+                            .then(ensureWithinStartNode, gotoStartNode);
+                    } else {
+                        gotoStartNode();
+                    }
+                } else {
+                    //if a target is specified, go look it up - generally this target will just contain ids not the actual full
+                    //media object so we need to look it up
+                    var id = $scope.target.udi ? $scope.target.udi : $scope.target.id
+                    var altText = $scope.target.altText;
+                    if (id) {
+                        mediaResource.getById(id)
+                            .then(function (node) {
+                                $scope.target = node;
+                                if (ensureWithinStartNode(node)) {
+                                    selectImage(node);
+                                    $scope.target.url = mediaHelper.resolveFile(node);
+                                    $scope.target.altText = altText;
+                                    $scope.openDetailsDialog();
+                                }
+                            },
+                                gotoStartNode);
+                    } else {
+                        gotoStartNode();
+                    }
+                }
+            }
+
+            $scope.upload = function(v) {
+                angular.element(".umb-file-dropzone-directive .file-select").click();
+            };
+
+            $scope.dragLeave = function(el, event) {
+                $scope.activeDrag = false;
+            };
+
+            $scope.dragEnter = function(el, event) {
+                $scope.activeDrag = true;
+            };
+
+            $scope.submitFolder = function() {
+                if ($scope.newFolderName) {
+                    $scope.creatingFolder = true;
+                    mediaResource
+                        .addFolder($scope.newFolderName, $scope.currentFolder.id)
+                        .then(function(data) {
+                            //we've added a new folder so lets clear the tree cache for that specific item
+                            treeService.clearCache({
+                                cacheKey: "__media", //this is the main media tree cache key
+                                childrenOf: data.parentId //clear the children of the parent
+                            });
+                            $scope.creatingFolder = false;
+                            $scope.gotoFolder(data);
+                            $scope.showFolderInput = false;
+                            $scope.newFolderName = "";
+                        });
+                } else {
+                    $scope.showFolderInput = false;
+                }
+            };
+
+            $scope.enterSubmitFolder = function(event) {
+                if (event.keyCode === 13) {
+                    $scope.submitFolder();
+                    event.stopPropagation();
+                }
+            };
+
+            $scope.gotoFolder = function(folder) {
+                if (!$scope.multiPicker) {
+                    deselectAllImages($scope.model.selectedImages);
+                }
+
+                if (!folder) {
+                    folder = { id: -1, name: "Media", icon: "icon-folder" };
+                }
+
+                if (folder.id > 0) {
+                    entityResource.getAncestors(folder.id, "media", { dataTypeId: $scope.model.dataTypeId })
+                        .then(function(anc) {
+                            $scope.path = _.filter(anc,
+                                function(f) {
+                                    return f.path.indexOf($scope.startNodeId) !== -1;
+                                });
+                        });
+
+                } else {
+                    $scope.path = [];
+                }
+
+                mediaTypeHelper.getAllowedImagetypes(folder.id)
+                    .then(function (types) {
+                        $scope.acceptedMediatypes = types;
+                    });
+
+                $scope.lockedFolder = (folder.id === -1 && $scope.model.startNodeIsVirtual) || hasFolderAccess(folder) === false;
+
+                $scope.currentFolder = folder;
+                localStorageService.set("umbLastOpenedMediaNodeId", folder.id);
+                return getChildren(folder.id);
+            };
+
+            $scope.clickHandler = function(image, event, index) {
+                if (image.isFolder) {
+                    if ($scope.disableFolderSelect) {
+                        $scope.gotoFolder(image);
+                    } else {
+                        eventsService.emit("dialogs.mediaPicker.select", image);
+                        selectImage(image);
+                    }
+                } else {
+                    eventsService.emit("dialogs.mediaPicker.select", image);
+                    if ($scope.showDetails) {
+
+                        $scope.target = image;
+
+                        // handle both entity and full media object
+                        if (image.image) {
+                            $scope.target.url = image.image;
+                        } else {
+                            $scope.target.url = mediaHelper.resolveFile(image);
+                        }
+
+                        $scope.openDetailsDialog();
+                    } else {
+                        selectImage(image);
+                    }
+                }
+            };
+
+            $scope.clickItemName = function(item) {
+                if (item.isFolder) {
+                    $scope.gotoFolder(item);
+                }
+            };
+
+            function selectImage(image) {
+                if (image.selected) {
+                    for (var i = 0; $scope.model.selectedImages.length > i; i++) {
+                        var imageInSelection = $scope.model.selectedImages[i];
+                        if (image.key === imageInSelection.key) {
+                            image.selected = false;
+                            $scope.model.selectedImages.splice(i, 1);
+                        }
+                    }
+                } else {
+                    if (!$scope.multiPicker) {
+                        deselectAllImages($scope.model.selectedImages);
+                    }
+                    image.selected = true;
+                    $scope.model.selectedImages.push(image);
+                }
+            }
+
+            function deselectAllImages(images) {
+                for (var i = 0; i < images.length; i++) {
+                    var image = images[i];
+                    image.selected = false;
+                }
+                images.length = 0;
+            }
+
+            $scope.onUploadComplete = function(files) {
+                $scope.gotoFolder($scope.currentFolder).then(function() {
+                    if (files.length === 1 && $scope.model.selectedImages.length === 0) {
+                        var image = $scope.images[$scope.images.length - 1];
+                        $scope.target = image;
+                        $scope.target.url = mediaHelper.resolveFile(image);
+                        selectImage(image);
+                    }
+                });
+            };
+
+            $scope.onFilesQueue = function() {
+                $scope.activeDrag = false;
+            };
+
+            function ensureWithinStartNode(node) {
+                // make sure that last opened node is on the same path as start node
+                var nodePath = node.path.split(",");
+
+                // also make sure the node is not trashed
+                if (nodePath.indexOf($scope.startNodeId.toString()) !== -1 && node.trashed === false) {
+                    $scope.gotoFolder({ id: $scope.lastOpenedNode, name: "Media", icon: "icon-folder" });
+                    return true;
+                } else {
+                    $scope.gotoFolder({ id: $scope.startNodeId, name: "Media", icon: "icon-folder" });
+                    return false;
+                }
+            }
+
+            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" });
+            }
+
+            $scope.openDetailsDialog = function() {
+
+                $scope.mediaPickerDetailsOverlay = {};
+                $scope.mediaPickerDetailsOverlay.show = true;
+
+                $scope.mediaPickerDetailsOverlay.submit = function(model) {
+                    $scope.model.selectedImages.push($scope.target);
+                    $scope.model.submit($scope.model);
+
+                    $scope.mediaPickerDetailsOverlay.show = false;
+                    $scope.mediaPickerDetailsOverlay = null;
+                };
+
+                $scope.mediaPickerDetailsOverlay.close = function(oldModel) {
+                    $scope.mediaPickerDetailsOverlay.show = false;
+                    $scope.mediaPickerDetailsOverlay = null;
+                };
+            };
+
+            var debounceSearchMedia = _.debounce(function() {
+                    $scope.$apply(function() {
+                        if ($scope.searchOptions.filter) {
+                            searchMedia();
+                        } else {
+                            // reset pagination
+                            $scope.searchOptions = {
+                                pageNumber: 1,
+                                pageSize: 100,
+                                totalItems: 0,
+                                totalPages: 0,
+                                filter: '',
+                                dataTypeId: $scope.model.dataTypeId
+                            };
+                            getChildren($scope.currentFolder.id);
+                        }
+                    });
+                }, 500);
+
+            $scope.changeSearch = function() {
+                $scope.loading = true;
+                debounceSearchMedia();
+            };
+
+            $scope.toggle = function() {
+                // Make sure to activate the changeSearch function everytime the toggle is clicked
+                $scope.changeSearch();
+            }
+
+            $scope.changePagination = function(pageNumber) {
+                $scope.loading = true;
+                $scope.searchOptions.pageNumber = pageNumber;
+                searchMedia();
+            };
+
+            function searchMedia() {
+                $scope.loading = true;
+                entityResource.getPagedDescendants($scope.currentFolder.id, "Media", $scope.searchOptions)
+                    .then(function(data) {
+                        // update image data to work with image grid
+                        angular.forEach(data.items,
+                            function(mediaItem) {
+                                // set thumbnail and src
+                                mediaItem.thumbnail = mediaHelper.resolveFileFromEntity(mediaItem, true);
+                                mediaItem.image = mediaHelper.resolveFileFromEntity(mediaItem, false);
+                                // set properties to match a media object
+                                mediaItem.properties = [];
+                                if (mediaItem.metaData) {
+                                    if (mediaItem.metaData.umbracoWidth && mediaItem.metaData.umbracoHeight) {
+                                        mediaItem.properties.push({
+                                            alias: "umbracoWidth",
+                                            value: mediaItem.metaData.umbracoWidth.Value
+                                        });
+                                        mediaItem.properties.push({
+                                            alias: "umbracoHeight",
+                                            value: mediaItem.metaData.umbracoHeight.Value
+                                        });
+                                    }
+                                    if (mediaItem.metaData.umbracoFile) {
+                                        mediaItem.properties.push({
+                                            alias: "umbracoFile",
+                                            editor: mediaItem.metaData.umbracoFile.PropertyEditorAlias,
+                                            value: mediaItem.metaData.umbracoFile.Value
+                                        });
+                                    }
+                                }
+                            });
+                        // update images
+                        $scope.images = data.items ? data.items : [];
+                        // update pagination
+                        if (data.pageNumber > 0)
+                            $scope.searchOptions.pageNumber = data.pageNumber;
+                        if (data.pageSize > 0)
+                            $scope.searchOptions.pageSize = data.pageSize;
+                        $scope.searchOptions.totalItems = data.totalItems;
+                        $scope.searchOptions.totalPages = data.totalPages;
+                        // set already selected images to selected
+                        preSelectImages();
+                        $scope.loading = false;
+                    });
+            }
+
+            function getChildren(id) {
+                $scope.loading = true;
+                return mediaResource.getChildren(id, { dataTypeId: $scope.model.dataTypeId })
+                    .then(function(data) {
+                        $scope.searchOptions.filter = "";
+                        $scope.images = data.items ? data.items : [];
+                        // set already selected images to selected
+                        preSelectImages();
+                        $scope.loading = false;
+                    });
+            }
+
+            function preSelectImages() {
+                for (var folderImageIndex = 0; folderImageIndex < $scope.images.length; folderImageIndex++) {
+                    var folderImage = $scope.images[folderImageIndex];
+                    var imageIsSelected = false;
+
+                    if ($scope.model && angular.isArray($scope.model.selectedImages)) {
+                        for (var selectedImageIndex = 0;
+                            selectedImageIndex < $scope.model.selectedImages.length;
+                            selectedImageIndex++) {
+                            var selectedImage = $scope.model.selectedImages[selectedImageIndex];
+
+                            if (folderImage.key === selectedImage.key) {
+                                imageIsSelected = true;
+                            }
+                        }
+                    }
+
+                    if (imageIsSelected) {
+                        folderImage.selected = true;
+                    }
+                }
+            }
+
+            onInit();
+
+        });
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
index e1ce332b48..b4dd34dfff 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
@@ -16,7 +16,7 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController",
             searchFromId: dialogOptions.startNodeId,
             searchFromName: null,
             showSearch: false,
-            ignoreUserStartNodes: dialogOptions.ignoreUserStartNodes,
+            dataTypeId: dialogOptions.dataTypeId,
             results: [],
             selectedSearchResults: []
         }
@@ -138,8 +138,8 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController",
             if (dialogOptions.startNodeId)
                 params.push("startNodeId=" + dialogOptions.startNodeId);
 
-            if (dialogOptions.ignoreUserStartNodes)
-                params.push("ignoreUserStartNodes=" + dialogOptions.ignoreUserStartNodes);
+            if (dialogOptions.dataTypeId)
+                params.push("dataTypeId=" + dialogOptions.dataTypeId);
 
             if (dialogOptions.customTreeParams)
                 params.push(dialogOptions.customTreeParams);
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html
index c338e3402c..cfcbcfac75 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html
@@ -1,56 +1,56 @@
-<div ng-controller="Umbraco.Overlays.TreePickerController">
-
-    <div ng-hide="miniListView">
-
-        <div class="umb-control-group">
-            <umb-tree-search-box
-                ng-if="enableSearh"
-                hide-search-callback="hideSearch"
-                search-callback="onSearchResults"
-                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>
-
-        <umb-tree-search-results
-            ng-if="searchInfo.showSearch"
-            results="searchInfo.results"
-            select-result-callback="selectResult">
-        </umb-tree-search-results>
-      
-      <umb-empty-state ng-if="!hasItems && emptyStateMessage" position="center">
-        {{ emptyStateMessage }}
-      </umb-empty-state>
-
-      <div ng-if="treeReady" ng-hide="searchInfo.showSearch" ng-animate="'tree-fade-out'">
-            <umb-tree
-                section="{{section}}"
-                treealias="{{treeAlias}}"
-                hideheader="{{hideHeader}}"
-                hideoptions="true"
-                isdialog="true"
-                onlyinitialized="{{onlyInitialized}}"
-                customtreeparams="{{customTreeParams}}"
-                eventhandler="dialogTreeEventHandler"
-                enablelistviewsearch="true"
-                enablelistviewexpand="true"
-                enablecheckboxes="{{multiPicker}}">
-            </umb-tree>
-        </div>
-
-    </div>
-
-    <umb-mini-list-view
-        ng-if="miniListView"
-        node="miniListView"
-        entity-type="{{entityType}}"
-        start-node-id="model.startNodeId"
-        on-select="selectListViewNode(node)"
-        on-close="closeMiniListView()"
-        entity-type-filter="filter">
-    </umb-mini-list-view>
-
-</div>
+<div ng-controller="Umbraco.Overlays.TreePickerController">
+
+    <div ng-hide="miniListView">
+
+        <div class="umb-control-group">
+            <umb-tree-search-box
+                ng-if="enableSearh"
+                hide-search-callback="hideSearch"
+                search-callback="onSearchResults"
+                search-from-id="{{searchInfo.searchFromId}}"
+                search-from-name="{{searchInfo.searchFromName}}"
+                show-search="{{searchInfo.showSearch}}"
+                datatype-id="{{searchInfo.dataTypeId}}"
+                section="{{section}}">
+            </umb-tree-search-box>
+        </div>
+
+        <umb-tree-search-results
+            ng-if="searchInfo.showSearch"
+            results="searchInfo.results"
+            select-result-callback="selectResult">
+        </umb-tree-search-results>
+
+      <umb-empty-state ng-if="!hasItems && emptyStateMessage" position="center">
+        {{ emptyStateMessage }}
+      </umb-empty-state>
+
+      <div ng-if="treeReady" ng-hide="searchInfo.showSearch" ng-animate="'tree-fade-out'">
+            <umb-tree
+                section="{{section}}"
+                treealias="{{treeAlias}}"
+                hideheader="{{hideHeader}}"
+                hideoptions="true"
+                isdialog="true"
+                onlyinitialized="{{onlyInitialized}}"
+                customtreeparams="{{customTreeParams}}"
+                eventhandler="dialogTreeEventHandler"
+                enablelistviewsearch="true"
+                enablelistviewexpand="true"
+                enablecheckboxes="{{multiPicker}}">
+            </umb-tree>
+        </div>
+
+    </div>
+
+    <umb-mini-list-view
+        ng-if="miniListView"
+        node="miniListView"
+        entity-type="{{entityType}}"
+        start-node-id="model.startNodeId"
+        on-select="selectListViewNode(node)"
+        on-close="closeMiniListView()"
+        entity-type-filter="filter">
+    </umb-mini-list-view>
+
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
index ce836a8d68..627baa3e7a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
@@ -1,366 +1,366 @@
-//this controller simply tells the dialogs service to open a mediaPicker window
-//with a specified callback, this callback will receive an object with a selection on it
-
-function contentPickerController($scope, entityResource, editorState, iconHelper, $routeParams, angularHelper, navigationService, $location, miniEditorHelper, localizationService) {
-
-    var unsubscribe;
-
-    function subscribe() {
-        unsubscribe = $scope.$on("formSubmitting", function (ev, args) {
-            var currIds = _.map($scope.renderModel, function (i) {
-                return $scope.model.config.idType === "udi" ? i.udi : i.id;
-            });
-            $scope.model.value = trim(currIds.join(), ",");
-        });
-    }
-
-    function trim(str, chr) {
-        var rgxtrim = (!chr) ? new RegExp('^\\s+|\\s+$', 'g') : new RegExp('^' + chr + '+|' + chr + '+$', 'g');
-        return str.replace(rgxtrim, '');
-    }
-
-    function startWatch() {
-        //We need to watch our renderModel so that we can update the underlying $scope.model.value properly, this is required
-        // because the ui-sortable doesn't dispatch an event after the digest of the sort operation. Any of the events for UI sortable
-        // occur after the DOM has updated but BEFORE the digest has occured so the model has NOT changed yet - it even states so in the docs.
-        // In their source code there is no event so we need to just subscribe to our model changes here.
-        //This also makes it easier to manage models, we update one and the rest will just work.
-        $scope.$watch(function () {
-            //return the joined Ids as a string to watch
-            return _.map($scope.renderModel, function (i) {
-                return $scope.model.config.idType === "udi" ? i.udi : i.id;                 
-            }).join();
-        }, function (newVal) {
-            var currIds = _.map($scope.renderModel, function (i) {
-                return $scope.model.config.idType === "udi" ? i.udi : i.id;                
-            });
-            $scope.model.value = trim(currIds.join(), ",");
-
-            //Validate!
-            if ($scope.model.config && $scope.model.config.minNumber && parseInt($scope.model.config.minNumber) > $scope.renderModel.length) {
-                $scope.contentPickerForm.minCount.$setValidity("minCount", false);
-            }
-            else {
-                $scope.contentPickerForm.minCount.$setValidity("minCount", true);
-            }
-
-            if ($scope.model.config && $scope.model.config.maxNumber && parseInt($scope.model.config.maxNumber) < $scope.renderModel.length) {
-                $scope.contentPickerForm.maxCount.$setValidity("maxCount", false);
-            }
-            else {
-                $scope.contentPickerForm.maxCount.$setValidity("maxCount", true);
-            }
-
-            setSortingState($scope.renderModel);
-
-        });
-    }
-
-    $scope.renderModel = [];
-	    
-    $scope.dialogEditor = editorState && editorState.current && editorState.current.isDialogEditor === true;    
-
-    //the default pre-values
-    var defaultConfig = {
-        multiPicker: false,
-        showOpenButton: false,
-        showEditButton: false,
-        showPathOnHover: false,
-        ignoreUserStartNodes: false,
-        maxNumber: 1,
-        minNumber : 0,
-        startNode: {
-            query: "",
-            type: "content",
-	        id: $scope.model.config.startNodeId ? $scope.model.config.startNodeId : -1 // get start node for simple Content Picker
-        }
-    };
-
-    // sortable options
-    $scope.sortableOptions = {
-        axis: "y",
-        containment: "parent",
-        distance: 10,
-        opacity: 0.7,
-        tolerance: "pointer",
-        scroll: true,
-        zIndex: 6000,
-        update: function (e, ui) {
-            angularHelper.getCurrentForm($scope).$setDirty();
-        }
-    };
-
-    if ($scope.model.config) {
-        //merge the server config on top of the default config, then set the server config to use the result
-        $scope.model.config = angular.extend(defaultConfig, $scope.model.config);
-    }
-
-    //Umbraco persists boolean for prevalues as "0" or "1" so we need to convert that!
-    $scope.model.config.multiPicker = ($scope.model.config.multiPicker === "1" ? true : false);
-    $scope.model.config.showOpenButton = ($scope.model.config.showOpenButton === "1" ? true : false);
-    $scope.model.config.showEditButton = ($scope.model.config.showEditButton === "1" ? true : false);
-    $scope.model.config.showPathOnHover = ($scope.model.config.showPathOnHover === "1" ? true : false);
-    $scope.model.config.ignoreUserStartNodes = ($scope.model.config.ignoreUserStartNodes === "1" ? true : false);
-  
-    var entityType = $scope.model.config.startNode.type === "member"
-        ? "Member"
-        : $scope.model.config.startNode.type === "media"
-        ? "Media"
-        : "Document";
-    $scope.allowOpenButton = entityType === "Document";
-    $scope.allowEditButton = entityType === "Document";
-    $scope.allowRemoveButton = true;
-
-    //the dialog options for the picker
-    var dialogOptions = {
-        multiPicker: $scope.model.config.multiPicker,
-        entityType: entityType,
-        filterCssClass: "not-allowed not-published",
-        startNodeId: null,
-        currentNode: editorState ? editorState.current : null,
-        callback: function (data) {
-            if (angular.isArray(data)) {
-                _.each(data, function (item, i) {
-                    $scope.add(item);
-                });
-            } else {
-                $scope.clear();
-                $scope.add(data);
-            }
-            angularHelper.getCurrentForm($scope).$setDirty();
-        },
-        treeAlias: $scope.model.config.startNode.type,
-        section: $scope.model.config.startNode.type,
-        idType: "int"
-    };
-
-    //since most of the pre-value config's are used in the dialog options (i.e. maxNumber, minNumber, etc...) we'll merge the 
-    // pre-value config on to the dialog options
-    angular.extend(dialogOptions, $scope.model.config);
-
-    //We need to manually handle the filter for members here since the tree displayed is different and only contains
-    // searchable list views
-    if (entityType === "Member") {
-        //first change the not allowed filter css class
-        dialogOptions.filterCssClass = "not-allowed";
-        var currFilter = dialogOptions.filter;
-        //now change the filter to be a method
-        dialogOptions.filter = function(i) {
-            //filter out the list view nodes
-            if (i.metaData.isContainer) {
-                return true;
-            }
-            if (!currFilter) {
-                return false;
-            }
-            //now we need to filter based on what is stored in the pre-vals, this logic duplicates what is in the treepicker.controller, 
-            // but not much we can do about that since members require special filtering.
-            var filterItem = currFilter.toLowerCase().split(',');
-            var found = filterItem.indexOf(i.metaData.contentType.toLowerCase()) >= 0;
-            if (!currFilter.startsWith("!") && !found || currFilter.startsWith("!") && found) {
-                return true;
-            }
-
-            return false;
-        }
-    }
-
-    if ($routeParams.section === "settings" && $routeParams.tree === "documentTypes") {
-        //if the content-picker is being rendered inside the document-type editor, we don't need to process the startnode query
-        dialogOptions.startNodeId = -1;
-    } else if ($scope.model.config.startNode.query) {
-        //if we have a query for the startnode, we will use that.
-        var rootId = $routeParams.id;
-        entityResource.getByQuery($scope.model.config.startNode.query, rootId, "Document").then(function (ent) {
-            dialogOptions.startNodeId = $scope.model.config.idType === "udi" ? ent.udi : ent.id;
-        });
-    }
-    else {
-        dialogOptions.startNodeId = $scope.model.config.startNode.id;
-    }
-
-    //dialog
-    $scope.openContentPicker = function() {
-      $scope.contentPickerOverlay = dialogOptions;
-      $scope.contentPickerOverlay.view = "treepicker";
-      $scope.contentPickerOverlay.show = true;
-
-      $scope.contentPickerOverlay.submit = function(model) {
-
-          if (angular.isArray(model.selection)) {
-             _.each(model.selection, function (item, i) {
-                  $scope.add(item);
-              });
-              angularHelper.getCurrentForm($scope).$setDirty();
-          }
-
-          $scope.contentPickerOverlay.show = false;
-          $scope.contentPickerOverlay = null;
-      }
-
-      $scope.contentPickerOverlay.close = function(oldModel) {
-          $scope.contentPickerOverlay.show = false;
-          $scope.contentPickerOverlay = null;
-      }
-
-    };
-
-    $scope.remove = function (index) {
-        $scope.renderModel.splice(index, 1);
-        angularHelper.getCurrentForm($scope).$setDirty();
-    };
-
-    $scope.showNode = function (index) {
-        var item = $scope.renderModel[index];
-        var id = item.id;
-        var section = $scope.model.config.startNode.type.toLowerCase();
-
-        entityResource.getPath(id, entityType).then(function (path) {
-            navigationService.changeSection(section);
-            navigationService.showTree(section, {
-                tree: section, path: path, forceReload: false, activate: true
-            });
-            var routePath = section + "/" + section + "/edit/" + id.toString();
-            $location.path(routePath).search("");
-        });
-    }
-
-    $scope.add = function (item) {
-        var currIds = _.map($scope.renderModel, function (i) {
-            return $scope.model.config.idType === "udi" ? i.udi : i.id;
-        });
-
-        var itemId = $scope.model.config.idType === "udi" ? item.udi : item.id;
-
-        if (currIds.indexOf(itemId) < 0) {
-            setEntityUrl(item);
-        }
-    };
-
-    $scope.clear = function () {
-        $scope.renderModel = [];
-    };
-
-    $scope.openMiniEditor = function(node) {
-        miniEditorHelper.launchMiniEditor(node).then(function(updatedNode){
-            // update the node
-            node.name = updatedNode.name;
-            node.published = updatedNode.hasPublishedVersion;
-            if(entityType !== "Member") {
-                entityResource.getUrl(updatedNode.id, entityType).then(function(data){
-                    node.url = data;
-                });
-            }
-        });
-    };
-
-    //when the scope is destroyed we need to unsubscribe
-    $scope.$on('$destroy', function () {
-        if(unsubscribe) {
-            unsubscribe();
-        }
-    });
-    
-    var modelIds = $scope.model.value ? $scope.model.value.split(',') : [];
-
-    //load current data if anything selected
-    if (modelIds.length > 0) {
-        entityResource.getByIds(modelIds, entityType).then(function(data) {
-
-            _.each(modelIds,
-                function(id, i) {
-                    var entity = _.find(data,
-                        function(d) {
-                            return $scope.model.config.idType === "udi" ? (d.udi == id) : (d.id == id);
-                        });
-
-                    if (entity) {
-                        setEntityUrl(entity);
-                    }
-
-                });
-
-            //everything is loaded, start the watch on the model
-            startWatch();
-            subscribe();
-        });
-    }
-    else {
-        //everything is loaded, start the watch on the model
-        startWatch();
-        subscribe();
-    }
-
-    function setEntityUrl(entity) {
-
-        // get url for content and media items
-        if(entityType !== "Member") {
-            entityResource.getUrl(entity.id, entityType).then(function(data){
-                // update url                
-                angular.forEach($scope.renderModel, function(item){
-                    if (item.id === entity.id) {
-                        if (entity.trashed) {
-                            item.url = localizationService.dictionary.general_recycleBin;
-                        } else {
-                            item.url = data;
-                        }
-                    }
-                });
-            });
-        }
-
-        // add the selected item to the renderModel
-        // if it needs to show a url the item will get 
-        // updated when the url comes back from server
-        addSelectedItem(entity);
-
-    }
-
-    function addSelectedItem(item) {
-
-        // set icon
-        if(item.icon) {
-            item.icon = iconHelper.convertFromLegacyIcon(item.icon);
-        }
-
-        // set default icon
-        if (!item.icon) {
-            switch (entityType) {
-                case "Document":
-                    item.icon = "icon-document";
-                    break;
-                case "Media":
-                    item.icon = "icon-picture";
-                    break;
-                case "Member":
-                    item.icon = "icon-user";
-                    break;
-            }
-        }
-
-        $scope.renderModel.push({ 
-            "name": item.name,
-            "id": item.id,
-            "udi": item.udi,
-            "icon": item.icon,
-            "path": item.path,
-            "url": item.url,
-            "trashed": item.trashed,
-            "published": (item.metaData && item.metaData.IsPublished === false && entityType === "Document") ? false : true
-            // only content supports published/unpublished content so we set everything else to published so the UI looks correct 
-        });
-
-    }
-
-    function setSortingState(items) {
-        // disable sorting if the list only consist of one item
-        if(items.length > 1) {
-            $scope.sortableOptions.disabled = false;
-        } else {
-            $scope.sortableOptions.disabled = true;
-        }
-    }
-
-}
-
-angular.module('umbraco').controller("Umbraco.PropertyEditors.ContentPickerController", contentPickerController);
+//this controller simply tells the dialogs service to open a mediaPicker window
+//with a specified callback, this callback will receive an object with a selection on it
+
+function contentPickerController($scope, entityResource, editorState, iconHelper, $routeParams, angularHelper, navigationService, $location, miniEditorHelper, localizationService) {
+
+    var unsubscribe;
+
+    function subscribe() {
+        unsubscribe = $scope.$on("formSubmitting", function (ev, args) {
+            var currIds = _.map($scope.renderModel, function (i) {
+                return $scope.model.config.idType === "udi" ? i.udi : i.id;
+            });
+            $scope.model.value = trim(currIds.join(), ",");
+        });
+    }
+
+    function trim(str, chr) {
+        var rgxtrim = (!chr) ? new RegExp('^\\s+|\\s+$', 'g') : new RegExp('^' + chr + '+|' + chr + '+$', 'g');
+        return str.replace(rgxtrim, '');
+    }
+
+    function startWatch() {
+        //We need to watch our renderModel so that we can update the underlying $scope.model.value properly, this is required
+        // because the ui-sortable doesn't dispatch an event after the digest of the sort operation. Any of the events for UI sortable
+        // occur after the DOM has updated but BEFORE the digest has occured so the model has NOT changed yet - it even states so in the docs.
+        // In their source code there is no event so we need to just subscribe to our model changes here.
+        //This also makes it easier to manage models, we update one and the rest will just work.
+        $scope.$watch(function () {
+            //return the joined Ids as a string to watch
+            return _.map($scope.renderModel, function (i) {
+                return $scope.model.config.idType === "udi" ? i.udi : i.id;
+            }).join();
+        }, function (newVal) {
+            var currIds = _.map($scope.renderModel, function (i) {
+                return $scope.model.config.idType === "udi" ? i.udi : i.id;
+            });
+            $scope.model.value = trim(currIds.join(), ",");
+
+            //Validate!
+            if ($scope.model.config && $scope.model.config.minNumber && parseInt($scope.model.config.minNumber) > $scope.renderModel.length) {
+                $scope.contentPickerForm.minCount.$setValidity("minCount", false);
+            }
+            else {
+                $scope.contentPickerForm.minCount.$setValidity("minCount", true);
+            }
+
+            if ($scope.model.config && $scope.model.config.maxNumber && parseInt($scope.model.config.maxNumber) < $scope.renderModel.length) {
+                $scope.contentPickerForm.maxCount.$setValidity("maxCount", false);
+            }
+            else {
+                $scope.contentPickerForm.maxCount.$setValidity("maxCount", true);
+            }
+
+            setSortingState($scope.renderModel);
+
+        });
+    }
+
+    $scope.renderModel = [];
+
+    $scope.dialogEditor = editorState && editorState.current && editorState.current.isDialogEditor === true;
+
+    //the default pre-values
+    var defaultConfig = {
+        multiPicker: false,
+        showOpenButton: false,
+        showEditButton: false,
+        showPathOnHover: false,
+        dataTypeId: null,
+        maxNumber: 1,
+        minNumber : 0,
+        startNode: {
+            query: "",
+            type: "content",
+	        id: $scope.model.config.startNodeId ? $scope.model.config.startNodeId : -1 // get start node for simple Content Picker
+        }
+    };
+
+    // sortable options
+    $scope.sortableOptions = {
+        axis: "y",
+        containment: "parent",
+        distance: 10,
+        opacity: 0.7,
+        tolerance: "pointer",
+        scroll: true,
+        zIndex: 6000,
+        update: function (e, ui) {
+            angularHelper.getCurrentForm($scope).$setDirty();
+        }
+    };
+
+    if ($scope.model.config) {
+        //merge the server config on top of the default config, then set the server config to use the result
+        $scope.model.config = angular.extend(defaultConfig, $scope.model.config);
+    }
+
+    //Umbraco persists boolean for prevalues as "0" or "1" so we need to convert that!
+    $scope.model.config.multiPicker = ($scope.model.config.multiPicker === "1" ? true : false);
+    $scope.model.config.showOpenButton = ($scope.model.config.showOpenButton === "1" ? true : false);
+    $scope.model.config.showEditButton = ($scope.model.config.showEditButton === "1" ? true : false);
+    $scope.model.config.showPathOnHover = ($scope.model.config.showPathOnHover === "1" ? true : false);
+
+    var entityType = $scope.model.config.startNode.type === "member"
+        ? "Member"
+        : $scope.model.config.startNode.type === "media"
+        ? "Media"
+        : "Document";
+    $scope.allowOpenButton = entityType === "Document";
+    $scope.allowEditButton = entityType === "Document";
+    $scope.allowRemoveButton = true;
+
+    //the dialog options for the picker
+    var dialogOptions = {
+        multiPicker: $scope.model.config.multiPicker,
+        entityType: entityType,
+        filterCssClass: "not-allowed not-published",
+        startNodeId: null,
+        currentNode: editorState ? editorState.current : null,
+        callback: function (data) {
+            if (angular.isArray(data)) {
+                _.each(data, function (item, i) {
+                    $scope.add(item);
+                });
+            } else {
+                $scope.clear();
+                $scope.add(data);
+            }
+            angularHelper.getCurrentForm($scope).$setDirty();
+        },
+        treeAlias: $scope.model.config.startNode.type,
+        section: $scope.model.config.startNode.type,
+        idType: "int"
+    };
+
+    dialogOptions.dataTypeId = $scope.model.dataTypeId;
+    //since most of the pre-value config's are used in the dialog options (i.e. maxNumber, minNumber, etc...) we'll merge the
+    // pre-value config on to the dialog options
+    angular.extend(dialogOptions, $scope.model.config);
+
+    //We need to manually handle the filter for members here since the tree displayed is different and only contains
+    // searchable list views
+    if (entityType === "Member") {
+        //first change the not allowed filter css class
+        dialogOptions.filterCssClass = "not-allowed";
+        var currFilter = dialogOptions.filter;
+        //now change the filter to be a method
+        dialogOptions.filter = function(i) {
+            //filter out the list view nodes
+            if (i.metaData.isContainer) {
+                return true;
+            }
+            if (!currFilter) {
+                return false;
+            }
+            //now we need to filter based on what is stored in the pre-vals, this logic duplicates what is in the treepicker.controller,
+            // but not much we can do about that since members require special filtering.
+            var filterItem = currFilter.toLowerCase().split(',');
+            var found = filterItem.indexOf(i.metaData.contentType.toLowerCase()) >= 0;
+            if (!currFilter.startsWith("!") && !found || currFilter.startsWith("!") && found) {
+                return true;
+            }
+
+            return false;
+        }
+    }
+
+    if ($routeParams.section === "settings" && $routeParams.tree === "documentTypes") {
+        //if the content-picker is being rendered inside the document-type editor, we don't need to process the startnode query
+        dialogOptions.startNodeId = -1;
+    } else if ($scope.model.config.startNode.query) {
+        //if we have a query for the startnode, we will use that.
+        var rootId = $routeParams.id;
+        entityResource.getByQuery($scope.model.config.startNode.query, rootId, "Document").then(function (ent) {
+            dialogOptions.startNodeId = $scope.model.config.idType === "udi" ? ent.udi : ent.id;
+        });
+    }
+    else {
+        dialogOptions.startNodeId = $scope.model.config.startNode.id;
+    }
+
+    //dialog
+    $scope.openContentPicker = function() {
+      $scope.contentPickerOverlay = dialogOptions;
+      $scope.contentPickerOverlay.view = "treepicker";
+      $scope.contentPickerOverlay.show = true;
+
+      $scope.contentPickerOverlay.submit = function(model) {
+
+          if (angular.isArray(model.selection)) {
+             _.each(model.selection, function (item, i) {
+                  $scope.add(item);
+              });
+              angularHelper.getCurrentForm($scope).$setDirty();
+          }
+
+          $scope.contentPickerOverlay.show = false;
+          $scope.contentPickerOverlay = null;
+      }
+
+      $scope.contentPickerOverlay.close = function(oldModel) {
+          $scope.contentPickerOverlay.show = false;
+          $scope.contentPickerOverlay = null;
+      }
+
+    };
+
+    $scope.remove = function (index) {
+        $scope.renderModel.splice(index, 1);
+        angularHelper.getCurrentForm($scope).$setDirty();
+    };
+
+    $scope.showNode = function (index) {
+        var item = $scope.renderModel[index];
+        var id = item.id;
+        var section = $scope.model.config.startNode.type.toLowerCase();
+
+        entityResource.getPath(id, entityType).then(function (path) {
+            navigationService.changeSection(section);
+            navigationService.showTree(section, {
+                tree: section, path: path, forceReload: false, activate: true
+            });
+            var routePath = section + "/" + section + "/edit/" + id.toString();
+            $location.path(routePath).search("");
+        });
+    }
+
+    $scope.add = function (item) {
+        var currIds = _.map($scope.renderModel, function (i) {
+            return $scope.model.config.idType === "udi" ? i.udi : i.id;
+        });
+
+        var itemId = $scope.model.config.idType === "udi" ? item.udi : item.id;
+
+        if (currIds.indexOf(itemId) < 0) {
+            setEntityUrl(item);
+        }
+    };
+
+    $scope.clear = function () {
+        $scope.renderModel = [];
+    };
+
+    $scope.openMiniEditor = function(node) {
+        miniEditorHelper.launchMiniEditor(node).then(function(updatedNode){
+            // update the node
+            node.name = updatedNode.name;
+            node.published = updatedNode.hasPublishedVersion;
+            if(entityType !== "Member") {
+                entityResource.getUrl(updatedNode.id, entityType).then(function(data){
+                    node.url = data;
+                });
+            }
+        });
+    };
+
+    //when the scope is destroyed we need to unsubscribe
+    $scope.$on('$destroy', function () {
+        if(unsubscribe) {
+            unsubscribe();
+        }
+    });
+
+    var modelIds = $scope.model.value ? $scope.model.value.split(',') : [];
+
+    //load current data if anything selected
+    if (modelIds.length > 0) {
+        entityResource.getByIds(modelIds, entityType).then(function(data) {
+
+            _.each(modelIds,
+                function(id, i) {
+                    var entity = _.find(data,
+                        function(d) {
+                            return $scope.model.config.idType === "udi" ? (d.udi == id) : (d.id == id);
+                        });
+
+                    if (entity) {
+                        setEntityUrl(entity);
+                    }
+
+                });
+
+            //everything is loaded, start the watch on the model
+            startWatch();
+            subscribe();
+        });
+    }
+    else {
+        //everything is loaded, start the watch on the model
+        startWatch();
+        subscribe();
+    }
+
+    function setEntityUrl(entity) {
+
+        // get url for content and media items
+        if(entityType !== "Member") {
+            entityResource.getUrl(entity.id, entityType).then(function(data){
+                // update url
+                angular.forEach($scope.renderModel, function(item){
+                    if (item.id === entity.id) {
+                        if (entity.trashed) {
+                            item.url = localizationService.dictionary.general_recycleBin;
+                        } else {
+                            item.url = data;
+                        }
+                    }
+                });
+            });
+        }
+
+        // add the selected item to the renderModel
+        // if it needs to show a url the item will get
+        // updated when the url comes back from server
+        addSelectedItem(entity);
+
+    }
+
+    function addSelectedItem(item) {
+
+        // set icon
+        if(item.icon) {
+            item.icon = iconHelper.convertFromLegacyIcon(item.icon);
+        }
+
+        // set default icon
+        if (!item.icon) {
+            switch (entityType) {
+                case "Document":
+                    item.icon = "icon-document";
+                    break;
+                case "Media":
+                    item.icon = "icon-picture";
+                    break;
+                case "Member":
+                    item.icon = "icon-user";
+                    break;
+            }
+        }
+
+        $scope.renderModel.push({
+            "name": item.name,
+            "id": item.id,
+            "udi": item.udi,
+            "icon": item.icon,
+            "path": item.path,
+            "url": item.url,
+            "trashed": item.trashed,
+            "published": (item.metaData && item.metaData.IsPublished === false && entityType === "Document") ? false : true
+            // only content supports published/unpublished content so we set everything else to published so the UI looks correct
+        });
+
+    }
+
+    function setSortingState(items) {
+        // disable sorting if the list only consist of one item
+        if(items.length > 1) {
+            $scope.sortableOptions.disabled = false;
+        } else {
+            $scope.sortableOptions.disabled = true;
+        }
+    }
+
+}
+
+angular.module('umbraco').controller("Umbraco.PropertyEditors.ContentPickerController", contentPickerController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
index a093ccb034..c61f5419ca 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
@@ -1,11 +1,9 @@
 angular.module("umbraco")
     .controller("Umbraco.PropertyEditors.Grid.MediaController",
     function ($scope, $rootScope, $timeout, userService) {
-        
-        var ignoreUserStartNodes = $scope.model.config.ignoreUserStartNodes === "1" ? true : false;
 
         if (!$scope.model.config.startNodeId) {
-            if (ignoreUserStartNodes === true) {
+            if ($scope.model.config.ignoreUserStartNodes === "1" ) {
                 $scope.model.config.startNodeId = -1;
                 $scope.model.config.startNodeIsVirtual = true;
 
@@ -22,7 +20,7 @@ angular.module("umbraco")
             $scope.mediaPickerOverlay.view = "mediapicker";
             $scope.mediaPickerOverlay.startNodeId = $scope.model.config && $scope.model.config.startNodeId ? $scope.model.config.startNodeId : undefined;
             $scope.mediaPickerOverlay.startNodeIsVirtual = $scope.mediaPickerOverlay.startNodeId ? $scope.model.config.startNodeIsVirtual : undefined;
-            $scope.mediaPickerOverlay.ignoreUserStartNodes = ignoreUserStartNodes;
+            $scope.mediaPickerOverlay.dataTypeId = $scope.model.dataTypeId;
             $scope.mediaPickerOverlay.cropSize = $scope.control.editor.config && $scope.control.editor.config.size ? $scope.control.editor.config.size : undefined;
             $scope.mediaPickerOverlay.showDetails = true;
             $scope.mediaPickerOverlay.disableFolderSelect = true;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js
index cf81300b32..e3e5d5e072 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js
@@ -11,12 +11,13 @@
         vm.openEmbed = openEmbed;
 
         function openLinkPicker(editor, currentTarget, anchorElement) {
-						
+
             vm.linkPickerOverlay = {
                 view: "linkpicker",
                 currentTarget: currentTarget,
 				anchors: tinyMceService.getAnchorNames(JSON.stringify(editorState.current.properties)),
-                ignoreUserStartNodes: $scope.model.config.ignoreUserStartNodes === "1",
+                dataTypeId: $scope.model.dataTypeId,
+                ignoreUserStartNodes : $scope.model.config.ignoreUserStartNodes,
                 show: true,
                 submit: function(model) {
                     tinyMceService.insertLinkInEditor(editor, model.target, anchorElement);
@@ -27,12 +28,11 @@
         }
 
         function openMediaPicker(editor, currentTarget, userData) {
-            var ignoreUserStartNodes = false;
             var startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
             var startNodeIsVirtual = userData.startMediaIds.length !== 1;
 
+
             if ($scope.model.config.ignoreUserStartNodes === "1") {
-                ignoreUserStartNodes = true;
                 startNodeId = -1;
                 startNodeIsVirtual = true;
             }
@@ -40,10 +40,10 @@
             vm.mediaPickerOverlay = {
                 currentTarget: currentTarget,
                 onlyImages: true,
-                showDetails: true,                
+                showDetails: true,
                 startNodeId: startNodeId,
                 startNodeIsVirtual: startNodeIsVirtual,
-                ignoreUserStartNodes: ignoreUserStartNodes,
+                dataTypeId: $scope.model.dataTypeId,
                 view: "mediapicker",
                 show: true,
                 submit: function(model) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
index 1f1305b0f0..559d0e4a19 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
@@ -1,184 +1,185 @@
-//this controller simply tells the dialogs service to open a mediaPicker window
-//with a specified callback, this callback will receive an object with a selection on it
-angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerController",
-    function ($rootScope, $scope, dialogService, entityResource, mediaResource, mediaHelper, $timeout, userService, $location, localizationService) {
-
-        //check the pre-values for multi-picker
-        var multiPicker = $scope.model.config.multiPicker && $scope.model.config.multiPicker !== '0' ? true : false;
-        var onlyImages = $scope.model.config.onlyImages && $scope.model.config.onlyImages !== '0' ? true : false;
-        var disableFolderSelect = $scope.model.config.disableFolderSelect && $scope.model.config.disableFolderSelect !== '0' ? true : false;
-        var ignoreUserStartNodes = $scope.model.config.ignoreUserStartNodes === "1" ? true : false;
-
-        if (!$scope.model.config.startNodeId) {
-            if (ignoreUserStartNodes === true) {
-                $scope.model.config.startNodeId = -1;
-                $scope.model.config.startNodeIsVirtual = true;
-
-            } else {
-                userService.getCurrentUser().then(function (userData) {
-                    $scope.model.config.startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
-                    $scope.model.config.startNodeIsVirtual = userData.startMediaIds.length !== 1;
-                });
-            }          
-        }
-
-        function setupViewModel() {
-            $scope.mediaItems = [];
-            $scope.ids = [];
-
-            $scope.isMultiPicker = multiPicker;
-
-            if ($scope.model.value) {
-                var ids = $scope.model.value.split(',');
-
-                //NOTE: We need to use the entityResource NOT the mediaResource here because
-                // the mediaResource has server side auth configured for which the user must have
-                // access to the media section, if they don't they'll get auth errors. The entityResource
-                // acts differently in that it allows access if the user has access to any of the apps that
-                // might require it's use. Therefore we need to use the metaData property to get at the thumbnail
-                // value.
-
-                entityResource.getByIds(ids, "Media").then(function(medias) {
-
-                    // The service only returns item results for ids that exist (deleted items are silently ignored).
-                    // This results in the picked items value to be set to contain only ids of picked items that could actually be found.
-                    // Since a referenced item could potentially be restored later on, instead of changing the selected values here based
-                    // on whether the items exist during a save event - we should keep "placeholder" items for picked items that currently
-                    // could not be fetched. This will preserve references and ensure that the state of an item does not differ depending
-                    // on whether it is simply resaved or not.
-                    // This is done by remapping the int/guid ids into a new array of items, where we create "Deleted item" placeholders
-                    // when there is no match for a selected id. This will ensure that the values being set on save, are the same as before.
-
-                    medias = _.map(ids,
-                        function(id) {
-                            var found = _.find(medias,
-                                function(m) {
-                                    // We could use coercion (two ='s) here .. but not sure if this works equally well in all browsers and
-                                    // it's prone to someone "fixing" it at some point without knowing the effects. Rather use toString()
-                                    // compares and be completely sure it works.
-                                    return m.udi.toString() === id.toString() || m.id.toString() === id.toString();
-                                });
-                            if (found) {
-                                return found;
-                            } else {
-                                return {
-                                    name: localizationService.dictionary.mediaPicker_deletedItem,
-                                    id: $scope.model.config.idType !== "udi" ? id : null,
-                                    udi: $scope.model.config.idType === "udi" ? id : null,
-                                    icon: "icon-picture",
-                                    thumbnail: null,
-                                    trashed: true
-                                };
-                            }
-                        });
-
-                    _.each(medias,
-                        function(media, i) {
-                            // if there is no thumbnail, try getting one if the media is not a placeholder item
-                            if (!media.thumbnail && media.id && media.metaData) {
-                                media.thumbnail = mediaHelper.resolveFileFromEntity(media, true);
-                            }
-
-                            $scope.mediaItems.push(media);
-
-                            if ($scope.model.config.idType === "udi") {
-                                $scope.ids.push(media.udi);
-                            } else {
-                                $scope.ids.push(media.id);
-                            }
-                        });
-
-                    $scope.sync();
-                });
-            }
-        }
-
-        setupViewModel();
-
-        $scope.remove = function(index) {
-            $scope.mediaItems.splice(index, 1);
-            $scope.ids.splice(index, 1);
-            $scope.sync();
-        };
-
-        $scope.goToItem = function(item) {
-            $location.path('media/media/edit/' + item.id);
-        };
-
-       $scope.add = function() {
-
-           $scope.mediaPickerOverlay = {
-               view: "mediapicker",
-               title: "Select media",
-               startNodeId: $scope.model.config.startNodeId,
-               startNodeIsVirtual: $scope.model.config.startNodeIsVirtual,
-               ignoreUserStartNodes: ignoreUserStartNodes,
-               multiPicker: multiPicker,
-               onlyImages: onlyImages,
-               disableFolderSelect: disableFolderSelect,
-               show: true,
-               submit: function(model) {
-
-                   _.each(model.selectedImages, function(media, i) {
-                       // if there is no thumbnail, try getting one if the media is not a placeholder item
-                       if (!media.thumbnail && media.id && media.metaData) {
-                           media.thumbnail = mediaHelper.resolveFileFromEntity(media, true);
-                       }
-
-                       $scope.mediaItems.push(media);
-
-                       if ($scope.model.config.idType === "udi") {
-                           $scope.ids.push(media.udi);
-                       }
-                       else {
-                           $scope.ids.push(media.id);
-                       }
-                   });
-
-                   $scope.sync();
-
-                   $scope.mediaPickerOverlay.show = false;
-                   $scope.mediaPickerOverlay = null;
-               }
-           };
-       };
-
-       $scope.sortableOptions = {
-           disabled: !$scope.isMultiPicker,
-           items: "li:not(.add-wrapper)",
-           cancel: ".unsortable",
-           update: function(e, ui) {
-               var r = [];
-               // TODO: Instead of doing this with a half second delay would be better to use a watch like we do in the
-               // content picker. Then we don't have to worry about setting ids, render models, models, we just set one and let the
-               // watch do all the rest.
-                $timeout(function(){
-                    angular.forEach($scope.mediaItems, function(value, key) {
-                        r.push($scope.model.config.idType === "udi" ? value.udi : value.id);
-                    });
-                    $scope.ids = r;
-                    $scope.sync();
-                }, 500, false);
-            }
-        };
-
-        $scope.sync = function() {
-            $scope.model.value = $scope.ids.join();
-        };
-
-        $scope.showAdd = function () {
-            if (!multiPicker) {
-                if ($scope.model.value && $scope.model.value !== "") {
-                    return false;
-                }
-            }
-            return true;
-        };
-
-        //here we declare a special method which will be called whenever the value has changed from the server
-        //this is instead of doing a watch on the model.value = faster
-        $scope.model.onValueChanged = function (newVal, oldVal) {
-            //update the display val again if it has changed from the server
-            setupViewModel();
-        };
-    });
+//this controller simply tells the dialogs service to open a mediaPicker window
+//with a specified callback, this callback will receive an object with a selection on it
+angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerController",
+    function ($rootScope, $scope, dialogService, entityResource, mediaResource, mediaHelper, $timeout, userService, $location, localizationService) {
+
+        //check the pre-values for multi-picker
+        var multiPicker = $scope.model.config.multiPicker && $scope.model.config.multiPicker !== '0' ? true : false;
+        var onlyImages = $scope.model.config.onlyImages && $scope.model.config.onlyImages !== '0' ? true : false;
+        var disableFolderSelect = $scope.model.config.disableFolderSelect && $scope.model.config.disableFolderSelect !== '0' ? true : false;
+
+        if (!$scope.model.config.startNodeId) {
+
+
+            if ( $scope.model.config.ignoreUserStartNodes === "1") {
+                $scope.model.config.startNodeId = -1;
+                $scope.model.config.startNodeIsVirtual = true;
+
+            } else {
+                userService.getCurrentUser().then(function (userData) {
+                    $scope.model.config.startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
+                    $scope.model.config.startNodeIsVirtual = userData.startMediaIds.length !== 1;
+                });
+            }
+        }
+
+        function setupViewModel() {
+            $scope.mediaItems = [];
+            $scope.ids = [];
+
+            $scope.isMultiPicker = multiPicker;
+
+            if ($scope.model.value) {
+                var ids = $scope.model.value.split(',');
+
+                //NOTE: We need to use the entityResource NOT the mediaResource here because
+                // the mediaResource has server side auth configured for which the user must have
+                // access to the media section, if they don't they'll get auth errors. The entityResource
+                // acts differently in that it allows access if the user has access to any of the apps that
+                // might require it's use. Therefore we need to use the metaData property to get at the thumbnail
+                // value.
+
+                entityResource.getByIds(ids, "Media").then(function(medias) {
+
+                    // The service only returns item results for ids that exist (deleted items are silently ignored).
+                    // This results in the picked items value to be set to contain only ids of picked items that could actually be found.
+                    // Since a referenced item could potentially be restored later on, instead of changing the selected values here based
+                    // on whether the items exist during a save event - we should keep "placeholder" items for picked items that currently
+                    // could not be fetched. This will preserve references and ensure that the state of an item does not differ depending
+                    // on whether it is simply resaved or not.
+                    // This is done by remapping the int/guid ids into a new array of items, where we create "Deleted item" placeholders
+                    // when there is no match for a selected id. This will ensure that the values being set on save, are the same as before.
+
+                    medias = _.map(ids,
+                        function(id) {
+                            var found = _.find(medias,
+                                function(m) {
+                                    // We could use coercion (two ='s) here .. but not sure if this works equally well in all browsers and
+                                    // it's prone to someone "fixing" it at some point without knowing the effects. Rather use toString()
+                                    // compares and be completely sure it works.
+                                    return m.udi.toString() === id.toString() || m.id.toString() === id.toString();
+                                });
+                            if (found) {
+                                return found;
+                            } else {
+                                return {
+                                    name: localizationService.dictionary.mediaPicker_deletedItem,
+                                    id: $scope.model.config.idType !== "udi" ? id : null,
+                                    udi: $scope.model.config.idType === "udi" ? id : null,
+                                    icon: "icon-picture",
+                                    thumbnail: null,
+                                    trashed: true
+                                };
+                            }
+                        });
+
+                    _.each(medias,
+                        function(media, i) {
+                            // if there is no thumbnail, try getting one if the media is not a placeholder item
+                            if (!media.thumbnail && media.id && media.metaData) {
+                                media.thumbnail = mediaHelper.resolveFileFromEntity(media, true);
+                            }
+
+                            $scope.mediaItems.push(media);
+
+                            if ($scope.model.config.idType === "udi") {
+                                $scope.ids.push(media.udi);
+                            } else {
+                                $scope.ids.push(media.id);
+                            }
+                        });
+
+                    $scope.sync();
+                });
+            }
+        }
+
+        setupViewModel();
+
+        $scope.remove = function(index) {
+            $scope.mediaItems.splice(index, 1);
+            $scope.ids.splice(index, 1);
+            $scope.sync();
+        };
+
+        $scope.goToItem = function(item) {
+            $location.path('media/media/edit/' + item.id);
+        };
+
+       $scope.add = function() {
+
+           $scope.mediaPickerOverlay = {
+               view: "mediapicker",
+               title: "Select media",
+               startNodeId: $scope.model.config.startNodeId,
+               startNodeIsVirtual: $scope.model.config.startNodeIsVirtual,
+               dataTypeId:  $scope.model.dataTypeId,
+               multiPicker: multiPicker,
+               onlyImages: onlyImages,
+               disableFolderSelect: disableFolderSelect,
+               show: true,
+               submit: function(model) {
+
+                   _.each(model.selectedImages, function(media, i) {
+                       // if there is no thumbnail, try getting one if the media is not a placeholder item
+                       if (!media.thumbnail && media.id && media.metaData) {
+                           media.thumbnail = mediaHelper.resolveFileFromEntity(media, true);
+                       }
+
+                       $scope.mediaItems.push(media);
+
+                       if ($scope.model.config.idType === "udi") {
+                           $scope.ids.push(media.udi);
+                       }
+                       else {
+                           $scope.ids.push(media.id);
+                       }
+                   });
+
+                   $scope.sync();
+
+                   $scope.mediaPickerOverlay.show = false;
+                   $scope.mediaPickerOverlay = null;
+               }
+           };
+       };
+
+       $scope.sortableOptions = {
+           disabled: !$scope.isMultiPicker,
+           items: "li:not(.add-wrapper)",
+           cancel: ".unsortable",
+           update: function(e, ui) {
+               var r = [];
+               // TODO: Instead of doing this with a half second delay would be better to use a watch like we do in the
+               // content picker. Then we don't have to worry about setting ids, render models, models, we just set one and let the
+               // watch do all the rest.
+                $timeout(function(){
+                    angular.forEach($scope.mediaItems, function(value, key) {
+                        r.push($scope.model.config.idType === "udi" ? value.udi : value.id);
+                    });
+                    $scope.ids = r;
+                    $scope.sync();
+                }, 500, false);
+            }
+        };
+
+        $scope.sync = function() {
+            $scope.model.value = $scope.ids.join();
+        };
+
+        $scope.showAdd = function () {
+            if (!multiPicker) {
+                if ($scope.model.value && $scope.model.value !== "") {
+                    return false;
+                }
+            }
+            return true;
+        };
+
+        //here we declare a special method which will be called whenever the value has changed from the server
+        //this is instead of doing a watch on the model.value = faster
+        $scope.model.onValueChanged = function (newVal, oldVal) {
+            //update the display val again if it has changed from the server
+            setupViewModel();
+        };
+    });
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
index c7e67a0a42..124f342741 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
@@ -67,11 +67,12 @@ function multiUrlPickerController($scope, angularHelper, localizationService, en
             url: link.url,
             target: link.target
         } : null;
-        
+
         $scope.linkPickerOverlay = {
             view: "linkpicker",
             currentTarget: target,
-            ignoreUserStartNodes: $scope.model.config.ignoreUserStartNodes === "1",
+            dataTypeId: $scope.model.dataTypeId,
+            ignoreUserStartNodes : $scope.model.config.ignoreUserStartNodes,
             show: true,
             submit: function (model) {
                 if (model.target.url || model.target.anchor) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
index 6047169c54..26c6a0c051 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
@@ -1,242 +1,242 @@
-angular.module("umbraco")
-    .controller("Umbraco.PropertyEditors.RelatedLinksController",
-        function ($rootScope, $scope, dialogService, iconHelper) {
-
-            if (!$scope.model.value) {
-                $scope.model.value = [];
-            }
-
-            $scope.model.config.max = isNumeric($scope.model.config.max) && $scope.model.config.max !== 0 ? $scope.model.config.max : Number.MAX_VALUE;
-            
-            $scope.newCaption = '';
-            $scope.newLink = 'http://';
-            $scope.newNewWindow = false;
-            $scope.newInternal = null;
-            $scope.newInternalName = '';
-            $scope.newInternalIcon = null;
-            $scope.addExternal = true;
-            $scope.currentEditLink = null;
-            $scope.hasError = false;
-
-            $scope.internal = function($event) {
-               $scope.currentEditLink = null;
-
-               $scope.contentPickerOverlay = {};
-               $scope.contentPickerOverlay.view = "contentpicker";
-               $scope.contentPickerOverlay.multiPicker = false;
-               $scope.contentPickerOverlay.show = true;
-               $scope.contentPickerOverlay.ignoreUserStartNodes = $scope.model.config.ignoreUserStartNodes === "1" ? true:  false;
-               $scope.contentPickerOverlay.idType = $scope.model.config.idType ? $scope.model.config.idType : "int";
-
-               $scope.contentPickerOverlay.submit = function(model) {
-
-                  select(model.selection[0]);
-
-                  $scope.contentPickerOverlay.show = false;
-                  $scope.contentPickerOverlay = null;
-               };
-
-               $scope.contentPickerOverlay.close = function(oldModel) {
-                  $scope.contentPickerOverlay.show = false;
-                  $scope.contentPickerOverlay = null;
-               };
-
-               $event.preventDefault();
-            };
-
-            $scope.selectInternal = function ($event, link) {
-               $scope.currentEditLink = link;
-
-               $scope.contentPickerOverlay = {};
-               $scope.contentPickerOverlay.view = "contentpicker";
-               $scope.contentPickerOverlay.multiPicker = false;
-               $scope.contentPickerOverlay.show = true;
-               $scope.contentPickerOverlay.ignoreUserStartNodes = $scope.model.config.ignoreUserStartNodes === "1" ? true : false;
-               $scope.contentPickerOverlay.idType = $scope.model.config.idType ? $scope.model.config.idType : "int";
-
-               $scope.contentPickerOverlay.submit = function(model) {
-
-                  select(model.selection[0]);
-
-                  $scope.contentPickerOverlay.show = false;
-                  $scope.contentPickerOverlay = null;
-               };
-
-               $scope.contentPickerOverlay.close = function(oldModel) {
-                  $scope.contentPickerOverlay.show = false;
-                  $scope.contentPickerOverlay = null;
-               };
-
-               $event.preventDefault();
-
-            };
-
-            $scope.edit = function (idx) {
-                for (var i = 0; i < $scope.model.value.length; i++) {
-                    $scope.model.value[i].edit = false;
-                }
-                $scope.model.value[idx].edit = true;
-            };
-
-            $scope.saveEdit = function (idx) {
-                $scope.model.value[idx].title = $scope.model.value[idx].caption;
-                $scope.model.value[idx].edit = false;
-            };
-
-            $scope.delete = function (idx) {               
-                $scope.model.value.splice(idx, 1);               
-            };
-
-            $scope.add = function ($event) {
-				if (!angular.isArray($scope.model.value)) {
-                  $scope.model.value = [];
-				}
-				
-                if ($scope.newCaption == "") {
-                    $scope.hasError = true;
-                } else {
-                    if ($scope.addExternal) {
-                        var newExtLink = new function() {
-                            this.caption = $scope.newCaption;
-                            this.link = $scope.newLink;
-                            this.newWindow = $scope.newNewWindow;
-                            this.edit = false;
-                            this.isInternal = false;
-                            this.type = "external";
-                            this.title = $scope.newCaption;
-                        };
-                        $scope.model.value.push(newExtLink);
-                    } else {
-                        var newIntLink = new function() {
-                            this.caption = $scope.newCaption;
-                            this.link = $scope.newInternal;
-                            this.newWindow = $scope.newNewWindow;
-                            this.internal = $scope.newInternal;
-                            this.edit = false;
-                            this.isInternal = true;
-                            this.internalName = $scope.newInternalName;
-                            this.internalIcon = $scope.newInternalIcon;
-                            this.type = "internal";
-                            this.title = $scope.newCaption;
-                        };
-                        $scope.model.value.push(newIntLink);
-                    }
-                    $scope.newCaption = '';
-                    $scope.newLink = 'http://';
-                    $scope.newNewWindow = false;
-                    $scope.newInternal = null;
-                    $scope.newInternalName = '';
-                    $scope.newInternalIcon = null;
-                }
-                $event.preventDefault();
-            };
-
-            $scope.switch = function ($event) {
-                $scope.addExternal = !$scope.addExternal;
-                $event.preventDefault();
-            };
-            
-            $scope.switchLinkType = function ($event, link) {
-                link.isInternal = !link.isInternal;                
-                link.type = link.isInternal ? "internal" : "external";
-                if (!link.isInternal)
-                    link.link = $scope.newLink;
-                $event.preventDefault();
-            };
-
-            $scope.move = function (index, direction) {
-                var temp = $scope.model.value[index];
-                $scope.model.value[index] = $scope.model.value[index + direction];
-                $scope.model.value[index + direction] = temp;                
-            };
-
-            //helper for determining if a user can add items
-            $scope.canAdd = function () {
-                return $scope.model.config.max <= 0 || $scope.model.config.max > countVisible();
-            }
-
-            //helper that returns if an item can be sorted
-            $scope.canSort = function () {
-                return countVisible() > 1;
-            }
-
-            $scope.sortableOptions = {
-                axis: 'y',
-                handle: '.handle',
-                cursor: 'move',
-                cancel: '.no-drag',
-                containment: 'parent',
-                placeholder: 'sortable-placeholder',
-                forcePlaceholderSize: true,
-                helper: function (e, ui) {
-                    // When sorting table rows, the cells collapse. This helper fixes that: https://www.foliotek.com/devblog/make-table-rows-sortable-using-jquery-ui-sortable/
-                    ui.children().each(function () {
-                        $(this).width($(this).width());
-                    });
-                    return ui;
-                },
-                items: '> tr:not(.unsortable)',
-                tolerance: 'pointer',
-                update: function (e, ui) {
-                    // Get the new and old index for the moved element (using the URL as the identifier)
-                    var newIndex = ui.item.index();
-                    var movedLinkUrl = ui.item.attr('data-link');
-                    var originalIndex = getElementIndexByUrl(movedLinkUrl);
-
-                    // Move the element in the model
-                    var movedElement = $scope.model.value[originalIndex];
-                    $scope.model.value.splice(originalIndex, 1);
-                    $scope.model.value.splice(newIndex, 0, movedElement);
-                },
-                start: function (e, ui) {
-                    //ui.placeholder.html("<td colspan='5'></td>");
-
-                    // Build a placeholder cell that spans all the cells in the row: https://stackoverflow.com/questions/25845310/jquery-ui-sortable-and-table-cell-size
-                    var cellCount = 0;
-                    $('td, th', ui.helper).each(function () {
-                        // For each td or th try and get it's colspan attribute, and add that or 1 to the total
-                        var colspan = 1;
-                        var colspanAttr = $(this).attr('colspan');
-                        if (colspanAttr > 1) {
-                            colspan = colspanAttr;
-                        }
-                        cellCount += colspan;
-                    });
-
-                    // Add the placeholder UI - note that this is the item's content, so td rather than tr - and set height of tr
-                    ui.placeholder.html('<td colspan="' + cellCount + '"></td>').height(ui.item.height());
-                }
-            };
-
-            //helper to count what is visible
-            function countVisible() {
-                return $scope.model.value.length;
-            }
-
-            function isNumeric(n) {
-                return !isNaN(parseFloat(n)) && isFinite(n);
-            }
-
-            function getElementIndexByUrl(url) {
-                for (var i = 0; i < $scope.model.value.length; i++) {
-                    if ($scope.model.value[i].link == url) {
-                        return i;
-                    }
-                }
-
-                return -1;
-            }
-
-            function select(data) {
-                if ($scope.currentEditLink != null) {
-                    $scope.currentEditLink.internal = $scope.model.config.idType === "udi" ? data.udi : data.id;
-                    $scope.currentEditLink.internalName = data.name;
-                    $scope.currentEditLink.internalIcon = iconHelper.convertFromLegacyIcon(data.icon);
-                    $scope.currentEditLink.link = $scope.model.config.idType === "udi" ? data.udi : data.id;
-                } else {
-                    $scope.newInternal = $scope.model.config.idType === "udi" ? data.udi : data.id;
-                    $scope.newInternalName = data.name;
-                    $scope.newInternalIcon = iconHelper.convertFromLegacyIcon(data.icon);
-                }
-            }
-        });
+angular.module("umbraco")
+    .controller("Umbraco.PropertyEditors.RelatedLinksController",
+        function ($rootScope, $scope, dialogService, iconHelper) {
+
+            if (!$scope.model.value) {
+                $scope.model.value = [];
+            }
+
+            $scope.model.config.max = isNumeric($scope.model.config.max) && $scope.model.config.max !== 0 ? $scope.model.config.max : Number.MAX_VALUE;
+
+            $scope.newCaption = '';
+            $scope.newLink = 'http://';
+            $scope.newNewWindow = false;
+            $scope.newInternal = null;
+            $scope.newInternalName = '';
+            $scope.newInternalIcon = null;
+            $scope.addExternal = true;
+            $scope.currentEditLink = null;
+            $scope.hasError = false;
+
+            $scope.internal = function($event) {
+               $scope.currentEditLink = null;
+
+               $scope.contentPickerOverlay = {};
+               $scope.contentPickerOverlay.view = "contentpicker";
+               $scope.contentPickerOverlay.multiPicker = false;
+               $scope.contentPickerOverlay.show = true;
+               $scope.contentPickerOverlay.dataTypeId = $scope.model.dataTypeId;
+               $scope.contentPickerOverlay.idType = $scope.model.config.idType ? $scope.model.config.idType : "int";
+
+               $scope.contentPickerOverlay.submit = function(model) {
+
+                  select(model.selection[0]);
+
+                  $scope.contentPickerOverlay.show = false;
+                  $scope.contentPickerOverlay = null;
+               };
+
+               $scope.contentPickerOverlay.close = function(oldModel) {
+                  $scope.contentPickerOverlay.show = false;
+                  $scope.contentPickerOverlay = null;
+               };
+
+               $event.preventDefault();
+            };
+
+            $scope.selectInternal = function ($event, link) {
+               $scope.currentEditLink = link;
+
+               $scope.contentPickerOverlay = {};
+               $scope.contentPickerOverlay.view = "contentpicker";
+               $scope.contentPickerOverlay.multiPicker = false;
+               $scope.contentPickerOverlay.show = true;
+               $scope.contentPickerOverlay.dataTypeId = $scope.model.dataTypeId;
+               $scope.contentPickerOverlay.idType = $scope.model.config.idType ? $scope.model.config.idType : "int";
+
+               $scope.contentPickerOverlay.submit = function(model) {
+
+                  select(model.selection[0]);
+
+                  $scope.contentPickerOverlay.show = false;
+                  $scope.contentPickerOverlay = null;
+               };
+
+               $scope.contentPickerOverlay.close = function(oldModel) {
+                  $scope.contentPickerOverlay.show = false;
+                  $scope.contentPickerOverlay = null;
+               };
+
+               $event.preventDefault();
+
+            };
+
+            $scope.edit = function (idx) {
+                for (var i = 0; i < $scope.model.value.length; i++) {
+                    $scope.model.value[i].edit = false;
+                }
+                $scope.model.value[idx].edit = true;
+            };
+
+            $scope.saveEdit = function (idx) {
+                $scope.model.value[idx].title = $scope.model.value[idx].caption;
+                $scope.model.value[idx].edit = false;
+            };
+
+            $scope.delete = function (idx) {
+                $scope.model.value.splice(idx, 1);
+            };
+
+            $scope.add = function ($event) {
+				if (!angular.isArray($scope.model.value)) {
+                  $scope.model.value = [];
+				}
+
+                if ($scope.newCaption == "") {
+                    $scope.hasError = true;
+                } else {
+                    if ($scope.addExternal) {
+                        var newExtLink = new function() {
+                            this.caption = $scope.newCaption;
+                            this.link = $scope.newLink;
+                            this.newWindow = $scope.newNewWindow;
+                            this.edit = false;
+                            this.isInternal = false;
+                            this.type = "external";
+                            this.title = $scope.newCaption;
+                        };
+                        $scope.model.value.push(newExtLink);
+                    } else {
+                        var newIntLink = new function() {
+                            this.caption = $scope.newCaption;
+                            this.link = $scope.newInternal;
+                            this.newWindow = $scope.newNewWindow;
+                            this.internal = $scope.newInternal;
+                            this.edit = false;
+                            this.isInternal = true;
+                            this.internalName = $scope.newInternalName;
+                            this.internalIcon = $scope.newInternalIcon;
+                            this.type = "internal";
+                            this.title = $scope.newCaption;
+                        };
+                        $scope.model.value.push(newIntLink);
+                    }
+                    $scope.newCaption = '';
+                    $scope.newLink = 'http://';
+                    $scope.newNewWindow = false;
+                    $scope.newInternal = null;
+                    $scope.newInternalName = '';
+                    $scope.newInternalIcon = null;
+                }
+                $event.preventDefault();
+            };
+
+            $scope.switch = function ($event) {
+                $scope.addExternal = !$scope.addExternal;
+                $event.preventDefault();
+            };
+
+            $scope.switchLinkType = function ($event, link) {
+                link.isInternal = !link.isInternal;
+                link.type = link.isInternal ? "internal" : "external";
+                if (!link.isInternal)
+                    link.link = $scope.newLink;
+                $event.preventDefault();
+            };
+
+            $scope.move = function (index, direction) {
+                var temp = $scope.model.value[index];
+                $scope.model.value[index] = $scope.model.value[index + direction];
+                $scope.model.value[index + direction] = temp;
+            };
+
+            //helper for determining if a user can add items
+            $scope.canAdd = function () {
+                return $scope.model.config.max <= 0 || $scope.model.config.max > countVisible();
+            }
+
+            //helper that returns if an item can be sorted
+            $scope.canSort = function () {
+                return countVisible() > 1;
+            }
+
+            $scope.sortableOptions = {
+                axis: 'y',
+                handle: '.handle',
+                cursor: 'move',
+                cancel: '.no-drag',
+                containment: 'parent',
+                placeholder: 'sortable-placeholder',
+                forcePlaceholderSize: true,
+                helper: function (e, ui) {
+                    // When sorting table rows, the cells collapse. This helper fixes that: https://www.foliotek.com/devblog/make-table-rows-sortable-using-jquery-ui-sortable/
+                    ui.children().each(function () {
+                        $(this).width($(this).width());
+                    });
+                    return ui;
+                },
+                items: '> tr:not(.unsortable)',
+                tolerance: 'pointer',
+                update: function (e, ui) {
+                    // Get the new and old index for the moved element (using the URL as the identifier)
+                    var newIndex = ui.item.index();
+                    var movedLinkUrl = ui.item.attr('data-link');
+                    var originalIndex = getElementIndexByUrl(movedLinkUrl);
+
+                    // Move the element in the model
+                    var movedElement = $scope.model.value[originalIndex];
+                    $scope.model.value.splice(originalIndex, 1);
+                    $scope.model.value.splice(newIndex, 0, movedElement);
+                },
+                start: function (e, ui) {
+                    //ui.placeholder.html("<td colspan='5'></td>");
+
+                    // Build a placeholder cell that spans all the cells in the row: https://stackoverflow.com/questions/25845310/jquery-ui-sortable-and-table-cell-size
+                    var cellCount = 0;
+                    $('td, th', ui.helper).each(function () {
+                        // For each td or th try and get it's colspan attribute, and add that or 1 to the total
+                        var colspan = 1;
+                        var colspanAttr = $(this).attr('colspan');
+                        if (colspanAttr > 1) {
+                            colspan = colspanAttr;
+                        }
+                        cellCount += colspan;
+                    });
+
+                    // Add the placeholder UI - note that this is the item's content, so td rather than tr - and set height of tr
+                    ui.placeholder.html('<td colspan="' + cellCount + '"></td>').height(ui.item.height());
+                }
+            };
+
+            //helper to count what is visible
+            function countVisible() {
+                return $scope.model.value.length;
+            }
+
+            function isNumeric(n) {
+                return !isNaN(parseFloat(n)) && isFinite(n);
+            }
+
+            function getElementIndexByUrl(url) {
+                for (var i = 0; i < $scope.model.value.length; i++) {
+                    if ($scope.model.value[i].link == url) {
+                        return i;
+                    }
+                }
+
+                return -1;
+            }
+
+            function select(data) {
+                if ($scope.currentEditLink != null) {
+                    $scope.currentEditLink.internal = $scope.model.config.idType === "udi" ? data.udi : data.id;
+                    $scope.currentEditLink.internalName = data.name;
+                    $scope.currentEditLink.internalIcon = iconHelper.convertFromLegacyIcon(data.icon);
+                    $scope.currentEditLink.link = $scope.model.config.idType === "udi" ? data.udi : data.id;
+                } else {
+                    $scope.newInternal = $scope.model.config.idType === "udi" ? data.udi : data.id;
+                    $scope.newInternalName = data.name;
+                    $scope.newInternalIcon = iconHelper.convertFromLegacyIcon(data.icon);
+                }
+            }
+        });
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
index f8dea2ee8b..cadbc5f57a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
@@ -1,403 +1,402 @@
-angular.module("umbraco")
-    .controller("Umbraco.PropertyEditors.RTEController",
-    function ($rootScope, $scope, $q, $locale, dialogService, $log, imageHelper, assetsService, $timeout, tinyMceService, angularHelper, stylesheetResource, macroService, editorState) {
-
-        $scope.isLoading = true;
-
-        //To id the html textarea we need to use the datetime ticks because we can have multiple rte's per a single property alias
-        // because now we have to support having 2x (maybe more at some stage) content editors being displayed at once. This is because
-        // we have this mini content editor panel that can be launched with MNTP.
-        var d = new Date();
-        var n = d.getTime();
-        $scope.textAreaHtmlId = $scope.model.alias + "_" + n + "_rte";
-
-        function syncContent(editor){
-            editor.save();
-            angularHelper.safeApply($scope, function () {
-                $scope.model.value = editor.getContent();
-            });
-
-            //make the form dirty manually so that the track changes works, setting our model doesn't trigger
-            // the angular bits because tinymce replaces the textarea.
-            angularHelper.getCurrentForm($scope).$setDirty();
-        }
-
-        tinyMceService.configuration().then(function (tinyMceConfig) {
-
-            //config value from general tinymce.config file
-            var validElements = tinyMceConfig.validElements;
-
-            //These are absolutely required in order for the macros to render inline
-            //we put these as extended elements because they get merged on top of the normal allowed elements by tiny mce
-            var extendedValidElements = "@[id|class|style],-div[id|dir|class|align|style],ins[datetime|cite],-ul[class|style],-li[class|style],span[id|class|style]";
-
-            var invalidElements = tinyMceConfig.inValidElements;
-            var plugins = _.map(tinyMceConfig.plugins, function (plugin) {
-                if (plugin.useOnFrontend) {
-                    return plugin.name;
-                }
-            }).join(" ");
-
-            var editorConfig = $scope.model.config.editor;
-            if (!editorConfig || angular.isString(editorConfig)) {
-                editorConfig = tinyMceService.defaultPrevalues();
-            }
-
-            //config value on the data type
-            var toolbar = editorConfig.toolbar.join(" | ");
-            var stylesheets = [];
-            var styleFormats = [];
-            var await = [];
-            if (!editorConfig.maxImageSize && editorConfig.maxImageSize != 0) {
-                editorConfig.maxImageSize = tinyMceService.defaultPrevalues().maxImageSize;
-            }
-
-            //queue file loading
-            if (typeof tinymce === "undefined") { // Don't reload tinymce if already loaded
-                await.push(assetsService.loadJs("lib/tinymce/tinymce.min.js", $scope));
-            }
-
-            //queue rules loading
-            angular.forEach(editorConfig.stylesheets, function (val, key) {
-                stylesheets.push(Umbraco.Sys.ServerVariables.umbracoSettings.cssPath + "/" + val + ".css?" + new Date().getTime());
-                await.push(stylesheetResource.getRulesByName(val).then(function (rules) {
-                    angular.forEach(rules, function (rule) {
-                        var r = {};
-                        r.title = rule.name;
-                        if (rule.selector[0] == ".") {
-                            r.inline = "span";
-                            r.classes = rule.selector.substring(1);
-                        }
-                        else if (rule.selector[0] == "#") {
-                            r.inline = "span";
-                            r.attributes = { id: rule.selector.substring(1) };
-                        }
-                        else if (rule.selector[0] != "." && rule.selector.indexOf(".") > -1) {
-                            var split = rule.selector.split(".");
-                            r.block = split[0];
-                            r.classes = rule.selector.substring(rule.selector.indexOf(".") + 1).replace(".", " ");
-                        }
-                        else if (rule.selector[0] != "#" && rule.selector.indexOf("#") > -1) {
-                            var split = rule.selector.split("#");
-                            r.block = split[0];
-                            r.classes = rule.selector.substring(rule.selector.indexOf("#") + 1);
-                        }
-                        else {
-                            r.block = rule.selector;
-                        }
-
-                        styleFormats.push(r);
-                    });
-                }));
-            });
-
-
-            //stores a reference to the editor
-            var tinyMceEditor = null;
-
-            // these languages are available for localization
-            var availableLanguages = [
-                'da',
-                'de',
-                'en',
-                'en_us',
-                'fi',
-                'fr',
-                'he',
-                'it',
-                'ja',
-                'nl',
-                'no',
-                'pl',
-                'pt',
-                'ru',
-                'sv',
-                'zh'
-            ];
-
-            //define fallback language
-            var language = 'en_us';
-            //get locale from angular and match tinymce format. Angular localization is always in the format of ru-ru, de-de, en-gb, etc.
-            //wheras tinymce is in the format of ru, de, en, en_us, etc.
-            var localeId = $locale.id.replace('-', '_');
-            //try matching the language using full locale format
-            var languageMatch = _.find(availableLanguages, function(o) { return o === localeId; });
-            //if no matches, try matching using only the language
-            if (languageMatch === undefined) {
-                var localeParts = localeId.split('_');
-                languageMatch = _.find(availableLanguages, function(o) { return o === localeParts[0]; });
-            }
-            //if a match was found - set the language
-            if (languageMatch !== undefined) {
-                language = languageMatch;
-            }
-
-            //wait for queue to end
-            $q.all(await).then(function () {
-                
-                //create a baseline Config to exten upon
-                var baseLineConfigObj = {
-                    mode: "exact",
-                    skin: "umbraco",
-                    plugins: plugins,
-                    valid_elements: validElements,
-                    invalid_elements: invalidElements,
-                    extended_valid_elements: extendedValidElements,
-                    menubar: false,
-                    statusbar: false,
-                    relative_urls: false,
-                    height: editorConfig.dimensions.height,
-                    width: editorConfig.dimensions.width,
-                    maxImageSize: editorConfig.maxImageSize,
-                    toolbar: toolbar,
-                    content_css: stylesheets,
-                    style_formats: styleFormats,
-                    language: language,
-                    //see http://archive.tinymce.com/wiki.php/Configuration:cache_suffix
-                    cache_suffix: "?umb__rnd=" + Umbraco.Sys.ServerVariables.application.cacheBuster
-                };
-
-                if (tinyMceConfig.customConfig) {
-
-                    //if there is some custom config, we need to see if the string value of each item might actually be json and if so, we need to
-                    // convert it to json instead of having it as a string since this is what tinymce requires
-                    for (var i in tinyMceConfig.customConfig) {
-                        var val = tinyMceConfig.customConfig[i];
-                        if (val) {
-                            val = val.toString().trim();
-                            if (val.detectIsJson()) {
-                                try {
-                                    tinyMceConfig.customConfig[i] = JSON.parse(val);
-                                    //now we need to check if this custom config key is defined in our baseline, if it is we don't want to
-                                    //overwrite the baseline config item if it is an array, we want to concat the items in the array, otherwise
-                                    //if it's an object it will overwrite the baseline
-                                    if (angular.isArray(baseLineConfigObj[i]) && angular.isArray(tinyMceConfig.customConfig[i])) {
-                                        //concat it and below this concat'd array will overwrite the baseline in angular.extend
-                                        tinyMceConfig.customConfig[i] = baseLineConfigObj[i].concat(tinyMceConfig.customConfig[i]);
-                                    }
-                                }
-                                catch (e) {
-                                    //cannot parse, we'll just leave it
-                                }
-                            }
-                            if (val === "true") {
-                                tinyMceConfig.customConfig[i] = true;
-                            }
-                            if (val === "false") {
-                                tinyMceConfig.customConfig[i] = false;
-                            }
-                        }
-                    }
-
-                    angular.extend(baseLineConfigObj, tinyMceConfig.customConfig);
-                }
-
-                //set all the things that user configs should not be able to override
-                baseLineConfigObj.elements = $scope.textAreaHtmlId; //this is the exact textarea id to replace!
-                baseLineConfigObj.setup = function (editor) {
-
-                    //set the reference
-                    tinyMceEditor = editor;
-
-                    //enable browser based spell checking
-                    editor.on('init', function (e) {
-                        editor.getBody().setAttribute('spellcheck', true);
-                    });
-
-                    //We need to listen on multiple things here because of the nature of tinymce, it doesn't
-                    //fire events when you think!
-                    //The change event doesn't fire when content changes, only when cursor points are changed and undo points
-                    //are created. the blur event doesn't fire if you insert content into the editor with a button and then
-                    //press save.
-                    //We have a couple of options, one is to do a set timeout and check for isDirty on the editor, or we can
-                    //listen to both change and blur and also on our own 'saving' event. I think this will be best because a
-                    //timer might end up using unwanted cpu and we'd still have to listen to our saving event in case they clicked
-                    //save before the timeout elapsed.
-
-                    //TODO: We need to re-enable something like this to ensure the track changes is working with tinymce
-                    // so we can detect if the form is dirty or not, Per has some better events to use as this one triggers
-                    // even if you just enter/exit with mouse cursuor which doesn't really mean it's changed.
-                    // see: http://issues.umbraco.org/issue/U4-4485
-                    //var alreadyDirty = false;
-                    //editor.on('change', function (e) {
-                    //    angularHelper.safeApply($scope, function () {
-                    //        $scope.model.value = editor.getContent();
-
-                    //        if (!alreadyDirty) {
-                    //            //make the form dirty manually so that the track changes works, setting our model doesn't trigger
-                    //            // the angular bits because tinymce replaces the textarea.
-                    //            var currForm = angularHelper.getCurrentForm($scope);
-                    //            currForm.$setDirty();
-                    //            alreadyDirty = true;
-                    //        }
-
-                    //    });
-                    //});
-
-                    //when we leave the editor (maybe)
-                    editor.on('blur', function (e) {
-                        editor.save();
-                        angularHelper.safeApply($scope, function () {
-                            $scope.model.value = editor.getContent();
-                        });
-                    });
-
-                    //when buttons modify content
-                    editor.on('ExecCommand', function (e) {
-                        syncContent(editor);
-                    });
-
-                    // Update model on keypress
-                    editor.on('KeyUp', function (e) {
-                        syncContent(editor);
-                    });
-
-                    // Update model on change, i.e. copy/pasted text, plugins altering content
-                    editor.on('SetContent', function (e) {
-                        if (!e.initial) {
-                            syncContent(editor);
-                        }
-                    });
-
-
-                    editor.on('ObjectResized', function (e) {
-                        var qs = "?width=" + e.width + "&height=" + e.height + "&mode=max";
-                        var srcAttr = $(e.target).attr("src");
-                        var path = srcAttr.split("?")[0];
-                        $(e.target).attr("data-mce-src", path + qs);
-
-                        syncContent(editor);
-                    });
-					
-                    tinyMceService.createLinkPicker(editor, $scope, function(currentTarget, anchorElement) {
-                        $scope.linkPickerOverlay = {
-                            view: "linkpicker",
-                            currentTarget: currentTarget,
-							              anchors: editorState.current ? tinyMceService.getAnchorNames(JSON.stringify(editorState.current.properties)) : [],
-                            ignoreUserStartNodes: $scope.model.config.ignoreUserStartNodes === "1",
-                            show: true,
-                            submit: function(model) {
-                                tinyMceService.insertLinkInEditor(editor, model.target, anchorElement);
-                                $scope.linkPickerOverlay.show = false;
-                                $scope.linkPickerOverlay = null;
-                            }
-                        };
-                    });
-
-                    //Create the insert media plugin
-                    tinyMceService.createMediaPicker(editor, $scope, function(currentTarget, userData){
-                        var ignoreUserStartNodes = false;
-                        var startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
-                        var startNodeIsVirtual = userData.startMediaIds.length !== 1;
-
-                        if ($scope.model.config.ignoreUserStartNodes === "1") {
-                            ignoreUserStartNodes = true;
-                            startNodeId = -1;
-                            startNodeIsVirtual = true;
-                        }
-
-                        $scope.mediaPickerOverlay = {
-                            currentTarget: currentTarget,
-                            onlyImages: true,
-                            showDetails: true,
-                            disableFolderSelect: true,
-                            startNodeId: startNodeId,
-                            startNodeIsVirtual: startNodeIsVirtual,
-                            ignoreUserStartNodes: ignoreUserStartNodes,
-                            view: "mediapicker",
-                            show: true,
-                            submit: function(model) {
-                                tinyMceService.insertMediaInEditor(editor, model.selectedImages[0]);
-                                $scope.mediaPickerOverlay.show = false;
-                                $scope.mediaPickerOverlay = null;
-                            }
-                        };
-
-                    });
-                    
-                    //Create the embedded plugin
-                    tinyMceService.createInsertEmbeddedMedia(editor, $scope, function() {
-
-                      $scope.embedOverlay = {
-                          view: "embed",
-                          show: true,
-                          submit: function(model) {
-                              tinyMceService.insertEmbeddedMediaInEditor(editor, model.embed.preview);
-                              $scope.embedOverlay.show = false;
-                              $scope.embedOverlay = null;
-                          }
-                      };
-
-                    });
-
-
-                    //Create the insert macro plugin
-                    tinyMceService.createInsertMacro(editor, $scope, function(dialogData) {
-
-                        $scope.macroPickerOverlay = {
-                            view: "macropicker",
-                            dialogData: dialogData,
-                            show: true,
-                            submit: function(model) {
-                                var macroObject = macroService.collectValueData(model.selectedMacro, model.macroParams, dialogData.renderingEngine);
-                                tinyMceService.insertMacroInEditor(editor, macroObject, $scope);
-                                $scope.macroPickerOverlay.show = false;
-                                $scope.macroPickerOverlay = null;
-                            }
-                        };
-
-                    });
-                };
-                
-                /** Loads in the editor */
-                function loadTinyMce() {
-
-                    //we need to add a timeout here, to force a redraw so TinyMCE can find
-                    //the elements needed
-                    $timeout(function () {
-                        tinymce.DOM.events.domLoaded = true;
-                        tinymce.init(baseLineConfigObj);
-
-                        $scope.isLoading = false;
-
-                    }, 200, false);
-                }
-
-
-
-
-                loadTinyMce();
-
-                //here we declare a special method which will be called whenever the value has changed from the server
-                //this is instead of doing a watch on the model.value = faster
-                $scope.model.onValueChanged = function (newVal, oldVal) {
-                    //update the display val again if it has changed from the server;
-                    //uses an empty string in the editor when the value is null
-                    tinyMceEditor.setContent(newVal || "", { format: 'raw' });
-                    //we need to manually fire this event since it is only ever fired based on loading from the DOM, this
-                    // is required for our plugins listening to this event to execute
-                    tinyMceEditor.fire('LoadContent', null);
-                };
-
-                //listen for formSubmitting event (the result is callback used to remove the event subscription)
-                var unsubscribe = $scope.$on("formSubmitting", function () {
-                    //TODO: Here we should parse out the macro rendered content so we can save on a lot of bytes in data xfer
-                    // we do parse it out on the server side but would be nice to do that on the client side before as well.
-                    if (tinyMceEditor !== undefined && tinyMceEditor != null && !$scope.isLoading) {
-                        $scope.model.value = tinyMceEditor.getContent();
-                    }
-                });
-
-                //when the element is disposed we need to unsubscribe!
-                // NOTE: this is very important otherwise if this is part of a modal, the listener still exists because the dom
-                // element might still be there even after the modal has been hidden.
-                $scope.$on('$destroy', function () {
-                    unsubscribe();
-					if (tinyMceEditor !== undefined && tinyMceEditor != null) {
-                        tinyMceEditor.destroy();
-                    }
-                });
-            });
-        });
-
-    });
+angular.module("umbraco")
+    .controller("Umbraco.PropertyEditors.RTEController",
+    function ($rootScope, $scope, $q, $locale, dialogService, $log, imageHelper, assetsService, $timeout, tinyMceService, angularHelper, stylesheetResource, macroService, editorState) {
+
+        $scope.isLoading = true;
+
+        //To id the html textarea we need to use the datetime ticks because we can have multiple rte's per a single property alias
+        // because now we have to support having 2x (maybe more at some stage) content editors being displayed at once. This is because
+        // we have this mini content editor panel that can be launched with MNTP.
+        var d = new Date();
+        var n = d.getTime();
+        $scope.textAreaHtmlId = $scope.model.alias + "_" + n + "_rte";
+
+        function syncContent(editor){
+            editor.save();
+            angularHelper.safeApply($scope, function () {
+                $scope.model.value = editor.getContent();
+            });
+
+            //make the form dirty manually so that the track changes works, setting our model doesn't trigger
+            // the angular bits because tinymce replaces the textarea.
+            angularHelper.getCurrentForm($scope).$setDirty();
+        }
+
+        tinyMceService.configuration().then(function (tinyMceConfig) {
+
+            //config value from general tinymce.config file
+            var validElements = tinyMceConfig.validElements;
+
+            //These are absolutely required in order for the macros to render inline
+            //we put these as extended elements because they get merged on top of the normal allowed elements by tiny mce
+            var extendedValidElements = "@[id|class|style],-div[id|dir|class|align|style],ins[datetime|cite],-ul[class|style],-li[class|style],span[id|class|style]";
+
+            var invalidElements = tinyMceConfig.inValidElements;
+            var plugins = _.map(tinyMceConfig.plugins, function (plugin) {
+                if (plugin.useOnFrontend) {
+                    return plugin.name;
+                }
+            }).join(" ");
+
+            var editorConfig = $scope.model.config.editor;
+            if (!editorConfig || angular.isString(editorConfig)) {
+                editorConfig = tinyMceService.defaultPrevalues();
+            }
+
+            //config value on the data type
+            var toolbar = editorConfig.toolbar.join(" | ");
+            var stylesheets = [];
+            var styleFormats = [];
+            var await = [];
+            if (!editorConfig.maxImageSize && editorConfig.maxImageSize != 0) {
+                editorConfig.maxImageSize = tinyMceService.defaultPrevalues().maxImageSize;
+            }
+
+            //queue file loading
+            if (typeof tinymce === "undefined") { // Don't reload tinymce if already loaded
+                await.push(assetsService.loadJs("lib/tinymce/tinymce.min.js", $scope));
+            }
+
+            //queue rules loading
+            angular.forEach(editorConfig.stylesheets, function (val, key) {
+                stylesheets.push(Umbraco.Sys.ServerVariables.umbracoSettings.cssPath + "/" + val + ".css?" + new Date().getTime());
+                await.push(stylesheetResource.getRulesByName(val).then(function (rules) {
+                    angular.forEach(rules, function (rule) {
+                        var r = {};
+                        r.title = rule.name;
+                        if (rule.selector[0] == ".") {
+                            r.inline = "span";
+                            r.classes = rule.selector.substring(1);
+                        }
+                        else if (rule.selector[0] == "#") {
+                            r.inline = "span";
+                            r.attributes = { id: rule.selector.substring(1) };
+                        }
+                        else if (rule.selector[0] != "." && rule.selector.indexOf(".") > -1) {
+                            var split = rule.selector.split(".");
+                            r.block = split[0];
+                            r.classes = rule.selector.substring(rule.selector.indexOf(".") + 1).replace(".", " ");
+                        }
+                        else if (rule.selector[0] != "#" && rule.selector.indexOf("#") > -1) {
+                            var split = rule.selector.split("#");
+                            r.block = split[0];
+                            r.classes = rule.selector.substring(rule.selector.indexOf("#") + 1);
+                        }
+                        else {
+                            r.block = rule.selector;
+                        }
+
+                        styleFormats.push(r);
+                    });
+                }));
+            });
+
+
+            //stores a reference to the editor
+            var tinyMceEditor = null;
+
+            // these languages are available for localization
+            var availableLanguages = [
+                'da',
+                'de',
+                'en',
+                'en_us',
+                'fi',
+                'fr',
+                'he',
+                'it',
+                'ja',
+                'nl',
+                'no',
+                'pl',
+                'pt',
+                'ru',
+                'sv',
+                'zh'
+            ];
+
+            //define fallback language
+            var language = 'en_us';
+            //get locale from angular and match tinymce format. Angular localization is always in the format of ru-ru, de-de, en-gb, etc.
+            //wheras tinymce is in the format of ru, de, en, en_us, etc.
+            var localeId = $locale.id.replace('-', '_');
+            //try matching the language using full locale format
+            var languageMatch = _.find(availableLanguages, function(o) { return o === localeId; });
+            //if no matches, try matching using only the language
+            if (languageMatch === undefined) {
+                var localeParts = localeId.split('_');
+                languageMatch = _.find(availableLanguages, function(o) { return o === localeParts[0]; });
+            }
+            //if a match was found - set the language
+            if (languageMatch !== undefined) {
+                language = languageMatch;
+            }
+
+            //wait for queue to end
+            $q.all(await).then(function () {
+
+                //create a baseline Config to exten upon
+                var baseLineConfigObj = {
+                    mode: "exact",
+                    skin: "umbraco",
+                    plugins: plugins,
+                    valid_elements: validElements,
+                    invalid_elements: invalidElements,
+                    extended_valid_elements: extendedValidElements,
+                    menubar: false,
+                    statusbar: false,
+                    relative_urls: false,
+                    height: editorConfig.dimensions.height,
+                    width: editorConfig.dimensions.width,
+                    maxImageSize: editorConfig.maxImageSize,
+                    toolbar: toolbar,
+                    content_css: stylesheets,
+                    style_formats: styleFormats,
+                    language: language,
+                    //see http://archive.tinymce.com/wiki.php/Configuration:cache_suffix
+                    cache_suffix: "?umb__rnd=" + Umbraco.Sys.ServerVariables.application.cacheBuster
+                };
+
+                if (tinyMceConfig.customConfig) {
+
+                    //if there is some custom config, we need to see if the string value of each item might actually be json and if so, we need to
+                    // convert it to json instead of having it as a string since this is what tinymce requires
+                    for (var i in tinyMceConfig.customConfig) {
+                        var val = tinyMceConfig.customConfig[i];
+                        if (val) {
+                            val = val.toString().trim();
+                            if (val.detectIsJson()) {
+                                try {
+                                    tinyMceConfig.customConfig[i] = JSON.parse(val);
+                                    //now we need to check if this custom config key is defined in our baseline, if it is we don't want to
+                                    //overwrite the baseline config item if it is an array, we want to concat the items in the array, otherwise
+                                    //if it's an object it will overwrite the baseline
+                                    if (angular.isArray(baseLineConfigObj[i]) && angular.isArray(tinyMceConfig.customConfig[i])) {
+                                        //concat it and below this concat'd array will overwrite the baseline in angular.extend
+                                        tinyMceConfig.customConfig[i] = baseLineConfigObj[i].concat(tinyMceConfig.customConfig[i]);
+                                    }
+                                }
+                                catch (e) {
+                                    //cannot parse, we'll just leave it
+                                }
+                            }
+                            if (val === "true") {
+                                tinyMceConfig.customConfig[i] = true;
+                            }
+                            if (val === "false") {
+                                tinyMceConfig.customConfig[i] = false;
+                            }
+                        }
+                    }
+
+                    angular.extend(baseLineConfigObj, tinyMceConfig.customConfig);
+                }
+
+                //set all the things that user configs should not be able to override
+                baseLineConfigObj.elements = $scope.textAreaHtmlId; //this is the exact textarea id to replace!
+                baseLineConfigObj.setup = function (editor) {
+
+                    //set the reference
+                    tinyMceEditor = editor;
+
+                    //enable browser based spell checking
+                    editor.on('init', function (e) {
+                        editor.getBody().setAttribute('spellcheck', true);
+                    });
+
+                    //We need to listen on multiple things here because of the nature of tinymce, it doesn't
+                    //fire events when you think!
+                    //The change event doesn't fire when content changes, only when cursor points are changed and undo points
+                    //are created. the blur event doesn't fire if you insert content into the editor with a button and then
+                    //press save.
+                    //We have a couple of options, one is to do a set timeout and check for isDirty on the editor, or we can
+                    //listen to both change and blur and also on our own 'saving' event. I think this will be best because a
+                    //timer might end up using unwanted cpu and we'd still have to listen to our saving event in case they clicked
+                    //save before the timeout elapsed.
+
+                    //TODO: We need to re-enable something like this to ensure the track changes is working with tinymce
+                    // so we can detect if the form is dirty or not, Per has some better events to use as this one triggers
+                    // even if you just enter/exit with mouse cursuor which doesn't really mean it's changed.
+                    // see: http://issues.umbraco.org/issue/U4-4485
+                    //var alreadyDirty = false;
+                    //editor.on('change', function (e) {
+                    //    angularHelper.safeApply($scope, function () {
+                    //        $scope.model.value = editor.getContent();
+
+                    //        if (!alreadyDirty) {
+                    //            //make the form dirty manually so that the track changes works, setting our model doesn't trigger
+                    //            // the angular bits because tinymce replaces the textarea.
+                    //            var currForm = angularHelper.getCurrentForm($scope);
+                    //            currForm.$setDirty();
+                    //            alreadyDirty = true;
+                    //        }
+
+                    //    });
+                    //});
+
+                    //when we leave the editor (maybe)
+                    editor.on('blur', function (e) {
+                        editor.save();
+                        angularHelper.safeApply($scope, function () {
+                            $scope.model.value = editor.getContent();
+                        });
+                    });
+
+                    //when buttons modify content
+                    editor.on('ExecCommand', function (e) {
+                        syncContent(editor);
+                    });
+
+                    // Update model on keypress
+                    editor.on('KeyUp', function (e) {
+                        syncContent(editor);
+                    });
+
+                    // Update model on change, i.e. copy/pasted text, plugins altering content
+                    editor.on('SetContent', function (e) {
+                        if (!e.initial) {
+                            syncContent(editor);
+                        }
+                    });
+
+
+                    editor.on('ObjectResized', function (e) {
+                        var qs = "?width=" + e.width + "&height=" + e.height + "&mode=max";
+                        var srcAttr = $(e.target).attr("src");
+                        var path = srcAttr.split("?")[0];
+                        $(e.target).attr("data-mce-src", path + qs);
+
+                        syncContent(editor);
+                    });
+
+                    tinyMceService.createLinkPicker(editor, $scope, function(currentTarget, anchorElement) {
+                        $scope.linkPickerOverlay = {
+                            view: "linkpicker",
+                            currentTarget: currentTarget,
+							              anchors: editorState.current ? tinyMceService.getAnchorNames(JSON.stringify(editorState.current.properties)) : [],
+                            dataTypeId: $scope.model.dataTypeId,
+                            ignoreUserStartNodes: $scope.model.config.ignoreUserStartNodes,
+                            show: true,
+                            submit: function(model) {
+                                tinyMceService.insertLinkInEditor(editor, model.target, anchorElement);
+                                $scope.linkPickerOverlay.show = false;
+                                $scope.linkPickerOverlay = null;
+                            }
+                        };
+                    });
+
+                    //Create the insert media plugin
+                    tinyMceService.createMediaPicker(editor, $scope, function(currentTarget, userData){
+                        var startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
+                        var startNodeIsVirtual = userData.startMediaIds.length !== 1;
+
+                        if ($scope.model.config.ignoreUserStartNodes === "1") {
+                            startNodeId = -1;
+                            startNodeIsVirtual = true;
+                        }
+
+                        $scope.mediaPickerOverlay = {
+                            currentTarget: currentTarget,
+                            onlyImages: true,
+                            showDetails: true,
+                            disableFolderSelect: true,
+                            startNodeId: startNodeId,
+                            startNodeIsVirtual: startNodeIsVirtual,
+                            dataTypeId: $scope.model.dataTypeId,
+                            view: "mediapicker",
+                            show: true,
+                            submit: function(model) {
+                                tinyMceService.insertMediaInEditor(editor, model.selectedImages[0]);
+                                $scope.mediaPickerOverlay.show = false;
+                                $scope.mediaPickerOverlay = null;
+                            }
+                        };
+
+                    });
+
+                    //Create the embedded plugin
+                    tinyMceService.createInsertEmbeddedMedia(editor, $scope, function() {
+
+                      $scope.embedOverlay = {
+                          view: "embed",
+                          show: true,
+                          submit: function(model) {
+                              tinyMceService.insertEmbeddedMediaInEditor(editor, model.embed.preview);
+                              $scope.embedOverlay.show = false;
+                              $scope.embedOverlay = null;
+                          }
+                      };
+
+                    });
+
+
+                    //Create the insert macro plugin
+                    tinyMceService.createInsertMacro(editor, $scope, function(dialogData) {
+
+                        $scope.macroPickerOverlay = {
+                            view: "macropicker",
+                            dialogData: dialogData,
+                            show: true,
+                            submit: function(model) {
+                                var macroObject = macroService.collectValueData(model.selectedMacro, model.macroParams, dialogData.renderingEngine);
+                                tinyMceService.insertMacroInEditor(editor, macroObject, $scope);
+                                $scope.macroPickerOverlay.show = false;
+                                $scope.macroPickerOverlay = null;
+                            }
+                        };
+
+                    });
+                };
+
+                /** Loads in the editor */
+                function loadTinyMce() {
+
+                    //we need to add a timeout here, to force a redraw so TinyMCE can find
+                    //the elements needed
+                    $timeout(function () {
+                        tinymce.DOM.events.domLoaded = true;
+                        tinymce.init(baseLineConfigObj);
+
+                        $scope.isLoading = false;
+
+                    }, 200, false);
+                }
+
+
+
+
+                loadTinyMce();
+
+                //here we declare a special method which will be called whenever the value has changed from the server
+                //this is instead of doing a watch on the model.value = faster
+                $scope.model.onValueChanged = function (newVal, oldVal) {
+                    //update the display val again if it has changed from the server;
+                    //uses an empty string in the editor when the value is null
+                    tinyMceEditor.setContent(newVal || "", { format: 'raw' });
+                    //we need to manually fire this event since it is only ever fired based on loading from the DOM, this
+                    // is required for our plugins listening to this event to execute
+                    tinyMceEditor.fire('LoadContent', null);
+                };
+
+                //listen for formSubmitting event (the result is callback used to remove the event subscription)
+                var unsubscribe = $scope.$on("formSubmitting", function () {
+                    //TODO: Here we should parse out the macro rendered content so we can save on a lot of bytes in data xfer
+                    // we do parse it out on the server side but would be nice to do that on the client side before as well.
+                    if (tinyMceEditor !== undefined && tinyMceEditor != null && !$scope.isLoading) {
+                        $scope.model.value = tinyMceEditor.getContent();
+                    }
+                });
+
+                //when the element is disposed we need to unsubscribe!
+                // NOTE: this is very important otherwise if this is part of a modal, the listener still exists because the dom
+                // element might still be there even after the modal has been hidden.
+                $scope.$on('$destroy', function () {
+                    unsubscribe();
+					if (tinyMceEditor !== undefined && tinyMceEditor != null) {
+                        tinyMceEditor.destroy();
+                    }
+                });
+            });
+        });
+
+    });
diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs
index b8d9c8bcb6..c909c1eb84 100644
--- a/src/Umbraco.Web/Editors/ContentController.cs
+++ b/src/Umbraco.Web/Editors/ContentController.cs
@@ -1,1227 +1,1227 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Text;
-using System.Web.Http;
-using System.Web.Http.Controllers;
-using System.Web.Http.ModelBinding;
-using AutoMapper;
-using Umbraco.Core;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.Membership;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
-using Umbraco.Core.Publishing;
-using Umbraco.Core.Services;
-using Umbraco.Web.Models.ContentEditing;
-using Umbraco.Web.Models.Mapping;
-using Umbraco.Web.Mvc;
-using Umbraco.Web.WebApi;
-using Umbraco.Web.WebApi.Binders;
-using Umbraco.Web.WebApi.Filters;
-using Umbraco.Core.Events;
-using Constants = Umbraco.Core.Constants;
-using umbraco.cms.businesslogic;
-using System.Collections;
-using umbraco;
-
-namespace Umbraco.Web.Editors
-{
-    /// <summary>
-    /// The API controller used for editing content
-    /// </summary>
-    /// <remarks>
-    /// This controller is decorated with the UmbracoApplicationAuthorizeAttribute which means that any user requesting
-    /// access to ALL of the methods on this controller will need access to the content application.
-    /// </remarks>
-    [PluginController("UmbracoApi")]
-    [UmbracoApplicationAuthorize(Constants.Applications.Content)]
-    [ContentControllerConfiguration]
-    public class ContentController : ContentControllerBase
-    {
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        public ContentController()
-                : this(UmbracoContext.Current)
-        {
-        }
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="umbracoContext"></param>
-        public ContentController(UmbracoContext umbracoContext)
-                : base(umbracoContext)
-        {
-        }
-
-        /// <summary>
-        /// Configures this controller with a custom action selector
-        /// </summary>
-        private class ContentControllerConfigurationAttribute : Attribute, IControllerConfiguration
-        {
-            public void Initialize(HttpControllerSettings controllerSettings, HttpControllerDescriptor controllerDescriptor)
-            {
-                controllerSettings.Services.Replace(typeof(IHttpActionSelector), new ParameterSwapControllerActionSelector(
-                    new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetNiceUrl", "id", typeof(int), typeof(Guid), typeof(Udi)),
-                    new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetById", "id", typeof(int), typeof(Guid), typeof(Udi))
-                ));
-            }
-        }
-
-        /// <summary>
-        /// Return content for the specified ids
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <returns></returns>
-        [FilterAllowedOutgoingContent(typeof(IEnumerable<ContentItemDisplay>))]
-        public IEnumerable<ContentItemDisplay> GetByIds([FromUri]int[] ids)
-        {
-            var foundContent = Services.ContentService.GetByIds(ids);
-            return foundContent.Select(content => AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(content, UmbracoContext));
-        }
-
-        /// <summary>
-        /// Updates the permissions for a content item for a particular user group
-        /// </summary>
-        /// <param name="saveModel"></param>
-        /// <returns></returns>
-        /// <remarks>
-        /// Permission check is done for letter 'R' which is for <see cref="ActionRights"/> which the user must have access to to update
-        /// </remarks>
-        [EnsureUserPermissionForContent("saveModel.ContentId", 'R')]
-        public IEnumerable<AssignedUserGroupPermissions> PostSaveUserGroupPermissions(UserGroupPermissionsSave saveModel)
-        {
-            if (saveModel.ContentId <= 0) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
-
-            //TODO: Should non-admins be alowed to set granular permissions?
-
-            var content = Services.ContentService.GetById(saveModel.ContentId);
-            if (content == null) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
-
-            //current permissions explicitly assigned to this content item
-            var contentPermissions = Services.ContentService.GetPermissionsForEntity(content)
-                .ToDictionary(x => x.UserGroupId, x => x);
-
-            var allUserGroups = Services.UserService.GetAllUserGroups().ToArray();
-
-            //loop through each user group
-            foreach (var userGroup in allUserGroups)
-            {
-                //check if there's a permission set posted up for this user group
-                IEnumerable<string> groupPermissions;
-                if (saveModel.AssignedPermissions.TryGetValue(userGroup.Id, out groupPermissions))
-                {
-                    //create a string collection of the assigned letters
-                    var groupPermissionCodes = groupPermissions.ToArray();
-
-                    //check if there are no permissions assigned for this group save model, if that is the case we want to reset the permissions
-                    //for this group/node which will go back to the defaults
-                    if (groupPermissionCodes.Length == 0)
-                    {
-                        Services.UserService.RemoveUserGroupPermissions(userGroup.Id, content.Id);
-                    }
-                    //check if they are the defaults, if so we should just remove them if they exist since it's more overhead having them stored
-                    else if (userGroup.Permissions.UnsortedSequenceEqual(groupPermissionCodes))
-                    {
-                        //only remove them if they are actually currently assigned
-                        if (contentPermissions.ContainsKey(userGroup.Id))
-                        {
-                            //remove these permissions from this node for this group since the ones being assigned are the same as the defaults
-                            Services.UserService.RemoveUserGroupPermissions(userGroup.Id, content.Id);
-                        }
-                    }
-                    //if they are different we need to update, otherwise there's nothing to update
-                    else if (contentPermissions.ContainsKey(userGroup.Id) == false || contentPermissions[userGroup.Id].AssignedPermissions.UnsortedSequenceEqual(groupPermissionCodes) == false)
-                    {
-
-                        Services.UserService.ReplaceUserGroupPermissions(userGroup.Id, groupPermissionCodes.Select(x => x[0]), content.Id);
-                    }
-                }
-            }
-
-            return GetDetailedPermissions(content, allUserGroups);
-        }
-
-        /// <summary>
-        /// Returns the user group permissions for user groups assigned to this node
-        /// </summary>
-        /// <param name="contentId"></param>
-        /// <returns></returns>
-        /// <remarks>
-        /// Permission check is done for letter 'R' which is for <see cref="ActionRights"/> which the user must have access to to view
-        /// </remarks>
-        [EnsureUserPermissionForContent("contentId", 'R')]
-        public IEnumerable<AssignedUserGroupPermissions> GetDetailedPermissions(int contentId)
-        {
-            if (contentId <= 0) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
-            var content = Services.ContentService.GetById(contentId);
-            if (content == null) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
-
-            //TODO: Should non-admins be able to see detailed permissions?
-
-            var allUserGroups = Services.UserService.GetAllUserGroups();
-
-            return GetDetailedPermissions(content, allUserGroups);
-        }
-
-        private IEnumerable<AssignedUserGroupPermissions> GetDetailedPermissions(IContent content, IEnumerable<IUserGroup> allUserGroups)
-        {
-            //get all user groups and map their default permissions to the AssignedUserGroupPermissions model.
-            //we do this because not all groups will have true assigned permissions for this node so if they don't have assigned permissions, we need to show the defaults.
-
-            var defaultPermissionsByGroup = Mapper.Map<IEnumerable<AssignedUserGroupPermissions>>(allUserGroups).ToArray();
-
-            var defaultPermissionsAsDictionary = defaultPermissionsByGroup
-                .ToDictionary(x => Convert.ToInt32(x.Id), x => x);
-
-            //get the actual assigned permissions
-            var assignedPermissionsByGroup = Services.ContentService.GetPermissionsForEntity(content).ToArray();
-
-            //iterate over assigned and update the defaults with the real values
-            foreach (var assignedGroupPermission in assignedPermissionsByGroup)
-            {
-                var defaultUserGroupPermissions = defaultPermissionsAsDictionary[assignedGroupPermission.UserGroupId];
-
-                //clone the default permissions model to the assigned ones
-                defaultUserGroupPermissions.AssignedPermissions = AssignedUserGroupPermissions.ClonePermissions(defaultUserGroupPermissions.DefaultPermissions);
-
-                //since there is custom permissions assigned to this node for this group, we need to clear all of the default permissions
-                //and we'll re-check it if it's one of the explicitly assigned ones
-                foreach (var permission in defaultUserGroupPermissions.AssignedPermissions.SelectMany(x => x.Value))
-                {
-                    permission.Checked = false;
-                    permission.Checked = assignedGroupPermission.AssignedPermissions.Contains(permission.PermissionCode, StringComparer.InvariantCulture);
-                }
-
-            }
-
-            return defaultPermissionsByGroup;
-        }
-
-        /// <summary>
-        /// Returns an item to be used to display the recycle bin for content
-        /// </summary>
-        /// <returns></returns>
-        public ContentItemDisplay GetRecycleBin()
-        {
-            var display = new ContentItemDisplay
-            {
-                Id = Constants.System.RecycleBinContent,
-                Alias = "recycleBin",
-                ParentId = -1,
-                Name = Services.TextService.Localize("general/recycleBin"),
-                ContentTypeAlias = "recycleBin",
-                CreateDate = DateTime.Now,
-                IsContainer = true,
-                Path = "-1," + Constants.System.RecycleBinContent
-            };
-
-            TabsAndPropertiesResolver<IContent>.AddListView(display, "content", Services.DataTypeService, Services.TextService);
-
-            return display;
-        }
-
-        public ContentItemDisplay GetBlueprintById(int id)
-        {
-            var foundContent = Services.ContentService.GetBlueprintById(id);
-            if (foundContent == null)
-            {
-                HandleContentNotFound(id);
-            }
-
-            var content = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(foundContent, UmbracoContext);
-
-            SetupBlueprint(content, foundContent);
-
-            return content;
-        }
-
-        private static void SetupBlueprint(ContentItemDisplay content, IContent persistedContent)
-        {
-            content.AllowPreview = false;
-
-            //set a custom path since the tree that renders this has the content type id as the parent
-            content.Path = string.Format("-1,{0},{1}", persistedContent.ContentTypeId, content.Id);
-
-            content.AllowedActions = new[] { "A" };
-            content.IsBlueprint = true;
-
-            var excludeProps = new[] { "_umb_urls", "_umb_releasedate", "_umb_expiredate", "_umb_template" };
-            var propsTab = content.Tabs.Last();
-            propsTab.Properties = propsTab.Properties
-                .Where(p => excludeProps.Contains(p.Alias) == false);
-        }
-
-        /// <summary>
-        /// Gets the content json for the content id
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="ignoreUserStartNodes">If set to true, user and group start node permissions will be ignored.</param>
-        /// <returns></returns>
-        [OutgoingEditorModelEvent]
-        [EnsureUserPermissionForContent("id")]
-        public ContentItemDisplay GetById(int id, [FromUri]bool ignoreUserStartNodes = false)
-        {
-            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
-            if (foundContent == null)
-            {
-                HandleContentNotFound(id);
-            }
-
-            var content = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(foundContent, UmbracoContext);
-            return content;
-        }
-
-        /// <summary>
-        /// Gets the content json for the content id
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        [OutgoingEditorModelEvent]
-        [EnsureUserPermissionForContent("id")]
-        public ContentItemDisplay GetById(Guid id)
-        {
-            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
-            if (foundContent == null)
-            {
-                HandleContentNotFound(id);
-            }
-
-            var content = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(foundContent, UmbracoContext);
-            return content;
-        }
-
-        /// <summary>
-        /// Gets the content json for the content id
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        [OutgoingEditorModelEvent]
-        [EnsureUserPermissionForContent("id")]
-        public ContentItemDisplay GetById(Udi id)
-        {
-            var guidUdi = id as GuidUdi;
-            if (guidUdi != null)
-            {
-                return GetById(guidUdi.Guid);
-            }
-
-            throw new HttpResponseException(HttpStatusCode.NotFound);
-        }
-
-        [EnsureUserPermissionForContent("id")]
-        public ContentItemDisplay GetWithTreeDefinition(int id)
-        {
-            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
-            if (foundContent == null)
-            {
-                HandleContentNotFound(id);
-            }
-
-            var content = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(foundContent, UmbracoContext);
-            return content;
-        }
-
-        /// <summary>
-        /// Gets an empty content item for the 
-        /// </summary>
-        /// <param name="contentTypeAlias"></param>
-        /// <param name="parentId"></param>
-        /// <returns>
-        /// If this is a container type, we'll remove the umbContainerView tab for a new item since
-        /// it cannot actually list children if it doesn't exist yet.
-        /// </returns>
-        [OutgoingEditorModelEvent]
-        public ContentItemDisplay GetEmpty(string contentTypeAlias, int parentId)
-        {
-            var contentType = Services.ContentTypeService.GetContentType(contentTypeAlias);
-            if (contentType == null)
-            {
-                throw new HttpResponseException(HttpStatusCode.NotFound);
-            }
-
-            var emptyContent = Services.ContentService.CreateContent("", parentId, contentType.Alias, UmbracoUser.Id);
-            var mapped = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(emptyContent, UmbracoContext);
-            // translate the content type name if applicable
-            mapped.ContentTypeName = Services.TextService.UmbracoDictionaryTranslate(mapped.ContentTypeName);
-            // if your user type doesn't have access to the Settings section it would not get this property mapped
-            if(mapped.DocumentType != null)
-                mapped.DocumentType.Name = Services.TextService.UmbracoDictionaryTranslate(mapped.DocumentType.Name);
-
-            //remove this tab if it exists: umbContainerView
-            var containerTab = mapped.Tabs.FirstOrDefault(x => x.Alias == Constants.Conventions.PropertyGroups.ListViewGroupName);
-            mapped.Tabs = mapped.Tabs.Except(new[] { containerTab });
-            return mapped;
-        }
-
-        [OutgoingEditorModelEvent]
-        public ContentItemDisplay GetEmpty(int blueprintId, int parentId)
-        {
-            var blueprint = Services.ContentService.GetBlueprintById(blueprintId);
-            if (blueprint == null)
-            {
-                throw new HttpResponseException(HttpStatusCode.NotFound);
-            }
-
-            blueprint.Id = 0;
-            blueprint.Name = string.Empty;
-            blueprint.ParentId = parentId;
-
-            var mapped = Mapper.Map<ContentItemDisplay>(blueprint);
-
-            //remove this tab if it exists: umbContainerView
-            var containerTab = mapped.Tabs.FirstOrDefault(x => x.Alias == Constants.Conventions.PropertyGroups.ListViewGroupName);
-            mapped.Tabs = mapped.Tabs.Except(new[] { containerTab });
-            return mapped;
-        }
-
-        /// <summary>
-        /// Gets the Url for a given node ID
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        public HttpResponseMessage GetNiceUrl(int id)
-        {
-            var url = Umbraco.NiceUrl(id);
-            var response = Request.CreateResponse(HttpStatusCode.OK);
-            response.Content = new StringContent(url, Encoding.UTF8, "application/json");
-            return response;
-        }
-
-        /// <summary>
-        /// Gets the Url for a given node ID
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        public HttpResponseMessage GetNiceUrl(Guid id)
-        {
-            var url = Umbraco.UrlProvider.GetUrl(id);
-            var response = Request.CreateResponse(HttpStatusCode.OK);
-            response.Content = new StringContent(url, Encoding.UTF8, "application/json");
-            return response;
-        }
-
-        /// <summary>
-        /// Gets the Url for a given node ID
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        public HttpResponseMessage GetNiceUrl(Udi id)
-        {
-            var guidUdi = id as GuidUdi;
-            if (guidUdi != null)
-            {
-                return GetNiceUrl(guidUdi.Guid);
-            }
-            throw new HttpResponseException(HttpStatusCode.NotFound);
-        }
-
-        /// <summary>
-        /// Gets the children for the content id passed in
-        /// </summary>
-        /// <returns></returns>
-        [FilterAllowedOutgoingContent(typeof(IEnumerable<ContentItemBasic<ContentPropertyBasic, IContent>>), "Items")]
-        public PagedResult<ContentItemBasic<ContentPropertyBasic, IContent>> GetChildren(
-                int id,
-                int pageNumber = 0,  //TODO: This should be '1' as it's not the index
-                int pageSize = 0,
-                string orderBy = "SortOrder",
-                Direction orderDirection = Direction.Ascending,
-                bool orderBySystemField = true,
-                string filter = "")
-        {
-            return GetChildren(id, null, pageNumber, pageSize, orderBy, orderDirection, orderBySystemField, filter);
-        }
-
-        /// <summary>
-        /// Gets the children for the content id passed in
-        /// </summary>
-        /// <returns></returns>
-        [FilterAllowedOutgoingContent(typeof(IEnumerable<ContentItemBasic<ContentPropertyBasic, IContent>>), "Items")]
-        public PagedResult<ContentItemBasic<ContentPropertyBasic, IContent>> GetChildren(
-                int id,
-                string includeProperties,
-                int pageNumber = 0,  //TODO: This should be '1' as it's not the index
-                int pageSize = 0,
-                string orderBy = "SortOrder",
-                Direction orderDirection = Direction.Ascending,
-                bool orderBySystemField = true,
-                string filter = "")
-        {
-            long totalChildren;
-            IContent[] children;
-            if (pageNumber > 0 && pageSize > 0)
-            {
-                children = Services.ContentService
-                 .GetPagedChildren(id, (pageNumber - 1), pageSize, out totalChildren
-                 , orderBy, orderDirection, orderBySystemField, filter).ToArray();
-            }
-            else
-            {
-                children = Services.ContentService.GetChildren(id).ToArray();
-                totalChildren = children.Length;
-            }
-
-            if (totalChildren == 0)
-            {
-                return new PagedResult<ContentItemBasic<ContentPropertyBasic, IContent>>(0, 0, 0);
-            }
-
-            var pagedResult = new PagedResult<ContentItemBasic<ContentPropertyBasic, IContent>>(totalChildren, pageNumber, pageSize);
-            pagedResult.Items = children.Select(content =>
-                Mapper.Map<IContent, ContentItemBasic<ContentPropertyBasic, IContent>>(content,
-                    opts =>
-                    {
-                        // if there's a list of property aliases to map - we will make sure to store this in the mapping context.
-                        if (String.IsNullOrWhiteSpace(includeProperties) == false)
-                        {
-                            opts.Items["IncludeProperties"] = includeProperties.Split(new[] { ", ", "," }, StringSplitOptions.RemoveEmptyEntries);
-                        }
-                    }));
-
-            return pagedResult;
-        }
-
-        [Obsolete("Dont use this, it is incorrectly named, use HasPermission instead")]
-        public bool GetHasPermission(string permissionToCheck, int nodeId)
-        {
-            return HasPermission(permissionToCheck, nodeId);
-        }
-
-        /// <summary>
-        /// Returns permissions for all nodes passed in for the current user
-        /// TODO: This should be moved to the CurrentUserController?
-        /// </summary>
-        /// <param name="nodeIds"></param>
-        /// <returns></returns>
-        [HttpPost]
-        public Dictionary<int, string[]> GetPermissions(int[] nodeIds)
-        {
-            var permissions = Services.UserService
-                    .GetPermissions(Security.CurrentUser, nodeIds);
-
-            var permissionsDictionary = new Dictionary<int, string[]>();
-            foreach (var nodeId in nodeIds)
-            {
-                var aggregatePerms = permissions.GetAllPermissions(nodeId).ToArray();
-                permissionsDictionary.Add(nodeId, aggregatePerms);
-            }
-
-            return permissionsDictionary;
-        }
-
-        /// <summary>
-        /// Checks a nodes permission for the current user
-        /// TODO: This should be moved to the CurrentUserController?
-        /// </summary>
-        /// <param name="permissionToCheck"></param>
-        /// <param name="nodeId"></param>
-        /// <returns></returns>
-        [HttpGet]
-        public bool HasPermission(string permissionToCheck, int nodeId)
-        {
-            var p = Services.UserService.GetPermissions(Security.CurrentUser, nodeId).GetAllPermissions();
-            if (p.Contains(permissionToCheck.ToString(CultureInfo.InvariantCulture)))
-            {
-                return true;
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Creates a blueprint from a content item 
-        /// </summary>
-        /// <param name="contentId">The content id to copy</param>
-        /// <param name="name">The name of the blueprint</param>
-        /// <returns></returns>
-        [HttpPost]
-        public SimpleNotificationModel CreateBlueprintFromContent([FromUri]int contentId, [FromUri]string name)
-        {
-            if (string.IsNullOrWhiteSpace(name)) throw new ArgumentException("Value cannot be null or whitespace.", "name");
-
-            var content = Services.ContentService.GetById(contentId);
-            if (content == null)
-                throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
-
-            EnsureUniqueName(name, content, "name");
-
-            var blueprint = Services.ContentService.CreateContentFromBlueprint(content, name, Security.CurrentUser.Id);
-
-            Services.ContentService.SaveBlueprint(blueprint, Security.CurrentUser.Id);
-
-            var notificationModel = new SimpleNotificationModel();
-            notificationModel.AddSuccessNotification(
-                Services.TextService.Localize("blueprints/createdBlueprintHeading"),
-                Services.TextService.Localize("blueprints/createdBlueprintMessage", new[] { content.Name })
-            );
-
-            return notificationModel;
-        }
-
-        private void EnsureUniqueName(string name, IContent content, string modelName)
-        {
-            var existing = Services.ContentService.GetBlueprintsForContentTypes(content.ContentTypeId);
-            if (existing.Any(x => x.Name == name && x.Id != content.Id))
-            {
-                ModelState.AddModelError(modelName, Services.TextService.Localize("blueprints/duplicateBlueprintMessage"));
-                throw new HttpResponseException(Request.CreateValidationErrorResponse(ModelState));
-            }
-        }
-
-        /// <summary>
-        /// Saves content
-        /// </summary>
-        /// <returns></returns>
-        [FileUploadCleanupFilter]
-        [ContentPostValidate]
-        public ContentItemDisplay PostSaveBlueprint(
-            [ModelBinder(typeof(BlueprintItemBinder))] ContentItemSave contentItem)
-        {
-            var contentItemDisplay = PostSaveInternal(contentItem,
-                content =>
-                {
-                    EnsureUniqueName(content.Name, content, "Name");
-
-                    Services.ContentService.SaveBlueprint(contentItem.PersistedContent, Security.CurrentUser.Id);
-                    //we need to reuse the underlying logic so return the result that it wants
-                    return Attempt<OperationStatus>.Succeed(new OperationStatus(OperationStatusType.Success, new EventMessages()));
-                });
-            SetupBlueprint(contentItemDisplay, contentItemDisplay.PersistedContent);
-
-            return contentItemDisplay;
-        }
-
-        /// <summary>
-        /// Saves content
-        /// </summary>
-        /// <returns></returns>
-        [FileUploadCleanupFilter]
-        [ContentPostValidate]
-        [OutgoingEditorModelEvent]
-        public ContentItemDisplay PostSave(
-                [ModelBinder(typeof(ContentItemBinder))]
-                                ContentItemSave contentItem)
-        {
-            return PostSaveInternal(contentItem,
-                content => Services.ContentService.WithResult().Save(contentItem.PersistedContent, Security.CurrentUser.Id));
-        }
-
-        private ContentItemDisplay PostSaveInternal(ContentItemSave contentItem, Func<IContent, Attempt<OperationStatus>> saveMethod)
-        {
-            //Recent versions of IE/Edge may send in the full clientside file path instead of just the file name.
-            //To ensure similar behavior across all browsers no matter what they do - we strip the FileName property of all
-            //uploaded files to being *only* the actual file name (as it should be).
-            if (contentItem.UploadedFiles != null && contentItem.UploadedFiles.Any())
-            {
-                foreach (var file in contentItem.UploadedFiles)
-                {
-                    file.FileName = Path.GetFileName(file.FileName);
-                }
-            }
-
-            //If we've reached here it means:
-            // * Our model has been bound
-            // * and validated
-            // * any file attachments have been saved to their temporary location for us to use
-            // * we have a reference to the DTO object and the persisted object
-            // * Permissions are valid
-            MapPropertyValues(contentItem);
-
-            //We need to manually check the validation results here because:
-            // * We still need to save the entity even if there are validation value errors
-            // * Depending on if the entity is new, and if there are non property validation errors (i.e. the name is null)
-            //      then we cannot continue saving, we can only display errors
-            // * If there are validation errors and they were attempting to publish, we can only save, NOT publish and display 
-            //      a message indicating this
-            if (ModelState.IsValid == false)
-            {
-                if (ValidationHelper.ModelHasRequiredForPersistenceErrors(contentItem) && IsCreatingAction(contentItem.Action))
-                {
-                    //ok, so the absolute mandatory data is invalid and it's new, we cannot actually continue!
-                    // add the modelstate to the outgoing object and throw a validation message
-                    var forDisplay = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(contentItem.PersistedContent, UmbracoContext);
-                    forDisplay.Errors = ModelState.ToErrorDictionary();
-                    throw new HttpResponseException(Request.CreateValidationErrorResponse(forDisplay));
-
-                }
-
-                //if the model state is not valid we cannot publish so change it to save
-                switch (contentItem.Action)
-                {
-                    case ContentSaveAction.Publish:
-                        contentItem.Action = ContentSaveAction.Save;
-                        break;
-                    case ContentSaveAction.PublishNew:
-                        contentItem.Action = ContentSaveAction.SaveNew;
-                        break;
-                }
-            }
-
-            //initialize this to successful
-            var publishStatus = Attempt<PublishStatus>.Succeed();
-            var wasCancelled = false;
-
-            if (contentItem.Action == ContentSaveAction.Save || contentItem.Action == ContentSaveAction.SaveNew)
-            {
-                //save the item
-                var saveResult = saveMethod(contentItem.PersistedContent);
-
-                wasCancelled = saveResult.Success == false && saveResult.Result.StatusType == OperationStatusType.FailedCancelledByEvent;
-            }
-            else if (contentItem.Action == ContentSaveAction.SendPublish || contentItem.Action == ContentSaveAction.SendPublishNew)
-            {
-                var sendResult = Services.ContentService.SendToPublication(contentItem.PersistedContent, Security.CurrentUser.Id);
-                wasCancelled = sendResult == false;
-            }
-            else
-            {
-                //publish the item and check if it worked, if not we will show a diff msg below
-                publishStatus = Services.ContentService.SaveAndPublishWithStatus(contentItem.PersistedContent, Security.CurrentUser.Id);
-                wasCancelled = publishStatus.Result.StatusType == PublishStatusType.FailedCancelledByEvent;
-            }
-
-            //return the updated model
-            var display = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(contentItem.PersistedContent, UmbracoContext);
-
-            //lasty, if it is not valid, add the modelstate to the outgoing object and throw a 403
-            HandleInvalidModelState(display);
-
-            //put the correct msgs in 
-            switch (contentItem.Action)
-            {
-                case ContentSaveAction.Save:
-                case ContentSaveAction.SaveNew:
-                    if (wasCancelled == false)
-                    {
-                        display.AddSuccessNotification(
-                            Services.TextService.Localize("speechBubbles/editContentSavedHeader"),
-                            contentItem.ReleaseDate.HasValue
-                                ? Services.TextService.Localize("speechBubbles/editContentSavedWithReleaseDateText", new [] { contentItem.ReleaseDate.Value.ToLongDateString(), contentItem.ReleaseDate.Value.ToShortTimeString() })
-                                : Services.TextService.Localize("speechBubbles/editContentSavedText")
-                        );
-                    }
-                    else
-                    {
-                        AddCancelMessage(display);
-                    }
-                    break;
-                case ContentSaveAction.SendPublish:
-                case ContentSaveAction.SendPublishNew:
-                    if (wasCancelled == false)
-                    {
-                        display.AddSuccessNotification(
-                            Services.TextService.Localize("speechBubbles/editContentSendToPublish"),
-                            Services.TextService.Localize("speechBubbles/editContentSendToPublishText"));
-                    }
-                    else
-                    {
-                        AddCancelMessage(display);
-                    }
-                    break;
-                case ContentSaveAction.Publish:
-                case ContentSaveAction.PublishNew:
-                    ShowMessageForPublishStatus(publishStatus.Result, display, contentItem.ExpireDate);
-                    break;
-            }
-
-            //If the item is new and the operation was cancelled, we need to return a different
-            // status code so the UI can handle it since it won't be able to redirect since there
-            // is no Id to redirect to!
-            if (wasCancelled && IsCreatingAction(contentItem.Action))
-            {
-                throw new HttpResponseException(Request.CreateValidationErrorResponse(display));
-            }
-
-            display.PersistedContent = contentItem.PersistedContent;
-
-            return display;
-        }
-
-        /// <summary>
-        /// Publishes a document with a given ID
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        /// <remarks>
-        /// The CanAccessContentAuthorize attribute will deny access to this method if the current user
-        /// does not have Publish access to this node.
-        /// </remarks>
-        /// 
-        [EnsureUserPermissionForContent("id", 'U')]
-        public HttpResponseMessage PostPublishById(int id)
-        {
-            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
-
-            if (foundContent == null)
-            {
-                return HandleContentNotFound(id, false);
-            }
-
-            var publishResult = Services.ContentService.PublishWithStatus(foundContent, Security.CurrentUser.Id);
-            if (publishResult.Success == false)
-            {
-                var notificationModel = new SimpleNotificationModel();
-                ShowMessageForPublishStatus(publishResult.Result, notificationModel, foundContent.ExpireDate);
-                return Request.CreateValidationErrorResponse(notificationModel);
-            }
-
-            //return ok
-            return Request.CreateResponse(HttpStatusCode.OK);
-
-        }
-
-        [HttpDelete]
-        [HttpPost]
-        public HttpResponseMessage DeleteBlueprint(int id)
-        {
-            var found = Services.ContentService.GetBlueprintById(id);
-
-            if (found == null)
-            {
-                return HandleContentNotFound(id, false);
-            }
-
-            Services.ContentService.DeleteBlueprint(found);
-
-            return Request.CreateResponse(HttpStatusCode.OK);
-        }
-
-        /// <summary>
-        /// Moves an item to the recycle bin, if it is already there then it will permanently delete it
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        /// <remarks>
-        /// The CanAccessContentAuthorize attribute will deny access to this method if the current user
-        /// does not have Delete access to this node.
-        /// </remarks>
-        [EnsureUserPermissionForContent("id", 'D')]
-        [HttpDelete]
-        [HttpPost]
-        public HttpResponseMessage DeleteById(int id)
-        {
-            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
-
-            if (foundContent == null)
-            {
-                return HandleContentNotFound(id, false);
-            }
-
-            //if the current item is in the recycle bin
-            if (foundContent.IsInRecycleBin() == false)
-            {
-                var moveResult = Services.ContentService.WithResult().MoveToRecycleBin(foundContent, Security.CurrentUser.Id);
-                if (moveResult == false)
-                {
-                    //returning an object of INotificationModel will ensure that any pending 
-                    // notification messages are added to the response.
-                    return Request.CreateValidationErrorResponse(new SimpleNotificationModel());
-                }
-            }
-            else
-            {
-                var deleteResult = Services.ContentService.WithResult().Delete(foundContent, Security.CurrentUser.Id);
-                if (deleteResult == false)
-                {
-                    //returning an object of INotificationModel will ensure that any pending 
-                    // notification messages are added to the response.
-                    return Request.CreateValidationErrorResponse(new SimpleNotificationModel());
-                }
-            }
-
-            return Request.CreateResponse(HttpStatusCode.OK);
-        }
-
-        /// <summary>
-        /// Empties the recycle bin
-        /// </summary>
-        /// <returns></returns>
-        /// <remarks>
-        /// attributed with EnsureUserPermissionForContent to verify the user has access to the recycle bin
-        /// </remarks>
-        [HttpDelete]
-        [HttpPost]
-        [EnsureUserPermissionForContent(Constants.System.RecycleBinContent, 'D')]
-        public HttpResponseMessage EmptyRecycleBin()
-        {
-            Services.ContentService.EmptyRecycleBin(Security.CurrentUser.Id);
-
-            return Request.CreateNotificationSuccessResponse(Services.TextService.Localize("defaultdialogs/recycleBinIsEmpty"));
-        }
-
-        /// <summary>
-        /// Change the sort order for content
-        /// </summary>
-        /// <param name="sorted"></param>
-        /// <returns></returns>
-        [EnsureUserPermissionForContent("sorted.ParentId", 'S')]
-        public HttpResponseMessage PostSort(ContentSortOrder sorted)
-        {
-            if (sorted == null)
-            {
-                return Request.CreateResponse(HttpStatusCode.NotFound);
-            }
-
-            //if there's nothing to sort just return ok
-            if (sorted.IdSortOrder.Length == 0)
-            {
-                return Request.CreateResponse(HttpStatusCode.OK);
-            }
-
-            try
-            {
-                var contentService = Services.ContentService;
-
-                // Save content with new sort order and update content xml in db accordingly
-                if (contentService.Sort(sorted.IdSortOrder, Security.CurrentUser.Id) == false)
-                {
-                    LogHelper.Warn<ContentController>("Content sorting failed, this was probably caused by an event being cancelled");
-                    return Request.CreateValidationErrorResponse("Content sorting failed, this was probably caused by an event being cancelled");
-                }
-                return Request.CreateResponse(HttpStatusCode.OK);
-            }
-            catch (Exception ex)
-            {
-                LogHelper.Error<ContentController>("Could not update content sort order", ex);
-                throw;
-            }
-        }
-
-        /// <summary>
-        /// Change the sort order for media
-        /// </summary>
-        /// <param name="move"></param>
-        /// <returns></returns>
-        [EnsureUserPermissionForContent("move.ParentId", 'M')]
-        public HttpResponseMessage PostMove(MoveOrCopy move)
-        {
-            var toMove = ValidateMoveOrCopy(move);
-
-            Services.ContentService.Move(toMove, move.ParentId, Security.CurrentUser.Id);
-
-            var response = Request.CreateResponse(HttpStatusCode.OK);
-            response.Content = new StringContent(toMove.Path, Encoding.UTF8, "application/json");
-            return response;
-        }
-
-        /// <summary>
-        /// Copies a content item and places the copy as a child of a given parent Id
-        /// </summary>
-        /// <param name="copy"></param>
-        /// <returns></returns>
-        [EnsureUserPermissionForContent("copy.ParentId", 'C')]
-        public HttpResponseMessage PostCopy(MoveOrCopy copy)
-        {
-            var toCopy = ValidateMoveOrCopy(copy);
-
-            var c = Services.ContentService.Copy(toCopy, copy.ParentId, copy.RelateToOriginal, copy.Recursive, Security.CurrentUser.Id);
-
-            var response = Request.CreateResponse(HttpStatusCode.OK);
-            response.Content = new StringContent(c.Path, Encoding.UTF8, "application/json");
-            return response;
-        }
-
-        /// <summary>
-        /// Unpublishes a node with a given Id and returns the unpublished entity
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        [EnsureUserPermissionForContent("id", 'U')]
-        [OutgoingEditorModelEvent]
-        public ContentItemDisplay PostUnPublish(int id)
-        {
-            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
-
-            if (foundContent == null)
-                HandleContentNotFound(id);
-
-            var unpublishResult = Services.ContentService.WithResult().UnPublish(foundContent, Security.CurrentUser.Id);
-
-            var content = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(foundContent, UmbracoContext);
-
-            if (unpublishResult == false)
-            {
-                AddCancelMessage(content);
-                throw new HttpResponseException(Request.CreateValidationErrorResponse(content));
-            }
-            else
-            {
-                content.AddSuccessNotification(Services.TextService.Localize("content/unPublish"), Services.TextService.Localize("speechBubbles/contentUnpublished"));
-                return content;
-            }
-        }
-
-        /// <summary>
-        /// Maps the dto property values to the persisted model
-        /// </summary>
-        /// <param name="contentItem"></param>
-        private void MapPropertyValues(ContentItemSave contentItem)
-        {
-            UpdateName(contentItem);
-
-            //TODO: We need to support 'send to publish'
-
-            contentItem.PersistedContent.ExpireDate = contentItem.ExpireDate;
-            contentItem.PersistedContent.ReleaseDate = contentItem.ReleaseDate;
-            //only set the template if it didn't change
-            var templateChanged = (contentItem.PersistedContent.Template == null && contentItem.TemplateAlias.IsNullOrWhiteSpace() == false)
-                                                        || (contentItem.PersistedContent.Template != null && contentItem.PersistedContent.Template.Alias != contentItem.TemplateAlias)
-                                                        || (contentItem.PersistedContent.Template != null && contentItem.TemplateAlias.IsNullOrWhiteSpace());
-            if (templateChanged)
-            {
-                var template = Services.FileService.GetTemplate(contentItem.TemplateAlias);
-                if (template == null && contentItem.TemplateAlias.IsNullOrWhiteSpace() == false)
-                {
-                    //ModelState.AddModelError("Template", "No template exists with the specified alias: " + contentItem.TemplateAlias);
-                    LogHelper.Warn<ContentController>("No template exists with the specified alias: " + contentItem.TemplateAlias);
-                }
-                else
-                {
-                    //NOTE: this could be null if there was a template and the posted template is null, this should remove the assigned template
-                    contentItem.PersistedContent.Template = template;
-                }
-            }
-
-            base.MapPropertyValues(contentItem);
-        }
-
-        /// <summary>
-        /// Ensures the item can be moved/copied to the new location
-        /// </summary>
-        /// <param name="model"></param>
-        /// <returns></returns>
-        private IContent ValidateMoveOrCopy(MoveOrCopy model)
-        {
-            if (model == null)
-            {
-                throw new HttpResponseException(HttpStatusCode.NotFound);
-            }
-
-            var contentService = Services.ContentService;
-            var toMove = contentService.GetById(model.Id);
-            if (toMove == null)
-            {
-                throw new HttpResponseException(HttpStatusCode.NotFound);
-            }
-            if (model.ParentId < 0)
-            {
-                //cannot move if the content item is not allowed at the root
-                if (toMove.ContentType.AllowedAsRoot == false)
-                {
-                    throw new HttpResponseException(
-                            Request.CreateNotificationValidationErrorResponse(
-                                    Services.TextService.Localize("moveOrCopy/notAllowedAtRoot")));
-                }
-            }
-            else
-            {
-                var parent = contentService.GetById(model.ParentId);
-                if (parent == null)
-                {
-                    throw new HttpResponseException(HttpStatusCode.NotFound);
-                }
-
-                //check if the item is allowed under this one
-                if (parent.ContentType.AllowedContentTypes.Select(x => x.Id).ToArray()
-                        .Any(x => x.Value == toMove.ContentType.Id) == false)
-                {
-                    throw new HttpResponseException(
-                            Request.CreateNotificationValidationErrorResponse(
-                                    Services.TextService.Localize("moveOrCopy/notAllowedByContentType")));
-                }
-
-                // Check on paths
-                if ((string.Format(",{0},", parent.Path)).IndexOf(string.Format(",{0},", toMove.Id), StringComparison.Ordinal) > -1)
-                {
-                    throw new HttpResponseException(
-                            Request.CreateNotificationValidationErrorResponse(
-                                    Services.TextService.Localize("moveOrCopy/notAllowedByPath")));
-                }
-            }
-
-            return toMove;
-        }
-
-        private void ShowMessageForPublishStatus(PublishStatus status, INotificationModel display, DateTime? expireDate)
-        {
-            switch (status.StatusType)
-            {
-                case PublishStatusType.Success:
-                case PublishStatusType.SuccessAlreadyPublished:                    
-                    display.AddSuccessNotification(
-                            Services.TextService.Localize("speechBubbles/editContentPublishedHeader"),
-                            expireDate.HasValue
-                                ? Services.TextService.Localize("speechBubbles/editContentPublishedWithExpireDateText", new [] { expireDate.Value.ToLongDateString(), expireDate.Value.ToShortTimeString() })
-                                : Services.TextService.Localize("speechBubbles/editContentPublishedText")
-                    );
-                    break;
-                case PublishStatusType.FailedPathNotPublished:
-                    display.AddWarningNotification(
-                            Services.TextService.Localize("publish"),
-                            Services.TextService.Localize("publish/contentPublishedFailedByParent",
-                                    new[] { string.Format("{0} ({1})", status.ContentItem.Name, status.ContentItem.Id) }).Trim());
-                    break;
-                case PublishStatusType.FailedCancelledByEvent:
-                    AddCancelMessage(display, "publish", "speechBubbles/contentPublishedFailedByEvent");
-                    break;
-                case PublishStatusType.FailedAwaitingRelease:
-                    display.AddWarningNotification(
-                            Services.TextService.Localize("publish"),
-                            Services.TextService.Localize("publish/contentPublishedFailedAwaitingRelease",
-                                    new[] { string.Format("{0} ({1})", status.ContentItem.Name, status.ContentItem.Id) }).Trim());
-                    break;
-                case PublishStatusType.FailedHasExpired:
-                    display.AddWarningNotification(
-                            Services.TextService.Localize("publish"),
-                            Services.TextService.Localize("publish/contentPublishedFailedExpired",
-                                    new[]
-                                    {
-                                                                string.Format("{0} ({1})", status.ContentItem.Name, status.ContentItem.Id),
-                                    }).Trim());
-                    break;
-                case PublishStatusType.FailedIsTrashed:
-                    //TODO: We should add proper error messaging for this!
-                    break;
-                case PublishStatusType.FailedContentInvalid:
-                    display.AddWarningNotification(
-                            Services.TextService.Localize("publish"),
-                            Services.TextService.Localize("publish/contentPublishedFailedInvalid",
-                                    new[]
-                                    {
-                                                                string.Format("{0} ({1})", status.ContentItem.Name, status.ContentItem.Id),
-                                                                string.Join(",", status.InvalidProperties.Select(x => x.Alias))
-                                    }).Trim());
-                    break;
-                default:
-                    throw new IndexOutOfRangeException();
-            }
-        }
-
-
-        /// <summary>
-        /// Performs a permissions check for the user to check if it has access to the node based on 
-        /// start node and/or permissions for the node
-        /// </summary>
-        /// <param name="storage">The storage to add the content item to so it can be reused</param>
-        /// <param name="user"></param>
-        /// <param name="userService"></param>
-        /// <param name="contentService"></param>
-        /// <param name="entityService"></param>
-        /// <param name="nodeId">The content to lookup, if the contentItem is not specified</param>
-        /// <param name="permissionsToCheck"></param>
-        /// <param name="contentItem">Specifies the already resolved content item to check against</param>
-        /// <param name="ignoreUserStartNodes">If set to true, user and group start node permissions will be ignored.</param>
-        /// <returns></returns>
-        internal static bool CheckPermissions(
-                IDictionary<string, object> storage,
-                IUser user,
-                IUserService userService,
-                IContentService contentService,
-                IEntityService entityService,
-                int nodeId,
-                char[] permissionsToCheck = null,
-                IContent contentItem = null,
-                bool ignoreUserStartNodes = false)
-        {
-            if (storage == null) throw new ArgumentNullException("storage");
-            if (user == null) throw new ArgumentNullException("user");
-            if (userService == null) throw new ArgumentNullException("userService");
-            if (contentService == null) throw new ArgumentNullException("contentService");
-            if (entityService == null) throw new ArgumentNullException("entityService");
-
-            if (contentItem == null && nodeId != Constants.System.Root && nodeId != Constants.System.RecycleBinContent)
-            {
-                contentItem = contentService.GetById(nodeId);
-                //put the content item into storage so it can be retreived 
-                // in the controller (saves a lookup)
-                storage[typeof(IContent).ToString()] = contentItem;
-            }
-
-            if (contentItem == null && nodeId != Constants.System.Root && nodeId != Constants.System.RecycleBinContent)
-            {
-                throw new HttpResponseException(HttpStatusCode.NotFound);
-            }
-
-            if(ignoreUserStartNodes)
-            {
-                return true;
-            }
-
-            var hasPathAccess = (nodeId == Constants.System.Root)
-                ? user.HasContentRootAccess(entityService)
-                : (nodeId == Constants.System.RecycleBinContent)
-                    ? user.HasContentBinAccess(entityService)
-                    : user.HasPathAccess(contentItem, entityService);
-
-            if (hasPathAccess == false)
-            {
-                return false;
-            }
-
-            if (permissionsToCheck == null || permissionsToCheck.Length == 0)
-            {
-                return true;
-            }
-
-            //get the implicit/inherited permissions for the user for this path,
-            //if there is no content item for this id, than just use the id as the path (i.e. -1 or -20)
-            var path = contentItem != null ? contentItem.Path : nodeId.ToString();
-            var permission = userService.GetPermissionsForPath(user, path);
-
-            var allowed = true;
-            foreach (var p in permissionsToCheck)
-            {
-                if (permission == null
-                    || permission.GetAllPermissions().Contains(p.ToString(CultureInfo.InvariantCulture)) == false)
-                {
-                    allowed = false;
-                }
-            }
-            return allowed;
-        }
-
-        [EnsureUserPermissionForContent("contentId", 'F')]
-        public IEnumerable<NotifySetting> GetNotificationOptions(int contentId)
-        {
-            var notifications = new List<NotifySetting>();
-            if (contentId <= 0) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
-
-            var content = Services.ContentService.GetById(contentId);
-            if (content == null) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
-
-            var actionList = ActionsResolver.Current.Actions;
-            foreach (var a in actionList)
-            {
-                if (a.ShowInNotifier)
-                {
-                    NotifySetting n = new NotifySetting
-                    {
-                        Name = ui.Text("actions", a.Alias),
-                        Checked = (UmbracoUser.GetNotifications(content.Path).IndexOf(a.Letter) > -1),
-                        NotifyCode = a.Letter.ToString()
-                    };
-                    notifications.Add(n);
-                }
-            }
-            return notifications;
-        }
-
-        public void PostNotificationOptions(int contentId, string notifyOptions = "")
-        {
-            if (contentId <= 0) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
-            var content = Services.ContentService.GetById(contentId);
-
-            if (content == null) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
-            var node = new CMSNode(contentId);
-
-            global::umbraco.cms.businesslogic.workflow.Notification.UpdateNotifications(UmbracoUser, node, notifyOptions ?? "");
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using System.Web.Http;
+using System.Web.Http.Controllers;
+using System.Web.Http.ModelBinding;
+using AutoMapper;
+using Umbraco.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.Membership;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
+using Umbraco.Core.Publishing;
+using Umbraco.Core.Services;
+using Umbraco.Web.Models.ContentEditing;
+using Umbraco.Web.Models.Mapping;
+using Umbraco.Web.Mvc;
+using Umbraco.Web.WebApi;
+using Umbraco.Web.WebApi.Binders;
+using Umbraco.Web.WebApi.Filters;
+using Umbraco.Core.Events;
+using Constants = Umbraco.Core.Constants;
+using umbraco.cms.businesslogic;
+using System.Collections;
+using umbraco;
+
+namespace Umbraco.Web.Editors
+{
+    /// <summary>
+    /// The API controller used for editing content
+    /// </summary>
+    /// <remarks>
+    /// This controller is decorated with the UmbracoApplicationAuthorizeAttribute which means that any user requesting
+    /// access to ALL of the methods on this controller will need access to the content application.
+    /// </remarks>
+    [PluginController("UmbracoApi")]
+    [UmbracoApplicationAuthorize(Constants.Applications.Content)]
+    [ContentControllerConfiguration]
+    public class ContentController : ContentControllerBase
+    {
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public ContentController()
+                : this(UmbracoContext.Current)
+        {
+        }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="umbracoContext"></param>
+        public ContentController(UmbracoContext umbracoContext)
+                : base(umbracoContext)
+        {
+        }
+
+        /// <summary>
+        /// Configures this controller with a custom action selector
+        /// </summary>
+        private class ContentControllerConfigurationAttribute : Attribute, IControllerConfiguration
+        {
+            public void Initialize(HttpControllerSettings controllerSettings, HttpControllerDescriptor controllerDescriptor)
+            {
+                controllerSettings.Services.Replace(typeof(IHttpActionSelector), new ParameterSwapControllerActionSelector(
+                    new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetNiceUrl", "id", typeof(int), typeof(Guid), typeof(Udi)),
+                    new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetById", "id", typeof(int), typeof(Guid), typeof(Udi))
+                ));
+            }
+        }
+
+        /// <summary>
+        /// Return content for the specified ids
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        [FilterAllowedOutgoingContent(typeof(IEnumerable<ContentItemDisplay>))]
+        public IEnumerable<ContentItemDisplay> GetByIds([FromUri]int[] ids)
+        {
+            var foundContent = Services.ContentService.GetByIds(ids);
+            return foundContent.Select(content => AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(content, UmbracoContext));
+        }
+
+        /// <summary>
+        /// Updates the permissions for a content item for a particular user group
+        /// </summary>
+        /// <param name="saveModel"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// Permission check is done for letter 'R' which is for <see cref="ActionRights"/> which the user must have access to to update
+        /// </remarks>
+        [EnsureUserPermissionForContent("saveModel.ContentId", 'R')]
+        public IEnumerable<AssignedUserGroupPermissions> PostSaveUserGroupPermissions(UserGroupPermissionsSave saveModel)
+        {
+            if (saveModel.ContentId <= 0) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
+
+            //TODO: Should non-admins be alowed to set granular permissions?
+
+            var content = Services.ContentService.GetById(saveModel.ContentId);
+            if (content == null) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
+
+            //current permissions explicitly assigned to this content item
+            var contentPermissions = Services.ContentService.GetPermissionsForEntity(content)
+                .ToDictionary(x => x.UserGroupId, x => x);
+
+            var allUserGroups = Services.UserService.GetAllUserGroups().ToArray();
+
+            //loop through each user group
+            foreach (var userGroup in allUserGroups)
+            {
+                //check if there's a permission set posted up for this user group
+                IEnumerable<string> groupPermissions;
+                if (saveModel.AssignedPermissions.TryGetValue(userGroup.Id, out groupPermissions))
+                {
+                    //create a string collection of the assigned letters
+                    var groupPermissionCodes = groupPermissions.ToArray();
+
+                    //check if there are no permissions assigned for this group save model, if that is the case we want to reset the permissions
+                    //for this group/node which will go back to the defaults
+                    if (groupPermissionCodes.Length == 0)
+                    {
+                        Services.UserService.RemoveUserGroupPermissions(userGroup.Id, content.Id);
+                    }
+                    //check if they are the defaults, if so we should just remove them if they exist since it's more overhead having them stored
+                    else if (userGroup.Permissions.UnsortedSequenceEqual(groupPermissionCodes))
+                    {
+                        //only remove them if they are actually currently assigned
+                        if (contentPermissions.ContainsKey(userGroup.Id))
+                        {
+                            //remove these permissions from this node for this group since the ones being assigned are the same as the defaults
+                            Services.UserService.RemoveUserGroupPermissions(userGroup.Id, content.Id);
+                        }
+                    }
+                    //if they are different we need to update, otherwise there's nothing to update
+                    else if (contentPermissions.ContainsKey(userGroup.Id) == false || contentPermissions[userGroup.Id].AssignedPermissions.UnsortedSequenceEqual(groupPermissionCodes) == false)
+                    {
+
+                        Services.UserService.ReplaceUserGroupPermissions(userGroup.Id, groupPermissionCodes.Select(x => x[0]), content.Id);
+                    }
+                }
+            }
+
+            return GetDetailedPermissions(content, allUserGroups);
+        }
+
+        /// <summary>
+        /// Returns the user group permissions for user groups assigned to this node
+        /// </summary>
+        /// <param name="contentId"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// Permission check is done for letter 'R' which is for <see cref="ActionRights"/> which the user must have access to to view
+        /// </remarks>
+        [EnsureUserPermissionForContent("contentId", 'R')]
+        public IEnumerable<AssignedUserGroupPermissions> GetDetailedPermissions(int contentId)
+        {
+            if (contentId <= 0) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
+            var content = Services.ContentService.GetById(contentId);
+            if (content == null) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
+
+            //TODO: Should non-admins be able to see detailed permissions?
+
+            var allUserGroups = Services.UserService.GetAllUserGroups();
+
+            return GetDetailedPermissions(content, allUserGroups);
+        }
+
+        private IEnumerable<AssignedUserGroupPermissions> GetDetailedPermissions(IContent content, IEnumerable<IUserGroup> allUserGroups)
+        {
+            //get all user groups and map their default permissions to the AssignedUserGroupPermissions model.
+            //we do this because not all groups will have true assigned permissions for this node so if they don't have assigned permissions, we need to show the defaults.
+
+            var defaultPermissionsByGroup = Mapper.Map<IEnumerable<AssignedUserGroupPermissions>>(allUserGroups).ToArray();
+
+            var defaultPermissionsAsDictionary = defaultPermissionsByGroup
+                .ToDictionary(x => Convert.ToInt32(x.Id), x => x);
+
+            //get the actual assigned permissions
+            var assignedPermissionsByGroup = Services.ContentService.GetPermissionsForEntity(content).ToArray();
+
+            //iterate over assigned and update the defaults with the real values
+            foreach (var assignedGroupPermission in assignedPermissionsByGroup)
+            {
+                var defaultUserGroupPermissions = defaultPermissionsAsDictionary[assignedGroupPermission.UserGroupId];
+
+                //clone the default permissions model to the assigned ones
+                defaultUserGroupPermissions.AssignedPermissions = AssignedUserGroupPermissions.ClonePermissions(defaultUserGroupPermissions.DefaultPermissions);
+
+                //since there is custom permissions assigned to this node for this group, we need to clear all of the default permissions
+                //and we'll re-check it if it's one of the explicitly assigned ones
+                foreach (var permission in defaultUserGroupPermissions.AssignedPermissions.SelectMany(x => x.Value))
+                {
+                    permission.Checked = false;
+                    permission.Checked = assignedGroupPermission.AssignedPermissions.Contains(permission.PermissionCode, StringComparer.InvariantCulture);
+                }
+
+            }
+
+            return defaultPermissionsByGroup;
+        }
+
+        /// <summary>
+        /// Returns an item to be used to display the recycle bin for content
+        /// </summary>
+        /// <returns></returns>
+        public ContentItemDisplay GetRecycleBin()
+        {
+            var display = new ContentItemDisplay
+            {
+                Id = Constants.System.RecycleBinContent,
+                Alias = "recycleBin",
+                ParentId = -1,
+                Name = Services.TextService.Localize("general/recycleBin"),
+                ContentTypeAlias = "recycleBin",
+                CreateDate = DateTime.Now,
+                IsContainer = true,
+                Path = "-1," + Constants.System.RecycleBinContent
+            };
+
+            TabsAndPropertiesResolver<IContent>.AddListView(display, "content", Services.DataTypeService, Services.TextService);
+
+            return display;
+        }
+
+        public ContentItemDisplay GetBlueprintById(int id)
+        {
+            var foundContent = Services.ContentService.GetBlueprintById(id);
+            if (foundContent == null)
+            {
+                HandleContentNotFound(id);
+            }
+
+            var content = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(foundContent, UmbracoContext);
+
+            SetupBlueprint(content, foundContent);
+
+            return content;
+        }
+
+        private static void SetupBlueprint(ContentItemDisplay content, IContent persistedContent)
+        {
+            content.AllowPreview = false;
+
+            //set a custom path since the tree that renders this has the content type id as the parent
+            content.Path = string.Format("-1,{0},{1}", persistedContent.ContentTypeId, content.Id);
+
+            content.AllowedActions = new[] { "A" };
+            content.IsBlueprint = true;
+
+            var excludeProps = new[] { "_umb_urls", "_umb_releasedate", "_umb_expiredate", "_umb_template" };
+            var propsTab = content.Tabs.Last();
+            propsTab.Properties = propsTab.Properties
+                .Where(p => excludeProps.Contains(p.Alias) == false);
+        }
+
+        /// <summary>
+        /// Gets the content json for the content id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="dataTypeId">If set used to lookup whether the user and group start node permissions should be ignored.</param>
+        /// <returns></returns>
+        [OutgoingEditorModelEvent]
+        [EnsureUserPermissionForContent("id")]
+        public ContentItemDisplay GetById(int id, [FromUri]Guid? dataTypeId = null)
+        {
+            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
+            if (foundContent == null)
+            {
+                HandleContentNotFound(id);
+            }
+
+            var content = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(foundContent, UmbracoContext);
+            return content;
+        }
+
+        /// <summary>
+        /// Gets the content json for the content id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [OutgoingEditorModelEvent]
+        [EnsureUserPermissionForContent("id")]
+        public ContentItemDisplay GetById(Guid id)
+        {
+            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
+            if (foundContent == null)
+            {
+                HandleContentNotFound(id);
+            }
+
+            var content = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(foundContent, UmbracoContext);
+            return content;
+        }
+
+        /// <summary>
+        /// Gets the content json for the content id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [OutgoingEditorModelEvent]
+        [EnsureUserPermissionForContent("id")]
+        public ContentItemDisplay GetById(Udi id)
+        {
+            var guidUdi = id as GuidUdi;
+            if (guidUdi != null)
+            {
+                return GetById(guidUdi.Guid);
+            }
+
+            throw new HttpResponseException(HttpStatusCode.NotFound);
+        }
+
+        [EnsureUserPermissionForContent("id")]
+        public ContentItemDisplay GetWithTreeDefinition(int id)
+        {
+            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
+            if (foundContent == null)
+            {
+                HandleContentNotFound(id);
+            }
+
+            var content = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(foundContent, UmbracoContext);
+            return content;
+        }
+
+        /// <summary>
+        /// Gets an empty content item for the
+        /// </summary>
+        /// <param name="contentTypeAlias"></param>
+        /// <param name="parentId"></param>
+        /// <returns>
+        /// If this is a container type, we'll remove the umbContainerView tab for a new item since
+        /// it cannot actually list children if it doesn't exist yet.
+        /// </returns>
+        [OutgoingEditorModelEvent]
+        public ContentItemDisplay GetEmpty(string contentTypeAlias, int parentId)
+        {
+            var contentType = Services.ContentTypeService.GetContentType(contentTypeAlias);
+            if (contentType == null)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+
+            var emptyContent = Services.ContentService.CreateContent("", parentId, contentType.Alias, UmbracoUser.Id);
+            var mapped = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(emptyContent, UmbracoContext);
+            // translate the content type name if applicable
+            mapped.ContentTypeName = Services.TextService.UmbracoDictionaryTranslate(mapped.ContentTypeName);
+            // if your user type doesn't have access to the Settings section it would not get this property mapped
+            if(mapped.DocumentType != null)
+                mapped.DocumentType.Name = Services.TextService.UmbracoDictionaryTranslate(mapped.DocumentType.Name);
+
+            //remove this tab if it exists: umbContainerView
+            var containerTab = mapped.Tabs.FirstOrDefault(x => x.Alias == Constants.Conventions.PropertyGroups.ListViewGroupName);
+            mapped.Tabs = mapped.Tabs.Except(new[] { containerTab });
+            return mapped;
+        }
+
+        [OutgoingEditorModelEvent]
+        public ContentItemDisplay GetEmpty(int blueprintId, int parentId)
+        {
+            var blueprint = Services.ContentService.GetBlueprintById(blueprintId);
+            if (blueprint == null)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+
+            blueprint.Id = 0;
+            blueprint.Name = string.Empty;
+            blueprint.ParentId = parentId;
+
+            var mapped = Mapper.Map<ContentItemDisplay>(blueprint);
+
+            //remove this tab if it exists: umbContainerView
+            var containerTab = mapped.Tabs.FirstOrDefault(x => x.Alias == Constants.Conventions.PropertyGroups.ListViewGroupName);
+            mapped.Tabs = mapped.Tabs.Except(new[] { containerTab });
+            return mapped;
+        }
+
+        /// <summary>
+        /// Gets the Url for a given node ID
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public HttpResponseMessage GetNiceUrl(int id)
+        {
+            var url = Umbraco.NiceUrl(id);
+            var response = Request.CreateResponse(HttpStatusCode.OK);
+            response.Content = new StringContent(url, Encoding.UTF8, "application/json");
+            return response;
+        }
+
+        /// <summary>
+        /// Gets the Url for a given node ID
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public HttpResponseMessage GetNiceUrl(Guid id)
+        {
+            var url = Umbraco.UrlProvider.GetUrl(id);
+            var response = Request.CreateResponse(HttpStatusCode.OK);
+            response.Content = new StringContent(url, Encoding.UTF8, "application/json");
+            return response;
+        }
+
+        /// <summary>
+        /// Gets the Url for a given node ID
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public HttpResponseMessage GetNiceUrl(Udi id)
+        {
+            var guidUdi = id as GuidUdi;
+            if (guidUdi != null)
+            {
+                return GetNiceUrl(guidUdi.Guid);
+            }
+            throw new HttpResponseException(HttpStatusCode.NotFound);
+        }
+
+        /// <summary>
+        /// Gets the children for the content id passed in
+        /// </summary>
+        /// <returns></returns>
+        [FilterAllowedOutgoingContent(typeof(IEnumerable<ContentItemBasic<ContentPropertyBasic, IContent>>), "Items")]
+        public PagedResult<ContentItemBasic<ContentPropertyBasic, IContent>> GetChildren(
+                int id,
+                int pageNumber = 0,  //TODO: This should be '1' as it's not the index
+                int pageSize = 0,
+                string orderBy = "SortOrder",
+                Direction orderDirection = Direction.Ascending,
+                bool orderBySystemField = true,
+                string filter = "")
+        {
+            return GetChildren(id, null, pageNumber, pageSize, orderBy, orderDirection, orderBySystemField, filter);
+        }
+
+        /// <summary>
+        /// Gets the children for the content id passed in
+        /// </summary>
+        /// <returns></returns>
+        [FilterAllowedOutgoingContent(typeof(IEnumerable<ContentItemBasic<ContentPropertyBasic, IContent>>), "Items")]
+        public PagedResult<ContentItemBasic<ContentPropertyBasic, IContent>> GetChildren(
+                int id,
+                string includeProperties,
+                int pageNumber = 0,  //TODO: This should be '1' as it's not the index
+                int pageSize = 0,
+                string orderBy = "SortOrder",
+                Direction orderDirection = Direction.Ascending,
+                bool orderBySystemField = true,
+                string filter = "")
+        {
+            long totalChildren;
+            IContent[] children;
+            if (pageNumber > 0 && pageSize > 0)
+            {
+                children = Services.ContentService
+                 .GetPagedChildren(id, (pageNumber - 1), pageSize, out totalChildren
+                 , orderBy, orderDirection, orderBySystemField, filter).ToArray();
+            }
+            else
+            {
+                children = Services.ContentService.GetChildren(id).ToArray();
+                totalChildren = children.Length;
+            }
+
+            if (totalChildren == 0)
+            {
+                return new PagedResult<ContentItemBasic<ContentPropertyBasic, IContent>>(0, 0, 0);
+            }
+
+            var pagedResult = new PagedResult<ContentItemBasic<ContentPropertyBasic, IContent>>(totalChildren, pageNumber, pageSize);
+            pagedResult.Items = children.Select(content =>
+                Mapper.Map<IContent, ContentItemBasic<ContentPropertyBasic, IContent>>(content,
+                    opts =>
+                    {
+                        // if there's a list of property aliases to map - we will make sure to store this in the mapping context.
+                        if (String.IsNullOrWhiteSpace(includeProperties) == false)
+                        {
+                            opts.Items["IncludeProperties"] = includeProperties.Split(new[] { ", ", "," }, StringSplitOptions.RemoveEmptyEntries);
+                        }
+                    }));
+
+            return pagedResult;
+        }
+
+        [Obsolete("Dont use this, it is incorrectly named, use HasPermission instead")]
+        public bool GetHasPermission(string permissionToCheck, int nodeId)
+        {
+            return HasPermission(permissionToCheck, nodeId);
+        }
+
+        /// <summary>
+        /// Returns permissions for all nodes passed in for the current user
+        /// TODO: This should be moved to the CurrentUserController?
+        /// </summary>
+        /// <param name="nodeIds"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public Dictionary<int, string[]> GetPermissions(int[] nodeIds)
+        {
+            var permissions = Services.UserService
+                    .GetPermissions(Security.CurrentUser, nodeIds);
+
+            var permissionsDictionary = new Dictionary<int, string[]>();
+            foreach (var nodeId in nodeIds)
+            {
+                var aggregatePerms = permissions.GetAllPermissions(nodeId).ToArray();
+                permissionsDictionary.Add(nodeId, aggregatePerms);
+            }
+
+            return permissionsDictionary;
+        }
+
+        /// <summary>
+        /// Checks a nodes permission for the current user
+        /// TODO: This should be moved to the CurrentUserController?
+        /// </summary>
+        /// <param name="permissionToCheck"></param>
+        /// <param name="nodeId"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public bool HasPermission(string permissionToCheck, int nodeId)
+        {
+            var p = Services.UserService.GetPermissions(Security.CurrentUser, nodeId).GetAllPermissions();
+            if (p.Contains(permissionToCheck.ToString(CultureInfo.InvariantCulture)))
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Creates a blueprint from a content item
+        /// </summary>
+        /// <param name="contentId">The content id to copy</param>
+        /// <param name="name">The name of the blueprint</param>
+        /// <returns></returns>
+        [HttpPost]
+        public SimpleNotificationModel CreateBlueprintFromContent([FromUri]int contentId, [FromUri]string name)
+        {
+            if (string.IsNullOrWhiteSpace(name)) throw new ArgumentException("Value cannot be null or whitespace.", "name");
+
+            var content = Services.ContentService.GetById(contentId);
+            if (content == null)
+                throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
+
+            EnsureUniqueName(name, content, "name");
+
+            var blueprint = Services.ContentService.CreateContentFromBlueprint(content, name, Security.CurrentUser.Id);
+
+            Services.ContentService.SaveBlueprint(blueprint, Security.CurrentUser.Id);
+
+            var notificationModel = new SimpleNotificationModel();
+            notificationModel.AddSuccessNotification(
+                Services.TextService.Localize("blueprints/createdBlueprintHeading"),
+                Services.TextService.Localize("blueprints/createdBlueprintMessage", new[] { content.Name })
+            );
+
+            return notificationModel;
+        }
+
+        private void EnsureUniqueName(string name, IContent content, string modelName)
+        {
+            var existing = Services.ContentService.GetBlueprintsForContentTypes(content.ContentTypeId);
+            if (existing.Any(x => x.Name == name && x.Id != content.Id))
+            {
+                ModelState.AddModelError(modelName, Services.TextService.Localize("blueprints/duplicateBlueprintMessage"));
+                throw new HttpResponseException(Request.CreateValidationErrorResponse(ModelState));
+            }
+        }
+
+        /// <summary>
+        /// Saves content
+        /// </summary>
+        /// <returns></returns>
+        [FileUploadCleanupFilter]
+        [ContentPostValidate]
+        public ContentItemDisplay PostSaveBlueprint(
+            [ModelBinder(typeof(BlueprintItemBinder))] ContentItemSave contentItem)
+        {
+            var contentItemDisplay = PostSaveInternal(contentItem,
+                content =>
+                {
+                    EnsureUniqueName(content.Name, content, "Name");
+
+                    Services.ContentService.SaveBlueprint(contentItem.PersistedContent, Security.CurrentUser.Id);
+                    //we need to reuse the underlying logic so return the result that it wants
+                    return Attempt<OperationStatus>.Succeed(new OperationStatus(OperationStatusType.Success, new EventMessages()));
+                });
+            SetupBlueprint(contentItemDisplay, contentItemDisplay.PersistedContent);
+
+            return contentItemDisplay;
+        }
+
+        /// <summary>
+        /// Saves content
+        /// </summary>
+        /// <returns></returns>
+        [FileUploadCleanupFilter]
+        [ContentPostValidate]
+        [OutgoingEditorModelEvent]
+        public ContentItemDisplay PostSave(
+                [ModelBinder(typeof(ContentItemBinder))]
+                                ContentItemSave contentItem)
+        {
+            return PostSaveInternal(contentItem,
+                content => Services.ContentService.WithResult().Save(contentItem.PersistedContent, Security.CurrentUser.Id));
+        }
+
+        private ContentItemDisplay PostSaveInternal(ContentItemSave contentItem, Func<IContent, Attempt<OperationStatus>> saveMethod)
+        {
+            //Recent versions of IE/Edge may send in the full clientside file path instead of just the file name.
+            //To ensure similar behavior across all browsers no matter what they do - we strip the FileName property of all
+            //uploaded files to being *only* the actual file name (as it should be).
+            if (contentItem.UploadedFiles != null && contentItem.UploadedFiles.Any())
+            {
+                foreach (var file in contentItem.UploadedFiles)
+                {
+                    file.FileName = Path.GetFileName(file.FileName);
+                }
+            }
+
+            //If we've reached here it means:
+            // * Our model has been bound
+            // * and validated
+            // * any file attachments have been saved to their temporary location for us to use
+            // * we have a reference to the DTO object and the persisted object
+            // * Permissions are valid
+            MapPropertyValues(contentItem);
+
+            //We need to manually check the validation results here because:
+            // * We still need to save the entity even if there are validation value errors
+            // * Depending on if the entity is new, and if there are non property validation errors (i.e. the name is null)
+            //      then we cannot continue saving, we can only display errors
+            // * If there are validation errors and they were attempting to publish, we can only save, NOT publish and display
+            //      a message indicating this
+            if (ModelState.IsValid == false)
+            {
+                if (ValidationHelper.ModelHasRequiredForPersistenceErrors(contentItem) && IsCreatingAction(contentItem.Action))
+                {
+                    //ok, so the absolute mandatory data is invalid and it's new, we cannot actually continue!
+                    // add the modelstate to the outgoing object and throw a validation message
+                    var forDisplay = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(contentItem.PersistedContent, UmbracoContext);
+                    forDisplay.Errors = ModelState.ToErrorDictionary();
+                    throw new HttpResponseException(Request.CreateValidationErrorResponse(forDisplay));
+
+                }
+
+                //if the model state is not valid we cannot publish so change it to save
+                switch (contentItem.Action)
+                {
+                    case ContentSaveAction.Publish:
+                        contentItem.Action = ContentSaveAction.Save;
+                        break;
+                    case ContentSaveAction.PublishNew:
+                        contentItem.Action = ContentSaveAction.SaveNew;
+                        break;
+                }
+            }
+
+            //initialize this to successful
+            var publishStatus = Attempt<PublishStatus>.Succeed();
+            var wasCancelled = false;
+
+            if (contentItem.Action == ContentSaveAction.Save || contentItem.Action == ContentSaveAction.SaveNew)
+            {
+                //save the item
+                var saveResult = saveMethod(contentItem.PersistedContent);
+
+                wasCancelled = saveResult.Success == false && saveResult.Result.StatusType == OperationStatusType.FailedCancelledByEvent;
+            }
+            else if (contentItem.Action == ContentSaveAction.SendPublish || contentItem.Action == ContentSaveAction.SendPublishNew)
+            {
+                var sendResult = Services.ContentService.SendToPublication(contentItem.PersistedContent, Security.CurrentUser.Id);
+                wasCancelled = sendResult == false;
+            }
+            else
+            {
+                //publish the item and check if it worked, if not we will show a diff msg below
+                publishStatus = Services.ContentService.SaveAndPublishWithStatus(contentItem.PersistedContent, Security.CurrentUser.Id);
+                wasCancelled = publishStatus.Result.StatusType == PublishStatusType.FailedCancelledByEvent;
+            }
+
+            //return the updated model
+            var display = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(contentItem.PersistedContent, UmbracoContext);
+
+            //lasty, if it is not valid, add the modelstate to the outgoing object and throw a 403
+            HandleInvalidModelState(display);
+
+            //put the correct msgs in
+            switch (contentItem.Action)
+            {
+                case ContentSaveAction.Save:
+                case ContentSaveAction.SaveNew:
+                    if (wasCancelled == false)
+                    {
+                        display.AddSuccessNotification(
+                            Services.TextService.Localize("speechBubbles/editContentSavedHeader"),
+                            contentItem.ReleaseDate.HasValue
+                                ? Services.TextService.Localize("speechBubbles/editContentSavedWithReleaseDateText", new [] { contentItem.ReleaseDate.Value.ToLongDateString(), contentItem.ReleaseDate.Value.ToShortTimeString() })
+                                : Services.TextService.Localize("speechBubbles/editContentSavedText")
+                        );
+                    }
+                    else
+                    {
+                        AddCancelMessage(display);
+                    }
+                    break;
+                case ContentSaveAction.SendPublish:
+                case ContentSaveAction.SendPublishNew:
+                    if (wasCancelled == false)
+                    {
+                        display.AddSuccessNotification(
+                            Services.TextService.Localize("speechBubbles/editContentSendToPublish"),
+                            Services.TextService.Localize("speechBubbles/editContentSendToPublishText"));
+                    }
+                    else
+                    {
+                        AddCancelMessage(display);
+                    }
+                    break;
+                case ContentSaveAction.Publish:
+                case ContentSaveAction.PublishNew:
+                    ShowMessageForPublishStatus(publishStatus.Result, display, contentItem.ExpireDate);
+                    break;
+            }
+
+            //If the item is new and the operation was cancelled, we need to return a different
+            // status code so the UI can handle it since it won't be able to redirect since there
+            // is no Id to redirect to!
+            if (wasCancelled && IsCreatingAction(contentItem.Action))
+            {
+                throw new HttpResponseException(Request.CreateValidationErrorResponse(display));
+            }
+
+            display.PersistedContent = contentItem.PersistedContent;
+
+            return display;
+        }
+
+        /// <summary>
+        /// Publishes a document with a given ID
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// The CanAccessContentAuthorize attribute will deny access to this method if the current user
+        /// does not have Publish access to this node.
+        /// </remarks>
+        ///
+        [EnsureUserPermissionForContent("id", 'U')]
+        public HttpResponseMessage PostPublishById(int id)
+        {
+            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
+
+            if (foundContent == null)
+            {
+                return HandleContentNotFound(id, false);
+            }
+
+            var publishResult = Services.ContentService.PublishWithStatus(foundContent, Security.CurrentUser.Id);
+            if (publishResult.Success == false)
+            {
+                var notificationModel = new SimpleNotificationModel();
+                ShowMessageForPublishStatus(publishResult.Result, notificationModel, foundContent.ExpireDate);
+                return Request.CreateValidationErrorResponse(notificationModel);
+            }
+
+            //return ok
+            return Request.CreateResponse(HttpStatusCode.OK);
+
+        }
+
+        [HttpDelete]
+        [HttpPost]
+        public HttpResponseMessage DeleteBlueprint(int id)
+        {
+            var found = Services.ContentService.GetBlueprintById(id);
+
+            if (found == null)
+            {
+                return HandleContentNotFound(id, false);
+            }
+
+            Services.ContentService.DeleteBlueprint(found);
+
+            return Request.CreateResponse(HttpStatusCode.OK);
+        }
+
+        /// <summary>
+        /// Moves an item to the recycle bin, if it is already there then it will permanently delete it
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// The CanAccessContentAuthorize attribute will deny access to this method if the current user
+        /// does not have Delete access to this node.
+        /// </remarks>
+        [EnsureUserPermissionForContent("id", 'D')]
+        [HttpDelete]
+        [HttpPost]
+        public HttpResponseMessage DeleteById(int id)
+        {
+            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
+
+            if (foundContent == null)
+            {
+                return HandleContentNotFound(id, false);
+            }
+
+            //if the current item is in the recycle bin
+            if (foundContent.IsInRecycleBin() == false)
+            {
+                var moveResult = Services.ContentService.WithResult().MoveToRecycleBin(foundContent, Security.CurrentUser.Id);
+                if (moveResult == false)
+                {
+                    //returning an object of INotificationModel will ensure that any pending
+                    // notification messages are added to the response.
+                    return Request.CreateValidationErrorResponse(new SimpleNotificationModel());
+                }
+            }
+            else
+            {
+                var deleteResult = Services.ContentService.WithResult().Delete(foundContent, Security.CurrentUser.Id);
+                if (deleteResult == false)
+                {
+                    //returning an object of INotificationModel will ensure that any pending
+                    // notification messages are added to the response.
+                    return Request.CreateValidationErrorResponse(new SimpleNotificationModel());
+                }
+            }
+
+            return Request.CreateResponse(HttpStatusCode.OK);
+        }
+
+        /// <summary>
+        /// Empties the recycle bin
+        /// </summary>
+        /// <returns></returns>
+        /// <remarks>
+        /// attributed with EnsureUserPermissionForContent to verify the user has access to the recycle bin
+        /// </remarks>
+        [HttpDelete]
+        [HttpPost]
+        [EnsureUserPermissionForContent(Constants.System.RecycleBinContent, 'D')]
+        public HttpResponseMessage EmptyRecycleBin()
+        {
+            Services.ContentService.EmptyRecycleBin(Security.CurrentUser.Id);
+
+            return Request.CreateNotificationSuccessResponse(Services.TextService.Localize("defaultdialogs/recycleBinIsEmpty"));
+        }
+
+        /// <summary>
+        /// Change the sort order for content
+        /// </summary>
+        /// <param name="sorted"></param>
+        /// <returns></returns>
+        [EnsureUserPermissionForContent("sorted.ParentId", 'S')]
+        public HttpResponseMessage PostSort(ContentSortOrder sorted)
+        {
+            if (sorted == null)
+            {
+                return Request.CreateResponse(HttpStatusCode.NotFound);
+            }
+
+            //if there's nothing to sort just return ok
+            if (sorted.IdSortOrder.Length == 0)
+            {
+                return Request.CreateResponse(HttpStatusCode.OK);
+            }
+
+            try
+            {
+                var contentService = Services.ContentService;
+
+                // Save content with new sort order and update content xml in db accordingly
+                if (contentService.Sort(sorted.IdSortOrder, Security.CurrentUser.Id) == false)
+                {
+                    LogHelper.Warn<ContentController>("Content sorting failed, this was probably caused by an event being cancelled");
+                    return Request.CreateValidationErrorResponse("Content sorting failed, this was probably caused by an event being cancelled");
+                }
+                return Request.CreateResponse(HttpStatusCode.OK);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Error<ContentController>("Could not update content sort order", ex);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// Change the sort order for media
+        /// </summary>
+        /// <param name="move"></param>
+        /// <returns></returns>
+        [EnsureUserPermissionForContent("move.ParentId", 'M')]
+        public HttpResponseMessage PostMove(MoveOrCopy move)
+        {
+            var toMove = ValidateMoveOrCopy(move);
+
+            Services.ContentService.Move(toMove, move.ParentId, Security.CurrentUser.Id);
+
+            var response = Request.CreateResponse(HttpStatusCode.OK);
+            response.Content = new StringContent(toMove.Path, Encoding.UTF8, "application/json");
+            return response;
+        }
+
+        /// <summary>
+        /// Copies a content item and places the copy as a child of a given parent Id
+        /// </summary>
+        /// <param name="copy"></param>
+        /// <returns></returns>
+        [EnsureUserPermissionForContent("copy.ParentId", 'C')]
+        public HttpResponseMessage PostCopy(MoveOrCopy copy)
+        {
+            var toCopy = ValidateMoveOrCopy(copy);
+
+            var c = Services.ContentService.Copy(toCopy, copy.ParentId, copy.RelateToOriginal, copy.Recursive, Security.CurrentUser.Id);
+
+            var response = Request.CreateResponse(HttpStatusCode.OK);
+            response.Content = new StringContent(c.Path, Encoding.UTF8, "application/json");
+            return response;
+        }
+
+        /// <summary>
+        /// Unpublishes a node with a given Id and returns the unpublished entity
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [EnsureUserPermissionForContent("id", 'U')]
+        [OutgoingEditorModelEvent]
+        public ContentItemDisplay PostUnPublish(int id)
+        {
+            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
+
+            if (foundContent == null)
+                HandleContentNotFound(id);
+
+            var unpublishResult = Services.ContentService.WithResult().UnPublish(foundContent, Security.CurrentUser.Id);
+
+            var content = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(foundContent, UmbracoContext);
+
+            if (unpublishResult == false)
+            {
+                AddCancelMessage(content);
+                throw new HttpResponseException(Request.CreateValidationErrorResponse(content));
+            }
+            else
+            {
+                content.AddSuccessNotification(Services.TextService.Localize("content/unPublish"), Services.TextService.Localize("speechBubbles/contentUnpublished"));
+                return content;
+            }
+        }
+
+        /// <summary>
+        /// Maps the dto property values to the persisted model
+        /// </summary>
+        /// <param name="contentItem"></param>
+        private void MapPropertyValues(ContentItemSave contentItem)
+        {
+            UpdateName(contentItem);
+
+            //TODO: We need to support 'send to publish'
+
+            contentItem.PersistedContent.ExpireDate = contentItem.ExpireDate;
+            contentItem.PersistedContent.ReleaseDate = contentItem.ReleaseDate;
+            //only set the template if it didn't change
+            var templateChanged = (contentItem.PersistedContent.Template == null && contentItem.TemplateAlias.IsNullOrWhiteSpace() == false)
+                                                        || (contentItem.PersistedContent.Template != null && contentItem.PersistedContent.Template.Alias != contentItem.TemplateAlias)
+                                                        || (contentItem.PersistedContent.Template != null && contentItem.TemplateAlias.IsNullOrWhiteSpace());
+            if (templateChanged)
+            {
+                var template = Services.FileService.GetTemplate(contentItem.TemplateAlias);
+                if (template == null && contentItem.TemplateAlias.IsNullOrWhiteSpace() == false)
+                {
+                    //ModelState.AddModelError("Template", "No template exists with the specified alias: " + contentItem.TemplateAlias);
+                    LogHelper.Warn<ContentController>("No template exists with the specified alias: " + contentItem.TemplateAlias);
+                }
+                else
+                {
+                    //NOTE: this could be null if there was a template and the posted template is null, this should remove the assigned template
+                    contentItem.PersistedContent.Template = template;
+                }
+            }
+
+            base.MapPropertyValues(contentItem);
+        }
+
+        /// <summary>
+        /// Ensures the item can be moved/copied to the new location
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        private IContent ValidateMoveOrCopy(MoveOrCopy model)
+        {
+            if (model == null)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+
+            var contentService = Services.ContentService;
+            var toMove = contentService.GetById(model.Id);
+            if (toMove == null)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+            if (model.ParentId < 0)
+            {
+                //cannot move if the content item is not allowed at the root
+                if (toMove.ContentType.AllowedAsRoot == false)
+                {
+                    throw new HttpResponseException(
+                            Request.CreateNotificationValidationErrorResponse(
+                                    Services.TextService.Localize("moveOrCopy/notAllowedAtRoot")));
+                }
+            }
+            else
+            {
+                var parent = contentService.GetById(model.ParentId);
+                if (parent == null)
+                {
+                    throw new HttpResponseException(HttpStatusCode.NotFound);
+                }
+
+                //check if the item is allowed under this one
+                if (parent.ContentType.AllowedContentTypes.Select(x => x.Id).ToArray()
+                        .Any(x => x.Value == toMove.ContentType.Id) == false)
+                {
+                    throw new HttpResponseException(
+                            Request.CreateNotificationValidationErrorResponse(
+                                    Services.TextService.Localize("moveOrCopy/notAllowedByContentType")));
+                }
+
+                // Check on paths
+                if ((string.Format(",{0},", parent.Path)).IndexOf(string.Format(",{0},", toMove.Id), StringComparison.Ordinal) > -1)
+                {
+                    throw new HttpResponseException(
+                            Request.CreateNotificationValidationErrorResponse(
+                                    Services.TextService.Localize("moveOrCopy/notAllowedByPath")));
+                }
+            }
+
+            return toMove;
+        }
+
+        private void ShowMessageForPublishStatus(PublishStatus status, INotificationModel display, DateTime? expireDate)
+        {
+            switch (status.StatusType)
+            {
+                case PublishStatusType.Success:
+                case PublishStatusType.SuccessAlreadyPublished:
+                    display.AddSuccessNotification(
+                            Services.TextService.Localize("speechBubbles/editContentPublishedHeader"),
+                            expireDate.HasValue
+                                ? Services.TextService.Localize("speechBubbles/editContentPublishedWithExpireDateText", new [] { expireDate.Value.ToLongDateString(), expireDate.Value.ToShortTimeString() })
+                                : Services.TextService.Localize("speechBubbles/editContentPublishedText")
+                    );
+                    break;
+                case PublishStatusType.FailedPathNotPublished:
+                    display.AddWarningNotification(
+                            Services.TextService.Localize("publish"),
+                            Services.TextService.Localize("publish/contentPublishedFailedByParent",
+                                    new[] { string.Format("{0} ({1})", status.ContentItem.Name, status.ContentItem.Id) }).Trim());
+                    break;
+                case PublishStatusType.FailedCancelledByEvent:
+                    AddCancelMessage(display, "publish", "speechBubbles/contentPublishedFailedByEvent");
+                    break;
+                case PublishStatusType.FailedAwaitingRelease:
+                    display.AddWarningNotification(
+                            Services.TextService.Localize("publish"),
+                            Services.TextService.Localize("publish/contentPublishedFailedAwaitingRelease",
+                                    new[] { string.Format("{0} ({1})", status.ContentItem.Name, status.ContentItem.Id) }).Trim());
+                    break;
+                case PublishStatusType.FailedHasExpired:
+                    display.AddWarningNotification(
+                            Services.TextService.Localize("publish"),
+                            Services.TextService.Localize("publish/contentPublishedFailedExpired",
+                                    new[]
+                                    {
+                                                                string.Format("{0} ({1})", status.ContentItem.Name, status.ContentItem.Id),
+                                    }).Trim());
+                    break;
+                case PublishStatusType.FailedIsTrashed:
+                    //TODO: We should add proper error messaging for this!
+                    break;
+                case PublishStatusType.FailedContentInvalid:
+                    display.AddWarningNotification(
+                            Services.TextService.Localize("publish"),
+                            Services.TextService.Localize("publish/contentPublishedFailedInvalid",
+                                    new[]
+                                    {
+                                                                string.Format("{0} ({1})", status.ContentItem.Name, status.ContentItem.Id),
+                                                                string.Join(",", status.InvalidProperties.Select(x => x.Alias))
+                                    }).Trim());
+                    break;
+                default:
+                    throw new IndexOutOfRangeException();
+            }
+        }
+
+
+        /// <summary>
+        /// Performs a permissions check for the user to check if it has access to the node based on
+        /// start node and/or permissions for the node
+        /// </summary>
+        /// <param name="storage">The storage to add the content item to so it can be reused</param>
+        /// <param name="user"></param>
+        /// <param name="userService"></param>
+        /// <param name="contentService"></param>
+        /// <param name="entityService"></param>
+        /// <param name="nodeId">The content to lookup, if the contentItem is not specified</param>
+        /// <param name="permissionsToCheck"></param>
+        /// <param name="contentItem">Specifies the already resolved content item to check against</param>
+        /// <param name="ignoreUserStartNodes">If set to true, user and group start node permissions will be ignored.</param>
+        /// <returns></returns>
+        internal static bool CheckPermissions(
+                IDictionary<string, object> storage,
+                IUser user,
+                IUserService userService,
+                IContentService contentService,
+                IEntityService entityService,
+                int nodeId,
+                char[] permissionsToCheck = null,
+                IContent contentItem = null,
+                bool ignoreUserStartNodes = false)
+        {
+            if (storage == null) throw new ArgumentNullException("storage");
+            if (user == null) throw new ArgumentNullException("user");
+            if (userService == null) throw new ArgumentNullException("userService");
+            if (contentService == null) throw new ArgumentNullException("contentService");
+            if (entityService == null) throw new ArgumentNullException("entityService");
+
+            if (contentItem == null && nodeId != Constants.System.Root && nodeId != Constants.System.RecycleBinContent)
+            {
+                contentItem = contentService.GetById(nodeId);
+                //put the content item into storage so it can be retreived
+                // in the controller (saves a lookup)
+                storage[typeof(IContent).ToString()] = contentItem;
+            }
+
+            if (contentItem == null && nodeId != Constants.System.Root && nodeId != Constants.System.RecycleBinContent)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+
+            if(ignoreUserStartNodes)
+            {
+                return true;
+            }
+
+            var hasPathAccess = (nodeId == Constants.System.Root)
+                ? user.HasContentRootAccess(entityService)
+                : (nodeId == Constants.System.RecycleBinContent)
+                    ? user.HasContentBinAccess(entityService)
+                    : user.HasPathAccess(contentItem, entityService);
+
+            if (hasPathAccess == false)
+            {
+                return false;
+            }
+
+            if (permissionsToCheck == null || permissionsToCheck.Length == 0)
+            {
+                return true;
+            }
+
+            //get the implicit/inherited permissions for the user for this path,
+            //if there is no content item for this id, than just use the id as the path (i.e. -1 or -20)
+            var path = contentItem != null ? contentItem.Path : nodeId.ToString();
+            var permission = userService.GetPermissionsForPath(user, path);
+
+            var allowed = true;
+            foreach (var p in permissionsToCheck)
+            {
+                if (permission == null
+                    || permission.GetAllPermissions().Contains(p.ToString(CultureInfo.InvariantCulture)) == false)
+                {
+                    allowed = false;
+                }
+            }
+            return allowed;
+        }
+
+        [EnsureUserPermissionForContent("contentId", 'F')]
+        public IEnumerable<NotifySetting> GetNotificationOptions(int contentId)
+        {
+            var notifications = new List<NotifySetting>();
+            if (contentId <= 0) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
+
+            var content = Services.ContentService.GetById(contentId);
+            if (content == null) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
+
+            var actionList = ActionsResolver.Current.Actions;
+            foreach (var a in actionList)
+            {
+                if (a.ShowInNotifier)
+                {
+                    NotifySetting n = new NotifySetting
+                    {
+                        Name = ui.Text("actions", a.Alias),
+                        Checked = (UmbracoUser.GetNotifications(content.Path).IndexOf(a.Letter) > -1),
+                        NotifyCode = a.Letter.ToString()
+                    };
+                    notifications.Add(n);
+                }
+            }
+            return notifications;
+        }
+
+        public void PostNotificationOptions(int contentId, string notifyOptions = "")
+        {
+            if (contentId <= 0) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
+            var content = Services.ContentService.GetById(contentId);
+
+            if (content == null) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
+            var node = new CMSNode(contentId);
+
+            global::umbraco.cms.businesslogic.workflow.Notification.UpdateNotifications(UmbracoUser, node, notifyOptions ?? "");
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Editors/EntityController.cs b/src/Umbraco.Web/Editors/EntityController.cs
index a3f76db4f2..36f4465e96 100644
--- a/src/Umbraco.Web/Editors/EntityController.cs
+++ b/src/Umbraco.Web/Editors/EntityController.cs
@@ -1,999 +1,1004 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Globalization;
-using System.Net;
-using System.Text;
-using System.Web.Http;
-using AutoMapper;
-using Umbraco.Core;
-using Umbraco.Core.Models.Membership;
-using Umbraco.Web.Models.ContentEditing;
-using Umbraco.Web.Mvc;
-using System.Linq;
-using System.Net.Http;
-using Umbraco.Core.Models;
-using Constants = Umbraco.Core.Constants;
-using Examine;
-using Umbraco.Web.Dynamics;
-using System.Text.RegularExpressions;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
-using System.Web.Http.Controllers;
-using Umbraco.Core.Models.EntityBase;
-using Umbraco.Core.Xml;
-using Umbraco.Web.Search;
-using Umbraco.Web.Trees;
-
-namespace Umbraco.Web.Editors
-{
-    /// <summary>
-    /// The API controller used for getting entity objects, basic name, icon, id representation of umbraco objects that are based on CMSNode
-    /// </summary>
-    /// <remarks>
-    /// Some objects such as macros are not based on CMSNode
-    /// </remarks>
-    [EntityControllerConfiguration]
-    [PluginController("UmbracoApi")]
-    public class EntityController : UmbracoAuthorizedJsonController
-    {
-
-        /// <summary>
-        /// Configures this controller with a custom action selector
-        /// </summary>
-        private class EntityControllerConfigurationAttribute : Attribute, IControllerConfiguration
-        {
-            public void Initialize(HttpControllerSettings controllerSettings, HttpControllerDescriptor controllerDescriptor)
-            {
-                controllerSettings.Services.Replace(typeof(IHttpActionSelector), new ParameterSwapControllerActionSelector(
-
-                    //This is a special case, we'll accept a String here so that we can get page members when the special "all-members" 
-                    //id is passed in eventually we'll probably want to support GUID + Udi too
-                    new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetPagedChildren", "id", typeof(int), typeof(string)),
-                    new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetPath", "id", typeof(int), typeof(Guid), typeof(Udi)),
-                    new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetById", "id", typeof(int), typeof(Guid), typeof(Udi)),
-                    new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetByIds", "ids", typeof(int[]), typeof(Guid[]), typeof(Udi[]))));
-            }
-        }
-
-        private readonly UmbracoTreeSearcher _treeSearcher = new UmbracoTreeSearcher();
-
-        /// <summary>
-        /// Returns an Umbraco alias given a string
-        /// </summary>
-        /// <param name="value"></param>
-        /// <param name="camelCase"></param>
-        /// <returns></returns>
-        public dynamic GetSafeAlias(string value, bool camelCase = true)
-        {
-            var returnValue = (string.IsNullOrWhiteSpace(value)) ? string.Empty : value.ToSafeAlias(camelCase);
-            dynamic returnObj = new System.Dynamic.ExpandoObject();
-            returnObj.alias = returnValue;
-            returnObj.original = value;
-            returnObj.camelCase = camelCase;
-
-            return returnObj;
-        }
-
-        /// <summary>
-        /// Searches for results based on the entity type
-        /// </summary>
-        /// <param name="query"></param>
-        /// <param name="type"></param>
-        /// <param name="searchFrom">
-        /// A starting point for the search, generally a node id, but for members this is a member type alias
-        /// </param>
-        /// <returns></returns>
-        [Obsolete("This method is obsolete, use the overload with ignoreUserStartNodes instead", false)]
-        [HttpGet]
-        public IEnumerable<EntityBasic> Search(string query, UmbracoEntityTypes type, string searchFrom = null)
-        {
-            return Search(query, type, false, searchFrom);
-        }
-        
-        /// <summary>
-        /// Searches for results based on the entity type
-        /// </summary>
-        /// <param name="query"></param>
-        /// <param name="type"></param>
-        /// <param name="searchFrom">
-        /// A starting point for the search, generally a node id, but for members this is a member type alias
-        /// </param>
-        /// <param name="ignoreUserStartNodes">If set to true, user and group start node permissions will be ignored.</param>
-        /// <returns></returns>
-        [HttpGet]
-        public IEnumerable<EntityBasic> Search(string query, UmbracoEntityTypes type, bool? ignoreUserStartNodes, string searchFrom = null)
-        {
-            //TODO: Should we restrict search results based on what app the user has access to?
-            // - Theoretically you shouldn't be able to see member data if you don't have access to members right?
-
-            if (string.IsNullOrEmpty(query))
-                return Enumerable.Empty<EntityBasic>();
-
-            return ExamineSearch(query, type, searchFrom, ignoreUserStartNodes != null && ignoreUserStartNodes.Value);
-        }
-
-        /// <summary>
-        /// Searches for all content that the user is allowed to see (based on their allowed sections)
-        /// </summary>
-        /// <param name="query"></param>
-        /// <returns></returns>
-        /// <remarks>
-        /// Even though a normal entity search will allow any user to search on a entity type that they may not have access to edit, we need
-        /// to filter these results to the sections they are allowed to edit since this search function is explicitly for the global search 
-        /// so if we showed entities that they weren't allowed to edit they would get errors when clicking on the result.
-        /// 
-        /// The reason a user is allowed to search individual entity types that they are not allowed to edit is because those search
-        /// methods might be used in things like pickers in the content editor.
-        /// </remarks>        
-        [HttpGet]
-        public IDictionary<string, TreeSearchResult> SearchAll(string query)
-        {
-            var result = new Dictionary<string, TreeSearchResult>();
-
-            if (string.IsNullOrEmpty(query))
-                return result;
-            
-            var allowedSections = Security.CurrentUser.AllowedSections.ToArray();
-            var searchableTrees = SearchableTreeResolver.Current.GetSearchableTrees();
-            
-            foreach (var searchableTree in searchableTrees)
-            {
-                if (allowedSections.Contains(searchableTree.Value.AppAlias))
-                {
-                    var tree = Services.ApplicationTreeService.GetByAlias(searchableTree.Key);
-                    if (tree == null) continue; //shouldn't occur
-                    
-                    var searchableTreeAttribute = searchableTree.Value.SearchableTree.GetType().GetCustomAttribute<SearchableTreeAttribute>(false);
-                    var treeAttribute = tree.GetTreeAttribute();
-
-                    long total;
-
-                    result[treeAttribute.GetRootNodeDisplayName(Services.TextService)] = new TreeSearchResult
-                    {
-                        Results = searchableTree.Value.SearchableTree.Search(query, 200, 0, out total),
-                        TreeAlias = searchableTree.Key,
-                        AppAlias = searchableTree.Value.AppAlias,
-                        JsFormatterService = searchableTreeAttribute == null ? "" : searchableTreeAttribute.ServiceName,
-                        JsFormatterMethod = searchableTreeAttribute == null ? "" : searchableTreeAttribute.MethodName
-                    };
-                }
-            }            
-            return result;
-        }
-
-        /// <summary>
-        /// Gets the path for a given node ID
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="type"></param>
-        /// <returns></returns>
-        public IEnumerable<int> GetPath(int id, UmbracoEntityTypes type)
-        {
-            var foundContent = GetResultForId(id, type);
-
-            return foundContent.Path.Split(new[] {','}, StringSplitOptions.RemoveEmptyEntries).Select(int.Parse);
-        }
-
-        /// <summary>
-        /// Gets the path for a given node ID
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="type"></param>
-        /// <returns></returns>
-        public IEnumerable<int> GetPath(Guid id, UmbracoEntityTypes type)
-        {
-            var foundContent = GetResultForKey(id, type);
-
-            return foundContent.Path.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(int.Parse);
-        }
-
-        /// <summary>
-        /// Gets the path for a given node ID
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="type"></param>
-        /// <returns></returns>
-        public IEnumerable<int> GetPath(Udi id, UmbracoEntityTypes type)
-        {
-            var guidUdi = id as GuidUdi;
-            if (guidUdi != null)
-            {
-                return GetPath(guidUdi.Guid, type);
-            }
-            throw new HttpResponseException(HttpStatusCode.NotFound);            
-        }
-
-        /// <summary>
-        /// Gets the url of an entity
-        /// </summary>
-        /// <param name="id">Int id of the entity to fetch URL for</param>
-        /// <param name="type">The tpye of entity such as Document, Media, Member</param>
-        /// <returns>The URL or path to the item</returns>
-        public HttpResponseMessage GetUrl(int id, UmbracoEntityTypes type)
-        {
-            var returnUrl = string.Empty;
-
-            if (type == UmbracoEntityTypes.Document)
-            {
-                var foundUrl = Umbraco.Url(id);
-                if (string.IsNullOrEmpty(foundUrl) == false && foundUrl != "#")
-                {
-                    returnUrl = foundUrl;
-
-                    return new HttpResponseMessage(HttpStatusCode.OK)
-                    {
-                        Content = new StringContent(returnUrl)
-                    };
-                }   
-            }
-
-            var ancestors = GetAncestors(id, type);
-
-            //if content, skip the first node for replicating NiceUrl defaults
-            if(type == UmbracoEntityTypes.Document) {
-                ancestors = ancestors.Skip(1);
-            }
-
-            returnUrl = "/" + string.Join("/", ancestors.Select(x => x.Name));
-
-            return new HttpResponseMessage(HttpStatusCode.OK)
-            {
-                Content = new StringContent(returnUrl)
-            };
-        }
-        
-        [Obsolete("Use GetyById instead")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public EntityBasic GetByKey(Guid id, UmbracoEntityTypes type)
-        {
-            return GetResultForKey(id, type);
-        }
-
-        /// <summary>
-        /// Gets an entity by a xpath query
-        /// </summary>
-        /// <param name="query"></param>
-        /// <param name="nodeContextId"></param>
-        /// <param name="type"></param>
-        /// <returns></returns>
-        public EntityBasic GetByQuery(string query, int nodeContextId, UmbracoEntityTypes type)
-        {
-            //TODO: Rename this!!! It's misleading, it should be GetByXPath
-
-          
-            if (type != UmbracoEntityTypes.Document)
-                throw new ArgumentException("Get by query is only compatible with enitities of type Document");
-
-
-            var q = ParseXPathQuery(query, nodeContextId);
-            var node = Umbraco.TypedContentSingleAtXPath(q);
-
-            if (node == null)
-                return null;
-
-            return GetById(node.Id, type);
-        }
-
-        //PP: wip in progress on the query parser
-        private string ParseXPathQuery(string query, int id)
-        {
-            return UmbracoXPathPathSyntaxParser.ParseXPathQuery(
-                xpathExpression: query,
-                nodeContextId: id,
-                getPath: nodeid =>
-                {
-                    var ent = Services.EntityService.Get(nodeid);
-                    return ent.Path.Split(',').Reverse();
-                },
-                publishedContentExists: i => Umbraco.TypedContent(i) != null);
-        }
-
-        #region GetById
-
-        /// <summary>
-        /// Gets an entity by it's id
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="type"></param>
-        /// <returns></returns>
-        public EntityBasic GetById(int id, UmbracoEntityTypes type)
-        {
-            return GetResultForId(id, type);
-        }
-
-        /// <summary>
-        /// Gets an entity by it's key
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="type"></param>
-        /// <returns></returns>
-        public EntityBasic GetById(Guid id, UmbracoEntityTypes type)
-        {
-            return GetResultForKey(id, type);
-        }
-
-        /// <summary>
-        /// Gets an entity by it's UDI
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="type"></param>
-        /// <returns></returns>
-        public EntityBasic GetById(Udi id, UmbracoEntityTypes type)
-        {
-            var guidUdi = id as GuidUdi;
-            if (guidUdi != null)
-            {
-                return GetResultForKey(guidUdi.Guid, type);
-            }
-            throw new HttpResponseException(HttpStatusCode.NotFound);
-        } 
-        #endregion
-
-        #region GetByIds
-        /// <summary>
-        /// Get entities by integer ids
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <param name="type"></param>
-        /// <returns></returns>
-        /// <remarks>
-        /// We allow for POST because there could be quite a lot of Ids
-        /// </remarks>
-        [HttpGet]
-        [HttpPost]
-        public IEnumerable<EntityBasic> GetByIds([FromJsonPath]int[] ids, UmbracoEntityTypes type)
-        {
-            if (ids == null)
-            {
-                throw new HttpResponseException(HttpStatusCode.NotFound);
-            }
-            return GetResultForIds(ids, type);
-        }
-
-        /// <summary>
-        /// Get entities by GUID ids
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <param name="type"></param>
-        /// <returns></returns>
-        /// <remarks>
-        /// We allow for POST because there could be quite a lot of Ids
-        /// </remarks>
-        [HttpGet]
-        [HttpPost]
-        public IEnumerable<EntityBasic> GetByIds([FromJsonPath]Guid[] ids, UmbracoEntityTypes type)
-        {
-            if (ids == null)
-            {
-                throw new HttpResponseException(HttpStatusCode.NotFound);
-            }
-            return GetResultForKeys(ids, type);
-        }
-
-        /// <summary>
-        /// Get entities by UDIs
-        /// </summary>
-        /// <param name="ids">
-        /// A list of UDIs to lookup items by, all UDIs must be of the same UDI type!
-        /// </param>
-        /// <param name="type"></param>
-        /// <returns></returns>
-        /// <remarks>
-        /// We allow for POST because there could be quite a lot of Ids.
-        /// </remarks>
-        [HttpGet]
-        [HttpPost]
-        public IEnumerable<EntityBasic> GetByIds([FromJsonPath]Udi[] ids, [FromUri]UmbracoEntityTypes type)
-        {
-            if (ids == null)
-            {
-                throw new HttpResponseException(HttpStatusCode.NotFound);
-            }
-
-            if (ids.Length == 0)
-            {
-                return Enumerable.Empty<EntityBasic>();
-            }
-
-            //all udi types will need to be the same in this list so we'll determine by the first
-            //currently we only support GuidIdi for this method
-
-            var guidUdi = ids[0] as GuidUdi;
-            if (guidUdi != null)
-            {
-                return GetResultForKeys(ids.Select(x => ((GuidUdi)x).Guid).ToArray(), type);
-            }
-
-            throw new HttpResponseException(HttpStatusCode.NotFound);
-        }       
-        #endregion
-
-        [Obsolete("Use GetyByIds instead")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public IEnumerable<EntityBasic> GetByKeys([FromUri]Guid[] ids, UmbracoEntityTypes type)
-        {
-            if (ids == null)
-            {
-                throw new HttpResponseException(HttpStatusCode.NotFound);
-            }
-            return GetResultForKeys(ids, type);
-        }
-
-        public IEnumerable<EntityBasic> GetChildren(int id, UmbracoEntityTypes type)
-        {
-            return GetResultForChildren(id, type);
-        }
-
-        /// <summary>
-        /// Get paged child entities by id
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="type"></param>
-        /// <param name="pageNumber"></param>
-        /// <param name="pageSize"></param>
-        /// <param name="orderBy"></param>
-        /// <param name="orderDirection"></param>
-        /// <param name="filter"></param>
-        /// <returns></returns>
-        public PagedResult<EntityBasic> GetPagedChildren(
-            string id,
-            UmbracoEntityTypes type,
-            int pageNumber,
-            int pageSize,
-            string orderBy = "SortOrder",
-            Direction orderDirection = Direction.Ascending,
-            string filter = "")
-        {
-            int intId;
-
-            if (int.TryParse(id, out intId))
-            {
-                return GetPagedChildren(intId, type, pageNumber, pageSize, orderBy, orderDirection, filter);
-            }
-
-            Guid guidId;
-            if (Guid.TryParse(id, out guidId))
-            {
-                //Not supported currently
-                throw new HttpResponseException(HttpStatusCode.NotFound);
-            }
-
-            Udi udiId;
-            if (Udi.TryParse(id, out udiId))
-            {
-                //Not supported currently
-                throw new HttpResponseException(HttpStatusCode.NotFound);
-            }
-
-            //so we don't have an INT, GUID or UDI, it's just a string, so now need to check if it's a special id or a member type
-            if (id == Constants.Conventions.MemberTypes.AllMembersListId)
-            {
-                //the EntityService can search paged members from the root
-
-                intId = -1;
-                return GetPagedChildren(intId, type, pageNumber, pageSize, orderBy, orderDirection, filter);
-            }
-
-            //the EntityService cannot search members of a certain type, this is currently not supported and would require 
-            //quite a bit of plumbing to do in the Services/Repository, we'll revert to a paged search
-
-            long total;
-            var searchResult = _treeSearcher.ExamineSearch(Umbraco, filter ?? "", type, pageSize, pageNumber - 1, out total, id);
-
-            return new PagedResult<EntityBasic>(total, pageNumber, pageSize)
-            {
-                Items = searchResult
-            };            
-        }
-
-        /// <summary>
-        /// Get paged child entities by id
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="type"></param>
-        /// <param name="pageNumber"></param>
-        /// <param name="pageSize"></param>
-        /// <param name="orderBy"></param>
-        /// <param name="orderDirection"></param>
-        /// <param name="filter"></param>
-        /// <returns></returns>
-        public PagedResult<EntityBasic> GetPagedChildren(
-            int id,
-            UmbracoEntityTypes type,
-            int pageNumber, 
-            int pageSize,
-            string orderBy = "SortOrder",
-            Direction orderDirection = Direction.Ascending,
-            string filter = "")
-        {
-            if (pageNumber <= 0)
-                throw new HttpResponseException(HttpStatusCode.NotFound);
-            if (pageSize <= 0)
-                throw new HttpResponseException(HttpStatusCode.NotFound);
-            
-            var objectType = ConvertToObjectType(type);
-            if (objectType.HasValue)
-            {
-                long totalRecords;
-                var entities = Services.EntityService.GetPagedChildren(id, objectType.Value, pageNumber - 1, pageSize, out totalRecords, orderBy, orderDirection, filter);
-
-                if (totalRecords == 0)
-                {
-                    return new PagedResult<EntityBasic>(0, 0, 0);
-                }
-
-                var pagedResult = new PagedResult<EntityBasic>(totalRecords, pageNumber, pageSize)
-                {
-                    Items = entities.Select(Mapper.Map<EntityBasic>)
-                };
-
-                return pagedResult;
-            }
-
-            //now we need to convert the unknown ones
-            switch (type)
-            {
-                case UmbracoEntityTypes.PropertyType:
-                case UmbracoEntityTypes.PropertyGroup:
-                case UmbracoEntityTypes.Domain:
-                case UmbracoEntityTypes.Language:
-                case UmbracoEntityTypes.User:
-                case UmbracoEntityTypes.Macro:
-                default:
-                    throw new NotSupportedException("The " + typeof(EntityController) + " does not currently support data for the type " + type);
-            }
-        }
-
-        [Obsolete("This method is obsolete, use the overload with ignoreUserStartNodes instead", false)]
-        public PagedResult<EntityBasic> GetPagedDescendants(
-            int id,
-            UmbracoEntityTypes type,
-            int pageNumber,
-            int pageSize,
-            string orderBy = "SortOrder",
-            Direction orderDirection = Direction.Ascending,
-            string filter = "")
-        {
-            return GetPagedDescendants(id, type, pageNumber, pageSize,
-                false, orderBy, orderDirection, filter);
-        }
-
-        public PagedResult<EntityBasic> GetPagedDescendants(
-            int id,
-            UmbracoEntityTypes type,
-            int pageNumber,
-            int pageSize,
-            bool ignoreUserStartNodes,
-            string orderBy = "SortOrder",
-            Direction orderDirection = Direction.Ascending,
-            string filter = "")
-        {
-            if (pageNumber <= 0)
-                throw new HttpResponseException(HttpStatusCode.NotFound);
-            if (pageSize <= 0)
-                throw new HttpResponseException(HttpStatusCode.NotFound);
-
-            var objectType = ConvertToObjectType(type);
-            if (objectType.HasValue)
-            {
-                IEnumerable<IUmbracoEntity> entities;
-                long totalRecords;
-
-                if (id == Constants.System.Root)
-                {
-                    // root is special: we reduce it to start nodes
-
-                    int[] aids = null;
-                    switch (type)
-                    {
-                        case UmbracoEntityTypes.Document:
-                            aids = Security.CurrentUser.CalculateContentStartNodeIds(Services.EntityService);
-                            break;
-                        case UmbracoEntityTypes.Media:
-                            aids = Security.CurrentUser.CalculateMediaStartNodeIds(Services.EntityService);
-                            break;
-                    }
-
-                    entities = aids == null || aids.Contains(Constants.System.Root) || ignoreUserStartNodes
-                        ? Services.EntityService.GetPagedDescendantsFromRoot(objectType.Value, pageNumber - 1, pageSize, out totalRecords, orderBy, orderDirection, filter, includeTrashed: false)
-                        : Services.EntityService.GetPagedDescendants(aids, objectType.Value, pageNumber - 1, pageSize, out totalRecords, orderBy, orderDirection, filter);
-                }
-                else
-                {
-                    entities = Services.EntityService.GetPagedDescendants(id, objectType.Value, pageNumber - 1, pageSize, out totalRecords, orderBy, orderDirection, filter);
-                }
-
-                if (totalRecords == 0)
-                {
-                    return new PagedResult<EntityBasic>(0, 0, 0);
-                }
-
-                var pagedResult = new PagedResult<EntityBasic>(totalRecords, pageNumber, pageSize)
-                {
-                    Items = entities.Select(Mapper.Map<EntityBasic>)
-                };
-
-                return pagedResult;
-            }
-
-            //now we need to convert the unknown ones
-            switch (type)
-            {
-                case UmbracoEntityTypes.PropertyType:
-                case UmbracoEntityTypes.PropertyGroup:
-                case UmbracoEntityTypes.Domain:
-                case UmbracoEntityTypes.Language:
-                case UmbracoEntityTypes.User:
-                case UmbracoEntityTypes.Macro:
-                default:
-                    throw new NotSupportedException("The " + typeof(EntityController) + " does not currently support data for the type " + type);
-            }
-        }
-
-        [Obsolete("This method is obsolete, use the overload with ignoreUserStartNodes instead", false)]
-        public IEnumerable<EntityBasic> GetAncestors(int id, UmbracoEntityTypes type)
-        {
-            return GetResultForAncestors(id, type, false);
-        }
-
-        public IEnumerable<EntityBasic> GetAncestors(int id, UmbracoEntityTypes type, bool ignoreUserStartNodes)
-        {
-            return GetResultForAncestors(id, type, ignoreUserStartNodes);
-        }
-
-        public IEnumerable<EntityBasic> GetAll(UmbracoEntityTypes type, string postFilter, [FromUri]IDictionary<string, object> postFilterParams)
-        {
-            return GetResultForAll(type, postFilter, postFilterParams);
-        }
-
-        /// <summary>
-        /// Searches for results based on the entity type
-        /// </summary>
-        /// <param name="query"></param>
-        /// <param name="entityType"></param>
-        /// <param name="searchFrom"></param>
-        /// <param name="ignoreUserStartNodes">If set to true, user and group start node permissions will be ignored.</param>
-        /// <returns></returns>
-        private IEnumerable<SearchResultItem> ExamineSearch(string query, UmbracoEntityTypes entityType, string searchFrom = null, bool ignoreUserStartNodes = false)
-        {
-            long total;
-            return _treeSearcher.ExamineSearch(Umbraco, query, entityType, 200, 0, out total, ignoreUserStartNodes, searchFrom);
-        }
-        
-
-        private IEnumerable<EntityBasic> GetResultForChildren(int id, UmbracoEntityTypes entityType)
-        {
-            var objectType = ConvertToObjectType(entityType);
-            if (objectType.HasValue)
-            {
-                //TODO: Need to check for Object types that support hierarchic here, some might not.
-
-                return Services.EntityService.GetChildren(id, objectType.Value)
-                    .WhereNotNull()
-                    .Select(Mapper.Map<EntityBasic>);
-            }
-            //now we need to convert the unknown ones
-            switch (entityType)
-            {
-                case UmbracoEntityTypes.Domain:
-                case UmbracoEntityTypes.Language:
-                case UmbracoEntityTypes.User:
-                case UmbracoEntityTypes.Macro:
-                default:
-                    throw new NotSupportedException("The " + typeof(EntityController) + " does not currently support data for the type " + entityType);
-            }
-        }
-
-        private IEnumerable<EntityBasic> GetResultForAncestors(int id, UmbracoEntityTypes entityType, bool ignoreUserStartNodes = false)
-        {
-            var objectType = ConvertToObjectType(entityType);
-            if (objectType.HasValue)
-            {
-                //TODO: Need to check for Object types that support hierarchic here, some might not.
-
-                var ids = Services.EntityService.Get(id).Path.Split(',').Select(int.Parse).Distinct().ToArray();
-
-                if (ignoreUserStartNodes == false)
-                {
-                    int[] aids = null;
-                    switch (entityType)
-                    {
-                        case UmbracoEntityTypes.Document:
-                            aids = Security.CurrentUser.CalculateContentStartNodeIds(Services.EntityService);
-                            break;
-                        case UmbracoEntityTypes.Media:
-                            aids = Security.CurrentUser.CalculateMediaStartNodeIds(Services.EntityService);
-                            break;
-                    }
-
-                    if (aids != null)
-                    {
-                        var lids = new List<int>();
-                        var ok = false;
-                        foreach (var i in ids)
-                        {
-                            if (ok)
-                            {
-                                lids.Add(i);
-                                continue;
-                            }
-                            if (aids.Contains(i))
-                            {
-                                lids.Add(i);
-                                ok = true;
-                            }
-                        }
-                        ids = lids.ToArray();
-                    }
-                }
-
-                return ids.Length == 0
-                    ? Enumerable.Empty<EntityBasic>()
-                    : Services.EntityService.GetAll(objectType.Value, ids)
-                        .WhereNotNull()
-                        .OrderBy(x => x.Level)
-                        .Select(Mapper.Map<EntityBasic>);
-            }
-            //now we need to convert the unknown ones
-            switch (entityType)
-            {
-                case UmbracoEntityTypes.PropertyType:
-                case UmbracoEntityTypes.PropertyGroup:
-                case UmbracoEntityTypes.Domain:
-                case UmbracoEntityTypes.Language:
-                case UmbracoEntityTypes.User:
-                case UmbracoEntityTypes.Macro:
-                default:
-                    throw new NotSupportedException("The " + typeof(EntityController) + " does not currently support data for the type " + entityType);
-            }
-        }
-
-        /// <summary>
-        /// Gets the result for the entity list based on the type
-        /// </summary>
-        /// <param name="entityType"></param>
-        /// <param name="postFilter">A string where filter that will filter the results dynamically with linq - optional</param>
-        /// <param name="postFilterParams">the parameters to fill in the string where filter - optional</param>
-        /// <returns></returns>
-        private IEnumerable<EntityBasic> GetResultForAll(UmbracoEntityTypes entityType, string postFilter = null, IDictionary<string, object> postFilterParams = null)
-        {
-            var objectType = ConvertToObjectType(entityType);
-            if (objectType.HasValue)
-            {
-                //TODO: Should we order this by something ?
-                var entities = Services.EntityService.GetAll(objectType.Value).WhereNotNull().Select(Mapper.Map<EntityBasic>);
-                return ExecutePostFilter(entities, postFilter, postFilterParams);                
-            }
-            //now we need to convert the unknown ones
-            switch (entityType)
-            {
-                case UmbracoEntityTypes.Template:
-                    var templates = Services.FileService.GetTemplates();
-                    var filteredTemplates = ExecutePostFilter(templates, postFilter, postFilterParams);
-                    return filteredTemplates.Select(Mapper.Map<EntityBasic>);
-
-                case UmbracoEntityTypes.Macro:                    
-                    //Get all macros from the macro service
-                    var macros = Services.MacroService.GetAll().WhereNotNull().OrderBy(x => x.Name);
-                    var filteredMacros = ExecutePostFilter(macros, postFilter, postFilterParams);
-                    return filteredMacros.Select(Mapper.Map<EntityBasic>);
-
-                case UmbracoEntityTypes.PropertyType:
-
-                    //get all document types, then combine all property types into one list
-                    var propertyTypes = Services.ContentTypeService.GetAllContentTypes().Cast<IContentTypeComposition>()
-                                                .Concat(Services.ContentTypeService.GetAllMediaTypes())
-                                                .ToArray()
-                                                .SelectMany(x => x.PropertyTypes)
-                                                .DistinctBy(composition => composition.Alias);
-                    var filteredPropertyTypes = ExecutePostFilter(propertyTypes, postFilter, postFilterParams);
-                    return Mapper.Map<IEnumerable<PropertyType>, IEnumerable<EntityBasic>>(filteredPropertyTypes);
-
-                case UmbracoEntityTypes.PropertyGroup:
-
-                    //get all document types, then combine all property types into one list
-                    var propertyGroups = Services.ContentTypeService.GetAllContentTypes().Cast<IContentTypeComposition>()
-                                                .Concat(Services.ContentTypeService.GetAllMediaTypes())
-                                                .ToArray()
-                                                .SelectMany(x => x.PropertyGroups)
-                                                .DistinctBy(composition => composition.Name);
-                    var filteredpropertyGroups = ExecutePostFilter(propertyGroups, postFilter, postFilterParams);
-                    return Mapper.Map<IEnumerable<PropertyGroup>, IEnumerable<EntityBasic>>(filteredpropertyGroups);
-
-                case UmbracoEntityTypes.User:
-
-                    int total;
-                    var users = Services.UserService.GetAll(0, int.MaxValue, out total);
-                    var filteredUsers = ExecutePostFilter(users, postFilter, postFilterParams);
-                    return Mapper.Map<IEnumerable<IUser>, IEnumerable<EntityBasic>>(filteredUsers);
-
-                case UmbracoEntityTypes.Domain:
-
-                case UmbracoEntityTypes.Language:
-
-                default:
-                    throw new NotSupportedException("The " + typeof(EntityController) + " does not currently support data for the type " + entityType);
-            }
-        }
-
-        private IEnumerable<EntityBasic> GetResultForKeys(Guid[] keys, UmbracoEntityTypes entityType)
-        {
-            if (keys.Length == 0)
-                return Enumerable.Empty<EntityBasic>();
-
-            var objectType = ConvertToObjectType(entityType);
-            if (objectType.HasValue)
-            {
-                var entities = Services.EntityService.GetAll(objectType.Value, keys)
-                    .WhereNotNull()
-                    .Select(Mapper.Map<EntityBasic>);
-
-                // entities are in "some" order, put them back in order
-                var xref = entities.ToDictionary(x => x.Key);
-                var result = keys.Select(x => xref.ContainsKey(x) ? xref[x] : null).Where(x => x != null);
-
-                return result;
-            }
-            //now we need to convert the unknown ones
-            switch (entityType)
-            {
-                case UmbracoEntityTypes.PropertyType:
-                case UmbracoEntityTypes.PropertyGroup:
-                case UmbracoEntityTypes.Domain:
-                case UmbracoEntityTypes.Language:
-                case UmbracoEntityTypes.User:
-                case UmbracoEntityTypes.Macro:
-                default:
-                    throw new NotSupportedException("The " + typeof(EntityController) + " does not currently support data for the type " + entityType);
-            }
-        }
-
-        private IEnumerable<EntityBasic> GetResultForIds(int[] ids, UmbracoEntityTypes entityType)
-        {
-            if (ids.Length == 0)
-                return Enumerable.Empty<EntityBasic>();
-
-            var objectType = ConvertToObjectType(entityType);
-            if (objectType.HasValue)
-            {
-                var entities = Services.EntityService.GetAll(objectType.Value, ids)
-                    .WhereNotNull()
-                    .Select(Mapper.Map<EntityBasic>);
-
-                // entities are in "some" order, put them back in order
-                var xref = entities.ToDictionary(x => x.Id);
-                var result = ids.Select(x => xref.ContainsKey(x) ? xref[x] : null).Where(x => x != null);
-
-                return result;
-            }
-            //now we need to convert the unknown ones
-            switch (entityType)
-            {
-                case UmbracoEntityTypes.PropertyType:
-                case UmbracoEntityTypes.PropertyGroup:
-                case UmbracoEntityTypes.Domain:
-                case UmbracoEntityTypes.Language:
-                case UmbracoEntityTypes.User:
-                case UmbracoEntityTypes.Macro:
-                default:
-                    throw new NotSupportedException("The " + typeof(EntityController) + " does not currently support data for the type " + entityType);
-            }
-        }
-
-        private EntityBasic GetResultForKey(Guid key, UmbracoEntityTypes entityType)
-        {
-            var objectType = ConvertToObjectType(entityType);
-            if (objectType.HasValue)
-            {
-                var found = Services.EntityService.GetByKey(key, objectType.Value);
-                if (found == null)
-                {
-                    throw new HttpResponseException(HttpStatusCode.NotFound);
-                }
-                return Mapper.Map<EntityBasic>(found);
-            }
-            //now we need to convert the unknown ones
-            switch (entityType)
-            {
-                case UmbracoEntityTypes.PropertyType:
-
-                case UmbracoEntityTypes.PropertyGroup:
-
-                case UmbracoEntityTypes.Domain:
-
-                case UmbracoEntityTypes.Language:
-
-                case UmbracoEntityTypes.User:
-
-                case UmbracoEntityTypes.Macro:
-
-                default:
-                    throw new NotSupportedException("The " + typeof(EntityController) + " does not currently support data for the type " + entityType);
-            }
-        }
-
-        private EntityBasic GetResultForId(int id, UmbracoEntityTypes entityType)
-        {
-            var objectType = ConvertToObjectType(entityType);
-            if (objectType.HasValue)
-            {
-                var found = Services.EntityService.Get(id, objectType.Value);
-                if (found == null)
-                {
-                    throw new HttpResponseException(HttpStatusCode.NotFound);
-                }
-                return Mapper.Map<EntityBasic>(found);
-            }                
-            //now we need to convert the unknown ones
-            switch (entityType)
-            {
-                case UmbracoEntityTypes.PropertyType:
-                    
-                case UmbracoEntityTypes.PropertyGroup:
-
-                case UmbracoEntityTypes.Domain:
-                    
-                case UmbracoEntityTypes.Language:
-                    
-                case UmbracoEntityTypes.User:
-                    
-                case UmbracoEntityTypes.Macro:
-                    
-                default:
-                    throw new NotSupportedException("The " + typeof(EntityController) + " does not currently support data for the type " + entityType);
-            }
-        }
-
-        private static UmbracoObjectTypes? ConvertToObjectType(UmbracoEntityTypes entityType)
-        {
-            switch (entityType)
-            {
-                case UmbracoEntityTypes.Document:
-                    return UmbracoObjectTypes.Document;
-                case UmbracoEntityTypes.Media:
-                    return UmbracoObjectTypes.Media;
-                case UmbracoEntityTypes.MemberType:
-                    return UmbracoObjectTypes.MediaType;
-                case UmbracoEntityTypes.MemberGroup:
-                    return UmbracoObjectTypes.MemberGroup;
-                case UmbracoEntityTypes.ContentItem:
-                    return UmbracoObjectTypes.ContentItem;
-                case UmbracoEntityTypes.MediaType:
-                    return UmbracoObjectTypes.MediaType;
-                case UmbracoEntityTypes.DocumentType:
-                    return UmbracoObjectTypes.DocumentType;
-                case UmbracoEntityTypes.Stylesheet:
-                    return UmbracoObjectTypes.Stylesheet;
-                case UmbracoEntityTypes.Member:
-                    return UmbracoObjectTypes.Member;
-                case UmbracoEntityTypes.DataType:
-                    return UmbracoObjectTypes.DataType;
-                default:
-                    //There is no UmbracoEntity conversion (things like Macros, Users, etc...)
-                    return null;
-            }
-        }
-
-        /// <summary>
-        /// Executes the post filter against a collection of objects
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="entities"></param>
-        /// <param name="postFilter"></param>
-        /// <param name="postFilterParams"></param>
-        /// <returns></returns>
-        private IEnumerable<T> ExecutePostFilter<T>(IEnumerable<T> entities, string postFilter, IDictionary<string, object> postFilterParams)
-        {
-            //if a post filter is assigned then try to execute it
-            if (postFilter.IsNullOrWhiteSpace() == false)
-            {
-                return postFilterParams == null
-                               ? entities.AsQueryable().Where(postFilter).ToArray()
-                               : entities.AsQueryable().Where(postFilter, postFilterParams).ToArray();
-
-            }
-            return entities;
-        } 
-
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Globalization;
+using System.Net;
+using System.Text;
+using System.Web.Http;
+using AutoMapper;
+using Umbraco.Core;
+using Umbraco.Core.Models.Membership;
+using Umbraco.Web.Models.ContentEditing;
+using Umbraco.Web.Mvc;
+using System.Linq;
+using System.Net.Http;
+using Umbraco.Core.Models;
+using Constants = Umbraco.Core.Constants;
+using Examine;
+using Umbraco.Web.Dynamics;
+using System.Text.RegularExpressions;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
+using System.Web.Http.Controllers;
+using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Xml;
+using Umbraco.Web.Search;
+using Umbraco.Web.Trees;
+
+namespace Umbraco.Web.Editors
+{
+    /// <summary>
+    /// The API controller used for getting entity objects, basic name, icon, id representation of umbraco objects that are based on CMSNode
+    /// </summary>
+    /// <remarks>
+    /// Some objects such as macros are not based on CMSNode
+    /// </remarks>
+    [EntityControllerConfiguration]
+    [PluginController("UmbracoApi")]
+    public class EntityController : UmbracoAuthorizedJsonController
+    {
+
+        /// <summary>
+        /// Configures this controller with a custom action selector
+        /// </summary>
+        private class EntityControllerConfigurationAttribute : Attribute, IControllerConfiguration
+        {
+            public void Initialize(HttpControllerSettings controllerSettings, HttpControllerDescriptor controllerDescriptor)
+            {
+                controllerSettings.Services.Replace(typeof(IHttpActionSelector), new ParameterSwapControllerActionSelector(
+
+                    //This is a special case, we'll accept a String here so that we can get page members when the special "all-members"
+                    //id is passed in eventually we'll probably want to support GUID + Udi too
+                    new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetPagedChildren", "id", typeof(int), typeof(string)),
+                    new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetPath", "id", typeof(int), typeof(Guid), typeof(Udi)),
+                    new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetById", "id", typeof(int), typeof(Guid), typeof(Udi)),
+                    new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetByIds", "ids", typeof(int[]), typeof(Guid[]), typeof(Udi[]))));
+            }
+        }
+
+        private readonly UmbracoTreeSearcher _treeSearcher = new UmbracoTreeSearcher();
+
+        /// <summary>
+        /// Returns an Umbraco alias given a string
+        /// </summary>
+        /// <param name="value"></param>
+        /// <param name="camelCase"></param>
+        /// <returns></returns>
+        public dynamic GetSafeAlias(string value, bool camelCase = true)
+        {
+            var returnValue = (string.IsNullOrWhiteSpace(value)) ? string.Empty : value.ToSafeAlias(camelCase);
+            dynamic returnObj = new System.Dynamic.ExpandoObject();
+            returnObj.alias = returnValue;
+            returnObj.original = value;
+            returnObj.camelCase = camelCase;
+
+            return returnObj;
+        }
+
+        /// <summary>
+        /// Searches for results based on the entity type
+        /// </summary>
+        /// <param name="query"></param>
+        /// <param name="type"></param>
+        /// <param name="searchFrom">
+        /// A starting point for the search, generally a node id, but for members this is a member type alias
+        /// </param>
+        /// <returns></returns>
+        [Obsolete("This method is obsolete, use the overload with dataTypeId instead", false)]
+        [HttpGet]
+        public IEnumerable<EntityBasic> Search(string query, UmbracoEntityTypes type, string searchFrom = null)
+        {
+            return Search(query, type, null, searchFrom);
+        }
+
+        /// <summary>
+        /// Searches for results based on the entity type
+        /// </summary>
+        /// <param name="query"></param>
+        /// <param name="type"></param>
+        /// <param name="searchFrom">
+        /// A starting point for the search, generally a node id, but for members this is a member type alias
+        /// </param>
+        /// <param name="dataTypeId">If set used to look up whether user and group start node permissions will be ignored.</param>
+        /// <returns></returns>
+        [HttpGet]
+        public IEnumerable<EntityBasic> Search(string query, UmbracoEntityTypes type, Guid? dataTypeId, string searchFrom = null)
+        {
+            //TODO: Should we restrict search results based on what app the user has access to?
+            // - Theoretically you shouldn't be able to see member data if you don't have access to members right?
+
+            if (string.IsNullOrEmpty(query))
+                return Enumerable.Empty<EntityBasic>();
+
+            var ignoreUserStartNodes = dataTypeId.HasValue && Services.DataTypeService.IsDataTypeIgnoringUserStartNodes(dataTypeId.Value);
+            return ExamineSearch(query, type, searchFrom, ignoreUserStartNodes);
+        }
+
+        /// <summary>
+        /// Searches for all content that the user is allowed to see (based on their allowed sections)
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// Even though a normal entity search will allow any user to search on a entity type that they may not have access to edit, we need
+        /// to filter these results to the sections they are allowed to edit since this search function is explicitly for the global search
+        /// so if we showed entities that they weren't allowed to edit they would get errors when clicking on the result.
+        ///
+        /// The reason a user is allowed to search individual entity types that they are not allowed to edit is because those search
+        /// methods might be used in things like pickers in the content editor.
+        /// </remarks>
+        [HttpGet]
+        public IDictionary<string, TreeSearchResult> SearchAll(string query)
+        {
+            var result = new Dictionary<string, TreeSearchResult>();
+
+            if (string.IsNullOrEmpty(query))
+                return result;
+
+            var allowedSections = Security.CurrentUser.AllowedSections.ToArray();
+            var searchableTrees = SearchableTreeResolver.Current.GetSearchableTrees();
+
+            foreach (var searchableTree in searchableTrees)
+            {
+                if (allowedSections.Contains(searchableTree.Value.AppAlias))
+                {
+                    var tree = Services.ApplicationTreeService.GetByAlias(searchableTree.Key);
+                    if (tree == null) continue; //shouldn't occur
+
+                    var searchableTreeAttribute = searchableTree.Value.SearchableTree.GetType().GetCustomAttribute<SearchableTreeAttribute>(false);
+                    var treeAttribute = tree.GetTreeAttribute();
+
+                    long total;
+
+                    result[treeAttribute.GetRootNodeDisplayName(Services.TextService)] = new TreeSearchResult
+                    {
+                        Results = searchableTree.Value.SearchableTree.Search(query, 200, 0, out total),
+                        TreeAlias = searchableTree.Key,
+                        AppAlias = searchableTree.Value.AppAlias,
+                        JsFormatterService = searchableTreeAttribute == null ? "" : searchableTreeAttribute.ServiceName,
+                        JsFormatterMethod = searchableTreeAttribute == null ? "" : searchableTreeAttribute.MethodName
+                    };
+                }
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// Gets the path for a given node ID
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        public IEnumerable<int> GetPath(int id, UmbracoEntityTypes type)
+        {
+            var foundContent = GetResultForId(id, type);
+
+            return foundContent.Path.Split(new[] {','}, StringSplitOptions.RemoveEmptyEntries).Select(int.Parse);
+        }
+
+        /// <summary>
+        /// Gets the path for a given node ID
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        public IEnumerable<int> GetPath(Guid id, UmbracoEntityTypes type)
+        {
+            var foundContent = GetResultForKey(id, type);
+
+            return foundContent.Path.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(int.Parse);
+        }
+
+        /// <summary>
+        /// Gets the path for a given node ID
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        public IEnumerable<int> GetPath(Udi id, UmbracoEntityTypes type)
+        {
+            var guidUdi = id as GuidUdi;
+            if (guidUdi != null)
+            {
+                return GetPath(guidUdi.Guid, type);
+            }
+            throw new HttpResponseException(HttpStatusCode.NotFound);
+        }
+
+        /// <summary>
+        /// Gets the url of an entity
+        /// </summary>
+        /// <param name="id">Int id of the entity to fetch URL for</param>
+        /// <param name="type">The tpye of entity such as Document, Media, Member</param>
+        /// <returns>The URL or path to the item</returns>
+        public HttpResponseMessage GetUrl(int id, UmbracoEntityTypes type)
+        {
+            var returnUrl = string.Empty;
+
+            if (type == UmbracoEntityTypes.Document)
+            {
+                var foundUrl = Umbraco.Url(id);
+                if (string.IsNullOrEmpty(foundUrl) == false && foundUrl != "#")
+                {
+                    returnUrl = foundUrl;
+
+                    return new HttpResponseMessage(HttpStatusCode.OK)
+                    {
+                        Content = new StringContent(returnUrl)
+                    };
+                }
+            }
+
+            var ancestors = GetAncestors(id, type);
+
+            //if content, skip the first node for replicating NiceUrl defaults
+            if(type == UmbracoEntityTypes.Document) {
+                ancestors = ancestors.Skip(1);
+            }
+
+            returnUrl = "/" + string.Join("/", ancestors.Select(x => x.Name));
+
+            return new HttpResponseMessage(HttpStatusCode.OK)
+            {
+                Content = new StringContent(returnUrl)
+            };
+        }
+
+        [Obsolete("Use GetyById instead")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public EntityBasic GetByKey(Guid id, UmbracoEntityTypes type)
+        {
+            return GetResultForKey(id, type);
+        }
+
+        /// <summary>
+        /// Gets an entity by a xpath query
+        /// </summary>
+        /// <param name="query"></param>
+        /// <param name="nodeContextId"></param>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        public EntityBasic GetByQuery(string query, int nodeContextId, UmbracoEntityTypes type)
+        {
+            //TODO: Rename this!!! It's misleading, it should be GetByXPath
+
+
+            if (type != UmbracoEntityTypes.Document)
+                throw new ArgumentException("Get by query is only compatible with enitities of type Document");
+
+
+            var q = ParseXPathQuery(query, nodeContextId);
+            var node = Umbraco.TypedContentSingleAtXPath(q);
+
+            if (node == null)
+                return null;
+
+            return GetById(node.Id, type);
+        }
+
+        //PP: wip in progress on the query parser
+        private string ParseXPathQuery(string query, int id)
+        {
+            return UmbracoXPathPathSyntaxParser.ParseXPathQuery(
+                xpathExpression: query,
+                nodeContextId: id,
+                getPath: nodeid =>
+                {
+                    var ent = Services.EntityService.Get(nodeid);
+                    return ent.Path.Split(',').Reverse();
+                },
+                publishedContentExists: i => Umbraco.TypedContent(i) != null);
+        }
+
+        #region GetById
+
+        /// <summary>
+        /// Gets an entity by it's id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        public EntityBasic GetById(int id, UmbracoEntityTypes type)
+        {
+            return GetResultForId(id, type);
+        }
+
+        /// <summary>
+        /// Gets an entity by it's key
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        public EntityBasic GetById(Guid id, UmbracoEntityTypes type)
+        {
+            return GetResultForKey(id, type);
+        }
+
+        /// <summary>
+        /// Gets an entity by it's UDI
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        public EntityBasic GetById(Udi id, UmbracoEntityTypes type)
+        {
+            var guidUdi = id as GuidUdi;
+            if (guidUdi != null)
+            {
+                return GetResultForKey(guidUdi.Guid, type);
+            }
+            throw new HttpResponseException(HttpStatusCode.NotFound);
+        }
+        #endregion
+
+        #region GetByIds
+        /// <summary>
+        /// Get entities by integer ids
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// We allow for POST because there could be quite a lot of Ids
+        /// </remarks>
+        [HttpGet]
+        [HttpPost]
+        public IEnumerable<EntityBasic> GetByIds([FromJsonPath]int[] ids, UmbracoEntityTypes type)
+        {
+            if (ids == null)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+            return GetResultForIds(ids, type);
+        }
+
+        /// <summary>
+        /// Get entities by GUID ids
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// We allow for POST because there could be quite a lot of Ids
+        /// </remarks>
+        [HttpGet]
+        [HttpPost]
+        public IEnumerable<EntityBasic> GetByIds([FromJsonPath]Guid[] ids, UmbracoEntityTypes type)
+        {
+            if (ids == null)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+            return GetResultForKeys(ids, type);
+        }
+
+        /// <summary>
+        /// Get entities by UDIs
+        /// </summary>
+        /// <param name="ids">
+        /// A list of UDIs to lookup items by, all UDIs must be of the same UDI type!
+        /// </param>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// We allow for POST because there could be quite a lot of Ids.
+        /// </remarks>
+        [HttpGet]
+        [HttpPost]
+        public IEnumerable<EntityBasic> GetByIds([FromJsonPath]Udi[] ids, [FromUri]UmbracoEntityTypes type)
+        {
+            if (ids == null)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+
+            if (ids.Length == 0)
+            {
+                return Enumerable.Empty<EntityBasic>();
+            }
+
+            //all udi types will need to be the same in this list so we'll determine by the first
+            //currently we only support GuidIdi for this method
+
+            var guidUdi = ids[0] as GuidUdi;
+            if (guidUdi != null)
+            {
+                return GetResultForKeys(ids.Select(x => ((GuidUdi)x).Guid).ToArray(), type);
+            }
+
+            throw new HttpResponseException(HttpStatusCode.NotFound);
+        }
+        #endregion
+
+        [Obsolete("Use GetyByIds instead")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public IEnumerable<EntityBasic> GetByKeys([FromUri]Guid[] ids, UmbracoEntityTypes type)
+        {
+            if (ids == null)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+            return GetResultForKeys(ids, type);
+        }
+
+        public IEnumerable<EntityBasic> GetChildren(int id, UmbracoEntityTypes type)
+        {
+            return GetResultForChildren(id, type);
+        }
+
+        /// <summary>
+        /// Get paged child entities by id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="type"></param>
+        /// <param name="pageNumber"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="orderBy"></param>
+        /// <param name="orderDirection"></param>
+        /// <param name="filter"></param>
+        /// <returns></returns>
+        public PagedResult<EntityBasic> GetPagedChildren(
+            string id,
+            UmbracoEntityTypes type,
+            int pageNumber,
+            int pageSize,
+            string orderBy = "SortOrder",
+            Direction orderDirection = Direction.Ascending,
+            string filter = "")
+        {
+            int intId;
+
+            if (int.TryParse(id, out intId))
+            {
+                return GetPagedChildren(intId, type, pageNumber, pageSize, orderBy, orderDirection, filter);
+            }
+
+            Guid guidId;
+            if (Guid.TryParse(id, out guidId))
+            {
+                //Not supported currently
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+
+            Udi udiId;
+            if (Udi.TryParse(id, out udiId))
+            {
+                //Not supported currently
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+
+            //so we don't have an INT, GUID or UDI, it's just a string, so now need to check if it's a special id or a member type
+            if (id == Constants.Conventions.MemberTypes.AllMembersListId)
+            {
+                //the EntityService can search paged members from the root
+
+                intId = -1;
+                return GetPagedChildren(intId, type, pageNumber, pageSize, orderBy, orderDirection, filter);
+            }
+
+            //the EntityService cannot search members of a certain type, this is currently not supported and would require
+            //quite a bit of plumbing to do in the Services/Repository, we'll revert to a paged search
+
+            long total;
+            var searchResult = _treeSearcher.ExamineSearch(Umbraco, filter ?? "", type, pageSize, pageNumber - 1, out total, id);
+
+            return new PagedResult<EntityBasic>(total, pageNumber, pageSize)
+            {
+                Items = searchResult
+            };
+        }
+
+        /// <summary>
+        /// Get paged child entities by id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="type"></param>
+        /// <param name="pageNumber"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="orderBy"></param>
+        /// <param name="orderDirection"></param>
+        /// <param name="filter"></param>
+        /// <returns></returns>
+        public PagedResult<EntityBasic> GetPagedChildren(
+            int id,
+            UmbracoEntityTypes type,
+            int pageNumber,
+            int pageSize,
+            string orderBy = "SortOrder",
+            Direction orderDirection = Direction.Ascending,
+            string filter = "")
+        {
+            if (pageNumber <= 0)
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            if (pageSize <= 0)
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+
+            var objectType = ConvertToObjectType(type);
+            if (objectType.HasValue)
+            {
+                long totalRecords;
+                var entities = Services.EntityService.GetPagedChildren(id, objectType.Value, pageNumber - 1, pageSize, out totalRecords, orderBy, orderDirection, filter);
+
+                if (totalRecords == 0)
+                {
+                    return new PagedResult<EntityBasic>(0, 0, 0);
+                }
+
+                var pagedResult = new PagedResult<EntityBasic>(totalRecords, pageNumber, pageSize)
+                {
+                    Items = entities.Select(Mapper.Map<EntityBasic>)
+                };
+
+                return pagedResult;
+            }
+
+            //now we need to convert the unknown ones
+            switch (type)
+            {
+                case UmbracoEntityTypes.PropertyType:
+                case UmbracoEntityTypes.PropertyGroup:
+                case UmbracoEntityTypes.Domain:
+                case UmbracoEntityTypes.Language:
+                case UmbracoEntityTypes.User:
+                case UmbracoEntityTypes.Macro:
+                default:
+                    throw new NotSupportedException("The " + typeof(EntityController) + " does not currently support data for the type " + type);
+            }
+        }
+
+        [Obsolete("This method is obsolete, use the overload with dataTypeId instead", false)]
+        public PagedResult<EntityBasic> GetPagedDescendants(
+            int id,
+            UmbracoEntityTypes type,
+            int pageNumber,
+            int pageSize,
+            string orderBy = "SortOrder",
+            Direction orderDirection = Direction.Ascending,
+            string filter = "")
+        {
+            return GetPagedDescendants(id, type, pageNumber, pageSize,
+                null, orderBy, orderDirection, filter);
+        }
+
+        public PagedResult<EntityBasic> GetPagedDescendants(
+            int id,
+            UmbracoEntityTypes type,
+            int pageNumber,
+            int pageSize,
+            Guid? dataTypeId,
+            string orderBy = "SortOrder",
+            Direction orderDirection = Direction.Ascending,
+            string filter = "")
+        {
+            if (pageNumber <= 0)
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            if (pageSize <= 0)
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+
+            var objectType = ConvertToObjectType(type);
+            if (objectType.HasValue)
+            {
+                IEnumerable<IUmbracoEntity> entities;
+                long totalRecords;
+
+                if (id == Constants.System.Root)
+                {
+                    // root is special: we reduce it to start nodes
+
+                    int[] aids = null;
+                    switch (type)
+                    {
+                        case UmbracoEntityTypes.Document:
+                            aids = Security.CurrentUser.CalculateContentStartNodeIds(Services.EntityService);
+                            break;
+                        case UmbracoEntityTypes.Media:
+                            aids = Security.CurrentUser.CalculateMediaStartNodeIds(Services.EntityService);
+                            break;
+                    }
+
+                    var ignoreUserStartNodes = IsDataTypeIgnoringUserStartNodes(dataTypeId);
+                    entities = aids == null || aids.Contains(Constants.System.Root) || ignoreUserStartNodes
+                        ? Services.EntityService.GetPagedDescendantsFromRoot(objectType.Value, pageNumber - 1, pageSize, out totalRecords, orderBy, orderDirection, filter, includeTrashed: false)
+                        : Services.EntityService.GetPagedDescendants(aids, objectType.Value, pageNumber - 1, pageSize, out totalRecords, orderBy, orderDirection, filter);
+                }
+                else
+                {
+                    entities = Services.EntityService.GetPagedDescendants(id, objectType.Value, pageNumber - 1, pageSize, out totalRecords, orderBy, orderDirection, filter);
+                }
+
+                if (totalRecords == 0)
+                {
+                    return new PagedResult<EntityBasic>(0, 0, 0);
+                }
+
+                var pagedResult = new PagedResult<EntityBasic>(totalRecords, pageNumber, pageSize)
+                {
+                    Items = entities.Select(Mapper.Map<EntityBasic>)
+                };
+
+                return pagedResult;
+            }
+
+            //now we need to convert the unknown ones
+            switch (type)
+            {
+                case UmbracoEntityTypes.PropertyType:
+                case UmbracoEntityTypes.PropertyGroup:
+                case UmbracoEntityTypes.Domain:
+                case UmbracoEntityTypes.Language:
+                case UmbracoEntityTypes.User:
+                case UmbracoEntityTypes.Macro:
+                default:
+                    throw new NotSupportedException("The " + typeof(EntityController) + " does not currently support data for the type " + type);
+            }
+        }
+
+        private bool IsDataTypeIgnoringUserStartNodes(Guid? dataTypeId) => dataTypeId.HasValue && Services.DataTypeService.IsDataTypeIgnoringUserStartNodes(dataTypeId.Value);
+
+        [Obsolete("This method is obsolete, use the overload with dataTypeId instead", false)]
+        public IEnumerable<EntityBasic> GetAncestors(int id, UmbracoEntityTypes type)
+        {
+            return GetResultForAncestors(id, type, null);
+        }
+
+        public IEnumerable<EntityBasic> GetAncestors(int id, UmbracoEntityTypes type, Guid? dataTypeId)
+        {
+            return GetResultForAncestors(id, type, dataTypeId);
+        }
+
+        public IEnumerable<EntityBasic> GetAll(UmbracoEntityTypes type, string postFilter, [FromUri]IDictionary<string, object> postFilterParams)
+        {
+            return GetResultForAll(type, postFilter, postFilterParams);
+        }
+
+        /// <summary>
+        /// Searches for results based on the entity type
+        /// </summary>
+        /// <param name="query"></param>
+        /// <param name="entityType"></param>
+        /// <param name="searchFrom"></param>
+        /// <param name="ignoreUserStartNodes">If set to true, user and group start node permissions will be ignored.</param>
+        /// <returns></returns>
+        private IEnumerable<SearchResultItem> ExamineSearch(string query, UmbracoEntityTypes entityType, string searchFrom = null, bool ignoreUserStartNodes = false)
+        {
+            long total;
+            return _treeSearcher.ExamineSearch(Umbraco, query, entityType, 200, 0, out total, ignoreUserStartNodes, searchFrom);
+        }
+
+
+        private IEnumerable<EntityBasic> GetResultForChildren(int id, UmbracoEntityTypes entityType)
+        {
+            var objectType = ConvertToObjectType(entityType);
+            if (objectType.HasValue)
+            {
+                //TODO: Need to check for Object types that support hierarchic here, some might not.
+
+                return Services.EntityService.GetChildren(id, objectType.Value)
+                    .WhereNotNull()
+                    .Select(Mapper.Map<EntityBasic>);
+            }
+            //now we need to convert the unknown ones
+            switch (entityType)
+            {
+                case UmbracoEntityTypes.Domain:
+                case UmbracoEntityTypes.Language:
+                case UmbracoEntityTypes.User:
+                case UmbracoEntityTypes.Macro:
+                default:
+                    throw new NotSupportedException("The " + typeof(EntityController) + " does not currently support data for the type " + entityType);
+            }
+        }
+
+        private IEnumerable<EntityBasic> GetResultForAncestors(int id, UmbracoEntityTypes entityType, Guid? dataTypeId = null)
+        {
+            var objectType = ConvertToObjectType(entityType);
+            if (objectType.HasValue)
+            {
+                //TODO: Need to check for Object types that support hierarchic here, some might not.
+
+                var ids = Services.EntityService.Get(id).Path.Split(',').Select(int.Parse).Distinct().ToArray();
+
+                var ignoreUserStartNodes = IsDataTypeIgnoringUserStartNodes(dataTypeId);
+                if (ignoreUserStartNodes == false)
+                {
+                    int[] aids = null;
+                    switch (entityType)
+                    {
+                        case UmbracoEntityTypes.Document:
+                            aids = Security.CurrentUser.CalculateContentStartNodeIds(Services.EntityService);
+                            break;
+                        case UmbracoEntityTypes.Media:
+                            aids = Security.CurrentUser.CalculateMediaStartNodeIds(Services.EntityService);
+                            break;
+                    }
+
+                    if (aids != null)
+                    {
+                        var lids = new List<int>();
+                        var ok = false;
+                        foreach (var i in ids)
+                        {
+                            if (ok)
+                            {
+                                lids.Add(i);
+                                continue;
+                            }
+                            if (aids.Contains(i))
+                            {
+                                lids.Add(i);
+                                ok = true;
+                            }
+                        }
+                        ids = lids.ToArray();
+                    }
+                }
+
+                return ids.Length == 0
+                    ? Enumerable.Empty<EntityBasic>()
+                    : Services.EntityService.GetAll(objectType.Value, ids)
+                        .WhereNotNull()
+                        .OrderBy(x => x.Level)
+                        .Select(Mapper.Map<EntityBasic>);
+            }
+            //now we need to convert the unknown ones
+            switch (entityType)
+            {
+                case UmbracoEntityTypes.PropertyType:
+                case UmbracoEntityTypes.PropertyGroup:
+                case UmbracoEntityTypes.Domain:
+                case UmbracoEntityTypes.Language:
+                case UmbracoEntityTypes.User:
+                case UmbracoEntityTypes.Macro:
+                default:
+                    throw new NotSupportedException("The " + typeof(EntityController) + " does not currently support data for the type " + entityType);
+            }
+        }
+
+        /// <summary>
+        /// Gets the result for the entity list based on the type
+        /// </summary>
+        /// <param name="entityType"></param>
+        /// <param name="postFilter">A string where filter that will filter the results dynamically with linq - optional</param>
+        /// <param name="postFilterParams">the parameters to fill in the string where filter - optional</param>
+        /// <returns></returns>
+        private IEnumerable<EntityBasic> GetResultForAll(UmbracoEntityTypes entityType, string postFilter = null, IDictionary<string, object> postFilterParams = null)
+        {
+            var objectType = ConvertToObjectType(entityType);
+            if (objectType.HasValue)
+            {
+                //TODO: Should we order this by something ?
+                var entities = Services.EntityService.GetAll(objectType.Value).WhereNotNull().Select(Mapper.Map<EntityBasic>);
+                return ExecutePostFilter(entities, postFilter, postFilterParams);
+            }
+            //now we need to convert the unknown ones
+            switch (entityType)
+            {
+                case UmbracoEntityTypes.Template:
+                    var templates = Services.FileService.GetTemplates();
+                    var filteredTemplates = ExecutePostFilter(templates, postFilter, postFilterParams);
+                    return filteredTemplates.Select(Mapper.Map<EntityBasic>);
+
+                case UmbracoEntityTypes.Macro:
+                    //Get all macros from the macro service
+                    var macros = Services.MacroService.GetAll().WhereNotNull().OrderBy(x => x.Name);
+                    var filteredMacros = ExecutePostFilter(macros, postFilter, postFilterParams);
+                    return filteredMacros.Select(Mapper.Map<EntityBasic>);
+
+                case UmbracoEntityTypes.PropertyType:
+
+                    //get all document types, then combine all property types into one list
+                    var propertyTypes = Services.ContentTypeService.GetAllContentTypes().Cast<IContentTypeComposition>()
+                                                .Concat(Services.ContentTypeService.GetAllMediaTypes())
+                                                .ToArray()
+                                                .SelectMany(x => x.PropertyTypes)
+                                                .DistinctBy(composition => composition.Alias);
+                    var filteredPropertyTypes = ExecutePostFilter(propertyTypes, postFilter, postFilterParams);
+                    return Mapper.Map<IEnumerable<PropertyType>, IEnumerable<EntityBasic>>(filteredPropertyTypes);
+
+                case UmbracoEntityTypes.PropertyGroup:
+
+                    //get all document types, then combine all property types into one list
+                    var propertyGroups = Services.ContentTypeService.GetAllContentTypes().Cast<IContentTypeComposition>()
+                                                .Concat(Services.ContentTypeService.GetAllMediaTypes())
+                                                .ToArray()
+                                                .SelectMany(x => x.PropertyGroups)
+                                                .DistinctBy(composition => composition.Name);
+                    var filteredpropertyGroups = ExecutePostFilter(propertyGroups, postFilter, postFilterParams);
+                    return Mapper.Map<IEnumerable<PropertyGroup>, IEnumerable<EntityBasic>>(filteredpropertyGroups);
+
+                case UmbracoEntityTypes.User:
+
+                    int total;
+                    var users = Services.UserService.GetAll(0, int.MaxValue, out total);
+                    var filteredUsers = ExecutePostFilter(users, postFilter, postFilterParams);
+                    return Mapper.Map<IEnumerable<IUser>, IEnumerable<EntityBasic>>(filteredUsers);
+
+                case UmbracoEntityTypes.Domain:
+
+                case UmbracoEntityTypes.Language:
+
+                default:
+                    throw new NotSupportedException("The " + typeof(EntityController) + " does not currently support data for the type " + entityType);
+            }
+        }
+
+        private IEnumerable<EntityBasic> GetResultForKeys(Guid[] keys, UmbracoEntityTypes entityType)
+        {
+            if (keys.Length == 0)
+                return Enumerable.Empty<EntityBasic>();
+
+            var objectType = ConvertToObjectType(entityType);
+            if (objectType.HasValue)
+            {
+                var entities = Services.EntityService.GetAll(objectType.Value, keys)
+                    .WhereNotNull()
+                    .Select(Mapper.Map<EntityBasic>);
+
+                // entities are in "some" order, put them back in order
+                var xref = entities.ToDictionary(x => x.Key);
+                var result = keys.Select(x => xref.ContainsKey(x) ? xref[x] : null).Where(x => x != null);
+
+                return result;
+            }
+            //now we need to convert the unknown ones
+            switch (entityType)
+            {
+                case UmbracoEntityTypes.PropertyType:
+                case UmbracoEntityTypes.PropertyGroup:
+                case UmbracoEntityTypes.Domain:
+                case UmbracoEntityTypes.Language:
+                case UmbracoEntityTypes.User:
+                case UmbracoEntityTypes.Macro:
+                default:
+                    throw new NotSupportedException("The " + typeof(EntityController) + " does not currently support data for the type " + entityType);
+            }
+        }
+
+        private IEnumerable<EntityBasic> GetResultForIds(int[] ids, UmbracoEntityTypes entityType)
+        {
+            if (ids.Length == 0)
+                return Enumerable.Empty<EntityBasic>();
+
+            var objectType = ConvertToObjectType(entityType);
+            if (objectType.HasValue)
+            {
+                var entities = Services.EntityService.GetAll(objectType.Value, ids)
+                    .WhereNotNull()
+                    .Select(Mapper.Map<EntityBasic>);
+
+                // entities are in "some" order, put them back in order
+                var xref = entities.ToDictionary(x => x.Id);
+                var result = ids.Select(x => xref.ContainsKey(x) ? xref[x] : null).Where(x => x != null);
+
+                return result;
+            }
+            //now we need to convert the unknown ones
+            switch (entityType)
+            {
+                case UmbracoEntityTypes.PropertyType:
+                case UmbracoEntityTypes.PropertyGroup:
+                case UmbracoEntityTypes.Domain:
+                case UmbracoEntityTypes.Language:
+                case UmbracoEntityTypes.User:
+                case UmbracoEntityTypes.Macro:
+                default:
+                    throw new NotSupportedException("The " + typeof(EntityController) + " does not currently support data for the type " + entityType);
+            }
+        }
+
+        private EntityBasic GetResultForKey(Guid key, UmbracoEntityTypes entityType)
+        {
+            var objectType = ConvertToObjectType(entityType);
+            if (objectType.HasValue)
+            {
+                var found = Services.EntityService.GetByKey(key, objectType.Value);
+                if (found == null)
+                {
+                    throw new HttpResponseException(HttpStatusCode.NotFound);
+                }
+                return Mapper.Map<EntityBasic>(found);
+            }
+            //now we need to convert the unknown ones
+            switch (entityType)
+            {
+                case UmbracoEntityTypes.PropertyType:
+
+                case UmbracoEntityTypes.PropertyGroup:
+
+                case UmbracoEntityTypes.Domain:
+
+                case UmbracoEntityTypes.Language:
+
+                case UmbracoEntityTypes.User:
+
+                case UmbracoEntityTypes.Macro:
+
+                default:
+                    throw new NotSupportedException("The " + typeof(EntityController) + " does not currently support data for the type " + entityType);
+            }
+        }
+
+        private EntityBasic GetResultForId(int id, UmbracoEntityTypes entityType)
+        {
+            var objectType = ConvertToObjectType(entityType);
+            if (objectType.HasValue)
+            {
+                var found = Services.EntityService.Get(id, objectType.Value);
+                if (found == null)
+                {
+                    throw new HttpResponseException(HttpStatusCode.NotFound);
+                }
+                return Mapper.Map<EntityBasic>(found);
+            }
+            //now we need to convert the unknown ones
+            switch (entityType)
+            {
+                case UmbracoEntityTypes.PropertyType:
+
+                case UmbracoEntityTypes.PropertyGroup:
+
+                case UmbracoEntityTypes.Domain:
+
+                case UmbracoEntityTypes.Language:
+
+                case UmbracoEntityTypes.User:
+
+                case UmbracoEntityTypes.Macro:
+
+                default:
+                    throw new NotSupportedException("The " + typeof(EntityController) + " does not currently support data for the type " + entityType);
+            }
+        }
+
+        private static UmbracoObjectTypes? ConvertToObjectType(UmbracoEntityTypes entityType)
+        {
+            switch (entityType)
+            {
+                case UmbracoEntityTypes.Document:
+                    return UmbracoObjectTypes.Document;
+                case UmbracoEntityTypes.Media:
+                    return UmbracoObjectTypes.Media;
+                case UmbracoEntityTypes.MemberType:
+                    return UmbracoObjectTypes.MediaType;
+                case UmbracoEntityTypes.MemberGroup:
+                    return UmbracoObjectTypes.MemberGroup;
+                case UmbracoEntityTypes.ContentItem:
+                    return UmbracoObjectTypes.ContentItem;
+                case UmbracoEntityTypes.MediaType:
+                    return UmbracoObjectTypes.MediaType;
+                case UmbracoEntityTypes.DocumentType:
+                    return UmbracoObjectTypes.DocumentType;
+                case UmbracoEntityTypes.Stylesheet:
+                    return UmbracoObjectTypes.Stylesheet;
+                case UmbracoEntityTypes.Member:
+                    return UmbracoObjectTypes.Member;
+                case UmbracoEntityTypes.DataType:
+                    return UmbracoObjectTypes.DataType;
+                default:
+                    //There is no UmbracoEntity conversion (things like Macros, Users, etc...)
+                    return null;
+            }
+        }
+
+        /// <summary>
+        /// Executes the post filter against a collection of objects
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="entities"></param>
+        /// <param name="postFilter"></param>
+        /// <param name="postFilterParams"></param>
+        /// <returns></returns>
+        private IEnumerable<T> ExecutePostFilter<T>(IEnumerable<T> entities, string postFilter, IDictionary<string, object> postFilterParams)
+        {
+            //if a post filter is assigned then try to execute it
+            if (postFilter.IsNullOrWhiteSpace() == false)
+            {
+                return postFilterParams == null
+                               ? entities.AsQueryable().Where(postFilter).ToArray()
+                               : entities.AsQueryable().Where(postFilter, postFilterParams).ToArray();
+
+            }
+            return entities;
+        }
+
+    }
+}
diff --git a/src/Umbraco.Web/Editors/MediaController.cs b/src/Umbraco.Web/Editors/MediaController.cs
index 6c0c293572..788ae3a0c7 100644
--- a/src/Umbraco.Web/Editors/MediaController.cs
+++ b/src/Umbraco.Web/Editors/MediaController.cs
@@ -1,1014 +1,1017 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.IO;
-using System.Net;
-using System.Net.Http;
-using System.Net.Http.Formatting;
-using System.Text;
-using System.Threading.Tasks;
-using System.Web.Http;
-using System.Web.Http.ModelBinding;
-using AutoMapper;
-using Umbraco.Core;
-using Umbraco.Core.IO;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.Membership;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
-using Umbraco.Core.Services;
-using Umbraco.Web.Models.ContentEditing;
-using Umbraco.Web.Models.Mapping;
-using Umbraco.Web.Mvc;
-using Umbraco.Web.WebApi;
-using System.Linq;
-using System.Web.Http.Controllers;
-using Umbraco.Web.WebApi.Binders;
-using Umbraco.Web.WebApi.Filters;
-using Constants = Umbraco.Core.Constants;
-using Umbraco.Core.Configuration;
-using Umbraco.Web.UI;
-using Notification = Umbraco.Web.Models.ContentEditing.Notification;
-using Umbraco.Core.Persistence;
-using Umbraco.Core.Configuration.UmbracoSettings;
-
-namespace Umbraco.Web.Editors
-{
-    /// <remarks>
-    /// This controller is decorated with the UmbracoApplicationAuthorizeAttribute which means that any user requesting
-    /// access to ALL of the methods on this controller will need access to the media application.
-    /// </remarks>
-    [PluginController("UmbracoApi")]
-    [UmbracoApplicationAuthorize(Constants.Applications.Media)]
-    [MediaControllerControllerConfiguration]
-    public class MediaController : ContentControllerBase
-    {
-        /// <summary>
-        /// Configures this controller with a custom action selector
-        /// </summary>
-        private class MediaControllerControllerConfigurationAttribute : Attribute, IControllerConfiguration
-        {
-            public void Initialize(HttpControllerSettings controllerSettings, HttpControllerDescriptor controllerDescriptor)
-            {
-                controllerSettings.Services.Replace(typeof(IHttpActionSelector), new ParameterSwapControllerActionSelector(
-                    new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetById", "id", typeof(int), typeof(Guid), typeof(Udi)),
-                    new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetChildren", "id", typeof(int), typeof(Guid), typeof(Udi), typeof(string))));
-            }
-        }
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        public MediaController()
-            : this(UmbracoContext.Current)
-        {
-        }
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="umbracoContext"></param>
-        public MediaController(UmbracoContext umbracoContext)
-            : base(umbracoContext)
-        {
-        }
-
-        /// <summary>
-        /// Gets an empty content item for the
-        /// </summary>
-        /// <param name="contentTypeAlias"></param>
-        /// <param name="parentId"></param>
-        /// <returns></returns>
-        [OutgoingEditorModelEvent]
-        public MediaItemDisplay GetEmpty(string contentTypeAlias, int parentId)
-        {
-            var contentType = Services.ContentTypeService.GetMediaType(contentTypeAlias);
-            if (contentType == null)
-            {
-                throw new HttpResponseException(HttpStatusCode.NotFound);
-            }
-
-            var emptyContent = Services.MediaService.CreateMedia("", parentId, contentType.Alias, Security.CurrentUser.Id);
-            var mapped = AutoMapperExtensions.MapWithUmbracoContext<IMedia, MediaItemDisplay>(emptyContent, UmbracoContext);
-
-            //remove this tab if it exists: umbContainerView
-            var containerTab = mapped.Tabs.FirstOrDefault(x => x.Alias == Constants.Conventions.PropertyGroups.ListViewGroupName);
-            mapped.Tabs = mapped.Tabs.Except(new[] { containerTab });
-            return mapped;
-        }
-
-        /// <summary>
-        /// Returns an item to be used to display the recycle bin for media
-        /// </summary>
-        /// <returns></returns>
-        public ContentItemDisplay GetRecycleBin()
-        {
-            var display = new ContentItemDisplay
-            {
-                Id = Constants.System.RecycleBinMedia,
-                Alias = "recycleBin",
-                ParentId = -1,
-                Name = Services.TextService.Localize("general/recycleBin"),
-                ContentTypeAlias = "recycleBin",
-                CreateDate = DateTime.Now,
-                IsContainer = true,
-                Path = "-1," + Constants.System.RecycleBinMedia
-            };
-
-            TabsAndPropertiesResolver<IMedia>.AddListView(display, "media", Services.DataTypeService, Services.TextService);
-
-            return display;
-        }
-
-        /// <summary>
-        /// Gets the media item by id
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        [OutgoingEditorModelEvent]
-        [EnsureUserPermissionForMedia("id")]
-        public MediaItemDisplay GetById(int id)
-        {
-            var foundContent = GetObjectFromRequest(() => Services.MediaService.GetById(id));
-
-            if (foundContent == null)
-            {
-                HandleContentNotFound(id);
-                //HandleContentNotFound will throw an exception
-                return null;
-            }
-            return AutoMapperExtensions.MapWithUmbracoContext<IMedia, MediaItemDisplay>(foundContent, UmbracoContext);
-        }
-
-        /// <summary>
-        /// Gets the media item by id
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        [OutgoingEditorModelEvent]
-        [EnsureUserPermissionForMedia("id")]
-        public MediaItemDisplay GetById(Guid id)
-        {
-            var foundContent = GetObjectFromRequest(() => Services.MediaService.GetById(id));
-
-            if (foundContent == null)
-            {
-                HandleContentNotFound(id);
-                //HandleContentNotFound will throw an exception
-                return null;
-            }
-            return AutoMapperExtensions.MapWithUmbracoContext<IMedia, MediaItemDisplay>(foundContent, UmbracoContext);
-        }
-
-        /// <summary>
-        /// Gets the media item by id
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        [OutgoingEditorModelEvent]
-        [EnsureUserPermissionForMedia("id")]
-        public MediaItemDisplay GetById(Udi id)
-        {
-            var guidUdi = id as GuidUdi;
-            if (guidUdi != null)
-            {
-                return GetById(guidUdi.Guid);
-            }
-            throw new HttpResponseException(HttpStatusCode.NotFound);
-        }
-
-        /// <summary>
-        /// Return media for the specified ids
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <returns></returns>
-        [FilterAllowedOutgoingMedia(typeof(IEnumerable<MediaItemDisplay>))]
-        public IEnumerable<MediaItemDisplay> GetByIds([FromUri]int[] ids)
-        {
-            var foundMedia = Services.MediaService.GetByIds(ids);
-            return foundMedia.Select(media => AutoMapperExtensions.MapWithUmbracoContext<IMedia, MediaItemDisplay>(media, UmbracoContext));
-        }
-
-        /// <summary>
-        /// Returns media items known to be of a "Folder" type
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        [Obsolete("This is no longer used and shouldn't be because it performs poorly when there are a lot of media items")]
-        [FilterAllowedOutgoingMedia(typeof(IEnumerable<ContentItemBasic<ContentPropertyBasic, IMedia>>))]
-        public IEnumerable<ContentItemBasic<ContentPropertyBasic, IMedia>> GetChildFolders(int id = -1)
-        {
-            //we are only allowing a max of 500 to be returned here, if more is required it needs to be paged
-            var result = GetChildFolders(id, 1, 500);
-            return result.Items;
-        }
-
-        /// <summary>
-        /// Returns a paged result of media items known to be of a "Folder" type
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="pageNumber"></param>
-        /// <param name="pageSize"></param>
-        /// <returns></returns>
-        public PagedResult<ContentItemBasic<ContentPropertyBasic, IMedia>> GetChildFolders(int id, int pageNumber, int pageSize)
-        {
-            //Suggested convention for folder mediatypes - we can make this more or less complicated as long as we document it...
-            //if you create a media type, which has an alias that ends with ...Folder then its a folder: ex: "secureFolder", "bannerFolder", "Folder"
-            var folderTypes = Services.ContentTypeService
-                .GetAllMediaTypes()
-                .Where(x => x.Alias.EndsWith("Folder"))
-                .Select(x => x.Id)
-                .ToArray();
-
-            if (folderTypes.Length == 0)
-            {
-                return new PagedResult<ContentItemBasic<ContentPropertyBasic, IMedia>>(0, pageNumber, pageSize);
-            }
-
-            long total;
-            var children = Services.MediaService.GetPagedChildren(id, pageNumber - 1, pageSize, out total, "Name", Direction.Ascending, true, null, folderTypes.ToArray());
-
-            return new PagedResult<ContentItemBasic<ContentPropertyBasic, IMedia>>(total, pageNumber, pageSize)
-            {
-                Items = children.Select(Mapper.Map<IMedia, ContentItemBasic<ContentPropertyBasic, IMedia>>)
-            };
-        }
-
-        /// <summary>
-        /// Returns the root media objects
-        /// </summary>
-        [FilterAllowedOutgoingMedia(typeof(IEnumerable<ContentItemBasic<ContentPropertyBasic, IMedia>>))]
-        public IEnumerable<ContentItemBasic<ContentPropertyBasic, IMedia>> GetRootMedia()
-        {
-            //TODO: Add permissions check!
-
-            return Services.MediaService.GetRootMedia()
-                           .Select(Mapper.Map<IMedia, ContentItemBasic<ContentPropertyBasic, IMedia>>);
-        }
-
-        #region GetChildren
-
-        private int[] _userStartNodes;
-        protected int[] UserStartNodes
-        {
-            get { return _userStartNodes ?? (_userStartNodes = Security.CurrentUser.CalculateMediaStartNodeIds(Services.EntityService)); }
-        }
-
-        /// <summary>
-        /// Returns the child media objects - using the entity INT id
-        /// </summary>
-        [FilterAllowedOutgoingMedia(typeof(IEnumerable<ContentItemBasic<ContentPropertyBasic, IMedia>>), "Items")]
-        public PagedResult<ContentItemBasic<ContentPropertyBasic, IMedia>> GetChildren(int id,
-            int pageNumber = 0,
-            int pageSize = 0,
-            string orderBy = "SortOrder",
-            Direction orderDirection = Direction.Ascending,
-            bool orderBySystemField = true,
-            string filter = "",
-            bool ignoreUserStartNodes = false)
-        {
-            //if a request is made for the root node data but the user's start node is not the default, then
-            // we need to return their start nodes
-            if (id == Constants.System.Root && UserStartNodes.Length > 0 && (UserStartNodes.Contains(Constants.System.Root) == false && ignoreUserStartNodes == false))
-            {
-                if (pageNumber > 0)
-                    return new PagedResult<ContentItemBasic<ContentPropertyBasic, IMedia>>(0, 0, 0);
-                var nodes = Services.MediaService.GetByIds(UserStartNodes).ToArray();
-                if (nodes.Length == 0)
-                    return new PagedResult<ContentItemBasic<ContentPropertyBasic, IMedia>>(0, 0, 0);
-                if (pageSize < nodes.Length) pageSize = nodes.Length; // bah
-                var pr = new PagedResult<ContentItemBasic<ContentPropertyBasic, IMedia>>(nodes.Length, pageNumber, pageSize)
-                {
-                    Items = nodes.Select(Mapper.Map<IMedia, ContentItemBasic<ContentPropertyBasic, IMedia>>)
-                };
-                return pr;
-            }
-
-            // else proceed as usual
-
-            long totalChildren;
-            IMedia[] children;
-            if (pageNumber > 0 && pageSize > 0)
-            {
-                children = Services.MediaService
-                 .GetPagedChildren(id, (pageNumber - 1), pageSize, out totalChildren
-                 , orderBy, orderDirection, orderBySystemField, filter).ToArray();
-            }
-            else
-            {
-                children = Services.MediaService.GetChildren(id).ToArray();
-                totalChildren = children.Length;
-            }
-
-            if (totalChildren == 0)
-            {
-                return new PagedResult<ContentItemBasic<ContentPropertyBasic, IMedia>>(0, 0, 0);
-            }
-
-            var pagedResult = new PagedResult<ContentItemBasic<ContentPropertyBasic, IMedia>>(totalChildren, pageNumber, pageSize);
-            pagedResult.Items = children
-                .Select(Mapper.Map<IMedia, ContentItemBasic<ContentPropertyBasic, IMedia>>);
-
-            return pagedResult;
-        }
-
-        /// <summary>
-        /// This method is obsolete, use the overload with ignoreUserStartNodes instead
-        /// Returns the child media objects - using the entity GUID id
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="pageNumber"></param>
-        /// <param name="pageSize"></param>
-        /// <param name="orderBy"></param>
-        /// <param name="orderDirection"></param>
-        /// <param name="orderBySystemField"></param>
-        /// <param name="filter"></param>
-        /// <returns></returns>
-        [Obsolete("This method is obsolete, use the overload with ignoreUserStartNodes instead", false)]
-        [FilterAllowedOutgoingMedia(typeof(IEnumerable<ContentItemBasic<ContentPropertyBasic, IMedia>>), "Items")]
-        public PagedResult<ContentItemBasic<ContentPropertyBasic, IMedia>> GetChildren(Guid id,
-           int pageNumber = 0,
-           int pageSize = 0,
-           string orderBy = "SortOrder",
-           Direction orderDirection = Direction.Ascending,
-           bool orderBySystemField = true,
-           string filter = "")
-        {
-            return GetChildren(id, false, pageNumber, pageSize, orderBy, orderDirection, orderBySystemField, filter);
-        }
-
-        /// <summary>
-        /// Returns the child media objects - using the entity GUID id
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="pageNumber"></param>
-        /// <param name="pageSize"></param>
-        /// <param name="orderBy"></param>
-        /// <param name="orderDirection"></param>
-        /// <param name="orderBySystemField"></param>
-        /// <param name="filter"></param>
-        /// <param name="ignoreUserStartNodes">If set to true, user and group start node permissions will be ignored.</param>
-        /// <returns></returns>
-        [FilterAllowedOutgoingMedia(typeof(IEnumerable<ContentItemBasic<ContentPropertyBasic, IMedia>>), "Items")]
-        public PagedResult<ContentItemBasic<ContentPropertyBasic, IMedia>> GetChildren(Guid id,
-           bool ignoreUserStartNodes,
-           int pageNumber = 0,
-           int pageSize = 0,
-           string orderBy = "SortOrder",
-           Direction orderDirection = Direction.Ascending,
-           bool orderBySystemField = true,
-           string filter = "")
-        {
-            var entity = Services.EntityService.GetByKey(id);
-            if (entity != null)
-            {
-                return GetChildren(entity.Id, pageNumber, pageSize, orderBy, orderDirection, orderBySystemField, filter, ignoreUserStartNodes);
-            }
-            throw new HttpResponseException(HttpStatusCode.NotFound);
-        }
-
-        /// <summary>
-        /// This method is obsolete, use the overload with ignoreUserStartNodes instead
-        /// Returns the child media objects - using the entity UDI id
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="pageNumber"></param>
-        /// <param name="pageSize"></param>
-        /// <param name="orderBy"></param>
-        /// <param name="orderDirection"></param>
-        /// <param name="orderBySystemField"></param>
-        /// <param name="filter"></param>
-        /// <returns></returns>
-        [Obsolete("This method is obsolete, use the overload with ignoreUserStartNodes instead", false)]
-        [FilterAllowedOutgoingMedia(typeof(IEnumerable<ContentItemBasic<ContentPropertyBasic, IMedia>>), "Items")]
-        public PagedResult<ContentItemBasic<ContentPropertyBasic, IMedia>> GetChildren(Udi id,
-           int pageNumber = 0,
-           int pageSize = 0,
-           string orderBy = "SortOrder",
-           Direction orderDirection = Direction.Ascending,
-           bool orderBySystemField = true,
-           string filter = "")
-        {
-            return GetChildren(id, false, pageNumber, pageSize, orderBy, orderDirection, orderBySystemField, filter);
-        }
-
-        /// <summary>
-        /// Returns the child media objects - using the entity UDI id
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="pageNumber"></param>
-        /// <param name="pageSize"></param>
-        /// <param name="orderBy"></param>
-        /// <param name="orderDirection"></param>
-        /// <param name="orderBySystemField"></param>
-        /// <param name="filter"></param>
-        /// <param name="ignoreUserStartNodes">If set to true, user and group start node permissions will be ignored.</param>
-        /// <returns></returns>
-        [FilterAllowedOutgoingMedia(typeof(IEnumerable<ContentItemBasic<ContentPropertyBasic, IMedia>>), "Items")]
-        public PagedResult<ContentItemBasic<ContentPropertyBasic, IMedia>> GetChildren(Udi id,
-           bool ignoreUserStartNodes,
-           int pageNumber = 0,
-           int pageSize = 0,
-           string orderBy = "SortOrder",
-           Direction orderDirection = Direction.Ascending,
-           bool orderBySystemField = true,
-           string filter = "")
-        {
-            var guidUdi = id as GuidUdi;
-            if (guidUdi != null)
-            {
-                var entity = Services.EntityService.GetByKey(guidUdi.Guid);
-                if (entity != null)
-                {
-                    return GetChildren(entity.Id, pageNumber, pageSize, orderBy, orderDirection, orderBySystemField, filter, ignoreUserStartNodes);
-                }
-            }
-
-            throw new HttpResponseException(HttpStatusCode.NotFound);
-        }
-
-        [Obsolete("Do not use this method, use either the overload with INT or GUID instead, this will be removed in future versions")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        [UmbracoTreeAuthorize(Constants.Trees.MediaTypes, Constants.Trees.Media)]
-        public PagedResult<ContentItemBasic<ContentPropertyBasic, IMedia>> GetChildren(string id,
-           int pageNumber = 0,
-           int pageSize = 0,
-           string orderBy = "SortOrder",
-           Direction orderDirection = Direction.Ascending,
-           bool orderBySystemField = true,
-           string filter = "",
-           bool ignoreUserStartNodes = false)
-        {
-            foreach (var type in new[] { typeof(int), typeof(Guid) })
-            {
-                var parsed = id.TryConvertTo(type);
-                if (parsed)
-                {
-                    //oooh magic! will auto select the right overload
-                    return GetChildren((dynamic)parsed.Result);
-                }
-            }
-
-            throw new HttpResponseException(HttpStatusCode.NotFound);
-        }
-        #endregion
-
-        /// <summary>
-        /// Moves an item to the recycle bin, if it is already there then it will permanently delete it
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        [EnsureUserPermissionForMedia("id")]
-        [HttpPost]
-        public HttpResponseMessage DeleteById(int id)
-        {
-            var foundMedia = GetObjectFromRequest(() => Services.MediaService.GetById(id));
-
-            if (foundMedia == null)
-            {
-                return HandleContentNotFound(id, false);
-            }
-
-            //if the current item is in the recycle bin
-            if (foundMedia.IsInRecycleBin() == false)
-            {
-                var moveResult = Services.MediaService.WithResult().MoveToRecycleBin(foundMedia, Security.CurrentUser.Id);
-                if (moveResult == false)
-                {
-                    //returning an object of INotificationModel will ensure that any pending
-                    // notification messages are added to the response.
-                    return Request.CreateValidationErrorResponse(new SimpleNotificationModel());
-                }
-            }
-            else
-            {
-                var deleteResult = Services.MediaService.WithResult().Delete(foundMedia, Security.CurrentUser.Id);
-                if (deleteResult == false)
-                {
-                    //returning an object of INotificationModel will ensure that any pending
-                    // notification messages are added to the response.
-                    return Request.CreateValidationErrorResponse(new SimpleNotificationModel());
-                }
-            }
-
-            return Request.CreateResponse(HttpStatusCode.OK);
-        }
-
-        /// <summary>
-        /// Change the sort order for media
-        /// </summary>
-        /// <param name="move"></param>
-        /// <returns></returns>
-        [EnsureUserPermissionForMedia("move.Id")]
-        public HttpResponseMessage PostMove(MoveOrCopy move)
-        {
-            var toMove = ValidateMoveOrCopy(move);
-            var destinationParentID = move.ParentId;
-            var sourceParentID = toMove.ParentId;
-            
-            var moveResult = Services.MediaService.WithResult().Move(toMove, move.ParentId, Security.CurrentUser.Id);
-
-            if (sourceParentID == destinationParentID)
-            {
-                return Request.CreateValidationErrorResponse(new SimpleNotificationModel(new Notification("",Services.TextService.Localize("media/moveToSameFolderFailed"),SpeechBubbleIcon.Error)));
-            }
-            if (moveResult == false)
-            {
-                return Request.CreateValidationErrorResponse(new SimpleNotificationModel());
-            }
-            else
-            {
-                var response = Request.CreateResponse(HttpStatusCode.OK);
-                response.Content = new StringContent(toMove.Path, Encoding.UTF8, "application/json");
-                return response;
-            }
-        }
-
-        /// <summary>
-        /// Saves content
-        /// </summary>
-        /// <returns></returns>
-        [FileUploadCleanupFilter]
-        [MediaPostValidate]
-        [OutgoingEditorModelEvent]
-        public MediaItemDisplay PostSave(
-            [ModelBinder(typeof(MediaItemBinder))]
-                MediaItemSave contentItem)
-        {
-            //Recent versions of IE/Edge may send in the full clientside file path instead of just the file name.
-            //To ensure similar behavior across all browsers no matter what they do - we strip the FileName property of all
-            //uploaded files to being *only* the actual file name (as it should be).
-            if (contentItem.UploadedFiles != null && contentItem.UploadedFiles.Any())
-            {
-                foreach (var file in contentItem.UploadedFiles)
-                {
-                    file.FileName = Path.GetFileName(file.FileName);
-                }
-            }
-
-            //If we've reached here it means:
-            // * Our model has been bound
-            // * and validated
-            // * any file attachments have been saved to their temporary location for us to use
-            // * we have a reference to the DTO object and the persisted object
-            // * Permissions are valid
-
-            MapPropertyValues(contentItem);
-
-            //We need to manually check the validation results here because:
-            // * We still need to save the entity even if there are validation value errors
-            // * Depending on if the entity is new, and if there are non property validation errors (i.e. the name is null)
-            //      then we cannot continue saving, we can only display errors
-            // * If there are validation errors and they were attempting to publish, we can only save, NOT publish and display
-            //      a message indicating this
-            if (ModelState.IsValid == false)
-            {
-                if (ValidationHelper.ModelHasRequiredForPersistenceErrors(contentItem)
-                    && (contentItem.Action == ContentSaveAction.SaveNew))
-                {
-                    //ok, so the absolute mandatory data is invalid and it's new, we cannot actually continue!
-                    // add the modelstate to the outgoing object and throw validation response
-                    var forDisplay = AutoMapperExtensions.MapWithUmbracoContext<IMedia, MediaItemDisplay>(contentItem.PersistedContent, UmbracoContext);
-                    forDisplay.Errors = ModelState.ToErrorDictionary();
-                    throw new HttpResponseException(Request.CreateValidationErrorResponse(forDisplay));
-                }
-            }
-
-            //save the item
-            var saveStatus = Services.MediaService.WithResult().Save(contentItem.PersistedContent, Security.CurrentUser.Id);
-
-            //return the updated model
-            var display = AutoMapperExtensions.MapWithUmbracoContext<IMedia, MediaItemDisplay>(contentItem.PersistedContent, UmbracoContext);
-
-            //lasty, if it is not valid, add the modelstate to the outgoing object and throw a 403
-            HandleInvalidModelState(display);
-
-            //put the correct msgs in
-            switch (contentItem.Action)
-            {
-                case ContentSaveAction.Save:
-                case ContentSaveAction.SaveNew:
-                    if (saveStatus.Success)
-                    {
-                        display.AddSuccessNotification(
-                            Services.TextService.Localize("speechBubbles/editMediaSaved"),
-                            Services.TextService.Localize("speechBubbles/editMediaSavedText"));
-                    }
-                    else
-                    {
-                        AddCancelMessage(display);
-
-                        //If the item is new and the operation was cancelled, we need to return a different
-                        // status code so the UI can handle it since it won't be able to redirect since there
-                        // is no Id to redirect to!
-                        if (saveStatus.Result.StatusType == OperationStatusType.FailedCancelledByEvent && IsCreatingAction(contentItem.Action))
-                        {
-                            throw new HttpResponseException(Request.CreateValidationErrorResponse(display));
-                        }
-                    }
-
-                    break;
-            }
-
-            return display;
-        }
-
-        /// <summary>
-        /// Maps the property values to the persisted entity
-        /// </summary>
-        /// <param name="contentItem"></param>
-        protected override void MapPropertyValues<TPersisted>(ContentBaseItemSave<TPersisted> contentItem)
-        {
-            UpdateName(contentItem);
-
-            //use the base method to map the rest of the properties
-            base.MapPropertyValues(contentItem);
-        }
-
-        /// <summary>
-        /// Empties the recycle bin
-        /// </summary>
-        /// <returns></returns>
-        [HttpDelete]
-        [HttpPost]
-        public HttpResponseMessage EmptyRecycleBin()
-        {
-            Services.MediaService.EmptyRecycleBin(Security.CurrentUser.Id);
-
-            return Request.CreateNotificationSuccessResponse(Services.TextService.Localize("defaultdialogs/recycleBinIsEmpty"));
-        }
-
-        /// <summary>
-        /// Change the sort order for media
-        /// </summary>
-        /// <param name="sorted"></param>
-        /// <returns></returns>
-        [EnsureUserPermissionForMedia("sorted.ParentId")]
-        public HttpResponseMessage PostSort(ContentSortOrder sorted)
-        {
-            if (sorted == null)
-            {
-                return Request.CreateResponse(HttpStatusCode.NotFound);
-            }
-
-            //if there's nothing to sort just return ok
-            if (sorted.IdSortOrder.Length == 0)
-            {
-                return Request.CreateResponse(HttpStatusCode.OK);
-            }
-
-            var mediaService = base.ApplicationContext.Services.MediaService;
-            var sortedMedia = new List<IMedia>();
-            try
-            {
-                sortedMedia.AddRange(sorted.IdSortOrder.Select(mediaService.GetById));
-
-                // Save Media with new sort order and update content xml in db accordingly
-                if (mediaService.Sort(sortedMedia) == false)
-                {
-                    LogHelper.Warn<MediaController>("Media sorting failed, this was probably caused by an event being cancelled");
-                    return Request.CreateValidationErrorResponse("Media sorting failed, this was probably caused by an event being cancelled");
-                }
-                return Request.CreateResponse(HttpStatusCode.OK);
-            }
-            catch (Exception ex)
-            {
-                LogHelper.Error<MediaController>("Could not update media sort order", ex);
-                throw;
-            }
-        }
-        
-        public MediaItemDisplay PostAddFolder(PostedFolder folder)
-        {
-            var intParentId = GetParentIdAsInt(folder.ParentId, validatePermissions:true);
-            
-            var mediaService = ApplicationContext.Services.MediaService;
-
-            var f = mediaService.CreateMedia(folder.Name, intParentId, Constants.Conventions.MediaTypes.Folder);
-            mediaService.Save(f, Security.CurrentUser.Id);
-
-            return AutoMapperExtensions.MapWithUmbracoContext<IMedia, MediaItemDisplay>(f, UmbracoContext);
-        }
-
-        /// <summary>
-        /// Used to submit a media file
-        /// </summary>
-        /// <returns></returns>
-        /// <remarks>
-        /// We cannot validate this request with attributes (nicely) due to the nature of the multi-part for data.
-        /// </remarks>
-        [FileUploadCleanupFilter(false)]
-        public async Task<HttpResponseMessage> PostAddFile()
-        {
-            if (Request.Content.IsMimeMultipartContent() == false)
-            {
-                throw new HttpResponseException(HttpStatusCode.UnsupportedMediaType);
-            }
-
-            var root = IOHelper.MapPath("~/App_Data/TEMP/FileUploads");
-            //ensure it exists
-            Directory.CreateDirectory(root);
-            var provider = new MultipartFormDataStreamProvider(root);
-
-            var result = await Request.Content.ReadAsMultipartAsync(provider);
-
-            //must have a file
-            if (result.FileData.Count == 0)
-            {
-                return Request.CreateResponse(HttpStatusCode.NotFound);
-            }
-
-            //get the string json from the request
-            string currentFolderId = result.FormData["currentFolder"];
-            int parentId = GetParentIdAsInt(currentFolderId, validatePermissions: true);
-           
-            var tempFiles = new PostedFiles();
-            var mediaService = ApplicationContext.Services.MediaService;
-            
-            //in case we pass a path with a folder in it, we will create it and upload media to it.
-            if (result.FormData.ContainsKey("path"))
-            {
-
-                var folders = result.FormData["path"].Split('/');
-
-                for (int i = 0; i < folders.Length - 1; i++)
-                {
-                    var folderName = folders[i];
-                    IMedia folderMediaItem;
-
-                    //if uploading directly to media root and not a subfolder
-                    if (parentId == -1)
-                    {
-                        //look for matching folder
-                        folderMediaItem =
-                            mediaService.GetRootMedia().FirstOrDefault(x => x.Name == folderName && x.ContentType.Alias == Constants.Conventions.MediaTypes.Folder);
-                        if (folderMediaItem == null)
-                        {
-                            //if null, create a folder
-                            folderMediaItem = mediaService.CreateMedia(folderName, -1, Constants.Conventions.MediaTypes.Folder);
-                            mediaService.Save(folderMediaItem);
-                        }
-                    }
-                    else
-                    {
-                        //get current parent
-                        var mediaRoot = mediaService.GetById(parentId);
-
-                        //if the media root is null, something went wrong, we'll abort
-                        if (mediaRoot == null)
-                            return Request.CreateErrorResponse(HttpStatusCode.InternalServerError,
-                                "The folder: " + folderName + " could not be used for storing images, its ID: " + parentId +
-                                " returned null");
-
-                        //look for matching folder
-                        folderMediaItem = mediaRoot.Children().FirstOrDefault(x => x.Name == folderName && x.ContentType.Alias == Constants.Conventions.MediaTypes.Folder);
-                        if (folderMediaItem == null)
-                        {
-                            //if null, create a folder
-                            folderMediaItem = mediaService.CreateMedia(folderName, mediaRoot, Constants.Conventions.MediaTypes.Folder);
-                            mediaService.Save(folderMediaItem);
-                        }
-                    }
-                    //set the media root to the folder id so uploaded files will end there.
-                    parentId = folderMediaItem.Id;
-                }
-            }
-
-            //get the files
-            foreach (var file in result.FileData)
-            {
-                var fileName = file.Headers.ContentDisposition.FileName.Trim(new[] { '\"' }).TrimEnd();
-                var safeFileName = fileName.ToSafeFileName();
-                var ext = safeFileName.Substring(safeFileName.LastIndexOf('.') + 1).ToLower();
-
-                if (UmbracoConfig.For.UmbracoSettings().Content.IsFileAllowedForUpload(ext))
-                {
-                    var mediaType = Constants.Conventions.MediaTypes.File;
-
-                    if (result.FormData["contentTypeAlias"] == Constants.Conventions.MediaTypes.AutoSelect)
-                    {
-                        if (UmbracoConfig.For.UmbracoSettings().Content.ImageFileTypes.Contains(ext))
-                        {
-                            mediaType = Constants.Conventions.MediaTypes.Image;
-                        }
-                    }
-                    else
-                    {
-                        mediaType = result.FormData["contentTypeAlias"];
-                    }
-
-                    var mediaItemName = fileName.ToFriendlyName();
-
-                    var f = mediaService.CreateMedia(mediaItemName, parentId, mediaType, Security.CurrentUser.Id);
-
-                    var fileInfo = new FileInfo(file.LocalFileName);
-                    var fs = fileInfo.OpenReadWithRetry();
-                    if (fs == null) throw new InvalidOperationException("Could not acquire file stream");
-                    using (fs)
-                    {
-                        f.SetValue(Constants.Conventions.Media.File, fileName, fs);
-                    }
-
-                    var saveResult = mediaService.WithResult().Save(f, Security.CurrentUser.Id);
-                    if (saveResult == false)
-                    {
-                        AddCancelMessage(tempFiles,
-                            message: Services.TextService.Localize("speechBubbles/operationCancelledText") + " -- " + mediaItemName,
-                            localizeMessage: false);
-                    }
-                    else
-                    {
-                        tempFiles.UploadedFiles.Add(new ContentItemFile
-                        {
-                            FileName = fileName,
-                            PropertyAlias = Constants.Conventions.Media.File,
-                            TempFilePath = file.LocalFileName
-                        });
-                    }
-                }
-                else
-                {
-                    tempFiles.Notifications.Add(new Notification(
-                        Services.TextService.Localize("speechBubbles/operationFailedHeader"),
-                        Services.TextService.Localize("media/disallowedFileType"),
-                        SpeechBubbleIcon.Warning));
-                }
-            }
-
-            //Different response if this is a 'blueimp' request
-            if (Request.GetQueryNameValuePairs().Any(x => x.Key == "origin"))
-            {
-                var origin = Request.GetQueryNameValuePairs().First(x => x.Key == "origin");
-                if (origin.Value == "blueimp")
-                {
-                    return Request.CreateResponse(HttpStatusCode.OK,
-                        tempFiles,
-                        //Don't output the angular xsrf stuff, blue imp doesn't like that
-                        new JsonMediaTypeFormatter());
-                }
-            }
-
-            return Request.CreateResponse(HttpStatusCode.OK, tempFiles);
-        }
-
-        /// <summary>
-        /// Given a parent id which could be a GUID, UDI or an INT, this will resolve the INT
-        /// </summary>
-        /// <param name="parentId"></param>
-        /// <param name="validatePermissions">
-        /// If true, this will check if the current user has access to the resolved integer parent id
-        /// and if that check fails an unauthorized exception will occur
-        /// </param>
-        /// <returns></returns>
-        private int GetParentIdAsInt(string parentId, bool validatePermissions)
-        {
-            int intParentId;
-            GuidUdi parentUdi;
-
-            // test for udi
-            if (GuidUdi.TryParse(parentId, out parentUdi))
-            {
-                parentId = parentUdi.Guid.ToString();
-            }
-
-            //if it's not an INT then we'll check for GUID
-            if (int.TryParse(parentId, out intParentId) == false)
-            {
-                // if a guid then try to look up the entity
-                Guid idGuid;
-                if (Guid.TryParse(parentId, out idGuid))
-                {
-                    var entity = Services.EntityService.GetByKey(idGuid);
-                    if (entity != null)
-                    {
-                        intParentId = entity.Id;
-                    }
-                    else
-                    {
-                        throw new EntityNotFoundException(parentId, "The passed id doesn't exist");
-                    }
-                }
-                else
-                {
-                    throw new HttpResponseException(
-                        Request.CreateValidationErrorResponse("The request was not formatted correctly, the parentId is not an integer, Guid or UDI"));
-                }
-            }
-
-            //ensure the user has access to this folder by parent id!
-            if (validatePermissions && CheckPermissions(
-                    new Dictionary<string, object>(),
-                    Security.CurrentUser,
-                    Services.MediaService,
-                    Services.EntityService,
-                    intParentId) == false)
-            {
-                throw new HttpResponseException(Request.CreateResponse(
-                    HttpStatusCode.Forbidden,
-                    new SimpleNotificationModel(new Notification(
-                        Services.TextService.Localize("speechBubbles/operationFailedHeader"),
-                        Services.TextService.Localize("speechBubbles/invalidUserPermissionsText"),
-                        SpeechBubbleIcon.Warning))));
-            }
-
-            return intParentId;
-        }
-
-        /// <summary>
-        /// Ensures the item can be moved/copied to the new location
-        /// </summary>
-        /// <param name="model"></param>
-        /// <returns></returns>
-        private IMedia ValidateMoveOrCopy(MoveOrCopy model)
-        {
-            if (model == null)
-            {
-                throw new HttpResponseException(HttpStatusCode.NotFound);
-            }
-
-            var mediaService = Services.MediaService;
-            var toMove = mediaService.GetById(model.Id);
-            if (toMove == null)
-            {
-                throw new HttpResponseException(HttpStatusCode.NotFound);
-            }
-            if (model.ParentId < 0)
-            {
-                //cannot move if the content item is not allowed at the root
-                if (toMove.ContentType.AllowedAsRoot == false)
-                {
-                    var notificationModel = new SimpleNotificationModel();
-                    notificationModel.AddErrorNotification(Services.TextService.Localize("moveOrCopy/notAllowedAtRoot"), "");
-                    throw new HttpResponseException(Request.CreateValidationErrorResponse(notificationModel));
-                }
-            }
-            else
-            {
-                var parent = mediaService.GetById(model.ParentId);
-                if (parent == null)
-                {
-                    throw new HttpResponseException(HttpStatusCode.NotFound);
-                }
-
-                //check if the item is allowed under this one
-                if (parent.ContentType.AllowedContentTypes.Select(x => x.Id).ToArray()
-                    .Any(x => x.Value == toMove.ContentType.Id) == false)
-                {
-                    var notificationModel = new SimpleNotificationModel();
-                    notificationModel.AddErrorNotification(Services.TextService.Localize("moveOrCopy/notAllowedByContentType"), "");
-                    throw new HttpResponseException(Request.CreateValidationErrorResponse(notificationModel));
-                }
-
-                // Check on paths
-                if ((string.Format(",{0},", parent.Path)).IndexOf(string.Format(",{0},", toMove.Id), StringComparison.Ordinal) > -1)
-                {
-                    var notificationModel = new SimpleNotificationModel();
-                    notificationModel.AddErrorNotification(Services.TextService.Localize("moveOrCopy/notAllowedByPath"), "");
-                    throw new HttpResponseException(Request.CreateValidationErrorResponse(notificationModel));
-                }
-            }
-
-            return toMove;
-        }
-
-        /// <summary>
-        /// Performs a permissions check for the user to check if it has access to the node based on
-        /// start node and/or permissions for the node
-        /// </summary>
-        /// <param name="storage">The storage to add the content item to so it can be reused</param>
-        /// <param name="user"></param>
-        /// <param name="mediaService"></param>
-        /// <param name="entityService"></param>
-        /// <param name="nodeId">The content to lookup, if the contentItem is not specified</param>
-        /// <param name="media">Specifies the already resolved content item to check against, setting this ignores the nodeId</param>
-        /// <returns></returns>
-        internal static bool CheckPermissions(IDictionary<string, object> storage, IUser user, IMediaService mediaService, IEntityService entityService, int nodeId, IMedia media = null)
-        {
-            if (storage == null) throw new ArgumentNullException("storage");
-            if (user == null) throw new ArgumentNullException("user");
-            if (mediaService == null) throw new ArgumentNullException("mediaService");
-            if (entityService == null) throw new ArgumentNullException("entityService");
-
-            if (media == null && nodeId != Constants.System.Root && nodeId != Constants.System.RecycleBinMedia)
-            {
-                media = mediaService.GetById(nodeId);
-                //put the content item into storage so it can be retreived
-                // in the controller (saves a lookup)
-                storage[typeof(IMedia).ToString()] = media;
-            }
-
-            if (media == null && nodeId != Constants.System.Root && nodeId != Constants.System.RecycleBinMedia)
-            {
-                throw new HttpResponseException(HttpStatusCode.NotFound);
-            }
-
-            var hasPathAccess = (nodeId == Constants.System.Root)
-                ? user.HasMediaRootAccess(entityService)
-                : (nodeId == Constants.System.RecycleBinMedia)
-                    ? user.HasMediaBinAccess(entityService)
-                    : user.HasPathAccess(media, entityService);
-
-            return hasPathAccess;
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.IO;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Formatting;
+using System.Text;
+using System.Threading.Tasks;
+using System.Web.Http;
+using System.Web.Http.ModelBinding;
+using AutoMapper;
+using Umbraco.Core;
+using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.Membership;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
+using Umbraco.Core.Services;
+using Umbraco.Web.Models.ContentEditing;
+using Umbraco.Web.Models.Mapping;
+using Umbraco.Web.Mvc;
+using Umbraco.Web.WebApi;
+using System.Linq;
+using System.Web.Http.Controllers;
+using Umbraco.Web.WebApi.Binders;
+using Umbraco.Web.WebApi.Filters;
+using Constants = Umbraco.Core.Constants;
+using Umbraco.Core.Configuration;
+using Umbraco.Web.UI;
+using Notification = Umbraco.Web.Models.ContentEditing.Notification;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Configuration.UmbracoSettings;
+
+namespace Umbraco.Web.Editors
+{
+    /// <remarks>
+    /// This controller is decorated with the UmbracoApplicationAuthorizeAttribute which means that any user requesting
+    /// access to ALL of the methods on this controller will need access to the media application.
+    /// </remarks>
+    [PluginController("UmbracoApi")]
+    [UmbracoApplicationAuthorize(Constants.Applications.Media)]
+    [MediaControllerControllerConfiguration]
+    public class MediaController : ContentControllerBase
+    {
+        /// <summary>
+        /// Configures this controller with a custom action selector
+        /// </summary>
+        private class MediaControllerControllerConfigurationAttribute : Attribute, IControllerConfiguration
+        {
+            public void Initialize(HttpControllerSettings controllerSettings, HttpControllerDescriptor controllerDescriptor)
+            {
+                controllerSettings.Services.Replace(typeof(IHttpActionSelector), new ParameterSwapControllerActionSelector(
+                    new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetById", "id", typeof(int), typeof(Guid), typeof(Udi)),
+                    new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetChildren", "id", typeof(int), typeof(Guid), typeof(Udi), typeof(string))));
+            }
+        }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public MediaController()
+            : this(UmbracoContext.Current)
+        {
+        }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="umbracoContext"></param>
+        public MediaController(UmbracoContext umbracoContext)
+            : base(umbracoContext)
+        {
+        }
+
+        /// <summary>
+        /// Gets an empty content item for the
+        /// </summary>
+        /// <param name="contentTypeAlias"></param>
+        /// <param name="parentId"></param>
+        /// <returns></returns>
+        [OutgoingEditorModelEvent]
+        public MediaItemDisplay GetEmpty(string contentTypeAlias, int parentId)
+        {
+            var contentType = Services.ContentTypeService.GetMediaType(contentTypeAlias);
+            if (contentType == null)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+
+            var emptyContent = Services.MediaService.CreateMedia("", parentId, contentType.Alias, Security.CurrentUser.Id);
+            var mapped = AutoMapperExtensions.MapWithUmbracoContext<IMedia, MediaItemDisplay>(emptyContent, UmbracoContext);
+
+            //remove this tab if it exists: umbContainerView
+            var containerTab = mapped.Tabs.FirstOrDefault(x => x.Alias == Constants.Conventions.PropertyGroups.ListViewGroupName);
+            mapped.Tabs = mapped.Tabs.Except(new[] { containerTab });
+            return mapped;
+        }
+
+        /// <summary>
+        /// Returns an item to be used to display the recycle bin for media
+        /// </summary>
+        /// <returns></returns>
+        public ContentItemDisplay GetRecycleBin()
+        {
+            var display = new ContentItemDisplay
+            {
+                Id = Constants.System.RecycleBinMedia,
+                Alias = "recycleBin",
+                ParentId = -1,
+                Name = Services.TextService.Localize("general/recycleBin"),
+                ContentTypeAlias = "recycleBin",
+                CreateDate = DateTime.Now,
+                IsContainer = true,
+                Path = "-1," + Constants.System.RecycleBinMedia
+            };
+
+            TabsAndPropertiesResolver<IMedia>.AddListView(display, "media", Services.DataTypeService, Services.TextService);
+
+            return display;
+        }
+
+        /// <summary>
+        /// Gets the media item by id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [OutgoingEditorModelEvent]
+        [EnsureUserPermissionForMedia("id")]
+        public MediaItemDisplay GetById(int id)
+        {
+            var foundContent = GetObjectFromRequest(() => Services.MediaService.GetById(id));
+
+            if (foundContent == null)
+            {
+                HandleContentNotFound(id);
+                //HandleContentNotFound will throw an exception
+                return null;
+            }
+            return AutoMapperExtensions.MapWithUmbracoContext<IMedia, MediaItemDisplay>(foundContent, UmbracoContext);
+        }
+
+        /// <summary>
+        /// Gets the media item by id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [OutgoingEditorModelEvent]
+        [EnsureUserPermissionForMedia("id")]
+        public MediaItemDisplay GetById(Guid id)
+        {
+            var foundContent = GetObjectFromRequest(() => Services.MediaService.GetById(id));
+
+            if (foundContent == null)
+            {
+                HandleContentNotFound(id);
+                //HandleContentNotFound will throw an exception
+                return null;
+            }
+            return AutoMapperExtensions.MapWithUmbracoContext<IMedia, MediaItemDisplay>(foundContent, UmbracoContext);
+        }
+
+        /// <summary>
+        /// Gets the media item by id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [OutgoingEditorModelEvent]
+        [EnsureUserPermissionForMedia("id")]
+        public MediaItemDisplay GetById(Udi id)
+        {
+            var guidUdi = id as GuidUdi;
+            if (guidUdi != null)
+            {
+                return GetById(guidUdi.Guid);
+            }
+            throw new HttpResponseException(HttpStatusCode.NotFound);
+        }
+
+        /// <summary>
+        /// Return media for the specified ids
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        [FilterAllowedOutgoingMedia(typeof(IEnumerable<MediaItemDisplay>))]
+        public IEnumerable<MediaItemDisplay> GetByIds([FromUri]int[] ids)
+        {
+            var foundMedia = Services.MediaService.GetByIds(ids);
+            return foundMedia.Select(media => AutoMapperExtensions.MapWithUmbracoContext<IMedia, MediaItemDisplay>(media, UmbracoContext));
+        }
+
+        /// <summary>
+        /// Returns media items known to be of a "Folder" type
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [Obsolete("This is no longer used and shouldn't be because it performs poorly when there are a lot of media items")]
+        [FilterAllowedOutgoingMedia(typeof(IEnumerable<ContentItemBasic<ContentPropertyBasic, IMedia>>))]
+        public IEnumerable<ContentItemBasic<ContentPropertyBasic, IMedia>> GetChildFolders(int id = -1)
+        {
+            //we are only allowing a max of 500 to be returned here, if more is required it needs to be paged
+            var result = GetChildFolders(id, 1, 500);
+            return result.Items;
+        }
+
+        /// <summary>
+        /// Returns a paged result of media items known to be of a "Folder" type
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="pageNumber"></param>
+        /// <param name="pageSize"></param>
+        /// <returns></returns>
+        public PagedResult<ContentItemBasic<ContentPropertyBasic, IMedia>> GetChildFolders(int id, int pageNumber, int pageSize)
+        {
+            //Suggested convention for folder mediatypes - we can make this more or less complicated as long as we document it...
+            //if you create a media type, which has an alias that ends with ...Folder then its a folder: ex: "secureFolder", "bannerFolder", "Folder"
+            var folderTypes = Services.ContentTypeService
+                .GetAllMediaTypes()
+                .Where(x => x.Alias.EndsWith("Folder"))
+                .Select(x => x.Id)
+                .ToArray();
+
+            if (folderTypes.Length == 0)
+            {
+                return new PagedResult<ContentItemBasic<ContentPropertyBasic, IMedia>>(0, pageNumber, pageSize);
+            }
+
+            long total;
+            var children = Services.MediaService.GetPagedChildren(id, pageNumber - 1, pageSize, out total, "Name", Direction.Ascending, true, null, folderTypes.ToArray());
+
+            return new PagedResult<ContentItemBasic<ContentPropertyBasic, IMedia>>(total, pageNumber, pageSize)
+            {
+                Items = children.Select(Mapper.Map<IMedia, ContentItemBasic<ContentPropertyBasic, IMedia>>)
+            };
+        }
+
+        /// <summary>
+        /// Returns the root media objects
+        /// </summary>
+        [FilterAllowedOutgoingMedia(typeof(IEnumerable<ContentItemBasic<ContentPropertyBasic, IMedia>>))]
+        public IEnumerable<ContentItemBasic<ContentPropertyBasic, IMedia>> GetRootMedia()
+        {
+            //TODO: Add permissions check!
+
+            return Services.MediaService.GetRootMedia()
+                           .Select(Mapper.Map<IMedia, ContentItemBasic<ContentPropertyBasic, IMedia>>);
+        }
+
+        #region GetChildren
+
+        private int[] _userStartNodes;
+        protected int[] UserStartNodes
+        {
+            get { return _userStartNodes ?? (_userStartNodes = Security.CurrentUser.CalculateMediaStartNodeIds(Services.EntityService)); }
+        }
+
+        /// <summary>
+        /// Returns the child media objects - using the entity INT id
+        /// </summary>
+        [FilterAllowedOutgoingMedia(typeof(IEnumerable<ContentItemBasic<ContentPropertyBasic, IMedia>>), "Items")]
+        public PagedResult<ContentItemBasic<ContentPropertyBasic, IMedia>> GetChildren(int id,
+            int pageNumber = 0,
+            int pageSize = 0,
+            string orderBy = "SortOrder",
+            Direction orderDirection = Direction.Ascending,
+            bool orderBySystemField = true,
+            string filter = "",
+            Guid? dataTypeId = null)
+        {
+            //if a request is made for the root node data but the user's start node is not the default, then
+            // we need to return their start nodes
+            if (id == Constants.System.Root && UserStartNodes.Length > 0 && UserStartNodes.Contains(Constants.System.Root) == false)
+            {
+                var ignoreUserStartNodes = dataTypeId.HasValue && Services.DataTypeService.IsDataTypeIgnoringUserStartNodes(dataTypeId.Value);
+                if (ignoreUserStartNodes == false)
+                {
+                    if (pageNumber > 0)
+                        return new PagedResult<ContentItemBasic<ContentPropertyBasic, IMedia>>(0, 0, 0);
+                    var nodes = Services.MediaService.GetByIds(UserStartNodes).ToArray();
+                    if (nodes.Length == 0)
+                        return new PagedResult<ContentItemBasic<ContentPropertyBasic, IMedia>>(0, 0, 0);
+                    if (pageSize < nodes.Length) pageSize = nodes.Length; // bah
+                    var pr = new PagedResult<ContentItemBasic<ContentPropertyBasic, IMedia>>(nodes.Length, pageNumber, pageSize)
+                    {
+                        Items = nodes.Select(Mapper.Map<IMedia, ContentItemBasic<ContentPropertyBasic, IMedia>>)
+                    };
+                    return pr;
+                }
+            }
+
+            // else proceed as usual
+
+            long totalChildren;
+            IMedia[] children;
+            if (pageNumber > 0 && pageSize > 0)
+            {
+                children = Services.MediaService
+                 .GetPagedChildren(id, (pageNumber - 1), pageSize, out totalChildren
+                 , orderBy, orderDirection, orderBySystemField, filter).ToArray();
+            }
+            else
+            {
+                children = Services.MediaService.GetChildren(id).ToArray();
+                totalChildren = children.Length;
+            }
+
+            if (totalChildren == 0)
+            {
+                return new PagedResult<ContentItemBasic<ContentPropertyBasic, IMedia>>(0, 0, 0);
+            }
+
+            var pagedResult = new PagedResult<ContentItemBasic<ContentPropertyBasic, IMedia>>(totalChildren, pageNumber, pageSize);
+            pagedResult.Items = children
+                .Select(Mapper.Map<IMedia, ContentItemBasic<ContentPropertyBasic, IMedia>>);
+
+            return pagedResult;
+        }
+
+        /// <summary>
+        /// This method is obsolete, use the overload with dataTypeId instead
+        /// Returns the child media objects - using the entity GUID id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="pageNumber"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="orderBy"></param>
+        /// <param name="orderDirection"></param>
+        /// <param name="orderBySystemField"></param>
+        /// <param name="filter"></param>
+        /// <returns></returns>
+        [Obsolete("This method is obsolete, use the overload with dataTypeId instead", false)]
+        [FilterAllowedOutgoingMedia(typeof(IEnumerable<ContentItemBasic<ContentPropertyBasic, IMedia>>), "Items")]
+        public PagedResult<ContentItemBasic<ContentPropertyBasic, IMedia>> GetChildren(Guid id,
+           int pageNumber = 0,
+           int pageSize = 0,
+           string orderBy = "SortOrder",
+           Direction orderDirection = Direction.Ascending,
+           bool orderBySystemField = true,
+           string filter = "")
+        {
+            return GetChildren(id, null, pageNumber, pageSize, orderBy, orderDirection, orderBySystemField, filter);
+        }
+
+        /// <summary>
+        /// Returns the child media objects - using the entity GUID id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="pageNumber"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="orderBy"></param>
+        /// <param name="orderDirection"></param>
+        /// <param name="orderBySystemField"></param>
+        /// <param name="filter"></param>
+        /// <param name="dataTypeId">If set used to lookup whether user and group start node permissions should be ignored.</param>
+        /// <returns></returns>
+        [FilterAllowedOutgoingMedia(typeof(IEnumerable<ContentItemBasic<ContentPropertyBasic, IMedia>>), "Items")]
+        public PagedResult<ContentItemBasic<ContentPropertyBasic, IMedia>> GetChildren(Guid id,
+           Guid? dataTypeId,
+           int pageNumber = 0,
+           int pageSize = 0,
+           string orderBy = "SortOrder",
+           Direction orderDirection = Direction.Ascending,
+           bool orderBySystemField = true,
+           string filter = "")
+        {
+            var entity = Services.EntityService.GetByKey(id);
+            if (entity != null)
+            {
+                return GetChildren(entity.Id, pageNumber, pageSize, orderBy, orderDirection, orderBySystemField, filter, dataTypeId);
+            }
+            throw new HttpResponseException(HttpStatusCode.NotFound);
+        }
+
+        /// <summary>
+        /// This method is obsolete, use the overload with dataTypeId instead
+        /// Returns the child media objects - using the entity UDI id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="pageNumber"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="orderBy"></param>
+        /// <param name="orderDirection"></param>
+        /// <param name="orderBySystemField"></param>
+        /// <param name="filter"></param>
+        /// <returns></returns>
+        [Obsolete("This method is obsolete, use the overload with dataTypeId instead", false)]
+        [FilterAllowedOutgoingMedia(typeof(IEnumerable<ContentItemBasic<ContentPropertyBasic, IMedia>>), "Items")]
+        public PagedResult<ContentItemBasic<ContentPropertyBasic, IMedia>> GetChildren(Udi id,
+           int pageNumber = 0,
+           int pageSize = 0,
+           string orderBy = "SortOrder",
+           Direction orderDirection = Direction.Ascending,
+           bool orderBySystemField = true,
+           string filter = "")
+        {
+            return GetChildren(id, null, pageNumber, pageSize, orderBy, orderDirection, orderBySystemField, filter);
+        }
+
+        /// <summary>
+        /// Returns the child media objects - using the entity UDI id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="pageNumber"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="orderBy"></param>
+        /// <param name="orderDirection"></param>
+        /// <param name="orderBySystemField"></param>
+        /// <param name="filter"></param>
+        /// <param name="dataTypeId">If set used to lookup whether the user and group start node permissions will be ignored.</param>
+        /// <returns></returns>
+        [FilterAllowedOutgoingMedia(typeof(IEnumerable<ContentItemBasic<ContentPropertyBasic, IMedia>>), "Items")]
+        public PagedResult<ContentItemBasic<ContentPropertyBasic, IMedia>> GetChildren(Udi id,
+           Guid? dataTypeId,
+           int pageNumber = 0,
+           int pageSize = 0,
+           string orderBy = "SortOrder",
+           Direction orderDirection = Direction.Ascending,
+           bool orderBySystemField = true,
+           string filter = "")
+        {
+            var guidUdi = id as GuidUdi;
+            if (guidUdi != null)
+            {
+                var entity = Services.EntityService.GetByKey(guidUdi.Guid);
+                if (entity != null)
+                {
+                    return GetChildren(entity.Id, pageNumber, pageSize, orderBy, orderDirection, orderBySystemField, filter, dataTypeId);
+                }
+            }
+
+            throw new HttpResponseException(HttpStatusCode.NotFound);
+        }
+
+        [Obsolete("Do not use this method, use either the overload with INT or GUID instead, this will be removed in future versions")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [UmbracoTreeAuthorize(Constants.Trees.MediaTypes, Constants.Trees.Media)]
+        public PagedResult<ContentItemBasic<ContentPropertyBasic, IMedia>> GetChildren(string id,
+           int pageNumber = 0,
+           int pageSize = 0,
+           string orderBy = "SortOrder",
+           Direction orderDirection = Direction.Ascending,
+           bool orderBySystemField = true,
+           string filter = "")
+        {
+            foreach (var type in new[] { typeof(int), typeof(Guid) })
+            {
+                var parsed = id.TryConvertTo(type);
+                if (parsed)
+                {
+                    //oooh magic! will auto select the right overload
+                    return GetChildren((dynamic)parsed.Result);
+                }
+            }
+
+            throw new HttpResponseException(HttpStatusCode.NotFound);
+        }
+        #endregion
+
+        /// <summary>
+        /// Moves an item to the recycle bin, if it is already there then it will permanently delete it
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [EnsureUserPermissionForMedia("id")]
+        [HttpPost]
+        public HttpResponseMessage DeleteById(int id)
+        {
+            var foundMedia = GetObjectFromRequest(() => Services.MediaService.GetById(id));
+
+            if (foundMedia == null)
+            {
+                return HandleContentNotFound(id, false);
+            }
+
+            //if the current item is in the recycle bin
+            if (foundMedia.IsInRecycleBin() == false)
+            {
+                var moveResult = Services.MediaService.WithResult().MoveToRecycleBin(foundMedia, Security.CurrentUser.Id);
+                if (moveResult == false)
+                {
+                    //returning an object of INotificationModel will ensure that any pending
+                    // notification messages are added to the response.
+                    return Request.CreateValidationErrorResponse(new SimpleNotificationModel());
+                }
+            }
+            else
+            {
+                var deleteResult = Services.MediaService.WithResult().Delete(foundMedia, Security.CurrentUser.Id);
+                if (deleteResult == false)
+                {
+                    //returning an object of INotificationModel will ensure that any pending
+                    // notification messages are added to the response.
+                    return Request.CreateValidationErrorResponse(new SimpleNotificationModel());
+                }
+            }
+
+            return Request.CreateResponse(HttpStatusCode.OK);
+        }
+
+        /// <summary>
+        /// Change the sort order for media
+        /// </summary>
+        /// <param name="move"></param>
+        /// <returns></returns>
+        [EnsureUserPermissionForMedia("move.Id")]
+        public HttpResponseMessage PostMove(MoveOrCopy move)
+        {
+            var toMove = ValidateMoveOrCopy(move);
+            var destinationParentID = move.ParentId;
+            var sourceParentID = toMove.ParentId;
+
+            var moveResult = Services.MediaService.WithResult().Move(toMove, move.ParentId, Security.CurrentUser.Id);
+
+            if (sourceParentID == destinationParentID)
+            {
+                return Request.CreateValidationErrorResponse(new SimpleNotificationModel(new Notification("",Services.TextService.Localize("media/moveToSameFolderFailed"),SpeechBubbleIcon.Error)));
+            }
+            if (moveResult == false)
+            {
+                return Request.CreateValidationErrorResponse(new SimpleNotificationModel());
+            }
+            else
+            {
+                var response = Request.CreateResponse(HttpStatusCode.OK);
+                response.Content = new StringContent(toMove.Path, Encoding.UTF8, "application/json");
+                return response;
+            }
+        }
+
+        /// <summary>
+        /// Saves content
+        /// </summary>
+        /// <returns></returns>
+        [FileUploadCleanupFilter]
+        [MediaPostValidate]
+        [OutgoingEditorModelEvent]
+        public MediaItemDisplay PostSave(
+            [ModelBinder(typeof(MediaItemBinder))]
+                MediaItemSave contentItem)
+        {
+            //Recent versions of IE/Edge may send in the full clientside file path instead of just the file name.
+            //To ensure similar behavior across all browsers no matter what they do - we strip the FileName property of all
+            //uploaded files to being *only* the actual file name (as it should be).
+            if (contentItem.UploadedFiles != null && contentItem.UploadedFiles.Any())
+            {
+                foreach (var file in contentItem.UploadedFiles)
+                {
+                    file.FileName = Path.GetFileName(file.FileName);
+                }
+            }
+
+            //If we've reached here it means:
+            // * Our model has been bound
+            // * and validated
+            // * any file attachments have been saved to their temporary location for us to use
+            // * we have a reference to the DTO object and the persisted object
+            // * Permissions are valid
+
+            MapPropertyValues(contentItem);
+
+            //We need to manually check the validation results here because:
+            // * We still need to save the entity even if there are validation value errors
+            // * Depending on if the entity is new, and if there are non property validation errors (i.e. the name is null)
+            //      then we cannot continue saving, we can only display errors
+            // * If there are validation errors and they were attempting to publish, we can only save, NOT publish and display
+            //      a message indicating this
+            if (ModelState.IsValid == false)
+            {
+                if (ValidationHelper.ModelHasRequiredForPersistenceErrors(contentItem)
+                    && (contentItem.Action == ContentSaveAction.SaveNew))
+                {
+                    //ok, so the absolute mandatory data is invalid and it's new, we cannot actually continue!
+                    // add the modelstate to the outgoing object and throw validation response
+                    var forDisplay = AutoMapperExtensions.MapWithUmbracoContext<IMedia, MediaItemDisplay>(contentItem.PersistedContent, UmbracoContext);
+                    forDisplay.Errors = ModelState.ToErrorDictionary();
+                    throw new HttpResponseException(Request.CreateValidationErrorResponse(forDisplay));
+                }
+            }
+
+            //save the item
+            var saveStatus = Services.MediaService.WithResult().Save(contentItem.PersistedContent, Security.CurrentUser.Id);
+
+            //return the updated model
+            var display = AutoMapperExtensions.MapWithUmbracoContext<IMedia, MediaItemDisplay>(contentItem.PersistedContent, UmbracoContext);
+
+            //lasty, if it is not valid, add the modelstate to the outgoing object and throw a 403
+            HandleInvalidModelState(display);
+
+            //put the correct msgs in
+            switch (contentItem.Action)
+            {
+                case ContentSaveAction.Save:
+                case ContentSaveAction.SaveNew:
+                    if (saveStatus.Success)
+                    {
+                        display.AddSuccessNotification(
+                            Services.TextService.Localize("speechBubbles/editMediaSaved"),
+                            Services.TextService.Localize("speechBubbles/editMediaSavedText"));
+                    }
+                    else
+                    {
+                        AddCancelMessage(display);
+
+                        //If the item is new and the operation was cancelled, we need to return a different
+                        // status code so the UI can handle it since it won't be able to redirect since there
+                        // is no Id to redirect to!
+                        if (saveStatus.Result.StatusType == OperationStatusType.FailedCancelledByEvent && IsCreatingAction(contentItem.Action))
+                        {
+                            throw new HttpResponseException(Request.CreateValidationErrorResponse(display));
+                        }
+                    }
+
+                    break;
+            }
+
+            return display;
+        }
+
+        /// <summary>
+        /// Maps the property values to the persisted entity
+        /// </summary>
+        /// <param name="contentItem"></param>
+        protected override void MapPropertyValues<TPersisted>(ContentBaseItemSave<TPersisted> contentItem)
+        {
+            UpdateName(contentItem);
+
+            //use the base method to map the rest of the properties
+            base.MapPropertyValues(contentItem);
+        }
+
+        /// <summary>
+        /// Empties the recycle bin
+        /// </summary>
+        /// <returns></returns>
+        [HttpDelete]
+        [HttpPost]
+        public HttpResponseMessage EmptyRecycleBin()
+        {
+            Services.MediaService.EmptyRecycleBin(Security.CurrentUser.Id);
+
+            return Request.CreateNotificationSuccessResponse(Services.TextService.Localize("defaultdialogs/recycleBinIsEmpty"));
+        }
+
+        /// <summary>
+        /// Change the sort order for media
+        /// </summary>
+        /// <param name="sorted"></param>
+        /// <returns></returns>
+        [EnsureUserPermissionForMedia("sorted.ParentId")]
+        public HttpResponseMessage PostSort(ContentSortOrder sorted)
+        {
+            if (sorted == null)
+            {
+                return Request.CreateResponse(HttpStatusCode.NotFound);
+            }
+
+            //if there's nothing to sort just return ok
+            if (sorted.IdSortOrder.Length == 0)
+            {
+                return Request.CreateResponse(HttpStatusCode.OK);
+            }
+
+            var mediaService = base.ApplicationContext.Services.MediaService;
+            var sortedMedia = new List<IMedia>();
+            try
+            {
+                sortedMedia.AddRange(sorted.IdSortOrder.Select(mediaService.GetById));
+
+                // Save Media with new sort order and update content xml in db accordingly
+                if (mediaService.Sort(sortedMedia) == false)
+                {
+                    LogHelper.Warn<MediaController>("Media sorting failed, this was probably caused by an event being cancelled");
+                    return Request.CreateValidationErrorResponse("Media sorting failed, this was probably caused by an event being cancelled");
+                }
+                return Request.CreateResponse(HttpStatusCode.OK);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Error<MediaController>("Could not update media sort order", ex);
+                throw;
+            }
+        }
+
+        public MediaItemDisplay PostAddFolder(PostedFolder folder)
+        {
+            var intParentId = GetParentIdAsInt(folder.ParentId, validatePermissions:true);
+
+            var mediaService = ApplicationContext.Services.MediaService;
+
+            var f = mediaService.CreateMedia(folder.Name, intParentId, Constants.Conventions.MediaTypes.Folder);
+            mediaService.Save(f, Security.CurrentUser.Id);
+
+            return AutoMapperExtensions.MapWithUmbracoContext<IMedia, MediaItemDisplay>(f, UmbracoContext);
+        }
+
+        /// <summary>
+        /// Used to submit a media file
+        /// </summary>
+        /// <returns></returns>
+        /// <remarks>
+        /// We cannot validate this request with attributes (nicely) due to the nature of the multi-part for data.
+        /// </remarks>
+        [FileUploadCleanupFilter(false)]
+        public async Task<HttpResponseMessage> PostAddFile()
+        {
+            if (Request.Content.IsMimeMultipartContent() == false)
+            {
+                throw new HttpResponseException(HttpStatusCode.UnsupportedMediaType);
+            }
+
+            var root = IOHelper.MapPath("~/App_Data/TEMP/FileUploads");
+            //ensure it exists
+            Directory.CreateDirectory(root);
+            var provider = new MultipartFormDataStreamProvider(root);
+
+            var result = await Request.Content.ReadAsMultipartAsync(provider);
+
+            //must have a file
+            if (result.FileData.Count == 0)
+            {
+                return Request.CreateResponse(HttpStatusCode.NotFound);
+            }
+
+            //get the string json from the request
+            string currentFolderId = result.FormData["currentFolder"];
+            int parentId = GetParentIdAsInt(currentFolderId, validatePermissions: true);
+
+            var tempFiles = new PostedFiles();
+            var mediaService = ApplicationContext.Services.MediaService;
+
+            //in case we pass a path with a folder in it, we will create it and upload media to it.
+            if (result.FormData.ContainsKey("path"))
+            {
+
+                var folders = result.FormData["path"].Split('/');
+
+                for (int i = 0; i < folders.Length - 1; i++)
+                {
+                    var folderName = folders[i];
+                    IMedia folderMediaItem;
+
+                    //if uploading directly to media root and not a subfolder
+                    if (parentId == -1)
+                    {
+                        //look for matching folder
+                        folderMediaItem =
+                            mediaService.GetRootMedia().FirstOrDefault(x => x.Name == folderName && x.ContentType.Alias == Constants.Conventions.MediaTypes.Folder);
+                        if (folderMediaItem == null)
+                        {
+                            //if null, create a folder
+                            folderMediaItem = mediaService.CreateMedia(folderName, -1, Constants.Conventions.MediaTypes.Folder);
+                            mediaService.Save(folderMediaItem);
+                        }
+                    }
+                    else
+                    {
+                        //get current parent
+                        var mediaRoot = mediaService.GetById(parentId);
+
+                        //if the media root is null, something went wrong, we'll abort
+                        if (mediaRoot == null)
+                            return Request.CreateErrorResponse(HttpStatusCode.InternalServerError,
+                                "The folder: " + folderName + " could not be used for storing images, its ID: " + parentId +
+                                " returned null");
+
+                        //look for matching folder
+                        folderMediaItem = mediaRoot.Children().FirstOrDefault(x => x.Name == folderName && x.ContentType.Alias == Constants.Conventions.MediaTypes.Folder);
+                        if (folderMediaItem == null)
+                        {
+                            //if null, create a folder
+                            folderMediaItem = mediaService.CreateMedia(folderName, mediaRoot, Constants.Conventions.MediaTypes.Folder);
+                            mediaService.Save(folderMediaItem);
+                        }
+                    }
+                    //set the media root to the folder id so uploaded files will end there.
+                    parentId = folderMediaItem.Id;
+                }
+            }
+
+            //get the files
+            foreach (var file in result.FileData)
+            {
+                var fileName = file.Headers.ContentDisposition.FileName.Trim(new[] { '\"' }).TrimEnd();
+                var safeFileName = fileName.ToSafeFileName();
+                var ext = safeFileName.Substring(safeFileName.LastIndexOf('.') + 1).ToLower();
+
+                if (UmbracoConfig.For.UmbracoSettings().Content.IsFileAllowedForUpload(ext))
+                {
+                    var mediaType = Constants.Conventions.MediaTypes.File;
+
+                    if (result.FormData["contentTypeAlias"] == Constants.Conventions.MediaTypes.AutoSelect)
+                    {
+                        if (UmbracoConfig.For.UmbracoSettings().Content.ImageFileTypes.Contains(ext))
+                        {
+                            mediaType = Constants.Conventions.MediaTypes.Image;
+                        }
+                    }
+                    else
+                    {
+                        mediaType = result.FormData["contentTypeAlias"];
+                    }
+
+                    var mediaItemName = fileName.ToFriendlyName();
+
+                    var f = mediaService.CreateMedia(mediaItemName, parentId, mediaType, Security.CurrentUser.Id);
+
+                    var fileInfo = new FileInfo(file.LocalFileName);
+                    var fs = fileInfo.OpenReadWithRetry();
+                    if (fs == null) throw new InvalidOperationException("Could not acquire file stream");
+                    using (fs)
+                    {
+                        f.SetValue(Constants.Conventions.Media.File, fileName, fs);
+                    }
+
+                    var saveResult = mediaService.WithResult().Save(f, Security.CurrentUser.Id);
+                    if (saveResult == false)
+                    {
+                        AddCancelMessage(tempFiles,
+                            message: Services.TextService.Localize("speechBubbles/operationCancelledText") + " -- " + mediaItemName,
+                            localizeMessage: false);
+                    }
+                    else
+                    {
+                        tempFiles.UploadedFiles.Add(new ContentItemFile
+                        {
+                            FileName = fileName,
+                            PropertyAlias = Constants.Conventions.Media.File,
+                            TempFilePath = file.LocalFileName
+                        });
+                    }
+                }
+                else
+                {
+                    tempFiles.Notifications.Add(new Notification(
+                        Services.TextService.Localize("speechBubbles/operationFailedHeader"),
+                        Services.TextService.Localize("media/disallowedFileType"),
+                        SpeechBubbleIcon.Warning));
+                }
+            }
+
+            //Different response if this is a 'blueimp' request
+            if (Request.GetQueryNameValuePairs().Any(x => x.Key == "origin"))
+            {
+                var origin = Request.GetQueryNameValuePairs().First(x => x.Key == "origin");
+                if (origin.Value == "blueimp")
+                {
+                    return Request.CreateResponse(HttpStatusCode.OK,
+                        tempFiles,
+                        //Don't output the angular xsrf stuff, blue imp doesn't like that
+                        new JsonMediaTypeFormatter());
+                }
+            }
+
+            return Request.CreateResponse(HttpStatusCode.OK, tempFiles);
+        }
+
+        /// <summary>
+        /// Given a parent id which could be a GUID, UDI or an INT, this will resolve the INT
+        /// </summary>
+        /// <param name="parentId"></param>
+        /// <param name="validatePermissions">
+        /// If true, this will check if the current user has access to the resolved integer parent id
+        /// and if that check fails an unauthorized exception will occur
+        /// </param>
+        /// <returns></returns>
+        private int GetParentIdAsInt(string parentId, bool validatePermissions)
+        {
+            int intParentId;
+            GuidUdi parentUdi;
+
+            // test for udi
+            if (GuidUdi.TryParse(parentId, out parentUdi))
+            {
+                parentId = parentUdi.Guid.ToString();
+            }
+
+            //if it's not an INT then we'll check for GUID
+            if (int.TryParse(parentId, out intParentId) == false)
+            {
+                // if a guid then try to look up the entity
+                Guid idGuid;
+                if (Guid.TryParse(parentId, out idGuid))
+                {
+                    var entity = Services.EntityService.GetByKey(idGuid);
+                    if (entity != null)
+                    {
+                        intParentId = entity.Id;
+                    }
+                    else
+                    {
+                        throw new EntityNotFoundException(parentId, "The passed id doesn't exist");
+                    }
+                }
+                else
+                {
+                    throw new HttpResponseException(
+                        Request.CreateValidationErrorResponse("The request was not formatted correctly, the parentId is not an integer, Guid or UDI"));
+                }
+            }
+
+            //ensure the user has access to this folder by parent id!
+            if (validatePermissions && CheckPermissions(
+                    new Dictionary<string, object>(),
+                    Security.CurrentUser,
+                    Services.MediaService,
+                    Services.EntityService,
+                    intParentId) == false)
+            {
+                throw new HttpResponseException(Request.CreateResponse(
+                    HttpStatusCode.Forbidden,
+                    new SimpleNotificationModel(new Notification(
+                        Services.TextService.Localize("speechBubbles/operationFailedHeader"),
+                        Services.TextService.Localize("speechBubbles/invalidUserPermissionsText"),
+                        SpeechBubbleIcon.Warning))));
+            }
+
+            return intParentId;
+        }
+
+        /// <summary>
+        /// Ensures the item can be moved/copied to the new location
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        private IMedia ValidateMoveOrCopy(MoveOrCopy model)
+        {
+            if (model == null)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+
+            var mediaService = Services.MediaService;
+            var toMove = mediaService.GetById(model.Id);
+            if (toMove == null)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+            if (model.ParentId < 0)
+            {
+                //cannot move if the content item is not allowed at the root
+                if (toMove.ContentType.AllowedAsRoot == false)
+                {
+                    var notificationModel = new SimpleNotificationModel();
+                    notificationModel.AddErrorNotification(Services.TextService.Localize("moveOrCopy/notAllowedAtRoot"), "");
+                    throw new HttpResponseException(Request.CreateValidationErrorResponse(notificationModel));
+                }
+            }
+            else
+            {
+                var parent = mediaService.GetById(model.ParentId);
+                if (parent == null)
+                {
+                    throw new HttpResponseException(HttpStatusCode.NotFound);
+                }
+
+                //check if the item is allowed under this one
+                if (parent.ContentType.AllowedContentTypes.Select(x => x.Id).ToArray()
+                    .Any(x => x.Value == toMove.ContentType.Id) == false)
+                {
+                    var notificationModel = new SimpleNotificationModel();
+                    notificationModel.AddErrorNotification(Services.TextService.Localize("moveOrCopy/notAllowedByContentType"), "");
+                    throw new HttpResponseException(Request.CreateValidationErrorResponse(notificationModel));
+                }
+
+                // Check on paths
+                if ((string.Format(",{0},", parent.Path)).IndexOf(string.Format(",{0},", toMove.Id), StringComparison.Ordinal) > -1)
+                {
+                    var notificationModel = new SimpleNotificationModel();
+                    notificationModel.AddErrorNotification(Services.TextService.Localize("moveOrCopy/notAllowedByPath"), "");
+                    throw new HttpResponseException(Request.CreateValidationErrorResponse(notificationModel));
+                }
+            }
+
+            return toMove;
+        }
+
+        /// <summary>
+        /// Performs a permissions check for the user to check if it has access to the node based on
+        /// start node and/or permissions for the node
+        /// </summary>
+        /// <param name="storage">The storage to add the content item to so it can be reused</param>
+        /// <param name="user"></param>
+        /// <param name="mediaService"></param>
+        /// <param name="entityService"></param>
+        /// <param name="nodeId">The content to lookup, if the contentItem is not specified</param>
+        /// <param name="media">Specifies the already resolved content item to check against, setting this ignores the nodeId</param>
+        /// <returns></returns>
+        internal static bool CheckPermissions(IDictionary<string, object> storage, IUser user, IMediaService mediaService, IEntityService entityService, int nodeId, IMedia media = null)
+        {
+            if (storage == null) throw new ArgumentNullException("storage");
+            if (user == null) throw new ArgumentNullException("user");
+            if (mediaService == null) throw new ArgumentNullException("mediaService");
+            if (entityService == null) throw new ArgumentNullException("entityService");
+
+            if (media == null && nodeId != Constants.System.Root && nodeId != Constants.System.RecycleBinMedia)
+            {
+                media = mediaService.GetById(nodeId);
+                //put the content item into storage so it can be retreived
+                // in the controller (saves a lookup)
+                storage[typeof(IMedia).ToString()] = media;
+            }
+
+            if (media == null && nodeId != Constants.System.Root && nodeId != Constants.System.RecycleBinMedia)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+
+            var hasPathAccess = (nodeId == Constants.System.Root)
+                ? user.HasMediaRootAccess(entityService)
+                : (nodeId == Constants.System.RecycleBinMedia)
+                    ? user.HasMediaBinAccess(entityService)
+                    : user.HasPathAccess(media, entityService);
+
+            return hasPathAccess;
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentPropertyBasic.cs b/src/Umbraco.Web/Models/ContentEditing/ContentPropertyBasic.cs
index 4ed46de135..f2174ab120 100644
--- a/src/Umbraco.Web/Models/ContentEditing/ContentPropertyBasic.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/ContentPropertyBasic.cs
@@ -1,46 +1,51 @@
-using System.ComponentModel.DataAnnotations;
-using System.Runtime.Serialization;
-using Umbraco.Core.PropertyEditors;
-
-namespace Umbraco.Web.Models.ContentEditing
-{
-    /// <summary>
-    /// Represents a content property to be saved
-    /// </summary>
-    [DataContract(Name = "property", Namespace = "")]
-    public class ContentPropertyBasic
-    {
-        /// <summary>
-        /// This is the cmsPropertyData ID
-        /// </summary>
-        /// <remarks>
-        /// This is not really used for anything
-        /// </remarks>
-        [DataMember(Name = "id", IsRequired = true)]
-        [Required]
-        public int Id { get; set; }
-
-        [DataMember(Name = "value")]
-        public object Value { get; set; }
-
-        [DataMember(Name = "alias", IsRequired = true)]
-        [Required(AllowEmptyStrings = false)]
-        public string Alias { get; set; }
-
-        [DataMember(Name = "editor", IsRequired = false)]
-        public string Editor { get; set; }
-
-        /// <summary>
-        /// Flags the property to denote that it can contain sensitive data
-        /// </summary>
-        [DataMember(Name = "isSensitive", IsRequired = false)]
-        public bool IsSensitive { get; set; }
-
-        /// <summary>
-        /// Used internally during model mapping
-        /// </summary>
-        [IgnoreDataMember]
-        internal PropertyEditor PropertyEditor { get; set; }
-
-    }
-}
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.Runtime.Serialization;
+using Umbraco.Core.PropertyEditors;
+
+namespace Umbraco.Web.Models.ContentEditing
+{
+    /// <summary>
+    /// Represents a content property to be saved
+    /// </summary>
+    [DataContract(Name = "property", Namespace = "")]
+    public class ContentPropertyBasic
+    {
+        /// <summary>
+        /// This is the cmsPropertyData ID
+        /// </summary>
+        /// <remarks>
+        /// This is not really used for anything
+        /// </remarks>
+        [DataMember(Name = "id", IsRequired = true)]
+        [Required]
+        public int Id { get; set; }
+
+        [DataMember(Name = "dataTypeId", IsRequired = true)]
+        [Required]
+        public Guid DataTypeId { get; set; }
+
+        [DataMember(Name = "value")]
+        public object Value { get; set; }
+
+        [DataMember(Name = "alias", IsRequired = true)]
+        [Required(AllowEmptyStrings = false)]
+        public string Alias { get; set; }
+
+        [DataMember(Name = "editor", IsRequired = false)]
+        public string Editor { get; set; }
+
+        /// <summary>
+        /// Flags the property to denote that it can contain sensitive data
+        /// </summary>
+        [DataMember(Name = "isSensitive", IsRequired = false)]
+        public bool IsSensitive { get; set; }
+
+        /// <summary>
+        /// Used internally during model mapping
+        /// </summary>
+        [IgnoreDataMember]
+        internal PropertyEditor PropertyEditor { get; set; }
+
+    }
+}
diff --git a/src/Umbraco.Web/Models/Mapping/ContentPropertyBasicConverter.cs b/src/Umbraco.Web/Models/Mapping/ContentPropertyBasicConverter.cs
index ccf22a8c34..02cf570f7d 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentPropertyBasicConverter.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentPropertyBasicConverter.cs
@@ -1,75 +1,78 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using AutoMapper;
-using Umbraco.Core;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.Services;
-using Umbraco.Web.Models.ContentEditing;
-
-namespace Umbraco.Web.Models.Mapping
-{
-    /// <summary>
-    /// Creates a base generic ContentPropertyBasic from a Property
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    internal class ContentPropertyBasicConverter<T> : ITypeConverter<Property, T>
-        where T : ContentPropertyBasic, new()
-    {
-        protected IDataTypeService DataTypeService { get; private set; }
-
-        private static readonly List<string> ComplexPropertyTypeAliases = new List<string> {"Umbraco.NestedContent"};
-
-        public ContentPropertyBasicConverter(IDataTypeService dataTypeService)
-        {
-            DataTypeService = dataTypeService;
-        }
-
-        /// <summary>
-        /// Assigns the PropertyEditor, Id, Alias and Value to the property
-        /// </summary>
-        /// <returns></returns>
-        public virtual T Convert(ResolutionContext context)
-        {
-            var property = context.SourceValue as Property;
-            if (property == null)
-                throw new InvalidOperationException("Source value is not a property.");
-
-            var editor = PropertyEditorResolver.Current.GetByAlias(property.PropertyType.PropertyEditorAlias);
-            if (editor == null)
-            {
-                LogHelper.Error<ContentPropertyBasicConverter<T>>(
-                    "No property editor found, converting to a Label",
-                    new NullReferenceException("The property editor with alias " +
-                                               property.PropertyType.PropertyEditorAlias + " does not exist"));
-
-                editor = PropertyEditorResolver.Current.GetByAlias(Constants.PropertyEditors.NoEditAlias);
-            }
-
-            var result = new T
-            {
-                Id = property.Id,
-                Alias = property.Alias,
-                PropertyEditor = editor,
-                Editor = editor.Alias
-            };
-
-            // if there's a set of property aliases specified, we will check if the current property's value should be mapped.
-            // if it isn't one of the ones specified in 'includeProperties', we will just return the result without mapping the Value.
-            if (context.Options.Items.ContainsKey("IncludeProperties"))
-            {
-                var includeProperties = context.Options.Items["IncludeProperties"] as IEnumerable<string>;
-                if (includeProperties != null && includeProperties.Contains(property.Alias) == false)
-                {
-                    return result;
-                }
-            }
-
-            // if no 'IncludeProperties' were specified or this property is set to be included - we will map the value and return.
-            result.Value = editor.ValueEditor.ConvertDbToEditor(property, property.PropertyType, DataTypeService);
-            return result;
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using AutoMapper;
+using Umbraco.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Services;
+using Umbraco.Web.Models.ContentEditing;
+
+namespace Umbraco.Web.Models.Mapping
+{
+    /// <summary>
+    /// Creates a base generic ContentPropertyBasic from a Property
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    internal class ContentPropertyBasicConverter<T> : ITypeConverter<Property, T>
+        where T : ContentPropertyBasic, new()
+    {
+        protected IDataTypeService DataTypeService { get; private set; }
+
+        private static readonly List<string> ComplexPropertyTypeAliases = new List<string> {"Umbraco.NestedContent"};
+
+        public ContentPropertyBasicConverter(IDataTypeService dataTypeService)
+        {
+            DataTypeService = dataTypeService;
+        }
+
+        /// <summary>
+        /// Assigns the PropertyEditor, Id, Alias and Value to the property
+        /// </summary>
+        /// <returns></returns>
+        public virtual T Convert(ResolutionContext context)
+        {
+            var property = context.SourceValue as Property;
+            if (property == null)
+                throw new InvalidOperationException("Source value is not a property.");
+
+            var editor = PropertyEditorResolver.Current.GetByAlias(property.PropertyType.PropertyEditorAlias);
+            if (editor == null)
+            {
+                LogHelper.Error<ContentPropertyBasicConverter<T>>(
+                    "No property editor found, converting to a Label",
+                    new NullReferenceException("The property editor with alias " +
+                                               property.PropertyType.PropertyEditorAlias + " does not exist"));
+
+                editor = PropertyEditorResolver.Current.GetByAlias(Constants.PropertyEditors.NoEditAlias);
+            }
+
+            var dataTypeDefinition = DataTypeService.GetDataTypeDefinitionById(property.PropertyType.DataTypeDefinitionId);
+
+            var result = new T
+            {
+                Id = property.Id,
+                DataTypeId = dataTypeDefinition.Key,
+                Alias = property.Alias,
+                PropertyEditor = editor,
+                Editor = editor.Alias
+            };
+
+            // if there's a set of property aliases specified, we will check if the current property's value should be mapped.
+            // if it isn't one of the ones specified in 'includeProperties', we will just return the result without mapping the Value.
+            if (context.Options.Items.ContainsKey("IncludeProperties"))
+            {
+                var includeProperties = context.Options.Items["IncludeProperties"] as IEnumerable<string>;
+                if (includeProperties != null && includeProperties.Contains(property.Alias) == false)
+                {
+                    return result;
+                }
+            }
+
+            // if no 'IncludeProperties' were specified or this property is set to be included - we will map the value and return.
+            result.Value = editor.ValueEditor.ConvertDbToEditor(property, property.PropertyType, DataTypeService);
+            return result;
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Trees/TreeControllerBase.cs b/src/Umbraco.Web/Trees/TreeControllerBase.cs
index 2ea41ff128..f2f83d1133 100644
--- a/src/Umbraco.Web/Trees/TreeControllerBase.cs
+++ b/src/Umbraco.Web/Trees/TreeControllerBase.cs
@@ -1,401 +1,407 @@
-using System;
-using System.Globalization;
-using System.Linq;
-using System.Net.Http.Formatting;
-using System.Web.Http.ModelBinding;
-using Umbraco.Core;
-using Umbraco.Core.Events;
-using Umbraco.Web.Models.Trees;
-using Umbraco.Web.WebApi;
-using Umbraco.Web.WebApi.Filters;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.EntityBase;
-using Umbraco.Web.Search;
-
-namespace Umbraco.Web.Trees
-{
-    /// <summary>
-    /// A base controller reference for non-attributed trees (un-registered). Developers should inherit from
-    /// TreeController.
-    /// </summary>
-    [AngularJsonOnlyConfiguration]
-    public abstract class TreeControllerBase : UmbracoAuthorizedApiController
-    {
-        protected TreeControllerBase()
-        {
-        }
-
-        protected TreeControllerBase(UmbracoContext umbracoContext) : base(umbracoContext)
-        {
-        }
-
-        protected TreeControllerBase(UmbracoContext umbracoContext, UmbracoHelper umbracoHelper) : base(umbracoContext, umbracoHelper)
-        {
-        }
-
-        /// <summary>
-        /// The method called to render the contents of the tree structure
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="queryStrings">
-        /// All of the query string parameters passed from jsTree
-        /// </param>
-        /// <remarks>
-        /// We are allowing an arbitrary number of query strings to be pased in so that developers are able to persist custom data from the front-end
-        /// to the back end to be used in the query for model data.
-        /// </remarks>
-        protected abstract TreeNodeCollection GetTreeNodes(string id, [ModelBinder(typeof(HttpQueryStringModelBinder))]FormDataCollection queryStrings);
-
-        /// <summary>
-        /// Returns the menu structure for the node
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="queryStrings"></param>
-        /// <returns></returns>
-        protected abstract MenuItemCollection GetMenuForNode(string id, [ModelBinder(typeof(HttpQueryStringModelBinder))]FormDataCollection queryStrings);
-
-        /// <summary>
-        /// The name to display on the root node
-        /// </summary>
-        public abstract string RootNodeDisplayName { get; }
-
-        /// <summary>
-        /// Gets the current tree alias from the attribute assigned to it.
-        /// </summary>
-        public abstract string TreeAlias { get; }
-
-        /// <summary>
-        /// Returns the root node for the tree
-        /// </summary>
-        /// <param name="queryStrings"></param>
-        /// <returns></returns>
-        public TreeNode GetRootNode([ModelBinder(typeof(HttpQueryStringModelBinder))]FormDataCollection queryStrings)
-        {
-            if (queryStrings == null) queryStrings = new FormDataCollection("");
-            var node = CreateRootNode(queryStrings);
-
-            //add the tree alias to the root
-            node.AdditionalData["treeAlias"] = TreeAlias;
-
-            AddQueryStringsToAdditionalData(node, queryStrings);
-
-            //check if the tree is searchable and add that to the meta data as well
-            if (this is ISearchableTree)
-            {
-                node.AdditionalData.Add("searchable", "true");
-            }
-
-            //now update all data based on some of the query strings, like if we are running in dialog mode           
-            if (IsDialog(queryStrings))
-            {
-                node.RoutePath = "#";
-            }
-
-            OnRootNodeRendering(this, new TreeNodeRenderingEventArgs(node, queryStrings));
-
-            return node;
-        }
-
-        /// <summary>
-        /// The action called to render the contents of the tree structure
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="queryStrings">
-        /// All of the query string parameters passed from jsTree
-        /// </param>
-        /// <returns>JSON markup for jsTree</returns>        
-        /// <remarks>
-        /// We are allowing an arbitrary number of query strings to be pased in so that developers are able to persist custom data from the front-end
-        /// to the back end to be used in the query for model data.
-        /// </remarks>
-        public TreeNodeCollection GetNodes(string id, [ModelBinder(typeof(HttpQueryStringModelBinder))]FormDataCollection queryStrings)
-        {
-            if (queryStrings == null) queryStrings = new FormDataCollection("");
-            var nodes = GetTreeNodes(id, queryStrings);
-
-            foreach (var node in nodes)
-            {
-                AddQueryStringsToAdditionalData(node, queryStrings);
-            }
-
-            //now update all data based on some of the query strings, like if we are running in dialog mode            
-            if (IsDialog((queryStrings)))
-            {
-                foreach (var node in nodes)
-                {
-                    node.RoutePath = "#";
-                }
-            }
-
-            //raise the event
-            OnTreeNodesRendering(this, new TreeNodesRenderingEventArgs(nodes, queryStrings));
-
-            return nodes;
-        }
-
-        /// <summary>
-        /// The action called to render the menu for a tree node
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="queryStrings"></param>
-        /// <returns></returns>
-        public MenuItemCollection GetMenu(string id, [ModelBinder(typeof(HttpQueryStringModelBinder))]FormDataCollection queryStrings)
-        {
-            if (queryStrings == null) queryStrings = new FormDataCollection("");
-            var menu = GetMenuForNode(id, queryStrings);
-            //raise the event
-            OnMenuRendering(this, new MenuRenderingEventArgs(id, menu, queryStrings));
-            return menu;
-        }
-
-        /// <summary>
-        /// Helper method to create a root model for a tree
-        /// </summary>
-        /// <returns></returns>
-        protected virtual TreeNode CreateRootNode(FormDataCollection queryStrings)
-        {
-            var rootNodeAsString = Constants.System.Root.ToString(CultureInfo.InvariantCulture);
-            var currApp = queryStrings.GetValue<string>(TreeQueryStringParameters.Application);
-
-            var node = new TreeNode(
-                rootNodeAsString,
-                null, //this is a root node, there is no parent
-                Url.GetTreeUrl(GetType(), rootNodeAsString, queryStrings),
-                Url.GetMenuUrl(GetType(), rootNodeAsString, queryStrings))
-                {
-                    HasChildren = true,
-                    RoutePath = currApp,
-                    Name = RootNodeDisplayName
-                };
-
-            return node;
-        }
-
-        #region Create TreeNode methods
-
-        /// <summary>
-        /// Helper method to create tree nodes
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="parentId"></param>
-        /// <param name="queryStrings"></param>
-        /// <param name="title"></param>
-        /// <returns></returns>
-        public TreeNode CreateTreeNode(string id, string parentId, FormDataCollection queryStrings, string title)
-        {
-            var jsonUrl = Url.GetTreeUrl(GetType(), id, queryStrings);
-            var menuUrl = Url.GetMenuUrl(GetType(), id, queryStrings);
-            var node = new TreeNode(id, parentId, jsonUrl, menuUrl) { Name = title };
-            return node;
-        }
-
-        /// <summary>
-        /// Helper method to create tree nodes
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="parentId"></param>
-        /// <param name="queryStrings"></param>
-        /// <param name="title"></param>
-        /// <param name="icon"></param>
-        /// <returns></returns>
-        public TreeNode CreateTreeNode(string id, string parentId, FormDataCollection queryStrings, string title, string icon)
-        {
-            var jsonUrl = Url.GetTreeUrl(GetType(), id, queryStrings);
-            var menuUrl = Url.GetMenuUrl(GetType(), id, queryStrings);
-            var node = new TreeNode(id, parentId, jsonUrl, menuUrl)
-            {
-                Name = title, 
-                Icon = icon,
-                NodeType = TreeAlias
-            };
-            return node;
-        }
-
-        /// <summary>
-        /// Helper method to create tree nodes
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="parentId"></param>
-        /// <param name="queryStrings"></param>
-        /// <param name="title"></param>
-        /// <param name="routePath"></param>
-        /// <param name="icon"></param>
-        /// <returns></returns>
-        public TreeNode CreateTreeNode(string id, string parentId, FormDataCollection queryStrings, string title, string icon, string routePath)
-        {
-            var jsonUrl = Url.GetTreeUrl(GetType(), id, queryStrings);
-            var menuUrl = Url.GetMenuUrl(GetType(), id, queryStrings);
-            var node = new TreeNode(id, parentId, jsonUrl, menuUrl) { Name = title, RoutePath = routePath, Icon = icon };
-            return node;
-        }
-
-        /// <summary>
-        /// Helper method to create tree nodes and automatically generate the json url + UDI
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <param name="entityObjectType"></param>
-        /// <param name="parentId"></param>
-        /// <param name="queryStrings"></param>
-        /// <param name="hasChildren"></param>
-        /// <returns></returns>
-        public TreeNode CreateTreeNode(UmbracoEntity entity, Guid entityObjectType, string parentId, FormDataCollection queryStrings, bool hasChildren)
-        {
-            var treeNode = CreateTreeNode(entity.Id.ToInvariantString(), parentId, queryStrings, entity.Name, entity.ContentTypeIcon);
-            treeNode.Path = entity.Path;
-            treeNode.Udi = Udi.Create(UmbracoObjectTypesExtensions.GetUdiType(entityObjectType), entity.Key);
-            treeNode.HasChildren = hasChildren;
-            return treeNode;
-        }
-
-        /// <summary>
-        /// Helper method to create tree nodes and automatically generate the json url + UDI
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <param name="entityObjectType"></param>
-        /// <param name="parentId"></param>
-        /// <param name="queryStrings"></param>
-        /// <param name="icon"></param>
-        /// <param name="hasChildren"></param>
-        /// <returns></returns>
-        public TreeNode CreateTreeNode(IUmbracoEntity entity, Guid entityObjectType, string parentId, FormDataCollection queryStrings, string icon, bool hasChildren)
-        {
-            var treeNode = CreateTreeNode(entity.Id.ToInvariantString(), parentId, queryStrings, entity.Name, icon);
-            treeNode.Path = entity.Path;
-            treeNode.Udi = Udi.Create(UmbracoObjectTypesExtensions.GetUdiType(entityObjectType), entity.Key);
-            treeNode.HasChildren = hasChildren;
-            return treeNode;
-        }
-
-        /// <summary>
-        /// Helper method to create tree nodes and automatically generate the json url
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="parentId"></param>
-        /// <param name="queryStrings"></param>
-        /// <param name="title"></param>
-        /// <param name="icon"></param>
-        /// <param name="hasChildren"></param>
-        /// <returns></returns>
-        public TreeNode CreateTreeNode(string id, string parentId, FormDataCollection queryStrings, string title, string icon, bool hasChildren)
-        {
-            var treeNode = CreateTreeNode(id, parentId, queryStrings, title, icon);
-            treeNode.HasChildren = hasChildren;
-            return treeNode;
-        }
-
-        /// <summary>
-        /// Helper method to create tree nodes and automatically generate the json url
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="parentId"></param>
-        /// <param name="queryStrings"></param>
-        /// <param name="title"></param>
-        /// <param name="routePath"></param>
-        /// <param name="hasChildren"></param>
-        /// <param name="icon"></param>
-        /// <returns></returns>
-        public TreeNode CreateTreeNode(string id, string parentId, FormDataCollection queryStrings, string title, string icon, bool hasChildren, string routePath)
-        {
-            var treeNode = CreateTreeNode(id, parentId, queryStrings, title, icon);
-            treeNode.HasChildren = hasChildren;
-            treeNode.RoutePath = routePath;
-            return treeNode;
-        }
-
-        /// <summary>
-        /// Helper method to create tree nodes and automatically generate the json url + UDI
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="parentId"></param>
-        /// <param name="queryStrings"></param>
-        /// <param name="title"></param>
-        /// <param name="routePath"></param>
-        /// <param name="hasChildren"></param>
-        /// <param name="icon"></param>
-        /// <param name="udi"></param>
-        /// <returns></returns>
-        public TreeNode CreateTreeNode(string id, string parentId, FormDataCollection queryStrings, string title, string icon, bool hasChildren, string routePath, Udi udi)
-        {
-            var treeNode = CreateTreeNode(id, parentId, queryStrings, title, icon);
-            treeNode.HasChildren = hasChildren;
-            treeNode.RoutePath = routePath;
-            treeNode.Udi = udi;
-            return treeNode;
-        }
-
-        #endregion
-
-        /// <summary>
-        /// The AdditionalData of a node is always populated with the query string data, this method performs this
-        /// operation and ensures that special values are not inserted or that duplicate keys are not added.
-        /// </summary>
-        /// <param name="node"></param>
-        /// <param name="queryStrings"></param>
-        protected void AddQueryStringsToAdditionalData(TreeNode node, FormDataCollection queryStrings)
-        {
-            foreach (var q in queryStrings.Where(x => node.AdditionalData.ContainsKey(x.Key) == false))
-            {
-                node.AdditionalData.Add(q.Key, q.Value);
-            }
-        }
-
-        /// <summary>
-        /// If the request is for a dialog mode tree
-        /// </summary>
-        /// <param name="queryStrings"></param>
-        /// <returns></returns>
-        protected bool IsDialog(FormDataCollection queryStrings)
-        {
-            return queryStrings.GetValue<bool>(TreeQueryStringParameters.IsDialog);
-        }
-
-        /// <summary>
-        /// If the request should allows a user to choose nodes that they normally don't have access to
-        /// </summary>
-        /// <param name="queryStrings"></param>
-        /// <returns></returns>
-        protected bool IgnoreUserStartNodes(FormDataCollection queryStrings)
-        {
-            return queryStrings.GetValue<bool>(TreeQueryStringParameters.IgnoreUserStartNodes);
-        }
-
-        /// <summary>
-        /// An event that allows developers to modify the tree node collection that is being rendered
-        /// </summary>
-        /// <remarks>
-        /// Developers can add/remove/replace/insert/update/etc... any of the tree items in the collection.
-        /// </remarks>
-        public static event TypedEventHandler<TreeControllerBase, TreeNodesRenderingEventArgs> TreeNodesRendering;
-
-        private static void OnTreeNodesRendering(TreeControllerBase instance, TreeNodesRenderingEventArgs e)
-        {
-            var handler = TreeNodesRendering;
-            if (handler != null) handler(instance, e);
-        }
-
-        /// <summary>
-        /// An event that allows developer to modify the root tree node that is being rendered
-        /// </summary>
-        public static event TypedEventHandler<TreeControllerBase, TreeNodeRenderingEventArgs> RootNodeRendering;
-
-        private static void OnRootNodeRendering(TreeControllerBase instance, TreeNodeRenderingEventArgs e)
-        {
-            var handler = RootNodeRendering;
-            if (handler != null) handler(instance, e);
-        }
-
-        /// <summary>
-        /// An event that allows developers to modify the meun that is being rendered
-        /// </summary>
-        /// <remarks>
-        /// Developers can add/remove/replace/insert/update/etc... any of the tree items in the collection.
-        /// </remarks>
-        public static event TypedEventHandler<TreeControllerBase, MenuRenderingEventArgs> MenuRendering;
-
-        private static void OnMenuRendering(TreeControllerBase instance, MenuRenderingEventArgs e)
-        {
-            var handler = MenuRendering;
-            if (handler != null) handler(instance, e);
-        }
-    }
-}
+using System;
+using System.Globalization;
+using System.Linq;
+using System.Net.Http.Formatting;
+using System.Web.Http.ModelBinding;
+using Umbraco.Core;
+using Umbraco.Core.Events;
+using Umbraco.Web.Models.Trees;
+using Umbraco.Web.WebApi;
+using Umbraco.Web.WebApi.Filters;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.EntityBase;
+using Umbraco.Web.Search;
+
+namespace Umbraco.Web.Trees
+{
+    /// <summary>
+    /// A base controller reference for non-attributed trees (un-registered). Developers should inherit from
+    /// TreeController.
+    /// </summary>
+    [AngularJsonOnlyConfiguration]
+    public abstract class TreeControllerBase : UmbracoAuthorizedApiController
+    {
+        protected TreeControllerBase()
+        {
+        }
+
+        protected TreeControllerBase(UmbracoContext umbracoContext) : base(umbracoContext)
+        {
+        }
+
+        protected TreeControllerBase(UmbracoContext umbracoContext, UmbracoHelper umbracoHelper) : base(umbracoContext, umbracoHelper)
+        {
+        }
+
+        /// <summary>
+        /// The method called to render the contents of the tree structure
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="queryStrings">
+        /// All of the query string parameters passed from jsTree
+        /// </param>
+        /// <remarks>
+        /// We are allowing an arbitrary number of query strings to be pased in so that developers are able to persist custom data from the front-end
+        /// to the back end to be used in the query for model data.
+        /// </remarks>
+        protected abstract TreeNodeCollection GetTreeNodes(string id, [ModelBinder(typeof(HttpQueryStringModelBinder))]FormDataCollection queryStrings);
+
+        /// <summary>
+        /// Returns the menu structure for the node
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="queryStrings"></param>
+        /// <returns></returns>
+        protected abstract MenuItemCollection GetMenuForNode(string id, [ModelBinder(typeof(HttpQueryStringModelBinder))]FormDataCollection queryStrings);
+
+        /// <summary>
+        /// The name to display on the root node
+        /// </summary>
+        public abstract string RootNodeDisplayName { get; }
+
+        /// <summary>
+        /// Gets the current tree alias from the attribute assigned to it.
+        /// </summary>
+        public abstract string TreeAlias { get; }
+
+        /// <summary>
+        /// Returns the root node for the tree
+        /// </summary>
+        /// <param name="queryStrings"></param>
+        /// <returns></returns>
+        public TreeNode GetRootNode([ModelBinder(typeof(HttpQueryStringModelBinder))]FormDataCollection queryStrings)
+        {
+            if (queryStrings == null) queryStrings = new FormDataCollection("");
+            var node = CreateRootNode(queryStrings);
+
+            //add the tree alias to the root
+            node.AdditionalData["treeAlias"] = TreeAlias;
+
+            AddQueryStringsToAdditionalData(node, queryStrings);
+
+            //check if the tree is searchable and add that to the meta data as well
+            if (this is ISearchableTree)
+            {
+                node.AdditionalData.Add("searchable", "true");
+            }
+
+            //now update all data based on some of the query strings, like if we are running in dialog mode
+            if (IsDialog(queryStrings))
+            {
+                node.RoutePath = "#";
+            }
+
+            OnRootNodeRendering(this, new TreeNodeRenderingEventArgs(node, queryStrings));
+
+            return node;
+        }
+
+        /// <summary>
+        /// The action called to render the contents of the tree structure
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="queryStrings">
+        /// All of the query string parameters passed from jsTree
+        /// </param>
+        /// <returns>JSON markup for jsTree</returns>
+        /// <remarks>
+        /// We are allowing an arbitrary number of query strings to be pased in so that developers are able to persist custom data from the front-end
+        /// to the back end to be used in the query for model data.
+        /// </remarks>
+        public TreeNodeCollection GetNodes(string id, [ModelBinder(typeof(HttpQueryStringModelBinder))]FormDataCollection queryStrings)
+        {
+            if (queryStrings == null) queryStrings = new FormDataCollection("");
+            var nodes = GetTreeNodes(id, queryStrings);
+
+            foreach (var node in nodes)
+            {
+                AddQueryStringsToAdditionalData(node, queryStrings);
+            }
+
+            //now update all data based on some of the query strings, like if we are running in dialog mode
+            if (IsDialog((queryStrings)))
+            {
+                foreach (var node in nodes)
+                {
+                    node.RoutePath = "#";
+                }
+            }
+
+            //raise the event
+            OnTreeNodesRendering(this, new TreeNodesRenderingEventArgs(nodes, queryStrings));
+
+            return nodes;
+        }
+
+        /// <summary>
+        /// The action called to render the menu for a tree node
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="queryStrings"></param>
+        /// <returns></returns>
+        public MenuItemCollection GetMenu(string id, [ModelBinder(typeof(HttpQueryStringModelBinder))]FormDataCollection queryStrings)
+        {
+            if (queryStrings == null) queryStrings = new FormDataCollection("");
+            var menu = GetMenuForNode(id, queryStrings);
+            //raise the event
+            OnMenuRendering(this, new MenuRenderingEventArgs(id, menu, queryStrings));
+            return menu;
+        }
+
+        /// <summary>
+        /// Helper method to create a root model for a tree
+        /// </summary>
+        /// <returns></returns>
+        protected virtual TreeNode CreateRootNode(FormDataCollection queryStrings)
+        {
+            var rootNodeAsString = Constants.System.Root.ToString(CultureInfo.InvariantCulture);
+            var currApp = queryStrings.GetValue<string>(TreeQueryStringParameters.Application);
+
+            var node = new TreeNode(
+                rootNodeAsString,
+                null, //this is a root node, there is no parent
+                Url.GetTreeUrl(GetType(), rootNodeAsString, queryStrings),
+                Url.GetMenuUrl(GetType(), rootNodeAsString, queryStrings))
+                {
+                    HasChildren = true,
+                    RoutePath = currApp,
+                    Name = RootNodeDisplayName
+                };
+
+            return node;
+        }
+
+        #region Create TreeNode methods
+
+        /// <summary>
+        /// Helper method to create tree nodes
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="parentId"></param>
+        /// <param name="queryStrings"></param>
+        /// <param name="title"></param>
+        /// <returns></returns>
+        public TreeNode CreateTreeNode(string id, string parentId, FormDataCollection queryStrings, string title)
+        {
+            var jsonUrl = Url.GetTreeUrl(GetType(), id, queryStrings);
+            var menuUrl = Url.GetMenuUrl(GetType(), id, queryStrings);
+            var node = new TreeNode(id, parentId, jsonUrl, menuUrl) { Name = title };
+            return node;
+        }
+
+        /// <summary>
+        /// Helper method to create tree nodes
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="parentId"></param>
+        /// <param name="queryStrings"></param>
+        /// <param name="title"></param>
+        /// <param name="icon"></param>
+        /// <returns></returns>
+        public TreeNode CreateTreeNode(string id, string parentId, FormDataCollection queryStrings, string title, string icon)
+        {
+            var jsonUrl = Url.GetTreeUrl(GetType(), id, queryStrings);
+            var menuUrl = Url.GetMenuUrl(GetType(), id, queryStrings);
+            var node = new TreeNode(id, parentId, jsonUrl, menuUrl)
+            {
+                Name = title,
+                Icon = icon,
+                NodeType = TreeAlias
+            };
+            return node;
+        }
+
+        /// <summary>
+        /// Helper method to create tree nodes
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="parentId"></param>
+        /// <param name="queryStrings"></param>
+        /// <param name="title"></param>
+        /// <param name="routePath"></param>
+        /// <param name="icon"></param>
+        /// <returns></returns>
+        public TreeNode CreateTreeNode(string id, string parentId, FormDataCollection queryStrings, string title, string icon, string routePath)
+        {
+            var jsonUrl = Url.GetTreeUrl(GetType(), id, queryStrings);
+            var menuUrl = Url.GetMenuUrl(GetType(), id, queryStrings);
+            var node = new TreeNode(id, parentId, jsonUrl, menuUrl) { Name = title, RoutePath = routePath, Icon = icon };
+            return node;
+        }
+
+        /// <summary>
+        /// Helper method to create tree nodes and automatically generate the json url + UDI
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <param name="entityObjectType"></param>
+        /// <param name="parentId"></param>
+        /// <param name="queryStrings"></param>
+        /// <param name="hasChildren"></param>
+        /// <returns></returns>
+        public TreeNode CreateTreeNode(UmbracoEntity entity, Guid entityObjectType, string parentId, FormDataCollection queryStrings, bool hasChildren)
+        {
+            var treeNode = CreateTreeNode(entity.Id.ToInvariantString(), parentId, queryStrings, entity.Name, entity.ContentTypeIcon);
+            treeNode.Path = entity.Path;
+            treeNode.Udi = Udi.Create(UmbracoObjectTypesExtensions.GetUdiType(entityObjectType), entity.Key);
+            treeNode.HasChildren = hasChildren;
+            return treeNode;
+        }
+
+        /// <summary>
+        /// Helper method to create tree nodes and automatically generate the json url + UDI
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <param name="entityObjectType"></param>
+        /// <param name="parentId"></param>
+        /// <param name="queryStrings"></param>
+        /// <param name="icon"></param>
+        /// <param name="hasChildren"></param>
+        /// <returns></returns>
+        public TreeNode CreateTreeNode(IUmbracoEntity entity, Guid entityObjectType, string parentId, FormDataCollection queryStrings, string icon, bool hasChildren)
+        {
+            var treeNode = CreateTreeNode(entity.Id.ToInvariantString(), parentId, queryStrings, entity.Name, icon);
+            treeNode.Path = entity.Path;
+            treeNode.Udi = Udi.Create(UmbracoObjectTypesExtensions.GetUdiType(entityObjectType), entity.Key);
+            treeNode.HasChildren = hasChildren;
+            return treeNode;
+        }
+
+        /// <summary>
+        /// Helper method to create tree nodes and automatically generate the json url
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="parentId"></param>
+        /// <param name="queryStrings"></param>
+        /// <param name="title"></param>
+        /// <param name="icon"></param>
+        /// <param name="hasChildren"></param>
+        /// <returns></returns>
+        public TreeNode CreateTreeNode(string id, string parentId, FormDataCollection queryStrings, string title, string icon, bool hasChildren)
+        {
+            var treeNode = CreateTreeNode(id, parentId, queryStrings, title, icon);
+            treeNode.HasChildren = hasChildren;
+            return treeNode;
+        }
+
+        /// <summary>
+        /// Helper method to create tree nodes and automatically generate the json url
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="parentId"></param>
+        /// <param name="queryStrings"></param>
+        /// <param name="title"></param>
+        /// <param name="routePath"></param>
+        /// <param name="hasChildren"></param>
+        /// <param name="icon"></param>
+        /// <returns></returns>
+        public TreeNode CreateTreeNode(string id, string parentId, FormDataCollection queryStrings, string title, string icon, bool hasChildren, string routePath)
+        {
+            var treeNode = CreateTreeNode(id, parentId, queryStrings, title, icon);
+            treeNode.HasChildren = hasChildren;
+            treeNode.RoutePath = routePath;
+            return treeNode;
+        }
+
+        /// <summary>
+        /// Helper method to create tree nodes and automatically generate the json url + UDI
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="parentId"></param>
+        /// <param name="queryStrings"></param>
+        /// <param name="title"></param>
+        /// <param name="routePath"></param>
+        /// <param name="hasChildren"></param>
+        /// <param name="icon"></param>
+        /// <param name="udi"></param>
+        /// <returns></returns>
+        public TreeNode CreateTreeNode(string id, string parentId, FormDataCollection queryStrings, string title, string icon, bool hasChildren, string routePath, Udi udi)
+        {
+            var treeNode = CreateTreeNode(id, parentId, queryStrings, title, icon);
+            treeNode.HasChildren = hasChildren;
+            treeNode.RoutePath = routePath;
+            treeNode.Udi = udi;
+            return treeNode;
+        }
+
+        #endregion
+
+        /// <summary>
+        /// The AdditionalData of a node is always populated with the query string data, this method performs this
+        /// operation and ensures that special values are not inserted or that duplicate keys are not added.
+        /// </summary>
+        /// <param name="node"></param>
+        /// <param name="queryStrings"></param>
+        protected void AddQueryStringsToAdditionalData(TreeNode node, FormDataCollection queryStrings)
+        {
+            foreach (var q in queryStrings.Where(x => node.AdditionalData.ContainsKey(x.Key) == false))
+            {
+                node.AdditionalData.Add(q.Key, q.Value);
+            }
+        }
+
+        /// <summary>
+        /// If the request is for a dialog mode tree
+        /// </summary>
+        /// <param name="queryStrings"></param>
+        /// <returns></returns>
+        protected bool IsDialog(FormDataCollection queryStrings)
+        {
+            return queryStrings.GetValue<bool>(TreeQueryStringParameters.IsDialog);
+        }
+
+        /// <summary>
+        /// If the request should allows a user to choose nodes that they normally don't have access to
+        /// </summary>
+        /// <param name="queryStrings"></param>
+        /// <returns></returns>
+        protected bool IgnoreUserStartNodes(FormDataCollection queryStrings)
+        {
+            var dataTypeId = queryStrings.GetValue<Guid?>(TreeQueryStringParameters.DataTypeId);
+            if (dataTypeId.HasValue)
+            {
+                return Services.DataTypeService.IsDataTypeIgnoringUserStartNodes(dataTypeId.Value);
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// An event that allows developers to modify the tree node collection that is being rendered
+        /// </summary>
+        /// <remarks>
+        /// Developers can add/remove/replace/insert/update/etc... any of the tree items in the collection.
+        /// </remarks>
+        public static event TypedEventHandler<TreeControllerBase, TreeNodesRenderingEventArgs> TreeNodesRendering;
+
+        private static void OnTreeNodesRendering(TreeControllerBase instance, TreeNodesRenderingEventArgs e)
+        {
+            var handler = TreeNodesRendering;
+            if (handler != null) handler(instance, e);
+        }
+
+        /// <summary>
+        /// An event that allows developer to modify the root tree node that is being rendered
+        /// </summary>
+        public static event TypedEventHandler<TreeControllerBase, TreeNodeRenderingEventArgs> RootNodeRendering;
+
+        private static void OnRootNodeRendering(TreeControllerBase instance, TreeNodeRenderingEventArgs e)
+        {
+            var handler = RootNodeRendering;
+            if (handler != null) handler(instance, e);
+        }
+
+        /// <summary>
+        /// An event that allows developers to modify the meun that is being rendered
+        /// </summary>
+        /// <remarks>
+        /// Developers can add/remove/replace/insert/update/etc... any of the tree items in the collection.
+        /// </remarks>
+        public static event TypedEventHandler<TreeControllerBase, MenuRenderingEventArgs> MenuRendering;
+
+        private static void OnMenuRendering(TreeControllerBase instance, MenuRenderingEventArgs e)
+        {
+            var handler = MenuRendering;
+            if (handler != null) handler(instance, e);
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Trees/TreeQueryStringParameters.cs b/src/Umbraco.Web/Trees/TreeQueryStringParameters.cs
index c79b9f8781..20e02d1c42 100644
--- a/src/Umbraco.Web/Trees/TreeQueryStringParameters.cs
+++ b/src/Umbraco.Web/Trees/TreeQueryStringParameters.cs
@@ -1,15 +1,15 @@
-namespace Umbraco.Web.Trees
-{
-    /// <summary>
-    /// Common query string parameters used for tree query strings
-    /// </summary>
-    internal struct TreeQueryStringParameters
-    {
-        public const string IsDialog = "isDialog";
-        public const string Application = "application";
-        public const string StartNodeId = "startNodeId";
-        public const string IgnoreUserStartNodes = "ignoreUserStartNodes";        
-        //public const string OnNodeClick = "OnNodeClick";
-        //public const string RenderParent = "RenderParent";
-    }
-}
+namespace Umbraco.Web.Trees
+{
+    /// <summary>
+    /// Common query string parameters used for tree query strings
+    /// </summary>
+    internal struct TreeQueryStringParameters
+    {
+        public const string IsDialog = "isDialog";
+        public const string Application = "application";
+        public const string StartNodeId = "startNodeId";
+        public const string DataTypeId = "dataTypeId";
+        //public const string OnNodeClick = "OnNodeClick";
+        //public const string RenderParent = "RenderParent";
+    }
+}
diff --git a/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs b/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
index 64fe9a4b65..57a7db4889 100644
--- a/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
+++ b/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
@@ -1,148 +1,154 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Web.Http;
-using System.Web.Http.Controllers;
-using System.Web.Http.Filters;
-using Umbraco.Core;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.Membership;
-using Umbraco.Core.Services;
-using Umbraco.Web.Editors;
-using Umbraco.Web.Models.ContentEditing;
-using umbraco.BusinessLogic.Actions;
-
-namespace Umbraco.Web.WebApi.Filters
-{
-    /// <summary>
-    /// Auth filter to check if the current user has access to the content item (by id). 
-    /// </summary>
-    /// <remarks>
-    /// 
-    /// This first checks if the user can access this based on their start node, and then checks node permissions
-    /// 
-    /// By default the permission that is checked is browse but this can be specified in the ctor.
-    /// NOTE: This cannot be an auth filter because that happens too soon and we don't have access to the action params.
-    /// </remarks>
-    public sealed class EnsureUserPermissionForContentAttribute : ActionFilterAttribute
-    {
-        private readonly int? _nodeId;
-        private readonly string _paramName;
-        private readonly char? _permissionToCheck;
-
-        /// <summary>
-        /// This constructor will only be able to test the start node access
-        /// </summary>
-        public EnsureUserPermissionForContentAttribute(int nodeId)
-        {
-            _nodeId = nodeId;
-        }
-
-        public EnsureUserPermissionForContentAttribute(int nodeId, char permissionToCheck)
-            : this(nodeId)
-        {
-            _permissionToCheck = permissionToCheck;
-        }
-
-        public EnsureUserPermissionForContentAttribute(string paramName)
-        {
-            if (string.IsNullOrWhiteSpace(paramName)) throw new ArgumentException("Value cannot be null or whitespace.", "paramName");
-
-            _paramName = paramName;
-            _permissionToCheck = ActionBrowse.Instance.Letter;
-        }
-
-        public EnsureUserPermissionForContentAttribute(string paramName, char permissionToCheck)
-            : this(paramName)
-        {
-            _permissionToCheck = permissionToCheck;
-        }
-        
-        public override bool AllowMultiple
-        {
-            get { return true; }
-        }
-
-        public override void OnActionExecuting(HttpActionContext actionContext)
-        {
-            if (UmbracoContext.Current.Security.CurrentUser == null)
-            {
-                //not logged in
-                throw new HttpResponseException(System.Net.HttpStatusCode.Unauthorized);
-            }
-            
-            var ignoreUserStartNodes = actionContext.ActionArguments.ContainsKey("ignoreUserStartNodes") &&
-                                       bool.Parse(actionContext.ActionArguments.GetValueAsString("ignoreUserStartNodes"));
-
-            int nodeId;
-            if (_nodeId.HasValue == false)
-            {
-                var parts = _paramName.Split(new char[] {'.'}, StringSplitOptions.RemoveEmptyEntries);
-
-                if (actionContext.ActionArguments[parts[0]] == null)
-                {
-                    throw new InvalidOperationException("No argument found for the current action with the name: " + _paramName);
-                }
-
-                if (parts.Length == 1)
-                {
-                    var argument = actionContext.ActionArguments[parts[0]].ToString();
-                    // if the argument is an int, it will parse and can be assigned to nodeId
-                    // if might be a udi, so check that next
-                    // otherwise treat it as a guid - unlikely we ever get here
-                    if (int.TryParse(argument, out int parsedId))
-                    {
-                        nodeId = parsedId;
-                    }
-                    else if (Udi.TryParse(argument, true, out Udi udi))
-                    { 
-                        nodeId = ApplicationContext.Current.Services.EntityService.GetIdForUdi(udi).Result;
-                    }
-                    else
-                    {
-                        Guid.TryParse(argument, out Guid key);
-                        nodeId = ApplicationContext.Current.Services.EntityService.GetIdForKey(key, UmbracoObjectTypes.Document).Result;
-                    }
-                }
-                else
-                {
-                    //now we need to see if we can get the property of whatever object it is
-                    var pType = actionContext.ActionArguments[parts[0]].GetType();
-                    var prop = pType.GetProperty(parts[1]);
-                    if (prop == null)
-                    {
-                        throw new InvalidOperationException("No argument found for the current action with the name: " + _paramName);
-                    }
-                    nodeId = (int)prop.GetValue(actionContext.ActionArguments[parts[0]]);                    
-                }
-            }
-            else
-            {
-                nodeId = _nodeId.Value;
-            }
-
-            if (ContentController.CheckPermissions(
-                actionContext.Request.Properties,
-                UmbracoContext.Current.Security.CurrentUser,
-                ApplicationContext.Current.Services.UserService,
-                ApplicationContext.Current.Services.ContentService, 
-                ApplicationContext.Current.Services.EntityService, 
-                nodeId,
-                _permissionToCheck.HasValue ? new[]{_permissionToCheck.Value}: null,
-                ignoreUserStartNodes: ignoreUserStartNodes))
-            {
-                base.OnActionExecuting(actionContext);
-            }
-            else
-            {
-                throw new HttpResponseException(actionContext.Request.CreateUserNoAccessResponse());
-            }
-            
-        }
-
-        
-
-    }
-}
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Web.Http;
+using System.Web.Http.Controllers;
+using System.Web.Http.Filters;
+using Umbraco.Core;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.Membership;
+using Umbraco.Core.Services;
+using Umbraco.Web.Editors;
+using Umbraco.Web.Models.ContentEditing;
+using umbraco.BusinessLogic.Actions;
+
+namespace Umbraco.Web.WebApi.Filters
+{
+    /// <summary>
+    /// Auth filter to check if the current user has access to the content item (by id).
+    /// </summary>
+    /// <remarks>
+    ///
+    /// This first checks if the user can access this based on their start node, and then checks node permissions
+    ///
+    /// By default the permission that is checked is browse but this can be specified in the ctor.
+    /// NOTE: This cannot be an auth filter because that happens too soon and we don't have access to the action params.
+    /// </remarks>
+    public sealed class EnsureUserPermissionForContentAttribute : ActionFilterAttribute
+    {
+        private readonly int? _nodeId;
+        private readonly string _paramName;
+        private readonly char? _permissionToCheck;
+
+        /// <summary>
+        /// This constructor will only be able to test the start node access
+        /// </summary>
+        public EnsureUserPermissionForContentAttribute(int nodeId)
+        {
+            _nodeId = nodeId;
+        }
+
+        public EnsureUserPermissionForContentAttribute(int nodeId, char permissionToCheck)
+            : this(nodeId)
+        {
+            _permissionToCheck = permissionToCheck;
+        }
+
+        public EnsureUserPermissionForContentAttribute(string paramName)
+        {
+            if (string.IsNullOrWhiteSpace(paramName)) throw new ArgumentException("Value cannot be null or whitespace.", "paramName");
+
+            _paramName = paramName;
+            _permissionToCheck = ActionBrowse.Instance.Letter;
+        }
+
+        public EnsureUserPermissionForContentAttribute(string paramName, char permissionToCheck)
+            : this(paramName)
+        {
+            _permissionToCheck = permissionToCheck;
+        }
+
+        public override bool AllowMultiple
+        {
+            get { return true; }
+        }
+
+        public override void OnActionExecuting(HttpActionContext actionContext)
+        {
+            if (UmbracoContext.Current.Security.CurrentUser == null)
+            {
+                //not logged in
+                throw new HttpResponseException(System.Net.HttpStatusCode.Unauthorized);
+            }
+
+            var ignoreUserStartNodes = false;
+
+            if (actionContext.ActionArguments.ContainsKey("dataTypeId") &&
+                Guid.TryParse(actionContext.ActionArguments.GetValueAsString("dataTypeId"), out var dataTypeId))
+            {
+                ignoreUserStartNodes =
+                    ApplicationContext.Current.Services.DataTypeService.IsDataTypeIgnoringUserStartNodes(dataTypeId);
+            }
+
+            int nodeId;
+            if (_nodeId.HasValue == false)
+            {
+                var parts = _paramName.Split(new char[] {'.'}, StringSplitOptions.RemoveEmptyEntries);
+
+                if (actionContext.ActionArguments[parts[0]] == null)
+                {
+                    throw new InvalidOperationException("No argument found for the current action with the name: " + _paramName);
+                }
+
+                if (parts.Length == 1)
+                {
+                    var argument = actionContext.ActionArguments[parts[0]].ToString();
+                    // if the argument is an int, it will parse and can be assigned to nodeId
+                    // if might be a udi, so check that next
+                    // otherwise treat it as a guid - unlikely we ever get here
+                    if (int.TryParse(argument, out int parsedId))
+                    {
+                        nodeId = parsedId;
+                    }
+                    else if (Udi.TryParse(argument, true, out Udi udi))
+                    {
+                        nodeId = ApplicationContext.Current.Services.EntityService.GetIdForUdi(udi).Result;
+                    }
+                    else
+                    {
+                        Guid.TryParse(argument, out Guid key);
+                        nodeId = ApplicationContext.Current.Services.EntityService.GetIdForKey(key, UmbracoObjectTypes.Document).Result;
+                    }
+                }
+                else
+                {
+                    //now we need to see if we can get the property of whatever object it is
+                    var pType = actionContext.ActionArguments[parts[0]].GetType();
+                    var prop = pType.GetProperty(parts[1]);
+                    if (prop == null)
+                    {
+                        throw new InvalidOperationException("No argument found for the current action with the name: " + _paramName);
+                    }
+                    nodeId = (int)prop.GetValue(actionContext.ActionArguments[parts[0]]);
+                }
+            }
+            else
+            {
+                nodeId = _nodeId.Value;
+            }
+
+            if (ContentController.CheckPermissions(
+                actionContext.Request.Properties,
+                UmbracoContext.Current.Security.CurrentUser,
+                ApplicationContext.Current.Services.UserService,
+                ApplicationContext.Current.Services.ContentService,
+                ApplicationContext.Current.Services.EntityService,
+                nodeId,
+                _permissionToCheck.HasValue ? new[]{_permissionToCheck.Value}: null,
+                ignoreUserStartNodes: ignoreUserStartNodes))
+            {
+                base.OnActionExecuting(actionContext);
+            }
+            else
+            {
+                throw new HttpResponseException(actionContext.Request.CreateUserNoAccessResponse());
+            }
+
+        }
+
+
+
+    }
+}
diff --git a/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs b/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs
index 23d4fb871c..40f0ad2a79 100644
--- a/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs
+++ b/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs
@@ -8,13 +8,12 @@ using System.Web.Http.Filters;
 using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Membership;
-using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Web.Trees;
 
 namespace Umbraco.Web.WebApi.Filters
 {
     /// <summary>
-    /// This inspects the result of the action that returns a collection of content and removes 
+    /// This inspects the result of the action that returns a collection of content and removes
     /// any item that the current user doesn't have access to
     /// </summary>
     internal class FilterAllowedOutgoingMediaAttribute : ActionFilterAttribute
@@ -79,12 +78,18 @@ namespace Umbraco.Web.WebApi.Filters
 
         protected virtual void FilterItems(IUser user, IList items)
         {
-            bool.TryParse(HttpContext.Current.Request.QueryString.Get(TreeQueryStringParameters.IgnoreUserStartNodes), out var ignoreUserStartNodes);
+
+            Guid? dataTypeId = Guid.TryParse(HttpContext.Current.Request.QueryString.Get(TreeQueryStringParameters.DataTypeId), out var temp) ? (Guid?)temp : null;
+
+            if (dataTypeId.HasValue == false) return;
+
+            var ignoreUserStartNodes = ApplicationContext.Current.Services.DataTypeService.IsDataTypeIgnoringUserStartNodes(dataTypeId.Value);
 
             if (ignoreUserStartNodes == false)
             {
                 FilterBasedOnStartNode(items, user);
             }
+
         }
 
         internal void FilterBasedOnStartNode(IList items, IUser user)

From c0f26f93b3f2ba4b6d7c2af0be30154853f7ac05 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Thu, 20 Jun 2019 22:07:59 +0200
Subject: [PATCH 007/776] WIP for property level copying

---
 .../PropertyEditors/DataEditorAttribute.cs          |  5 +++++
 src/Umbraco.Core/PropertyEditors/DataValueEditor.cs |  7 +++++++
 .../PropertyEditors/IDataValueEditor.cs             |  5 +++++
 .../components/property/umbproperty.directive.js    |  4 ++++
 .../src/views/components/property/umb-property.html |  3 +++
 .../nestedcontent/nestedcontent.controller.js       | 13 ++++++++++---
 .../Models/ContentEditing/ContentPropertyDisplay.cs |  3 +++
 .../Models/Mapping/ContentPropertyDisplayMapper.cs  |  1 +
 .../PropertyEditors/NestedContentPropertyEditor.cs  |  2 +-
 9 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Core/PropertyEditors/DataEditorAttribute.cs b/src/Umbraco.Core/PropertyEditors/DataEditorAttribute.cs
index ca08127d51..bf67522449 100644
--- a/src/Umbraco.Core/PropertyEditors/DataEditorAttribute.cs
+++ b/src/Umbraco.Core/PropertyEditors/DataEditorAttribute.cs
@@ -111,6 +111,11 @@ namespace Umbraco.Core.PropertyEditors
         /// </summary>
         public bool HideLabel { get; set; }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether the editor value can be copied
+        /// </summary>
+        public bool CanCopy { get; set; }
+
         /// <summary>
         /// Gets or sets an optional icon.
         /// </summary>
diff --git a/src/Umbraco.Core/PropertyEditors/DataValueEditor.cs b/src/Umbraco.Core/PropertyEditors/DataValueEditor.cs
index c4380f032c..2f215c6032 100644
--- a/src/Umbraco.Core/PropertyEditors/DataValueEditor.cs
+++ b/src/Umbraco.Core/PropertyEditors/DataValueEditor.cs
@@ -57,6 +57,7 @@ namespace Umbraco.Core.PropertyEditors
             View = view;
             ValueType = attribute.ValueType;
             HideLabel = attribute.HideLabel;
+            CanCopy = attribute.CanCopy;
         }
 
         /// <summary>
@@ -133,6 +134,12 @@ namespace Umbraco.Core.PropertyEditors
         [JsonProperty("hideLabel")]
         public bool HideLabel { get; set; }
 
+        /// <summary>
+        /// If this is true then the editor value can be copied
+        /// </summary>
+        [JsonProperty("canCopy")]
+        public bool CanCopy { get; set; }
+
         /// <summary>
         /// Set this to true if the property editor is for display purposes only
         /// </summary>
diff --git a/src/Umbraco.Core/PropertyEditors/IDataValueEditor.cs b/src/Umbraco.Core/PropertyEditors/IDataValueEditor.cs
index cb68531cc7..18670ccf4f 100644
--- a/src/Umbraco.Core/PropertyEditors/IDataValueEditor.cs
+++ b/src/Umbraco.Core/PropertyEditors/IDataValueEditor.cs
@@ -34,6 +34,11 @@ namespace Umbraco.Core.PropertyEditors
         /// </summary>
         bool HideLabel { get; }
 
+        /// <summary>
+        /// Gets a value indicating whether the value can be copied
+        /// </summary>
+        bool CanCopy { get; }
+
         /// <summary>
         /// Validates a property value.
         /// </summary>
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbproperty.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbproperty.directive.js
index 302378b8c0..1e4c810fec 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbproperty.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbproperty.directive.js
@@ -32,6 +32,10 @@ angular.module("umbraco.directives")
                 self.setPropertyError = function (errorMsg) {
                     $scope.property.propertyErrorMessage = errorMsg;
                 };
+
+                $scope.onCopy = function () {
+                    $scope.$broadcast("propertyCopy");
+                }
             }
         };
     });
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property.html b/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property.html
index 9d2588484c..01d8f2b616 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property.html
@@ -17,6 +17,9 @@
                     <span ng-if="property.validation.mandatory">
                         <strong class="umb-control-required">*</strong>
                     </span>
+
+                    <i class="icon-documents" ng-show="!showInherit && property.canCopy" ng-click="onCopy()" prevent-default></i>
+
                     <small ng-bind-html="property.description | preserveNewLineInHtml"></small>
                 </label>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
index 4e8b35a276..2884212c85 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -547,12 +547,19 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
             $scope.realCurrentNode = newVal;
         });
 
-        var unsubscribe = $scope.$on("formSubmitting", function (ev, args) {
+        var unsubscribe = [];
+        unsubscribe.push($scope.$on("formSubmitting", function (ev, args) {
             updateModel();
-        });
+        }));
+        unsubscribe.push($scope.$on("propertyCopy", function (ev, args) {
+            console.log("NC: I be the copy function by broadcast", $scope.model.alias);
+        }));
 
         $scope.$on("$destroy", function () {
-            unsubscribe();
+            console.log("Unsubscribing", unsubscribe.length)
+            for (var u in unsubscribe) {
+                unsubscribe[u]();
+            }
         });
         
     }
diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentPropertyDisplay.cs b/src/Umbraco.Web/Models/ContentEditing/ContentPropertyDisplay.cs
index 39a4718dd0..add557c8fc 100644
--- a/src/Umbraco.Web/Models/ContentEditing/ContentPropertyDisplay.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/ContentPropertyDisplay.cs
@@ -33,6 +33,9 @@ namespace Umbraco.Web.Models.ContentEditing
         [DataMember(Name = "hideLabel")]
         public bool HideLabel { get; set; }
 
+        [DataMember(Name = "canCopy")]
+        public bool CanCopy { get; set; }
+
         [DataMember(Name = "validation")]
         public PropertyTypeValidation Validation { get; set; }
 
diff --git a/src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayMapper.cs b/src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayMapper.cs
index 8a45548e9c..7a10f7062b 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayMapper.cs
@@ -39,6 +39,7 @@ namespace Umbraco.Web.Models.Mapping
             dest.Description = originalProp.PropertyType.Description;
             dest.Label = originalProp.PropertyType.Name;
             dest.HideLabel = valEditor.HideLabel;
+            dest.CanCopy = valEditor.CanCopy;
 
             //add the validation information
             dest.Validation.Mandatory = originalProp.PropertyType.Mandatory;
diff --git a/src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
index 6dee2f78b5..6fcb7ea642 100644
--- a/src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
@@ -18,7 +18,7 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// Represents a nested content property editor.
     /// </summary>
-    [DataEditor(Constants.PropertyEditors.Aliases.NestedContent, "Nested Content", "nestedcontent", ValueType = "JSON", Group = "lists", Icon = "icon-thumbnail-list")]
+    [DataEditor(Constants.PropertyEditors.Aliases.NestedContent, "Nested Content", "nestedcontent", ValueType = "JSON", Group = "lists", Icon = "icon-thumbnail-list", CanCopy = true)]
     public class NestedContentPropertyEditor : DataEditor
     {
         private readonly Lazy<PropertyEditorCollection> _propertyEditors;

From 959a4b77bbb9358b02dd5072371f3e2e6232a7b6 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Thu, 20 Jun 2019 22:24:46 +0200
Subject: [PATCH 008/776] Remove inline property copying for NC

---
 .../propertyeditors/nestedcontent/nestedcontent.controller.js  | 2 +-
 .../src/views/propertyeditors/nestedcontent/nestedcontent.html | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
index 2f4fa08e32..5c97a935a1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -596,7 +596,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
             updateModel();
         }));
         unsubscribe.push($scope.$on("propertyCopy", function (ev, args) {
-            console.log("NC: I be the copy function by broadcast", $scope.model.alias);
+            $scope.clickCopyAll();
         }));
 
         $scope.$on("$destroy", function () {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html
index a3196e8928..1eb7311ca7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html
@@ -42,9 +42,6 @@
             <a href class="umb-nested-content__add-content" ng-class="{ '--disabled': !scaffolds.length }" ng-click="openNodeTypePicker($event)" prevent-default>
                 <localize key="grid_addElement"></localize>
             </a>
-            <a class="umb-nested-content__icon umb-nested-content__icon--copy" title="{{copyIconTitle}}" ng-click="clickCopyAll();" ng-if="showCopy && nodes.length" prevent-default>
-                <i class="icon icon-documents"></i>
-            </a>
         </div>
 
     </ng-form>

From 5fa0641a5ce9009c9d3f5717ebdecf8c4d5a5cf0 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Thu, 20 Jun 2019 22:39:06 +0200
Subject: [PATCH 009/776] Add hover state to the property copy icon

---
 src/Umbraco.Web.UI.Client/src/less/property-editors.less | 9 +++++++++
 .../src/views/components/property/umb-property.html      | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
index 9e8dd37ab9..93cbeb60d1 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -59,7 +59,16 @@
 	border-radius: 3px;
 }
 
+.umb-property .umb-property__copy {
+    font-size: 16px;
+    padding: 4px;
+    line-height: 10px;
 
+    &:hover {
+        color: @ui-option-type-hover;
+        text-decoration: none;
+    }
+}
 
 //
 // Content picker
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property.html b/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property.html
index 01d8f2b616..7f48ca250d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property.html
@@ -18,7 +18,7 @@
                         <strong class="umb-control-required">*</strong>
                     </span>
 
-                    <i class="icon-documents" ng-show="!showInherit && property.canCopy" ng-click="onCopy()" prevent-default></i>
+                    <a class="icon-documents umb-property__copy" ng-show="!showInherit && property.canCopy" ng-click="onCopy()" prevent-default></a>
 
                     <small ng-bind-html="property.description | preserveNewLineInHtml"></small>
                 </label>

From b55d2a8a41c96f9e6461157f45c7f8df27d64733 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Fri, 21 Jun 2019 09:55:46 +0200
Subject: [PATCH 010/776] Modelsbuilder is asking for too old a version of the
 CodeAnalysis dependency

---
 build/NuSpecs/UmbracoCms.nuspec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec
index 8b650edc13..7d864fb03a 100644
--- a/build/NuSpecs/UmbracoCms.nuspec
+++ b/build/NuSpecs/UmbracoCms.nuspec
@@ -22,6 +22,7 @@
                 <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)" />
+                <dependency id="Microsoft.CodeAnalysis.CSharp" version="[1.3.1, 2.0.0)" />
             </group>
         </dependencies>
     </metadata>

From ad4416f6633c95520d9dff8f009d2f43f5093b26 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Fri, 21 Jun 2019 10:07:45 +0200
Subject: [PATCH 011/776] So apparently Microsoft.CodeAnalysis.CSharp version
 1.3.2 contains the dll that has the version 1.3.1.. very confusing

---
 build/NuSpecs/UmbracoCms.nuspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec
index 7d864fb03a..838ec5eff0 100644
--- a/build/NuSpecs/UmbracoCms.nuspec
+++ b/build/NuSpecs/UmbracoCms.nuspec
@@ -22,7 +22,7 @@
                 <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)" />
-                <dependency id="Microsoft.CodeAnalysis.CSharp" version="[1.3.1, 2.0.0)" />
+                <dependency id="Microsoft.CodeAnalysis.CSharp" version="[1.3.2, 2.0.0)" />
             </group>
         </dependencies>
     </metadata>

From 5ebdfc7b1ce7e9329af64e51f1004a481a8fefb4 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Fri, 21 Jun 2019 10:22:16 +0200
Subject: [PATCH 012/776] Previously added a few too many binding redirects to
 the web.config

---
 src/Umbraco.Web.UI/web.Template.config | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config
index 583952f29d..4ff70db974 100644
--- a/src/Umbraco.Web.UI/web.Template.config
+++ b/src/Umbraco.Web.UI/web.Template.config
@@ -438,22 +438,6 @@
                 <assemblyIdentity name="System.Data.SqlServerCe" publicKeyToken="89845DCD8080CC91" culture="neutral"/>
                 <bindingRedirect oldVersion="0.0.0.0-4.0.0.1" newVersion="4.0.0.1"/>
             </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-1.2.3.0" newVersion="1.2.3.0" />
-            </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.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="System.Threading.Tasks.Dataflow" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-4.6.3.0" newVersion="4.6.3.0" />
-            </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral" />
                 <bindingRedirect oldVersion="0.0.0.0-1.3.1.0" newVersion="1.3.1.0" />

From 2898203cb9d21acfb3430f5b04a50e991de414b8 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Fri, 21 Jun 2019 10:35:05 +0200
Subject: [PATCH 013/776] 
 https://umbraco.visualstudio.com/D-Team%20Tracker/_workitems/edit/1479
 Bugfixes for the "Bypass security" feature + filter out possible sensitive
 data

---
 .../src/common/resources/content.resource.js  |  6 +++-
 .../src/common/resources/entity.resource.js   | 15 +++++---
 .../contentpicker/contentpicker.controller.js |  2 +-
 .../ContentEditing/ContentPropertyBasic.cs    |  5 ++-
 ...EnsureUserPermissionForContentAttribute.cs | 17 +++++++---
 .../FilterAllowedOutgoingMediaAttribute.cs    | 34 +++++++++++++++++++
 6 files changed, 65 insertions(+), 14 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
index 31eccfb5aa..d85cc74d7d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
@@ -331,12 +331,16 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
             //now copy back to the options we will use
             options = defaults;
 
+            var args = [{ id: id }];
+            if(options.dataTypeId){
+                args.push({ dataTypeId: options.dataTypeId });
+            }
             return umbRequestHelper.resourcePromise(
                   $http.get(
                         umbRequestHelper.getApiUrl(
                               "contentApiBaseUrl",
                               "GetById",
-                              [{ id: id }, { dataTypeId: options.dataTypeId }])),
+                                args)),
                   'Failed to retrieve data for content id ' + id);
         },
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
index fff4ddde37..3991932d2d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
@@ -304,16 +304,21 @@ function entityResource($q, $http, umbRequestHelper) {
             //now copy back to the options we will use
             options = defaults;
 
+
+            var args = [
+                { id: id },
+                { type: type },
+            ];
+            if(options.dataTypeId){
+                args.push({dataTypeId: options.dataTypeId});
+            }
+
             return umbRequestHelper.resourcePromise(
                $http.get(
                    umbRequestHelper.getApiUrl(
                        "entityApiBaseUrl",
                        "GetAncestors",
-                       [
-                           { id: id },
-                           { type: type },
-                           { dataTypeId: options.dataTypeId }
-                       ])),
+                       args)),
                        'Failed to retrieve ancestor data for id ' + id);
         },
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
index 627baa3e7a..187b86a811 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
@@ -133,7 +133,6 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
         idType: "int"
     };
 
-    dialogOptions.dataTypeId = $scope.model.dataTypeId;
     //since most of the pre-value config's are used in the dialog options (i.e. maxNumber, minNumber, etc...) we'll merge the
     // pre-value config on to the dialog options
     angular.extend(dialogOptions, $scope.model.config);
@@ -184,6 +183,7 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
       $scope.contentPickerOverlay = dialogOptions;
       $scope.contentPickerOverlay.view = "treepicker";
       $scope.contentPickerOverlay.show = true;
+      $scope.contentPickerOverlay.dataTypeId = $scope.model.dataTypeId;
 
       $scope.contentPickerOverlay.submit = function(model) {
 
diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentPropertyBasic.cs b/src/Umbraco.Web/Models/ContentEditing/ContentPropertyBasic.cs
index f2174ab120..9edbab04ae 100644
--- a/src/Umbraco.Web/Models/ContentEditing/ContentPropertyBasic.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/ContentPropertyBasic.cs
@@ -21,9 +21,8 @@ namespace Umbraco.Web.Models.ContentEditing
         [Required]
         public int Id { get; set; }
 
-        [DataMember(Name = "dataTypeId", IsRequired = true)]
-        [Required]
-        public Guid DataTypeId { get; set; }
+        [DataMember(Name = "dataTypeId", IsRequired = false)]
+        public Guid? DataTypeId { get; set; }
 
         [DataMember(Name = "value")]
         public object Value { get; set; }
diff --git a/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs b/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
index 57a7db4889..dfdea268c4 100644
--- a/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
+++ b/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
@@ -75,11 +75,20 @@ namespace Umbraco.Web.WebApi.Filters
 
             var ignoreUserStartNodes = false;
 
-            if (actionContext.ActionArguments.ContainsKey("dataTypeId") &&
-                Guid.TryParse(actionContext.ActionArguments.GetValueAsString("dataTypeId"), out var dataTypeId))
+            if (actionContext.ActionArguments.ContainsKey("dataTypeId"))
             {
-                ignoreUserStartNodes =
-                    ApplicationContext.Current.Services.DataTypeService.IsDataTypeIgnoringUserStartNodes(dataTypeId);
+                if (actionContext.ActionArguments.TryGetValue("dataTypeId", out var dataTypeIdValue))
+                {
+                    var dataTypeIdString = dataTypeIdValue?.ToString();
+                    if (string.IsNullOrEmpty(dataTypeIdString) == false &&
+                        Guid.TryParse(dataTypeIdString, out var dataTypeId))
+                    {
+                        ignoreUserStartNodes =
+                            ApplicationContext.Current.Services.DataTypeService
+                                .IsDataTypeIgnoringUserStartNodes(dataTypeId);
+                    }
+                }
+
             }
 
             int nodeId;
diff --git a/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs b/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs
index 40f0ad2a79..d054337fd9 100644
--- a/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs
+++ b/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs
@@ -89,9 +89,43 @@ namespace Umbraco.Web.WebApi.Filters
             {
                 FilterBasedOnStartNode(items, user);
             }
+            else
+            {
+                FilterOutPossibleSensitiveData(items);
+            }
 
         }
 
+        /// <summary>
+        /// Removes all properties of the items except the umbracoFile.
+        /// </summary>
+        /// <param name="items"></param>
+        private void FilterOutPossibleSensitiveData(IList items)
+        {
+            foreach (dynamic item in items)
+            {
+
+                if (item.Properties != null)
+                {
+                    if (item.Properties is IList properties)
+                        // Iterate reverse, because we removed from the same list, such that the ordering of indexes not
+                        // changes doing the iteration
+                        for (var i = properties.Count - 1; i >= 0; i--)
+                        {
+                            dynamic property = properties[i];
+                            if (property.Alias != null && property.Alias is string)
+                            {
+                                var alias = property.Alias as string;
+                                if (string.Equals(alias, Constants.Conventions.Media.File) == false)
+                                {
+                                    properties.RemoveAt(i);
+                                }
+                            }
+                        }
+                }
+            }
+        }
+
         internal void FilterBasedOnStartNode(IList items, IUser user)
         {
             var toRemove = new List<dynamic>();

From 40d4a8fe6aa40a46a1b186b93f1e2dafcfcb84c8 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Fri, 21 Jun 2019 13:32:53 +0200
Subject: [PATCH 014/776] Modelsbuilder is asking for too old a version of
 CodeAnalysis, Immutable and Metadata dependencies

---
 build/NuSpecs/UmbracoCms.nuspec          |  1 -
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 20 ++++++++++----------
 src/Umbraco.Web.UI/packages.config       | 10 +++++-----
 src/Umbraco.Web.UI/web.Template.config   |  8 --------
 4 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec
index 838ec5eff0..8b650edc13 100644
--- a/build/NuSpecs/UmbracoCms.nuspec
+++ b/build/NuSpecs/UmbracoCms.nuspec
@@ -22,7 +22,6 @@
                 <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)" />
-                <dependency id="Microsoft.CodeAnalysis.CSharp" version="[1.3.2, 2.0.0)" />
             </group>
         </dependencies>
     </metadata>
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 9d92d55388..a0624a2dd7 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -155,11 +155,11 @@
     <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.2\lib\net45\Microsoft.AspNet.Identity.Owin.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.CodeAnalysis, Version=1.3.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.Common.1.3.2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
+    <Reference Include="Microsoft.CodeAnalysis, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeAnalysis.Common.1.0.0\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.CodeAnalysis.CSharp, Version=1.3.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.1.3.2\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
@@ -204,8 +204,8 @@
     <Reference Include="System">
       <Name>System</Name>
     </Reference>
-    <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\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+    <Reference Include="System.Collections.Immutable, Version=1.1.36.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Collections.Immutable.1.1.36\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.configuration" />
@@ -236,8 +236,8 @@
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
     </Reference>
-    <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\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
+    <Reference Include="System.Reflection.Metadata, Version=1.0.21.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Reflection.Metadata.1.0.21\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
@@ -1002,8 +1002,8 @@
     <Folder Include="Views\MacroPartials\" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
-    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.1.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.1.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
   </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
diff --git a/src/Umbraco.Web.UI/packages.config b/src/Umbraco.Web.UI/packages.config
index abcaf6bf83..18cbfdb042 100644
--- a/src/Umbraco.Web.UI/packages.config
+++ b/src/Umbraco.Web.UI/packages.config
@@ -19,9 +19,9 @@
   <package id="Microsoft.AspNet.WebApi.Core" 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.CodeAnalysis.Analyzers" version="1.1.0" targetFramework="net452" developmentDependency="true" />
-  <package id="Microsoft.CodeAnalysis.Common" version="1.3.2" targetFramework="net452" />
-  <package id="Microsoft.CodeAnalysis.CSharp" version="1.3.2" targetFramework="net452" />
+  <package id="Microsoft.CodeAnalysis.Analyzers" version="1.0.0" targetFramework="net452" developmentDependency="true" />
+  <package id="Microsoft.CodeAnalysis.Common" version="1.0.0" targetFramework="net452" />
+  <package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0" targetFramework="net452" />
   <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.1" targetFramework="net452" />
   <package id="Microsoft.IO.RecyclableMemoryStream" version="1.2.2" targetFramework="net45" />
   <package id="Microsoft.Net.Compilers" version="1.3.2" targetFramework="net452" developmentDependency="true" />
@@ -36,7 +36,7 @@
   <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net452" />
   <package id="Owin" version="1.0" targetFramework="net45" />
   <package id="SqlServerCE" version="4.0.0.1" targetFramework="net45" />
-  <package id="System.Collections.Immutable" version="1.5.0" targetFramework="net452" />
-  <package id="System.Reflection.Metadata" version="1.6.0" targetFramework="net452" />
+  <package id="System.Collections.Immutable" version="1.1.36" targetFramework="net452" />
+  <package id="System.Reflection.Metadata" version="1.0.21" targetFramework="net452" />
   <package id="Umbraco.ModelsBuilder" version="3.0.10" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config
index 4ff70db974..0d26b71a38 100644
--- a/src/Umbraco.Web.UI/web.Template.config
+++ b/src/Umbraco.Web.UI/web.Template.config
@@ -438,14 +438,6 @@
                 <assemblyIdentity name="System.Data.SqlServerCe" publicKeyToken="89845DCD8080CC91" culture="neutral"/>
                 <bindingRedirect oldVersion="0.0.0.0-4.0.0.1" newVersion="4.0.0.1"/>
             </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-1.3.1.0" newVersion="1.3.1.0" />
-            </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-1.3.1.0" newVersion="1.3.1.0" />
-            </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" publicKeyToken="31bf3856ad364e35" culture="neutral" />
                 <bindingRedirect oldVersion="0.0.0.0-2.0.1.0" newVersion="2.0.1.0" />

From c4c2082fa93aa663349551009e8b52a04f9e54e0 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Fri, 21 Jun 2019 13:57:17 +0200
Subject: [PATCH 015/776] 
 https://umbraco.visualstudio.com/D-Team%20Tracker/_workitems/edit/1479 - Only
 allow "ignoreUserStartNodes" for custom data types and not the default build
 in.

---
 src/Umbraco.Core/Constants-DataTypes.cs       | 295 ++++++++
 src/Umbraco.Core/Models/DataTypeDefinition.cs | 477 ++++++------
 .../Models/IDataTypeDefinition.cs             |  53 +-
 .../Factories/DataTypeDefinitionFactory.cs    | 196 ++---
 .../Migrations/Initial/BaseDataCreation.cs    | 684 +++++++++---------
 src/Umbraco.Core/Services/DataTypeService.cs  |   2 +-
 src/Umbraco.Core/Umbraco.Core.csproj          |   3 +
 .../Models/Mapping/PreValueDisplayResolver.cs | 173 ++---
 .../ContentPicker2PropertyEditor.cs           |  10 +-
 .../PropertyEditors/GridPropertyEditor.cs     |  16 +-
 .../MediaPicker2PropertyEditor.cs             |   4 +-
 .../MultiNodeTreePicker2PropertyEditor.cs     |  12 +-
 .../MultiUrlPickerPropertyEditor.cs           |   2 +-
 .../RelatedLinks2PropertyEditor.cs            |   6 +-
 .../PropertyEditors/RichTextPreValueEditor.cs | 147 ++--
 15 files changed, 1217 insertions(+), 863 deletions(-)
 create mode 100644 src/Umbraco.Core/Constants-DataTypes.cs

diff --git a/src/Umbraco.Core/Constants-DataTypes.cs b/src/Umbraco.Core/Constants-DataTypes.cs
new file mode 100644
index 0000000000..d5d0e99dab
--- /dev/null
+++ b/src/Umbraco.Core/Constants-DataTypes.cs
@@ -0,0 +1,295 @@
+using System;
+
+namespace Umbraco.Core
+{
+    public static partial class Constants
+    {
+        /// <summary>
+        ///     Defines the identifiers for Umbraco data types as constants for easy centralized access/management.
+        /// </summary>
+        public static class DataTypes
+        {
+
+            public static class ReservedPreValueKeys
+            {
+                public const string IgnoreUserStartNodes = "ignoreUserStartNodes";
+            }
+
+            /// <summary>
+            /// Guid for Content Picker as string
+            /// </summary>
+            public const string ContentPicker = "FD1E0DA5-5606-4862-B679-5D0CF3A52A59";
+
+            /// <summary>
+            /// Guid for Content Picker
+            /// </summary>
+            public static readonly Guid ContentPickerGuid = new Guid(ContentPicker);
+
+
+            /// <summary>
+            /// Guid for Member Picker as string
+            /// </summary>
+            public const string MemberPicker = "1EA2E01F-EBD8-4CE1-8D71-6B1149E63548";
+
+            /// <summary>
+            /// Guid for Member Picker
+            /// </summary>
+            public static readonly Guid MemberPickerGuid = new Guid(MemberPicker);
+
+
+            /// <summary>
+            /// Guid for Media Picker as string
+            /// </summary>
+            public const string MediaPicker = "135D60E0-64D9-49ED-AB08-893C9BA44AE5";
+
+            /// <summary>
+            /// Guid for Media Picker
+            /// </summary>
+            public static readonly Guid MediaPickerGuid = new Guid(MediaPicker);
+
+
+            /// <summary>
+            /// Guid for Multiple Media Picker as string
+            /// </summary>
+            public const string MultipleMediaPicker = "9DBBCBBB-2327-434A-B355-AF1B84E5010A";
+
+            /// <summary>
+            /// Guid for Multiple Media Picker
+            /// </summary>
+            public static readonly Guid MultipleMediaPickerGuid = new Guid(MultipleMediaPicker);
+
+
+            /// <summary>
+            /// Guid for Related Links as string
+            /// </summary>
+            public const string RelatedLinks = "B4E3535A-1753-47E2-8568-602CF8CFEE6F";
+
+            /// <summary>
+            /// Guid for Related Links
+            /// </summary>
+            public static readonly Guid RelatedLinksGuid = new Guid(RelatedLinks);
+
+
+            /// <summary>
+            /// Guid for Member as string
+            /// </summary>
+            public const string Member = "d59be02f-1df9-4228-aa1e-01917d806cda";
+
+            /// <summary>
+            /// Guid for Member
+            /// </summary>
+            public static readonly Guid MemberGuid = new Guid(Member);
+
+
+            /// <summary>
+            /// Guid for Image Cropper as string
+            /// </summary>
+            public const string ImageCropper = "1df9f033-e6d4-451f-b8d2-e0cbc50a836f";
+
+            /// <summary>
+            /// Guid for Image Cropper
+            /// </summary>
+            public static readonly Guid ImageCropperGuid = new Guid(ImageCropper);
+
+
+            /// <summary>
+            /// Guid for Tags as string
+            /// </summary>
+            public const string Tags = "b6b73142-b9c1-4bf8-a16d-e1c23320b549";
+
+            /// <summary>
+            /// Guid for Tags
+            /// </summary>
+            public static readonly Guid TagsGuid = new Guid(Tags);
+
+
+            /// <summary>
+            /// Guid for List View - Content as string
+            /// </summary>
+            public const string ListViewContent = "C0808DD3-8133-4E4B-8CE8-E2BEA84A96A4";
+
+            /// <summary>
+            /// Guid for List View - Content
+            /// </summary>
+            public static readonly Guid ListViewContentGuid = new Guid(ListViewContent);
+
+
+            /// <summary>
+            /// Guid for List View - Media as string
+            /// </summary>
+            public const string ListViewMedia = "3A0156C4-3B8C-4803-BDC1-6871FAA83FFF";
+
+            /// <summary>
+            /// Guid for List View - Media
+            /// </summary>
+            public static readonly Guid ListViewMediaGuid = new Guid(ListViewMedia);
+
+
+            /// <summary>
+            /// Guid for List View - Members as string
+            /// </summary>
+            public const string ListViewMembers = "AA2C52A0-CE87-4E65-A47C-7DF09358585D";
+
+            /// <summary>
+            /// Guid for List View - Members
+            /// </summary>
+            public static readonly Guid ListViewMembersGuid = new Guid(ListViewMembers);
+
+
+            /// <summary>
+            /// Guid for Date Picker with time as string
+            /// </summary>
+            public const string DatePickerWithTime = "e4d66c0f-b935-4200-81f0-025f7256b89a";
+
+            /// <summary>
+            /// Guid for Date Picker with time
+            /// </summary>
+            public static readonly Guid DatePickerWithTimeGuid = new Guid(DatePickerWithTime);
+
+
+            /// <summary>
+            /// Guid for Approved Color as string
+            /// </summary>
+            public const string ApprovedColor = "0225af17-b302-49cb-9176-b9f35cab9c17";
+
+            /// <summary>
+            /// Guid for Approved Color
+            /// </summary>
+            public static readonly Guid ApprovedColorGuid = new Guid(ApprovedColor);
+
+
+            /// <summary>
+            /// Guid for Dropdown multiple as string
+            /// </summary>
+            public const string DropdownMultiple = "f38f0ac7-1d27-439c-9f3f-089cd8825a53";
+
+            /// <summary>
+            /// Guid for Dropdown multiple
+            /// </summary>
+            public static readonly Guid DropdownMultipleGuid = new Guid(DropdownMultiple);
+
+
+            /// <summary>
+            /// Guid for Radiobox as string
+            /// </summary>
+            public const string Radiobox = "bb5f57c9-ce2b-4bb9-b697-4caca783a805";
+
+            /// <summary>
+            /// Guid for Radiobox
+            /// </summary>
+            public static readonly Guid RadioboxGuid = new Guid(Radiobox);
+
+
+            /// <summary>
+            /// Guid for Date Picker as string
+            /// </summary>
+            public const string DatePicker = "5046194e-4237-453c-a547-15db3a07c4e1";
+
+            /// <summary>
+            /// Guid for Date Picker
+            /// </summary>
+            public static readonly Guid DatePickerGuid = new Guid(DatePicker);
+
+
+            /// <summary>
+            /// Guid for Dropdown as string
+            /// </summary>
+            public const string Dropdown = "0b6a45e7-44ba-430d-9da5-4e46060b9e03";
+
+            /// <summary>
+            /// Guid for Dropdown
+            /// </summary>
+            public static readonly Guid DropdownGuid = new Guid(Dropdown);
+
+
+            /// <summary>
+            /// Guid for Checkbox list as string
+            /// </summary>
+            public const string CheckboxList = "fbaf13a8-4036-41f2-93a3-974f678c312a";
+
+            /// <summary>
+            /// Guid for Checkbox list
+            /// </summary>
+            public static readonly Guid CheckboxListGuid = new Guid(CheckboxList);
+
+
+            /// <summary>
+            /// Guid for Checkbox as string
+            /// </summary>
+            public const string Checkbox = "92897bc6-a5f3-4ffe-ae27-f2e7e33dda49";
+
+            /// <summary>
+            /// Guid for Checkbox
+            /// </summary>
+            public static readonly Guid CheckboxGuid = new Guid(Checkbox);
+
+
+            /// <summary>
+            /// Guid for Numeric as string
+            /// </summary>
+            public const string Numeric = "2e6d3631-066e-44b8-aec4-96f09099b2b5";
+
+            /// <summary>
+            /// Guid for Dropdown
+            /// </summary>
+            public static readonly Guid NumericGuid = new Guid(Numeric);
+
+
+            /// <summary>
+            /// Guid for Richtext editor as string
+            /// </summary>
+            public const string RichtextEditor = "ca90c950-0aff-4e72-b976-a30b1ac57dad";
+
+            /// <summary>
+            /// Guid for Richtext editor
+            /// </summary>
+            public static readonly Guid RichtextEditorGuid = new Guid(RichtextEditor);
+
+
+            /// <summary>
+            /// Guid for Textstring as string
+            /// </summary>
+            public const string Textstring = "0cc0eba1-9960-42c9-bf9b-60e150b429ae";
+
+            /// <summary>
+            /// Guid for Textstring
+            /// </summary>
+            public static readonly Guid TextstringGuid = new Guid(Textstring);
+
+
+            /// <summary>
+            /// Guid for Textarea as string
+            /// </summary>
+            public const string Textarea = "c6bac0dd-4ab9-45b1-8e30-e4b619ee5da3";
+
+            /// <summary>
+            /// Guid for Dropdown
+            /// </summary>
+            public static readonly Guid TextareaGuid = new Guid(Textarea);
+
+
+            /// <summary>
+            /// Guid for Upload as string
+            /// </summary>
+            public const string Upload = "84c6b441-31df-4ffe-b67e-67d5bc3ae65a";
+
+            /// <summary>
+            /// Guid for Upload
+            /// </summary>
+            public static readonly Guid UploadGuid = new Guid(Upload);
+
+
+            /// <summary>
+            /// Guid for Label as string
+            /// </summary>
+            public const string Label = "f0bc4bfb-b499-40d6-ba86-058885a5178c";
+
+            /// <summary>
+            /// Guid for Label
+            /// </summary>
+            public static readonly Guid LabelGuid = new Guid(Label);
+
+
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Models/DataTypeDefinition.cs b/src/Umbraco.Core/Models/DataTypeDefinition.cs
index 3ba5125a90..5e1fd649ae 100644
--- a/src/Umbraco.Core/Models/DataTypeDefinition.cs
+++ b/src/Umbraco.Core/Models/DataTypeDefinition.cs
@@ -1,219 +1,260 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Reflection;
-using System.Runtime.Serialization;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models.EntityBase;
-using Umbraco.Core.Persistence;
-using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.Services;
-
-namespace Umbraco.Core.Models
-{
-    /// <summary>
-    /// Definition of a DataType/PropertyEditor
-    /// </summary>
-    /// <remarks>
-    /// The definition exists as a database reference between an actual DataType/PropertyEditor 
-    /// (identified by its control id), its prevalues (configuration) and the named DataType in the backoffice UI.
-    /// </remarks>
-    [Serializable]
-    [DataContract(IsReference = true)]
-    public class DataTypeDefinition : Entity, IDataTypeDefinition
-    {
-        private int _parentId;
-        private string _name;
-        private int _sortOrder;
-        private int _level;
-        private string _path;
-        private int _creatorId;
-        private bool _trashed;
-        private string _propertyEditorAlias;
-        private DataTypeDatabaseType _databaseType;
-
-        [Obsolete("Property editor's are defined by a string alias from version 7 onwards, use the alternative contructor that specifies an alias")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public DataTypeDefinition(int parentId, Guid controlId)
-        {
-            _parentId = parentId;
-
-            _propertyEditorAlias = LegacyPropertyEditorIdToAliasConverter.GetAliasFromLegacyId(controlId, false);
-            if (_propertyEditorAlias == null)
-            {
-                //convert to Label!
-                LogHelper.Warn<DataTypeDefinition>("Could not find a GUID -> Alias mapping for the legacy property editor with id " + controlId + ". The DataType has been converted to a Label.");
-                _propertyEditorAlias = Constants.PropertyEditors.NoEditAlias;
-            }
-
-            _additionalData = new Dictionary<string, object>();
-        }
-
-        public DataTypeDefinition(int parentId, string propertyEditorAlias)
-        {
-            _parentId = parentId;
-            _propertyEditorAlias = propertyEditorAlias;
-
-            _additionalData = new Dictionary<string, object>();
-        }
-
-        public DataTypeDefinition(string propertyEditorAlias)
-        {
-            _parentId = -1;
-            _propertyEditorAlias = propertyEditorAlias;
-
-            _additionalData = new Dictionary<string, object>();
-        }
-
-        private static readonly Lazy<PropertySelectors> Ps = new Lazy<PropertySelectors>();
-
-        private class PropertySelectors
-        {
-            public readonly PropertyInfo NameSelector = ExpressionHelper.GetPropertyInfo<DataTypeDefinition, string>(x => x.Name);
-            public readonly PropertyInfo ParentIdSelector = ExpressionHelper.GetPropertyInfo<DataTypeDefinition, int>(x => x.ParentId);
-            public readonly PropertyInfo SortOrderSelector = ExpressionHelper.GetPropertyInfo<DataTypeDefinition, int>(x => x.SortOrder);
-            public readonly PropertyInfo LevelSelector = ExpressionHelper.GetPropertyInfo<DataTypeDefinition, int>(x => x.Level);
-            public readonly PropertyInfo PathSelector = ExpressionHelper.GetPropertyInfo<DataTypeDefinition, string>(x => x.Path);
-            public readonly PropertyInfo UserIdSelector = ExpressionHelper.GetPropertyInfo<DataTypeDefinition, int>(x => x.CreatorId);
-            public readonly PropertyInfo TrashedSelector = ExpressionHelper.GetPropertyInfo<DataTypeDefinition, bool>(x => x.Trashed);
-            public readonly PropertyInfo PropertyEditorAliasSelector = ExpressionHelper.GetPropertyInfo<DataTypeDefinition, string>(x => x.PropertyEditorAlias);
-            public readonly PropertyInfo DatabaseTypeSelector = ExpressionHelper.GetPropertyInfo<DataTypeDefinition, DataTypeDatabaseType>(x => x.DatabaseType);
-        }
-
-        /// <summary>
-        /// Gets or sets the Id of the Parent entity
-        /// </summary>
-        /// <remarks>Might not be necessary if handled as a relation?</remarks>
-        [DataMember]
-        public int ParentId
-        {
-            get { return _parentId; }
-            set { SetPropertyValueAndDetectChanges(value, ref _parentId, Ps.Value.ParentIdSelector); }
-        }
-
-        /// <summary>
-        /// Gets or sets the name of the current entity
-        /// </summary>
-        [DataMember]
-        public string Name
-        {
-            get { return _name; }
-            set { SetPropertyValueAndDetectChanges(value, ref _name, Ps.Value.NameSelector); }
-        }
-
-        /// <summary>
-        /// Gets or sets the sort order of the content entity
-        /// </summary>
-        [DataMember]
-        public int SortOrder
-        {
-            get { return _sortOrder; }
-            set { SetPropertyValueAndDetectChanges(value, ref _sortOrder, Ps.Value.SortOrderSelector); }
-        }
-
-        /// <summary>
-        /// Gets or sets the level of the content entity
-        /// </summary>
-        [DataMember]
-        public int Level
-        {
-            get { return _level; }
-            set { SetPropertyValueAndDetectChanges(value, ref _level, Ps.Value.LevelSelector); }
-        }
-
-        /// <summary>
-        /// Gets or sets the path
-        /// </summary>
-        [DataMember]
-        public string Path //Setting this value should be handled by the class not the user
-        {
-            get { return _path; }
-            set { SetPropertyValueAndDetectChanges(value, ref _path, Ps.Value.PathSelector); }
-        }
-
-        /// <summary>
-        /// Id of the user who created this entity
-        /// </summary>
-        [DataMember]
-        public int CreatorId
-        {
-            get { return _creatorId; }
-            set { SetPropertyValueAndDetectChanges(value, ref _creatorId, Ps.Value.UserIdSelector); }
-        }
-
-        //NOTE: SD: Why do we have this ??
-
-        /// <summary>
-        /// Boolean indicating whether this entity is Trashed or not.
-        /// </summary>
-        [DataMember]
-        public bool Trashed
-        {
-            get { return _trashed; }
-            internal set
-            {
-                SetPropertyValueAndDetectChanges(value, ref _trashed, Ps.Value.TrashedSelector);
-                //This is a custom property that is not exposed in IUmbracoEntity so add it to the additional data
-                _additionalData["Trashed"] = value;
-            }
-        }
-               
-        [DataMember]
-        public string PropertyEditorAlias
-        {
-            get { return _propertyEditorAlias; }
-            set
-            {
-                SetPropertyValueAndDetectChanges(value, ref _propertyEditorAlias, Ps.Value.PropertyEditorAliasSelector);
-                //This is a custom property that is not exposed in IUmbracoEntity so add it to the additional data
-                _additionalData["DatabaseType"] = value;
-            }
-        }
-
-        /// <summary>
-        /// Id of the DataType control
-        /// </summary>
-        [DataMember]
-        [Obsolete("Property editor's are defined by a string alias from version 7 onwards, use the PropertyEditorAlias property instead. This method will return a generated GUID for any property editor alias not explicitly mapped to a legacy ID")]
-        public Guid ControlId
-        {
-            get
-            {
-                return LegacyPropertyEditorIdToAliasConverter.GetLegacyIdFromAlias(
-                    _propertyEditorAlias, LegacyPropertyEditorIdToAliasConverter.NotFoundLegacyIdResponseBehavior.GenerateId).Value;
-            }
-            set
-            {
-                var alias = LegacyPropertyEditorIdToAliasConverter.GetAliasFromLegacyId(value, true);
-                PropertyEditorAlias = alias;
-                //This is a custom property that is not exposed in IUmbracoEntity so add it to the additional data
-                _additionalData["ControlId"] = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or Sets the DatabaseType for which the DataType's value is saved as
-        /// </summary>
-        [DataMember]
-        public DataTypeDatabaseType DatabaseType
-        {
-            get { return _databaseType; }
-            set 
-            {
-                SetPropertyValueAndDetectChanges(value, ref _databaseType, Ps.Value.DatabaseTypeSelector);                
-                //This is a custom property that is not exposed in IUmbracoEntity so add it to the additional data
-                _additionalData["DatabaseType"] = value;
-            }
-        }
-
-         private readonly IDictionary<string, object> _additionalData;
-        /// <summary>
-        /// Some entities may expose additional data that other's might not, this custom data will be available in this collection
-        /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        IDictionary<string, object> IUmbracoEntity.AdditionalData
-        {
-            get { return _additionalData; }
-        }
-    }
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Reflection;
+using System.Runtime.Serialization;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Services;
+
+namespace Umbraco.Core.Models
+{
+    /// <summary>
+    /// Definition of a DataType/PropertyEditor
+    /// </summary>
+    /// <remarks>
+    /// The definition exists as a database reference between an actual DataType/PropertyEditor
+    /// (identified by its control id), its prevalues (configuration) and the named DataType in the backoffice UI.
+    /// </remarks>
+    [Serializable]
+    [DataContract(IsReference = true)]
+    public class DataTypeDefinition : Entity, IDataTypeDefinition
+    {
+        private int _parentId;
+        private string _name;
+        private int _sortOrder;
+        private int _level;
+        private string _path;
+        private int _creatorId;
+        private bool _trashed;
+        private string _propertyEditorAlias;
+        private DataTypeDatabaseType _databaseType;
+
+        private static readonly ISet<Guid> IdsOfBuildInDataTypes = new HashSet<Guid>()
+            {
+                Constants.DataTypes.ContentPickerGuid,
+                Constants.DataTypes.MemberPickerGuid,
+                Constants.DataTypes.MediaPickerGuid,
+                Constants.DataTypes.MultipleMediaPickerGuid,
+                Constants.DataTypes.RelatedLinksGuid,
+                Constants.DataTypes.MemberGuid,
+                Constants.DataTypes.ImageCropperGuid,
+                Constants.DataTypes.TagsGuid,
+                Constants.DataTypes.ListViewContentGuid,
+                Constants.DataTypes.ListViewMediaGuid,
+                Constants.DataTypes.ListViewMembersGuid,
+                Constants.DataTypes.DatePickerWithTimeGuid,
+                Constants.DataTypes.ApprovedColorGuid,
+                Constants.DataTypes.DropdownMultipleGuid,
+                Constants.DataTypes.RadioboxGuid,
+                Constants.DataTypes.DatePickerGuid,
+                Constants.DataTypes.DropdownGuid,
+                Constants.DataTypes.CheckboxListGuid,
+                Constants.DataTypes.CheckboxGuid,
+                Constants.DataTypes.NumericGuid,
+                Constants.DataTypes.RichtextEditorGuid,
+                Constants.DataTypes.TextstringGuid,
+                Constants.DataTypes.TextareaGuid,
+                Constants.DataTypes.UploadGuid,
+                Constants.DataTypes.LabelGuid,
+            };
+
+        [Obsolete("Property editor's are defined by a string alias from version 7 onwards, use the alternative contructor that specifies an alias")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public DataTypeDefinition(int parentId, Guid controlId)
+        {
+            _parentId = parentId;
+
+            _propertyEditorAlias = LegacyPropertyEditorIdToAliasConverter.GetAliasFromLegacyId(controlId, false);
+            if (_propertyEditorAlias == null)
+            {
+                //convert to Label!
+                LogHelper.Warn<DataTypeDefinition>("Could not find a GUID -> Alias mapping for the legacy property editor with id " + controlId + ". The DataType has been converted to a Label.");
+                _propertyEditorAlias = Constants.PropertyEditors.NoEditAlias;
+            }
+
+            _additionalData = new Dictionary<string, object>();
+        }
+
+        public DataTypeDefinition(int parentId, string propertyEditorAlias)
+        {
+            _parentId = parentId;
+            _propertyEditorAlias = propertyEditorAlias;
+
+            _additionalData = new Dictionary<string, object>();
+        }
+
+        public DataTypeDefinition(string propertyEditorAlias)
+        {
+            _parentId = -1;
+            _propertyEditorAlias = propertyEditorAlias;
+
+            _additionalData = new Dictionary<string, object>();
+        }
+
+        public DataTypeDefinition(string propertyEditorAlias, Guid uniqueId)
+        {
+            _parentId = -1;
+            _propertyEditorAlias = propertyEditorAlias;
+
+            _additionalData = new Dictionary<string, object>();
+            IsBuildInDataType = IdsOfBuildInDataTypes.Contains(uniqueId);
+        }
+
+        private static readonly Lazy<PropertySelectors> Ps = new Lazy<PropertySelectors>();
+
+        private class PropertySelectors
+        {
+            public readonly PropertyInfo NameSelector = ExpressionHelper.GetPropertyInfo<DataTypeDefinition, string>(x => x.Name);
+            public readonly PropertyInfo ParentIdSelector = ExpressionHelper.GetPropertyInfo<DataTypeDefinition, int>(x => x.ParentId);
+            public readonly PropertyInfo SortOrderSelector = ExpressionHelper.GetPropertyInfo<DataTypeDefinition, int>(x => x.SortOrder);
+            public readonly PropertyInfo LevelSelector = ExpressionHelper.GetPropertyInfo<DataTypeDefinition, int>(x => x.Level);
+            public readonly PropertyInfo PathSelector = ExpressionHelper.GetPropertyInfo<DataTypeDefinition, string>(x => x.Path);
+            public readonly PropertyInfo UserIdSelector = ExpressionHelper.GetPropertyInfo<DataTypeDefinition, int>(x => x.CreatorId);
+            public readonly PropertyInfo TrashedSelector = ExpressionHelper.GetPropertyInfo<DataTypeDefinition, bool>(x => x.Trashed);
+            public readonly PropertyInfo PropertyEditorAliasSelector = ExpressionHelper.GetPropertyInfo<DataTypeDefinition, string>(x => x.PropertyEditorAlias);
+            public readonly PropertyInfo DatabaseTypeSelector = ExpressionHelper.GetPropertyInfo<DataTypeDefinition, DataTypeDatabaseType>(x => x.DatabaseType);
+        }
+
+        /// <summary>
+        /// Gets or sets the Id of the Parent entity
+        /// </summary>
+        /// <remarks>Might not be necessary if handled as a relation?</remarks>
+        [DataMember]
+        public int ParentId
+        {
+            get { return _parentId; }
+            set { SetPropertyValueAndDetectChanges(value, ref _parentId, Ps.Value.ParentIdSelector); }
+        }
+
+        /// <summary>
+        /// Gets or sets the name of the current entity
+        /// </summary>
+        [DataMember]
+        public string Name
+        {
+            get { return _name; }
+            set { SetPropertyValueAndDetectChanges(value, ref _name, Ps.Value.NameSelector); }
+        }
+
+        /// <summary>
+        /// Gets or sets the sort order of the content entity
+        /// </summary>
+        [DataMember]
+        public int SortOrder
+        {
+            get { return _sortOrder; }
+            set { SetPropertyValueAndDetectChanges(value, ref _sortOrder, Ps.Value.SortOrderSelector); }
+        }
+
+        /// <summary>
+        /// Gets or sets the level of the content entity
+        /// </summary>
+        [DataMember]
+        public int Level
+        {
+            get { return _level; }
+            set { SetPropertyValueAndDetectChanges(value, ref _level, Ps.Value.LevelSelector); }
+        }
+
+        /// <summary>
+        /// Gets or sets the path
+        /// </summary>
+        [DataMember]
+        public string Path //Setting this value should be handled by the class not the user
+        {
+            get { return _path; }
+            set { SetPropertyValueAndDetectChanges(value, ref _path, Ps.Value.PathSelector); }
+        }
+
+        /// <summary>
+        /// Id of the user who created this entity
+        /// </summary>
+        [DataMember]
+        public int CreatorId
+        {
+            get { return _creatorId; }
+            set { SetPropertyValueAndDetectChanges(value, ref _creatorId, Ps.Value.UserIdSelector); }
+        }
+
+        //NOTE: SD: Why do we have this ??
+
+        /// <summary>
+        /// Boolean indicating whether this entity is Trashed or not.
+        /// </summary>
+        [DataMember]
+        public bool Trashed
+        {
+            get { return _trashed; }
+            internal set
+            {
+                SetPropertyValueAndDetectChanges(value, ref _trashed, Ps.Value.TrashedSelector);
+                //This is a custom property that is not exposed in IUmbracoEntity so add it to the additional data
+                _additionalData["Trashed"] = value;
+            }
+        }
+
+        [DataMember]
+        public string PropertyEditorAlias
+        {
+            get { return _propertyEditorAlias; }
+            set
+            {
+                SetPropertyValueAndDetectChanges(value, ref _propertyEditorAlias, Ps.Value.PropertyEditorAliasSelector);
+                //This is a custom property that is not exposed in IUmbracoEntity so add it to the additional data
+                _additionalData["DatabaseType"] = value;
+            }
+        }
+
+        /// <summary>
+        /// Id of the DataType control
+        /// </summary>
+        [DataMember]
+        [Obsolete("Property editor's are defined by a string alias from version 7 onwards, use the PropertyEditorAlias property instead. This method will return a generated GUID for any property editor alias not explicitly mapped to a legacy ID")]
+        public Guid ControlId
+        {
+            get
+            {
+                return LegacyPropertyEditorIdToAliasConverter.GetLegacyIdFromAlias(
+                    _propertyEditorAlias, LegacyPropertyEditorIdToAliasConverter.NotFoundLegacyIdResponseBehavior.GenerateId).Value;
+            }
+            set
+            {
+                var alias = LegacyPropertyEditorIdToAliasConverter.GetAliasFromLegacyId(value, true);
+                PropertyEditorAlias = alias;
+                //This is a custom property that is not exposed in IUmbracoEntity so add it to the additional data
+                _additionalData["ControlId"] = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or Sets the DatabaseType for which the DataType's value is saved as
+        /// </summary>
+        [DataMember]
+        public DataTypeDatabaseType DatabaseType
+        {
+            get { return _databaseType; }
+            set
+            {
+                SetPropertyValueAndDetectChanges(value, ref _databaseType, Ps.Value.DatabaseTypeSelector);
+                //This is a custom property that is not exposed in IUmbracoEntity so add it to the additional data
+                _additionalData["DatabaseType"] = value;
+            }
+        }
+
+         private readonly IDictionary<string, object> _additionalData;
+        /// <summary>
+        /// Some entities may expose additional data that other's might not, this custom data will be available in this collection
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        IDictionary<string, object> IUmbracoEntity.AdditionalData
+        {
+            get { return _additionalData; }
+        }
+
+        public bool IsBuildInDataType { get;}
+    }
+
 }
diff --git a/src/Umbraco.Core/Models/IDataTypeDefinition.cs b/src/Umbraco.Core/Models/IDataTypeDefinition.cs
index a33736e604..f57a1bdca7 100644
--- a/src/Umbraco.Core/Models/IDataTypeDefinition.cs
+++ b/src/Umbraco.Core/Models/IDataTypeDefinition.cs
@@ -1,24 +1,29 @@
-using System;
-using Umbraco.Core.Models.EntityBase;
-
-namespace Umbraco.Core.Models
-{
-    public interface IDataTypeDefinition : IUmbracoEntity
-    {
-        /// <summary>
-        /// The Property editor alias assigned to the data type
-        /// </summary>
-        string PropertyEditorAlias { get; set; }
-
-        /// <summary>
-        /// Id of the DataType control
-        /// </summary>
-        [Obsolete("Property editor's are defined by a string alias from version 7 onwards, use the PropertyEditorAlias property instead")]
-        Guid ControlId { get; set; }
-
-        /// <summary>
-        /// Gets or Sets the DatabaseType for which the DataType's value is saved as
-        /// </summary>
-        DataTypeDatabaseType DatabaseType { get; set; }
-    }
-}
\ No newline at end of file
+using System;
+using Umbraco.Core.Models.EntityBase;
+
+namespace Umbraco.Core.Models
+{
+    public interface IDataTypeDefinition : IUmbracoEntity
+    {
+        /// <summary>
+        /// The Property editor alias assigned to the data type
+        /// </summary>
+        string PropertyEditorAlias { get; set; }
+
+        /// <summary>
+        /// Id of the DataType control
+        /// </summary>
+        [Obsolete("Property editor's are defined by a string alias from version 7 onwards, use the PropertyEditorAlias property instead")]
+        Guid ControlId { get; set; }
+
+        /// <summary>
+        /// Gets or Sets the DatabaseType for which the DataType's value is saved as
+        /// </summary>
+        DataTypeDatabaseType DatabaseType { get; set; }
+
+        /// <summary>
+        /// Gets information about whether this data type is build in or not.
+        /// </summary>
+        bool IsBuildInDataType { get;}
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Factories/DataTypeDefinitionFactory.cs b/src/Umbraco.Core/Persistence/Factories/DataTypeDefinitionFactory.cs
index cf487fa1a2..14c162d8ea 100644
--- a/src/Umbraco.Core/Persistence/Factories/DataTypeDefinitionFactory.cs
+++ b/src/Umbraco.Core/Persistence/Factories/DataTypeDefinitionFactory.cs
@@ -1,98 +1,98 @@
-using System;
-using System.Globalization;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.Rdbms;
-
-namespace Umbraco.Core.Persistence.Factories
-{
-    internal class DataTypeDefinitionFactory
-    {
-        private readonly Guid _nodeObjectTypeId;
-        private int _primaryKey;
-
-        public DataTypeDefinitionFactory(Guid nodeObjectTypeId)
-        {
-            _nodeObjectTypeId = nodeObjectTypeId;
-        }
-
-        #region Implementation of IEntityFactory<DataTypeDefinition,DataTypeDto>
-
-        public IDataTypeDefinition BuildEntity(DataTypeDto dto)
-        {
-            var dataTypeDefinition = new DataTypeDefinition(dto.PropertyEditorAlias);
-
-
-            try
-            {
-                dataTypeDefinition.DisableChangeTracking();
-
-                dataTypeDefinition.CreateDate = dto.NodeDto.CreateDate;
-                dataTypeDefinition.DatabaseType = dto.DbType.EnumParse<DataTypeDatabaseType>(true);
-                dataTypeDefinition.Id = dto.DataTypeId;
-                dataTypeDefinition.Key = dto.NodeDto.UniqueId;
-                dataTypeDefinition.Level = dto.NodeDto.Level;
-                dataTypeDefinition.UpdateDate = dto.NodeDto.CreateDate;
-                dataTypeDefinition.Name = dto.NodeDto.Text;
-                dataTypeDefinition.ParentId = dto.NodeDto.ParentId;
-                dataTypeDefinition.Path = dto.NodeDto.Path;
-                dataTypeDefinition.SortOrder = dto.NodeDto.SortOrder;
-                dataTypeDefinition.Trashed = dto.NodeDto.Trashed;
-                dataTypeDefinition.CreatorId = dto.NodeDto.UserId.Value;
-
-                //on initial construction we don't want to have dirty properties tracked
-                // http://issues.umbraco.org/issue/U4-1946
-                dataTypeDefinition.ResetDirtyProperties(false);
-                return dataTypeDefinition;
-            }
-            finally
-            {
-                dataTypeDefinition.EnableChangeTracking();
-            }
-        }
-
-        public DataTypeDto BuildDto(IDataTypeDefinition entity)
-        {
-            var dataTypeDto = new DataTypeDto
-                                  {
-                                      PropertyEditorAlias = entity.PropertyEditorAlias,
-                                      DataTypeId = entity.Id,
-                                      DbType = entity.DatabaseType.ToString(),
-                                      NodeDto = BuildNodeDto(entity)
-                                  };
-
-            if (_primaryKey > 0)
-            {
-                dataTypeDto.PrimaryKey = _primaryKey;
-            }
-
-            return dataTypeDto;
-        }
-
-        #endregion
-
-        public void SetPrimaryKey(int primaryKey)
-        {
-            _primaryKey = primaryKey;
-        }
-
-        private NodeDto BuildNodeDto(IDataTypeDefinition entity)
-        {
-            var nodeDto = new NodeDto
-                              {
-                                  CreateDate = entity.CreateDate,
-                                  NodeId = entity.Id,
-                                  Level = short.Parse(entity.Level.ToString(CultureInfo.InvariantCulture)),
-                                  NodeObjectType = _nodeObjectTypeId,
-                                  ParentId = entity.ParentId,
-                                  Path = entity.Path,
-                                  SortOrder = entity.SortOrder,
-                                  Text = entity.Name,
-                                  Trashed = entity.Trashed,
-                                  UniqueId = entity.Key,
-                                  UserId = entity.CreatorId
-                              };
-
-            return nodeDto;
-        }
-    }
-}
\ No newline at end of file
+using System;
+using System.Globalization;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.Rdbms;
+
+namespace Umbraco.Core.Persistence.Factories
+{
+    internal class DataTypeDefinitionFactory
+    {
+        private readonly Guid _nodeObjectTypeId;
+        private int _primaryKey;
+
+        public DataTypeDefinitionFactory(Guid nodeObjectTypeId)
+        {
+            _nodeObjectTypeId = nodeObjectTypeId;
+        }
+
+        #region Implementation of IEntityFactory<DataTypeDefinition,DataTypeDto>
+
+        public IDataTypeDefinition BuildEntity(DataTypeDto dto)
+        {
+            var dataTypeDefinition = new DataTypeDefinition(dto.PropertyEditorAlias,dto.NodeDto.UniqueId);
+
+
+            try
+            {
+                dataTypeDefinition.DisableChangeTracking();
+
+                dataTypeDefinition.CreateDate = dto.NodeDto.CreateDate;
+                dataTypeDefinition.DatabaseType = dto.DbType.EnumParse<DataTypeDatabaseType>(true);
+                dataTypeDefinition.Id = dto.DataTypeId;
+                dataTypeDefinition.Key = dto.NodeDto.UniqueId;
+                dataTypeDefinition.Level = dto.NodeDto.Level;
+                dataTypeDefinition.UpdateDate = dto.NodeDto.CreateDate;
+                dataTypeDefinition.Name = dto.NodeDto.Text;
+                dataTypeDefinition.ParentId = dto.NodeDto.ParentId;
+                dataTypeDefinition.Path = dto.NodeDto.Path;
+                dataTypeDefinition.SortOrder = dto.NodeDto.SortOrder;
+                dataTypeDefinition.Trashed = dto.NodeDto.Trashed;
+                dataTypeDefinition.CreatorId = dto.NodeDto.UserId.Value;
+
+                //on initial construction we don't want to have dirty properties tracked
+                // http://issues.umbraco.org/issue/U4-1946
+                dataTypeDefinition.ResetDirtyProperties(false);
+                return dataTypeDefinition;
+            }
+            finally
+            {
+                dataTypeDefinition.EnableChangeTracking();
+            }
+        }
+
+        public DataTypeDto BuildDto(IDataTypeDefinition entity)
+        {
+            var dataTypeDto = new DataTypeDto
+                                  {
+                                      PropertyEditorAlias = entity.PropertyEditorAlias,
+                                      DataTypeId = entity.Id,
+                                      DbType = entity.DatabaseType.ToString(),
+                                      NodeDto = BuildNodeDto(entity)
+                                  };
+
+            if (_primaryKey > 0)
+            {
+                dataTypeDto.PrimaryKey = _primaryKey;
+            }
+
+            return dataTypeDto;
+        }
+
+        #endregion
+
+        public void SetPrimaryKey(int primaryKey)
+        {
+            _primaryKey = primaryKey;
+        }
+
+        private NodeDto BuildNodeDto(IDataTypeDefinition entity)
+        {
+            var nodeDto = new NodeDto
+                              {
+                                  CreateDate = entity.CreateDate,
+                                  NodeId = entity.Id,
+                                  Level = short.Parse(entity.Level.ToString(CultureInfo.InvariantCulture)),
+                                  NodeObjectType = _nodeObjectTypeId,
+                                  ParentId = entity.ParentId,
+                                  Path = entity.Path,
+                                  SortOrder = entity.SortOrder,
+                                  Text = entity.Name,
+                                  Trashed = entity.Trashed,
+                                  UniqueId = entity.Key,
+                                  UserId = entity.CreatorId
+                              };
+
+            return nodeDto;
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs b/src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs
index b8e605e63e..e1716947e1 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs
+++ b/src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs
@@ -1,342 +1,342 @@
-using System;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models.Rdbms;
-
-namespace Umbraco.Core.Persistence.Migrations.Initial
-{
-    /// <summary>
-    /// Represents the initial data creation by running Insert for the base data.
-    /// </summary>
-    internal class BaseDataCreation
-    {
-        private readonly Database _database;
-        private readonly ILogger _logger;
-
-        public BaseDataCreation(Database database, ILogger logger)
-        {
-            _database = database;
-            _logger = logger;
-        }
-
-        /// <summary>
-        /// Initialize the base data creation by inserting the data foundation for umbraco
-        /// specific to a table
-        /// </summary>
-        /// <param name="tableName">Name of the table to create base data for</param>
-        public void InitializeBaseData(string tableName)
-        {
-            _logger.Info<BaseDataCreation>(string.Format("Creating data in table {0}", tableName));
-
-            if(tableName.Equals("umbracoNode"))
-            {
-                CreateUmbracoNodeData();
-            }
-
-            if (tableName.Equals("umbracoLock"))
-            {
-                CreateUmbracoLockData();
-            }
-
-            if (tableName.Equals("cmsContentType"))
-            {
-                CreateCmsContentTypeData();
-            }
-
-            if (tableName.Equals("umbracoUser"))
-            {
-                CreateUmbracoUserData();
-            }
-
-            if (tableName.Equals("umbracoUserGroup"))
-            {
-                CreateUmbracoUserGroupData();
-            }
-
-            if (tableName.Equals("umbracoUser2UserGroup"))
-            {
-                CreateUmbracoUser2UserGroupData();
-            }
-
-            if (tableName.Equals("umbracoUserGroup2App"))
-            {
-                CreateUmbracoUserGroup2AppData();
-            }
-
-            if (tableName.Equals("cmsPropertyTypeGroup"))
-            {
-                CreateCmsPropertyTypeGroupData();
-            }
-
-            if (tableName.Equals("cmsPropertyType"))
-            {
-                CreateCmsPropertyTypeData();
-            }
-
-            if (tableName.Equals("umbracoLanguage"))
-            {
-                CreateUmbracoLanguageData();
-            }
-
-            if (tableName.Equals("cmsContentTypeAllowedContentType"))
-            {
-                CreateCmsContentTypeAllowedContentTypeData();
-            }
-
-            if(tableName.Equals("cmsDataType"))
-            {
-                CreateCmsDataTypeData();
-            }
-
-            if (tableName.Equals("cmsDataTypePreValues"))
-            {
-                CreateCmsDataTypePreValuesData();
-            }
-
-            if (tableName.Equals("umbracoRelationType"))
-            {
-                CreateUmbracoRelationTypeData();
-            }
-
-            if (tableName.Equals("cmsTaskType"))
-            {
-                CreateCmsTaskTypeData();
-            }
-
-            if (tableName.Equals("umbracoMigration"))
-            {
-                CreateUmbracoMigrationData();
-            }
-
-            _logger.Info<BaseDataCreation>(string.Format("Done creating data in table {0}", tableName));
-        }
-
-        private void CreateUmbracoNodeData()
-        {
-            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -1, Trashed = false, ParentId = -1, UserId = 0, Level = 0, Path = "-1", SortOrder = 0, UniqueId = new Guid("916724a5-173d-4619-b97e-b9de133dd6f5"), Text = "SYSTEM DATA: umbraco master root", NodeObjectType = new Guid(Constants.ObjectTypes.SystemRoot), CreateDate = DateTime.Now });
-            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -20, Trashed = false, ParentId = -1, UserId = 0, Level = 0, Path = "-1,-20", SortOrder = 0, UniqueId = new Guid("0F582A79-1E41-4CF0-BFA0-76340651891A"), Text = "Recycle Bin", NodeObjectType = new Guid(Constants.ObjectTypes.ContentRecycleBin), CreateDate = DateTime.Now });
-            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -21, Trashed = false, ParentId = -1, UserId = 0, Level = 0, Path = "-1,-21", SortOrder = 0, UniqueId = new Guid("BF7C7CBC-952F-4518-97A2-69E9C7B33842"), Text = "Recycle Bin", NodeObjectType = new Guid(Constants.ObjectTypes.MediaRecycleBin), CreateDate = DateTime.Now });
-            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -92, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-92", SortOrder = 35, UniqueId = new Guid("f0bc4bfb-b499-40d6-ba86-058885a5178c"), Text = "Label", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
-            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -90, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-90", SortOrder = 34, UniqueId = new Guid("84c6b441-31df-4ffe-b67e-67d5bc3ae65a"), Text = "Upload", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
-            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -89, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-89", SortOrder = 33, UniqueId = new Guid("c6bac0dd-4ab9-45b1-8e30-e4b619ee5da3"), Text = "Textarea", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
-            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -88, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-88", SortOrder = 32, UniqueId = new Guid("0cc0eba1-9960-42c9-bf9b-60e150b429ae"), Text = "Textstring", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
-            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -87, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-87", SortOrder = 4, UniqueId = new Guid("ca90c950-0aff-4e72-b976-a30b1ac57dad"), Text = "Richtext editor", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
-            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -51, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-51", SortOrder = 2, UniqueId = new Guid("2e6d3631-066e-44b8-aec4-96f09099b2b5"), Text = "Numeric", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
-            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -49, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-49", SortOrder = 2, UniqueId = new Guid("92897bc6-a5f3-4ffe-ae27-f2e7e33dda49"), Text = "Checkbox", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
-            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -43, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-43", SortOrder = 2, UniqueId = new Guid("fbaf13a8-4036-41f2-93a3-974f678c312a"), Text = "Checkbox list", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
-            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -42, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-42", SortOrder = 2, UniqueId = new Guid("0b6a45e7-44ba-430d-9da5-4e46060b9e03"), Text = "Dropdown", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
-            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -41, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-41", SortOrder = 2, UniqueId = new Guid("5046194e-4237-453c-a547-15db3a07c4e1"), Text = "Date Picker", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
-            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -40, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-40", SortOrder = 2, UniqueId = new Guid("bb5f57c9-ce2b-4bb9-b697-4caca783a805"), Text = "Radiobox", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
-            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -39, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-39", SortOrder = 2, UniqueId = new Guid("f38f0ac7-1d27-439c-9f3f-089cd8825a53"), Text = "Dropdown multiple", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });            
-            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -37, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-37", SortOrder = 2, UniqueId = new Guid("0225af17-b302-49cb-9176-b9f35cab9c17"), Text = "Approved Color", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
-            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -36, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-36", SortOrder = 2, UniqueId = new Guid("e4d66c0f-b935-4200-81f0-025f7256b89a"), Text = "Date Picker with time", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
-            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = Constants.System.DefaultContentListViewDataTypeId, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-95", SortOrder = 2, UniqueId = new Guid("C0808DD3-8133-4E4B-8CE8-E2BEA84A96A4"), Text = Constants.Conventions.DataTypes.ListViewPrefix + "Content", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
-            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = Constants.System.DefaultMediaListViewDataTypeId, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-96", SortOrder = 2, UniqueId = new Guid("3A0156C4-3B8C-4803-BDC1-6871FAA83FFF"), Text = Constants.Conventions.DataTypes.ListViewPrefix + "Media", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
-            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = Constants.System.DefaultMembersListViewDataTypeId, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-97", SortOrder = 2, UniqueId = new Guid("AA2C52A0-CE87-4E65-A47C-7DF09358585D"), Text = Constants.Conventions.DataTypes.ListViewPrefix + "Members", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });                                    
-            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1031, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1031", SortOrder = 2, UniqueId = new Guid("f38bd2d7-65d0-48e6-95dc-87ce06ec2d3d"), Text = Constants.Conventions.MediaTypes.Folder, NodeObjectType = new Guid(Constants.ObjectTypes.MediaType), CreateDate = DateTime.Now });
-            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1032, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1032", SortOrder = 2, UniqueId = new Guid("cc07b313-0843-4aa8-bbda-871c8da728c8"), Text = Constants.Conventions.MediaTypes.Image, NodeObjectType = new Guid(Constants.ObjectTypes.MediaType), CreateDate = DateTime.Now });
-            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1033, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1033", SortOrder = 2, UniqueId = new Guid("4c52d8ab-54e6-40cd-999c-7a5f24903e4d"), Text = Constants.Conventions.MediaTypes.File, NodeObjectType = new Guid(Constants.ObjectTypes.MediaType), CreateDate = DateTime.Now });                        
-            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1041, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1041", SortOrder = 2, UniqueId = new Guid("b6b73142-b9c1-4bf8-a16d-e1c23320b549"), Text = "Tags", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
-            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1043, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1043", SortOrder = 2, UniqueId = new Guid("1df9f033-e6d4-451f-b8d2-e0cbc50a836f"), Text = "Image Cropper", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
-            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1044, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1044", SortOrder = 0, UniqueId = new Guid("d59be02f-1df9-4228-aa1e-01917d806cda"), Text = Constants.Conventions.MemberTypes.DefaultAlias, NodeObjectType = new Guid(Constants.ObjectTypes.MemberType), CreateDate = DateTime.Now });
-
-            //New UDI pickers with newer Ids
-            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1046, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1046", SortOrder = 2, UniqueId = new Guid("FD1E0DA5-5606-4862-B679-5D0CF3A52A59"), Text = "Content Picker", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
-            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1047, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1047", SortOrder = 2, UniqueId = new Guid("1EA2E01F-EBD8-4CE1-8D71-6B1149E63548"), Text = "Member Picker", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
-            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1048, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1048", SortOrder = 2, UniqueId = new Guid("135D60E0-64D9-49ED-AB08-893C9BA44AE5"), Text = "Media Picker", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
-            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1049, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1049", SortOrder = 2, UniqueId = new Guid("9DBBCBBB-2327-434A-B355-AF1B84E5010A"), Text = "Multiple Media Picker", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
-            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1050, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1050", SortOrder = 2, UniqueId = new Guid("B4E3535A-1753-47E2-8568-602CF8CFEE6F"), Text = "Related Links", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
-        }
-
-        private void CreateUmbracoLockData()
-        {
-            // all lock objects
-            _database.Insert("umbracoLock", "id", false, new LockDto { Id = Constants.Locks.Servers, Name = "Servers" });
-        }
-
-        private void CreateCmsContentTypeData()
-        {
-            _database.Insert("cmsContentType", "pk", false, new ContentTypeDto { PrimaryKey = 532, NodeId = 1031, Alias = Constants.Conventions.MediaTypes.Folder, Icon = "icon-folder", Thumbnail = "icon-folder", IsContainer = false, AllowAtRoot = true });
-            _database.Insert("cmsContentType", "pk", false, new ContentTypeDto { PrimaryKey = 533, NodeId = 1032, Alias = Constants.Conventions.MediaTypes.Image, Icon = "icon-picture", Thumbnail = "icon-picture", AllowAtRoot = true });
-            _database.Insert("cmsContentType", "pk", false, new ContentTypeDto { PrimaryKey = 534, NodeId = 1033, Alias = Constants.Conventions.MediaTypes.File, Icon = "icon-document", Thumbnail = "icon-document", AllowAtRoot = true });
-            _database.Insert("cmsContentType", "pk", false, new ContentTypeDto { PrimaryKey = 531, NodeId = 1044, Alias = Constants.Conventions.MemberTypes.DefaultAlias, Icon = "icon-user", Thumbnail = "icon-user" });
-        }
-
-        private void CreateUmbracoUserData()
-        {
-            _database.Insert("umbracoUser", "id", false, new UserDto { Id = 0, Disabled = false, NoConsole = false, UserName = "Administrator", Login = "admin", Password = "default", Email = "", UserLanguage = "en-US", CreateDate = DateTime.Now, UpdateDate = DateTime.Now });
-        }
-        
-        private void CreateUmbracoUserGroupData()
-        {
-            _database.Insert("umbracoUserGroup", "id", false, new UserGroupDto { Id = 1, StartMediaId = -1, StartContentId = -1, Alias = Constants.Security.AdminGroupAlias, Name = "Administrators", DefaultPermissions = "CADMOSKTPIURZ:5F7ï", CreateDate = DateTime.Now, UpdateDate = DateTime.Now, Icon = "icon-medal" });
-            _database.Insert("umbracoUserGroup", "id", false, new UserGroupDto { Id = 2, StartMediaId = -1, StartContentId = -1, Alias = "writer", Name = "Writers", DefaultPermissions = "CAH:F", CreateDate = DateTime.Now, UpdateDate = DateTime.Now, Icon = "icon-edit" });
-            _database.Insert("umbracoUserGroup", "id", false, new UserGroupDto { Id = 3, StartMediaId = -1, StartContentId = -1, Alias = "editor", Name = "Editors", DefaultPermissions = "CADMOSKTPUZ:5Fï", CreateDate = DateTime.Now, UpdateDate = DateTime.Now, Icon = "icon-tools" });
-            _database.Insert("umbracoUserGroup", "id", false, new UserGroupDto { Id = 4, StartMediaId = -1, StartContentId = -1, Alias = Constants.Security.TranslatorGroupAlias, Name = "Translators", DefaultPermissions = "AF", CreateDate = DateTime.Now, UpdateDate = DateTime.Now, Icon = "icon-globe" });
-            _database.Insert("umbracoUserGroup", "id", false, new UserGroupDto { Id = 5, StartMediaId = -1, StartContentId = -1, Alias = Constants.Security.SensitiveDataGroupAlias, Name = "Sensitive data", DefaultPermissions = "", CreateDate = DateTime.Now, UpdateDate = DateTime.Now, Icon = "icon-lock" });
-        }
-
-        private void CreateUmbracoUser2UserGroupData()
-        {
-            _database.Insert(new User2UserGroupDto { UserGroupId = 1, UserId = 0 }); //add admin to admins
-            _database.Insert(new User2UserGroupDto { UserGroupId = 5, UserId = 0 }); //add admin to sensitive data
-        }
-
-        private void CreateUmbracoUserGroup2AppData()
-        {
-            _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Content });
-            _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Developer });
-            _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Media });
-            _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Members });
-            _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Settings });            
-            _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Users });
-            _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Forms });
-            
-            _database.Insert(new UserGroup2AppDto { UserGroupId = 2, AppAlias = Constants.Applications.Content });
-
-            _database.Insert(new UserGroup2AppDto { UserGroupId = 3, AppAlias = Constants.Applications.Content });
-            _database.Insert(new UserGroup2AppDto { UserGroupId = 3, AppAlias = Constants.Applications.Media });
-            _database.Insert(new UserGroup2AppDto { UserGroupId = 3, AppAlias = Constants.Applications.Forms });
-
-            _database.Insert(new UserGroup2AppDto { UserGroupId = 4, AppAlias = Constants.Applications.Translation });
-        }
-        
-        private void CreateCmsPropertyTypeGroupData()
-        {          
-            _database.Insert("cmsPropertyTypeGroup", "id", false, new PropertyTypeGroupDto { Id = 3, ContentTypeNodeId = 1032, Text = "Image", SortOrder = 1, UniqueId = new Guid(Constants.PropertyTypeGroups.Image) });
-            _database.Insert("cmsPropertyTypeGroup", "id", false, new PropertyTypeGroupDto { Id = 4, ContentTypeNodeId = 1033, Text = "File", SortOrder = 1, UniqueId = new Guid(Constants.PropertyTypeGroups.File) });
-            _database.Insert("cmsPropertyTypeGroup", "id", false, new PropertyTypeGroupDto { Id = 5, ContentTypeNodeId = 1031, Text = "Contents", SortOrder = 1, UniqueId = new Guid(Constants.PropertyTypeGroups.Contents) });
-            //membership property group
-            _database.Insert("cmsPropertyTypeGroup", "id", false, new PropertyTypeGroupDto { Id = 11, ContentTypeNodeId = 1044, Text = "Membership", SortOrder = 1, UniqueId = new Guid(Constants.PropertyTypeGroups.Membership) });
-        }
-
-        private void CreateCmsPropertyTypeData()
-        {
-            _database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 6, UniqueId = 6.ToGuid(), DataTypeId = 1043, ContentTypeId = 1032, PropertyTypeGroupId = 3, Alias = Constants.Conventions.Media.File, Name = "Upload image", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = null });
-            _database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 7, UniqueId = 7.ToGuid(), DataTypeId = -92, ContentTypeId = 1032, PropertyTypeGroupId = 3, Alias = Constants.Conventions.Media.Width, Name = "Width", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = null });
-            _database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 8, UniqueId = 8.ToGuid(), DataTypeId = -92, ContentTypeId = 1032, PropertyTypeGroupId = 3, Alias = Constants.Conventions.Media.Height, Name = "Height", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = null });
-            _database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 9, UniqueId = 9.ToGuid(), DataTypeId = -92, ContentTypeId = 1032, PropertyTypeGroupId = 3, Alias = Constants.Conventions.Media.Bytes, Name = "Size", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = null });
-            _database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 10, UniqueId = 10.ToGuid(), DataTypeId = -92, ContentTypeId = 1032, PropertyTypeGroupId = 3, Alias = Constants.Conventions.Media.Extension, Name = "Type", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = null });
-            _database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 24, UniqueId = 24.ToGuid(), DataTypeId = -90, ContentTypeId = 1033, PropertyTypeGroupId = 4, Alias = Constants.Conventions.Media.File, Name = "Upload file", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = null });
-            _database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 25, UniqueId = 25.ToGuid(), DataTypeId = -92, ContentTypeId = 1033, PropertyTypeGroupId = 4, Alias = Constants.Conventions.Media.Extension, Name = "Type", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = null });
-            _database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 26, UniqueId = 26.ToGuid(), DataTypeId = -92, ContentTypeId = 1033, PropertyTypeGroupId = 4, Alias = Constants.Conventions.Media.Bytes, Name = "Size", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = null });
-            _database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 27, UniqueId = 27.ToGuid(), DataTypeId = Constants.System.DefaultMediaListViewDataTypeId, ContentTypeId = 1031, PropertyTypeGroupId = 5, Alias = "contents", Name = "Contents:", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = null });
-            //membership property types
-            _database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 28, UniqueId = 28.ToGuid(), DataTypeId = -89, ContentTypeId = 1044, PropertyTypeGroupId = 11, Alias = Constants.Conventions.Member.Comments, Name = Constants.Conventions.Member.CommentsLabel, SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = null });
-            _database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 29, UniqueId = 29.ToGuid(), DataTypeId = -92, ContentTypeId = 1044, PropertyTypeGroupId = 11, Alias = Constants.Conventions.Member.FailedPasswordAttempts, Name = Constants.Conventions.Member.FailedPasswordAttemptsLabel, SortOrder = 1, Mandatory = false, ValidationRegExp = null, Description = null });
-            _database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 30, UniqueId = 30.ToGuid(), DataTypeId = -49, ContentTypeId = 1044, PropertyTypeGroupId = 11, Alias = Constants.Conventions.Member.IsApproved, Name = Constants.Conventions.Member.IsApprovedLabel, SortOrder = 2, Mandatory = false, ValidationRegExp = null, Description = null });
-            _database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 31, UniqueId = 31.ToGuid(), DataTypeId = -49, ContentTypeId = 1044, PropertyTypeGroupId = 11, Alias = Constants.Conventions.Member.IsLockedOut, Name = Constants.Conventions.Member.IsLockedOutLabel, SortOrder = 3, Mandatory = false, ValidationRegExp = null, Description = null });
-            _database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 32, UniqueId = 32.ToGuid(), DataTypeId = -92, ContentTypeId = 1044, PropertyTypeGroupId = 11, Alias = Constants.Conventions.Member.LastLockoutDate, Name = Constants.Conventions.Member.LastLockoutDateLabel, SortOrder = 4, Mandatory = false, ValidationRegExp = null, Description = null });
-            _database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 33, UniqueId = 33.ToGuid(), DataTypeId = -92, ContentTypeId = 1044, PropertyTypeGroupId = 11, Alias = Constants.Conventions.Member.LastLoginDate, Name = Constants.Conventions.Member.LastLoginDateLabel, SortOrder = 5, Mandatory = false, ValidationRegExp = null, Description = null });
-            _database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 34, UniqueId = 34.ToGuid(), DataTypeId = -92, ContentTypeId = 1044, PropertyTypeGroupId = 11, Alias = Constants.Conventions.Member.LastPasswordChangeDate, Name = Constants.Conventions.Member.LastPasswordChangeDateLabel, SortOrder = 6, Mandatory = false, ValidationRegExp = null, Description = null });
-            
-        }
-
-        private void CreateUmbracoLanguageData()
-        {
-            _database.Insert("umbracoLanguage", "id", false, new LanguageDto { Id = 1, IsoCode = "en-US", CultureName = "en-US" });
-        }
-
-        private void CreateCmsContentTypeAllowedContentTypeData()
-        {
-            _database.Insert("cmsContentTypeAllowedContentType", "Id", false, new ContentTypeAllowedContentTypeDto { Id = 1031, AllowedId = 1031 });
-            _database.Insert("cmsContentTypeAllowedContentType", "Id", false, new ContentTypeAllowedContentTypeDto { Id = 1031, AllowedId = 1032 });
-            _database.Insert("cmsContentTypeAllowedContentType", "Id", false, new ContentTypeAllowedContentTypeDto { Id = 1031, AllowedId = 1033 });
-        }
-
-        private void CreateCmsDataTypeData()
-        {
-            //TODO Check which of the DataTypeIds below doesn't exist in umbracoNode, which results in a foreign key constraint errors.
-            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 1, DataTypeId = -49, PropertyEditorAlias = Constants.PropertyEditors.TrueFalseAlias, DbType = "Integer" });
-            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 2, DataTypeId = -51, PropertyEditorAlias = Constants.PropertyEditors.IntegerAlias, DbType = "Integer" });
-            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 3, DataTypeId = -87, PropertyEditorAlias = Constants.PropertyEditors.TinyMCEAlias, DbType = "Ntext" });
-            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 4, DataTypeId = -88, PropertyEditorAlias = Constants.PropertyEditors.TextboxAlias, DbType = "Nvarchar" });
-            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 5, DataTypeId = -89, PropertyEditorAlias = Constants.PropertyEditors.TextboxMultipleAlias, DbType = "Ntext" });
-            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 6, DataTypeId = -90, PropertyEditorAlias = Constants.PropertyEditors.UploadFieldAlias, DbType = "Nvarchar" });
-            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 7, DataTypeId = -92, PropertyEditorAlias = Constants.PropertyEditors.NoEditAlias, DbType = "Nvarchar" });
-            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 8, DataTypeId = -36, PropertyEditorAlias = Constants.PropertyEditors.DateTimeAlias, DbType = "Date" });
-            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 9, DataTypeId = -37, PropertyEditorAlias = Constants.PropertyEditors.ColorPickerAlias, DbType = "Nvarchar" });            
-            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 11, DataTypeId = -39, PropertyEditorAlias = Constants.PropertyEditors.DropDownListFlexibleAlias, DbType = "Nvarchar" });
-            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 12, DataTypeId = -40, PropertyEditorAlias = Constants.PropertyEditors.RadioButtonListAlias, DbType = "Nvarchar" });
-            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 13, DataTypeId = -41, PropertyEditorAlias = Constants.PropertyEditors.DateAlias, DbType = "Date" });
-            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 14, DataTypeId = -42, PropertyEditorAlias = Constants.PropertyEditors.DropDownListFlexibleAlias, DbType = "Integer" });
-            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 15, DataTypeId = -43, PropertyEditorAlias = Constants.PropertyEditors.CheckBoxListAlias, DbType = "Nvarchar" });                        
-            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 22, DataTypeId = 1041, PropertyEditorAlias = Constants.PropertyEditors.TagsAlias, DbType = "Ntext" });
-            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 24, DataTypeId = 1043, PropertyEditorAlias = Constants.PropertyEditors.ImageCropperAlias, DbType = "Ntext" });
-            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = -26, DataTypeId = Constants.System.DefaultContentListViewDataTypeId, PropertyEditorAlias = Constants.PropertyEditors.ListViewAlias, DbType = "Nvarchar" });
-            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = -27, DataTypeId = Constants.System.DefaultMediaListViewDataTypeId, PropertyEditorAlias = Constants.PropertyEditors.ListViewAlias, DbType = "Nvarchar" });
-            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = -28, DataTypeId = Constants.System.DefaultMembersListViewDataTypeId, PropertyEditorAlias = Constants.PropertyEditors.ListViewAlias, DbType = "Nvarchar" });
-
-            //New UDI pickers with newer Ids
-            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 26, DataTypeId = 1046, PropertyEditorAlias = Constants.PropertyEditors.ContentPicker2Alias, DbType = "Nvarchar" });
-            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 27, DataTypeId = 1047, PropertyEditorAlias = Constants.PropertyEditors.MemberPicker2Alias, DbType = "Nvarchar" });
-            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 28, DataTypeId = 1048, PropertyEditorAlias = Constants.PropertyEditors.MediaPicker2Alias, DbType = "Ntext" });
-            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 29, DataTypeId = 1049, PropertyEditorAlias = Constants.PropertyEditors.MediaPicker2Alias, DbType = "Ntext" });
-            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 30, DataTypeId = 1050, PropertyEditorAlias = Constants.PropertyEditors.RelatedLinks2Alias, DbType = "Ntext" });
-        }
-
-        private void CreateCmsDataTypePreValuesData()
-        {
-            _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = 3, Alias = "", SortOrder = 0, DataTypeNodeId = -87, Value = ",code,undo,redo,cut,copy,mcepasteword,stylepicker,bold,italic,bullist,numlist,outdent,indent,mcelink,unlink,mceinsertanchor,mceimage,umbracomacro,mceinserttable,umbracoembed,mcecharmap,|1|1,2,3,|0|500,400|1049,|true|" });
-            _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = 4, Alias = "group", SortOrder = 0, DataTypeNodeId = 1041, Value = "default" });
-            _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = 5, Alias = "storageType", SortOrder = 0, DataTypeNodeId = 1041, Value = "Json" });
-            
-            //defaults for the member list
-            _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = -1, Alias = "pageSize", SortOrder = 1, DataTypeNodeId = Constants.System.DefaultMembersListViewDataTypeId, Value = "10" });
-            _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = -2, Alias = "orderBy", SortOrder = 2, DataTypeNodeId = Constants.System.DefaultMembersListViewDataTypeId, Value = "username" });
-            _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = -3, Alias = "orderDirection", SortOrder = 3, DataTypeNodeId = Constants.System.DefaultMembersListViewDataTypeId, Value = "asc" });
-            _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = -4, Alias = "includeProperties", SortOrder = 4, DataTypeNodeId = Constants.System.DefaultMembersListViewDataTypeId, Value = "[{\"alias\":\"username\",\"isSystem\":1},{\"alias\":\"email\",\"isSystem\":1},{\"alias\":\"updateDate\",\"header\":\"Last edited\",\"isSystem\":1}]" });
-
-            //layouts for the list view
-            var cardLayout = "{\"name\": \"Grid\",\"path\": \"views/propertyeditors/listview/layouts/grid/grid.html\", \"icon\": \"icon-thumbnails-small\", \"isSystem\": 1, \"selected\": true}";
-            var listLayout = "{\"name\": \"List\",\"path\": \"views/propertyeditors/listview/layouts/list/list.html\",\"icon\": \"icon-list\", \"isSystem\": 1,\"selected\": true}";
-
-            //defaults for the media list
-            _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = -5, Alias = "pageSize", SortOrder = 1, DataTypeNodeId = Constants.System.DefaultMediaListViewDataTypeId, Value = "100" });
-            _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = -6, Alias = "orderBy", SortOrder = 2, DataTypeNodeId = Constants.System.DefaultMediaListViewDataTypeId, Value = "updateDate" });
-            _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = -7, Alias = "orderDirection", SortOrder = 3, DataTypeNodeId = Constants.System.DefaultMediaListViewDataTypeId, Value = "desc" });
-            _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = -8, Alias = "layouts", SortOrder = 4, DataTypeNodeId = Constants.System.DefaultMediaListViewDataTypeId, Value = "[" + cardLayout + "," + listLayout + "]" });
-            _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = -9, Alias = "includeProperties", SortOrder = 5, DataTypeNodeId = Constants.System.DefaultMediaListViewDataTypeId, Value = "[{\"alias\":\"updateDate\",\"header\":\"Last edited\",\"isSystem\":1},{\"alias\":\"owner\",\"header\":\"Updated by\",\"isSystem\":1}]" });
-
-            //default's for MultipleMediaPickerAlias picker
-            _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = 6, Alias = "multiPicker", SortOrder = 0, DataTypeNodeId = 1049, Value = "1" });
-
-            // Defaults for single item dropdown
-            _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = 7, Alias = "multiple", SortOrder = 0, DataTypeNodeId = -42, Value = "0" });
-
-            // Defaults for multiple item dropdown
-            _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = 8, Alias = "multiple", SortOrder = 0, DataTypeNodeId = -39, Value = "1" });
-        }
-
-        private void CreateUmbracoRelationTypeData()
-        {
-            var relationType = new RelationTypeDto { Id = 1, Alias = Constants.Conventions.RelationTypes.RelateDocumentOnCopyAlias, ChildObjectType = new Guid(Constants.ObjectTypes.Document), ParentObjectType = new Guid(Constants.ObjectTypes.Document), Dual = true, Name = Constants.Conventions.RelationTypes.RelateDocumentOnCopyName };
-            relationType.UniqueId = (relationType.Alias + "____" + relationType.Name).ToGuid();
-            _database.Insert("umbracoRelationType", "id", false, relationType);
-            relationType = new RelationTypeDto { Id = 2, Alias = Constants.Conventions.RelationTypes.RelateParentDocumentOnDeleteAlias, ChildObjectType = new Guid(Constants.ObjectTypes.Document), ParentObjectType = new Guid(Constants.ObjectTypes.Document), Dual = false, Name = Constants.Conventions.RelationTypes.RelateParentDocumentOnDeleteName };
-            relationType.UniqueId = (relationType.Alias + "____" + relationType.Name).ToGuid();
-            _database.Insert("umbracoRelationType", "id", false, relationType);
-            relationType = new RelationTypeDto { Id = 3, Alias = Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteAlias, ChildObjectType = new Guid(Constants.ObjectTypes.Media), ParentObjectType = new Guid(Constants.ObjectTypes.Media), Dual = false, Name = Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteName };
-            relationType.UniqueId = (relationType.Alias + "____" + relationType.Name).ToGuid();
-            _database.Insert("umbracoRelationType", "id", false, relationType);
-        }
-
-        private void CreateCmsTaskTypeData()
-        {
-            _database.Insert("cmsTaskType", "id", false, new TaskTypeDto { Id = 1, Alias = "toTranslate" });
-        }
-
-        private void CreateUmbracoMigrationData()
-        {
-            var dto = new MigrationDto
-            {
-                Id = 1,
-                Name = Constants.System.UmbracoMigrationName,
-                Version = UmbracoVersion.GetSemanticVersion().ToString(),
-                CreateDate = DateTime.Now
-            };
-
-            _database.Insert("umbracoMigration", "pk", false, dto);
-        }
-    }
-}
+using System;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models.Rdbms;
+
+namespace Umbraco.Core.Persistence.Migrations.Initial
+{
+    /// <summary>
+    /// Represents the initial data creation by running Insert for the base data.
+    /// </summary>
+    internal class BaseDataCreation
+    {
+        private readonly Database _database;
+        private readonly ILogger _logger;
+
+        public BaseDataCreation(Database database, ILogger logger)
+        {
+            _database = database;
+            _logger = logger;
+        }
+
+        /// <summary>
+        /// Initialize the base data creation by inserting the data foundation for umbraco
+        /// specific to a table
+        /// </summary>
+        /// <param name="tableName">Name of the table to create base data for</param>
+        public void InitializeBaseData(string tableName)
+        {
+            _logger.Info<BaseDataCreation>(string.Format("Creating data in table {0}", tableName));
+
+            if(tableName.Equals("umbracoNode"))
+            {
+                CreateUmbracoNodeData();
+            }
+
+            if (tableName.Equals("umbracoLock"))
+            {
+                CreateUmbracoLockData();
+            }
+
+            if (tableName.Equals("cmsContentType"))
+            {
+                CreateCmsContentTypeData();
+            }
+
+            if (tableName.Equals("umbracoUser"))
+            {
+                CreateUmbracoUserData();
+            }
+
+            if (tableName.Equals("umbracoUserGroup"))
+            {
+                CreateUmbracoUserGroupData();
+            }
+
+            if (tableName.Equals("umbracoUser2UserGroup"))
+            {
+                CreateUmbracoUser2UserGroupData();
+            }
+
+            if (tableName.Equals("umbracoUserGroup2App"))
+            {
+                CreateUmbracoUserGroup2AppData();
+            }
+
+            if (tableName.Equals("cmsPropertyTypeGroup"))
+            {
+                CreateCmsPropertyTypeGroupData();
+            }
+
+            if (tableName.Equals("cmsPropertyType"))
+            {
+                CreateCmsPropertyTypeData();
+            }
+
+            if (tableName.Equals("umbracoLanguage"))
+            {
+                CreateUmbracoLanguageData();
+            }
+
+            if (tableName.Equals("cmsContentTypeAllowedContentType"))
+            {
+                CreateCmsContentTypeAllowedContentTypeData();
+            }
+
+            if(tableName.Equals("cmsDataType"))
+            {
+                CreateCmsDataTypeData();
+            }
+
+            if (tableName.Equals("cmsDataTypePreValues"))
+            {
+                CreateCmsDataTypePreValuesData();
+            }
+
+            if (tableName.Equals("umbracoRelationType"))
+            {
+                CreateUmbracoRelationTypeData();
+            }
+
+            if (tableName.Equals("cmsTaskType"))
+            {
+                CreateCmsTaskTypeData();
+            }
+
+            if (tableName.Equals("umbracoMigration"))
+            {
+                CreateUmbracoMigrationData();
+            }
+
+            _logger.Info<BaseDataCreation>(string.Format("Done creating data in table {0}", tableName));
+        }
+
+        private void CreateUmbracoNodeData()
+        {
+            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -1, Trashed = false, ParentId = -1, UserId = 0, Level = 0, Path = "-1", SortOrder = 0, UniqueId = new Guid("916724a5-173d-4619-b97e-b9de133dd6f5"), Text = "SYSTEM DATA: umbraco master root", NodeObjectType = new Guid(Constants.ObjectTypes.SystemRoot), CreateDate = DateTime.Now });
+            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -20, Trashed = false, ParentId = -1, UserId = 0, Level = 0, Path = "-1,-20", SortOrder = 0, UniqueId = new Guid("0F582A79-1E41-4CF0-BFA0-76340651891A"), Text = "Recycle Bin", NodeObjectType = new Guid(Constants.ObjectTypes.ContentRecycleBin), CreateDate = DateTime.Now });
+            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -21, Trashed = false, ParentId = -1, UserId = 0, Level = 0, Path = "-1,-21", SortOrder = 0, UniqueId = new Guid("BF7C7CBC-952F-4518-97A2-69E9C7B33842"), Text = "Recycle Bin", NodeObjectType = new Guid(Constants.ObjectTypes.MediaRecycleBin), CreateDate = DateTime.Now });
+            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -92, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-92", SortOrder = 35, UniqueId = Constants.DataTypes.LabelGuid, Text = "Label", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
+            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -90, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-90", SortOrder = 34, UniqueId = Constants.DataTypes.UploadGuid, Text = "Upload", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
+            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -89, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-89", SortOrder = 33, UniqueId = Constants.DataTypes.TextareaGuid, Text = "Textarea", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
+            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -88, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-88", SortOrder = 32, UniqueId = Constants.DataTypes.TextstringGuid, Text = "Textstring", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
+            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -87, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-87", SortOrder = 4, UniqueId = Constants.DataTypes.RichtextEditorGuid, Text = "Richtext editor", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
+            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -51, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-51", SortOrder = 2, UniqueId = Constants.DataTypes.NumericGuid, Text = "Numeric", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
+            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -49, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-49", SortOrder = 2, UniqueId = Constants.DataTypes.CheckboxGuid, Text = "Checkbox", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
+            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -43, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-43", SortOrder = 2, UniqueId = Constants.DataTypes.CheckboxListGuid, Text = "Checkbox list", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
+            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -42, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-42", SortOrder = 2, UniqueId = Constants.DataTypes.DropdownGuid, Text = "Dropdown", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
+            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -41, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-41", SortOrder = 2, UniqueId = Constants.DataTypes.DatePickerGuid, Text = "Date Picker", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
+            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -40, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-40", SortOrder = 2, UniqueId = Constants.DataTypes.RadioboxGuid, Text = "Radiobox", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
+            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -39, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-39", SortOrder = 2, UniqueId = Constants.DataTypes.DropdownMultipleGuid, Text = "Dropdown multiple", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
+            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -37, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-37", SortOrder = 2, UniqueId = Constants.DataTypes.ApprovedColorGuid, Text = "Approved Color", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
+            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -36, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-36", SortOrder = 2, UniqueId = Constants.DataTypes.DatePickerWithTimeGuid, Text = "Date Picker with time", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
+            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = Constants.System.DefaultContentListViewDataTypeId, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-95", SortOrder = 2, UniqueId = Constants.DataTypes.ListViewContentGuid, Text = Constants.Conventions.DataTypes.ListViewPrefix + "Content", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
+            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = Constants.System.DefaultMediaListViewDataTypeId, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-96", SortOrder = 2, UniqueId = Constants.DataTypes.ListViewMembersGuid, Text = Constants.Conventions.DataTypes.ListViewPrefix + "Media", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
+            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = Constants.System.DefaultMembersListViewDataTypeId, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-97", SortOrder = 2, UniqueId = Constants.DataTypes.ListViewMembersGuid, Text = Constants.Conventions.DataTypes.ListViewPrefix + "Members", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
+            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1031, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1031", SortOrder = 2, UniqueId = new Guid("f38bd2d7-65d0-48e6-95dc-87ce06ec2d3d"), Text = Constants.Conventions.MediaTypes.Folder, NodeObjectType = new Guid(Constants.ObjectTypes.MediaType), CreateDate = DateTime.Now });
+            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1032, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1032", SortOrder = 2, UniqueId = new Guid("cc07b313-0843-4aa8-bbda-871c8da728c8"), Text = Constants.Conventions.MediaTypes.Image, NodeObjectType = new Guid(Constants.ObjectTypes.MediaType), CreateDate = DateTime.Now });
+            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1033, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1033", SortOrder = 2, UniqueId = new Guid("4c52d8ab-54e6-40cd-999c-7a5f24903e4d"), Text = Constants.Conventions.MediaTypes.File, NodeObjectType = new Guid(Constants.ObjectTypes.MediaType), CreateDate = DateTime.Now });
+            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1041, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1041", SortOrder = 2, UniqueId = Constants.DataTypes.TagsGuid, Text = "Tags", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
+            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1043, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1043", SortOrder = 2, UniqueId = Constants.DataTypes.ImageCropperGuid, Text = "Image Cropper", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
+            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1044, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1044", SortOrder = 0, UniqueId = Constants.DataTypes.MemberGuid, Text = Constants.Conventions.MemberTypes.DefaultAlias, NodeObjectType = new Guid(Constants.ObjectTypes.MemberType), CreateDate = DateTime.Now });
+
+            //New UDI pickers with newer Ids
+            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1046, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1046", SortOrder = 2, UniqueId = Constants.DataTypes.ContentPickerGuid, Text = "Content Picker", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
+            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1047, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1047", SortOrder = 2, UniqueId = Constants.DataTypes.MemberPickerGuid, Text = "Member Picker", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
+            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1048, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1048", SortOrder = 2, UniqueId = Constants.DataTypes.MediaPickerGuid, Text = "Media Picker", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
+            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1049, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1049", SortOrder = 2, UniqueId = Constants.DataTypes.MultipleMediaPickerGuid, Text = "Multiple Media Picker", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
+            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1050, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1050", SortOrder = 2, UniqueId = Constants.DataTypes.RelatedLinksGuid, Text = "Related Links", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
+        }
+
+        private void CreateUmbracoLockData()
+        {
+            // all lock objects
+            _database.Insert("umbracoLock", "id", false, new LockDto { Id = Constants.Locks.Servers, Name = "Servers" });
+        }
+
+        private void CreateCmsContentTypeData()
+        {
+            _database.Insert("cmsContentType", "pk", false, new ContentTypeDto { PrimaryKey = 532, NodeId = 1031, Alias = Constants.Conventions.MediaTypes.Folder, Icon = "icon-folder", Thumbnail = "icon-folder", IsContainer = false, AllowAtRoot = true });
+            _database.Insert("cmsContentType", "pk", false, new ContentTypeDto { PrimaryKey = 533, NodeId = 1032, Alias = Constants.Conventions.MediaTypes.Image, Icon = "icon-picture", Thumbnail = "icon-picture", AllowAtRoot = true });
+            _database.Insert("cmsContentType", "pk", false, new ContentTypeDto { PrimaryKey = 534, NodeId = 1033, Alias = Constants.Conventions.MediaTypes.File, Icon = "icon-document", Thumbnail = "icon-document", AllowAtRoot = true });
+            _database.Insert("cmsContentType", "pk", false, new ContentTypeDto { PrimaryKey = 531, NodeId = 1044, Alias = Constants.Conventions.MemberTypes.DefaultAlias, Icon = "icon-user", Thumbnail = "icon-user" });
+        }
+
+        private void CreateUmbracoUserData()
+        {
+            _database.Insert("umbracoUser", "id", false, new UserDto { Id = 0, Disabled = false, NoConsole = false, UserName = "Administrator", Login = "admin", Password = "default", Email = "", UserLanguage = "en-US", CreateDate = DateTime.Now, UpdateDate = DateTime.Now });
+        }
+
+        private void CreateUmbracoUserGroupData()
+        {
+            _database.Insert("umbracoUserGroup", "id", false, new UserGroupDto { Id = 1, StartMediaId = -1, StartContentId = -1, Alias = Constants.Security.AdminGroupAlias, Name = "Administrators", DefaultPermissions = "CADMOSKTPIURZ:5F7ï", CreateDate = DateTime.Now, UpdateDate = DateTime.Now, Icon = "icon-medal" });
+            _database.Insert("umbracoUserGroup", "id", false, new UserGroupDto { Id = 2, StartMediaId = -1, StartContentId = -1, Alias = "writer", Name = "Writers", DefaultPermissions = "CAH:F", CreateDate = DateTime.Now, UpdateDate = DateTime.Now, Icon = "icon-edit" });
+            _database.Insert("umbracoUserGroup", "id", false, new UserGroupDto { Id = 3, StartMediaId = -1, StartContentId = -1, Alias = "editor", Name = "Editors", DefaultPermissions = "CADMOSKTPUZ:5Fï", CreateDate = DateTime.Now, UpdateDate = DateTime.Now, Icon = "icon-tools" });
+            _database.Insert("umbracoUserGroup", "id", false, new UserGroupDto { Id = 4, StartMediaId = -1, StartContentId = -1, Alias = Constants.Security.TranslatorGroupAlias, Name = "Translators", DefaultPermissions = "AF", CreateDate = DateTime.Now, UpdateDate = DateTime.Now, Icon = "icon-globe" });
+            _database.Insert("umbracoUserGroup", "id", false, new UserGroupDto { Id = 5, StartMediaId = -1, StartContentId = -1, Alias = Constants.Security.SensitiveDataGroupAlias, Name = "Sensitive data", DefaultPermissions = "", CreateDate = DateTime.Now, UpdateDate = DateTime.Now, Icon = "icon-lock" });
+        }
+
+        private void CreateUmbracoUser2UserGroupData()
+        {
+            _database.Insert(new User2UserGroupDto { UserGroupId = 1, UserId = 0 }); //add admin to admins
+            _database.Insert(new User2UserGroupDto { UserGroupId = 5, UserId = 0 }); //add admin to sensitive data
+        }
+
+        private void CreateUmbracoUserGroup2AppData()
+        {
+            _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Content });
+            _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Developer });
+            _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Media });
+            _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Members });
+            _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Settings });
+            _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Users });
+            _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Forms });
+
+            _database.Insert(new UserGroup2AppDto { UserGroupId = 2, AppAlias = Constants.Applications.Content });
+
+            _database.Insert(new UserGroup2AppDto { UserGroupId = 3, AppAlias = Constants.Applications.Content });
+            _database.Insert(new UserGroup2AppDto { UserGroupId = 3, AppAlias = Constants.Applications.Media });
+            _database.Insert(new UserGroup2AppDto { UserGroupId = 3, AppAlias = Constants.Applications.Forms });
+
+            _database.Insert(new UserGroup2AppDto { UserGroupId = 4, AppAlias = Constants.Applications.Translation });
+        }
+
+        private void CreateCmsPropertyTypeGroupData()
+        {
+            _database.Insert("cmsPropertyTypeGroup", "id", false, new PropertyTypeGroupDto { Id = 3, ContentTypeNodeId = 1032, Text = "Image", SortOrder = 1, UniqueId = new Guid(Constants.PropertyTypeGroups.Image) });
+            _database.Insert("cmsPropertyTypeGroup", "id", false, new PropertyTypeGroupDto { Id = 4, ContentTypeNodeId = 1033, Text = "File", SortOrder = 1, UniqueId = new Guid(Constants.PropertyTypeGroups.File) });
+            _database.Insert("cmsPropertyTypeGroup", "id", false, new PropertyTypeGroupDto { Id = 5, ContentTypeNodeId = 1031, Text = "Contents", SortOrder = 1, UniqueId = new Guid(Constants.PropertyTypeGroups.Contents) });
+            //membership property group
+            _database.Insert("cmsPropertyTypeGroup", "id", false, new PropertyTypeGroupDto { Id = 11, ContentTypeNodeId = 1044, Text = "Membership", SortOrder = 1, UniqueId = new Guid(Constants.PropertyTypeGroups.Membership) });
+        }
+
+        private void CreateCmsPropertyTypeData()
+        {
+            _database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 6, UniqueId = 6.ToGuid(), DataTypeId = 1043, ContentTypeId = 1032, PropertyTypeGroupId = 3, Alias = Constants.Conventions.Media.File, Name = "Upload image", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = null });
+            _database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 7, UniqueId = 7.ToGuid(), DataTypeId = -92, ContentTypeId = 1032, PropertyTypeGroupId = 3, Alias = Constants.Conventions.Media.Width, Name = "Width", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = null });
+            _database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 8, UniqueId = 8.ToGuid(), DataTypeId = -92, ContentTypeId = 1032, PropertyTypeGroupId = 3, Alias = Constants.Conventions.Media.Height, Name = "Height", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = null });
+            _database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 9, UniqueId = 9.ToGuid(), DataTypeId = -92, ContentTypeId = 1032, PropertyTypeGroupId = 3, Alias = Constants.Conventions.Media.Bytes, Name = "Size", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = null });
+            _database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 10, UniqueId = 10.ToGuid(), DataTypeId = -92, ContentTypeId = 1032, PropertyTypeGroupId = 3, Alias = Constants.Conventions.Media.Extension, Name = "Type", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = null });
+            _database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 24, UniqueId = 24.ToGuid(), DataTypeId = -90, ContentTypeId = 1033, PropertyTypeGroupId = 4, Alias = Constants.Conventions.Media.File, Name = "Upload file", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = null });
+            _database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 25, UniqueId = 25.ToGuid(), DataTypeId = -92, ContentTypeId = 1033, PropertyTypeGroupId = 4, Alias = Constants.Conventions.Media.Extension, Name = "Type", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = null });
+            _database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 26, UniqueId = 26.ToGuid(), DataTypeId = -92, ContentTypeId = 1033, PropertyTypeGroupId = 4, Alias = Constants.Conventions.Media.Bytes, Name = "Size", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = null });
+            _database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 27, UniqueId = 27.ToGuid(), DataTypeId = Constants.System.DefaultMediaListViewDataTypeId, ContentTypeId = 1031, PropertyTypeGroupId = 5, Alias = "contents", Name = "Contents:", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = null });
+            //membership property types
+            _database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 28, UniqueId = 28.ToGuid(), DataTypeId = -89, ContentTypeId = 1044, PropertyTypeGroupId = 11, Alias = Constants.Conventions.Member.Comments, Name = Constants.Conventions.Member.CommentsLabel, SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = null });
+            _database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 29, UniqueId = 29.ToGuid(), DataTypeId = -92, ContentTypeId = 1044, PropertyTypeGroupId = 11, Alias = Constants.Conventions.Member.FailedPasswordAttempts, Name = Constants.Conventions.Member.FailedPasswordAttemptsLabel, SortOrder = 1, Mandatory = false, ValidationRegExp = null, Description = null });
+            _database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 30, UniqueId = 30.ToGuid(), DataTypeId = -49, ContentTypeId = 1044, PropertyTypeGroupId = 11, Alias = Constants.Conventions.Member.IsApproved, Name = Constants.Conventions.Member.IsApprovedLabel, SortOrder = 2, Mandatory = false, ValidationRegExp = null, Description = null });
+            _database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 31, UniqueId = 31.ToGuid(), DataTypeId = -49, ContentTypeId = 1044, PropertyTypeGroupId = 11, Alias = Constants.Conventions.Member.IsLockedOut, Name = Constants.Conventions.Member.IsLockedOutLabel, SortOrder = 3, Mandatory = false, ValidationRegExp = null, Description = null });
+            _database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 32, UniqueId = 32.ToGuid(), DataTypeId = -92, ContentTypeId = 1044, PropertyTypeGroupId = 11, Alias = Constants.Conventions.Member.LastLockoutDate, Name = Constants.Conventions.Member.LastLockoutDateLabel, SortOrder = 4, Mandatory = false, ValidationRegExp = null, Description = null });
+            _database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 33, UniqueId = 33.ToGuid(), DataTypeId = -92, ContentTypeId = 1044, PropertyTypeGroupId = 11, Alias = Constants.Conventions.Member.LastLoginDate, Name = Constants.Conventions.Member.LastLoginDateLabel, SortOrder = 5, Mandatory = false, ValidationRegExp = null, Description = null });
+            _database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 34, UniqueId = 34.ToGuid(), DataTypeId = -92, ContentTypeId = 1044, PropertyTypeGroupId = 11, Alias = Constants.Conventions.Member.LastPasswordChangeDate, Name = Constants.Conventions.Member.LastPasswordChangeDateLabel, SortOrder = 6, Mandatory = false, ValidationRegExp = null, Description = null });
+
+        }
+
+        private void CreateUmbracoLanguageData()
+        {
+            _database.Insert("umbracoLanguage", "id", false, new LanguageDto { Id = 1, IsoCode = "en-US", CultureName = "en-US" });
+        }
+
+        private void CreateCmsContentTypeAllowedContentTypeData()
+        {
+            _database.Insert("cmsContentTypeAllowedContentType", "Id", false, new ContentTypeAllowedContentTypeDto { Id = 1031, AllowedId = 1031 });
+            _database.Insert("cmsContentTypeAllowedContentType", "Id", false, new ContentTypeAllowedContentTypeDto { Id = 1031, AllowedId = 1032 });
+            _database.Insert("cmsContentTypeAllowedContentType", "Id", false, new ContentTypeAllowedContentTypeDto { Id = 1031, AllowedId = 1033 });
+        }
+
+        private void CreateCmsDataTypeData()
+        {
+            //TODO Check which of the DataTypeIds below doesn't exist in umbracoNode, which results in a foreign key constraint errors.
+            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 1, DataTypeId = -49, PropertyEditorAlias = Constants.PropertyEditors.TrueFalseAlias, DbType = "Integer" });
+            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 2, DataTypeId = -51, PropertyEditorAlias = Constants.PropertyEditors.IntegerAlias, DbType = "Integer" });
+            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 3, DataTypeId = -87, PropertyEditorAlias = Constants.PropertyEditors.TinyMCEAlias, DbType = "Ntext" });
+            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 4, DataTypeId = -88, PropertyEditorAlias = Constants.PropertyEditors.TextboxAlias, DbType = "Nvarchar" });
+            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 5, DataTypeId = -89, PropertyEditorAlias = Constants.PropertyEditors.TextboxMultipleAlias, DbType = "Ntext" });
+            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 6, DataTypeId = -90, PropertyEditorAlias = Constants.PropertyEditors.UploadFieldAlias, DbType = "Nvarchar" });
+            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 7, DataTypeId = -92, PropertyEditorAlias = Constants.PropertyEditors.NoEditAlias, DbType = "Nvarchar" });
+            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 8, DataTypeId = -36, PropertyEditorAlias = Constants.PropertyEditors.DateTimeAlias, DbType = "Date" });
+            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 9, DataTypeId = -37, PropertyEditorAlias = Constants.PropertyEditors.ColorPickerAlias, DbType = "Nvarchar" });
+            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 11, DataTypeId = -39, PropertyEditorAlias = Constants.PropertyEditors.DropDownListFlexibleAlias, DbType = "Nvarchar" });
+            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 12, DataTypeId = -40, PropertyEditorAlias = Constants.PropertyEditors.RadioButtonListAlias, DbType = "Nvarchar" });
+            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 13, DataTypeId = -41, PropertyEditorAlias = Constants.PropertyEditors.DateAlias, DbType = "Date" });
+            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 14, DataTypeId = -42, PropertyEditorAlias = Constants.PropertyEditors.DropDownListFlexibleAlias, DbType = "Integer" });
+            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 15, DataTypeId = -43, PropertyEditorAlias = Constants.PropertyEditors.CheckBoxListAlias, DbType = "Nvarchar" });
+            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 22, DataTypeId = 1041, PropertyEditorAlias = Constants.PropertyEditors.TagsAlias, DbType = "Ntext" });
+            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 24, DataTypeId = 1043, PropertyEditorAlias = Constants.PropertyEditors.ImageCropperAlias, DbType = "Ntext" });
+            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = -26, DataTypeId = Constants.System.DefaultContentListViewDataTypeId, PropertyEditorAlias = Constants.PropertyEditors.ListViewAlias, DbType = "Nvarchar" });
+            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = -27, DataTypeId = Constants.System.DefaultMediaListViewDataTypeId, PropertyEditorAlias = Constants.PropertyEditors.ListViewAlias, DbType = "Nvarchar" });
+            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = -28, DataTypeId = Constants.System.DefaultMembersListViewDataTypeId, PropertyEditorAlias = Constants.PropertyEditors.ListViewAlias, DbType = "Nvarchar" });
+
+            //New UDI pickers with newer Ids
+            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 26, DataTypeId = 1046, PropertyEditorAlias = Constants.PropertyEditors.ContentPicker2Alias, DbType = "Nvarchar" });
+            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 27, DataTypeId = 1047, PropertyEditorAlias = Constants.PropertyEditors.MemberPicker2Alias, DbType = "Nvarchar" });
+            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 28, DataTypeId = 1048, PropertyEditorAlias = Constants.PropertyEditors.MediaPicker2Alias, DbType = "Ntext" });
+            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 29, DataTypeId = 1049, PropertyEditorAlias = Constants.PropertyEditors.MediaPicker2Alias, DbType = "Ntext" });
+            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 30, DataTypeId = 1050, PropertyEditorAlias = Constants.PropertyEditors.RelatedLinks2Alias, DbType = "Ntext" });
+        }
+
+        private void CreateCmsDataTypePreValuesData()
+        {
+            _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = 3, Alias = "", SortOrder = 0, DataTypeNodeId = -87, Value = ",code,undo,redo,cut,copy,mcepasteword,stylepicker,bold,italic,bullist,numlist,outdent,indent,mcelink,unlink,mceinsertanchor,mceimage,umbracomacro,mceinserttable,umbracoembed,mcecharmap,|1|1,2,3,|0|500,400|1049,|true|" });
+            _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = 4, Alias = "group", SortOrder = 0, DataTypeNodeId = 1041, Value = "default" });
+            _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = 5, Alias = "storageType", SortOrder = 0, DataTypeNodeId = 1041, Value = "Json" });
+
+            //defaults for the member list
+            _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = -1, Alias = "pageSize", SortOrder = 1, DataTypeNodeId = Constants.System.DefaultMembersListViewDataTypeId, Value = "10" });
+            _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = -2, Alias = "orderBy", SortOrder = 2, DataTypeNodeId = Constants.System.DefaultMembersListViewDataTypeId, Value = "username" });
+            _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = -3, Alias = "orderDirection", SortOrder = 3, DataTypeNodeId = Constants.System.DefaultMembersListViewDataTypeId, Value = "asc" });
+            _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = -4, Alias = "includeProperties", SortOrder = 4, DataTypeNodeId = Constants.System.DefaultMembersListViewDataTypeId, Value = "[{\"alias\":\"username\",\"isSystem\":1},{\"alias\":\"email\",\"isSystem\":1},{\"alias\":\"updateDate\",\"header\":\"Last edited\",\"isSystem\":1}]" });
+
+            //layouts for the list view
+            var cardLayout = "{\"name\": \"Grid\",\"path\": \"views/propertyeditors/listview/layouts/grid/grid.html\", \"icon\": \"icon-thumbnails-small\", \"isSystem\": 1, \"selected\": true}";
+            var listLayout = "{\"name\": \"List\",\"path\": \"views/propertyeditors/listview/layouts/list/list.html\",\"icon\": \"icon-list\", \"isSystem\": 1,\"selected\": true}";
+
+            //defaults for the media list
+            _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = -5, Alias = "pageSize", SortOrder = 1, DataTypeNodeId = Constants.System.DefaultMediaListViewDataTypeId, Value = "100" });
+            _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = -6, Alias = "orderBy", SortOrder = 2, DataTypeNodeId = Constants.System.DefaultMediaListViewDataTypeId, Value = "updateDate" });
+            _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = -7, Alias = "orderDirection", SortOrder = 3, DataTypeNodeId = Constants.System.DefaultMediaListViewDataTypeId, Value = "desc" });
+            _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = -8, Alias = "layouts", SortOrder = 4, DataTypeNodeId = Constants.System.DefaultMediaListViewDataTypeId, Value = "[" + cardLayout + "," + listLayout + "]" });
+            _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = -9, Alias = "includeProperties", SortOrder = 5, DataTypeNodeId = Constants.System.DefaultMediaListViewDataTypeId, Value = "[{\"alias\":\"updateDate\",\"header\":\"Last edited\",\"isSystem\":1},{\"alias\":\"owner\",\"header\":\"Updated by\",\"isSystem\":1}]" });
+
+            //default's for MultipleMediaPickerAlias picker
+            _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = 6, Alias = "multiPicker", SortOrder = 0, DataTypeNodeId = 1049, Value = "1" });
+
+            // Defaults for single item dropdown
+            _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = 7, Alias = "multiple", SortOrder = 0, DataTypeNodeId = -42, Value = "0" });
+
+            // Defaults for multiple item dropdown
+            _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = 8, Alias = "multiple", SortOrder = 0, DataTypeNodeId = -39, Value = "1" });
+        }
+
+        private void CreateUmbracoRelationTypeData()
+        {
+            var relationType = new RelationTypeDto { Id = 1, Alias = Constants.Conventions.RelationTypes.RelateDocumentOnCopyAlias, ChildObjectType = new Guid(Constants.ObjectTypes.Document), ParentObjectType = new Guid(Constants.ObjectTypes.Document), Dual = true, Name = Constants.Conventions.RelationTypes.RelateDocumentOnCopyName };
+            relationType.UniqueId = (relationType.Alias + "____" + relationType.Name).ToGuid();
+            _database.Insert("umbracoRelationType", "id", false, relationType);
+            relationType = new RelationTypeDto { Id = 2, Alias = Constants.Conventions.RelationTypes.RelateParentDocumentOnDeleteAlias, ChildObjectType = new Guid(Constants.ObjectTypes.Document), ParentObjectType = new Guid(Constants.ObjectTypes.Document), Dual = false, Name = Constants.Conventions.RelationTypes.RelateParentDocumentOnDeleteName };
+            relationType.UniqueId = (relationType.Alias + "____" + relationType.Name).ToGuid();
+            _database.Insert("umbracoRelationType", "id", false, relationType);
+            relationType = new RelationTypeDto { Id = 3, Alias = Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteAlias, ChildObjectType = new Guid(Constants.ObjectTypes.Media), ParentObjectType = new Guid(Constants.ObjectTypes.Media), Dual = false, Name = Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteName };
+            relationType.UniqueId = (relationType.Alias + "____" + relationType.Name).ToGuid();
+            _database.Insert("umbracoRelationType", "id", false, relationType);
+        }
+
+        private void CreateCmsTaskTypeData()
+        {
+            _database.Insert("cmsTaskType", "id", false, new TaskTypeDto { Id = 1, Alias = "toTranslate" });
+        }
+
+        private void CreateUmbracoMigrationData()
+        {
+            var dto = new MigrationDto
+            {
+                Id = 1,
+                Name = Constants.System.UmbracoMigrationName,
+                Version = UmbracoVersion.GetSemanticVersion().ToString(),
+                CreateDate = DateTime.Now
+            };
+
+            _database.Insert("umbracoMigration", "pk", false, dto);
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Services/DataTypeService.cs b/src/Umbraco.Core/Services/DataTypeService.cs
index 43c2b69c47..b02fb644d8 100644
--- a/src/Umbraco.Core/Services/DataTypeService.cs
+++ b/src/Umbraco.Core/Services/DataTypeService.cs
@@ -356,7 +356,7 @@ namespace Umbraco.Core.Services
             if (dataType != null)
             {
                 var preValues = GetPreValuesCollectionByDataTypeId(dataType.Id);
-                if (preValues.PreValuesAsDictionary.TryGetValue("ignoreUserStartNodes", out var preValue))
+                if (preValues.PreValuesAsDictionary.TryGetValue(Constants.DataTypes.ReservedPreValueKeys.IgnoreUserStartNodes, out var preValue))
                 {
                     return string.Equals(preValue.Value, "1", StringComparison.InvariantCulture);
                 }
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 0b3c923c83..f29c1bea46 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -324,6 +324,9 @@
     <Compile Include="Configuration\UmbracoSettings\WebRoutingElement.cs" />
     <Compile Include="Configuration\UmbracoVersion.cs" />
     <Compile Include="Attempt.cs" />
+    <Compile Include="Constants-DataTypes.cs">
+      <DependentUpon>Constants.cs</DependentUpon>
+    </Compile>
     <Compile Include="Constants-DeploySelector.cs" />
     <Compile Include="Constants-Examine.cs" />
     <Compile Include="Constants-Icons.cs" />
diff --git a/src/Umbraco.Web/Models/Mapping/PreValueDisplayResolver.cs b/src/Umbraco.Web/Models/Mapping/PreValueDisplayResolver.cs
index 9d1331e691..652bd34fff 100644
--- a/src/Umbraco.Web/Models/Mapping/PreValueDisplayResolver.cs
+++ b/src/Umbraco.Web/Models/Mapping/PreValueDisplayResolver.cs
@@ -1,84 +1,93 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using AutoMapper;
-using Umbraco.Core;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.Services;
-using Umbraco.Web.Models.ContentEditing;
-
-namespace Umbraco.Web.Models.Mapping
-{
-    internal class PreValueDisplayResolver : ValueResolver<IDataTypeDefinition, IEnumerable<PreValueFieldDisplay>>
-    {
-        private readonly IDataTypeService _dataTypeService;
-
-        public PreValueDisplayResolver(IDataTypeService dataTypeService)
-        {
-            _dataTypeService = dataTypeService;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using AutoMapper;
+using Umbraco.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Services;
+using Umbraco.Web.Models.ContentEditing;
+
+namespace Umbraco.Web.Models.Mapping
+{
+    internal class PreValueDisplayResolver : ValueResolver<IDataTypeDefinition, IEnumerable<PreValueFieldDisplay>>
+    {
+        private readonly IDataTypeService _dataTypeService;
+
+        public PreValueDisplayResolver(IDataTypeService dataTypeService)
+        {
+            _dataTypeService = dataTypeService;
         }
 
-        /// <summary>
-        /// Maps pre-values in the dictionary to the values for the fields.
-        /// </summary>
-        /// <param name="fields">The fields.</param>
-        /// <param name="preValues">The pre-values.</param>
-        /// <param name="editorAlias">The editor alias.</param>
-        internal static void MapPreValueValuesToPreValueFields(PreValueFieldDisplay[] fields, IDictionary<string, object> preValues, string editorAlias)
-        {
-            if (fields == null) throw new ArgumentNullException(nameof(fields));
-            if (preValues == null) throw new ArgumentNullException(nameof(preValues));
-
-            // Now we need to wire up the pre-values values with the actual fields defined
-            foreach (var field in fields)
-            {
-                // If the dictionary would be constructed with StringComparer.InvariantCultureIgnoreCase, we could just use TryGetValue
-                var preValue = preValues.SingleOrDefault(x => x.Key.InvariantEquals(field.Key));
-                if (preValue.Key == null)
-                {
-                    LogHelper.Warn<PreValueDisplayResolver>("Could not find persisted pre-value for field {0} on property editor {1}", () => field.Key, () => editorAlias);
-                    continue;
-                }
-
-                field.Value = preValue.Value;
-            }
-        }
-
-        internal IEnumerable<PreValueFieldDisplay> Convert(IDataTypeDefinition source)
-        {
-            PropertyEditor propEd = null;
-            if (source.PropertyEditorAlias.IsNullOrWhiteSpace() == false)
-            {
-                propEd = PropertyEditorResolver.Current.GetByAlias(source.PropertyEditorAlias);
-                if (propEd == null)
-                {
-                    throw new InvalidOperationException("Could not find property editor with alias " + source.PropertyEditorAlias);
-                }
-            }
-
-            // Set up the defaults
-            var dataTypeService = _dataTypeService;
-            var preVals = dataTypeService.GetPreValuesCollectionByDataTypeId(source.Id);
-            IDictionary<string, object> dictionaryVals = preVals.FormatAsDictionary().ToDictionary(x => x.Key, x => (object)x.Value);
-            var result = Enumerable.Empty<PreValueFieldDisplay>().ToArray();
-
-            // If we have a prop editor, then format the pre-values based on it and create it's fields
-            if (propEd != null)
-            {
-                result = propEd.PreValueEditor.Fields.Select(Mapper.Map<PreValueFieldDisplay>).ToArray();
-                dictionaryVals = propEd.PreValueEditor.ConvertDbToEditor(propEd.DefaultPreValues, preVals);
-            }
-
-            MapPreValueValuesToPreValueFields(result, dictionaryVals, source.PropertyEditorAlias);
-
-            return result;
-        }
-
-        protected override IEnumerable<PreValueFieldDisplay> ResolveCore(IDataTypeDefinition source)
-        {
-            return Convert(source);
-        }
-    }
-}
+        /// <summary>
+        /// Maps pre-values in the dictionary to the values for the fields.
+        /// </summary>
+        /// <param name="fields">The fields.</param>
+        /// <param name="preValues">The pre-values.</param>
+        /// <param name="editorAlias">The editor alias.</param>
+        internal static void MapPreValueValuesToPreValueFields(IEnumerable<PreValueFieldDisplay> fields, IDictionary<string, object> preValues, string editorAlias)
+        {
+            if (fields == null) throw new ArgumentNullException(nameof(fields));
+            if (preValues == null) throw new ArgumentNullException(nameof(preValues));
+
+            // Now we need to wire up the pre-values values with the actual fields defined
+            foreach (var field in fields)
+            {
+                // If the dictionary would be constructed with StringComparer.InvariantCultureIgnoreCase, we could just use TryGetValue
+                var preValue = preValues.SingleOrDefault(x => x.Key.InvariantEquals(field.Key));
+                if (preValue.Key == null)
+                {
+                    LogHelper.Warn<PreValueDisplayResolver>("Could not find persisted pre-value for field {0} on property editor {1}", () => field.Key, () => editorAlias);
+                    continue;
+                }
+
+                field.Value = preValue.Value;
+            }
+        }
+
+        internal IEnumerable<PreValueFieldDisplay> Convert(IDataTypeDefinition source)
+        {
+            PropertyEditor propEd = null;
+            if (source.PropertyEditorAlias.IsNullOrWhiteSpace() == false)
+            {
+                propEd = PropertyEditorResolver.Current.GetByAlias(source.PropertyEditorAlias);
+                if (propEd == null)
+                {
+                    throw new InvalidOperationException("Could not find property editor with alias " + source.PropertyEditorAlias);
+                }
+            }
+
+            // Set up the defaults
+            var dataTypeService = _dataTypeService;
+            var preVals = dataTypeService.GetPreValuesCollectionByDataTypeId(source.Id);
+            IDictionary<string, object> dictionaryVals = preVals.FormatAsDictionary().ToDictionary(x => x.Key, x => (object)x.Value);
+            var result = Enumerable.Empty<PreValueFieldDisplay>();
+
+            // If we have a prop editor, then format the pre-values based on it and create it's fields
+            if (propEd != null)
+            {
+                result = propEd.PreValueEditor.Fields.Select(Mapper.Map<PreValueFieldDisplay>).AsEnumerable();
+                if (source.IsBuildInDataType)
+                {
+                    result = RemovePreValuesNotSupportedOnBuildInTypes(result);
+                }
+                dictionaryVals = propEd.PreValueEditor.ConvertDbToEditor(propEd.DefaultPreValues, preVals);
+            }
+
+            MapPreValueValuesToPreValueFields(result, dictionaryVals, source.PropertyEditorAlias);
+
+            return result;
+        }
+
+        private IEnumerable<PreValueFieldDisplay> RemovePreValuesNotSupportedOnBuildInTypes(IEnumerable<PreValueFieldDisplay> preValues)
+        {
+            return preValues.Where(preValue => string.Equals(preValue.Key, Constants.DataTypes.ReservedPreValueKeys.IgnoreUserStartNodes) == false);
+        }
+
+        protected override IEnumerable<PreValueFieldDisplay> ResolveCore(IDataTypeDefinition source)
+        {
+            return Convert(source);
+        }
+    }
+}
diff --git a/src/Umbraco.Web/PropertyEditors/ContentPicker2PropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/ContentPicker2PropertyEditor.cs
index 0039385e5f..46f251ebf4 100644
--- a/src/Umbraco.Web/PropertyEditors/ContentPicker2PropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/ContentPicker2PropertyEditor.cs
@@ -15,11 +15,11 @@ namespace Umbraco.Web.PropertyEditors
         {
             InternalPreValues = new Dictionary<string, object>
             {
-                {"startNodeId", "-1"},                
+                {"startNodeId", "-1"},
                 {"showOpenButton", "0"},
                 {"showEditButton", "0"},
                 {"showPathOnHover", "0"},
-                {"ignoreUserStartNodes", "0"},
+                {Constants.DataTypes.ReservedPreValueKeys.IgnoreUserStartNodes, "0"},
                 {"idType", "udi"}
             };
         }
@@ -40,9 +40,9 @@ namespace Umbraco.Web.PropertyEditors
         {
             public ContentPickerPreValueEditor()
             {
-                //create the fields                
+                //create the fields
                 Fields.Add(new PreValueField()
-                {                    
+                {
                     Key = "showOpenButton",
                     View = "boolean",
                     Name = "Show open button (this feature is in preview!)",
@@ -50,7 +50,7 @@ namespace Umbraco.Web.PropertyEditors
                 });
                 Fields.Add(new PreValueField()
                 {
-                    Key = "ignoreUserStartNodes",
+                    Key = Constants.DataTypes.ReservedPreValueKeys.IgnoreUserStartNodes,
                     View = "boolean",
                     Name = "Ignore user start nodes",
                     Description = "Selecting this option allows a user to choose nodes that they normally don't have access to."
diff --git a/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
index 4a8803a099..94aed3e852 100644
--- a/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
@@ -18,7 +18,7 @@ namespace Umbraco.Web.PropertyEditors
 {
     [PropertyEditor(Core.Constants.PropertyEditors.GridAlias, "Grid layout", "grid", HideLabel = true, IsParameterEditor = false, ValueType = PropertyEditorValueTypes.Json, Group="rich content", Icon="icon-layout")]
     public class GridPropertyEditor : PropertyEditor, IApplicationEventHandler
-    {        
+    {
 
         private static void DocumentWriting(object sender, Examine.LuceneEngine.DocumentWritingEventArgs e)
         {
@@ -49,7 +49,7 @@ namespace Umbraco.Web.PropertyEditors
 
                                     foreach (var areaVal in areaVals)
                                     {
-                                        //TODO: If it's not a string, then it's a json formatted value - 
+                                        //TODO: If it's not a string, then it's a json formatted value -
                                         // we cannot really index this in a smart way since it could be 'anything'
                                         if (areaVal.Type == JTokenType.String)
                                         {
@@ -87,12 +87,12 @@ namespace Umbraco.Web.PropertyEditors
                         catch (InvalidCastException)
                         {
                             //swallow...on purpose, there's a chance that this isn't the json format we are looking for
-                            // and we don't want that to affect the website. 
+                            // and we don't want that to affect the website.
                         }
                         catch (JsonException)
                         {
-                            //swallow...on purpose, there's a chance that this isn't json and we don't want that to affect 
-                            // the website. 
+                            //swallow...on purpose, there's a chance that this isn't json and we don't want that to affect
+                            // the website.
                         }
                         catch (ArgumentException)
                         {
@@ -137,7 +137,7 @@ namespace Umbraco.Web.PropertyEditors
             [PreValueField("rte", "Rich text editor", "views/propertyeditors/rte/rte.prevalues.html", Description = "Rich text editor configuration")]
             public string Rte { get; set; }
 
-            [PreValueField("ignoreUserStartNodes", "Ignore user start nodes", "boolean", Description = "Selecting this option allows a user to choose nodes that they normally don't have access to.")]
+            [PreValueField(Constants.DataTypes.ReservedPreValueKeys.IgnoreUserStartNodes, "Ignore user start nodes", "boolean", Description = "Selecting this option allows a user to choose nodes that they normally don't have access to.")]
             public bool IgnoreUserStartNodes { get; set; }
         }
 
@@ -152,7 +152,7 @@ namespace Umbraco.Web.PropertyEditors
         {
             /// <summary>
             /// We're going to bind to the Examine events so we can ensure grid data is index nicely.
-            /// </summary>        
+            /// </summary>
             protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
             {
                 foreach (var i in ExamineManager.Instance.IndexProviderCollection.OfType<BaseUmbracoIndexer>())
@@ -175,7 +175,7 @@ namespace Umbraco.Web.PropertyEditors
         public void OnApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
         {
             //wrap
-            _applicationStartup.OnApplicationStarted(umbracoApplication, applicationContext);            
+            _applicationStartup.OnApplicationStarted(umbracoApplication, applicationContext);
         }
         #endregion
     }
diff --git a/src/Umbraco.Web/PropertyEditors/MediaPicker2PropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/MediaPicker2PropertyEditor.cs
index 6aa7ab4a54..e62ac98abd 100644
--- a/src/Umbraco.Web/PropertyEditors/MediaPicker2PropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MediaPicker2PropertyEditor.cs
@@ -19,7 +19,7 @@ namespace Umbraco.Web.PropertyEditors
         }
 
         internal IDictionary<string, object> InternalPreValues;
-        
+
         public override IDictionary<string, object> DefaultPreValues
         {
             get { return InternalPreValues; }
@@ -58,7 +58,7 @@ namespace Umbraco.Web.PropertyEditors
                 });
                 Fields.Add(new PreValueField()
                 {
-                    Key = "ignoreUserStartNodes",
+                    Key = Constants.DataTypes.ReservedPreValueKeys.IgnoreUserStartNodes,
                     View = "boolean",
                     Name = "Ignore user start nodes",
                     Description = "Selecting this option allows a user to choose nodes that they normally don't have access to."
diff --git a/src/Umbraco.Web/PropertyEditors/MultiNodeTreePicker2PropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/MultiNodeTreePicker2PropertyEditor.cs
index f57a9951b6..b79cd96313 100644
--- a/src/Umbraco.Web/PropertyEditors/MultiNodeTreePicker2PropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MultiNodeTreePicker2PropertyEditor.cs
@@ -16,11 +16,11 @@ namespace Umbraco.Web.PropertyEditors
                 {"showOpenButton", "0"},
                 {"showEditButton", "0"},
                 {"showPathOnHover", "0"},
-                {"ignoreUserStartNodes", "0"},
+                {Constants.DataTypes.ReservedPreValueKeys.IgnoreUserStartNodes, "0"},
                 {"idType", "udi"}
             };
         }
-        
+
         protected override PreValueEditor CreatePreValueEditor()
         {
             return new MultiNodePickerPreValueEditor();
@@ -40,7 +40,7 @@ namespace Umbraco.Web.PropertyEditors
                 //create the fields
                 Fields.Add(new PreValueField()
                 {
-                    Key = "ignoreUserStartNodes",
+                    Key = Constants.DataTypes.ReservedPreValueKeys.IgnoreUserStartNodes,
                     View = "boolean",
                     Name = "Ignore user start nodes",
                     Description = "Selecting this option allows a user to choose nodes that they normally don't have access to."
@@ -81,7 +81,7 @@ namespace Umbraco.Web.PropertyEditors
                     Name = "Show open button (this feature is in preview!)",
                     Description = "Opens the node in a dialog"
                 });
-            }            
+            }
 
             /// <summary>
             /// This ensures the multiPicker pre-val is set based on the maxNumber of nodes set
@@ -117,9 +117,9 @@ namespace Umbraco.Web.PropertyEditors
                         {
                             result["multiPicker"] = "1";
                         }
-                    }    
+                    }
                 }
-                
+
 
                 return result;
             }
diff --git a/src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs
index f3ae317efa..ea3a1572b1 100644
--- a/src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs
@@ -34,7 +34,7 @@ namespace Umbraco.Web.PropertyEditors
             {
                 Fields.Add(new PreValueField()
                 {
-                    Key = "ignoreUserStartNodes",
+                    Key = Constants.DataTypes.ReservedPreValueKeys.IgnoreUserStartNodes,
                     View = "boolean",
                     Name = "Ignore user start nodes",
                     Description = "Selecting this option allows a user to choose nodes that they normally don't have access to."
diff --git a/src/Umbraco.Web/PropertyEditors/RelatedLinks2PropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/RelatedLinks2PropertyEditor.cs
index a96c0724ff..289e6588a9 100644
--- a/src/Umbraco.Web/PropertyEditors/RelatedLinks2PropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/RelatedLinks2PropertyEditor.cs
@@ -14,7 +14,7 @@ namespace Umbraco.Web.PropertyEditors
         {
             InternalPreValues = new Dictionary<string, object>
             {
-                {"ignoreUserStartNodes", "0"},
+                {Constants.DataTypes.ReservedPreValueKeys.IgnoreUserStartNodes, "0"},
                 {"idType", "udi"}
             };
         }
@@ -33,11 +33,11 @@ namespace Umbraco.Web.PropertyEditors
 
         internal class RelatedLinksPreValueEditor : PreValueEditor
         {
-            [PreValueField("ignoreUserStartNodes", "Ignore user start nodes", "boolean", Description = "Selecting this option allows a user to choose nodes that they normally don't have access to.")]
+            [PreValueField(Constants.DataTypes.ReservedPreValueKeys.IgnoreUserStartNodes, "Ignore user start nodes", "boolean", Description = "Selecting this option allows a user to choose nodes that they normally don't have access to.")]
             public bool IgnoreUserStartNodes { get; set; }
 
             [PreValueField("max", "Maximum number of links", "number", Description = "Enter the maximum amount of links to be added, enter 0 for unlimited")]
-            public int Maximum { get; set; }            
+            public int Maximum { get; set; }
         }
     }
 }
diff --git a/src/Umbraco.Web/PropertyEditors/RichTextPreValueEditor.cs b/src/Umbraco.Web/PropertyEditors/RichTextPreValueEditor.cs
index 69445bc304..9fd2bf6de4 100644
--- a/src/Umbraco.Web/PropertyEditors/RichTextPreValueEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/RichTextPreValueEditor.cs
@@ -1,73 +1,74 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Umbraco.Core.PropertyEditors;
-
-namespace Umbraco.Web.PropertyEditors
-{
-    //need to figure out how to use this...
-    internal class RichTextPreValueEditor : PreValueEditor
-    {
-        public RichTextPreValueEditor()
-        {
-            //SD: You can add pre-val fields here like you are doing, or you can add fields using attributes (http://issues.umbraco.org/issue/U4-2692),
-            // see below for examples.
-
-            //use a custom editor too
-            Fields.Add(new PreValueField()
-            {
-                View = "views/propertyeditors/rte/rte.prevalues.html",
-                HideLabel = true,
-                Key = "editor"
-            });
-
-            Fields.Add(new PreValueField()
-            {
-                Key = "ignoreUserStartNodes",
-                View = "boolean",
-                Name = "Ignore user start nodes",
-                Description = "Selecting this option allows a user to choose nodes that they normally don't have access to."
-            });
-
-            Fields.Add(new PreValueField()
-            {
-                Name = "Hide Label",
-                View = "boolean",
-                Key = "hideLabel"
-            });
-        }
-
-        //SD: You can declare a field like this if you want to instead of in the ctor, there's some options here:
-        //#1 - the property name becomes the Key:
-        //
-        // [PreValueField("", "views/propertyeditors/rte/rte.prevalues.html", HideLabel = true)]
-        // public string Editor { get; set; }
-
-        //#2 - You can specify a custom Key:
-        //
-        // [PreValueField("editor", "", "views/propertyeditors/rte/rte.prevalues.html", HideLabel = true)]
-        // public string Editor { get; set; }
-
-        //#3 - If you require custom server side validation for your field then you have to specify a custom PreValueField type to use,
-        //     this is why in this case I find it easier to use the ctor logic but thats just an opinion
-        //     - Any value specified for this property attribute will override the values set in on the class instance of the field, this
-        //       allows you to re-use class instances of fields if you want.
-        //
-        // [PreValueField(typeof(EditorPreValueField))]
-        // public string Editor { get; set; }
-           
-        // [PreValueField("", "views/propertyeditors/rte/rte.prevalues.html", HideLabel = true)]
-        // public class EditorPreValueField : PreValueField
-        // {
-        //     public EditorPreValueField()
-        //     {
-        //         //add any required server validators for this field
-        //         Validators.Add(new RegexValidator("^\\d*$"));
-        //         //You could also set the field properties directly here if you wanted instead of the attribute
-        //     }
-        // }
-
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace Umbraco.Web.PropertyEditors
+{
+    //need to figure out how to use this...
+    internal class RichTextPreValueEditor : PreValueEditor
+    {
+        public RichTextPreValueEditor()
+        {
+            //SD: You can add pre-val fields here like you are doing, or you can add fields using attributes (http://issues.umbraco.org/issue/U4-2692),
+            // see below for examples.
+
+            //use a custom editor too
+            Fields.Add(new PreValueField()
+            {
+                View = "views/propertyeditors/rte/rte.prevalues.html",
+                HideLabel = true,
+                Key = "editor"
+            });
+
+            Fields.Add(new PreValueField()
+            {
+                Key = Constants.DataTypes.ReservedPreValueKeys.IgnoreUserStartNodes,
+                View = "boolean",
+                Name = "Ignore user start nodes",
+                Description = "Selecting this option allows a user to choose nodes that they normally don't have access to."
+            });
+
+            Fields.Add(new PreValueField()
+            {
+                Name = "Hide Label",
+                View = "boolean",
+                Key = "hideLabel"
+            });
+        }
+
+        //SD: You can declare a field like this if you want to instead of in the ctor, there's some options here:
+        //#1 - the property name becomes the Key:
+        //
+        // [PreValueField("", "views/propertyeditors/rte/rte.prevalues.html", HideLabel = true)]
+        // public string Editor { get; set; }
+
+        //#2 - You can specify a custom Key:
+        //
+        // [PreValueField("editor", "", "views/propertyeditors/rte/rte.prevalues.html", HideLabel = true)]
+        // public string Editor { get; set; }
+
+        //#3 - If you require custom server side validation for your field then you have to specify a custom PreValueField type to use,
+        //     this is why in this case I find it easier to use the ctor logic but thats just an opinion
+        //     - Any value specified for this property attribute will override the values set in on the class instance of the field, this
+        //       allows you to re-use class instances of fields if you want.
+        //
+        // [PreValueField(typeof(EditorPreValueField))]
+        // public string Editor { get; set; }
+
+        // [PreValueField("", "views/propertyeditors/rte/rte.prevalues.html", HideLabel = true)]
+        // public class EditorPreValueField : PreValueField
+        // {
+        //     public EditorPreValueField()
+        //     {
+        //         //add any required server validators for this field
+        //         Validators.Add(new RegexValidator("^\\d*$"));
+        //         //You could also set the field properties directly here if you wanted instead of the attribute
+        //     }
+        // }
+
+    }
+}

From 8d12170def955ee00f53dcc7d19d441ad532a395 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Fri, 21 Jun 2019 14:58:58 +0200
Subject: [PATCH 016/776] Correct NuGet transform for the web.config file in
 the Views folder

---
 build/NuSpecs/tools/Views.Web.config.install.xdt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/build/NuSpecs/tools/Views.Web.config.install.xdt b/build/NuSpecs/tools/Views.Web.config.install.xdt
index 4d660301a8..828bb8612f 100644
--- a/build/NuSpecs/tools/Views.Web.config.install.xdt
+++ b/build/NuSpecs/tools/Views.Web.config.install.xdt
@@ -8,7 +8,7 @@
     </configSections>
 
     <system.web.webPages.razor>
-        <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(factoryType)" xdt:Transform="SetAttributes(factoryType)" />
+        <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(factoryType)" xdt:Transform="SetAttributes(factoryType)" />
         <pages pageBaseType="System.Web.Mvc.WebViewPage">
             <namespaces>
                 <add namespace="Umbraco.Web.PublishedContentModels" xdt:Transform="InsertIfMissing" />
@@ -18,13 +18,13 @@
 
     <system.web>
         <pages
-          pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
-          pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
-          userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
+          pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
+          pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
+          userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
         xdt:Locator="Match(pageParserFilterType,pageBaseType,userControlBaseType)"
         xdt:Transform="SetAttributes(pageParserFilterType,pageBaseType,userControlBaseType)">
             <controls>
-                <add assembly="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" xdt:Locator="Match(namespace)" xdt:Transform="SetAttributes(assembly)" />
+                <add assembly="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" xdt:Locator="Match(namespace)" xdt:Transform="SetAttributes(assembly)" />
             </controls>
         </pages>
     </system.web>

From cb16eb1826b3cc3282beeb4c945106f990e8bd59 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sat, 22 Jun 2019 10:43:40 +0200
Subject: [PATCH 017/776] Don't expand the last item when pasting multiple
 items

---
 .../nestedcontent/nestedcontent.controller.js     | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
index 5c97a935a1..440f391a44 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -165,10 +165,10 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
                     if (item.alias === "nc_pasteAllItems") {
                         _.each(item.data, function (node) {
                             delete node.$$hashKey;
-                            $scope.pasteFromClipboard(node);
+                            $scope.pasteFromClipboard(node, false);
                         });
                     } else {
-                        $scope.pasteFromClipboard(item.data);
+                        $scope.pasteFromClipboard(item.data, true);
                     }
 
                     $scope.overlayMenu.show = false;
@@ -404,7 +404,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
             });
         }
 
-        $scope.pasteFromClipboard = function(newNode) {
+        $scope.pasteFromClipboard = function(newNode, setCurrentNode) {
             
             if (newNode === undefined) {
                 return;
@@ -415,9 +415,14 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
             
             $scope.nodes.push(newNode);
             $scope.setDirty();
-            //updateModel();// done by setting current node...
+
+            if (setCurrentNode) {
+                $scope.currentNode = newNode;
+            }
+            else {
+                updateModel();
+            }
             
-            $scope.currentNode = newNode;
         }
         
         function checkAbilityToPasteContent() {

From d38c12115e5a4b5d59db0d3b9f8cccffee1e1546 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sat, 22 Jun 2019 13:23:50 +0200
Subject: [PATCH 018/776] Remove some debugging stuff

---
 .../propertyeditors/nestedcontent/nestedcontent.controller.js    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
index 440f391a44..567f78bc39 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -605,7 +605,6 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
         }));
 
         $scope.$on("$destroy", function () {
-            console.log("Unsubscribing", unsubscribe.length)
             for (var u in unsubscribe) {
                 unsubscribe[u]();
             }

From 601d48277e3042ef0655ede6370b750414930313 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Sun, 23 Jun 2019 19:53:57 +0100
Subject: [PATCH 019/776] Update NuSpecs with the XML MetaData for SourceLink

---
 build/NuSpecs/UmbracoCms.Core.nuspec | 1 +
 build/NuSpecs/UmbracoCms.Web.nuspec  | 1 +
 build/NuSpecs/UmbracoCms.nuspec      | 1 +
 3 files changed, 3 insertions(+)

diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec
index 56462fcc40..d93cd4e241 100644
--- a/build/NuSpecs/UmbracoCms.Core.nuspec
+++ b/build/NuSpecs/UmbracoCms.Core.nuspec
@@ -14,6 +14,7 @@
         <summary>Contains the core assemblies needed to run Umbraco Cms</summary>
         <language>en-US</language>
         <tags>umbraco</tags>
+        <repository type="git" url="https://github.com/umbraco/umbraco-cms" />
         <dependencies>
 
             <group targetFramework="net472">
diff --git a/build/NuSpecs/UmbracoCms.Web.nuspec b/build/NuSpecs/UmbracoCms.Web.nuspec
index 614a816f3f..4937c85466 100644
--- a/build/NuSpecs/UmbracoCms.Web.nuspec
+++ b/build/NuSpecs/UmbracoCms.Web.nuspec
@@ -14,6 +14,7 @@
         <summary>Contains the core assemblies needed to run Umbraco Cms</summary>
         <language>en-US</language>
         <tags>umbraco</tags>
+        <repository type="git" url="https://github.com/umbraco/umbraco-cms" />
         <dependencies>
 
             <group targetFramework="net472">
diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec
index 5cdacca419..99a4a9e98c 100644
--- a/build/NuSpecs/UmbracoCms.nuspec
+++ b/build/NuSpecs/UmbracoCms.nuspec
@@ -14,6 +14,7 @@
         <summary>Installs Umbraco Cms in your Visual Studio ASP.NET project</summary>
         <language>en-US</language>
         <tags>umbraco</tags>
+        <repository type="git" url="https://github.com/umbraco/umbraco-cms" />
         <dependencies>
 
             <group targetFramework="net472">

From 003ee1a9916c4cd0c69389c099bc1447daf9ea66 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Sun, 23 Jun 2019 19:57:43 +0100
Subject: [PATCH 020/776] Added in Microsoft.SourceLink.GitHub Nuget package

---
 src/Umbraco.Core/Umbraco.Core.csproj       | 5 +++++
 src/Umbraco.Examine/Umbraco.Examine.csproj | 5 +++++
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj   | 5 +++++
 src/Umbraco.Web/Umbraco.Web.csproj         | 5 +++++
 4 files changed, 20 insertions(+)

diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 7c0e41348b..a874024c85 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -55,6 +55,11 @@
   </ItemGroup>
   <ItemGroup>
     <!-- note: NuGet deals with transitive references now -->
+    <PackageReference Include="Microsoft.SourceLink.GitHub">
+      <Version>1.0.0-beta2-19270-01</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
     <PackageReference Include="Serilog.Sinks.Async">
       <Version>1.3.0</Version>
     </PackageReference>
diff --git a/src/Umbraco.Examine/Umbraco.Examine.csproj b/src/Umbraco.Examine/Umbraco.Examine.csproj
index 05b209f927..14a57c3216 100644
--- a/src/Umbraco.Examine/Umbraco.Examine.csproj
+++ b/src/Umbraco.Examine/Umbraco.Examine.csproj
@@ -49,6 +49,11 @@
   <ItemGroup>
     <!-- note: NuGet deals with transitive references now -->
     <PackageReference Include="Examine" Version="1.0.0" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub">
+      <Version>1.0.0-beta2-19270-01</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="NPoco" Version="3.9.4" />
   </ItemGroup>
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 7ae996a6c5..d9aba825d8 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -101,6 +101,11 @@
     <PackageReference Include="Microsoft.Owin.Host.SystemWeb" Version="4.0.1" />
     <PackageReference Include="Microsoft.Owin.Security.Cookies" Version="4.0.1" />
     <PackageReference Include="Microsoft.Owin.Security.OAuth" Version="4.0.1" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub">
+      <Version>1.0.0-beta2-19270-01</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
     <PackageReference Include="MiniProfiler" Version="4.0.138" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="Umbraco.ModelsBuilder.Ui">
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 7ebcf55155..af4b37f2b1 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -80,6 +80,11 @@
     <PackageReference Include="Microsoft.Owin.Host.SystemWeb" Version="4.0.1" />
     <PackageReference Include="Microsoft.Owin.Security.Cookies" Version="4.0.1" />
     <PackageReference Include="Microsoft.Owin.Security.OAuth" Version="4.0.1" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub">
+      <Version>1.0.0-beta2-19270-01</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
     <PackageReference Include="MiniProfiler" Version="4.0.138" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="NPoco" Version="3.9.4" />

From eab597a2a8bc09916c912eeceba1d46cbd359b99 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 24 Jun 2019 08:58:25 +0200
Subject: [PATCH 021/776] 
 https://umbraco.visualstudio.com/D-Team%20Tracker/_workitems/edit/1479 - fix
 for js linter

---
 .../src/common/resources/entity.resource.js                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
index 3991932d2d..31ff7424ac 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
@@ -307,7 +307,7 @@ function entityResource($q, $http, umbRequestHelper) {
 
             var args = [
                 { id: id },
-                { type: type },
+                { type: type }
             ];
             if(options.dataTypeId){
                 args.push({dataTypeId: options.dataTypeId});

From d4311fe4ab50b3a5bd7716765739f5deb7826d74 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 24 Jun 2019 10:52:35 +0200
Subject: [PATCH 022/776] 
 https://umbraco.visualstudio.com/D-Team%20Tracker/_workitems/edit/1479 -
 Replaced client side method to get Auchors with a server side version, and
 eliminated the use of contentResource in linkPikers

---
 src/Umbraco.Core/Services/ContentService.cs   | 5843 +++++++++--------
 src/Umbraco.Core/Services/IContentService.cs  | 1437 ++--
 .../src/common/resources/entity.resource.js   |   35 +
 .../src/common/services/tinymce.service.js    | 1729 +++--
 .../common/dialogs/linkpicker.controller.js   |   18 +-
 .../linkpicker/linkpicker.controller.js       |   16 +-
 .../grid/editors/rte.controller.js            |   29 +-
 .../propertyeditors/rte/rte.controller.js     |   34 +-
 src/Umbraco.Web/Editors/EntityController.cs   |   20 +
 .../Models/ContentEditing/UrlAndAnchors.cs    |   21 +
 src/Umbraco.Web/Umbraco.Web.csproj            | 4053 ++++++------
 11 files changed, 6665 insertions(+), 6570 deletions(-)
 create mode 100644 src/Umbraco.Web/Models/ContentEditing/UrlAndAnchors.cs

diff --git a/src/Umbraco.Core/Services/ContentService.cs b/src/Umbraco.Core/Services/ContentService.cs
index a1e7c9955e..cf49e892dd 100644
--- a/src/Umbraco.Core/Services/ContentService.cs
+++ b/src/Umbraco.Core/Services/ContentService.cs
@@ -1,2904 +1,2939 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Xml;
-using System.Xml.Linq;
-using Umbraco.Core.Events;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.Membership;
-using Umbraco.Core.Models.Rdbms;
-using Umbraco.Core.Persistence;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
-using Umbraco.Core.Persistence.Querying;
-using Umbraco.Core.Persistence.Repositories;
-using Umbraco.Core.Persistence.UnitOfWork;
-using Umbraco.Core.Publishing;
-
-namespace Umbraco.Core.Services
-{
-    /// <summary>
-    /// Represents the Content Service, which is an easy access to operations involving <see cref="IContent"/>
-    /// </summary>
-    public class ContentService : ScopeRepositoryService, IContentService, IContentServiceOperations
-    {
-        private readonly IPublishingStrategy2 _publishingStrategy;
-        private readonly EntityXmlSerializer _entitySerializer = new EntityXmlSerializer();
-        private readonly IDataTypeService _dataTypeService;
-        private readonly IUserService _userService;
-
-        //Support recursive locks because some of the methods that require locking call other methods that require locking.
-        //for example, the Move method needs to be locked but this calls the Save method which also needs to be locked.
-        private static readonly ReaderWriterLockSlim Locker = new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion);
-
-        public ContentService(
-            IDatabaseUnitOfWorkProvider provider,
-            RepositoryFactory repositoryFactory,
-            ILogger logger,
-            IEventMessagesFactory eventMessagesFactory,
-            IDataTypeService dataTypeService,
-            IUserService userService)
-            : base(provider, repositoryFactory, logger, eventMessagesFactory)
-        {
-            if (dataTypeService == null) throw new ArgumentNullException("dataTypeService");
-            if (userService == null) throw new ArgumentNullException("userService");
-            _publishingStrategy = new PublishingStrategy(UowProvider.ScopeProvider, eventMessagesFactory, logger);
-            _dataTypeService = dataTypeService;
-            _userService = userService;
-        }
-
-        #region Static Queries
-
-        private IQuery<IContent> _notTrashedQuery;
-
-        #endregion
-
-        public int CountPublished(string contentTypeAlias = null)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                return repository.CountPublished(contentTypeAlias);
-            }
-        }
-
-        public int Count(string contentTypeAlias = null)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                return repository.Count(contentTypeAlias);
-            }
-        }
-
-        public int CountChildren(int parentId, string contentTypeAlias = null)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                return repository.CountChildren(parentId, contentTypeAlias);
-            }
-        }
-
-        public int CountDescendants(int parentId, string contentTypeAlias = null)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                return repository.CountDescendants(parentId, contentTypeAlias);
-            }
-        }
-
-        /// <summary>
-        /// Used to bulk update the permissions set for a content item. This will replace all permissions
-        /// assigned to an entity with a list of user id & permission pairs.
-        /// </summary>
-        /// <param name="permissionSet"></param>
-        public void ReplaceContentPermissions(EntityPermissionSet permissionSet)
-        {
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                repository.ReplaceContentPermissions(permissionSet);
-                uow.Commit();
-            }
-        }
-
-        /// <summary>
-        /// Assigns a single permission to the current content item for the specified group ids
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <param name="permission"></param>
-        /// <param name="groupIds"></param>
-        public void AssignContentPermission(IContent entity, char permission, IEnumerable<int> groupIds)
-        {
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                repository.AssignEntityPermission(entity, permission, groupIds);
-                uow.Commit();
-            }
-        }
-
-        /// <summary>
-        /// Returns implicit/inherited permissions assigned to the content item for all user groups
-        /// </summary>
-        /// <param name="content"></param>
-        /// <returns></returns>
-        public EntityPermissionCollection GetPermissionsForEntity(IContent content)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                return repository.GetPermissionsForEntity(content.Id);
-            }
-        }
-
-        /// <summary>
-        /// Creates an <see cref="IContent"/> object using the alias of the <see cref="IContentType"/>
-        /// that this Content should based on.
-        /// </summary>
-        /// <remarks>
-        /// Note that using this method will simply return a new IContent without any identity
-        /// as it has not yet been persisted. It is intended as a shortcut to creating new content objects
-        /// that does not invoke a save operation against the database.
-        /// </remarks>
-        /// <param name="name">Name of the Content object</param>
-        /// <param name="parentId">Id of Parent for the new Content</param>
-        /// <param name="contentTypeAlias">Alias of the <see cref="IContentType"/></param>
-        /// <param name="userId">Optional id of the user creating the content</param>
-        /// <returns><see cref="IContent"/></returns>
-        public IContent CreateContent(string name, Guid parentId, string contentTypeAlias, int userId = 0)
-        {
-            var parent = GetById(parentId);
-            return CreateContent(name, parent, contentTypeAlias, userId);
-        }
-
-        /// <summary>
-        /// Creates an <see cref="IContent"/> object using the alias of the <see cref="IContentType"/>
-        /// that this Content should based on.
-        /// </summary>
-        /// <remarks>
-        /// Note that using this method will simply return a new IContent without any identity
-        /// as it has not yet been persisted. It is intended as a shortcut to creating new content objects
-        /// that does not invoke a save operation against the database.
-        /// </remarks>
-        /// <param name="name">Name of the Content object</param>
-        /// <param name="parentId">Id of Parent for the new Content</param>
-        /// <param name="contentTypeAlias">Alias of the <see cref="IContentType"/></param>
-        /// <param name="userId">Optional id of the user creating the content</param>
-        /// <returns><see cref="IContent"/></returns>
-        public IContent CreateContent(string name, int parentId, string contentTypeAlias, int userId = 0)
-        {
-            var contentType = FindContentTypeByAlias(contentTypeAlias);
-            var content = new Content(name, parentId, contentType);
-            var parent = GetById(content.ParentId);
-            content.Path = string.Concat(parent.IfNotNull(x => x.Path, content.ParentId.ToString()), ",", content.Id);
-
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var newEventArgs = new NewEventArgs<IContent>(content, contentTypeAlias, parentId);
-                if (uow.Events.DispatchCancelable(Creating, this, newEventArgs))
-                {
-                    uow.Commit();
-                    content.WasCancelled = true;
-                    return content;
-                }
-
-                content.CreatorId = userId;
-                content.WriterId = userId;
-                newEventArgs.CanCancel = false;
-                uow.Events.Dispatch(Created, this, newEventArgs);
-
-                uow.Commit();
-            }
-
-            return content;
-        }
-
-        /// <summary>
-        /// Creates an <see cref="IContent"/> object using the alias of the <see cref="IContentType"/>
-        /// that this Content should based on.
-        /// </summary>
-        /// <remarks>
-        /// Note that using this method will simply return a new IContent without any identity
-        /// as it has not yet been persisted. It is intended as a shortcut to creating new content objects
-        /// that does not invoke a save operation against the database.
-        /// </remarks>
-        /// <param name="name">Name of the Content object</param>
-        /// <param name="parent">Parent <see cref="IContent"/> object for the new Content</param>
-        /// <param name="contentTypeAlias">Alias of the <see cref="IContentType"/></param>
-        /// <param name="userId">Optional id of the user creating the content</param>
-        /// <returns><see cref="IContent"/></returns>
-        public IContent CreateContent(string name, IContent parent, string contentTypeAlias, int userId = 0)
-        {
-            if (parent == null) throw new ArgumentNullException("parent");
-
-            var contentType = FindContentTypeByAlias(contentTypeAlias);
-            var content = new Content(name, parent, contentType);
-            content.Path = string.Concat(parent.Path, ",", content.Id);
-
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var newEventArgs = new NewEventArgs<IContent>(content, contentTypeAlias, parent);
-                if (uow.Events.DispatchCancelable(Creating, this, newEventArgs))
-                {
-                    uow.Commit();
-                    content.WasCancelled = true;
-                    return content;
-                }
-
-                content.CreatorId = userId;
-                content.WriterId = userId;
-                newEventArgs.CanCancel = false;
-                uow.Events.Dispatch(Created, this, newEventArgs);
-
-                uow.Commit();
-            }
-
-            return content;
-        }
-
-        /// <summary>
-        /// Creates and saves an <see cref="IContent"/> object using the alias of the <see cref="IContentType"/>
-        /// that this Content should based on.
-        /// </summary>
-        /// <remarks>
-        /// This method returns an <see cref="IContent"/> object that has been persisted to the database
-        /// and therefor has an identity.
-        /// </remarks>
-        /// <param name="name">Name of the Content object</param>
-        /// <param name="parentId">Id of Parent for the new Content</param>
-        /// <param name="contentTypeAlias">Alias of the <see cref="IContentType"/></param>
-        /// <param name="userId">Optional id of the user creating the content</param>
-        /// <returns><see cref="IContent"/></returns>
-        public IContent CreateContentWithIdentity(string name, int parentId, string contentTypeAlias, int userId = 0)
-        {
-            var contentType = FindContentTypeByAlias(contentTypeAlias);
-            var content = new Content(name, parentId, contentType);
-
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                //NOTE: I really hate the notion of these Creating/Created events - they are so inconsistent, I've only just found
-                // out that in these 'WithIdentity' methods, the Saving/Saved events were not fired, wtf. Anyways, they're added now.
-                var newEventArgs = new NewEventArgs<IContent>(content, contentTypeAlias, parentId);
-                if (uow.Events.DispatchCancelable(Creating, this, newEventArgs))
-                {
-                    uow.Commit();
-                    content.WasCancelled = true;
-                    return content;
-                }
-
-                var saveEventArgs = new SaveEventArgs<IContent>(content);
-                if (uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
-                {
-                    uow.Commit();
-                    content.WasCancelled = true;
-                    return content;
-                }
-
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                content.CreatorId = userId;
-                content.WriterId = userId;
-
-                repository.AddOrUpdate(content);
-                repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-                saveEventArgs.CanCancel = false;
-                uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
-                newEventArgs.CanCancel = false;
-                uow.Events.Dispatch(Created, this, newEventArgs);
-
-                Audit(uow, AuditType.New, string.Format("Content '{0}' was created with Id {1}", name, content.Id), content.CreatorId, content.Id);
-                uow.Commit();
-            }
-
-            return content;
-        }
-
-        /// <summary>
-        /// Creates and saves an <see cref="IContent"/> object using the alias of the <see cref="IContentType"/>
-        /// that this Content should based on.
-        /// </summary>
-        /// <remarks>
-        /// This method returns an <see cref="IContent"/> object that has been persisted to the database
-        /// and therefor has an identity.
-        /// </remarks>
-        /// <param name="name">Name of the Content object</param>
-        /// <param name="parent">Parent <see cref="IContent"/> object for the new Content</param>
-        /// <param name="contentTypeAlias">Alias of the <see cref="IContentType"/></param>
-        /// <param name="userId">Optional id of the user creating the content</param>
-        /// <returns><see cref="IContent"/></returns>
-        public IContent CreateContentWithIdentity(string name, IContent parent, string contentTypeAlias, int userId = 0)
-        {
-            if (parent == null) throw new ArgumentNullException("parent");
-
-            var contentType = FindContentTypeByAlias(contentTypeAlias);
-            var content = new Content(name, parent, contentType);
-
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                //NOTE: I really hate the notion of these Creating/Created events - they are so inconsistent, I've only just found
-                // out that in these 'WithIdentity' methods, the Saving/Saved events were not fired, wtf. Anyways, they're added now.
-                var newEventArgs = new NewEventArgs<IContent>(content, contentTypeAlias, parent);
-                if (uow.Events.DispatchCancelable(Creating, this, newEventArgs))
-                {
-                    uow.Commit();
-                    content.WasCancelled = true;
-                    return content;
-                }
-
-                var saveEventArgs = new SaveEventArgs<IContent>(content);
-                if (uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
-                {
-                    uow.Commit();
-                    content.WasCancelled = true;
-                    return content;
-                }
-
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                content.CreatorId = userId;
-                content.WriterId = userId;
-
-                repository.AddOrUpdate(content);
-                repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-                saveEventArgs.CanCancel = false;
-                uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
-                newEventArgs.CanCancel = false;
-                uow.Events.Dispatch(Created, this, newEventArgs);
-
-                Audit(uow, AuditType.New, string.Format("Content '{0}' was created with Id {1}", name, content.Id), content.CreatorId, content.Id);
-                uow.Commit();
-            }
-
-            return content;
-        }
-
-        /// <summary>
-        /// Gets an <see cref="IContent"/> object by Id
-        /// </summary>
-        /// <param name="id">Id of the Content to retrieve</param>
-        /// <returns><see cref="IContent"/></returns>
-        public IContent GetById(int id)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                return repository.Get(id);
-            }
-        }
-
-        /// <summary>
-        /// Gets <see cref="IContent"/> objects by Ids
-        /// </summary>
-        /// <param name="ids">Ids of the Content to retrieve</param>
-        /// <returns><see cref="IContent"/></returns>
-        public IEnumerable<IContent> GetByIds(IEnumerable<int> ids)
-        {
-            var idsArray = ids.ToArray();
-            if (idsArray.Length == 0) return Enumerable.Empty<IContent>();
-
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                // ensure that the result has the order based on the ids passed in
-                var result = repository.GetAll(idsArray);
-                var content = result.ToDictionary(x => x.Id, x => x);
-
-                var sortedResult = idsArray.Select(x =>
-                {
-                    IContent c;
-                    return content.TryGetValue(x, out c) ? c : null;
-                }).WhereNotNull();
-
-                return sortedResult;
-            }
-        }
-
-        /// <summary>
-        /// Gets <see cref="IContent"/> objects by Ids
-        /// </summary>
-        /// <param name="ids">Ids of the Content to retrieve</param>
-        /// <returns><see cref="IContent"/></returns>
-        public IEnumerable<IContent> GetByIds(IEnumerable<Guid> ids)
-        {
-            var idsArray = ids.ToArray();
-            if (idsArray.Length == 0) return Enumerable.Empty<IContent>();
-
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                // ensure that the result has the order based on the ids passed in
-                var result = repository.GetAll(idsArray);
-                var content = result.ToDictionary(x => x.Key, x => x);
-
-                var sortedResult = idsArray.Select(x =>
-                {
-                    IContent c;
-                    return content.TryGetValue(x, out c) ? c : null;
-                }).WhereNotNull();
-
-                return sortedResult;
-            }
-        }
-
-        /// <summary>
-        /// Gets an <see cref="IContent"/> object by its 'UniqueId'
-        /// </summary>
-        /// <param name="key">Guid key of the Content to retrieve</param>
-        /// <returns><see cref="IContent"/></returns>
-        public IContent GetById(Guid key)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                return repository.Get(key);
-            }
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects by the Id of the <see cref="IContentType"/>
-        /// </summary>
-        /// <param name="id">Id of the <see cref="IContentType"/></param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetContentOfContentType(int id)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                var query = Query<IContent>.Builder.Where(x => x.ContentTypeId == id);
-                return repository.GetByQuery(query);
-            }
-        }
-
-        internal IEnumerable<IContent> GetPublishedContentOfContentType(int id)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                var query = Query<IContent>.Builder.Where(x => x.ContentTypeId == id);
-                return repository.GetByPublishedVersion(query);
-            }
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects by Level
-        /// </summary>
-        /// <param name="level">The level to retrieve Content from</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetByLevel(int level)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                var query = Query<IContent>.Builder.Where(x => x.Level == level && x.Path.StartsWith(Constants.System.RecycleBinContent.ToInvariantString()) == false);
-                return repository.GetByQuery(query);
-            }
-        }
-
-        /// <summary>
-        /// Gets a specific version of an <see cref="IContent"/> item.
-        /// </summary>
-        /// <param name="versionId">Id of the version to retrieve</param>
-        /// <returns>An <see cref="IContent"/> item</returns>
-        public IContent GetByVersion(Guid versionId)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                return repository.GetByVersion(versionId);
-            }
-        }
-
-
-        /// <summary>
-        /// Gets a collection of an <see cref="IContent"/> objects versions by Id
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetVersions(int id)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                return repository.GetAllVersions(id);
-            }
-        }
-
-        /// <summary>
-        /// Gets a list of all version Ids for the given content item ordered so latest is first
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="maxRows">The maximum number of rows to return</param>
-        /// <returns></returns>
-        public IEnumerable<Guid> GetVersionIds(int id, int maxRows)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                return repository.GetVersionIds(id, maxRows);
-            }
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects, which are ancestors of the current content.
-        /// </summary>
-        /// <param name="id">Id of the <see cref="IContent"/> to retrieve ancestors for</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetAncestors(int id)
-        {
-            var content = GetById(id);
-            return GetAncestors(content);
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects, which are ancestors of the current content.
-        /// </summary>
-        /// <param name="content"><see cref="IContent"/> to retrieve ancestors for</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetAncestors(IContent content)
-        {
-            //null check otherwise we get exceptions
-            if (content.Path.IsNullOrWhiteSpace()) return Enumerable.Empty<IContent>();
-
-            var ids = content.Path.Split(',').Where(x => x != Constants.System.Root.ToInvariantString() && x != content.Id.ToString(CultureInfo.InvariantCulture)).Select(int.Parse).ToArray();
-            if (ids.Any() == false)
-                return new List<IContent>();
-
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                return repository.GetAll(ids);
-            }
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
-        /// </summary>
-        /// <param name="id">Id of the Parent to retrieve Children from</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetChildren(int id)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                var query = Query<IContent>.Builder.Where(x => x.ParentId == id);
-                return repository.GetByQuery(query).OrderBy(x => x.SortOrder);
-            }
-        }
-
-        [Obsolete("Use the overload with 'long' parameter types instead")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public IEnumerable<IContent> GetPagedChildren(int id, int pageIndex, int pageSize, out int totalChildren,
-            string orderBy, Direction orderDirection, string filter = "")
-        {
-            long total;
-            var result = GetPagedChildren(id, Convert.ToInt64(pageIndex), pageSize, out total, orderBy, orderDirection, true, filter);
-            totalChildren = Convert.ToInt32(total);
-            return result;
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
-        /// </summary>
-        /// <param name="id">Id of the Parent to retrieve Children from</param>
-        /// <param name="pageIndex">Page index (zero based)</param>
-        /// <param name="pageSize">Page size</param>
-        /// <param name="totalChildren">Total records query would return without paging</param>
-        /// <param name="orderBy">Field to order by</param>
-        /// <param name="orderDirection">Direction to order by</param>
-        /// <param name="filter">Search text filter</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetPagedChildren(int id, long pageIndex, int pageSize, out long totalChildren,
-            string orderBy, Direction orderDirection, string filter = "")
-        {
-            return GetPagedChildren(id, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, true, filter);
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
-        /// </summary>
-        /// <param name="id">Id of the Parent to retrieve Children from</param>
-        /// <param name="pageIndex">Page index (zero based)</param>
-        /// <param name="pageSize">Page size</param>
-        /// <param name="totalChildren">Total records query would return without paging</param>
-        /// <param name="orderBy">Field to order by</param>
-        /// <param name="orderDirection">Direction to order by</param>
-        /// <param name="orderBySystemField">Flag to indicate when ordering by system field</param>
-        /// <param name="filter">Search text filter</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetPagedChildren(int id, long pageIndex, int pageSize, out long totalChildren,
-            string orderBy, Direction orderDirection, bool orderBySystemField, string filter)
-        {
-            Mandate.ParameterCondition(pageIndex >= 0, "pageIndex");
-            Mandate.ParameterCondition(pageSize > 0, "pageSize");
-
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                var query = Query<IContent>.Builder;
-                // always check for a parent - else it will also get decendants (and then you should use the GetPagedDescendants method)
-                query.Where(x => x.ParentId == id);
-
-                IQuery<IContent> filterQuery = null;
-                if (filter.IsNullOrWhiteSpace() == false)
-                {
-                    filterQuery = Query<IContent>.Builder.Where(x => x.Name.Contains(filter));
-                }
-                return repository.GetPagedResultsByQuery(query, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, orderBySystemField, filterQuery);
-            }
-        }
-
-        [Obsolete("Use the overload with 'long' parameter types instead")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public IEnumerable<IContent> GetPagedDescendants(int id, int pageIndex, int pageSize, out int totalChildren, string orderBy = "path", Direction orderDirection = Direction.Ascending, string filter = "")
-        {
-            long total;
-            var result = GetPagedDescendants(id, Convert.ToInt64(pageIndex), pageSize, out total, orderBy, orderDirection, true, filter);
-            totalChildren = Convert.ToInt32(total);
-            return result;
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
-        /// </summary>
-        /// <param name="id">Id of the Parent to retrieve Descendants from</param>
-        /// <param name="pageIndex">Page number</param>
-        /// <param name="pageSize">Page size</param>
-        /// <param name="totalChildren">Total records query would return without paging</param>
-        /// <param name="orderBy">Field to order by</param>
-        /// <param name="orderDirection">Direction to order by</param>
-        /// <param name="filter">Search text filter</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetPagedDescendants(int id, long pageIndex, int pageSize, out long totalChildren, string orderBy = "path", Direction orderDirection = Direction.Ascending, string filter = "")
-        {
-            return GetPagedDescendants(id, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, true, filter);
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
-        /// </summary>
-        /// <param name="id">Id of the Parent to retrieve Descendants from</param>
-        /// <param name="pageIndex">Page number</param>
-        /// <param name="pageSize">Page size</param>
-        /// <param name="totalChildren">Total records query would return without paging</param>
-        /// <param name="orderBy">Field to order by</param>
-        /// <param name="orderDirection">Direction to order by</param>
-        /// <param name="orderBySystemField">Flag to indicate when ordering by system field</param>
-        /// <param name="filter">Search text filter</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetPagedDescendants(int id, long pageIndex, int pageSize, out long totalChildren, string orderBy, Direction orderDirection, bool orderBySystemField, string filter)
-        {
-            Mandate.ParameterCondition(pageIndex >= 0, "pageIndex");
-            Mandate.ParameterCondition(pageSize > 0, "pageSize");
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                // get query - if the id is System Root, then just get all
-                var query = Query<IContent>.Builder;
-                if (id != Constants.System.Root)
-                {
-                    var entityRepository = RepositoryFactory.CreateEntityRepository(uow);
-                    var contentPath = entityRepository.GetAllPaths(Constants.ObjectTypes.DocumentGuid, id).ToArray();
-                    if (contentPath.Length == 0)
-                    {
-                        totalChildren = 0;
-                        return Enumerable.Empty<IContent>();
-                    }
-                    query.Where(x => x.Path.SqlStartsWith(string.Format("{0},", contentPath[0].Path), TextColumnType.NVarchar));
-                }
-                    
-
-                // get filter
-                IQuery<IContent> filterQuery = null;
-                if (filter.IsNullOrWhiteSpace() == false)
-                    filterQuery = Query<IContent>.Builder.Where(x => x.Name.Contains(filter));
-
-                return repository.GetPagedResultsByQuery(query, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, orderBySystemField, filterQuery);
-            }
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
-        /// </summary>
-        /// <param name="id">Id of the Parent to retrieve Descendants from</param>
-        /// <param name="pageIndex">Page number</param>
-        /// <param name="pageSize">Page size</param>
-        /// <param name="totalChildren">Total records query would return without paging</param>
-        /// <param name="orderBy">Field to order by</param>
-        /// <param name="orderDirection">Direction to order by</param>
-        /// <param name="orderBySystemField">Flag to indicate when ordering by system field</param>
-        /// <param name="filter">Search filter</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetPagedDescendants(int id, long pageIndex, int pageSize, out long totalChildren, string orderBy, Direction orderDirection, bool orderBySystemField, IQuery<IContent> filter)
-        {
-            Mandate.ParameterCondition(pageIndex >= 0, "pageIndex");
-            Mandate.ParameterCondition(pageSize > 0, "pageSize");
-
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                // get query - if the id is System Root, then just get all
-                var query = Query<IContent>.Builder;
-                if (id != Constants.System.Root)
-                {
-                    var entityRepository = RepositoryFactory.CreateEntityRepository(uow);
-                    var contentPath = entityRepository.GetAllPaths(Constants.ObjectTypes.DocumentGuid, id).ToArray();
-                    if (contentPath.Length == 0)
-                    {
-                        totalChildren = 0;
-                        return Enumerable.Empty<IContent>();
-                    }
-                    query.Where(x => x.Path.SqlStartsWith(string.Format("{0},", contentPath[0].Path), TextColumnType.NVarchar));
-                }
-
-                return repository.GetPagedResultsByQuery(query, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, orderBySystemField, filter);
-            }
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects by its name or partial name
-        /// </summary>
-        /// <param name="parentId">Id of the Parent to retrieve Children from</param>
-        /// <param name="name">Full or partial name of the children</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetChildrenByName(int parentId, string name)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                var query = Query<IContent>.Builder.Where(x => x.ParentId == parentId && x.Name.Contains(name));
-                return repository.GetByQuery(query);
-            }
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
-        /// </summary>
-        /// <param name="id">Id of the Parent to retrieve Descendants from</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetDescendants(int id)
-        {
-            var content = GetById(id);
-            return content == null ? Enumerable.Empty<IContent>() : GetDescendants(content);
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
-        /// </summary>
-        /// <param name="content"><see cref="IContent"/> item to retrieve Descendants from</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetDescendants(IContent content)
-        {
-            //This is a check to ensure that the path is correct for this entity to avoid problems like: http://issues.umbraco.org/issue/U4-9336 due to data corruption
-            if (content.ValidatePath() == false)
-                throw new InvalidDataException(string.Format("The content item {0} has an invalid path: {1} with parentID: {2}", content.Id, content.Path, content.ParentId));
-
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                var pathMatch = content.Path + ",";
-                var query = Query<IContent>.Builder.Where(x => x.Path.StartsWith(pathMatch) && x.Id != content.Id);
-                return repository.GetByQuery(query);
-            }
-        }
-
-        /// <summary>
-        /// Gets the parent of the current content as an <see cref="IContent"/> item.
-        /// </summary>
-        /// <param name="id">Id of the <see cref="IContent"/> to retrieve the parent from</param>
-        /// <returns>Parent <see cref="IContent"/> object</returns>
-        public IContent GetParent(int id)
-        {
-            var content = GetById(id);
-            return GetParent(content);
-        }
-
-        /// <summary>
-        /// Gets the parent of the current content as an <see cref="IContent"/> item.
-        /// </summary>
-        /// <param name="content"><see cref="IContent"/> to retrieve the parent from</param>
-        /// <returns>Parent <see cref="IContent"/> object</returns>
-        public IContent GetParent(IContent content)
-        {
-            if (content.ParentId == Constants.System.Root || content.ParentId == Constants.System.RecycleBinContent)
-                return null;
-
-            return GetById(content.ParentId);
-        }
-
-        /// <summary>
-        /// Gets the published version of an <see cref="IContent"/> item
-        /// </summary>
-        /// <param name="id">Id of the <see cref="IContent"/> to retrieve version from</param>
-        /// <returns>An <see cref="IContent"/> item</returns>
-        public IContent GetPublishedVersion(int id)
-        {
-            var version = GetVersions(id);
-            return version.FirstOrDefault(x => x.Published);
-        }
-
-        /// <summary>
-        /// Gets the published version of a <see cref="IContent"/> item.
-        /// </summary>
-        /// <param name="content">The content item.</param>
-        /// <returns>The published version, if any; otherwise, null.</returns>
-        public IContent GetPublishedVersion(IContent content)
-        {
-            if (content.Published) return content;
-            return content.HasPublishedVersion
-                ? GetByVersion(content.PublishedVersionGuid)
-                : null;
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects, which reside at the first level / root
-        /// </summary>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetRootContent()
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                var query = Query<IContent>.Builder.Where(x => x.ParentId == Constants.System.Root);
-                return repository.GetByQuery(query);
-            }
-        }
-
-        /// <summary>
-        /// Gets all published content items
-        /// </summary>
-        /// <returns></returns>
-        internal IEnumerable<IContent> GetAllPublished()
-        {
-            //create it once if it is needed (no need for locking here)
-            if (_notTrashedQuery == null)
-            {
-                _notTrashedQuery = Query<IContent>.Builder.Where(x => x.Trashed == false);
-            }
-
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                return repository.GetByPublishedVersion(_notTrashedQuery);
-            }
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects, which has an expiration date less than or equal to today.
-        /// </summary>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetContentForExpiration()
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                var query = Query<IContent>.Builder.Where(x => x.ExpireDate <= DateTime.Now);
-                return repository.GetByQuery(query).Where(x => x.HasPublishedVersion);
-            }
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects, which has a release date less than or equal to today.
-        /// </summary>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetContentForRelease()
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                var query = Query<IContent>.Builder.Where(x => x.Published == false && x.ReleaseDate <= DateTime.Now);
-                return repository.GetByQuery(query);
-            }
-        }
-
-        /// <summary>
-        /// Gets a collection of an <see cref="IContent"/> objects, which resides in the Recycle Bin
-        /// </summary>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetContentInRecycleBin()
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                var query = Query<IContent>.Builder.Where(x => x.Path.StartsWith(Constants.System.RecycleBinContentPathPrefix));
-                return repository.GetByQuery(query);
-            }
-        }
-
-        /// <summary>
-        /// Checks whether an <see cref="IContent"/> item has any children
-        /// </summary>
-        /// <param name="id">Id of the <see cref="IContent"/></param>
-        /// <returns>True if the content has any children otherwise False</returns>
-        public bool HasChildren(int id)
-        {
-            return CountChildren(id) > 0;
-        }
-
-        internal int CountChildren(int id)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                var query = Query<IContent>.Builder.Where(x => x.ParentId == id);
-                return repository.Count(query);
-            }
-        }
-
-        /// <summary>
-        /// Checks whether an <see cref="IContent"/> item has any published versions
-        /// </summary>
-        /// <param name="id">Id of the <see cref="IContent"/></param>
-        /// <returns>True if the content has any published version otherwise False</returns>
-        public bool HasPublishedVersion(int id)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                var query = Query<IContent>.Builder.Where(x => x.Published == true && x.Id == id && x.Trashed == false);
-                return repository.Count(query) > 0;
-            }
-        }
-
-        /// <summary>
-        /// Checks if the passed in <see cref="IContent"/> can be published based on the anscestors publish state.
-        /// </summary>
-        /// <param name="content"><see cref="IContent"/> to check if anscestors are published</param>
-        /// <returns>True if the Content can be published, otherwise False</returns>
-        public bool IsPublishable(IContent content)
-        {
-            int[] ids;
-            if (content.HasIdentity)
-            {
-                // get ids from path (we have identity)
-                // skip the first one that has to be -1 - and we don't care
-                // skip the last one that has to be "this" - and it's ok to stop at the parent
-                ids = content.Path.Split(',').Skip(1).SkipLast().Select(int.Parse).ToArray();
-            }
-            else
-            {
-                // no path yet (no identity), have to move up to parent
-                // skip the first one that has to be -1 - and we don't care
-                // don't skip the last one that is "parent"
-                var parent = GetById(content.ParentId);
-                if (parent == null) return false;
-                ids = parent.Path.Split(',').Skip(1).Select(int.Parse).ToArray();
-            }
-            if (ids.Length == 0)
-                return false;
-
-            // if the first one is recycle bin, fail fast
-            if (ids[0] == Constants.System.RecycleBinContent)
-                return false;
-
-            // fixme - move to repository?
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var sql = new Sql(@"
-                    SELECT id 
-                    FROM umbracoNode
-                    JOIN cmsDocument ON umbracoNode.id=cmsDocument.nodeId AND cmsDocument.published=@0
-                    WHERE umbracoNode.trashed=@1 AND umbracoNode.id IN (@2)",
-                    true, false, ids);                    
-                var x = uow.Database.Fetch<int>(sql);
-                return ids.Length == x.Count;
-            }
-        }
-
-        /// <summary>
-        /// This will rebuild the xml structures for content in the database.
-        /// </summary>
-        /// <param name="userId">This is not used for anything</param>
-        /// <returns>True if publishing succeeded, otherwise False</returns>
-        /// <remarks>
-        /// This is used for when a document type alias or a document type property is changed, the xml will need to
-        /// be regenerated.
-        /// </remarks>
-        public bool RePublishAll(int userId = 0)
-        {
-            try
-            {
-                RebuildXmlStructures();
-                return true;
-            }
-            catch (Exception ex)
-            {
-                Logger.Error<ContentService>("An error occurred executing RePublishAll", ex);
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// This will rebuild the xml structures for content in the database.
-        /// </summary>
-        /// <param name="contentTypeIds">
-        /// If specified will only rebuild the xml for the content type's specified, otherwise will update the structure
-        /// for all published content.
-        /// </param>
-        internal void RePublishAll(params int[] contentTypeIds)
-        {
-            try
-            {
-                RebuildXmlStructures(contentTypeIds);
-            }
-            catch (Exception ex)
-            {
-                Logger.Error<ContentService>("An error occurred executing RePublishAll", ex);
-            }
-        }
-
-        /// <summary>
-        /// Publishes a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to publish</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <returns>True if publishing succeeded, otherwise False</returns>
-        public bool Publish(IContent content, int userId = 0)
-        {
-            var result = SaveAndPublishDo(content, userId);
-            Logger.Info<ContentService>("Call was made to ContentService.Publish, use PublishWithStatus instead since that method will provide more detailed information on the outcome");
-            return result.Success;
-        }
-
-        /// <summary>
-        /// Publishes a <see cref="IContent"/> object and all its children
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to publish along with its children</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <param name="includeUnpublished"></param>
-        /// <returns>The list of statuses for all published items</returns>
-        IEnumerable<Attempt<PublishStatus>> IContentServiceOperations.PublishWithChildren(IContent content, int userId, bool includeUnpublished)
-        {
-            return PublishWithChildrenDo(content, userId, includeUnpublished);
-        }
-
-        /// <summary>
-        /// Saves and Publishes a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to save and publish</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise save events.</param>
-        /// <returns>True if publishing succeeded, otherwise False</returns>
-        Attempt<PublishStatus> IContentServiceOperations.SaveAndPublish(IContent content, int userId, bool raiseEvents)
-        {
-            return SaveAndPublishDo(content, userId, raiseEvents);
-        }
-
-        /// <summary>
-        /// Deletes an <see cref="IContent"/> object by moving it to the Recycle Bin
-        /// </summary>
-        /// <remarks>Move an item to the Recycle Bin will result in the item being unpublished</remarks>
-        /// <param name="content">The <see cref="IContent"/> to delete</param>
-        /// <param name="userId">Optional Id of the User deleting the Content</param>
-        Attempt<OperationStatus> IContentServiceOperations.MoveToRecycleBin(IContent content, int userId)
-        {
-            return MoveToRecycleBinDo(content, userId, false);
-        }
-
-        /// <summary>
-        /// Deletes an <see cref="IContent"/> object by moving it to the Recycle Bin
-        /// </summary>
-        /// <remarks>Move an item to the Recycle Bin will result in the item being unpublished</remarks>
-        /// <param name="content">The <see cref="IContent"/> to delete</param>
-        /// <param name="userId">Optional Id of the User deleting the Content</param>
-        /// <param name="ignoreDescendants">
-        /// A boolean indicating to ignore this item's descendant list from also being moved to the recycle bin. This is required for the DeleteContentOfTypes method
-        /// because it has already looked up all descendant nodes that will need to be recycled
-        /// TODO: Fix all of this, it will require a reasonable refactor and most of this stuff should be done at the repo level instead of service sub operations
-        /// </param>
-        private Attempt<OperationStatus> MoveToRecycleBinDo(IContent content, int userId, bool ignoreDescendants)
-        {
-            var evtMsgs = EventMessagesFactory.Get();
-            using (new WriteLock(Locker))
-            {
-                using (var uow = UowProvider.GetUnitOfWork())
-                {
-                    //Hack: this ensures that the entity's path is valid and if not it fixes/persists it
-                    //see: http://issues.umbraco.org/issue/U4-9336
-                    content.EnsureValidPath(Logger, entity => GetById(entity.ParentId), QuickUpdate);
-                    var originalPath = content.Path;
-                    var moveEventInfo = new MoveEventInfo<IContent>(content, originalPath, Constants.System.RecycleBinContent);
-                    var moveEventArgs = new MoveEventArgs<IContent>(evtMsgs, moveEventInfo);
-                    if (uow.Events.DispatchCancelable(Trashing, this, moveEventArgs, "Trashing"))
-                    {
-                        uow.Commit();
-                        return OperationStatus.Cancelled(evtMsgs);
-                    }
-                    var moveInfo = new List<MoveEventInfo<IContent>>
-                    {
-                        moveEventInfo
-                    };
-
-                    //get descendents to process of the content item that is being moved to trash - must be done before changing the state below
-                    //must be processed with shallowest levels first
-                    var descendants = ignoreDescendants ? Enumerable.Empty<IContent>() : GetDescendants(content).OrderBy(x => x.Level);
-
-                    //Do the updates for this item
-                    var repository = RepositoryFactory.CreateContentRepository(uow);
-                    //Make sure that published content is unpublished before being moved to the Recycle Bin
-                    if (HasPublishedVersion(content.Id))
-                    {
-                        //TODO: this shouldn't be a 'sub operation', and if it needs to be it cannot raise events and cannot be cancelled!
-                        UnPublish(content, userId);
-                    }
-                    content.WriterId = userId;
-                    content.ChangeTrashedState(true);
-                    repository.AddOrUpdate(content);
-
-                    //Loop through descendants to update their trash state, but ensuring structure by keeping the ParentId
-                    foreach (var descendant in descendants)
-                    {
-                        //TODO: this shouldn't be a 'sub operation', and if it needs to be it cannot raise events and cannot be cancelled!
-                        UnPublish(descendant, userId);
-                        descendant.WriterId = userId;
-                        descendant.ChangeTrashedState(true, descendant.ParentId);
-                        repository.AddOrUpdate(descendant);
-
-                        moveInfo.Add(new MoveEventInfo<IContent>(descendant, descendant.Path, descendant.ParentId));
-                    }
-
-                    moveEventArgs.CanCancel = false;
-                    moveEventArgs.MoveInfoCollection = moveInfo;
-                    uow.Events.Dispatch(Trashed, this, moveEventArgs, "Trashed");
-
-                    Audit(uow, AuditType.Move, "Move Content to Recycle Bin performed by user", userId, content.Id);
-                    uow.Commit();
-                }
-
-                return OperationStatus.Success(evtMsgs);
-            }
-        }
-
-        /// <summary>
-        /// UnPublishes a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to publish</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <returns>True if unpublishing succeeded, otherwise False</returns>
-        Attempt<UnPublishStatus> IContentServiceOperations.UnPublish(IContent content, int userId)
-        {
-            return UnPublishDo(content, false, userId);
-        }
-
-        /// <summary>
-        /// Publishes a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to publish</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <returns>True if publishing succeeded, otherwise False</returns>
-        public Attempt<PublishStatus> PublishWithStatus(IContent content, int userId = 0)
-        {
-            return ((IContentServiceOperations)this).Publish(content, userId);
-        }
-
-        /// <summary>
-        /// Publishes a <see cref="IContent"/> object and all its children
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to publish along with its children</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <returns>True if publishing succeeded, otherwise False</returns>
-        [Obsolete("Use PublishWithChildrenWithStatus instead, that method will provide more detailed information on the outcome and also allows the includeUnpublished flag")]
-        public bool PublishWithChildren(IContent content, int userId = 0)
-        {
-            var result = PublishWithChildrenDo(content, userId, true);
-
-            //This used to just return false only when the parent content failed, otherwise would always return true so we'll
-            // do the same thing for the moment
-            if (result.All(x => x.Result.ContentItem.Id != content.Id))
-                return false;
-
-            return result.Single(x => x.Result.ContentItem.Id == content.Id).Success;
-        }
-
-        /// <summary>
-        /// Publishes a <see cref="IContent"/> object and all its children
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to publish along with its children</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <param name="includeUnpublished">set to true if you want to also publish children that are currently unpublished</param>
-        /// <returns>True if publishing succeeded, otherwise False</returns>
-        public IEnumerable<Attempt<PublishStatus>> PublishWithChildrenWithStatus(IContent content, int userId = 0, bool includeUnpublished = false)
-        {
-            return ((IContentServiceOperations)this).PublishWithChildren(content, userId, includeUnpublished);
-        }
-
-        /// <summary>
-        /// UnPublishes a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to publish</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <returns>True if unpublishing succeeded, otherwise False</returns>
-        public bool UnPublish(IContent content, int userId = 0)
-        {
-            var attempt = ((IContentServiceOperations)this).UnPublish(content, userId);
-            LogHelper.Debug<ContentService>(string.Format("Result of unpublish attempt: {0}", attempt.Result.StatusType));
-            return attempt.Success;
-        }
-
-        /// <summary>
-        /// Saves and Publishes a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to save and publish</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise save events.</param>
-        /// <returns>True if publishing succeeded, otherwise False</returns>
-        [Obsolete("Use SaveAndPublishWithStatus instead, that method will provide more detailed information on the outcome")]
-        public bool SaveAndPublish(IContent content, int userId = 0, bool raiseEvents = true)
-        {
-            var result = SaveAndPublishDo(content, userId, raiseEvents);
-            return result.Success;
-        }
-
-        /// <summary>
-        /// Saves and Publishes a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to save and publish</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise save events.</param>
-        /// <returns>True if publishing succeeded, otherwise False</returns>
-        public Attempt<PublishStatus> SaveAndPublishWithStatus(IContent content, int userId = 0, bool raiseEvents = true)
-        {
-            return ((IContentServiceOperations)this).SaveAndPublish(content, userId, raiseEvents);
-        }
-
-        public IContent GetBlueprintById(int id)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentBlueprintRepository(uow);
-                var blueprint = repository.Get(id);
-                if (blueprint != null)
-                    ((Content) blueprint).IsBlueprint = true;
-                return blueprint;
-            }
-        }
-
-        public IContent GetBlueprintById(Guid id)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentBlueprintRepository(uow);
-                var blueprint = repository.Get(id);
-                if (blueprint != null)
-                    ((Content)blueprint).IsBlueprint = true;
-                return blueprint;
-            }
-        }
-
-        public void SaveBlueprint(IContent content, int userId = 0)
-        {
-            //always ensure the blueprint is at the root
-            if (content.ParentId != -1)
-                content.ParentId = -1;
-
-            ((Content) content).IsBlueprint = true;
-
-            using (new WriteLock(Locker))
-            {
-                using (var uow = UowProvider.GetUnitOfWork())
-                {
-                    if (string.IsNullOrWhiteSpace(content.Name))
-                    {
-                        throw new ArgumentException("Cannot save content blueprint with empty name.");
-                    }
-
-                    var repository = RepositoryFactory.CreateContentBlueprintRepository(uow);
-
-                    if (content.HasIdentity == false)
-                    {
-                        content.CreatorId = userId;
-                    }
-                    content.WriterId = userId;
-
-                    repository.AddOrUpdate(content);
-
-                    uow.Events.Dispatch(SavedBlueprint, this, new SaveEventArgs<IContent>(content), "SavedBlueprint");
-
-                    uow.Commit();
-                }
-            }
-        }
-
-        public void DeleteBlueprint(IContent content, int userId = 0)
-        {
-            using (new WriteLock(Locker))
-            {
-                using (var uow = UowProvider.GetUnitOfWork())
-                {
-                    var repository = RepositoryFactory.CreateContentBlueprintRepository(uow);
-                    repository.Delete(content);
-                    uow.Events.Dispatch(DeletedBlueprint, this, new DeleteEventArgs<IContent>(content), "DeletedBlueprint");
-                    uow.Commit();
-                }
-            }
-        }
-
-        public IContent CreateContentFromBlueprint(IContent blueprint, string name, int userId = 0)
-        {
-            if (blueprint == null) throw new ArgumentNullException("blueprint");
-
-            var contentType = blueprint.ContentType;
-            var content = new Content(name, -1, contentType);
-            content.Path = string.Concat(content.ParentId.ToString(), ",", content.Id);
-
-            content.CreatorId = userId;
-            content.WriterId = userId;
-
-            foreach (var property in blueprint.Properties)
-                content.SetValue(property.Alias, property.Value);
-
-            return content;
-        }
-
-        public void DeleteBlueprintsOfTypes(IEnumerable<int> contentTypeIds, int userId = 0)
-        {
-            using (new WriteLock(Locker))
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var repository = RepositoryFactory.CreateContentBlueprintRepository(uow);
-
-                var contentTypeIdsA = contentTypeIds.ToArray();
-                var query = new Query<IContent>();
-                if (contentTypeIdsA.Length > 0)
-                {
-                    query.Where(x => contentTypeIdsA.Contains(x.ContentTypeId));
-                }
-                var blueprints = repository.GetByQuery(query).Select(x =>
-                {
-                    ((Content) x).IsBlueprint = true;
-                    return x;
-                }).ToArray();
-
-                foreach (var blueprint in blueprints)
-                {
-                    repository.Delete(blueprint);
-                }
-
-                uow.Events.Dispatch(DeletedBlueprint, this, new DeleteEventArgs<IContent>(blueprints), "DeletedBlueprint");
-                uow.Commit();
-            }
-        }
-
-        public void DeleteBlueprintsOfType(int contentTypeId, int userId = 0)
-        {
-            DeleteBlueprintsOfTypes(new[] {contentTypeId}, userId);
-        }
-
-        /// <summary>
-        /// Saves a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to save</param>
-        /// <param name="userId">Optional Id of the User saving the Content</param>
-        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
-        public void Save(IContent content, int userId = 0, bool raiseEvents = true)
-        {
-            ((IContentServiceOperations)this).Save(content, userId, raiseEvents);
-        }
-
-        /// <summary>
-        /// Saves a collection of <see cref="IContent"/> objects.
-        /// </summary>
-        /// <param name="contents">Collection of <see cref="IContent"/> to save</param>
-        /// <param name="userId">Optional Id of the User saving the Content</param>
-        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
-        Attempt<OperationStatus> IContentServiceOperations.Save(IEnumerable<IContent> contents, int userId, bool raiseEvents)
-        {
-            var asArray = contents.ToArray();
-
-            var evtMsgs = EventMessagesFactory.Get();
-
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var saveEventArgs = new SaveEventArgs<IContent>(asArray, evtMsgs);
-                if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
-                {
-                    uow.Commit();
-                    return OperationStatus.Cancelled(evtMsgs);
-                }
-
-                // todo - understand what's a lock in a scope?
-                // (though, these locks are refactored in v8)
-                using (new WriteLock(Locker))
-                {
-                    var containsNew = asArray.Any(x => x.HasIdentity == false);
-                    var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                    if (containsNew)
-                    {
-                        foreach (var content in asArray)
-                        {
-                            content.WriterId = userId;
-
-                            //Only change the publish state if the "previous" version was actually published
-                            if (content.Published)
-                                content.ChangePublishedState(PublishedState.Saved);
-
-                            repository.AddOrUpdate(content);
-                            //add or update preview
-                            repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-                        }
-                    }
-                    else
-                    {
-                        foreach (var content in asArray)
-                        {
-                            content.WriterId = userId;
-                            repository.AddOrUpdate(content);
-                            //add or update preview
-                            repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-                        }
-                    }
-                }
-
-                if (raiseEvents)
-                {
-                    saveEventArgs.CanCancel = false;
-                    uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
-                }
-
-                Audit(uow, AuditType.Save, "Bulk Save content performed by user", userId == -1 ? 0 : userId, Constants.System.Root);
-                uow.Commit();
-
-                return OperationStatus.Success(evtMsgs);
-            }
-        }
-
-        /// <summary>
-        /// Permanently deletes an <see cref="IContent"/> object.
-        /// </summary>
-        /// <remarks>
-        /// This method will also delete associated media files, child content and possibly associated domains.
-        /// </remarks>
-        /// <remarks>Please note that this method will completely remove the Content from the database</remarks>
-        /// <param name="content">The <see cref="IContent"/> to delete</param>
-        /// <param name="userId">Optional Id of the User deleting the Content</param>
-        Attempt<OperationStatus> IContentServiceOperations.Delete(IContent content, int userId)
-        {
-            var evtMsgs = EventMessagesFactory.Get();
-
-            using (new WriteLock(Locker))
-            {
-                using (var uow = UowProvider.GetUnitOfWork())
-                {
-                    var deleteEventArgs = new DeleteEventArgs<IContent>(content, evtMsgs);
-                    if (uow.Events.DispatchCancelable(Deleting, this, deleteEventArgs, "Deleting"))
-                    {
-                        uow.Commit();
-                        return OperationStatus.Cancelled(evtMsgs);
-                    }
-
-                    //Make sure that published content is unpublished before being deleted
-                    if (HasPublishedVersion(content.Id))
-                    {
-                        UnPublish(content, userId);
-                    }
-
-                    //Delete children before deleting the 'possible parent'
-                    var children = GetChildren(content.Id);
-                    foreach (var child in children)
-                    {
-                        Delete(child, userId);
-                    }
-
-                    var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                    repository.Delete(content);
-
-                    deleteEventArgs.CanCancel = false;
-                    uow.Events.Dispatch(Deleted, this, deleteEventArgs, "Deleted");
-
-                    Audit(uow, AuditType.Delete, "Delete Content performed by user", userId, content.Id);
-                    uow.Commit();
-                }
-
-                return OperationStatus.Success(evtMsgs);
-            }
-        }
-
-        /// <summary>
-        /// Publishes a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to publish</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <returns>The published status attempt</returns>
-        Attempt<PublishStatus> IContentServiceOperations.Publish(IContent content, int userId)
-        {
-            return SaveAndPublishDo(content, userId);
-        }
-
-        /// <summary>
-        /// Saves a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to save</param>
-        /// <param name="userId">Optional Id of the User saving the Content</param>
-        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
-        Attempt<OperationStatus> IContentServiceOperations.Save(IContent content, int userId, bool raiseEvents)
-        {
-            return Save(content, true, userId, raiseEvents);
-        }
-
-        /// <summary>
-        /// Saves a collection of <see cref="IContent"/> objects.
-        /// </summary>
-        /// <remarks>
-        /// If the collection of content contains new objects that references eachother by Id or ParentId,
-        /// then use the overload Save method with a collection of Lazy <see cref="IContent"/>.
-        /// </remarks>
-        /// <param name="contents">Collection of <see cref="IContent"/> to save</param>
-        /// <param name="userId">Optional Id of the User saving the Content</param>
-        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
-        public void Save(IEnumerable<IContent> contents, int userId = 0, bool raiseEvents = true)
-        {
-            ((IContentServiceOperations)this).Save(contents, userId, raiseEvents);
-        }
-
-        /// <summary>
-        /// Deletes all content of the specified types. All Descendants of deleted content that is not of these types is moved to Recycle Bin.
-        /// </summary>
-        /// <param name="contentTypeIds">Id of the <see cref="IContentType"/></param>
-        /// <param name="userId">Optional Id of the user issueing the delete operation</param>
-        public void DeleteContentOfTypes(IEnumerable<int> contentTypeIds, int userId = 0)
-        {
-            using (new WriteLock(Locker))
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                //track the 'root' items of the collection of nodes discovered to delete, we need to use
-                //these items to lookup descendants that are not of this doc type so they can be transfered
-                //to the recycle bin
-                IDictionary<string, IContent> rootItems;
-                var contentToDelete = this.TrackDeletionsForDeleteContentOfTypes(contentTypeIds, repository, out rootItems).ToArray();
-
-                if (uow.Events.DispatchCancelable(Deleting, this, new DeleteEventArgs<IContent>(contentToDelete), "Deleting"))
-                {
-                    uow.Commit();
-                    return;
-                }
-
-                //Determine the items that will need to be recycled (that are children of these content items but not of these content types)
-                var contentToRecycle = this.TrackTrashedForDeleteContentOfTypes(contentTypeIds, rootItems, repository);
-
-                //move each item to the bin starting with the deepest items
-                foreach (var child in contentToRecycle.OrderByDescending(x => x.Level))
-                {
-                    MoveToRecycleBinDo(child, userId, true);
-                }
-
-                foreach (var content in contentToDelete)
-                {
-                    Delete(content, userId);
-                }
-
-                Audit(uow, AuditType.Delete,
-                    string.Format("Delete Content of Types {0} performed by user", string.Join(",", contentTypeIds)),
-                    userId, Constants.System.Root);
-                uow.Commit();
-            }
-        }
-
-        /// <summary>
-        /// Deletes all content of specified type. All children of deleted content is moved to Recycle Bin.
-        /// </summary>
-        /// <remarks>This needs extra care and attention as its potentially a dangerous and extensive operation</remarks>
-        /// <param name="contentTypeId">Id of the <see cref="IContentType"/></param>
-        /// <param name="userId">Optional Id of the user issueing the delete operation</param>
-        public void DeleteContentOfType(int contentTypeId, int userId = 0)
-        {
-            DeleteContentOfTypes(new[] {contentTypeId}, userId);
-        }
-
-        /// <summary>
-        /// Permanently deletes an <see cref="IContent"/> object as well as all of its Children.
-        /// </summary>
-        /// <remarks>
-        /// This method will also delete associated media files, child content and possibly associated domains.
-        /// </remarks>
-        /// <remarks>Please note that this method will completely remove the Content from the database</remarks>
-        /// <param name="content">The <see cref="IContent"/> to delete</param>
-        /// <param name="userId">Optional Id of the User deleting the Content</param>
-        public void Delete(IContent content, int userId = 0)
-        {
-            ((IContentServiceOperations)this).Delete(content, userId);
-        }
-
-        /// <summary>
-        /// Permanently deletes versions from an <see cref="IContent"/> object prior to a specific date.
-        /// This method will never delete the latest version of a content item.
-        /// </summary>
-        /// <param name="id">Id of the <see cref="IContent"/> object to delete versions from</param>
-        /// <param name="versionDate">Latest version date</param>
-        /// <param name="userId">Optional Id of the User deleting versions of a Content object</param>
-        public void DeleteVersions(int id, DateTime versionDate, int userId = 0)
-        {
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var deleteRevisionsEventArgs = new DeleteRevisionsEventArgs(id, dateToRetain: versionDate);
-                if (uow.Events.DispatchCancelable(DeletingVersions, this, deleteRevisionsEventArgs, "DeletingVersions"))
-                {
-                    uow.Commit();
-                    return;
-                }
-
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                repository.DeleteVersions(id, versionDate);
-                deleteRevisionsEventArgs.CanCancel = false;
-                uow.Events.Dispatch(DeletedVersions, this, deleteRevisionsEventArgs, "DeletedVersions");
-
-                Audit(uow, AuditType.Delete, "Delete Content by version date performed by user", userId, Constants.System.Root);
-                uow.Commit();
-            }
-        }
-
-        /// <summary>
-        /// Permanently deletes specific version(s) from an <see cref="IContent"/> object.
-        /// This method will never delete the latest version of a content item.
-        /// </summary>
-        /// <param name="id">Id of the <see cref="IContent"/> object to delete a version from</param>
-        /// <param name="versionId">Id of the version to delete</param>
-        /// <param name="deletePriorVersions">Boolean indicating whether to delete versions prior to the versionId</param>
-        /// <param name="userId">Optional Id of the User deleting versions of a Content object</param>
-        public void DeleteVersion(int id, Guid versionId, bool deletePriorVersions, int userId = 0)
-        {
-            using (new WriteLock(Locker))
-            {
-                using (var uow = UowProvider.GetUnitOfWork())
-                {
-                    if (uow.Events.DispatchCancelable(DeletingVersions, this, new DeleteRevisionsEventArgs(id, specificVersion: versionId), "DeletingVersions"))
-                    {
-                        uow.Commit();
-                        return;
-                    }
-
-                    if (deletePriorVersions)
-                    {
-                        var content = GetByVersion(versionId);
-                        DeleteVersions(id, content.UpdateDate, userId);
-                    }
-
-                    var repository = RepositoryFactory.CreateContentRepository(uow);
-                    repository.DeleteVersion(versionId);
-
-                    uow.Events.Dispatch(DeletedVersions, this, new DeleteRevisionsEventArgs(id, false, specificVersion: versionId), "DeletedVersions");
-
-                    Audit(uow, AuditType.Delete, "Delete Content by version performed by user", userId, Constants.System.Root);
-                    uow.Commit();
-                }
-            }
-        }
-
-        /// <summary>
-        /// Deletes an <see cref="IContent"/> object by moving it to the Recycle Bin
-        /// </summary>
-        /// <remarks>Move an item to the Recycle Bin will result in the item being unpublished</remarks>
-        /// <param name="content">The <see cref="IContent"/> to delete</param>
-        /// <param name="userId">Optional Id of the User deleting the Content</param>
-        public void MoveToRecycleBin(IContent content, int userId = 0)
-        {
-            ((IContentServiceOperations)this).MoveToRecycleBin(content, userId);
-        }
-
-        /// <summary>
-        /// Moves an <see cref="IContent"/> object to a new location by changing its parent id.
-        /// </summary>
-        /// <remarks>
-        /// If the <see cref="IContent"/> object is already published it will be
-        /// published after being moved to its new location. Otherwise it'll just
-        /// be saved with a new parent id.
-        /// </remarks>
-        /// <param name="content">The <see cref="IContent"/> to move</param>
-        /// <param name="parentId">Id of the Content's new Parent</param>
-        /// <param name="userId">Optional Id of the User moving the Content</param>
-        public void Move(IContent content, int parentId, int userId = 0)
-        {
-            using (new WriteLock(Locker))
-            {
-                //This ensures that the correct method is called if this method is used to Move to recycle bin.
-                if (parentId == Constants.System.RecycleBinContent)
-                {
-                    MoveToRecycleBin(content, userId);
-                    return;
-                }
-
-                using (var uow = UowProvider.GetUnitOfWork())
-                {
-                    var moveEventInfo = new MoveEventInfo<IContent>(content, content.Path, parentId);
-                    var moveEventArgs = new MoveEventArgs<IContent>(moveEventInfo);
-                    if (uow.Events.DispatchCancelable(Moving, this, moveEventArgs, "Moving"))
-                    {
-                        uow.Commit();
-                        return;
-                    }
-
-                    //used to track all the moved entities to be given to the event
-                    var moveInfo = new List<MoveEventInfo<IContent>>();
-
-                    //call private method that does the recursive moving
-                    PerformMove(content, parentId, userId, moveInfo);
-
-                    moveEventArgs.MoveInfoCollection = moveInfo;
-                    moveEventArgs.CanCancel = false;
-                    uow.Events.Dispatch(Moved, this, moveEventArgs, "Moved");
-
-                    Audit(uow, AuditType.Move, "Move Content performed by user", userId, content.Id);
-                    uow.Commit();
-                }
-            }
-        }
-
-        /// <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")]
-        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))
-            {
-                var nodeObjectType = Constants.ObjectTypes.DocumentGuid;
-
-                using (var uow = UowProvider.GetUnitOfWork())
-                {
-                    var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                    //Create a dictionary of ids -> dictionary of property aliases + values
-                    var entities = repository.GetEntitiesInRecycleBin()
-                        .ToDictionary(
-                            key => key.Id,
-                            val => (IEnumerable<Property>)val.Properties);
-
-                    var files = ((ContentRepository)repository).GetFilesInRecycleBinForUploadField();
-
-                    var recycleBinEventArgs = new RecycleBinEventArgs(nodeObjectType, entities, files);
-                    if (uow.Events.DispatchCancelable(EmptyingRecycleBin, this, recycleBinEventArgs))
-                    {
-                        uow.Commit();
-                        return;
-                    }
-
-                    var success = repository.EmptyRecycleBin();
-                    recycleBinEventArgs.CanCancel = false;
-                    recycleBinEventArgs.RecycleBinEmptiedSuccessfully = success;
-                    uow.Events.Dispatch(EmptiedRecycleBin, this, recycleBinEventArgs);
-
-                    Audit(uow, AuditType.Delete, "Empty Content Recycle Bin performed by user", userId, Constants.System.RecycleBinContent);
-                    uow.Commit();
-                }
-            }
-        }
-
-        /// <summary>
-        /// Copies an <see cref="IContent"/> object by creating a new Content object of the same type and copies all data from the current
-        /// to the new copy which is returned. Recursively copies all children.
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to copy</param>
-        /// <param name="parentId">Id of the Content's new Parent</param>
-        /// <param name="relateToOriginal">Boolean indicating whether the copy should be related to the original</param>
-        /// <param name="userId">Optional Id of the User copying the Content</param>
-        /// <returns>The newly created <see cref="IContent"/> object</returns>
-        public IContent Copy(IContent content, int parentId, bool relateToOriginal, int userId = 0)
-        {
-            return Copy(content, parentId, relateToOriginal, true, userId);
-        }
-
-        /// <summary>
-        /// Copies an <see cref="IContent"/> object by creating a new Content object of the same type and copies all data from the current
-        /// to the new copy which is returned.
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to copy</param>
-        /// <param name="parentId">Id of the Content's new Parent</param>
-        /// <param name="relateToOriginal">Boolean indicating whether the copy should be related to the original</param>
-        /// <param name="recursive">A value indicating whether to recursively copy children.</param>
-        /// <param name="userId">Optional Id of the User copying the Content</param>
-        /// <returns>The newly created <see cref="IContent"/> object</returns>
-        public IContent Copy(IContent content, int parentId, bool relateToOriginal, bool recursive, int userId = 0)
-        {
-            //TODO: This all needs to be managed correctly so that the logic is submitted in one
-            // transaction, the CRUD needs to be moved to the repo
-
-            using (new WriteLock(Locker))
-            {
-                var copy = content.DeepCloneWithResetIdentities();
-                copy.ParentId = parentId;
-
-                // A copy should never be set to published automatically even if the original was.
-                copy.ChangePublishedState(PublishedState.Unpublished);
-
-                using (var uow = UowProvider.GetUnitOfWork())
-                {
-                    var copyEventArgs = new CopyEventArgs<IContent>(content, copy, true, parentId, relateToOriginal);
-                    if (uow.Events.DispatchCancelable(Copying, this, copyEventArgs))
-                    {
-                        uow.Commit();
-                        return null;
-                    }
-
-                    var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                    // Update the create author and last edit author
-                    copy.CreatorId = userId;
-                    copy.WriterId = userId;
-
-                    //get the current permissions, if there are any explicit ones they need to be copied
-                    var currentPermissions = GetPermissionsForEntity(content);
-                    currentPermissions.RemoveWhere(p => p.IsDefaultPermissions);
-
-                    repository.AddOrUpdate(copy);
-                    repository.AddOrUpdatePreviewXml(copy, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-
-                    //add permissions
-                    if (currentPermissions.Count > 0)
-                    {
-                        var permissionSet = new ContentPermissionSet(copy, currentPermissions);
-                        repository.AddOrUpdatePermissions(permissionSet);
-                    }
-
-                    uow.Commit(); // todo - this should flush, not commit
-
-                    //Special case for the associated tags
-                    //TODO: Move this to the repository layer in a single transaction!
-                    //don't copy tags data in tags table if the item is in the recycle bin
-                    if (parentId != Constants.System.RecycleBinContent)
-                    {
-                        var tags = uow.Database.Fetch<TagRelationshipDto>("WHERE nodeId = @Id", new { Id = content.Id });
-                        foreach (var tag in tags)
-                            uow.Database.Insert(new TagRelationshipDto
-                            {
-                                NodeId = copy.Id, TagId = tag.TagId, PropertyTypeId = tag.PropertyTypeId
-                            });
-                    }
-                    uow.Commit(); // todo - this should flush, not commit
-
-                    if (recursive)
-                    {
-                        //Look for children and copy those as well
-                        var children = GetChildren(content.Id);
-                        foreach (var child in children)
-                        {
-                            //TODO: This shouldn't recurse back to this method, it should be done in a private method
-                            // that doesn't have a nested lock and so we can perform the entire operation in one commit.
-                            Copy(child, copy.Id, relateToOriginal, true, userId);
-                        }
-                    }
-                    copyEventArgs.CanCancel = false;
-                    uow.Events.Dispatch(Copied, this, copyEventArgs);
-                    Audit(uow, AuditType.Copy, "Copy Content performed by user", userId, content.Id);
-                    uow.Commit();
-                }
-
-                return copy;
-            }
-        }
-
-
-        /// <summary>
-        /// Sends an <see cref="IContent"/> to Publication, which executes handlers and events for the 'Send to Publication' action.
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to send to publication</param>
-        /// <param name="userId">Optional Id of the User issueing the send to publication</param>
-        /// <returns>True if sending publication was succesfull otherwise false</returns>
-        public bool SendToPublication(IContent content, int userId = 0)
-        {
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var sendToPublishEventArgs = new SendToPublishEventArgs<IContent>(content);
-                if (uow.Events.DispatchCancelable(SendingToPublish, this, sendToPublishEventArgs))
-                {
-                    uow.Commit();
-                    return false;
-                }
-
-                //Save before raising event
-                Save(content, userId);
-                sendToPublishEventArgs.CanCancel = false;
-                uow.Events.Dispatch(SentToPublish, this, sendToPublishEventArgs);
-
-                Audit(uow, AuditType.SendToPublish, "Send to Publish performed by user", content.WriterId, content.Id);
-                uow.Commit();
-
-                return true;
-            }
-        }
-
-        /// <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.
-        /// </summary>
-        /// <remarks>
-        /// The way data is stored actually only allows us to rollback on properties
-        /// and not data like Name and Alias of the Content.
-        /// </remarks>
-        /// <param name="id">Id of the <see cref="IContent"/>being rolled back</param>
-        /// <param name="versionId">Id of the version to rollback to</param>
-        /// <param name="userId">Optional Id of the User issueing the rollback of the Content</param>
-        /// <returns>The newly created <see cref="IContent"/> object</returns>
-        public IContent Rollback(int id, Guid versionId, int userId = 0)
-        {
-            var content = GetByVersion(versionId);
-
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var rollbackEventArgs = new RollbackEventArgs<IContent>(content);
-                if (uow.Events.DispatchCancelable(RollingBack, this, rollbackEventArgs))
-                {
-                    uow.Commit();
-                    return content;
-                }
-
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                content.WriterId = userId;
-                content.CreatorId = userId;
-                content.ChangePublishedState(PublishedState.Unpublished);
-
-                repository.AddOrUpdate(content);
-                repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-                rollbackEventArgs.CanCancel = false;
-                uow.Events.Dispatch(RolledBack, this, rollbackEventArgs);
-
-                Audit(uow, AuditType.RollBack, "Content rollback performed by user", content.WriterId, content.Id);
-                uow.Commit();
-            }
-
-            return content;
-        }
-
-        /// <summary>
-        /// Sorts a collection of <see cref="IContent"/> objects by updating the SortOrder according
-        /// to the ordering of items in the passed in <see cref="IEnumerable{T}"/>.
-        /// </summary>
-        /// <remarks>
-        /// Using this method will ensure that the Published-state is maintained upon sorting
-        /// so the cache is updated accordingly - as needed.
-        /// </remarks>
-        /// <param name="items"></param>
-        /// <param name="userId"></param>
-        /// <param name="raiseEvents"></param>
-        /// <returns>True if sorting succeeded, otherwise False</returns>
-        public bool Sort(IEnumerable<IContent> items, int userId = 0, bool raiseEvents = true)
-        {
-            var shouldBePublished = new List<IContent>();
-            var shouldBeSaved = new List<IContent>();
-
-            using (new WriteLock(Locker))
-            {
-                using (var uow = UowProvider.GetUnitOfWork())
-                {
-                    var asArray = items.ToArray();
-                    var saveEventArgs = new SaveEventArgs<IContent>(asArray);
-                    if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
-                    {
-                        uow.Commit();
-                        return false;
-                    }
-
-                    var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                    var i = 0;
-                    foreach (var content in asArray)
-                    {
-                        //If the current sort order equals that of the content
-                        //we don't need to update it, so just increment the sort order
-                        //and continue.
-                        if (content.SortOrder == i)
-                        {
-                            i++;
-                            continue;
-                        }
-
-                        content.SortOrder = i;
-                        content.WriterId = userId;
-                        i++;
-
-                        if (content.Published)
-                        {
-                            //TODO: This should not be an inner operation, but if we do this, it cannot raise events and cannot be cancellable!
-                            var published = _publishingStrategy.Publish(uow, content, userId).Success;
-                            shouldBePublished.Add(content);
-                        }
-                        else
-                            shouldBeSaved.Add(content);
-
-                        repository.AddOrUpdate(content);
-                        //add or update a preview
-                        repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-                    }
-
-                    foreach (var content in shouldBePublished)
-                    {
-                        //Create and Save ContentXml DTO
-                        repository.AddOrUpdateContentXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-                    }
-
-                    if (raiseEvents)
-                    {
-                        saveEventArgs.CanCancel = false;
-                        uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
-                    }
-
-                    if (shouldBePublished.Any())
-                    {
-                        //TODO: This should not be an inner operation, but if we do this, it cannot raise events and cannot be cancellable!
-                        _publishingStrategy.PublishingFinalized(uow, shouldBePublished, false);
-                    }
-
-                    Audit(uow, AuditType.Sort, "Sorting content performed by user", userId, 0);
-                    uow.Commit();
-                }
-            }
-
-            return true;
-        }
-
-        /// <summary>
-        /// Sorts a collection of <see cref="IContent"/> objects by updating the SortOrder according
-        /// to the ordering of node Ids passed in.
-        /// </summary>
-        /// <remarks>
-        /// Using this method will ensure that the Published-state is maintained upon sorting
-        /// so the cache is updated accordingly - as needed.
-        /// </remarks>
-        /// <param name="ids"></param>
-        /// <param name="userId"></param>
-        /// <param name="raiseEvents"></param>
-        /// <returns>True if sorting succeeded, otherwise False</returns>
-        public bool Sort(int[] ids, int userId = 0, bool raiseEvents = true)
-        {
-            var shouldBePublished = new List<IContent>();
-            var shouldBeSaved = new List<IContent>();
-
-            using (new WriteLock(Locker))
-            {
-                var allContent = GetByIds(ids).ToDictionary(x => x.Id, x => x);
-                if (allContent.Any() == false)
-                {
-                    return false;
-                }
-                var items = ids.Select(x => allContent[x]).ToArray();
-
-                using (var uow = UowProvider.GetUnitOfWork())
-                {
-                    var saveEventArgs = new SaveEventArgs<IContent>(items);
-                    if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
-                    {
-                        uow.Commit();
-                        return false;
-                    }
-
-                    var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                    var i = 0;
-                    foreach (var content in items)
-                    {
-                        //If the current sort order equals that of the content
-                        //we don't need to update it, so just increment the sort order
-                        //and continue.
-                        if (content.SortOrder == i)
-                        {
-                            i++;
-                            continue;
-                        }
-
-                        content.SortOrder = i;
-                        content.WriterId = userId;
-                        i++;
-
-                        if (content.Published)
-                        {
-                            //TODO: This should not be an inner operation, but if we do this, it cannot raise events and cannot be cancellable!
-                            var published = _publishingStrategy.Publish(uow, content, userId).Success;
-                            shouldBePublished.Add(content);
-                        }
-                        else
-                            shouldBeSaved.Add(content);
-
-                        repository.AddOrUpdate(content);
-                        //add or update a preview
-                        repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-                    }
-
-                    foreach (var content in shouldBePublished)
-                    {
-                        //Create and Save ContentXml DTO
-                        repository.AddOrUpdateContentXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-                    }
-
-                    if (raiseEvents)
-                    {
-                        saveEventArgs.CanCancel = false;
-                        uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
-                    }
-
-                    if (shouldBePublished.Any())
-                    {
-                        //TODO: This should not be an inner operation, but if we do this, it cannot raise events and cannot be cancellable!
-                        _publishingStrategy.PublishingFinalized(uow, shouldBePublished, false);
-                    }
-
-                    Audit(uow, AuditType.Sort, "Sort child items performed by user", userId, items.First().ParentId);
-                    uow.Commit();
-                }
-            }
-
-            return true;
-        }
-
-        public IEnumerable<IContent> GetBlueprintsForContentTypes(params int[] documentTypeIds)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentBlueprintRepository(uow);
-
-                var query = new Query<IContent>();
-                if (documentTypeIds.Length > 0)
-                {
-                    query.Where(x => documentTypeIds.Contains(x.ContentTypeId));
-                }
-                return repository.GetByQuery(query).Select(x =>
-                {
-                    ((Content) x).IsBlueprint = true;
-                    return x;
-                });
-            }
-        }
-
-        /// <summary>
-        /// Gets paged content descendants as XML by path
-        /// </summary>
-        /// <param name="path">Path starts with</param>
-        /// <param name="pageIndex">Page number</param>
-        /// <param name="pageSize">Page size</param>
-        /// <param name="totalRecords">Total records the query would return without paging</param>
-        /// <returns>A paged enumerable of XML entries of content items</returns>
-        public IEnumerable<XElement> GetPagedXmlEntries(string path, long pageIndex, int pageSize, out long totalRecords)
-        {
-            Mandate.ParameterCondition(pageIndex >= 0, "pageIndex");
-            Mandate.ParameterCondition(pageSize > 0, "pageSize");
-
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                var contents = repository.GetPagedXmlEntriesByPath(path, pageIndex, pageSize,
-                    //This order by is VERY important! This allows us to figure out what is implicitly not published, see ContentRepository.BuildXmlCache and
-                    // UmbracoContentIndexer.PerformIndexAll which uses the logic based on this sort order
-                    new[] { "level", "parentID", "sortOrder" },
-                    out totalRecords);
-                return contents;
-            }
-        }
-
-        /// <summary>
-        /// This builds the Xml document used for the XML cache
-        /// </summary>
-        /// <returns></returns>
-        public XmlDocument BuildXmlCache()
-        {
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                var result = repository.BuildXmlCache();
-                uow.Commit();
-                return result;
-            }
-        }
-
-        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>
-        /// <param name="contentTypeIds">
-        /// Only rebuild the xml structures for the content type ids passed in, if none then rebuilds the structures
-        /// for all content
-        /// </param>
-        public void RebuildXmlStructures(params int[] contentTypeIds)
-        {
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                repository.RebuildXmlStructures(
-                    content => _entitySerializer.Serialize(this, _dataTypeService, _userService, content),
-                    contentTypeIds: contentTypeIds.Length == 0 ? null : contentTypeIds);
-
-                Audit(uow, AuditType.Publish, "ContentService.RebuildXmlStructures completed, the xml has been regenerated in the database", 0, Constants.System.Root);
-                uow.Commit();
-            }
-        }
-
-        #region Internal Methods
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> descendants by the first Parent.
-        /// </summary>
-        /// <param name="content"><see cref="IContent"/> item to retrieve Descendants from</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        internal IEnumerable<IContent> GetPublishedDescendants(IContent content)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                var query = Query<IContent>.Builder.Where(x => x.Id != content.Id && x.Path.StartsWith(content.Path) && x.Trashed == false);
-                return repository.GetByPublishedVersion(query);
-            }
-        }
-
-        #endregion
-
-        #region Private Methods
-
-        /// <summary>
-        /// Hack: This is used to fix some data if an entity's properties are invalid/corrupt
-        /// </summary>
-        /// <param name="content"></param>
-        private void QuickUpdate(IContent content)
-        {
-            if (content == null) throw new ArgumentNullException("content");
-            if (content.HasIdentity == false) throw new InvalidOperationException("Cannot update an entity without an Identity");
-
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                repository.AddOrUpdate(content);
-                uow.Commit();
-            }
-        }
-
-        private void Audit(IScopeUnitOfWork uow, AuditType type, string message, int userId, int objectId)
-        {
-            var auditRepo = RepositoryFactory.CreateAuditRepository(uow);
-            auditRepo.AddOrUpdate(new AuditItem(objectId, message, type, userId));
-        }
-
-        //TODO: All of this needs to be moved to the repository
-        private void PerformMove(IContent content, int parentId, int userId, ICollection<MoveEventInfo<IContent>> moveInfo)
-        {
-            //add a tracking item to use in the Moved event
-            moveInfo.Add(new MoveEventInfo<IContent>(content, content.Path, parentId));
-
-            content.WriterId = userId;
-            if (parentId == Constants.System.Root)
-            {
-                content.Path = string.Concat(Constants.System.Root, ",", content.Id);
-                content.Level = 1;
-            }
-            else
-            {
-                var parent = GetById(parentId);
-                content.Path = string.Concat(parent.Path, ",", content.Id);
-                content.Level = parent.Level + 1;
-            }
-
-            //If Content is being moved away from Recycle Bin, its state should be un-trashed
-            if (content.Trashed && parentId != Constants.System.RecycleBinContent)
-            {
-                content.ChangeTrashedState(false, parentId);
-            }
-            else
-            {
-                content.ParentId = parentId;
-            }
-
-            //If Content is published, it should be (re)published from its new location
-            if (content.Published)
-            {
-                //If Content is Publishable its saved and published
-                //otherwise we save the content without changing the publish state, and generate new xml because the Path, Level and Parent has changed.
-                if (IsPublishable(content))
-                {
-                    //TODO: This is raising events, probably not desirable as this costs performance for event listeners like Examine
-                    SaveAndPublish(content, userId);
-                }
-                else
-                {
-                    //TODO: This is raising events, probably not desirable as this costs performance for event listeners like Examine
-                    Save(content, false, userId);
-
-                    //TODO: This shouldn't be here! This needs to be part of the repository logic but in order to fix this we need to
-                    // change how this method calls "Save" as it needs to save using an internal method
-                    using (var uow = UowProvider.GetUnitOfWork())
-                    {
-                        var xml = _entitySerializer.Serialize(this, _dataTypeService, _userService, content);
-
-                        var poco = new ContentXmlDto { NodeId = content.Id, Xml = xml.ToDataString() };
-                        var exists =
-                            uow.Database.FirstOrDefault<ContentXmlDto>("WHERE nodeId = @Id", new { Id = content.Id }) !=
-                            null;
-                        int result = exists
-                                         ? uow.Database.Update(poco)
-                                         : Convert.ToInt32(uow.Database.Insert(poco));
-                        uow.Commit();
-                    }
-                }
-            }
-            else
-            {
-                //TODO: This is raising events, probably not desirable as this costs performance for event listeners like Examine
-                Save(content, userId);
-            }
-
-            //Ensure that Path and Level is updated on children
-            var children = GetChildren(content.Id).ToArray();
-            if (children.Any())
-            {
-                foreach (var child in children)
-                {
-                    PerformMove(child, content.Id, userId, moveInfo);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Publishes a <see cref="IContent"/> object and all its children
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to publish along with its children</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <param name="includeUnpublished">If set to true, this will also publish descendants that are completely unpublished, normally this will only publish children that have previously been published</param>
-        /// <returns>
-        /// A list of publish statues. If the parent document is not valid or cannot be published because it's parent(s) is not published
-        /// then the list will only contain one status item, otherwise it will contain status items for it and all of it's descendants that
-        /// are to be published.
-        /// </returns>
-        private IEnumerable<Attempt<PublishStatus>> PublishWithChildrenDo(
-            IContent content, int userId = 0, bool includeUnpublished = false)
-        {
-            if (content == null) throw new ArgumentNullException("content");
-
-            var evtMsgs = EventMessagesFactory.Get();
-
-            using (new WriteLock(Locker))
-            {
-                //Hack: this ensures that the entity's path is valid and if not it fixes/persists it
-                //see: http://issues.umbraco.org/issue/U4-9336
-                content.EnsureValidPath(Logger, entity => GetById(entity.ParentId), QuickUpdate);
-
-                var result = new List<Attempt<PublishStatus>>();
-
-                //Check if parent is published (although not if its a root node) - if parent isn't published this Content cannot be published
-                if (content.ParentId != Constants.System.Root && content.ParentId != Constants.System.RecycleBinContent && IsPublishable(content) == false)
-                {
-                    Logger.Info<ContentService>(
-                        string.Format(
-                            "Content '{0}' with Id '{1}' could not be published because its parent or one of its ancestors is not published.",
-                            content.Name, content.Id));
-                    result.Add(Attempt.Fail(new PublishStatus(content, PublishStatusType.FailedPathNotPublished, evtMsgs)));
-                    return result;
-                }
-
-                //Content contains invalid property values and can therefore not be published - fire event?
-                if (!content.IsValid())
-                {
-                    Logger.Info<ContentService>(
-                        string.Format("Content '{0}' with Id '{1}' could not be published because of invalid properties.",
-                                      content.Name, content.Id));
-                    result.Add(
-                        Attempt.Fail(
-                            new PublishStatus(content, PublishStatusType.FailedContentInvalid, evtMsgs)
-                            {
-                                InvalidProperties = ((ContentBase)content).LastInvalidProperties
-                            }));
-                    return result;
-                }
-
-                //Consider creating a Path query instead of recursive method:
-                //var query = Query<IContent>.Builder.Where(x => x.Path.StartsWith(content.Path));
-
-                var updated = new List<IContent>();
-                var list = new List<IContent>();
-                list.Add(content); //include parent item
-                list.AddRange(GetDescendants(content));
-
-                var internalStrategy = _publishingStrategy;
-
-                using (var uow = UowProvider.GetUnitOfWork())
-                {
-                    //Publish and then update the database with new status
-                    var publishedOutcome = internalStrategy.PublishWithChildren(uow, list, userId, includeUnpublished).ToArray();
-                    var published = publishedOutcome
-                        .Where(x => x.Success || x.Result.StatusType == PublishStatusType.SuccessAlreadyPublished)
-                        // ensure proper order (for events) - cannot publish a child before its parent!
-                        .OrderBy(x => x.Result.ContentItem.Level)
-                        .ThenBy(x => x.Result.ContentItem.SortOrder);
-
-                    var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                    //NOTE The Publish with subpages-dialog was used more as a republish-type-thing, so we'll have to include PublishStatusType.SuccessAlreadyPublished
-                    //in the updated-list, so the Published event is triggered with the expected set of pages and the xml is updated.
-                    foreach (var item in published)
-                    {
-                        item.Result.ContentItem.WriterId = userId;
-                        repository.AddOrUpdate(item.Result.ContentItem);
-                        //add or update a preview
-                        repository.AddOrUpdatePreviewXml(item.Result.ContentItem, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-                        //add or update the published xml
-                        repository.AddOrUpdateContentXml(item.Result.ContentItem, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-                        updated.Add(item.Result.ContentItem);
-                    }
-
-                    //Save xml to db and call following method to fire event:
-                    _publishingStrategy.PublishingFinalized(uow, updated, false);
-
-                    Audit(uow, AuditType.Publish, "Publish with Children performed by user", userId, content.Id);
-                    uow.Commit();
-
-                    return publishedOutcome;
-                }
-            }
-        }
-
-        /// <summary>
-        /// UnPublishes a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to publish</param>
-        /// <param name="omitCacheRefresh">Optional boolean to avoid having the cache refreshed when calling this Unpublish method. By default this method will update the cache.</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <returns>True if unpublishing succeeded, otherwise False</returns>
-        private Attempt<UnPublishStatus> UnPublishDo(IContent content, bool omitCacheRefresh = false, int userId = 0)
-        {
-            var newest = GetById(content.Id); // ensure we have the newest version
-            if (content.Version != newest.Version) // but use the original object if it's already the newest version
-                content = newest;
-
-            var evtMsgs = EventMessagesFactory.Get();
-
-            var published = content.Published ? content : GetPublishedVersion(content.Id); // get the published version
-            if (published == null)
-            {
-                return Attempt.Succeed(new UnPublishStatus(content, UnPublishedStatusType.SuccessAlreadyUnPublished, evtMsgs)); // already unpublished
-            }
-
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var unpublished = _publishingStrategy.UnPublish(uow, content, userId);
-                if (unpublished == false)
-                {
-                    uow.Commit();
-                    return Attempt.Fail(new UnPublishStatus(content, UnPublishedStatusType.FailedCancelledByEvent, evtMsgs));
-                }
-
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                content.WriterId = userId;
-                repository.AddOrUpdate(content);
-                // is published is not newest, reset the published flag on published version
-                if (published.Version != content.Version)
-                    repository.ClearPublished(published);
-                repository.DeleteContentXml(content);
-
-                //Delete xml from db? and call following method to fire event through PublishingStrategy to update cache
-                if (omitCacheRefresh == false)
-                    _publishingStrategy.UnPublishingFinalized(uow, content);
-
-                Audit(uow, AuditType.UnPublish, "UnPublish performed by user", userId, content.Id);
-                uow.Commit();
-            }
-
-            return Attempt.Succeed(new UnPublishStatus(content, UnPublishedStatusType.Success, evtMsgs));
-        }
-
-        /// <summary>
-        /// Saves and Publishes a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to save and publish</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise save events.</param>
-        /// <returns>True if publishing succeeded, otherwise False</returns>
-        private Attempt<PublishStatus> SaveAndPublishDo(IContent content, int userId = 0, bool raiseEvents = true)
-        {
-            var evtMsgs = EventMessagesFactory.Get();
-
-            using (new WriteLock(Locker))
-            {
-                using (var uow = UowProvider.GetUnitOfWork())
-                {
-                    var saveEventArgs = new SaveEventArgs<IContent>(content, evtMsgs);
-                    if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
-                    {
-                        uow.Commit();
-                        return Attempt.Fail(new PublishStatus(content, PublishStatusType.FailedCancelledByEvent, evtMsgs));
-                    }
-
-                    //Has this content item previously been published? If so, we don't need to refresh the children
-                    var previouslyPublished = content.HasIdentity && HasPublishedVersion(content.Id); //content might not have an id
-                    var publishStatus = new PublishStatus(content, PublishStatusType.Success, evtMsgs); //initially set to success
-
-                    //Check if parent is published (although not if its a root node) - if parent isn't published this Content cannot be published
-                    publishStatus.StatusType = CheckAndLogIsPublishable(content);
-                    //if it is not successful, then check if the props are valid
-                    if ((int)publishStatus.StatusType < 10)
-                    {
-                        //Content contains invalid property values and can therefore not be published - fire event?
-                        publishStatus.StatusType = CheckAndLogIsValid(content);
-                        //set the invalid properties (if there are any)
-                        publishStatus.InvalidProperties = ((ContentBase)content).LastInvalidProperties;
-                    }
-                    //if we're still successful, then publish using the strategy
-                    if (publishStatus.StatusType == PublishStatusType.Success)
-                    {
-                        //Publish and then update the database with new status
-                        var publishResult = _publishingStrategy.Publish(uow, content, userId);
-                        //set the status type to the publish result
-                        publishStatus.StatusType = publishResult.Result.StatusType;
-                    }
-
-                    //we are successfully published if our publishStatus is still Successful
-                    bool published = publishStatus.StatusType == PublishStatusType.Success;
-
-                    var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                    if (published == false)
-                    {
-                        content.ChangePublishedState(PublishedState.Saved);
-                    }
-                    //Since this is the Save and Publish method, the content should be saved even though the publish fails or isn't allowed
-                    if (content.HasIdentity == false)
-                    {
-                        content.CreatorId = userId;
-                    }
-                    content.WriterId = userId;
-
-                    repository.AddOrUpdate(content);
-                    repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-
-                    if (published)
-                    {
-                        //Content Xml
-                        repository.AddOrUpdateContentXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-                    }
-
-                    if (raiseEvents)
-                    {
-                        saveEventArgs.CanCancel = false;
-                        uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
-                    }
-
-                    //Save xml to db and call following method to fire event through PublishingStrategy to update cache
-                    if (published)
-                    {
-                        _publishingStrategy.PublishingFinalized(uow, content);
-                    }
-
-                    //We need to check if children and their publish state to ensure that we 'republish' content that was previously published
-                    if (published && previouslyPublished == false && HasChildren(content.Id))
-                    {
-                    //TODO: Horrible for performance if there are lots of descendents! We should page if anything but this is crazy
-                        var descendants = GetPublishedDescendants(content);
-                        _publishingStrategy.PublishingFinalized(uow, descendants, false);
-                    }
-
-                    uow.Commit();
-
-                    if (publishStatus.StatusType == PublishStatusType.Success)
-                    {
-                        Audit(uow, AuditType.Publish, "Save and Publish performed by user", userId, content.Id);
-                    }
-                    else
-                    {
-                        Audit(uow, AuditType.Save, "Save performed by user", userId, content.Id);
-                    }
-                    uow.Commit();
-
-                    return Attempt.If(publishStatus.StatusType == PublishStatusType.Success, publishStatus);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Saves a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to save</param>
-        /// <param name="changeState">Boolean indicating whether or not to change the Published state upon saving</param>
-        /// <param name="userId">Optional Id of the User saving the Content</param>
-        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
-        private Attempt<OperationStatus> Save(IContent content, bool changeState, int userId = 0, bool raiseEvents = true)
-        {
-            var evtMsgs = EventMessagesFactory.Get();
-
-            using (new WriteLock(Locker))
-            {
-                using (var uow = UowProvider.GetUnitOfWork())
-                {
-                    var saveEventArgs = new SaveEventArgs<IContent>(content, evtMsgs);
-                    if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
-                    {
-                        uow.Commit();
-                        return OperationStatus.Cancelled(evtMsgs);
-                    }
-
-                    if (string.IsNullOrWhiteSpace(content.Name))
-                    {
-                        throw new ArgumentException("Cannot save content with empty name.");
-                    }
-
-                    var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                    if (content.HasIdentity == false)
-                    {
-                        content.CreatorId = userId;
-                    }
-                    content.WriterId = userId;
-
-                    //Only change the publish state if the "previous" version was actually published or marked as unpublished
-                    if (changeState && (content.Published || ((Content)content).PublishedState == PublishedState.Unpublished))
-                        content.ChangePublishedState(PublishedState.Saved);
-
-                    repository.AddOrUpdate(content);
-
-                    //Generate a new preview
-                    repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-
-                    if (raiseEvents)
-                    {
-                        saveEventArgs.CanCancel = false;
-                        uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
-                    }
-
-                    Audit(uow, AuditType.Save, "Save Content performed by user", userId, content.Id);
-                    uow.Commit();
-                }
-
-                return OperationStatus.Success(evtMsgs);
-            }
-        }
-
-        private PublishStatusType CheckAndLogIsPublishable(IContent content)
-        {
-            //Check if parent is published (although not if its a root node) - if parent isn't published this Content cannot be published
-            if (content.ParentId != Constants.System.Root && content.ParentId != Constants.System.RecycleBinContent && IsPublishable(content) == false)
-            {
-                Logger.Info<ContentService>(
-                    string.Format(
-                        "Content '{0}' with Id '{1}' could not be published because its parent is not published.",
-                        content.Name, content.Id));
-                return PublishStatusType.FailedPathNotPublished;
-            }
-
-            if (content.ExpireDate.HasValue && content.ExpireDate.Value > DateTime.MinValue && DateTime.Now > content.ExpireDate.Value)
-            {
-                Logger.Info<ContentService>(
-                    string.Format(
-                        "Content '{0}' with Id '{1}' has expired and could not be published.",
-                        content.Name, content.Id));
-                return PublishStatusType.FailedHasExpired;
-            }
-
-            if (content.ReleaseDate.HasValue && content.ReleaseDate.Value > DateTime.MinValue && content.ReleaseDate.Value > DateTime.Now)
-            {
-                Logger.Info<ContentService>(
-                    string.Format(
-                        "Content '{0}' with Id '{1}' is awaiting release and could not be published.",
-                        content.Name, content.Id));
-                return PublishStatusType.FailedAwaitingRelease;
-            }
-
-            return PublishStatusType.Success;
-        }
-
-        private PublishStatusType CheckAndLogIsValid(IContent content)
-        {
-            //Content contains invalid property values and can therefore not be published - fire event?
-            if (content.IsValid() == false)
-            {
-                Logger.Info<ContentService>(
-                    string.Format(
-                        "Content '{0}' with Id '{1}' could not be published because of invalid properties.",
-                        content.Name, content.Id));
-                return PublishStatusType.FailedContentInvalid;
-            }
-
-            return PublishStatusType.Success;
-        }
-
-        private IContentType FindContentTypeByAlias(string contentTypeAlias)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentTypeRepository(uow);
-
-                var query = Query<IContentType>.Builder.Where(x => x.Alias == contentTypeAlias);
-                var types = repository.GetByQuery(query);
-
-                if (types.Any() == false)
-                    throw new Exception(
-                        string.Format("No ContentType matching the passed in Alias: '{0}' was found",
-                                      contentTypeAlias));
-
-                var contentType = types.First();
-
-                if (contentType == null)
-                    throw new Exception(string.Format("ContentType matching the passed in Alias: '{0}' was null",
-                                                      contentTypeAlias));
-                return contentType;
-            }
-        }
-
-        #endregion
-
-        #region Proxy Event Handlers
-        /// <summary>
-        /// Occurs before publish.
-        /// </summary>
-        /// <remarks>Proxy to the real event on the <see cref="PublishingStrategy"/></remarks>
-        public static event TypedEventHandler<IPublishingStrategy, PublishEventArgs<IContent>> Publishing
-        {
-            add { PublishingStrategy.Publishing += value; }
-            remove { PublishingStrategy.Publishing -= value; }
-        }
-
-        /// <summary>
-        /// Occurs after publish.
-        /// </summary>
-        /// <remarks>Proxy to the real event on the <see cref="PublishingStrategy"/></remarks>
-        public static event TypedEventHandler<IPublishingStrategy, PublishEventArgs<IContent>> Published
-        {
-            add { PublishingStrategy.Published += value; }
-            remove { PublishingStrategy.Published -= value; }
-        }
-        /// <summary>
-        /// Occurs before unpublish.
-        /// </summary>
-        /// <remarks>Proxy to the real event on the <see cref="PublishingStrategy"/></remarks>
-        public static event TypedEventHandler<IPublishingStrategy, PublishEventArgs<IContent>> UnPublishing
-        {
-            add { PublishingStrategy.UnPublishing += value; }
-            remove { PublishingStrategy.UnPublishing -= value; }
-        }
-
-        /// <summary>
-        /// Occurs after unpublish.
-        /// </summary>
-        /// <remarks>Proxy to the real event on the <see cref="PublishingStrategy"/></remarks>
-        public static event TypedEventHandler<IPublishingStrategy, PublishEventArgs<IContent>> UnPublished
-        {
-            add { PublishingStrategy.UnPublished += value; }
-            remove { PublishingStrategy.UnPublished -= value; }
-        }
-        #endregion
-
-        #region Event Handlers
-        /// <summary>
-        /// Occurs before Delete
-        /// </summary>
-        public static event TypedEventHandler<IContentService, DeleteEventArgs<IContent>> Deleting;
-
-        /// <summary>
-        /// Occurs after Delete
-        /// </summary>
-        public static event TypedEventHandler<IContentService, DeleteEventArgs<IContent>> Deleted;
-
-        /// <summary>
-        /// Occurs before Delete Versions
-        /// </summary>
-        public static event TypedEventHandler<IContentService, DeleteRevisionsEventArgs> DeletingVersions;
-
-        /// <summary>
-        /// Occurs after Delete Versions
-        /// </summary>
-        public static event TypedEventHandler<IContentService, DeleteRevisionsEventArgs> DeletedVersions;
-
-        /// <summary>
-        /// Occurs before Save
-        /// </summary>
-        public static event TypedEventHandler<IContentService, SaveEventArgs<IContent>> Saving;
-
-        /// <summary>
-        /// Occurs after Save
-        /// </summary>
-        public static event TypedEventHandler<IContentService, SaveEventArgs<IContent>> Saved;
-
-        /// <summary>
-        /// Occurs before Create
-        /// </summary>
-        [Obsolete("Use the Created event instead, the Creating and Created events both offer the same functionality, Creating event has been deprecated.")]
-        public static event TypedEventHandler<IContentService, NewEventArgs<IContent>> Creating;
-
-        /// <summary>
-        /// Occurs after Create
-        /// </summary>
-        /// <remarks>
-        /// Please note that the Content object has been created, but might not have been saved
-        /// so it does not have an identity yet (meaning no Id has been set).
-        /// </remarks>
-        public static event TypedEventHandler<IContentService, NewEventArgs<IContent>> Created;
-
-        /// <summary>
-        /// Occurs before Copy
-        /// </summary>
-        public static event TypedEventHandler<IContentService, CopyEventArgs<IContent>> Copying;
-
-        /// <summary>
-        /// Occurs after Copy
-        /// </summary>
-        public static event TypedEventHandler<IContentService, CopyEventArgs<IContent>> Copied;
-
-        /// <summary>
-        /// Occurs before Content is moved to Recycle Bin
-        /// </summary>
-        public static event TypedEventHandler<IContentService, MoveEventArgs<IContent>> Trashing;
-
-        /// <summary>
-        /// Occurs after Content is moved to Recycle Bin
-        /// </summary>
-        public static event TypedEventHandler<IContentService, MoveEventArgs<IContent>> Trashed;
-
-        /// <summary>
-        /// Occurs before Move
-        /// </summary>
-        public static event TypedEventHandler<IContentService, MoveEventArgs<IContent>> Moving;
-
-        /// <summary>
-        /// Occurs after Move
-        /// </summary>
-        public static event TypedEventHandler<IContentService, MoveEventArgs<IContent>> Moved;
-
-        /// <summary>
-        /// Occurs before Rollback
-        /// </summary>
-        public static event TypedEventHandler<IContentService, RollbackEventArgs<IContent>> RollingBack;
-
-        /// <summary>
-        /// Occurs after Rollback
-        /// </summary>
-        public static event TypedEventHandler<IContentService, RollbackEventArgs<IContent>> RolledBack;
-
-        /// <summary>
-        /// Occurs before Send to Publish
-        /// </summary>
-        public static event TypedEventHandler<IContentService, SendToPublishEventArgs<IContent>> SendingToPublish;
-
-        /// <summary>
-        /// Occurs after Send to Publish
-        /// </summary>
-        public static event TypedEventHandler<IContentService, SendToPublishEventArgs<IContent>> SentToPublish;
-
-        /// <summary>
-        /// Occurs before the Recycle Bin is emptied
-        /// </summary>
-        public static event TypedEventHandler<IContentService, RecycleBinEventArgs> EmptyingRecycleBin;
-
-        /// <summary>
-        /// Occurs after the Recycle Bin has been Emptied
-        /// </summary>
-        public static event TypedEventHandler<IContentService, RecycleBinEventArgs> EmptiedRecycleBin;
-
-        /// <summary>
-        /// Occurs after a blueprint has been saved.
-        /// </summary>
-        public static event TypedEventHandler<IContentService, SaveEventArgs<IContent>> SavedBlueprint;
-
-        /// <summary>
-        /// Occurs after a blueprint has been deleted.
-        /// </summary>
-        public static event TypedEventHandler<IContentService, DeleteEventArgs<IContent>> DeletedBlueprint;
-
-        #endregion
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Xml;
+using System.Xml.Linq;
+using Umbraco.Core.Events;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.Membership;
+using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
+using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.UnitOfWork;
+using Umbraco.Core.Publishing;
+
+namespace Umbraco.Core.Services
+{
+    /// <summary>
+    /// Represents the Content Service, which is an easy access to operations involving <see cref="IContent"/>
+    /// </summary>
+    public class ContentService : ScopeRepositoryService, IContentService, IContentServiceOperations
+    {
+        private readonly IPublishingStrategy2 _publishingStrategy;
+        private readonly EntityXmlSerializer _entitySerializer = new EntityXmlSerializer();
+        private readonly IDataTypeService _dataTypeService;
+        private readonly IUserService _userService;
+
+        //Support recursive locks because some of the methods that require locking call other methods that require locking.
+        //for example, the Move method needs to be locked but this calls the Save method which also needs to be locked.
+        private static readonly ReaderWriterLockSlim Locker = new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion);
+
+        public ContentService(
+            IDatabaseUnitOfWorkProvider provider,
+            RepositoryFactory repositoryFactory,
+            ILogger logger,
+            IEventMessagesFactory eventMessagesFactory,
+            IDataTypeService dataTypeService,
+            IUserService userService)
+            : base(provider, repositoryFactory, logger, eventMessagesFactory)
+        {
+            if (dataTypeService == null) throw new ArgumentNullException("dataTypeService");
+            if (userService == null) throw new ArgumentNullException("userService");
+            _publishingStrategy = new PublishingStrategy(UowProvider.ScopeProvider, eventMessagesFactory, logger);
+            _dataTypeService = dataTypeService;
+            _userService = userService;
+        }
+
+        #region Static Queries
+
+        private IQuery<IContent> _notTrashedQuery;
+
+        #endregion
+
+        public int CountPublished(string contentTypeAlias = null)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                return repository.CountPublished(contentTypeAlias);
+            }
+        }
+
+        public int Count(string contentTypeAlias = null)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                return repository.Count(contentTypeAlias);
+            }
+        }
+
+        public int CountChildren(int parentId, string contentTypeAlias = null)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                return repository.CountChildren(parentId, contentTypeAlias);
+            }
+        }
+
+        public int CountDescendants(int parentId, string contentTypeAlias = null)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                return repository.CountDescendants(parentId, contentTypeAlias);
+            }
+        }
+
+        /// <summary>
+        /// Used to bulk update the permissions set for a content item. This will replace all permissions
+        /// assigned to an entity with a list of user id & permission pairs.
+        /// </summary>
+        /// <param name="permissionSet"></param>
+        public void ReplaceContentPermissions(EntityPermissionSet permissionSet)
+        {
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                repository.ReplaceContentPermissions(permissionSet);
+                uow.Commit();
+            }
+        }
+
+        /// <summary>
+        /// Assigns a single permission to the current content item for the specified group ids
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <param name="permission"></param>
+        /// <param name="groupIds"></param>
+        public void AssignContentPermission(IContent entity, char permission, IEnumerable<int> groupIds)
+        {
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                repository.AssignEntityPermission(entity, permission, groupIds);
+                uow.Commit();
+            }
+        }
+
+        /// <summary>
+        /// Returns implicit/inherited permissions assigned to the content item for all user groups
+        /// </summary>
+        /// <param name="content"></param>
+        /// <returns></returns>
+        public EntityPermissionCollection GetPermissionsForEntity(IContent content)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                return repository.GetPermissionsForEntity(content.Id);
+            }
+        }
+
+        /// <summary>
+        /// Creates an <see cref="IContent"/> object using the alias of the <see cref="IContentType"/>
+        /// that this Content should based on.
+        /// </summary>
+        /// <remarks>
+        /// Note that using this method will simply return a new IContent without any identity
+        /// as it has not yet been persisted. It is intended as a shortcut to creating new content objects
+        /// that does not invoke a save operation against the database.
+        /// </remarks>
+        /// <param name="name">Name of the Content object</param>
+        /// <param name="parentId">Id of Parent for the new Content</param>
+        /// <param name="contentTypeAlias">Alias of the <see cref="IContentType"/></param>
+        /// <param name="userId">Optional id of the user creating the content</param>
+        /// <returns><see cref="IContent"/></returns>
+        public IContent CreateContent(string name, Guid parentId, string contentTypeAlias, int userId = 0)
+        {
+            var parent = GetById(parentId);
+            return CreateContent(name, parent, contentTypeAlias, userId);
+        }
+
+        /// <summary>
+        /// Creates an <see cref="IContent"/> object using the alias of the <see cref="IContentType"/>
+        /// that this Content should based on.
+        /// </summary>
+        /// <remarks>
+        /// Note that using this method will simply return a new IContent without any identity
+        /// as it has not yet been persisted. It is intended as a shortcut to creating new content objects
+        /// that does not invoke a save operation against the database.
+        /// </remarks>
+        /// <param name="name">Name of the Content object</param>
+        /// <param name="parentId">Id of Parent for the new Content</param>
+        /// <param name="contentTypeAlias">Alias of the <see cref="IContentType"/></param>
+        /// <param name="userId">Optional id of the user creating the content</param>
+        /// <returns><see cref="IContent"/></returns>
+        public IContent CreateContent(string name, int parentId, string contentTypeAlias, int userId = 0)
+        {
+            var contentType = FindContentTypeByAlias(contentTypeAlias);
+            var content = new Content(name, parentId, contentType);
+            var parent = GetById(content.ParentId);
+            content.Path = string.Concat(parent.IfNotNull(x => x.Path, content.ParentId.ToString()), ",", content.Id);
+
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var newEventArgs = new NewEventArgs<IContent>(content, contentTypeAlias, parentId);
+                if (uow.Events.DispatchCancelable(Creating, this, newEventArgs))
+                {
+                    uow.Commit();
+                    content.WasCancelled = true;
+                    return content;
+                }
+
+                content.CreatorId = userId;
+                content.WriterId = userId;
+                newEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Created, this, newEventArgs);
+
+                uow.Commit();
+            }
+
+            return content;
+        }
+
+        /// <summary>
+        /// Creates an <see cref="IContent"/> object using the alias of the <see cref="IContentType"/>
+        /// that this Content should based on.
+        /// </summary>
+        /// <remarks>
+        /// Note that using this method will simply return a new IContent without any identity
+        /// as it has not yet been persisted. It is intended as a shortcut to creating new content objects
+        /// that does not invoke a save operation against the database.
+        /// </remarks>
+        /// <param name="name">Name of the Content object</param>
+        /// <param name="parent">Parent <see cref="IContent"/> object for the new Content</param>
+        /// <param name="contentTypeAlias">Alias of the <see cref="IContentType"/></param>
+        /// <param name="userId">Optional id of the user creating the content</param>
+        /// <returns><see cref="IContent"/></returns>
+        public IContent CreateContent(string name, IContent parent, string contentTypeAlias, int userId = 0)
+        {
+            if (parent == null) throw new ArgumentNullException("parent");
+
+            var contentType = FindContentTypeByAlias(contentTypeAlias);
+            var content = new Content(name, parent, contentType);
+            content.Path = string.Concat(parent.Path, ",", content.Id);
+
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var newEventArgs = new NewEventArgs<IContent>(content, contentTypeAlias, parent);
+                if (uow.Events.DispatchCancelable(Creating, this, newEventArgs))
+                {
+                    uow.Commit();
+                    content.WasCancelled = true;
+                    return content;
+                }
+
+                content.CreatorId = userId;
+                content.WriterId = userId;
+                newEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Created, this, newEventArgs);
+
+                uow.Commit();
+            }
+
+            return content;
+        }
+
+        /// <summary>
+        /// Creates and saves an <see cref="IContent"/> object using the alias of the <see cref="IContentType"/>
+        /// that this Content should based on.
+        /// </summary>
+        /// <remarks>
+        /// This method returns an <see cref="IContent"/> object that has been persisted to the database
+        /// and therefor has an identity.
+        /// </remarks>
+        /// <param name="name">Name of the Content object</param>
+        /// <param name="parentId">Id of Parent for the new Content</param>
+        /// <param name="contentTypeAlias">Alias of the <see cref="IContentType"/></param>
+        /// <param name="userId">Optional id of the user creating the content</param>
+        /// <returns><see cref="IContent"/></returns>
+        public IContent CreateContentWithIdentity(string name, int parentId, string contentTypeAlias, int userId = 0)
+        {
+            var contentType = FindContentTypeByAlias(contentTypeAlias);
+            var content = new Content(name, parentId, contentType);
+
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                //NOTE: I really hate the notion of these Creating/Created events - they are so inconsistent, I've only just found
+                // out that in these 'WithIdentity' methods, the Saving/Saved events were not fired, wtf. Anyways, they're added now.
+                var newEventArgs = new NewEventArgs<IContent>(content, contentTypeAlias, parentId);
+                if (uow.Events.DispatchCancelable(Creating, this, newEventArgs))
+                {
+                    uow.Commit();
+                    content.WasCancelled = true;
+                    return content;
+                }
+
+                var saveEventArgs = new SaveEventArgs<IContent>(content);
+                if (uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
+                {
+                    uow.Commit();
+                    content.WasCancelled = true;
+                    return content;
+                }
+
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                content.CreatorId = userId;
+                content.WriterId = userId;
+
+                repository.AddOrUpdate(content);
+                repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                saveEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
+                newEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Created, this, newEventArgs);
+
+                Audit(uow, AuditType.New, string.Format("Content '{0}' was created with Id {1}", name, content.Id), content.CreatorId, content.Id);
+                uow.Commit();
+            }
+
+            return content;
+        }
+
+        public IList<string> GetAnchorValuesFromRTEs(int id)
+        {
+            var result = new List<string>();
+
+            var content = GetById(id);
+
+            foreach (var contentProperty in content.Properties)
+            {
+                if (string.Equals(contentProperty.PropertyType.PropertyEditorAlias, Constants.PropertyEditors.TinyMCEAlias))
+                {
+                    var value = contentProperty.Value.ToString();
+
+                    result.AddRange(GetAnchorValuesFromRTEContent(value));
+                }
+            }
+
+
+            return result;
+        }
+
+        public IList<string> GetAnchorValuesFromRTEContent(string rteContent)
+        {
+            var result = new List<string>();
+            var regex = new Regex("<a id=\"(.*?)\">");
+            var matches = regex.Matches(rteContent);
+
+            foreach (Match match in matches)
+            {
+                result.Add(match.Value.Split('\"')[1]);
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Creates and saves an <see cref="IContent"/> object using the alias of the <see cref="IContentType"/>
+        /// that this Content should based on.
+        /// </summary>
+        /// <remarks>
+        /// This method returns an <see cref="IContent"/> object that has been persisted to the database
+        /// and therefor has an identity.
+        /// </remarks>
+        /// <param name="name">Name of the Content object</param>
+        /// <param name="parent">Parent <see cref="IContent"/> object for the new Content</param>
+        /// <param name="contentTypeAlias">Alias of the <see cref="IContentType"/></param>
+        /// <param name="userId">Optional id of the user creating the content</param>
+        /// <returns><see cref="IContent"/></returns>
+        public IContent CreateContentWithIdentity(string name, IContent parent, string contentTypeAlias, int userId = 0)
+        {
+            if (parent == null) throw new ArgumentNullException("parent");
+
+            var contentType = FindContentTypeByAlias(contentTypeAlias);
+            var content = new Content(name, parent, contentType);
+
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                //NOTE: I really hate the notion of these Creating/Created events - they are so inconsistent, I've only just found
+                // out that in these 'WithIdentity' methods, the Saving/Saved events were not fired, wtf. Anyways, they're added now.
+                var newEventArgs = new NewEventArgs<IContent>(content, contentTypeAlias, parent);
+                if (uow.Events.DispatchCancelable(Creating, this, newEventArgs))
+                {
+                    uow.Commit();
+                    content.WasCancelled = true;
+                    return content;
+                }
+
+                var saveEventArgs = new SaveEventArgs<IContent>(content);
+                if (uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
+                {
+                    uow.Commit();
+                    content.WasCancelled = true;
+                    return content;
+                }
+
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                content.CreatorId = userId;
+                content.WriterId = userId;
+
+                repository.AddOrUpdate(content);
+                repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                saveEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
+                newEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Created, this, newEventArgs);
+
+                Audit(uow, AuditType.New, string.Format("Content '{0}' was created with Id {1}", name, content.Id), content.CreatorId, content.Id);
+                uow.Commit();
+            }
+
+            return content;
+        }
+
+        /// <summary>
+        /// Gets an <see cref="IContent"/> object by Id
+        /// </summary>
+        /// <param name="id">Id of the Content to retrieve</param>
+        /// <returns><see cref="IContent"/></returns>
+        public IContent GetById(int id)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                return repository.Get(id);
+            }
+        }
+
+        /// <summary>
+        /// Gets <see cref="IContent"/> objects by Ids
+        /// </summary>
+        /// <param name="ids">Ids of the Content to retrieve</param>
+        /// <returns><see cref="IContent"/></returns>
+        public IEnumerable<IContent> GetByIds(IEnumerable<int> ids)
+        {
+            var idsArray = ids.ToArray();
+            if (idsArray.Length == 0) return Enumerable.Empty<IContent>();
+
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                // ensure that the result has the order based on the ids passed in
+                var result = repository.GetAll(idsArray);
+                var content = result.ToDictionary(x => x.Id, x => x);
+
+                var sortedResult = idsArray.Select(x =>
+                {
+                    IContent c;
+                    return content.TryGetValue(x, out c) ? c : null;
+                }).WhereNotNull();
+
+                return sortedResult;
+            }
+        }
+
+        /// <summary>
+        /// Gets <see cref="IContent"/> objects by Ids
+        /// </summary>
+        /// <param name="ids">Ids of the Content to retrieve</param>
+        /// <returns><see cref="IContent"/></returns>
+        public IEnumerable<IContent> GetByIds(IEnumerable<Guid> ids)
+        {
+            var idsArray = ids.ToArray();
+            if (idsArray.Length == 0) return Enumerable.Empty<IContent>();
+
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                // ensure that the result has the order based on the ids passed in
+                var result = repository.GetAll(idsArray);
+                var content = result.ToDictionary(x => x.Key, x => x);
+
+                var sortedResult = idsArray.Select(x =>
+                {
+                    IContent c;
+                    return content.TryGetValue(x, out c) ? c : null;
+                }).WhereNotNull();
+
+                return sortedResult;
+            }
+        }
+
+        /// <summary>
+        /// Gets an <see cref="IContent"/> object by its 'UniqueId'
+        /// </summary>
+        /// <param name="key">Guid key of the Content to retrieve</param>
+        /// <returns><see cref="IContent"/></returns>
+        public IContent GetById(Guid key)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                return repository.Get(key);
+            }
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects by the Id of the <see cref="IContentType"/>
+        /// </summary>
+        /// <param name="id">Id of the <see cref="IContentType"/></param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetContentOfContentType(int id)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                var query = Query<IContent>.Builder.Where(x => x.ContentTypeId == id);
+                return repository.GetByQuery(query);
+            }
+        }
+
+        internal IEnumerable<IContent> GetPublishedContentOfContentType(int id)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                var query = Query<IContent>.Builder.Where(x => x.ContentTypeId == id);
+                return repository.GetByPublishedVersion(query);
+            }
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects by Level
+        /// </summary>
+        /// <param name="level">The level to retrieve Content from</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetByLevel(int level)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                var query = Query<IContent>.Builder.Where(x => x.Level == level && x.Path.StartsWith(Constants.System.RecycleBinContent.ToInvariantString()) == false);
+                return repository.GetByQuery(query);
+            }
+        }
+
+        /// <summary>
+        /// Gets a specific version of an <see cref="IContent"/> item.
+        /// </summary>
+        /// <param name="versionId">Id of the version to retrieve</param>
+        /// <returns>An <see cref="IContent"/> item</returns>
+        public IContent GetByVersion(Guid versionId)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                return repository.GetByVersion(versionId);
+            }
+        }
+
+
+        /// <summary>
+        /// Gets a collection of an <see cref="IContent"/> objects versions by Id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetVersions(int id)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                return repository.GetAllVersions(id);
+            }
+        }
+
+        /// <summary>
+        /// Gets a list of all version Ids for the given content item ordered so latest is first
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="maxRows">The maximum number of rows to return</param>
+        /// <returns></returns>
+        public IEnumerable<Guid> GetVersionIds(int id, int maxRows)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                return repository.GetVersionIds(id, maxRows);
+            }
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects, which are ancestors of the current content.
+        /// </summary>
+        /// <param name="id">Id of the <see cref="IContent"/> to retrieve ancestors for</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetAncestors(int id)
+        {
+            var content = GetById(id);
+            return GetAncestors(content);
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects, which are ancestors of the current content.
+        /// </summary>
+        /// <param name="content"><see cref="IContent"/> to retrieve ancestors for</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetAncestors(IContent content)
+        {
+            //null check otherwise we get exceptions
+            if (content.Path.IsNullOrWhiteSpace()) return Enumerable.Empty<IContent>();
+
+            var ids = content.Path.Split(',').Where(x => x != Constants.System.Root.ToInvariantString() && x != content.Id.ToString(CultureInfo.InvariantCulture)).Select(int.Parse).ToArray();
+            if (ids.Any() == false)
+                return new List<IContent>();
+
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                return repository.GetAll(ids);
+            }
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
+        /// </summary>
+        /// <param name="id">Id of the Parent to retrieve Children from</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetChildren(int id)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                var query = Query<IContent>.Builder.Where(x => x.ParentId == id);
+                return repository.GetByQuery(query).OrderBy(x => x.SortOrder);
+            }
+        }
+
+        [Obsolete("Use the overload with 'long' parameter types instead")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public IEnumerable<IContent> GetPagedChildren(int id, int pageIndex, int pageSize, out int totalChildren,
+            string orderBy, Direction orderDirection, string filter = "")
+        {
+            long total;
+            var result = GetPagedChildren(id, Convert.ToInt64(pageIndex), pageSize, out total, orderBy, orderDirection, true, filter);
+            totalChildren = Convert.ToInt32(total);
+            return result;
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
+        /// </summary>
+        /// <param name="id">Id of the Parent to retrieve Children from</param>
+        /// <param name="pageIndex">Page index (zero based)</param>
+        /// <param name="pageSize">Page size</param>
+        /// <param name="totalChildren">Total records query would return without paging</param>
+        /// <param name="orderBy">Field to order by</param>
+        /// <param name="orderDirection">Direction to order by</param>
+        /// <param name="filter">Search text filter</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetPagedChildren(int id, long pageIndex, int pageSize, out long totalChildren,
+            string orderBy, Direction orderDirection, string filter = "")
+        {
+            return GetPagedChildren(id, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, true, filter);
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
+        /// </summary>
+        /// <param name="id">Id of the Parent to retrieve Children from</param>
+        /// <param name="pageIndex">Page index (zero based)</param>
+        /// <param name="pageSize">Page size</param>
+        /// <param name="totalChildren">Total records query would return without paging</param>
+        /// <param name="orderBy">Field to order by</param>
+        /// <param name="orderDirection">Direction to order by</param>
+        /// <param name="orderBySystemField">Flag to indicate when ordering by system field</param>
+        /// <param name="filter">Search text filter</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetPagedChildren(int id, long pageIndex, int pageSize, out long totalChildren,
+            string orderBy, Direction orderDirection, bool orderBySystemField, string filter)
+        {
+            Mandate.ParameterCondition(pageIndex >= 0, "pageIndex");
+            Mandate.ParameterCondition(pageSize > 0, "pageSize");
+
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                var query = Query<IContent>.Builder;
+                // always check for a parent - else it will also get decendants (and then you should use the GetPagedDescendants method)
+                query.Where(x => x.ParentId == id);
+
+                IQuery<IContent> filterQuery = null;
+                if (filter.IsNullOrWhiteSpace() == false)
+                {
+                    filterQuery = Query<IContent>.Builder.Where(x => x.Name.Contains(filter));
+                }
+                return repository.GetPagedResultsByQuery(query, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, orderBySystemField, filterQuery);
+            }
+        }
+
+        [Obsolete("Use the overload with 'long' parameter types instead")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public IEnumerable<IContent> GetPagedDescendants(int id, int pageIndex, int pageSize, out int totalChildren, string orderBy = "path", Direction orderDirection = Direction.Ascending, string filter = "")
+        {
+            long total;
+            var result = GetPagedDescendants(id, Convert.ToInt64(pageIndex), pageSize, out total, orderBy, orderDirection, true, filter);
+            totalChildren = Convert.ToInt32(total);
+            return result;
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
+        /// </summary>
+        /// <param name="id">Id of the Parent to retrieve Descendants from</param>
+        /// <param name="pageIndex">Page number</param>
+        /// <param name="pageSize">Page size</param>
+        /// <param name="totalChildren">Total records query would return without paging</param>
+        /// <param name="orderBy">Field to order by</param>
+        /// <param name="orderDirection">Direction to order by</param>
+        /// <param name="filter">Search text filter</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetPagedDescendants(int id, long pageIndex, int pageSize, out long totalChildren, string orderBy = "path", Direction orderDirection = Direction.Ascending, string filter = "")
+        {
+            return GetPagedDescendants(id, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, true, filter);
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
+        /// </summary>
+        /// <param name="id">Id of the Parent to retrieve Descendants from</param>
+        /// <param name="pageIndex">Page number</param>
+        /// <param name="pageSize">Page size</param>
+        /// <param name="totalChildren">Total records query would return without paging</param>
+        /// <param name="orderBy">Field to order by</param>
+        /// <param name="orderDirection">Direction to order by</param>
+        /// <param name="orderBySystemField">Flag to indicate when ordering by system field</param>
+        /// <param name="filter">Search text filter</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetPagedDescendants(int id, long pageIndex, int pageSize, out long totalChildren, string orderBy, Direction orderDirection, bool orderBySystemField, string filter)
+        {
+            Mandate.ParameterCondition(pageIndex >= 0, "pageIndex");
+            Mandate.ParameterCondition(pageSize > 0, "pageSize");
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                // get query - if the id is System Root, then just get all
+                var query = Query<IContent>.Builder;
+                if (id != Constants.System.Root)
+                {
+                    var entityRepository = RepositoryFactory.CreateEntityRepository(uow);
+                    var contentPath = entityRepository.GetAllPaths(Constants.ObjectTypes.DocumentGuid, id).ToArray();
+                    if (contentPath.Length == 0)
+                    {
+                        totalChildren = 0;
+                        return Enumerable.Empty<IContent>();
+                    }
+                    query.Where(x => x.Path.SqlStartsWith(string.Format("{0},", contentPath[0].Path), TextColumnType.NVarchar));
+                }
+
+
+                // get filter
+                IQuery<IContent> filterQuery = null;
+                if (filter.IsNullOrWhiteSpace() == false)
+                    filterQuery = Query<IContent>.Builder.Where(x => x.Name.Contains(filter));
+
+                return repository.GetPagedResultsByQuery(query, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, orderBySystemField, filterQuery);
+            }
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
+        /// </summary>
+        /// <param name="id">Id of the Parent to retrieve Descendants from</param>
+        /// <param name="pageIndex">Page number</param>
+        /// <param name="pageSize">Page size</param>
+        /// <param name="totalChildren">Total records query would return without paging</param>
+        /// <param name="orderBy">Field to order by</param>
+        /// <param name="orderDirection">Direction to order by</param>
+        /// <param name="orderBySystemField">Flag to indicate when ordering by system field</param>
+        /// <param name="filter">Search filter</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetPagedDescendants(int id, long pageIndex, int pageSize, out long totalChildren, string orderBy, Direction orderDirection, bool orderBySystemField, IQuery<IContent> filter)
+        {
+            Mandate.ParameterCondition(pageIndex >= 0, "pageIndex");
+            Mandate.ParameterCondition(pageSize > 0, "pageSize");
+
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                // get query - if the id is System Root, then just get all
+                var query = Query<IContent>.Builder;
+                if (id != Constants.System.Root)
+                {
+                    var entityRepository = RepositoryFactory.CreateEntityRepository(uow);
+                    var contentPath = entityRepository.GetAllPaths(Constants.ObjectTypes.DocumentGuid, id).ToArray();
+                    if (contentPath.Length == 0)
+                    {
+                        totalChildren = 0;
+                        return Enumerable.Empty<IContent>();
+                    }
+                    query.Where(x => x.Path.SqlStartsWith(string.Format("{0},", contentPath[0].Path), TextColumnType.NVarchar));
+                }
+
+                return repository.GetPagedResultsByQuery(query, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, orderBySystemField, filter);
+            }
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects by its name or partial name
+        /// </summary>
+        /// <param name="parentId">Id of the Parent to retrieve Children from</param>
+        /// <param name="name">Full or partial name of the children</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetChildrenByName(int parentId, string name)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                var query = Query<IContent>.Builder.Where(x => x.ParentId == parentId && x.Name.Contains(name));
+                return repository.GetByQuery(query);
+            }
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
+        /// </summary>
+        /// <param name="id">Id of the Parent to retrieve Descendants from</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetDescendants(int id)
+        {
+            var content = GetById(id);
+            return content == null ? Enumerable.Empty<IContent>() : GetDescendants(content);
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
+        /// </summary>
+        /// <param name="content"><see cref="IContent"/> item to retrieve Descendants from</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetDescendants(IContent content)
+        {
+            //This is a check to ensure that the path is correct for this entity to avoid problems like: http://issues.umbraco.org/issue/U4-9336 due to data corruption
+            if (content.ValidatePath() == false)
+                throw new InvalidDataException(string.Format("The content item {0} has an invalid path: {1} with parentID: {2}", content.Id, content.Path, content.ParentId));
+
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                var pathMatch = content.Path + ",";
+                var query = Query<IContent>.Builder.Where(x => x.Path.StartsWith(pathMatch) && x.Id != content.Id);
+                return repository.GetByQuery(query);
+            }
+        }
+
+        /// <summary>
+        /// Gets the parent of the current content as an <see cref="IContent"/> item.
+        /// </summary>
+        /// <param name="id">Id of the <see cref="IContent"/> to retrieve the parent from</param>
+        /// <returns>Parent <see cref="IContent"/> object</returns>
+        public IContent GetParent(int id)
+        {
+            var content = GetById(id);
+            return GetParent(content);
+        }
+
+        /// <summary>
+        /// Gets the parent of the current content as an <see cref="IContent"/> item.
+        /// </summary>
+        /// <param name="content"><see cref="IContent"/> to retrieve the parent from</param>
+        /// <returns>Parent <see cref="IContent"/> object</returns>
+        public IContent GetParent(IContent content)
+        {
+            if (content.ParentId == Constants.System.Root || content.ParentId == Constants.System.RecycleBinContent)
+                return null;
+
+            return GetById(content.ParentId);
+        }
+
+        /// <summary>
+        /// Gets the published version of an <see cref="IContent"/> item
+        /// </summary>
+        /// <param name="id">Id of the <see cref="IContent"/> to retrieve version from</param>
+        /// <returns>An <see cref="IContent"/> item</returns>
+        public IContent GetPublishedVersion(int id)
+        {
+            var version = GetVersions(id);
+            return version.FirstOrDefault(x => x.Published);
+        }
+
+        /// <summary>
+        /// Gets the published version of a <see cref="IContent"/> item.
+        /// </summary>
+        /// <param name="content">The content item.</param>
+        /// <returns>The published version, if any; otherwise, null.</returns>
+        public IContent GetPublishedVersion(IContent content)
+        {
+            if (content.Published) return content;
+            return content.HasPublishedVersion
+                ? GetByVersion(content.PublishedVersionGuid)
+                : null;
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects, which reside at the first level / root
+        /// </summary>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetRootContent()
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                var query = Query<IContent>.Builder.Where(x => x.ParentId == Constants.System.Root);
+                return repository.GetByQuery(query);
+            }
+        }
+
+        /// <summary>
+        /// Gets all published content items
+        /// </summary>
+        /// <returns></returns>
+        internal IEnumerable<IContent> GetAllPublished()
+        {
+            //create it once if it is needed (no need for locking here)
+            if (_notTrashedQuery == null)
+            {
+                _notTrashedQuery = Query<IContent>.Builder.Where(x => x.Trashed == false);
+            }
+
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                return repository.GetByPublishedVersion(_notTrashedQuery);
+            }
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects, which has an expiration date less than or equal to today.
+        /// </summary>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetContentForExpiration()
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                var query = Query<IContent>.Builder.Where(x => x.ExpireDate <= DateTime.Now);
+                return repository.GetByQuery(query).Where(x => x.HasPublishedVersion);
+            }
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects, which has a release date less than or equal to today.
+        /// </summary>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetContentForRelease()
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                var query = Query<IContent>.Builder.Where(x => x.Published == false && x.ReleaseDate <= DateTime.Now);
+                return repository.GetByQuery(query);
+            }
+        }
+
+        /// <summary>
+        /// Gets a collection of an <see cref="IContent"/> objects, which resides in the Recycle Bin
+        /// </summary>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetContentInRecycleBin()
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                var query = Query<IContent>.Builder.Where(x => x.Path.StartsWith(Constants.System.RecycleBinContentPathPrefix));
+                return repository.GetByQuery(query);
+            }
+        }
+
+        /// <summary>
+        /// Checks whether an <see cref="IContent"/> item has any children
+        /// </summary>
+        /// <param name="id">Id of the <see cref="IContent"/></param>
+        /// <returns>True if the content has any children otherwise False</returns>
+        public bool HasChildren(int id)
+        {
+            return CountChildren(id) > 0;
+        }
+
+        internal int CountChildren(int id)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                var query = Query<IContent>.Builder.Where(x => x.ParentId == id);
+                return repository.Count(query);
+            }
+        }
+
+        /// <summary>
+        /// Checks whether an <see cref="IContent"/> item has any published versions
+        /// </summary>
+        /// <param name="id">Id of the <see cref="IContent"/></param>
+        /// <returns>True if the content has any published version otherwise False</returns>
+        public bool HasPublishedVersion(int id)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                var query = Query<IContent>.Builder.Where(x => x.Published == true && x.Id == id && x.Trashed == false);
+                return repository.Count(query) > 0;
+            }
+        }
+
+        /// <summary>
+        /// Checks if the passed in <see cref="IContent"/> can be published based on the anscestors publish state.
+        /// </summary>
+        /// <param name="content"><see cref="IContent"/> to check if anscestors are published</param>
+        /// <returns>True if the Content can be published, otherwise False</returns>
+        public bool IsPublishable(IContent content)
+        {
+            int[] ids;
+            if (content.HasIdentity)
+            {
+                // get ids from path (we have identity)
+                // skip the first one that has to be -1 - and we don't care
+                // skip the last one that has to be "this" - and it's ok to stop at the parent
+                ids = content.Path.Split(',').Skip(1).SkipLast().Select(int.Parse).ToArray();
+            }
+            else
+            {
+                // no path yet (no identity), have to move up to parent
+                // skip the first one that has to be -1 - and we don't care
+                // don't skip the last one that is "parent"
+                var parent = GetById(content.ParentId);
+                if (parent == null) return false;
+                ids = parent.Path.Split(',').Skip(1).Select(int.Parse).ToArray();
+            }
+            if (ids.Length == 0)
+                return false;
+
+            // if the first one is recycle bin, fail fast
+            if (ids[0] == Constants.System.RecycleBinContent)
+                return false;
+
+            // fixme - move to repository?
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var sql = new Sql(@"
+                    SELECT id
+                    FROM umbracoNode
+                    JOIN cmsDocument ON umbracoNode.id=cmsDocument.nodeId AND cmsDocument.published=@0
+                    WHERE umbracoNode.trashed=@1 AND umbracoNode.id IN (@2)",
+                    true, false, ids);
+                var x = uow.Database.Fetch<int>(sql);
+                return ids.Length == x.Count;
+            }
+        }
+
+        /// <summary>
+        /// This will rebuild the xml structures for content in the database.
+        /// </summary>
+        /// <param name="userId">This is not used for anything</param>
+        /// <returns>True if publishing succeeded, otherwise False</returns>
+        /// <remarks>
+        /// This is used for when a document type alias or a document type property is changed, the xml will need to
+        /// be regenerated.
+        /// </remarks>
+        public bool RePublishAll(int userId = 0)
+        {
+            try
+            {
+                RebuildXmlStructures();
+                return true;
+            }
+            catch (Exception ex)
+            {
+                Logger.Error<ContentService>("An error occurred executing RePublishAll", ex);
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// This will rebuild the xml structures for content in the database.
+        /// </summary>
+        /// <param name="contentTypeIds">
+        /// If specified will only rebuild the xml for the content type's specified, otherwise will update the structure
+        /// for all published content.
+        /// </param>
+        internal void RePublishAll(params int[] contentTypeIds)
+        {
+            try
+            {
+                RebuildXmlStructures(contentTypeIds);
+            }
+            catch (Exception ex)
+            {
+                Logger.Error<ContentService>("An error occurred executing RePublishAll", ex);
+            }
+        }
+
+        /// <summary>
+        /// Publishes a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to publish</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <returns>True if publishing succeeded, otherwise False</returns>
+        public bool Publish(IContent content, int userId = 0)
+        {
+            var result = SaveAndPublishDo(content, userId);
+            Logger.Info<ContentService>("Call was made to ContentService.Publish, use PublishWithStatus instead since that method will provide more detailed information on the outcome");
+            return result.Success;
+        }
+
+        /// <summary>
+        /// Publishes a <see cref="IContent"/> object and all its children
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to publish along with its children</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <param name="includeUnpublished"></param>
+        /// <returns>The list of statuses for all published items</returns>
+        IEnumerable<Attempt<PublishStatus>> IContentServiceOperations.PublishWithChildren(IContent content, int userId, bool includeUnpublished)
+        {
+            return PublishWithChildrenDo(content, userId, includeUnpublished);
+        }
+
+        /// <summary>
+        /// Saves and Publishes a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to save and publish</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise save events.</param>
+        /// <returns>True if publishing succeeded, otherwise False</returns>
+        Attempt<PublishStatus> IContentServiceOperations.SaveAndPublish(IContent content, int userId, bool raiseEvents)
+        {
+            return SaveAndPublishDo(content, userId, raiseEvents);
+        }
+
+        /// <summary>
+        /// Deletes an <see cref="IContent"/> object by moving it to the Recycle Bin
+        /// </summary>
+        /// <remarks>Move an item to the Recycle Bin will result in the item being unpublished</remarks>
+        /// <param name="content">The <see cref="IContent"/> to delete</param>
+        /// <param name="userId">Optional Id of the User deleting the Content</param>
+        Attempt<OperationStatus> IContentServiceOperations.MoveToRecycleBin(IContent content, int userId)
+        {
+            return MoveToRecycleBinDo(content, userId, false);
+        }
+
+        /// <summary>
+        /// Deletes an <see cref="IContent"/> object by moving it to the Recycle Bin
+        /// </summary>
+        /// <remarks>Move an item to the Recycle Bin will result in the item being unpublished</remarks>
+        /// <param name="content">The <see cref="IContent"/> to delete</param>
+        /// <param name="userId">Optional Id of the User deleting the Content</param>
+        /// <param name="ignoreDescendants">
+        /// A boolean indicating to ignore this item's descendant list from also being moved to the recycle bin. This is required for the DeleteContentOfTypes method
+        /// because it has already looked up all descendant nodes that will need to be recycled
+        /// TODO: Fix all of this, it will require a reasonable refactor and most of this stuff should be done at the repo level instead of service sub operations
+        /// </param>
+        private Attempt<OperationStatus> MoveToRecycleBinDo(IContent content, int userId, bool ignoreDescendants)
+        {
+            var evtMsgs = EventMessagesFactory.Get();
+            using (new WriteLock(Locker))
+            {
+                using (var uow = UowProvider.GetUnitOfWork())
+                {
+                    //Hack: this ensures that the entity's path is valid and if not it fixes/persists it
+                    //see: http://issues.umbraco.org/issue/U4-9336
+                    content.EnsureValidPath(Logger, entity => GetById(entity.ParentId), QuickUpdate);
+                    var originalPath = content.Path;
+                    var moveEventInfo = new MoveEventInfo<IContent>(content, originalPath, Constants.System.RecycleBinContent);
+                    var moveEventArgs = new MoveEventArgs<IContent>(evtMsgs, moveEventInfo);
+                    if (uow.Events.DispatchCancelable(Trashing, this, moveEventArgs, "Trashing"))
+                    {
+                        uow.Commit();
+                        return OperationStatus.Cancelled(evtMsgs);
+                    }
+                    var moveInfo = new List<MoveEventInfo<IContent>>
+                    {
+                        moveEventInfo
+                    };
+
+                    //get descendents to process of the content item that is being moved to trash - must be done before changing the state below
+                    //must be processed with shallowest levels first
+                    var descendants = ignoreDescendants ? Enumerable.Empty<IContent>() : GetDescendants(content).OrderBy(x => x.Level);
+
+                    //Do the updates for this item
+                    var repository = RepositoryFactory.CreateContentRepository(uow);
+                    //Make sure that published content is unpublished before being moved to the Recycle Bin
+                    if (HasPublishedVersion(content.Id))
+                    {
+                        //TODO: this shouldn't be a 'sub operation', and if it needs to be it cannot raise events and cannot be cancelled!
+                        UnPublish(content, userId);
+                    }
+                    content.WriterId = userId;
+                    content.ChangeTrashedState(true);
+                    repository.AddOrUpdate(content);
+
+                    //Loop through descendants to update their trash state, but ensuring structure by keeping the ParentId
+                    foreach (var descendant in descendants)
+                    {
+                        //TODO: this shouldn't be a 'sub operation', and if it needs to be it cannot raise events and cannot be cancelled!
+                        UnPublish(descendant, userId);
+                        descendant.WriterId = userId;
+                        descendant.ChangeTrashedState(true, descendant.ParentId);
+                        repository.AddOrUpdate(descendant);
+
+                        moveInfo.Add(new MoveEventInfo<IContent>(descendant, descendant.Path, descendant.ParentId));
+                    }
+
+                    moveEventArgs.CanCancel = false;
+                    moveEventArgs.MoveInfoCollection = moveInfo;
+                    uow.Events.Dispatch(Trashed, this, moveEventArgs, "Trashed");
+
+                    Audit(uow, AuditType.Move, "Move Content to Recycle Bin performed by user", userId, content.Id);
+                    uow.Commit();
+                }
+
+                return OperationStatus.Success(evtMsgs);
+            }
+        }
+
+        /// <summary>
+        /// UnPublishes a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to publish</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <returns>True if unpublishing succeeded, otherwise False</returns>
+        Attempt<UnPublishStatus> IContentServiceOperations.UnPublish(IContent content, int userId)
+        {
+            return UnPublishDo(content, false, userId);
+        }
+
+        /// <summary>
+        /// Publishes a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to publish</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <returns>True if publishing succeeded, otherwise False</returns>
+        public Attempt<PublishStatus> PublishWithStatus(IContent content, int userId = 0)
+        {
+            return ((IContentServiceOperations)this).Publish(content, userId);
+        }
+
+        /// <summary>
+        /// Publishes a <see cref="IContent"/> object and all its children
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to publish along with its children</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <returns>True if publishing succeeded, otherwise False</returns>
+        [Obsolete("Use PublishWithChildrenWithStatus instead, that method will provide more detailed information on the outcome and also allows the includeUnpublished flag")]
+        public bool PublishWithChildren(IContent content, int userId = 0)
+        {
+            var result = PublishWithChildrenDo(content, userId, true);
+
+            //This used to just return false only when the parent content failed, otherwise would always return true so we'll
+            // do the same thing for the moment
+            if (result.All(x => x.Result.ContentItem.Id != content.Id))
+                return false;
+
+            return result.Single(x => x.Result.ContentItem.Id == content.Id).Success;
+        }
+
+        /// <summary>
+        /// Publishes a <see cref="IContent"/> object and all its children
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to publish along with its children</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <param name="includeUnpublished">set to true if you want to also publish children that are currently unpublished</param>
+        /// <returns>True if publishing succeeded, otherwise False</returns>
+        public IEnumerable<Attempt<PublishStatus>> PublishWithChildrenWithStatus(IContent content, int userId = 0, bool includeUnpublished = false)
+        {
+            return ((IContentServiceOperations)this).PublishWithChildren(content, userId, includeUnpublished);
+        }
+
+        /// <summary>
+        /// UnPublishes a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to publish</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <returns>True if unpublishing succeeded, otherwise False</returns>
+        public bool UnPublish(IContent content, int userId = 0)
+        {
+            var attempt = ((IContentServiceOperations)this).UnPublish(content, userId);
+            LogHelper.Debug<ContentService>(string.Format("Result of unpublish attempt: {0}", attempt.Result.StatusType));
+            return attempt.Success;
+        }
+
+        /// <summary>
+        /// Saves and Publishes a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to save and publish</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise save events.</param>
+        /// <returns>True if publishing succeeded, otherwise False</returns>
+        [Obsolete("Use SaveAndPublishWithStatus instead, that method will provide more detailed information on the outcome")]
+        public bool SaveAndPublish(IContent content, int userId = 0, bool raiseEvents = true)
+        {
+            var result = SaveAndPublishDo(content, userId, raiseEvents);
+            return result.Success;
+        }
+
+        /// <summary>
+        /// Saves and Publishes a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to save and publish</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise save events.</param>
+        /// <returns>True if publishing succeeded, otherwise False</returns>
+        public Attempt<PublishStatus> SaveAndPublishWithStatus(IContent content, int userId = 0, bool raiseEvents = true)
+        {
+            return ((IContentServiceOperations)this).SaveAndPublish(content, userId, raiseEvents);
+        }
+
+        public IContent GetBlueprintById(int id)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentBlueprintRepository(uow);
+                var blueprint = repository.Get(id);
+                if (blueprint != null)
+                    ((Content) blueprint).IsBlueprint = true;
+                return blueprint;
+            }
+        }
+
+        public IContent GetBlueprintById(Guid id)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentBlueprintRepository(uow);
+                var blueprint = repository.Get(id);
+                if (blueprint != null)
+                    ((Content)blueprint).IsBlueprint = true;
+                return blueprint;
+            }
+        }
+
+        public void SaveBlueprint(IContent content, int userId = 0)
+        {
+            //always ensure the blueprint is at the root
+            if (content.ParentId != -1)
+                content.ParentId = -1;
+
+            ((Content) content).IsBlueprint = true;
+
+            using (new WriteLock(Locker))
+            {
+                using (var uow = UowProvider.GetUnitOfWork())
+                {
+                    if (string.IsNullOrWhiteSpace(content.Name))
+                    {
+                        throw new ArgumentException("Cannot save content blueprint with empty name.");
+                    }
+
+                    var repository = RepositoryFactory.CreateContentBlueprintRepository(uow);
+
+                    if (content.HasIdentity == false)
+                    {
+                        content.CreatorId = userId;
+                    }
+                    content.WriterId = userId;
+
+                    repository.AddOrUpdate(content);
+
+                    uow.Events.Dispatch(SavedBlueprint, this, new SaveEventArgs<IContent>(content), "SavedBlueprint");
+
+                    uow.Commit();
+                }
+            }
+        }
+
+        public void DeleteBlueprint(IContent content, int userId = 0)
+        {
+            using (new WriteLock(Locker))
+            {
+                using (var uow = UowProvider.GetUnitOfWork())
+                {
+                    var repository = RepositoryFactory.CreateContentBlueprintRepository(uow);
+                    repository.Delete(content);
+                    uow.Events.Dispatch(DeletedBlueprint, this, new DeleteEventArgs<IContent>(content), "DeletedBlueprint");
+                    uow.Commit();
+                }
+            }
+        }
+
+        public IContent CreateContentFromBlueprint(IContent blueprint, string name, int userId = 0)
+        {
+            if (blueprint == null) throw new ArgumentNullException("blueprint");
+
+            var contentType = blueprint.ContentType;
+            var content = new Content(name, -1, contentType);
+            content.Path = string.Concat(content.ParentId.ToString(), ",", content.Id);
+
+            content.CreatorId = userId;
+            content.WriterId = userId;
+
+            foreach (var property in blueprint.Properties)
+                content.SetValue(property.Alias, property.Value);
+
+            return content;
+        }
+
+        public void DeleteBlueprintsOfTypes(IEnumerable<int> contentTypeIds, int userId = 0)
+        {
+            using (new WriteLock(Locker))
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var repository = RepositoryFactory.CreateContentBlueprintRepository(uow);
+
+                var contentTypeIdsA = contentTypeIds.ToArray();
+                var query = new Query<IContent>();
+                if (contentTypeIdsA.Length > 0)
+                {
+                    query.Where(x => contentTypeIdsA.Contains(x.ContentTypeId));
+                }
+                var blueprints = repository.GetByQuery(query).Select(x =>
+                {
+                    ((Content) x).IsBlueprint = true;
+                    return x;
+                }).ToArray();
+
+                foreach (var blueprint in blueprints)
+                {
+                    repository.Delete(blueprint);
+                }
+
+                uow.Events.Dispatch(DeletedBlueprint, this, new DeleteEventArgs<IContent>(blueprints), "DeletedBlueprint");
+                uow.Commit();
+            }
+        }
+
+        public void DeleteBlueprintsOfType(int contentTypeId, int userId = 0)
+        {
+            DeleteBlueprintsOfTypes(new[] {contentTypeId}, userId);
+        }
+
+        /// <summary>
+        /// Saves a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to save</param>
+        /// <param name="userId">Optional Id of the User saving the Content</param>
+        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
+        public void Save(IContent content, int userId = 0, bool raiseEvents = true)
+        {
+            ((IContentServiceOperations)this).Save(content, userId, raiseEvents);
+        }
+
+        /// <summary>
+        /// Saves a collection of <see cref="IContent"/> objects.
+        /// </summary>
+        /// <param name="contents">Collection of <see cref="IContent"/> to save</param>
+        /// <param name="userId">Optional Id of the User saving the Content</param>
+        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
+        Attempt<OperationStatus> IContentServiceOperations.Save(IEnumerable<IContent> contents, int userId, bool raiseEvents)
+        {
+            var asArray = contents.ToArray();
+
+            var evtMsgs = EventMessagesFactory.Get();
+
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var saveEventArgs = new SaveEventArgs<IContent>(asArray, evtMsgs);
+                if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
+                {
+                    uow.Commit();
+                    return OperationStatus.Cancelled(evtMsgs);
+                }
+
+                // todo - understand what's a lock in a scope?
+                // (though, these locks are refactored in v8)
+                using (new WriteLock(Locker))
+                {
+                    var containsNew = asArray.Any(x => x.HasIdentity == false);
+                    var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                    if (containsNew)
+                    {
+                        foreach (var content in asArray)
+                        {
+                            content.WriterId = userId;
+
+                            //Only change the publish state if the "previous" version was actually published
+                            if (content.Published)
+                                content.ChangePublishedState(PublishedState.Saved);
+
+                            repository.AddOrUpdate(content);
+                            //add or update preview
+                            repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                        }
+                    }
+                    else
+                    {
+                        foreach (var content in asArray)
+                        {
+                            content.WriterId = userId;
+                            repository.AddOrUpdate(content);
+                            //add or update preview
+                            repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                        }
+                    }
+                }
+
+                if (raiseEvents)
+                {
+                    saveEventArgs.CanCancel = false;
+                    uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
+                }
+
+                Audit(uow, AuditType.Save, "Bulk Save content performed by user", userId == -1 ? 0 : userId, Constants.System.Root);
+                uow.Commit();
+
+                return OperationStatus.Success(evtMsgs);
+            }
+        }
+
+        /// <summary>
+        /// Permanently deletes an <see cref="IContent"/> object.
+        /// </summary>
+        /// <remarks>
+        /// This method will also delete associated media files, child content and possibly associated domains.
+        /// </remarks>
+        /// <remarks>Please note that this method will completely remove the Content from the database</remarks>
+        /// <param name="content">The <see cref="IContent"/> to delete</param>
+        /// <param name="userId">Optional Id of the User deleting the Content</param>
+        Attempt<OperationStatus> IContentServiceOperations.Delete(IContent content, int userId)
+        {
+            var evtMsgs = EventMessagesFactory.Get();
+
+            using (new WriteLock(Locker))
+            {
+                using (var uow = UowProvider.GetUnitOfWork())
+                {
+                    var deleteEventArgs = new DeleteEventArgs<IContent>(content, evtMsgs);
+                    if (uow.Events.DispatchCancelable(Deleting, this, deleteEventArgs, "Deleting"))
+                    {
+                        uow.Commit();
+                        return OperationStatus.Cancelled(evtMsgs);
+                    }
+
+                    //Make sure that published content is unpublished before being deleted
+                    if (HasPublishedVersion(content.Id))
+                    {
+                        UnPublish(content, userId);
+                    }
+
+                    //Delete children before deleting the 'possible parent'
+                    var children = GetChildren(content.Id);
+                    foreach (var child in children)
+                    {
+                        Delete(child, userId);
+                    }
+
+                    var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                    repository.Delete(content);
+
+                    deleteEventArgs.CanCancel = false;
+                    uow.Events.Dispatch(Deleted, this, deleteEventArgs, "Deleted");
+
+                    Audit(uow, AuditType.Delete, "Delete Content performed by user", userId, content.Id);
+                    uow.Commit();
+                }
+
+                return OperationStatus.Success(evtMsgs);
+            }
+        }
+
+        /// <summary>
+        /// Publishes a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to publish</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <returns>The published status attempt</returns>
+        Attempt<PublishStatus> IContentServiceOperations.Publish(IContent content, int userId)
+        {
+            return SaveAndPublishDo(content, userId);
+        }
+
+        /// <summary>
+        /// Saves a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to save</param>
+        /// <param name="userId">Optional Id of the User saving the Content</param>
+        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
+        Attempt<OperationStatus> IContentServiceOperations.Save(IContent content, int userId, bool raiseEvents)
+        {
+            return Save(content, true, userId, raiseEvents);
+        }
+
+        /// <summary>
+        /// Saves a collection of <see cref="IContent"/> objects.
+        /// </summary>
+        /// <remarks>
+        /// If the collection of content contains new objects that references eachother by Id or ParentId,
+        /// then use the overload Save method with a collection of Lazy <see cref="IContent"/>.
+        /// </remarks>
+        /// <param name="contents">Collection of <see cref="IContent"/> to save</param>
+        /// <param name="userId">Optional Id of the User saving the Content</param>
+        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
+        public void Save(IEnumerable<IContent> contents, int userId = 0, bool raiseEvents = true)
+        {
+            ((IContentServiceOperations)this).Save(contents, userId, raiseEvents);
+        }
+
+        /// <summary>
+        /// Deletes all content of the specified types. All Descendants of deleted content that is not of these types is moved to Recycle Bin.
+        /// </summary>
+        /// <param name="contentTypeIds">Id of the <see cref="IContentType"/></param>
+        /// <param name="userId">Optional Id of the user issueing the delete operation</param>
+        public void DeleteContentOfTypes(IEnumerable<int> contentTypeIds, int userId = 0)
+        {
+            using (new WriteLock(Locker))
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                //track the 'root' items of the collection of nodes discovered to delete, we need to use
+                //these items to lookup descendants that are not of this doc type so they can be transfered
+                //to the recycle bin
+                IDictionary<string, IContent> rootItems;
+                var contentToDelete = this.TrackDeletionsForDeleteContentOfTypes(contentTypeIds, repository, out rootItems).ToArray();
+
+                if (uow.Events.DispatchCancelable(Deleting, this, new DeleteEventArgs<IContent>(contentToDelete), "Deleting"))
+                {
+                    uow.Commit();
+                    return;
+                }
+
+                //Determine the items that will need to be recycled (that are children of these content items but not of these content types)
+                var contentToRecycle = this.TrackTrashedForDeleteContentOfTypes(contentTypeIds, rootItems, repository);
+
+                //move each item to the bin starting with the deepest items
+                foreach (var child in contentToRecycle.OrderByDescending(x => x.Level))
+                {
+                    MoveToRecycleBinDo(child, userId, true);
+                }
+
+                foreach (var content in contentToDelete)
+                {
+                    Delete(content, userId);
+                }
+
+                Audit(uow, AuditType.Delete,
+                    string.Format("Delete Content of Types {0} performed by user", string.Join(",", contentTypeIds)),
+                    userId, Constants.System.Root);
+                uow.Commit();
+            }
+        }
+
+        /// <summary>
+        /// Deletes all content of specified type. All children of deleted content is moved to Recycle Bin.
+        /// </summary>
+        /// <remarks>This needs extra care and attention as its potentially a dangerous and extensive operation</remarks>
+        /// <param name="contentTypeId">Id of the <see cref="IContentType"/></param>
+        /// <param name="userId">Optional Id of the user issueing the delete operation</param>
+        public void DeleteContentOfType(int contentTypeId, int userId = 0)
+        {
+            DeleteContentOfTypes(new[] {contentTypeId}, userId);
+        }
+
+        /// <summary>
+        /// Permanently deletes an <see cref="IContent"/> object as well as all of its Children.
+        /// </summary>
+        /// <remarks>
+        /// This method will also delete associated media files, child content and possibly associated domains.
+        /// </remarks>
+        /// <remarks>Please note that this method will completely remove the Content from the database</remarks>
+        /// <param name="content">The <see cref="IContent"/> to delete</param>
+        /// <param name="userId">Optional Id of the User deleting the Content</param>
+        public void Delete(IContent content, int userId = 0)
+        {
+            ((IContentServiceOperations)this).Delete(content, userId);
+        }
+
+        /// <summary>
+        /// Permanently deletes versions from an <see cref="IContent"/> object prior to a specific date.
+        /// This method will never delete the latest version of a content item.
+        /// </summary>
+        /// <param name="id">Id of the <see cref="IContent"/> object to delete versions from</param>
+        /// <param name="versionDate">Latest version date</param>
+        /// <param name="userId">Optional Id of the User deleting versions of a Content object</param>
+        public void DeleteVersions(int id, DateTime versionDate, int userId = 0)
+        {
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var deleteRevisionsEventArgs = new DeleteRevisionsEventArgs(id, dateToRetain: versionDate);
+                if (uow.Events.DispatchCancelable(DeletingVersions, this, deleteRevisionsEventArgs, "DeletingVersions"))
+                {
+                    uow.Commit();
+                    return;
+                }
+
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                repository.DeleteVersions(id, versionDate);
+                deleteRevisionsEventArgs.CanCancel = false;
+                uow.Events.Dispatch(DeletedVersions, this, deleteRevisionsEventArgs, "DeletedVersions");
+
+                Audit(uow, AuditType.Delete, "Delete Content by version date performed by user", userId, Constants.System.Root);
+                uow.Commit();
+            }
+        }
+
+        /// <summary>
+        /// Permanently deletes specific version(s) from an <see cref="IContent"/> object.
+        /// This method will never delete the latest version of a content item.
+        /// </summary>
+        /// <param name="id">Id of the <see cref="IContent"/> object to delete a version from</param>
+        /// <param name="versionId">Id of the version to delete</param>
+        /// <param name="deletePriorVersions">Boolean indicating whether to delete versions prior to the versionId</param>
+        /// <param name="userId">Optional Id of the User deleting versions of a Content object</param>
+        public void DeleteVersion(int id, Guid versionId, bool deletePriorVersions, int userId = 0)
+        {
+            using (new WriteLock(Locker))
+            {
+                using (var uow = UowProvider.GetUnitOfWork())
+                {
+                    if (uow.Events.DispatchCancelable(DeletingVersions, this, new DeleteRevisionsEventArgs(id, specificVersion: versionId), "DeletingVersions"))
+                    {
+                        uow.Commit();
+                        return;
+                    }
+
+                    if (deletePriorVersions)
+                    {
+                        var content = GetByVersion(versionId);
+                        DeleteVersions(id, content.UpdateDate, userId);
+                    }
+
+                    var repository = RepositoryFactory.CreateContentRepository(uow);
+                    repository.DeleteVersion(versionId);
+
+                    uow.Events.Dispatch(DeletedVersions, this, new DeleteRevisionsEventArgs(id, false, specificVersion: versionId), "DeletedVersions");
+
+                    Audit(uow, AuditType.Delete, "Delete Content by version performed by user", userId, Constants.System.Root);
+                    uow.Commit();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Deletes an <see cref="IContent"/> object by moving it to the Recycle Bin
+        /// </summary>
+        /// <remarks>Move an item to the Recycle Bin will result in the item being unpublished</remarks>
+        /// <param name="content">The <see cref="IContent"/> to delete</param>
+        /// <param name="userId">Optional Id of the User deleting the Content</param>
+        public void MoveToRecycleBin(IContent content, int userId = 0)
+        {
+            ((IContentServiceOperations)this).MoveToRecycleBin(content, userId);
+        }
+
+        /// <summary>
+        /// Moves an <see cref="IContent"/> object to a new location by changing its parent id.
+        /// </summary>
+        /// <remarks>
+        /// If the <see cref="IContent"/> object is already published it will be
+        /// published after being moved to its new location. Otherwise it'll just
+        /// be saved with a new parent id.
+        /// </remarks>
+        /// <param name="content">The <see cref="IContent"/> to move</param>
+        /// <param name="parentId">Id of the Content's new Parent</param>
+        /// <param name="userId">Optional Id of the User moving the Content</param>
+        public void Move(IContent content, int parentId, int userId = 0)
+        {
+            using (new WriteLock(Locker))
+            {
+                //This ensures that the correct method is called if this method is used to Move to recycle bin.
+                if (parentId == Constants.System.RecycleBinContent)
+                {
+                    MoveToRecycleBin(content, userId);
+                    return;
+                }
+
+                using (var uow = UowProvider.GetUnitOfWork())
+                {
+                    var moveEventInfo = new MoveEventInfo<IContent>(content, content.Path, parentId);
+                    var moveEventArgs = new MoveEventArgs<IContent>(moveEventInfo);
+                    if (uow.Events.DispatchCancelable(Moving, this, moveEventArgs, "Moving"))
+                    {
+                        uow.Commit();
+                        return;
+                    }
+
+                    //used to track all the moved entities to be given to the event
+                    var moveInfo = new List<MoveEventInfo<IContent>>();
+
+                    //call private method that does the recursive moving
+                    PerformMove(content, parentId, userId, moveInfo);
+
+                    moveEventArgs.MoveInfoCollection = moveInfo;
+                    moveEventArgs.CanCancel = false;
+                    uow.Events.Dispatch(Moved, this, moveEventArgs, "Moved");
+
+                    Audit(uow, AuditType.Move, "Move Content performed by user", userId, content.Id);
+                    uow.Commit();
+                }
+            }
+        }
+
+        /// <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")]
+        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))
+            {
+                var nodeObjectType = Constants.ObjectTypes.DocumentGuid;
+
+                using (var uow = UowProvider.GetUnitOfWork())
+                {
+                    var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                    //Create a dictionary of ids -> dictionary of property aliases + values
+                    var entities = repository.GetEntitiesInRecycleBin()
+                        .ToDictionary(
+                            key => key.Id,
+                            val => (IEnumerable<Property>)val.Properties);
+
+                    var files = ((ContentRepository)repository).GetFilesInRecycleBinForUploadField();
+
+                    var recycleBinEventArgs = new RecycleBinEventArgs(nodeObjectType, entities, files);
+                    if (uow.Events.DispatchCancelable(EmptyingRecycleBin, this, recycleBinEventArgs))
+                    {
+                        uow.Commit();
+                        return;
+                    }
+
+                    var success = repository.EmptyRecycleBin();
+                    recycleBinEventArgs.CanCancel = false;
+                    recycleBinEventArgs.RecycleBinEmptiedSuccessfully = success;
+                    uow.Events.Dispatch(EmptiedRecycleBin, this, recycleBinEventArgs);
+
+                    Audit(uow, AuditType.Delete, "Empty Content Recycle Bin performed by user", userId, Constants.System.RecycleBinContent);
+                    uow.Commit();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Copies an <see cref="IContent"/> object by creating a new Content object of the same type and copies all data from the current
+        /// to the new copy which is returned. Recursively copies all children.
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to copy</param>
+        /// <param name="parentId">Id of the Content's new Parent</param>
+        /// <param name="relateToOriginal">Boolean indicating whether the copy should be related to the original</param>
+        /// <param name="userId">Optional Id of the User copying the Content</param>
+        /// <returns>The newly created <see cref="IContent"/> object</returns>
+        public IContent Copy(IContent content, int parentId, bool relateToOriginal, int userId = 0)
+        {
+            return Copy(content, parentId, relateToOriginal, true, userId);
+        }
+
+        /// <summary>
+        /// Copies an <see cref="IContent"/> object by creating a new Content object of the same type and copies all data from the current
+        /// to the new copy which is returned.
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to copy</param>
+        /// <param name="parentId">Id of the Content's new Parent</param>
+        /// <param name="relateToOriginal">Boolean indicating whether the copy should be related to the original</param>
+        /// <param name="recursive">A value indicating whether to recursively copy children.</param>
+        /// <param name="userId">Optional Id of the User copying the Content</param>
+        /// <returns>The newly created <see cref="IContent"/> object</returns>
+        public IContent Copy(IContent content, int parentId, bool relateToOriginal, bool recursive, int userId = 0)
+        {
+            //TODO: This all needs to be managed correctly so that the logic is submitted in one
+            // transaction, the CRUD needs to be moved to the repo
+
+            using (new WriteLock(Locker))
+            {
+                var copy = content.DeepCloneWithResetIdentities();
+                copy.ParentId = parentId;
+
+                // A copy should never be set to published automatically even if the original was.
+                copy.ChangePublishedState(PublishedState.Unpublished);
+
+                using (var uow = UowProvider.GetUnitOfWork())
+                {
+                    var copyEventArgs = new CopyEventArgs<IContent>(content, copy, true, parentId, relateToOriginal);
+                    if (uow.Events.DispatchCancelable(Copying, this, copyEventArgs))
+                    {
+                        uow.Commit();
+                        return null;
+                    }
+
+                    var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                    // Update the create author and last edit author
+                    copy.CreatorId = userId;
+                    copy.WriterId = userId;
+
+                    //get the current permissions, if there are any explicit ones they need to be copied
+                    var currentPermissions = GetPermissionsForEntity(content);
+                    currentPermissions.RemoveWhere(p => p.IsDefaultPermissions);
+
+                    repository.AddOrUpdate(copy);
+                    repository.AddOrUpdatePreviewXml(copy, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+
+                    //add permissions
+                    if (currentPermissions.Count > 0)
+                    {
+                        var permissionSet = new ContentPermissionSet(copy, currentPermissions);
+                        repository.AddOrUpdatePermissions(permissionSet);
+                    }
+
+                    uow.Commit(); // todo - this should flush, not commit
+
+                    //Special case for the associated tags
+                    //TODO: Move this to the repository layer in a single transaction!
+                    //don't copy tags data in tags table if the item is in the recycle bin
+                    if (parentId != Constants.System.RecycleBinContent)
+                    {
+                        var tags = uow.Database.Fetch<TagRelationshipDto>("WHERE nodeId = @Id", new { Id = content.Id });
+                        foreach (var tag in tags)
+                            uow.Database.Insert(new TagRelationshipDto
+                            {
+                                NodeId = copy.Id, TagId = tag.TagId, PropertyTypeId = tag.PropertyTypeId
+                            });
+                    }
+                    uow.Commit(); // todo - this should flush, not commit
+
+                    if (recursive)
+                    {
+                        //Look for children and copy those as well
+                        var children = GetChildren(content.Id);
+                        foreach (var child in children)
+                        {
+                            //TODO: This shouldn't recurse back to this method, it should be done in a private method
+                            // that doesn't have a nested lock and so we can perform the entire operation in one commit.
+                            Copy(child, copy.Id, relateToOriginal, true, userId);
+                        }
+                    }
+                    copyEventArgs.CanCancel = false;
+                    uow.Events.Dispatch(Copied, this, copyEventArgs);
+                    Audit(uow, AuditType.Copy, "Copy Content performed by user", userId, content.Id);
+                    uow.Commit();
+                }
+
+                return copy;
+            }
+        }
+
+
+        /// <summary>
+        /// Sends an <see cref="IContent"/> to Publication, which executes handlers and events for the 'Send to Publication' action.
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to send to publication</param>
+        /// <param name="userId">Optional Id of the User issueing the send to publication</param>
+        /// <returns>True if sending publication was succesfull otherwise false</returns>
+        public bool SendToPublication(IContent content, int userId = 0)
+        {
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var sendToPublishEventArgs = new SendToPublishEventArgs<IContent>(content);
+                if (uow.Events.DispatchCancelable(SendingToPublish, this, sendToPublishEventArgs))
+                {
+                    uow.Commit();
+                    return false;
+                }
+
+                //Save before raising event
+                Save(content, userId);
+                sendToPublishEventArgs.CanCancel = false;
+                uow.Events.Dispatch(SentToPublish, this, sendToPublishEventArgs);
+
+                Audit(uow, AuditType.SendToPublish, "Send to Publish performed by user", content.WriterId, content.Id);
+                uow.Commit();
+
+                return true;
+            }
+        }
+
+        /// <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.
+        /// </summary>
+        /// <remarks>
+        /// The way data is stored actually only allows us to rollback on properties
+        /// and not data like Name and Alias of the Content.
+        /// </remarks>
+        /// <param name="id">Id of the <see cref="IContent"/>being rolled back</param>
+        /// <param name="versionId">Id of the version to rollback to</param>
+        /// <param name="userId">Optional Id of the User issueing the rollback of the Content</param>
+        /// <returns>The newly created <see cref="IContent"/> object</returns>
+        public IContent Rollback(int id, Guid versionId, int userId = 0)
+        {
+            var content = GetByVersion(versionId);
+
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var rollbackEventArgs = new RollbackEventArgs<IContent>(content);
+                if (uow.Events.DispatchCancelable(RollingBack, this, rollbackEventArgs))
+                {
+                    uow.Commit();
+                    return content;
+                }
+
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                content.WriterId = userId;
+                content.CreatorId = userId;
+                content.ChangePublishedState(PublishedState.Unpublished);
+
+                repository.AddOrUpdate(content);
+                repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                rollbackEventArgs.CanCancel = false;
+                uow.Events.Dispatch(RolledBack, this, rollbackEventArgs);
+
+                Audit(uow, AuditType.RollBack, "Content rollback performed by user", content.WriterId, content.Id);
+                uow.Commit();
+            }
+
+            return content;
+        }
+
+        /// <summary>
+        /// Sorts a collection of <see cref="IContent"/> objects by updating the SortOrder according
+        /// to the ordering of items in the passed in <see cref="IEnumerable{T}"/>.
+        /// </summary>
+        /// <remarks>
+        /// Using this method will ensure that the Published-state is maintained upon sorting
+        /// so the cache is updated accordingly - as needed.
+        /// </remarks>
+        /// <param name="items"></param>
+        /// <param name="userId"></param>
+        /// <param name="raiseEvents"></param>
+        /// <returns>True if sorting succeeded, otherwise False</returns>
+        public bool Sort(IEnumerable<IContent> items, int userId = 0, bool raiseEvents = true)
+        {
+            var shouldBePublished = new List<IContent>();
+            var shouldBeSaved = new List<IContent>();
+
+            using (new WriteLock(Locker))
+            {
+                using (var uow = UowProvider.GetUnitOfWork())
+                {
+                    var asArray = items.ToArray();
+                    var saveEventArgs = new SaveEventArgs<IContent>(asArray);
+                    if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
+                    {
+                        uow.Commit();
+                        return false;
+                    }
+
+                    var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                    var i = 0;
+                    foreach (var content in asArray)
+                    {
+                        //If the current sort order equals that of the content
+                        //we don't need to update it, so just increment the sort order
+                        //and continue.
+                        if (content.SortOrder == i)
+                        {
+                            i++;
+                            continue;
+                        }
+
+                        content.SortOrder = i;
+                        content.WriterId = userId;
+                        i++;
+
+                        if (content.Published)
+                        {
+                            //TODO: This should not be an inner operation, but if we do this, it cannot raise events and cannot be cancellable!
+                            var published = _publishingStrategy.Publish(uow, content, userId).Success;
+                            shouldBePublished.Add(content);
+                        }
+                        else
+                            shouldBeSaved.Add(content);
+
+                        repository.AddOrUpdate(content);
+                        //add or update a preview
+                        repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                    }
+
+                    foreach (var content in shouldBePublished)
+                    {
+                        //Create and Save ContentXml DTO
+                        repository.AddOrUpdateContentXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                    }
+
+                    if (raiseEvents)
+                    {
+                        saveEventArgs.CanCancel = false;
+                        uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
+                    }
+
+                    if (shouldBePublished.Any())
+                    {
+                        //TODO: This should not be an inner operation, but if we do this, it cannot raise events and cannot be cancellable!
+                        _publishingStrategy.PublishingFinalized(uow, shouldBePublished, false);
+                    }
+
+                    Audit(uow, AuditType.Sort, "Sorting content performed by user", userId, 0);
+                    uow.Commit();
+                }
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// Sorts a collection of <see cref="IContent"/> objects by updating the SortOrder according
+        /// to the ordering of node Ids passed in.
+        /// </summary>
+        /// <remarks>
+        /// Using this method will ensure that the Published-state is maintained upon sorting
+        /// so the cache is updated accordingly - as needed.
+        /// </remarks>
+        /// <param name="ids"></param>
+        /// <param name="userId"></param>
+        /// <param name="raiseEvents"></param>
+        /// <returns>True if sorting succeeded, otherwise False</returns>
+        public bool Sort(int[] ids, int userId = 0, bool raiseEvents = true)
+        {
+            var shouldBePublished = new List<IContent>();
+            var shouldBeSaved = new List<IContent>();
+
+            using (new WriteLock(Locker))
+            {
+                var allContent = GetByIds(ids).ToDictionary(x => x.Id, x => x);
+                if (allContent.Any() == false)
+                {
+                    return false;
+                }
+                var items = ids.Select(x => allContent[x]).ToArray();
+
+                using (var uow = UowProvider.GetUnitOfWork())
+                {
+                    var saveEventArgs = new SaveEventArgs<IContent>(items);
+                    if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
+                    {
+                        uow.Commit();
+                        return false;
+                    }
+
+                    var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                    var i = 0;
+                    foreach (var content in items)
+                    {
+                        //If the current sort order equals that of the content
+                        //we don't need to update it, so just increment the sort order
+                        //and continue.
+                        if (content.SortOrder == i)
+                        {
+                            i++;
+                            continue;
+                        }
+
+                        content.SortOrder = i;
+                        content.WriterId = userId;
+                        i++;
+
+                        if (content.Published)
+                        {
+                            //TODO: This should not be an inner operation, but if we do this, it cannot raise events and cannot be cancellable!
+                            var published = _publishingStrategy.Publish(uow, content, userId).Success;
+                            shouldBePublished.Add(content);
+                        }
+                        else
+                            shouldBeSaved.Add(content);
+
+                        repository.AddOrUpdate(content);
+                        //add or update a preview
+                        repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                    }
+
+                    foreach (var content in shouldBePublished)
+                    {
+                        //Create and Save ContentXml DTO
+                        repository.AddOrUpdateContentXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                    }
+
+                    if (raiseEvents)
+                    {
+                        saveEventArgs.CanCancel = false;
+                        uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
+                    }
+
+                    if (shouldBePublished.Any())
+                    {
+                        //TODO: This should not be an inner operation, but if we do this, it cannot raise events and cannot be cancellable!
+                        _publishingStrategy.PublishingFinalized(uow, shouldBePublished, false);
+                    }
+
+                    Audit(uow, AuditType.Sort, "Sort child items performed by user", userId, items.First().ParentId);
+                    uow.Commit();
+                }
+            }
+
+            return true;
+        }
+
+        public IEnumerable<IContent> GetBlueprintsForContentTypes(params int[] documentTypeIds)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentBlueprintRepository(uow);
+
+                var query = new Query<IContent>();
+                if (documentTypeIds.Length > 0)
+                {
+                    query.Where(x => documentTypeIds.Contains(x.ContentTypeId));
+                }
+                return repository.GetByQuery(query).Select(x =>
+                {
+                    ((Content) x).IsBlueprint = true;
+                    return x;
+                });
+            }
+        }
+
+        /// <summary>
+        /// Gets paged content descendants as XML by path
+        /// </summary>
+        /// <param name="path">Path starts with</param>
+        /// <param name="pageIndex">Page number</param>
+        /// <param name="pageSize">Page size</param>
+        /// <param name="totalRecords">Total records the query would return without paging</param>
+        /// <returns>A paged enumerable of XML entries of content items</returns>
+        public IEnumerable<XElement> GetPagedXmlEntries(string path, long pageIndex, int pageSize, out long totalRecords)
+        {
+            Mandate.ParameterCondition(pageIndex >= 0, "pageIndex");
+            Mandate.ParameterCondition(pageSize > 0, "pageSize");
+
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                var contents = repository.GetPagedXmlEntriesByPath(path, pageIndex, pageSize,
+                    //This order by is VERY important! This allows us to figure out what is implicitly not published, see ContentRepository.BuildXmlCache and
+                    // UmbracoContentIndexer.PerformIndexAll which uses the logic based on this sort order
+                    new[] { "level", "parentID", "sortOrder" },
+                    out totalRecords);
+                return contents;
+            }
+        }
+
+        /// <summary>
+        /// This builds the Xml document used for the XML cache
+        /// </summary>
+        /// <returns></returns>
+        public XmlDocument BuildXmlCache()
+        {
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                var result = repository.BuildXmlCache();
+                uow.Commit();
+                return result;
+            }
+        }
+
+        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>
+        /// <param name="contentTypeIds">
+        /// Only rebuild the xml structures for the content type ids passed in, if none then rebuilds the structures
+        /// for all content
+        /// </param>
+        public void RebuildXmlStructures(params int[] contentTypeIds)
+        {
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                repository.RebuildXmlStructures(
+                    content => _entitySerializer.Serialize(this, _dataTypeService, _userService, content),
+                    contentTypeIds: contentTypeIds.Length == 0 ? null : contentTypeIds);
+
+                Audit(uow, AuditType.Publish, "ContentService.RebuildXmlStructures completed, the xml has been regenerated in the database", 0, Constants.System.Root);
+                uow.Commit();
+            }
+        }
+
+        #region Internal Methods
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> descendants by the first Parent.
+        /// </summary>
+        /// <param name="content"><see cref="IContent"/> item to retrieve Descendants from</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        internal IEnumerable<IContent> GetPublishedDescendants(IContent content)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                var query = Query<IContent>.Builder.Where(x => x.Id != content.Id && x.Path.StartsWith(content.Path) && x.Trashed == false);
+                return repository.GetByPublishedVersion(query);
+            }
+        }
+
+        #endregion
+
+        #region Private Methods
+
+        /// <summary>
+        /// Hack: This is used to fix some data if an entity's properties are invalid/corrupt
+        /// </summary>
+        /// <param name="content"></param>
+        private void QuickUpdate(IContent content)
+        {
+            if (content == null) throw new ArgumentNullException("content");
+            if (content.HasIdentity == false) throw new InvalidOperationException("Cannot update an entity without an Identity");
+
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                repository.AddOrUpdate(content);
+                uow.Commit();
+            }
+        }
+
+        private void Audit(IScopeUnitOfWork uow, AuditType type, string message, int userId, int objectId)
+        {
+            var auditRepo = RepositoryFactory.CreateAuditRepository(uow);
+            auditRepo.AddOrUpdate(new AuditItem(objectId, message, type, userId));
+        }
+
+        //TODO: All of this needs to be moved to the repository
+        private void PerformMove(IContent content, int parentId, int userId, ICollection<MoveEventInfo<IContent>> moveInfo)
+        {
+            //add a tracking item to use in the Moved event
+            moveInfo.Add(new MoveEventInfo<IContent>(content, content.Path, parentId));
+
+            content.WriterId = userId;
+            if (parentId == Constants.System.Root)
+            {
+                content.Path = string.Concat(Constants.System.Root, ",", content.Id);
+                content.Level = 1;
+            }
+            else
+            {
+                var parent = GetById(parentId);
+                content.Path = string.Concat(parent.Path, ",", content.Id);
+                content.Level = parent.Level + 1;
+            }
+
+            //If Content is being moved away from Recycle Bin, its state should be un-trashed
+            if (content.Trashed && parentId != Constants.System.RecycleBinContent)
+            {
+                content.ChangeTrashedState(false, parentId);
+            }
+            else
+            {
+                content.ParentId = parentId;
+            }
+
+            //If Content is published, it should be (re)published from its new location
+            if (content.Published)
+            {
+                //If Content is Publishable its saved and published
+                //otherwise we save the content without changing the publish state, and generate new xml because the Path, Level and Parent has changed.
+                if (IsPublishable(content))
+                {
+                    //TODO: This is raising events, probably not desirable as this costs performance for event listeners like Examine
+                    SaveAndPublish(content, userId);
+                }
+                else
+                {
+                    //TODO: This is raising events, probably not desirable as this costs performance for event listeners like Examine
+                    Save(content, false, userId);
+
+                    //TODO: This shouldn't be here! This needs to be part of the repository logic but in order to fix this we need to
+                    // change how this method calls "Save" as it needs to save using an internal method
+                    using (var uow = UowProvider.GetUnitOfWork())
+                    {
+                        var xml = _entitySerializer.Serialize(this, _dataTypeService, _userService, content);
+
+                        var poco = new ContentXmlDto { NodeId = content.Id, Xml = xml.ToDataString() };
+                        var exists =
+                            uow.Database.FirstOrDefault<ContentXmlDto>("WHERE nodeId = @Id", new { Id = content.Id }) !=
+                            null;
+                        int result = exists
+                                         ? uow.Database.Update(poco)
+                                         : Convert.ToInt32(uow.Database.Insert(poco));
+                        uow.Commit();
+                    }
+                }
+            }
+            else
+            {
+                //TODO: This is raising events, probably not desirable as this costs performance for event listeners like Examine
+                Save(content, userId);
+            }
+
+            //Ensure that Path and Level is updated on children
+            var children = GetChildren(content.Id).ToArray();
+            if (children.Any())
+            {
+                foreach (var child in children)
+                {
+                    PerformMove(child, content.Id, userId, moveInfo);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Publishes a <see cref="IContent"/> object and all its children
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to publish along with its children</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <param name="includeUnpublished">If set to true, this will also publish descendants that are completely unpublished, normally this will only publish children that have previously been published</param>
+        /// <returns>
+        /// A list of publish statues. If the parent document is not valid or cannot be published because it's parent(s) is not published
+        /// then the list will only contain one status item, otherwise it will contain status items for it and all of it's descendants that
+        /// are to be published.
+        /// </returns>
+        private IEnumerable<Attempt<PublishStatus>> PublishWithChildrenDo(
+            IContent content, int userId = 0, bool includeUnpublished = false)
+        {
+            if (content == null) throw new ArgumentNullException("content");
+
+            var evtMsgs = EventMessagesFactory.Get();
+
+            using (new WriteLock(Locker))
+            {
+                //Hack: this ensures that the entity's path is valid and if not it fixes/persists it
+                //see: http://issues.umbraco.org/issue/U4-9336
+                content.EnsureValidPath(Logger, entity => GetById(entity.ParentId), QuickUpdate);
+
+                var result = new List<Attempt<PublishStatus>>();
+
+                //Check if parent is published (although not if its a root node) - if parent isn't published this Content cannot be published
+                if (content.ParentId != Constants.System.Root && content.ParentId != Constants.System.RecycleBinContent && IsPublishable(content) == false)
+                {
+                    Logger.Info<ContentService>(
+                        string.Format(
+                            "Content '{0}' with Id '{1}' could not be published because its parent or one of its ancestors is not published.",
+                            content.Name, content.Id));
+                    result.Add(Attempt.Fail(new PublishStatus(content, PublishStatusType.FailedPathNotPublished, evtMsgs)));
+                    return result;
+                }
+
+                //Content contains invalid property values and can therefore not be published - fire event?
+                if (!content.IsValid())
+                {
+                    Logger.Info<ContentService>(
+                        string.Format("Content '{0}' with Id '{1}' could not be published because of invalid properties.",
+                                      content.Name, content.Id));
+                    result.Add(
+                        Attempt.Fail(
+                            new PublishStatus(content, PublishStatusType.FailedContentInvalid, evtMsgs)
+                            {
+                                InvalidProperties = ((ContentBase)content).LastInvalidProperties
+                            }));
+                    return result;
+                }
+
+                //Consider creating a Path query instead of recursive method:
+                //var query = Query<IContent>.Builder.Where(x => x.Path.StartsWith(content.Path));
+
+                var updated = new List<IContent>();
+                var list = new List<IContent>();
+                list.Add(content); //include parent item
+                list.AddRange(GetDescendants(content));
+
+                var internalStrategy = _publishingStrategy;
+
+                using (var uow = UowProvider.GetUnitOfWork())
+                {
+                    //Publish and then update the database with new status
+                    var publishedOutcome = internalStrategy.PublishWithChildren(uow, list, userId, includeUnpublished).ToArray();
+                    var published = publishedOutcome
+                        .Where(x => x.Success || x.Result.StatusType == PublishStatusType.SuccessAlreadyPublished)
+                        // ensure proper order (for events) - cannot publish a child before its parent!
+                        .OrderBy(x => x.Result.ContentItem.Level)
+                        .ThenBy(x => x.Result.ContentItem.SortOrder);
+
+                    var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                    //NOTE The Publish with subpages-dialog was used more as a republish-type-thing, so we'll have to include PublishStatusType.SuccessAlreadyPublished
+                    //in the updated-list, so the Published event is triggered with the expected set of pages and the xml is updated.
+                    foreach (var item in published)
+                    {
+                        item.Result.ContentItem.WriterId = userId;
+                        repository.AddOrUpdate(item.Result.ContentItem);
+                        //add or update a preview
+                        repository.AddOrUpdatePreviewXml(item.Result.ContentItem, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                        //add or update the published xml
+                        repository.AddOrUpdateContentXml(item.Result.ContentItem, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                        updated.Add(item.Result.ContentItem);
+                    }
+
+                    //Save xml to db and call following method to fire event:
+                    _publishingStrategy.PublishingFinalized(uow, updated, false);
+
+                    Audit(uow, AuditType.Publish, "Publish with Children performed by user", userId, content.Id);
+                    uow.Commit();
+
+                    return publishedOutcome;
+                }
+            }
+        }
+
+        /// <summary>
+        /// UnPublishes a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to publish</param>
+        /// <param name="omitCacheRefresh">Optional boolean to avoid having the cache refreshed when calling this Unpublish method. By default this method will update the cache.</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <returns>True if unpublishing succeeded, otherwise False</returns>
+        private Attempt<UnPublishStatus> UnPublishDo(IContent content, bool omitCacheRefresh = false, int userId = 0)
+        {
+            var newest = GetById(content.Id); // ensure we have the newest version
+            if (content.Version != newest.Version) // but use the original object if it's already the newest version
+                content = newest;
+
+            var evtMsgs = EventMessagesFactory.Get();
+
+            var published = content.Published ? content : GetPublishedVersion(content.Id); // get the published version
+            if (published == null)
+            {
+                return Attempt.Succeed(new UnPublishStatus(content, UnPublishedStatusType.SuccessAlreadyUnPublished, evtMsgs)); // already unpublished
+            }
+
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var unpublished = _publishingStrategy.UnPublish(uow, content, userId);
+                if (unpublished == false)
+                {
+                    uow.Commit();
+                    return Attempt.Fail(new UnPublishStatus(content, UnPublishedStatusType.FailedCancelledByEvent, evtMsgs));
+                }
+
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                content.WriterId = userId;
+                repository.AddOrUpdate(content);
+                // is published is not newest, reset the published flag on published version
+                if (published.Version != content.Version)
+                    repository.ClearPublished(published);
+                repository.DeleteContentXml(content);
+
+                //Delete xml from db? and call following method to fire event through PublishingStrategy to update cache
+                if (omitCacheRefresh == false)
+                    _publishingStrategy.UnPublishingFinalized(uow, content);
+
+                Audit(uow, AuditType.UnPublish, "UnPublish performed by user", userId, content.Id);
+                uow.Commit();
+            }
+
+            return Attempt.Succeed(new UnPublishStatus(content, UnPublishedStatusType.Success, evtMsgs));
+        }
+
+        /// <summary>
+        /// Saves and Publishes a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to save and publish</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise save events.</param>
+        /// <returns>True if publishing succeeded, otherwise False</returns>
+        private Attempt<PublishStatus> SaveAndPublishDo(IContent content, int userId = 0, bool raiseEvents = true)
+        {
+            var evtMsgs = EventMessagesFactory.Get();
+
+            using (new WriteLock(Locker))
+            {
+                using (var uow = UowProvider.GetUnitOfWork())
+                {
+                    var saveEventArgs = new SaveEventArgs<IContent>(content, evtMsgs);
+                    if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
+                    {
+                        uow.Commit();
+                        return Attempt.Fail(new PublishStatus(content, PublishStatusType.FailedCancelledByEvent, evtMsgs));
+                    }
+
+                    //Has this content item previously been published? If so, we don't need to refresh the children
+                    var previouslyPublished = content.HasIdentity && HasPublishedVersion(content.Id); //content might not have an id
+                    var publishStatus = new PublishStatus(content, PublishStatusType.Success, evtMsgs); //initially set to success
+
+                    //Check if parent is published (although not if its a root node) - if parent isn't published this Content cannot be published
+                    publishStatus.StatusType = CheckAndLogIsPublishable(content);
+                    //if it is not successful, then check if the props are valid
+                    if ((int)publishStatus.StatusType < 10)
+                    {
+                        //Content contains invalid property values and can therefore not be published - fire event?
+                        publishStatus.StatusType = CheckAndLogIsValid(content);
+                        //set the invalid properties (if there are any)
+                        publishStatus.InvalidProperties = ((ContentBase)content).LastInvalidProperties;
+                    }
+                    //if we're still successful, then publish using the strategy
+                    if (publishStatus.StatusType == PublishStatusType.Success)
+                    {
+                        //Publish and then update the database with new status
+                        var publishResult = _publishingStrategy.Publish(uow, content, userId);
+                        //set the status type to the publish result
+                        publishStatus.StatusType = publishResult.Result.StatusType;
+                    }
+
+                    //we are successfully published if our publishStatus is still Successful
+                    bool published = publishStatus.StatusType == PublishStatusType.Success;
+
+                    var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                    if (published == false)
+                    {
+                        content.ChangePublishedState(PublishedState.Saved);
+                    }
+                    //Since this is the Save and Publish method, the content should be saved even though the publish fails or isn't allowed
+                    if (content.HasIdentity == false)
+                    {
+                        content.CreatorId = userId;
+                    }
+                    content.WriterId = userId;
+
+                    repository.AddOrUpdate(content);
+                    repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+
+                    if (published)
+                    {
+                        //Content Xml
+                        repository.AddOrUpdateContentXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                    }
+
+                    if (raiseEvents)
+                    {
+                        saveEventArgs.CanCancel = false;
+                        uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
+                    }
+
+                    //Save xml to db and call following method to fire event through PublishingStrategy to update cache
+                    if (published)
+                    {
+                        _publishingStrategy.PublishingFinalized(uow, content);
+                    }
+
+                    //We need to check if children and their publish state to ensure that we 'republish' content that was previously published
+                    if (published && previouslyPublished == false && HasChildren(content.Id))
+                    {
+                    //TODO: Horrible for performance if there are lots of descendents! We should page if anything but this is crazy
+                        var descendants = GetPublishedDescendants(content);
+                        _publishingStrategy.PublishingFinalized(uow, descendants, false);
+                    }
+
+                    uow.Commit();
+
+                    if (publishStatus.StatusType == PublishStatusType.Success)
+                    {
+                        Audit(uow, AuditType.Publish, "Save and Publish performed by user", userId, content.Id);
+                    }
+                    else
+                    {
+                        Audit(uow, AuditType.Save, "Save performed by user", userId, content.Id);
+                    }
+                    uow.Commit();
+
+                    return Attempt.If(publishStatus.StatusType == PublishStatusType.Success, publishStatus);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Saves a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to save</param>
+        /// <param name="changeState">Boolean indicating whether or not to change the Published state upon saving</param>
+        /// <param name="userId">Optional Id of the User saving the Content</param>
+        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
+        private Attempt<OperationStatus> Save(IContent content, bool changeState, int userId = 0, bool raiseEvents = true)
+        {
+            var evtMsgs = EventMessagesFactory.Get();
+
+            using (new WriteLock(Locker))
+            {
+                using (var uow = UowProvider.GetUnitOfWork())
+                {
+                    var saveEventArgs = new SaveEventArgs<IContent>(content, evtMsgs);
+                    if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
+                    {
+                        uow.Commit();
+                        return OperationStatus.Cancelled(evtMsgs);
+                    }
+
+                    if (string.IsNullOrWhiteSpace(content.Name))
+                    {
+                        throw new ArgumentException("Cannot save content with empty name.");
+                    }
+
+                    var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                    if (content.HasIdentity == false)
+                    {
+                        content.CreatorId = userId;
+                    }
+                    content.WriterId = userId;
+
+                    //Only change the publish state if the "previous" version was actually published or marked as unpublished
+                    if (changeState && (content.Published || ((Content)content).PublishedState == PublishedState.Unpublished))
+                        content.ChangePublishedState(PublishedState.Saved);
+
+                    repository.AddOrUpdate(content);
+
+                    //Generate a new preview
+                    repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+
+                    if (raiseEvents)
+                    {
+                        saveEventArgs.CanCancel = false;
+                        uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
+                    }
+
+                    Audit(uow, AuditType.Save, "Save Content performed by user", userId, content.Id);
+                    uow.Commit();
+                }
+
+                return OperationStatus.Success(evtMsgs);
+            }
+        }
+
+        private PublishStatusType CheckAndLogIsPublishable(IContent content)
+        {
+            //Check if parent is published (although not if its a root node) - if parent isn't published this Content cannot be published
+            if (content.ParentId != Constants.System.Root && content.ParentId != Constants.System.RecycleBinContent && IsPublishable(content) == false)
+            {
+                Logger.Info<ContentService>(
+                    string.Format(
+                        "Content '{0}' with Id '{1}' could not be published because its parent is not published.",
+                        content.Name, content.Id));
+                return PublishStatusType.FailedPathNotPublished;
+            }
+
+            if (content.ExpireDate.HasValue && content.ExpireDate.Value > DateTime.MinValue && DateTime.Now > content.ExpireDate.Value)
+            {
+                Logger.Info<ContentService>(
+                    string.Format(
+                        "Content '{0}' with Id '{1}' has expired and could not be published.",
+                        content.Name, content.Id));
+                return PublishStatusType.FailedHasExpired;
+            }
+
+            if (content.ReleaseDate.HasValue && content.ReleaseDate.Value > DateTime.MinValue && content.ReleaseDate.Value > DateTime.Now)
+            {
+                Logger.Info<ContentService>(
+                    string.Format(
+                        "Content '{0}' with Id '{1}' is awaiting release and could not be published.",
+                        content.Name, content.Id));
+                return PublishStatusType.FailedAwaitingRelease;
+            }
+
+            return PublishStatusType.Success;
+        }
+
+        private PublishStatusType CheckAndLogIsValid(IContent content)
+        {
+            //Content contains invalid property values and can therefore not be published - fire event?
+            if (content.IsValid() == false)
+            {
+                Logger.Info<ContentService>(
+                    string.Format(
+                        "Content '{0}' with Id '{1}' could not be published because of invalid properties.",
+                        content.Name, content.Id));
+                return PublishStatusType.FailedContentInvalid;
+            }
+
+            return PublishStatusType.Success;
+        }
+
+        private IContentType FindContentTypeByAlias(string contentTypeAlias)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentTypeRepository(uow);
+
+                var query = Query<IContentType>.Builder.Where(x => x.Alias == contentTypeAlias);
+                var types = repository.GetByQuery(query);
+
+                if (types.Any() == false)
+                    throw new Exception(
+                        string.Format("No ContentType matching the passed in Alias: '{0}' was found",
+                                      contentTypeAlias));
+
+                var contentType = types.First();
+
+                if (contentType == null)
+                    throw new Exception(string.Format("ContentType matching the passed in Alias: '{0}' was null",
+                                                      contentTypeAlias));
+                return contentType;
+            }
+        }
+
+        #endregion
+
+        #region Proxy Event Handlers
+        /// <summary>
+        /// Occurs before publish.
+        /// </summary>
+        /// <remarks>Proxy to the real event on the <see cref="PublishingStrategy"/></remarks>
+        public static event TypedEventHandler<IPublishingStrategy, PublishEventArgs<IContent>> Publishing
+        {
+            add { PublishingStrategy.Publishing += value; }
+            remove { PublishingStrategy.Publishing -= value; }
+        }
+
+        /// <summary>
+        /// Occurs after publish.
+        /// </summary>
+        /// <remarks>Proxy to the real event on the <see cref="PublishingStrategy"/></remarks>
+        public static event TypedEventHandler<IPublishingStrategy, PublishEventArgs<IContent>> Published
+        {
+            add { PublishingStrategy.Published += value; }
+            remove { PublishingStrategy.Published -= value; }
+        }
+        /// <summary>
+        /// Occurs before unpublish.
+        /// </summary>
+        /// <remarks>Proxy to the real event on the <see cref="PublishingStrategy"/></remarks>
+        public static event TypedEventHandler<IPublishingStrategy, PublishEventArgs<IContent>> UnPublishing
+        {
+            add { PublishingStrategy.UnPublishing += value; }
+            remove { PublishingStrategy.UnPublishing -= value; }
+        }
+
+        /// <summary>
+        /// Occurs after unpublish.
+        /// </summary>
+        /// <remarks>Proxy to the real event on the <see cref="PublishingStrategy"/></remarks>
+        public static event TypedEventHandler<IPublishingStrategy, PublishEventArgs<IContent>> UnPublished
+        {
+            add { PublishingStrategy.UnPublished += value; }
+            remove { PublishingStrategy.UnPublished -= value; }
+        }
+        #endregion
+
+        #region Event Handlers
+        /// <summary>
+        /// Occurs before Delete
+        /// </summary>
+        public static event TypedEventHandler<IContentService, DeleteEventArgs<IContent>> Deleting;
+
+        /// <summary>
+        /// Occurs after Delete
+        /// </summary>
+        public static event TypedEventHandler<IContentService, DeleteEventArgs<IContent>> Deleted;
+
+        /// <summary>
+        /// Occurs before Delete Versions
+        /// </summary>
+        public static event TypedEventHandler<IContentService, DeleteRevisionsEventArgs> DeletingVersions;
+
+        /// <summary>
+        /// Occurs after Delete Versions
+        /// </summary>
+        public static event TypedEventHandler<IContentService, DeleteRevisionsEventArgs> DeletedVersions;
+
+        /// <summary>
+        /// Occurs before Save
+        /// </summary>
+        public static event TypedEventHandler<IContentService, SaveEventArgs<IContent>> Saving;
+
+        /// <summary>
+        /// Occurs after Save
+        /// </summary>
+        public static event TypedEventHandler<IContentService, SaveEventArgs<IContent>> Saved;
+
+        /// <summary>
+        /// Occurs before Create
+        /// </summary>
+        [Obsolete("Use the Created event instead, the Creating and Created events both offer the same functionality, Creating event has been deprecated.")]
+        public static event TypedEventHandler<IContentService, NewEventArgs<IContent>> Creating;
+
+        /// <summary>
+        /// Occurs after Create
+        /// </summary>
+        /// <remarks>
+        /// Please note that the Content object has been created, but might not have been saved
+        /// so it does not have an identity yet (meaning no Id has been set).
+        /// </remarks>
+        public static event TypedEventHandler<IContentService, NewEventArgs<IContent>> Created;
+
+        /// <summary>
+        /// Occurs before Copy
+        /// </summary>
+        public static event TypedEventHandler<IContentService, CopyEventArgs<IContent>> Copying;
+
+        /// <summary>
+        /// Occurs after Copy
+        /// </summary>
+        public static event TypedEventHandler<IContentService, CopyEventArgs<IContent>> Copied;
+
+        /// <summary>
+        /// Occurs before Content is moved to Recycle Bin
+        /// </summary>
+        public static event TypedEventHandler<IContentService, MoveEventArgs<IContent>> Trashing;
+
+        /// <summary>
+        /// Occurs after Content is moved to Recycle Bin
+        /// </summary>
+        public static event TypedEventHandler<IContentService, MoveEventArgs<IContent>> Trashed;
+
+        /// <summary>
+        /// Occurs before Move
+        /// </summary>
+        public static event TypedEventHandler<IContentService, MoveEventArgs<IContent>> Moving;
+
+        /// <summary>
+        /// Occurs after Move
+        /// </summary>
+        public static event TypedEventHandler<IContentService, MoveEventArgs<IContent>> Moved;
+
+        /// <summary>
+        /// Occurs before Rollback
+        /// </summary>
+        public static event TypedEventHandler<IContentService, RollbackEventArgs<IContent>> RollingBack;
+
+        /// <summary>
+        /// Occurs after Rollback
+        /// </summary>
+        public static event TypedEventHandler<IContentService, RollbackEventArgs<IContent>> RolledBack;
+
+        /// <summary>
+        /// Occurs before Send to Publish
+        /// </summary>
+        public static event TypedEventHandler<IContentService, SendToPublishEventArgs<IContent>> SendingToPublish;
+
+        /// <summary>
+        /// Occurs after Send to Publish
+        /// </summary>
+        public static event TypedEventHandler<IContentService, SendToPublishEventArgs<IContent>> SentToPublish;
+
+        /// <summary>
+        /// Occurs before the Recycle Bin is emptied
+        /// </summary>
+        public static event TypedEventHandler<IContentService, RecycleBinEventArgs> EmptyingRecycleBin;
+
+        /// <summary>
+        /// Occurs after the Recycle Bin has been Emptied
+        /// </summary>
+        public static event TypedEventHandler<IContentService, RecycleBinEventArgs> EmptiedRecycleBin;
+
+        /// <summary>
+        /// Occurs after a blueprint has been saved.
+        /// </summary>
+        public static event TypedEventHandler<IContentService, SaveEventArgs<IContent>> SavedBlueprint;
+
+        /// <summary>
+        /// Occurs after a blueprint has been deleted.
+        /// </summary>
+        public static event TypedEventHandler<IContentService, DeleteEventArgs<IContent>> DeletedBlueprint;
+
+        #endregion
+    }
+}
diff --git a/src/Umbraco.Core/Services/IContentService.cs b/src/Umbraco.Core/Services/IContentService.cs
index 5a626c5d36..8c063890fd 100644
--- a/src/Umbraco.Core/Services/IContentService.cs
+++ b/src/Umbraco.Core/Services/IContentService.cs
@@ -1,717 +1,720 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Xml;
-using System.Xml.Linq;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.Membership;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
-using Umbraco.Core.Persistence.Querying;
-using Umbraco.Core.Publishing;
-
-namespace Umbraco.Core.Services
-{
-    /// <summary>
-    /// A temporary interface until we are in v8, this is used to return a different result for the same method and this interface gets implemented
-    /// explicitly. These methods will replace the normal ones in IContentService in v8 and this will be removed.
-    /// </summary>
-    public interface IContentServiceOperations
-    {
-        //TODO: Remove this class in v8
-
-        //TODO: There's probably more that needs to be added like the EmptyRecycleBin, etc...        
-
-        /// <summary>
-        /// Saves a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to save</param>
-        /// <param name="userId">Optional Id of the User saving the Content</param>
-        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
-        Attempt<OperationStatus> Save(IContent content, int userId = 0, bool raiseEvents = true);
-
-        /// <summary>
-        /// Saves a collection of <see cref="IContent"/> objects.
-        /// </summary>        
-        /// <param name="contents">Collection of <see cref="IContent"/> to save</param>
-        /// <param name="userId">Optional Id of the User saving the Content</param>
-        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>        
-        Attempt<OperationStatus> Save(IEnumerable<IContent> contents, int userId = 0, bool raiseEvents = true);
-
-        /// <summary>
-        /// Permanently deletes an <see cref="IContent"/> object.
-        /// </summary>
-        /// <remarks>
-        /// This method will also delete associated media files, child content and possibly associated domains.
-        /// </remarks>
-        /// <remarks>Please note that this method will completely remove the Content from the database</remarks>
-        /// <param name="content">The <see cref="IContent"/> to delete</param>
-        /// <param name="userId">Optional Id of the User deleting the Content</param>
-        Attempt<OperationStatus> Delete(IContent content, int userId = 0);
-
-        /// <summary>
-        /// Publishes a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to publish</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <returns>The published status attempt</returns>
-        Attempt<PublishStatus> Publish(IContent content, int userId = 0);
-
-        /// <summary>
-        /// Publishes a <see cref="IContent"/> object and all its children
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to publish along with its children</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <param name="includeUnpublished"></param>
-        /// <returns>The list of statuses for all published items</returns>
-        IEnumerable<Attempt<PublishStatus>> PublishWithChildren(IContent content, int userId = 0, bool includeUnpublished = false);
-
-        /// <summary>
-        /// Saves and Publishes a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to save and publish</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise save events.</param>
-        /// <returns>True if publishing succeeded, otherwise False</returns>
-        Attempt<PublishStatus> SaveAndPublish(IContent content, int userId = 0, bool raiseEvents = true);
-
-        /// <summary>
-        /// Deletes an <see cref="IContent"/> object by moving it to the Recycle Bin
-        /// </summary>
-        /// <remarks>Move an item to the Recycle Bin will result in the item being unpublished</remarks>
-        /// <param name="content">The <see cref="IContent"/> to delete</param>
-        /// <param name="userId">Optional Id of the User deleting the Content</param>
-        Attempt<OperationStatus> MoveToRecycleBin(IContent content, int userId = 0);
-
-        /// <summary>
-        /// UnPublishes a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to publish</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <returns>True if unpublishing succeeded, otherwise False</returns>
-        Attempt<UnPublishStatus> UnPublish(IContent content, int userId = 0);
-    }
-
-    /// <summary>
-    /// Defines the ContentService, which is an easy access to operations involving <see cref="IContent"/>
-    /// </summary>
-    public interface IContentService : IContentServiceBase
-    {
-        IEnumerable<IContent> GetBlueprintsForContentTypes(params int[] documentTypeIds);
-        IContent GetBlueprintById(int id);
-        IContent GetBlueprintById(Guid id);
-        void SaveBlueprint(IContent content, int userId = 0);
-        void DeleteBlueprint(IContent content, int userId = 0);
-        IContent CreateContentFromBlueprint(IContent blueprint, string name, int userId = 0);
-        void DeleteBlueprintsOfType(int contentTypeId, int userId = 0);
-        void DeleteBlueprintsOfTypes(IEnumerable<int> contentTypeIds, int userId = 0);
-
-        /// <summary>
-        /// Gets all XML entries found in the cmsContentXml table based on the given path
-        /// </summary>
-        /// <param name="path">Path starts with</param>
-        /// <param name="pageIndex">Page number</param>
-        /// <param name="pageSize">Page size</param>
-        /// <param name="totalRecords">Total records the query would return without paging</param>
-        /// <returns>A paged enumerable of XML entries of content items</returns>
-        /// <remarks>
-        /// If -1 is passed, then this will return all content xml entries, otherwise will return all descendents from the path
-        /// </remarks>
-        IEnumerable<XElement> GetPagedXmlEntries(string path, long pageIndex, int pageSize, out long totalRecords);
-
-        /// <summary>
-        /// This builds the Xml document used for the XML cache
-        /// </summary>
-        /// <returns></returns>
-        XmlDocument BuildXmlCache();
-
-        XmlDocument BuildPreviewXmlCache();
-
-        /// <summary>
-        /// Rebuilds all xml content in the cmsContentXml table for all documents
-        /// </summary>
-        /// <param name="contentTypeIds">
-        /// Only rebuild the xml structures for the content type ids passed in, if none then rebuilds the structures
-        /// for all content
-        /// </param>
-        void RebuildXmlStructures(params int[] contentTypeIds);
-
-        int CountPublished(string contentTypeAlias = null);
-        int Count(string contentTypeAlias = null);
-        int CountChildren(int parentId, string contentTypeAlias = null);
-        int CountDescendants(int parentId, string contentTypeAlias = null);
-
-        /// <summary>
-        /// Used to bulk update the permissions set for a content item. This will replace all permissions
-        /// assigned to an entity with a list of user group id & permission pairs.
-        /// </summary>
-        /// <param name="permissionSet"></param>
-        void ReplaceContentPermissions(EntityPermissionSet permissionSet);
-
-        /// <summary>
-        /// Assigns a single permission to the current content item for the specified user group ids
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <param name="permission"></param>
-        /// <param name="groupIds"></param>
-        void AssignContentPermission(IContent entity, char permission, IEnumerable<int> groupIds);
-
-        /// <summary>
-        /// Returns implicit/inherited permissions assigned to the content item for all user groups
-        /// </summary>
-        /// <param name="content"></param>
-        /// <returns></returns>
-        EntityPermissionCollection GetPermissionsForEntity(IContent content);
-
-        bool SendToPublication(IContent content, int userId = 0);
-
-        IEnumerable<IContent> GetByIds(IEnumerable<int> ids);
-        IEnumerable<IContent> GetByIds(IEnumerable<Guid> ids);
-
-        /// <summary>
-        /// Creates an <see cref="IContent"/> object using the alias of the <see cref="IContentType"/>
-        /// that this Content should based on.
-        /// </summary>
-        /// <remarks>
-        /// Note that using this method will simply return a new IContent without any identity
-        /// as it has not yet been persisted. It is intended as a shortcut to creating new content objects
-        /// that does not invoke a save operation against the database.
-        /// </remarks>
-        /// <param name="name">Name of the Content object</param>
-        /// <param name="parentId">Id of Parent for the new Content</param>
-        /// <param name="contentTypeAlias">Alias of the <see cref="IContentType"/></param>
-        /// <param name="userId">Optional id of the user creating the content</param>
-        /// <returns><see cref="IContent"/></returns>
-        IContent CreateContent(string name, Guid parentId, string contentTypeAlias, int userId = 0);
-
-        /// <summary>
-        /// Creates an <see cref="IContent"/> object using the alias of the <see cref="IContentType"/>
-        /// that this Content should based on.
-        /// </summary>
-        /// <remarks>
-        /// Note that using this method will simply return a new IContent without any identity
-        /// as it has not yet been persisted. It is intended as a shortcut to creating new content objects
-        /// that does not invoke a save operation against the database.
-        /// </remarks>
-        /// <param name="name">Name of the Content object</param>
-        /// <param name="parentId">Id of Parent for the new Content</param>
-        /// <param name="contentTypeAlias">Alias of the <see cref="IContentType"/></param>
-        /// <param name="userId">Optional id of the user creating the content</param>
-        /// <returns><see cref="IContent"/></returns>
-        IContent CreateContent(string name, int parentId, string contentTypeAlias, int userId = 0);
-
-        /// <summary>
-        /// Creates an <see cref="IContent"/> object using the alias of the <see cref="IContentType"/>
-        /// that this Content should based on.
-        /// </summary>
-        /// <remarks>
-        /// Note that using this method will simply return a new IContent without any identity
-        /// as it has not yet been persisted. It is intended as a shortcut to creating new content objects
-        /// that does not invoke a save operation against the database.
-        /// </remarks>
-        /// <param name="name">Name of the Content object</param>
-        /// <param name="parent">Parent <see cref="IContent"/> object for the new Content</param>
-        /// <param name="contentTypeAlias">Alias of the <see cref="IContentType"/></param>
-        /// <param name="userId">Optional id of the user creating the content</param>
-        /// <returns><see cref="IContent"/></returns>
-        IContent CreateContent(string name, IContent parent, string contentTypeAlias, int userId = 0);
-
-        /// <summary>
-        /// Gets an <see cref="IContent"/> object by Id
-        /// </summary>
-        /// <param name="id">Id of the Content to retrieve</param>
-        /// <returns><see cref="IContent"/></returns>
-        IContent GetById(int id);
-
-        /// <summary>
-        /// Gets an <see cref="IContent"/> object by its 'UniqueId'
-        /// </summary>
-        /// <param name="key">Guid key of the Content to retrieve</param>
-        /// <returns><see cref="IContent"/></returns>
-        IContent GetById(Guid key);
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects by the Id of the <see cref="IContentType"/>
-        /// </summary>
-        /// <param name="id">Id of the <see cref="IContentType"/></param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        IEnumerable<IContent> GetContentOfContentType(int id);
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects by Level
-        /// </summary>
-        /// <param name="level">The level to retrieve Content from</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        IEnumerable<IContent> GetByLevel(int level);
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
-        /// </summary>
-        /// <param name="id">Id of the Parent to retrieve Children from</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        IEnumerable<IContent> GetChildren(int id);
-
-        [Obsolete("Use the overload with 'long' parameter types instead")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        IEnumerable<IContent> GetPagedChildren(int id, int pageIndex, int pageSize, out int totalRecords,
-            string orderBy = "SortOrder", Direction orderDirection = Direction.Ascending, string filter = "");
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
-        /// </summary>
-        /// <param name="id">Id of the Parent to retrieve Children from</param>
-        /// <param name="pageIndex">Page number</param>
-        /// <param name="pageSize">Page size</param>
-        /// <param name="totalRecords">Total records query would return without paging</param>
-        /// <param name="orderBy">Field to order by</param>
-        /// <param name="orderDirection">Direction to order by</param>
-        /// <param name="filter">Search text filter</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        IEnumerable<IContent> GetPagedChildren(int id, long pageIndex, int pageSize, out long totalRecords,
-            string orderBy = "SortOrder", Direction orderDirection = Direction.Ascending, string filter = "");
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
-        /// </summary>
-        /// <param name="id">Id of the Parent to retrieve Children from</param>
-        /// <param name="pageIndex">Page number</param>
-        /// <param name="pageSize">Page size</param>
-        /// <param name="totalRecords">Total records query would return without paging</param>
-        /// <param name="orderBy">Field to order by</param>
-        /// <param name="orderDirection">Direction to order by</param>
-        /// <param name="orderBySystemField">Flag to indicate when ordering by system field</param>
-        /// <param name="filter">Search text filter</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        IEnumerable<IContent> GetPagedChildren(int id, long pageIndex, int pageSize, out long totalRecords,
-            string orderBy, Direction orderDirection, bool orderBySystemField, string filter);
-
-        [Obsolete("Use the overload with 'long' parameter types instead")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        IEnumerable<IContent> GetPagedDescendants(int id, int pageIndex, int pageSize, out int totalRecords,
-            string orderBy = "path", Direction orderDirection = Direction.Ascending, string filter = "");
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
-        /// </summary>
-        /// <param name="id">Id of the Parent to retrieve Descendants from</param>
-        /// <param name="pageIndex">Page number</param>
-        /// <param name="pageSize">Page size</param>
-        /// <param name="totalRecords">Total records query would return without paging</param>
-        /// <param name="orderBy">Field to order by</param>
-        /// <param name="orderDirection">Direction to order by</param>
-        /// <param name="filter">Search text filter</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        IEnumerable<IContent> GetPagedDescendants(int id, long pageIndex, int pageSize, out long totalRecords,
-            string orderBy = "path", Direction orderDirection = Direction.Ascending, string filter = "");
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
-        /// </summary>
-        /// <param name="id">Id of the Parent to retrieve Descendants from</param>
-        /// <param name="pageIndex">Page number</param>
-        /// <param name="pageSize">Page size</param>
-        /// <param name="totalRecords">Total records query would return without paging</param>
-        /// <param name="orderBy">Field to order by</param>
-        /// <param name="orderDirection">Direction to order by</param>
-        /// <param name="orderBySystemField">Flag to indicate when ordering by system field</param>
-        /// <param name="filter">Search text filter</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        IEnumerable<IContent> GetPagedDescendants(int id, long pageIndex, int pageSize, out long totalRecords,
-            string orderBy, Direction orderDirection, bool orderBySystemField, string filter);
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
-        /// </summary>
-        /// <param name="id">Id of the Parent to retrieve Descendants from</param>
-        /// <param name="pageIndex">Page number</param>
-        /// <param name="pageSize">Page size</param>
-        /// <param name="totalRecords">Total records query would return without paging</param>
-        /// <param name="orderBy">Field to order by</param>
-        /// <param name="orderDirection">Direction to order by</param>
-        /// <param name="orderBySystemField">Flag to indicate when ordering by system field</param>
-        /// <param name="filter"></param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        IEnumerable<IContent> GetPagedDescendants(int id, long pageIndex, int pageSize, out long totalRecords,
-            string orderBy, Direction orderDirection, bool orderBySystemField, IQuery<IContent> filter);
-
-        /// <summary>
-        /// Gets a collection of an <see cref="IContent"/> objects versions by its Id
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        IEnumerable<IContent> GetVersions(int id);
-
-        /// <summary>
-        /// Gets a list of all version Ids for the given content item ordered so latest is first
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="maxRows">The maximum number of rows to return</param>
-        /// <returns></returns>
-        IEnumerable<Guid> GetVersionIds(int id, int maxRows);
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects, which reside at the first level / root
-        /// </summary>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        IEnumerable<IContent> GetRootContent();
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects, which has an expiration date greater then today
-        /// </summary>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        IEnumerable<IContent> GetContentForExpiration();
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects, which has a release date greater then today
-        /// </summary>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        IEnumerable<IContent> GetContentForRelease();
-
-        /// <summary>
-        /// Gets a collection of an <see cref="IContent"/> objects, which resides in the Recycle Bin
-        /// </summary>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        IEnumerable<IContent> GetContentInRecycleBin();
-
-        /// <summary>
-        /// Saves a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to save</param>
-        /// <param name="userId">Optional Id of the User saving the Content</param>
-        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
-        void Save(IContent content, int userId = 0, bool raiseEvents = true);
-
-        /// <summary>
-        /// Saves a collection of <see cref="IContent"/> objects.
-        /// </summary>        
-        /// <param name="contents">Collection of <see cref="IContent"/> to save</param>
-        /// <param name="userId">Optional Id of the User saving the Content</param>
-        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
-        void Save(IEnumerable<IContent> contents, int userId = 0, bool raiseEvents = true);
-
-        /// <summary>
-        /// Deletes all content of specified type. All children of deleted content is moved to Recycle Bin.
-        /// </summary>
-        /// <remarks>This needs extra care and attention as its potentially a dangerous and extensive operation</remarks>
-        /// <param name="contentTypeId">Id of the <see cref="IContentType"/></param>
-        /// <param name="userId">Optional Id of the user issueing the delete operation</param>
-        void DeleteContentOfType(int contentTypeId, int userId = 0);
-
-        /// <summary>
-        /// Deletes all content of the specified types. All Descendants of deleted content that is not of these types is moved to Recycle Bin.
-        /// </summary>
-        /// <remarks>This needs extra care and attention as its potentially a dangerous and extensive operation</remarks>
-        /// <param name="contentTypeIds">Ids of the <see cref="IContentType"/>s</param>
-        /// <param name="userId">Optional Id of the user issueing the delete operation</param>
-        void DeleteContentOfTypes(IEnumerable<int> contentTypeIds, int userId = 0);
-
-        /// <summary>
-        /// Permanently deletes versions from an <see cref="IContent"/> object prior to a specific date.
-        /// </summary>
-        /// <param name="id">Id of the <see cref="IContent"/> object to delete versions from</param>
-        /// <param name="versionDate">Latest version date</param>
-        /// <param name="userId">Optional Id of the User deleting versions of a Content object</param>
-        void DeleteVersions(int id, DateTime versionDate, int userId = 0);
-
-        /// <summary>
-        /// Permanently deletes a specific version from an <see cref="IContent"/> object.
-        /// </summary>
-        /// <param name="id">Id of the <see cref="IContent"/> object to delete a version from</param>
-        /// <param name="versionId">Id of the version to delete</param>
-        /// <param name="deletePriorVersions">Boolean indicating whether to delete versions prior to the versionId</param>
-        /// <param name="userId">Optional Id of the User deleting versions of a Content object</param>
-        void DeleteVersion(int id, Guid versionId, bool deletePriorVersions, int userId = 0);
-
-        /// <summary>
-        /// Deletes an <see cref="IContent"/> object by moving it to the Recycle Bin
-        /// </summary>
-        /// <remarks>Move an item to the Recycle Bin will result in the item being unpublished</remarks>
-        /// <param name="content">The <see cref="IContent"/> to delete</param>
-        /// <param name="userId">Optional Id of the User deleting the Content</param>
-        void MoveToRecycleBin(IContent content, int userId = 0);
-
-        /// <summary>
-        /// Moves an <see cref="IContent"/> object to a new location
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to move</param>
-        /// <param name="parentId">Id of the Content's new Parent</param>
-        /// <param name="userId">Optional Id of the User moving the Content</param>
-        void Move(IContent content, int parentId, int userId = 0);
-
-        /// <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.
-        /// </summary>
-        /// <param name="id">Id of the <see cref="IContent"/>being rolled back</param>
-        /// <param name="versionId">Id of the version to rollback to</param>
-        /// <param name="userId">Optional Id of the User issueing the rollback of the Content</param>
-        /// <returns>The newly created <see cref="IContent"/> object</returns>
-        IContent Rollback(int id, Guid versionId, int userId = 0);
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects by its name or partial name
-        /// </summary>
-        /// <param name="parentId">Id of the Parent to retrieve Children from</param>
-        /// <param name="name">Full or partial name of the children</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        IEnumerable<IContent> GetChildrenByName(int parentId, string name);
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
-        /// </summary>
-        /// <param name="id">Id of the Parent to retrieve Descendants from</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        IEnumerable<IContent> GetDescendants(int id);
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
-        /// </summary>
-        /// <param name="content"><see cref="IContent"/> item to retrieve Descendants from</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        IEnumerable<IContent> GetDescendants(IContent content);
-
-        /// <summary>
-        /// Gets a specific version of an <see cref="IContent"/> item.
-        /// </summary>
-        /// <param name="versionId">Id of the version to retrieve</param>
-        /// <returns>An <see cref="IContent"/> item</returns>
-        IContent GetByVersion(Guid versionId);
-
-        /// <summary>
-        /// Gets the published version of an <see cref="IContent"/> item
-        /// </summary>
-        /// <param name="id">Id of the <see cref="IContent"/> to retrieve version from</param>
-        /// <returns>An <see cref="IContent"/> item</returns>
-        IContent GetPublishedVersion(int id);
-
-        /// <summary>
-        /// Gets the published version of a <see cref="IContent"/> item.
-        /// </summary>
-        /// <param name="content">The content item.</param>
-        /// <returns>The published version, if any; otherwise, null.</returns>
-        IContent GetPublishedVersion(IContent content);
-
-        /// <summary>
-        /// Checks whether an <see cref="IContent"/> item has any children
-        /// </summary>
-        /// <param name="id">Id of the <see cref="IContent"/></param>
-        /// <returns>True if the content has any children otherwise False</returns>
-        bool HasChildren(int id);
-
-        /// <summary>
-        /// Checks whether an <see cref="IContent"/> item has any published versions
-        /// </summary>
-        /// <param name="id">Id of the <see cref="IContent"/></param>
-        /// <returns>True if the content has any published version otherwise False</returns>
-        bool HasPublishedVersion(int id);
-
-        /// <summary>
-        /// Re-Publishes all Content
-        /// </summary>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <returns>True if publishing succeeded, otherwise False</returns>
-        bool RePublishAll(int userId = 0);
-
-        /// <summary>
-        /// Publishes a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to publish</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <returns>True if publishing succeeded, otherwise False</returns>
-        bool Publish(IContent content, int userId = 0);
-
-        /// <summary>
-        /// Publishes a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to publish</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <returns>The published status attempt</returns>
-        Attempt<PublishStatus> PublishWithStatus(IContent content, int userId = 0);
-
-        /// <summary>
-        /// Publishes a <see cref="IContent"/> object and all its children
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to publish along with its children</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <returns>True if publishing succeeded, otherwise False</returns>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        [Obsolete("Use PublishWithChildrenWithStatus instead, that method will provide more detailed information on the outcome and also allows the includeUnpublished flag")]
-        bool PublishWithChildren(IContent content, int userId = 0);
-
-        /// <summary>
-        /// Publishes a <see cref="IContent"/> object and all its children
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to publish along with its children</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <param name="includeUnpublished"></param>
-        /// <returns>The list of statuses for all published items</returns>
-        IEnumerable<Attempt<PublishStatus>> PublishWithChildrenWithStatus(IContent content, int userId = 0, bool includeUnpublished = false);
-
-        /// <summary>
-        /// UnPublishes a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to publish</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <returns>True if unpublishing succeeded, otherwise False</returns>
-        bool UnPublish(IContent content, int userId = 0);
-
-        /// <summary>
-        /// Saves and Publishes a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to save and publish</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise save events.</param>
-        /// <returns>True if publishing succeeded, otherwise False</returns>
-        [Obsolete("Use SaveAndPublishWithStatus instead, that method will provide more detailed information on the outcome")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        bool SaveAndPublish(IContent content, int userId = 0, bool raiseEvents = true);
-
-        /// <summary>
-        /// Saves and Publishes a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to save and publish</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise save events.</param>
-        /// <returns>True if publishing succeeded, otherwise False</returns>
-        Attempt<PublishStatus> SaveAndPublishWithStatus(IContent content, int userId = 0, bool raiseEvents = true);
-
-        /// <summary>
-        /// Permanently deletes an <see cref="IContent"/> object.
-        /// </summary>
-        /// <remarks>
-        /// This method will also delete associated media files, child content and possibly associated domains.
-        /// </remarks>
-        /// <remarks>Please note that this method will completely remove the Content from the database</remarks>
-        /// <param name="content">The <see cref="IContent"/> to delete</param>
-        /// <param name="userId">Optional Id of the User deleting the Content</param>        
-        void Delete(IContent content, int userId = 0);
-
-        /// <summary>
-        /// Copies an <see cref="IContent"/> object by creating a new Content object of the same type and copies all data from the current 
-        /// to the new copy, which is returned. Recursively copies all children.
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to copy</param>
-        /// <param name="parentId">Id of the Content's new Parent</param>
-        /// <param name="relateToOriginal">Boolean indicating whether the copy should be related to the original</param>
-        /// <param name="userId">Optional Id of the User copying the Content</param>
-        /// <returns>The newly created <see cref="IContent"/> object</returns>
-        IContent Copy(IContent content, int parentId, bool relateToOriginal, int userId = 0);
-
-        /// <summary>
-        /// Copies an <see cref="IContent"/> object by creating a new Content object of the same type and copies all data from the current 
-        /// to the new copy which is returned.
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to copy</param>
-        /// <param name="parentId">Id of the Content's new Parent</param>
-        /// <param name="relateToOriginal">Boolean indicating whether the copy should be related to the original</param>
-        /// <param name="recursive">A value indicating whether to recursively copy children.</param>
-        /// <param name="userId">Optional Id of the User copying the Content</param>
-        /// <returns>The newly created <see cref="IContent"/> object</returns>
-        IContent Copy(IContent content, int parentId, bool relateToOriginal, bool recursive, int userId = 0);
-
-        /// <summary>
-        /// Checks if the passed in <see cref="IContent"/> can be published based on the anscestors publish state.
-        /// </summary>
-        /// <param name="content"><see cref="IContent"/> to check if anscestors are published</param>
-        /// <returns>True if the Content can be published, otherwise False</returns>
-        bool IsPublishable(IContent content);
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects, which are ancestors of the current content.
-        /// </summary>
-        /// <param name="id">Id of the <see cref="IContent"/> to retrieve ancestors for</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        IEnumerable<IContent> GetAncestors(int id);
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects, which are ancestors of the current content.
-        /// </summary>
-        /// <param name="content"><see cref="IContent"/> to retrieve ancestors for</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        IEnumerable<IContent> GetAncestors(IContent content);
-
-        /// <summary>
-        /// Sorts a collection of <see cref="IContent"/> objects by updating the SortOrder according
-        /// to the ordering of items in the passed in <see cref="IEnumerable{T}"/>.
-        /// </summary>
-        /// <remarks>
-        /// Using this method will ensure that the Published-state is maintained upon sorting
-        /// so the cache is updated accordingly - as needed.
-        /// </remarks>
-        /// <param name="items"></param>
-        /// <param name="userId"></param>
-        /// <param name="raiseEvents"></param>
-        /// <returns>True if sorting succeeded, otherwise False</returns>
-        bool Sort(IEnumerable<IContent> items, int userId = 0, bool raiseEvents = true);
-
-        /// <summary>
-        /// Sorts a collection of <see cref="IContent"/> objects by updating the SortOrder according
-        /// to the ordering of node Ids passed in.
-        /// </summary>
-        /// <remarks>
-        /// Using this method will ensure that the Published-state is maintained upon sorting
-        /// so the cache is updated accordingly - as needed.
-        /// </remarks>
-        /// <param name="ids"></param>
-        /// <param name="userId"></param>
-        /// <param name="raiseEvents"></param>
-        /// <returns>True if sorting succeeded, otherwise False</returns>
-        bool Sort(int[] ids, int userId = 0, bool raiseEvents = true);
-
-        /// <summary>
-        /// Gets the parent of the current content as an <see cref="IContent"/> item.
-        /// </summary>
-        /// <param name="id">Id of the <see cref="IContent"/> to retrieve the parent from</param>
-        /// <returns>Parent <see cref="IContent"/> object</returns>
-        IContent GetParent(int id);
-
-        /// <summary>
-        /// Gets the parent of the current content as an <see cref="IContent"/> item.
-        /// </summary>
-        /// <param name="content"><see cref="IContent"/> to retrieve the parent from</param>
-        /// <returns>Parent <see cref="IContent"/> object</returns>
-        IContent GetParent(IContent content);
-
-        /// <summary>
-        /// Creates and saves an <see cref="IContent"/> object using the alias of the <see cref="IContentType"/>
-        /// that this Content should based on.
-        /// </summary>
-        /// <remarks>
-        /// This method returns an <see cref="IContent"/> object that has been persisted to the database
-        /// and therefor has an identity.
-        /// </remarks>
-        /// <param name="name">Name of the Content object</param>
-        /// <param name="parent">Parent <see cref="IContent"/> object for the new Content</param>
-        /// <param name="contentTypeAlias">Alias of the <see cref="IContentType"/></param>
-        /// <param name="userId">Optional id of the user creating the content</param>
-        /// <returns><see cref="IContent"/></returns>
-        IContent CreateContentWithIdentity(string name, IContent parent, string contentTypeAlias, int userId = 0);
-
-        /// <summary>
-        /// Creates and saves an <see cref="IContent"/> object using the alias of the <see cref="IContentType"/>
-        /// that this Content should based on.
-        /// </summary>
-        /// <remarks>
-        /// This method returns an <see cref="IContent"/> object that has been persisted to the database
-        /// and therefor has an identity.
-        /// </remarks>
-        /// <param name="name">Name of the Content object</param>
-        /// <param name="parentId">Id of Parent for the new Content</param>
-        /// <param name="contentTypeAlias">Alias of the <see cref="IContentType"/></param>
-        /// <param name="userId">Optional id of the user creating the content</param>
-        /// <returns><see cref="IContent"/></returns>
-        IContent CreateContentWithIdentity(string name, int parentId, string contentTypeAlias, int userId = 0);
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Xml;
+using System.Xml.Linq;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.Membership;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
+using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Publishing;
+
+namespace Umbraco.Core.Services
+{
+    /// <summary>
+    /// A temporary interface until we are in v8, this is used to return a different result for the same method and this interface gets implemented
+    /// explicitly. These methods will replace the normal ones in IContentService in v8 and this will be removed.
+    /// </summary>
+    public interface IContentServiceOperations
+    {
+        //TODO: Remove this class in v8
+
+        //TODO: There's probably more that needs to be added like the EmptyRecycleBin, etc...
+
+        /// <summary>
+        /// Saves a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to save</param>
+        /// <param name="userId">Optional Id of the User saving the Content</param>
+        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
+        Attempt<OperationStatus> Save(IContent content, int userId = 0, bool raiseEvents = true);
+
+        /// <summary>
+        /// Saves a collection of <see cref="IContent"/> objects.
+        /// </summary>
+        /// <param name="contents">Collection of <see cref="IContent"/> to save</param>
+        /// <param name="userId">Optional Id of the User saving the Content</param>
+        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
+        Attempt<OperationStatus> Save(IEnumerable<IContent> contents, int userId = 0, bool raiseEvents = true);
+
+        /// <summary>
+        /// Permanently deletes an <see cref="IContent"/> object.
+        /// </summary>
+        /// <remarks>
+        /// This method will also delete associated media files, child content and possibly associated domains.
+        /// </remarks>
+        /// <remarks>Please note that this method will completely remove the Content from the database</remarks>
+        /// <param name="content">The <see cref="IContent"/> to delete</param>
+        /// <param name="userId">Optional Id of the User deleting the Content</param>
+        Attempt<OperationStatus> Delete(IContent content, int userId = 0);
+
+        /// <summary>
+        /// Publishes a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to publish</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <returns>The published status attempt</returns>
+        Attempt<PublishStatus> Publish(IContent content, int userId = 0);
+
+        /// <summary>
+        /// Publishes a <see cref="IContent"/> object and all its children
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to publish along with its children</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <param name="includeUnpublished"></param>
+        /// <returns>The list of statuses for all published items</returns>
+        IEnumerable<Attempt<PublishStatus>> PublishWithChildren(IContent content, int userId = 0, bool includeUnpublished = false);
+
+        /// <summary>
+        /// Saves and Publishes a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to save and publish</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise save events.</param>
+        /// <returns>True if publishing succeeded, otherwise False</returns>
+        Attempt<PublishStatus> SaveAndPublish(IContent content, int userId = 0, bool raiseEvents = true);
+
+        /// <summary>
+        /// Deletes an <see cref="IContent"/> object by moving it to the Recycle Bin
+        /// </summary>
+        /// <remarks>Move an item to the Recycle Bin will result in the item being unpublished</remarks>
+        /// <param name="content">The <see cref="IContent"/> to delete</param>
+        /// <param name="userId">Optional Id of the User deleting the Content</param>
+        Attempt<OperationStatus> MoveToRecycleBin(IContent content, int userId = 0);
+
+        /// <summary>
+        /// UnPublishes a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to publish</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <returns>True if unpublishing succeeded, otherwise False</returns>
+        Attempt<UnPublishStatus> UnPublish(IContent content, int userId = 0);
+    }
+
+    /// <summary>
+    /// Defines the ContentService, which is an easy access to operations involving <see cref="IContent"/>
+    /// </summary>
+    public interface IContentService : IContentServiceBase
+    {
+        IEnumerable<IContent> GetBlueprintsForContentTypes(params int[] documentTypeIds);
+        IContent GetBlueprintById(int id);
+        IContent GetBlueprintById(Guid id);
+        void SaveBlueprint(IContent content, int userId = 0);
+        void DeleteBlueprint(IContent content, int userId = 0);
+        IContent CreateContentFromBlueprint(IContent blueprint, string name, int userId = 0);
+        void DeleteBlueprintsOfType(int contentTypeId, int userId = 0);
+        void DeleteBlueprintsOfTypes(IEnumerable<int> contentTypeIds, int userId = 0);
+
+        /// <summary>
+        /// Gets all XML entries found in the cmsContentXml table based on the given path
+        /// </summary>
+        /// <param name="path">Path starts with</param>
+        /// <param name="pageIndex">Page number</param>
+        /// <param name="pageSize">Page size</param>
+        /// <param name="totalRecords">Total records the query would return without paging</param>
+        /// <returns>A paged enumerable of XML entries of content items</returns>
+        /// <remarks>
+        /// If -1 is passed, then this will return all content xml entries, otherwise will return all descendents from the path
+        /// </remarks>
+        IEnumerable<XElement> GetPagedXmlEntries(string path, long pageIndex, int pageSize, out long totalRecords);
+
+        /// <summary>
+        /// This builds the Xml document used for the XML cache
+        /// </summary>
+        /// <returns></returns>
+        XmlDocument BuildXmlCache();
+
+        XmlDocument BuildPreviewXmlCache();
+
+        /// <summary>
+        /// Rebuilds all xml content in the cmsContentXml table for all documents
+        /// </summary>
+        /// <param name="contentTypeIds">
+        /// Only rebuild the xml structures for the content type ids passed in, if none then rebuilds the structures
+        /// for all content
+        /// </param>
+        void RebuildXmlStructures(params int[] contentTypeIds);
+
+        int CountPublished(string contentTypeAlias = null);
+        int Count(string contentTypeAlias = null);
+        int CountChildren(int parentId, string contentTypeAlias = null);
+        int CountDescendants(int parentId, string contentTypeAlias = null);
+
+        /// <summary>
+        /// Used to bulk update the permissions set for a content item. This will replace all permissions
+        /// assigned to an entity with a list of user group id & permission pairs.
+        /// </summary>
+        /// <param name="permissionSet"></param>
+        void ReplaceContentPermissions(EntityPermissionSet permissionSet);
+
+        /// <summary>
+        /// Assigns a single permission to the current content item for the specified user group ids
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <param name="permission"></param>
+        /// <param name="groupIds"></param>
+        void AssignContentPermission(IContent entity, char permission, IEnumerable<int> groupIds);
+
+        /// <summary>
+        /// Returns implicit/inherited permissions assigned to the content item for all user groups
+        /// </summary>
+        /// <param name="content"></param>
+        /// <returns></returns>
+        EntityPermissionCollection GetPermissionsForEntity(IContent content);
+
+        bool SendToPublication(IContent content, int userId = 0);
+
+        IEnumerable<IContent> GetByIds(IEnumerable<int> ids);
+        IEnumerable<IContent> GetByIds(IEnumerable<Guid> ids);
+
+        /// <summary>
+        /// Creates an <see cref="IContent"/> object using the alias of the <see cref="IContentType"/>
+        /// that this Content should based on.
+        /// </summary>
+        /// <remarks>
+        /// Note that using this method will simply return a new IContent without any identity
+        /// as it has not yet been persisted. It is intended as a shortcut to creating new content objects
+        /// that does not invoke a save operation against the database.
+        /// </remarks>
+        /// <param name="name">Name of the Content object</param>
+        /// <param name="parentId">Id of Parent for the new Content</param>
+        /// <param name="contentTypeAlias">Alias of the <see cref="IContentType"/></param>
+        /// <param name="userId">Optional id of the user creating the content</param>
+        /// <returns><see cref="IContent"/></returns>
+        IContent CreateContent(string name, Guid parentId, string contentTypeAlias, int userId = 0);
+
+        /// <summary>
+        /// Creates an <see cref="IContent"/> object using the alias of the <see cref="IContentType"/>
+        /// that this Content should based on.
+        /// </summary>
+        /// <remarks>
+        /// Note that using this method will simply return a new IContent without any identity
+        /// as it has not yet been persisted. It is intended as a shortcut to creating new content objects
+        /// that does not invoke a save operation against the database.
+        /// </remarks>
+        /// <param name="name">Name of the Content object</param>
+        /// <param name="parentId">Id of Parent for the new Content</param>
+        /// <param name="contentTypeAlias">Alias of the <see cref="IContentType"/></param>
+        /// <param name="userId">Optional id of the user creating the content</param>
+        /// <returns><see cref="IContent"/></returns>
+        IContent CreateContent(string name, int parentId, string contentTypeAlias, int userId = 0);
+
+        /// <summary>
+        /// Creates an <see cref="IContent"/> object using the alias of the <see cref="IContentType"/>
+        /// that this Content should based on.
+        /// </summary>
+        /// <remarks>
+        /// Note that using this method will simply return a new IContent without any identity
+        /// as it has not yet been persisted. It is intended as a shortcut to creating new content objects
+        /// that does not invoke a save operation against the database.
+        /// </remarks>
+        /// <param name="name">Name of the Content object</param>
+        /// <param name="parent">Parent <see cref="IContent"/> object for the new Content</param>
+        /// <param name="contentTypeAlias">Alias of the <see cref="IContentType"/></param>
+        /// <param name="userId">Optional id of the user creating the content</param>
+        /// <returns><see cref="IContent"/></returns>
+        IContent CreateContent(string name, IContent parent, string contentTypeAlias, int userId = 0);
+
+        /// <summary>
+        /// Gets an <see cref="IContent"/> object by Id
+        /// </summary>
+        /// <param name="id">Id of the Content to retrieve</param>
+        /// <returns><see cref="IContent"/></returns>
+        IContent GetById(int id);
+
+        /// <summary>
+        /// Gets an <see cref="IContent"/> object by its 'UniqueId'
+        /// </summary>
+        /// <param name="key">Guid key of the Content to retrieve</param>
+        /// <returns><see cref="IContent"/></returns>
+        IContent GetById(Guid key);
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects by the Id of the <see cref="IContentType"/>
+        /// </summary>
+        /// <param name="id">Id of the <see cref="IContentType"/></param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        IEnumerable<IContent> GetContentOfContentType(int id);
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects by Level
+        /// </summary>
+        /// <param name="level">The level to retrieve Content from</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        IEnumerable<IContent> GetByLevel(int level);
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
+        /// </summary>
+        /// <param name="id">Id of the Parent to retrieve Children from</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        IEnumerable<IContent> GetChildren(int id);
+
+        [Obsolete("Use the overload with 'long' parameter types instead")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        IEnumerable<IContent> GetPagedChildren(int id, int pageIndex, int pageSize, out int totalRecords,
+            string orderBy = "SortOrder", Direction orderDirection = Direction.Ascending, string filter = "");
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
+        /// </summary>
+        /// <param name="id">Id of the Parent to retrieve Children from</param>
+        /// <param name="pageIndex">Page number</param>
+        /// <param name="pageSize">Page size</param>
+        /// <param name="totalRecords">Total records query would return without paging</param>
+        /// <param name="orderBy">Field to order by</param>
+        /// <param name="orderDirection">Direction to order by</param>
+        /// <param name="filter">Search text filter</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        IEnumerable<IContent> GetPagedChildren(int id, long pageIndex, int pageSize, out long totalRecords,
+            string orderBy = "SortOrder", Direction orderDirection = Direction.Ascending, string filter = "");
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
+        /// </summary>
+        /// <param name="id">Id of the Parent to retrieve Children from</param>
+        /// <param name="pageIndex">Page number</param>
+        /// <param name="pageSize">Page size</param>
+        /// <param name="totalRecords">Total records query would return without paging</param>
+        /// <param name="orderBy">Field to order by</param>
+        /// <param name="orderDirection">Direction to order by</param>
+        /// <param name="orderBySystemField">Flag to indicate when ordering by system field</param>
+        /// <param name="filter">Search text filter</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        IEnumerable<IContent> GetPagedChildren(int id, long pageIndex, int pageSize, out long totalRecords,
+            string orderBy, Direction orderDirection, bool orderBySystemField, string filter);
+
+        [Obsolete("Use the overload with 'long' parameter types instead")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        IEnumerable<IContent> GetPagedDescendants(int id, int pageIndex, int pageSize, out int totalRecords,
+            string orderBy = "path", Direction orderDirection = Direction.Ascending, string filter = "");
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
+        /// </summary>
+        /// <param name="id">Id of the Parent to retrieve Descendants from</param>
+        /// <param name="pageIndex">Page number</param>
+        /// <param name="pageSize">Page size</param>
+        /// <param name="totalRecords">Total records query would return without paging</param>
+        /// <param name="orderBy">Field to order by</param>
+        /// <param name="orderDirection">Direction to order by</param>
+        /// <param name="filter">Search text filter</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        IEnumerable<IContent> GetPagedDescendants(int id, long pageIndex, int pageSize, out long totalRecords,
+            string orderBy = "path", Direction orderDirection = Direction.Ascending, string filter = "");
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
+        /// </summary>
+        /// <param name="id">Id of the Parent to retrieve Descendants from</param>
+        /// <param name="pageIndex">Page number</param>
+        /// <param name="pageSize">Page size</param>
+        /// <param name="totalRecords">Total records query would return without paging</param>
+        /// <param name="orderBy">Field to order by</param>
+        /// <param name="orderDirection">Direction to order by</param>
+        /// <param name="orderBySystemField">Flag to indicate when ordering by system field</param>
+        /// <param name="filter">Search text filter</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        IEnumerable<IContent> GetPagedDescendants(int id, long pageIndex, int pageSize, out long totalRecords,
+            string orderBy, Direction orderDirection, bool orderBySystemField, string filter);
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
+        /// </summary>
+        /// <param name="id">Id of the Parent to retrieve Descendants from</param>
+        /// <param name="pageIndex">Page number</param>
+        /// <param name="pageSize">Page size</param>
+        /// <param name="totalRecords">Total records query would return without paging</param>
+        /// <param name="orderBy">Field to order by</param>
+        /// <param name="orderDirection">Direction to order by</param>
+        /// <param name="orderBySystemField">Flag to indicate when ordering by system field</param>
+        /// <param name="filter"></param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        IEnumerable<IContent> GetPagedDescendants(int id, long pageIndex, int pageSize, out long totalRecords,
+            string orderBy, Direction orderDirection, bool orderBySystemField, IQuery<IContent> filter);
+
+        /// <summary>
+        /// Gets a collection of an <see cref="IContent"/> objects versions by its Id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        IEnumerable<IContent> GetVersions(int id);
+
+        /// <summary>
+        /// Gets a list of all version Ids for the given content item ordered so latest is first
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="maxRows">The maximum number of rows to return</param>
+        /// <returns></returns>
+        IEnumerable<Guid> GetVersionIds(int id, int maxRows);
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects, which reside at the first level / root
+        /// </summary>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        IEnumerable<IContent> GetRootContent();
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects, which has an expiration date greater then today
+        /// </summary>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        IEnumerable<IContent> GetContentForExpiration();
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects, which has a release date greater then today
+        /// </summary>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        IEnumerable<IContent> GetContentForRelease();
+
+        /// <summary>
+        /// Gets a collection of an <see cref="IContent"/> objects, which resides in the Recycle Bin
+        /// </summary>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        IEnumerable<IContent> GetContentInRecycleBin();
+
+        /// <summary>
+        /// Saves a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to save</param>
+        /// <param name="userId">Optional Id of the User saving the Content</param>
+        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
+        void Save(IContent content, int userId = 0, bool raiseEvents = true);
+
+        /// <summary>
+        /// Saves a collection of <see cref="IContent"/> objects.
+        /// </summary>
+        /// <param name="contents">Collection of <see cref="IContent"/> to save</param>
+        /// <param name="userId">Optional Id of the User saving the Content</param>
+        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
+        void Save(IEnumerable<IContent> contents, int userId = 0, bool raiseEvents = true);
+
+        /// <summary>
+        /// Deletes all content of specified type. All children of deleted content is moved to Recycle Bin.
+        /// </summary>
+        /// <remarks>This needs extra care and attention as its potentially a dangerous and extensive operation</remarks>
+        /// <param name="contentTypeId">Id of the <see cref="IContentType"/></param>
+        /// <param name="userId">Optional Id of the user issueing the delete operation</param>
+        void DeleteContentOfType(int contentTypeId, int userId = 0);
+
+        /// <summary>
+        /// Deletes all content of the specified types. All Descendants of deleted content that is not of these types is moved to Recycle Bin.
+        /// </summary>
+        /// <remarks>This needs extra care and attention as its potentially a dangerous and extensive operation</remarks>
+        /// <param name="contentTypeIds">Ids of the <see cref="IContentType"/>s</param>
+        /// <param name="userId">Optional Id of the user issueing the delete operation</param>
+        void DeleteContentOfTypes(IEnumerable<int> contentTypeIds, int userId = 0);
+
+        /// <summary>
+        /// Permanently deletes versions from an <see cref="IContent"/> object prior to a specific date.
+        /// </summary>
+        /// <param name="id">Id of the <see cref="IContent"/> object to delete versions from</param>
+        /// <param name="versionDate">Latest version date</param>
+        /// <param name="userId">Optional Id of the User deleting versions of a Content object</param>
+        void DeleteVersions(int id, DateTime versionDate, int userId = 0);
+
+        /// <summary>
+        /// Permanently deletes a specific version from an <see cref="IContent"/> object.
+        /// </summary>
+        /// <param name="id">Id of the <see cref="IContent"/> object to delete a version from</param>
+        /// <param name="versionId">Id of the version to delete</param>
+        /// <param name="deletePriorVersions">Boolean indicating whether to delete versions prior to the versionId</param>
+        /// <param name="userId">Optional Id of the User deleting versions of a Content object</param>
+        void DeleteVersion(int id, Guid versionId, bool deletePriorVersions, int userId = 0);
+
+        /// <summary>
+        /// Deletes an <see cref="IContent"/> object by moving it to the Recycle Bin
+        /// </summary>
+        /// <remarks>Move an item to the Recycle Bin will result in the item being unpublished</remarks>
+        /// <param name="content">The <see cref="IContent"/> to delete</param>
+        /// <param name="userId">Optional Id of the User deleting the Content</param>
+        void MoveToRecycleBin(IContent content, int userId = 0);
+
+        /// <summary>
+        /// Moves an <see cref="IContent"/> object to a new location
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to move</param>
+        /// <param name="parentId">Id of the Content's new Parent</param>
+        /// <param name="userId">Optional Id of the User moving the Content</param>
+        void Move(IContent content, int parentId, int userId = 0);
+
+        /// <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.
+        /// </summary>
+        /// <param name="id">Id of the <see cref="IContent"/>being rolled back</param>
+        /// <param name="versionId">Id of the version to rollback to</param>
+        /// <param name="userId">Optional Id of the User issueing the rollback of the Content</param>
+        /// <returns>The newly created <see cref="IContent"/> object</returns>
+        IContent Rollback(int id, Guid versionId, int userId = 0);
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects by its name or partial name
+        /// </summary>
+        /// <param name="parentId">Id of the Parent to retrieve Children from</param>
+        /// <param name="name">Full or partial name of the children</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        IEnumerable<IContent> GetChildrenByName(int parentId, string name);
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
+        /// </summary>
+        /// <param name="id">Id of the Parent to retrieve Descendants from</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        IEnumerable<IContent> GetDescendants(int id);
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
+        /// </summary>
+        /// <param name="content"><see cref="IContent"/> item to retrieve Descendants from</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        IEnumerable<IContent> GetDescendants(IContent content);
+
+        /// <summary>
+        /// Gets a specific version of an <see cref="IContent"/> item.
+        /// </summary>
+        /// <param name="versionId">Id of the version to retrieve</param>
+        /// <returns>An <see cref="IContent"/> item</returns>
+        IContent GetByVersion(Guid versionId);
+
+        /// <summary>
+        /// Gets the published version of an <see cref="IContent"/> item
+        /// </summary>
+        /// <param name="id">Id of the <see cref="IContent"/> to retrieve version from</param>
+        /// <returns>An <see cref="IContent"/> item</returns>
+        IContent GetPublishedVersion(int id);
+
+        /// <summary>
+        /// Gets the published version of a <see cref="IContent"/> item.
+        /// </summary>
+        /// <param name="content">The content item.</param>
+        /// <returns>The published version, if any; otherwise, null.</returns>
+        IContent GetPublishedVersion(IContent content);
+
+        /// <summary>
+        /// Checks whether an <see cref="IContent"/> item has any children
+        /// </summary>
+        /// <param name="id">Id of the <see cref="IContent"/></param>
+        /// <returns>True if the content has any children otherwise False</returns>
+        bool HasChildren(int id);
+
+        /// <summary>
+        /// Checks whether an <see cref="IContent"/> item has any published versions
+        /// </summary>
+        /// <param name="id">Id of the <see cref="IContent"/></param>
+        /// <returns>True if the content has any published version otherwise False</returns>
+        bool HasPublishedVersion(int id);
+
+        /// <summary>
+        /// Re-Publishes all Content
+        /// </summary>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <returns>True if publishing succeeded, otherwise False</returns>
+        bool RePublishAll(int userId = 0);
+
+        /// <summary>
+        /// Publishes a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to publish</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <returns>True if publishing succeeded, otherwise False</returns>
+        bool Publish(IContent content, int userId = 0);
+
+        /// <summary>
+        /// Publishes a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to publish</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <returns>The published status attempt</returns>
+        Attempt<PublishStatus> PublishWithStatus(IContent content, int userId = 0);
+
+        /// <summary>
+        /// Publishes a <see cref="IContent"/> object and all its children
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to publish along with its children</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <returns>True if publishing succeeded, otherwise False</returns>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [Obsolete("Use PublishWithChildrenWithStatus instead, that method will provide more detailed information on the outcome and also allows the includeUnpublished flag")]
+        bool PublishWithChildren(IContent content, int userId = 0);
+
+        /// <summary>
+        /// Publishes a <see cref="IContent"/> object and all its children
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to publish along with its children</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <param name="includeUnpublished"></param>
+        /// <returns>The list of statuses for all published items</returns>
+        IEnumerable<Attempt<PublishStatus>> PublishWithChildrenWithStatus(IContent content, int userId = 0, bool includeUnpublished = false);
+
+        /// <summary>
+        /// UnPublishes a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to publish</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <returns>True if unpublishing succeeded, otherwise False</returns>
+        bool UnPublish(IContent content, int userId = 0);
+
+        /// <summary>
+        /// Saves and Publishes a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to save and publish</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise save events.</param>
+        /// <returns>True if publishing succeeded, otherwise False</returns>
+        [Obsolete("Use SaveAndPublishWithStatus instead, that method will provide more detailed information on the outcome")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        bool SaveAndPublish(IContent content, int userId = 0, bool raiseEvents = true);
+
+        /// <summary>
+        /// Saves and Publishes a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to save and publish</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise save events.</param>
+        /// <returns>True if publishing succeeded, otherwise False</returns>
+        Attempt<PublishStatus> SaveAndPublishWithStatus(IContent content, int userId = 0, bool raiseEvents = true);
+
+        /// <summary>
+        /// Permanently deletes an <see cref="IContent"/> object.
+        /// </summary>
+        /// <remarks>
+        /// This method will also delete associated media files, child content and possibly associated domains.
+        /// </remarks>
+        /// <remarks>Please note that this method will completely remove the Content from the database</remarks>
+        /// <param name="content">The <see cref="IContent"/> to delete</param>
+        /// <param name="userId">Optional Id of the User deleting the Content</param>
+        void Delete(IContent content, int userId = 0);
+
+        /// <summary>
+        /// Copies an <see cref="IContent"/> object by creating a new Content object of the same type and copies all data from the current
+        /// to the new copy, which is returned. Recursively copies all children.
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to copy</param>
+        /// <param name="parentId">Id of the Content's new Parent</param>
+        /// <param name="relateToOriginal">Boolean indicating whether the copy should be related to the original</param>
+        /// <param name="userId">Optional Id of the User copying the Content</param>
+        /// <returns>The newly created <see cref="IContent"/> object</returns>
+        IContent Copy(IContent content, int parentId, bool relateToOriginal, int userId = 0);
+
+        /// <summary>
+        /// Copies an <see cref="IContent"/> object by creating a new Content object of the same type and copies all data from the current
+        /// to the new copy which is returned.
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to copy</param>
+        /// <param name="parentId">Id of the Content's new Parent</param>
+        /// <param name="relateToOriginal">Boolean indicating whether the copy should be related to the original</param>
+        /// <param name="recursive">A value indicating whether to recursively copy children.</param>
+        /// <param name="userId">Optional Id of the User copying the Content</param>
+        /// <returns>The newly created <see cref="IContent"/> object</returns>
+        IContent Copy(IContent content, int parentId, bool relateToOriginal, bool recursive, int userId = 0);
+
+        /// <summary>
+        /// Checks if the passed in <see cref="IContent"/> can be published based on the anscestors publish state.
+        /// </summary>
+        /// <param name="content"><see cref="IContent"/> to check if anscestors are published</param>
+        /// <returns>True if the Content can be published, otherwise False</returns>
+        bool IsPublishable(IContent content);
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects, which are ancestors of the current content.
+        /// </summary>
+        /// <param name="id">Id of the <see cref="IContent"/> to retrieve ancestors for</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        IEnumerable<IContent> GetAncestors(int id);
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects, which are ancestors of the current content.
+        /// </summary>
+        /// <param name="content"><see cref="IContent"/> to retrieve ancestors for</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        IEnumerable<IContent> GetAncestors(IContent content);
+
+        /// <summary>
+        /// Sorts a collection of <see cref="IContent"/> objects by updating the SortOrder according
+        /// to the ordering of items in the passed in <see cref="IEnumerable{T}"/>.
+        /// </summary>
+        /// <remarks>
+        /// Using this method will ensure that the Published-state is maintained upon sorting
+        /// so the cache is updated accordingly - as needed.
+        /// </remarks>
+        /// <param name="items"></param>
+        /// <param name="userId"></param>
+        /// <param name="raiseEvents"></param>
+        /// <returns>True if sorting succeeded, otherwise False</returns>
+        bool Sort(IEnumerable<IContent> items, int userId = 0, bool raiseEvents = true);
+
+        /// <summary>
+        /// Sorts a collection of <see cref="IContent"/> objects by updating the SortOrder according
+        /// to the ordering of node Ids passed in.
+        /// </summary>
+        /// <remarks>
+        /// Using this method will ensure that the Published-state is maintained upon sorting
+        /// so the cache is updated accordingly - as needed.
+        /// </remarks>
+        /// <param name="ids"></param>
+        /// <param name="userId"></param>
+        /// <param name="raiseEvents"></param>
+        /// <returns>True if sorting succeeded, otherwise False</returns>
+        bool Sort(int[] ids, int userId = 0, bool raiseEvents = true);
+
+        /// <summary>
+        /// Gets the parent of the current content as an <see cref="IContent"/> item.
+        /// </summary>
+        /// <param name="id">Id of the <see cref="IContent"/> to retrieve the parent from</param>
+        /// <returns>Parent <see cref="IContent"/> object</returns>
+        IContent GetParent(int id);
+
+        /// <summary>
+        /// Gets the parent of the current content as an <see cref="IContent"/> item.
+        /// </summary>
+        /// <param name="content"><see cref="IContent"/> to retrieve the parent from</param>
+        /// <returns>Parent <see cref="IContent"/> object</returns>
+        IContent GetParent(IContent content);
+
+        /// <summary>
+        /// Creates and saves an <see cref="IContent"/> object using the alias of the <see cref="IContentType"/>
+        /// that this Content should based on.
+        /// </summary>
+        /// <remarks>
+        /// This method returns an <see cref="IContent"/> object that has been persisted to the database
+        /// and therefor has an identity.
+        /// </remarks>
+        /// <param name="name">Name of the Content object</param>
+        /// <param name="parent">Parent <see cref="IContent"/> object for the new Content</param>
+        /// <param name="contentTypeAlias">Alias of the <see cref="IContentType"/></param>
+        /// <param name="userId">Optional id of the user creating the content</param>
+        /// <returns><see cref="IContent"/></returns>
+        IContent CreateContentWithIdentity(string name, IContent parent, string contentTypeAlias, int userId = 0);
+
+        /// <summary>
+        /// Creates and saves an <see cref="IContent"/> object using the alias of the <see cref="IContentType"/>
+        /// that this Content should based on.
+        /// </summary>
+        /// <remarks>
+        /// This method returns an <see cref="IContent"/> object that has been persisted to the database
+        /// and therefor has an identity.
+        /// </remarks>
+        /// <param name="name">Name of the Content object</param>
+        /// <param name="parentId">Id of Parent for the new Content</param>
+        /// <param name="contentTypeAlias">Alias of the <see cref="IContentType"/></param>
+        /// <param name="userId">Optional id of the user creating the content</param>
+        /// <returns><see cref="IContent"/></returns>
+        IContent CreateContentWithIdentity(string name, int parentId, string contentTypeAlias, int userId = 0);
+
+        IList<string> GetAnchorValuesFromRTEs(int id);
+        IList<string> GetAnchorValuesFromRTEContent(string rteContent);
+    }
+}
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
index 31ff7424ac..db5e9dd404 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
@@ -160,6 +160,38 @@ function entityResource($q, $http, umbRequestHelper) {
                 'Failed to retrieve entity data for id ' + id);
         },
 
+
+        getUrlAndAnchors: function (id) {
+
+            if (id === -1 || id === "-1") {
+                return null;
+            }
+
+            return umbRequestHelper.resourcePromise(
+                $http.get(
+                    umbRequestHelper.getApiUrl(
+                        "entityApiBaseUrl",
+                        "GetUrlAndAnchors",
+                        [{ id: id }])),
+                'Failed to retrieve url and anchors data for id ' + id);
+        },
+
+
+        getAnchors: function (rteContent) {
+
+            if (rteContent == null || rteContent.length === 0) {
+                return [];
+            }
+
+            return umbRequestHelper.resourcePromise(
+                $http.post(
+                    umbRequestHelper.getApiUrl(
+                        "entityApiBaseUrl",
+                        "GetAnchors",
+                        [{ rteContent: rteContent }])),
+                'Failed to anchors data for rte content ' + rteContent);
+        },
+
         /**
          * @ngdoc method
          * @name umbraco.resources.entityResource#getByIds
@@ -488,6 +520,7 @@ function entityResource($q, $http, umbRequestHelper) {
                 'Failed to retrieve child data for id ' + parentId);
         },
 
+
         /**
          * @ngdoc method
          * @name umbraco.resources.entityResource#search
@@ -583,6 +616,8 @@ function entityResource($q, $http, umbRequestHelper) {
                 'Failed to retrieve entity data for query ' + query);
         }
 
+
+
     };
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 7edd462a57..f721c31337 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -1,879 +1,850 @@
-/**
- * @ngdoc service
- * @name umbraco.services.tinyMceService
- *
- *  
- * @description
- * A service containing all logic for all of the Umbraco TinyMCE plugins
- */
-function tinyMceService($log, imageHelper, $http, $timeout, macroResource, macroService, $routeParams, umbRequestHelper, angularHelper, userService) {
-	return {
-
-		/**
-		 * @ngdoc method
-		 * @name umbraco.services.tinyMceService#configuration
-		 * @methodOf umbraco.services.tinyMceService
-		 *
-		 * @description
-		 * Returns a collection of plugins available to the tinyMCE editor
-		 *
-		 */
-		configuration: function () {
-			return umbRequestHelper.resourcePromise(
-				$http.get(
-					umbRequestHelper.getApiUrl(
-						"rteApiBaseUrl",
-						"GetConfiguration"), {
-						cache: true
-					}),
-				'Failed to retrieve tinymce configuration');
-		},
-
-		/**
-		 * @ngdoc method
-		 * @name umbraco.services.tinyMceService#defaultPrevalues
-		 * @methodOf umbraco.services.tinyMceService
-		 *
-		 * @description
-		 * Returns a default configration to fallback on in case none is provided
-		 *
-		 */
-		defaultPrevalues: function () {
-			var cfg = {};
-			cfg.toolbar = ["code", "bold", "italic", "styleselect", "alignleft", "aligncenter", "alignright", "bullist", "numlist", "outdent", "indent", "link", "image", "umbmediapicker", "umbembeddialog", "umbmacro"];
-			cfg.stylesheets = [];
-			cfg.dimensions = {
-				height: 500
-			};
-			cfg.maxImageSize = 500;
-			return cfg;
-		},
-
-		/**
-		 * @ngdoc method
-		 * @name umbraco.services.tinyMceService#createInsertEmbeddedMedia
-		 * @methodOf umbraco.services.tinyMceService
-		 *
-		 * @description
-		 * Creates the umbrco insert embedded media tinymce plugin
-		 *
-		 * @param {Object} editor the TinyMCE editor instance        
-		 * @param {Object} $scope the current controller scope
-		 */
-		createInsertEmbeddedMedia: function (editor, scope, callback) {
-			editor.addButton('umbembeddialog', {
-				icon: 'custom icon-tv',
-				tooltip: 'Embed',
-				onclick: function () {
-					if (callback) {
-						callback();
-					}
-				}
-			});
-		},
-
-		insertEmbeddedMediaInEditor: function (editor, preview) {
-			editor.insertContent(preview);
-		},
-
-		/**
-		 * @ngdoc method
-		 * @name umbraco.services.tinyMceService#createMediaPicker
-		 * @methodOf umbraco.services.tinyMceService
-		 *
-		 * @description
-		 * Creates the umbrco insert media tinymce plugin
-		 *
-		 * @param {Object} editor the TinyMCE editor instance        
-		 * @param {Object} $scope the current controller scope
-		 */
-		createMediaPicker: function (editor, scope, callback) {
-			editor.addButton('umbmediapicker', {
-				icon: 'custom icon-picture',
-				tooltip: 'Media Picker',
-				stateSelector: 'img',
-				onclick: function () {
-
-					var selectedElm = editor.selection.getNode(),
-						currentTarget;
-
-
-					if (selectedElm.nodeName === 'IMG') {
-						var img = $(selectedElm);
-
-						var hasUdi = img.attr("data-udi") ? true : false;
-
-						currentTarget = {
-							altText: img.attr("alt"),
-							url: img.attr("src")
-						};
-
-						if (hasUdi) {
-							currentTarget["udi"] = img.attr("data-udi");
-						} else {
-							currentTarget["id"] = img.attr("rel");
-						}
-					}
-
-					userService.getCurrentUser().then(function (userData) {
-						if (callback) {
-							callback(currentTarget, userData);
-						}
-					});
-
-				}
-			});
-		},
-
-		insertMediaInEditor: function (editor, img) {
-			if (img) {
-
-				var hasUdi = img.udi ? true : false;
-
-				var data = {
-					alt: img.altText || "",
-					src: (img.url) ? img.url : "nothing.jpg",
-					id: '__mcenew'
-				};
-
-				if (hasUdi) {
-					data["data-udi"] = img.udi;
-				} else {
-					//Considering these fixed because UDI will now be used and thus
-					// we have no need for rel http://issues.umbraco.org/issue/U4-6228, http://issues.umbraco.org/issue/U4-6595
-					data["rel"] = img.id;
-					data["data-id"] = img.id;
-				}
-
-				editor.insertContent(editor.dom.createHTML('img', data));
-
-				$timeout(function () {
-					var imgElm = editor.dom.get('__mcenew');
-					var size = editor.dom.getSize(imgElm);
-
-					if (editor.settings.maxImageSize && editor.settings.maxImageSize !== 0) {
-						var newSize = imageHelper.scaleToMaxSize(editor.settings.maxImageSize, size.w, size.h);
-
-						var s = "width: " + newSize.width + "px; height:" + newSize.height + "px;";
-						editor.dom.setAttrib(imgElm, 'style', s);
-
-						if (img.url) {
-							var src = img.url + "?width=" + newSize.width + "&height=" + newSize.height;
-							editor.dom.setAttrib(imgElm, 'data-mce-src', src);
-						}
-                    }
-				    editor.dom.setAttrib(imgElm, 'id', null);
-				}, 500);
-			}
-		},
-
-		/**
-		 * @ngdoc method
-		 * @name umbraco.services.tinyMceService#createUmbracoMacro
-		 * @methodOf umbraco.services.tinyMceService
-		 *
-		 * @description
-		 * Creates the insert umbrco macro tinymce plugin
-		 *
-		 * @param {Object} editor the TinyMCE editor instance      
-		 * @param {Object} $scope the current controller scope
-		 */
-		createInsertMacro: function (editor, $scope, callback) {
-
-			var createInsertMacroScope = this;
-
-			/** Adds custom rules for the macro plugin and custom serialization */
-			editor.on('preInit', function (args) {
-				//this is requires so that we tell the serializer that a 'div' is actually allowed in the root, otherwise the cleanup will strip it out
-				editor.serializer.addRules('div');
-
-				/** This checks if the div is a macro container, if so, checks if its wrapped in a p tag and then unwraps it (removes p tag) */
-				editor.serializer.addNodeFilter('div', function (nodes, name) {
-					for (var i = 0; i < nodes.length; i++) {
-						if (nodes[i].attr("class") === "umb-macro-holder" && nodes[i].parent && nodes[i].parent.name.toUpperCase() === "P") {
-							nodes[i].parent.unwrap();
-						}
-					}
-				});
-
-			});
-
-			/**
-			 * Because the macro gets wrapped in a P tag because of the way 'enter' works, this 
-			 * method will return the macro element if not wrapped in a p, or the p if the macro
-			 * element is the only one inside of it even if we are deep inside an element inside the macro
-			 */
-			function getRealMacroElem(element) {
-				var e = $(element).closest(".umb-macro-holder");
-				if (e.length > 0) {
-					if (e.get(0).parentNode.nodeName === "P") {
-						//now check if we're the only element                    
-						if (element.parentNode.childNodes.length === 1) {
-							return e.get(0).parentNode;
-						}
-					}
-					return e.get(0);
-				}
-				return null;
-			}
-
-			/** Adds the button instance */
-			editor.addButton('umbmacro', {
-				icon: 'custom icon-settings-alt',
-				tooltip: 'Insert macro',
-				onPostRender: function () {
-
-					var ctrl = this;
-					var isOnMacroElement = false;
-
-					/**
-					 if the selection comes from a different element that is not the macro's
-					 we need to check if the selection includes part of the macro, if so we'll force the selection
-					 to clear to the next element since if people can select part of the macro markup they can then modify it.
-					*/
-					function handleSelectionChange() {
-
-						if (!editor.selection.isCollapsed()) {
-							var endSelection = tinymce.activeEditor.selection.getEnd();
-							var startSelection = tinymce.activeEditor.selection.getStart();
-							//don't proceed if it's an entire element selected
-							if (endSelection !== startSelection) {
-
-								//if the end selection is a macro then move the cursor
-								//NOTE: we don't have to handle when the selection comes from a previous parent because
-								// that is automatically taken care of with the normal onNodeChanged logic since the 
-								// evt.element will be the macro once it becomes part of the selection.
-								var $testForMacro = $(endSelection).closest(".umb-macro-holder");
-								if ($testForMacro.length > 0) {
-
-									//it came from before so move after, if there is no after then select ourselves
-									var next = $testForMacro.next();
-									if (next.length > 0) {
-										editor.selection.setCursorLocation($testForMacro.next().get(0));
-									} else {
-										selectMacroElement($testForMacro.get(0));
-									}
-
-								}
-							}
-						}
-					}
-
-					/** helper method to select the macro element */
-					function selectMacroElement(macroElement) {
-
-						// move selection to top element to ensure we can't edit this
-						editor.selection.select(macroElement);
-
-						// check if the current selection *is* the element (ie bug)
-						var currentSelection = editor.selection.getStart();
-						if (tinymce.isIE) {
-							if (!editor.dom.hasClass(currentSelection, 'umb-macro-holder')) {
-								while (!editor.dom.hasClass(currentSelection, 'umb-macro-holder') && currentSelection.parentNode) {
-									currentSelection = currentSelection.parentNode;
-								}
-								editor.selection.select(currentSelection);
-							}
-						}
-					}
-
-					/**
-					 * Add a node change handler, test if we're editing a macro and select the whole thing, then set our isOnMacroElement flag.
-					 * If we change the selection inside this method, then we end up in an infinite loop, so we have to remove ourselves
-					 * from the event listener before changing selection, however, it seems that putting a break point in this method
-					 * will always cause an 'infinite' loop as the caret keeps changing.
-					 */
-					function onNodeChanged(evt) {
-
-						//set our macro button active when on a node of class umb-macro-holder
-						var $macroElement = $(evt.element).closest(".umb-macro-holder");
-
-						handleSelectionChange();
-
-						//set the button active
-						ctrl.active($macroElement.length !== 0);
-
-						if ($macroElement.length > 0) {
-							var macroElement = $macroElement.get(0);
-
-							//remove the event listener before re-selecting
-							editor.off('NodeChange', onNodeChanged);
-
-							selectMacroElement(macroElement);
-
-							//set the flag
-							isOnMacroElement = true;
-
-							//re-add the event listener
-							editor.on('NodeChange', onNodeChanged);
-						} else {
-							isOnMacroElement = false;
-						}
-
-					}
-
-					/** when the contents load we need to find any macros declared and load in their content */
-					editor.on("LoadContent", function (o) {
-
-						//get all macro divs and load their content
-						$(editor.dom.select(".umb-macro-holder.mceNonEditable")).each(function () {
-							createInsertMacroScope.loadMacroContent($(this), null, $scope);
-						});
-
-					});
-
-					/** This prevents any other commands from executing when the current element is the macro so the content cannot be edited */
-					editor.on('BeforeExecCommand', function (o) {
-						if (isOnMacroElement) {
-							if (o.preventDefault) {
-								o.preventDefault();
-							}
-							if (o.stopImmediatePropagation) {
-								o.stopImmediatePropagation();
-							}
-							return;
-						}
-					});
-
-					/** This double checks and ensures you can't paste content into the rendered macro */
-					editor.on("Paste", function (o) {
-						if (isOnMacroElement) {
-							if (o.preventDefault) {
-								o.preventDefault();
-							}
-							if (o.stopImmediatePropagation) {
-								o.stopImmediatePropagation();
-							}
-							return;
-						}
-					});
-
-					//set onNodeChanged event listener
-					editor.on('NodeChange', onNodeChanged);
-
-					/** 
-					 * Listen for the keydown in the editor, we'll check if we are currently on a macro element, if so
-					 * we'll check if the key down is a supported key which requires an action, otherwise we ignore the request
-					 * so the macro cannot be edited.
-					 */
-					editor.on('KeyDown', function (e) {
-						if (isOnMacroElement) {
-							var macroElement = editor.selection.getNode();
-
-							//get the 'real' element (either p or the real one)
-							macroElement = getRealMacroElem(macroElement);
-
-							//prevent editing
-							e.preventDefault();
-							e.stopPropagation();
-
-							var moveSibling = function (element, isNext) {
-								var $e = $(element);
-								var $sibling = isNext ? $e.next() : $e.prev();
-								if ($sibling.length > 0) {
-									editor.selection.select($sibling.get(0));
-									editor.selection.collapse(true);
-								} else {
-									//if we're moving previous and there is no sibling, then lets recurse and just select the next one
-									if (!isNext) {
-										moveSibling(element, true);
-										return;
-									}
-
-									//if there is no sibling we'll generate a new p at the end and select it
-									editor.setContent(editor.getContent() + "<p>&nbsp;</p>");
-									editor.selection.select($(editor.dom.getRoot()).children().last().get(0));
-									editor.selection.collapse(true);
-
-								}
-							};
-
-							//supported keys to move to the next or prev element (13-enter, 27-esc, 38-up, 40-down, 39-right, 37-left)
-							//supported keys to remove the macro (8-backspace, 46-delete)
-							//TODO: Should we make the enter key insert a line break before or leave it as moving to the next element?
-							if ($.inArray(e.keyCode, [13, 40, 39]) !== -1) {
-								//move to next element
-								moveSibling(macroElement, true);
-							} else if ($.inArray(e.keyCode, [27, 38, 37]) !== -1) {
-								//move to prev element
-								moveSibling(macroElement, false);
-							} else if ($.inArray(e.keyCode, [8, 46]) !== -1) {
-								//delete macro element
-
-								//move first, then delete
-								moveSibling(macroElement, false);
-								editor.dom.remove(macroElement);
-							}
-							return;
-						}
-					});
-
-				},
-
-				/** The insert macro button click event handler */
-				onclick: function () {
-
-					var dialogData = {
-						//flag for use in rte so we only show macros flagged for the editor
-						richTextEditor: true
-					};
-
-					//when we click we could have a macro already selected and in that case we'll want to edit the current parameters
-					//so we'll need to extract them and submit them to the dialog.
-					var macroElement = editor.selection.getNode();
-					macroElement = getRealMacroElem(macroElement);
-					if (macroElement) {
-						//we have a macro selected so we'll need to parse it's alias and parameters
-						var contents = $(macroElement).contents();
-						var comment = _.find(contents, function (item) {
-							return item.nodeType === 8;
-						});
-						if (!comment) {
-							throw "Cannot parse the current macro, the syntax in the editor is invalid";
-						}
-						var syntax = comment.textContent.trim();
-						var parsed = macroService.parseMacroSyntax(syntax);
-						dialogData = {
-							macroData: parsed
-						};
-					}
-
-					if (callback) {
-						callback(dialogData);
-					}
-
-				}
-			});
-		},
-
-		insertMacroInEditor: function (editor, macroObject, $scope) {
-
-			//put the macro syntax in comments, we will parse this out on the server side to be used
-			//for persisting.
-			var macroSyntaxComment = "<!-- " + macroObject.syntax + " -->";
-			//create an id class for this element so we can re-select it after inserting
-			var uniqueId = "umb-macro-" + editor.dom.uniqueId();
-			var macroDiv = editor.dom.create('div', {
-					'class': 'umb-macro-holder ' + macroObject.macroAlias + ' mceNonEditable ' + uniqueId
-				},
-				macroSyntaxComment + '<ins>Macro alias: <strong>' + macroObject.macroAlias + '</strong></ins>');
-
-			editor.selection.setNode(macroDiv);
-
-			var $macroDiv = $(editor.dom.select("div.umb-macro-holder." + uniqueId));
-
-			//async load the macro content
-			this.loadMacroContent($macroDiv, macroObject, $scope);
-
-		},
-
-		/** loads in the macro content async from the server */
-		loadMacroContent: function ($macroDiv, macroData, $scope) {
-
-			//if we don't have the macroData, then we'll need to parse it from the macro div
-			if (!macroData) {
-				var contents = $macroDiv.contents();
-				var comment = _.find(contents, function (item) {
-					return item.nodeType === 8;
-				});
-				if (!comment) {
-					throw "Cannot parse the current macro, the syntax in the editor is invalid";
-				}
-				var syntax = comment.textContent.trim();
-				var parsed = macroService.parseMacroSyntax(syntax);
-				macroData = parsed;
-			}
-
-			var $ins = $macroDiv.find("ins");
-
-			//show the throbber
-			$macroDiv.addClass("loading");
-
-			var contentId = $routeParams.id;
-
-			//need to wrap in safe apply since this might be occuring outside of angular
-			angularHelper.safeApply($scope, function () {
-				macroResource.getMacroResultAsHtmlForEditor(macroData.macroAlias, contentId, macroData.macroParamsDictionary)
-					.then(function (htmlResult) {
-
-						$macroDiv.removeClass("loading");
-						htmlResult = htmlResult.trim();
-						if (htmlResult !== "") {
-							$ins.html(htmlResult);
-						}
-					});
-			});
-
-		},
-
-		createLinkPicker: function (editor, $scope, onClick) {
-
-			function createLinkList(callback) {
-				return function () {
-					var linkList = editor.settings.link_list;
-
-					if (typeof (linkList) === "string") {
-						tinymce.util.XHR.send({
-							url: linkList,
-							success: function (text) {
-								callback(tinymce.util.JSON.parse(text));
-							}
-						});
-					} else {
-						callback(linkList);
-					}
-				};
-			}
-
-			function showDialog(linkList) {
-				var data = {},
-					selection = editor.selection,
-					dom = editor.dom,
-					selectedElm, anchorElm, initialText;
-				var win, linkListCtrl, relListCtrl, targetListCtrl;
-
-				function linkListChangeHandler(e) {
-					var textCtrl = win.find('#text');
-
-					if (!textCtrl.value() || (e.lastControl && textCtrl.value() === e.lastControl.text())) {
-						textCtrl.value(e.control.text());
-					}
-
-					win.find('#href').value(e.control.value());
-				}
-
-				function buildLinkList() {
-					var linkListItems = [{
-						text: 'None',
-						value: ''
-                    }];
-
-					tinymce.each(linkList, function (link) {
-						linkListItems.push({
-							text: link.text || link.title,
-							value: link.value || link.url,
-							menu: link.menu
-						});
-					});
-
-					return linkListItems;
-				}
-
-				function buildRelList(relValue) {
-					var relListItems = [{
-						text: 'None',
-						value: ''
-                    }];
-
-					tinymce.each(editor.settings.rel_list, function (rel) {
-						relListItems.push({
-							text: rel.text || rel.title,
-							value: rel.value,
-							selected: relValue === rel.value
-						});
-					});
-
-					return relListItems;
-				}
-
-				function buildTargetList(targetValue) {
-					var targetListItems = [{
-						text: 'None',
-						value: ''
-                    }];
-
-					if (!editor.settings.target_list) {
-						targetListItems.push({
-							text: 'New window',
-							value: '_blank'
-						});
-					}
-
-					tinymce.each(editor.settings.target_list, function (target) {
-						targetListItems.push({
-							text: target.text || target.title,
-							value: target.value,
-							selected: targetValue === target.value
-						});
-					});
-
-					return targetListItems;
-				}
-
-				function buildAnchorListControl(url) {
-					var anchorList = [];
-
-					tinymce.each(editor.dom.select('a:not([href])'), function (anchor) {
-						var id = anchor.name || anchor.id;
-
-						if (id) {
-							anchorList.push({
-								text: id,
-								value: '#' + id,
-								selected: url.indexOf('#' + id) !== -1
-							});
-						}
-					});
-
-					if (anchorList.length) {
-						anchorList.unshift({
-							text: 'None',
-							value: ''
-						});
-
-						return {
-							name: 'anchor',
-							type: 'listbox',
-							label: 'Anchors',
-							values: anchorList,
-							onselect: linkListChangeHandler
-						};
-					}
-				}
-
-				function updateText() {
-					if (!initialText && data.text.length === 0) {
-						this.parent().parent().find('#text')[0].value(this.value());
-					}
-				}
-
-				selectedElm = selection.getNode();
-				anchorElm = dom.getParent(selectedElm, 'a[href]');
-
-				data.text = initialText = anchorElm ? (anchorElm.innerText || anchorElm.textContent) : selection.getContent({
-					format: 'text'
-				});
-				data.href = anchorElm ? dom.getAttrib(anchorElm, 'href') : '';
-				data.target = anchorElm ? dom.getAttrib(anchorElm, 'target') : '';
-				data.rel = anchorElm ? dom.getAttrib(anchorElm, 'rel') : '';
-
-				if (selectedElm.nodeName === "IMG") {
-					data.text = initialText = " ";
-				}
-
-				if (linkList) {
-					linkListCtrl = {
-						type: 'listbox',
-						label: 'Link list',
-						values: buildLinkList(),
-						onselect: linkListChangeHandler
-					};
-				}
-
-				if (editor.settings.target_list !== false) {
-					targetListCtrl = {
-						name: 'target',
-						type: 'listbox',
-						label: 'Target',
-						values: buildTargetList(data.target)
-					};
-				}
-
-				if (editor.settings.rel_list) {
-					relListCtrl = {
-						name: 'rel',
-						type: 'listbox',
-						label: 'Rel',
-						values: buildRelList(data.rel)
-					};
-				}
-
-				var currentTarget = null;
-
-				//if we already have a link selected, we want to pass that data over to the dialog
-				if (anchorElm) {
-					var anchor = $(anchorElm);
-					currentTarget = {
-						name: anchor.attr("title"),
-						url: anchor.attr("href"),
-						target: anchor.attr("target")
-					};
-
-					// drop the lead char from the anchor text, if it has a value
-					var anchorVal = anchor[0].dataset.anchor;
-					if (anchorVal) {
-						currentTarget.anchor = anchorVal.substring(1);
-					}
-
-					//locallink detection, we do this here, to avoid poluting the dialogservice
-					//so the dialog service can just expect to get a node-like structure
-					if (currentTarget.url.indexOf("localLink:") > 0) {
-						// if the current link has an anchor, it needs to be considered when getting the udi/id
-						// if an anchor exists, reduce the substring max by its length plus two to offset the removed prefix and trailing curly brace
-						var linkId = currentTarget.url.substring(currentTarget.url.indexOf(":") + 1, currentTarget.url.lastIndexOf("}"));
-
-						//we need to check if this is an INT or a UDI
-						var parsedIntId = parseInt(linkId, 10);
-						if (isNaN(parsedIntId)) {
-							//it's a UDI
-							currentTarget.udi = linkId;
-						} else {
-							currentTarget.id = linkId;
-						}
-					}
-				}
-
-				if (onClick) {
-					onClick(currentTarget, anchorElm);
-				}
-
-			}
-
-			editor.addButton('link', {
-				icon: 'link',
-				tooltip: 'Insert/edit link',
-				shortcut: 'Ctrl+K',
-				onclick: createLinkList(showDialog),
-				stateSelector: 'a[href]'
-			});
-
-			editor.addButton('unlink', {
-				icon: 'unlink',
-				tooltip: 'Remove link',
-				cmd: 'unlink',
-				stateSelector: 'a[href]'
-			});
-
-			editor.addShortcut('Ctrl+K', '', createLinkList(showDialog));
-			this.showDialog = showDialog;
-
-			editor.addMenuItem('link', {
-				icon: 'link',
-				text: 'Insert link',
-				shortcut: 'Ctrl+K',
-				onclick: createLinkList(showDialog),
-				stateSelector: 'a[href]',
-				context: 'insert',
-				prependToContext: true
-			});
-
-		},
-
-		/**
-		 * @ngdoc method
-		 * @name umbraco.services.tinyMceService#getAnchorNames
-		 * @methodOf umbraco.services.tinyMceService
-		 *
-		 * @description
-		 * From the given string, generates a string array where each item is the id attribute value from a named anchor
-		 * 'some string <a id="anchor"></a>with a named anchor' returns ['anchor']
-		 *
-		 * @param {string} input the string to parse      
-		 */
-		getAnchorNames: function (input) {
-      if (!input) return [];
-        
-			var anchorPattern = /<a id=\\"(.*?)\\">/gi;
-			var matches = input.match(anchorPattern);
-			var anchors = [];
-
-			if (matches) {
-				anchors = matches.map(function (v) {
-					return v.substring(v.indexOf('"') + 1, v.lastIndexOf('\\'));
-				});
-			}
-
-			return anchors.filter(function(val, i, self) {
-          return self.indexOf(val) === i;
-      });
-		},
-
-		insertLinkInEditor: function (editor, target, anchorElm) {
-
-			var href = target.url;
-			// We want to use the Udi. If it is set, we use it, else fallback to id, and finally to null
-			var hasUdi = target.udi ? true : false;
-			var id = hasUdi ? target.udi : (target.id ? target.id : null);
-
-			// if an anchor exists, check that it is appropriately prefixed
-			if (target.anchor && target.anchor[0] !== '?' && target.anchor[0] !== '#') {
-				target.anchor = (target.anchor.indexOf('=') === -1 ? '#' : '?') + target.anchor;
-			}
- 
-			// the href might be an external url, so check the value for an anchor/qs
-			// href has the anchor re-appended later, hence the reset here to avoid duplicating the anchor
-			if (!target.anchor) {
-				var urlParts = href.split(/(#|\?)/);
-				if (urlParts.length === 3) {
-					href = urlParts[0];
-					target.anchor = urlParts[1] + urlParts[2];
-				}
-			}
-			
-			//Create a json obj used to create the attributes for the tag
-			function createElemAttributes() {
-				var a = {
-					href: href,
-					title: target.name,
-					target: target.target ? target.target : null,
-					rel: target.rel ? target.rel : null
-				};
-
-				if (hasUdi) {
-					a["data-udi"] = target.udi;
-				} else if (target.id) {
-					a["data-id"] = target.id;
-				}
-
-				if (target.anchor) {
-					a["data-anchor"] = target.anchor;
-					a.href = a.href + target.anchor;
-				} else {
-					a["data-anchor"] = null;
-				}
-
-				return a;
-			}
-
-			function insertLink() {
-				if (anchorElm) {
-					editor.dom.setAttribs(anchorElm, createElemAttributes());
-
-					editor.selection.select(anchorElm);
-					editor.execCommand('mceEndTyping');
-				} else {
-					editor.execCommand('mceInsertLink', false, createElemAttributes());
-				}
-			}
-
-            if (!href && !target.anchor) {
-				editor.execCommand('unlink');
-				return;
-			}
-
-			//if we have an id, it must be a locallink:id, aslong as the isMedia flag is not set
-			if (id && (angular.isUndefined(target.isMedia) || !target.isMedia)) {
-
-				href = "/{localLink:" + id + "}";
-
-				insertLink();
-				return;
-			}
-
-		    if (!href) {
-		        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;
-			}
-
-			// Is www. prefixed
-			if (/^\s*www\./i.test(href)) {
-				href = 'http://' + href;
-				insertLink();
-				return;
-			}
-
-			insertLink();
-
-		}
-
-	};
-}
-
-angular.module('umbraco.services').factory('tinyMceService', tinyMceService);
+/**
+ * @ngdoc service
+ * @name umbraco.services.tinyMceService
+ *
+ *
+ * @description
+ * A service containing all logic for all of the Umbraco TinyMCE plugins
+ */
+function tinyMceService($log, imageHelper, $http, $timeout, macroResource, macroService, $routeParams, umbRequestHelper, angularHelper, userService) {
+	return {
+
+		/**
+		 * @ngdoc method
+		 * @name umbraco.services.tinyMceService#configuration
+		 * @methodOf umbraco.services.tinyMceService
+		 *
+		 * @description
+		 * Returns a collection of plugins available to the tinyMCE editor
+		 *
+		 */
+		configuration: function () {
+			return umbRequestHelper.resourcePromise(
+				$http.get(
+					umbRequestHelper.getApiUrl(
+						"rteApiBaseUrl",
+						"GetConfiguration"), {
+						cache: true
+					}),
+				'Failed to retrieve tinymce configuration');
+		},
+
+		/**
+		 * @ngdoc method
+		 * @name umbraco.services.tinyMceService#defaultPrevalues
+		 * @methodOf umbraco.services.tinyMceService
+		 *
+		 * @description
+		 * Returns a default configration to fallback on in case none is provided
+		 *
+		 */
+		defaultPrevalues: function () {
+			var cfg = {};
+			cfg.toolbar = ["code", "bold", "italic", "styleselect", "alignleft", "aligncenter", "alignright", "bullist", "numlist", "outdent", "indent", "link", "image", "umbmediapicker", "umbembeddialog", "umbmacro"];
+			cfg.stylesheets = [];
+			cfg.dimensions = {
+				height: 500
+			};
+			cfg.maxImageSize = 500;
+			return cfg;
+		},
+
+		/**
+		 * @ngdoc method
+		 * @name umbraco.services.tinyMceService#createInsertEmbeddedMedia
+		 * @methodOf umbraco.services.tinyMceService
+		 *
+		 * @description
+		 * Creates the umbrco insert embedded media tinymce plugin
+		 *
+		 * @param {Object} editor the TinyMCE editor instance
+		 * @param {Object} $scope the current controller scope
+		 */
+		createInsertEmbeddedMedia: function (editor, scope, callback) {
+			editor.addButton('umbembeddialog', {
+				icon: 'custom icon-tv',
+				tooltip: 'Embed',
+				onclick: function () {
+					if (callback) {
+						callback();
+					}
+				}
+			});
+		},
+
+		insertEmbeddedMediaInEditor: function (editor, preview) {
+			editor.insertContent(preview);
+		},
+
+		/**
+		 * @ngdoc method
+		 * @name umbraco.services.tinyMceService#createMediaPicker
+		 * @methodOf umbraco.services.tinyMceService
+		 *
+		 * @description
+		 * Creates the umbrco insert media tinymce plugin
+		 *
+		 * @param {Object} editor the TinyMCE editor instance
+		 * @param {Object} $scope the current controller scope
+		 */
+		createMediaPicker: function (editor, scope, callback) {
+			editor.addButton('umbmediapicker', {
+				icon: 'custom icon-picture',
+				tooltip: 'Media Picker',
+				stateSelector: 'img',
+				onclick: function () {
+
+					var selectedElm = editor.selection.getNode(),
+						currentTarget;
+
+
+					if (selectedElm.nodeName === 'IMG') {
+						var img = $(selectedElm);
+
+						var hasUdi = img.attr("data-udi") ? true : false;
+
+						currentTarget = {
+							altText: img.attr("alt"),
+							url: img.attr("src")
+						};
+
+						if (hasUdi) {
+							currentTarget["udi"] = img.attr("data-udi");
+						} else {
+							currentTarget["id"] = img.attr("rel");
+						}
+					}
+
+					userService.getCurrentUser().then(function (userData) {
+						if (callback) {
+							callback(currentTarget, userData);
+						}
+					});
+
+				}
+			});
+		},
+
+		insertMediaInEditor: function (editor, img) {
+			if (img) {
+
+				var hasUdi = img.udi ? true : false;
+
+				var data = {
+					alt: img.altText || "",
+					src: (img.url) ? img.url : "nothing.jpg",
+					id: '__mcenew'
+				};
+
+				if (hasUdi) {
+					data["data-udi"] = img.udi;
+				} else {
+					//Considering these fixed because UDI will now be used and thus
+					// we have no need for rel http://issues.umbraco.org/issue/U4-6228, http://issues.umbraco.org/issue/U4-6595
+					data["rel"] = img.id;
+					data["data-id"] = img.id;
+				}
+
+				editor.insertContent(editor.dom.createHTML('img', data));
+
+				$timeout(function () {
+					var imgElm = editor.dom.get('__mcenew');
+					var size = editor.dom.getSize(imgElm);
+
+					if (editor.settings.maxImageSize && editor.settings.maxImageSize !== 0) {
+						var newSize = imageHelper.scaleToMaxSize(editor.settings.maxImageSize, size.w, size.h);
+
+						var s = "width: " + newSize.width + "px; height:" + newSize.height + "px;";
+						editor.dom.setAttrib(imgElm, 'style', s);
+
+						if (img.url) {
+							var src = img.url + "?width=" + newSize.width + "&height=" + newSize.height;
+							editor.dom.setAttrib(imgElm, 'data-mce-src', src);
+						}
+                    }
+				    editor.dom.setAttrib(imgElm, 'id', null);
+				}, 500);
+			}
+		},
+
+		/**
+		 * @ngdoc method
+		 * @name umbraco.services.tinyMceService#createUmbracoMacro
+		 * @methodOf umbraco.services.tinyMceService
+		 *
+		 * @description
+		 * Creates the insert umbrco macro tinymce plugin
+		 *
+		 * @param {Object} editor the TinyMCE editor instance
+		 * @param {Object} $scope the current controller scope
+		 */
+		createInsertMacro: function (editor, $scope, callback) {
+
+			var createInsertMacroScope = this;
+
+			/** Adds custom rules for the macro plugin and custom serialization */
+			editor.on('preInit', function (args) {
+				//this is requires so that we tell the serializer that a 'div' is actually allowed in the root, otherwise the cleanup will strip it out
+				editor.serializer.addRules('div');
+
+				/** This checks if the div is a macro container, if so, checks if its wrapped in a p tag and then unwraps it (removes p tag) */
+				editor.serializer.addNodeFilter('div', function (nodes, name) {
+					for (var i = 0; i < nodes.length; i++) {
+						if (nodes[i].attr("class") === "umb-macro-holder" && nodes[i].parent && nodes[i].parent.name.toUpperCase() === "P") {
+							nodes[i].parent.unwrap();
+						}
+					}
+				});
+
+			});
+
+			/**
+			 * Because the macro gets wrapped in a P tag because of the way 'enter' works, this
+			 * method will return the macro element if not wrapped in a p, or the p if the macro
+			 * element is the only one inside of it even if we are deep inside an element inside the macro
+			 */
+			function getRealMacroElem(element) {
+				var e = $(element).closest(".umb-macro-holder");
+				if (e.length > 0) {
+					if (e.get(0).parentNode.nodeName === "P") {
+						//now check if we're the only element
+						if (element.parentNode.childNodes.length === 1) {
+							return e.get(0).parentNode;
+						}
+					}
+					return e.get(0);
+				}
+				return null;
+			}
+
+			/** Adds the button instance */
+			editor.addButton('umbmacro', {
+				icon: 'custom icon-settings-alt',
+				tooltip: 'Insert macro',
+				onPostRender: function () {
+
+					var ctrl = this;
+					var isOnMacroElement = false;
+
+					/**
+					 if the selection comes from a different element that is not the macro's
+					 we need to check if the selection includes part of the macro, if so we'll force the selection
+					 to clear to the next element since if people can select part of the macro markup they can then modify it.
+					*/
+					function handleSelectionChange() {
+
+						if (!editor.selection.isCollapsed()) {
+							var endSelection = tinymce.activeEditor.selection.getEnd();
+							var startSelection = tinymce.activeEditor.selection.getStart();
+							//don't proceed if it's an entire element selected
+							if (endSelection !== startSelection) {
+
+								//if the end selection is a macro then move the cursor
+								//NOTE: we don't have to handle when the selection comes from a previous parent because
+								// that is automatically taken care of with the normal onNodeChanged logic since the
+								// evt.element will be the macro once it becomes part of the selection.
+								var $testForMacro = $(endSelection).closest(".umb-macro-holder");
+								if ($testForMacro.length > 0) {
+
+									//it came from before so move after, if there is no after then select ourselves
+									var next = $testForMacro.next();
+									if (next.length > 0) {
+										editor.selection.setCursorLocation($testForMacro.next().get(0));
+									} else {
+										selectMacroElement($testForMacro.get(0));
+									}
+
+								}
+							}
+						}
+					}
+
+					/** helper method to select the macro element */
+					function selectMacroElement(macroElement) {
+
+						// move selection to top element to ensure we can't edit this
+						editor.selection.select(macroElement);
+
+						// check if the current selection *is* the element (ie bug)
+						var currentSelection = editor.selection.getStart();
+						if (tinymce.isIE) {
+							if (!editor.dom.hasClass(currentSelection, 'umb-macro-holder')) {
+								while (!editor.dom.hasClass(currentSelection, 'umb-macro-holder') && currentSelection.parentNode) {
+									currentSelection = currentSelection.parentNode;
+								}
+								editor.selection.select(currentSelection);
+							}
+						}
+					}
+
+					/**
+					 * Add a node change handler, test if we're editing a macro and select the whole thing, then set our isOnMacroElement flag.
+					 * If we change the selection inside this method, then we end up in an infinite loop, so we have to remove ourselves
+					 * from the event listener before changing selection, however, it seems that putting a break point in this method
+					 * will always cause an 'infinite' loop as the caret keeps changing.
+					 */
+					function onNodeChanged(evt) {
+
+						//set our macro button active when on a node of class umb-macro-holder
+						var $macroElement = $(evt.element).closest(".umb-macro-holder");
+
+						handleSelectionChange();
+
+						//set the button active
+						ctrl.active($macroElement.length !== 0);
+
+						if ($macroElement.length > 0) {
+							var macroElement = $macroElement.get(0);
+
+							//remove the event listener before re-selecting
+							editor.off('NodeChange', onNodeChanged);
+
+							selectMacroElement(macroElement);
+
+							//set the flag
+							isOnMacroElement = true;
+
+							//re-add the event listener
+							editor.on('NodeChange', onNodeChanged);
+						} else {
+							isOnMacroElement = false;
+						}
+
+					}
+
+					/** when the contents load we need to find any macros declared and load in their content */
+					editor.on("LoadContent", function (o) {
+
+						//get all macro divs and load their content
+						$(editor.dom.select(".umb-macro-holder.mceNonEditable")).each(function () {
+							createInsertMacroScope.loadMacroContent($(this), null, $scope);
+						});
+
+					});
+
+					/** This prevents any other commands from executing when the current element is the macro so the content cannot be edited */
+					editor.on('BeforeExecCommand', function (o) {
+						if (isOnMacroElement) {
+							if (o.preventDefault) {
+								o.preventDefault();
+							}
+							if (o.stopImmediatePropagation) {
+								o.stopImmediatePropagation();
+							}
+							return;
+						}
+					});
+
+					/** This double checks and ensures you can't paste content into the rendered macro */
+					editor.on("Paste", function (o) {
+						if (isOnMacroElement) {
+							if (o.preventDefault) {
+								o.preventDefault();
+							}
+							if (o.stopImmediatePropagation) {
+								o.stopImmediatePropagation();
+							}
+							return;
+						}
+					});
+
+					//set onNodeChanged event listener
+					editor.on('NodeChange', onNodeChanged);
+
+					/**
+					 * Listen for the keydown in the editor, we'll check if we are currently on a macro element, if so
+					 * we'll check if the key down is a supported key which requires an action, otherwise we ignore the request
+					 * so the macro cannot be edited.
+					 */
+					editor.on('KeyDown', function (e) {
+						if (isOnMacroElement) {
+							var macroElement = editor.selection.getNode();
+
+							//get the 'real' element (either p or the real one)
+							macroElement = getRealMacroElem(macroElement);
+
+							//prevent editing
+							e.preventDefault();
+							e.stopPropagation();
+
+							var moveSibling = function (element, isNext) {
+								var $e = $(element);
+								var $sibling = isNext ? $e.next() : $e.prev();
+								if ($sibling.length > 0) {
+									editor.selection.select($sibling.get(0));
+									editor.selection.collapse(true);
+								} else {
+									//if we're moving previous and there is no sibling, then lets recurse and just select the next one
+									if (!isNext) {
+										moveSibling(element, true);
+										return;
+									}
+
+									//if there is no sibling we'll generate a new p at the end and select it
+									editor.setContent(editor.getContent() + "<p>&nbsp;</p>");
+									editor.selection.select($(editor.dom.getRoot()).children().last().get(0));
+									editor.selection.collapse(true);
+
+								}
+							};
+
+							//supported keys to move to the next or prev element (13-enter, 27-esc, 38-up, 40-down, 39-right, 37-left)
+							//supported keys to remove the macro (8-backspace, 46-delete)
+							//TODO: Should we make the enter key insert a line break before or leave it as moving to the next element?
+							if ($.inArray(e.keyCode, [13, 40, 39]) !== -1) {
+								//move to next element
+								moveSibling(macroElement, true);
+							} else if ($.inArray(e.keyCode, [27, 38, 37]) !== -1) {
+								//move to prev element
+								moveSibling(macroElement, false);
+							} else if ($.inArray(e.keyCode, [8, 46]) !== -1) {
+								//delete macro element
+
+								//move first, then delete
+								moveSibling(macroElement, false);
+								editor.dom.remove(macroElement);
+							}
+							return;
+						}
+					});
+
+				},
+
+				/** The insert macro button click event handler */
+				onclick: function () {
+
+					var dialogData = {
+						//flag for use in rte so we only show macros flagged for the editor
+						richTextEditor: true
+					};
+
+					//when we click we could have a macro already selected and in that case we'll want to edit the current parameters
+					//so we'll need to extract them and submit them to the dialog.
+					var macroElement = editor.selection.getNode();
+					macroElement = getRealMacroElem(macroElement);
+					if (macroElement) {
+						//we have a macro selected so we'll need to parse it's alias and parameters
+						var contents = $(macroElement).contents();
+						var comment = _.find(contents, function (item) {
+							return item.nodeType === 8;
+						});
+						if (!comment) {
+							throw "Cannot parse the current macro, the syntax in the editor is invalid";
+						}
+						var syntax = comment.textContent.trim();
+						var parsed = macroService.parseMacroSyntax(syntax);
+						dialogData = {
+							macroData: parsed
+						};
+					}
+
+					if (callback) {
+						callback(dialogData);
+					}
+
+				}
+			});
+		},
+
+		insertMacroInEditor: function (editor, macroObject, $scope) {
+
+			//put the macro syntax in comments, we will parse this out on the server side to be used
+			//for persisting.
+			var macroSyntaxComment = "<!-- " + macroObject.syntax + " -->";
+			//create an id class for this element so we can re-select it after inserting
+			var uniqueId = "umb-macro-" + editor.dom.uniqueId();
+			var macroDiv = editor.dom.create('div', {
+					'class': 'umb-macro-holder ' + macroObject.macroAlias + ' mceNonEditable ' + uniqueId
+				},
+				macroSyntaxComment + '<ins>Macro alias: <strong>' + macroObject.macroAlias + '</strong></ins>');
+
+			editor.selection.setNode(macroDiv);
+
+			var $macroDiv = $(editor.dom.select("div.umb-macro-holder." + uniqueId));
+
+			//async load the macro content
+			this.loadMacroContent($macroDiv, macroObject, $scope);
+
+		},
+
+		/** loads in the macro content async from the server */
+		loadMacroContent: function ($macroDiv, macroData, $scope) {
+
+			//if we don't have the macroData, then we'll need to parse it from the macro div
+			if (!macroData) {
+				var contents = $macroDiv.contents();
+				var comment = _.find(contents, function (item) {
+					return item.nodeType === 8;
+				});
+				if (!comment) {
+					throw "Cannot parse the current macro, the syntax in the editor is invalid";
+				}
+				var syntax = comment.textContent.trim();
+				var parsed = macroService.parseMacroSyntax(syntax);
+				macroData = parsed;
+			}
+
+			var $ins = $macroDiv.find("ins");
+
+			//show the throbber
+			$macroDiv.addClass("loading");
+
+			var contentId = $routeParams.id;
+
+			//need to wrap in safe apply since this might be occuring outside of angular
+			angularHelper.safeApply($scope, function () {
+				macroResource.getMacroResultAsHtmlForEditor(macroData.macroAlias, contentId, macroData.macroParamsDictionary)
+					.then(function (htmlResult) {
+
+						$macroDiv.removeClass("loading");
+						htmlResult = htmlResult.trim();
+						if (htmlResult !== "") {
+							$ins.html(htmlResult);
+						}
+					});
+			});
+
+		},
+
+		createLinkPicker: function (editor, $scope, onClick) {
+
+			function createLinkList(callback) {
+				return function () {
+					var linkList = editor.settings.link_list;
+
+					if (typeof (linkList) === "string") {
+						tinymce.util.XHR.send({
+							url: linkList,
+							success: function (text) {
+								callback(tinymce.util.JSON.parse(text));
+							}
+						});
+					} else {
+						callback(linkList);
+					}
+				};
+			}
+
+			function showDialog(linkList) {
+				var data = {},
+					selection = editor.selection,
+					dom = editor.dom,
+					selectedElm, anchorElm, initialText;
+				var win, linkListCtrl, relListCtrl, targetListCtrl;
+
+				function linkListChangeHandler(e) {
+					var textCtrl = win.find('#text');
+
+					if (!textCtrl.value() || (e.lastControl && textCtrl.value() === e.lastControl.text())) {
+						textCtrl.value(e.control.text());
+					}
+
+					win.find('#href').value(e.control.value());
+				}
+
+				function buildLinkList() {
+					var linkListItems = [{
+						text: 'None',
+						value: ''
+                    }];
+
+					tinymce.each(linkList, function (link) {
+						linkListItems.push({
+							text: link.text || link.title,
+							value: link.value || link.url,
+							menu: link.menu
+						});
+					});
+
+					return linkListItems;
+				}
+
+				function buildRelList(relValue) {
+					var relListItems = [{
+						text: 'None',
+						value: ''
+                    }];
+
+					tinymce.each(editor.settings.rel_list, function (rel) {
+						relListItems.push({
+							text: rel.text || rel.title,
+							value: rel.value,
+							selected: relValue === rel.value
+						});
+					});
+
+					return relListItems;
+				}
+
+				function buildTargetList(targetValue) {
+					var targetListItems = [{
+						text: 'None',
+						value: ''
+                    }];
+
+					if (!editor.settings.target_list) {
+						targetListItems.push({
+							text: 'New window',
+							value: '_blank'
+						});
+					}
+
+					tinymce.each(editor.settings.target_list, function (target) {
+						targetListItems.push({
+							text: target.text || target.title,
+							value: target.value,
+							selected: targetValue === target.value
+						});
+					});
+
+					return targetListItems;
+				}
+
+				function buildAnchorListControl(url) {
+					var anchorList = [];
+
+					tinymce.each(editor.dom.select('a:not([href])'), function (anchor) {
+						var id = anchor.name || anchor.id;
+
+						if (id) {
+							anchorList.push({
+								text: id,
+								value: '#' + id,
+								selected: url.indexOf('#' + id) !== -1
+							});
+						}
+					});
+
+					if (anchorList.length) {
+						anchorList.unshift({
+							text: 'None',
+							value: ''
+						});
+
+						return {
+							name: 'anchor',
+							type: 'listbox',
+							label: 'Anchors',
+							values: anchorList,
+							onselect: linkListChangeHandler
+						};
+					}
+				}
+
+				function updateText() {
+					if (!initialText && data.text.length === 0) {
+						this.parent().parent().find('#text')[0].value(this.value());
+					}
+				}
+
+				selectedElm = selection.getNode();
+				anchorElm = dom.getParent(selectedElm, 'a[href]');
+
+				data.text = initialText = anchorElm ? (anchorElm.innerText || anchorElm.textContent) : selection.getContent({
+					format: 'text'
+				});
+				data.href = anchorElm ? dom.getAttrib(anchorElm, 'href') : '';
+				data.target = anchorElm ? dom.getAttrib(anchorElm, 'target') : '';
+				data.rel = anchorElm ? dom.getAttrib(anchorElm, 'rel') : '';
+
+				if (selectedElm.nodeName === "IMG") {
+					data.text = initialText = " ";
+				}
+
+				if (linkList) {
+					linkListCtrl = {
+						type: 'listbox',
+						label: 'Link list',
+						values: buildLinkList(),
+						onselect: linkListChangeHandler
+					};
+				}
+
+				if (editor.settings.target_list !== false) {
+					targetListCtrl = {
+						name: 'target',
+						type: 'listbox',
+						label: 'Target',
+						values: buildTargetList(data.target)
+					};
+				}
+
+				if (editor.settings.rel_list) {
+					relListCtrl = {
+						name: 'rel',
+						type: 'listbox',
+						label: 'Rel',
+						values: buildRelList(data.rel)
+					};
+				}
+
+				var currentTarget = null;
+
+				//if we already have a link selected, we want to pass that data over to the dialog
+				if (anchorElm) {
+					var anchor = $(anchorElm);
+					currentTarget = {
+						name: anchor.attr("title"),
+						url: anchor.attr("href"),
+						target: anchor.attr("target")
+					};
+
+					// drop the lead char from the anchor text, if it has a value
+					var anchorVal = anchor[0].dataset.anchor;
+					if (anchorVal) {
+						currentTarget.anchor = anchorVal.substring(1);
+					}
+
+					//locallink detection, we do this here, to avoid poluting the dialogservice
+					//so the dialog service can just expect to get a node-like structure
+					if (currentTarget.url.indexOf("localLink:") > 0) {
+						// if the current link has an anchor, it needs to be considered when getting the udi/id
+						// if an anchor exists, reduce the substring max by its length plus two to offset the removed prefix and trailing curly brace
+						var linkId = currentTarget.url.substring(currentTarget.url.indexOf(":") + 1, currentTarget.url.lastIndexOf("}"));
+
+						//we need to check if this is an INT or a UDI
+						var parsedIntId = parseInt(linkId, 10);
+						if (isNaN(parsedIntId)) {
+							//it's a UDI
+							currentTarget.udi = linkId;
+						} else {
+							currentTarget.id = linkId;
+						}
+					}
+				}
+
+				if (onClick) {
+					onClick(currentTarget, anchorElm);
+				}
+
+			}
+
+			editor.addButton('link', {
+				icon: 'link',
+				tooltip: 'Insert/edit link',
+				shortcut: 'Ctrl+K',
+				onclick: createLinkList(showDialog),
+				stateSelector: 'a[href]'
+			});
+
+			editor.addButton('unlink', {
+				icon: 'unlink',
+				tooltip: 'Remove link',
+				cmd: 'unlink',
+				stateSelector: 'a[href]'
+			});
+
+			editor.addShortcut('Ctrl+K', '', createLinkList(showDialog));
+			this.showDialog = showDialog;
+
+			editor.addMenuItem('link', {
+				icon: 'link',
+				text: 'Insert link',
+				shortcut: 'Ctrl+K',
+				onclick: createLinkList(showDialog),
+				stateSelector: 'a[href]',
+				context: 'insert',
+				prependToContext: true
+			});
+
+		},
+
+		insertLinkInEditor: function (editor, target, anchorElm) {
+
+			var href = target.url;
+			// We want to use the Udi. If it is set, we use it, else fallback to id, and finally to null
+			var hasUdi = target.udi ? true : false;
+			var id = hasUdi ? target.udi : (target.id ? target.id : null);
+
+			// if an anchor exists, check that it is appropriately prefixed
+			if (target.anchor && target.anchor[0] !== '?' && target.anchor[0] !== '#') {
+				target.anchor = (target.anchor.indexOf('=') === -1 ? '#' : '?') + target.anchor;
+			}
+
+			// the href might be an external url, so check the value for an anchor/qs
+			// href has the anchor re-appended later, hence the reset here to avoid duplicating the anchor
+			if (!target.anchor) {
+				var urlParts = href.split(/(#|\?)/);
+				if (urlParts.length === 3) {
+					href = urlParts[0];
+					target.anchor = urlParts[1] + urlParts[2];
+				}
+			}
+
+			//Create a json obj used to create the attributes for the tag
+			function createElemAttributes() {
+				var a = {
+					href: href,
+					title: target.name,
+					target: target.target ? target.target : null,
+					rel: target.rel ? target.rel : null
+				};
+
+				if (hasUdi) {
+					a["data-udi"] = target.udi;
+				} else if (target.id) {
+					a["data-id"] = target.id;
+				}
+
+				if (target.anchor) {
+					a["data-anchor"] = target.anchor;
+					a.href = a.href + target.anchor;
+				} else {
+					a["data-anchor"] = null;
+				}
+
+				return a;
+			}
+
+			function insertLink() {
+				if (anchorElm) {
+					editor.dom.setAttribs(anchorElm, createElemAttributes());
+
+					editor.selection.select(anchorElm);
+					editor.execCommand('mceEndTyping');
+				} else {
+					editor.execCommand('mceInsertLink', false, createElemAttributes());
+				}
+			}
+
+            if (!href && !target.anchor) {
+				editor.execCommand('unlink');
+				return;
+			}
+
+			//if we have an id, it must be a locallink:id, aslong as the isMedia flag is not set
+			if (id && (angular.isUndefined(target.isMedia) || !target.isMedia)) {
+
+				href = "/{localLink:" + id + "}";
+
+				insertLink();
+				return;
+			}
+
+		    if (!href) {
+		        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;
+			}
+
+			// Is www. prefixed
+			if (/^\s*www\./i.test(href)) {
+				href = 'http://' + href;
+				insertLink();
+				return;
+			}
+
+			insertLink();
+
+		}
+
+	};
+}
+
+angular.module('umbraco.services').factory('tinyMceService', tinyMceService);
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
index 67d62de223..b1fa038c44 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
@@ -1,6 +1,6 @@
 //used for the media picker dialog
 angular.module("umbraco").controller("Umbraco.Dialogs.LinkPickerController",
-	function ($scope, eventsService, dialogService, entityResource, contentResource, mediaHelper, userService, localizationService, tinyMceService) {
+	function ($scope, eventsService, dialogService, entityResource, mediaHelper, userService, localizationService, tinyMceService) {
 		var dialogOptions = $scope.dialogOptions;
 
 		var searchText = "Search...";
@@ -40,10 +40,10 @@ angular.module("umbraco").controller("Umbraco.Dialogs.LinkPickerController",
 				}
 
 				// if a link exists, get the properties to build the anchor name list
-				contentResource.getById(id).then(function (resp) {
-					$scope.anchorValues = tinyMceService.getAnchorNames(JSON.stringify(resp.properties));
-					$scope.target.url = resp.urls[0];
-				});
+                entityResource.getUrlAndAnchors(id).then(function(resp){
+                    $scope.anchorValues = resp.anchorValues;
+                    $scope.target.url = resp.url;
+                });
 			} else if ($scope.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 ?
@@ -88,10 +88,10 @@ angular.module("umbraco").controller("Umbraco.Dialogs.LinkPickerController",
 				if (args.node.id < 0) {
 					$scope.target.url = "/";
 				} else {
-					contentResource.getById(args.node.id).then(function (resp) {
-						$scope.anchorValues = tinyMceService.getAnchorNames(JSON.stringify(resp.properties));
-						$scope.target.url = resp.urls[0];
-					});
+                    entityResource.getUrlAndAnchors(args.node.id).then(function(resp){
+                        $scope.anchorValues = resp.anchorValues;
+                        $scope.target.url = resp.url;
+                    });
 				}
 
 				if (!angular.isUndefined($scope.target.isMedia)) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
index 8a1c3eb9a9..787fe4186e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
@@ -1,6 +1,6 @@
 //used for the media picker dialog
 angular.module("umbraco").controller("Umbraco.Overlays.LinkPickerController",
-    function ($scope, eventsService, dialogService, entityResource, contentResource, mediaHelper, userService, localizationService, tinyMceService) {
+    function ($scope, eventsService, dialogService, entityResource, mediaHelper, userService, localizationService, tinyMceService) {
         var dialogOptions = $scope.model;
 
         var searchText = "Search...";
@@ -45,10 +45,10 @@ angular.module("umbraco").controller("Umbraco.Overlays.LinkPickerController",
                         });
                     });
 
-                    // if a link exists, get the properties to build the anchor name list
-                    contentResource.getById(id, { dataTypeId: dialogOptions.dataTypeId }).then(function (resp) {
-                        $scope.model.target.url = resp.urls[0];
-                        $scope.anchorValues = tinyMceService.getAnchorNames(JSON.stringify(resp.properties));
+
+                    entityResource.getUrlAndAnchors(id).then(function(resp){
+                        $scope.anchorValues = resp.anchorValues;
+                        $scope.model.target.url = resp.url;
                     });
                 }
             } else if ($scope.model.target.url.length) {
@@ -88,9 +88,9 @@ angular.module("umbraco").controller("Umbraco.Overlays.LinkPickerController",
             if (args.node.id < 0) {
                 $scope.model.target.url = "/";
             } else {
-                contentResource.getById(args.node.id, { dataTypeId: dialogOptions.dataTypeId }).then(function (resp) {
-                    $scope.model.target.url = resp.urls[0];
-                    $scope.anchorValues = tinyMceService.getAnchorNames(JSON.stringify(resp.properties));
+                entityResource.getUrlAndAnchors(args.node.id).then(function(resp){
+                    $scope.anchorValues = resp.anchorValues;
+                    $scope.model.target.url = resp.url;
                 });
             }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js
index e3e5d5e072..30ea1eaef6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js
@@ -12,19 +12,22 @@
 
         function openLinkPicker(editor, currentTarget, anchorElement) {
 
-            vm.linkPickerOverlay = {
-                view: "linkpicker",
-                currentTarget: currentTarget,
-				anchors: tinyMceService.getAnchorNames(JSON.stringify(editorState.current.properties)),
-                dataTypeId: $scope.model.dataTypeId,
-                ignoreUserStartNodes : $scope.model.config.ignoreUserStartNodes,
-                show: true,
-                submit: function(model) {
-                    tinyMceService.insertLinkInEditor(editor, model.target, anchorElement);
-                    vm.linkPickerOverlay.show = false;
-                    vm.linkPickerOverlay = null;
-                }
-            };
+            entityResource.getAnchors($scope.model.value).then(function(anchorValues) {
+                vm.linkPickerOverlay = {
+                    view: "linkpicker",
+                    currentTarget: currentTarget,
+                    anchors: anchorValues,
+                    dataTypeId: $scope.model.dataTypeId,
+                    ignoreUserStartNodes : $scope.model.config.ignoreUserStartNodes,
+                    show: true,
+                    submit: function(model) {
+                        tinyMceService.insertLinkInEditor(editor, model.target, anchorElement);
+                        vm.linkPickerOverlay.show = false;
+                        vm.linkPickerOverlay = null;
+                    }
+                };
+            });
+
         }
 
         function openMediaPicker(editor, currentTarget, userData) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
index cadbc5f57a..dd9fb404c1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
@@ -1,6 +1,6 @@
 angular.module("umbraco")
     .controller("Umbraco.PropertyEditors.RTEController",
-    function ($rootScope, $scope, $q, $locale, dialogService, $log, imageHelper, assetsService, $timeout, tinyMceService, angularHelper, stylesheetResource, macroService, editorState) {
+    function ($rootScope, $scope, $q, $locale, dialogService, $log, imageHelper, assetsService, $timeout, tinyMceService, angularHelper, stylesheetResource, macroService, editorState, entityResource) {
 
         $scope.isLoading = true;
 
@@ -270,19 +270,25 @@ angular.module("umbraco")
                     });
 
                     tinyMceService.createLinkPicker(editor, $scope, function(currentTarget, anchorElement) {
-                        $scope.linkPickerOverlay = {
-                            view: "linkpicker",
-                            currentTarget: currentTarget,
-							              anchors: editorState.current ? tinyMceService.getAnchorNames(JSON.stringify(editorState.current.properties)) : [],
-                            dataTypeId: $scope.model.dataTypeId,
-                            ignoreUserStartNodes: $scope.model.config.ignoreUserStartNodes,
-                            show: true,
-                            submit: function(model) {
-                                tinyMceService.insertLinkInEditor(editor, model.target, anchorElement);
-                                $scope.linkPickerOverlay.show = false;
-                                $scope.linkPickerOverlay = null;
-                            }
-                        };
+
+                        entityResource.getAnchors($scope.model.value).then(function(anchorValues){
+                            $scope.linkPickerOverlay = {
+                                view: "linkpicker",
+                                currentTarget: currentTarget,
+                                anchors: anchorValues,
+                                dataTypeId: $scope.model.dataTypeId,
+                                ignoreUserStartNodes: $scope.model.config.ignoreUserStartNodes,
+                                show: true,
+                                submit: function(model) {
+                                    tinyMceService.insertLinkInEditor(editor, model.target, anchorElement);
+                                    $scope.linkPickerOverlay.show = false;
+                                    $scope.linkPickerOverlay = null;
+                                }
+                            };
+                        });
+
+
+
                     });
 
                     //Create the insert media plugin
diff --git a/src/Umbraco.Web/Editors/EntityController.cs b/src/Umbraco.Web/Editors/EntityController.cs
index 36f4465e96..d6e997b57e 100644
--- a/src/Umbraco.Web/Editors/EntityController.cs
+++ b/src/Umbraco.Web/Editors/EntityController.cs
@@ -289,6 +289,26 @@ namespace Umbraco.Web.Editors
                 publishedContentExists: i => Umbraco.TypedContent(i) != null);
         }
 
+
+        [HttpGet]
+        public UrlAndAnchors GetUrlAndAnchors(int id)
+        {
+            var x = GetResultForId(id, UmbracoEntityTypes.Document);
+
+            var url = Umbraco.Url(id);
+            var anchorValues = Services.ContentService.GetAnchorValuesFromRTEs(id);
+            return new UrlAndAnchors(url, anchorValues);
+        }
+
+        [HttpPost]
+        public IList<string> GetAnchors(string rteContent)
+        {
+
+            var anchorValues = Services.ContentService.GetAnchorValuesFromRTEContent(rteContent);
+            return anchorValues;
+        }
+
+
         #region GetById
 
         /// <summary>
diff --git a/src/Umbraco.Web/Models/ContentEditing/UrlAndAnchors.cs b/src/Umbraco.Web/Models/ContentEditing/UrlAndAnchors.cs
new file mode 100644
index 0000000000..a8cf2e26ee
--- /dev/null
+++ b/src/Umbraco.Web/Models/ContentEditing/UrlAndAnchors.cs
@@ -0,0 +1,21 @@
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+
+namespace Umbraco.Web.Models.ContentEditing
+{
+    [DataContract(Name = "urlAndAnchors", Namespace = "")]
+    public class UrlAndAnchors
+    {
+        public UrlAndAnchors(string url, IList<string> anchorValues)
+        {
+            Url = url;
+            AnchorValues = anchorValues;
+        }
+
+        [DataMember(Name = "url")]
+        public string Url { get; }
+
+        [DataMember(Name = "anchorValues")]
+        public IList<string> AnchorValues { get;  }
+    }
+}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 90624df5f2..d4fd27c323 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -1,2027 +1,2028 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{651E1350-91B6-44B7-BD60-7207006D7003}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>umbraco</AssemblyName>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Umbraco.Web</RootNamespace>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <StartupObject>
-    </StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <SccProjectName>
-    </SccProjectName>
-    <SccLocalPath>
-    </SccLocalPath>
-    <SccAuxPath>
-    </SccAuxPath>
-    <SccProvider>
-    </SccProvider>
-    <OldToolsVersion>4.0</OldToolsVersion>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <TargetFrameworkProfile />
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>bin\Debug\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>bin\Release\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>bin\Release\umbraco.xml</DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>pdbonly</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\UmbracoExamine\UmbracoExamine.csproj">
-      <Project>{07fbc26b-2927-4a22-8d96-d644c667fecc}</Project>
-      <Name>UmbracoExamine</Name>
-    </ProjectReference>
-    <Reference Include="AutoMapper, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
-      <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="AutoMapper.Net4, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
-      <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <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="dotless.Core, Version=1.5.2.0, Culture=neutral, PublicKeyToken=96b446c9e63eae34, processorArchitecture=MSIL">
-      <HintPath>..\packages\dotless.1.5.2\lib\dotless.Core.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="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="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>
-    <Reference Include="Lucene.Net, Version=2.9.4.1, Culture=neutral, PublicKeyToken=85089178b9ac3181, processorArchitecture=MSIL">
-      <HintPath>..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll</HintPath>
-    </Reference>
-    <Reference Include="MarkdownSharp, Version=1.14.5.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Markdown.1.14.7\lib\net45\MarkdownSharp.dll</HintPath>
-      <Private>True</Private>
-    </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.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.2\lib\net45\Microsoft.AspNet.Identity.Owin.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.AspNet.SignalR.Core, Version=2.4.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.SignalR.Core.2.4.1\lib\net45\Microsoft.AspNet.SignalR.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.CSharp" />
-    <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.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.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=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=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="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>
-      <Private>True</Private>
-    </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>
-      <Private>True</Private>
-    </Reference>
-    <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>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Semver, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\semver.1.1.2\lib\net451\Semver.dll</HintPath>
-    </Reference>
-    <Reference Include="System">
-      <Name>System</Name>
-    </Reference>
-    <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.configuration" />
-    <Reference Include="System.Data">
-      <Name>System.Data</Name>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Design" />
-    <Reference Include="System.Drawing">
-      <Name>System.Drawing</Name>
-    </Reference>
-    <Reference Include="System.EnterpriseServices" />
-    <Reference Include="System.IO.Compression.FileSystem" />
-    <Reference Include="System.Net.Http" />
-    <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.Runtime.Serialization" />
-    <Reference Include="System.Security" />
-    <Reference Include="System.ServiceModel" />
-    <Reference Include="System.Threading.Tasks.Dataflow, Version=4.6.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Threading.Tasks.Dataflow.4.9.0\lib\portable-net45+win8+wpa81\System.Threading.Tasks.Dataflow.dll</HintPath>
-    </Reference>
-    <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.Abstractions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Web.ApplicationServices" />
-    <Reference Include="System.Web.DynamicData" />
-    <Reference Include="System.Web.Entity" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Web.Extensions.Design" />
-    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
-    </Reference>
-    <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.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.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.7\lib\net45\System.Web.Razor.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Services">
-      <Name>System.Web.Services</Name>
-    </Reference>
-    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <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.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.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml">
-      <Name>System.XML</Name>
-    </Reference>
-    <Reference Include="System.Xml.Linq" />
-    <ProjectReference Include="..\SQLCE4Umbraco\SqlCE4Umbraco.csproj">
-      <Project>{5BA5425F-27A7-4677-865E-82246498AA2E}</Project>
-      <Name>SqlCE4Umbraco</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj">
-      <Project>{31785BC3-256C-4613-B2F5-A1B0BDDED8C1}</Project>
-      <Name>Umbraco.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\umbraco.controls\umbraco.controls.csproj">
-      <Project>{6EDD2061-82F2-461B-BB6E-879245A832DE}</Project>
-      <Name>umbraco.controls</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\umbraco.businesslogic\umbraco.businesslogic.csproj">
-      <Name>umbraco.businesslogic</Name>
-      <Project>{E469A9CE-1BEC-423F-AC44-713CD72457EA}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-    </ProjectReference>
-    <ProjectReference Include="..\umbraco.cms\umbraco.cms.csproj">
-      <Project>{CCD75EC3-63DB-4184-B49D-51C1DD337230}</Project>
-      <Name>umbraco.cms</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\umbraco.datalayer\umbraco.datalayer.csproj">
-      <Project>{C7CB79F0-1C97-4B33-BFA7-00731B579AE2}</Project>
-      <Name>umbraco.datalayer</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\umbraco.interfaces\umbraco.interfaces.csproj">
-      <Name>umbraco.interfaces</Name>
-      <Project>{511F6D8D-7717-440A-9A57-A507E9A8B27F}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-    </ProjectReference>
-    <ProjectReference Include="..\umbraco.providers\umbraco.providers.csproj">
-      <Project>{D7636876-0756-43CB-A192-138C6F0D5E42}</Project>
-      <Name>umbraco.providers</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\SolutionInfo.cs">
-      <Link>Properties\SolutionInfo.cs</Link>
-    </Compile>
-    <Compile Include="ApplicationContextExtensions.cs" />
-    <Compile Include="AreaRegistrationContextExtensions.cs" />
-    <Compile Include="BatchedDatabaseServerMessengerStartup.cs" />
-    <Compile Include="Cache\ApplicationCacheRefresher.cs" />
-    <Compile Include="Cache\ApplicationTreeCacheRefresher.cs" />
-    <Compile Include="Cache\CacheRefresherEventHandler.cs" />
-    <Compile Include="Cache\ContentTypeCacheRefresher.cs" />
-    <Compile Include="Cache\DataTypeCacheRefresher.cs" />
-    <Compile Include="Cache\DictionaryCacheRefresher.cs" />
-    <Compile Include="Cache\DistributedCache.cs" />
-    <Compile Include="Cache\DistributedCacheExtensions.cs" />
-    <Compile Include="Cache\DomainCacheRefresher.cs" />
-    <Compile Include="Cache\LanguageCacheRefresher.cs" />
-    <Compile Include="Cache\MacroCacheRefresher.cs" />
-    <Compile Include="Cache\MediaCacheRefresher.cs" />
-    <Compile Include="Cache\MemberCacheRefresher.cs" />
-    <Compile Include="Cache\MemberGroupCacheRefresher.cs" />
-    <Compile Include="Cache\PageCacheRefresher.cs" />
-    <Compile Include="Cache\PublicAccessCacheRefresher.cs" />
-    <Compile Include="Cache\RelationTypeCacheRefresher.cs" />
-    <Compile Include="Cache\UserGroupCacheRefresher.cs" />
-    <Compile Include="Cache\StylesheetCacheRefresher.cs" />
-    <Compile Include="Cache\StylesheetPropertyCacheRefresher.cs" />
-    <Compile Include="Cache\TemplateCacheRefresher.cs" />
-    <Compile Include="Cache\UnpublishedPageCacheRefresher.cs" />
-    <Compile Include="Cache\UserCacheRefresher.cs" />
-    <Compile Include="Editors\PreviewController.cs" />
-    <Compile Include="Editors\BackOfficeAssetsController.cs" />
-    <Compile Include="Features\DisabledFeatures.cs" />
-    <Compile Include="Editors\BackOfficeNotificationsController.cs" />
-    <Compile Include="Editors\DictionaryController.cs" />
-    <Compile Include="Editors\BackOfficeServerVariables.cs" />
-    <Compile Include="Editors\DashboardHelper.cs" />
-    <Compile Include="Editors\EditorModelEventArgs.cs" />
-    <Compile Include="Editors\EditorValidationResolver.cs" />
-    <Compile Include="Editors\EditorValidator.cs" />
-    <Compile Include="Editors\FromJsonPathAttribute.cs" />
-    <Compile Include="Editors\HelpController.cs" />
-    <Compile Include="Editors\IsCurrentUserModelFilterAttribute.cs" />
-    <Compile Include="Editors\PasswordChanger.cs" />
-    <Compile Include="Editors\TemplateController.cs" />
-    <Compile Include="Editors\ParameterSwapControllerActionSelector.cs" />
-    <Compile Include="Editors\CodeFileController.cs" />
-    <Compile Include="Editors\TourController.cs" />
-    <Compile Include="Features\EnabledFeatures.cs" />
-    <Compile Include="HealthCheck\Checks\Services\Tls12Check.cs" />
-    <Compile Include="HealthCheck\Checks\Security\XssProtectionCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Security\HstsCheck.cs" />
-    <Compile Include="Models\BackOfficeTourFilter.cs" />
-    <Compile Include="Models\ContentEditing\BackOfficePreview.cs" />
-    <Compile Include="Models\ContentEditing\DocumentTypeCollectionDisplay.cs" />
-    <Compile Include="Models\ContentEditing\NotifySetting.cs" />
-    <Compile Include="Models\Mapping\AutoMapperExtensions.cs" />
-    <Compile Include="Models\Mapping\ContentTreeNodeUrlResolver.cs" />
-    <Compile Include="Models\Mapping\MemberTreeNodeUrlResolver.cs" />
-    <Compile Include="Models\Trees\ExportMember.cs" />
-    <Compile Include="PropertyEditors\DropdownFlexiblePropertyEditor.cs" />
-    <Compile Include="TourFilterResolver.cs" />
-    <Compile Include="Editors\UserEditorAuthorizationHelper.cs" />
-    <Compile Include="Editors\UserGroupAuthorizationAttribute.cs" />
-    <Compile Include="Editors\UserGroupEditorAuthorizationHelper.cs" />
-    <Compile Include="Editors\UserGroupsController.cs" />
-    <Compile Include="Editors\UserGroupValidateAttribute.cs" />
-    <Compile Include="ExamineStartup.cs" />
-    <Compile Include="Extensions\UdiExtensions.cs" />
-    <Compile Include="Features\UmbracoFeatures.cs" />
-    <Compile Include="Features\FeaturesResolver.cs" />
-    <Compile Include="HealthCheck\Checks\Config\AbstractConfigCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Config\AcceptableConfiguration.cs" />
-    <Compile Include="HealthCheck\Checks\Config\ConfigurationService.cs" />
-    <Compile Include="HealthCheck\Checks\Config\ConfigurationServiceResult.cs" />
-    <Compile Include="HealthCheck\Checks\Config\MacroErrorsCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Config\NotificationEmailCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Config\TrySkipIisCustomErrorsCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Config\CustomErrorsCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Config\TraceCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Config\ValueComparisonType.cs" />
-    <Compile Include="HealthCheck\Checks\Config\CompilationDebugCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Security\BaseHttpHeaderCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Security\NoSniffCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Services\SmtpCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Permissions\FolderAndFilePermissionsCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Security\ExcessiveHeadersCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Security\ClickJackingCheck.cs" />
-    <Compile Include="HealthCheck\HealthCheckAction.cs" />
-    <Compile Include="HealthCheck\HealthCheckNotificationMethodAttribute.cs" />
-    <Compile Include="HealthCheck\HealthCheckAttribute.cs" />
-    <Compile Include="HealthCheck\HealthCheckContext.cs" />
-    <Compile Include="HealthCheck\HealthCheckController.cs" />
-    <Compile Include="HealthCheck\HealthCheckGroup.cs" />
-    <Compile Include="HealthCheck\HealthCheckNotificationMethodResolver.cs" />
-    <Compile Include="HealthCheck\HealthCheckResolver.cs" />
-    <Compile Include="HealthCheck\HealthCheck.cs" />
-    <Compile Include="HealthCheck\HealthCheckResults.cs" />
-    <Compile Include="HealthCheck\HealthCheckStatus.cs" />
-    <Compile Include="HealthCheck\Checks\Security\HttpsCheck.cs" />
-    <Compile Include="HealthCheck\IHealthCheckResolver.cs" />
-    <Compile Include="HealthCheck\IHealthCheckNotificationMethodsResolver.cs" />
-    <Compile Include="HealthCheck\NotificationMethods\NotificationMethodBase.cs" />
-    <Compile Include="HealthCheck\NotificationMethods\EmailNotificationMethod.cs" />
-    <Compile Include="HealthCheck\NotificationMethods\IHealthCheckNotificatationMethod.cs" />
-    <Compile Include="HealthCheck\StatusResultType.cs" />
-    <Compile Include="HealthCheck\Checks\DataIntegrity\XmlDataIntegrityHealthCheck.cs" />
-    <Compile Include="IHttpContextAccessor.cs" />
-    <Compile Include="Install\InstallSteps\ConfigureMachineKey.cs" />
-    <Compile Include="Models\BackOfficeTourFile.cs" />
-    <Compile Include="Models\BackOfficeTourStep.cs" />
-    <Compile Include="Models\ContentEditing\AssignedContentPermissions.cs" />
-    <Compile Include="Models\ContentEditing\AssignedUserGroupPermissions.cs" />
-    <Compile Include="Models\ContentEditing\ContentRedirectUrl.cs" />
-    <Compile Include="Models\ContentEditing\DictionaryDisplay.cs" />
-    <Compile Include="Models\ContentEditing\DictionaryOverviewDisplay.cs" />
-    <Compile Include="Models\ContentEditing\DictionarySave.cs" />
-    <Compile Include="Models\ContentEditing\DictionaryOverviewTranslationDisplay.cs" />
-    <Compile Include="Models\ContentEditing\DictionaryTranslationSave.cs" />
-    <Compile Include="Models\ContentEditing\EditorNavigation.cs" />
-    <Compile Include="Models\ContentEditing\GetAvailableCompositionsFilter.cs" />
-    <Compile Include="Editors\IEditorValidator.cs" />
-    <Compile Include="Editors\EditorModelEventManager.cs" />
-    <Compile Include="HtmlHelperBackOfficeExtensions.cs" />
-    <Compile Include="Install\InstallSteps\Version73FileCleanup.cs" />
-    <Compile Include="Models\ContentEditing\DocumentTypeDisplay.cs" />
-    <Compile Include="Media\EmbedProviders\Flickr.cs" />
-    <Compile Include="Models\ContentEditing\ContentTypeCompositionDisplay.cs" />
-    <Compile Include="Models\ContentEditing\ContentTypeSave.cs" />
-    <Compile Include="Models\ContentEditing\DocumentTypeSave.cs" />
-    <Compile Include="Models\ContentEditing\InstalledPackageModel.cs" />
-    <Compile Include="Models\ContentEditing\LinkDisplay.cs" />
-    <Compile Include="Models\ContentEditing\MediaTypeDisplay.cs" />
-    <Compile Include="Models\ContentEditing\MediaTypeSave.cs" />
-    <Compile Include="Models\ContentEditing\MemberPropertyTypeBasic.cs" />
-    <Compile Include="Models\ContentEditing\MemberPropertyTypeDisplay.cs" />
-    <Compile Include="Models\ContentEditing\MemberTypeDisplay.cs" />
-    <Compile Include="Models\ContentEditing\MemberTypeSave.cs" />
-    <Compile Include="Models\ContentEditing\Permission.cs" />
-    <Compile Include="Models\ContentEditing\PostedFiles.cs" />
-    <Compile Include="Models\ContentEditing\PostedFolder.cs" />
-    <Compile Include="Models\ContentEditing\PropertyGroupBasic.cs" />
-    <Compile Include="Models\ContentEditing\PropertyTypeBasic.cs" />
-    <Compile Include="Models\ContentEditing\SimpleNotificationModel.cs" />
-    <Compile Include="Models\ContentEditing\SnippetDisplay.cs" />
-    <Compile Include="Models\ContentEditing\TemplateDisplay.cs" />
-    <Compile Include="Models\ContentEditing\DictionaryTranslationDisplay.cs" />
-    <Compile Include="Models\ContentEditing\UserDisplay.cs" />
-    <Compile Include="Models\ContentEditing\UserBasic.cs" />
-    <Compile Include="Models\ContentEditing\UserGroupBasic.cs" />
-    <Compile Include="Models\ContentEditing\UserGroupDisplay.cs" />
-    <Compile Include="Models\ContentEditing\UserGroupPermissionsSave.cs" />
-    <Compile Include="Models\ContentEditing\UserGroupSave.cs" />
-    <Compile Include="Models\DetachedPublishedContent.cs" />
-    <Compile Include="Models\DetachedPublishedProperty.cs" />
-    <Compile Include="Models\ContentEditing\UserInvite.cs" />
-    <Compile Include="Models\ContentEditing\UserSave.cs" />
-    <Compile Include="Models\Link.cs" />
-    <Compile Include="Models\LinkType.cs" />
-    <Compile Include="Models\LocalPackageInstallModel.cs" />
-    <Compile Include="Models\Mapping\CodeFileDisplayMapper.cs" />
-    <Compile Include="Models\Mapping\ContentTypeModelMapperExtensions.cs" />
-    <Compile Include="Models\Mapping\ContentTypeUdiResolver.cs" />
-    <Compile Include="Models\Mapping\DictionaryModelMapper.cs" />
-    <Compile Include="Models\Mapping\EntityModelMapperExtensions.cs" />
-    <Compile Include="Models\Mapping\LockedCompositionsResolver.cs" />
-    <Compile Include="Models\Mapping\UserGroupDefaultPermissionsResolver.cs" />
-    <Compile Include="Models\Mapping\PropertyGroupDisplayResolver.cs" />
-    <Compile Include="Models\RelatedLink.cs" />
-    <Compile Include="Models\Mapping\TemplateModelMapper.cs" />
-    <Compile Include="Models\PackageInstallResult.cs" />
-    <Compile Include="Models\RelatedLinkBase.cs" />
-    <Compile Include="Models\ContentEditing\CodeFileDisplay.cs" />
-    <Compile Include="Models\SendCodeViewModel.cs" />
-    <Compile Include="Models\RelatedLinks.cs" />
-    <Compile Include="Models\RelatedLinkType.cs" />
-    <Compile Include="Models\SetPasswordModel.cs" />
-    <Compile Include="Models\RequestPasswordResetModel.cs" />
-    <Compile Include="Models\PublishedContentWithKeyBase.cs" />
-    <Compile Include="Models\BackOfficeTour.cs" />
-    <Compile Include="Models\UserTourStatus.cs" />
-    <Compile Include="Models\ValidatePasswordResetCodeModel.cs" />
-    <Compile Include="Mvc\ControllerContextExtensions.cs" />
-    <Compile Include="Mvc\DisableBrowserCacheAttribute.cs" />
-    <Compile Include="Mvc\EnsurePartialViewMacroViewContextFilterAttribute.cs" />
-    <Compile Include="Mvc\IRenderController.cs" />
-    <Compile Include="Mvc\ModelBindingException.cs" />
-    <Compile Include="Mvc\RenderIndexActionSelectorAttribute.cs" />
-    <Compile Include="Mvc\UmbracoRequireHttpsAttribute.cs" />
-    <Compile Include="Mvc\ValidateMvcAngularAntiForgeryTokenAttribute.cs" />
-    <Compile Include="OwinMiddlewareConfiguredEventArgs.cs" />
-    <Compile Include="Profiling\WebProfilerProvider.cs" />
-    <Compile Include="Profiling\WebProfiler.cs" />
-    <Compile Include="PropertyEditors\ContentPicker2PropertyEditor.cs" />
-    <Compile Include="PropertyEditors\DatePreValueEditor.cs" />
-    <Compile Include="PropertyEditors\DateTimePreValueEditor.cs" />
-    <Compile Include="PropertyEditors\DecimalPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MediaPicker2PropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MemberPicker2PropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MultiNodeTreePicker2PropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MultiUrlPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\NestedContentController.cs" />
-    <Compile Include="PropertyEditors\NestedContentHelper.cs" />
-    <Compile Include="PropertyEditors\NestedContentPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\RelatedLinks2PropertyEditor.cs" />
-    <Compile Include="PropertyEditors\TextOnlyValueEditor.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\ContentPickerPropertyConverter.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\MultipleContentPickerParameterEditor.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\ImageCropDataSetConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\ImageCropperValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\LegacyRelatedLinksEditorValueConvertor.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\MediaPickerPropertyConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\MemberPickerPropertyConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\MultiNodeTreePickerPropertyConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\LegacyMediaPickerPropertyConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\MultiUrlPickerPropertyConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\NestedContentSingleValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\NestedContentManyValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\NestedContentPublishedPropertyTypeExtensions.cs" />
-    <Compile Include="PublishedContentQueryExtensions.cs" />
-    <Compile Include="Routing\RedirectTrackingEventHandler.cs" />
-    <Compile Include="Editors\RedirectUrlManagementController.cs" />
-    <Compile Include="Models\ContentEditing\RedirectUrlSearchResults.cs" />
-    <Compile Include="RelatedLinksTypeConverter.cs" />
-    <Compile Include="RouteDataExtensions.cs" />
-    <Compile Include="Routing\ContentFinderByRedirectUrl.cs" />
-    <Compile Include="Scheduling\HealthCheckNotifier.cs" />
-    <Compile Include="Scheduling\LatchedBackgroundTaskBase.cs" />
-    <Compile Include="Search\SearchableApplicationTree.cs" />
-    <Compile Include="Search\SearchableTreeAttribute.cs" />
-    <Compile Include="Search\SearchableTreeCollection.cs" />
-    <Compile Include="Search\SearchableTreeResolver.cs" />
-    <Compile Include="Search\UmbracoTreeSearcher.cs" />
-    <Compile Include="Security\Identity\ExternalSignInAutoLinkOptions.cs" />
-    <Compile Include="Security\Identity\FixWindowsAuthMiddlware.cs" />
-    <Compile Include="Security\Identity\ForceRenewalCookieAuthenticationHandler.cs" />
-    <Compile Include="Security\Identity\ForceRenewalCookieAuthenticationMiddleware.cs" />
-    <Compile Include="Security\Identity\GetUserSecondsMiddleWare.cs" />
-    <Compile Include="Models\ContentEditing\PropertyTypeDisplay.cs" />
-    <Compile Include="Models\ContentEditing\PropertyGroupDisplay.cs" />
-    <Compile Include="Media\EmbedProviders\OEmbedJson.cs" />
-    <Compile Include="Media\EmbedProviders\OEmbedResponse.cs" />
-    <Compile Include="Media\EmbedProviders\OEmbedPhoto.cs" />
-    <Compile Include="Security\Identity\IUmbracoBackOfficeTwoFactorOptions.cs" />
-    <Compile Include="Models\Mapping\PropertyTypeGroupResolver.cs" />
-    <Compile Include="Security\Identity\PreviewAuthenticationMiddleware.cs" />
-    <Compile Include="SingletonHttpContextAccessor.cs" />
-    <Compile Include="Trees\DictionaryTreeController.cs" />
-    <Compile Include="Trees\MacroTreeController.cs" />
-    <Compile Include="Trees\UserTreeController.cs" />
-    <Compile Include="Suspendable.cs" />
-    <Compile Include="Trees\ContentBlueprintTreeController.cs" />
-    <Compile Include="Trees\ContentTypeTreeController.cs" />
-    <Compile Include="Trees\PackagesTreeController.cs" />
-    <Compile Include="Trees\MediaTypeTreeController.cs" />
-    <Compile Include="Trees\MemberTypeTreeController.cs" />
-    <Compile Include="Security\WebAuthExtensions.cs" />
-    <Compile Include="Trees\XsltTreeController.cs" />
-    <Compile Include="umbraco.presentation\SafeXmlReaderWriter.cs" />
-    <Compile Include="Trees\ScriptTreeController.cs" />
-    <Compile Include="umbraco.presentation\umbraco\developer\Packages\installer.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="UmbracoDefaultOwinStartup.cs" />
-    <Compile Include="IUmbracoContextAccessor.cs" />
-    <Compile Include="Models\ContentEditing\Relation.cs" />
-    <Compile Include="HtmlStringUtilities.cs" />
-    <Compile Include="Models\ContentEditing\RelationType.cs" />
-    <Compile Include="Models\ContentExtensions.cs" />
-    <Compile Include="IDynamicPublishedContentQuery.cs" />
-    <Compile Include="ITagQuery.cs" />
-    <Compile Include="ITypedPublishedContentQuery.cs" />
-    <Compile Include="IUmbracoComponentRenderer.cs" />
-    <Compile Include="Models\LegacyConvertedNode.cs" />
-    <Compile Include="Models\LegacyConvertedNodeProperty.cs" />
-    <Compile Include="Models\Mapping\RelationModelMapper.cs" />
-    <Compile Include="Mvc\DisableClientCacheAttribute.cs" />
-    <Compile Include="Models\UnLinkLoginModel.cs" />
-    <Compile Include="Mvc\MvcVersionCheck.cs" />
-    <Compile Include="Mvc\ReflectedFixedRazorViewEngine.cs" />
-    <Compile Include="Scheduling\ThreadingTaskImmutable.cs" />
-    <Compile Include="Mvc\ProfilingView.cs" />
-    <Compile Include="Mvc\ProfilingViewEngine.cs" />
-    <Compile Include="Mvc\UrlHelperExtensions.cs" />
-    <Compile Include="Scheduling\BackgroundTaskRunner.cs" />
-    <Compile Include="BatchedDatabaseServerMessenger.cs" />
-    <Compile Include="BatchedWebServiceServerMessenger.cs" />
-    <Compile Include="CacheHelperExtensions.cs" />
-    <Compile Include="Cache\UserGroupPermissionsCacheRefresher.cs" />
-    <Compile Include="Editors\AuthenticationController.cs" />
-    <Compile Include="Controllers\UmbProfileController.cs" />
-    <Compile Include="Editors\ContentController.cs" />
-    <Compile Include="Controllers\UmbLoginStatusController.cs" />
-    <Compile Include="Editors\ContentPostValidateAttribute.cs" />
-    <Compile Include="Editors\ContentTypeControllerBase.cs" />
-    <Compile Include="Editors\DashboardController.cs" />
-    <Compile Include="Editors\DashboardSecurity.cs" />
-    <Compile Include="Editors\DataTypeController.cs" />
-    <Compile Include="Editors\DataTypeValidateAttribute.cs" />
-    <Compile Include="Editors\EntityControllerConfigurationAttribute.cs" />
-    <Compile Include="Editors\ImagesController.cs" />
-    <Compile Include="Editors\PackageInstallController.cs" />
-    <Compile Include="Editors\RelationController.cs" />
-    <Compile Include="Editors\CanvasDesignerController.cs" />
-    <Compile Include="Editors\UsersController.cs" />
-    <Compile Include="GridTemplateExtensions.cs" />
-    <Compile Include="Models\PackageInstallModel.cs" />
-    <Compile Include="Models\ContentEditing\DataTypeBasic.cs" />
-    <Compile Include="Models\ContentEditing\MemberBasic.cs" />
-    <Compile Include="Models\ContentEditing\MemberListDisplay.cs" />
-    <Compile Include="Models\TemplateQuery\ContentTypeModel.cs" />
-    <Compile Include="Models\TemplateQuery\PropertyModel.cs" />
-    <Compile Include="Models\TemplateQuery\SourceModel.cs" />
-    <Compile Include="Models\TemplateQuery\TemplateQueryResult.cs" />
-    <Compile Include="Models\TemplateQuery\SortExpression.cs" />
-    <Compile Include="Models\TemplateQuery\Operathor.cs" />
-    <Compile Include="Models\TemplateQuery\OperathorTerm.cs" />
-    <Compile Include="Models\TemplateQuery\QueryCondition.cs" />
-    <Compile Include="Models\TemplateQuery\QueryModel.cs" />
-    <Compile Include="Models\TemplateQuery\QueryResultModel.cs" />
-    <Compile Include="Editors\TemplateQueryController.cs" />
-    <Compile Include="Models\ContentEditing\ContentBaseItemSave.cs" />
-    <Compile Include="Models\ContentEditing\MediaItemSave.cs" />
-    <Compile Include="Models\DetachedContent.cs" />
-    <Compile Include="Models\ImageCropAnchor.cs" />
-    <Compile Include="Models\ImageCropCoordinates.cs" />
-    <Compile Include="Models\ImageCropDataSet.cs" />
-    <Compile Include="Models\ImageCropFocalPoint.cs" />
-    <Compile Include="Models\ImageCropMode.cs" />
-    <Compile Include="Install\DatabaseHelper.cs" />
-    <Compile Include="Install\InstallException.cs" />
-    <Compile Include="Install\InstallStatusTracker.cs" />
-    <Compile Include="Install\InstallSteps\DatabaseConfigureStep.cs" />
-    <Compile Include="Install\InstallSteps\DatabaseInstallStep.cs" />
-    <Compile Include="Install\InstallSteps\DatabaseUpgradeStep.cs" />
-    <Compile Include="Install\InstallSteps\FilePermissionsStep.cs" />
-    <Compile Include="Install\InstallSteps\MajorVersion7UpgradeReport.cs" />
-    <Compile Include="Install\InstallSteps\SetUmbracoVersionStep.cs" />
-    <Compile Include="Install\InstallSteps\StarterKitCleanupStep.cs" />
-    <Compile Include="Install\InstallSteps\StarterKitDownloadStep.cs" />
-    <Compile Include="Install\InstallSteps\StarterKitInstallStep.cs" />
-    <Compile Include="Install\InstallSteps\UpgradeStep.cs" />
-    <Compile Include="Install\InstallSteps\NewInstallStep.cs" />
-    <Compile Include="Install\Controllers\InstallPackageController.cs" />
-    <Compile Include="Install\Models\DatabaseModel.cs" />
-    <Compile Include="Install\Models\DatabaseType.cs" />
-    <Compile Include="Install\Models\InstallationType.cs" />
-    <Compile Include="Install\Models\InstallInstructions.cs" />
-    <Compile Include="Install\Models\InstallPackageModel.cs" />
-    <Compile Include="Install\Models\InstallProgressResultModel.cs" />
-    <Compile Include="Install\Models\InstallSetup.cs" />
-    <Compile Include="Install\Models\InstallSetupResult.cs" />
-    <Compile Include="Install\Models\InstallSetupStep.cs" />
-    <Compile Include="Install\Models\InstallSetupStepAttribute.cs" />
-    <Compile Include="Install\Models\InstallTrackingItem.cs" />
-    <Compile Include="Install\Models\Package.cs" />
-    <Compile Include="Install\Models\UserModel.cs" />
-    <Compile Include="Install\UmbracoInstallArea.cs" />
-    <Compile Include="Install\Controllers\InstallApiController.cs" />
-    <Compile Include="Install\Controllers\InstallController.cs" />
-    <Compile Include="Install\InstallAuthorizeAttribute.cs" />
-    <Compile Include="Models\ContentEditing\TreeSearchResult.cs" />
-    <Compile Include="Models\ContentEditing\ListViewAwareContentItemDisplayBase.cs" />
-    <Compile Include="Models\ContentEditing\PropertyTypeValidation.cs" />
-    <Compile Include="Models\ImageCropData.cs" />
-    <Compile Include="Models\ImageCropRatioMode.cs" />
-    <Compile Include="Models\IRenderModel.cs" />
-    <Compile Include="Models\PartialViewMacroModelExtensions.cs" />
-    <Compile Include="Models\PostRedirectModel.cs" />
-    <Compile Include="Models\PublishedProperty.cs" />
-    <Compile Include="Mvc\ActionExecutedEventArgs.cs" />
-    <Compile Include="Mvc\AdminTokenAuthorizeAttribute.cs" />
-    <Compile Include="Mvc\NotFoundHandler.cs" />
-    <Compile Include="Mvc\PreRenderViewActionFilterAttribute.cs" />
-    <Compile Include="Mvc\RedirectToUmbracoUrlResult.cs" />
-    <Compile Include="PropertyEditors\GridPropertyEditor.cs" />
-    <Compile Include="Mvc\UmbracoVirtualNodeByIdRouteHandler.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\MacroContainerValueConverter.cs" />
-    <Compile Include="PropertyEditors\TagsDataController.cs" />
-    <Compile Include="PublishedCache\MemberPublishedContent.cs" />
-    <Compile Include="PublishedCache\RawValueProperty.cs" />
-    <Compile Include="Models\RenderModelOfTContent.cs" />
-    <Compile Include="Mvc\JsonNetResult.cs" />
-    <Compile Include="Mvc\MinifyJavaScriptResultAttribute.cs" />
-    <Compile Include="Mvc\EnsurePublishedContentRequestAttribute.cs" />
-    <Compile Include="Mvc\UmbracoTemplatePageOfTContent.cs" />
-    <Compile Include="Mvc\UmbracoViewPage.cs" />
-    <Compile Include="Editors\LogController.cs" />
-    <Compile Include="Editors\MacroController.cs" />
-    <Compile Include="Editors\MemberTypeController.cs" />
-    <Compile Include="Editors\UpdateCheckController.cs" />
-    <Compile Include="MembershipProviderExtensions.cs" />
-    <Compile Include="Models\ChangingPasswordModel.cs" />
-    <Compile Include="Models\ContentEditing\ModelWithNotifications.cs" />
-    <Compile Include="Models\ContentEditing\StyleSheet.cs" />
-    <Compile Include="Editors\StylesheetController.cs" />
-    <Compile Include="Models\ContentEditing\AuditLog.cs" />
-    <Compile Include="Models\ContentEditing\MoveOrCopy.cs" />
-    <Compile Include="Models\ContentEditing\MacroParameter.cs" />
-    <Compile Include="Models\ContentEditing\MemberDisplay.cs" />
-    <Compile Include="Models\ContentEditing\MemberSave.cs" />
-    <Compile Include="Models\ContentEditing\RichTextEditorCommand.cs" />
-    <Compile Include="Models\ContentEditing\RichTextEditorConfiguration.cs" />
-    <Compile Include="Models\ContentEditing\RichTextEditorPlugin.cs" />
-    <Compile Include="Models\ContentEditing\StylesheetRule.cs" />
-    <Compile Include="Models\ContentEditing\UmbracoEntityTypes.cs" />
-    <Compile Include="Models\ContentEditing\AuditLogType.cs" />
-    <Compile Include="Models\Mapping\MiscModelsMapper.cs" />
-    <Compile Include="Models\Mapping\MacroModelMapper.cs" />
-    <Compile Include="Models\Mapping\MemberModelMapper.cs" />
-    <Compile Include="Models\Mapping\TabModelMapper.cs" />
-    <Compile Include="Models\TagModel.cs" />
-    <Compile Include="Models\UpgradeCheckResponse.cs" />
-    <Compile Include="Models\PasswordChangedModel.cs" />
-    <Compile Include="NotificationServiceExtensions.cs" />
-    <Compile Include="PropertyEditors\ColorListPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\EmailAddressPropertyEditor.cs" />
-    <Compile Include="ImageCropperBaseExtensions.cs" />
-    <Compile Include="PropertyEditors\ImageCropperPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\ImageCropperPropertyValueEditor.cs" />
-    <Compile Include="PropertyEditors\ListViewPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MacroContainerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MarkdownPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MemberGroupPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MemberPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MultiNodeTreePickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MultipleMediaPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\ContentTypeParameterEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\MultipleContentTypeParameterEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\MultipleMediaPickerParameterEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\MultiplePropertyGroupParameterEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\MultiplePropertyTypeParameterEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\PropertyGroupParameterEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\PropertyTypeParameterEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\SingleMediaPickerParameterEditor.cs" />
-    <Compile Include="PropertyEditors\PropertyEditorAssetAttribute.cs" />
-    <Compile Include="PropertyEditors\RelatedLinksPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\RteEmbedController.cs" />
-    <Compile Include="Editors\EntityController.cs" />
-    <Compile Include="Editors\MediaPostValidateAttribute.cs" />
-    <Compile Include="Editors\MemberController.cs" />
-    <Compile Include="Editors\CurrentUserController.cs" />
-    <Compile Include="Models\ContentEditing\DashboardControl.cs" />
-    <Compile Include="Models\ContentEditing\DataTypeDisplay.cs" />
-    <Compile Include="Models\ContentEditing\DataTypeSave.cs" />
-    <Compile Include="Models\ContentEditing\EntityBasic.cs" />
-    <Compile Include="Models\ContentEditing\PreValueFieldDisplay.cs" />
-    <Compile Include="Models\ContentEditing\PreValueFieldSave.cs" />
-    <Compile Include="Models\ContentEditing\PropertyEditorBasic.cs" />
-    <Compile Include="Models\Mapping\AvailablePropertyEditorsResolver.cs" />
-    <Compile Include="Models\Mapping\DatabaseTypeResolver.cs" />
-    <Compile Include="Models\Mapping\DataTypeModelMapper.cs" />
-    <Compile Include="Models\Mapping\EntityModelMapper.cs" />
-    <Compile Include="Models\Mapping\PreValueDisplayResolver.cs" />
-    <Compile Include="PropertyEditors\CheckBoxListPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\ColorPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\DatePropertyEditor.cs" />
-    <Compile Include="PropertyEditors\DateTimePropertyEditor.cs" />
-    <Compile Include="PropertyEditors\DateTimeValidator.cs" />
-    <Compile Include="PropertyEditors\DropDownMultiplePropertyEditor.cs" />
-    <Compile Include="PropertyEditors\FolderBrowserPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\IntegerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MediaPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MultipleTextStringPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\PublishValuesMultipleValueEditor.cs" />
-    <Compile Include="PropertyEditors\DropDownMultipleWithKeysPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\RadioButtonsPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\RichTextPreValueController.cs" />
-    <Compile Include="PropertyEditors\RichTextPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\SliderPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\TagPropertyEditorTagDefinition.cs" />
-    <Compile Include="PropertyEditors\TagsPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\UploadFileTypeValidator.cs" />
-    <Compile Include="PropertyEditors\UserPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\RelatedLinksEditorValueConvertor.cs" />
-    <Compile Include="PropertyEditors\ValueListPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\DropDownPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\PublishValueValueEditor.cs" />
-    <Compile Include="PropertyEditors\DropDownWithKeysPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\LabelPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\PropertyValueEditorWrapper.cs" />
-    <Compile Include="PublishedContentQuery.cs" />
-    <Compile Include="ImageCropperTemplateExtensions.cs" />
-    <Compile Include="Mvc\UmbracoVirtualNodeRouteHandler.cs" />
-    <Compile Include="Routing\CustomRouteUrlProvider.cs" />
-    <Compile Include="Routing\UrlProviderExtensions.cs" />
-    <Compile Include="Scheduling\BackgroundTaskRunnerOptions.cs" />
-    <Compile Include="Scheduling\IBackgroundTaskRunner.cs" />
-    <Compile Include="Scheduling\ILatchedBackgroundTask.cs" />
-    <Compile Include="Scheduling\RecurringTaskBase.cs" />
-    <Compile Include="Security\Identity\AppBuilderExtensions.cs" />
-    <Compile Include="Security\Identity\AuthenticationOptionsExtensions.cs" />
-    <Compile Include="Security\Identity\AuthenticationManagerExtensions.cs" />
-    <Compile Include="Security\Identity\BackOfficeCookieManager.cs" />
-    <Compile Include="Security\Identity\FormsAuthenticationSecureDataFormat.cs" />
-    <Compile Include="Security\Identity\UmbracoBackOfficeCookieAuthOptions.cs" />
-    <Compile Include="Scheduling\TaskAndFactoryExtensions.cs" />
-    <Compile Include="SingletonUmbracoContextAccessor.cs" />
-    <Compile Include="Strategies\Migrations\ClearCsrfCookiesAfterUpgrade.cs" />
-    <Compile Include="Strategies\Migrations\ClearMediaXmlCacheForDeletedItemsAfterUpgrade.cs" />
-    <Compile Include="Strategies\Migrations\EnsureListViewDataTypeIsCreated.cs" />
-    <Compile Include="Strategies\Migrations\MigrationStartupHander.cs" />
-    <Compile Include="Strategies\Migrations\OverwriteStylesheetFilesFromTempFiles.cs" />
-    <Compile Include="Strategies\NotificationsHandler.cs" />
-    <Compile Include="Strategies\RelateOnCopyHandler.cs" />
-    <Compile Include="TagQuery.cs" />
-    <Compile Include="Trees\CoreTreeAttribute.cs" />
-    <Compile Include="Trees\DataTypeTreeController.cs" />
-    <Compile Include="Trees\FileSystemTreeController.cs" />
-    <Compile Include="Trees\LanguageTreeController.cs" />
-    <Compile Include="Trees\LegacyBaseTreeAttribute.cs" />
-    <Compile Include="Trees\MemberTreeController.cs" />
-    <Compile Include="Trees\MenuRenderingEventArgs.cs" />
-    <Compile Include="Models\Trees\CreateChildEntity.cs" />
-    <Compile Include="Models\Trees\MenuItemList.cs" />
-    <Compile Include="Trees\TemplatesTreeController.cs" />
-    <Compile Include="Trees\TreeControllerBase.cs" />
-    <Compile Include="CanvasDesignerUtility.cs" />
-    <Compile Include="UI\JavaScript\AssetInitialization.cs" />
-    <Compile Include="UI\JavaScript\CssInitialization.cs" />
-    <Compile Include="UI\JavaScript\DependencyPathRenderer.cs" />
-    <Compile Include="umbraco.presentation\umbraco\create.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\create\Language.ascx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\create\xslt.ascx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadPackager.cs" />
-    <Compile Include="PublishedCache\XmlPublishedCache\XmlCacheFilePersister.cs" />
-    <Compile Include="UmbracoComponentRenderer.cs" />
-    <Compile Include="Web References\org.umbraco.our\Reference.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Reference.map</DependentUpon>
-    </Compile>
-    <Compile Include="WebApi\AngularJsonMediaTypeFormatter.cs" />
-    <Compile Include="WebApi\AngularJsonOnlyConfigurationAttribute.cs" />
-    <Compile Include="WebApi\Binders\BlueprintItemBinder.cs" />
-    <Compile Include="WebApi\Binders\MemberBinder.cs" />
-    <Compile Include="WebApi\EnableDetailedErrorsAttribute.cs" />
-    <Compile Include="WebApi\Filters\AdminUsersAuthorizeAttribute.cs" />
-    <Compile Include="WebApi\Filters\AngularAntiForgeryHelper.cs" />
-    <Compile Include="WebApi\Filters\AppendCurrentEventMessagesAttribute.cs" />
-    <Compile Include="WebApi\Filters\AppendUserModifiedHeaderAttribute.cs" />
-    <Compile Include="WebApi\Filters\ClearAngularAntiForgeryTokenAttribute.cs" />
-    <Compile Include="WebApi\Filters\DisableBrowserCacheAttribute.cs" />
-    <Compile Include="WebApi\Filters\EnableOverrideAuthorizationAttribute.cs" />
-    <Compile Include="WebApi\Filters\FeatureAuthorizeAttribute.cs" />
-    <Compile Include="WebApi\Filters\FilterGrouping.cs" />
-    <Compile Include="WebApi\Filters\HttpQueryStringModelBinder.cs" />
-    <Compile Include="WebApi\Filters\LegacyTreeAuthorizeAttribute.cs" />
-    <Compile Include="WebApi\Filters\OutgoingEditorModelEventAttribute.cs" />
-    <Compile Include="WebApi\Filters\OutgoingNoHyphenGuidFormatAttribute.cs" />
-    <Compile Include="WebApi\Filters\OverridableAuthorizationAttribute.cs" />
-    <Compile Include="WebApi\Filters\SetAngularAntiForgeryTokensAttribute.cs" />
-    <Compile Include="WebApi\Filters\UmbracoBackOfficeLogoutAttribute.cs" />
-    <Compile Include="WebApi\Filters\UmbracoWebApiRequireHttpsAttribute.cs" />
-    <Compile Include="WebApi\Filters\UmbracoTreeAuthorizeAttribute.cs" />
-    <Compile Include="WebApi\Filters\UmbracoUseHttps.cs" />
-    <Compile Include="WebApi\Filters\ValidateAngularAntiForgeryTokenAttribute.cs" />
-    <Compile Include="WebApi\Filters\CheckIfUserTicketDataIsStaleAttribute.cs" />
-    <Compile Include="WebApi\HttpControllerContextExtensions.cs" />
-    <Compile Include="WebApi\CustomDateTimeConvertor.cs" />
-    <Compile Include="Models\ContentEditing\ContentSortOrder.cs" />
-    <Compile Include="Editors\ContentControllerBase.cs" />
-    <Compile Include="Editors\ContentTypeController.cs" />
-    <Compile Include="Editors\LegacyController.cs" />
-    <Compile Include="Controllers\UmbRegisterController.cs" />
-    <Compile Include="Models\ProfileModel.cs" />
-    <Compile Include="Models\LoginStatusModel.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\MarkdownEditorValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\TextStringValueConverter.cs" />
-    <Compile Include="PublishedContentPropertyExtension.cs" />
-    <Compile Include="Models\UmbracoProperty.cs" />
-    <Compile Include="Mvc\MergeParentContextViewDataAttribute.cs" />
-    <Compile Include="Mvc\ViewDataDictionaryExtensions.cs" />
-    <Compile Include="Routing\ContentLastChanceFinderByNotFoundHandlers.cs" />
-    <Compile Include="Models\RegisterModel.cs" />
-    <Compile Include="Models\LoginModel.cs" />
-    <Compile Include="Editors\MediaTypeController.cs" />
-    <Compile Include="Scheduling\IBackgroundTask.cs" />
-    <Compile Include="Scheduling\KeepAlive.cs" />
-    <Compile Include="Scheduling\LogScrubber.cs" />
-    <Compile Include="Scheduling\ScheduledPublishing.cs" />
-    <Compile Include="Scheduling\ScheduledTasks.cs" />
-    <Compile Include="Scheduling\TaskEventArgs.cs" />
-    <Compile Include="Security\MembershipHelper.cs" />
-    <Compile Include="Editors\SectionController.cs" />
-    <Compile Include="Editors\UmbracoAuthorizedJsonController.cs" />
-    <Compile Include="Editors\ValidationHelper.cs" />
-    <Compile Include="HttpCookieExtensions.cs" />
-    <Compile Include="Models\ContentEditing\ContentItemDisplayBase.cs" />
-    <Compile Include="Models\ContentEditing\ContentSaveAction.cs" />
-    <Compile Include="Models\ContentEditing\ContentTypeBasic.cs" />
-    <Compile Include="Models\ContentEditing\IErrorModel.cs" />
-    <Compile Include="Models\ContentEditing\IHaveUploadedFiles.cs" />
-    <Compile Include="Models\ContentEditing\INotificationModel.cs" />
-    <Compile Include="Models\ContentEditing\MediaItemDisplay.cs" />
-    <Compile Include="Models\ContentEditing\MessagesExtensions.cs" />
-    <Compile Include="Models\ContentEditing\Notification.cs" />
-    <Compile Include="Models\ContentEditing\Section.cs" />
-    <Compile Include="Models\ContentEditing\Tab.cs" />
-    <Compile Include="Models\ContentEditing\TabbedContentItem.cs" />
-    <Compile Include="Models\ContentEditing\UserProfile.cs" />
-    <Compile Include="Models\ContentEditing\UserDetail.cs" />
-    <Compile Include="FormDataCollectionExtensions.cs" />
-    <Compile Include="Models\Mapping\ContentPropertyBasicConverter.cs" />
-    <Compile Include="Models\Mapping\ContentPropertyDisplayConverter.cs" />
-    <Compile Include="Models\Mapping\ContentPropertyDtoConverter.cs" />
-    <Compile Include="Models\Mapping\ContentPropertyModelMapper.cs" />
-    <Compile Include="Models\Mapping\CreatorResolver.cs" />
-    <Compile Include="Models\Mapping\MediaModelMapper.cs" />
-    <Compile Include="Models\Mapping\ContentTypeModelMapper.cs" />
-    <Compile Include="Models\Mapping\ContentModelMapper.cs" />
-    <Compile Include="Models\Mapping\OwnerResolver.cs" />
-    <Compile Include="Models\Mapping\SectionModelMapper.cs" />
-    <Compile Include="Models\Mapping\TabsAndPropertiesResolver.cs" />
-    <Compile Include="Models\Mapping\UserModelMapper.cs" />
-    <Compile Include="PropertyEditors\ContentPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\FileUploadPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\FileUploadPropertyValueEditor.cs" />
-    <Compile Include="PropertyEditors\RichTextPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\TextAreaPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\TextboxPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\TrueFalsePropertyEditor.cs" />
-    <Compile Include="Trees\MediaTreeController.cs" />
-    <Compile Include="Models\Trees\ActionMenuItem.cs" />
-    <Compile Include="Models\Trees\ActionMenuItemAttribute.cs" />
-    <Compile Include="Trees\ActionUrlMethod.cs" />
-    <Compile Include="Trees\ApplicationTreeRegistrar.cs" />
-    <Compile Include="Trees\ContentTreeControllerBase.cs" />
-    <Compile Include="Trees\LegacyTreeController.cs" />
-    <Compile Include="Search\ISearchableTree.cs" />
-    <Compile Include="Trees\LegacyTreeDataConverter.cs" />
-    <Compile Include="Trees\LegacyTreeJavascript.cs" />
-    <Compile Include="Trees\LegacyTreeParams.cs" />
-    <Compile Include="Models\Trees\MenuItem.cs" />
-    <Compile Include="Models\Trees\MenuItemCollection.cs" />
-    <Compile Include="Models\Trees\RefreshNode.cs" />
-    <Compile Include="Models\ContentEditing\SearchResultItem.cs" />
-    <Compile Include="Models\Trees\SectionRootNode.cs" />
-    <Compile Include="Trees\TreeController.cs" />
-    <Compile Include="Trees\ApplicationTreeExtensions.cs" />
-    <Compile Include="Trees\TreeAttribute.cs" />
-    <Compile Include="Models\Trees\TreeNode.cs" />
-    <Compile Include="Models\Trees\TreeNodeCollection.cs" />
-    <Compile Include="Models\Trees\TreeNodeExtensions.cs" />
-    <Compile Include="Trees\TreeNodeRenderingEventArgs.cs" />
-    <Compile Include="Trees\TreeNodesRenderingEventArgs.cs" />
-    <Compile Include="Trees\TreeQueryStringParameters.cs" />
-    <Compile Include="Trees\ApplicationTreeController.cs" />
-    <Compile Include="Editors\BackOfficeController.cs" />
-    <Compile Include="Security\Providers\MembersMembershipProvider.cs" />
-    <Compile Include="Security\Providers\MembersRoleProvider.cs" />
-    <Compile Include="Security\Providers\UmbracoMembershipProvider.cs" />
-    <Compile Include="Security\Providers\UsersMembershipProvider.cs" />
-    <Compile Include="Trees\ContentTreeController.cs" />
-    <Compile Include="Trees\TreeRenderingEventArgs.cs" />
-    <Compile Include="Trees\UrlHelperExtensions.cs" />
-    <Compile Include="UI\JavaScript\JsInitialization.cs" />
-    <Compile Include="Models\ContentEditing\ContentItemBasic.cs" />
-    <Compile Include="Models\ContentEditing\ContentItemDisplay.cs" />
-    <Compile Include="Models\ContentEditing\ContentItemDto.cs" />
-    <Compile Include="Models\ContentEditing\ContentItemFile.cs" />
-    <Compile Include="Models\ContentEditing\ContentItemSave.cs" />
-    <Compile Include="Models\ContentEditing\ContentPropertyBasic.cs" />
-    <Compile Include="Models\ContentEditing\ContentPropertyDisplay.cs" />
-    <Compile Include="Models\ContentEditing\ContentPropertyDto.cs" />
-    <Compile Include="Dynamics\DynamicExpression.cs" />
-    <Compile Include="Dynamics\DynamicGrouping.cs" />
-    <Compile Include="Dynamics\DynamicPublishedContentIdEqualityComparer.cs" />
-    <Compile Include="Dynamics\DynamicPublishedContentListOrdering.cs" />
-    <Compile Include="Dynamics\DynamicQueryable.cs" />
-    <Compile Include="Dynamics\ExpressionParser.cs" />
-    <Compile Include="Dynamics\ExtensionMethods.cs" />
-    <Compile Include="Dynamics\Grouping.cs" />
-    <Compile Include="HttpRequestExtensions.cs" />
-    <Compile Include="HttpUrlHelperExtensions.cs" />
-    <Compile Include="Install\FilePermissionHelper.cs" />
-    <Compile Include="Install\InstallHelper.cs" />
-    <Compile Include="Install\HttpInstallAuthorizeAttribute.cs" />
-    <Compile Include="Macros\PartialViewMacroController.cs" />
-    <Compile Include="Macros\PartialViewMacroEngine.cs" />
-    <Compile Include="Macros\PartialViewMacroPage.cs" />
-    <Compile Include="Media\ImageUrl.cs" />
-    <Compile Include="Media\ImageUrlProviderResolver.cs" />
-    <Compile Include="Media\ImageUrlProviders\ImageUrlProvider.cs" />
-    <Compile Include="Models\DynamicPublishedContent.cs" />
-    <Compile Include="Models\DynamicPublishedContentList.cs" />
-    <Compile Include="Models\PartialViewMacroModel.cs" />
-    <Compile Include="Models\PublishedContentBase.cs" />
-    <Compile Include="Mvc\AreaRegistrationExtensions.cs" />
-    <Compile Include="BaseRest\BaseRestHandler.cs" />
-    <Compile Include="BaseRest\MemberRest.cs" />
-    <Compile Include="BaseRest\RestExtensionAttribute.cs" />
-    <Compile Include="BaseRest\RestExtensionMethodAttribute.cs" />
-    <Compile Include="BaseRest\RestExtensionMethodInfo.cs" />
-    <Compile Include="ContextualPublishedCacheExtensions.cs" />
-    <Compile Include="Mvc\DefaultRenderMvcControllerResolver.cs" />
-    <Compile Include="Mvc\QueryStringFilterAttribute.cs" />
-    <Compile Include="PublishedCache\ContextualPublishedContentCache.cs" />
-    <Compile Include="PublishedCache\ContextualPublishedCacheOfT.cs" />
-    <Compile Include="PublishedCache\ContextualPublishedCache.cs" />
-    <Compile Include="PublishedCache\ContextualPublishedMediaCache.cs" />
-    <Compile Include="PublishedCache\PublishedCachesResolver.cs" />
-    <Compile Include="PublishedCache\IPublishedCaches.cs" />
-    <Compile Include="PublishedCache\PublishedCaches.cs" />
-    <Compile Include="PublishedCache\XmlPublishedCache\PublishedMediaCache.cs" />
-    <Compile Include="Dictionary\UmbracoCultureDictionary.cs" />
-    <Compile Include="Dictionary\UmbracoCultureDictionaryFactory.cs" />
-    <Compile Include="Mvc\MemberAuthorizeAttribute.cs" />
-    <Compile Include="Mvc\BackOfficeArea.cs" />
-    <Compile Include="Mvc\ControllerFactoryExtensions.cs" />
-    <Compile Include="Mvc\IRenderMvcController.cs" />
-    <Compile Include="Mvc\SurfaceRouteHandler.cs" />
-    <Compile Include="PublishedCache\XmlPublishedCache\RoutesCache.cs" />
-    <Compile Include="PublishedCache\XmlPublishedCache\UmbracoContextCache.cs" />
-    <Compile Include="Routing\UrlProviderMode.cs" />
-    <Compile Include="Search\ExamineIndexerModel.cs" />
-    <Compile Include="Search\LuceneIndexerExtensions.cs" />
-    <Compile Include="Security\ValidateRequestAttempt.cs" />
-    <Compile Include="Security\WebSecurity.cs" />
-    <Compile Include="UI\JavaScript\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="UI\JavaScript\ServerVariablesParser.cs" />
-    <Compile Include="Strategies\Migrations\RebuildXmlCachesAfterUpgrade.cs" />
-    <Compile Include="Strategies\PublicAccessEventHandler.cs" />
-    <Compile Include="UI\Bundles\JsApplicationLib.cs" />
-    <Compile Include="UI\Bundles\JsJQueryCore.cs" />
-    <Compile Include="UI\Bundles\JsJQueryPlugins.cs" />
-    <Compile Include="UI\Bundles\JsUmbracoApplicationCore.cs" />
-    <Compile Include="UI\Bundles\JsUmbracoApplicationUI.cs" />
-    <Compile Include="UI\Bundles\JsUmbracoTree.cs" />
-    <Compile Include="UI\CdfLogger.cs" />
-    <Compile Include="Models\LegacyNodeHelper.cs" />
-    <Compile Include="umbraco.presentation\umbraco\controls\Tree\TreeControl.ascx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\create\simple.ascx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Packages\directoryBrowser.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\ProtectPage.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\create.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\AssignDomain2.aspx.cs">
-      <DependentUpon>AssignDomain2.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\AssignDomain2.aspx.designer.cs">
-      <DependentUpon>AssignDomain2.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="UmbracoContextExtensions.cs" />
-    <Compile Include="umbraco.presentation\umbraco\settings\stylesheet\editstylesheet.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\settings\stylesheet\property\EditStyleSheetProperty.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Controllers\UmbLoginController.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\TranslateTreeNames.cs" />
-    <Compile Include="UrlHelperExtensions.cs" />
-    <Compile Include="Editors\MediaController.cs" />
-    <Compile Include="UrlHelperRenderExtensions.cs" />
-    <Compile Include="WebApi\Binders\ContentItemBaseBinder.cs" />
-    <Compile Include="WebApi\IsBackOfficeAttribute.cs" />
-    <Compile Include="WebApi\Binders\ContentItemBinder.cs" />
-    <Compile Include="WebApi\Binders\MediaItemBinder.cs" />
-    <Compile Include="WebApi\Filters\EnsureUserPermissionForContentAttribute.cs" />
-    <Compile Include="WebApi\Filters\ContentItemValidationHelper.cs" />
-    <Compile Include="WebApi\Filters\EnsureUserPermissionForMediaAttribute.cs" />
-    <Compile Include="WebApi\Filters\FileUploadCleanupFilterAttribute.cs" />
-    <Compile Include="WebApi\Filters\FilterAllowedOutgoingContentAttribute.cs" />
-    <Compile Include="WebApi\Filters\FilterAllowedOutgoingMediaAttribute.cs" />
-    <Compile Include="WebApi\Filters\HttpQueryStringFilterAttribute.cs" />
-    <Compile Include="WebApi\Filters\OutgoingDateTimeFormatAttribute.cs" />
-    <Compile Include="WebApi\Filters\UmbracoApplicationAuthorizeAttribute.cs" />
-    <Compile Include="WebApi\GuidNoHyphenConverter.cs" />
-    <Compile Include="WebApi\HttpRequestMessageExtensions.cs" />
-    <Compile Include="WebApi\JsonCamelCaseFormatter.cs" />
-    <Compile Include="WebApi\MemberAuthorizeAttribute.cs" />
-    <Compile Include="WebApi\MvcVersionCheck.cs" />
-    <Compile Include="WebApi\NamespaceHttpControllerSelector.cs" />
-    <Compile Include="WebApi\PrefixlessBodyModelValidator.cs" />
-    <Compile Include="WebApi\PrefixlessBodyModelValidatorAttribute.cs" />
-    <Compile Include="WebApi\SessionHttpControllerRouteHandler.cs" />
-    <Compile Include="WebApi\UmbracoApiController.cs" />
-    <Compile Include="WebApi\UmbracoApiControllerBase.cs" />
-    <Compile Include="WebApi\UmbracoApiControllerResolver.cs" />
-    <Compile Include="Mvc\UmbracoAuthorizeAttribute.cs" />
-    <Compile Include="Mvc\NotChildAction.cs" />
-    <Compile Include="Mvc\UmbracoAuthorizedController.cs" />
-    <Compile Include="Mvc\UmbracoController.cs" />
-    <Compile Include="Mvc\UmbracoControllerFactory.cs" />
-    <Compile Include="Mvc\UmbracoMvcHandler.cs" />
-    <Compile Include="Mvc\UmbracoViewPageOfTModel.cs" />
-    <Compile Include="PublishedCache\IPublishedCache.cs" />
-    <Compile Include="PublishedCache\IPublishedContentCache.cs" />
-    <Compile Include="PublishedCache\IPublishedMediaCache.cs" />
-    <Compile Include="PublishedContentExtensions.cs" />
-    <Compile Include="ExamineExtensions.cs" />
-    <Compile Include="FormlessPage.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="HtmlHelperRenderExtensions.cs" />
-    <Compile Include="Scheduling\Scheduler.cs" />
-    <Compile Include="Media\EmbedProviders\AbstractOEmbedProvider.cs" />
-    <Compile Include="Media\EmbedProviders\AbstractProvider.cs" />
-    <Compile Include="Media\EmbedProviders\OEmbedRich.cs" />
-    <Compile Include="Media\EmbedProviders\OEmbedVideo.cs" />
-    <Compile Include="Media\EmbedProviders\Settings\Dictionary.cs" />
-    <Compile Include="Media\EmbedProviders\Settings\String.cs" />
-    <Compile Include="Media\EmbedProviders\Twitgoo.cs" />
-    <Compile Include="ModelStateExtensions.cs" />
-    <Compile Include="Mvc\HtmlTagWrapper.cs" />
-    <Compile Include="Mvc\HtmlTagWrapperTextNode.cs" />
-    <Compile Include="Mvc\IHtmlTagWrapper.cs" />
-    <Compile Include="Mvc\MergeModelStateToChildActionAttribute.cs" />
-    <Compile Include="Mvc\PluginController.cs" />
-    <Compile Include="Mvc\PluginViewEngine.cs" />
-    <Compile Include="Mvc\PostedDataProxyInfo.cs" />
-    <Compile Include="Mvc\RedirectToUmbracoPageResult.cs" />
-    <Compile Include="Mvc\Strings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Strings.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Mvc\SurfaceController.cs" />
-    <Compile Include="Mvc\PluginControllerArea.cs" />
-    <Compile Include="Mvc\PluginControllerAttribute.cs" />
-    <Compile Include="Mvc\SurfaceControllerFactory.cs" />
-    <Compile Include="Mvc\PluginControllerMetadata.cs" />
-    <Compile Include="Mvc\UmbracoPageResult.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\RteMacroRenderingValueConverter.cs" />
-    <Compile Include="RenderFieldCaseType.cs" />
-    <Compile Include="RenderFieldEncodingType.cs" />
-    <Compile Include="RouteCollectionExtensions.cs" />
-    <Compile Include="Routing\AliasUrlProvider.cs" />
-    <Compile Include="Routing\ContentFinderByLegacy404.cs" />
-    <Compile Include="Routing\ContentFinderByNotFoundHandler.cs" />
-    <Compile Include="Routing\ContentFinderByPageIdQuery.cs" />
-    <Compile Include="Mvc\SurfaceControllerResolver.cs" />
-    <Compile Include="Routing\ContentFinderByNotFoundHandlers.cs" />
-    <Compile Include="Routing\ISiteDomainHelper.cs" />
-    <Compile Include="Routing\RoutableAttemptEventArgs.cs" />
-    <Compile Include="Routing\DefaultUrlProvider.cs" />
-    <Compile Include="Routing\DomainAndUri.cs" />
-    <Compile Include="Routing\IUrlProvider.cs" />
-    <Compile Include="Routing\SiteDomainHelper.cs" />
-    <Compile Include="Routing\SiteDomainHelperResolver.cs" />
-    <Compile Include="Routing\UrlProviderResolver.cs" />
-    <Compile Include="Routing\NotFoundHandlerHelper.cs" />
-    <Compile Include="Routing\EnsureRoutableOutcome.cs" />
-    <Compile Include="Security\LegacyDefaultAppMapping.cs" />
-    <Compile Include="Routing\PublishedContentRequestEngine.cs" />
-    <Compile Include="Routing\UrlProvider.cs" />
-    <Compile Include="Routing\WebServicesRouteConstraint.cs" />
-    <Compile Include="Search\ExamineSearcherModel.cs" />
-    <Compile Include="Search\ExamineEvents.cs" />
-    <Compile Include="Strategies\DataTypes\LegacyUploadFieldWorkaround.cs" />
-    <Compile Include="Strategies\Migrations\PublishAfterUpgradeToVersionSixth.cs" />
-    <Compile Include="Strategies\LegacyClasses.cs" />
-    <Compile Include="Strategies\Migrations\EnsureAppsTreesUpdatedOnUpgrade.cs" />
-    <Compile Include="Strategies\ServerRegistrationEventHandler.cs" />
-    <Compile Include="Templates\TemplateRenderer.cs" />
-    <Compile Include="Templates\TemplateUtilities.cs" />
-    <Compile Include="Trees\PartialViewMacrosTreeController.cs" />
-    <Compile Include="Trees\PartialViewsTreeController.cs" />
-    <Compile Include="UI\Controls\InsertMacroSplitButton.cs" />
-    <Compile Include="UI\IAssignedApp.cs" />
-    <Compile Include="UI\LegacyDialogHandler.cs" />
-    <Compile Include="UI\LegacyDialogTask.cs" />
-    <Compile Include="UI\Controls\ProgressBar.cs" />
-    <Compile Include="UI\Controls\UmbracoControl.cs" />
-    <Compile Include="UI\Controls\UmbracoUserControl.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="UI\Pages\BasePage.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="UI\Pages\ClientTools.cs" />
-    <Compile Include="UI\Pages\UmbracoEnsuredPage.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="UI\SpeechBubbleIcon.cs" />
-    <Compile Include="umbraco.presentation\AttributeCollectionAdapter.cs" />
-    <Compile Include="umbraco.presentation\Default.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\MacroCacheContent.cs" />
-    <Compile Include="umbraco.presentation\ScriptingMacroResult.cs" />
-    <Compile Include="umbraco.presentation\umbraco\dialogs\sort.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\macroResultWrapper.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\masterpages\default.Master.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\publishStatus.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\Default.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\tree.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\ping.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Macros\editMacro.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Python\editPython.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\editXslt.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\editMacro.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\umbracoField.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\treePicker.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\masterpages\umbracoPage.master.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\masterpages\umbracoDialog.master.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\nodeFactory\UmbracoSiteMapProviderAccessUpdate.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Search\QuickSearch.ascx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\settings\modals\ShowUmbracoTags.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\templateControls\Image.cs" />
-    <Compile Include="umbraco.presentation\umbraco\uQuery\IGetProperty.cs" />
-    <Compile Include="umbraco.presentation\XsltExtensionAttribute.cs" />
-    <Compile Include="UmbracoHelper.cs" />
-    <Compile Include="Mvc\ViewContextExtensions.cs" />
-    <Compile Include="Mvc\ViewDataContainerExtensions.cs" />
-    <Compile Include="PublishedCache\XmlPublishedCache\PublishedContentCache.cs" />
-    <Compile Include="Routing\PublishedContentNotFoundHandler.cs" />
-    <Compile Include="PublishedCache\XmlPublishedCache\XmlPublishedContent.cs" />
-    <Compile Include="PublishedCache\XmlPublishedCache\XmlPublishedProperty.cs" />
-    <Compile Include="Mvc\Constants.cs" />
-    <Compile Include="Mvc\FilteredControllerFactoriesResolver.cs" />
-    <Compile Include="Mvc\IFilteredControllerFactory.cs" />
-    <Compile Include="Mvc\MasterControllerFactory.cs" />
-    <Compile Include="Mvc\RenderActionInvoker.cs" />
-    <Compile Include="Mvc\RenderControllerFactory.cs" />
-    <Compile Include="Models\RenderModel.cs" />
-    <Compile Include="Mvc\RenderModelBinder.cs" />
-    <Compile Include="Mvc\RenderMvcController.cs" />
-    <Compile Include="Mvc\RenderRouteHandler.cs" />
-    <Compile Include="Mvc\RenderViewEngine.cs" />
-    <Compile Include="Mvc\UmbracoTemplatePage.cs" />
-    <Compile Include="Mvc\RouteDefinition.cs" />
-    <Compile Include="Mvc\RouteValueDictionaryExtensions.cs" />
-    <Compile Include="umbraco.presentation\umbraco\nodeFactory\Node.cs" />
-    <Compile Include="umbraco.presentation\umbraco\nodeFactory\Nodes.cs" />
-    <Compile Include="umbraco.presentation\umbraco\nodeFactory\Property.cs" />
-    <Compile Include="Routing\UmbracoRequestEventArgs.cs" />
-    <Compile Include="UmbracoUserControl.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="WebApi\UmbracoAuthorizeAttribute.cs" />
-    <Compile Include="WebApi\UmbracoAuthorizedApiController.cs" />
-    <Compile Include="WebApi\Filters\ValidationFilterAttribute.cs" />
-    <Compile Include="WebApi\Filters\UmbracoUserTimeoutFilterAttribute.cs" />
-    <Compile Include="WebApi\UnhandedExceptionLoggerConfigurationAttribute.cs" />
-    <Compile Include="WebApi\UnhandledExceptionLogger.cs" />
-    <Compile Include="WebApi\WebApiHelper.cs" />
-    <Compile Include="WebBootManager.cs" />
-    <Compile Include="Routing\LegacyRequestInitializer.cs" />
-    <Compile Include="Mvc\ControllerExtensions.cs" />
-    <Compile Include="Routing\ContentLastChanceFinderResolver.cs" />
-    <Compile Include="Routing\ContentFinderByUrlAlias.cs" />
-    <Compile Include="Media\ThumbnailProviders\AbstractThumbnailProvider.cs" />
-    <Compile Include="Media\ThumbnailProviders\MediaTypeIconThumbnailProvider.cs" />
-    <Compile Include="Media\ThumbnailProviders\FileExtensionIconThumbnailProvider.cs" />
-    <Compile Include="Media\ThumbnailProviders\ImageThumbnailProvider.cs" />
-    <Compile Include="Media\ThumbnailProviders\ThumbnailProvidersResolver.cs" />
-    <Compile Include="UI\Controls\FolderBrowser.cs" />
-    <Compile Include="Routing\ContentFinderByIdPath.cs" />
-    <Compile Include="Routing\ContentFinderByNiceUrl.cs" />
-    <Compile Include="Routing\ContentFinderByNiceUrlAndTemplate.cs" />
-    <Compile Include="Routing\ContentFinderByProfile.cs" />
-    <Compile Include="PluginManagerExtensions.cs" />
-    <Compile Include="Routing\DomainHelper.cs" />
-    <Compile Include="Routing\ContentFinderResolver.cs" />
-    <Compile Include="Routing\PublishedContentRequest.cs" />
-    <Compile Include="Routing\IContentFinder.cs" />
-    <Compile Include="Routing\RoutingContext.cs" />
-    <Compile Include="umbraco.presentation\EnsureSystemPathsApplicationStartupHandler.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\BasePageExtensions.cs" />
-    <Compile Include="umbraco.presentation\content.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\helper.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\item.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\keepAliveService.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\library.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\macro.cs" />
-    <Compile Include="umbraco.presentation\page.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\Settings1.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>Settings.settings</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\publishingService.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\PublishQueue.cs" />
-    <Compile Include="umbraco.presentation\python.cs" />
-    <Compile Include="umbraco.presentation\NotFoundHandlers.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\requestModule.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\showField.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\template.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\UmbracoContext.cs" />
-    <Compile Include="umbraco.presentation\UmbracoPage.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbracoPageHolder.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\UmbracoRequest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\UmbracoResponse.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\UmbracoServerUtility.cs" />
-    <Compile Include="umbraco.presentation\umbraco\actions\delete.aspx.cs">
-      <DependentUpon>delete.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\actions\delete.aspx.designer.cs">
-      <DependentUpon>delete.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\actions\editContent.aspx.cs">
-      <DependentUpon>editContent.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\actions\editContent.aspx.designer.cs">
-      <DependentUpon>editContent.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\actions\preview.aspx.cs">
-      <DependentUpon>preview.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\actions\preview.aspx.designer.cs">
-      <DependentUpon>preview.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\actions\publish.aspx.cs">
-      <DependentUpon>publish.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\actions\publish.aspx.designer.cs">
-      <DependentUpon>publish.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\controls\ContentControl.cs" />
-    <Compile Include="umbraco.presentation\umbraco\controls\ContentPicker.cs" />
-    <Compile Include="umbraco.presentation\umbraco\controls\ContentTypeControl.cs" />
-    <Compile Include="umbraco.presentation\umbraco\controls\Images\ImageViewer.ascx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\controls\dualSelectBox.cs" />
-    <Compile Include="umbraco.presentation\umbraco\controls\GenericValidation.cs" />
-    <Compile Include="umbraco.presentation\umbraco\controls\LabelButton.cs" />
-    <Compile Include="umbraco.presentation\umbraco\controls\macroParameterControl.cs" />
-    <Compile Include="umbraco.presentation\umbraco\controls\ProgressBar.ascx.cs">
-      <DependentUpon>ProgressBar.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\controls\ProgressBar.ascx.designer.cs">
-      <DependentUpon>ProgressBar.ascx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\controls\SaveClickEventArgs.cs" />
-    <Compile Include="umbraco.presentation\umbraco\controls\Tree\CustomTreeControl.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\controls\Tree\CustomTreeService.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\controls\Tree\JTreeContextMenu.cs" />
-    <Compile Include="umbraco.presentation\umbraco\controls\Tree\JTreeContextMenuItem.cs" />
-    <Compile Include="umbraco.presentation\umbraco\controls\Tree\NodeInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\create\CreatedPackageTasks.cs" />
-    <Compile Include="umbraco.presentation\umbraco\create\dictionaryTasks.cs" />
-    <Compile Include="umbraco.presentation\umbraco\create\macroTasks.cs" />
-    <Compile Include="umbraco.presentation\umbraco\create\MemberGroupTasks.cs" />
-    <Compile Include="umbraco.presentation\umbraco\create\stylesheetPropertyTasks.cs" />
-    <Compile Include="umbraco.presentation\umbraco\create\StylesheetTasks.cs" />
-    <Compile Include="umbraco.presentation\umbraco\create\XsltTasks.cs" />
-    <Compile Include="umbraco.presentation\umbraco\dashboard\FeedProxy.aspx.cs">
-      <DependentUpon>FeedProxy.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dashboard\FeedProxy.aspx.designer.cs">
-      <DependentUpon>FeedProxy.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\EditRelationType.aspx.cs">
-      <DependentUpon>EditRelationType.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\EditRelationType.aspx.designer.cs">
-      <DependentUpon>EditRelationType.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\NewRelationType.aspx.cs">
-      <DependentUpon>NewRelationType.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\NewRelationType.aspx.designer.cs">
-      <DependentUpon>NewRelationType.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\ReadOnlyRelation.cs" />
-    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\RelationTypesWebService.asmx.cs">
-      <DependentUpon>RelationTypesWebService.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\TreeMenu\ActionDeleteRelationType.cs" />
-    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\TreeMenu\ActionNewRelationType.cs" />
-    <Compile Include="umbraco.presentation\umbraco\dialogs\Preview.aspx.cs">
-      <DependentUpon>Preview.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\Preview.aspx.designer.cs">
-      <DependentUpon>Preview.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\members\MemberSearch.ascx.cs">
-      <DependentUpon>MemberSearch.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\members\MemberSearch.ascx.designer.cs">
-      <DependentUpon>MemberSearch.ascx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\nodeFactory\Page_Legacy.cs" />
-    <Compile Include="umbraco.presentation\umbraco\preview\PreviewContent.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Search\ExamineEvents.cs" />
-    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltVisualize.aspx.cs">
-      <DependentUpon>xsltVisualize.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltVisualize.aspx.designer.cs">
-      <DependentUpon>xsltVisualize.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\insertMasterpageContent.aspx.cs">
-      <DependentUpon>insertMasterpageContent.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\insertMasterpageContent.aspx.designer.cs">
-      <DependentUpon>insertMasterpageContent.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\insertMasterpagePlaceholder.aspx.cs">
-      <DependentUpon>insertMasterpagePlaceholder.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\insertMasterpagePlaceholder.aspx.designer.cs">
-      <DependentUpon>insertMasterpagePlaceholder.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\republish.aspx.cs">
-      <DependentUpon>republish.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\republish.aspx.designer.cs">
-      <DependentUpon>republish.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\search.aspx.cs">
-      <DependentUpon>search.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\search.aspx.designer.cs">
-      <DependentUpon>search.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\SendPublish.aspx.cs">
-      <DependentUpon>SendPublish.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\SendPublish.aspx.designer.cs">
-      <DependentUpon>SendPublish.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\create\dialogHandler_temp.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\create\languageTasks.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Macros\assemblyBrowser.aspx.cs">
-      <DependentUpon>assemblyBrowser.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Macros\assemblyBrowser.aspx.designer.cs">
-      <DependentUpon>assemblyBrowser.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Packages\editPackage.aspx.cs">
-      <DependentUpon>editPackage.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Packages\editPackage.aspx.designer.cs">
-      <DependentUpon>editPackage.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\getXsltStatus.asmx.cs">
-      <DependentUpon>getXsltStatus.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltChooseExtension.aspx.cs">
-      <DependentUpon>xsltChooseExtension.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltChooseExtension.aspx.designer.cs">
-      <DependentUpon>xsltChooseExtension.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltInsertValueOf.aspx.cs">
-      <DependentUpon>xsltInsertValueOf.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltInsertValueOf.aspx.designer.cs">
-      <DependentUpon>xsltInsertValueOf.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\exportDocumenttype.aspx.cs">
-      <DependentUpon>exportDocumenttype.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\importDocumenttype.aspx.cs">
-      <DependentUpon>importDocumenttype.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\rollBack.aspx.cs">
-      <DependentUpon>rollBack.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\rollBack.aspx.designer.cs">
-      <DependentUpon>rollBack.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\sendToTranslation.aspx.cs">
-      <DependentUpon>sendToTranslation.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\sendToTranslation.aspx.designer.cs">
-      <DependentUpon>sendToTranslation.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\viewAuditTrail.aspx.cs">
-      <DependentUpon>viewAuditTrail.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\viewAuditTrail.aspx.designer.cs">
-      <DependentUpon>viewAuditTrail.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\members\EditMemberGroup.aspx.cs">
-      <DependentUpon>EditMemberGroup.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\members\EditMemberGroup.aspx.designer.cs">
-      <DependentUpon>EditMemberGroup.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\members\search.aspx.cs">
-      <DependentUpon>search.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\members\search.aspx.designer.cs">
-      <DependentUpon>search.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\members\ViewMembers.aspx.cs">
-      <DependentUpon>ViewMembers.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\members\ViewMembers.aspx.designer.cs">
-      <DependentUpon>ViewMembers.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\nodeFactory\Properties.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\nodeFactory\UmbracoSiteMapProvider.cs" />
-    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\GzipCompressor.cs" />
-    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\GzipModule.cs" />
-    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\IModule.cs" />
-    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\JSON.cs" />
-    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\JSONReader.cs" />
-    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\JSONWriter.cs" />
-    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\tinymce3tinymceCompress.aspx.cs">
-      <DependentUpon>tinymce3tinymceCompress.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\tinymce3tinymceCompress.aspx.designer.cs">
-      <DependentUpon>tinymce3tinymceCompress.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\Search\QuickSearchHandler.ashx.cs">
-      <DependentUpon>QuickSearchHandler.ashx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\settings\DictionaryItemList.aspx.cs">
-      <DependentUpon>DictionaryItemList.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\settings\DictionaryItemList.aspx.designer.cs">
-      <DependentUpon>DictionaryItemList.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\settings\editLanguage.aspx.cs">
-      <DependentUpon>editLanguage.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\settings\editLanguage.aspx.designer.cs">
-      <DependentUpon>editLanguage.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\templateControls\Script.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\BaseMediaTree.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadDLRScripts.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\ITreeService.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadRelationTypes.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\MediaRecycleBin.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\NodeActionsEventArgs.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\TreeEventArgs.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\TreeRequestParams.cs" />
-    <Compile Include="umbraco.presentation\umbraco\uQuery\ContentExtensions.cs" />
-    <Compile Include="umbraco.presentation\umbraco\uQuery\ContentTypeExtensions.cs" />
-    <Compile Include="umbraco.presentation\umbraco\uQuery\DocumentExtensions.cs" />
-    <Compile Include="umbraco.presentation\umbraco\uQuery\MediaExtensions.cs" />
-    <Compile Include="umbraco.presentation\umbraco\uQuery\MemberExtensions.cs" />
-    <Compile Include="umbraco.presentation\umbraco\uQuery\NodeExtensions.cs" />
-    <Compile Include="umbraco.presentation\umbraco\uQuery\PreValueExtensions.cs" />
-    <Compile Include="umbraco.presentation\umbraco\uQuery\RelationTypeExtensions.cs" />
-    <Compile Include="umbraco.presentation\umbraco\uQuery\UmbracoObjectTypeExtensions.cs" />
-    <Compile Include="umbraco.presentation\umbraco\webservices\MacroContainerService.asmx.cs">
-      <DependentUpon>MacroContainerService.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\webservices\TagsAutoCompleteHandler.ashx.cs">
-      <DependentUpon>TagsAutoCompleteHandler.ashx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\webservices\TreeClientService.asmx.cs">
-      <DependentUpon>TreeClientService.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\templateControls\DisableEventValidation.cs" />
-    <Compile Include="umbraco.presentation\umbraco\templateControls\Item.cs" />
-    <Compile Include="umbraco.presentation\umbraco\templateControls\ItemRenderer.cs" />
-    <Compile Include="umbraco.presentation\umbraco\templateControls\Macro.cs" />
-    <Compile Include="umbraco.presentation\umbraco\templateControls\ContentType.cs" />
-    <Compile Include="umbraco.presentation\umbraco\templateControls\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\translation\default.aspx.cs">
-      <DependentUpon>default.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\translation\default.aspx.designer.cs">
-      <DependentUpon>default.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\translation\details.aspx.cs">
-      <DependentUpon>details.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\translation\details.aspx.designer.cs">
-      <DependentUpon>details.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\translation\preview.aspx.cs">
-      <DependentUpon>preview.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\translation\preview.aspx.designer.cs">
-      <DependentUpon>preview.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\translation\xml.aspx.cs">
-      <DependentUpon>xml.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\translation\xml.aspx.designer.cs">
-      <DependentUpon>xml.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\treeInit.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\Trees\BaseContentTree.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\BaseTree.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\ContentRecycleBin.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\FileSystemTree.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadContent.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadcontentItemType.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadDataTypes.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadLanguages.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadMacros.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadMedia.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadMediaTypes.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadMemberGroups.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadMembers.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadMemberTypes.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadNodeTypes.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadPython.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadScripts.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadStylesheetProperty.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadStylesheets.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadTemplates.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadTranslationTasks.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadUsers.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadXslt.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\NullTree.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\LegacyTree.cs" />
-    <Compile Include="umbraco.presentation\umbraco\webservices\TreeDataService.ashx.cs">
-      <DependentUpon>TreeDataService.ashx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\Trees\TreeDefinitionCollection.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\TreeDefinition.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\TreeDialogModes.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\TreeService.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\XmlTree.cs">
-      <DependentUpon>XmlTree.xsd</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\urlRewriter\UrlRewriterFormWriter.cs" />
-    <Compile Include="umbraco.presentation\umbraco\webservices\ajaxHelpers.cs" />
-    <Compile Include="umbraco.presentation\umbraco\webservices\CacheRefresher.asmx.cs">
-      <DependentUpon>CacheRefresher.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\webservices\CheckForUpgrade.asmx.cs">
-      <DependentUpon>CheckForUpgrade.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\webservices\CMSNode.asmx.cs">
-      <DependentUpon>CMSNode.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\webservices\codeEditorSave.asmx.cs">
-      <DependentUpon>codeEditorSave.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\webservices\legacyAjaxCalls.asmx.cs">
-      <DependentUpon>legacyAjaxCalls.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\webservices\nodeSorter.asmx.cs">
-      <DependentUpon>nodeSorter.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\webservices\progressStatus.asmx.cs">
-      <DependentUpon>progressStatus.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\webservices\publication.asmx.cs">
-      <DependentUpon>publication.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\webservices\RegexComWebservice.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Web\UI\ContentPage.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery.cs" />
-    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Content.cs">
-      <DependentUpon>uQuery.cs</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-DataTypes.cs">
-      <DependentUpon>uQuery.cs</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Dictionary.cs">
-      <DependentUpon>uQuery.cs</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Document.cs">
-      <DependentUpon>uQuery.cs</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Media.cs">
-      <DependentUpon>uQuery.cs</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Members.cs">
-      <DependentUpon>uQuery.cs</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Nodes.cs">
-      <DependentUpon>uQuery.cs</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-PreValues.cs">
-      <DependentUpon>uQuery.cs</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-UmbracoObjectType.cs">
-      <DependentUpon>uQuery.cs</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\viewstateMoverModule.cs" />
-    <Compile Include="UmbracoApplication.cs" />
-    <Compile Include="UmbracoContext.cs" />
-    <Compile Include="UmbracoModule.cs" />
-    <Compile Include="UriUtility.cs" />
-    <Compile Include="Web References\org.umbraco.update\Reference.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Reference.map</DependentUpon>
-    </Compile>
-    <Compile Include="WebServices\BulkPublishController.cs" />
-    <Compile Include="WebServices\CoreStringsController.cs" />
-    <Compile Include="WebServices\DomainsApiController.cs" />
-    <Compile Include="WebServices\EmbedMediaService.cs" />
-    <Compile Include="WebServices\ExamineManagementApiController.cs" />
-    <Compile Include="WebServices\FolderBrowserService.cs" />
-    <Compile Include="WebServices\TagsController.cs" />
-    <Compile Include="WebServices\UmbracoAuthorizedHttpHandler.cs" />
-    <Compile Include="WebServices\SaveFileController.cs" />
-    <Compile Include="WebServices\UmbracoAuthorizedWebService.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="WebServices\UmbracoHttpHandler.cs" />
-    <Compile Include="WebServices\UmbracoWebService.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="WebServices\XmlDataIntegrityController.cs" />
-    <Compile Include="WebViewPageExtensions.cs" />
-    <None Include="..\Umbraco.Web.UI\Views\web.config">
-      <Link>Mvc\web.config</Link>
-    </None>
-    <None Include="packages.config" />
-    <None Include="Web References\org.umbraco.our\Reference.map">
-      <Generator>MSDiscoCodeGenerator</Generator>
-      <LastGenOutput>Reference.cs</LastGenOutput>
-    </None>
-    <None Include="Web References\org.umbraco.our\repository.disco" />
-    <EmbeddedResource Include="UI\JavaScript\Main.js" />
-    <EmbeddedResource Include="UI\JavaScript\JsInitialize.js" />
-    <EmbeddedResource Include="UI\JavaScript\ServerVariables.js" />
-    <Content Include="umbraco.presentation\umbraco\controls\Tree\CustomTreeService.asmx" />
-    <Content Include="umbraco.presentation\umbraco\developer\RelationTypes\EditRelationType.aspx" />
-    <Content Include="umbraco.presentation\umbraco\developer\RelationTypes\NewRelationType.aspx" />
-    <Content Include="umbraco.presentation\umbraco\developer\RelationTypes\RelationTypesWebService.asmx" />
-    <Content Include="umbraco.presentation\umbraco\dashboard\FeedProxy.aspx" />
-    <Content Include="umbraco.presentation\umbraco\dialogs\AssignDomain2.aspx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\members\MemberSearch.ascx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\dialogs\Preview.aspx" />
-    <Content Include="umbraco.presentation\umbraco\controls\ProgressBar.ascx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\actions\delete.aspx" />
-    <Content Include="umbraco.presentation\umbraco\actions\editContent.aspx" />
-    <Content Include="umbraco.presentation\umbraco\actions\preview.aspx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\actions\publish.aspx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\webservices\MacroContainerService.asmx" />
-    <Content Include="umbraco.presentation\umbraco\developer\Xslt\xsltVisualize.aspx" />
-    <Content Include="umbraco.presentation\umbraco\dialogs\empty.htm" />
-    <Content Include="umbraco.presentation\umbraco\dialogs\republish.aspx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\dialogs\search.aspx" />
-    <Content Include="umbraco.presentation\umbraco\dialogs\SendPublish.aspx" />
-    <Content Include="umbraco.presentation\umbraco\webservices\TreeClientService.asmx" />
-    <Content Include="umbraco.presentation\umbraco\members\search.aspx" />
-    <Content Include="umbraco.presentation\umbraco\translation\details.aspx" />
-    <Content Include="umbraco.presentation\umbraco\developer\Packages\editPackage.aspx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\dialogs\exportDocumenttype.aspx" />
-    <Content Include="umbraco.presentation\umbraco\dialogs\importDocumenttype.aspx" />
-    <Content Include="umbraco.presentation\umbraco\dialogs\rollBack.aspx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\dialogs\sendToTranslation.aspx" />
-    <Content Include="umbraco.presentation\umbraco\dialogs\viewAuditTrail.aspx" />
-    <Content Include="umbraco.presentation\umbraco\members\ViewMembers.aspx" />
-    <Content Include="umbraco.presentation\umbraco\plugins\tinymce3\tinymce3tinymceCompress.aspx" />
-    <None Include="app.config" />
-    <None Include="Web References\org.umbraco.our\repository.wsdl" />
-    <None Include="Web References\org.umbraco.update\UpgradeResult.datasource">
-      <DependentUpon>Reference.map</DependentUpon>
-    </None>
-    <None Include="Web References\org.umbraco.update\UpgradeResult1.datasource">
-      <DependentUpon>Reference.map</DependentUpon>
-    </None>
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings1.Designer.cs</LastGenOutput>
-    </None>
-    <Content Include="umbraco.presentation\umbraco\Search\QuickSearchHandler.ashx" />
-    <None Include="umbraco.presentation\umbraco\templateControls\InlineXslt.xsltTemplate" />
-    <Content Include="umbraco.presentation\umbraco\webservices\CheckForUpgrade.asmx" />
-    <Content Include="umbraco.presentation\umbraco\settings\DictionaryItemList.aspx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\translation\default.aspx" />
-    <Content Include="umbraco.presentation\umbraco\translation\preview.aspx" />
-    <Content Include="umbraco.presentation\umbraco\translation\xml.aspx" />
-    <Content Include="umbraco.presentation\umbraco\developer\Macros\assemblyBrowser.aspx" />
-    <Content Include="umbraco.presentation\umbraco\developer\Xslt\getXsltStatus.asmx" />
-    <Content Include="umbraco.presentation\umbraco\developer\Xslt\xsltChooseExtension.aspx" />
-    <Content Include="umbraco.presentation\umbraco\developer\Xslt\xsltInsertValueOf.aspx" />
-    <Content Include="umbraco.presentation\umbraco\members\EditMemberGroup.aspx">
-      <SubType>Form</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\schemas\umbraco.xsd">
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\settings\editLanguage.aspx" />
-    <!--<Content Include="umbraco.presentation\umbraco\users\PermissionEditor.aspx" />-->
-    <Content Include="umbraco.presentation\umbraco\webservices\CacheRefresher.asmx">
-      <SubType>Form</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\webservices\CMSNode.asmx" />
-    <Content Include="umbraco.presentation\umbraco\webservices\codeEditorSave.asmx" />
-    <Content Include="umbraco.presentation\umbraco\webservices\legacyAjaxCalls.asmx" />
-    <Content Include="umbraco.presentation\umbraco\webservices\nodeSorter.asmx" />
-    <Content Include="umbraco.presentation\umbraco\webservices\progressStatus.asmx">
-      <SubType>Form</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\webservices\publication.asmx" />
-    <Content Include="umbraco.presentation\umbraco\webservices\TreeDataService.ashx" />
-    <None Include="umbraco.presentation\umbraco\Trees\Trees.cd" />
-    <None Include="umbraco.presentation\umbraco\Trees\XmlTree.xsd">
-      <SubType>
-      </SubType>
-    </None>
-    <None Include="umbraco.presentation\umbraco\Trees\XmlTree.xsx">
-      <DependentUpon>XmlTree.xsd</DependentUpon>
-    </None>
-    <Content Include="umbraco.presentation\umbraco\webservices\TagsAutoCompleteHandler.ashx" />
-    <None Include="Web References\org.umbraco.update\checkforupgrade.disco" />
-    <None Include="Web References\org.umbraco.update\checkforupgrade.wsdl" />
-    <None Include="Web References\org.umbraco.update\Reference.map">
-      <Generator>MSDiscoCodeGenerator</Generator>
-      <LastGenOutput>Reference.cs</LastGenOutput>
-    </None>
-    <EmbeddedResource Include="UI\JavaScript\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Mvc\Strings.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Strings.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Include="umbraco.presentation\umbraco\templateControls\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <None Include="umbraco.presentation\umbraco\schemas\package.xsd">
-      <SubType>
-      </SubType>
-    </None>
-    <None Include="umbraco.presentation\umbraco\schemas\package.xsx">
-      <DependentUpon>package.xsd</DependentUpon>
-    </None>
-    <None Include="umbraco.presentation\umbraco\schemas\umbraco.xsc">
-      <DependentUpon>umbraco.xsd</DependentUpon>
-    </None>
-    <None Include="umbraco.presentation\umbraco\schemas\umbraco.xss">
-      <DependentUpon>umbraco.xsd</DependentUpon>
-    </None>
-    <None Include="umbraco.presentation\umbraco\schemas\umbraco.xsx">
-      <DependentUpon>umbraco.xsd</DependentUpon>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <WebReferences Include="Web References\" />
-  </ItemGroup>
-  <ItemGroup>
-    <WebReferenceUrl Include="https://our.umbraco.com/umbraco/webservices/api/repository.asmx">
-      <UrlBehavior>Dynamic</UrlBehavior>
-      <RelPath>Web References\org.umbraco.our\</RelPath>
-      <UpdateFromURL>https://our.umbraco.com/umbraco/webservices/api/repository.asmx</UpdateFromURL>
-      <ServiceLocationURL>
-      </ServiceLocationURL>
-      <CachedDynamicPropName>
-      </CachedDynamicPropName>
-      <CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
-      <CachedSettingsPropName>umbraco_org_umbraco_our_Repository</CachedSettingsPropName>
-    </WebReferenceUrl>
-    <WebReferenceUrl Include="http://update.umbraco.org/checkforupgrade.asmx">
-      <UrlBehavior>Dynamic</UrlBehavior>
-      <RelPath>Web References\org.umbraco.update\</RelPath>
-      <UpdateFromURL>http://update.umbraco.org/checkforupgrade.asmx</UpdateFromURL>
-      <ServiceLocationURL>
-      </ServiceLocationURL>
-      <CachedDynamicPropName>
-      </CachedDynamicPropName>
-      <CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
-      <CachedSettingsPropName>umbraco_org_umbraco_update_CheckForUpgrade</CachedSettingsPropName>
-    </WebReferenceUrl>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="umbraco.presentation\umbraco\settings\scripts\" />
-  </ItemGroup>
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
-    <VSToolsPath Condition="exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v11.0\WebApplications\Microsoft.WebApplication.targets')">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v11.0</VSToolsPath>
-    <VSToolsPath Condition="exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v12.0\WebApplications\Microsoft.WebApplication.targets')">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v12.0</VSToolsPath>
-    <VSToolsPath Condition="exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v14.0\WebApplications\Microsoft.WebApplication.targets')">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v14.0</VSToolsPath>
-    <VSToolsPath Condition="exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets')">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
-  <ProjectExtensions />
-  <PropertyGroup>
-    <!--<PostBuildEvent>xcopy "$(ProjectDir)..\..\lib\*.dll" "$(TargetDir)*.dll" /Y</PostBuildEvent>-->
-  </PropertyGroup>
-  <Import Project="..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets" Condition="Exists('..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets')" />
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{651E1350-91B6-44B7-BD60-7207006D7003}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>umbraco</AssemblyName>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Umbraco.Web</RootNamespace>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <StartupObject>
+    </StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <SccProjectName>
+    </SccProjectName>
+    <SccLocalPath>
+    </SccLocalPath>
+    <SccAuxPath>
+    </SccAuxPath>
+    <SccProvider>
+    </SccProvider>
+    <OldToolsVersion>4.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
+    <LangVersion>latest</LangVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
+    <LangVersion>latest</LangVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile>bin\Release\umbraco.xml</DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>pdbonly</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\UmbracoExamine\UmbracoExamine.csproj">
+      <Project>{07fbc26b-2927-4a22-8d96-d644c667fecc}</Project>
+      <Name>UmbracoExamine</Name>
+    </ProjectReference>
+    <Reference Include="AutoMapper, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
+      <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="AutoMapper.Net4, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
+      <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <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="dotless.Core, Version=1.5.2.0, Culture=neutral, PublicKeyToken=96b446c9e63eae34, processorArchitecture=MSIL">
+      <HintPath>..\packages\dotless.1.5.2\lib\dotless.Core.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="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="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>
+    <Reference Include="Lucene.Net, Version=2.9.4.1, Culture=neutral, PublicKeyToken=85089178b9ac3181, processorArchitecture=MSIL">
+      <HintPath>..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll</HintPath>
+    </Reference>
+    <Reference Include="MarkdownSharp, Version=1.14.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Markdown.1.14.7\lib\net45\MarkdownSharp.dll</HintPath>
+      <Private>True</Private>
+    </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.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.2\lib\net45\Microsoft.AspNet.Identity.Owin.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNet.SignalR.Core, Version=2.4.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.SignalR.Core.2.4.1\lib\net45\Microsoft.AspNet.SignalR.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CSharp" />
+    <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.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.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=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=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="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>
+      <Private>True</Private>
+    </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>
+      <Private>True</Private>
+    </Reference>
+    <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>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Semver, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\semver.1.1.2\lib\net451\Semver.dll</HintPath>
+    </Reference>
+    <Reference Include="System">
+      <Name>System</Name>
+    </Reference>
+    <Reference Include="System.ComponentModel.Composition" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.configuration" />
+    <Reference Include="System.Data">
+      <Name>System.Data</Name>
+    </Reference>
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Design" />
+    <Reference Include="System.Drawing">
+      <Name>System.Drawing</Name>
+    </Reference>
+    <Reference Include="System.EnterpriseServices" />
+    <Reference Include="System.IO.Compression.FileSystem" />
+    <Reference Include="System.Net.Http" />
+    <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.Runtime.Serialization" />
+    <Reference Include="System.Security" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Threading.Tasks.Dataflow, Version=4.6.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Dataflow.4.9.0\lib\portable-net45+win8+wpa81\System.Threading.Tasks.Dataflow.dll</HintPath>
+    </Reference>
+    <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.Abstractions">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Web.ApplicationServices" />
+    <Reference Include="System.Web.DynamicData" />
+    <Reference Include="System.Web.Entity" />
+    <Reference Include="System.Web.Extensions" />
+    <Reference Include="System.Web.Extensions.Design" />
+    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
+    </Reference>
+    <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.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.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.7\lib\net45\System.Web.Razor.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Services">
+      <Name>System.Web.Services</Name>
+    </Reference>
+    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <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.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.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml">
+      <Name>System.XML</Name>
+    </Reference>
+    <Reference Include="System.Xml.Linq" />
+    <ProjectReference Include="..\SQLCE4Umbraco\SqlCE4Umbraco.csproj">
+      <Project>{5BA5425F-27A7-4677-865E-82246498AA2E}</Project>
+      <Name>SqlCE4Umbraco</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj">
+      <Project>{31785BC3-256C-4613-B2F5-A1B0BDDED8C1}</Project>
+      <Name>Umbraco.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\umbraco.controls\umbraco.controls.csproj">
+      <Project>{6EDD2061-82F2-461B-BB6E-879245A832DE}</Project>
+      <Name>umbraco.controls</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\umbraco.businesslogic\umbraco.businesslogic.csproj">
+      <Name>umbraco.businesslogic</Name>
+      <Project>{E469A9CE-1BEC-423F-AC44-713CD72457EA}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+    </ProjectReference>
+    <ProjectReference Include="..\umbraco.cms\umbraco.cms.csproj">
+      <Project>{CCD75EC3-63DB-4184-B49D-51C1DD337230}</Project>
+      <Name>umbraco.cms</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\umbraco.datalayer\umbraco.datalayer.csproj">
+      <Project>{C7CB79F0-1C97-4B33-BFA7-00731B579AE2}</Project>
+      <Name>umbraco.datalayer</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\umbraco.interfaces\umbraco.interfaces.csproj">
+      <Name>umbraco.interfaces</Name>
+      <Project>{511F6D8D-7717-440A-9A57-A507E9A8B27F}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+    </ProjectReference>
+    <ProjectReference Include="..\umbraco.providers\umbraco.providers.csproj">
+      <Project>{D7636876-0756-43CB-A192-138C6F0D5E42}</Project>
+      <Name>umbraco.providers</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\SolutionInfo.cs">
+      <Link>Properties\SolutionInfo.cs</Link>
+    </Compile>
+    <Compile Include="ApplicationContextExtensions.cs" />
+    <Compile Include="AreaRegistrationContextExtensions.cs" />
+    <Compile Include="BatchedDatabaseServerMessengerStartup.cs" />
+    <Compile Include="Cache\ApplicationCacheRefresher.cs" />
+    <Compile Include="Cache\ApplicationTreeCacheRefresher.cs" />
+    <Compile Include="Cache\CacheRefresherEventHandler.cs" />
+    <Compile Include="Cache\ContentTypeCacheRefresher.cs" />
+    <Compile Include="Cache\DataTypeCacheRefresher.cs" />
+    <Compile Include="Cache\DictionaryCacheRefresher.cs" />
+    <Compile Include="Cache\DistributedCache.cs" />
+    <Compile Include="Cache\DistributedCacheExtensions.cs" />
+    <Compile Include="Cache\DomainCacheRefresher.cs" />
+    <Compile Include="Cache\LanguageCacheRefresher.cs" />
+    <Compile Include="Cache\MacroCacheRefresher.cs" />
+    <Compile Include="Cache\MediaCacheRefresher.cs" />
+    <Compile Include="Cache\MemberCacheRefresher.cs" />
+    <Compile Include="Cache\MemberGroupCacheRefresher.cs" />
+    <Compile Include="Cache\PageCacheRefresher.cs" />
+    <Compile Include="Cache\PublicAccessCacheRefresher.cs" />
+    <Compile Include="Cache\RelationTypeCacheRefresher.cs" />
+    <Compile Include="Cache\UserGroupCacheRefresher.cs" />
+    <Compile Include="Cache\StylesheetCacheRefresher.cs" />
+    <Compile Include="Cache\StylesheetPropertyCacheRefresher.cs" />
+    <Compile Include="Cache\TemplateCacheRefresher.cs" />
+    <Compile Include="Cache\UnpublishedPageCacheRefresher.cs" />
+    <Compile Include="Cache\UserCacheRefresher.cs" />
+    <Compile Include="Editors\PreviewController.cs" />
+    <Compile Include="Editors\BackOfficeAssetsController.cs" />
+    <Compile Include="Features\DisabledFeatures.cs" />
+    <Compile Include="Editors\BackOfficeNotificationsController.cs" />
+    <Compile Include="Editors\DictionaryController.cs" />
+    <Compile Include="Editors\BackOfficeServerVariables.cs" />
+    <Compile Include="Editors\DashboardHelper.cs" />
+    <Compile Include="Editors\EditorModelEventArgs.cs" />
+    <Compile Include="Editors\EditorValidationResolver.cs" />
+    <Compile Include="Editors\EditorValidator.cs" />
+    <Compile Include="Editors\FromJsonPathAttribute.cs" />
+    <Compile Include="Editors\HelpController.cs" />
+    <Compile Include="Editors\IsCurrentUserModelFilterAttribute.cs" />
+    <Compile Include="Editors\PasswordChanger.cs" />
+    <Compile Include="Editors\TemplateController.cs" />
+    <Compile Include="Editors\ParameterSwapControllerActionSelector.cs" />
+    <Compile Include="Editors\CodeFileController.cs" />
+    <Compile Include="Editors\TourController.cs" />
+    <Compile Include="Features\EnabledFeatures.cs" />
+    <Compile Include="HealthCheck\Checks\Services\Tls12Check.cs" />
+    <Compile Include="HealthCheck\Checks\Security\XssProtectionCheck.cs" />
+    <Compile Include="HealthCheck\Checks\Security\HstsCheck.cs" />
+    <Compile Include="Models\BackOfficeTourFilter.cs" />
+    <Compile Include="Models\ContentEditing\BackOfficePreview.cs" />
+    <Compile Include="Models\ContentEditing\DocumentTypeCollectionDisplay.cs" />
+    <Compile Include="Models\ContentEditing\NotifySetting.cs" />
+    <Compile Include="Models\ContentEditing\UrlAndAnchors.cs" />
+    <Compile Include="Models\Mapping\AutoMapperExtensions.cs" />
+    <Compile Include="Models\Mapping\ContentTreeNodeUrlResolver.cs" />
+    <Compile Include="Models\Mapping\MemberTreeNodeUrlResolver.cs" />
+    <Compile Include="Models\Trees\ExportMember.cs" />
+    <Compile Include="PropertyEditors\DropdownFlexiblePropertyEditor.cs" />
+    <Compile Include="TourFilterResolver.cs" />
+    <Compile Include="Editors\UserEditorAuthorizationHelper.cs" />
+    <Compile Include="Editors\UserGroupAuthorizationAttribute.cs" />
+    <Compile Include="Editors\UserGroupEditorAuthorizationHelper.cs" />
+    <Compile Include="Editors\UserGroupsController.cs" />
+    <Compile Include="Editors\UserGroupValidateAttribute.cs" />
+    <Compile Include="ExamineStartup.cs" />
+    <Compile Include="Extensions\UdiExtensions.cs" />
+    <Compile Include="Features\UmbracoFeatures.cs" />
+    <Compile Include="Features\FeaturesResolver.cs" />
+    <Compile Include="HealthCheck\Checks\Config\AbstractConfigCheck.cs" />
+    <Compile Include="HealthCheck\Checks\Config\AcceptableConfiguration.cs" />
+    <Compile Include="HealthCheck\Checks\Config\ConfigurationService.cs" />
+    <Compile Include="HealthCheck\Checks\Config\ConfigurationServiceResult.cs" />
+    <Compile Include="HealthCheck\Checks\Config\MacroErrorsCheck.cs" />
+    <Compile Include="HealthCheck\Checks\Config\NotificationEmailCheck.cs" />
+    <Compile Include="HealthCheck\Checks\Config\TrySkipIisCustomErrorsCheck.cs" />
+    <Compile Include="HealthCheck\Checks\Config\CustomErrorsCheck.cs" />
+    <Compile Include="HealthCheck\Checks\Config\TraceCheck.cs" />
+    <Compile Include="HealthCheck\Checks\Config\ValueComparisonType.cs" />
+    <Compile Include="HealthCheck\Checks\Config\CompilationDebugCheck.cs" />
+    <Compile Include="HealthCheck\Checks\Security\BaseHttpHeaderCheck.cs" />
+    <Compile Include="HealthCheck\Checks\Security\NoSniffCheck.cs" />
+    <Compile Include="HealthCheck\Checks\Services\SmtpCheck.cs" />
+    <Compile Include="HealthCheck\Checks\Permissions\FolderAndFilePermissionsCheck.cs" />
+    <Compile Include="HealthCheck\Checks\Security\ExcessiveHeadersCheck.cs" />
+    <Compile Include="HealthCheck\Checks\Security\ClickJackingCheck.cs" />
+    <Compile Include="HealthCheck\HealthCheckAction.cs" />
+    <Compile Include="HealthCheck\HealthCheckNotificationMethodAttribute.cs" />
+    <Compile Include="HealthCheck\HealthCheckAttribute.cs" />
+    <Compile Include="HealthCheck\HealthCheckContext.cs" />
+    <Compile Include="HealthCheck\HealthCheckController.cs" />
+    <Compile Include="HealthCheck\HealthCheckGroup.cs" />
+    <Compile Include="HealthCheck\HealthCheckNotificationMethodResolver.cs" />
+    <Compile Include="HealthCheck\HealthCheckResolver.cs" />
+    <Compile Include="HealthCheck\HealthCheck.cs" />
+    <Compile Include="HealthCheck\HealthCheckResults.cs" />
+    <Compile Include="HealthCheck\HealthCheckStatus.cs" />
+    <Compile Include="HealthCheck\Checks\Security\HttpsCheck.cs" />
+    <Compile Include="HealthCheck\IHealthCheckResolver.cs" />
+    <Compile Include="HealthCheck\IHealthCheckNotificationMethodsResolver.cs" />
+    <Compile Include="HealthCheck\NotificationMethods\NotificationMethodBase.cs" />
+    <Compile Include="HealthCheck\NotificationMethods\EmailNotificationMethod.cs" />
+    <Compile Include="HealthCheck\NotificationMethods\IHealthCheckNotificatationMethod.cs" />
+    <Compile Include="HealthCheck\StatusResultType.cs" />
+    <Compile Include="HealthCheck\Checks\DataIntegrity\XmlDataIntegrityHealthCheck.cs" />
+    <Compile Include="IHttpContextAccessor.cs" />
+    <Compile Include="Install\InstallSteps\ConfigureMachineKey.cs" />
+    <Compile Include="Models\BackOfficeTourFile.cs" />
+    <Compile Include="Models\BackOfficeTourStep.cs" />
+    <Compile Include="Models\ContentEditing\AssignedContentPermissions.cs" />
+    <Compile Include="Models\ContentEditing\AssignedUserGroupPermissions.cs" />
+    <Compile Include="Models\ContentEditing\ContentRedirectUrl.cs" />
+    <Compile Include="Models\ContentEditing\DictionaryDisplay.cs" />
+    <Compile Include="Models\ContentEditing\DictionaryOverviewDisplay.cs" />
+    <Compile Include="Models\ContentEditing\DictionarySave.cs" />
+    <Compile Include="Models\ContentEditing\DictionaryOverviewTranslationDisplay.cs" />
+    <Compile Include="Models\ContentEditing\DictionaryTranslationSave.cs" />
+    <Compile Include="Models\ContentEditing\EditorNavigation.cs" />
+    <Compile Include="Models\ContentEditing\GetAvailableCompositionsFilter.cs" />
+    <Compile Include="Editors\IEditorValidator.cs" />
+    <Compile Include="Editors\EditorModelEventManager.cs" />
+    <Compile Include="HtmlHelperBackOfficeExtensions.cs" />
+    <Compile Include="Install\InstallSteps\Version73FileCleanup.cs" />
+    <Compile Include="Models\ContentEditing\DocumentTypeDisplay.cs" />
+    <Compile Include="Media\EmbedProviders\Flickr.cs" />
+    <Compile Include="Models\ContentEditing\ContentTypeCompositionDisplay.cs" />
+    <Compile Include="Models\ContentEditing\ContentTypeSave.cs" />
+    <Compile Include="Models\ContentEditing\DocumentTypeSave.cs" />
+    <Compile Include="Models\ContentEditing\InstalledPackageModel.cs" />
+    <Compile Include="Models\ContentEditing\LinkDisplay.cs" />
+    <Compile Include="Models\ContentEditing\MediaTypeDisplay.cs" />
+    <Compile Include="Models\ContentEditing\MediaTypeSave.cs" />
+    <Compile Include="Models\ContentEditing\MemberPropertyTypeBasic.cs" />
+    <Compile Include="Models\ContentEditing\MemberPropertyTypeDisplay.cs" />
+    <Compile Include="Models\ContentEditing\MemberTypeDisplay.cs" />
+    <Compile Include="Models\ContentEditing\MemberTypeSave.cs" />
+    <Compile Include="Models\ContentEditing\Permission.cs" />
+    <Compile Include="Models\ContentEditing\PostedFiles.cs" />
+    <Compile Include="Models\ContentEditing\PostedFolder.cs" />
+    <Compile Include="Models\ContentEditing\PropertyGroupBasic.cs" />
+    <Compile Include="Models\ContentEditing\PropertyTypeBasic.cs" />
+    <Compile Include="Models\ContentEditing\SimpleNotificationModel.cs" />
+    <Compile Include="Models\ContentEditing\SnippetDisplay.cs" />
+    <Compile Include="Models\ContentEditing\TemplateDisplay.cs" />
+    <Compile Include="Models\ContentEditing\DictionaryTranslationDisplay.cs" />
+    <Compile Include="Models\ContentEditing\UserDisplay.cs" />
+    <Compile Include="Models\ContentEditing\UserBasic.cs" />
+    <Compile Include="Models\ContentEditing\UserGroupBasic.cs" />
+    <Compile Include="Models\ContentEditing\UserGroupDisplay.cs" />
+    <Compile Include="Models\ContentEditing\UserGroupPermissionsSave.cs" />
+    <Compile Include="Models\ContentEditing\UserGroupSave.cs" />
+    <Compile Include="Models\DetachedPublishedContent.cs" />
+    <Compile Include="Models\DetachedPublishedProperty.cs" />
+    <Compile Include="Models\ContentEditing\UserInvite.cs" />
+    <Compile Include="Models\ContentEditing\UserSave.cs" />
+    <Compile Include="Models\Link.cs" />
+    <Compile Include="Models\LinkType.cs" />
+    <Compile Include="Models\LocalPackageInstallModel.cs" />
+    <Compile Include="Models\Mapping\CodeFileDisplayMapper.cs" />
+    <Compile Include="Models\Mapping\ContentTypeModelMapperExtensions.cs" />
+    <Compile Include="Models\Mapping\ContentTypeUdiResolver.cs" />
+    <Compile Include="Models\Mapping\DictionaryModelMapper.cs" />
+    <Compile Include="Models\Mapping\EntityModelMapperExtensions.cs" />
+    <Compile Include="Models\Mapping\LockedCompositionsResolver.cs" />
+    <Compile Include="Models\Mapping\UserGroupDefaultPermissionsResolver.cs" />
+    <Compile Include="Models\Mapping\PropertyGroupDisplayResolver.cs" />
+    <Compile Include="Models\RelatedLink.cs" />
+    <Compile Include="Models\Mapping\TemplateModelMapper.cs" />
+    <Compile Include="Models\PackageInstallResult.cs" />
+    <Compile Include="Models\RelatedLinkBase.cs" />
+    <Compile Include="Models\ContentEditing\CodeFileDisplay.cs" />
+    <Compile Include="Models\SendCodeViewModel.cs" />
+    <Compile Include="Models\RelatedLinks.cs" />
+    <Compile Include="Models\RelatedLinkType.cs" />
+    <Compile Include="Models\SetPasswordModel.cs" />
+    <Compile Include="Models\RequestPasswordResetModel.cs" />
+    <Compile Include="Models\PublishedContentWithKeyBase.cs" />
+    <Compile Include="Models\BackOfficeTour.cs" />
+    <Compile Include="Models\UserTourStatus.cs" />
+    <Compile Include="Models\ValidatePasswordResetCodeModel.cs" />
+    <Compile Include="Mvc\ControllerContextExtensions.cs" />
+    <Compile Include="Mvc\DisableBrowserCacheAttribute.cs" />
+    <Compile Include="Mvc\EnsurePartialViewMacroViewContextFilterAttribute.cs" />
+    <Compile Include="Mvc\IRenderController.cs" />
+    <Compile Include="Mvc\ModelBindingException.cs" />
+    <Compile Include="Mvc\RenderIndexActionSelectorAttribute.cs" />
+    <Compile Include="Mvc\UmbracoRequireHttpsAttribute.cs" />
+    <Compile Include="Mvc\ValidateMvcAngularAntiForgeryTokenAttribute.cs" />
+    <Compile Include="OwinMiddlewareConfiguredEventArgs.cs" />
+    <Compile Include="Profiling\WebProfilerProvider.cs" />
+    <Compile Include="Profiling\WebProfiler.cs" />
+    <Compile Include="PropertyEditors\ContentPicker2PropertyEditor.cs" />
+    <Compile Include="PropertyEditors\DatePreValueEditor.cs" />
+    <Compile Include="PropertyEditors\DateTimePreValueEditor.cs" />
+    <Compile Include="PropertyEditors\DecimalPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\MediaPicker2PropertyEditor.cs" />
+    <Compile Include="PropertyEditors\MemberPicker2PropertyEditor.cs" />
+    <Compile Include="PropertyEditors\MultiNodeTreePicker2PropertyEditor.cs" />
+    <Compile Include="PropertyEditors\MultiUrlPickerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\NestedContentController.cs" />
+    <Compile Include="PropertyEditors\NestedContentHelper.cs" />
+    <Compile Include="PropertyEditors\NestedContentPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\RelatedLinks2PropertyEditor.cs" />
+    <Compile Include="PropertyEditors\TextOnlyValueEditor.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\ContentPickerPropertyConverter.cs" />
+    <Compile Include="PropertyEditors\ParameterEditors\MultipleContentPickerParameterEditor.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\ImageCropDataSetConverter.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\ImageCropperValueConverter.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\LegacyRelatedLinksEditorValueConvertor.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\MediaPickerPropertyConverter.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\MemberPickerPropertyConverter.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\MultiNodeTreePickerPropertyConverter.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\LegacyMediaPickerPropertyConverter.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\MultiUrlPickerPropertyConverter.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\NestedContentSingleValueConverter.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\NestedContentManyValueConverter.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\NestedContentPublishedPropertyTypeExtensions.cs" />
+    <Compile Include="PublishedContentQueryExtensions.cs" />
+    <Compile Include="Routing\RedirectTrackingEventHandler.cs" />
+    <Compile Include="Editors\RedirectUrlManagementController.cs" />
+    <Compile Include="Models\ContentEditing\RedirectUrlSearchResults.cs" />
+    <Compile Include="RelatedLinksTypeConverter.cs" />
+    <Compile Include="RouteDataExtensions.cs" />
+    <Compile Include="Routing\ContentFinderByRedirectUrl.cs" />
+    <Compile Include="Scheduling\HealthCheckNotifier.cs" />
+    <Compile Include="Scheduling\LatchedBackgroundTaskBase.cs" />
+    <Compile Include="Search\SearchableApplicationTree.cs" />
+    <Compile Include="Search\SearchableTreeAttribute.cs" />
+    <Compile Include="Search\SearchableTreeCollection.cs" />
+    <Compile Include="Search\SearchableTreeResolver.cs" />
+    <Compile Include="Search\UmbracoTreeSearcher.cs" />
+    <Compile Include="Security\Identity\ExternalSignInAutoLinkOptions.cs" />
+    <Compile Include="Security\Identity\FixWindowsAuthMiddlware.cs" />
+    <Compile Include="Security\Identity\ForceRenewalCookieAuthenticationHandler.cs" />
+    <Compile Include="Security\Identity\ForceRenewalCookieAuthenticationMiddleware.cs" />
+    <Compile Include="Security\Identity\GetUserSecondsMiddleWare.cs" />
+    <Compile Include="Models\ContentEditing\PropertyTypeDisplay.cs" />
+    <Compile Include="Models\ContentEditing\PropertyGroupDisplay.cs" />
+    <Compile Include="Media\EmbedProviders\OEmbedJson.cs" />
+    <Compile Include="Media\EmbedProviders\OEmbedResponse.cs" />
+    <Compile Include="Media\EmbedProviders\OEmbedPhoto.cs" />
+    <Compile Include="Security\Identity\IUmbracoBackOfficeTwoFactorOptions.cs" />
+    <Compile Include="Models\Mapping\PropertyTypeGroupResolver.cs" />
+    <Compile Include="Security\Identity\PreviewAuthenticationMiddleware.cs" />
+    <Compile Include="SingletonHttpContextAccessor.cs" />
+    <Compile Include="Trees\DictionaryTreeController.cs" />
+    <Compile Include="Trees\MacroTreeController.cs" />
+    <Compile Include="Trees\UserTreeController.cs" />
+    <Compile Include="Suspendable.cs" />
+    <Compile Include="Trees\ContentBlueprintTreeController.cs" />
+    <Compile Include="Trees\ContentTypeTreeController.cs" />
+    <Compile Include="Trees\PackagesTreeController.cs" />
+    <Compile Include="Trees\MediaTypeTreeController.cs" />
+    <Compile Include="Trees\MemberTypeTreeController.cs" />
+    <Compile Include="Security\WebAuthExtensions.cs" />
+    <Compile Include="Trees\XsltTreeController.cs" />
+    <Compile Include="umbraco.presentation\SafeXmlReaderWriter.cs" />
+    <Compile Include="Trees\ScriptTreeController.cs" />
+    <Compile Include="umbraco.presentation\umbraco\developer\Packages\installer.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="UmbracoDefaultOwinStartup.cs" />
+    <Compile Include="IUmbracoContextAccessor.cs" />
+    <Compile Include="Models\ContentEditing\Relation.cs" />
+    <Compile Include="HtmlStringUtilities.cs" />
+    <Compile Include="Models\ContentEditing\RelationType.cs" />
+    <Compile Include="Models\ContentExtensions.cs" />
+    <Compile Include="IDynamicPublishedContentQuery.cs" />
+    <Compile Include="ITagQuery.cs" />
+    <Compile Include="ITypedPublishedContentQuery.cs" />
+    <Compile Include="IUmbracoComponentRenderer.cs" />
+    <Compile Include="Models\LegacyConvertedNode.cs" />
+    <Compile Include="Models\LegacyConvertedNodeProperty.cs" />
+    <Compile Include="Models\Mapping\RelationModelMapper.cs" />
+    <Compile Include="Mvc\DisableClientCacheAttribute.cs" />
+    <Compile Include="Models\UnLinkLoginModel.cs" />
+    <Compile Include="Mvc\MvcVersionCheck.cs" />
+    <Compile Include="Mvc\ReflectedFixedRazorViewEngine.cs" />
+    <Compile Include="Scheduling\ThreadingTaskImmutable.cs" />
+    <Compile Include="Mvc\ProfilingView.cs" />
+    <Compile Include="Mvc\ProfilingViewEngine.cs" />
+    <Compile Include="Mvc\UrlHelperExtensions.cs" />
+    <Compile Include="Scheduling\BackgroundTaskRunner.cs" />
+    <Compile Include="BatchedDatabaseServerMessenger.cs" />
+    <Compile Include="BatchedWebServiceServerMessenger.cs" />
+    <Compile Include="CacheHelperExtensions.cs" />
+    <Compile Include="Cache\UserGroupPermissionsCacheRefresher.cs" />
+    <Compile Include="Editors\AuthenticationController.cs" />
+    <Compile Include="Controllers\UmbProfileController.cs" />
+    <Compile Include="Editors\ContentController.cs" />
+    <Compile Include="Controllers\UmbLoginStatusController.cs" />
+    <Compile Include="Editors\ContentPostValidateAttribute.cs" />
+    <Compile Include="Editors\ContentTypeControllerBase.cs" />
+    <Compile Include="Editors\DashboardController.cs" />
+    <Compile Include="Editors\DashboardSecurity.cs" />
+    <Compile Include="Editors\DataTypeController.cs" />
+    <Compile Include="Editors\DataTypeValidateAttribute.cs" />
+    <Compile Include="Editors\EntityControllerConfigurationAttribute.cs" />
+    <Compile Include="Editors\ImagesController.cs" />
+    <Compile Include="Editors\PackageInstallController.cs" />
+    <Compile Include="Editors\RelationController.cs" />
+    <Compile Include="Editors\CanvasDesignerController.cs" />
+    <Compile Include="Editors\UsersController.cs" />
+    <Compile Include="GridTemplateExtensions.cs" />
+    <Compile Include="Models\PackageInstallModel.cs" />
+    <Compile Include="Models\ContentEditing\DataTypeBasic.cs" />
+    <Compile Include="Models\ContentEditing\MemberBasic.cs" />
+    <Compile Include="Models\ContentEditing\MemberListDisplay.cs" />
+    <Compile Include="Models\TemplateQuery\ContentTypeModel.cs" />
+    <Compile Include="Models\TemplateQuery\PropertyModel.cs" />
+    <Compile Include="Models\TemplateQuery\SourceModel.cs" />
+    <Compile Include="Models\TemplateQuery\TemplateQueryResult.cs" />
+    <Compile Include="Models\TemplateQuery\SortExpression.cs" />
+    <Compile Include="Models\TemplateQuery\Operathor.cs" />
+    <Compile Include="Models\TemplateQuery\OperathorTerm.cs" />
+    <Compile Include="Models\TemplateQuery\QueryCondition.cs" />
+    <Compile Include="Models\TemplateQuery\QueryModel.cs" />
+    <Compile Include="Models\TemplateQuery\QueryResultModel.cs" />
+    <Compile Include="Editors\TemplateQueryController.cs" />
+    <Compile Include="Models\ContentEditing\ContentBaseItemSave.cs" />
+    <Compile Include="Models\ContentEditing\MediaItemSave.cs" />
+    <Compile Include="Models\DetachedContent.cs" />
+    <Compile Include="Models\ImageCropAnchor.cs" />
+    <Compile Include="Models\ImageCropCoordinates.cs" />
+    <Compile Include="Models\ImageCropDataSet.cs" />
+    <Compile Include="Models\ImageCropFocalPoint.cs" />
+    <Compile Include="Models\ImageCropMode.cs" />
+    <Compile Include="Install\DatabaseHelper.cs" />
+    <Compile Include="Install\InstallException.cs" />
+    <Compile Include="Install\InstallStatusTracker.cs" />
+    <Compile Include="Install\InstallSteps\DatabaseConfigureStep.cs" />
+    <Compile Include="Install\InstallSteps\DatabaseInstallStep.cs" />
+    <Compile Include="Install\InstallSteps\DatabaseUpgradeStep.cs" />
+    <Compile Include="Install\InstallSteps\FilePermissionsStep.cs" />
+    <Compile Include="Install\InstallSteps\MajorVersion7UpgradeReport.cs" />
+    <Compile Include="Install\InstallSteps\SetUmbracoVersionStep.cs" />
+    <Compile Include="Install\InstallSteps\StarterKitCleanupStep.cs" />
+    <Compile Include="Install\InstallSteps\StarterKitDownloadStep.cs" />
+    <Compile Include="Install\InstallSteps\StarterKitInstallStep.cs" />
+    <Compile Include="Install\InstallSteps\UpgradeStep.cs" />
+    <Compile Include="Install\InstallSteps\NewInstallStep.cs" />
+    <Compile Include="Install\Controllers\InstallPackageController.cs" />
+    <Compile Include="Install\Models\DatabaseModel.cs" />
+    <Compile Include="Install\Models\DatabaseType.cs" />
+    <Compile Include="Install\Models\InstallationType.cs" />
+    <Compile Include="Install\Models\InstallInstructions.cs" />
+    <Compile Include="Install\Models\InstallPackageModel.cs" />
+    <Compile Include="Install\Models\InstallProgressResultModel.cs" />
+    <Compile Include="Install\Models\InstallSetup.cs" />
+    <Compile Include="Install\Models\InstallSetupResult.cs" />
+    <Compile Include="Install\Models\InstallSetupStep.cs" />
+    <Compile Include="Install\Models\InstallSetupStepAttribute.cs" />
+    <Compile Include="Install\Models\InstallTrackingItem.cs" />
+    <Compile Include="Install\Models\Package.cs" />
+    <Compile Include="Install\Models\UserModel.cs" />
+    <Compile Include="Install\UmbracoInstallArea.cs" />
+    <Compile Include="Install\Controllers\InstallApiController.cs" />
+    <Compile Include="Install\Controllers\InstallController.cs" />
+    <Compile Include="Install\InstallAuthorizeAttribute.cs" />
+    <Compile Include="Models\ContentEditing\TreeSearchResult.cs" />
+    <Compile Include="Models\ContentEditing\ListViewAwareContentItemDisplayBase.cs" />
+    <Compile Include="Models\ContentEditing\PropertyTypeValidation.cs" />
+    <Compile Include="Models\ImageCropData.cs" />
+    <Compile Include="Models\ImageCropRatioMode.cs" />
+    <Compile Include="Models\IRenderModel.cs" />
+    <Compile Include="Models\PartialViewMacroModelExtensions.cs" />
+    <Compile Include="Models\PostRedirectModel.cs" />
+    <Compile Include="Models\PublishedProperty.cs" />
+    <Compile Include="Mvc\ActionExecutedEventArgs.cs" />
+    <Compile Include="Mvc\AdminTokenAuthorizeAttribute.cs" />
+    <Compile Include="Mvc\NotFoundHandler.cs" />
+    <Compile Include="Mvc\PreRenderViewActionFilterAttribute.cs" />
+    <Compile Include="Mvc\RedirectToUmbracoUrlResult.cs" />
+    <Compile Include="PropertyEditors\GridPropertyEditor.cs" />
+    <Compile Include="Mvc\UmbracoVirtualNodeByIdRouteHandler.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\MacroContainerValueConverter.cs" />
+    <Compile Include="PropertyEditors\TagsDataController.cs" />
+    <Compile Include="PublishedCache\MemberPublishedContent.cs" />
+    <Compile Include="PublishedCache\RawValueProperty.cs" />
+    <Compile Include="Models\RenderModelOfTContent.cs" />
+    <Compile Include="Mvc\JsonNetResult.cs" />
+    <Compile Include="Mvc\MinifyJavaScriptResultAttribute.cs" />
+    <Compile Include="Mvc\EnsurePublishedContentRequestAttribute.cs" />
+    <Compile Include="Mvc\UmbracoTemplatePageOfTContent.cs" />
+    <Compile Include="Mvc\UmbracoViewPage.cs" />
+    <Compile Include="Editors\LogController.cs" />
+    <Compile Include="Editors\MacroController.cs" />
+    <Compile Include="Editors\MemberTypeController.cs" />
+    <Compile Include="Editors\UpdateCheckController.cs" />
+    <Compile Include="MembershipProviderExtensions.cs" />
+    <Compile Include="Models\ChangingPasswordModel.cs" />
+    <Compile Include="Models\ContentEditing\ModelWithNotifications.cs" />
+    <Compile Include="Models\ContentEditing\StyleSheet.cs" />
+    <Compile Include="Editors\StylesheetController.cs" />
+    <Compile Include="Models\ContentEditing\AuditLog.cs" />
+    <Compile Include="Models\ContentEditing\MoveOrCopy.cs" />
+    <Compile Include="Models\ContentEditing\MacroParameter.cs" />
+    <Compile Include="Models\ContentEditing\MemberDisplay.cs" />
+    <Compile Include="Models\ContentEditing\MemberSave.cs" />
+    <Compile Include="Models\ContentEditing\RichTextEditorCommand.cs" />
+    <Compile Include="Models\ContentEditing\RichTextEditorConfiguration.cs" />
+    <Compile Include="Models\ContentEditing\RichTextEditorPlugin.cs" />
+    <Compile Include="Models\ContentEditing\StylesheetRule.cs" />
+    <Compile Include="Models\ContentEditing\UmbracoEntityTypes.cs" />
+    <Compile Include="Models\ContentEditing\AuditLogType.cs" />
+    <Compile Include="Models\Mapping\MiscModelsMapper.cs" />
+    <Compile Include="Models\Mapping\MacroModelMapper.cs" />
+    <Compile Include="Models\Mapping\MemberModelMapper.cs" />
+    <Compile Include="Models\Mapping\TabModelMapper.cs" />
+    <Compile Include="Models\TagModel.cs" />
+    <Compile Include="Models\UpgradeCheckResponse.cs" />
+    <Compile Include="Models\PasswordChangedModel.cs" />
+    <Compile Include="NotificationServiceExtensions.cs" />
+    <Compile Include="PropertyEditors\ColorListPreValueEditor.cs" />
+    <Compile Include="PropertyEditors\EmailAddressPropertyEditor.cs" />
+    <Compile Include="ImageCropperBaseExtensions.cs" />
+    <Compile Include="PropertyEditors\ImageCropperPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\ImageCropperPropertyValueEditor.cs" />
+    <Compile Include="PropertyEditors\ListViewPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\MacroContainerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\MarkdownPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\MemberGroupPickerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\MemberPickerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\MultiNodeTreePickerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\MultipleMediaPickerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\ParameterEditors\ContentTypeParameterEditor.cs" />
+    <Compile Include="PropertyEditors\ParameterEditors\MultipleContentTypeParameterEditor.cs" />
+    <Compile Include="PropertyEditors\ParameterEditors\MultipleMediaPickerParameterEditor.cs" />
+    <Compile Include="PropertyEditors\ParameterEditors\MultiplePropertyGroupParameterEditor.cs" />
+    <Compile Include="PropertyEditors\ParameterEditors\MultiplePropertyTypeParameterEditor.cs" />
+    <Compile Include="PropertyEditors\ParameterEditors\PropertyGroupParameterEditor.cs" />
+    <Compile Include="PropertyEditors\ParameterEditors\PropertyTypeParameterEditor.cs" />
+    <Compile Include="PropertyEditors\ParameterEditors\SingleMediaPickerParameterEditor.cs" />
+    <Compile Include="PropertyEditors\PropertyEditorAssetAttribute.cs" />
+    <Compile Include="PropertyEditors\RelatedLinksPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\RteEmbedController.cs" />
+    <Compile Include="Editors\EntityController.cs" />
+    <Compile Include="Editors\MediaPostValidateAttribute.cs" />
+    <Compile Include="Editors\MemberController.cs" />
+    <Compile Include="Editors\CurrentUserController.cs" />
+    <Compile Include="Models\ContentEditing\DashboardControl.cs" />
+    <Compile Include="Models\ContentEditing\DataTypeDisplay.cs" />
+    <Compile Include="Models\ContentEditing\DataTypeSave.cs" />
+    <Compile Include="Models\ContentEditing\EntityBasic.cs" />
+    <Compile Include="Models\ContentEditing\PreValueFieldDisplay.cs" />
+    <Compile Include="Models\ContentEditing\PreValueFieldSave.cs" />
+    <Compile Include="Models\ContentEditing\PropertyEditorBasic.cs" />
+    <Compile Include="Models\Mapping\AvailablePropertyEditorsResolver.cs" />
+    <Compile Include="Models\Mapping\DatabaseTypeResolver.cs" />
+    <Compile Include="Models\Mapping\DataTypeModelMapper.cs" />
+    <Compile Include="Models\Mapping\EntityModelMapper.cs" />
+    <Compile Include="Models\Mapping\PreValueDisplayResolver.cs" />
+    <Compile Include="PropertyEditors\CheckBoxListPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\ColorPickerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\DatePropertyEditor.cs" />
+    <Compile Include="PropertyEditors\DateTimePropertyEditor.cs" />
+    <Compile Include="PropertyEditors\DateTimeValidator.cs" />
+    <Compile Include="PropertyEditors\DropDownMultiplePropertyEditor.cs" />
+    <Compile Include="PropertyEditors\FolderBrowserPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\IntegerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\MediaPickerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\MultipleTextStringPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\PublishValuesMultipleValueEditor.cs" />
+    <Compile Include="PropertyEditors\DropDownMultipleWithKeysPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\RadioButtonsPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\RichTextPreValueController.cs" />
+    <Compile Include="PropertyEditors\RichTextPreValueEditor.cs" />
+    <Compile Include="PropertyEditors\SliderPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\TagPropertyEditorTagDefinition.cs" />
+    <Compile Include="PropertyEditors\TagsPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\UploadFileTypeValidator.cs" />
+    <Compile Include="PropertyEditors\UserPickerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\RelatedLinksEditorValueConvertor.cs" />
+    <Compile Include="PropertyEditors\ValueListPreValueEditor.cs" />
+    <Compile Include="PropertyEditors\DropDownPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\PublishValueValueEditor.cs" />
+    <Compile Include="PropertyEditors\DropDownWithKeysPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\LabelPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\PropertyValueEditorWrapper.cs" />
+    <Compile Include="PublishedContentQuery.cs" />
+    <Compile Include="ImageCropperTemplateExtensions.cs" />
+    <Compile Include="Mvc\UmbracoVirtualNodeRouteHandler.cs" />
+    <Compile Include="Routing\CustomRouteUrlProvider.cs" />
+    <Compile Include="Routing\UrlProviderExtensions.cs" />
+    <Compile Include="Scheduling\BackgroundTaskRunnerOptions.cs" />
+    <Compile Include="Scheduling\IBackgroundTaskRunner.cs" />
+    <Compile Include="Scheduling\ILatchedBackgroundTask.cs" />
+    <Compile Include="Scheduling\RecurringTaskBase.cs" />
+    <Compile Include="Security\Identity\AppBuilderExtensions.cs" />
+    <Compile Include="Security\Identity\AuthenticationOptionsExtensions.cs" />
+    <Compile Include="Security\Identity\AuthenticationManagerExtensions.cs" />
+    <Compile Include="Security\Identity\BackOfficeCookieManager.cs" />
+    <Compile Include="Security\Identity\FormsAuthenticationSecureDataFormat.cs" />
+    <Compile Include="Security\Identity\UmbracoBackOfficeCookieAuthOptions.cs" />
+    <Compile Include="Scheduling\TaskAndFactoryExtensions.cs" />
+    <Compile Include="SingletonUmbracoContextAccessor.cs" />
+    <Compile Include="Strategies\Migrations\ClearCsrfCookiesAfterUpgrade.cs" />
+    <Compile Include="Strategies\Migrations\ClearMediaXmlCacheForDeletedItemsAfterUpgrade.cs" />
+    <Compile Include="Strategies\Migrations\EnsureListViewDataTypeIsCreated.cs" />
+    <Compile Include="Strategies\Migrations\MigrationStartupHander.cs" />
+    <Compile Include="Strategies\Migrations\OverwriteStylesheetFilesFromTempFiles.cs" />
+    <Compile Include="Strategies\NotificationsHandler.cs" />
+    <Compile Include="Strategies\RelateOnCopyHandler.cs" />
+    <Compile Include="TagQuery.cs" />
+    <Compile Include="Trees\CoreTreeAttribute.cs" />
+    <Compile Include="Trees\DataTypeTreeController.cs" />
+    <Compile Include="Trees\FileSystemTreeController.cs" />
+    <Compile Include="Trees\LanguageTreeController.cs" />
+    <Compile Include="Trees\LegacyBaseTreeAttribute.cs" />
+    <Compile Include="Trees\MemberTreeController.cs" />
+    <Compile Include="Trees\MenuRenderingEventArgs.cs" />
+    <Compile Include="Models\Trees\CreateChildEntity.cs" />
+    <Compile Include="Models\Trees\MenuItemList.cs" />
+    <Compile Include="Trees\TemplatesTreeController.cs" />
+    <Compile Include="Trees\TreeControllerBase.cs" />
+    <Compile Include="CanvasDesignerUtility.cs" />
+    <Compile Include="UI\JavaScript\AssetInitialization.cs" />
+    <Compile Include="UI\JavaScript\CssInitialization.cs" />
+    <Compile Include="UI\JavaScript\DependencyPathRenderer.cs" />
+    <Compile Include="umbraco.presentation\umbraco\create.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\create\Language.ascx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\create\xslt.ascx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadPackager.cs" />
+    <Compile Include="PublishedCache\XmlPublishedCache\XmlCacheFilePersister.cs" />
+    <Compile Include="UmbracoComponentRenderer.cs" />
+    <Compile Include="Web References\org.umbraco.our\Reference.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Reference.map</DependentUpon>
+    </Compile>
+    <Compile Include="WebApi\AngularJsonMediaTypeFormatter.cs" />
+    <Compile Include="WebApi\AngularJsonOnlyConfigurationAttribute.cs" />
+    <Compile Include="WebApi\Binders\BlueprintItemBinder.cs" />
+    <Compile Include="WebApi\Binders\MemberBinder.cs" />
+    <Compile Include="WebApi\EnableDetailedErrorsAttribute.cs" />
+    <Compile Include="WebApi\Filters\AdminUsersAuthorizeAttribute.cs" />
+    <Compile Include="WebApi\Filters\AngularAntiForgeryHelper.cs" />
+    <Compile Include="WebApi\Filters\AppendCurrentEventMessagesAttribute.cs" />
+    <Compile Include="WebApi\Filters\AppendUserModifiedHeaderAttribute.cs" />
+    <Compile Include="WebApi\Filters\ClearAngularAntiForgeryTokenAttribute.cs" />
+    <Compile Include="WebApi\Filters\DisableBrowserCacheAttribute.cs" />
+    <Compile Include="WebApi\Filters\EnableOverrideAuthorizationAttribute.cs" />
+    <Compile Include="WebApi\Filters\FeatureAuthorizeAttribute.cs" />
+    <Compile Include="WebApi\Filters\FilterGrouping.cs" />
+    <Compile Include="WebApi\Filters\HttpQueryStringModelBinder.cs" />
+    <Compile Include="WebApi\Filters\LegacyTreeAuthorizeAttribute.cs" />
+    <Compile Include="WebApi\Filters\OutgoingEditorModelEventAttribute.cs" />
+    <Compile Include="WebApi\Filters\OutgoingNoHyphenGuidFormatAttribute.cs" />
+    <Compile Include="WebApi\Filters\OverridableAuthorizationAttribute.cs" />
+    <Compile Include="WebApi\Filters\SetAngularAntiForgeryTokensAttribute.cs" />
+    <Compile Include="WebApi\Filters\UmbracoBackOfficeLogoutAttribute.cs" />
+    <Compile Include="WebApi\Filters\UmbracoWebApiRequireHttpsAttribute.cs" />
+    <Compile Include="WebApi\Filters\UmbracoTreeAuthorizeAttribute.cs" />
+    <Compile Include="WebApi\Filters\UmbracoUseHttps.cs" />
+    <Compile Include="WebApi\Filters\ValidateAngularAntiForgeryTokenAttribute.cs" />
+    <Compile Include="WebApi\Filters\CheckIfUserTicketDataIsStaleAttribute.cs" />
+    <Compile Include="WebApi\HttpControllerContextExtensions.cs" />
+    <Compile Include="WebApi\CustomDateTimeConvertor.cs" />
+    <Compile Include="Models\ContentEditing\ContentSortOrder.cs" />
+    <Compile Include="Editors\ContentControllerBase.cs" />
+    <Compile Include="Editors\ContentTypeController.cs" />
+    <Compile Include="Editors\LegacyController.cs" />
+    <Compile Include="Controllers\UmbRegisterController.cs" />
+    <Compile Include="Models\ProfileModel.cs" />
+    <Compile Include="Models\LoginStatusModel.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\MarkdownEditorValueConverter.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\TextStringValueConverter.cs" />
+    <Compile Include="PublishedContentPropertyExtension.cs" />
+    <Compile Include="Models\UmbracoProperty.cs" />
+    <Compile Include="Mvc\MergeParentContextViewDataAttribute.cs" />
+    <Compile Include="Mvc\ViewDataDictionaryExtensions.cs" />
+    <Compile Include="Routing\ContentLastChanceFinderByNotFoundHandlers.cs" />
+    <Compile Include="Models\RegisterModel.cs" />
+    <Compile Include="Models\LoginModel.cs" />
+    <Compile Include="Editors\MediaTypeController.cs" />
+    <Compile Include="Scheduling\IBackgroundTask.cs" />
+    <Compile Include="Scheduling\KeepAlive.cs" />
+    <Compile Include="Scheduling\LogScrubber.cs" />
+    <Compile Include="Scheduling\ScheduledPublishing.cs" />
+    <Compile Include="Scheduling\ScheduledTasks.cs" />
+    <Compile Include="Scheduling\TaskEventArgs.cs" />
+    <Compile Include="Security\MembershipHelper.cs" />
+    <Compile Include="Editors\SectionController.cs" />
+    <Compile Include="Editors\UmbracoAuthorizedJsonController.cs" />
+    <Compile Include="Editors\ValidationHelper.cs" />
+    <Compile Include="HttpCookieExtensions.cs" />
+    <Compile Include="Models\ContentEditing\ContentItemDisplayBase.cs" />
+    <Compile Include="Models\ContentEditing\ContentSaveAction.cs" />
+    <Compile Include="Models\ContentEditing\ContentTypeBasic.cs" />
+    <Compile Include="Models\ContentEditing\IErrorModel.cs" />
+    <Compile Include="Models\ContentEditing\IHaveUploadedFiles.cs" />
+    <Compile Include="Models\ContentEditing\INotificationModel.cs" />
+    <Compile Include="Models\ContentEditing\MediaItemDisplay.cs" />
+    <Compile Include="Models\ContentEditing\MessagesExtensions.cs" />
+    <Compile Include="Models\ContentEditing\Notification.cs" />
+    <Compile Include="Models\ContentEditing\Section.cs" />
+    <Compile Include="Models\ContentEditing\Tab.cs" />
+    <Compile Include="Models\ContentEditing\TabbedContentItem.cs" />
+    <Compile Include="Models\ContentEditing\UserProfile.cs" />
+    <Compile Include="Models\ContentEditing\UserDetail.cs" />
+    <Compile Include="FormDataCollectionExtensions.cs" />
+    <Compile Include="Models\Mapping\ContentPropertyBasicConverter.cs" />
+    <Compile Include="Models\Mapping\ContentPropertyDisplayConverter.cs" />
+    <Compile Include="Models\Mapping\ContentPropertyDtoConverter.cs" />
+    <Compile Include="Models\Mapping\ContentPropertyModelMapper.cs" />
+    <Compile Include="Models\Mapping\CreatorResolver.cs" />
+    <Compile Include="Models\Mapping\MediaModelMapper.cs" />
+    <Compile Include="Models\Mapping\ContentTypeModelMapper.cs" />
+    <Compile Include="Models\Mapping\ContentModelMapper.cs" />
+    <Compile Include="Models\Mapping\OwnerResolver.cs" />
+    <Compile Include="Models\Mapping\SectionModelMapper.cs" />
+    <Compile Include="Models\Mapping\TabsAndPropertiesResolver.cs" />
+    <Compile Include="Models\Mapping\UserModelMapper.cs" />
+    <Compile Include="PropertyEditors\ContentPickerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\FileUploadPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\FileUploadPropertyValueEditor.cs" />
+    <Compile Include="PropertyEditors\RichTextPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\TextAreaPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\TextboxPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\TrueFalsePropertyEditor.cs" />
+    <Compile Include="Trees\MediaTreeController.cs" />
+    <Compile Include="Models\Trees\ActionMenuItem.cs" />
+    <Compile Include="Models\Trees\ActionMenuItemAttribute.cs" />
+    <Compile Include="Trees\ActionUrlMethod.cs" />
+    <Compile Include="Trees\ApplicationTreeRegistrar.cs" />
+    <Compile Include="Trees\ContentTreeControllerBase.cs" />
+    <Compile Include="Trees\LegacyTreeController.cs" />
+    <Compile Include="Search\ISearchableTree.cs" />
+    <Compile Include="Trees\LegacyTreeDataConverter.cs" />
+    <Compile Include="Trees\LegacyTreeJavascript.cs" />
+    <Compile Include="Trees\LegacyTreeParams.cs" />
+    <Compile Include="Models\Trees\MenuItem.cs" />
+    <Compile Include="Models\Trees\MenuItemCollection.cs" />
+    <Compile Include="Models\Trees\RefreshNode.cs" />
+    <Compile Include="Models\ContentEditing\SearchResultItem.cs" />
+    <Compile Include="Models\Trees\SectionRootNode.cs" />
+    <Compile Include="Trees\TreeController.cs" />
+    <Compile Include="Trees\ApplicationTreeExtensions.cs" />
+    <Compile Include="Trees\TreeAttribute.cs" />
+    <Compile Include="Models\Trees\TreeNode.cs" />
+    <Compile Include="Models\Trees\TreeNodeCollection.cs" />
+    <Compile Include="Models\Trees\TreeNodeExtensions.cs" />
+    <Compile Include="Trees\TreeNodeRenderingEventArgs.cs" />
+    <Compile Include="Trees\TreeNodesRenderingEventArgs.cs" />
+    <Compile Include="Trees\TreeQueryStringParameters.cs" />
+    <Compile Include="Trees\ApplicationTreeController.cs" />
+    <Compile Include="Editors\BackOfficeController.cs" />
+    <Compile Include="Security\Providers\MembersMembershipProvider.cs" />
+    <Compile Include="Security\Providers\MembersRoleProvider.cs" />
+    <Compile Include="Security\Providers\UmbracoMembershipProvider.cs" />
+    <Compile Include="Security\Providers\UsersMembershipProvider.cs" />
+    <Compile Include="Trees\ContentTreeController.cs" />
+    <Compile Include="Trees\TreeRenderingEventArgs.cs" />
+    <Compile Include="Trees\UrlHelperExtensions.cs" />
+    <Compile Include="UI\JavaScript\JsInitialization.cs" />
+    <Compile Include="Models\ContentEditing\ContentItemBasic.cs" />
+    <Compile Include="Models\ContentEditing\ContentItemDisplay.cs" />
+    <Compile Include="Models\ContentEditing\ContentItemDto.cs" />
+    <Compile Include="Models\ContentEditing\ContentItemFile.cs" />
+    <Compile Include="Models\ContentEditing\ContentItemSave.cs" />
+    <Compile Include="Models\ContentEditing\ContentPropertyBasic.cs" />
+    <Compile Include="Models\ContentEditing\ContentPropertyDisplay.cs" />
+    <Compile Include="Models\ContentEditing\ContentPropertyDto.cs" />
+    <Compile Include="Dynamics\DynamicExpression.cs" />
+    <Compile Include="Dynamics\DynamicGrouping.cs" />
+    <Compile Include="Dynamics\DynamicPublishedContentIdEqualityComparer.cs" />
+    <Compile Include="Dynamics\DynamicPublishedContentListOrdering.cs" />
+    <Compile Include="Dynamics\DynamicQueryable.cs" />
+    <Compile Include="Dynamics\ExpressionParser.cs" />
+    <Compile Include="Dynamics\ExtensionMethods.cs" />
+    <Compile Include="Dynamics\Grouping.cs" />
+    <Compile Include="HttpRequestExtensions.cs" />
+    <Compile Include="HttpUrlHelperExtensions.cs" />
+    <Compile Include="Install\FilePermissionHelper.cs" />
+    <Compile Include="Install\InstallHelper.cs" />
+    <Compile Include="Install\HttpInstallAuthorizeAttribute.cs" />
+    <Compile Include="Macros\PartialViewMacroController.cs" />
+    <Compile Include="Macros\PartialViewMacroEngine.cs" />
+    <Compile Include="Macros\PartialViewMacroPage.cs" />
+    <Compile Include="Media\ImageUrl.cs" />
+    <Compile Include="Media\ImageUrlProviderResolver.cs" />
+    <Compile Include="Media\ImageUrlProviders\ImageUrlProvider.cs" />
+    <Compile Include="Models\DynamicPublishedContent.cs" />
+    <Compile Include="Models\DynamicPublishedContentList.cs" />
+    <Compile Include="Models\PartialViewMacroModel.cs" />
+    <Compile Include="Models\PublishedContentBase.cs" />
+    <Compile Include="Mvc\AreaRegistrationExtensions.cs" />
+    <Compile Include="BaseRest\BaseRestHandler.cs" />
+    <Compile Include="BaseRest\MemberRest.cs" />
+    <Compile Include="BaseRest\RestExtensionAttribute.cs" />
+    <Compile Include="BaseRest\RestExtensionMethodAttribute.cs" />
+    <Compile Include="BaseRest\RestExtensionMethodInfo.cs" />
+    <Compile Include="ContextualPublishedCacheExtensions.cs" />
+    <Compile Include="Mvc\DefaultRenderMvcControllerResolver.cs" />
+    <Compile Include="Mvc\QueryStringFilterAttribute.cs" />
+    <Compile Include="PublishedCache\ContextualPublishedContentCache.cs" />
+    <Compile Include="PublishedCache\ContextualPublishedCacheOfT.cs" />
+    <Compile Include="PublishedCache\ContextualPublishedCache.cs" />
+    <Compile Include="PublishedCache\ContextualPublishedMediaCache.cs" />
+    <Compile Include="PublishedCache\PublishedCachesResolver.cs" />
+    <Compile Include="PublishedCache\IPublishedCaches.cs" />
+    <Compile Include="PublishedCache\PublishedCaches.cs" />
+    <Compile Include="PublishedCache\XmlPublishedCache\PublishedMediaCache.cs" />
+    <Compile Include="Dictionary\UmbracoCultureDictionary.cs" />
+    <Compile Include="Dictionary\UmbracoCultureDictionaryFactory.cs" />
+    <Compile Include="Mvc\MemberAuthorizeAttribute.cs" />
+    <Compile Include="Mvc\BackOfficeArea.cs" />
+    <Compile Include="Mvc\ControllerFactoryExtensions.cs" />
+    <Compile Include="Mvc\IRenderMvcController.cs" />
+    <Compile Include="Mvc\SurfaceRouteHandler.cs" />
+    <Compile Include="PublishedCache\XmlPublishedCache\RoutesCache.cs" />
+    <Compile Include="PublishedCache\XmlPublishedCache\UmbracoContextCache.cs" />
+    <Compile Include="Routing\UrlProviderMode.cs" />
+    <Compile Include="Search\ExamineIndexerModel.cs" />
+    <Compile Include="Search\LuceneIndexerExtensions.cs" />
+    <Compile Include="Security\ValidateRequestAttempt.cs" />
+    <Compile Include="Security\WebSecurity.cs" />
+    <Compile Include="UI\JavaScript\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="UI\JavaScript\ServerVariablesParser.cs" />
+    <Compile Include="Strategies\Migrations\RebuildXmlCachesAfterUpgrade.cs" />
+    <Compile Include="Strategies\PublicAccessEventHandler.cs" />
+    <Compile Include="UI\Bundles\JsApplicationLib.cs" />
+    <Compile Include="UI\Bundles\JsJQueryCore.cs" />
+    <Compile Include="UI\Bundles\JsJQueryPlugins.cs" />
+    <Compile Include="UI\Bundles\JsUmbracoApplicationCore.cs" />
+    <Compile Include="UI\Bundles\JsUmbracoApplicationUI.cs" />
+    <Compile Include="UI\Bundles\JsUmbracoTree.cs" />
+    <Compile Include="UI\CdfLogger.cs" />
+    <Compile Include="Models\LegacyNodeHelper.cs" />
+    <Compile Include="umbraco.presentation\umbraco\controls\Tree\TreeControl.ascx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\create\simple.ascx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\Packages\directoryBrowser.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\ProtectPage.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\create.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\AssignDomain2.aspx.cs">
+      <DependentUpon>AssignDomain2.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\AssignDomain2.aspx.designer.cs">
+      <DependentUpon>AssignDomain2.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="UmbracoContextExtensions.cs" />
+    <Compile Include="umbraco.presentation\umbraco\settings\stylesheet\editstylesheet.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\settings\stylesheet\property\EditStyleSheetProperty.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Controllers\UmbLoginController.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\TranslateTreeNames.cs" />
+    <Compile Include="UrlHelperExtensions.cs" />
+    <Compile Include="Editors\MediaController.cs" />
+    <Compile Include="UrlHelperRenderExtensions.cs" />
+    <Compile Include="WebApi\Binders\ContentItemBaseBinder.cs" />
+    <Compile Include="WebApi\IsBackOfficeAttribute.cs" />
+    <Compile Include="WebApi\Binders\ContentItemBinder.cs" />
+    <Compile Include="WebApi\Binders\MediaItemBinder.cs" />
+    <Compile Include="WebApi\Filters\EnsureUserPermissionForContentAttribute.cs" />
+    <Compile Include="WebApi\Filters\ContentItemValidationHelper.cs" />
+    <Compile Include="WebApi\Filters\EnsureUserPermissionForMediaAttribute.cs" />
+    <Compile Include="WebApi\Filters\FileUploadCleanupFilterAttribute.cs" />
+    <Compile Include="WebApi\Filters\FilterAllowedOutgoingContentAttribute.cs" />
+    <Compile Include="WebApi\Filters\FilterAllowedOutgoingMediaAttribute.cs" />
+    <Compile Include="WebApi\Filters\HttpQueryStringFilterAttribute.cs" />
+    <Compile Include="WebApi\Filters\OutgoingDateTimeFormatAttribute.cs" />
+    <Compile Include="WebApi\Filters\UmbracoApplicationAuthorizeAttribute.cs" />
+    <Compile Include="WebApi\GuidNoHyphenConverter.cs" />
+    <Compile Include="WebApi\HttpRequestMessageExtensions.cs" />
+    <Compile Include="WebApi\JsonCamelCaseFormatter.cs" />
+    <Compile Include="WebApi\MemberAuthorizeAttribute.cs" />
+    <Compile Include="WebApi\MvcVersionCheck.cs" />
+    <Compile Include="WebApi\NamespaceHttpControllerSelector.cs" />
+    <Compile Include="WebApi\PrefixlessBodyModelValidator.cs" />
+    <Compile Include="WebApi\PrefixlessBodyModelValidatorAttribute.cs" />
+    <Compile Include="WebApi\SessionHttpControllerRouteHandler.cs" />
+    <Compile Include="WebApi\UmbracoApiController.cs" />
+    <Compile Include="WebApi\UmbracoApiControllerBase.cs" />
+    <Compile Include="WebApi\UmbracoApiControllerResolver.cs" />
+    <Compile Include="Mvc\UmbracoAuthorizeAttribute.cs" />
+    <Compile Include="Mvc\NotChildAction.cs" />
+    <Compile Include="Mvc\UmbracoAuthorizedController.cs" />
+    <Compile Include="Mvc\UmbracoController.cs" />
+    <Compile Include="Mvc\UmbracoControllerFactory.cs" />
+    <Compile Include="Mvc\UmbracoMvcHandler.cs" />
+    <Compile Include="Mvc\UmbracoViewPageOfTModel.cs" />
+    <Compile Include="PublishedCache\IPublishedCache.cs" />
+    <Compile Include="PublishedCache\IPublishedContentCache.cs" />
+    <Compile Include="PublishedCache\IPublishedMediaCache.cs" />
+    <Compile Include="PublishedContentExtensions.cs" />
+    <Compile Include="ExamineExtensions.cs" />
+    <Compile Include="FormlessPage.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HtmlHelperRenderExtensions.cs" />
+    <Compile Include="Scheduling\Scheduler.cs" />
+    <Compile Include="Media\EmbedProviders\AbstractOEmbedProvider.cs" />
+    <Compile Include="Media\EmbedProviders\AbstractProvider.cs" />
+    <Compile Include="Media\EmbedProviders\OEmbedRich.cs" />
+    <Compile Include="Media\EmbedProviders\OEmbedVideo.cs" />
+    <Compile Include="Media\EmbedProviders\Settings\Dictionary.cs" />
+    <Compile Include="Media\EmbedProviders\Settings\String.cs" />
+    <Compile Include="Media\EmbedProviders\Twitgoo.cs" />
+    <Compile Include="ModelStateExtensions.cs" />
+    <Compile Include="Mvc\HtmlTagWrapper.cs" />
+    <Compile Include="Mvc\HtmlTagWrapperTextNode.cs" />
+    <Compile Include="Mvc\IHtmlTagWrapper.cs" />
+    <Compile Include="Mvc\MergeModelStateToChildActionAttribute.cs" />
+    <Compile Include="Mvc\PluginController.cs" />
+    <Compile Include="Mvc\PluginViewEngine.cs" />
+    <Compile Include="Mvc\PostedDataProxyInfo.cs" />
+    <Compile Include="Mvc\RedirectToUmbracoPageResult.cs" />
+    <Compile Include="Mvc\Strings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Strings.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Mvc\SurfaceController.cs" />
+    <Compile Include="Mvc\PluginControllerArea.cs" />
+    <Compile Include="Mvc\PluginControllerAttribute.cs" />
+    <Compile Include="Mvc\SurfaceControllerFactory.cs" />
+    <Compile Include="Mvc\PluginControllerMetadata.cs" />
+    <Compile Include="Mvc\UmbracoPageResult.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\RteMacroRenderingValueConverter.cs" />
+    <Compile Include="RenderFieldCaseType.cs" />
+    <Compile Include="RenderFieldEncodingType.cs" />
+    <Compile Include="RouteCollectionExtensions.cs" />
+    <Compile Include="Routing\AliasUrlProvider.cs" />
+    <Compile Include="Routing\ContentFinderByLegacy404.cs" />
+    <Compile Include="Routing\ContentFinderByNotFoundHandler.cs" />
+    <Compile Include="Routing\ContentFinderByPageIdQuery.cs" />
+    <Compile Include="Mvc\SurfaceControllerResolver.cs" />
+    <Compile Include="Routing\ContentFinderByNotFoundHandlers.cs" />
+    <Compile Include="Routing\ISiteDomainHelper.cs" />
+    <Compile Include="Routing\RoutableAttemptEventArgs.cs" />
+    <Compile Include="Routing\DefaultUrlProvider.cs" />
+    <Compile Include="Routing\DomainAndUri.cs" />
+    <Compile Include="Routing\IUrlProvider.cs" />
+    <Compile Include="Routing\SiteDomainHelper.cs" />
+    <Compile Include="Routing\SiteDomainHelperResolver.cs" />
+    <Compile Include="Routing\UrlProviderResolver.cs" />
+    <Compile Include="Routing\NotFoundHandlerHelper.cs" />
+    <Compile Include="Routing\EnsureRoutableOutcome.cs" />
+    <Compile Include="Security\LegacyDefaultAppMapping.cs" />
+    <Compile Include="Routing\PublishedContentRequestEngine.cs" />
+    <Compile Include="Routing\UrlProvider.cs" />
+    <Compile Include="Routing\WebServicesRouteConstraint.cs" />
+    <Compile Include="Search\ExamineSearcherModel.cs" />
+    <Compile Include="Search\ExamineEvents.cs" />
+    <Compile Include="Strategies\DataTypes\LegacyUploadFieldWorkaround.cs" />
+    <Compile Include="Strategies\Migrations\PublishAfterUpgradeToVersionSixth.cs" />
+    <Compile Include="Strategies\LegacyClasses.cs" />
+    <Compile Include="Strategies\Migrations\EnsureAppsTreesUpdatedOnUpgrade.cs" />
+    <Compile Include="Strategies\ServerRegistrationEventHandler.cs" />
+    <Compile Include="Templates\TemplateRenderer.cs" />
+    <Compile Include="Templates\TemplateUtilities.cs" />
+    <Compile Include="Trees\PartialViewMacrosTreeController.cs" />
+    <Compile Include="Trees\PartialViewsTreeController.cs" />
+    <Compile Include="UI\Controls\InsertMacroSplitButton.cs" />
+    <Compile Include="UI\IAssignedApp.cs" />
+    <Compile Include="UI\LegacyDialogHandler.cs" />
+    <Compile Include="UI\LegacyDialogTask.cs" />
+    <Compile Include="UI\Controls\ProgressBar.cs" />
+    <Compile Include="UI\Controls\UmbracoControl.cs" />
+    <Compile Include="UI\Controls\UmbracoUserControl.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="UI\Pages\BasePage.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="UI\Pages\ClientTools.cs" />
+    <Compile Include="UI\Pages\UmbracoEnsuredPage.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="UI\SpeechBubbleIcon.cs" />
+    <Compile Include="umbraco.presentation\AttributeCollectionAdapter.cs" />
+    <Compile Include="umbraco.presentation\Default.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\MacroCacheContent.cs" />
+    <Compile Include="umbraco.presentation\ScriptingMacroResult.cs" />
+    <Compile Include="umbraco.presentation\umbraco\dialogs\sort.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\macroResultWrapper.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\masterpages\default.Master.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\publishStatus.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\Default.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\tree.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\ping.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\Macros\editMacro.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\Python\editPython.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\editXslt.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\editMacro.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\umbracoField.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\treePicker.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\masterpages\umbracoPage.master.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\masterpages\umbracoDialog.master.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\nodeFactory\UmbracoSiteMapProviderAccessUpdate.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Search\QuickSearch.ascx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\settings\modals\ShowUmbracoTags.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\templateControls\Image.cs" />
+    <Compile Include="umbraco.presentation\umbraco\uQuery\IGetProperty.cs" />
+    <Compile Include="umbraco.presentation\XsltExtensionAttribute.cs" />
+    <Compile Include="UmbracoHelper.cs" />
+    <Compile Include="Mvc\ViewContextExtensions.cs" />
+    <Compile Include="Mvc\ViewDataContainerExtensions.cs" />
+    <Compile Include="PublishedCache\XmlPublishedCache\PublishedContentCache.cs" />
+    <Compile Include="Routing\PublishedContentNotFoundHandler.cs" />
+    <Compile Include="PublishedCache\XmlPublishedCache\XmlPublishedContent.cs" />
+    <Compile Include="PublishedCache\XmlPublishedCache\XmlPublishedProperty.cs" />
+    <Compile Include="Mvc\Constants.cs" />
+    <Compile Include="Mvc\FilteredControllerFactoriesResolver.cs" />
+    <Compile Include="Mvc\IFilteredControllerFactory.cs" />
+    <Compile Include="Mvc\MasterControllerFactory.cs" />
+    <Compile Include="Mvc\RenderActionInvoker.cs" />
+    <Compile Include="Mvc\RenderControllerFactory.cs" />
+    <Compile Include="Models\RenderModel.cs" />
+    <Compile Include="Mvc\RenderModelBinder.cs" />
+    <Compile Include="Mvc\RenderMvcController.cs" />
+    <Compile Include="Mvc\RenderRouteHandler.cs" />
+    <Compile Include="Mvc\RenderViewEngine.cs" />
+    <Compile Include="Mvc\UmbracoTemplatePage.cs" />
+    <Compile Include="Mvc\RouteDefinition.cs" />
+    <Compile Include="Mvc\RouteValueDictionaryExtensions.cs" />
+    <Compile Include="umbraco.presentation\umbraco\nodeFactory\Node.cs" />
+    <Compile Include="umbraco.presentation\umbraco\nodeFactory\Nodes.cs" />
+    <Compile Include="umbraco.presentation\umbraco\nodeFactory\Property.cs" />
+    <Compile Include="Routing\UmbracoRequestEventArgs.cs" />
+    <Compile Include="UmbracoUserControl.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="WebApi\UmbracoAuthorizeAttribute.cs" />
+    <Compile Include="WebApi\UmbracoAuthorizedApiController.cs" />
+    <Compile Include="WebApi\Filters\ValidationFilterAttribute.cs" />
+    <Compile Include="WebApi\Filters\UmbracoUserTimeoutFilterAttribute.cs" />
+    <Compile Include="WebApi\UnhandedExceptionLoggerConfigurationAttribute.cs" />
+    <Compile Include="WebApi\UnhandledExceptionLogger.cs" />
+    <Compile Include="WebApi\WebApiHelper.cs" />
+    <Compile Include="WebBootManager.cs" />
+    <Compile Include="Routing\LegacyRequestInitializer.cs" />
+    <Compile Include="Mvc\ControllerExtensions.cs" />
+    <Compile Include="Routing\ContentLastChanceFinderResolver.cs" />
+    <Compile Include="Routing\ContentFinderByUrlAlias.cs" />
+    <Compile Include="Media\ThumbnailProviders\AbstractThumbnailProvider.cs" />
+    <Compile Include="Media\ThumbnailProviders\MediaTypeIconThumbnailProvider.cs" />
+    <Compile Include="Media\ThumbnailProviders\FileExtensionIconThumbnailProvider.cs" />
+    <Compile Include="Media\ThumbnailProviders\ImageThumbnailProvider.cs" />
+    <Compile Include="Media\ThumbnailProviders\ThumbnailProvidersResolver.cs" />
+    <Compile Include="UI\Controls\FolderBrowser.cs" />
+    <Compile Include="Routing\ContentFinderByIdPath.cs" />
+    <Compile Include="Routing\ContentFinderByNiceUrl.cs" />
+    <Compile Include="Routing\ContentFinderByNiceUrlAndTemplate.cs" />
+    <Compile Include="Routing\ContentFinderByProfile.cs" />
+    <Compile Include="PluginManagerExtensions.cs" />
+    <Compile Include="Routing\DomainHelper.cs" />
+    <Compile Include="Routing\ContentFinderResolver.cs" />
+    <Compile Include="Routing\PublishedContentRequest.cs" />
+    <Compile Include="Routing\IContentFinder.cs" />
+    <Compile Include="Routing\RoutingContext.cs" />
+    <Compile Include="umbraco.presentation\EnsureSystemPathsApplicationStartupHandler.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\BasePageExtensions.cs" />
+    <Compile Include="umbraco.presentation\content.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\helper.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\item.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\keepAliveService.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\library.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\macro.cs" />
+    <Compile Include="umbraco.presentation\page.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\Settings1.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <DependentUpon>Settings.settings</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\publishingService.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\PublishQueue.cs" />
+    <Compile Include="umbraco.presentation\python.cs" />
+    <Compile Include="umbraco.presentation\NotFoundHandlers.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\requestModule.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\showField.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\template.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\UmbracoContext.cs" />
+    <Compile Include="umbraco.presentation\UmbracoPage.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbracoPageHolder.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\UmbracoRequest.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\UmbracoResponse.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\UmbracoServerUtility.cs" />
+    <Compile Include="umbraco.presentation\umbraco\actions\delete.aspx.cs">
+      <DependentUpon>delete.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\actions\delete.aspx.designer.cs">
+      <DependentUpon>delete.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\actions\editContent.aspx.cs">
+      <DependentUpon>editContent.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\actions\editContent.aspx.designer.cs">
+      <DependentUpon>editContent.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\actions\preview.aspx.cs">
+      <DependentUpon>preview.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\actions\preview.aspx.designer.cs">
+      <DependentUpon>preview.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\actions\publish.aspx.cs">
+      <DependentUpon>publish.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\actions\publish.aspx.designer.cs">
+      <DependentUpon>publish.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\controls\ContentControl.cs" />
+    <Compile Include="umbraco.presentation\umbraco\controls\ContentPicker.cs" />
+    <Compile Include="umbraco.presentation\umbraco\controls\ContentTypeControl.cs" />
+    <Compile Include="umbraco.presentation\umbraco\controls\Images\ImageViewer.ascx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\controls\dualSelectBox.cs" />
+    <Compile Include="umbraco.presentation\umbraco\controls\GenericValidation.cs" />
+    <Compile Include="umbraco.presentation\umbraco\controls\LabelButton.cs" />
+    <Compile Include="umbraco.presentation\umbraco\controls\macroParameterControl.cs" />
+    <Compile Include="umbraco.presentation\umbraco\controls\ProgressBar.ascx.cs">
+      <DependentUpon>ProgressBar.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\controls\ProgressBar.ascx.designer.cs">
+      <DependentUpon>ProgressBar.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\controls\SaveClickEventArgs.cs" />
+    <Compile Include="umbraco.presentation\umbraco\controls\Tree\CustomTreeControl.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\controls\Tree\CustomTreeService.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\controls\Tree\JTreeContextMenu.cs" />
+    <Compile Include="umbraco.presentation\umbraco\controls\Tree\JTreeContextMenuItem.cs" />
+    <Compile Include="umbraco.presentation\umbraco\controls\Tree\NodeInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\create\CreatedPackageTasks.cs" />
+    <Compile Include="umbraco.presentation\umbraco\create\dictionaryTasks.cs" />
+    <Compile Include="umbraco.presentation\umbraco\create\macroTasks.cs" />
+    <Compile Include="umbraco.presentation\umbraco\create\MemberGroupTasks.cs" />
+    <Compile Include="umbraco.presentation\umbraco\create\stylesheetPropertyTasks.cs" />
+    <Compile Include="umbraco.presentation\umbraco\create\StylesheetTasks.cs" />
+    <Compile Include="umbraco.presentation\umbraco\create\XsltTasks.cs" />
+    <Compile Include="umbraco.presentation\umbraco\dashboard\FeedProxy.aspx.cs">
+      <DependentUpon>FeedProxy.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dashboard\FeedProxy.aspx.designer.cs">
+      <DependentUpon>FeedProxy.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\EditRelationType.aspx.cs">
+      <DependentUpon>EditRelationType.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\EditRelationType.aspx.designer.cs">
+      <DependentUpon>EditRelationType.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\NewRelationType.aspx.cs">
+      <DependentUpon>NewRelationType.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\NewRelationType.aspx.designer.cs">
+      <DependentUpon>NewRelationType.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\ReadOnlyRelation.cs" />
+    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\RelationTypesWebService.asmx.cs">
+      <DependentUpon>RelationTypesWebService.asmx</DependentUpon>
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\TreeMenu\ActionDeleteRelationType.cs" />
+    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\TreeMenu\ActionNewRelationType.cs" />
+    <Compile Include="umbraco.presentation\umbraco\dialogs\Preview.aspx.cs">
+      <DependentUpon>Preview.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\Preview.aspx.designer.cs">
+      <DependentUpon>Preview.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\members\MemberSearch.ascx.cs">
+      <DependentUpon>MemberSearch.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\members\MemberSearch.ascx.designer.cs">
+      <DependentUpon>MemberSearch.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\nodeFactory\Page_Legacy.cs" />
+    <Compile Include="umbraco.presentation\umbraco\preview\PreviewContent.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Search\ExamineEvents.cs" />
+    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltVisualize.aspx.cs">
+      <DependentUpon>xsltVisualize.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltVisualize.aspx.designer.cs">
+      <DependentUpon>xsltVisualize.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\insertMasterpageContent.aspx.cs">
+      <DependentUpon>insertMasterpageContent.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\insertMasterpageContent.aspx.designer.cs">
+      <DependentUpon>insertMasterpageContent.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\insertMasterpagePlaceholder.aspx.cs">
+      <DependentUpon>insertMasterpagePlaceholder.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\insertMasterpagePlaceholder.aspx.designer.cs">
+      <DependentUpon>insertMasterpagePlaceholder.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\republish.aspx.cs">
+      <DependentUpon>republish.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\republish.aspx.designer.cs">
+      <DependentUpon>republish.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\search.aspx.cs">
+      <DependentUpon>search.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\search.aspx.designer.cs">
+      <DependentUpon>search.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\SendPublish.aspx.cs">
+      <DependentUpon>SendPublish.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\SendPublish.aspx.designer.cs">
+      <DependentUpon>SendPublish.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\create\dialogHandler_temp.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\create\languageTasks.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\Macros\assemblyBrowser.aspx.cs">
+      <DependentUpon>assemblyBrowser.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\Macros\assemblyBrowser.aspx.designer.cs">
+      <DependentUpon>assemblyBrowser.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\Packages\editPackage.aspx.cs">
+      <DependentUpon>editPackage.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\Packages\editPackage.aspx.designer.cs">
+      <DependentUpon>editPackage.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\getXsltStatus.asmx.cs">
+      <DependentUpon>getXsltStatus.asmx</DependentUpon>
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltChooseExtension.aspx.cs">
+      <DependentUpon>xsltChooseExtension.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltChooseExtension.aspx.designer.cs">
+      <DependentUpon>xsltChooseExtension.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltInsertValueOf.aspx.cs">
+      <DependentUpon>xsltInsertValueOf.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltInsertValueOf.aspx.designer.cs">
+      <DependentUpon>xsltInsertValueOf.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\exportDocumenttype.aspx.cs">
+      <DependentUpon>exportDocumenttype.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\importDocumenttype.aspx.cs">
+      <DependentUpon>importDocumenttype.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\rollBack.aspx.cs">
+      <DependentUpon>rollBack.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\rollBack.aspx.designer.cs">
+      <DependentUpon>rollBack.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\sendToTranslation.aspx.cs">
+      <DependentUpon>sendToTranslation.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\sendToTranslation.aspx.designer.cs">
+      <DependentUpon>sendToTranslation.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\viewAuditTrail.aspx.cs">
+      <DependentUpon>viewAuditTrail.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\viewAuditTrail.aspx.designer.cs">
+      <DependentUpon>viewAuditTrail.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\members\EditMemberGroup.aspx.cs">
+      <DependentUpon>EditMemberGroup.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\members\EditMemberGroup.aspx.designer.cs">
+      <DependentUpon>EditMemberGroup.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\members\search.aspx.cs">
+      <DependentUpon>search.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\members\search.aspx.designer.cs">
+      <DependentUpon>search.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\members\ViewMembers.aspx.cs">
+      <DependentUpon>ViewMembers.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\members\ViewMembers.aspx.designer.cs">
+      <DependentUpon>ViewMembers.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\nodeFactory\Properties.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\nodeFactory\UmbracoSiteMapProvider.cs" />
+    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\GzipCompressor.cs" />
+    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\GzipModule.cs" />
+    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\IModule.cs" />
+    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\JSON.cs" />
+    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\JSONReader.cs" />
+    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\JSONWriter.cs" />
+    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\tinymce3tinymceCompress.aspx.cs">
+      <DependentUpon>tinymce3tinymceCompress.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\tinymce3tinymceCompress.aspx.designer.cs">
+      <DependentUpon>tinymce3tinymceCompress.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\Search\QuickSearchHandler.ashx.cs">
+      <DependentUpon>QuickSearchHandler.ashx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\settings\DictionaryItemList.aspx.cs">
+      <DependentUpon>DictionaryItemList.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\settings\DictionaryItemList.aspx.designer.cs">
+      <DependentUpon>DictionaryItemList.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\settings\editLanguage.aspx.cs">
+      <DependentUpon>editLanguage.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\settings\editLanguage.aspx.designer.cs">
+      <DependentUpon>editLanguage.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\templateControls\Script.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\BaseMediaTree.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadDLRScripts.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\ITreeService.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadRelationTypes.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\MediaRecycleBin.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\NodeActionsEventArgs.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\TreeEventArgs.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\TreeRequestParams.cs" />
+    <Compile Include="umbraco.presentation\umbraco\uQuery\ContentExtensions.cs" />
+    <Compile Include="umbraco.presentation\umbraco\uQuery\ContentTypeExtensions.cs" />
+    <Compile Include="umbraco.presentation\umbraco\uQuery\DocumentExtensions.cs" />
+    <Compile Include="umbraco.presentation\umbraco\uQuery\MediaExtensions.cs" />
+    <Compile Include="umbraco.presentation\umbraco\uQuery\MemberExtensions.cs" />
+    <Compile Include="umbraco.presentation\umbraco\uQuery\NodeExtensions.cs" />
+    <Compile Include="umbraco.presentation\umbraco\uQuery\PreValueExtensions.cs" />
+    <Compile Include="umbraco.presentation\umbraco\uQuery\RelationTypeExtensions.cs" />
+    <Compile Include="umbraco.presentation\umbraco\uQuery\UmbracoObjectTypeExtensions.cs" />
+    <Compile Include="umbraco.presentation\umbraco\webservices\MacroContainerService.asmx.cs">
+      <DependentUpon>MacroContainerService.asmx</DependentUpon>
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\webservices\TagsAutoCompleteHandler.ashx.cs">
+      <DependentUpon>TagsAutoCompleteHandler.ashx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\webservices\TreeClientService.asmx.cs">
+      <DependentUpon>TreeClientService.asmx</DependentUpon>
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\templateControls\DisableEventValidation.cs" />
+    <Compile Include="umbraco.presentation\umbraco\templateControls\Item.cs" />
+    <Compile Include="umbraco.presentation\umbraco\templateControls\ItemRenderer.cs" />
+    <Compile Include="umbraco.presentation\umbraco\templateControls\Macro.cs" />
+    <Compile Include="umbraco.presentation\umbraco\templateControls\ContentType.cs" />
+    <Compile Include="umbraco.presentation\umbraco\templateControls\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\translation\default.aspx.cs">
+      <DependentUpon>default.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\translation\default.aspx.designer.cs">
+      <DependentUpon>default.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\translation\details.aspx.cs">
+      <DependentUpon>details.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\translation\details.aspx.designer.cs">
+      <DependentUpon>details.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\translation\preview.aspx.cs">
+      <DependentUpon>preview.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\translation\preview.aspx.designer.cs">
+      <DependentUpon>preview.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\translation\xml.aspx.cs">
+      <DependentUpon>xml.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\translation\xml.aspx.designer.cs">
+      <DependentUpon>xml.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\treeInit.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\Trees\BaseContentTree.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\BaseTree.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\ContentRecycleBin.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\FileSystemTree.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadContent.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadcontentItemType.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadDataTypes.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadLanguages.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadMacros.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadMedia.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadMediaTypes.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadMemberGroups.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadMembers.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadMemberTypes.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadNodeTypes.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadPython.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadScripts.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadStylesheetProperty.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadStylesheets.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadTemplates.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadTranslationTasks.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadUsers.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadXslt.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\NullTree.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\LegacyTree.cs" />
+    <Compile Include="umbraco.presentation\umbraco\webservices\TreeDataService.ashx.cs">
+      <DependentUpon>TreeDataService.ashx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\Trees\TreeDefinitionCollection.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\TreeDefinition.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\TreeDialogModes.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\TreeService.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\XmlTree.cs">
+      <DependentUpon>XmlTree.xsd</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\urlRewriter\UrlRewriterFormWriter.cs" />
+    <Compile Include="umbraco.presentation\umbraco\webservices\ajaxHelpers.cs" />
+    <Compile Include="umbraco.presentation\umbraco\webservices\CacheRefresher.asmx.cs">
+      <DependentUpon>CacheRefresher.asmx</DependentUpon>
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\webservices\CheckForUpgrade.asmx.cs">
+      <DependentUpon>CheckForUpgrade.asmx</DependentUpon>
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\webservices\CMSNode.asmx.cs">
+      <DependentUpon>CMSNode.asmx</DependentUpon>
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\webservices\codeEditorSave.asmx.cs">
+      <DependentUpon>codeEditorSave.asmx</DependentUpon>
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\webservices\legacyAjaxCalls.asmx.cs">
+      <DependentUpon>legacyAjaxCalls.asmx</DependentUpon>
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\webservices\nodeSorter.asmx.cs">
+      <DependentUpon>nodeSorter.asmx</DependentUpon>
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\webservices\progressStatus.asmx.cs">
+      <DependentUpon>progressStatus.asmx</DependentUpon>
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\webservices\publication.asmx.cs">
+      <DependentUpon>publication.asmx</DependentUpon>
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\webservices\RegexComWebservice.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Web\UI\ContentPage.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery.cs" />
+    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Content.cs">
+      <DependentUpon>uQuery.cs</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-DataTypes.cs">
+      <DependentUpon>uQuery.cs</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Dictionary.cs">
+      <DependentUpon>uQuery.cs</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Document.cs">
+      <DependentUpon>uQuery.cs</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Media.cs">
+      <DependentUpon>uQuery.cs</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Members.cs">
+      <DependentUpon>uQuery.cs</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Nodes.cs">
+      <DependentUpon>uQuery.cs</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-PreValues.cs">
+      <DependentUpon>uQuery.cs</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-UmbracoObjectType.cs">
+      <DependentUpon>uQuery.cs</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\viewstateMoverModule.cs" />
+    <Compile Include="UmbracoApplication.cs" />
+    <Compile Include="UmbracoContext.cs" />
+    <Compile Include="UmbracoModule.cs" />
+    <Compile Include="UriUtility.cs" />
+    <Compile Include="Web References\org.umbraco.update\Reference.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Reference.map</DependentUpon>
+    </Compile>
+    <Compile Include="WebServices\BulkPublishController.cs" />
+    <Compile Include="WebServices\CoreStringsController.cs" />
+    <Compile Include="WebServices\DomainsApiController.cs" />
+    <Compile Include="WebServices\EmbedMediaService.cs" />
+    <Compile Include="WebServices\ExamineManagementApiController.cs" />
+    <Compile Include="WebServices\FolderBrowserService.cs" />
+    <Compile Include="WebServices\TagsController.cs" />
+    <Compile Include="WebServices\UmbracoAuthorizedHttpHandler.cs" />
+    <Compile Include="WebServices\SaveFileController.cs" />
+    <Compile Include="WebServices\UmbracoAuthorizedWebService.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="WebServices\UmbracoHttpHandler.cs" />
+    <Compile Include="WebServices\UmbracoWebService.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="WebServices\XmlDataIntegrityController.cs" />
+    <Compile Include="WebViewPageExtensions.cs" />
+    <None Include="..\Umbraco.Web.UI\Views\web.config">
+      <Link>Mvc\web.config</Link>
+    </None>
+    <None Include="packages.config" />
+    <None Include="Web References\org.umbraco.our\Reference.map">
+      <Generator>MSDiscoCodeGenerator</Generator>
+      <LastGenOutput>Reference.cs</LastGenOutput>
+    </None>
+    <None Include="Web References\org.umbraco.our\repository.disco" />
+    <EmbeddedResource Include="UI\JavaScript\Main.js" />
+    <EmbeddedResource Include="UI\JavaScript\JsInitialize.js" />
+    <EmbeddedResource Include="UI\JavaScript\ServerVariables.js" />
+    <Content Include="umbraco.presentation\umbraco\controls\Tree\CustomTreeService.asmx" />
+    <Content Include="umbraco.presentation\umbraco\developer\RelationTypes\EditRelationType.aspx" />
+    <Content Include="umbraco.presentation\umbraco\developer\RelationTypes\NewRelationType.aspx" />
+    <Content Include="umbraco.presentation\umbraco\developer\RelationTypes\RelationTypesWebService.asmx" />
+    <Content Include="umbraco.presentation\umbraco\dashboard\FeedProxy.aspx" />
+    <Content Include="umbraco.presentation\umbraco\dialogs\AssignDomain2.aspx">
+      <SubType>ASPXCodeBehind</SubType>
+    </Content>
+    <Content Include="umbraco.presentation\umbraco\members\MemberSearch.ascx">
+      <SubType>ASPXCodeBehind</SubType>
+    </Content>
+    <Content Include="umbraco.presentation\umbraco\dialogs\Preview.aspx" />
+    <Content Include="umbraco.presentation\umbraco\controls\ProgressBar.ascx">
+      <SubType>ASPXCodeBehind</SubType>
+    </Content>
+    <Content Include="umbraco.presentation\umbraco\actions\delete.aspx" />
+    <Content Include="umbraco.presentation\umbraco\actions\editContent.aspx" />
+    <Content Include="umbraco.presentation\umbraco\actions\preview.aspx">
+      <SubType>ASPXCodeBehind</SubType>
+    </Content>
+    <Content Include="umbraco.presentation\umbraco\actions\publish.aspx">
+      <SubType>ASPXCodeBehind</SubType>
+    </Content>
+    <Content Include="umbraco.presentation\umbraco\webservices\MacroContainerService.asmx" />
+    <Content Include="umbraco.presentation\umbraco\developer\Xslt\xsltVisualize.aspx" />
+    <Content Include="umbraco.presentation\umbraco\dialogs\empty.htm" />
+    <Content Include="umbraco.presentation\umbraco\dialogs\republish.aspx">
+      <SubType>ASPXCodeBehind</SubType>
+    </Content>
+    <Content Include="umbraco.presentation\umbraco\dialogs\search.aspx" />
+    <Content Include="umbraco.presentation\umbraco\dialogs\SendPublish.aspx" />
+    <Content Include="umbraco.presentation\umbraco\webservices\TreeClientService.asmx" />
+    <Content Include="umbraco.presentation\umbraco\members\search.aspx" />
+    <Content Include="umbraco.presentation\umbraco\translation\details.aspx" />
+    <Content Include="umbraco.presentation\umbraco\developer\Packages\editPackage.aspx">
+      <SubType>ASPXCodeBehind</SubType>
+    </Content>
+    <Content Include="umbraco.presentation\umbraco\dialogs\exportDocumenttype.aspx" />
+    <Content Include="umbraco.presentation\umbraco\dialogs\importDocumenttype.aspx" />
+    <Content Include="umbraco.presentation\umbraco\dialogs\rollBack.aspx">
+      <SubType>ASPXCodeBehind</SubType>
+    </Content>
+    <Content Include="umbraco.presentation\umbraco\dialogs\sendToTranslation.aspx" />
+    <Content Include="umbraco.presentation\umbraco\dialogs\viewAuditTrail.aspx" />
+    <Content Include="umbraco.presentation\umbraco\members\ViewMembers.aspx" />
+    <Content Include="umbraco.presentation\umbraco\plugins\tinymce3\tinymce3tinymceCompress.aspx" />
+    <None Include="app.config" />
+    <None Include="Web References\org.umbraco.our\repository.wsdl" />
+    <None Include="Web References\org.umbraco.update\UpgradeResult.datasource">
+      <DependentUpon>Reference.map</DependentUpon>
+    </None>
+    <None Include="Web References\org.umbraco.update\UpgradeResult1.datasource">
+      <DependentUpon>Reference.map</DependentUpon>
+    </None>
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings1.Designer.cs</LastGenOutput>
+    </None>
+    <Content Include="umbraco.presentation\umbraco\Search\QuickSearchHandler.ashx" />
+    <None Include="umbraco.presentation\umbraco\templateControls\InlineXslt.xsltTemplate" />
+    <Content Include="umbraco.presentation\umbraco\webservices\CheckForUpgrade.asmx" />
+    <Content Include="umbraco.presentation\umbraco\settings\DictionaryItemList.aspx">
+      <SubType>ASPXCodeBehind</SubType>
+    </Content>
+    <Content Include="umbraco.presentation\umbraco\translation\default.aspx" />
+    <Content Include="umbraco.presentation\umbraco\translation\preview.aspx" />
+    <Content Include="umbraco.presentation\umbraco\translation\xml.aspx" />
+    <Content Include="umbraco.presentation\umbraco\developer\Macros\assemblyBrowser.aspx" />
+    <Content Include="umbraco.presentation\umbraco\developer\Xslt\getXsltStatus.asmx" />
+    <Content Include="umbraco.presentation\umbraco\developer\Xslt\xsltChooseExtension.aspx" />
+    <Content Include="umbraco.presentation\umbraco\developer\Xslt\xsltInsertValueOf.aspx" />
+    <Content Include="umbraco.presentation\umbraco\members\EditMemberGroup.aspx">
+      <SubType>Form</SubType>
+    </Content>
+    <Content Include="umbraco.presentation\umbraco\schemas\umbraco.xsd">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="umbraco.presentation\umbraco\settings\editLanguage.aspx" />
+    <!--<Content Include="umbraco.presentation\umbraco\users\PermissionEditor.aspx" />-->
+    <Content Include="umbraco.presentation\umbraco\webservices\CacheRefresher.asmx">
+      <SubType>Form</SubType>
+    </Content>
+    <Content Include="umbraco.presentation\umbraco\webservices\CMSNode.asmx" />
+    <Content Include="umbraco.presentation\umbraco\webservices\codeEditorSave.asmx" />
+    <Content Include="umbraco.presentation\umbraco\webservices\legacyAjaxCalls.asmx" />
+    <Content Include="umbraco.presentation\umbraco\webservices\nodeSorter.asmx" />
+    <Content Include="umbraco.presentation\umbraco\webservices\progressStatus.asmx">
+      <SubType>Form</SubType>
+    </Content>
+    <Content Include="umbraco.presentation\umbraco\webservices\publication.asmx" />
+    <Content Include="umbraco.presentation\umbraco\webservices\TreeDataService.ashx" />
+    <None Include="umbraco.presentation\umbraco\Trees\Trees.cd" />
+    <None Include="umbraco.presentation\umbraco\Trees\XmlTree.xsd">
+      <SubType>
+      </SubType>
+    </None>
+    <None Include="umbraco.presentation\umbraco\Trees\XmlTree.xsx">
+      <DependentUpon>XmlTree.xsd</DependentUpon>
+    </None>
+    <Content Include="umbraco.presentation\umbraco\webservices\TagsAutoCompleteHandler.ashx" />
+    <None Include="Web References\org.umbraco.update\checkforupgrade.disco" />
+    <None Include="Web References\org.umbraco.update\checkforupgrade.wsdl" />
+    <None Include="Web References\org.umbraco.update\Reference.map">
+      <Generator>MSDiscoCodeGenerator</Generator>
+      <LastGenOutput>Reference.cs</LastGenOutput>
+    </None>
+    <EmbeddedResource Include="UI\JavaScript\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Mvc\Strings.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Strings.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Include="umbraco.presentation\umbraco\templateControls\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <None Include="umbraco.presentation\umbraco\schemas\package.xsd">
+      <SubType>
+      </SubType>
+    </None>
+    <None Include="umbraco.presentation\umbraco\schemas\package.xsx">
+      <DependentUpon>package.xsd</DependentUpon>
+    </None>
+    <None Include="umbraco.presentation\umbraco\schemas\umbraco.xsc">
+      <DependentUpon>umbraco.xsd</DependentUpon>
+    </None>
+    <None Include="umbraco.presentation\umbraco\schemas\umbraco.xss">
+      <DependentUpon>umbraco.xsd</DependentUpon>
+    </None>
+    <None Include="umbraco.presentation\umbraco\schemas\umbraco.xsx">
+      <DependentUpon>umbraco.xsd</DependentUpon>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <WebReferences Include="Web References\" />
+  </ItemGroup>
+  <ItemGroup>
+    <WebReferenceUrl Include="https://our.umbraco.com/umbraco/webservices/api/repository.asmx">
+      <UrlBehavior>Dynamic</UrlBehavior>
+      <RelPath>Web References\org.umbraco.our\</RelPath>
+      <UpdateFromURL>https://our.umbraco.com/umbraco/webservices/api/repository.asmx</UpdateFromURL>
+      <ServiceLocationURL>
+      </ServiceLocationURL>
+      <CachedDynamicPropName>
+      </CachedDynamicPropName>
+      <CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
+      <CachedSettingsPropName>umbraco_org_umbraco_our_Repository</CachedSettingsPropName>
+    </WebReferenceUrl>
+    <WebReferenceUrl Include="http://update.umbraco.org/checkforupgrade.asmx">
+      <UrlBehavior>Dynamic</UrlBehavior>
+      <RelPath>Web References\org.umbraco.update\</RelPath>
+      <UpdateFromURL>http://update.umbraco.org/checkforupgrade.asmx</UpdateFromURL>
+      <ServiceLocationURL>
+      </ServiceLocationURL>
+      <CachedDynamicPropName>
+      </CachedDynamicPropName>
+      <CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
+      <CachedSettingsPropName>umbraco_org_umbraco_update_CheckForUpgrade</CachedSettingsPropName>
+    </WebReferenceUrl>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="umbraco.presentation\umbraco\settings\scripts\" />
+  </ItemGroup>
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
+    <VSToolsPath Condition="exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v11.0\WebApplications\Microsoft.WebApplication.targets')">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v11.0</VSToolsPath>
+    <VSToolsPath Condition="exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v12.0\WebApplications\Microsoft.WebApplication.targets')">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v12.0</VSToolsPath>
+    <VSToolsPath Condition="exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v14.0\WebApplications\Microsoft.WebApplication.targets')">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v14.0</VSToolsPath>
+    <VSToolsPath Condition="exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets')">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0</VSToolsPath>
+  </PropertyGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
+  <ProjectExtensions />
+  <PropertyGroup>
+    <!--<PostBuildEvent>xcopy "$(ProjectDir)..\..\lib\*.dll" "$(TargetDir)*.dll" /Y</PostBuildEvent>-->
+  </PropertyGroup>
+  <Import Project="..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets" Condition="Exists('..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets')" />
 </Project>
\ No newline at end of file

From 60ed6f6b20f9830bebfa40933dd059fe94318ad4 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Mon, 24 Jun 2019 13:18:20 +0100
Subject: [PATCH 023/776] Remove snupkg aka newer Symbol nuget packages

---
 build/build.ps1 | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/build/build.ps1 b/build/build.ps1
index 55b686c98e..e4994d2c4a 100644
--- a/build/build.ps1
+++ b/build/build.ps1
@@ -15,7 +15,7 @@
     [Parameter(Mandatory=$false)]
     [Alias("doc")]
     [switch] $docfx = $false,
-	
+
     # keep the build directories, don't clear them
     [Parameter(Mandatory=$false)]
     [Alias("c")]
@@ -392,13 +392,13 @@
     &$this.BuildEnv.NuGet Pack "$nuspecs\UmbracoCms.Core.nuspec" `
         -Properties BuildTmp="$($this.BuildTemp)" `
         -Version "$($this.Version.Semver.ToString())" `
-        -Symbols -SymbolPackageFormat snupkg -Verbosity detailed -outputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.cmscore.log"
+        -Verbosity detailed -outputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.cmscore.log"
     if (-not $?) { throw "Failed to pack NuGet UmbracoCms.Core." }
 
     &$this.BuildEnv.NuGet Pack "$nuspecs\UmbracoCms.Web.nuspec" `
         -Properties BuildTmp="$($this.BuildTemp)" `
         -Version "$($this.Version.Semver.ToString())" `
-        -Symbols -SymbolPackageFormat snupkg -Verbosity detailed -outputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.cmsweb.log"
+        -Verbosity detailed -outputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.cmsweb.log"
     if (-not $?) { throw "Failed to pack NuGet UmbracoCms.Web." }
 
     &$this.BuildEnv.NuGet Pack "$nuspecs\UmbracoCms.nuspec" `
@@ -429,37 +429,37 @@
     Write-Host "Prepare Azure Gallery"
     $this.CopyFile("$($this.SolutionRoot)\build\Azure\azuregalleryrelease.ps1", $this.BuildOutput)
   })
-  
+
   $ubuild.DefineMethod("PrepareCSharpDocs",
   {
     Write-Host "Prepare C# Documentation"
-	
+
     $src = "$($this.SolutionRoot)\src"
       $tmp = $this.BuildTemp
       $out = $this.BuildOutput
     $DocFxJson = Join-Path -Path $src "\ApiDocs\docfx.json"
     $DocFxSiteOutput = Join-Path -Path $tmp "\_site\*.*"
-	
+
 
 	#restore nuget packages
 	$this.RestoreNuGet()
     # run DocFx
     $DocFx = $this.BuildEnv.DocFx
-    
+
     & $DocFx metadata $DocFxJson
     & $DocFx build $DocFxJson
 
     # zip it
     & $this.BuildEnv.Zip a -tzip -r "$out\csharp-docs.zip" $DocFxSiteOutput
   })
-  
+
   $ubuild.DefineMethod("PrepareAngularDocs",
   {
     Write-Host "Prepare Angular Documentation"
-	
+
     $src = "$($this.SolutionRoot)\src"
       $out = $this.BuildOutput
-    
+
     $this.CompileBelle()
 
     "Moving to Umbraco.Web.UI.Client folder"

From 966b07ba1c969934b322b0266a6a9e0e1abda015 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 24 Jun 2019 21:12:38 +0200
Subject: [PATCH 024/776] 
 https://umbraco.visualstudio.com/D-Team%20Tracker/_workitems/edit/1479 -
 Changed entity service to only return small model with media path. And
 updated media picker to use entity service when loading data.

---
 .../Repositories/EntityRepository.cs          | 1630 ++++++++---------
 src/Umbraco.Core/Services/EntityService.cs    | 1536 ++++++++--------
 src/Umbraco.Core/Services/IEntityService.cs   |  578 +++---
 src/Umbraco.Core/Services/IRelationService.cs |  604 +++---
 src/Umbraco.Core/Services/RelationService.cs  | 1488 ++++++++-------
 .../common/services/mediahelper.service.js    |   76 +-
 .../common/dialogs/mediapicker.controller.js  |  274 +--
 .../mediaPicker/mediapicker.controller.js     |   13 +-
 .../mediapicker/mediapicker.controller.js     |    2 +-
 .../Models/Mapping/PreValueDisplayResolver.cs |    1 +
 .../FilterAllowedOutgoingMediaAttribute.cs    |    2 +-
 src/umbraco.cms/businesslogic/web/Access.cs   | 1162 ++++++------
 12 files changed, 3569 insertions(+), 3797 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs b/src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
index f28b226932..495c0109ad 100644
--- a/src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
@@ -1,891 +1,747 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.EntityBase;
-using Umbraco.Core.Models.Rdbms;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
-using Umbraco.Core.Persistence.Factories;
-using Umbraco.Core.Persistence.Querying;
-using Umbraco.Core.Persistence.UnitOfWork;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    /// <summary>
-    /// Represents the EntityRepository used to query <see cref="IUmbracoEntity"/> objects.
-    /// </summary>
-    /// <remarks>
-    /// This is limited to objects that are based in the umbracoNode-table.
-    /// </remarks>
-    internal class EntityRepository : DisposableObjectSlim, IEntityRepository
-    {
-        private readonly IDatabaseUnitOfWork _work;
-
-        public EntityRepository(IDatabaseUnitOfWork work)
-		{
-		    _work = work;
-		}
-
-        /// <summary>
-        /// Returns the Unit of Work added to the repository
-        /// </summary>
-        protected internal IDatabaseUnitOfWork UnitOfWork
-        {
-            get { return _work; }
-        }
-
-        /// <summary>
-        /// Internal for testing purposes
-        /// </summary>
-        internal Guid UnitKey
-        {
-            get { return (Guid)_work.Key; }
-        }
-
-        #region Query Methods
-
-        public IEnumerable<IUmbracoEntity> GetPagedResultsByQuery(IQuery<IUmbracoEntity> query, Guid objectTypeId, long pageIndex, int pageSize, out long totalRecords,
-            string orderBy, Direction orderDirection, IQuery<IUmbracoEntity> filter = null)
-        {   
-            bool isContent = objectTypeId == Constants.ObjectTypes.DocumentGuid || objectTypeId == Constants.ObjectTypes.DocumentBlueprintGuid;
-            bool isMedia = objectTypeId == Constants.ObjectTypes.MediaGuid;
-            var factory = new UmbracoEntityFactory();
-            
-            var sqlClause = GetBaseWhere(GetBase, isContent, isMedia, sql =>
-            {
-                if (filter != null)
-                {
-                    foreach (var filterClause in filter.GetWhereClauses())
-                    {
-                        sql.Where(filterClause.Item1, filterClause.Item2);
-                    }
-                }
-            }, objectTypeId);
-            var translator = new SqlTranslator<IUmbracoEntity>(sqlClause, query);
-            var entitySql = translator.Translate();
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
+using Umbraco.Core.Persistence.Factories;
+using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Persistence.UnitOfWork;
+
+namespace Umbraco.Core.Persistence.Repositories
+{
+    /// <summary>
+    /// Represents the EntityRepository used to query <see cref="IUmbracoEntity"/> objects.
+    /// </summary>
+    /// <remarks>
+    /// This is limited to objects that are based in the umbracoNode-table.
+    /// </remarks>
+    internal class EntityRepository : DisposableObjectSlim, IEntityRepository
+    {
+        private readonly IDatabaseUnitOfWork _work;
+
+        public EntityRepository(IDatabaseUnitOfWork work)
+		{
+		    _work = work;
+		}
+
+        /// <summary>
+        /// Returns the Unit of Work added to the repository
+        /// </summary>
+        protected internal IDatabaseUnitOfWork UnitOfWork
+        {
+            get { return _work; }
+        }
+
+        /// <summary>
+        /// Internal for testing purposes
+        /// </summary>
+        internal Guid UnitKey
+        {
+            get { return (Guid)_work.Key; }
+        }
+
+        #region Query Methods
+
+        public IEnumerable<IUmbracoEntity> GetPagedResultsByQuery(IQuery<IUmbracoEntity> query, Guid objectTypeId, long pageIndex, int pageSize, out long totalRecords,
+            string orderBy, Direction orderDirection, IQuery<IUmbracoEntity> filter = null)
+        {
+            bool isContent = objectTypeId == Constants.ObjectTypes.DocumentGuid || objectTypeId == Constants.ObjectTypes.DocumentBlueprintGuid;
+            bool isMedia = objectTypeId == Constants.ObjectTypes.MediaGuid;
+            var factory = new UmbracoEntityFactory();
+
+            var sqlClause = GetBaseWhere(GetBase, isContent, isMedia, sql =>
+            {
+                if (filter != null)
+                {
+                    foreach (var filterClause in filter.GetWhereClauses())
+                    {
+                        sql.Where(filterClause.Item1, filterClause.Item2);
+                    }
+                }
+            }, objectTypeId);
+            var translator = new SqlTranslator<IUmbracoEntity>(sqlClause, query);
+            var entitySql = translator.Translate();
             var pagedSql = entitySql.Append(GetGroupBy(isContent, isMedia, false));
             pagedSql = (orderDirection == Direction.Descending) ? pagedSql.OrderByDescending("umbracoNode.id") : pagedSql.OrderBy("umbracoNode.id");
-
-            IEnumerable<IUmbracoEntity> result;
-
-            if (isMedia)
-            {
-                //Treat media differently for now, as an Entity it will be returned with ALL of it's properties in the AdditionalData bag!
-                var pagedResult = _work.Database.Page<dynamic>(pageIndex + 1, pageSize, pagedSql);
-                
-                var ids = pagedResult.Items.Select(x => (int) x.id).InGroupsOf(2000);
-                var entities = pagedResult.Items.Select(factory.BuildEntityFromDynamic).Cast<IUmbracoEntity>().ToList();
-
-                //Now we need to merge in the property data since we need paging and we can't do this the way that the big media query was working before
-                foreach (var idGroup in ids)
-                {
-                    var propSql = GetPropertySql(Constants.ObjectTypes.Media)
+
+            IEnumerable<IUmbracoEntity> result;
+
+            if (isMedia)
+            {
+                //Treat media differently for now, as an Entity it will be returned with ALL of it's properties in the AdditionalData bag!
+                var pagedResult = _work.Database.Page<dynamic>(pageIndex + 1, pageSize, pagedSql);
+
+                var ids = pagedResult.Items.Select(x => (int) x.id).InGroupsOf(2000);
+                var entities = pagedResult.Items.Select(factory.BuildEntityFromDynamic).Cast<IUmbracoEntity>().ToList();
+
+                //Now we need to merge in the property data since we need paging and we can't do this the way that the big media query was working before
+                foreach (var idGroup in ids)
+                {
+                    var propSql = GetPropertySql(Constants.ObjectTypes.Media)
                         .Where("contentNodeId IN (@ids)", new { ids = idGroup });
                     propSql = (orderDirection == Direction.Descending) ? propSql.OrderByDescending("contentNodeId") : propSql.OrderBy("contentNodeId");
-
-                    //This does NOT fetch all data into memory in a list, this will read
-                    // over the records as a data reader, this is much better for performance and memory,
-                    // but it means that during the reading of this data set, nothing else can be read
-                    // from SQL server otherwise we'll get an exception.
-                    var allPropertyData = _work.Database.Query<dynamic>(propSql);
-
-                    //keep track of the current property data item being enumerated
-                    var propertyDataSetEnumerator = allPropertyData.GetEnumerator();
-                    var hasCurrent = false; // initially there is no enumerator.Current
-
-                    try
-                    {
-                        //This must be sorted by node id (which is done by SQL) because this is how we are sorting the query to lookup property types above,
-                        // which allows us to more efficiently iterate over the large data set of property values.
-                        foreach (var entity in entities)
-                        {
-                            // assemble the dtos for this def
-                            // use the available enumerator.Current if any else move to next
-                            while (hasCurrent || propertyDataSetEnumerator.MoveNext())
-                            {
-                                if (propertyDataSetEnumerator.Current.contentNodeId == entity.Id)
-                                {
-                                    hasCurrent = false; // enumerator.Current is not available
-
-                                    //the property data goes into the additional data
-                                    entity.AdditionalData[propertyDataSetEnumerator.Current.propertyTypeAlias] = new UmbracoEntity.EntityProperty
-                                    {
-                                        PropertyEditorAlias = propertyDataSetEnumerator.Current.propertyEditorAlias,
-                                        Value = StringExtensions.IsNullOrWhiteSpace(propertyDataSetEnumerator.Current.dataNtext)
-                                            ? propertyDataSetEnumerator.Current.dataNvarchar
-                                            : StringExtensions.ConvertToJsonIfPossible(propertyDataSetEnumerator.Current.dataNtext)
-                                    };
-                                }
-                                else
-                                {
-                                    hasCurrent = true; // enumerator.Current is available for another def
-                                    break; // no more propertyDataDto for this def
-                                }
-                            }
-                        }
-                    }
-                    finally
-                    {
-                        propertyDataSetEnumerator.Dispose();
-                    }
-                }
-                
-                result = entities;
-            }
-            else
-            {   
-                var pagedResult = _work.Database.Page<dynamic>(pageIndex + 1, pageSize, pagedSql);
-                result = pagedResult.Items.Select(factory.BuildEntityFromDynamic).Cast<IUmbracoEntity>().ToList();
-            }
-
-            //The total items from the PetaPoco page query will be wrong due to the Outer join used on parent, depending on the search this will 
-            //return duplicate results when the COUNT is used in conjuction with it, so we need to get the total on our own.
-
-            //generate a query that does not contain the LEFT Join for parent, this would cause
-            //the COUNT(*) query to return the wrong 
-            var sqlCountClause = GetBaseWhere(
-                (isC, isM, f) => GetBase(isC, isM, f, true), //true == is a count query
-                isContent, isMedia, sql =>
-                {
-                    if (filter != null)
-                    {
-                        foreach (var filterClause in filter.GetWhereClauses())
-                        {
-                            sql.Where(filterClause.Item1, filterClause.Item2);
-                        }
-                    }
-                }, objectTypeId);
-            var translatorCount = new SqlTranslator<IUmbracoEntity>(sqlCountClause, query);
-            var countSql = translatorCount.Translate();
-
-            totalRecords = _work.Database.ExecuteScalar<int>(countSql);
-
-            return result;
-        }
-
-        public IUmbracoEntity GetByKey(Guid key)
-        {
-            var sql = GetBaseWhere(GetBase, false, false, key);
-            var nodeDto = _work.Database.FirstOrDefault<dynamic>(sql);
-            if (nodeDto == null)
-                return null;
-
-            var factory = new UmbracoEntityFactory();
-            var entity = factory.BuildEntityFromDynamic(nodeDto);
-
-            return entity;
-        }
-
-        public IUmbracoEntity GetByKey(Guid key, Guid objectTypeId)
-        {
-            bool isContent = objectTypeId == Constants.ObjectTypes.DocumentGuid || objectTypeId == Constants.ObjectTypes.DocumentBlueprintGuid;
-            bool isMedia = objectTypeId == Constants.ObjectTypes.MediaGuid;
-
-            var sql = GetFullSqlForEntityType(key, isContent, isMedia, objectTypeId);
-
-            var factory = new UmbracoEntityFactory();
-
-            if (isMedia)
-            {
-                //for now treat media differently and include all property data too  
-                var entities = _work.Database.Fetch<dynamic, UmbracoPropertyDto, UmbracoEntity>(
-                    new UmbracoEntityRelator().Map, sql);
-
-                return entities.FirstOrDefault();
-            }
-            else
-            {
-
-                //query = read forward data reader, do not load everything into mem
-                var dtos = _work.Database.Query<dynamic>(sql);
-                var collection = new EntityDefinitionCollection();
-                foreach (var dto in dtos)
-                {
-                    collection.AddOrUpdate(new EntityDefinition(factory, dto, isContent, false));
-                }
-                var found = collection.FirstOrDefault();
-                return found != null ? found.BuildFromDynamic() : null;                
-            }
-            
-            
-        }
-
-        public virtual IUmbracoEntity Get(int id)
-        {
-            var sql = GetBaseWhere(GetBase, false, false, id);
-            var nodeDto = _work.Database.FirstOrDefault<dynamic>(sql);
-            if (nodeDto == null)
-                return null;
-
-            var factory = new UmbracoEntityFactory();
-            var entity = factory.BuildEntityFromDynamic(nodeDto);
-
-            return entity;
-        }
-
-        public virtual IUmbracoEntity Get(int id, Guid objectTypeId)
-        {
-            bool isContent = objectTypeId == Constants.ObjectTypes.DocumentGuid || objectTypeId == Constants.ObjectTypes.DocumentBlueprintGuid;
-            bool isMedia = objectTypeId == Constants.ObjectTypes.MediaGuid;
-
-            var sql = GetFullSqlForEntityType(id, isContent, isMedia, objectTypeId);
-
-            var factory = new UmbracoEntityFactory();
-
-            if (isMedia)
-            {
-                //for now treat media differently and include all property data too  
-                var entities = _work.Database.Fetch<dynamic, UmbracoPropertyDto, UmbracoEntity>(
-                    new UmbracoEntityRelator().Map, sql);
-
-                return entities.FirstOrDefault();
-            }
-            else
-            {                
-                //query = read forward data reader, do not load everything into mem
-                var dtos = _work.Database.Query<dynamic>(sql);
-                var collection = new EntityDefinitionCollection();
-                foreach (var dto in dtos)
-                {
-                    collection.AddOrUpdate(new EntityDefinition(factory, dto, isContent, false));
-                }
-                var found = collection.FirstOrDefault();
-                return found != null ? found.BuildFromDynamic() : null;
-            }
-        }
-
-        public virtual IEnumerable<IUmbracoEntity> GetAll(Guid objectTypeId, params int[] ids)
-        {
-            return ids.Any() 
-                ? PerformGetAll(objectTypeId, sql => sql.Where(" umbracoNode.id in (@ids)", new { ids })) 
-                : PerformGetAll(objectTypeId);
-        }
-
-        public virtual IEnumerable<IUmbracoEntity> GetAll(Guid objectTypeId, params Guid[] keys)
-        {
-            return keys.Any() 
-                ? PerformGetAll(objectTypeId, sql => sql.Where(" umbracoNode.uniqueID in (@keys)", new { keys })) 
-                : PerformGetAll(objectTypeId);
-        }
-
-        private IEnumerable<IUmbracoEntity> PerformGetAll(Guid objectTypeId, Action<Sql> filter = null)
-        {
-            var isContent = objectTypeId == Constants.ObjectTypes.DocumentGuid || objectTypeId == Constants.ObjectTypes.DocumentBlueprintGuid;
-            var isMedia = objectTypeId == Constants.ObjectTypes.MediaGuid;
-            var sql = GetFullSqlForEntityType(isContent, isMedia, objectTypeId, filter);
-
-            var factory = new UmbracoEntityFactory();
-
-            if (isMedia)
-            {
-                //for now treat media differently and include all property data too                
-                var entities = _work.Database.Fetch<dynamic, UmbracoPropertyDto, UmbracoEntity>(
-                    new UmbracoEntityRelator().Map, sql);
-                return entities;
-            }
-            else
-            {
-                //query = read forward data reader, do not load everything into mem
-                var dtos = _work.Database.Query<dynamic>(sql);
-                var collection = new EntityDefinitionCollection();
-                foreach (var dto in dtos)
-                {
-                    collection.AddOrUpdate(new EntityDefinition(factory, dto, isContent, false));
-                }
-                return collection.Select(x => x.BuildFromDynamic()).ToList();                
-            }
-        }
-
-        public virtual IEnumerable<EntityPath> GetAllPaths(Guid objectTypeId, params int[] ids)
-        {
-            return ids.Any()
-                ? PerformGetAllPaths(objectTypeId, sql => sql.Append(" AND umbracoNode.id in (@ids)", new { ids }))
-                : PerformGetAllPaths(objectTypeId);
-        }
-
-        public virtual IEnumerable<EntityPath> GetAllPaths(Guid objectTypeId, params Guid[] keys)
-        {
-            return keys.Any()
-                ? PerformGetAllPaths(objectTypeId, sql => sql.Append(" AND umbracoNode.uniqueID in (@keys)", new { keys }))
-                : PerformGetAllPaths(objectTypeId);
-        }
-
-        private IEnumerable<EntityPath> PerformGetAllPaths(Guid objectTypeId, Action<Sql> filter = null)
-        {
-            var sql = new Sql("SELECT id, path FROM umbracoNode WHERE umbracoNode.nodeObjectType=@type", new { type = objectTypeId });
-            if (filter != null) filter(sql);
-            return _work.Database.Fetch<EntityPath>(sql);
-        }
-
-        public virtual IEnumerable<IUmbracoEntity> GetByQuery(IQuery<IUmbracoEntity> query)
-        {
-            var sqlClause = GetBase(false, false, null);
-            var translator = new SqlTranslator<IUmbracoEntity>(sqlClause, query);
-            var sql = translator.Translate().Append(GetGroupBy(false, false));
-
-            var dtos = _work.Database.Fetch<dynamic>(sql);
-
-            var factory = new UmbracoEntityFactory();
-            var list = dtos.Select(factory.BuildEntityFromDynamic).Cast<IUmbracoEntity>().ToList();
-
-            return list;
-        }
-
-        /// <summary>
-        /// Gets entities by query.
-        /// </summary>
-        /// <param name="query"></param>
-        /// <param name="objectTypeId"></param>
-        /// <returns></returns>
-        /// <remarks>
-        /// Note that this will also fetch all property data for media items, which can cause performance problems
-        /// when used without paging, in sites with large amounts of data in cmsPropertyData.
-        /// </remarks>
-        public virtual IEnumerable<IUmbracoEntity> GetByQuery(IQuery<IUmbracoEntity> query, Guid objectTypeId)
-        {
-            var isContent = objectTypeId == Constants.ObjectTypes.DocumentGuid || objectTypeId == Constants.ObjectTypes.DocumentBlueprintGuid;
-            var isMedia = objectTypeId == Constants.ObjectTypes.MediaGuid;
-
-            var sqlClause = GetBaseWhere(GetBase, isContent, isMedia, null, objectTypeId);
-
-            var translator = new SqlTranslator<IUmbracoEntity>(sqlClause, query);
-            var entitySql = translator.Translate();
-
-            var factory = new UmbracoEntityFactory();
-
-            if (isMedia)
-            {
-                var wheres = query.GetWhereClauses().ToArray();
-
-                var mediaSql = GetFullSqlForMedia(entitySql.Append(GetGroupBy(isContent, true, false)), sql =>
-                {
-                    //adds the additional filters
-                    foreach (var whereClause in wheres)
-                    {
-                        sql.Where(whereClause.Item1, whereClause.Item2);
-                    }
-                });
-
-                //for now treat media differently and include all property data too    
-                var entities = _work.Database.Fetch<dynamic, UmbracoPropertyDto, UmbracoEntity>(
-                    new UmbracoEntityRelator().Map, mediaSql);
-                return entities;
-            }
-            else
-            {
-                return GetByQueryInternal(entitySql, isContent, isMedia);
-            }
-        }
-
-        /// <summary>
-        /// Gets entities by query without fetching property data.
-        /// </summary>
-        /// <param name="query"></param>
-        /// <param name="objectTypeId"></param>
-        /// <returns></returns>
-        /// <remarks>
-        /// This is supposed to be internal and can be used when getting all entities without paging, without causing
-        /// performance issues.
-        /// </remarks>
-        internal IEnumerable<IUmbracoEntity> GetMediaByQueryWithoutPropertyData(IQuery<IUmbracoEntity> query)
-        {
-            var sqlClause = GetBaseWhere(GetBase, false, true, null, UmbracoObjectTypes.Media.GetGuid());
-
-            var translator = new SqlTranslator<IUmbracoEntity>(sqlClause, query);
-            var entitySql = translator.Translate();
-
-            return GetByQueryInternal(entitySql, false, true);
-        }
-
-        internal IEnumerable<IUmbracoEntity> GetByQueryInternal(Sql entitySql, bool isContent, bool isMedia)
-        {
-            var factory = new UmbracoEntityFactory();
-
-            //use dynamic so that we can get ALL properties from the SQL so we can chuck that data into our AdditionalData
-            var finalSql = entitySql.Append(GetGroupBy(isContent, isMedia));
-
-            //query = read forward data reader, do not load everything into mem
-            var dtos = _work.Database.Query<dynamic>(finalSql);
-            var collection = new EntityDefinitionCollection();
-            foreach (var dto in dtos)
-            {
-                collection.AddOrUpdate(new EntityDefinition(factory, dto, isContent, isMedia));
-            }
-            return collection.Select(x => x.BuildFromDynamic()).ToList();
-        }
-
-        #endregion
-
-
-        #region Sql Statements
-
-        protected Sql GetFullSqlForEntityType(Guid key, bool isContent, bool isMedia, Guid objectTypeId)
-        {
-            var entitySql = GetBaseWhere(GetBase, isContent, isMedia, objectTypeId, key);
-
-            if (isMedia == false) return entitySql.Append(GetGroupBy(isContent, false));
-
-            return GetFullSqlForMedia(entitySql.Append(GetGroupBy(isContent, true, false)));
-        }
-
-        protected Sql GetFullSqlForEntityType(int id, bool isContent, bool isMedia, Guid objectTypeId)
-        {
-            var entitySql = GetBaseWhere(GetBase, isContent, isMedia, objectTypeId, id);
-
-            if (isMedia == false) return entitySql.Append(GetGroupBy(isContent, false));
-
-            return GetFullSqlForMedia(entitySql.Append(GetGroupBy(isContent, true, false)));
-        }
-
-        protected Sql GetFullSqlForEntityType(bool isContent, bool isMedia, Guid objectTypeId, Action<Sql> filter)
-        {
-            var entitySql = GetBaseWhere(GetBase, isContent, isMedia, filter, objectTypeId);
-
-            if (isMedia == false) return entitySql.Append(GetGroupBy(isContent, false));
-
-            return GetFullSqlForMedia(entitySql.Append(GetGroupBy(isContent, true, false)), filter);
-        }
-
-        private Sql GetPropertySql(string nodeObjectType)
-        {
-            var sql = new Sql()
-                .Select("contentNodeId, versionId, dataNvarchar, dataNtext, propertyEditorAlias, alias as propertyTypeAlias")
-                .From<PropertyDataDto>()
-                .InnerJoin<NodeDto>()
-                .On<PropertyDataDto, NodeDto>(dto => dto.NodeId, dto => dto.NodeId)
-                .InnerJoin<PropertyTypeDto>()
-                .On<PropertyTypeDto, PropertyDataDto>(dto => dto.Id, dto => dto.PropertyTypeId)
-                .InnerJoin<DataTypeDto>()
-                .On<PropertyTypeDto, DataTypeDto>(dto => dto.DataTypeId, dto => dto.DataTypeId)
-                .Where("umbracoNode.nodeObjectType = @nodeObjectType", new { nodeObjectType = nodeObjectType });
-
-            return sql;
-        }
-
-        private Sql GetFullSqlForMedia(Sql entitySql, Action<Sql> filter = null)
-        {
-            //this will add any dataNvarchar property to the output which can be added to the additional properties
-
-            var joinSql = GetPropertySql(Constants.ObjectTypes.Media);
-
-            if (filter != null)
-            {
-                filter(joinSql);
-            }
-
-            //We're going to create a query to query against the entity SQL 
-            // because we cannot group by nText columns and we have a COUNT in the entitySql we cannot simply left join
-            // the entitySql query, we have to join the wrapped query to get the ntext in the result
-            
-            var wrappedSql = new Sql("SELECT * FROM (")
-                .Append(entitySql)
-                .Append(new Sql(") tmpTbl LEFT JOIN ("))
-                .Append(joinSql)
-                .Append(new Sql(") as property ON id = property.contentNodeId"))
-                .OrderBy("sortOrder, id");
-
-            return wrappedSql;
-        }
-
-        protected virtual Sql GetBase(bool isContent, bool isMedia, Action<Sql> customFilter)
-        {
-            return GetBase(isContent, isMedia, customFilter, false);
-        }
-
-        protected virtual Sql GetBase(bool isContent, bool isMedia, Action<Sql> customFilter, bool isCount)
-        {
-            var columns = new List<object>();
-            if (isCount)
-            {
-                columns.Add("COUNT(*)");
-            }
-            else
-            {
-                columns.AddRange(new List<object>
-                {
-                    "umbracoNode.id",
-                    "umbracoNode.trashed",
-                    "umbracoNode.parentID",
-                    "umbracoNode.nodeUser",
-                    "umbracoNode.level",
-                    "umbracoNode.path",
-                    "umbracoNode.sortOrder",
-                    "umbracoNode.uniqueID",
-                    "umbracoNode.text",
-                    "umbracoNode.nodeObjectType",
-                    "umbracoNode.createDate",
-                    "COUNT(parent.parentID) as children"
-                });
-
-                if (isContent || isMedia)
-                {
-                    if (isContent)
-                    {
-                        //only content has/needs this info
-                        columns.Add("published.versionId as publishedVersion");
-                        columns.Add("document.versionId as newestVersion");
-                        columns.Add("contentversion.id as versionId");
-                    }
-
-                    columns.Add("contenttype.alias");
-                    columns.Add("contenttype.icon");
-                    columns.Add("contenttype.thumbnail");
-                    columns.Add("contenttype.isContainer");
-                }
-            }
-
-            //Creates an SQL query to return a single row for the entity
-
-            var entitySql = new Sql()
-                .Select(columns.ToArray())
-                .From("umbracoNode umbracoNode");
-
-            if (isContent || isMedia)
-            {
-                entitySql.InnerJoin("cmsContent content").On("content.nodeId = umbracoNode.id");
-
-                if (isContent)
-                {
-                    //only content has/needs this info
-                    entitySql                        
-                        .InnerJoin("cmsDocument document").On("document.nodeId = umbracoNode.id")
-                        .InnerJoin("cmsContentVersion contentversion").On("contentversion.VersionId = document.versionId")
-                        .LeftJoin("(SELECT nodeId, versionId FROM cmsDocument WHERE published = 1) as published")
-                        .On("umbracoNode.id = published.nodeId");
-                }
-
-                entitySql.LeftJoin("cmsContentType contenttype").On("contenttype.nodeId = content.contentType");                
-            }
-
-            if (isCount == false)
-            {
-                entitySql.LeftJoin("umbracoNode parent").On("parent.parentID = umbracoNode.id");
-            }
-
-            if (customFilter != null)
-            {
-                customFilter(entitySql);
-            }
-
-            return entitySql;
-        }
-
-        protected virtual Sql GetBaseWhere(Func<bool, bool, Action<Sql>, Sql> baseQuery, bool isContent, bool isMedia, Action<Sql> filter, Guid nodeObjectType)
-        {
-            var sql = baseQuery(isContent, isMedia, filter)
-                .Where("umbracoNode.nodeObjectType = @NodeObjectType", new { NodeObjectType = nodeObjectType });
-
-            if (isContent)
-            {
-                sql.Where("document.newest = 1");
-            }
-
-            return sql;
-        }
-
-        protected virtual Sql GetBaseWhere(Func<bool, bool, Action<Sql>, Sql> baseQuery, bool isContent, bool isMedia, int id)
-        {
-            var sql = baseQuery(isContent, isMedia, null)
-                .Where("umbracoNode.id = @Id", new { Id = id });
-
-            if (isContent)
-            {
-                sql.Where("document.newest = 1");
-            }
-
-            sql.Append(GetGroupBy(isContent, isMedia));
-
-            return sql;
-        }
-
-        protected virtual Sql GetBaseWhere(Func<bool, bool, Action<Sql>, Sql> baseQuery, bool isContent, bool isMedia, Guid key)
-        {
-            var sql = baseQuery(isContent, isMedia, null)
-                .Where("umbracoNode.uniqueID = @UniqueID", new {UniqueID = key});
-
-            if (isContent)
-            {
-                sql.Where("document.newest = 1");
-            }
-
-            sql.Append(GetGroupBy(isContent, isMedia));
-
-            return sql;
-        }
-
-        protected virtual Sql GetBaseWhere(Func<bool, bool, Action<Sql>, Sql> baseQuery, bool isContent, bool isMedia, Guid nodeObjectType, int id)
-        {
-            var sql = baseQuery(isContent, isMedia, null)
-                .Where("umbracoNode.id = @Id AND umbracoNode.nodeObjectType = @NodeObjectType",
-                       new {Id = id, NodeObjectType = nodeObjectType});
-
-            if (isContent)
-            {
-                sql.Where("document.newest = 1");
-            }
-
-            return sql;
-        }
-
-        protected virtual Sql GetBaseWhere(Func<bool, bool, Action<Sql>, Sql> baseQuery, bool isContent, bool isMedia, Guid nodeObjectType, Guid key)
-        {
-            var sql = baseQuery(isContent, isMedia, null)
-                .Where("umbracoNode.uniqueID = @UniqueID AND umbracoNode.nodeObjectType = @NodeObjectType",
-                       new { UniqueID = key, NodeObjectType = nodeObjectType });
-
-            if (isContent)
-            {
-                sql.Where("document.newest = 1");
-            }
-
-            return sql;
-        }
-
-        protected virtual Sql GetGroupBy(bool isContent, bool isMedia, bool includeSort = true)
-        {
-            var columns = new List<object>
-            {
-                "umbracoNode.id",
-                "umbracoNode.trashed",
-                "umbracoNode.parentID",
-                "umbracoNode.nodeUser",
-                "umbracoNode.level",
-                "umbracoNode.path",
-                "umbracoNode.sortOrder",
-                "umbracoNode.uniqueID",
-                "umbracoNode.text",
-                "umbracoNode.nodeObjectType",
-                "umbracoNode.createDate"
-            };
-
-            if (isContent || isMedia)
-            {
-                if (isContent)
-                {
-                    columns.Add("published.versionId");
-                    columns.Add("document.versionId");
-                    columns.Add("contentversion.id");
-                }
-                columns.Add("contenttype.alias");
-                columns.Add("contenttype.icon");
-                columns.Add("contenttype.thumbnail");
-                columns.Add("contenttype.isContainer");                
-            }
-
-            var sql = new Sql()
-                .GroupBy(columns.ToArray());
-
-            if (includeSort)
-            {
-                sql = sql.OrderBy("umbracoNode.sortOrder");
-            }
-
-            return sql;
-        }
-
-        #endregion
-
-        /// <summary>
-        /// Dispose disposable properties
-        /// </summary>
-        /// <remarks>
-        /// Ensure the unit of work is disposed
-        /// </remarks>
-        protected override void DisposeResources()
-        {
-            UnitOfWork.DisposeIfDisposable();
-        }
-
-        public bool Exists(Guid key)
-        {
-            var sql = new Sql().Select("COUNT(*)").From("umbracoNode").Where("uniqueID=@uniqueID", new {uniqueID = key});
-            return _work.Database.ExecuteScalar<int>(sql) > 0;            
-        }
-
-        public bool Exists(int id)
-        {
-            var sql = new Sql().Select("COUNT(*)").From("umbracoNode").Where("id=@id", new { id = id });
-            return _work.Database.ExecuteScalar<int>(sql) > 0;
-        }
-
-        #region private classes
-        
-        [ExplicitColumns]
-        internal class UmbracoPropertyDto
-        {
-            [Column("propertyEditorAlias")]
-            public string PropertyEditorAlias { get; set; }
-
-            [Column("propertyTypeAlias")]
-            public string PropertyAlias { get; set; }
-
-            [Column("dataNvarchar")]
-            public string NVarcharValue { get; set; }
-
-            [Column("dataNtext")]
-            public string NTextValue { get; set; }
-        }
-
-        /// <summary>
-        /// This is a special relator in that it is not returning a DTO but a real resolved entity and that it accepts
-        /// a dynamic instance.
-        /// </summary>
-        /// <remarks>
-        /// We're doing this because when we query the db, we want to use dynamic so that it returns all available fields not just the ones
-        ///     defined on the entity so we can them to additional data
-        /// </remarks>
-        internal class UmbracoEntityRelator
-        {
-            internal UmbracoEntity Current;
-            private readonly UmbracoEntityFactory _factory = new UmbracoEntityFactory();
-
-            internal UmbracoEntity Map(dynamic a, UmbracoPropertyDto p)
-            {
-                // Terminating call.  Since we can return null from this function
-                // we need to be ready for PetaPoco to callback later with null
-                // parameters
-                if (a == null)
-                    return Current;
-
-                // Is this the same UmbracoEntity as the current one we're processing
-                if (Current != null && Current.Key == a.uniqueID)
-                {
-                    if (p != null && p.PropertyAlias.IsNullOrWhiteSpace() == false)
-                    {
-                        // Add this UmbracoProperty to the current additional data
-                        Current.AdditionalData[p.PropertyAlias] = new UmbracoEntity.EntityProperty
-                        {
-                            PropertyEditorAlias = p.PropertyEditorAlias,
-                            Value = p.NTextValue.IsNullOrWhiteSpace()
-                                ? p.NVarcharValue
-                                : p.NTextValue.ConvertToJsonIfPossible()
-                        };    
-                    }
-
-                    // Return null to indicate we're not done with this UmbracoEntity yet
-                    return null;
-                }
-
-                // This is a different UmbracoEntity to the current one, or this is the 
-                // first time through and we don't have a Tab yet
-
-                // Save the current UmbracoEntityDto
-                var prev = Current;
-
-                // Setup the new current UmbracoEntity
-                
-                Current = _factory.BuildEntityFromDynamic(a);
-
-                if (p != null && p.PropertyAlias.IsNullOrWhiteSpace() == false)
-                {
-                    //add the property/create the prop list if null
-                    Current.AdditionalData[p.PropertyAlias] = new UmbracoEntity.EntityProperty
-                    {
-                        PropertyEditorAlias = p.PropertyEditorAlias,
-                        Value = p.NTextValue.IsNullOrWhiteSpace()
-                            ? p.NVarcharValue
-                            : p.NTextValue.ConvertToJsonIfPossible()
-                    };
-                }
-
-                // Return the now populated previous UmbracoEntity (or null if first time through)
-                return prev;
-            }
-        }
-
-        private class EntityDefinitionCollection : KeyedCollection<int, EntityDefinition>
-        {
-            protected override int GetKeyForItem(EntityDefinition item)
-            {
-                return item.Id;
-            }
-
-            /// <summary>
-            /// if this key already exists if it does then we need to check
-            /// if the existing item is 'older' than the new item and if that is the case we'll replace the older one
-            /// </summary>
-            /// <param name="item"></param>
-            /// <returns></returns>
-            public bool AddOrUpdate(EntityDefinition item)
-            {
-                if (Dictionary == null)
-                {
-                    base.Add(item);
-                    return true;
-                }
-
-                var key = GetKeyForItem(item);
-                EntityDefinition found;
-                if (TryGetValue(key, out found))
-                {
-                    //it already exists and it's older so we need to replace it
-                    if (item.VersionId > found.VersionId)
-                    {
-                        var currIndex = Items.IndexOf(found);
-                        if (currIndex == -1)
-                            throw new IndexOutOfRangeException("Could not find the item in the list: " + found.Id);
-
-                        //replace the current one with the newer one
-                        SetItem(currIndex, item);
-                        return true;
-                    }
-                    //could not add or update
-                    return false;
-                }
-
-                base.Add(item);
-                return true;
-            }
-
-            private bool TryGetValue(int key, out EntityDefinition val)
-            {
-                if (Dictionary == null)
-                {
-                    val = null;
-                    return false;
-                }
-                return Dictionary.TryGetValue(key, out val);
-            }
-        }
-
-        private class EntityDefinition
-        {
-            private readonly UmbracoEntityFactory _factory;
-            private readonly dynamic _entity;
-            private readonly bool _isContent;
-            private readonly bool _isMedia;
-
-            public EntityDefinition(UmbracoEntityFactory factory, dynamic entity, bool isContent, bool isMedia)
-            {
-                _factory = factory;
-                _entity = entity;
-                _isContent = isContent;
-                _isMedia = isMedia;
-            }
-
-            public IUmbracoEntity BuildFromDynamic()
-            {
-                return _factory.BuildEntityFromDynamic(_entity);
-            }
-
-            public int Id
-            {
-                get { return _entity.id; }
-            }
-
-            public int VersionId
-            {
-                get
-                {
-                    if (_isContent || _isMedia)
-                    {
-                        return _entity.versionId;
-                    }
-                    return _entity.id;
-                }
-            }
-        }
-        #endregion
-    }
-}
+
+                    //This does NOT fetch all data into memory in a list, this will read
+                    // over the records as a data reader, this is much better for performance and memory,
+                    // but it means that during the reading of this data set, nothing else can be read
+                    // from SQL server otherwise we'll get an exception.
+                    var allPropertyData = _work.Database.Query<dynamic>(propSql);
+
+                    //keep track of the current property data item being enumerated
+                    var propertyDataSetEnumerator = allPropertyData.GetEnumerator();
+                    var hasCurrent = false; // initially there is no enumerator.Current
+
+                    try
+                    {
+                        //This must be sorted by node id (which is done by SQL) because this is how we are sorting the query to lookup property types above,
+                        // which allows us to more efficiently iterate over the large data set of property values.
+                        foreach (var entity in entities)
+                        {
+                            // assemble the dtos for this def
+                            // use the available enumerator.Current if any else move to next
+                            while (hasCurrent || propertyDataSetEnumerator.MoveNext())
+                            {
+                                if (propertyDataSetEnumerator.Current.contentNodeId == entity.Id)
+                                {
+                                    hasCurrent = false; // enumerator.Current is not available
+
+                                    //the property data goes into the additional data
+                                    entity.AdditionalData[propertyDataSetEnumerator.Current.propertyTypeAlias] = new UmbracoEntity.EntityProperty
+                                    {
+                                        PropertyEditorAlias = propertyDataSetEnumerator.Current.propertyEditorAlias,
+                                        Value = StringExtensions.IsNullOrWhiteSpace(propertyDataSetEnumerator.Current.dataNtext)
+                                            ? propertyDataSetEnumerator.Current.dataNvarchar
+                                            : StringExtensions.ConvertToJsonIfPossible(propertyDataSetEnumerator.Current.dataNtext)
+                                    };
+                                }
+                                else
+                                {
+                                    hasCurrent = true; // enumerator.Current is available for another def
+                                    break; // no more propertyDataDto for this def
+                                }
+                            }
+                        }
+                    }
+                    finally
+                    {
+                        propertyDataSetEnumerator.Dispose();
+                    }
+                }
+
+                result = entities;
+            }
+            else
+            {
+                var pagedResult = _work.Database.Page<dynamic>(pageIndex + 1, pageSize, pagedSql);
+                result = pagedResult.Items.Select(factory.BuildEntityFromDynamic).Cast<IUmbracoEntity>().ToList();
+            }
+
+            //The total items from the PetaPoco page query will be wrong due to the Outer join used on parent, depending on the search this will
+            //return duplicate results when the COUNT is used in conjuction with it, so we need to get the total on our own.
+
+            //generate a query that does not contain the LEFT Join for parent, this would cause
+            //the COUNT(*) query to return the wrong
+            var sqlCountClause = GetBaseWhere(
+                (isC, isM, f) => GetBase(isC, isM, f, true), //true == is a count query
+                isContent, isMedia, sql =>
+                {
+                    if (filter != null)
+                    {
+                        foreach (var filterClause in filter.GetWhereClauses())
+                        {
+                            sql.Where(filterClause.Item1, filterClause.Item2);
+                        }
+                    }
+                }, objectTypeId);
+            var translatorCount = new SqlTranslator<IUmbracoEntity>(sqlCountClause, query);
+            var countSql = translatorCount.Translate();
+
+            totalRecords = _work.Database.ExecuteScalar<int>(countSql);
+
+            return result;
+        }
+
+        public IUmbracoEntity GetByKey(Guid key)
+        {
+            var sql = GetBaseWhere(GetBase, false, false, key);
+            var nodeDto = _work.Database.FirstOrDefault<dynamic>(sql);
+            if (nodeDto == null)
+                return null;
+
+            var factory = new UmbracoEntityFactory();
+            var entity = factory.BuildEntityFromDynamic(nodeDto);
+
+            return entity;
+        }
+
+        public IUmbracoEntity GetByKey(Guid key, Guid objectTypeId)
+        {
+            bool isContent = objectTypeId == Constants.ObjectTypes.DocumentGuid || objectTypeId == Constants.ObjectTypes.DocumentBlueprintGuid;
+            bool isMedia = objectTypeId == Constants.ObjectTypes.MediaGuid;
+
+            var sql = GetFullSqlForEntityType(key, isContent, isMedia, objectTypeId);
+
+            var factory = new UmbracoEntityFactory();
+
+            //query = read forward data reader, do not load everything into mem
+            var dtos = _work.Database.Query<dynamic>(sql);
+            var collection = new EntityDefinitionCollection();
+            foreach (var dto in dtos)
+            {
+                collection.AddOrUpdate(new EntityDefinition(factory, dto, isContent, false));
+            }
+            var found = collection.FirstOrDefault();
+            return found != null ? found.BuildFromDynamic() : null;
+
+
+        }
+
+        public virtual IUmbracoEntity Get(int id)
+        {
+            var sql = GetBaseWhere(GetBase, false, false, id);
+            var nodeDto = _work.Database.FirstOrDefault<dynamic>(sql);
+            if (nodeDto == null)
+                return null;
+
+            var factory = new UmbracoEntityFactory();
+            var entity = factory.BuildEntityFromDynamic(nodeDto);
+
+            return entity;
+        }
+
+        public virtual IUmbracoEntity Get(int id, Guid objectTypeId)
+        {
+            bool isContent = objectTypeId == Constants.ObjectTypes.DocumentGuid || objectTypeId == Constants.ObjectTypes.DocumentBlueprintGuid;
+            bool isMedia = objectTypeId == Constants.ObjectTypes.MediaGuid;
+
+            var sql = GetFullSqlForEntityType(id, isContent, isMedia, objectTypeId);
+
+            var factory = new UmbracoEntityFactory();
+
+            //query = read forward data reader, do not load everything into mem
+            var dtos = _work.Database.Query<dynamic>(sql);
+            var collection = new EntityDefinitionCollection();
+            foreach (var dto in dtos)
+            {
+                collection.AddOrUpdate(new EntityDefinition(factory, dto, isContent, false));
+            }
+            var found = collection.FirstOrDefault();
+            return found != null ? found.BuildFromDynamic() : null;
+
+        }
+
+        public virtual IEnumerable<IUmbracoEntity> GetAll(Guid objectTypeId, params int[] ids)
+        {
+            return ids.Any()
+                ? PerformGetAll(objectTypeId, sql => sql.Where(" umbracoNode.id in (@ids)", new { ids }))
+                : PerformGetAll(objectTypeId);
+        }
+
+        public virtual IEnumerable<IUmbracoEntity> GetAll(Guid objectTypeId, params Guid[] keys)
+        {
+            return keys.Any()
+                ? PerformGetAll(objectTypeId, sql => sql.Where(" umbracoNode.uniqueID in (@keys)", new { keys }))
+                : PerformGetAll(objectTypeId);
+        }
+
+        private IEnumerable<IUmbracoEntity> PerformGetAll(Guid objectTypeId, Action<Sql> filter = null)
+        {
+            var isContent = objectTypeId == Constants.ObjectTypes.DocumentGuid || objectTypeId == Constants.ObjectTypes.DocumentBlueprintGuid;
+            var isMedia = objectTypeId == Constants.ObjectTypes.MediaGuid;
+            var sql = GetFullSqlForEntityType(isContent, isMedia, objectTypeId, filter);
+
+            var factory = new UmbracoEntityFactory();
+
+            //query = read forward data reader, do not load everything into mem
+            var dtos = _work.Database.Query<dynamic>(sql);
+            var collection = new EntityDefinitionCollection();
+            foreach (var dto in dtos)
+            {
+                collection.AddOrUpdate(new EntityDefinition(factory, dto, isContent, isMedia));
+            }
+            return collection.Select(x => x.BuildFromDynamic()).ToList();
+        }
+
+        public virtual IEnumerable<EntityPath> GetAllPaths(Guid objectTypeId, params int[] ids)
+        {
+            return ids.Any()
+                ? PerformGetAllPaths(objectTypeId, sql => sql.Append(" AND umbracoNode.id in (@ids)", new { ids }))
+                : PerformGetAllPaths(objectTypeId);
+        }
+
+        public virtual IEnumerable<EntityPath> GetAllPaths(Guid objectTypeId, params Guid[] keys)
+        {
+            return keys.Any()
+                ? PerformGetAllPaths(objectTypeId, sql => sql.Append(" AND umbracoNode.uniqueID in (@keys)", new { keys }))
+                : PerformGetAllPaths(objectTypeId);
+        }
+
+        private IEnumerable<EntityPath> PerformGetAllPaths(Guid objectTypeId, Action<Sql> filter = null)
+        {
+            var sql = new Sql("SELECT id, path FROM umbracoNode WHERE umbracoNode.nodeObjectType=@type", new { type = objectTypeId });
+            if (filter != null) filter(sql);
+            return _work.Database.Fetch<EntityPath>(sql);
+        }
+
+        public virtual IEnumerable<IUmbracoEntity> GetByQuery(IQuery<IUmbracoEntity> query)
+        {
+            var sqlClause = GetBase(false, false, null);
+            var translator = new SqlTranslator<IUmbracoEntity>(sqlClause, query);
+            var sql = translator.Translate().Append(GetGroupBy(false, false));
+
+            var dtos = _work.Database.Fetch<dynamic>(sql);
+
+            var factory = new UmbracoEntityFactory();
+            var list = dtos.Select(factory.BuildEntityFromDynamic).Cast<IUmbracoEntity>().ToList();
+
+            return list;
+        }
+
+        /// <summary>
+        /// Gets entities by query.
+        /// </summary>
+        /// <param name="query"></param>
+        /// <param name="objectTypeId"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// Note that this will also fetch all property data for media items, which can cause performance problems
+        /// when used without paging, in sites with large amounts of data in cmsPropertyData.
+        /// </remarks>
+        public virtual IEnumerable<IUmbracoEntity> GetByQuery(IQuery<IUmbracoEntity> query, Guid objectTypeId)
+        {
+            var isContent = objectTypeId == Constants.ObjectTypes.DocumentGuid || objectTypeId == Constants.ObjectTypes.DocumentBlueprintGuid;
+            var isMedia = objectTypeId == Constants.ObjectTypes.MediaGuid;
+
+            var sqlClause = GetBaseWhere(GetBase, isContent, isMedia, null, objectTypeId);
+
+            var translator = new SqlTranslator<IUmbracoEntity>(sqlClause, query);
+            var entitySql = translator.Translate();
+
+            return GetByQueryInternal(entitySql, isContent, isMedia);
+        }
+
+        /// <summary>
+        /// Gets entities by query without fetching property data.
+        /// </summary>
+        /// <param name="query"></param>
+        /// <param name="objectTypeId"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// This is supposed to be internal and can be used when getting all entities without paging, without causing
+        /// performance issues.
+        /// </remarks>
+        internal IEnumerable<IUmbracoEntity> GetMediaByQueryWithoutPropertyData(IQuery<IUmbracoEntity> query)
+        {
+            var sqlClause = GetBaseWhere(GetBase, false, true, null, UmbracoObjectTypes.Media.GetGuid());
+
+            var translator = new SqlTranslator<IUmbracoEntity>(sqlClause, query);
+            var entitySql = translator.Translate();
+
+            return GetByQueryInternal(entitySql, false, true);
+        }
+
+        internal IEnumerable<IUmbracoEntity> GetByQueryInternal(Sql entitySql, bool isContent, bool isMedia)
+        {
+            var factory = new UmbracoEntityFactory();
+
+            //use dynamic so that we can get ALL properties from the SQL so we can chuck that data into our AdditionalData
+            var finalSql = entitySql.Append(GetGroupBy(isContent, isMedia));
+
+            //query = read forward data reader, do not load everything into mem
+            var dtos = _work.Database.Query<dynamic>(finalSql);
+            var collection = new EntityDefinitionCollection();
+            foreach (var dto in dtos)
+            {
+                collection.AddOrUpdate(new EntityDefinition(factory, dto, isContent, isMedia));
+            }
+            return collection.Select(x => x.BuildFromDynamic()).ToList();
+        }
+
+        #endregion
+
+
+        #region Sql Statements
+
+        protected Sql GetFullSqlForEntityType(Guid key, bool isContent, bool isMedia, Guid objectTypeId)
+        {
+            var entitySql = GetBaseWhere(GetBase, isContent, isMedia, objectTypeId, key);
+
+            if (isMedia == false) return entitySql.Append(GetGroupBy(isContent, false));
+
+            return entitySql.Append(GetGroupBy(isContent, true, false));
+        }
+
+        protected Sql GetFullSqlForEntityType(int id, bool isContent, bool isMedia, Guid objectTypeId)
+        {
+            var entitySql = GetBaseWhere(GetBase, isContent, isMedia, objectTypeId, id);
+
+            if (isMedia == false) return entitySql.Append(GetGroupBy(isContent, false));
+
+            return entitySql.Append(GetGroupBy(isContent, true, false));
+        }
+
+        protected Sql GetFullSqlForEntityType(bool isContent, bool isMedia, Guid objectTypeId, Action<Sql> filter)
+        {
+            var entitySql = GetBaseWhere(GetBase, isContent, isMedia, filter, objectTypeId);
+
+            if (isMedia == false) return entitySql.Append(GetGroupBy(isContent, false));
+
+            return entitySql.Append(GetGroupBy(isContent, true, false));
+        }
+
+        private Sql GetPropertySql(string nodeObjectType)
+        {
+            var sql = new Sql()
+                .Select("contentNodeId, versionId, dataNvarchar, dataNtext, propertyEditorAlias, alias as propertyTypeAlias")
+                .From<PropertyDataDto>()
+                .InnerJoin<NodeDto>()
+                .On<PropertyDataDto, NodeDto>(dto => dto.NodeId, dto => dto.NodeId)
+                .InnerJoin<PropertyTypeDto>()
+                .On<PropertyTypeDto, PropertyDataDto>(dto => dto.Id, dto => dto.PropertyTypeId)
+                .InnerJoin<DataTypeDto>()
+                .On<PropertyTypeDto, DataTypeDto>(dto => dto.DataTypeId, dto => dto.DataTypeId)
+                .Where("umbracoNode.nodeObjectType = @nodeObjectType", new { nodeObjectType = nodeObjectType });
+
+            return sql;
+        }
+
+        protected virtual Sql GetBase(bool isContent, bool isMedia, Action<Sql> customFilter)
+        {
+            return GetBase(isContent, isMedia, customFilter, false);
+        }
+
+        protected virtual Sql GetBase(bool isContent, bool isMedia, Action<Sql> customFilter, bool isCount)
+        {
+            var columns = new List<object>();
+            if (isCount)
+            {
+                columns.Add("COUNT(*)");
+            }
+            else
+            {
+                columns.AddRange(new List<object>
+                {
+                    "umbracoNode.id",
+                    "umbracoNode.trashed",
+                    "umbracoNode.parentID",
+                    "umbracoNode.nodeUser",
+                    "umbracoNode.level",
+                    "umbracoNode.path",
+                    "umbracoNode.sortOrder",
+                    "umbracoNode.uniqueID",
+                    "umbracoNode.text",
+                    "umbracoNode.nodeObjectType",
+                    "umbracoNode.createDate",
+                    "COUNT(parent.parentID) as children"
+                });
+
+                if (isContent || isMedia)
+                {
+                    if (isContent)
+                    {
+                        //only content has/needs this info
+                        columns.Add("published.versionId as publishedVersion");
+                        columns.Add("document.versionId as newestVersion");
+                        columns.Add("contentversion.id as versionId");
+                    }
+
+                    columns.Add("contenttype.alias");
+                    columns.Add("contenttype.icon");
+                    columns.Add("contenttype.thumbnail");
+                    columns.Add("contenttype.isContainer");
+                }
+
+                if (isMedia)
+                {
+                    columns.Add("media.mediaPath");
+                }
+            }
+
+            //Creates an SQL query to return a single row for the entity
+
+            var entitySql = new Sql()
+                .Select(columns.ToArray())
+                .From("umbracoNode umbracoNode");
+
+            if (isContent || isMedia)
+            {
+                entitySql.InnerJoin("cmsContent content").On("content.nodeId = umbracoNode.id");
+
+                if (isContent)
+                {
+                    //only content has/needs this info
+                    entitySql
+                        .InnerJoin("cmsDocument document").On("document.nodeId = umbracoNode.id")
+                        .InnerJoin("cmsContentVersion contentversion").On("contentversion.VersionId = document.versionId")
+                        .LeftJoin("(SELECT nodeId, versionId FROM cmsDocument WHERE published = 1) as published")
+                        .On("umbracoNode.id = published.nodeId");
+                }
+
+                if (isMedia)
+                {
+                    entitySql.InnerJoin("cmsMedia media").On("media.nodeId = umbracoNode.id");
+                }
+
+                entitySql.LeftJoin("cmsContentType contenttype").On("contenttype.nodeId = content.contentType");
+            }
+
+
+
+            if (isCount == false)
+            {
+                entitySql.LeftJoin("umbracoNode parent").On("parent.parentID = umbracoNode.id");
+            }
+
+            if (customFilter != null)
+            {
+                customFilter(entitySql);
+            }
+
+            return entitySql;
+        }
+
+        protected virtual Sql GetBaseWhere(Func<bool, bool, Action<Sql>, Sql> baseQuery, bool isContent, bool isMedia, Action<Sql> filter, Guid nodeObjectType)
+        {
+            var sql = baseQuery(isContent, isMedia, filter)
+                .Where("umbracoNode.nodeObjectType = @NodeObjectType", new { NodeObjectType = nodeObjectType });
+
+            if (isContent)
+            {
+                sql.Where("document.newest = 1");
+            }
+
+            return sql;
+        }
+
+        protected virtual Sql GetBaseWhere(Func<bool, bool, Action<Sql>, Sql> baseQuery, bool isContent, bool isMedia, int id)
+        {
+            var sql = baseQuery(isContent, isMedia, null)
+                .Where("umbracoNode.id = @Id", new { Id = id });
+
+            if (isContent)
+            {
+                sql.Where("document.newest = 1");
+            }
+
+            sql.Append(GetGroupBy(isContent, isMedia));
+
+            return sql;
+        }
+
+        protected virtual Sql GetBaseWhere(Func<bool, bool, Action<Sql>, Sql> baseQuery, bool isContent, bool isMedia, Guid key)
+        {
+            var sql = baseQuery(isContent, isMedia, null)
+                .Where("umbracoNode.uniqueID = @UniqueID", new {UniqueID = key});
+
+            if (isContent)
+            {
+                sql.Where("document.newest = 1");
+            }
+
+            sql.Append(GetGroupBy(isContent, isMedia));
+
+            return sql;
+        }
+
+        protected virtual Sql GetBaseWhere(Func<bool, bool, Action<Sql>, Sql> baseQuery, bool isContent, bool isMedia, Guid nodeObjectType, int id)
+        {
+            var sql = baseQuery(isContent, isMedia, null)
+                .Where("umbracoNode.id = @Id AND umbracoNode.nodeObjectType = @NodeObjectType",
+                       new {Id = id, NodeObjectType = nodeObjectType});
+
+            if (isContent)
+            {
+                sql.Where("document.newest = 1");
+            }
+
+            return sql;
+        }
+
+        protected virtual Sql GetBaseWhere(Func<bool, bool, Action<Sql>, Sql> baseQuery, bool isContent, bool isMedia, Guid nodeObjectType, Guid key)
+        {
+            var sql = baseQuery(isContent, isMedia, null)
+                .Where("umbracoNode.uniqueID = @UniqueID AND umbracoNode.nodeObjectType = @NodeObjectType",
+                       new { UniqueID = key, NodeObjectType = nodeObjectType });
+
+            if (isContent)
+            {
+                sql.Where("document.newest = 1");
+            }
+
+            return sql;
+        }
+
+        protected virtual Sql GetGroupBy(bool isContent, bool isMedia, bool includeSort = true)
+        {
+            var columns = new List<object>
+            {
+                "umbracoNode.id",
+                "umbracoNode.trashed",
+                "umbracoNode.parentID",
+                "umbracoNode.nodeUser",
+                "umbracoNode.level",
+                "umbracoNode.path",
+                "umbracoNode.sortOrder",
+                "umbracoNode.uniqueID",
+                "umbracoNode.text",
+                "umbracoNode.nodeObjectType",
+                "umbracoNode.createDate"
+            };
+
+            if (isContent || isMedia)
+            {
+                if (isContent)
+                {
+                    columns.Add("published.versionId");
+                    columns.Add("document.versionId");
+                    columns.Add("contentversion.id");
+                }
+
+                if (isMedia)
+                {
+                    columns.Add("media.mediaPath");
+                }
+
+                columns.Add("contenttype.alias");
+                columns.Add("contenttype.icon");
+                columns.Add("contenttype.thumbnail");
+                columns.Add("contenttype.isContainer");
+            }
+
+            var sql = new Sql()
+                .GroupBy(columns.ToArray());
+
+            if (includeSort)
+            {
+                sql = sql.OrderBy("umbracoNode.sortOrder");
+            }
+
+            return sql;
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Dispose disposable properties
+        /// </summary>
+        /// <remarks>
+        /// Ensure the unit of work is disposed
+        /// </remarks>
+        protected override void DisposeResources()
+        {
+            UnitOfWork.DisposeIfDisposable();
+        }
+
+        public bool Exists(Guid key)
+        {
+            var sql = new Sql().Select("COUNT(*)").From("umbracoNode").Where("uniqueID=@uniqueID", new {uniqueID = key});
+            return _work.Database.ExecuteScalar<int>(sql) > 0;
+        }
+
+        public bool Exists(int id)
+        {
+            var sql = new Sql().Select("COUNT(*)").From("umbracoNode").Where("id=@id", new { id = id });
+            return _work.Database.ExecuteScalar<int>(sql) > 0;
+        }
+
+        #region private classes
+
+
+        private class EntityDefinitionCollection : KeyedCollection<int, EntityDefinition>
+        {
+            protected override int GetKeyForItem(EntityDefinition item)
+            {
+                return item.Id;
+            }
+
+            /// <summary>
+            /// if this key already exists if it does then we need to check
+            /// if the existing item is 'older' than the new item and if that is the case we'll replace the older one
+            /// </summary>
+            /// <param name="item"></param>
+            /// <returns></returns>
+            public bool AddOrUpdate(EntityDefinition item)
+            {
+                if (Dictionary == null)
+                {
+                    base.Add(item);
+                    return true;
+                }
+
+                var key = GetKeyForItem(item);
+                EntityDefinition found;
+                if (TryGetValue(key, out found))
+                {
+                    //it already exists and it's older so we need to replace it
+                    if (item.VersionId > found.VersionId)
+                    {
+                        var currIndex = Items.IndexOf(found);
+                        if (currIndex == -1)
+                            throw new IndexOutOfRangeException("Could not find the item in the list: " + found.Id);
+
+                        //replace the current one with the newer one
+                        SetItem(currIndex, item);
+                        return true;
+                    }
+                    //could not add or update
+                    return false;
+                }
+
+                base.Add(item);
+                return true;
+            }
+
+            private bool TryGetValue(int key, out EntityDefinition val)
+            {
+                if (Dictionary == null)
+                {
+                    val = null;
+                    return false;
+                }
+                return Dictionary.TryGetValue(key, out val);
+            }
+        }
+
+        private class EntityDefinition
+        {
+            private readonly UmbracoEntityFactory _factory;
+            private readonly dynamic _entity;
+            private readonly bool _isContent;
+            private readonly bool _isMedia;
+
+            public EntityDefinition(UmbracoEntityFactory factory, dynamic entity, bool isContent, bool isMedia)
+            {
+                _factory = factory;
+                _entity = entity;
+                _isContent = isContent;
+                _isMedia = isMedia;
+            }
+
+            public IUmbracoEntity BuildFromDynamic()
+            {
+                return _factory.BuildEntityFromDynamic(_entity);
+            }
+
+            public int Id
+            {
+                get { return _entity.id; }
+            }
+
+            public int VersionId
+            {
+                get
+                {
+                    if (_isContent || _isMedia)
+                    {
+                        return _entity.versionId;
+                    }
+                    return _entity.id;
+                }
+            }
+        }
+        #endregion
+    }
+}
diff --git a/src/Umbraco.Core/Services/EntityService.cs b/src/Umbraco.Core/Services/EntityService.cs
index 1e44bec909..906ece1081 100644
--- a/src/Umbraco.Core/Services/EntityService.cs
+++ b/src/Umbraco.Core/Services/EntityService.cs
@@ -1,802 +1,742 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
-using Umbraco.Core.CodeAnnotations;
-using Umbraco.Core.Events;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.EntityBase;
-using Umbraco.Core.Models.Rdbms;
-using Umbraco.Core.Persistence;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
-using Umbraco.Core.Persistence.Querying;
-using Umbraco.Core.Persistence.Repositories;
-using Umbraco.Core.Persistence.UnitOfWork;
-
-namespace Umbraco.Core.Services
-{
-    public class EntityService : ScopeRepositoryService, IEntityService
-    {
-        private readonly Dictionary<string, Tuple<UmbracoObjectTypes, Func<int, IUmbracoEntity>>> _supportedObjectTypes;
-        private readonly IdkMap _idkMap;
-
-        public EntityService(IDatabaseUnitOfWorkProvider provider, RepositoryFactory repositoryFactory, ILogger logger, IEventMessagesFactory eventMessagesFactory,
-           IContentService contentService, IContentTypeService contentTypeService, IMediaService mediaService, IDataTypeService dataTypeService,
-           IMemberService memberService, IMemberTypeService memberTypeService, IdkMap idkMap)
-            : base(provider, repositoryFactory, logger, eventMessagesFactory)
-        {
-            _idkMap = idkMap;
-
-            _supportedObjectTypes = new Dictionary<string, Tuple<UmbracoObjectTypes, Func<int, IUmbracoEntity>>>
-            {
-                {typeof (IDataTypeDefinition).FullName, new Tuple<UmbracoObjectTypes, Func<int, IUmbracoEntity>>(UmbracoObjectTypes.DataType, dataTypeService.GetDataTypeDefinitionById)},
-                {typeof (IContent).FullName, new Tuple<UmbracoObjectTypes, Func<int, IUmbracoEntity>>(UmbracoObjectTypes.Document, contentService.GetById)},
-                {typeof (IContentType).FullName, new Tuple<UmbracoObjectTypes, Func<int, IUmbracoEntity>>(UmbracoObjectTypes.DocumentType, contentTypeService.GetContentType)},
-                {typeof (IMedia).FullName, new Tuple<UmbracoObjectTypes, Func<int, IUmbracoEntity>>(UmbracoObjectTypes.Media, mediaService.GetById)},
-                {typeof (IMediaType).FullName, new Tuple<UmbracoObjectTypes, Func<int, IUmbracoEntity>>(UmbracoObjectTypes.MediaType, contentTypeService.GetMediaType)},
-                {typeof (IMember).FullName, new Tuple<UmbracoObjectTypes, Func<int, IUmbracoEntity>>(UmbracoObjectTypes.Member, memberService.GetById)},
-                {typeof (IMemberType).FullName, new Tuple<UmbracoObjectTypes, Func<int, IUmbracoEntity>>(UmbracoObjectTypes.MemberType, memberTypeService.Get)},
-            };
-        }
-
-        #region Static Queries
-
-        private IQuery<IUmbracoEntity> _rootEntityQuery;
-
-        #endregion
-
-        internal IdkMap IdkMap { get { return _idkMap; } }
-
-        /// <summary>
-        /// Returns the integer id for a given GUID
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="umbracoObjectType"></param>
-        /// <returns></returns>
-        public Attempt<int> GetIdForKey(Guid key, UmbracoObjectTypes umbracoObjectType)
-        {
-            return _idkMap.GetIdForKey(key, umbracoObjectType);
-        }
-
-        public Attempt<int> GetIdForUdi(Udi udi)
-        {
-            return _idkMap.GetIdForUdi(udi);
-        }
-
-        /// <summary>
-        /// Returns the GUID for a given integer id
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="umbracoObjectType"></param>
-        /// <returns></returns>
-        public Attempt<Guid> GetKeyForId(int id, UmbracoObjectTypes umbracoObjectType)
-        {
-            return _idkMap.GetKeyForId(id, umbracoObjectType);
-        }
-
-        public IUmbracoEntity GetByKey(Guid key, bool loadBaseType = true)
-        {
-            if (loadBaseType)
-            {
-                using (var uow = UowProvider.GetUnitOfWork())
-                {
-                    var repository = RepositoryFactory.CreateEntityRepository(uow);
-                    var ret = repository.GetByKey(key);
-                    uow.Commit();
-                    return ret;
-                }
-            }
-
-            //SD: TODO: Need to enable this at some stage ... just need to ask Morten what the deal is with what this does.
-            throw new NotSupportedException();
-
-            //var objectType = GetObjectType(key);
-            //var entityType = GetEntityType(objectType);
-            //var typeFullName = entityType.FullName;
-            //var entity = _supportedObjectTypes[typeFullName].Item2(id);
-
-            //return entity;
-        }
-
-        /// <summary>
-        /// Gets an UmbracoEntity by its Id, and optionally loads the complete object graph.
-        /// </summary>
-        /// <returns>
-        /// By default this will load the base type <see cref="IUmbracoEntity"/> with a minimum set of properties.
-        /// </returns>
-        /// <param name="id">Id of the object to retrieve</param>
-        /// <param name="loadBaseType">Optional bool to load the complete object graph when set to <c>False</c>.</param>
-        /// <returns>An <see cref="IUmbracoEntity"/></returns>
-        public virtual IUmbracoEntity Get(int id, bool loadBaseType = true)
-        {
-            if (loadBaseType)
-            {
-                using (var uow = UowProvider.GetUnitOfWork(readOnly:true))
-                {
-                    var repository = RepositoryFactory.CreateEntityRepository(uow);
-                    var ret = repository.Get(id);
-                    return ret;
-                }
-            }
-
-            var objectType = GetObjectType(id);
-            var entityType = GetEntityType(objectType);
-            var typeFullName = entityType.FullName;
-            var entity = _supportedObjectTypes[typeFullName].Item2(id);
-
-            return entity;
-        }
-
-        public IUmbracoEntity GetByKey(Guid key, UmbracoObjectTypes umbracoObjectType, bool loadBaseType = true)
-        {
-            if (loadBaseType)
-            {
-                var objectTypeId = umbracoObjectType.GetGuid();
-                using (var uow = UowProvider.GetUnitOfWork(readOnly:true))
-                {
-                    var repository = RepositoryFactory.CreateEntityRepository(uow);
-                    var ret = repository.GetByKey(key, objectTypeId);
-                    return ret;
-                }
-            }
-
-            //SD: TODO: Need to enable this at some stage ... just need to ask Morten what the deal is with what this does.
-            throw new NotSupportedException();
-
-            //var entityType = GetEntityType(umbracoObjectType);
-            //var typeFullName = entityType.FullName;
-            //var entity = _supportedObjectTypes[typeFullName].Item2(id);
-
-            //return entity;
-        }
-
-        /// <summary>
-        /// Gets an UmbracoEntity by its Id and UmbracoObjectType, and optionally loads the complete object graph.
-        /// </summary>
-        /// <returns>
-        /// By default this will load the base type <see cref="IUmbracoEntity"/> with a minimum set of properties.
-        /// </returns>
-        /// <param name="id">Id of the object to retrieve</param>
-        /// <param name="umbracoObjectType">UmbracoObjectType of the entity to retrieve</param>
-        /// <param name="loadBaseType">Optional bool to load the complete object graph when set to <c>False</c>.</param>
-        /// <returns>An <see cref="IUmbracoEntity"/></returns>
-        public virtual IUmbracoEntity Get(int id, UmbracoObjectTypes umbracoObjectType, bool loadBaseType = true)
-        {
-            if (loadBaseType)
-            {
-                var objectTypeId = umbracoObjectType.GetGuid();
-                using (var uow = UowProvider.GetUnitOfWork(readOnly:true))
-                {
-                    var repository = RepositoryFactory.CreateEntityRepository(uow);
-                    var ret = repository.Get(id, objectTypeId);
-                    return ret;
-                }
-            }
-
-            var entityType = GetEntityType(umbracoObjectType);
-            var typeFullName = entityType.FullName;
-            var entity = _supportedObjectTypes[typeFullName].Item2(id);
-
-            return entity;
-        }
-
-        public IUmbracoEntity GetByKey<T>(Guid key, bool loadBaseType = true) where T : IUmbracoEntity
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <summary>
-        /// Gets an UmbracoEntity by its Id and specified Type. Optionally loads the complete object graph.
-        /// </summary>
-        /// <returns>
-        /// By default this will load the base type <see cref="IUmbracoEntity"/> with a minimum set of properties.
-        /// </returns>
-        /// <typeparam name="T">Type of the model to retrieve. Must be based on an <see cref="IUmbracoEntity"/></typeparam>
-        /// <param name="id">Id of the object to retrieve</param>
-        /// <param name="loadBaseType">Optional bool to load the complete object graph when set to <c>False</c>.</param>
-        /// <returns>An <see cref="IUmbracoEntity"/></returns>
-        public virtual IUmbracoEntity Get<T>(int id, bool loadBaseType = true) where T : IUmbracoEntity
-        {
-            if (loadBaseType)
-            {
-                using (var uow = UowProvider.GetUnitOfWork(readOnly:true))
-                {
-                    var repository = RepositoryFactory.CreateEntityRepository(uow);
-                    var ret = repository.Get(id);
-                    return ret;
-                }
-            }
-
-            var typeFullName = typeof(T).FullName;
-            Mandate.That<NotSupportedException>(_supportedObjectTypes.ContainsKey(typeFullName), () =>
-            {
-                throw new NotSupportedException
-                    ("The passed in type is not supported");
-            });
-            var entity = _supportedObjectTypes[typeFullName].Item2(id);
-
-            return entity;
-        }
-
-        /// <summary>
-        /// Gets the parent of entity by its id
-        /// </summary>
-        /// <param name="id">Id of the entity to retrieve the Parent for</param>
-        /// <returns>An <see cref="IUmbracoEntity"/></returns>
-        public virtual IUmbracoEntity GetParent(int id)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly:true))
-            {
-                var repository = RepositoryFactory.CreateEntityRepository(uow);
-                var entity = repository.Get(id);
-
-                if (entity.ParentId == -1 || entity.ParentId == -20 || entity.ParentId == -21)
-                    return null;
-                var ret = repository.Get(entity.ParentId);
-                return ret;
-            }
-        }
-
-        /// <summary>
-        /// Gets the parent of entity by its id and UmbracoObjectType
-        /// </summary>
-        /// <param name="id">Id of the entity to retrieve the Parent for</param>
-        /// <param name="umbracoObjectType">UmbracoObjectType of the parent to retrieve</param>
-        /// <returns>An <see cref="IUmbracoEntity"/></returns>
-        public virtual IUmbracoEntity GetParent(int id, UmbracoObjectTypes umbracoObjectType)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly:true))
-            {
-                var repository = RepositoryFactory.CreateEntityRepository(uow);
-                var entity = repository.Get(id);
-
-                if (entity.ParentId == -1 || entity.ParentId == -20 || entity.ParentId == -21)
-                    return null;
-                var objectTypeId = umbracoObjectType.GetGuid();
-
-                var ret = repository.Get(entity.ParentId, objectTypeId);
-                return ret;
-            }
-        }
-
-        /// <summary>
-        /// Gets a collection of children by the parents Id
-        /// </summary>
-        /// <param name="parentId">Id of the parent to retrieve children for</param>
-        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/> objects</returns>
-        public virtual IEnumerable<IUmbracoEntity> GetChildren(int parentId)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly:true))
-            {
-                var repository = RepositoryFactory.CreateEntityRepository(uow);
-                var query = Query<IUmbracoEntity>.Builder.Where(x => x.ParentId == parentId);
-
-                var contents = repository.GetByQuery(query);
-                return contents;
-            }
-        }
-
-        /// <summary>
-        /// Gets a collection of children by the parents Id and UmbracoObjectType
-        /// </summary>
-        /// <param name="parentId">Id of the parent to retrieve children for</param>
-        /// <param name="umbracoObjectType">UmbracoObjectType of the children to retrieve</param>
-        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/> objects</returns>
-        public virtual IEnumerable<IUmbracoEntity> GetChildren(int parentId, UmbracoObjectTypes umbracoObjectType)
-        {
-            var objectTypeId = umbracoObjectType.GetGuid();
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateEntityRepository(uow);
-                var query = Query<IUmbracoEntity>.Builder.Where(x => x.ParentId == parentId);
-                return repository.GetByQuery(query, objectTypeId);
-            }
-        }
-
-        /// <summary>
-        /// Gets a collection of children by the parent's Id and UmbracoObjectType without adding property data
-        /// </summary>
-        /// <param name="parentId">Id of the parent to retrieve children for</param>
-        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/> objects</returns>
-        internal IEnumerable<IUmbracoEntity> GetMediaChildrenWithoutPropertyData(int parentId)
-        {
-            var objectTypeId = UmbracoObjectTypes.Media.GetGuid();
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateEntityRepository(uow);
-                var query = Query<IUmbracoEntity>.Builder.Where(x => x.ParentId == parentId);
-
-                // Not pretty having to cast the repository, but it is the only way to get to use an internal method that we
-                // do not want to make public on the interface. Unfortunately also prevents this from being unit tested.
-                // See this issue for details on why we need this:
-                // https://github.com/umbraco/Umbraco-CMS/issues/3457
-                return ((EntityRepository)repository).GetMediaByQueryWithoutPropertyData(query);
-            }
-        }
-        
-        /// <summary>
-        /// Returns a paged collection of children
-        /// </summary>
-        /// <param name="parentId">The parent id to return children for</param>
-        /// <param name="umbracoObjectType"></param>
-        /// <param name="pageIndex"></param>
-        /// <param name="pageSize"></param>
-        /// <param name="totalRecords"></param>
-        /// <param name="orderBy"></param>
-        /// <param name="orderDirection"></param>
-        /// <param name="filter"></param>
-        /// <returns></returns>
-        public IEnumerable<IUmbracoEntity> GetPagedChildren(int parentId, UmbracoObjectTypes umbracoObjectType, long pageIndex, int pageSize, out long totalRecords,
-            string orderBy = "SortOrder", Direction orderDirection = Direction.Ascending, string filter = "")
-        {
-            var objectTypeId = umbracoObjectType.GetGuid();
-            using (var uow = UowProvider.GetUnitOfWork(readOnly:true))
-            {
-                var repository = RepositoryFactory.CreateEntityRepository(uow);
-                var query = Query<IUmbracoEntity>.Builder.Where(x => x.ParentId == parentId && x.Trashed == false);
-
-                IQuery<IUmbracoEntity> filterQuery = null;
-                if (filter.IsNullOrWhiteSpace() == false)
-                {
-                    filterQuery = Query<IUmbracoEntity>.Builder.Where(x => x.Name.Contains(filter));
-                }
-
-                var contents = repository.GetPagedResultsByQuery(query, objectTypeId, pageIndex, pageSize, out totalRecords, orderBy, orderDirection, filterQuery);
-                return contents;
-            }
-        }
-
-        /// <summary>
-        /// Returns a paged collection of descendants
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="umbracoObjectType"></param>
-        /// <param name="pageIndex"></param>
-        /// <param name="pageSize"></param>
-        /// <param name="totalRecords"></param>
-        /// <param name="orderBy"></param>
-        /// <param name="orderDirection"></param>
-        /// <param name="filter"></param>
-        /// <returns></returns>
-        public IEnumerable<IUmbracoEntity> GetPagedDescendants(int id, UmbracoObjectTypes umbracoObjectType, long pageIndex, int pageSize, out long totalRecords,
-            string orderBy = "path", Direction orderDirection = Direction.Ascending, string filter = "")
-        {
-            var objectTypeId = umbracoObjectType.GetGuid();
-            using (var uow = UowProvider.GetUnitOfWork(readOnly:true))
-            {
-                var repository = RepositoryFactory.CreateEntityRepository(uow);
-                
-                var query = Query<IUmbracoEntity>.Builder;
-                //if the id is System Root, then just get all
-                if (id != Constants.System.Root)
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using Umbraco.Core.CodeAnnotations;
+using Umbraco.Core.Events;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
+using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.UnitOfWork;
+
+namespace Umbraco.Core.Services
+{
+    public class EntityService : ScopeRepositoryService, IEntityService
+    {
+        private readonly Dictionary<string, Tuple<UmbracoObjectTypes, Func<int, IUmbracoEntity>>> _supportedObjectTypes;
+        private readonly IdkMap _idkMap;
+
+        public EntityService(IDatabaseUnitOfWorkProvider provider, RepositoryFactory repositoryFactory, ILogger logger, IEventMessagesFactory eventMessagesFactory,
+           IContentService contentService, IContentTypeService contentTypeService, IMediaService mediaService, IDataTypeService dataTypeService,
+           IMemberService memberService, IMemberTypeService memberTypeService, IdkMap idkMap)
+            : base(provider, repositoryFactory, logger, eventMessagesFactory)
+        {
+            _idkMap = idkMap;
+
+            _supportedObjectTypes = new Dictionary<string, Tuple<UmbracoObjectTypes, Func<int, IUmbracoEntity>>>
+            {
+                {typeof (IDataTypeDefinition).FullName, new Tuple<UmbracoObjectTypes, Func<int, IUmbracoEntity>>(UmbracoObjectTypes.DataType, dataTypeService.GetDataTypeDefinitionById)},
+                {typeof (IContent).FullName, new Tuple<UmbracoObjectTypes, Func<int, IUmbracoEntity>>(UmbracoObjectTypes.Document, contentService.GetById)},
+                {typeof (IContentType).FullName, new Tuple<UmbracoObjectTypes, Func<int, IUmbracoEntity>>(UmbracoObjectTypes.DocumentType, contentTypeService.GetContentType)},
+                {typeof (IMedia).FullName, new Tuple<UmbracoObjectTypes, Func<int, IUmbracoEntity>>(UmbracoObjectTypes.Media, mediaService.GetById)},
+                {typeof (IMediaType).FullName, new Tuple<UmbracoObjectTypes, Func<int, IUmbracoEntity>>(UmbracoObjectTypes.MediaType, contentTypeService.GetMediaType)},
+                {typeof (IMember).FullName, new Tuple<UmbracoObjectTypes, Func<int, IUmbracoEntity>>(UmbracoObjectTypes.Member, memberService.GetById)},
+                {typeof (IMemberType).FullName, new Tuple<UmbracoObjectTypes, Func<int, IUmbracoEntity>>(UmbracoObjectTypes.MemberType, memberTypeService.Get)},
+            };
+        }
+
+        #region Static Queries
+
+        private IQuery<IUmbracoEntity> _rootEntityQuery;
+
+        #endregion
+
+        internal IdkMap IdkMap { get { return _idkMap; } }
+
+        /// <summary>
+        /// Returns the integer id for a given GUID
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="umbracoObjectType"></param>
+        /// <returns></returns>
+        public Attempt<int> GetIdForKey(Guid key, UmbracoObjectTypes umbracoObjectType)
+        {
+            return _idkMap.GetIdForKey(key, umbracoObjectType);
+        }
+
+        public Attempt<int> GetIdForUdi(Udi udi)
+        {
+            return _idkMap.GetIdForUdi(udi);
+        }
+
+        /// <summary>
+        /// Returns the GUID for a given integer id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="umbracoObjectType"></param>
+        /// <returns></returns>
+        public Attempt<Guid> GetKeyForId(int id, UmbracoObjectTypes umbracoObjectType)
+        {
+            return _idkMap.GetKeyForId(id, umbracoObjectType);
+        }
+
+        public IUmbracoEntity GetByKey(Guid key)
+        {
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var repository = RepositoryFactory.CreateEntityRepository(uow);
+                var ret = repository.GetByKey(key);
+                uow.Commit();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// Gets an UmbracoEntity by its Id, and optionally loads the complete object graph.
+        /// </summary>
+        /// <returns>
+        /// By default this will load the base type <see cref="IUmbracoEntity"/> with a minimum set of properties.
+        /// </returns>
+        /// <param name="id">Id of the object to retrieve</param>
+        /// <returns>An <see cref="IUmbracoEntity"/></returns>
+        public virtual IUmbracoEntity Get(int id)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly:true))
+            {
+                var repository = RepositoryFactory.CreateEntityRepository(uow);
+                var ret = repository.Get(id);
+                return ret;
+            }
+        }
+
+        public IUmbracoEntity GetByKey(Guid key, UmbracoObjectTypes umbracoObjectType)
+        {
+            var objectTypeId = umbracoObjectType.GetGuid();
+            using (var uow = UowProvider.GetUnitOfWork(readOnly:true))
+            {
+                var repository = RepositoryFactory.CreateEntityRepository(uow);
+                var ret = repository.GetByKey(key, objectTypeId);
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// Gets an UmbracoEntity by its Id and UmbracoObjectType, and optionally loads the complete object graph.
+        /// </summary>
+        /// <returns>
+        /// By default this will load the base type <see cref="IUmbracoEntity"/> with a minimum set of properties.
+        /// </returns>
+        /// <param name="id">Id of the object to retrieve</param>
+        /// <param name="umbracoObjectType">UmbracoObjectType of the entity to retrieve</param>
+        // <returns>An <see cref="IUmbracoEntity"/></returns>
+        public virtual IUmbracoEntity Get(int id, UmbracoObjectTypes umbracoObjectType)
+        {
+            var objectTypeId = umbracoObjectType.GetGuid();
+            using (var uow = UowProvider.GetUnitOfWork(readOnly:true))
+            {
+                var repository = RepositoryFactory.CreateEntityRepository(uow);
+                var ret = repository.Get(id, objectTypeId);
+                return ret;
+            }
+        }
+
+        public IUmbracoEntity GetByKey<T>(Guid key) where T : IUmbracoEntity
+        {
+            throw new NotImplementedException();
+        }
+
+        /// <summary>
+        /// Gets an UmbracoEntity by its Id and specified Type. Optionally loads the complete object graph.
+        /// </summary>
+        /// <returns>
+        /// By default this will load the base type <see cref="IUmbracoEntity"/> with a minimum set of properties.
+        /// </returns>
+        /// <typeparam name="T">Type of the model to retrieve. Must be based on an <see cref="IUmbracoEntity"/></typeparam>
+        /// <param name="id">Id of the object to retrieve</param>
+        /// <returns>An <see cref="IUmbracoEntity"/></returns>
+        public virtual IUmbracoEntity Get<T>(int id) where T : IUmbracoEntity
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly:true))
+            {
+                var repository = RepositoryFactory.CreateEntityRepository(uow);
+                var ret = repository.Get(id);
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// Gets the parent of entity by its id
+        /// </summary>
+        /// <param name="id">Id of the entity to retrieve the Parent for</param>
+        /// <returns>An <see cref="IUmbracoEntity"/></returns>
+        public virtual IUmbracoEntity GetParent(int id)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly:true))
+            {
+                var repository = RepositoryFactory.CreateEntityRepository(uow);
+                var entity = repository.Get(id);
+
+                if (entity.ParentId == -1 || entity.ParentId == -20 || entity.ParentId == -21)
+                    return null;
+                var ret = repository.Get(entity.ParentId);
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// Gets the parent of entity by its id and UmbracoObjectType
+        /// </summary>
+        /// <param name="id">Id of the entity to retrieve the Parent for</param>
+        /// <param name="umbracoObjectType">UmbracoObjectType of the parent to retrieve</param>
+        /// <returns>An <see cref="IUmbracoEntity"/></returns>
+        public virtual IUmbracoEntity GetParent(int id, UmbracoObjectTypes umbracoObjectType)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly:true))
+            {
+                var repository = RepositoryFactory.CreateEntityRepository(uow);
+                var entity = repository.Get(id);
+
+                if (entity.ParentId == -1 || entity.ParentId == -20 || entity.ParentId == -21)
+                    return null;
+                var objectTypeId = umbracoObjectType.GetGuid();
+
+                var ret = repository.Get(entity.ParentId, objectTypeId);
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// Gets a collection of children by the parents Id
+        /// </summary>
+        /// <param name="parentId">Id of the parent to retrieve children for</param>
+        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/> objects</returns>
+        public virtual IEnumerable<IUmbracoEntity> GetChildren(int parentId)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly:true))
+            {
+                var repository = RepositoryFactory.CreateEntityRepository(uow);
+                var query = Query<IUmbracoEntity>.Builder.Where(x => x.ParentId == parentId);
+
+                var contents = repository.GetByQuery(query);
+                return contents;
+            }
+        }
+
+        /// <summary>
+        /// Gets a collection of children by the parents Id and UmbracoObjectType
+        /// </summary>
+        /// <param name="parentId">Id of the parent to retrieve children for</param>
+        /// <param name="umbracoObjectType">UmbracoObjectType of the children to retrieve</param>
+        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/> objects</returns>
+        public virtual IEnumerable<IUmbracoEntity> GetChildren(int parentId, UmbracoObjectTypes umbracoObjectType)
+        {
+            var objectTypeId = umbracoObjectType.GetGuid();
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateEntityRepository(uow);
+                var query = Query<IUmbracoEntity>.Builder.Where(x => x.ParentId == parentId);
+                return repository.GetByQuery(query, objectTypeId);
+            }
+        }
+
+        /// <summary>
+        /// Gets a collection of children by the parent's Id and UmbracoObjectType without adding property data
+        /// </summary>
+        /// <param name="parentId">Id of the parent to retrieve children for</param>
+        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/> objects</returns>
+        internal IEnumerable<IUmbracoEntity> GetMediaChildrenWithoutPropertyData(int parentId)
+        {
+            var objectTypeId = UmbracoObjectTypes.Media.GetGuid();
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateEntityRepository(uow);
+                var query = Query<IUmbracoEntity>.Builder.Where(x => x.ParentId == parentId);
+
+                // Not pretty having to cast the repository, but it is the only way to get to use an internal method that we
+                // do not want to make public on the interface. Unfortunately also prevents this from being unit tested.
+                // See this issue for details on why we need this:
+                // https://github.com/umbraco/Umbraco-CMS/issues/3457
+                return ((EntityRepository)repository).GetMediaByQueryWithoutPropertyData(query);
+            }
+        }
+
+        /// <summary>
+        /// Returns a paged collection of children
+        /// </summary>
+        /// <param name="parentId">The parent id to return children for</param>
+        /// <param name="umbracoObjectType"></param>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="totalRecords"></param>
+        /// <param name="orderBy"></param>
+        /// <param name="orderDirection"></param>
+        /// <param name="filter"></param>
+        /// <returns></returns>
+        public IEnumerable<IUmbracoEntity> GetPagedChildren(int parentId, UmbracoObjectTypes umbracoObjectType, long pageIndex, int pageSize, out long totalRecords,
+            string orderBy = "SortOrder", Direction orderDirection = Direction.Ascending, string filter = "")
+        {
+            var objectTypeId = umbracoObjectType.GetGuid();
+            using (var uow = UowProvider.GetUnitOfWork(readOnly:true))
+            {
+                var repository = RepositoryFactory.CreateEntityRepository(uow);
+                var query = Query<IUmbracoEntity>.Builder.Where(x => x.ParentId == parentId && x.Trashed == false);
+
+                IQuery<IUmbracoEntity> filterQuery = null;
+                if (filter.IsNullOrWhiteSpace() == false)
                 {
-                    //lookup the path so we can use it in the prefix query below
-                    var itemPaths = repository.GetAllPaths(objectTypeId, id).ToArray();
-                    if (itemPaths.Length == 0)
-                    {
-                        totalRecords = 0;
-                        return Enumerable.Empty<IUmbracoEntity>();
-                    }
+                    filterQuery = Query<IUmbracoEntity>.Builder.Where(x => x.Name.Contains(filter));
+                }
+
+                var contents = repository.GetPagedResultsByQuery(query, objectTypeId, pageIndex, pageSize, out totalRecords, orderBy, orderDirection, filterQuery);
+                return contents;
+            }
+        }
+
+        /// <summary>
+        /// Returns a paged collection of descendants
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="umbracoObjectType"></param>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="totalRecords"></param>
+        /// <param name="orderBy"></param>
+        /// <param name="orderDirection"></param>
+        /// <param name="filter"></param>
+        /// <returns></returns>
+        public IEnumerable<IUmbracoEntity> GetPagedDescendants(int id, UmbracoObjectTypes umbracoObjectType, long pageIndex, int pageSize, out long totalRecords,
+            string orderBy = "path", Direction orderDirection = Direction.Ascending, string filter = "")
+        {
+            var objectTypeId = umbracoObjectType.GetGuid();
+            using (var uow = UowProvider.GetUnitOfWork(readOnly:true))
+            {
+                var repository = RepositoryFactory.CreateEntityRepository(uow);
+
+                var query = Query<IUmbracoEntity>.Builder;
+                //if the id is System Root, then just get all
+                if (id != Constants.System.Root)
+                {
+                    //lookup the path so we can use it in the prefix query below
+                    var itemPaths = repository.GetAllPaths(objectTypeId, id).ToArray();
+                    if (itemPaths.Length == 0)
+                    {
+                        totalRecords = 0;
+                        return Enumerable.Empty<IUmbracoEntity>();
+                    }
                     var itemPath = itemPaths[0].Path;
-
-                    query.Where(x => x.Path.SqlStartsWith(string.Format("{0},", itemPath), TextColumnType.NVarchar));
-                }
-
-                IQuery<IUmbracoEntity> filterQuery = null;
-                if (filter.IsNullOrWhiteSpace() == false)
-                {
-                    filterQuery = Query<IUmbracoEntity>.Builder.Where(x => x.Name.Contains(filter));
-                }
-
-                var contents = repository.GetPagedResultsByQuery(query, objectTypeId, pageIndex, pageSize, out totalRecords, orderBy, orderDirection, filterQuery);
-                return contents;
-            }
-        }
-        /// <summary>
-        /// Returns a paged collection of descendants.
-        /// </summary>
-        public IEnumerable<IUmbracoEntity> GetPagedDescendants(IEnumerable<int> ids, UmbracoObjectTypes umbracoObjectType, long pageIndex, int pageSize, out long totalRecords,
-            string orderBy = "path", Direction orderDirection = Direction.Ascending, string filter = "")
-        {
-            totalRecords = 0;
-
-            var idsA = ids.ToArray();
-            if (idsA.Length == 0)
-                return Enumerable.Empty<IUmbracoEntity>();
-
-            var objectTypeId = umbracoObjectType.GetGuid();
-
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateEntityRepository(uow);
-                
-                var query = Query<IUmbracoEntity>.Builder;
-                if (idsA.All(x => x != Constants.System.Root))
-                {
-                    //lookup the paths so we can use it in the prefix query below
-                    var itemPaths = repository.GetAllPaths(objectTypeId, idsA).ToArray();
-                    if (itemPaths.Length == 0)
-                    {
-                        totalRecords = 0;
-                        return Enumerable.Empty<IUmbracoEntity>();
-                    }
-
-                    var clauses = new List<Expression<Func<IUmbracoEntity, bool>>>();
-                    foreach (var id in idsA)
+
+                    query.Where(x => x.Path.SqlStartsWith(string.Format("{0},", itemPath), TextColumnType.NVarchar));
+                }
+
+                IQuery<IUmbracoEntity> filterQuery = null;
+                if (filter.IsNullOrWhiteSpace() == false)
+                {
+                    filterQuery = Query<IUmbracoEntity>.Builder.Where(x => x.Name.Contains(filter));
+                }
+
+                var contents = repository.GetPagedResultsByQuery(query, objectTypeId, pageIndex, pageSize, out totalRecords, orderBy, orderDirection, filterQuery);
+                return contents;
+            }
+        }
+        /// <summary>
+        /// Returns a paged collection of descendants.
+        /// </summary>
+        public IEnumerable<IUmbracoEntity> GetPagedDescendants(IEnumerable<int> ids, UmbracoObjectTypes umbracoObjectType, long pageIndex, int pageSize, out long totalRecords,
+            string orderBy = "path", Direction orderDirection = Direction.Ascending, string filter = "")
+        {
+            totalRecords = 0;
+
+            var idsA = ids.ToArray();
+            if (idsA.Length == 0)
+                return Enumerable.Empty<IUmbracoEntity>();
+
+            var objectTypeId = umbracoObjectType.GetGuid();
+
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateEntityRepository(uow);
+
+                var query = Query<IUmbracoEntity>.Builder;
+                if (idsA.All(x => x != Constants.System.Root))
+                {
+                    //lookup the paths so we can use it in the prefix query below
+                    var itemPaths = repository.GetAllPaths(objectTypeId, idsA).ToArray();
+                    if (itemPaths.Length == 0)
+                    {
+                        totalRecords = 0;
+                        return Enumerable.Empty<IUmbracoEntity>();
+                    }
+
+                    var clauses = new List<Expression<Func<IUmbracoEntity, bool>>>();
+                    foreach (var id in idsA)
                     {
                         //if the id is root then don't add any clauses
-                        if (id != Constants.System.Root)
-                        {
-                            var itemPath = itemPaths.FirstOrDefault(x => x.Id == id);
-                            if (itemPath == null) continue;
-                            var path = itemPath.Path;
-                            var qid = id;
-                            clauses.Add(x => x.Path.SqlStartsWith(string.Format("{0},", path), TextColumnType.NVarchar) || x.Path.SqlEndsWith(string.Format(",{0}", qid), TextColumnType.NVarchar));
-                        }                        
-                    }
-                    query.WhereAny(clauses);
-                }
-
-                IQuery<IUmbracoEntity> filterQuery = null;
-                if (filter.IsNullOrWhiteSpace() == false)
-                {
-                    filterQuery = Query<IUmbracoEntity>.Builder.Where(x => x.Name.Contains(filter));
-                }
-
-                var contents = repository.GetPagedResultsByQuery(query, objectTypeId, pageIndex, pageSize, out totalRecords, orderBy, orderDirection, filterQuery);
-                return contents;
-            }
-        }
-
-        /// <summary>
-        /// Returns a paged collection of descendants from the root
-        /// </summary>
-        /// <param name="umbracoObjectType"></param>
-        /// <param name="pageIndex"></param>
-        /// <param name="pageSize"></param>
-        /// <param name="totalRecords"></param>
-        /// <param name="orderBy"></param>
-        /// <param name="orderDirection"></param>
-        /// <param name="filter"></param>
-        /// <param name="includeTrashed">true/false to include trashed objects</param>
-        /// <returns></returns>
-        public IEnumerable<IUmbracoEntity> GetPagedDescendantsFromRoot(UmbracoObjectTypes umbracoObjectType, long pageIndex, int pageSize, out long totalRecords,
-            string orderBy = "path", Direction orderDirection = Direction.Ascending, string filter = "", bool includeTrashed = true)
-        {
-            var objectTypeId = umbracoObjectType.GetGuid();
-            using (var uow = UowProvider.GetUnitOfWork(readOnly:true))
-            {
-                var repository = RepositoryFactory.CreateEntityRepository(uow);
-
-                var query = Query<IUmbracoEntity>.Builder;
-                //don't include trashed if specfied
-                if (includeTrashed == false)
-                {
-                    query.Where(x => x.Trashed == false);
-                }
-
-                IQuery<IUmbracoEntity> filterQuery = null;
-                if (filter.IsNullOrWhiteSpace() == false)
-                {
-                    filterQuery = Query<IUmbracoEntity>.Builder.Where(x => x.Name.Contains(filter));
-                }
-
-                var contents = repository.GetPagedResultsByQuery(query, objectTypeId, pageIndex, pageSize, out totalRecords, orderBy, orderDirection, filterQuery);
-                return contents;
-            }
-        }
-        
-        /// <summary>
-        /// Gets a collection of descendents by the parents Id
-        /// </summary>
-        /// <param name="id">Id of entity to retrieve descendents for</param>
-        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/> objects</returns>
-        public virtual IEnumerable<IUmbracoEntity> GetDescendents(int id)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly:true))
-            {
-                var repository = RepositoryFactory.CreateEntityRepository(uow);
-                var entity = repository.Get(id);
-                var pathMatch = entity.Path + ",";
-                var query = Query<IUmbracoEntity>.Builder.Where(x => x.Path.StartsWith(pathMatch) && x.Id != id);
-
-                var entities = repository.GetByQuery(query);
-                return entities;
-            }
-        }
-
-        /// <summary>
-        /// Gets a collection of descendents by the parents Id
-        /// </summary>
-        /// <param name="id">Id of entity to retrieve descendents for</param>
-        /// <param name="umbracoObjectType">UmbracoObjectType of the descendents to retrieve</param>
-        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/> objects</returns>
-        public virtual IEnumerable<IUmbracoEntity> GetDescendents(int id, UmbracoObjectTypes umbracoObjectType)
-        {
-            var objectTypeId = umbracoObjectType.GetGuid();
-            using (var uow = UowProvider.GetUnitOfWork(readOnly:true))
-            {
-                var repository = RepositoryFactory.CreateEntityRepository(uow);
-                var entity = repository.Get(id);
-                var query = Query<IUmbracoEntity>.Builder.Where(x => x.Path.StartsWith(entity.Path) && x.Id != id);
-
-                var entities = repository.GetByQuery(query, objectTypeId);
-                return entities;
-            }
-        }
-
-        /// <summary>
-        /// Gets a collection of the entities at the root, which corresponds to the entities with a Parent Id of -1.
-        /// </summary>
-        /// <param name="umbracoObjectType">UmbracoObjectType of the root entities to retrieve</param>
-        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/> objects</returns>
-        public virtual IEnumerable<IUmbracoEntity> GetRootEntities(UmbracoObjectTypes umbracoObjectType)
-        {
-            //create it once if it is needed (no need for locking here)
-            if (_rootEntityQuery == null)
-            {
-                _rootEntityQuery = Query<IUmbracoEntity>.Builder.Where(x => x.ParentId == -1);
-            }
-
-            var objectTypeId = umbracoObjectType.GetGuid();
-            using (var uow = UowProvider.GetUnitOfWork(readOnly:true))
-            {
-                var repository = RepositoryFactory.CreateEntityRepository(uow);
-                var entities = repository.GetByQuery(_rootEntityQuery, objectTypeId);
-                return entities;
-            }
-        }
-
-        /// <summary>
-        /// Gets a collection of all <see cref="IUmbracoEntity"/> of a given type.
-        /// </summary>
-        /// <typeparam name="T">Type of the entities to retrieve</typeparam>
-        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/> objects</returns>
-        public virtual IEnumerable<IUmbracoEntity> GetAll<T>(params int[] ids) where T : IUmbracoEntity
-        {
-            var typeFullName = typeof(T).FullName;
-            Mandate.That<NotSupportedException>(_supportedObjectTypes.ContainsKey(typeFullName), () =>
-            {
-                throw new NotSupportedException
-                    ("The passed in type is not supported");
-            });
-            var objectType = _supportedObjectTypes[typeFullName].Item1;
-
-            return GetAll(objectType, ids);
-        }
-
-        /// <summary>
-        /// Gets a collection of all <see cref="IUmbracoEntity"/> of a given type.
-        /// </summary>
-        /// <param name="umbracoObjectType">UmbracoObjectType of the entities to return</param>
-        /// <param name="ids"></param>
-        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/> objects</returns>
-        public virtual IEnumerable<IUmbracoEntity> GetAll(UmbracoObjectTypes umbracoObjectType, params int[] ids)
-        {
-            var entityType = GetEntityType(umbracoObjectType);
-            var typeFullName = entityType.FullName;
-            Mandate.That<NotSupportedException>(_supportedObjectTypes.ContainsKey(typeFullName), () =>
-            {
-                throw new NotSupportedException
-                    ("The passed in type is not supported");
-            });
-
-            var objectTypeId = umbracoObjectType.GetGuid();
-            using (var uow = UowProvider.GetUnitOfWork(readOnly:true))
-            {
-                var repository = RepositoryFactory.CreateEntityRepository(uow);
-                var ret = repository.GetAll(objectTypeId, ids);
-                return ret;
-            }
-        }
-
-        public IEnumerable<IUmbracoEntity> GetAll(UmbracoObjectTypes umbracoObjectType, Guid[] keys)
-        {
-            var entityType = GetEntityType(umbracoObjectType);
-            var typeFullName = entityType.FullName;
-            Mandate.That<NotSupportedException>(_supportedObjectTypes.ContainsKey(typeFullName), () =>
-            {
-                throw new NotSupportedException
-                    ("The passed in type is not supported");
-            });
-
-            var objectTypeId = umbracoObjectType.GetGuid();
-            using (var uow = UowProvider.GetUnitOfWork(readOnly:true))
-            {
-                var repository = RepositoryFactory.CreateEntityRepository(uow);
-                var ret = repository.GetAll(objectTypeId, keys);
-                return ret;
-            }
-        }
-
-        public virtual IEnumerable<EntityPath> GetAllPaths(UmbracoObjectTypes umbracoObjectType, params int[] ids)
-        {
-            var entityType = GetEntityType(umbracoObjectType);
-            var typeFullName = entityType.FullName;
-            Mandate.That<NotSupportedException>(_supportedObjectTypes.ContainsKey(typeFullName), () =>
-            {
-                throw new NotSupportedException
-                    ("The passed in type is not supported");
-            });
-
-            var objectTypeId = umbracoObjectType.GetGuid();
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateEntityRepository(uow);
-                return repository.GetAllPaths(objectTypeId, ids);
-            }
-        }
-
-        public virtual IEnumerable<EntityPath> GetAllPaths(UmbracoObjectTypes umbracoObjectType, params Guid[] keys)
-        {
-            var entityType = GetEntityType(umbracoObjectType);
-            var typeFullName = entityType.FullName;
-            Mandate.That<NotSupportedException>(_supportedObjectTypes.ContainsKey(typeFullName), () =>
-            {
-                throw new NotSupportedException
-                    ("The passed in type is not supported");
-            });
-
-            var objectTypeId = umbracoObjectType.GetGuid();
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateEntityRepository(uow);
-                return repository.GetAllPaths(objectTypeId, keys);
-            }
-        }
-        
-        /// <summary>
-        /// Gets a collection of <see cref="T:Umbraco.Core.Models.EntityBase.IUmbracoEntity" />
-        /// </summary>
-        /// <param name="objectTypeId">Guid id of the UmbracoObjectType</param>
-        /// <param name="ids"></param>
-        /// <returns>An enumerable list of <see cref="T:Umbraco.Core.Models.EntityBase.IUmbracoEntity" /> objects</returns>
-        public virtual IEnumerable<IUmbracoEntity> GetAll(Guid objectTypeId, params int[] ids)
-        {
-            var umbracoObjectType = UmbracoObjectTypesExtensions.GetUmbracoObjectType(objectTypeId);
-            var entityType = GetEntityType(umbracoObjectType);
-            var typeFullName = entityType.FullName;
-            Mandate.That<NotSupportedException>(_supportedObjectTypes.ContainsKey(typeFullName), () =>
-            {
-                throw new NotSupportedException
-                    ("The passed in type is not supported");
-            });
-
-            using (var uow = UowProvider.GetUnitOfWork(readOnly:true))
-            {
-                var repository = RepositoryFactory.CreateEntityRepository(uow);
-                var ret = repository.GetAll(objectTypeId, ids);
-                return ret;
-            }
-        }
-
-        /// <summary>
-        /// Gets the UmbracoObjectType from the integer id of an IUmbracoEntity.
-        /// </summary>
-        /// <param name="id">Id of the entity</param>
-        /// <returns><see cref="UmbracoObjectTypes"/></returns>
-        public virtual UmbracoObjectTypes GetObjectType(int id)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var sql = new Sql().Select("nodeObjectType").From<NodeDto>().Where<NodeDto>(x => x.NodeId == id);
-                var nodeObjectTypeId = uow.Database.ExecuteScalar<Guid>(sql);
-                var objectTypeId = nodeObjectTypeId;
-                return UmbracoObjectTypesExtensions.GetUmbracoObjectType(objectTypeId);
-            }
-        }
-
-        /// <summary>
-        /// Gets the UmbracoObjectType from the integer id of an IUmbracoEntity.
-        /// </summary>
-        /// <param name="key">Unique Id of the entity</param>
-        /// <returns><see cref="UmbracoObjectTypes"/></returns>
-        public virtual UmbracoObjectTypes GetObjectType(Guid key)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var sql = new Sql().Select("nodeObjectType").From<NodeDto>().Where<NodeDto>(x => x.UniqueId == key);
-                var nodeObjectTypeId = uow.Database.ExecuteScalar<Guid>(sql);
-                var objectTypeId = nodeObjectTypeId;
-                return UmbracoObjectTypesExtensions.GetUmbracoObjectType(objectTypeId);
-            }
-        }
-
-        /// <summary>
-        /// Gets the UmbracoObjectType from an IUmbracoEntity.
-        /// </summary>
-        /// <param name="entity"><see cref="IUmbracoEntity"/></param>
-        /// <returns><see cref="UmbracoObjectTypes"/></returns>
-        public virtual UmbracoObjectTypes GetObjectType(IUmbracoEntity entity)
-        {
-            var entityImpl = entity as UmbracoEntity;
-            if (entityImpl == null)
-                return GetObjectType(entity.Id);
-
-            return UmbracoObjectTypesExtensions.GetUmbracoObjectType(entityImpl.NodeObjectTypeId);
-        }
-
-        /// <summary>
-        /// Gets the Type of an entity by its Id
-        /// </summary>
-        /// <param name="id">Id of the entity</param>
-        /// <returns>Type of the entity</returns>
-        public virtual Type GetEntityType(int id)
-        {
-            var objectType = GetObjectType(id);
-            return GetEntityType(objectType);
-        }
-
-        /// <summary>
-        /// Gets the Type of an entity by its <see cref="UmbracoObjectTypes"/>
-        /// </summary>
-        /// <param name="umbracoObjectType"><see cref="UmbracoObjectTypes"/></param>
-        /// <returns>Type of the entity</returns>
-        public virtual Type GetEntityType(UmbracoObjectTypes umbracoObjectType)
-        {
-            var type = typeof(UmbracoObjectTypes);
-            var memInfo = type.GetMember(umbracoObjectType.ToString());
-            var attributes = memInfo[0].GetCustomAttributes(typeof(UmbracoObjectTypeAttribute),
-                false);
-
-            var attribute = ((UmbracoObjectTypeAttribute)attributes[0]);
-            if (attribute == null)
-                throw new NullReferenceException("The passed in UmbracoObjectType does not contain an UmbracoObjectTypeAttribute, which is used to retrieve the Type.");
-
-            if (attribute.ModelType == null)
-                throw new NullReferenceException("The passed in UmbracoObjectType does not contain a Type definition");
-
-            return attribute.ModelType;
-        }
-
-        public bool Exists(Guid key)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly:true))
-            {
-                var repository = RepositoryFactory.CreateEntityRepository(uow);
-                var exists = repository.Exists(key);
-                return exists;
-            }
-        }
-
-        public bool Exists(int id)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly:true))
-            {
-                var repository = RepositoryFactory.CreateEntityRepository(uow);
-                var exists = repository.Exists(id);
-                return exists;
-            }
-        }
-
-        /// <inheritdoc />
-        public int ReserveId(Guid key)
-        {
-            NodeDto node;
-            using (var scope = UowProvider.ScopeProvider.CreateScope())
-            {
-                var sql = new Sql("SELECT * FROM umbracoNode WHERE uniqueID=@0 AND nodeObjectType=@1", key, Constants.ObjectTypes.IdReservationGuid);
-                node = scope.Database.SingleOrDefault<NodeDto>(sql);
-                if (node != null) throw new InvalidOperationException("An identifier has already been reserved for this Udi.");
-                node = new NodeDto
-                {
-                    UniqueId = key,
-                    Text = "RESERVED.ID",
-                    NodeObjectType = Constants.ObjectTypes.IdReservationGuid,
-
-                    CreateDate = DateTime.Now,
-                    UserId = 0,
-                    ParentId = -1,
-                    Level = 1,
-                    Path = "-1",
-                    SortOrder = 0,
-                    Trashed = false
-                };
-                scope.Database.Insert(node);
-                scope.Complete();
-            }
-            return node.NodeId;
-        }
-    }
-}
+                        if (id != Constants.System.Root)
+                        {
+                            var itemPath = itemPaths.FirstOrDefault(x => x.Id == id);
+                            if (itemPath == null) continue;
+                            var path = itemPath.Path;
+                            var qid = id;
+                            clauses.Add(x => x.Path.SqlStartsWith(string.Format("{0},", path), TextColumnType.NVarchar) || x.Path.SqlEndsWith(string.Format(",{0}", qid), TextColumnType.NVarchar));
+                        }
+                    }
+                    query.WhereAny(clauses);
+                }
+
+                IQuery<IUmbracoEntity> filterQuery = null;
+                if (filter.IsNullOrWhiteSpace() == false)
+                {
+                    filterQuery = Query<IUmbracoEntity>.Builder.Where(x => x.Name.Contains(filter));
+                }
+
+                var contents = repository.GetPagedResultsByQuery(query, objectTypeId, pageIndex, pageSize, out totalRecords, orderBy, orderDirection, filterQuery);
+                return contents;
+            }
+        }
+
+        /// <summary>
+        /// Returns a paged collection of descendants from the root
+        /// </summary>
+        /// <param name="umbracoObjectType"></param>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="totalRecords"></param>
+        /// <param name="orderBy"></param>
+        /// <param name="orderDirection"></param>
+        /// <param name="filter"></param>
+        /// <param name="includeTrashed">true/false to include trashed objects</param>
+        /// <returns></returns>
+        public IEnumerable<IUmbracoEntity> GetPagedDescendantsFromRoot(UmbracoObjectTypes umbracoObjectType, long pageIndex, int pageSize, out long totalRecords,
+            string orderBy = "path", Direction orderDirection = Direction.Ascending, string filter = "", bool includeTrashed = true)
+        {
+            var objectTypeId = umbracoObjectType.GetGuid();
+            using (var uow = UowProvider.GetUnitOfWork(readOnly:true))
+            {
+                var repository = RepositoryFactory.CreateEntityRepository(uow);
+
+                var query = Query<IUmbracoEntity>.Builder;
+                //don't include trashed if specfied
+                if (includeTrashed == false)
+                {
+                    query.Where(x => x.Trashed == false);
+                }
+
+                IQuery<IUmbracoEntity> filterQuery = null;
+                if (filter.IsNullOrWhiteSpace() == false)
+                {
+                    filterQuery = Query<IUmbracoEntity>.Builder.Where(x => x.Name.Contains(filter));
+                }
+
+                var contents = repository.GetPagedResultsByQuery(query, objectTypeId, pageIndex, pageSize, out totalRecords, orderBy, orderDirection, filterQuery);
+                return contents;
+            }
+        }
+
+        /// <summary>
+        /// Gets a collection of descendents by the parents Id
+        /// </summary>
+        /// <param name="id">Id of entity to retrieve descendents for</param>
+        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/> objects</returns>
+        public virtual IEnumerable<IUmbracoEntity> GetDescendents(int id)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly:true))
+            {
+                var repository = RepositoryFactory.CreateEntityRepository(uow);
+                var entity = repository.Get(id);
+                var pathMatch = entity.Path + ",";
+                var query = Query<IUmbracoEntity>.Builder.Where(x => x.Path.StartsWith(pathMatch) && x.Id != id);
+
+                var entities = repository.GetByQuery(query);
+                return entities;
+            }
+        }
+
+        /// <summary>
+        /// Gets a collection of descendents by the parents Id
+        /// </summary>
+        /// <param name="id">Id of entity to retrieve descendents for</param>
+        /// <param name="umbracoObjectType">UmbracoObjectType of the descendents to retrieve</param>
+        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/> objects</returns>
+        public virtual IEnumerable<IUmbracoEntity> GetDescendents(int id, UmbracoObjectTypes umbracoObjectType)
+        {
+            var objectTypeId = umbracoObjectType.GetGuid();
+            using (var uow = UowProvider.GetUnitOfWork(readOnly:true))
+            {
+                var repository = RepositoryFactory.CreateEntityRepository(uow);
+                var entity = repository.Get(id);
+                var query = Query<IUmbracoEntity>.Builder.Where(x => x.Path.StartsWith(entity.Path) && x.Id != id);
+
+                var entities = repository.GetByQuery(query, objectTypeId);
+                return entities;
+            }
+        }
+
+        /// <summary>
+        /// Gets a collection of the entities at the root, which corresponds to the entities with a Parent Id of -1.
+        /// </summary>
+        /// <param name="umbracoObjectType">UmbracoObjectType of the root entities to retrieve</param>
+        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/> objects</returns>
+        public virtual IEnumerable<IUmbracoEntity> GetRootEntities(UmbracoObjectTypes umbracoObjectType)
+        {
+            //create it once if it is needed (no need for locking here)
+            if (_rootEntityQuery == null)
+            {
+                _rootEntityQuery = Query<IUmbracoEntity>.Builder.Where(x => x.ParentId == -1);
+            }
+
+            var objectTypeId = umbracoObjectType.GetGuid();
+            using (var uow = UowProvider.GetUnitOfWork(readOnly:true))
+            {
+                var repository = RepositoryFactory.CreateEntityRepository(uow);
+                var entities = repository.GetByQuery(_rootEntityQuery, objectTypeId);
+                return entities;
+            }
+        }
+
+        /// <summary>
+        /// Gets a collection of all <see cref="IUmbracoEntity"/> of a given type.
+        /// </summary>
+        /// <typeparam name="T">Type of the entities to retrieve</typeparam>
+        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/> objects</returns>
+        public virtual IEnumerable<IUmbracoEntity> GetAll<T>(params int[] ids) where T : IUmbracoEntity
+        {
+            var typeFullName = typeof(T).FullName;
+            Mandate.That<NotSupportedException>(_supportedObjectTypes.ContainsKey(typeFullName), () =>
+            {
+                throw new NotSupportedException
+                    ("The passed in type is not supported");
+            });
+            var objectType = _supportedObjectTypes[typeFullName].Item1;
+
+            return GetAll(objectType, ids);
+        }
+
+        /// <summary>
+        /// Gets a collection of all <see cref="IUmbracoEntity"/> of a given type.
+        /// </summary>
+        /// <param name="umbracoObjectType">UmbracoObjectType of the entities to return</param>
+        /// <param name="ids"></param>
+        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/> objects</returns>
+        public virtual IEnumerable<IUmbracoEntity> GetAll(UmbracoObjectTypes umbracoObjectType, params int[] ids)
+        {
+            var entityType = GetEntityType(umbracoObjectType);
+            var typeFullName = entityType.FullName;
+            Mandate.That<NotSupportedException>(_supportedObjectTypes.ContainsKey(typeFullName), () =>
+            {
+                throw new NotSupportedException
+                    ("The passed in type is not supported");
+            });
+
+            var objectTypeId = umbracoObjectType.GetGuid();
+            using (var uow = UowProvider.GetUnitOfWork(readOnly:true))
+            {
+                var repository = RepositoryFactory.CreateEntityRepository(uow);
+                var ret = repository.GetAll(objectTypeId, ids);
+                return ret;
+            }
+        }
+
+        public IEnumerable<IUmbracoEntity> GetAll(UmbracoObjectTypes umbracoObjectType, Guid[] keys)
+        {
+            var entityType = GetEntityType(umbracoObjectType);
+            var typeFullName = entityType.FullName;
+            Mandate.That<NotSupportedException>(_supportedObjectTypes.ContainsKey(typeFullName), () =>
+            {
+                throw new NotSupportedException
+                    ("The passed in type is not supported");
+            });
+
+            var objectTypeId = umbracoObjectType.GetGuid();
+            using (var uow = UowProvider.GetUnitOfWork(readOnly:true))
+            {
+                var repository = RepositoryFactory.CreateEntityRepository(uow);
+                var ret = repository.GetAll(objectTypeId, keys);
+                return ret;
+            }
+        }
+
+        public virtual IEnumerable<EntityPath> GetAllPaths(UmbracoObjectTypes umbracoObjectType, params int[] ids)
+        {
+            var entityType = GetEntityType(umbracoObjectType);
+            var typeFullName = entityType.FullName;
+            Mandate.That<NotSupportedException>(_supportedObjectTypes.ContainsKey(typeFullName), () =>
+            {
+                throw new NotSupportedException
+                    ("The passed in type is not supported");
+            });
+
+            var objectTypeId = umbracoObjectType.GetGuid();
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateEntityRepository(uow);
+                return repository.GetAllPaths(objectTypeId, ids);
+            }
+        }
+
+        public virtual IEnumerable<EntityPath> GetAllPaths(UmbracoObjectTypes umbracoObjectType, params Guid[] keys)
+        {
+            var entityType = GetEntityType(umbracoObjectType);
+            var typeFullName = entityType.FullName;
+            Mandate.That<NotSupportedException>(_supportedObjectTypes.ContainsKey(typeFullName), () =>
+            {
+                throw new NotSupportedException
+                    ("The passed in type is not supported");
+            });
+
+            var objectTypeId = umbracoObjectType.GetGuid();
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateEntityRepository(uow);
+                return repository.GetAllPaths(objectTypeId, keys);
+            }
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="T:Umbraco.Core.Models.EntityBase.IUmbracoEntity" />
+        /// </summary>
+        /// <param name="objectTypeId">Guid id of the UmbracoObjectType</param>
+        /// <param name="ids"></param>
+        /// <returns>An enumerable list of <see cref="T:Umbraco.Core.Models.EntityBase.IUmbracoEntity" /> objects</returns>
+        public virtual IEnumerable<IUmbracoEntity> GetAll(Guid objectTypeId, params int[] ids)
+        {
+            var umbracoObjectType = UmbracoObjectTypesExtensions.GetUmbracoObjectType(objectTypeId);
+            var entityType = GetEntityType(umbracoObjectType);
+            var typeFullName = entityType.FullName;
+            Mandate.That<NotSupportedException>(_supportedObjectTypes.ContainsKey(typeFullName), () =>
+            {
+                throw new NotSupportedException
+                    ("The passed in type is not supported");
+            });
+
+            using (var uow = UowProvider.GetUnitOfWork(readOnly:true))
+            {
+                var repository = RepositoryFactory.CreateEntityRepository(uow);
+                var ret = repository.GetAll(objectTypeId, ids);
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// Gets the UmbracoObjectType from the integer id of an IUmbracoEntity.
+        /// </summary>
+        /// <param name="id">Id of the entity</param>
+        /// <returns><see cref="UmbracoObjectTypes"/></returns>
+        public virtual UmbracoObjectTypes GetObjectType(int id)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var sql = new Sql().Select("nodeObjectType").From<NodeDto>().Where<NodeDto>(x => x.NodeId == id);
+                var nodeObjectTypeId = uow.Database.ExecuteScalar<Guid>(sql);
+                var objectTypeId = nodeObjectTypeId;
+                return UmbracoObjectTypesExtensions.GetUmbracoObjectType(objectTypeId);
+            }
+        }
+
+        /// <summary>
+        /// Gets the UmbracoObjectType from the integer id of an IUmbracoEntity.
+        /// </summary>
+        /// <param name="key">Unique Id of the entity</param>
+        /// <returns><see cref="UmbracoObjectTypes"/></returns>
+        public virtual UmbracoObjectTypes GetObjectType(Guid key)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var sql = new Sql().Select("nodeObjectType").From<NodeDto>().Where<NodeDto>(x => x.UniqueId == key);
+                var nodeObjectTypeId = uow.Database.ExecuteScalar<Guid>(sql);
+                var objectTypeId = nodeObjectTypeId;
+                return UmbracoObjectTypesExtensions.GetUmbracoObjectType(objectTypeId);
+            }
+        }
+
+        /// <summary>
+        /// Gets the UmbracoObjectType from an IUmbracoEntity.
+        /// </summary>
+        /// <param name="entity"><see cref="IUmbracoEntity"/></param>
+        /// <returns><see cref="UmbracoObjectTypes"/></returns>
+        public virtual UmbracoObjectTypes GetObjectType(IUmbracoEntity entity)
+        {
+            var entityImpl = entity as UmbracoEntity;
+            if (entityImpl == null)
+                return GetObjectType(entity.Id);
+
+            return UmbracoObjectTypesExtensions.GetUmbracoObjectType(entityImpl.NodeObjectTypeId);
+        }
+
+        /// <summary>
+        /// Gets the Type of an entity by its Id
+        /// </summary>
+        /// <param name="id">Id of the entity</param>
+        /// <returns>Type of the entity</returns>
+        public virtual Type GetEntityType(int id)
+        {
+            var objectType = GetObjectType(id);
+            return GetEntityType(objectType);
+        }
+
+        /// <summary>
+        /// Gets the Type of an entity by its <see cref="UmbracoObjectTypes"/>
+        /// </summary>
+        /// <param name="umbracoObjectType"><see cref="UmbracoObjectTypes"/></param>
+        /// <returns>Type of the entity</returns>
+        public virtual Type GetEntityType(UmbracoObjectTypes umbracoObjectType)
+        {
+            var type = typeof(UmbracoObjectTypes);
+            var memInfo = type.GetMember(umbracoObjectType.ToString());
+            var attributes = memInfo[0].GetCustomAttributes(typeof(UmbracoObjectTypeAttribute),
+                false);
+
+            var attribute = ((UmbracoObjectTypeAttribute)attributes[0]);
+            if (attribute == null)
+                throw new NullReferenceException("The passed in UmbracoObjectType does not contain an UmbracoObjectTypeAttribute, which is used to retrieve the Type.");
+
+            if (attribute.ModelType == null)
+                throw new NullReferenceException("The passed in UmbracoObjectType does not contain a Type definition");
+
+            return attribute.ModelType;
+        }
+
+        public bool Exists(Guid key)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly:true))
+            {
+                var repository = RepositoryFactory.CreateEntityRepository(uow);
+                var exists = repository.Exists(key);
+                return exists;
+            }
+        }
+
+        public bool Exists(int id)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly:true))
+            {
+                var repository = RepositoryFactory.CreateEntityRepository(uow);
+                var exists = repository.Exists(id);
+                return exists;
+            }
+        }
+
+        /// <inheritdoc />
+        public int ReserveId(Guid key)
+        {
+            NodeDto node;
+            using (var scope = UowProvider.ScopeProvider.CreateScope())
+            {
+                var sql = new Sql("SELECT * FROM umbracoNode WHERE uniqueID=@0 AND nodeObjectType=@1", key, Constants.ObjectTypes.IdReservationGuid);
+                node = scope.Database.SingleOrDefault<NodeDto>(sql);
+                if (node != null) throw new InvalidOperationException("An identifier has already been reserved for this Udi.");
+                node = new NodeDto
+                {
+                    UniqueId = key,
+                    Text = "RESERVED.ID",
+                    NodeObjectType = Constants.ObjectTypes.IdReservationGuid,
+
+                    CreateDate = DateTime.Now,
+                    UserId = 0,
+                    ParentId = -1,
+                    Level = 1,
+                    Path = "-1",
+                    SortOrder = 0,
+                    Trashed = false
+                };
+                scope.Database.Insert(node);
+                scope.Complete();
+            }
+            return node.NodeId;
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Services/IEntityService.cs b/src/Umbraco.Core/Services/IEntityService.cs
index d8a60a9cae..a6a2254138 100644
--- a/src/Umbraco.Core/Services/IEntityService.cs
+++ b/src/Umbraco.Core/Services/IEntityService.cs
@@ -1,298 +1,282 @@
-using System;
-using System.Collections.Generic;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.EntityBase;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
-
-namespace Umbraco.Core.Services
-{
-    public interface IEntityService
-    {
-        /// <summary>
-        /// Returns true if the entity exists
-        /// </summary>
-        /// <param name="key"></param>
-        /// <returns></returns>
-        bool Exists(Guid key);
-
-        /// <summary>
-        /// Returns true if the entity exists
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        bool Exists(int id);
-
-        /// <summary>
-        /// Returns the integer id for a given GUID
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="umbracoObjectType"></param>
-        /// <returns></returns>
+using System;
+using System.Collections.Generic;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
+
+namespace Umbraco.Core.Services
+{
+    public interface IEntityService
+    {
+        /// <summary>
+        /// Returns true if the entity exists
+        /// </summary>
+        /// <param name="key"></param>
+        /// <returns></returns>
+        bool Exists(Guid key);
+
+        /// <summary>
+        /// Returns true if the entity exists
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        bool Exists(int id);
+
+        /// <summary>
+        /// Returns the integer id for a given GUID
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="umbracoObjectType"></param>
+        /// <returns></returns>
         Attempt<int> GetIdForKey(Guid key, UmbracoObjectTypes umbracoObjectType);
-
-        /// <summary>
-        /// Returns the integer id for a given Udi
-        /// </summary>
-        /// <param name="udi"></param>
-        /// <returns></returns>
-        Attempt<int> GetIdForUdi(Udi udi);
-
-        /// <summary>
-        /// Returns the GUID for a given integer id
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="umbracoObjectType"></param>
-        /// <returns></returns>
-        Attempt<Guid> GetKeyForId(int id, UmbracoObjectTypes umbracoObjectType);
-
-        /// <summary>
-        /// Gets an UmbracoEntity by its Id, and optionally loads the complete object graph.
-        /// </summary>
-        /// <returns>
-        /// By default this will load the base type <see cref="IUmbracoEntity"/> with a minimum set of properties.
-        /// </returns>
-        /// <param name="key">Unique Id of the object to retrieve</param>
-        /// <param name="loadBaseType">Optional bool to load the complete object graph when set to <c>False</c>.</param>
-        /// <returns>An <see cref="IUmbracoEntity"/></returns>
-        IUmbracoEntity GetByKey(Guid key, bool loadBaseType = true);
-
-        /// <summary>
-        /// Gets an UmbracoEntity by its Id, and optionally loads the complete object graph.
-        /// </summary>
-        /// <returns>
-        /// By default this will load the base type <see cref="IUmbracoEntity"/> with a minimum set of properties.
-        /// </returns>
-        /// <param name="id">Id of the object to retrieve</param>
-        /// <param name="loadBaseType">Optional bool to load the complete object graph when set to <c>False</c>.</param>
-        /// <returns>An <see cref="IUmbracoEntity"/></returns>
-        IUmbracoEntity Get(int id, bool loadBaseType = true);
-
-        /// <summary>
-        /// Gets an UmbracoEntity by its Id and UmbracoObjectType, and optionally loads the complete object graph.
-        /// </summary>
-        /// <returns>
-        /// By default this will load the base type <see cref="IUmbracoEntity"/> with a minimum set of properties.
-        /// </returns>
-        /// <param name="key">Unique Id of the object to retrieve</param>
-        /// <param name="umbracoObjectType">UmbracoObjectType of the entity to retrieve</param>
-        /// <param name="loadBaseType">Optional bool to load the complete object graph when set to <c>False</c>.</param>
-        /// <returns>An <see cref="IUmbracoEntity"/></returns>
-        IUmbracoEntity GetByKey(Guid key, UmbracoObjectTypes umbracoObjectType, bool loadBaseType = true);
-
-        /// <summary>
-        /// Gets an UmbracoEntity by its Id and UmbracoObjectType, and optionally loads the complete object graph.
-        /// </summary>
-        /// <returns>
-        /// By default this will load the base type <see cref="IUmbracoEntity"/> with a minimum set of properties.
-        /// </returns>
-        /// <param name="id">Id of the object to retrieve</param>
-        /// <param name="umbracoObjectType">UmbracoObjectType of the entity to retrieve</param>
-        /// <param name="loadBaseType">Optional bool to load the complete object graph when set to <c>False</c>.</param>
-        /// <returns>An <see cref="IUmbracoEntity"/></returns>
-        IUmbracoEntity Get(int id, UmbracoObjectTypes umbracoObjectType, bool loadBaseType = true);
-
-        /// <summary>
-        /// Gets an UmbracoEntity by its Id and specified Type. Optionally loads the complete object graph.
-        /// </summary>
-        /// <returns>
-        /// By default this will load the base type <see cref="IUmbracoEntity"/> with a minimum set of properties.
-        /// </returns>
-        /// <typeparam name="T">Type of the model to retrieve. Must be based on an <see cref="IUmbracoEntity"/></typeparam>
-        /// <param name="key">Unique Id of the object to retrieve</param>
-        /// <param name="loadBaseType">Optional bool to load the complete object graph when set to <c>False</c>.</param>
-        /// <returns>An <see cref="IUmbracoEntity"/></returns>
-        IUmbracoEntity GetByKey<T>(Guid key, bool loadBaseType = true) where T : IUmbracoEntity;
-
-        /// <summary>
-        /// Gets an UmbracoEntity by its Id and specified Type. Optionally loads the complete object graph.
-        /// </summary>
-        /// <returns>
-        /// By default this will load the base type <see cref="IUmbracoEntity"/> with a minimum set of properties.
-        /// </returns>
-        /// <typeparam name="T">Type of the model to retrieve. Must be based on an <see cref="IUmbracoEntity"/></typeparam>
-        /// <param name="id">Id of the object to retrieve</param>
-        /// <param name="loadBaseType">Optional bool to load the complete object graph when set to <c>False</c>.</param>
-        /// <returns>An <see cref="IUmbracoEntity"/></returns>
-        IUmbracoEntity Get<T>(int id, bool loadBaseType = true) where T : IUmbracoEntity;
-
-        /// <summary>
-        /// Gets the parent of entity by its id
-        /// </summary>
-        /// <param name="id">Id of the entity to retrieve the Parent for</param>
-        /// <returns>An <see cref="IUmbracoEntity"/></returns>
-        IUmbracoEntity GetParent(int id);
-
-        /// <summary>
-        /// Gets the parent of entity by its id and UmbracoObjectType
-        /// </summary>
-        /// <param name="id">Id of the entity to retrieve the Parent for</param>
-        /// <param name="umbracoObjectType">UmbracoObjectType of the parent to retrieve</param>
-        /// <returns>An <see cref="IUmbracoEntity"/></returns>
-        IUmbracoEntity GetParent(int id, UmbracoObjectTypes umbracoObjectType);
-
-        /// <summary>
-        /// Gets a collection of children by the parents Id
-        /// </summary>
-        /// <param name="parentId">Id of the parent to retrieve children for</param>
-        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/> objects</returns>
-        IEnumerable<IUmbracoEntity> GetChildren(int parentId);
-
-        /// <summary>
-        /// Gets a collection of children by the parents Id and UmbracoObjectType
-        /// </summary>
-        /// <param name="parentId">Id of the parent to retrieve children for</param>
-        /// <param name="umbracoObjectType">UmbracoObjectType of the children to retrieve</param>
-        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/> objects</returns>
-        IEnumerable<IUmbracoEntity> GetChildren(int parentId, UmbracoObjectTypes umbracoObjectType);
-
-        /// <summary>
-        /// Returns a paged collection of children
-        /// </summary>
-        /// <param name="parentId">The parent id to return children for</param>
-        /// <param name="umbracoObjectType"></param>
-        /// <param name="pageIndex"></param>
-        /// <param name="pageSize"></param>
-        /// <param name="totalRecords"></param>
-        /// <param name="orderBy"></param>
-        /// <param name="orderDirection"></param>
-        /// <param name="filter"></param>
-        /// <returns></returns>
-        IEnumerable<IUmbracoEntity> GetPagedChildren(int parentId, UmbracoObjectTypes umbracoObjectType, long pageIndex, int pageSize, out long totalRecords,
-            string orderBy = "SortOrder", Direction orderDirection = Direction.Ascending, string filter = "");
-
-        /// <summary>
-        /// Returns a paged collection of descendants
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="umbracoObjectType"></param>
-        /// <param name="pageIndex"></param>
-        /// <param name="pageSize"></param>
-        /// <param name="totalRecords"></param>
-        /// <param name="orderBy"></param>
-        /// <param name="orderDirection"></param>
-        /// <param name="filter"></param>
-        /// <returns></returns>
-        IEnumerable<IUmbracoEntity> GetPagedDescendants(int id, UmbracoObjectTypes umbracoObjectType, long pageIndex, int pageSize, out long totalRecords,
-            string orderBy = "path", Direction orderDirection = Direction.Ascending, string filter = "");
-
-        /// <summary>
-        /// Returns a paged collection of descendants
-        /// </summary>
-        IEnumerable<IUmbracoEntity> GetPagedDescendants(IEnumerable<int> ids, UmbracoObjectTypes umbracoObjectType, long pageIndex, int pageSize, out long totalRecords,
-            string orderBy = "path", Direction orderDirection = Direction.Ascending, string filter = "");
-
-        /// <summary>
-        /// Returns a paged collection of descendants from the root
-        /// </summary>
-        /// <param name="umbracoObjectType"></param>
-        /// <param name="pageIndex"></param>
-        /// <param name="pageSize"></param>
-        /// <param name="totalRecords"></param>
-        /// <param name="orderBy"></param>
-        /// <param name="orderDirection"></param>
-        /// <param name="filter"></param>
-        /// <param name="includeTrashed">true/false to include trashed objects</param>
-        /// <returns></returns>
-        IEnumerable<IUmbracoEntity> GetPagedDescendantsFromRoot(UmbracoObjectTypes umbracoObjectType, long pageIndex, int pageSize, out long totalRecords,
-            string orderBy = "path", Direction orderDirection = Direction.Ascending, string filter = "", bool includeTrashed = true);
-
-        /// <summary>
-        /// Gets a collection of descendents by the parents Id
-        /// </summary>
-        /// <param name="id">Id of entity to retrieve descendents for</param>
-        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/> objects</returns>
-        IEnumerable<IUmbracoEntity> GetDescendents(int id);
-
-        /// <summary>
-        /// Gets a collection of descendents by the parents Id
-        /// </summary>
-        /// <param name="id">Id of entity to retrieve descendents for</param>
-        /// <param name="umbracoObjectType">UmbracoObjectType of the descendents to retrieve</param>
-        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/> objects</returns>
-        IEnumerable<IUmbracoEntity> GetDescendents(int id, UmbracoObjectTypes umbracoObjectType);
-
-        /// <summary>
-        /// Gets a collection of the entities at the root, which corresponds to the entities with a Parent Id of -1.
-        /// </summary>
-        /// <param name="umbracoObjectType">UmbracoObjectType of the root entities to retrieve</param>
-        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/> objects</returns>
-        IEnumerable<IUmbracoEntity> GetRootEntities(UmbracoObjectTypes umbracoObjectType);
-
-        /// <summary>
-        /// Gets a collection of all <see cref="IUmbracoEntity"/> of a given type.
-        /// </summary>
-        /// <typeparam name="T">Type of the entities to retrieve</typeparam>
-        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/> objects</returns>
-        IEnumerable<IUmbracoEntity> GetAll<T>(params int[] ids) where T : IUmbracoEntity;
-
-        /// <summary>
-        /// Gets a collection of all <see cref="IUmbracoEntity"/> of a given type.
-        /// </summary>
-        /// <param name="umbracoObjectType">UmbracoObjectType of the entities to return</param>
-        /// <param name="ids"></param>
-        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/> objects</returns>
-        IEnumerable<IUmbracoEntity> GetAll(UmbracoObjectTypes umbracoObjectType, params int[] ids);
-
-        /// <summary>
-        /// Gets a collection of all <see cref="IUmbracoEntity"/> of a given type.
-        /// </summary>
-        /// <param name="umbracoObjectType">UmbracoObjectType of the entities to return</param>
-        /// <param name="keys"></param>
-        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/> objects</returns>
-        IEnumerable<IUmbracoEntity> GetAll(UmbracoObjectTypes umbracoObjectType, Guid[] keys);
-
-        /// <summary>
-        /// Gets a collection of <see cref="IUmbracoEntity"/>
-        /// </summary>
-        /// <param name="objectTypeId">Guid id of the UmbracoObjectType</param>
-        /// <param name="ids"></param>
-        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/> objects</returns>
-        IEnumerable<IUmbracoEntity> GetAll(Guid objectTypeId, params int[] ids);
-
-        /// <summary>
-        /// Gets paths for entities.
-        /// </summary>
-        IEnumerable<EntityPath> GetAllPaths(UmbracoObjectTypes umbracoObjectType, params int[] ids);
-
-        /// <summary>
-        /// Gets paths for entities.
-        /// </summary>
-        IEnumerable<EntityPath> GetAllPaths(UmbracoObjectTypes umbracoObjectType, params Guid[] keys);
-
-        /// <summary>
-        /// Gets the UmbracoObjectType from the integer id of an IUmbracoEntity.
-        /// </summary>
-        /// <param name="id">Id of the entity</param>
-        /// <returns><see cref="UmbracoObjectTypes"/></returns>
-        UmbracoObjectTypes GetObjectType(int id);
-
-        /// <summary>
-        /// Gets the UmbracoObjectType from an IUmbracoEntity.
-        /// </summary>
-        /// <param name="entity"><see cref="IUmbracoEntity"/></param>
-        /// <returns><see cref="UmbracoObjectTypes"/></returns>
-        UmbracoObjectTypes GetObjectType(IUmbracoEntity entity);
-
-        /// <summary>
-        /// Gets the Type of an entity by its Id
-        /// </summary>
-        /// <param name="id">Id of the entity</param>
-        /// <returns>Type of the entity</returns>
-        Type GetEntityType(int id);
-
-        /// <summary>
-        /// Gets the Type of an entity by its <see cref="UmbracoObjectTypes"/>
-        /// </summary>
-        /// <param name="umbracoObjectType"><see cref="UmbracoObjectTypes"/></param>
-        /// <returns>Type of the entity</returns>
-        Type GetEntityType(UmbracoObjectTypes umbracoObjectType);
-
-        /// <summary>
-        /// Reserves an identifier for a key.
-        /// </summary>
-        /// <param name="key">They key.</param>
-        /// <returns>The identifier.</returns>
-        /// <remarks>When a new content or a media is saved with the key, it will have the reserved identifier.</remarks>
-        int ReserveId(Guid key);
-    }
-}
\ No newline at end of file
+
+        /// <summary>
+        /// Returns the integer id for a given Udi
+        /// </summary>
+        /// <param name="udi"></param>
+        /// <returns></returns>
+        Attempt<int> GetIdForUdi(Udi udi);
+
+        /// <summary>
+        /// Returns the GUID for a given integer id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="umbracoObjectType"></param>
+        /// <returns></returns>
+        Attempt<Guid> GetKeyForId(int id, UmbracoObjectTypes umbracoObjectType);
+
+        /// <summary>
+        /// Gets an UmbracoEntity by its Id, and optionally loads the complete object graph.
+        /// </summary>
+        /// <returns>
+        /// By default this will load the base type <see cref="IUmbracoEntity"/> with a minimum set of properties.
+        /// </returns>
+        /// <param name="key">Unique Id of the object to retrieve</param>
+        /// <returns>An <see cref="IUmbracoEntity"/></returns>
+        IUmbracoEntity GetByKey(Guid key);
+
+        /// <summary>
+        /// Gets an UmbracoEntity by its Id, and optionally loads the complete object graph.
+        /// </summary>
+        /// <returns>
+        /// By default this will load the base type <see cref="IUmbracoEntity"/> with a minimum set of properties.
+        /// </returns>
+        /// <param name="id">Id of the object to retrieve</param>
+       /// <returns>An <see cref="IUmbracoEntity"/></returns>
+        IUmbracoEntity Get(int id);
+
+        /// <summary>
+        /// Gets an UmbracoEntity by its Id and UmbracoObjectType, and optionally loads the complete object graph.
+        /// </summary>
+        /// <returns>
+        /// By default this will load the base type <see cref="IUmbracoEntity"/> with a minimum set of properties.
+        /// </returns>
+        /// <param name="key">Unique Id of the object to retrieve</param>
+        /// <param name="umbracoObjectType">UmbracoObjectType of the entity to retrieve</param>
+        /// <returns>An <see cref="IUmbracoEntity"/></returns>
+        IUmbracoEntity GetByKey(Guid key, UmbracoObjectTypes umbracoObjectType);
+
+        /// <summary>
+        /// Gets an UmbracoEntity by its Id and UmbracoObjectType, and optionally loads the complete object graph.
+        /// </summary>
+        /// <returns>
+        /// By default this will load the base type <see cref="IUmbracoEntity"/> with a minimum set of properties.
+        /// </returns>
+        /// <param name="id">Id of the object to retrieve</param>
+        /// <param name="umbracoObjectType">UmbracoObjectType of the entity to retrieve</param>
+        /// <returns>An <see cref="IUmbracoEntity"/></returns>
+        IUmbracoEntity Get(int id, UmbracoObjectTypes umbracoObjectType);
+
+
+        /// <summary>
+        /// Gets an UmbracoEntity by its Id and specified Type. Optionally loads the complete object graph.
+        /// </summary>
+        /// <returns>
+        /// By default this will load the base type <see cref="IUmbracoEntity"/> with a minimum set of properties.
+        /// </returns>
+        /// <typeparam name="T">Type of the model to retrieve. Must be based on an <see cref="IUmbracoEntity"/></typeparam>
+        /// <param name="id">Id of the object to retrieve</param>
+        /// <returns>An <see cref="IUmbracoEntity"/></returns>
+        IUmbracoEntity Get<T>(int id) where T : IUmbracoEntity;
+
+        /// <summary>
+        /// Gets the parent of entity by its id
+        /// </summary>
+        /// <param name="id">Id of the entity to retrieve the Parent for</param>
+        /// <returns>An <see cref="IUmbracoEntity"/></returns>
+        IUmbracoEntity GetParent(int id);
+
+        /// <summary>
+        /// Gets the parent of entity by its id and UmbracoObjectType
+        /// </summary>
+        /// <param name="id">Id of the entity to retrieve the Parent for</param>
+        /// <param name="umbracoObjectType">UmbracoObjectType of the parent to retrieve</param>
+        /// <returns>An <see cref="IUmbracoEntity"/></returns>
+        IUmbracoEntity GetParent(int id, UmbracoObjectTypes umbracoObjectType);
+
+        /// <summary>
+        /// Gets a collection of children by the parents Id
+        /// </summary>
+        /// <param name="parentId">Id of the parent to retrieve children for</param>
+        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/> objects</returns>
+        IEnumerable<IUmbracoEntity> GetChildren(int parentId);
+
+        /// <summary>
+        /// Gets a collection of children by the parents Id and UmbracoObjectType
+        /// </summary>
+        /// <param name="parentId">Id of the parent to retrieve children for</param>
+        /// <param name="umbracoObjectType">UmbracoObjectType of the children to retrieve</param>
+        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/> objects</returns>
+        IEnumerable<IUmbracoEntity> GetChildren(int parentId, UmbracoObjectTypes umbracoObjectType);
+
+        /// <summary>
+        /// Returns a paged collection of children
+        /// </summary>
+        /// <param name="parentId">The parent id to return children for</param>
+        /// <param name="umbracoObjectType"></param>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="totalRecords"></param>
+        /// <param name="orderBy"></param>
+        /// <param name="orderDirection"></param>
+        /// <param name="filter"></param>
+        /// <returns></returns>
+        IEnumerable<IUmbracoEntity> GetPagedChildren(int parentId, UmbracoObjectTypes umbracoObjectType, long pageIndex, int pageSize, out long totalRecords,
+            string orderBy = "SortOrder", Direction orderDirection = Direction.Ascending, string filter = "");
+
+        /// <summary>
+        /// Returns a paged collection of descendants
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="umbracoObjectType"></param>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="totalRecords"></param>
+        /// <param name="orderBy"></param>
+        /// <param name="orderDirection"></param>
+        /// <param name="filter"></param>
+        /// <returns></returns>
+        IEnumerable<IUmbracoEntity> GetPagedDescendants(int id, UmbracoObjectTypes umbracoObjectType, long pageIndex, int pageSize, out long totalRecords,
+            string orderBy = "path", Direction orderDirection = Direction.Ascending, string filter = "");
+
+        /// <summary>
+        /// Returns a paged collection of descendants
+        /// </summary>
+        IEnumerable<IUmbracoEntity> GetPagedDescendants(IEnumerable<int> ids, UmbracoObjectTypes umbracoObjectType, long pageIndex, int pageSize, out long totalRecords,
+            string orderBy = "path", Direction orderDirection = Direction.Ascending, string filter = "");
+
+        /// <summary>
+        /// Returns a paged collection of descendants from the root
+        /// </summary>
+        /// <param name="umbracoObjectType"></param>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="totalRecords"></param>
+        /// <param name="orderBy"></param>
+        /// <param name="orderDirection"></param>
+        /// <param name="filter"></param>
+        /// <param name="includeTrashed">true/false to include trashed objects</param>
+        /// <returns></returns>
+        IEnumerable<IUmbracoEntity> GetPagedDescendantsFromRoot(UmbracoObjectTypes umbracoObjectType, long pageIndex, int pageSize, out long totalRecords,
+            string orderBy = "path", Direction orderDirection = Direction.Ascending, string filter = "", bool includeTrashed = true);
+
+        /// <summary>
+        /// Gets a collection of descendents by the parents Id
+        /// </summary>
+        /// <param name="id">Id of entity to retrieve descendents for</param>
+        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/> objects</returns>
+        IEnumerable<IUmbracoEntity> GetDescendents(int id);
+
+        /// <summary>
+        /// Gets a collection of descendents by the parents Id
+        /// </summary>
+        /// <param name="id">Id of entity to retrieve descendents for</param>
+        /// <param name="umbracoObjectType">UmbracoObjectType of the descendents to retrieve</param>
+        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/> objects</returns>
+        IEnumerable<IUmbracoEntity> GetDescendents(int id, UmbracoObjectTypes umbracoObjectType);
+
+        /// <summary>
+        /// Gets a collection of the entities at the root, which corresponds to the entities with a Parent Id of -1.
+        /// </summary>
+        /// <param name="umbracoObjectType">UmbracoObjectType of the root entities to retrieve</param>
+        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/> objects</returns>
+        IEnumerable<IUmbracoEntity> GetRootEntities(UmbracoObjectTypes umbracoObjectType);
+
+        /// <summary>
+        /// Gets a collection of all <see cref="IUmbracoEntity"/> of a given type.
+        /// </summary>
+        /// <typeparam name="T">Type of the entities to retrieve</typeparam>
+        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/> objects</returns>
+        IEnumerable<IUmbracoEntity> GetAll<T>(params int[] ids) where T : IUmbracoEntity;
+
+        /// <summary>
+        /// Gets a collection of all <see cref="IUmbracoEntity"/> of a given type.
+        /// </summary>
+        /// <param name="umbracoObjectType">UmbracoObjectType of the entities to return</param>
+        /// <param name="ids"></param>
+        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/> objects</returns>
+        IEnumerable<IUmbracoEntity> GetAll(UmbracoObjectTypes umbracoObjectType, params int[] ids);
+
+        /// <summary>
+        /// Gets a collection of all <see cref="IUmbracoEntity"/> of a given type.
+        /// </summary>
+        /// <param name="umbracoObjectType">UmbracoObjectType of the entities to return</param>
+        /// <param name="keys"></param>
+        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/> objects</returns>
+        IEnumerable<IUmbracoEntity> GetAll(UmbracoObjectTypes umbracoObjectType, Guid[] keys);
+
+        /// <summary>
+        /// Gets a collection of <see cref="IUmbracoEntity"/>
+        /// </summary>
+        /// <param name="objectTypeId">Guid id of the UmbracoObjectType</param>
+        /// <param name="ids"></param>
+        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/> objects</returns>
+        IEnumerable<IUmbracoEntity> GetAll(Guid objectTypeId, params int[] ids);
+
+        /// <summary>
+        /// Gets paths for entities.
+        /// </summary>
+        IEnumerable<EntityPath> GetAllPaths(UmbracoObjectTypes umbracoObjectType, params int[] ids);
+
+        /// <summary>
+        /// Gets paths for entities.
+        /// </summary>
+        IEnumerable<EntityPath> GetAllPaths(UmbracoObjectTypes umbracoObjectType, params Guid[] keys);
+
+        /// <summary>
+        /// Gets the UmbracoObjectType from the integer id of an IUmbracoEntity.
+        /// </summary>
+        /// <param name="id">Id of the entity</param>
+        /// <returns><see cref="UmbracoObjectTypes"/></returns>
+        UmbracoObjectTypes GetObjectType(int id);
+
+        /// <summary>
+        /// Gets the UmbracoObjectType from an IUmbracoEntity.
+        /// </summary>
+        /// <param name="entity"><see cref="IUmbracoEntity"/></param>
+        /// <returns><see cref="UmbracoObjectTypes"/></returns>
+        UmbracoObjectTypes GetObjectType(IUmbracoEntity entity);
+
+        /// <summary>
+        /// Gets the Type of an entity by its Id
+        /// </summary>
+        /// <param name="id">Id of the entity</param>
+        /// <returns>Type of the entity</returns>
+        Type GetEntityType(int id);
+
+        /// <summary>
+        /// Gets the Type of an entity by its <see cref="UmbracoObjectTypes"/>
+        /// </summary>
+        /// <param name="umbracoObjectType"><see cref="UmbracoObjectTypes"/></param>
+        /// <returns>Type of the entity</returns>
+        Type GetEntityType(UmbracoObjectTypes umbracoObjectType);
+
+        /// <summary>
+        /// Reserves an identifier for a key.
+        /// </summary>
+        /// <param name="key">They key.</param>
+        /// <returns>The identifier.</returns>
+        /// <remarks>When a new content or a media is saved with the key, it will have the reserved identifier.</remarks>
+        int ReserveId(Guid key);
+    }
+}
diff --git a/src/Umbraco.Core/Services/IRelationService.cs b/src/Umbraco.Core/Services/IRelationService.cs
index 6006a6b7c3..b5ca9ee019 100644
--- a/src/Umbraco.Core/Services/IRelationService.cs
+++ b/src/Umbraco.Core/Services/IRelationService.cs
@@ -1,306 +1,298 @@
-using System;
-using System.Collections.Generic;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.EntityBase;
-
-namespace Umbraco.Core.Services
-{
-    public interface IRelationService : IService
-    {
-        /// <summary>
-        /// Gets a <see cref="Relation"/> by its Id
-        /// </summary>
-        /// <param name="id">Id of the <see cref="Relation"/></param>
-        /// <returns>A <see cref="Relation"/> object</returns>
-        IRelation GetById(int id);
-
-        /// <summary>
-        /// Gets a <see cref="RelationType"/> by its Id
-        /// </summary>
-        /// <param name="id">Id of the <see cref="RelationType"/></param>
-        /// <returns>A <see cref="RelationType"/> object</returns>
-        IRelationType GetRelationTypeById(int id);
-
-        /// <summary>
-        /// Gets a <see cref="RelationType"/> by its Id
-        /// </summary>
-        /// <param name="id">Id of the <see cref="RelationType"/></param>
-        /// <returns>A <see cref="RelationType"/> object</returns>
-        IRelationType GetRelationTypeById(Guid id);
-
-        /// <summary>
-        /// Gets a <see cref="RelationType"/> by its Alias
-        /// </summary>
-        /// <param name="alias">Alias of the <see cref="RelationType"/></param>
-        /// <returns>A <see cref="RelationType"/> object</returns>
-        IRelationType GetRelationTypeByAlias(string alias);
-
-        /// <summary>
-        /// Gets all <see cref="Relation"/> objects
-        /// </summary>
-        /// <param name="ids">Optional array of integer ids to return relations for</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
-        IEnumerable<IRelation> GetAllRelations(params int[] ids);
-
-        /// <summary>
-        /// Gets all <see cref="Relation"/> objects by their <see cref="RelationType"/>
-        /// </summary>
-        /// <param name="relationType"><see cref="RelationType"/> to retrieve Relations for</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
-        IEnumerable<IRelation> GetAllRelationsByRelationType(RelationType relationType);
-
-        /// <summary>
-        /// Gets all <see cref="Relation"/> objects by their <see cref="RelationType"/>'s Id
-        /// </summary>
-        /// <param name="relationTypeId">Id of the <see cref="RelationType"/> to retrieve Relations for</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
-        IEnumerable<IRelation> GetAllRelationsByRelationType(int relationTypeId);
-
-        /// <summary>
-        /// Gets all <see cref="Relation"/> objects
-        /// </summary>
-        /// <param name="ids">Optional array of integer ids to return relationtypes for</param>
-        /// <returns>An enumerable list of <see cref="RelationType"/> objects</returns>
-        IEnumerable<IRelationType> GetAllRelationTypes(params int[] ids);
-
-        /// <summary>
-        /// Gets a list of <see cref="Relation"/> objects by their parent Id
-        /// </summary>
-        /// <param name="id">Id of the parent to retrieve relations for</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
-        IEnumerable<IRelation> GetByParentId(int id);
-
-        /// <summary>
-        /// Gets a list of <see cref="Relation"/> objects by their parent entity
-        /// </summary>
-        /// <param name="parent">Parent Entity to retrieve relations for</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
-        IEnumerable<IRelation> GetByParent(IUmbracoEntity parent);
-
-        /// <summary>
-        /// Gets a list of <see cref="Relation"/> objects by their parent entity
-        /// </summary>
-        /// <param name="parent">Parent Entity to retrieve relations for</param>
-        /// <param name="relationTypeAlias">Alias of the type of relation to retrieve</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
-        IEnumerable<IRelation> GetByParent(IUmbracoEntity parent, string relationTypeAlias);
-
-        /// <summary>
-        /// Gets a list of <see cref="Relation"/> objects by their child Id
-        /// </summary>
-        /// <param name="id">Id of the child to retrieve relations for</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
-        IEnumerable<IRelation> GetByChildId(int id);
-
-        /// <summary>
-        /// Gets a list of <see cref="Relation"/> objects by their child Entity
-        /// </summary>
-        /// <param name="child">Child Entity to retrieve relations for</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
-        IEnumerable<IRelation> GetByChild(IUmbracoEntity child);
-
-        /// <summary>
-        /// Gets a list of <see cref="Relation"/> objects by their child Entity
-        /// </summary>
-        /// <param name="child">Child Entity to retrieve relations for</param>
-        /// <param name="relationTypeAlias">Alias of the type of relation to retrieve</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
-        IEnumerable<IRelation> GetByChild(IUmbracoEntity child, string relationTypeAlias);
-
-        /// <summary>
-        /// Gets a list of <see cref="Relation"/> objects by their child or parent Id.
-        /// Using this method will get you all relations regards of it being a child or parent relation.
-        /// </summary>
-        /// <param name="id">Id of the child or parent to retrieve relations for</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
-        IEnumerable<IRelation> GetByParentOrChildId(int id);
-
-        IEnumerable<IRelation> GetByParentOrChildId(int id, string relationTypeAlias);
-
-        /// <summary>
-        /// Gets a list of <see cref="Relation"/> objects by the Name of the <see cref="RelationType"/>
-        /// </summary>
-        /// <param name="relationTypeName">Name of the <see cref="RelationType"/> to retrieve Relations for</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
-        IEnumerable<IRelation> GetByRelationTypeName(string relationTypeName);
-
-        /// <summary>
-        /// Gets a list of <see cref="Relation"/> objects by the Alias of the <see cref="RelationType"/>
-        /// </summary>
-        /// <param name="relationTypeAlias">Alias of the <see cref="RelationType"/> to retrieve Relations for</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
-        IEnumerable<IRelation> GetByRelationTypeAlias(string relationTypeAlias);
-
-        /// <summary>
-        /// Gets a list of <see cref="Relation"/> objects by the Id of the <see cref="RelationType"/>
-        /// </summary>
-        /// <param name="relationTypeId">Id of the <see cref="RelationType"/> to retrieve Relations for</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
-        IEnumerable<IRelation> GetByRelationTypeId(int relationTypeId);
-
-        /// <summary>
-        /// Gets the Child object from a Relation as an <see cref="IUmbracoEntity"/>
-        /// </summary>
-        /// <param name="relation">Relation to retrieve child object from</param>
-        /// <param name="loadBaseType">Optional bool to load the complete object graph when set to <c>False</c></param>
-        /// <returns>An <see cref="IUmbracoEntity"/></returns>
-        IUmbracoEntity GetChildEntityFromRelation(IRelation relation, bool loadBaseType = false);
-
-        /// <summary>
-        /// Gets the Parent object from a Relation as an <see cref="IUmbracoEntity"/>
-        /// </summary>
-        /// <param name="relation">Relation to retrieve parent object from</param>
-        /// <param name="loadBaseType">Optional bool to load the complete object graph when set to <c>False</c></param>
-        /// <returns>An <see cref="IUmbracoEntity"/></returns>
-        IUmbracoEntity GetParentEntityFromRelation(IRelation relation, bool loadBaseType = false);
-
-        /// <summary>
-        /// Gets the Parent and Child objects from a Relation as a <see cref="Tuple"/>"/> with <see cref="IUmbracoEntity"/>.
-        /// </summary>
-        /// <param name="relation">Relation to retrieve parent and child object from</param>
-        /// <param name="loadBaseType">Optional bool to load the complete object graph when set to <c>False</c></param>
-        /// <returns>Returns a Tuple with Parent (item1) and Child (item2)</returns>
-        Tuple<IUmbracoEntity, IUmbracoEntity> GetEntitiesFromRelation(IRelation relation, bool loadBaseType = false);
-
-        /// <summary>
-        /// Gets the Child objects from a list of Relations as a list of <see cref="IUmbracoEntity"/> objects.
-        /// </summary>
-        /// <param name="relations">List of relations to retrieve child objects from</param>
-        /// <param name="loadBaseType">Optional bool to load the complete object graph when set to <c>False</c></param>
-        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/></returns>
-        IEnumerable<IUmbracoEntity> GetChildEntitiesFromRelations(IEnumerable<IRelation> relations, bool loadBaseType = false);
-
-        /// <summary>
-        /// Gets the Parent objects from a list of Relations as a list of <see cref="IUmbracoEntity"/> objects.
-        /// </summary>
-        /// <param name="relations">List of relations to retrieve parent objects from</param>
-        /// <param name="loadBaseType">Optional bool to load the complete object graph when set to <c>False</c></param>
-        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/></returns>
-        IEnumerable<IUmbracoEntity> GetParentEntitiesFromRelations(IEnumerable<IRelation> relations,
-                                                                   bool loadBaseType = false);
-
-        /// <summary>
-        /// Gets the Parent and Child objects from a list of Relations as a list of <see cref="IUmbracoEntity"/> objects.
-        /// </summary>
-        /// <param name="relations">List of relations to retrieve parent and child objects from</param>
-        /// <param name="loadBaseType">Optional bool to load the complete object graph when set to <c>False</c></param>
-        /// <returns>An enumerable list of <see cref="Tuple"/> with <see cref="IUmbracoEntity"/></returns>
-        IEnumerable<Tuple<IUmbracoEntity, IUmbracoEntity>> GetEntitiesFromRelations(
-            IEnumerable<IRelation> relations,
-            bool loadBaseType = false);
-
-        /// <summary>
-        /// Relates two objects by their entity Ids.
-        /// </summary>
-        /// <param name="parentId">Id of the parent</param>
-        /// <param name="childId">Id of the child</param>
-        /// <param name="relationType">The type of relation to create</param>
-        /// <returns>The created <see cref="Relation"/></returns>
-        IRelation Relate(int parentId, int childId, IRelationType relationType);
-
-        /// <summary>
-        /// Relates two objects that are based on the <see cref="IUmbracoEntity"/> interface.
-        /// </summary>
-        /// <param name="parent">Parent entity</param>
-        /// <param name="child">Child entity</param>
-        /// <param name="relationType">The type of relation to create</param>
-        /// <returns>The created <see cref="Relation"/></returns>
-        IRelation Relate(IUmbracoEntity parent, IUmbracoEntity child, IRelationType relationType);
-
-        /// <summary>
-        /// Relates two objects by their entity Ids.
-        /// </summary>
-        /// <param name="parentId">Id of the parent</param>
-        /// <param name="childId">Id of the child</param>
-        /// <param name="relationTypeAlias">Alias of the type of relation to create</param>
-        /// <returns>The created <see cref="Relation"/></returns>
-        IRelation Relate(int parentId, int childId, string relationTypeAlias);
-
-        /// <summary>
-        /// Relates two objects that are based on the <see cref="IUmbracoEntity"/> interface.
-        /// </summary>
-        /// <param name="parent">Parent entity</param>
-        /// <param name="child">Child entity</param>
-        /// <param name="relationTypeAlias">Alias of the type of relation to create</param>
-        /// <returns>The created <see cref="Relation"/></returns>
-        IRelation Relate(IUmbracoEntity parent, IUmbracoEntity child, string relationTypeAlias);
-
-        /// <summary>
-        /// Checks whether any relations exists for the passed in <see cref="RelationType"/>.
-        /// </summary>
-        /// <param name="relationType"><see cref="RelationType"/> to check for relations</param>
-        /// <returns>Returns <c>True</c> if any relations exists for the given <see cref="RelationType"/>, otherwise <c>False</c></returns>
-        bool HasRelations(IRelationType relationType);
-
-        /// <summary>
-        /// Checks whether any relations exists for the passed in Id.
-        /// </summary>
-        /// <param name="id">Id of an object to check relations for</param>
-        /// <returns>Returns <c>True</c> if any relations exists with the given Id, otherwise <c>False</c></returns>
-        bool IsRelated(int id);
-
-        /// <summary>
-        /// Checks whether two items are related
-        /// </summary>
-        /// <param name="parentId">Id of the Parent relation</param>
-        /// <param name="childId">Id of the Child relation</param>
-        /// <returns>Returns <c>True</c> if any relations exists with the given Ids, otherwise <c>False</c></returns>
-        bool AreRelated(int parentId, int childId);
-
-        /// <summary>
-        /// Checks whether two items are related
-        /// </summary>
-        /// <param name="parent">Parent entity</param>
-        /// <param name="child">Child entity</param>
-        /// <returns>Returns <c>True</c> if any relations exist between the entities, otherwise <c>False</c></returns>
-        bool AreRelated(IUmbracoEntity parent, IUmbracoEntity child);
-
-        /// <summary>
-        /// Checks whether two items are related
-        /// </summary>
-        /// <param name="parent">Parent entity</param>
-        /// <param name="child">Child entity</param>
-        /// <param name="relationTypeAlias">Alias of the type of relation to create</param>
-        /// <returns>Returns <c>True</c> if any relations exist between the entities, otherwise <c>False</c></returns>
-        bool AreRelated(IUmbracoEntity parent, IUmbracoEntity child, string relationTypeAlias);
-
-        /// <summary>
-        /// Checks whether two items are related
-        /// </summary>
-        /// <param name="parentId">Id of the Parent relation</param>
-        /// <param name="childId">Id of the Child relation</param>
-        /// <param name="relationTypeAlias">Alias of the type of relation to create</param>
-        /// <returns>Returns <c>True</c> if any relations exist between the entities, otherwise <c>False</c></returns>
-        bool AreRelated(int parentId, int childId, string relationTypeAlias);
-
-        /// <summary>
-        /// Saves a <see cref="Relation"/>
-        /// </summary>
-        /// <param name="relation">Relation to save</param>
-        void Save(IRelation relation);
-
-        /// <summary>
-        /// Saves a <see cref="RelationType"/>
-        /// </summary>
-        /// <param name="relationType">RelationType to Save</param>
-        void Save(IRelationType relationType);
-
-        /// <summary>
-        /// Deletes a <see cref="Relation"/>
-        /// </summary>
-        /// <param name="relation">Relation to Delete</param>
-        void Delete(IRelation relation);
-
-        /// <summary>
-        /// Deletes a <see cref="RelationType"/>
-        /// </summary>
-        /// <param name="relationType">RelationType to Delete</param>
-        void Delete(IRelationType relationType);
-
-        /// <summary>
-        /// Deletes all <see cref="Relation"/> objects based on the passed in <see cref="RelationType"/>
-        /// </summary>
-        /// <param name="relationType"><see cref="RelationType"/> to Delete Relations for</param>
-        void DeleteRelationsOfType(IRelationType relationType);
-    }
-}
\ No newline at end of file
+using System;
+using System.Collections.Generic;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.EntityBase;
+
+namespace Umbraco.Core.Services
+{
+    public interface IRelationService : IService
+    {
+        /// <summary>
+        /// Gets a <see cref="Relation"/> by its Id
+        /// </summary>
+        /// <param name="id">Id of the <see cref="Relation"/></param>
+        /// <returns>A <see cref="Relation"/> object</returns>
+        IRelation GetById(int id);
+
+        /// <summary>
+        /// Gets a <see cref="RelationType"/> by its Id
+        /// </summary>
+        /// <param name="id">Id of the <see cref="RelationType"/></param>
+        /// <returns>A <see cref="RelationType"/> object</returns>
+        IRelationType GetRelationTypeById(int id);
+
+        /// <summary>
+        /// Gets a <see cref="RelationType"/> by its Id
+        /// </summary>
+        /// <param name="id">Id of the <see cref="RelationType"/></param>
+        /// <returns>A <see cref="RelationType"/> object</returns>
+        IRelationType GetRelationTypeById(Guid id);
+
+        /// <summary>
+        /// Gets a <see cref="RelationType"/> by its Alias
+        /// </summary>
+        /// <param name="alias">Alias of the <see cref="RelationType"/></param>
+        /// <returns>A <see cref="RelationType"/> object</returns>
+        IRelationType GetRelationTypeByAlias(string alias);
+
+        /// <summary>
+        /// Gets all <see cref="Relation"/> objects
+        /// </summary>
+        /// <param name="ids">Optional array of integer ids to return relations for</param>
+        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
+        IEnumerable<IRelation> GetAllRelations(params int[] ids);
+
+        /// <summary>
+        /// Gets all <see cref="Relation"/> objects by their <see cref="RelationType"/>
+        /// </summary>
+        /// <param name="relationType"><see cref="RelationType"/> to retrieve Relations for</param>
+        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
+        IEnumerable<IRelation> GetAllRelationsByRelationType(RelationType relationType);
+
+        /// <summary>
+        /// Gets all <see cref="Relation"/> objects by their <see cref="RelationType"/>'s Id
+        /// </summary>
+        /// <param name="relationTypeId">Id of the <see cref="RelationType"/> to retrieve Relations for</param>
+        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
+        IEnumerable<IRelation> GetAllRelationsByRelationType(int relationTypeId);
+
+        /// <summary>
+        /// Gets all <see cref="Relation"/> objects
+        /// </summary>
+        /// <param name="ids">Optional array of integer ids to return relationtypes for</param>
+        /// <returns>An enumerable list of <see cref="RelationType"/> objects</returns>
+        IEnumerable<IRelationType> GetAllRelationTypes(params int[] ids);
+
+        /// <summary>
+        /// Gets a list of <see cref="Relation"/> objects by their parent Id
+        /// </summary>
+        /// <param name="id">Id of the parent to retrieve relations for</param>
+        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
+        IEnumerable<IRelation> GetByParentId(int id);
+
+        /// <summary>
+        /// Gets a list of <see cref="Relation"/> objects by their parent entity
+        /// </summary>
+        /// <param name="parent">Parent Entity to retrieve relations for</param>
+        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
+        IEnumerable<IRelation> GetByParent(IUmbracoEntity parent);
+
+        /// <summary>
+        /// Gets a list of <see cref="Relation"/> objects by their parent entity
+        /// </summary>
+        /// <param name="parent">Parent Entity to retrieve relations for</param>
+        /// <param name="relationTypeAlias">Alias of the type of relation to retrieve</param>
+        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
+        IEnumerable<IRelation> GetByParent(IUmbracoEntity parent, string relationTypeAlias);
+
+        /// <summary>
+        /// Gets a list of <see cref="Relation"/> objects by their child Id
+        /// </summary>
+        /// <param name="id">Id of the child to retrieve relations for</param>
+        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
+        IEnumerable<IRelation> GetByChildId(int id);
+
+        /// <summary>
+        /// Gets a list of <see cref="Relation"/> objects by their child Entity
+        /// </summary>
+        /// <param name="child">Child Entity to retrieve relations for</param>
+        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
+        IEnumerable<IRelation> GetByChild(IUmbracoEntity child);
+
+        /// <summary>
+        /// Gets a list of <see cref="Relation"/> objects by their child Entity
+        /// </summary>
+        /// <param name="child">Child Entity to retrieve relations for</param>
+        /// <param name="relationTypeAlias">Alias of the type of relation to retrieve</param>
+        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
+        IEnumerable<IRelation> GetByChild(IUmbracoEntity child, string relationTypeAlias);
+
+        /// <summary>
+        /// Gets a list of <see cref="Relation"/> objects by their child or parent Id.
+        /// Using this method will get you all relations regards of it being a child or parent relation.
+        /// </summary>
+        /// <param name="id">Id of the child or parent to retrieve relations for</param>
+        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
+        IEnumerable<IRelation> GetByParentOrChildId(int id);
+
+        IEnumerable<IRelation> GetByParentOrChildId(int id, string relationTypeAlias);
+
+        /// <summary>
+        /// Gets a list of <see cref="Relation"/> objects by the Name of the <see cref="RelationType"/>
+        /// </summary>
+        /// <param name="relationTypeName">Name of the <see cref="RelationType"/> to retrieve Relations for</param>
+        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
+        IEnumerable<IRelation> GetByRelationTypeName(string relationTypeName);
+
+        /// <summary>
+        /// Gets a list of <see cref="Relation"/> objects by the Alias of the <see cref="RelationType"/>
+        /// </summary>
+        /// <param name="relationTypeAlias">Alias of the <see cref="RelationType"/> to retrieve Relations for</param>
+        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
+        IEnumerable<IRelation> GetByRelationTypeAlias(string relationTypeAlias);
+
+        /// <summary>
+        /// Gets a list of <see cref="Relation"/> objects by the Id of the <see cref="RelationType"/>
+        /// </summary>
+        /// <param name="relationTypeId">Id of the <see cref="RelationType"/> to retrieve Relations for</param>
+        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
+        IEnumerable<IRelation> GetByRelationTypeId(int relationTypeId);
+
+        /// <summary>
+        /// Gets the Child object from a Relation as an <see cref="IUmbracoEntity"/>
+        /// </summary>
+        /// <param name="relation">Relation to retrieve child object from</param>
+        /// <returns>An <see cref="IUmbracoEntity"/></returns>
+        IUmbracoEntity GetChildEntityFromRelation(IRelation relation);
+
+        /// <summary>
+        /// Gets the Parent object from a Relation as an <see cref="IUmbracoEntity"/>
+        /// </summary>
+        /// <param name="relation">Relation to retrieve parent object from</param>
+        /// <returns>An <see cref="IUmbracoEntity"/></returns>
+        IUmbracoEntity GetParentEntityFromRelation(IRelation relation);
+
+        /// <summary>
+        /// Gets the Parent and Child objects from a Relation as a <see cref="Tuple"/>"/> with <see cref="IUmbracoEntity"/>.
+        /// </summary>
+        /// <param name="relation">Relation to retrieve parent and child object from</param>
+        /// <returns>Returns a Tuple with Parent (item1) and Child (item2)</returns>
+        Tuple<IUmbracoEntity, IUmbracoEntity> GetEntitiesFromRelation(IRelation relation);
+
+        /// <summary>
+        /// Gets the Child objects from a list of Relations as a list of <see cref="IUmbracoEntity"/> objects.
+        /// </summary>
+        /// <param name="relations">List of relations to retrieve child objects from</param>
+        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/></returns>
+        IEnumerable<IUmbracoEntity> GetChildEntitiesFromRelations(IEnumerable<IRelation> relations);
+
+        /// <summary>
+        /// Gets the Parent objects from a list of Relations as a list of <see cref="IUmbracoEntity"/> objects.
+        /// </summary>
+        /// <param name="relations">List of relations to retrieve parent objects from</param>
+        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/></returns>
+        IEnumerable<IUmbracoEntity> GetParentEntitiesFromRelations(IEnumerable<IRelation> relations);
+
+        /// <summary>
+        /// Gets the Parent and Child objects from a list of Relations as a list of <see cref="IUmbracoEntity"/> objects.
+        /// </summary>
+        /// <param name="relations">List of relations to retrieve parent and child objects from</param>
+        /// <param name="loadBaseType">Optional bool to load the complete object graph when set to <c>False</c></param>
+        IEnumerable<Tuple<IUmbracoEntity, IUmbracoEntity>> GetEntitiesFromRelations(
+            IEnumerable<IRelation> relations);
+
+        /// <summary>
+        /// Relates two objects by their entity Ids.
+        /// </summary>
+        /// <param name="parentId">Id of the parent</param>
+        /// <param name="childId">Id of the child</param>
+        /// <param name="relationType">The type of relation to create</param>
+        /// <returns>The created <see cref="Relation"/></returns>
+        IRelation Relate(int parentId, int childId, IRelationType relationType);
+
+        /// <summary>
+        /// Relates two objects that are based on the <see cref="IUmbracoEntity"/> interface.
+        /// </summary>
+        /// <param name="parent">Parent entity</param>
+        /// <param name="child">Child entity</param>
+        /// <param name="relationType">The type of relation to create</param>
+        /// <returns>The created <see cref="Relation"/></returns>
+        IRelation Relate(IUmbracoEntity parent, IUmbracoEntity child, IRelationType relationType);
+
+        /// <summary>
+        /// Relates two objects by their entity Ids.
+        /// </summary>
+        /// <param name="parentId">Id of the parent</param>
+        /// <param name="childId">Id of the child</param>
+        /// <param name="relationTypeAlias">Alias of the type of relation to create</param>
+        /// <returns>The created <see cref="Relation"/></returns>
+        IRelation Relate(int parentId, int childId, string relationTypeAlias);
+
+        /// <summary>
+        /// Relates two objects that are based on the <see cref="IUmbracoEntity"/> interface.
+        /// </summary>
+        /// <param name="parent">Parent entity</param>
+        /// <param name="child">Child entity</param>
+        /// <param name="relationTypeAlias">Alias of the type of relation to create</param>
+        /// <returns>The created <see cref="Relation"/></returns>
+        IRelation Relate(IUmbracoEntity parent, IUmbracoEntity child, string relationTypeAlias);
+
+        /// <summary>
+        /// Checks whether any relations exists for the passed in <see cref="RelationType"/>.
+        /// </summary>
+        /// <param name="relationType"><see cref="RelationType"/> to check for relations</param>
+        /// <returns>Returns <c>True</c> if any relations exists for the given <see cref="RelationType"/>, otherwise <c>False</c></returns>
+        bool HasRelations(IRelationType relationType);
+
+        /// <summary>
+        /// Checks whether any relations exists for the passed in Id.
+        /// </summary>
+        /// <param name="id">Id of an object to check relations for</param>
+        /// <returns>Returns <c>True</c> if any relations exists with the given Id, otherwise <c>False</c></returns>
+        bool IsRelated(int id);
+
+        /// <summary>
+        /// Checks whether two items are related
+        /// </summary>
+        /// <param name="parentId">Id of the Parent relation</param>
+        /// <param name="childId">Id of the Child relation</param>
+        /// <returns>Returns <c>True</c> if any relations exists with the given Ids, otherwise <c>False</c></returns>
+        bool AreRelated(int parentId, int childId);
+
+        /// <summary>
+        /// Checks whether two items are related
+        /// </summary>
+        /// <param name="parent">Parent entity</param>
+        /// <param name="child">Child entity</param>
+        /// <returns>Returns <c>True</c> if any relations exist between the entities, otherwise <c>False</c></returns>
+        bool AreRelated(IUmbracoEntity parent, IUmbracoEntity child);
+
+        /// <summary>
+        /// Checks whether two items are related
+        /// </summary>
+        /// <param name="parent">Parent entity</param>
+        /// <param name="child">Child entity</param>
+        /// <param name="relationTypeAlias">Alias of the type of relation to create</param>
+        /// <returns>Returns <c>True</c> if any relations exist between the entities, otherwise <c>False</c></returns>
+        bool AreRelated(IUmbracoEntity parent, IUmbracoEntity child, string relationTypeAlias);
+
+        /// <summary>
+        /// Checks whether two items are related
+        /// </summary>
+        /// <param name="parentId">Id of the Parent relation</param>
+        /// <param name="childId">Id of the Child relation</param>
+        /// <param name="relationTypeAlias">Alias of the type of relation to create</param>
+        /// <returns>Returns <c>True</c> if any relations exist between the entities, otherwise <c>False</c></returns>
+        bool AreRelated(int parentId, int childId, string relationTypeAlias);
+
+        /// <summary>
+        /// Saves a <see cref="Relation"/>
+        /// </summary>
+        /// <param name="relation">Relation to save</param>
+        void Save(IRelation relation);
+
+        /// <summary>
+        /// Saves a <see cref="RelationType"/>
+        /// </summary>
+        /// <param name="relationType">RelationType to Save</param>
+        void Save(IRelationType relationType);
+
+        /// <summary>
+        /// Deletes a <see cref="Relation"/>
+        /// </summary>
+        /// <param name="relation">Relation to Delete</param>
+        void Delete(IRelation relation);
+
+        /// <summary>
+        /// Deletes a <see cref="RelationType"/>
+        /// </summary>
+        /// <param name="relationType">RelationType to Delete</param>
+        void Delete(IRelationType relationType);
+
+        /// <summary>
+        /// Deletes all <see cref="Relation"/> objects based on the passed in <see cref="RelationType"/>
+        /// </summary>
+        /// <param name="relationType"><see cref="RelationType"/> to Delete Relations for</param>
+        void DeleteRelationsOfType(IRelationType relationType);
+    }
+}
diff --git a/src/Umbraco.Core/Services/RelationService.cs b/src/Umbraco.Core/Services/RelationService.cs
index ccf86d425d..a940096ded 100644
--- a/src/Umbraco.Core/Services/RelationService.cs
+++ b/src/Umbraco.Core/Services/RelationService.cs
@@ -1,748 +1,740 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Umbraco.Core.Events;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.EntityBase;
-using Umbraco.Core.Persistence;
-using Umbraco.Core.Persistence.Querying;
-using Umbraco.Core.Persistence.UnitOfWork;
-
-namespace Umbraco.Core.Services
-{
-    public class RelationService : ScopeRepositoryService, IRelationService
-    {
-        private readonly IEntityService _entityService;
-        
-        public RelationService(IDatabaseUnitOfWorkProvider uowProvider, RepositoryFactory repositoryFactory, ILogger logger, IEventMessagesFactory eventMessagesFactory, IEntityService entityService)
-            : base(uowProvider, repositoryFactory, logger, eventMessagesFactory)
-        {
-            if (entityService == null) throw new ArgumentNullException("entityService");
-            _entityService = entityService;
-        }
-
-        /// <summary>
-        /// Gets a <see cref="Relation"/> by its Id
-        /// </summary>
-        /// <param name="id">Id of the <see cref="Relation"/></param>
-        /// <returns>A <see cref="Relation"/> object</returns>
-        public IRelation GetById(int id)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateRelationRepository(uow);
-                return repository.Get(id);
-            }
-        }
-
-        /// <summary>
-        /// Gets a <see cref="RelationType"/> by its Id
-        /// </summary>
-        /// <param name="id">Id of the <see cref="RelationType"/></param>
-        /// <returns>A <see cref="RelationType"/> object</returns>
-        public IRelationType GetRelationTypeById(int id)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateRelationTypeRepository(uow);
-                return repository.Get(id);
-            }
-        }
-
-        /// <summary>
-        /// Gets a <see cref="RelationType"/> by its Id
-        /// </summary>
-        /// <param name="id">Id of the <see cref="RelationType"/></param>
-        /// <returns>A <see cref="RelationType"/> object</returns>
-        public IRelationType GetRelationTypeById(Guid id)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateRelationTypeRepository(uow);
-                return repository.Get(id);
-            }
-        }
-
-        /// <summary>
-        /// Gets a <see cref="RelationType"/> by its Alias
-        /// </summary>
-        /// <param name="alias">Alias of the <see cref="RelationType"/></param>
-        /// <returns>A <see cref="RelationType"/> object</returns>
-        public IRelationType GetRelationTypeByAlias(string alias)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateRelationTypeRepository(uow);
-                var query = new Query<IRelationType>().Where(x => x.Alias == alias);
-                return repository.GetByQuery(query).FirstOrDefault();
-            }
-        }
-
-        /// <summary>
-        /// Gets all <see cref="Relation"/> objects
-        /// </summary>
-        /// <param name="ids">Optional array of integer ids to return relations for</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
-        public IEnumerable<IRelation> GetAllRelations(params int[] ids)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateRelationRepository(uow);
-                return repository.GetAll(ids);
-            }
-        }
-
-        /// <summary>
-        /// Gets all <see cref="Relation"/> objects by their <see cref="RelationType"/>
-        /// </summary>
-        /// <param name="relationType"><see cref="RelationType"/> to retrieve Relations for</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
-        public IEnumerable<IRelation> GetAllRelationsByRelationType(RelationType relationType)
-        {
-            return GetAllRelationsByRelationType(relationType.Id);
-        }
-
-        /// <summary>
-        /// Gets all <see cref="Relation"/> objects by their <see cref="RelationType"/>'s Id
-        /// </summary>
-        /// <param name="relationTypeId">Id of the <see cref="RelationType"/> to retrieve Relations for</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
-        public IEnumerable<IRelation> GetAllRelationsByRelationType(int relationTypeId)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateRelationRepository(uow);
-                var query = new Query<IRelation>().Where(x => x.RelationTypeId == relationTypeId);
-                return repository.GetByQuery(query);
-            }
-        }
-
-        /// <summary>
-        /// Gets all <see cref="Relation"/> objects
-        /// </summary>
-        /// <param name="ids">Optional array of integer ids to return relationtypes for</param>
-        /// <returns>An enumerable list of <see cref="RelationType"/> objects</returns>
-        public IEnumerable<IRelationType> GetAllRelationTypes(params int[] ids)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateRelationTypeRepository(uow);
-                return repository.GetAll(ids);
-            }
-        }
-
-        /// <summary>
-        /// Gets a list of <see cref="Relation"/> objects by their parent Id
-        /// </summary>
-        /// <param name="id">Id of the parent to retrieve relations for</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
-        public IEnumerable<IRelation> GetByParentId(int id)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateRelationRepository(uow);
-                var query = new Query<IRelation>().Where(x => x.ParentId == id);
-                return repository.GetByQuery(query);
-            }
-        }
-
-        /// <summary>
-        /// Gets a list of <see cref="Relation"/> objects by their parent entity
-        /// </summary>
-        /// <param name="parent">Parent Entity to retrieve relations for</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
-        public IEnumerable<IRelation> GetByParent(IUmbracoEntity parent)
-        {
-            return GetByParentId(parent.Id);
-        }
-
-        /// <summary>
-        /// Gets a list of <see cref="Relation"/> objects by their parent entity
-        /// </summary>
-        /// <param name="parent">Parent Entity to retrieve relations for</param>
-        /// <param name="relationTypeAlias">Alias of the type of relation to retrieve</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
-        public IEnumerable<IRelation> GetByParent(IUmbracoEntity parent, string relationTypeAlias)
-        {
-            return GetByParent(parent).Where(relation => relation.RelationType.Alias == relationTypeAlias);
-        }
-
-        /// <summary>
-        /// Gets a list of <see cref="Relation"/> objects by their child Id
-        /// </summary>
-        /// <param name="id">Id of the child to retrieve relations for</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
-        public IEnumerable<IRelation> GetByChildId(int id)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateRelationRepository(uow);
-                var query = new Query<IRelation>().Where(x => x.ChildId == id);
-                return repository.GetByQuery(query);
-            }
-        }
-
-        /// <summary>
-        /// Gets a list of <see cref="Relation"/> objects by their child Entity
-        /// </summary>
-        /// <param name="child">Child Entity to retrieve relations for</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
-        public IEnumerable<IRelation> GetByChild(IUmbracoEntity child)
-        {
-            return GetByChildId(child.Id);
-        }
-
-        /// <summary>
-        /// Gets a list of <see cref="Relation"/> objects by their child Entity
-        /// </summary>
-        /// <param name="child">Child Entity to retrieve relations for</param>
-        /// <param name="relationTypeAlias">Alias of the type of relation to retrieve</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
-        public IEnumerable<IRelation> GetByChild(IUmbracoEntity child, string relationTypeAlias)
-        {
-            return GetByChild(child).Where(relation => relation.RelationType.Alias == relationTypeAlias);
-        }
-
-        /// <summary>
-        /// Gets a list of <see cref="Relation"/> objects by their child or parent Id.
-        /// Using this method will get you all relations regards of it being a child or parent relation.
-        /// </summary>
-        /// <param name="id">Id of the child or parent to retrieve relations for</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
-        public IEnumerable<IRelation> GetByParentOrChildId(int id)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateRelationRepository(uow);
-                var query = new Query<IRelation>().Where(x => x.ParentId == id || x.ChildId == id);
-                return repository.GetByQuery(query);
-            }
-        }
-
-        public IEnumerable<IRelation> GetByParentOrChildId(int id, string relationTypeAlias)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var typeRepository = RepositoryFactory.CreateRelationTypeRepository(uow);
-                var rtQuery = new Query<IRelationType>().Where(x => x.Alias == relationTypeAlias);
-                var relationType = typeRepository.GetByQuery(rtQuery).FirstOrDefault();
-                if (relationType == null) return Enumerable.Empty<IRelation>();
-
-                var relationRepo = RepositoryFactory.CreateRelationRepository(uow);
-                var query = new Query<IRelation>().Where(x => (x.ParentId == id || x.ChildId == id) && x.RelationTypeId == relationType.Id);
-                return relationRepo.GetByQuery(query);
-            }
-        }
-
-        /// <summary>
-        /// Gets a list of <see cref="Relation"/> objects by the Name of the <see cref="RelationType"/>
-        /// </summary>
-        /// <param name="relationTypeName">Name of the <see cref="RelationType"/> to retrieve Relations for</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
-        public IEnumerable<IRelation> GetByRelationTypeName(string relationTypeName)
-        {
-            List<int> relationTypeIds = null;
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateRelationTypeRepository(uow);
-                var query = new Query<IRelationType>().Where(x => x.Name == relationTypeName);
-                var relationTypes = repository.GetByQuery(query);
-                if (relationTypes.Any())
-                {
-                    relationTypeIds = relationTypes.Select(x => x.Id).ToList();
-                }
-            }
-
-            if (relationTypeIds == null)
-                return Enumerable.Empty<IRelation>();
-
-            return GetRelationsByListOfTypeIds(relationTypeIds);
-        }
-
-        /// <summary>
-        /// Gets a list of <see cref="Relation"/> objects by the Alias of the <see cref="RelationType"/>
-        /// </summary>
-        /// <param name="relationTypeAlias">Alias of the <see cref="RelationType"/> to retrieve Relations for</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
-        public IEnumerable<IRelation> GetByRelationTypeAlias(string relationTypeAlias)
-        {
-            List<int> relationTypeIds = null;
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateRelationTypeRepository(uow);
-                var query = new Query<IRelationType>().Where(x => x.Alias == relationTypeAlias);
-                var relationTypes = repository.GetByQuery(query);
-                if (relationTypes.Any())
-                {
-                    relationTypeIds = relationTypes.Select(x => x.Id).ToList();
-                }
-            }
-
-            if (relationTypeIds == null)
-                return Enumerable.Empty<IRelation>();
-
-            return GetRelationsByListOfTypeIds(relationTypeIds);
-        }
-
-        /// <summary>
-        /// Gets a list of <see cref="Relation"/> objects by the Id of the <see cref="RelationType"/>
-        /// </summary>
-        /// <param name="relationTypeId">Id of the <see cref="RelationType"/> to retrieve Relations for</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
-        public IEnumerable<IRelation> GetByRelationTypeId(int relationTypeId)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateRelationRepository(uow);
-                var query = new Query<IRelation>().Where(x => x.RelationTypeId == relationTypeId);
-                return repository.GetByQuery(query);
-            }
-        }
-
-        /// <summary>
-        /// Gets the Child object from a Relation as an <see cref="IUmbracoEntity"/>
-        /// </summary>
-        /// <param name="relation">Relation to retrieve child object from</param>
-        /// <param name="loadBaseType">Optional bool to load the complete object graph when set to <c>False</c></param>
-        /// <returns>An <see cref="IUmbracoEntity"/></returns>
-        public IUmbracoEntity GetChildEntityFromRelation(IRelation relation, bool loadBaseType = false)
-        {
-            var objectType = UmbracoObjectTypesExtensions.GetUmbracoObjectType(relation.RelationType.ChildObjectType);
-            return _entityService.Get(relation.ChildId, objectType, loadBaseType);
-        }
-
-        /// <summary>
-        /// Gets the Parent object from a Relation as an <see cref="IUmbracoEntity"/>
-        /// </summary>
-        /// <param name="relation">Relation to retrieve parent object from</param>
-        /// <param name="loadBaseType">Optional bool to load the complete object graph when set to <c>False</c></param>
-        /// <returns>An <see cref="IUmbracoEntity"/></returns>
-        public IUmbracoEntity GetParentEntityFromRelation(IRelation relation, bool loadBaseType = false)
-        {
-            var objectType = UmbracoObjectTypesExtensions.GetUmbracoObjectType(relation.RelationType.ParentObjectType);
-            return _entityService.Get(relation.ParentId, objectType, loadBaseType);
-        }
-
-        /// <summary>
-        /// Gets the Parent and Child objects from a Relation as a <see cref="Tuple"/>"/> with <see cref="IUmbracoEntity"/>.
-        /// </summary>
-        /// <param name="relation">Relation to retrieve parent and child object from</param>
-        /// <param name="loadBaseType">Optional bool to load the complete object graph when set to <c>False</c></param>
-        /// <returns>Returns a Tuple with Parent (item1) and Child (item2)</returns>
-        public Tuple<IUmbracoEntity, IUmbracoEntity> GetEntitiesFromRelation(IRelation relation, bool loadBaseType = false)
-        {
-            var childObjectType = UmbracoObjectTypesExtensions.GetUmbracoObjectType(relation.RelationType.ChildObjectType);
-            var parentObjectType = UmbracoObjectTypesExtensions.GetUmbracoObjectType(relation.RelationType.ParentObjectType);
-
-            var child = _entityService.Get(relation.ChildId, childObjectType, loadBaseType);
-            var parent = _entityService.Get(relation.ParentId, parentObjectType, loadBaseType);
-
-            return new Tuple<IUmbracoEntity, IUmbracoEntity>(parent, child);
-        }
-
-        /// <summary>
-        /// Gets the Child objects from a list of Relations as a list of <see cref="IUmbracoEntity"/> objects.
-        /// </summary>
-        /// <param name="relations">List of relations to retrieve child objects from</param>
-        /// <param name="loadBaseType">Optional bool to load the complete object graph when set to <c>False</c></param>
-        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/></returns>
-        public IEnumerable<IUmbracoEntity> GetChildEntitiesFromRelations(IEnumerable<IRelation> relations, bool loadBaseType = false)
-        {
-            foreach (var relation in relations)
-            {
-                var objectType = UmbracoObjectTypesExtensions.GetUmbracoObjectType(relation.RelationType.ChildObjectType);
-                yield return _entityService.Get(relation.ChildId, objectType, loadBaseType);
-            }
-        }
-
-        /// <summary>
-        /// Gets the Parent objects from a list of Relations as a list of <see cref="IUmbracoEntity"/> objects.
-        /// </summary>
-        /// <param name="relations">List of relations to retrieve parent objects from</param>
-        /// <param name="loadBaseType">Optional bool to load the complete object graph when set to <c>False</c></param>
-        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/></returns>
-        public IEnumerable<IUmbracoEntity> GetParentEntitiesFromRelations(IEnumerable<IRelation> relations,
-                                                                          bool loadBaseType = false)
-        {
-            foreach (var relation in relations)
-            {
-                var objectType = UmbracoObjectTypesExtensions.GetUmbracoObjectType(relation.RelationType.ParentObjectType);
-                yield return _entityService.Get(relation.ParentId, objectType, loadBaseType);
-            }
-        }
-
-        /// <summary>
-        /// Gets the Parent and Child objects from a list of Relations as a list of <see cref="IUmbracoEntity"/> objects.
-        /// </summary>
-        /// <param name="relations">List of relations to retrieve parent and child objects from</param>
-        /// <param name="loadBaseType">Optional bool to load the complete object graph when set to <c>False</c></param>
-        /// <returns>An enumerable list of <see cref="Tuple"/> with <see cref="IUmbracoEntity"/></returns>
-        public IEnumerable<Tuple<IUmbracoEntity, IUmbracoEntity>> GetEntitiesFromRelations(
-            IEnumerable<IRelation> relations,
-            bool loadBaseType = false)
-        {
-            foreach (var relation in relations)
-            {
-                var childObjectType = UmbracoObjectTypesExtensions.GetUmbracoObjectType(relation.RelationType.ChildObjectType);
-                var parentObjectType = UmbracoObjectTypesExtensions.GetUmbracoObjectType(relation.RelationType.ParentObjectType);
-
-                var child = _entityService.Get(relation.ChildId, childObjectType, loadBaseType);
-                var parent = _entityService.Get(relation.ParentId, parentObjectType, loadBaseType);
-
-                yield return new Tuple<IUmbracoEntity, IUmbracoEntity>(parent, child);
-            }
-        }
-
-        /// <summary>
-        /// Relates two objects by their entity Ids.
-        /// </summary>
-        /// <param name="parentId">Id of the parent</param>
-        /// <param name="childId">Id of the child</param>
-        /// <param name="relationType">The type of relation to create</param>
-        /// <returns>The created <see cref="Relation"/></returns>
-        public IRelation Relate(int parentId, int childId, IRelationType relationType)
-        {
-            // Ensure that the RelationType has an indentity before using it to relate two entities
-            if (relationType.HasIdentity == false)
-                Save(relationType);
-
-            var relation = new Relation(parentId, childId, relationType);
-
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var saveEventArgs = new SaveEventArgs<IRelation>(relation);
-                if (uow.Events.DispatchCancelable(SavingRelation, this, saveEventArgs))
-                {
-                    uow.Commit();
-                    return relation;
-                }
-
-                var repository = RepositoryFactory.CreateRelationRepository(uow);
-                repository.AddOrUpdate(relation);
-                uow.Commit();
-                saveEventArgs.CanCancel = false;
-                uow.Events.Dispatch(SavedRelation, this, saveEventArgs);
-                return relation;
-            }
-        }
-
-        /// <summary>
-        /// Relates two objects that are based on the <see cref="IUmbracoEntity"/> interface.
-        /// </summary>
-        /// <param name="parent">Parent entity</param>
-        /// <param name="child">Child entity</param>
-        /// <param name="relationType">The type of relation to create</param>
-        /// <returns>The created <see cref="Relation"/></returns>
-        public IRelation Relate(IUmbracoEntity parent, IUmbracoEntity child, IRelationType relationType)
-        {
-            return Relate(parent.Id, child.Id, relationType);
-        }
-
-        /// <summary>
-        /// Relates two objects by their entity Ids.
-        /// </summary>
-        /// <param name="parentId">Id of the parent</param>
-        /// <param name="childId">Id of the child</param>
-        /// <param name="relationTypeAlias">Alias of the type of relation to create</param>
-        /// <returns>The created <see cref="Relation"/></returns>
-        public IRelation Relate(int parentId, int childId, string relationTypeAlias)
-        {
-            var relationType = GetRelationTypeByAlias(relationTypeAlias);
-            if (relationType == null || string.IsNullOrEmpty(relationType.Alias))
-                throw new ArgumentNullException(string.Format("No RelationType with Alias '{0}' exists.", relationTypeAlias));
-
-            return Relate(parentId, childId, relationType);
-        }
-
-        /// <summary>
-        /// Relates two objects that are based on the <see cref="IUmbracoEntity"/> interface.
-        /// </summary>
-        /// <param name="parent">Parent entity</param>
-        /// <param name="child">Child entity</param>
-        /// <param name="relationTypeAlias">Alias of the type of relation to create</param>
-        /// <returns>The created <see cref="Relation"/></returns>
-        public IRelation Relate(IUmbracoEntity parent, IUmbracoEntity child, string relationTypeAlias)
-        {
-            var relationType = GetRelationTypeByAlias(relationTypeAlias);
-            if (relationType == null || string.IsNullOrEmpty(relationType.Alias))
-                throw new ArgumentNullException(string.Format("No RelationType with Alias '{0}' exists.", relationTypeAlias));
-
-            return Relate(parent.Id, child.Id, relationType);
-        }
-
-        /// <summary>
-        /// Checks whether any relations exists for the passed in <see cref="RelationType"/>.
-        /// </summary>
-        /// <param name="relationType"><see cref="RelationType"/> to check for relations</param>
-        /// <returns>Returns <c>True</c> if any relations exists for the given <see cref="RelationType"/>, otherwise <c>False</c></returns>
-        public bool HasRelations(IRelationType relationType)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateRelationRepository(uow);
-                var query = new Query<IRelation>().Where(x => x.RelationTypeId == relationType.Id);
-                return repository.GetByQuery(query).Any();
-            }
-        }
-
-        /// <summary>
-        /// Checks whether any relations exists for the passed in Id.
-        /// </summary>
-        /// <param name="id">Id of an object to check relations for</param>
-        /// <returns>Returns <c>True</c> if any relations exists with the given Id, otherwise <c>False</c></returns>
-        public bool IsRelated(int id)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateRelationRepository(uow);
-                var query = new Query<IRelation>().Where(x => x.ParentId == id || x.ChildId == id);
-                return repository.GetByQuery(query).Any();
-            }
-        }
-
-        /// <summary>
-        /// Checks whether two items are related
-        /// </summary>
-        /// <param name="parentId">Id of the Parent relation</param>
-        /// <param name="childId">Id of the Child relation</param>
-        /// <returns>Returns <c>True</c> if any relations exists with the given Ids, otherwise <c>False</c></returns>
-        public bool AreRelated(int parentId, int childId)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateRelationRepository(uow);
-                var query = new Query<IRelation>().Where(x => x.ParentId == parentId && x.ChildId == childId);
-                return repository.GetByQuery(query).Any();
-            }
-        }
-
-        /// <summary>
-        /// Checks whether two items are related with a given relation type alias
-        /// </summary>
-        /// <param name="parentId">Id of the Parent relation</param>
-        /// <param name="childId">Id of the Child relation</param>
-        /// <param name="relationTypeAlias">Alias of the relation type</param>
-        /// <returns>Returns <c>True</c> if any relations exists with the given Ids and relation type, otherwise <c>False</c></returns>
-        public bool AreRelated(int parentId, int childId, string relationTypeAlias)
-        {
-            var relType = GetRelationTypeByAlias(relationTypeAlias);
-            if (relType == null)
-                return false;
-
-            return AreRelated(parentId, childId, relType);
-        }
-
-
-        /// <summary>
-        /// Checks whether two items are related with a given relation type
-        /// </summary>
-        /// <param name="parentId">Id of the Parent relation</param>
-        /// <param name="childId">Id of the Child relation</param>
-        /// <param name="relationType">Type of relation</param>
-        /// <returns>Returns <c>True</c> if any relations exists with the given Ids and relation type, otherwise <c>False</c></returns>
-        public bool AreRelated(int parentId, int childId, IRelationType relationType)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateRelationRepository(uow);
-                var query = new Query<IRelation>().Where(x => x.ParentId == parentId && x.ChildId == childId && x.RelationTypeId == relationType.Id);
-                return repository.GetByQuery(query).Any();
-            }
-        }
-
-        /// <summary>
-        /// Checks whether two items are related
-        /// </summary>
-        /// <param name="parent">Parent entity</param>
-        /// <param name="child">Child entity</param>
-        /// <returns>Returns <c>True</c> if any relations exist between the entities, otherwise <c>False</c></returns>
-        public bool AreRelated(IUmbracoEntity parent, IUmbracoEntity child)
-        {
-            return AreRelated(parent.Id, child.Id);
-        }
-
-        /// <summary>
-        /// Checks whether two items are related
-        /// </summary>
-        /// <param name="parent">Parent entity</param>
-        /// <param name="child">Child entity</param>
-        /// <param name="relationTypeAlias">Alias of the type of relation to create</param>
-        /// <returns>Returns <c>True</c> if any relations exist between the entities, otherwise <c>False</c></returns>
-        public bool AreRelated(IUmbracoEntity parent, IUmbracoEntity child, string relationTypeAlias)
-        {
-            return AreRelated(parent.Id, child.Id, relationTypeAlias);
-        }
-
-
-        /// <summary>
-        /// Saves a <see cref="Relation"/>
-        /// </summary>
-        /// <param name="relation">Relation to save</param>
-        public void Save(IRelation relation)
-        {
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var saveEventArgs = new SaveEventArgs<IRelation>(relation);
-                if (uow.Events.DispatchCancelable(SavingRelation, this, saveEventArgs))
-                {
-                    uow.Commit();
-                    return;
-                }
-                var repository = RepositoryFactory.CreateRelationRepository(uow);
-                repository.AddOrUpdate(relation);
-                uow.Commit();
-                saveEventArgs.CanCancel = false;
-                uow.Events.Dispatch(SavedRelation, this, saveEventArgs);
-            }
-        }
-
-        /// <summary>
-        /// Saves a <see cref="RelationType"/>
-        /// </summary>
-        /// <param name="relationType">RelationType to Save</param>
-        public void Save(IRelationType relationType)
-        {
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var saveEventArgs = new SaveEventArgs<IRelationType>(relationType);
-                if (uow.Events.DispatchCancelable(SavingRelationType, this, saveEventArgs))
-                {
-                    uow.Commit();
-                    return;
-                }
-                var repository = RepositoryFactory.CreateRelationTypeRepository(uow);
-                repository.AddOrUpdate(relationType);
-                uow.Commit();
-                saveEventArgs.CanCancel = false;
-                uow.Events.Dispatch(SavedRelationType, this, saveEventArgs);
-            }
-        }
-
-        /// <summary>
-        /// Deletes a <see cref="Relation"/>
-        /// </summary>
-        /// <param name="relation">Relation to Delete</param>
-        public void Delete(IRelation relation)
-        {
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var deleteEventArgs = new DeleteEventArgs<IRelation>(relation);
-                if (uow.Events.DispatchCancelable(DeletingRelation, this, deleteEventArgs))
-                {
-                    uow.Commit();
-                    return;
-                }
-                var repository = RepositoryFactory.CreateRelationRepository(uow);
-                repository.Delete(relation);
-                uow.Commit();
-                deleteEventArgs.CanCancel = false;
-                uow.Events.Dispatch(DeletedRelation, this, deleteEventArgs);
-            }
-        }
-
-        /// <summary>
-        /// Deletes a <see cref="RelationType"/>
-        /// </summary>
-        /// <param name="relationType">RelationType to Delete</param>
-        public void Delete(IRelationType relationType)
-        {
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var deleteEventArgs = new DeleteEventArgs<IRelationType>(relationType);
-                if (uow.Events.DispatchCancelable(DeletingRelationType, this, deleteEventArgs))
-                {
-                    uow.Commit();
-                    return;
-                }
-                var repository = RepositoryFactory.CreateRelationTypeRepository(uow);
-                repository.Delete(relationType);
-                uow.Commit();
-                deleteEventArgs.CanCancel = false;
-                uow.Events.Dispatch(DeletedRelationType, this, deleteEventArgs);
-            }
-        }
-
-        /// <summary>
-        /// Deletes all <see cref="Relation"/> objects based on the passed in <see cref="RelationType"/>
-        /// </summary>
-        /// <param name="relationType"><see cref="RelationType"/> to Delete Relations for</param>
-        public void DeleteRelationsOfType(IRelationType relationType)
-        {
-            var relations = new List<IRelation>();
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var repository = RepositoryFactory.CreateRelationRepository(uow);
-                var query = new Query<IRelation>().Where(x => x.RelationTypeId == relationType.Id);
-                relations.AddRange(repository.GetByQuery(query).ToList());
-
-                foreach (var relation in relations)
-                {
-                    repository.Delete(relation);
-                }
-                uow.Commit();
-                uow.Events.Dispatch(DeletedRelation, this, new DeleteEventArgs<IRelation>(relations, false));
-            }
-        }
-
-        #region Private Methods
-        private IEnumerable<IRelation> GetRelationsByListOfTypeIds(IEnumerable<int> relationTypeIds)
-        {
-            var relations = new List<IRelation>();
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateRelationRepository(uow);
-                foreach (var relationTypeId in relationTypeIds)
-                {
-                    int id = relationTypeId;
-                    var query = new Query<IRelation>().Where(x => x.RelationTypeId == id);
-                    relations.AddRange(repository.GetByQuery(query).ToList());
-                }
-            }
-            return relations;
-        }
-        #endregion
-
-        #region Events Handlers
-        /// <summary>
-        /// Occurs before Deleting a Relation
-        /// </summary>		
-        public static event TypedEventHandler<IRelationService, DeleteEventArgs<IRelation>> DeletingRelation;
-
-        /// <summary>
-        /// Occurs after a Relation is Deleted
-        /// </summary>
-        public static event TypedEventHandler<IRelationService, DeleteEventArgs<IRelation>> DeletedRelation;
-
-        /// <summary>
-        /// Occurs before Saving a Relation
-        /// </summary>
-        public static event TypedEventHandler<IRelationService, SaveEventArgs<IRelation>> SavingRelation;
-
-        /// <summary>
-        /// Occurs after a Relation is Saved
-        /// </summary>
-        public static event TypedEventHandler<IRelationService, SaveEventArgs<IRelation>> SavedRelation;
-
-        /// <summary>
-        /// Occurs before Deleting a RelationType
-        /// </summary>		
-        public static event TypedEventHandler<IRelationService, DeleteEventArgs<IRelationType>> DeletingRelationType;
-
-        /// <summary>
-        /// Occurs after a RelationType is Deleted
-        /// </summary>
-        public static event TypedEventHandler<IRelationService, DeleteEventArgs<IRelationType>> DeletedRelationType;
-
-        /// <summary>
-        /// Occurs before Saving a RelationType
-        /// </summary>
-        public static event TypedEventHandler<IRelationService, SaveEventArgs<IRelationType>> SavingRelationType;
-
-        /// <summary>
-        /// Occurs after a RelationType is Saved
-        /// </summary>
-        public static event TypedEventHandler<IRelationService, SaveEventArgs<IRelationType>> SavedRelationType;
-        #endregion
-    }
-}
\ No newline at end of file
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Umbraco.Core.Events;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Persistence.UnitOfWork;
+
+namespace Umbraco.Core.Services
+{
+    public class RelationService : ScopeRepositoryService, IRelationService
+    {
+        private readonly IEntityService _entityService;
+
+        public RelationService(IDatabaseUnitOfWorkProvider uowProvider, RepositoryFactory repositoryFactory, ILogger logger, IEventMessagesFactory eventMessagesFactory, IEntityService entityService)
+            : base(uowProvider, repositoryFactory, logger, eventMessagesFactory)
+        {
+            if (entityService == null) throw new ArgumentNullException("entityService");
+            _entityService = entityService;
+        }
+
+        /// <summary>
+        /// Gets a <see cref="Relation"/> by its Id
+        /// </summary>
+        /// <param name="id">Id of the <see cref="Relation"/></param>
+        /// <returns>A <see cref="Relation"/> object</returns>
+        public IRelation GetById(int id)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateRelationRepository(uow);
+                return repository.Get(id);
+            }
+        }
+
+        /// <summary>
+        /// Gets a <see cref="RelationType"/> by its Id
+        /// </summary>
+        /// <param name="id">Id of the <see cref="RelationType"/></param>
+        /// <returns>A <see cref="RelationType"/> object</returns>
+        public IRelationType GetRelationTypeById(int id)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateRelationTypeRepository(uow);
+                return repository.Get(id);
+            }
+        }
+
+        /// <summary>
+        /// Gets a <see cref="RelationType"/> by its Id
+        /// </summary>
+        /// <param name="id">Id of the <see cref="RelationType"/></param>
+        /// <returns>A <see cref="RelationType"/> object</returns>
+        public IRelationType GetRelationTypeById(Guid id)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateRelationTypeRepository(uow);
+                return repository.Get(id);
+            }
+        }
+
+        /// <summary>
+        /// Gets a <see cref="RelationType"/> by its Alias
+        /// </summary>
+        /// <param name="alias">Alias of the <see cref="RelationType"/></param>
+        /// <returns>A <see cref="RelationType"/> object</returns>
+        public IRelationType GetRelationTypeByAlias(string alias)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateRelationTypeRepository(uow);
+                var query = new Query<IRelationType>().Where(x => x.Alias == alias);
+                return repository.GetByQuery(query).FirstOrDefault();
+            }
+        }
+
+        /// <summary>
+        /// Gets all <see cref="Relation"/> objects
+        /// </summary>
+        /// <param name="ids">Optional array of integer ids to return relations for</param>
+        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
+        public IEnumerable<IRelation> GetAllRelations(params int[] ids)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateRelationRepository(uow);
+                return repository.GetAll(ids);
+            }
+        }
+
+        /// <summary>
+        /// Gets all <see cref="Relation"/> objects by their <see cref="RelationType"/>
+        /// </summary>
+        /// <param name="relationType"><see cref="RelationType"/> to retrieve Relations for</param>
+        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
+        public IEnumerable<IRelation> GetAllRelationsByRelationType(RelationType relationType)
+        {
+            return GetAllRelationsByRelationType(relationType.Id);
+        }
+
+        /// <summary>
+        /// Gets all <see cref="Relation"/> objects by their <see cref="RelationType"/>'s Id
+        /// </summary>
+        /// <param name="relationTypeId">Id of the <see cref="RelationType"/> to retrieve Relations for</param>
+        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
+        public IEnumerable<IRelation> GetAllRelationsByRelationType(int relationTypeId)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateRelationRepository(uow);
+                var query = new Query<IRelation>().Where(x => x.RelationTypeId == relationTypeId);
+                return repository.GetByQuery(query);
+            }
+        }
+
+        /// <summary>
+        /// Gets all <see cref="Relation"/> objects
+        /// </summary>
+        /// <param name="ids">Optional array of integer ids to return relationtypes for</param>
+        /// <returns>An enumerable list of <see cref="RelationType"/> objects</returns>
+        public IEnumerable<IRelationType> GetAllRelationTypes(params int[] ids)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateRelationTypeRepository(uow);
+                return repository.GetAll(ids);
+            }
+        }
+
+        /// <summary>
+        /// Gets a list of <see cref="Relation"/> objects by their parent Id
+        /// </summary>
+        /// <param name="id">Id of the parent to retrieve relations for</param>
+        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
+        public IEnumerable<IRelation> GetByParentId(int id)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateRelationRepository(uow);
+                var query = new Query<IRelation>().Where(x => x.ParentId == id);
+                return repository.GetByQuery(query);
+            }
+        }
+
+        /// <summary>
+        /// Gets a list of <see cref="Relation"/> objects by their parent entity
+        /// </summary>
+        /// <param name="parent">Parent Entity to retrieve relations for</param>
+        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
+        public IEnumerable<IRelation> GetByParent(IUmbracoEntity parent)
+        {
+            return GetByParentId(parent.Id);
+        }
+
+        /// <summary>
+        /// Gets a list of <see cref="Relation"/> objects by their parent entity
+        /// </summary>
+        /// <param name="parent">Parent Entity to retrieve relations for</param>
+        /// <param name="relationTypeAlias">Alias of the type of relation to retrieve</param>
+        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
+        public IEnumerable<IRelation> GetByParent(IUmbracoEntity parent, string relationTypeAlias)
+        {
+            return GetByParent(parent).Where(relation => relation.RelationType.Alias == relationTypeAlias);
+        }
+
+        /// <summary>
+        /// Gets a list of <see cref="Relation"/> objects by their child Id
+        /// </summary>
+        /// <param name="id">Id of the child to retrieve relations for</param>
+        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
+        public IEnumerable<IRelation> GetByChildId(int id)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateRelationRepository(uow);
+                var query = new Query<IRelation>().Where(x => x.ChildId == id);
+                return repository.GetByQuery(query);
+            }
+        }
+
+        /// <summary>
+        /// Gets a list of <see cref="Relation"/> objects by their child Entity
+        /// </summary>
+        /// <param name="child">Child Entity to retrieve relations for</param>
+        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
+        public IEnumerable<IRelation> GetByChild(IUmbracoEntity child)
+        {
+            return GetByChildId(child.Id);
+        }
+
+        /// <summary>
+        /// Gets a list of <see cref="Relation"/> objects by their child Entity
+        /// </summary>
+        /// <param name="child">Child Entity to retrieve relations for</param>
+        /// <param name="relationTypeAlias">Alias of the type of relation to retrieve</param>
+        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
+        public IEnumerable<IRelation> GetByChild(IUmbracoEntity child, string relationTypeAlias)
+        {
+            return GetByChild(child).Where(relation => relation.RelationType.Alias == relationTypeAlias);
+        }
+
+        /// <summary>
+        /// Gets a list of <see cref="Relation"/> objects by their child or parent Id.
+        /// Using this method will get you all relations regards of it being a child or parent relation.
+        /// </summary>
+        /// <param name="id">Id of the child or parent to retrieve relations for</param>
+        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
+        public IEnumerable<IRelation> GetByParentOrChildId(int id)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateRelationRepository(uow);
+                var query = new Query<IRelation>().Where(x => x.ParentId == id || x.ChildId == id);
+                return repository.GetByQuery(query);
+            }
+        }
+
+        public IEnumerable<IRelation> GetByParentOrChildId(int id, string relationTypeAlias)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var typeRepository = RepositoryFactory.CreateRelationTypeRepository(uow);
+                var rtQuery = new Query<IRelationType>().Where(x => x.Alias == relationTypeAlias);
+                var relationType = typeRepository.GetByQuery(rtQuery).FirstOrDefault();
+                if (relationType == null) return Enumerable.Empty<IRelation>();
+
+                var relationRepo = RepositoryFactory.CreateRelationRepository(uow);
+                var query = new Query<IRelation>().Where(x => (x.ParentId == id || x.ChildId == id) && x.RelationTypeId == relationType.Id);
+                return relationRepo.GetByQuery(query);
+            }
+        }
+
+        /// <summary>
+        /// Gets a list of <see cref="Relation"/> objects by the Name of the <see cref="RelationType"/>
+        /// </summary>
+        /// <param name="relationTypeName">Name of the <see cref="RelationType"/> to retrieve Relations for</param>
+        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
+        public IEnumerable<IRelation> GetByRelationTypeName(string relationTypeName)
+        {
+            List<int> relationTypeIds = null;
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateRelationTypeRepository(uow);
+                var query = new Query<IRelationType>().Where(x => x.Name == relationTypeName);
+                var relationTypes = repository.GetByQuery(query);
+                if (relationTypes.Any())
+                {
+                    relationTypeIds = relationTypes.Select(x => x.Id).ToList();
+                }
+            }
+
+            if (relationTypeIds == null)
+                return Enumerable.Empty<IRelation>();
+
+            return GetRelationsByListOfTypeIds(relationTypeIds);
+        }
+
+        /// <summary>
+        /// Gets a list of <see cref="Relation"/> objects by the Alias of the <see cref="RelationType"/>
+        /// </summary>
+        /// <param name="relationTypeAlias">Alias of the <see cref="RelationType"/> to retrieve Relations for</param>
+        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
+        public IEnumerable<IRelation> GetByRelationTypeAlias(string relationTypeAlias)
+        {
+            List<int> relationTypeIds = null;
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateRelationTypeRepository(uow);
+                var query = new Query<IRelationType>().Where(x => x.Alias == relationTypeAlias);
+                var relationTypes = repository.GetByQuery(query);
+                if (relationTypes.Any())
+                {
+                    relationTypeIds = relationTypes.Select(x => x.Id).ToList();
+                }
+            }
+
+            if (relationTypeIds == null)
+                return Enumerable.Empty<IRelation>();
+
+            return GetRelationsByListOfTypeIds(relationTypeIds);
+        }
+
+        /// <summary>
+        /// Gets a list of <see cref="Relation"/> objects by the Id of the <see cref="RelationType"/>
+        /// </summary>
+        /// <param name="relationTypeId">Id of the <see cref="RelationType"/> to retrieve Relations for</param>
+        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
+        public IEnumerable<IRelation> GetByRelationTypeId(int relationTypeId)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateRelationRepository(uow);
+                var query = new Query<IRelation>().Where(x => x.RelationTypeId == relationTypeId);
+                return repository.GetByQuery(query);
+            }
+        }
+
+        /// <summary>
+        /// Gets the Child object from a Relation as an <see cref="IUmbracoEntity"/>
+        /// </summary>
+        /// <param name="relation">Relation to retrieve child object from</param>
+        /// <returns>An <see cref="IUmbracoEntity"/></returns>
+        public IUmbracoEntity GetChildEntityFromRelation(IRelation relation)
+        {
+            var objectType = UmbracoObjectTypesExtensions.GetUmbracoObjectType(relation.RelationType.ChildObjectType);
+            return _entityService.Get(relation.ChildId, objectType);
+        }
+
+        /// <summary>
+        /// Gets the Parent object from a Relation as an <see cref="IUmbracoEntity"/>
+        /// </summary>
+        /// <param name="relation">Relation to retrieve parent object from</param>
+        /// <returns>An <see cref="IUmbracoEntity"/></returns>
+        public IUmbracoEntity GetParentEntityFromRelation(IRelation relation)
+        {
+            var objectType = UmbracoObjectTypesExtensions.GetUmbracoObjectType(relation.RelationType.ParentObjectType);
+            return _entityService.Get(relation.ParentId, objectType);
+        }
+
+        /// <summary>
+        /// Gets the Parent and Child objects from a Relation as a <see cref="Tuple"/>"/> with <see cref="IUmbracoEntity"/>.
+        /// </summary>
+        /// <param name="relation">Relation to retrieve parent and child object from</param>
+        /// <returns>Returns a Tuple with Parent (item1) and Child (item2)</returns>
+        public Tuple<IUmbracoEntity, IUmbracoEntity> GetEntitiesFromRelation(IRelation relation)
+        {
+            var childObjectType = UmbracoObjectTypesExtensions.GetUmbracoObjectType(relation.RelationType.ChildObjectType);
+            var parentObjectType = UmbracoObjectTypesExtensions.GetUmbracoObjectType(relation.RelationType.ParentObjectType);
+
+            var child = _entityService.Get(relation.ChildId, childObjectType);
+            var parent = _entityService.Get(relation.ParentId, parentObjectType);
+
+            return new Tuple<IUmbracoEntity, IUmbracoEntity>(parent, child);
+        }
+
+        /// <summary>
+        /// Gets the Child objects from a list of Relations as a list of <see cref="IUmbracoEntity"/> objects.
+        /// </summary>
+        /// <param name="relations">List of relations to retrieve child objects from</param>
+        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/></returns>
+        public IEnumerable<IUmbracoEntity> GetChildEntitiesFromRelations(IEnumerable<IRelation> relations)
+        {
+            foreach (var relation in relations)
+            {
+                var objectType = UmbracoObjectTypesExtensions.GetUmbracoObjectType(relation.RelationType.ChildObjectType);
+                yield return _entityService.Get(relation.ChildId, objectType);
+            }
+        }
+
+        /// <summary>
+        /// Gets the Parent objects from a list of Relations as a list of <see cref="IUmbracoEntity"/> objects.
+        /// </summary>
+        /// <param name="relations">List of relations to retrieve parent objects from</param>
+        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/></returns>
+        public IEnumerable<IUmbracoEntity> GetParentEntitiesFromRelations(IEnumerable<IRelation> relations)
+        {
+            foreach (var relation in relations)
+            {
+                var objectType = UmbracoObjectTypesExtensions.GetUmbracoObjectType(relation.RelationType.ParentObjectType);
+                yield return _entityService.Get(relation.ParentId, objectType);
+            }
+        }
+
+        /// <summary>
+        /// Gets the Parent and Child objects from a list of Relations as a list of <see cref="IUmbracoEntity"/> objects.
+        /// </summary>
+        /// <param name="relations">List of relations to retrieve parent and child objects from</param>
+        /// <returns>An enumerable list of <see cref="Tuple"/> with <see cref="IUmbracoEntity"/></returns>
+        public IEnumerable<Tuple<IUmbracoEntity, IUmbracoEntity>> GetEntitiesFromRelations(
+            IEnumerable<IRelation> relations)
+        {
+            foreach (var relation in relations)
+            {
+                var childObjectType = UmbracoObjectTypesExtensions.GetUmbracoObjectType(relation.RelationType.ChildObjectType);
+                var parentObjectType = UmbracoObjectTypesExtensions.GetUmbracoObjectType(relation.RelationType.ParentObjectType);
+
+                var child = _entityService.Get(relation.ChildId, childObjectType);
+                var parent = _entityService.Get(relation.ParentId, parentObjectType);
+
+                yield return new Tuple<IUmbracoEntity, IUmbracoEntity>(parent, child);
+            }
+        }
+
+        /// <summary>
+        /// Relates two objects by their entity Ids.
+        /// </summary>
+        /// <param name="parentId">Id of the parent</param>
+        /// <param name="childId">Id of the child</param>
+        /// <param name="relationType">The type of relation to create</param>
+        /// <returns>The created <see cref="Relation"/></returns>
+        public IRelation Relate(int parentId, int childId, IRelationType relationType)
+        {
+            // Ensure that the RelationType has an indentity before using it to relate two entities
+            if (relationType.HasIdentity == false)
+                Save(relationType);
+
+            var relation = new Relation(parentId, childId, relationType);
+
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var saveEventArgs = new SaveEventArgs<IRelation>(relation);
+                if (uow.Events.DispatchCancelable(SavingRelation, this, saveEventArgs))
+                {
+                    uow.Commit();
+                    return relation;
+                }
+
+                var repository = RepositoryFactory.CreateRelationRepository(uow);
+                repository.AddOrUpdate(relation);
+                uow.Commit();
+                saveEventArgs.CanCancel = false;
+                uow.Events.Dispatch(SavedRelation, this, saveEventArgs);
+                return relation;
+            }
+        }
+
+        /// <summary>
+        /// Relates two objects that are based on the <see cref="IUmbracoEntity"/> interface.
+        /// </summary>
+        /// <param name="parent">Parent entity</param>
+        /// <param name="child">Child entity</param>
+        /// <param name="relationType">The type of relation to create</param>
+        /// <returns>The created <see cref="Relation"/></returns>
+        public IRelation Relate(IUmbracoEntity parent, IUmbracoEntity child, IRelationType relationType)
+        {
+            return Relate(parent.Id, child.Id, relationType);
+        }
+
+        /// <summary>
+        /// Relates two objects by their entity Ids.
+        /// </summary>
+        /// <param name="parentId">Id of the parent</param>
+        /// <param name="childId">Id of the child</param>
+        /// <param name="relationTypeAlias">Alias of the type of relation to create</param>
+        /// <returns>The created <see cref="Relation"/></returns>
+        public IRelation Relate(int parentId, int childId, string relationTypeAlias)
+        {
+            var relationType = GetRelationTypeByAlias(relationTypeAlias);
+            if (relationType == null || string.IsNullOrEmpty(relationType.Alias))
+                throw new ArgumentNullException(string.Format("No RelationType with Alias '{0}' exists.", relationTypeAlias));
+
+            return Relate(parentId, childId, relationType);
+        }
+
+        /// <summary>
+        /// Relates two objects that are based on the <see cref="IUmbracoEntity"/> interface.
+        /// </summary>
+        /// <param name="parent">Parent entity</param>
+        /// <param name="child">Child entity</param>
+        /// <param name="relationTypeAlias">Alias of the type of relation to create</param>
+        /// <returns>The created <see cref="Relation"/></returns>
+        public IRelation Relate(IUmbracoEntity parent, IUmbracoEntity child, string relationTypeAlias)
+        {
+            var relationType = GetRelationTypeByAlias(relationTypeAlias);
+            if (relationType == null || string.IsNullOrEmpty(relationType.Alias))
+                throw new ArgumentNullException(string.Format("No RelationType with Alias '{0}' exists.", relationTypeAlias));
+
+            return Relate(parent.Id, child.Id, relationType);
+        }
+
+        /// <summary>
+        /// Checks whether any relations exists for the passed in <see cref="RelationType"/>.
+        /// </summary>
+        /// <param name="relationType"><see cref="RelationType"/> to check for relations</param>
+        /// <returns>Returns <c>True</c> if any relations exists for the given <see cref="RelationType"/>, otherwise <c>False</c></returns>
+        public bool HasRelations(IRelationType relationType)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateRelationRepository(uow);
+                var query = new Query<IRelation>().Where(x => x.RelationTypeId == relationType.Id);
+                return repository.GetByQuery(query).Any();
+            }
+        }
+
+        /// <summary>
+        /// Checks whether any relations exists for the passed in Id.
+        /// </summary>
+        /// <param name="id">Id of an object to check relations for</param>
+        /// <returns>Returns <c>True</c> if any relations exists with the given Id, otherwise <c>False</c></returns>
+        public bool IsRelated(int id)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateRelationRepository(uow);
+                var query = new Query<IRelation>().Where(x => x.ParentId == id || x.ChildId == id);
+                return repository.GetByQuery(query).Any();
+            }
+        }
+
+        /// <summary>
+        /// Checks whether two items are related
+        /// </summary>
+        /// <param name="parentId">Id of the Parent relation</param>
+        /// <param name="childId">Id of the Child relation</param>
+        /// <returns>Returns <c>True</c> if any relations exists with the given Ids, otherwise <c>False</c></returns>
+        public bool AreRelated(int parentId, int childId)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateRelationRepository(uow);
+                var query = new Query<IRelation>().Where(x => x.ParentId == parentId && x.ChildId == childId);
+                return repository.GetByQuery(query).Any();
+            }
+        }
+
+        /// <summary>
+        /// Checks whether two items are related with a given relation type alias
+        /// </summary>
+        /// <param name="parentId">Id of the Parent relation</param>
+        /// <param name="childId">Id of the Child relation</param>
+        /// <param name="relationTypeAlias">Alias of the relation type</param>
+        /// <returns>Returns <c>True</c> if any relations exists with the given Ids and relation type, otherwise <c>False</c></returns>
+        public bool AreRelated(int parentId, int childId, string relationTypeAlias)
+        {
+            var relType = GetRelationTypeByAlias(relationTypeAlias);
+            if (relType == null)
+                return false;
+
+            return AreRelated(parentId, childId, relType);
+        }
+
+
+        /// <summary>
+        /// Checks whether two items are related with a given relation type
+        /// </summary>
+        /// <param name="parentId">Id of the Parent relation</param>
+        /// <param name="childId">Id of the Child relation</param>
+        /// <param name="relationType">Type of relation</param>
+        /// <returns>Returns <c>True</c> if any relations exists with the given Ids and relation type, otherwise <c>False</c></returns>
+        public bool AreRelated(int parentId, int childId, IRelationType relationType)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateRelationRepository(uow);
+                var query = new Query<IRelation>().Where(x => x.ParentId == parentId && x.ChildId == childId && x.RelationTypeId == relationType.Id);
+                return repository.GetByQuery(query).Any();
+            }
+        }
+
+        /// <summary>
+        /// Checks whether two items are related
+        /// </summary>
+        /// <param name="parent">Parent entity</param>
+        /// <param name="child">Child entity</param>
+        /// <returns>Returns <c>True</c> if any relations exist between the entities, otherwise <c>False</c></returns>
+        public bool AreRelated(IUmbracoEntity parent, IUmbracoEntity child)
+        {
+            return AreRelated(parent.Id, child.Id);
+        }
+
+        /// <summary>
+        /// Checks whether two items are related
+        /// </summary>
+        /// <param name="parent">Parent entity</param>
+        /// <param name="child">Child entity</param>
+        /// <param name="relationTypeAlias">Alias of the type of relation to create</param>
+        /// <returns>Returns <c>True</c> if any relations exist between the entities, otherwise <c>False</c></returns>
+        public bool AreRelated(IUmbracoEntity parent, IUmbracoEntity child, string relationTypeAlias)
+        {
+            return AreRelated(parent.Id, child.Id, relationTypeAlias);
+        }
+
+
+        /// <summary>
+        /// Saves a <see cref="Relation"/>
+        /// </summary>
+        /// <param name="relation">Relation to save</param>
+        public void Save(IRelation relation)
+        {
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var saveEventArgs = new SaveEventArgs<IRelation>(relation);
+                if (uow.Events.DispatchCancelable(SavingRelation, this, saveEventArgs))
+                {
+                    uow.Commit();
+                    return;
+                }
+                var repository = RepositoryFactory.CreateRelationRepository(uow);
+                repository.AddOrUpdate(relation);
+                uow.Commit();
+                saveEventArgs.CanCancel = false;
+                uow.Events.Dispatch(SavedRelation, this, saveEventArgs);
+            }
+        }
+
+        /// <summary>
+        /// Saves a <see cref="RelationType"/>
+        /// </summary>
+        /// <param name="relationType">RelationType to Save</param>
+        public void Save(IRelationType relationType)
+        {
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var saveEventArgs = new SaveEventArgs<IRelationType>(relationType);
+                if (uow.Events.DispatchCancelable(SavingRelationType, this, saveEventArgs))
+                {
+                    uow.Commit();
+                    return;
+                }
+                var repository = RepositoryFactory.CreateRelationTypeRepository(uow);
+                repository.AddOrUpdate(relationType);
+                uow.Commit();
+                saveEventArgs.CanCancel = false;
+                uow.Events.Dispatch(SavedRelationType, this, saveEventArgs);
+            }
+        }
+
+        /// <summary>
+        /// Deletes a <see cref="Relation"/>
+        /// </summary>
+        /// <param name="relation">Relation to Delete</param>
+        public void Delete(IRelation relation)
+        {
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var deleteEventArgs = new DeleteEventArgs<IRelation>(relation);
+                if (uow.Events.DispatchCancelable(DeletingRelation, this, deleteEventArgs))
+                {
+                    uow.Commit();
+                    return;
+                }
+                var repository = RepositoryFactory.CreateRelationRepository(uow);
+                repository.Delete(relation);
+                uow.Commit();
+                deleteEventArgs.CanCancel = false;
+                uow.Events.Dispatch(DeletedRelation, this, deleteEventArgs);
+            }
+        }
+
+        /// <summary>
+        /// Deletes a <see cref="RelationType"/>
+        /// </summary>
+        /// <param name="relationType">RelationType to Delete</param>
+        public void Delete(IRelationType relationType)
+        {
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var deleteEventArgs = new DeleteEventArgs<IRelationType>(relationType);
+                if (uow.Events.DispatchCancelable(DeletingRelationType, this, deleteEventArgs))
+                {
+                    uow.Commit();
+                    return;
+                }
+                var repository = RepositoryFactory.CreateRelationTypeRepository(uow);
+                repository.Delete(relationType);
+                uow.Commit();
+                deleteEventArgs.CanCancel = false;
+                uow.Events.Dispatch(DeletedRelationType, this, deleteEventArgs);
+            }
+        }
+
+        /// <summary>
+        /// Deletes all <see cref="Relation"/> objects based on the passed in <see cref="RelationType"/>
+        /// </summary>
+        /// <param name="relationType"><see cref="RelationType"/> to Delete Relations for</param>
+        public void DeleteRelationsOfType(IRelationType relationType)
+        {
+            var relations = new List<IRelation>();
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var repository = RepositoryFactory.CreateRelationRepository(uow);
+                var query = new Query<IRelation>().Where(x => x.RelationTypeId == relationType.Id);
+                relations.AddRange(repository.GetByQuery(query).ToList());
+
+                foreach (var relation in relations)
+                {
+                    repository.Delete(relation);
+                }
+                uow.Commit();
+                uow.Events.Dispatch(DeletedRelation, this, new DeleteEventArgs<IRelation>(relations, false));
+            }
+        }
+
+        #region Private Methods
+        private IEnumerable<IRelation> GetRelationsByListOfTypeIds(IEnumerable<int> relationTypeIds)
+        {
+            var relations = new List<IRelation>();
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateRelationRepository(uow);
+                foreach (var relationTypeId in relationTypeIds)
+                {
+                    int id = relationTypeId;
+                    var query = new Query<IRelation>().Where(x => x.RelationTypeId == id);
+                    relations.AddRange(repository.GetByQuery(query).ToList());
+                }
+            }
+            return relations;
+        }
+        #endregion
+
+        #region Events Handlers
+        /// <summary>
+        /// Occurs before Deleting a Relation
+        /// </summary>
+        public static event TypedEventHandler<IRelationService, DeleteEventArgs<IRelation>> DeletingRelation;
+
+        /// <summary>
+        /// Occurs after a Relation is Deleted
+        /// </summary>
+        public static event TypedEventHandler<IRelationService, DeleteEventArgs<IRelation>> DeletedRelation;
+
+        /// <summary>
+        /// Occurs before Saving a Relation
+        /// </summary>
+        public static event TypedEventHandler<IRelationService, SaveEventArgs<IRelation>> SavingRelation;
+
+        /// <summary>
+        /// Occurs after a Relation is Saved
+        /// </summary>
+        public static event TypedEventHandler<IRelationService, SaveEventArgs<IRelation>> SavedRelation;
+
+        /// <summary>
+        /// Occurs before Deleting a RelationType
+        /// </summary>
+        public static event TypedEventHandler<IRelationService, DeleteEventArgs<IRelationType>> DeletingRelationType;
+
+        /// <summary>
+        /// Occurs after a RelationType is Deleted
+        /// </summary>
+        public static event TypedEventHandler<IRelationService, DeleteEventArgs<IRelationType>> DeletedRelationType;
+
+        /// <summary>
+        /// Occurs before Saving a RelationType
+        /// </summary>
+        public static event TypedEventHandler<IRelationService, SaveEventArgs<IRelationType>> SavingRelationType;
+
+        /// <summary>
+        /// Occurs after a RelationType is Saved
+        /// </summary>
+        public static event TypedEventHandler<IRelationService, SaveEventArgs<IRelationType>> SavedRelationType;
+        #endregion
+    }
+}
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
index 636437e387..2f31d36b62 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
@@ -4,7 +4,7 @@
 * @description A helper object used for dealing with media items
 **/
 function mediaHelper(umbRequestHelper) {
-    
+
     //container of fileresolvers
     var _mediaFileResolvers = {};
 
@@ -13,11 +13,11 @@ function mediaHelper(umbRequestHelper) {
          * @ngdoc function
          * @name umbraco.services.mediaHelper#getImagePropertyValue
          * @methodOf umbraco.services.mediaHelper
-         * @function    
+         * @function
          *
          * @description
          * Returns the file path associated with the media property if there is one
-         * 
+         *
          * @param {object} options Options object
          * @param {object} options.mediaModel The media object to retrieve the image path from
          * @param {object} options.imageOnly Optional, if true then will only return a path if the media item is an image
@@ -75,16 +75,16 @@ function mediaHelper(umbRequestHelper) {
 
             return "";
         },
-        
+
         /**
          * @ngdoc function
          * @name umbraco.services.mediaHelper#getImagePropertyValue
          * @methodOf umbraco.services.mediaHelper
-         * @function    
+         * @function
          *
          * @description
          * Returns the actual image path associated with the image property if there is one
-         * 
+         *
          * @param {object} options Options object
          * @param {object} options.imageModel The media object to retrieve the image path from
          */
@@ -104,11 +104,11 @@ function mediaHelper(umbRequestHelper) {
          * @ngdoc function
          * @name umbraco.services.mediaHelper#getThumbnail
          * @methodOf umbraco.services.mediaHelper
-         * @function    
+         * @function
          *
          * @description
          * formats the display model used to display the content to the model used to save the content
-         * 
+         *
          * @param {object} options Options object
          * @param {object} options.imageModel The media object to retrieve the image path from
          */
@@ -133,54 +133,48 @@ function mediaHelper(umbRequestHelper) {
          * @ngdoc function
          * @name umbraco.services.mediaHelper#resolveFileFromEntity
          * @methodOf umbraco.services.mediaHelper
-         * @function    
+         * @function
          *
          * @description
          * Gets the media file url for a media entity returned with the entityResource
-         * 
+         *
          * @param {object} mediaEntity A media Entity returned from the entityResource
          * @param {boolean} thumbnail Whether to return the thumbnail url or normal url
          */
-        resolveFileFromEntity : function(mediaEntity, thumbnail) {
-            
-            if (!angular.isObject(mediaEntity.metaData)) {
+        resolveFileFromEntity: function (mediaEntity, thumbnail) {
+
+            if (!angular.isObject(mediaEntity.metaData) || !mediaEntity.metaData.MediaPath) {
                 throw "Cannot resolve the file url from the mediaEntity, it does not contain the required metaData";
             }
 
-            var values = _.values(mediaEntity.metaData);
-            for (var i = 0; i < values.length; i++) {
-                var val = values[i];
-                if (angular.isObject(val) && val.PropertyEditorAlias) {
-                    for (var resolver in _mediaFileResolvers) {
-                        if (val.PropertyEditorAlias === resolver) {
-                            //we need to format a property variable that coincides with how the property would be structured
-                            // if it came from the mediaResource just to keep things slightly easier for the file resolvers.
-                            var property = { value: val.Value };
-
-                            return _mediaFileResolvers[resolver](property, mediaEntity, thumbnail);
-                        }
-                    }
+            if (thumbnail) {
+                if (this.detectIfImageByExtension(mediaEntity.metaData.MediaPath)) {
+                    return this.getThumbnailFromPath(mediaEntity.metaData.MediaPath);
+                }
+                else {
+                    return null;
                 }
             }
-
-            return "";
+            else {
+                return mediaEntity.metaData.MediaPath;
+            }
         },
 
         /**
          * @ngdoc function
          * @name umbraco.services.mediaHelper#resolveFile
          * @methodOf umbraco.services.mediaHelper
-         * @function    
+         * @function
          *
          * @description
          * Gets the media file url for a media object returned with the mediaResource
-         * 
+         *
          * @param {object} mediaEntity A media Entity returned from the entityResource
          * @param {boolean} thumbnail Whether to return the thumbnail url or normal url
          */
         /*jshint loopfunc: true */
         resolveFile : function(mediaItem, thumbnail){
-            
+
             function iterateProps(props){
                 var res = null;
                 for(var resolver in _mediaFileResolvers) {
@@ -191,7 +185,7 @@ function mediaHelper(umbRequestHelper) {
                     }
                 }
 
-                return res;    
+                return res;
             }
 
             //we either have properties raw on the object, or spread out on tabs
@@ -208,7 +202,7 @@ function mediaHelper(umbRequestHelper) {
                     }
                 }
             }
-            return result;            
+            return result;
         },
 
         /*jshint loopfunc: true */
@@ -246,11 +240,11 @@ function mediaHelper(umbRequestHelper) {
          * @ngdoc function
          * @name umbraco.services.mediaHelper#scaleToMaxSize
          * @methodOf umbraco.services.mediaHelper
-         * @function    
+         * @function
          *
          * @description
          * Finds the corrct max width and max height, given maximum dimensions and keeping aspect ratios
-         * 
+         *
          * @param {number} maxSize Maximum width & height
          * @param {number} width Current width
          * @param {number} height Current height
@@ -289,11 +283,11 @@ function mediaHelper(umbRequestHelper) {
          * @ngdoc function
          * @name umbraco.services.mediaHelper#getThumbnailFromPath
          * @methodOf umbraco.services.mediaHelper
-         * @function    
+         * @function
          *
          * @description
          * Returns the path to the thumbnail version of a given media library image path
-         * 
+         *
          * @param {string} imagePath Image path, ex: /media/1234/my-image.jpg
          */
         getThumbnailFromPath: function (imagePath) {
@@ -319,11 +313,11 @@ function mediaHelper(umbRequestHelper) {
          * @ngdoc function
          * @name umbraco.services.mediaHelper#detectIfImageByExtension
          * @methodOf umbraco.services.mediaHelper
-         * @function    
+         * @function
          *
          * @description
          * Returns true/false, indicating if the given path has an allowed image extension
-         * 
+         *
          * @param {string} imagePath Image path, ex: /media/1234/my-image.jpg
          */
         detectIfImageByExtension: function (imagePath) {
@@ -331,7 +325,7 @@ function mediaHelper(umbRequestHelper) {
             if (!imagePath) {
                 return false;
             }
-            
+
             var lowered = imagePath.toLowerCase();
             var ext = lowered.substr(lowered.lastIndexOf(".") + 1);
             return ("," + Umbraco.Sys.ServerVariables.umbracoSettings.imageFileTypes + ",").indexOf("," + ext + ",") !== -1;
@@ -388,6 +382,6 @@ function mediaHelper(umbRequestHelper) {
             var ext = lowered.substr(lowered.lastIndexOf(".") + 1);
             return ext;
         }
-        
+
     };
 }angular.module('umbraco.services').factory('mediaHelper', mediaHelper);
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js
index f337dbce18..da7ca307ca 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js
@@ -1,134 +1,140 @@
-//used for the media picker dialog
-angular.module("umbraco")
-    .controller("Umbraco.Dialogs.MediaPickerController",
-        function($scope, mediaResource, umbRequestHelper, entityResource, $log, mediaHelper, mediaTypeHelper, eventsService, treeService) {
-
-            var dialogOptions = $scope.dialogOptions;
-
-            $scope.onlyImages = dialogOptions.onlyImages;
-            $scope.showDetails = dialogOptions.showDetails;
-            $scope.multiPicker = (dialogOptions.multiPicker && dialogOptions.multiPicker !== "0") ? true : false;
-            $scope.startNodeId = dialogOptions.startNodeId ? dialogOptions.startNodeId : -1;
-            $scope.cropSize = dialogOptions.cropSize;
-
-            //preload selected item
-            $scope.target = undefined;
-            if (dialogOptions.currentTarget) {
-                $scope.target = dialogOptions.currentTarget;
-            }
-
-            $scope.acceptedMediatypes = [];
-            mediaTypeHelper.getAllowedImagetypes($scope.startNodeId)
-                .then(function(types) {
-                    $scope.acceptedMediatypes = types;
-                });
-
-            $scope.upload = function(v) {
-                angular.element(".umb-file-dropzone-directive .file-select").click();
-            };
-
-            $scope.dragLeave = function(el, event) {
-                $scope.activeDrag = false;
-            };
-
-            $scope.dragEnter = function(el, event) {
-                $scope.activeDrag = true;
-            };
-
-            $scope.submitFolder = function(e) {
-                if (e.keyCode === 13) {
-                    e.preventDefault();
-
-                    mediaResource
-                        .addFolder($scope.newFolderName, $scope.currentFolder.id)
-                        .then(function(data) {
-                            $scope.showFolderInput = false;
-                            $scope.newFolderName = "";
-
-                            //we've added a new folder so lets clear the tree cache for that specific item
-                            treeService.clearCache({
-                                cacheKey: "__media", //this is the main media tree cache key
-                                childrenOf: data.parentId //clear the children of the parent
-                            });
-
-                            $scope.gotoFolder(data);
-                        });
-                }
-            };
-
-            $scope.gotoFolder = function(folder) {
-                if (!folder) {
-                    folder = { id: -1, name: "Media", icon: "icon-folder" };
-                }
-
-                if (folder.id > 0) {
-                    entityResource.getAncestors(folder.id, "media")
-                        .then(function(anc) {
-                            // anc.splice(0,1);  
-                            $scope.path = _.filter(anc,
-                                function(f) {
-                                    return f.path.indexOf($scope.startNodeId) !== -1;
-                                });
-                        });
-
-                    mediaTypeHelper.getAllowedImagetypes(folder.id)
-                        .then(function(types) {
-                            $scope.acceptedMediatypes = types;
-                        });
-                } else {
-                    $scope.path = [];
-                }
-
-                //mediaResource.rootMedia()
-                mediaResource.getChildren(folder.id)
-                    .then(function(data) {
-                        $scope.searchTerm = "";
-                        $scope.images = data.items ? data.items : [];
-                    });
-
-                $scope.currentFolder = folder;
-            };
-
-
-            $scope.clickHandler = function(image, ev, select) {
-                ev.preventDefault();
-
-                if (image.isFolder && !select) {
-                    $scope.gotoFolder(image);
-                } else {
-                    eventsService.emit("dialogs.mediaPicker.select", image);
-
-                    //we have 3 options add to collection (if multi) show details, or submit it right back to the callback
-                    if ($scope.multiPicker) {
-                        $scope.select(image);
-                        image.cssclass = ($scope.dialogData.selection.indexOf(image) > -1) ? "selected" : "";
-                    } else if ($scope.showDetails) {
-                        $scope.target = image;
-                        $scope.target.url = mediaHelper.resolveFile(image);
-                    } else {
-                        $scope.submit(image);
-                    }
-                }
-            };
-
-            $scope.exitDetails = function() {
-                if (!$scope.currentFolder) {
-                    $scope.gotoFolder();
-                }
-
-                $scope.target = undefined;
-            };
-
-            $scope.onUploadComplete = function() {
-                $scope.gotoFolder($scope.currentFolder);
-            };
-
-            $scope.onFilesQueue = function() {
-                $scope.activeDrag = false;
-            };
-
-            //default root item
-            if (!$scope.target) {
-                $scope.gotoFolder({ id: $scope.startNodeId, name: "Media", icon: "icon-folder" });
-            }
-        });
\ No newline at end of file
+//used for the media picker dialog
+angular.module("umbraco")
+    .controller("Umbraco.Dialogs.MediaPickerController",
+        function($scope, mediaResource, umbRequestHelper, entityResource, $log, mediaHelper, mediaTypeHelper, eventsService, treeService) {
+
+            var dialogOptions = $scope.dialogOptions;
+
+            $scope.onlyImages = dialogOptions.onlyImages;
+            $scope.showDetails = dialogOptions.showDetails;
+            $scope.multiPicker = (dialogOptions.multiPicker && dialogOptions.multiPicker !== "0") ? true : false;
+            $scope.startNodeId = dialogOptions.startNodeId ? dialogOptions.startNodeId : -1;
+            $scope.cropSize = dialogOptions.cropSize;
+
+            //preload selected item
+            $scope.target = undefined;
+            if (dialogOptions.currentTarget) {
+                $scope.target = dialogOptions.currentTarget;
+            }
+
+            $scope.acceptedMediatypes = [];
+            mediaTypeHelper.getAllowedImagetypes($scope.startNodeId)
+                .then(function(types) {
+                    $scope.acceptedMediatypes = types;
+                });
+
+            $scope.upload = function(v) {
+                angular.element(".umb-file-dropzone-directive .file-select").click();
+            };
+
+            $scope.dragLeave = function(el, event) {
+                $scope.activeDrag = false;
+            };
+
+            $scope.dragEnter = function(el, event) {
+                $scope.activeDrag = true;
+            };
+
+            $scope.submitFolder = function(e) {
+                if (e.keyCode === 13) {
+                    e.preventDefault();
+
+                    mediaResource
+                        .addFolder($scope.newFolderName, $scope.currentFolder.id)
+                        .then(function(data) {
+                            $scope.showFolderInput = false;
+                            $scope.newFolderName = "";
+
+                            //we've added a new folder so lets clear the tree cache for that specific item
+                            treeService.clearCache({
+                                cacheKey: "__media", //this is the main media tree cache key
+                                childrenOf: data.parentId //clear the children of the parent
+                            });
+
+                            $scope.gotoFolder(data);
+                        });
+                }
+            };
+
+            $scope.gotoFolder = function(folder) {
+                if (!folder) {
+                    folder = { id: -1, name: "Media", icon: "icon-folder" };
+                }
+
+                if (folder.id > 0) {
+                    entityResource.getAncestors(folder.id, "media")
+                        .then(function(anc) {
+                            // anc.splice(0,1);
+                            $scope.path = _.filter(anc,
+                                function(f) {
+                                    return f.path.indexOf($scope.startNodeId) !== -1;
+                                });
+                        });
+
+                    mediaTypeHelper.getAllowedImagetypes(folder.id)
+                        .then(function(types) {
+                            $scope.acceptedMediatypes = types;
+                        });
+                } else {
+                    $scope.path = [];
+                }
+
+                //mediaResource.rootMedia()
+                entityResource.getChildren(folder.id, "Media")
+                    .then(function(data) {
+                        for (i=0;i<data.length;i++){
+                            if(data[i].metaData.MediaPath !== null){
+                                data[i].thumbnail = mediaHelper.resolveFileFromEntity(data[i], true);
+                                data[i].image = mediaHelper.resolveFileFromEntity(data[i], false);
+                            }
+                        }
+                        $scope.searchTerm = "";
+                        $scope.images = data ? data : [];
+                    });
+
+                $scope.currentFolder = folder;
+            };
+
+
+            $scope.clickHandler = function(image, ev, select) {
+                ev.preventDefault();
+
+                if (image.isFolder && !select) {
+                    $scope.gotoFolder(image);
+                } else {
+                    eventsService.emit("dialogs.mediaPicker.select", image);
+
+                    //we have 3 options add to collection (if multi) show details, or submit it right back to the callback
+                    if ($scope.multiPicker) {
+                        $scope.select(image);
+                        image.cssclass = ($scope.dialogData.selection.indexOf(image) > -1) ? "selected" : "";
+                    } else if ($scope.showDetails) {
+                        $scope.target = image;
+                        $scope.target.url = mediaHelper.resolveFile(image);
+                    } else {
+                        $scope.submit(image);
+                    }
+                }
+            };
+
+            $scope.exitDetails = function() {
+                if (!$scope.currentFolder) {
+                    $scope.gotoFolder();
+                }
+
+                $scope.target = undefined;
+            };
+
+            $scope.onUploadComplete = function() {
+                $scope.gotoFolder($scope.currentFolder);
+            };
+
+            $scope.onFilesQueue = function() {
+                $scope.activeDrag = false;
+            };
+
+            //default root item
+            if (!$scope.target) {
+                $scope.gotoFolder({ id: $scope.startNodeId, name: "Media", icon: "icon-folder" });
+            }
+        });
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
index e7d14c9871..400d3a7bb5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
@@ -90,7 +90,7 @@ angular.module("umbraco")
                     var id = $scope.target.udi ? $scope.target.udi : $scope.target.id
                     var altText = $scope.target.altText;
                     if (id) {
-                        mediaResource.getById(id)
+                        entityResource.getById(id, "Media")
                             .then(function (node) {
                                 $scope.target = node;
                                 if (ensureWithinStartNode(node)) {
@@ -388,10 +388,17 @@ angular.module("umbraco")
 
             function getChildren(id) {
                 $scope.loading = true;
-                return mediaResource.getChildren(id, { dataTypeId: $scope.model.dataTypeId })
+                return entityResource.getChildren(id, "Media")
                     .then(function(data) {
+
+                        for (i=0;i<data.length;i++){
+                            if(data[i].metaData.MediaPath !== null){
+                                data[i].thumbnail = mediaHelper.resolveFileFromEntity(data[i], true);
+                                data[i].image = mediaHelper.resolveFileFromEntity(data[i], false);
+                            }
+                        }
                         $scope.searchOptions.filter = "";
-                        $scope.images = data.items ? data.items : [];
+                        $scope.images = data ? data : [];
                         // set already selected images to selected
                         preSelectImages();
                         $scope.loading = false;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
index 559d0e4a19..138bb386be 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
@@ -1,7 +1,7 @@
 //this controller simply tells the dialogs service to open a mediaPicker window
 //with a specified callback, this callback will receive an object with a selection on it
 angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerController",
-    function ($rootScope, $scope, dialogService, entityResource, mediaResource, mediaHelper, $timeout, userService, $location, localizationService) {
+    function ($rootScope, $scope, dialogService, entityResource, mediaHelper, $timeout, userService, $location, localizationService) {
 
         //check the pre-values for multi-picker
         var multiPicker = $scope.model.config.multiPicker && $scope.model.config.multiPicker !== '0' ? true : false;
diff --git a/src/Umbraco.Web/Models/Mapping/PreValueDisplayResolver.cs b/src/Umbraco.Web/Models/Mapping/PreValueDisplayResolver.cs
index 652bd34fff..af6f99a15d 100644
--- a/src/Umbraco.Web/Models/Mapping/PreValueDisplayResolver.cs
+++ b/src/Umbraco.Web/Models/Mapping/PreValueDisplayResolver.cs
@@ -75,6 +75,7 @@ namespace Umbraco.Web.Models.Mapping
                 dictionaryVals = propEd.PreValueEditor.ConvertDbToEditor(propEd.DefaultPreValues, preVals);
             }
 
+            result = result.ToArray();
             MapPreValueValuesToPreValueFields(result, dictionaryVals, source.PropertyEditorAlias);
 
             return result;
diff --git a/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs b/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs
index d054337fd9..a246fa26ad 100644
--- a/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs
+++ b/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs
@@ -91,7 +91,7 @@ namespace Umbraco.Web.WebApi.Filters
             }
             else
             {
-                FilterOutPossibleSensitiveData(items);
+               // FilterOutPossibleSensitiveData(items);
             }
 
         }
diff --git a/src/umbraco.cms/businesslogic/web/Access.cs b/src/umbraco.cms/businesslogic/web/Access.cs
index 3d4470d23c..21b9d69fa5 100644
--- a/src/umbraco.cms/businesslogic/web/Access.cs
+++ b/src/umbraco.cms/businesslogic/web/Access.cs
@@ -1,581 +1,581 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Xml;
-using System.Xml.Linq;
-using System.Web.Security;
-using Umbraco.Core;
-using Umbraco.Core.Models;
-using Umbraco.Core.Security;
-using Umbraco.Core.Services;
-
-namespace umbraco.cms.businesslogic.web
-{
-    /// <summary>
-    /// Summary description for Access.
-    /// </summary>
-    [Obsolete("Use Umbraco.Core.Service.IPublicAccessService instead")]
-    public class Access
-    {
-
-        [Obsolete("Do not access this property directly, it is not thread safe, use GetXmlDocumentCopy instead")]
-        public static XmlDocument AccessXml
-        {
-            get { return GetXmlDocumentCopy(); }
-        }
-
-        //NOTE: This is here purely for backwards compat
-        [Obsolete("This should never be used, the data is stored in the database now")]
-        public static XmlDocument GetXmlDocumentCopy()
-        {
-            var allAccessEntries = ApplicationContext.Current.Services.PublicAccessService.GetAll().ToArray();
-
-            var xml = XDocument.Parse("<access/>");
-            foreach (var entry in allAccessEntries)
-            {
-                var pageXml = new XElement("page",
-                    new XAttribute("id", entry.ProtectedNodeId),
-                    new XAttribute("loginPage", entry.LoginNodeId),
-                    new XAttribute("noRightsPage", entry.NoAccessNodeId));
-
-                foreach (var rule in entry.Rules)
-                {
-                    if (rule.RuleType == Constants.Conventions.PublicAccess.MemberUsernameRuleType)
-                    {
-                        //if there is a member id claim then it is 'simple' (this is how legacy worked)
-                        pageXml.Add(new XAttribute("simple", "True"));
-                        pageXml.Add(new XAttribute("memberId", rule.RuleValue));
-                    }
-                    else if (rule.RuleType == Constants.Conventions.PublicAccess.MemberRoleRuleType)
-                    {
-                        pageXml.Add(new XElement("group", new XAttribute("id", rule.RuleValue)));
-                    }
-                }
-
-                xml.Root.Add(pageXml);
-            }
-
-            return xml.ToXmlDocument();
-        }
-
-        #region Manipulation methods
-
-        public static void AddMembershipRoleToDocument(int documentId, string role)
-        {
-            //event
-            var doc = new Document(documentId);
-            var e = new AddMemberShipRoleToDocumentEventArgs();
-            new Access().FireBeforeAddMemberShipRoleToDocument(doc, role, e);
-
-            if (e.Cancel) return;
-
-
-            var entry = ApplicationContext.Current.Services.PublicAccessService.AddRule(
-                doc.ContentEntity,
-                Constants.Conventions.PublicAccess.MemberRoleRuleType,
-                role);
-
-            if (entry.Success == false && entry.Result.Entity == null)
-            {
-                throw new Exception("Document is not protected!");
-            }
-
-            Save();
-
-            new Access().FireAfterAddMemberShipRoleToDocument(doc, role, e);
-        }
-        
-
-        [Obsolete("This method is no longer supported. Use the ASP.NET MemberShip methods instead", true)]
-        public static void AddMemberGroupToDocument(int DocumentId, int MemberGroupId)
-        {
-            var content = ApplicationContext.Current.Services.ContentService.GetById(DocumentId);
-
-            if (content == null)
-                throw new Exception("No content found with document id " + DocumentId);
-
-            if (ApplicationContext.Current.Services.PublicAccessService.AddRule(
-                content,
-                Constants.Conventions.PublicAccess.MemberGroupIdRuleType,
-                MemberGroupId.ToString(CultureInfo.InvariantCulture)))
-            {
-                Save();
-            }
-            
-        }
-
-        [Obsolete("This method is no longer supported. Use the ASP.NET MemberShip methods instead", true)]
-        public static void AddMemberToDocument(int DocumentId, int MemberId)
-        {
-            var content = ApplicationContext.Current.Services.ContentService.GetById(DocumentId);
-
-            if (content == null)
-                throw new Exception("No content found with document id " + DocumentId);
-
-            if (ApplicationContext.Current.Services.PublicAccessService.AddRule(
-                content,
-                Constants.Conventions.PublicAccess.MemberIdRuleType,
-                MemberId.ToString(CultureInfo.InvariantCulture)))
-            {
-                Save();
-            }
-            
-        }
-
-        public static void AddMembershipUserToDocument(int documentId, string membershipUserName)
-        {
-            //event
-            var doc = new Document(documentId);
-            var e = new AddMembershipUserToDocumentEventArgs();
-            new Access().FireBeforeAddMembershipUserToDocument(doc, membershipUserName, e);
-
-            if (e.Cancel) return;
-
-            var entry = ApplicationContext.Current.Services.PublicAccessService.AddRule(
-                doc.ContentEntity, 
-                Constants.Conventions.PublicAccess.MemberUsernameRuleType, 
-                membershipUserName);
-
-            if (entry.Success == false && entry.Result.Entity == null)
-            {
-                throw new Exception("Document is not protected!");
-            }
-
-            if (entry)
-            {
-                Save();
-                new Access().FireAfterAddMembershipUserToDocument(doc, membershipUserName, e);
-            }
-            
-        }
-
-        [Obsolete("This method is no longer supported. Use the ASP.NET MemberShip methods instead", true)]
-        public static void RemoveMemberGroupFromDocument(int DocumentId, int MemberGroupId)
-        {
-            var doc = new Document(DocumentId);
-
-            var entry = ApplicationContext.Current.Services.PublicAccessService.AddRule(
-                doc.ContentEntity, 
-                Constants.Conventions.PublicAccess.MemberGroupIdRuleType, 
-                MemberGroupId.ToString(CultureInfo.InvariantCulture));
-
-            if (entry.Success == false && entry.Result.Entity == null)
-            {
-                throw new Exception("Document is not protected!");
-            }
-
-            if (entry)
-            {
-                Save();
-            }
-        }
-
-        public static void RemoveMembershipRoleFromDocument(int documentId, string role)
-        {
-            var doc = new Document(documentId);
-            var e = new RemoveMemberShipRoleFromDocumentEventArgs();
-            new Access().FireBeforeRemoveMemberShipRoleFromDocument(doc, role, e);
-
-            if (e.Cancel) return;
-
-            if (ApplicationContext.Current.Services.PublicAccessService.RemoveRule(
-                doc.ContentEntity,
-                Constants.Conventions.PublicAccess.MemberRoleRuleType,
-                role))
-            {
-                Save();
-                new Access().FireAfterRemoveMemberShipRoleFromDocument(doc, role, e);
-            };
-            
-        }
-
-        public static bool RenameMemberShipRole(string oldRolename, string newRolename)
-        {
-            var hasChange = ApplicationContext.Current.Services.PublicAccessService.RenameMemberGroupRoleRules(oldRolename, newRolename);
-            
-            if (hasChange)
-                Save();
-
-            return hasChange;
-        }
-
-        public static void ProtectPage(bool Simple, int DocumentId, int LoginDocumentId, int ErrorDocumentId)
-        {
-            var doc = new Document(DocumentId);
-            var e = new AddProtectionEventArgs();
-            new Access().FireBeforeAddProtection(doc, e);
-
-            if (e.Cancel) return;
-
-            var loginContent = ApplicationContext.Current.Services.ContentService.GetById(LoginDocumentId);
-            if (loginContent == null) throw new NullReferenceException("No content item found with id " + LoginDocumentId);
-            var noAccessContent = ApplicationContext.Current.Services.ContentService.GetById(ErrorDocumentId);
-            if (noAccessContent == null) throw new NullReferenceException("No content item found with id " + ErrorDocumentId);
-
-            var entry = ApplicationContext.Current.Services.PublicAccessService.GetEntryForContent(doc.ContentEntity.Id.ToString());
-            if (entry != null)
-            {
-                if (Simple)
-                {
-                    // if using simple mode, make sure that all existing groups are removed
-                    entry.ClearRules();    
-                }
-                
-                //ensure the correct ids are applied
-                entry.LoginNodeId = loginContent.Id;
-                entry.NoAccessNodeId = noAccessContent.Id;
-            }
-            else
-            {
-                entry = new PublicAccessEntry(doc.ContentEntity, 
-                    ApplicationContext.Current.Services.ContentService.GetById(LoginDocumentId),
-                    ApplicationContext.Current.Services.ContentService.GetById(ErrorDocumentId),
-                    new List<PublicAccessRule>());
-            }
-
-            if (ApplicationContext.Current.Services.PublicAccessService.Save(entry))
-            {
-                Save();
-                new Access().FireAfterAddProtection(new Document(DocumentId), e);
-            }
-            
-        }
-
-        public static void RemoveProtection(int DocumentId)
-        {
-            //event
-            var doc = new Document(DocumentId);
-            var e = new RemoveProtectionEventArgs();
-            new Access().FireBeforeRemoveProtection(doc, e);
-
-            if (e.Cancel) return;
-
-            var entry = ApplicationContext.Current.Services.PublicAccessService.GetEntryForContent(doc.ContentEntity);
-            if (entry != null)
-            {
-                ApplicationContext.Current.Services.PublicAccessService.Delete(entry);
-            }
-
-            Save();
-
-            new Access().FireAfterRemoveProtection(doc, e);
-        } 
-        #endregion
-
-        #region Reading methods
-
-        [Obsolete("This method is no longer supported. Use the ASP.NET MemberShip methods instead", true)]
-        public static bool IsProtectedByGroup(int DocumentId, int GroupId)
-        {
-            var d = new Document(DocumentId);
-
-            var entry = ApplicationContext.Current.Services.PublicAccessService.GetEntryForContent(d.ContentEntity);
-            if (entry == null) return false;
-
-            return entry.Rules
-                .Any(x => x.RuleType == Constants.Conventions.PublicAccess.MemberGroupIdRuleType 
-                    && x.RuleValue == GroupId.ToString(CultureInfo.InvariantCulture));
-
-        }
-
-        public static bool IsProtectedByMembershipRole(int documentId, string role)
-        {
-            var content = ApplicationContext.Current.Services.ContentService.GetById(documentId);
-
-            var entry = ApplicationContext.Current.Services.PublicAccessService.GetEntryForContent(content);
-            if (entry == null) return false;
-
-            return entry.Rules
-                .Any(x => x.RuleType == Constants.Conventions.PublicAccess.MemberRoleRuleType
-                    && x.RuleValue == role);
-
-        }
-
-        public static string[] GetAccessingMembershipRoles(int documentId, string path)
-        {
-            var entry = ApplicationContext.Current.Services.PublicAccessService.GetEntryForContent(path.EnsureEndsWith("," + documentId));
-            if (entry == null) return new string[] { };
-
-            var memberGroupRoleRules = entry.Rules.Where(x => x.RuleType == Constants.Conventions.PublicAccess.MemberRoleRuleType);
-            return memberGroupRoleRules.Select(x => x.RuleValue).ToArray();
-
-        }
-
-        [Obsolete("This method is no longer supported. Use the ASP.NET MemberShip methods instead", true)]
-        public static member.MemberGroup[] GetAccessingGroups(int DocumentId)
-        {
-            var content = ApplicationContext.Current.Services.ContentService.GetById(DocumentId);
-            if (content == null) return null;
-
-            var entry = ApplicationContext.Current.Services.PublicAccessService.GetEntryForContent(content);
-            if (entry == null) return null;
-
-            var memberGroupIdRules = entry.Rules.Where(x => x.RuleType == Constants.Conventions.PublicAccess.MemberGroupIdRuleType);
-
-            return memberGroupIdRules.Select(x => new member.MemberGroup(int.Parse(x.RuleValue))).ToArray();
-
-        }
-
-        [Obsolete("This method is no longer supported. Use the ASP.NET MemberShip methods instead", true)]
-        public static member.Member GetAccessingMember(int DocumentId)
-        {
-            var content = ApplicationContext.Current.Services.ContentService.GetById(DocumentId);
-            if (content == null) return null;
-
-            var entry = ApplicationContext.Current.Services.PublicAccessService.GetEntryForContent(content);
-            if (entry == null) return null;
-
-            //legacy would throw an exception here if it was not 'simple' and simple means based on a member id in this case
-            if (entry.Rules.All(x => x.RuleType != Constants.Conventions.PublicAccess.MemberIdRuleType))
-            {
-                throw new Exception("Document isn't protected using Simple mechanism. Use GetAccessingMemberGroups instead");
-            }
-            
-            var memberIdRule = entry.Rules.First(x => x.RuleType == Constants.Conventions.PublicAccess.MemberIdRuleType);
-            return new member.Member(int.Parse(memberIdRule.RuleValue));
-
-        }
-
-        public static MembershipUser GetAccessingMembershipUser(int documentId)
-        {
-            var content = ApplicationContext.Current.Services.ContentService.GetById(documentId);
-            if (content == null) return null;
-
-            var entry = ApplicationContext.Current.Services.PublicAccessService.GetEntryForContent(content);
-            if (entry == null) return null;
-
-            //legacy would throw an exception here if it was not 'simple' and simple means based on a username
-            if (entry.Rules.All(x => x.RuleType != Constants.Conventions.PublicAccess.MemberUsernameRuleType))
-            {                
-                throw new Exception("Document isn't protected using Simple mechanism. Use GetAccessingMemberGroups instead");
-            }
-
-            var provider = MembershipProviderExtensions.GetMembersMembershipProvider();
-            var usernameRule = entry.Rules.First(x => x.RuleType == Constants.Conventions.PublicAccess.MemberUsernameRuleType);
-            return provider.GetUser(usernameRule.RuleValue, false);
-
-        }
-
-
-        [Obsolete("This method is no longer supported. Use the ASP.NET MemberShip methods instead", true)]
-        public static bool HasAccess(int DocumentId, member.Member Member)
-        {
-            var content = ApplicationContext.Current.Services.ContentService.GetById(DocumentId);
-            if (content == null) return true;
-
-            var entry = ApplicationContext.Current.Services.PublicAccessService.GetEntryForContent(content);
-            if (entry == null) return true;
-
-            var memberGroupIds = Member.Groups.Values.Cast<MemberGroup>().Select(x => x.Id.ToString(CultureInfo.InvariantCulture)).ToArray();
-            return entry.Rules.Any(x => x.RuleType == Constants.Conventions.PublicAccess.MemberGroupIdRuleType
-                                        && memberGroupIds.Contains(x.RuleValue));
-
-        }
-
-        [Obsolete("This method has been replaced because of a spelling mistake. Use the HasAccess method instead.", false)]
-        public static bool HasAccces(int documentId, object memberId)
-        {
-            // Call the correctly named version of this method
-            return HasAccess(documentId, memberId);
-        }
-
-        public static bool HasAccess(int documentId, object memberId)
-        {
-            return ApplicationContext.Current.Services.PublicAccessService.HasAccess(
-                documentId, 
-                memberId, 
-                ApplicationContext.Current.Services.ContentService,
-                MembershipProviderExtensions.GetMembersMembershipProvider(),
-                //TODO: This should really be targeting a specific provider by name!!
-                Roles.Provider);
-        }
-
-        public static bool HasAccess(int documentId, string path, MembershipUser member)
-        {
-            return ApplicationContext.Current.Services.PublicAccessService.HasAccess(
-                 path,
-                 member,
-                //TODO: This should really be targeting a specific provider by name!!
-                 Roles.Provider);
-        }
-
-        public static ProtectionType GetProtectionType(int DocumentId)
-        {
-            var content = ApplicationContext.Current.Services.ContentService.GetById(DocumentId);
-            if (content == null) return ProtectionType.NotProtected;
-
-            var entry = ApplicationContext.Current.Services.PublicAccessService.GetEntryForContent(content);
-            if (entry == null) return ProtectionType.NotProtected;
-
-            //legacy states that if it is protected by a member id then it is 'simple'
-            return entry.Rules.Any(x => x.RuleType == Constants.Conventions.PublicAccess.MemberIdRuleType)
-                ? ProtectionType.Simple 
-                : ProtectionType.Advanced;
-
-        }
-
-        public static bool IsProtected(int DocumentId, string Path)
-        {
-            return ApplicationContext.Current.Services.PublicAccessService.IsProtected(Path.EnsureEndsWith("," + DocumentId));             
-        }
-
-        //return the protection status of this exact document - not based on inheritance
-        public static bool IsProtected(int DocumentId)
-        {
-            return ApplicationContext.Current.Services.PublicAccessService.IsProtected(DocumentId.ToString());
-        }
-
-        public static int GetErrorPage(string Path)
-        {
-            var entry = ApplicationContext.Current.Services.PublicAccessService.GetEntryForContent(Path);
-            if (entry == null) return -1;
-            var entity = ApplicationContext.Current.Services.EntityService.Get(entry.NoAccessNodeId, UmbracoObjectTypes.Document, false);
-            return entity.Id;
-
-        }
-
-        public static int GetLoginPage(string Path)
-        {
-            var entry = ApplicationContext.Current.Services.PublicAccessService.GetEntryForContent(Path);
-            if (entry == null) return -1;
-            var entity = ApplicationContext.Current.Services.EntityService.Get(entry.LoginNodeId, UmbracoObjectTypes.Document, false);
-            return entity.Id;
-
-        } 
-        #endregion
-
-
-        //NOTE: This is purely here for backwards compat for events
-        private static void Save()
-        {
-            var e = new SaveEventArgs();
-
-            new Access().FireBeforeSave(e);
-
-            if (e.Cancel) return;
-
-            new Access().FireAfterSave(e);
-        }
-
-
-        //Event delegates
-        public delegate void SaveEventHandler(Access sender, SaveEventArgs e);
-
-        public delegate void AddProtectionEventHandler(Document sender, AddProtectionEventArgs e);
-        public delegate void RemoveProtectionEventHandler(Document sender, RemoveProtectionEventArgs e);
-
-        public delegate void AddMemberShipRoleToDocumentEventHandler(Document sender, string role, AddMemberShipRoleToDocumentEventArgs e);
-        public delegate void RemoveMemberShipRoleFromDocumentEventHandler(Document sender, string role, RemoveMemberShipRoleFromDocumentEventArgs e);
-
-        public delegate void RemoveMemberShipUserFromDocumentEventHandler(Document sender, string MembershipUserName, RemoveMemberShipUserFromDocumentEventArgs e);
-        public delegate void AddMembershipUserToDocumentEventHandler(Document sender, string MembershipUserName, AddMembershipUserToDocumentEventArgs e);
-
-        //Events
-
-        public static event SaveEventHandler BeforeSave;
-        protected virtual void FireBeforeSave(SaveEventArgs e)
-        {
-            if (BeforeSave != null)
-                BeforeSave(this, e);
-        }
-
-        public static event SaveEventHandler AfterSave;
-        protected virtual void FireAfterSave(SaveEventArgs e)
-        {
-            if (AfterSave != null)
-                AfterSave(this, e);
-        }
-
-        public static event AddProtectionEventHandler BeforeAddProtection;
-        protected virtual void FireBeforeAddProtection(Document doc, AddProtectionEventArgs e)
-        {
-            if (BeforeAddProtection != null)
-                BeforeAddProtection(doc, e);
-        }
-
-        public static event AddProtectionEventHandler AfterAddProtection;
-        protected virtual void FireAfterAddProtection(Document doc, AddProtectionEventArgs e)
-        {
-            if (AfterAddProtection != null)
-                AfterAddProtection(doc, e);
-        }
-
-        public static event RemoveProtectionEventHandler BeforeRemoveProtection;
-        protected virtual void FireBeforeRemoveProtection(Document doc, RemoveProtectionEventArgs e)
-        {
-            if (BeforeRemoveProtection != null)
-                BeforeRemoveProtection(doc, e);
-        }
-
-        public static event RemoveProtectionEventHandler AfterRemoveProtection;
-        protected virtual void FireAfterRemoveProtection(Document doc, RemoveProtectionEventArgs e)
-        {
-            if (AfterRemoveProtection != null)
-                AfterRemoveProtection(doc, e);
-        }
-
-        public static event AddMemberShipRoleToDocumentEventHandler BeforeAddMemberShipRoleToDocument;
-        protected virtual void FireBeforeAddMemberShipRoleToDocument(Document doc, string role, AddMemberShipRoleToDocumentEventArgs e)
-        {
-            if (BeforeAddMemberShipRoleToDocument != null)
-                BeforeAddMemberShipRoleToDocument(doc, role, e);
-        }
-
-        public static event AddMemberShipRoleToDocumentEventHandler AfterAddMemberShipRoleToDocument;
-        protected virtual void FireAfterAddMemberShipRoleToDocument(Document doc, string role, AddMemberShipRoleToDocumentEventArgs e)
-        {
-            if (AfterAddMemberShipRoleToDocument != null)
-                AfterAddMemberShipRoleToDocument(doc, role, e);
-        }
-
-        public static event RemoveMemberShipRoleFromDocumentEventHandler BeforeRemoveMemberShipRoleToDocument;
-        protected virtual void FireBeforeRemoveMemberShipRoleFromDocument(Document doc, string role, RemoveMemberShipRoleFromDocumentEventArgs e)
-        {
-            if (BeforeRemoveMemberShipRoleToDocument != null)
-                BeforeRemoveMemberShipRoleToDocument(doc, role, e);
-        }
-
-        public static event RemoveMemberShipRoleFromDocumentEventHandler AfterRemoveMemberShipRoleToDocument;
-        protected virtual void FireAfterRemoveMemberShipRoleFromDocument(Document doc, string role, RemoveMemberShipRoleFromDocumentEventArgs e)
-        {
-            if (AfterRemoveMemberShipRoleToDocument != null)
-                AfterRemoveMemberShipRoleToDocument(doc, role, e);
-        }
-
-        public static event RemoveMemberShipUserFromDocumentEventHandler BeforeRemoveMembershipUserFromDocument;
-        protected virtual void FireBeforeRemoveMembershipUserFromDocument(Document doc, string username, RemoveMemberShipUserFromDocumentEventArgs e)
-        {
-            if (BeforeRemoveMembershipUserFromDocument != null)
-                BeforeRemoveMembershipUserFromDocument(doc, username, e);
-        }
-
-        public static event RemoveMemberShipUserFromDocumentEventHandler AfterRemoveMembershipUserFromDocument;
-        protected virtual void FireAfterRemoveMembershipUserFromDocument(Document doc, string username, RemoveMemberShipUserFromDocumentEventArgs e)
-        {
-            if (AfterRemoveMembershipUserFromDocument != null)
-                AfterRemoveMembershipUserFromDocument(doc, username, e);
-        }
-
-        public static event AddMembershipUserToDocumentEventHandler BeforeAddMembershipUserToDocument;
-        protected virtual void FireBeforeAddMembershipUserToDocument(Document doc, string username, AddMembershipUserToDocumentEventArgs e)
-        {
-            if (BeforeAddMembershipUserToDocument != null)
-                BeforeAddMembershipUserToDocument(doc, username, e);
-        }
-
-        public static event AddMembershipUserToDocumentEventHandler AfterAddMembershipUserToDocument;
-        protected virtual void FireAfterAddMembershipUserToDocument(Document doc, string username, AddMembershipUserToDocumentEventArgs e)
-        {
-            if (AfterAddMembershipUserToDocument != null)
-                AfterAddMembershipUserToDocument(doc, username, e);
-        }
-    }
-
-    public enum ProtectionType
-    {
-        NotProtected,
-        Simple,
-        Advanced
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Xml;
+using System.Xml.Linq;
+using System.Web.Security;
+using Umbraco.Core;
+using Umbraco.Core.Models;
+using Umbraco.Core.Security;
+using Umbraco.Core.Services;
+
+namespace umbraco.cms.businesslogic.web
+{
+    /// <summary>
+    /// Summary description for Access.
+    /// </summary>
+    [Obsolete("Use Umbraco.Core.Service.IPublicAccessService instead")]
+    public class Access
+    {
+
+        [Obsolete("Do not access this property directly, it is not thread safe, use GetXmlDocumentCopy instead")]
+        public static XmlDocument AccessXml
+        {
+            get { return GetXmlDocumentCopy(); }
+        }
+
+        //NOTE: This is here purely for backwards compat
+        [Obsolete("This should never be used, the data is stored in the database now")]
+        public static XmlDocument GetXmlDocumentCopy()
+        {
+            var allAccessEntries = ApplicationContext.Current.Services.PublicAccessService.GetAll().ToArray();
+
+            var xml = XDocument.Parse("<access/>");
+            foreach (var entry in allAccessEntries)
+            {
+                var pageXml = new XElement("page",
+                    new XAttribute("id", entry.ProtectedNodeId),
+                    new XAttribute("loginPage", entry.LoginNodeId),
+                    new XAttribute("noRightsPage", entry.NoAccessNodeId));
+
+                foreach (var rule in entry.Rules)
+                {
+                    if (rule.RuleType == Constants.Conventions.PublicAccess.MemberUsernameRuleType)
+                    {
+                        //if there is a member id claim then it is 'simple' (this is how legacy worked)
+                        pageXml.Add(new XAttribute("simple", "True"));
+                        pageXml.Add(new XAttribute("memberId", rule.RuleValue));
+                    }
+                    else if (rule.RuleType == Constants.Conventions.PublicAccess.MemberRoleRuleType)
+                    {
+                        pageXml.Add(new XElement("group", new XAttribute("id", rule.RuleValue)));
+                    }
+                }
+
+                xml.Root.Add(pageXml);
+            }
+
+            return xml.ToXmlDocument();
+        }
+
+        #region Manipulation methods
+
+        public static void AddMembershipRoleToDocument(int documentId, string role)
+        {
+            //event
+            var doc = new Document(documentId);
+            var e = new AddMemberShipRoleToDocumentEventArgs();
+            new Access().FireBeforeAddMemberShipRoleToDocument(doc, role, e);
+
+            if (e.Cancel) return;
+
+
+            var entry = ApplicationContext.Current.Services.PublicAccessService.AddRule(
+                doc.ContentEntity,
+                Constants.Conventions.PublicAccess.MemberRoleRuleType,
+                role);
+
+            if (entry.Success == false && entry.Result.Entity == null)
+            {
+                throw new Exception("Document is not protected!");
+            }
+
+            Save();
+
+            new Access().FireAfterAddMemberShipRoleToDocument(doc, role, e);
+        }
+
+
+        [Obsolete("This method is no longer supported. Use the ASP.NET MemberShip methods instead", true)]
+        public static void AddMemberGroupToDocument(int DocumentId, int MemberGroupId)
+        {
+            var content = ApplicationContext.Current.Services.ContentService.GetById(DocumentId);
+
+            if (content == null)
+                throw new Exception("No content found with document id " + DocumentId);
+
+            if (ApplicationContext.Current.Services.PublicAccessService.AddRule(
+                content,
+                Constants.Conventions.PublicAccess.MemberGroupIdRuleType,
+                MemberGroupId.ToString(CultureInfo.InvariantCulture)))
+            {
+                Save();
+            }
+
+        }
+
+        [Obsolete("This method is no longer supported. Use the ASP.NET MemberShip methods instead", true)]
+        public static void AddMemberToDocument(int DocumentId, int MemberId)
+        {
+            var content = ApplicationContext.Current.Services.ContentService.GetById(DocumentId);
+
+            if (content == null)
+                throw new Exception("No content found with document id " + DocumentId);
+
+            if (ApplicationContext.Current.Services.PublicAccessService.AddRule(
+                content,
+                Constants.Conventions.PublicAccess.MemberIdRuleType,
+                MemberId.ToString(CultureInfo.InvariantCulture)))
+            {
+                Save();
+            }
+
+        }
+
+        public static void AddMembershipUserToDocument(int documentId, string membershipUserName)
+        {
+            //event
+            var doc = new Document(documentId);
+            var e = new AddMembershipUserToDocumentEventArgs();
+            new Access().FireBeforeAddMembershipUserToDocument(doc, membershipUserName, e);
+
+            if (e.Cancel) return;
+
+            var entry = ApplicationContext.Current.Services.PublicAccessService.AddRule(
+                doc.ContentEntity,
+                Constants.Conventions.PublicAccess.MemberUsernameRuleType,
+                membershipUserName);
+
+            if (entry.Success == false && entry.Result.Entity == null)
+            {
+                throw new Exception("Document is not protected!");
+            }
+
+            if (entry)
+            {
+                Save();
+                new Access().FireAfterAddMembershipUserToDocument(doc, membershipUserName, e);
+            }
+
+        }
+
+        [Obsolete("This method is no longer supported. Use the ASP.NET MemberShip methods instead", true)]
+        public static void RemoveMemberGroupFromDocument(int DocumentId, int MemberGroupId)
+        {
+            var doc = new Document(DocumentId);
+
+            var entry = ApplicationContext.Current.Services.PublicAccessService.AddRule(
+                doc.ContentEntity,
+                Constants.Conventions.PublicAccess.MemberGroupIdRuleType,
+                MemberGroupId.ToString(CultureInfo.InvariantCulture));
+
+            if (entry.Success == false && entry.Result.Entity == null)
+            {
+                throw new Exception("Document is not protected!");
+            }
+
+            if (entry)
+            {
+                Save();
+            }
+        }
+
+        public static void RemoveMembershipRoleFromDocument(int documentId, string role)
+        {
+            var doc = new Document(documentId);
+            var e = new RemoveMemberShipRoleFromDocumentEventArgs();
+            new Access().FireBeforeRemoveMemberShipRoleFromDocument(doc, role, e);
+
+            if (e.Cancel) return;
+
+            if (ApplicationContext.Current.Services.PublicAccessService.RemoveRule(
+                doc.ContentEntity,
+                Constants.Conventions.PublicAccess.MemberRoleRuleType,
+                role))
+            {
+                Save();
+                new Access().FireAfterRemoveMemberShipRoleFromDocument(doc, role, e);
+            };
+
+        }
+
+        public static bool RenameMemberShipRole(string oldRolename, string newRolename)
+        {
+            var hasChange = ApplicationContext.Current.Services.PublicAccessService.RenameMemberGroupRoleRules(oldRolename, newRolename);
+
+            if (hasChange)
+                Save();
+
+            return hasChange;
+        }
+
+        public static void ProtectPage(bool Simple, int DocumentId, int LoginDocumentId, int ErrorDocumentId)
+        {
+            var doc = new Document(DocumentId);
+            var e = new AddProtectionEventArgs();
+            new Access().FireBeforeAddProtection(doc, e);
+
+            if (e.Cancel) return;
+
+            var loginContent = ApplicationContext.Current.Services.ContentService.GetById(LoginDocumentId);
+            if (loginContent == null) throw new NullReferenceException("No content item found with id " + LoginDocumentId);
+            var noAccessContent = ApplicationContext.Current.Services.ContentService.GetById(ErrorDocumentId);
+            if (noAccessContent == null) throw new NullReferenceException("No content item found with id " + ErrorDocumentId);
+
+            var entry = ApplicationContext.Current.Services.PublicAccessService.GetEntryForContent(doc.ContentEntity.Id.ToString());
+            if (entry != null)
+            {
+                if (Simple)
+                {
+                    // if using simple mode, make sure that all existing groups are removed
+                    entry.ClearRules();
+                }
+
+                //ensure the correct ids are applied
+                entry.LoginNodeId = loginContent.Id;
+                entry.NoAccessNodeId = noAccessContent.Id;
+            }
+            else
+            {
+                entry = new PublicAccessEntry(doc.ContentEntity,
+                    ApplicationContext.Current.Services.ContentService.GetById(LoginDocumentId),
+                    ApplicationContext.Current.Services.ContentService.GetById(ErrorDocumentId),
+                    new List<PublicAccessRule>());
+            }
+
+            if (ApplicationContext.Current.Services.PublicAccessService.Save(entry))
+            {
+                Save();
+                new Access().FireAfterAddProtection(new Document(DocumentId), e);
+            }
+
+        }
+
+        public static void RemoveProtection(int DocumentId)
+        {
+            //event
+            var doc = new Document(DocumentId);
+            var e = new RemoveProtectionEventArgs();
+            new Access().FireBeforeRemoveProtection(doc, e);
+
+            if (e.Cancel) return;
+
+            var entry = ApplicationContext.Current.Services.PublicAccessService.GetEntryForContent(doc.ContentEntity);
+            if (entry != null)
+            {
+                ApplicationContext.Current.Services.PublicAccessService.Delete(entry);
+            }
+
+            Save();
+
+            new Access().FireAfterRemoveProtection(doc, e);
+        }
+        #endregion
+
+        #region Reading methods
+
+        [Obsolete("This method is no longer supported. Use the ASP.NET MemberShip methods instead", true)]
+        public static bool IsProtectedByGroup(int DocumentId, int GroupId)
+        {
+            var d = new Document(DocumentId);
+
+            var entry = ApplicationContext.Current.Services.PublicAccessService.GetEntryForContent(d.ContentEntity);
+            if (entry == null) return false;
+
+            return entry.Rules
+                .Any(x => x.RuleType == Constants.Conventions.PublicAccess.MemberGroupIdRuleType
+                    && x.RuleValue == GroupId.ToString(CultureInfo.InvariantCulture));
+
+        }
+
+        public static bool IsProtectedByMembershipRole(int documentId, string role)
+        {
+            var content = ApplicationContext.Current.Services.ContentService.GetById(documentId);
+
+            var entry = ApplicationContext.Current.Services.PublicAccessService.GetEntryForContent(content);
+            if (entry == null) return false;
+
+            return entry.Rules
+                .Any(x => x.RuleType == Constants.Conventions.PublicAccess.MemberRoleRuleType
+                    && x.RuleValue == role);
+
+        }
+
+        public static string[] GetAccessingMembershipRoles(int documentId, string path)
+        {
+            var entry = ApplicationContext.Current.Services.PublicAccessService.GetEntryForContent(path.EnsureEndsWith("," + documentId));
+            if (entry == null) return new string[] { };
+
+            var memberGroupRoleRules = entry.Rules.Where(x => x.RuleType == Constants.Conventions.PublicAccess.MemberRoleRuleType);
+            return memberGroupRoleRules.Select(x => x.RuleValue).ToArray();
+
+        }
+
+        [Obsolete("This method is no longer supported. Use the ASP.NET MemberShip methods instead", true)]
+        public static member.MemberGroup[] GetAccessingGroups(int DocumentId)
+        {
+            var content = ApplicationContext.Current.Services.ContentService.GetById(DocumentId);
+            if (content == null) return null;
+
+            var entry = ApplicationContext.Current.Services.PublicAccessService.GetEntryForContent(content);
+            if (entry == null) return null;
+
+            var memberGroupIdRules = entry.Rules.Where(x => x.RuleType == Constants.Conventions.PublicAccess.MemberGroupIdRuleType);
+
+            return memberGroupIdRules.Select(x => new member.MemberGroup(int.Parse(x.RuleValue))).ToArray();
+
+        }
+
+        [Obsolete("This method is no longer supported. Use the ASP.NET MemberShip methods instead", true)]
+        public static member.Member GetAccessingMember(int DocumentId)
+        {
+            var content = ApplicationContext.Current.Services.ContentService.GetById(DocumentId);
+            if (content == null) return null;
+
+            var entry = ApplicationContext.Current.Services.PublicAccessService.GetEntryForContent(content);
+            if (entry == null) return null;
+
+            //legacy would throw an exception here if it was not 'simple' and simple means based on a member id in this case
+            if (entry.Rules.All(x => x.RuleType != Constants.Conventions.PublicAccess.MemberIdRuleType))
+            {
+                throw new Exception("Document isn't protected using Simple mechanism. Use GetAccessingMemberGroups instead");
+            }
+
+            var memberIdRule = entry.Rules.First(x => x.RuleType == Constants.Conventions.PublicAccess.MemberIdRuleType);
+            return new member.Member(int.Parse(memberIdRule.RuleValue));
+
+        }
+
+        public static MembershipUser GetAccessingMembershipUser(int documentId)
+        {
+            var content = ApplicationContext.Current.Services.ContentService.GetById(documentId);
+            if (content == null) return null;
+
+            var entry = ApplicationContext.Current.Services.PublicAccessService.GetEntryForContent(content);
+            if (entry == null) return null;
+
+            //legacy would throw an exception here if it was not 'simple' and simple means based on a username
+            if (entry.Rules.All(x => x.RuleType != Constants.Conventions.PublicAccess.MemberUsernameRuleType))
+            {
+                throw new Exception("Document isn't protected using Simple mechanism. Use GetAccessingMemberGroups instead");
+            }
+
+            var provider = MembershipProviderExtensions.GetMembersMembershipProvider();
+            var usernameRule = entry.Rules.First(x => x.RuleType == Constants.Conventions.PublicAccess.MemberUsernameRuleType);
+            return provider.GetUser(usernameRule.RuleValue, false);
+
+        }
+
+
+        [Obsolete("This method is no longer supported. Use the ASP.NET MemberShip methods instead", true)]
+        public static bool HasAccess(int DocumentId, member.Member Member)
+        {
+            var content = ApplicationContext.Current.Services.ContentService.GetById(DocumentId);
+            if (content == null) return true;
+
+            var entry = ApplicationContext.Current.Services.PublicAccessService.GetEntryForContent(content);
+            if (entry == null) return true;
+
+            var memberGroupIds = Member.Groups.Values.Cast<MemberGroup>().Select(x => x.Id.ToString(CultureInfo.InvariantCulture)).ToArray();
+            return entry.Rules.Any(x => x.RuleType == Constants.Conventions.PublicAccess.MemberGroupIdRuleType
+                                        && memberGroupIds.Contains(x.RuleValue));
+
+        }
+
+        [Obsolete("This method has been replaced because of a spelling mistake. Use the HasAccess method instead.", false)]
+        public static bool HasAccces(int documentId, object memberId)
+        {
+            // Call the correctly named version of this method
+            return HasAccess(documentId, memberId);
+        }
+
+        public static bool HasAccess(int documentId, object memberId)
+        {
+            return ApplicationContext.Current.Services.PublicAccessService.HasAccess(
+                documentId,
+                memberId,
+                ApplicationContext.Current.Services.ContentService,
+                MembershipProviderExtensions.GetMembersMembershipProvider(),
+                //TODO: This should really be targeting a specific provider by name!!
+                Roles.Provider);
+        }
+
+        public static bool HasAccess(int documentId, string path, MembershipUser member)
+        {
+            return ApplicationContext.Current.Services.PublicAccessService.HasAccess(
+                 path,
+                 member,
+                //TODO: This should really be targeting a specific provider by name!!
+                 Roles.Provider);
+        }
+
+        public static ProtectionType GetProtectionType(int DocumentId)
+        {
+            var content = ApplicationContext.Current.Services.ContentService.GetById(DocumentId);
+            if (content == null) return ProtectionType.NotProtected;
+
+            var entry = ApplicationContext.Current.Services.PublicAccessService.GetEntryForContent(content);
+            if (entry == null) return ProtectionType.NotProtected;
+
+            //legacy states that if it is protected by a member id then it is 'simple'
+            return entry.Rules.Any(x => x.RuleType == Constants.Conventions.PublicAccess.MemberIdRuleType)
+                ? ProtectionType.Simple
+                : ProtectionType.Advanced;
+
+        }
+
+        public static bool IsProtected(int DocumentId, string Path)
+        {
+            return ApplicationContext.Current.Services.PublicAccessService.IsProtected(Path.EnsureEndsWith("," + DocumentId));
+        }
+
+        //return the protection status of this exact document - not based on inheritance
+        public static bool IsProtected(int DocumentId)
+        {
+            return ApplicationContext.Current.Services.PublicAccessService.IsProtected(DocumentId.ToString());
+        }
+
+        public static int GetErrorPage(string Path)
+        {
+            var entry = ApplicationContext.Current.Services.PublicAccessService.GetEntryForContent(Path);
+            if (entry == null) return -1;
+            var entity = ApplicationContext.Current.Services.EntityService.Get(entry.NoAccessNodeId, UmbracoObjectTypes.Document);
+            return entity.Id;
+
+        }
+
+        public static int GetLoginPage(string Path)
+        {
+            var entry = ApplicationContext.Current.Services.PublicAccessService.GetEntryForContent(Path);
+            if (entry == null) return -1;
+            var entity = ApplicationContext.Current.Services.EntityService.Get(entry.LoginNodeId, UmbracoObjectTypes.Document);
+            return entity.Id;
+
+        }
+        #endregion
+
+
+        //NOTE: This is purely here for backwards compat for events
+        private static void Save()
+        {
+            var e = new SaveEventArgs();
+
+            new Access().FireBeforeSave(e);
+
+            if (e.Cancel) return;
+
+            new Access().FireAfterSave(e);
+        }
+
+
+        //Event delegates
+        public delegate void SaveEventHandler(Access sender, SaveEventArgs e);
+
+        public delegate void AddProtectionEventHandler(Document sender, AddProtectionEventArgs e);
+        public delegate void RemoveProtectionEventHandler(Document sender, RemoveProtectionEventArgs e);
+
+        public delegate void AddMemberShipRoleToDocumentEventHandler(Document sender, string role, AddMemberShipRoleToDocumentEventArgs e);
+        public delegate void RemoveMemberShipRoleFromDocumentEventHandler(Document sender, string role, RemoveMemberShipRoleFromDocumentEventArgs e);
+
+        public delegate void RemoveMemberShipUserFromDocumentEventHandler(Document sender, string MembershipUserName, RemoveMemberShipUserFromDocumentEventArgs e);
+        public delegate void AddMembershipUserToDocumentEventHandler(Document sender, string MembershipUserName, AddMembershipUserToDocumentEventArgs e);
+
+        //Events
+
+        public static event SaveEventHandler BeforeSave;
+        protected virtual void FireBeforeSave(SaveEventArgs e)
+        {
+            if (BeforeSave != null)
+                BeforeSave(this, e);
+        }
+
+        public static event SaveEventHandler AfterSave;
+        protected virtual void FireAfterSave(SaveEventArgs e)
+        {
+            if (AfterSave != null)
+                AfterSave(this, e);
+        }
+
+        public static event AddProtectionEventHandler BeforeAddProtection;
+        protected virtual void FireBeforeAddProtection(Document doc, AddProtectionEventArgs e)
+        {
+            if (BeforeAddProtection != null)
+                BeforeAddProtection(doc, e);
+        }
+
+        public static event AddProtectionEventHandler AfterAddProtection;
+        protected virtual void FireAfterAddProtection(Document doc, AddProtectionEventArgs e)
+        {
+            if (AfterAddProtection != null)
+                AfterAddProtection(doc, e);
+        }
+
+        public static event RemoveProtectionEventHandler BeforeRemoveProtection;
+        protected virtual void FireBeforeRemoveProtection(Document doc, RemoveProtectionEventArgs e)
+        {
+            if (BeforeRemoveProtection != null)
+                BeforeRemoveProtection(doc, e);
+        }
+
+        public static event RemoveProtectionEventHandler AfterRemoveProtection;
+        protected virtual void FireAfterRemoveProtection(Document doc, RemoveProtectionEventArgs e)
+        {
+            if (AfterRemoveProtection != null)
+                AfterRemoveProtection(doc, e);
+        }
+
+        public static event AddMemberShipRoleToDocumentEventHandler BeforeAddMemberShipRoleToDocument;
+        protected virtual void FireBeforeAddMemberShipRoleToDocument(Document doc, string role, AddMemberShipRoleToDocumentEventArgs e)
+        {
+            if (BeforeAddMemberShipRoleToDocument != null)
+                BeforeAddMemberShipRoleToDocument(doc, role, e);
+        }
+
+        public static event AddMemberShipRoleToDocumentEventHandler AfterAddMemberShipRoleToDocument;
+        protected virtual void FireAfterAddMemberShipRoleToDocument(Document doc, string role, AddMemberShipRoleToDocumentEventArgs e)
+        {
+            if (AfterAddMemberShipRoleToDocument != null)
+                AfterAddMemberShipRoleToDocument(doc, role, e);
+        }
+
+        public static event RemoveMemberShipRoleFromDocumentEventHandler BeforeRemoveMemberShipRoleToDocument;
+        protected virtual void FireBeforeRemoveMemberShipRoleFromDocument(Document doc, string role, RemoveMemberShipRoleFromDocumentEventArgs e)
+        {
+            if (BeforeRemoveMemberShipRoleToDocument != null)
+                BeforeRemoveMemberShipRoleToDocument(doc, role, e);
+        }
+
+        public static event RemoveMemberShipRoleFromDocumentEventHandler AfterRemoveMemberShipRoleToDocument;
+        protected virtual void FireAfterRemoveMemberShipRoleFromDocument(Document doc, string role, RemoveMemberShipRoleFromDocumentEventArgs e)
+        {
+            if (AfterRemoveMemberShipRoleToDocument != null)
+                AfterRemoveMemberShipRoleToDocument(doc, role, e);
+        }
+
+        public static event RemoveMemberShipUserFromDocumentEventHandler BeforeRemoveMembershipUserFromDocument;
+        protected virtual void FireBeforeRemoveMembershipUserFromDocument(Document doc, string username, RemoveMemberShipUserFromDocumentEventArgs e)
+        {
+            if (BeforeRemoveMembershipUserFromDocument != null)
+                BeforeRemoveMembershipUserFromDocument(doc, username, e);
+        }
+
+        public static event RemoveMemberShipUserFromDocumentEventHandler AfterRemoveMembershipUserFromDocument;
+        protected virtual void FireAfterRemoveMembershipUserFromDocument(Document doc, string username, RemoveMemberShipUserFromDocumentEventArgs e)
+        {
+            if (AfterRemoveMembershipUserFromDocument != null)
+                AfterRemoveMembershipUserFromDocument(doc, username, e);
+        }
+
+        public static event AddMembershipUserToDocumentEventHandler BeforeAddMembershipUserToDocument;
+        protected virtual void FireBeforeAddMembershipUserToDocument(Document doc, string username, AddMembershipUserToDocumentEventArgs e)
+        {
+            if (BeforeAddMembershipUserToDocument != null)
+                BeforeAddMembershipUserToDocument(doc, username, e);
+        }
+
+        public static event AddMembershipUserToDocumentEventHandler AfterAddMembershipUserToDocument;
+        protected virtual void FireAfterAddMembershipUserToDocument(Document doc, string username, AddMembershipUserToDocumentEventArgs e)
+        {
+            if (AfterAddMembershipUserToDocument != null)
+                AfterAddMembershipUserToDocument(doc, username, e);
+        }
+    }
+
+    public enum ProtectionType
+    {
+        NotProtected,
+        Simple,
+        Advanced
+    }
+}

From 3e74bbfb453188f75e6ace3b28558bb31229ce49 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 25 Jun 2019 14:35:28 +1000
Subject: [PATCH 025/776] Creates a custom IAntiForgeryAdditionalDataProvider
 that provides and validates custom token data in the request which allows
 having a custom AF token per form created with BeginUmbracoForm

---
 ...oAntiForgeryAdditionalDataProviderTests.cs | 157 ++++++++++++++++++
 src/Umbraco.Tests/Umbraco.Tests.csproj        |   1 +
 src/Umbraco.Web/HtmlHelperRenderExtensions.cs |  11 +-
 src/Umbraco.Web/Mvc/RenderRouteHandler.cs     |  35 +---
 ...mbracoAntiForgeryAdditionalDataProvider.cs |  91 ++++++++++
 src/Umbraco.Web/Umbraco.Web.csproj            |   1 +
 src/Umbraco.Web/UmbracoHelper.cs              |  44 ++++-
 src/Umbraco.Web/WebBootManager.cs             |   8 +-
 8 files changed, 309 insertions(+), 39 deletions(-)
 create mode 100644 src/Umbraco.Tests/Security/UmbracoAntiForgeryAdditionalDataProviderTests.cs
 create mode 100644 src/Umbraco.Web/Security/UmbracoAntiForgeryAdditionalDataProvider.cs

diff --git a/src/Umbraco.Tests/Security/UmbracoAntiForgeryAdditionalDataProviderTests.cs b/src/Umbraco.Tests/Security/UmbracoAntiForgeryAdditionalDataProviderTests.cs
new file mode 100644
index 0000000000..c81c108e0d
--- /dev/null
+++ b/src/Umbraco.Tests/Security/UmbracoAntiForgeryAdditionalDataProviderTests.cs
@@ -0,0 +1,157 @@
+using System.Collections.Specialized;
+using System.Web;
+using System.Web.Helpers;
+using Moq;
+using Newtonsoft.Json;
+using NUnit.Framework;
+using Umbraco.Core;
+using Umbraco.Tests.TestHelpers;
+using Umbraco.Web.Mvc;
+using Umbraco.Web.Security;
+
+namespace Umbraco.Tests.Security
+{
+    [TestFixture]
+    public class UmbracoAntiForgeryAdditionalDataProviderTests
+    {
+        [Test]
+        public void Test_Wrapped_Non_BeginUmbracoForm()
+        {
+            var wrapped = Mock.Of<IAntiForgeryAdditionalDataProvider>(x => x.GetAdditionalData(It.IsAny<HttpContextBase>()) == "custom");
+            var provider = new UmbracoAntiForgeryAdditionalDataProvider(wrapped);
+
+            var httpContextFactory = new FakeHttpContextFactory("/hello/world");
+            var data = provider.GetAdditionalData(httpContextFactory.HttpContext);
+
+            Assert.IsTrue(data.DetectIsJson());
+            var json = JsonConvert.DeserializeObject<UmbracoAntiForgeryAdditionalDataProvider.AdditionalData>(data);
+            Assert.AreEqual(null, json.Ufprt);
+            Assert.IsTrue(json.Stamp != default);
+            Assert.AreEqual("custom", json.WrappedValue);
+        }
+
+        [Test]
+        public void Null_Wrapped_Non_BeginUmbracoForm()
+        {
+            var provider = new UmbracoAntiForgeryAdditionalDataProvider(null);
+
+            var httpContextFactory = new FakeHttpContextFactory("/hello/world");
+            var data = provider.GetAdditionalData(httpContextFactory.HttpContext);
+
+            Assert.IsTrue(data.DetectIsJson());
+            var json = JsonConvert.DeserializeObject<UmbracoAntiForgeryAdditionalDataProvider.AdditionalData>(data);
+            Assert.AreEqual(null, json.Ufprt);
+            Assert.IsTrue(json.Stamp != default);
+            Assert.AreEqual("default", json.WrappedValue);
+        }
+
+        [Test]
+        public void Validate_Non_Json()
+        {
+            var provider = new UmbracoAntiForgeryAdditionalDataProvider(null);
+
+            var httpContextFactory = new FakeHttpContextFactory("/hello/world");
+            var isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "hello");
+
+            Assert.IsFalse(isValid);
+        }
+
+        [Test]
+        public void Validate_Invalid_Json()
+        {
+            var provider = new UmbracoAntiForgeryAdditionalDataProvider(null);
+
+            var httpContextFactory = new FakeHttpContextFactory("/hello/world");
+            var isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "{'Stamp': '0'}");
+            Assert.IsFalse(isValid);
+
+            isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "{'Stamp': ''}");
+            Assert.IsFalse(isValid);
+
+            isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "{'hello': 'world'}");
+            Assert.IsFalse(isValid);
+
+        }
+
+        [Test]
+        public void Validate_No_Request_Ufprt()
+        {
+            var provider = new UmbracoAntiForgeryAdditionalDataProvider(null);
+
+            var httpContextFactory = new FakeHttpContextFactory("/hello/world");
+            //there is a ufprt in the additional data, but not in the request
+            var isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "{'Stamp': '636970328040070330', 'WrappedValue': 'default', 'Ufprt': 'ASBVDFDFDFDF'}");
+            Assert.IsFalse(isValid);
+        }
+
+        [Test]
+        public void Validate_No_AdditionalData_Ufprt()
+        {
+            var provider = new UmbracoAntiForgeryAdditionalDataProvider(null);
+
+            var httpContextFactory = new FakeHttpContextFactory("/hello/world");
+            var requestMock = Mock.Get(httpContextFactory.HttpContext.Request);
+            requestMock.SetupGet(x => x["ufprt"]).Returns("ABCDEFG");
+
+            //there is a ufprt in the additional data, but not in the request
+            var isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "{'Stamp': '636970328040070330', 'WrappedValue': 'default', 'Ufprt': ''}");
+            Assert.IsFalse(isValid);
+        }
+
+        [Test]
+        public void Validate_No_AdditionalData_Or_Request_Ufprt()
+        {
+            var provider = new UmbracoAntiForgeryAdditionalDataProvider(null);
+
+            var httpContextFactory = new FakeHttpContextFactory("/hello/world");
+            
+            //there is a ufprt in the additional data, but not in the request
+            var isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "{'Stamp': '636970328040070330', 'WrappedValue': 'default', 'Ufprt': ''}");
+            Assert.IsTrue(isValid);
+        }
+
+        [Test]
+        public void Validate_Request_And_AdditionalData_Ufprt()
+        {
+            var provider = new UmbracoAntiForgeryAdditionalDataProvider(null);
+
+            var routeParams1 = $"{RenderRouteHandler.ReservedAdditionalKeys.Controller}={HttpUtility.UrlEncode("Test")}&{RenderRouteHandler.ReservedAdditionalKeys.Action}={HttpUtility.UrlEncode("Index")}&{RenderRouteHandler.ReservedAdditionalKeys.Area}=Umbraco";
+            var routeParams2 = $"{RenderRouteHandler.ReservedAdditionalKeys.Controller}={HttpUtility.UrlEncode("Test")}&{RenderRouteHandler.ReservedAdditionalKeys.Action}={HttpUtility.UrlEncode("Index")}&{RenderRouteHandler.ReservedAdditionalKeys.Area}=Umbraco";
+
+            var httpContextFactory = new FakeHttpContextFactory("/hello/world");
+            var requestMock = Mock.Get(httpContextFactory.HttpContext.Request);
+            requestMock.SetupGet(x => x["ufprt"]).Returns(routeParams1.EncryptWithMachineKey());
+
+            var isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "{'Stamp': '636970328040070330', 'WrappedValue': 'default', 'Ufprt': '" + routeParams2.EncryptWithMachineKey() + "'}");
+            Assert.IsTrue(isValid);
+
+            routeParams2 = $"{RenderRouteHandler.ReservedAdditionalKeys.Controller}={HttpUtility.UrlEncode("Invalid")}&{RenderRouteHandler.ReservedAdditionalKeys.Action}={HttpUtility.UrlEncode("Index")}&{RenderRouteHandler.ReservedAdditionalKeys.Area}=Umbraco";
+            isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "{'Stamp': '636970328040070330', 'WrappedValue': 'default', 'Ufprt': '" + routeParams2.EncryptWithMachineKey() + "'}");
+            Assert.IsFalse(isValid);
+        }
+
+        [Test]
+        public void Validate_Wrapped_Request_And_AdditionalData_Ufprt()
+        {
+            var wrapped = Mock.Of<IAntiForgeryAdditionalDataProvider>(x => x.ValidateAdditionalData(It.IsAny<HttpContextBase>(), "custom") == true);
+            var provider = new UmbracoAntiForgeryAdditionalDataProvider(wrapped);
+
+            var routeParams1 = $"{RenderRouteHandler.ReservedAdditionalKeys.Controller}={HttpUtility.UrlEncode("Test")}&{RenderRouteHandler.ReservedAdditionalKeys.Action}={HttpUtility.UrlEncode("Index")}&{RenderRouteHandler.ReservedAdditionalKeys.Area}=Umbraco";
+            var routeParams2 = $"{RenderRouteHandler.ReservedAdditionalKeys.Controller}={HttpUtility.UrlEncode("Test")}&{RenderRouteHandler.ReservedAdditionalKeys.Action}={HttpUtility.UrlEncode("Index")}&{RenderRouteHandler.ReservedAdditionalKeys.Area}=Umbraco";
+
+            var httpContextFactory = new FakeHttpContextFactory("/hello/world");
+            var requestMock = Mock.Get(httpContextFactory.HttpContext.Request);
+            requestMock.SetupGet(x => x["ufprt"]).Returns(routeParams1.EncryptWithMachineKey());
+
+            var isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "{'Stamp': '636970328040070330', 'WrappedValue': 'default', 'Ufprt': '" + routeParams2.EncryptWithMachineKey() + "'}");
+            Assert.IsFalse(isValid);
+
+            isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "{'Stamp': '636970328040070330', 'WrappedValue': 'custom', 'Ufprt': '" + routeParams2.EncryptWithMachineKey() + "'}");
+            Assert.IsTrue(isValid);
+
+            routeParams2 = $"{RenderRouteHandler.ReservedAdditionalKeys.Controller}={HttpUtility.UrlEncode("Invalid")}&{RenderRouteHandler.ReservedAdditionalKeys.Action}={HttpUtility.UrlEncode("Index")}&{RenderRouteHandler.ReservedAdditionalKeys.Area}=Umbraco";
+            isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "{'Stamp': '636970328040070330', 'WrappedValue': 'default', 'Ufprt': '" + routeParams2.EncryptWithMachineKey() + "'}");
+            Assert.IsFalse(isValid);
+        }
+    }
+}
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 72939c12d9..7e6fdf4823 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -197,6 +197,7 @@
     <Compile Include="Packaging\PackageExtractionTests.cs" />
     <Compile Include="Persistence\Repositories\SimilarNodeNameTests.cs" />
     <Compile Include="PublishedContent\StronglyTypedModels\Home.cs" />
+    <Compile Include="Security\UmbracoAntiForgeryAdditionalDataProviderTests.cs" />
     <Compile Include="Services\AuditServiceTests.cs" />
     <Compile Include="Services\ConsentServiceTests.cs" />
     <Compile Include="Services\MemberGroupServiceTests.cs" />
diff --git a/src/Umbraco.Web/HtmlHelperRenderExtensions.cs b/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
index 90bc97ca19..a64c00a03c 100644
--- a/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
+++ b/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
@@ -306,14 +306,21 @@ namespace Umbraco.Web
 					return;
 				this._disposed = true;
 
+                //For UmbracoForm's we want to add our routing string to the httpcontext items in the case where anti-forgery tokens are used.
+                //In which case our custom UmbracoAntiForgeryAdditionalDataProvider will kick in and validate the values in the request against
+                //the values that will be appended to the token. This essentially means that when anti-forgery tokens are used with UmbracoForm's forms,
+                //that each token is unique to the controller/action/area instead of the default ASP.Net implementation which is that the token is unique
+                //per user.
+                _viewContext.HttpContext.Items["ufprt"] = _encryptedString;
+
                 //Detect if the call is targeting UmbRegisterController/UmbProfileController/UmbLoginStatusController/UmbLoginController and if it is we automatically output a AntiForgeryToken()
                 // We have a controllerName and area so we can match
                 if (_controllerName == "UmbRegister"
                     || _controllerName == "UmbProfile"
                     || _controllerName == "UmbLoginStatus"
                     || _controllerName == "UmbLogin")
-			    {
-			        _viewContext.Writer.Write(AntiForgery.GetHtml().ToString());
+			    {   
+                    _viewContext.Writer.Write(AntiForgery.GetHtml().ToString());
 			    }
 
                 //write out the hidden surface form routes
diff --git a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
index bacdd2ffa9..0a5cb06247 100644
--- a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
+++ b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
@@ -17,7 +17,7 @@ namespace Umbraco.Web.Mvc
     public class RenderRouteHandler : IRouteHandler
     {
         // Define reserved dictionary keys for controller, action and area specified in route additional values data
-        private static class ReservedAdditionalKeys
+        internal static class ReservedAdditionalKeys
         {
             internal const string Controller = "c";
             internal const string Action = "a";
@@ -142,36 +142,7 @@ namespace Umbraco.Web.Mvc
                     return null;
             }
 
-
-            string decryptedString;
-            try
-            {
-                decryptedString = encodedVal.DecryptWithMachineKey();
-            }
-            catch (FormatException)
-            {
-                LogHelper.Warn<RenderRouteHandler>("A value was detected in the ufprt parameter but Umbraco could not decrypt the string");
-                return null;
-            }
-
-            var parsedQueryString = HttpUtility.ParseQueryString(decryptedString);
-            var decodedParts = new Dictionary<string, string>();
-
-            foreach (var key in parsedQueryString.AllKeys)
-            {
-                decodedParts[key] = parsedQueryString[key];
-            }
-
-            //validate all required keys exist
-
-            //the controller
-            if (decodedParts.All(x => x.Key != ReservedAdditionalKeys.Controller))
-                return null;
-            //the action
-            if (decodedParts.All(x => x.Key != ReservedAdditionalKeys.Action))
-                return null;
-            //the area
-            if (decodedParts.All(x => x.Key != ReservedAdditionalKeys.Area))
+            if (!UmbracoHelper.DecryptAndValidateEncryptedRouteString(encodedVal, out var decodedParts))
                 return null;
 
             foreach (var item in decodedParts.Where(x => new[] {
@@ -192,6 +163,8 @@ namespace Umbraco.Web.Mvc
             };
         }
 
+       
+
         /// <summary>
         /// Handles a posted form to an Umbraco Url and ensures the correct controller is routed to and that
         /// the right DataTokens are set.
diff --git a/src/Umbraco.Web/Security/UmbracoAntiForgeryAdditionalDataProvider.cs b/src/Umbraco.Web/Security/UmbracoAntiForgeryAdditionalDataProvider.cs
new file mode 100644
index 0000000000..660f7e58fc
--- /dev/null
+++ b/src/Umbraco.Web/Security/UmbracoAntiForgeryAdditionalDataProvider.cs
@@ -0,0 +1,91 @@
+using System;
+using Umbraco.Web.Mvc;
+using Umbraco.Core;
+using System.Web.Helpers;
+using System.Web;
+using Newtonsoft.Json;
+
+namespace Umbraco.Web.Security
+{
+    /// <summary>
+    /// A custom <see cref="IAntiForgeryAdditionalDataProvider"/> to create a unique antiforgery token/validator per form created with BeginUmbracoForm
+    /// </summary>
+    public class UmbracoAntiForgeryAdditionalDataProvider : IAntiForgeryAdditionalDataProvider
+    {
+        private readonly IAntiForgeryAdditionalDataProvider _defaultProvider;
+
+        /// <summary>
+        /// Constructor, allows wrapping a default provider
+        /// </summary>
+        /// <param name="defaultProvider"></param>
+        public UmbracoAntiForgeryAdditionalDataProvider(IAntiForgeryAdditionalDataProvider defaultProvider)
+        {
+            _defaultProvider = defaultProvider;
+        }
+
+        public string GetAdditionalData(HttpContextBase context)
+        {
+            return JsonConvert.SerializeObject(new AdditionalData
+            {
+                Stamp = DateTime.UtcNow.Ticks,
+                //this value will be here if this is a BeginUmbracoForms form
+                Ufprt = context.Items["ufprt"]?.ToString(),
+                //if there was a wrapped provider, add it's value to the json, else just a static value
+                WrappedValue = _defaultProvider?.GetAdditionalData(context) ?? "default"
+            });
+        }
+
+        public bool ValidateAdditionalData(HttpContextBase context, string additionalData)
+        {
+            if (!additionalData.DetectIsJson())
+                return false; //must be json
+
+            AdditionalData json;
+            try
+            {
+                json = JsonConvert.DeserializeObject<AdditionalData>(additionalData);
+            }
+            catch
+            {
+                return false; //couldn't parse
+            }
+
+            if (json.Stamp == default) return false;
+
+            //if there was a wrapped provider, validate it, else validate the static value
+            var validateWrapped = _defaultProvider?.ValidateAdditionalData(context, json.WrappedValue) ?? json.WrappedValue == "default";
+            if (!validateWrapped)
+                return false;
+
+            var ufprtRequest = context.Request["ufprt"]?.ToString();
+
+            //if the custom BeginUmbracoForms route value is not there, then it's nothing more to validate
+            if (ufprtRequest.IsNullOrWhiteSpace() && json.Ufprt.IsNullOrWhiteSpace())
+                return true;
+
+            //if one or the other is null then something is wrong
+            if (!ufprtRequest.IsNullOrWhiteSpace() && json.Ufprt.IsNullOrWhiteSpace()) return false;
+            if (ufprtRequest.IsNullOrWhiteSpace() && !json.Ufprt.IsNullOrWhiteSpace()) return false;
+
+            if (!UmbracoHelper.DecryptAndValidateEncryptedRouteString(json.Ufprt, out var additionalDataParts))
+                return false;
+
+            if (!UmbracoHelper.DecryptAndValidateEncryptedRouteString(ufprtRequest, out var requestParts))
+                return false;
+
+            //ensure they all match
+            return additionalDataParts.Count == requestParts.Count
+                && additionalDataParts[RenderRouteHandler.ReservedAdditionalKeys.Controller] == requestParts[RenderRouteHandler.ReservedAdditionalKeys.Controller]
+                && additionalDataParts[RenderRouteHandler.ReservedAdditionalKeys.Action] == requestParts[RenderRouteHandler.ReservedAdditionalKeys.Action]
+                && additionalDataParts[RenderRouteHandler.ReservedAdditionalKeys.Area] == requestParts[RenderRouteHandler.ReservedAdditionalKeys.Area];
+        }
+
+        internal class AdditionalData
+        {
+            public string Ufprt { get; set; }
+            public long Stamp { get; set; }
+            public string WrappedValue { get; set; }
+        }
+
+    }
+}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 90624df5f2..16dc5dfec5 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -307,6 +307,7 @@
     <Compile Include="Cache\TemplateCacheRefresher.cs" />
     <Compile Include="Cache\UnpublishedPageCacheRefresher.cs" />
     <Compile Include="Cache\UserCacheRefresher.cs" />
+    <Compile Include="Security\UmbracoAntiForgeryAdditionalDataProvider.cs" />
     <Compile Include="Editors\PreviewController.cs" />
     <Compile Include="Editors\BackOfficeAssetsController.cs" />
     <Compile Include="Features\DisabledFeatures.cs" />
diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs
index f920314075..c00d37f216 100644
--- a/src/Umbraco.Web/UmbracoHelper.cs
+++ b/src/Umbraco.Web/UmbracoHelper.cs
@@ -10,9 +10,11 @@ using System.Xml.XPath;
 using Umbraco.Core;
 using Umbraco.Core.Dictionary;
 using Umbraco.Core.Dynamics;
+using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Services;
 using Umbraco.Core.Xml;
+using Umbraco.Web.Mvc;
 using Umbraco.Web.Routing;
 using Umbraco.Web.Security;
 
@@ -1647,6 +1649,43 @@ namespace Umbraco.Web
 
         #endregion
 
+        internal static bool DecryptAndValidateEncryptedRouteString(string ufprt, out IDictionary<string, string> parts)
+        {
+            string decryptedString;
+            try
+            {
+                decryptedString = ufprt.DecryptWithMachineKey();
+            }
+            catch (FormatException)
+            {
+                LogHelper.Warn<UmbracoHelper>("A value was detected in the ufprt parameter but Umbraco could not decrypt the string");
+                parts = null;
+                return false;
+            }
+
+            var parsedQueryString = HttpUtility.ParseQueryString(decryptedString);
+            parts = new Dictionary<string, string>();
+
+            foreach (var key in parsedQueryString.AllKeys)
+            {
+                parts[key] = parsedQueryString[key];
+            }
+
+            //validate all required keys exist
+
+            //the controller
+            if (parts.All(x => x.Key != RenderRouteHandler.ReservedAdditionalKeys.Controller))
+                return false;
+            //the action
+            if (parts.All(x => x.Key != RenderRouteHandler.ReservedAdditionalKeys.Action))
+                return false;
+            //the area
+            if (parts.All(x => x.Key != RenderRouteHandler.ReservedAdditionalKeys.Area))
+                return false;
+
+            return true;
+        }
+
         /// <summary>
         /// This is used in methods like BeginUmbracoForm and SurfaceAction to generate an encrypted string which gets submitted in a request for which
         /// Umbraco can decrypt during the routing process in order to delegate the request to a specific MVC Controller.
@@ -1663,10 +1702,7 @@ namespace Umbraco.Web
             Mandate.ParameterNotNull(area, "area");
 
             //need to create a params string as Base64 to put into our hidden field to use during the routes
-            var surfaceRouteParams = string.Format("c={0}&a={1}&ar={2}",
-                                                      HttpUtility.UrlEncode(controllerName),
-                                                      HttpUtility.UrlEncode(controllerAction),
-                                                      area);
+            var surfaceRouteParams = $"{RenderRouteHandler.ReservedAdditionalKeys.Controller}={HttpUtility.UrlEncode(controllerName)}&{RenderRouteHandler.ReservedAdditionalKeys.Action}={HttpUtility.UrlEncode(controllerAction)}&{RenderRouteHandler.ReservedAdditionalKeys.Area}={area}";
 
             //checking if the additional route values is already a dictionary and convert to querystring
             string additionalRouteValsAsQuery;
diff --git a/src/Umbraco.Web/WebBootManager.cs b/src/Umbraco.Web/WebBootManager.cs
index 950676355e..ff6fcff164 100644
--- a/src/Umbraco.Web/WebBootManager.cs
+++ b/src/Umbraco.Web/WebBootManager.cs
@@ -47,10 +47,12 @@ using Umbraco.Web.Profiling;
 using Umbraco.Web.Search;
 using GlobalSettings = Umbraco.Core.Configuration.GlobalSettings;
 using ProfilingViewEngine = Umbraco.Core.Profiling.ProfilingViewEngine;
-
+using System.Web.Helpers;
+using Umbraco.Web.Controllers;
 
 namespace Umbraco.Web
 {
+
     /// <summary>
     /// A bootstrapper for the Umbraco application which initializes all objects including the Web portion of the application
     /// </summary>
@@ -188,6 +190,8 @@ namespace Umbraco.Web
 
             base.Complete(afterComplete);
 
+            AntiForgeryConfig.AdditionalDataProvider = new UmbracoAntiForgeryAdditionalDataProvider(AntiForgeryConfig.AdditionalDataProvider);
+
             //Now, startup all of our legacy startup handler
             ApplicationEventsResolver.Current.InstantiateLegacyStartupHandlers();
 
@@ -281,7 +285,7 @@ namespace Umbraco.Web
                     // to worker A again, in theory the %temp%  folder should already be empty but we really want to make sure that its not
                     // utilizing an old path
                     appDomainHash);
-                
+
                 //set the file map and composite file default location to the %temp% location
                 BaseCompositeFileProcessingProvider.CompositeFilePathDefaultFolder
                     = XmlFileMapper.FileMapDefaultFolder

From 3865f4fb50e559f3441574c3facd66191bbc08ca Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 25 Jun 2019 08:15:06 +0200
Subject: [PATCH 026/776] 
 https://umbraco.visualstudio.com/D-Team%20Tracker/_workitems/edit/1479 -
 bugfix - wrong constant used

---
 .../Persistence/Migrations/Initial/BaseDataCreation.cs          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs b/src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs
index e1716947e1..7d3b15e48b 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs
+++ b/src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs
@@ -131,7 +131,7 @@ namespace Umbraco.Core.Persistence.Migrations.Initial
             _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -37, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-37", SortOrder = 2, UniqueId = Constants.DataTypes.ApprovedColorGuid, Text = "Approved Color", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
             _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -36, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-36", SortOrder = 2, UniqueId = Constants.DataTypes.DatePickerWithTimeGuid, Text = "Date Picker with time", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
             _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = Constants.System.DefaultContentListViewDataTypeId, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-95", SortOrder = 2, UniqueId = Constants.DataTypes.ListViewContentGuid, Text = Constants.Conventions.DataTypes.ListViewPrefix + "Content", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
-            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = Constants.System.DefaultMediaListViewDataTypeId, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-96", SortOrder = 2, UniqueId = Constants.DataTypes.ListViewMembersGuid, Text = Constants.Conventions.DataTypes.ListViewPrefix + "Media", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
+            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = Constants.System.DefaultMediaListViewDataTypeId, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-96", SortOrder = 2, UniqueId = Constants.DataTypes.ListViewMediaGuid, Text = Constants.Conventions.DataTypes.ListViewPrefix + "Media", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
             _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = Constants.System.DefaultMembersListViewDataTypeId, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-97", SortOrder = 2, UniqueId = Constants.DataTypes.ListViewMembersGuid, Text = Constants.Conventions.DataTypes.ListViewPrefix + "Members", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
             _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1031, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1031", SortOrder = 2, UniqueId = new Guid("f38bd2d7-65d0-48e6-95dc-87ce06ec2d3d"), Text = Constants.Conventions.MediaTypes.Folder, NodeObjectType = new Guid(Constants.ObjectTypes.MediaType), CreateDate = DateTime.Now });
             _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1032, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1032", SortOrder = 2, UniqueId = new Guid("cc07b313-0843-4aa8-bbda-871c8da728c8"), Text = Constants.Conventions.MediaTypes.Image, NodeObjectType = new Guid(Constants.ObjectTypes.MediaType), CreateDate = DateTime.Now });

From 383a8617cebefb77d7d9e74cfc98d152f6bea78b Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 25 Jun 2019 08:19:50 +0200
Subject: [PATCH 027/776] 
 https://umbraco.visualstudio.com/D-Team%20Tracker/_workitems/edit/1479 -
 Fixed test

---
 .../Services/EntityServiceTests.cs            | 1308 ++++++++---------
 1 file changed, 651 insertions(+), 657 deletions(-)

diff --git a/src/Umbraco.Tests/Services/EntityServiceTests.cs b/src/Umbraco.Tests/Services/EntityServiceTests.cs
index 8867282155..889d7e5e76 100644
--- a/src/Umbraco.Tests/Services/EntityServiceTests.cs
+++ b/src/Umbraco.Tests/Services/EntityServiceTests.cs
@@ -1,659 +1,653 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using NUnit.Framework;
-using Umbraco.Core;
-using Umbraco.Core.Models;
-using Umbraco.Tests.TestHelpers;
-using Umbraco.Tests.TestHelpers.Entities;
-
-namespace Umbraco.Tests.Services
-{
-    /// <summary>
-    /// Tests covering the EntityService
-    /// </summary>
-    [DatabaseTestBehavior(DatabaseBehavior.NewDbFileAndSchemaPerFixture)]
-    [TestFixture, RequiresSTA]
-    public class EntityServiceTests : BaseServiceTest
-    {
-        [SetUp]
-        public override void Initialize()
-        {
-            base.Initialize();
-        }
-
-        [TearDown]
-        public override void TearDown()
-        {
-            base.TearDown();
-        }
-
-        [Test]
-        public void EntityService_Can_Get_Paged_Content_Children()
-        {
-
-            var contentType = ServiceContext.ContentTypeService.GetContentType("umbTextpage");
-
-            var root = MockedContent.CreateSimpleContent(contentType);
-            ServiceContext.ContentService.Save(root);
-            for (int i = 0; i < 10; i++)
-            {
-                var c1 = MockedContent.CreateSimpleContent(contentType, Guid.NewGuid().ToString(), root);
-                ServiceContext.ContentService.Save(c1);
-            }
-
-            var service = ServiceContext.EntityService;
-
-            long total;
-            var entities = service.GetPagedChildren(root.Id, UmbracoObjectTypes.Document, 0, 6, out total).ToArray();
-            Assert.That(entities.Length, Is.EqualTo(6));
-            Assert.That(total, Is.EqualTo(10));
-            entities = service.GetPagedChildren(root.Id, UmbracoObjectTypes.Document, 1, 6, out total).ToArray();
-            Assert.That(entities.Length, Is.EqualTo(4));
-            Assert.That(total, Is.EqualTo(10));
-        }
-
-        [Test]
-        public void EntityService_Can_Get_Paged_Content_Descendants()
-        {
-            var contentType = ServiceContext.ContentTypeService.GetContentType("umbTextpage");
-
-            var root = MockedContent.CreateSimpleContent(contentType);
-            ServiceContext.ContentService.Save(root);
-            var count = 0;
-            for (int i = 0; i < 10; i++)
-            {
-                var c1 = MockedContent.CreateSimpleContent(contentType, Guid.NewGuid().ToString(), root);
-                ServiceContext.ContentService.Save(c1);
-                count++;
-
-                for (int j = 0; j < 5; j++)
-                {
-                    var c2 = MockedContent.CreateSimpleContent(contentType, Guid.NewGuid().ToString(), c1);
-                    ServiceContext.ContentService.Save(c2);
-                    count++;
-                }
-            }
-
-            var service = ServiceContext.EntityService;
-
-            long total;
-            var entities = service.GetPagedDescendants(root.Id, UmbracoObjectTypes.Document, 0, 31, out total).ToArray();
-            Assert.That(entities.Length, Is.EqualTo(31));
-            Assert.That(total, Is.EqualTo(60));
-            entities = service.GetPagedDescendants(root.Id, UmbracoObjectTypes.Document, 1, 31, out total).ToArray();
-            Assert.That(entities.Length, Is.EqualTo(29));
-            Assert.That(total, Is.EqualTo(60));
-        }
-
-        [Test]
-        public void EntityService_Can_Get_Paged_Content_Descendants_Including_Recycled()
-        {
-            var contentType = ServiceContext.ContentTypeService.GetContentType("umbTextpage");
-
-            var root = MockedContent.CreateSimpleContent(contentType);
-            ServiceContext.ContentService.Save(root);
-            var toDelete = new List<IContent>();
-            for (int i = 0; i < 10; i++)
-            {
-                var c1 = MockedContent.CreateSimpleContent(contentType, Guid.NewGuid().ToString(), root);
-                ServiceContext.ContentService.Save(c1);
-
-                if (i % 2 == 0)
-                {
-                    toDelete.Add(c1);
-                }
-
-                for (int j = 0; j < 5; j++)
-                {
-                    var c2 = MockedContent.CreateSimpleContent(contentType, Guid.NewGuid().ToString(), c1);
-                    ServiceContext.ContentService.Save(c2);
-                }
-            }
-
-            foreach (var content in toDelete)
-            {
-                ServiceContext.ContentService.MoveToRecycleBin(content);
-            }
-
-            var service = ServiceContext.EntityService;
-
-            long total;
-            //search at root to see if it returns recycled
-            var entities = service.GetPagedDescendants(-1, UmbracoObjectTypes.Document, 0, 1000, out total)
-                .Select(x => x.Id)
-                .ToArray();
-
-            foreach (var c in toDelete)
-            {
-                Assert.True(entities.Contains(c.Id));
-            }
-        }
-
-        [Test]
-        public void EntityService_Can_Get_Paged_Content_Descendants_Without_Recycled()
-        {
-            var contentType = ServiceContext.ContentTypeService.GetContentType("umbTextpage");
-
-            var root = MockedContent.CreateSimpleContent(contentType);
-            ServiceContext.ContentService.Save(root);
-            var toDelete = new List<IContent>();
-            for (int i = 0; i < 10; i++)
-            {
-                var c1 = MockedContent.CreateSimpleContent(contentType, Guid.NewGuid().ToString(), root);
-                ServiceContext.ContentService.Save(c1);
-
-                if (i % 2 == 0)
-                {
-                    toDelete.Add(c1);
-                }
-
-                for (int j = 0; j < 5; j++)
-                {
-                    var c2 = MockedContent.CreateSimpleContent(contentType, Guid.NewGuid().ToString(), c1);
-                    ServiceContext.ContentService.Save(c2);
-                }
-            }
-
-            foreach (var content in toDelete)
-            {
-                ServiceContext.ContentService.MoveToRecycleBin(content);
-            }
-
-            var service = ServiceContext.EntityService;
-
-            long total;
-            //search at root to see if it returns recycled
-            var entities = service.GetPagedDescendantsFromRoot(UmbracoObjectTypes.Document, 0, 1000, out total, includeTrashed:false)
-                .Select(x => x.Id)
-                .ToArray();
-
-            foreach (var c in toDelete)
-            {
-                Assert.IsFalse(entities.Contains(c.Id));
-            }
-        }
-
-        [Test]
-        public void EntityService_Can_Get_Paged_Content_Descendants_With_Search()
-        {
-            var contentType = ServiceContext.ContentTypeService.GetContentType("umbTextpage");
-
-            var root = MockedContent.CreateSimpleContent(contentType);
-            ServiceContext.ContentService.Save(root);
-
-            for (int i = 0; i < 10; i++)
-            {
-                var c1 = MockedContent.CreateSimpleContent(contentType, "ssss" + Guid.NewGuid(), root);
-                ServiceContext.ContentService.Save(c1);
-
-                for (int j = 0; j < 5; j++)
-                {
-                    var c2 = MockedContent.CreateSimpleContent(contentType, "tttt" + Guid.NewGuid(), c1);
-                    ServiceContext.ContentService.Save(c2);
-                }
-            }
-
-            var service = ServiceContext.EntityService;
-
-            long total;
-            var entities = service.GetPagedDescendants(root.Id, UmbracoObjectTypes.Document, 0, 10, out total, filter: "ssss").ToArray();
-            Assert.That(entities.Length, Is.EqualTo(10));
-            Assert.That(total, Is.EqualTo(10));
-            entities = service.GetPagedDescendants(root.Id, UmbracoObjectTypes.Document, 0, 50, out total, filter: "tttt").ToArray();
-            Assert.That(entities.Length, Is.EqualTo(50));
-            Assert.That(total, Is.EqualTo(50));
-        }
-
-        [Test]
-        public void EntityService_Can_Get_Paged_Media_Children()
-        {
-            var folderType = ServiceContext.ContentTypeService.GetMediaType(1031);
-            var imageMediaType = ServiceContext.ContentTypeService.GetMediaType(1032);
-
-            var root = MockedMedia.CreateMediaFolder(folderType, -1);
-            ServiceContext.MediaService.Save(root);
-            for (int i = 0; i < 10; i++)
-            {
-                var c1 = MockedMedia.CreateMediaImage(imageMediaType, root.Id);
-                ServiceContext.MediaService.Save(c1);
-            }
-
-            var service = ServiceContext.EntityService;
-
-            long total;
-            var entities = service.GetPagedChildren(root.Id, UmbracoObjectTypes.Media, 0, 6, out total).ToArray();
-            Assert.That(entities.Length, Is.EqualTo(6));
-            Assert.That(total, Is.EqualTo(10));
-            entities = service.GetPagedChildren(root.Id, UmbracoObjectTypes.Media, 1, 6, out total).ToArray();
-            Assert.That(entities.Length, Is.EqualTo(4));
-            Assert.That(total, Is.EqualTo(10));
-        }
-
-        [Test]
-        public void EntityService_Can_Get_Paged_Media_Descendants()
-        {
-            var folderType = ServiceContext.ContentTypeService.GetMediaType(1031);
-            var imageMediaType = ServiceContext.ContentTypeService.GetMediaType(1032);
-
-            var root = MockedMedia.CreateMediaFolder(folderType, -1);
-            ServiceContext.MediaService.Save(root);
-            var count = 0;
-            for (int i = 0; i < 10; i++)
-            {
-                var c1 = MockedMedia.CreateMediaImage(imageMediaType, root.Id);
-                ServiceContext.MediaService.Save(c1);
-                count++;
-
-                for (int j = 0; j < 5; j++)
-                {
-                    var c2 = MockedMedia.CreateMediaImage(imageMediaType, c1.Id);
-                    ServiceContext.MediaService.Save(c2);
-                    count++;
-                }
-            }
-
-            var service = ServiceContext.EntityService;
-
-            long total;
-            var entities = service.GetPagedDescendants(root.Id, UmbracoObjectTypes.Media, 0, 31, out total).ToArray();
-            Assert.That(entities.Length, Is.EqualTo(31));
-            Assert.That(total, Is.EqualTo(60));
-            entities = service.GetPagedDescendants(root.Id, UmbracoObjectTypes.Media, 1, 31, out total).ToArray();
-            Assert.That(entities.Length, Is.EqualTo(29));
-            Assert.That(total, Is.EqualTo(60));
-        }
-
-        [Test]
-        public void EntityService_Can_Get_Paged_Media_Descendants_Including_Recycled()
-        {
-            var folderType = ServiceContext.ContentTypeService.GetMediaType(1031);
-            var imageMediaType = ServiceContext.ContentTypeService.GetMediaType(1032);
-
-            var root = MockedMedia.CreateMediaFolder(folderType, -1);
-            ServiceContext.MediaService.Save(root);
-            var toDelete = new List<IMedia>();
-            for (int i = 0; i < 10; i++)
-            {
-                var c1 = MockedMedia.CreateMediaImage(imageMediaType, root.Id);
-                ServiceContext.MediaService.Save(c1);
-
-                if (i % 2 == 0)
-                {
-                    toDelete.Add(c1);
-                }
-
-                for (int j = 0; j < 5; j++)
-                {
-                    var c2 = MockedMedia.CreateMediaImage(imageMediaType, c1.Id);
-                    ServiceContext.MediaService.Save(c2);
-                }
-            }
-
-            foreach (var content in toDelete)
-            {
-                ServiceContext.MediaService.MoveToRecycleBin(content);
-            }
-
-            var service = ServiceContext.EntityService;
-
-            long total;
-            //search at root to see if it returns recycled
-            var entities = service.GetPagedDescendants(-1, UmbracoObjectTypes.Media, 0, 1000, out total)
-                .Select(x => x.Id)
-                .ToArray();
-
-            foreach (var media in toDelete)
-            {
-                Assert.IsTrue(entities.Contains(media.Id));
-            }
-        }
-
-        [Test]
-        public void EntityService_Can_Get_Paged_Media_Descendants_Without_Recycled()
-        {
-            var folderType = ServiceContext.ContentTypeService.GetMediaType(1031);
-            var imageMediaType = ServiceContext.ContentTypeService.GetMediaType(1032);
-
-            var root = MockedMedia.CreateMediaFolder(folderType, -1);
-            ServiceContext.MediaService.Save(root);
-            var toDelete = new List<IMedia>();
-            for (int i = 0; i < 10; i++)
-            {
-                var c1 = MockedMedia.CreateMediaImage(imageMediaType, root.Id);
-                ServiceContext.MediaService.Save(c1);
-
-                if (i % 2 == 0)
-                {
-                    toDelete.Add(c1);
-                }
-
-                for (int j = 0; j < 5; j++)
-                {
-                    var c2 = MockedMedia.CreateMediaImage(imageMediaType, c1.Id);
-                    ServiceContext.MediaService.Save(c2);
-                }
-            }
-
-            foreach (var content in toDelete)
-            {
-                ServiceContext.MediaService.MoveToRecycleBin(content);
-            }
-
-            var service = ServiceContext.EntityService;
-
-            long total;
-            //search at root to see if it returns recycled
-            var entities = service.GetPagedDescendantsFromRoot(UmbracoObjectTypes.Media, 0, 1000, out total, includeTrashed:false)
-                .Select(x => x.Id)
-                .ToArray();
-
-            foreach (var media in toDelete)
-            {
-                Assert.IsFalse(entities.Contains(media.Id));
-            }
-        }
-
-        [Test]
-        public void EntityService_Can_Get_Paged_Media_Descendants_With_Search()
-        {
-            var folderType = ServiceContext.ContentTypeService.GetMediaType(1031);
-            var imageMediaType = ServiceContext.ContentTypeService.GetMediaType(1032);
-
-            var root = MockedMedia.CreateMediaFolder(folderType, -1);
-            ServiceContext.MediaService.Save(root);
-
-            for (int i = 0; i < 10; i++)
-            {
-                var c1 = MockedMedia.CreateMediaImage(imageMediaType, root.Id);
-                c1.Name = "ssss" + Guid.NewGuid();
-                ServiceContext.MediaService.Save(c1);
-
-                for (int j = 0; j < 5; j++)
-                {
-                    var c2 = MockedMedia.CreateMediaImage(imageMediaType, c1.Id);
-                    c2.Name = "tttt" + Guid.NewGuid();
-                    ServiceContext.MediaService.Save(c2);
-                }
-            }
-
-            var service = ServiceContext.EntityService;
-
-            long total;
-            var entities = service.GetPagedDescendants(root.Id, UmbracoObjectTypes.Media, 0, 10, out total, filter: "ssss").ToArray();
-            Assert.That(entities.Length, Is.EqualTo(10));
-            Assert.That(total, Is.EqualTo(10));
-            entities = service.GetPagedDescendants(root.Id, UmbracoObjectTypes.Media, 0, 50, out total, filter: "tttt").ToArray();
-            Assert.That(entities.Length, Is.EqualTo(50));
-            Assert.That(total, Is.EqualTo(50));
-        }
-
-        [Test]
-        public void EntityService_Can_Find_All_Content_By_UmbracoObjectTypes()
-        {
-            var service = ServiceContext.EntityService;
-
-            var entities = service.GetAll(UmbracoObjectTypes.Document).ToArray();
-
-            Assert.That(entities.Any(), Is.True);
-            Assert.That(entities.Count(), Is.EqualTo(4));
-            Assert.That(entities.Any(x => x.Trashed), Is.True);
-        }
-
-        [Test]
-        public void EntityService_Can_Find_All_Content_By_UmbracoObjectType_Id()
-        {
-            var service = ServiceContext.EntityService;
-
-            var objectTypeId = new Guid(Constants.ObjectTypes.Document);
-            var entities = service.GetAll(objectTypeId).ToArray();
-
-            Assert.That(entities.Any(), Is.True);
-            Assert.That(entities.Count(), Is.EqualTo(4));
-            Assert.That(entities.Any(x => x.Trashed), Is.True);
-        }
-
-        [Test]
-        public void EntityService_Can_Find_All_Content_By_Type()
-        {
-            var service = ServiceContext.EntityService;
-
-            var entities = service.GetAll<IContent>().ToArray();
-
-            Assert.That(entities.Any(), Is.True);
-            Assert.That(entities.Count(), Is.EqualTo(4));
-            Assert.That(entities.Any(x => x.Trashed), Is.True);
-        }
-
-        [Test]
-        public void EntityService_Can_Get_Child_Content_By_ParentId_And_UmbracoObjectType()
-        {
-            var service = ServiceContext.EntityService;
-
-            var entities = service.GetChildren(-1, UmbracoObjectTypes.Document).ToArray();
-
-            Assert.That(entities.Any(), Is.True);
-            Assert.That(entities.Count(), Is.EqualTo(1));
-            Assert.That(entities.Any(x => x.Trashed), Is.False);
-        }
-
-        [Test]
-        public void EntityService_Can_Get_Children_By_ParentId()
-        {
-            var service = ServiceContext.EntityService;
-
-            var entities = service.GetChildren(folderId);
-
-            Assert.That(entities.Any(), Is.True);
-            Assert.That(entities.Count(), Is.EqualTo(3));
-            Assert.That(entities.Any(x => x.Trashed), Is.False);
-        }
-
-        [Test]
-        public void EntityService_Can_Get_Descendants_By_ParentId()
-        {
-            var service = ServiceContext.EntityService;
-
-            var entities = service.GetDescendents(folderId);
-
-            Assert.That(entities.Any(), Is.True);
-            Assert.That(entities.Count(), Is.EqualTo(4));
-            Assert.That(entities.Any(x => x.Trashed), Is.False);
-        }
-
-        [Test]
-        public void EntityService_Throws_When_Getting_All_With_Invalid_Type()
-        {
-            var service = ServiceContext.EntityService;
-            var objectTypeId = new Guid(Constants.ObjectTypes.ContentItem);
-
-            Assert.Throws<NotSupportedException>(() => service.GetAll<IContentBase>());
-            Assert.Throws<NullReferenceException>(() => service.GetAll(UmbracoObjectTypes.ContentItem));
-            Assert.Throws<NullReferenceException>(() => service.GetAll(objectTypeId));
-        }
-
-        [Test]
-        public void EntityService_Can_Find_All_ContentTypes_By_UmbracoObjectTypes()
-        {
-            var service = ServiceContext.EntityService;
-
-            var entities = service.GetAll(UmbracoObjectTypes.DocumentType).ToArray();
-
-            Assert.That(entities.Any(), Is.True);
-            Assert.That(entities.Count(), Is.EqualTo(1));
-        }
-
-        [Test]
-        public void EntityService_Can_Find_All_ContentTypes_By_UmbracoObjectType_Id()
-        {
-            var service = ServiceContext.EntityService;
-
-            var objectTypeId = new Guid(Constants.ObjectTypes.DocumentType);
-            var entities = service.GetAll(objectTypeId).ToArray();
-
-            Assert.That(entities.Any(), Is.True);
-            Assert.That(entities.Count(), Is.EqualTo(1));
-        }
-
-        [Test]
-        public void EntityService_Can_Find_All_ContentTypes_By_Type()
-        {
-            var service = ServiceContext.EntityService;
-
-            var entities = service.GetAll<IContentType>().ToArray();
-
-            Assert.That(entities.Any(), Is.True);
-            Assert.That(entities.Count(), Is.EqualTo(1));
-        }
-
-        [Test]
-        public void EntityService_Can_Find_All_Media_By_UmbracoObjectTypes()
-        {
-            var service = ServiceContext.EntityService;
-
-            var entities = service.GetAll(UmbracoObjectTypes.Media).ToArray();
-
-            Assert.That(entities.Any(), Is.True);
-            Assert.That(entities.Count(), Is.EqualTo(5));
-
-            Assert.That(
-                entities.Any(
-                    x =>
-                    x.AdditionalData.Any(y => y.Value is UmbracoEntity.EntityProperty
-                        && ((UmbracoEntity.EntityProperty)y.Value).PropertyEditorAlias == Constants.PropertyEditors.UploadFieldAlias)), Is.True);
-        }
-
-        [Test]
-        public void EntityService_Can_Get_ObjectType()
-        {
-            var service = ServiceContext.EntityService;
-            var mediaObjectType = service.GetObjectType(1031);
-
-            Assert.NotNull(mediaObjectType);
-            Assert.AreEqual(mediaObjectType, UmbracoObjectTypes.MediaType);
-        }
-
-        [Test]
-        public void EntityService_Can_Get_Key_For_Id_With_Unknown_Type()
-        {
-            var service = ServiceContext.EntityService;
-            var result = service.GetKeyForId(1060, UmbracoObjectTypes.Unknown);
-
-            Assert.IsTrue(result.Success);
-            Assert.AreEqual(Guid.Parse("1D3A8E6E-2EA9-4CC1-B229-1AEE19821522"), result.Result);
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using Umbraco.Core;
+using Umbraco.Core.Models;
+using Umbraco.Tests.TestHelpers;
+using Umbraco.Tests.TestHelpers.Entities;
+
+namespace Umbraco.Tests.Services
+{
+    /// <summary>
+    /// Tests covering the EntityService
+    /// </summary>
+    [DatabaseTestBehavior(DatabaseBehavior.NewDbFileAndSchemaPerFixture)]
+    [TestFixture, RequiresSTA]
+    public class EntityServiceTests : BaseServiceTest
+    {
+        [SetUp]
+        public override void Initialize()
+        {
+            base.Initialize();
         }
-
-        [Test]
-        public void EntityService_Can_Get_Key_For_Id()
-        {
-            var service = ServiceContext.EntityService;
-            var result = service.GetKeyForId(1060, UmbracoObjectTypes.DocumentType);
-
-            Assert.IsTrue(result.Success);
-            Assert.AreEqual(Guid.Parse("1D3A8E6E-2EA9-4CC1-B229-1AEE19821522"), result.Result);
-        }
-
-        [Test]
-        public void EntityService_Cannot_Get_Key_For_Id_With_Incorrect_Object_Type()
-        {
-            var service = ServiceContext.EntityService;
-            var result1 = service.GetKeyForId(1060, UmbracoObjectTypes.DocumentType);
-            var result2 = service.GetKeyForId(1060, UmbracoObjectTypes.MediaType);
-
-            Assert.IsTrue(result1.Success);
-            Assert.IsFalse(result2.Success);
-        }
-
-        [Test]
-        public void EntityService_Can_Get_Id_For_Key_With_Unknown_Type()
-        {
-            var service = ServiceContext.EntityService;
-            var result = service.GetIdForKey(Guid.Parse("1D3A8E6E-2EA9-4CC1-B229-1AEE19821522"), UmbracoObjectTypes.Unknown);
-
-            Assert.IsTrue(result.Success);
-            Assert.AreEqual(1060, result.Result);
+
+        [TearDown]
+        public override void TearDown()
+        {
+            base.TearDown();
         }
-
-        [Test]
-        public void EntityService_Can_Get_Id_For_Key()
-        {
-            var service = ServiceContext.EntityService;
-            var result = service.GetIdForKey(Guid.Parse("1D3A8E6E-2EA9-4CC1-B229-1AEE19821522"), UmbracoObjectTypes.DocumentType);
-
-            Assert.IsTrue(result.Success);
-            Assert.AreEqual(1060, result.Result);
-        }
-
-        [Test]
-        public void EntityService_Cannot_Get_Id_For_Key_With_Incorrect_Object_Type()
-        {
-            var service = ServiceContext.EntityService;
-            var result1 = service.GetIdForKey(Guid.Parse("1D3A8E6E-2EA9-4CC1-B229-1AEE19821522"), UmbracoObjectTypes.DocumentType);
-            var result2 = service.GetIdForKey(Guid.Parse("1D3A8E6E-2EA9-4CC1-B229-1AEE19821522"), UmbracoObjectTypes.MediaType);
-
-            Assert.IsTrue(result1.Success);
-            Assert.IsFalse(result2.Success);
-        }
-
-        [Test]
-        public void ReserveId()
-        {
-            var service = ServiceContext.EntityService;
-            var guid = Guid.NewGuid();
-
-            // can reserve
-            var reservedId = service.ReserveId(guid);
-            Assert.IsTrue(reservedId > 0);
-
-            // can get it back
-            var id = service.GetIdForKey(guid, UmbracoObjectTypes.DocumentType);
-            Assert.IsTrue(id.Success);
-            Assert.AreEqual(reservedId, id.Result);
-
-            // anything goes
-            id = service.GetIdForKey(guid, UmbracoObjectTypes.Media);
-            Assert.IsTrue(id.Success);
-            Assert.AreEqual(reservedId, id.Result);
-
-            // a random guid won't work
-            Assert.IsFalse(service.GetIdForKey(Guid.NewGuid(), UmbracoObjectTypes.DocumentType).Success);
-        }
-
-        private static bool _isSetup = false;
-
-        private int folderId;
-
-        public override void CreateTestData()
-        {
-            if (_isSetup == false)
-            {
-                _isSetup = true;
-
-                base.CreateTestData();
-
-                //Create and Save folder-Media -> 1050
-                var folderMediaType = ServiceContext.ContentTypeService.GetMediaType(1031);
-                var folder = MockedMedia.CreateMediaFolder(folderMediaType, -1);
-                ServiceContext.MediaService.Save(folder, 0);
-                folderId = folder.Id;
-
-                //Create and Save image-Media -> 1051
-                var imageMediaType = ServiceContext.ContentTypeService.GetMediaType(1032);
-                var image = MockedMedia.CreateMediaImage(imageMediaType, folder.Id);
-                ServiceContext.MediaService.Save(image, 0);
-
-                //Create and Save file-Media -> 1052
-                var fileMediaType = ServiceContext.ContentTypeService.GetMediaType(1033);
-                var file = MockedMedia.CreateMediaFile(fileMediaType, folder.Id);
-                ServiceContext.MediaService.Save(file, 0);
-
-                var subfolder = MockedMedia.CreateMediaFolder(folderMediaType, folder.Id);
-                ServiceContext.MediaService.Save(subfolder, 0);
-                var subfolder2 = MockedMedia.CreateMediaFolder(folderMediaType, subfolder.Id);
-                ServiceContext.MediaService.Save(subfolder2, 0);
-
-            }
-
-        }
-    }
-}
\ No newline at end of file
+
+        [Test]
+        public void EntityService_Can_Get_Paged_Content_Children()
+        {
+
+            var contentType = ServiceContext.ContentTypeService.GetContentType("umbTextpage");
+
+            var root = MockedContent.CreateSimpleContent(contentType);
+            ServiceContext.ContentService.Save(root);
+            for (int i = 0; i < 10; i++)
+            {
+                var c1 = MockedContent.CreateSimpleContent(contentType, Guid.NewGuid().ToString(), root);
+                ServiceContext.ContentService.Save(c1);
+            }
+
+            var service = ServiceContext.EntityService;
+
+            long total;
+            var entities = service.GetPagedChildren(root.Id, UmbracoObjectTypes.Document, 0, 6, out total).ToArray();
+            Assert.That(entities.Length, Is.EqualTo(6));
+            Assert.That(total, Is.EqualTo(10));
+            entities = service.GetPagedChildren(root.Id, UmbracoObjectTypes.Document, 1, 6, out total).ToArray();
+            Assert.That(entities.Length, Is.EqualTo(4));
+            Assert.That(total, Is.EqualTo(10));
+        }
+
+        [Test]
+        public void EntityService_Can_Get_Paged_Content_Descendants()
+        {
+            var contentType = ServiceContext.ContentTypeService.GetContentType("umbTextpage");
+
+            var root = MockedContent.CreateSimpleContent(contentType);
+            ServiceContext.ContentService.Save(root);
+            var count = 0;
+            for (int i = 0; i < 10; i++)
+            {
+                var c1 = MockedContent.CreateSimpleContent(contentType, Guid.NewGuid().ToString(), root);
+                ServiceContext.ContentService.Save(c1);
+                count++;
+
+                for (int j = 0; j < 5; j++)
+                {
+                    var c2 = MockedContent.CreateSimpleContent(contentType, Guid.NewGuid().ToString(), c1);
+                    ServiceContext.ContentService.Save(c2);
+                    count++;
+                }
+            }
+
+            var service = ServiceContext.EntityService;
+
+            long total;
+            var entities = service.GetPagedDescendants(root.Id, UmbracoObjectTypes.Document, 0, 31, out total).ToArray();
+            Assert.That(entities.Length, Is.EqualTo(31));
+            Assert.That(total, Is.EqualTo(60));
+            entities = service.GetPagedDescendants(root.Id, UmbracoObjectTypes.Document, 1, 31, out total).ToArray();
+            Assert.That(entities.Length, Is.EqualTo(29));
+            Assert.That(total, Is.EqualTo(60));
+        }
+
+        [Test]
+        public void EntityService_Can_Get_Paged_Content_Descendants_Including_Recycled()
+        {
+            var contentType = ServiceContext.ContentTypeService.GetContentType("umbTextpage");
+
+            var root = MockedContent.CreateSimpleContent(contentType);
+            ServiceContext.ContentService.Save(root);
+            var toDelete = new List<IContent>();
+            for (int i = 0; i < 10; i++)
+            {
+                var c1 = MockedContent.CreateSimpleContent(contentType, Guid.NewGuid().ToString(), root);
+                ServiceContext.ContentService.Save(c1);
+
+                if (i % 2 == 0)
+                {
+                    toDelete.Add(c1);
+                }
+
+                for (int j = 0; j < 5; j++)
+                {
+                    var c2 = MockedContent.CreateSimpleContent(contentType, Guid.NewGuid().ToString(), c1);
+                    ServiceContext.ContentService.Save(c2);
+                }
+            }
+
+            foreach (var content in toDelete)
+            {
+                ServiceContext.ContentService.MoveToRecycleBin(content);
+            }
+
+            var service = ServiceContext.EntityService;
+
+            long total;
+            //search at root to see if it returns recycled
+            var entities = service.GetPagedDescendants(-1, UmbracoObjectTypes.Document, 0, 1000, out total)
+                .Select(x => x.Id)
+                .ToArray();
+
+            foreach (var c in toDelete)
+            {
+                Assert.True(entities.Contains(c.Id));
+            }
+        }
+
+        [Test]
+        public void EntityService_Can_Get_Paged_Content_Descendants_Without_Recycled()
+        {
+            var contentType = ServiceContext.ContentTypeService.GetContentType("umbTextpage");
+
+            var root = MockedContent.CreateSimpleContent(contentType);
+            ServiceContext.ContentService.Save(root);
+            var toDelete = new List<IContent>();
+            for (int i = 0; i < 10; i++)
+            {
+                var c1 = MockedContent.CreateSimpleContent(contentType, Guid.NewGuid().ToString(), root);
+                ServiceContext.ContentService.Save(c1);
+
+                if (i % 2 == 0)
+                {
+                    toDelete.Add(c1);
+                }
+
+                for (int j = 0; j < 5; j++)
+                {
+                    var c2 = MockedContent.CreateSimpleContent(contentType, Guid.NewGuid().ToString(), c1);
+                    ServiceContext.ContentService.Save(c2);
+                }
+            }
+
+            foreach (var content in toDelete)
+            {
+                ServiceContext.ContentService.MoveToRecycleBin(content);
+            }
+
+            var service = ServiceContext.EntityService;
+
+            long total;
+            //search at root to see if it returns recycled
+            var entities = service.GetPagedDescendantsFromRoot(UmbracoObjectTypes.Document, 0, 1000, out total, includeTrashed:false)
+                .Select(x => x.Id)
+                .ToArray();
+
+            foreach (var c in toDelete)
+            {
+                Assert.IsFalse(entities.Contains(c.Id));
+            }
+        }
+
+        [Test]
+        public void EntityService_Can_Get_Paged_Content_Descendants_With_Search()
+        {
+            var contentType = ServiceContext.ContentTypeService.GetContentType("umbTextpage");
+
+            var root = MockedContent.CreateSimpleContent(contentType);
+            ServiceContext.ContentService.Save(root);
+
+            for (int i = 0; i < 10; i++)
+            {
+                var c1 = MockedContent.CreateSimpleContent(contentType, "ssss" + Guid.NewGuid(), root);
+                ServiceContext.ContentService.Save(c1);
+
+                for (int j = 0; j < 5; j++)
+                {
+                    var c2 = MockedContent.CreateSimpleContent(contentType, "tttt" + Guid.NewGuid(), c1);
+                    ServiceContext.ContentService.Save(c2);
+                }
+            }
+
+            var service = ServiceContext.EntityService;
+
+            long total;
+            var entities = service.GetPagedDescendants(root.Id, UmbracoObjectTypes.Document, 0, 10, out total, filter: "ssss").ToArray();
+            Assert.That(entities.Length, Is.EqualTo(10));
+            Assert.That(total, Is.EqualTo(10));
+            entities = service.GetPagedDescendants(root.Id, UmbracoObjectTypes.Document, 0, 50, out total, filter: "tttt").ToArray();
+            Assert.That(entities.Length, Is.EqualTo(50));
+            Assert.That(total, Is.EqualTo(50));
+        }
+
+        [Test]
+        public void EntityService_Can_Get_Paged_Media_Children()
+        {
+            var folderType = ServiceContext.ContentTypeService.GetMediaType(1031);
+            var imageMediaType = ServiceContext.ContentTypeService.GetMediaType(1032);
+
+            var root = MockedMedia.CreateMediaFolder(folderType, -1);
+            ServiceContext.MediaService.Save(root);
+            for (int i = 0; i < 10; i++)
+            {
+                var c1 = MockedMedia.CreateMediaImage(imageMediaType, root.Id);
+                ServiceContext.MediaService.Save(c1);
+            }
+
+            var service = ServiceContext.EntityService;
+
+            long total;
+            var entities = service.GetPagedChildren(root.Id, UmbracoObjectTypes.Media, 0, 6, out total).ToArray();
+            Assert.That(entities.Length, Is.EqualTo(6));
+            Assert.That(total, Is.EqualTo(10));
+            entities = service.GetPagedChildren(root.Id, UmbracoObjectTypes.Media, 1, 6, out total).ToArray();
+            Assert.That(entities.Length, Is.EqualTo(4));
+            Assert.That(total, Is.EqualTo(10));
+        }
+
+        [Test]
+        public void EntityService_Can_Get_Paged_Media_Descendants()
+        {
+            var folderType = ServiceContext.ContentTypeService.GetMediaType(1031);
+            var imageMediaType = ServiceContext.ContentTypeService.GetMediaType(1032);
+
+            var root = MockedMedia.CreateMediaFolder(folderType, -1);
+            ServiceContext.MediaService.Save(root);
+            var count = 0;
+            for (int i = 0; i < 10; i++)
+            {
+                var c1 = MockedMedia.CreateMediaImage(imageMediaType, root.Id);
+                ServiceContext.MediaService.Save(c1);
+                count++;
+
+                for (int j = 0; j < 5; j++)
+                {
+                    var c2 = MockedMedia.CreateMediaImage(imageMediaType, c1.Id);
+                    ServiceContext.MediaService.Save(c2);
+                    count++;
+                }
+            }
+
+            var service = ServiceContext.EntityService;
+
+            long total;
+            var entities = service.GetPagedDescendants(root.Id, UmbracoObjectTypes.Media, 0, 31, out total).ToArray();
+            Assert.That(entities.Length, Is.EqualTo(31));
+            Assert.That(total, Is.EqualTo(60));
+            entities = service.GetPagedDescendants(root.Id, UmbracoObjectTypes.Media, 1, 31, out total).ToArray();
+            Assert.That(entities.Length, Is.EqualTo(29));
+            Assert.That(total, Is.EqualTo(60));
+        }
+
+        [Test]
+        public void EntityService_Can_Get_Paged_Media_Descendants_Including_Recycled()
+        {
+            var folderType = ServiceContext.ContentTypeService.GetMediaType(1031);
+            var imageMediaType = ServiceContext.ContentTypeService.GetMediaType(1032);
+
+            var root = MockedMedia.CreateMediaFolder(folderType, -1);
+            ServiceContext.MediaService.Save(root);
+            var toDelete = new List<IMedia>();
+            for (int i = 0; i < 10; i++)
+            {
+                var c1 = MockedMedia.CreateMediaImage(imageMediaType, root.Id);
+                ServiceContext.MediaService.Save(c1);
+
+                if (i % 2 == 0)
+                {
+                    toDelete.Add(c1);
+                }
+
+                for (int j = 0; j < 5; j++)
+                {
+                    var c2 = MockedMedia.CreateMediaImage(imageMediaType, c1.Id);
+                    ServiceContext.MediaService.Save(c2);
+                }
+            }
+
+            foreach (var content in toDelete)
+            {
+                ServiceContext.MediaService.MoveToRecycleBin(content);
+            }
+
+            var service = ServiceContext.EntityService;
+
+            long total;
+            //search at root to see if it returns recycled
+            var entities = service.GetPagedDescendants(-1, UmbracoObjectTypes.Media, 0, 1000, out total)
+                .Select(x => x.Id)
+                .ToArray();
+
+            foreach (var media in toDelete)
+            {
+                Assert.IsTrue(entities.Contains(media.Id));
+            }
+        }
+
+        [Test]
+        public void EntityService_Can_Get_Paged_Media_Descendants_Without_Recycled()
+        {
+            var folderType = ServiceContext.ContentTypeService.GetMediaType(1031);
+            var imageMediaType = ServiceContext.ContentTypeService.GetMediaType(1032);
+
+            var root = MockedMedia.CreateMediaFolder(folderType, -1);
+            ServiceContext.MediaService.Save(root);
+            var toDelete = new List<IMedia>();
+            for (int i = 0; i < 10; i++)
+            {
+                var c1 = MockedMedia.CreateMediaImage(imageMediaType, root.Id);
+                ServiceContext.MediaService.Save(c1);
+
+                if (i % 2 == 0)
+                {
+                    toDelete.Add(c1);
+                }
+
+                for (int j = 0; j < 5; j++)
+                {
+                    var c2 = MockedMedia.CreateMediaImage(imageMediaType, c1.Id);
+                    ServiceContext.MediaService.Save(c2);
+                }
+            }
+
+            foreach (var content in toDelete)
+            {
+                ServiceContext.MediaService.MoveToRecycleBin(content);
+            }
+
+            var service = ServiceContext.EntityService;
+
+            long total;
+            //search at root to see if it returns recycled
+            var entities = service.GetPagedDescendantsFromRoot(UmbracoObjectTypes.Media, 0, 1000, out total, includeTrashed:false)
+                .Select(x => x.Id)
+                .ToArray();
+
+            foreach (var media in toDelete)
+            {
+                Assert.IsFalse(entities.Contains(media.Id));
+            }
+        }
+
+        [Test]
+        public void EntityService_Can_Get_Paged_Media_Descendants_With_Search()
+        {
+            var folderType = ServiceContext.ContentTypeService.GetMediaType(1031);
+            var imageMediaType = ServiceContext.ContentTypeService.GetMediaType(1032);
+
+            var root = MockedMedia.CreateMediaFolder(folderType, -1);
+            ServiceContext.MediaService.Save(root);
+
+            for (int i = 0; i < 10; i++)
+            {
+                var c1 = MockedMedia.CreateMediaImage(imageMediaType, root.Id);
+                c1.Name = "ssss" + Guid.NewGuid();
+                ServiceContext.MediaService.Save(c1);
+
+                for (int j = 0; j < 5; j++)
+                {
+                    var c2 = MockedMedia.CreateMediaImage(imageMediaType, c1.Id);
+                    c2.Name = "tttt" + Guid.NewGuid();
+                    ServiceContext.MediaService.Save(c2);
+                }
+            }
+
+            var service = ServiceContext.EntityService;
+
+            long total;
+            var entities = service.GetPagedDescendants(root.Id, UmbracoObjectTypes.Media, 0, 10, out total, filter: "ssss").ToArray();
+            Assert.That(entities.Length, Is.EqualTo(10));
+            Assert.That(total, Is.EqualTo(10));
+            entities = service.GetPagedDescendants(root.Id, UmbracoObjectTypes.Media, 0, 50, out total, filter: "tttt").ToArray();
+            Assert.That(entities.Length, Is.EqualTo(50));
+            Assert.That(total, Is.EqualTo(50));
+        }
+
+        [Test]
+        public void EntityService_Can_Find_All_Content_By_UmbracoObjectTypes()
+        {
+            var service = ServiceContext.EntityService;
+
+            var entities = service.GetAll(UmbracoObjectTypes.Document).ToArray();
+
+            Assert.That(entities.Any(), Is.True);
+            Assert.That(entities.Count(), Is.EqualTo(4));
+            Assert.That(entities.Any(x => x.Trashed), Is.True);
+        }
+
+        [Test]
+        public void EntityService_Can_Find_All_Content_By_UmbracoObjectType_Id()
+        {
+            var service = ServiceContext.EntityService;
+
+            var objectTypeId = new Guid(Constants.ObjectTypes.Document);
+            var entities = service.GetAll(objectTypeId).ToArray();
+
+            Assert.That(entities.Any(), Is.True);
+            Assert.That(entities.Count(), Is.EqualTo(4));
+            Assert.That(entities.Any(x => x.Trashed), Is.True);
+        }
+
+        [Test]
+        public void EntityService_Can_Find_All_Content_By_Type()
+        {
+            var service = ServiceContext.EntityService;
+
+            var entities = service.GetAll<IContent>().ToArray();
+
+            Assert.That(entities.Any(), Is.True);
+            Assert.That(entities.Count(), Is.EqualTo(4));
+            Assert.That(entities.Any(x => x.Trashed), Is.True);
+        }
+
+        [Test]
+        public void EntityService_Can_Get_Child_Content_By_ParentId_And_UmbracoObjectType()
+        {
+            var service = ServiceContext.EntityService;
+
+            var entities = service.GetChildren(-1, UmbracoObjectTypes.Document).ToArray();
+
+            Assert.That(entities.Any(), Is.True);
+            Assert.That(entities.Count(), Is.EqualTo(1));
+            Assert.That(entities.Any(x => x.Trashed), Is.False);
+        }
+
+        [Test]
+        public void EntityService_Can_Get_Children_By_ParentId()
+        {
+            var service = ServiceContext.EntityService;
+
+            var entities = service.GetChildren(folderId);
+
+            Assert.That(entities.Any(), Is.True);
+            Assert.That(entities.Count(), Is.EqualTo(3));
+            Assert.That(entities.Any(x => x.Trashed), Is.False);
+        }
+
+        [Test]
+        public void EntityService_Can_Get_Descendants_By_ParentId()
+        {
+            var service = ServiceContext.EntityService;
+
+            var entities = service.GetDescendents(folderId);
+
+            Assert.That(entities.Any(), Is.True);
+            Assert.That(entities.Count(), Is.EqualTo(4));
+            Assert.That(entities.Any(x => x.Trashed), Is.False);
+        }
+
+        [Test]
+        public void EntityService_Throws_When_Getting_All_With_Invalid_Type()
+        {
+            var service = ServiceContext.EntityService;
+            var objectTypeId = new Guid(Constants.ObjectTypes.ContentItem);
+
+            Assert.Throws<NotSupportedException>(() => service.GetAll<IContentBase>());
+            Assert.Throws<NullReferenceException>(() => service.GetAll(UmbracoObjectTypes.ContentItem));
+            Assert.Throws<NullReferenceException>(() => service.GetAll(objectTypeId));
+        }
+
+        [Test]
+        public void EntityService_Can_Find_All_ContentTypes_By_UmbracoObjectTypes()
+        {
+            var service = ServiceContext.EntityService;
+
+            var entities = service.GetAll(UmbracoObjectTypes.DocumentType).ToArray();
+
+            Assert.That(entities.Any(), Is.True);
+            Assert.That(entities.Count(), Is.EqualTo(1));
+        }
+
+        [Test]
+        public void EntityService_Can_Find_All_ContentTypes_By_UmbracoObjectType_Id()
+        {
+            var service = ServiceContext.EntityService;
+
+            var objectTypeId = new Guid(Constants.ObjectTypes.DocumentType);
+            var entities = service.GetAll(objectTypeId).ToArray();
+
+            Assert.That(entities.Any(), Is.True);
+            Assert.That(entities.Count(), Is.EqualTo(1));
+        }
+
+        [Test]
+        public void EntityService_Can_Find_All_ContentTypes_By_Type()
+        {
+            var service = ServiceContext.EntityService;
+
+            var entities = service.GetAll<IContentType>().ToArray();
+
+            Assert.That(entities.Any(), Is.True);
+            Assert.That(entities.Count(), Is.EqualTo(1));
+        }
+
+        [Test]
+        public void EntityService_Can_Find_All_Media_By_UmbracoObjectTypes()
+        {
+            var service = ServiceContext.EntityService;
+
+            var entities = service.GetAll(UmbracoObjectTypes.Media).ToArray();
+
+            Assert.That(entities.Any(), Is.True);
+            Assert.That(entities.Count(), Is.EqualTo(5));
+        }
+
+        [Test]
+        public void EntityService_Can_Get_ObjectType()
+        {
+            var service = ServiceContext.EntityService;
+            var mediaObjectType = service.GetObjectType(1031);
+
+            Assert.NotNull(mediaObjectType);
+            Assert.AreEqual(mediaObjectType, UmbracoObjectTypes.MediaType);
+        }
+
+        [Test]
+        public void EntityService_Can_Get_Key_For_Id_With_Unknown_Type()
+        {
+            var service = ServiceContext.EntityService;
+            var result = service.GetKeyForId(1060, UmbracoObjectTypes.Unknown);
+
+            Assert.IsTrue(result.Success);
+            Assert.AreEqual(Guid.Parse("1D3A8E6E-2EA9-4CC1-B229-1AEE19821522"), result.Result);
+        }
+
+        [Test]
+        public void EntityService_Can_Get_Key_For_Id()
+        {
+            var service = ServiceContext.EntityService;
+            var result = service.GetKeyForId(1060, UmbracoObjectTypes.DocumentType);
+
+            Assert.IsTrue(result.Success);
+            Assert.AreEqual(Guid.Parse("1D3A8E6E-2EA9-4CC1-B229-1AEE19821522"), result.Result);
+        }
+
+        [Test]
+        public void EntityService_Cannot_Get_Key_For_Id_With_Incorrect_Object_Type()
+        {
+            var service = ServiceContext.EntityService;
+            var result1 = service.GetKeyForId(1060, UmbracoObjectTypes.DocumentType);
+            var result2 = service.GetKeyForId(1060, UmbracoObjectTypes.MediaType);
+
+            Assert.IsTrue(result1.Success);
+            Assert.IsFalse(result2.Success);
+        }
+
+        [Test]
+        public void EntityService_Can_Get_Id_For_Key_With_Unknown_Type()
+        {
+            var service = ServiceContext.EntityService;
+            var result = service.GetIdForKey(Guid.Parse("1D3A8E6E-2EA9-4CC1-B229-1AEE19821522"), UmbracoObjectTypes.Unknown);
+
+            Assert.IsTrue(result.Success);
+            Assert.AreEqual(1060, result.Result);
+        }
+
+        [Test]
+        public void EntityService_Can_Get_Id_For_Key()
+        {
+            var service = ServiceContext.EntityService;
+            var result = service.GetIdForKey(Guid.Parse("1D3A8E6E-2EA9-4CC1-B229-1AEE19821522"), UmbracoObjectTypes.DocumentType);
+
+            Assert.IsTrue(result.Success);
+            Assert.AreEqual(1060, result.Result);
+        }
+
+        [Test]
+        public void EntityService_Cannot_Get_Id_For_Key_With_Incorrect_Object_Type()
+        {
+            var service = ServiceContext.EntityService;
+            var result1 = service.GetIdForKey(Guid.Parse("1D3A8E6E-2EA9-4CC1-B229-1AEE19821522"), UmbracoObjectTypes.DocumentType);
+            var result2 = service.GetIdForKey(Guid.Parse("1D3A8E6E-2EA9-4CC1-B229-1AEE19821522"), UmbracoObjectTypes.MediaType);
+
+            Assert.IsTrue(result1.Success);
+            Assert.IsFalse(result2.Success);
+        }
+
+        [Test]
+        public void ReserveId()
+        {
+            var service = ServiceContext.EntityService;
+            var guid = Guid.NewGuid();
+
+            // can reserve
+            var reservedId = service.ReserveId(guid);
+            Assert.IsTrue(reservedId > 0);
+
+            // can get it back
+            var id = service.GetIdForKey(guid, UmbracoObjectTypes.DocumentType);
+            Assert.IsTrue(id.Success);
+            Assert.AreEqual(reservedId, id.Result);
+
+            // anything goes
+            id = service.GetIdForKey(guid, UmbracoObjectTypes.Media);
+            Assert.IsTrue(id.Success);
+            Assert.AreEqual(reservedId, id.Result);
+
+            // a random guid won't work
+            Assert.IsFalse(service.GetIdForKey(Guid.NewGuid(), UmbracoObjectTypes.DocumentType).Success);
+        }
+
+        private static bool _isSetup = false;
+
+        private int folderId;
+
+        public override void CreateTestData()
+        {
+            if (_isSetup == false)
+            {
+                _isSetup = true;
+
+                base.CreateTestData();
+
+                //Create and Save folder-Media -> 1050
+                var folderMediaType = ServiceContext.ContentTypeService.GetMediaType(1031);
+                var folder = MockedMedia.CreateMediaFolder(folderMediaType, -1);
+                ServiceContext.MediaService.Save(folder, 0);
+                folderId = folder.Id;
+
+                //Create and Save image-Media -> 1051
+                var imageMediaType = ServiceContext.ContentTypeService.GetMediaType(1032);
+                var image = MockedMedia.CreateMediaImage(imageMediaType, folder.Id);
+                ServiceContext.MediaService.Save(image, 0);
+
+                //Create and Save file-Media -> 1052
+                var fileMediaType = ServiceContext.ContentTypeService.GetMediaType(1033);
+                var file = MockedMedia.CreateMediaFile(fileMediaType, folder.Id);
+                ServiceContext.MediaService.Save(file, 0);
+
+                var subfolder = MockedMedia.CreateMediaFolder(folderMediaType, folder.Id);
+                ServiceContext.MediaService.Save(subfolder, 0);
+                var subfolder2 = MockedMedia.CreateMediaFolder(folderMediaType, subfolder.Id);
+                ServiceContext.MediaService.Save(subfolder2, 0);
+
+            }
+
+        }
+    }
+}

From 0869bf27c741b13cab8876b7dc2ac71b75c42250 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 25 Jun 2019 08:26:01 +0200
Subject: [PATCH 028/776] 
 https://umbraco.visualstudio.com/D-Team%20Tracker/_workitems/edit/1479 -
 clean up

---
 .../FilterAllowedOutgoingMediaAttribute.cs    | 34 -------------------
 1 file changed, 34 deletions(-)

diff --git a/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs b/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs
index a246fa26ad..22ce7a5ce7 100644
--- a/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs
+++ b/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs
@@ -89,42 +89,8 @@ namespace Umbraco.Web.WebApi.Filters
             {
                 FilterBasedOnStartNode(items, user);
             }
-            else
-            {
-               // FilterOutPossibleSensitiveData(items);
-            }
-
         }
 
-        /// <summary>
-        /// Removes all properties of the items except the umbracoFile.
-        /// </summary>
-        /// <param name="items"></param>
-        private void FilterOutPossibleSensitiveData(IList items)
-        {
-            foreach (dynamic item in items)
-            {
-
-                if (item.Properties != null)
-                {
-                    if (item.Properties is IList properties)
-                        // Iterate reverse, because we removed from the same list, such that the ordering of indexes not
-                        // changes doing the iteration
-                        for (var i = properties.Count - 1; i >= 0; i--)
-                        {
-                            dynamic property = properties[i];
-                            if (property.Alias != null && property.Alias is string)
-                            {
-                                var alias = property.Alias as string;
-                                if (string.Equals(alias, Constants.Conventions.Media.File) == false)
-                                {
-                                    properties.RemoveAt(i);
-                                }
-                            }
-                        }
-                }
-            }
-        }
 
         internal void FilterBasedOnStartNode(IList items, IUser user)
         {

From afac4bb918a578d8b5513cd5cac720dde6e2089d Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 25 Jun 2019 09:18:30 +0200
Subject: [PATCH 029/776] 
 https://umbraco.visualstudio.com/D-Team%20Tracker/_workitems/edit/1479 -
 missing entityResource injection

---
 .../src/views/propertyeditors/grid/editors/rte.controller.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js
index 30ea1eaef6..601c0a36d2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js
@@ -1,7 +1,7 @@
 (function() {
     "use strict";
 
-    function GridRichTextEditorController($scope, tinyMceService, macroService, editorState) {
+    function GridRichTextEditorController($scope, tinyMceService, macroService, editorState, entityResource) {
 
         var vm = this;
 

From d558646d75a45b8cd52c71d21bdd92644e1e3f58 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 25 Jun 2019 09:21:51 +0200
Subject: [PATCH 030/776] 
 https://umbraco.visualstudio.com/D-Team%20Tracker/_workitems/edit/1479 - Fix
 for NullReferenceException

---
 src/Umbraco.Core/Services/ContentService.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/Services/ContentService.cs b/src/Umbraco.Core/Services/ContentService.cs
index cf49e892dd..3e5acd0296 100644
--- a/src/Umbraco.Core/Services/ContentService.cs
+++ b/src/Umbraco.Core/Services/ContentService.cs
@@ -310,9 +310,13 @@ namespace Umbraco.Core.Services
             {
                 if (string.Equals(contentProperty.PropertyType.PropertyEditorAlias, Constants.PropertyEditors.TinyMCEAlias))
                 {
-                    var value = contentProperty.Value.ToString();
+                    var value = contentProperty.Value?.ToString();
+
+                    if (string.IsNullOrEmpty(value))
+                    {
+                        result.AddRange(GetAnchorValuesFromRTEContent(value));
+                    }
 
-                    result.AddRange(GetAnchorValuesFromRTEContent(value));
                 }
             }
 

From 4dd325cec943045847852fde3e28a74da37ae1f6 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 25 Jun 2019 09:21:51 +0200
Subject: [PATCH 031/776] 
 https://umbraco.visualstudio.com/D-Team%20Tracker/_workitems/edit/1479 - Fix
 for NullReferenceException

---
 src/Umbraco.Core/Services/ContentService.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/Services/ContentService.cs b/src/Umbraco.Core/Services/ContentService.cs
index cf49e892dd..abde058252 100644
--- a/src/Umbraco.Core/Services/ContentService.cs
+++ b/src/Umbraco.Core/Services/ContentService.cs
@@ -310,9 +310,13 @@ namespace Umbraco.Core.Services
             {
                 if (string.Equals(contentProperty.PropertyType.PropertyEditorAlias, Constants.PropertyEditors.TinyMCEAlias))
                 {
-                    var value = contentProperty.Value.ToString();
+                    var value = contentProperty.Value?.ToString();
+
+                    if (!string.IsNullOrEmpty(value))
+                    {
+                        result.AddRange(GetAnchorValuesFromRTEContent(value));
+                    }
 
-                    result.AddRange(GetAnchorValuesFromRTEContent(value));
                 }
             }
 

From 36559b876123bf9521b6f5f93dd48bd6727659b5 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 25 Jun 2019 09:22:56 +0200
Subject: [PATCH 032/776] 
 https://umbraco.visualstudio.com/D-Team%20Tracker/_workitems/edit/1479 - Fix
 for NullReferenceException

---
 src/Umbraco.Core/Services/ContentService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Services/ContentService.cs b/src/Umbraco.Core/Services/ContentService.cs
index 3e5acd0296..abde058252 100644
--- a/src/Umbraco.Core/Services/ContentService.cs
+++ b/src/Umbraco.Core/Services/ContentService.cs
@@ -312,7 +312,7 @@ namespace Umbraco.Core.Services
                 {
                     var value = contentProperty.Value?.ToString();
 
-                    if (string.IsNullOrEmpty(value))
+                    if (!string.IsNullOrEmpty(value))
                     {
                         result.AddRange(GetAnchorValuesFromRTEContent(value));
                     }

From 1994194656c419359fc827cfc030818612bf9a20 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 25 Jun 2019 11:00:20 +0200
Subject: [PATCH 033/776] 
 https://umbraco.visualstudio.com/D-Team%20Tracker/_workitems/edit/1479  -
 Review fixes

---
 src/Umbraco.Core/Models/DataTypeDefinition.cs |   41 -
 .../Models/DataTypeDefinitionExtensions.cs    |   47 +
 .../Models/IDataTypeDefinition.cs             |    5 -
 .../Factories/DataTypeDefinitionFactory.cs    |    2 +-
 src/Umbraco.Core/Services/ContentService.cs   |   12 +-
 src/Umbraco.Core/Services/DataTypeService.cs  |   16 -
 .../Services/DateTypeServiceExtensions.cs     |   22 +
 src/Umbraco.Core/Services/IContentService.cs  |    4 +-
 src/Umbraco.Core/Services/IDataTypeService.cs |    1 -
 src/Umbraco.Core/Umbraco.Core.csproj          |    2 +
 .../src/common/resources/content.resource.js  | 1045 ++++++++---------
 .../src/common/resources/entity.resource.js   |   32 +-
 .../src/common/resources/media.resource.js    |  766 ++++++------
 .../src/common/services/search.service.js     |   20 +-
 .../common/dialogs/linkpicker.controller.js   |    3 +-
 .../common/dialogs/mediapicker.controller.js  |    2 +-
 .../common/dialogs/treepicker.controller.js   |  451 +++----
 .../linkpicker/linkpicker.controller.js       |    2 +-
 src/Umbraco.Web/Editors/ContentController.cs  |   12 +-
 src/Umbraco.Web/Editors/EntityController.cs   |   48 +-
 src/Umbraco.Web/Editors/MediaController.cs    |   49 +-
 .../Models/ContentEditing/UrlAndAnchors.cs    |    4 +-
 .../Mapping/ContentPropertyBasicConverter.cs  |   16 +-
 .../ContentPropertyDisplayConverter.cs        |  134 +--
 .../Mapping/ContentPropertyDtoConverter.cs    |   82 +-
 .../Mapping/ContentPropertyModelMapper.cs     |   74 +-
 .../Models/Mapping/PreValueDisplayResolver.cs |    4 +-
 src/Umbraco.Web/Search/UmbracoTreeSearcher.cs |   27 +-
 src/Umbraco.Web/Trees/TreeControllerBase.cs   |    1 +
 ...EnsureUserPermissionForContentAttribute.cs |   22 +-
 .../FilterAllowedOutgoingMediaAttribute.cs    |   16 +-
 31 files changed, 1417 insertions(+), 1545 deletions(-)
 create mode 100644 src/Umbraco.Core/Models/DataTypeDefinitionExtensions.cs
 create mode 100644 src/Umbraco.Core/Services/DateTypeServiceExtensions.cs

diff --git a/src/Umbraco.Core/Models/DataTypeDefinition.cs b/src/Umbraco.Core/Models/DataTypeDefinition.cs
index 5e1fd649ae..997dd6b16f 100644
--- a/src/Umbraco.Core/Models/DataTypeDefinition.cs
+++ b/src/Umbraco.Core/Models/DataTypeDefinition.cs
@@ -32,35 +32,6 @@ namespace Umbraco.Core.Models
         private string _propertyEditorAlias;
         private DataTypeDatabaseType _databaseType;
 
-        private static readonly ISet<Guid> IdsOfBuildInDataTypes = new HashSet<Guid>()
-            {
-                Constants.DataTypes.ContentPickerGuid,
-                Constants.DataTypes.MemberPickerGuid,
-                Constants.DataTypes.MediaPickerGuid,
-                Constants.DataTypes.MultipleMediaPickerGuid,
-                Constants.DataTypes.RelatedLinksGuid,
-                Constants.DataTypes.MemberGuid,
-                Constants.DataTypes.ImageCropperGuid,
-                Constants.DataTypes.TagsGuid,
-                Constants.DataTypes.ListViewContentGuid,
-                Constants.DataTypes.ListViewMediaGuid,
-                Constants.DataTypes.ListViewMembersGuid,
-                Constants.DataTypes.DatePickerWithTimeGuid,
-                Constants.DataTypes.ApprovedColorGuid,
-                Constants.DataTypes.DropdownMultipleGuid,
-                Constants.DataTypes.RadioboxGuid,
-                Constants.DataTypes.DatePickerGuid,
-                Constants.DataTypes.DropdownGuid,
-                Constants.DataTypes.CheckboxListGuid,
-                Constants.DataTypes.CheckboxGuid,
-                Constants.DataTypes.NumericGuid,
-                Constants.DataTypes.RichtextEditorGuid,
-                Constants.DataTypes.TextstringGuid,
-                Constants.DataTypes.TextareaGuid,
-                Constants.DataTypes.UploadGuid,
-                Constants.DataTypes.LabelGuid,
-            };
-
         [Obsolete("Property editor's are defined by a string alias from version 7 onwards, use the alternative contructor that specifies an alias")]
         [EditorBrowsable(EditorBrowsableState.Never)]
         public DataTypeDefinition(int parentId, Guid controlId)
@@ -94,15 +65,6 @@ namespace Umbraco.Core.Models
             _additionalData = new Dictionary<string, object>();
         }
 
-        public DataTypeDefinition(string propertyEditorAlias, Guid uniqueId)
-        {
-            _parentId = -1;
-            _propertyEditorAlias = propertyEditorAlias;
-
-            _additionalData = new Dictionary<string, object>();
-            IsBuildInDataType = IdsOfBuildInDataTypes.Contains(uniqueId);
-        }
-
         private static readonly Lazy<PropertySelectors> Ps = new Lazy<PropertySelectors>();
 
         private class PropertySelectors
@@ -253,8 +215,5 @@ namespace Umbraco.Core.Models
         {
             get { return _additionalData; }
         }
-
-        public bool IsBuildInDataType { get;}
     }
-
 }
diff --git a/src/Umbraco.Core/Models/DataTypeDefinitionExtensions.cs b/src/Umbraco.Core/Models/DataTypeDefinitionExtensions.cs
new file mode 100644
index 0000000000..45c4420820
--- /dev/null
+++ b/src/Umbraco.Core/Models/DataTypeDefinitionExtensions.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Models
+{
+    public static class DataTypeDefinitionExtensions
+    {
+        private static readonly ISet<Guid> IdsOfBuildInDataTypes = new HashSet<Guid>()
+        {
+            Constants.DataTypes.ContentPickerGuid,
+            Constants.DataTypes.MemberPickerGuid,
+            Constants.DataTypes.MediaPickerGuid,
+            Constants.DataTypes.MultipleMediaPickerGuid,
+            Constants.DataTypes.RelatedLinksGuid,
+            Constants.DataTypes.MemberGuid,
+            Constants.DataTypes.ImageCropperGuid,
+            Constants.DataTypes.TagsGuid,
+            Constants.DataTypes.ListViewContentGuid,
+            Constants.DataTypes.ListViewMediaGuid,
+            Constants.DataTypes.ListViewMembersGuid,
+            Constants.DataTypes.DatePickerWithTimeGuid,
+            Constants.DataTypes.ApprovedColorGuid,
+            Constants.DataTypes.DropdownMultipleGuid,
+            Constants.DataTypes.RadioboxGuid,
+            Constants.DataTypes.DatePickerGuid,
+            Constants.DataTypes.DropdownGuid,
+            Constants.DataTypes.CheckboxListGuid,
+            Constants.DataTypes.CheckboxGuid,
+            Constants.DataTypes.NumericGuid,
+            Constants.DataTypes.RichtextEditorGuid,
+            Constants.DataTypes.TextstringGuid,
+            Constants.DataTypes.TextareaGuid,
+            Constants.DataTypes.UploadGuid,
+            Constants.DataTypes.LabelGuid,
+        };
+
+        /// <summary>
+        /// Returns true if this date type is build-in/default.
+        /// </summary>
+        /// <param name="dataTypeDefinition">The data type definition.</param>
+        /// <returns></returns>
+        public static bool IsBuildInDataType(this IDataTypeDefinition dataTypeDefinition)
+        {
+            return IdsOfBuildInDataTypes.Contains(dataTypeDefinition.Key);
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Models/IDataTypeDefinition.cs b/src/Umbraco.Core/Models/IDataTypeDefinition.cs
index f57a1bdca7..0162fe7738 100644
--- a/src/Umbraco.Core/Models/IDataTypeDefinition.cs
+++ b/src/Umbraco.Core/Models/IDataTypeDefinition.cs
@@ -20,10 +20,5 @@ namespace Umbraco.Core.Models
         /// Gets or Sets the DatabaseType for which the DataType's value is saved as
         /// </summary>
         DataTypeDatabaseType DatabaseType { get; set; }
-
-        /// <summary>
-        /// Gets information about whether this data type is build in or not.
-        /// </summary>
-        bool IsBuildInDataType { get;}
     }
 }
diff --git a/src/Umbraco.Core/Persistence/Factories/DataTypeDefinitionFactory.cs b/src/Umbraco.Core/Persistence/Factories/DataTypeDefinitionFactory.cs
index 14c162d8ea..71248a1ce8 100644
--- a/src/Umbraco.Core/Persistence/Factories/DataTypeDefinitionFactory.cs
+++ b/src/Umbraco.Core/Persistence/Factories/DataTypeDefinitionFactory.cs
@@ -19,7 +19,7 @@ namespace Umbraco.Core.Persistence.Factories
 
         public IDataTypeDefinition BuildEntity(DataTypeDto dto)
         {
-            var dataTypeDefinition = new DataTypeDefinition(dto.PropertyEditorAlias,dto.NodeDto.UniqueId);
+            var dataTypeDefinition = new DataTypeDefinition(dto.PropertyEditorAlias);
 
 
             try
diff --git a/src/Umbraco.Core/Services/ContentService.cs b/src/Umbraco.Core/Services/ContentService.cs
index abde058252..2994bcc4f6 100644
--- a/src/Umbraco.Core/Services/ContentService.cs
+++ b/src/Umbraco.Core/Services/ContentService.cs
@@ -35,6 +35,7 @@ namespace Umbraco.Core.Services
         //Support recursive locks because some of the methods that require locking call other methods that require locking.
         //for example, the Move method needs to be locked but this calls the Save method which also needs to be locked.
         private static readonly ReaderWriterLockSlim Locker = new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion);
+        private static readonly Regex AnchorRegex = new Regex("<a id=\"(.*?)\">", RegexOptions.Compiled);
 
         public ContentService(
             IDatabaseUnitOfWorkProvider provider,
@@ -300,7 +301,7 @@ namespace Umbraco.Core.Services
             return content;
         }
 
-        public IList<string> GetAnchorValuesFromRTEs(int id)
+        public IEnumerable<string> GetAnchorValuesFromRTEs(int id)
         {
             var result = new List<string>();
 
@@ -308,7 +309,7 @@ namespace Umbraco.Core.Services
 
             foreach (var contentProperty in content.Properties)
             {
-                if (string.Equals(contentProperty.PropertyType.PropertyEditorAlias, Constants.PropertyEditors.TinyMCEAlias))
+                if (contentProperty.PropertyType.PropertyEditorAlias.InvariantEquals(Constants.PropertyEditors.TinyMCEAlias))
                 {
                     var value = contentProperty.Value?.ToString();
 
@@ -324,11 +325,12 @@ namespace Umbraco.Core.Services
             return result;
         }
 
-        public IList<string> GetAnchorValuesFromRTEContent(string rteContent)
+
+        public IEnumerable<string> GetAnchorValuesFromRTEContent(string rteContent)
         {
             var result = new List<string>();
-            var regex = new Regex("<a id=\"(.*?)\">");
-            var matches = regex.Matches(rteContent);
+
+            var matches = AnchorRegex.Matches(rteContent);
 
             foreach (Match match in matches)
             {
diff --git a/src/Umbraco.Core/Services/DataTypeService.cs b/src/Umbraco.Core/Services/DataTypeService.cs
index b02fb644d8..cc9e99d39f 100644
--- a/src/Umbraco.Core/Services/DataTypeService.cs
+++ b/src/Umbraco.Core/Services/DataTypeService.cs
@@ -349,22 +349,6 @@ namespace Umbraco.Core.Services
                 new OperationStatus<MoveOperationStatusType>(MoveOperationStatusType.Success, evtMsgs));
         }
 
-        public bool IsDataTypeIgnoringUserStartNodes(Guid key)
-        {
-            var dataType = GetDataTypeDefinitionById(key);
-
-            if (dataType != null)
-            {
-                var preValues = GetPreValuesCollectionByDataTypeId(dataType.Id);
-                if (preValues.PreValuesAsDictionary.TryGetValue(Constants.DataTypes.ReservedPreValueKeys.IgnoreUserStartNodes, out var preValue))
-                {
-                    return string.Equals(preValue.Value, "1", StringComparison.InvariantCulture);
-                }
-            }
-
-            return false;
-        }
-
         /// <summary>
         /// Saves an <see cref="IDataTypeDefinition"/>
         /// </summary>
diff --git a/src/Umbraco.Core/Services/DateTypeServiceExtensions.cs b/src/Umbraco.Core/Services/DateTypeServiceExtensions.cs
new file mode 100644
index 0000000000..63006653ab
--- /dev/null
+++ b/src/Umbraco.Core/Services/DateTypeServiceExtensions.cs
@@ -0,0 +1,22 @@
+using System;
+
+namespace Umbraco.Core.Services
+{
+    public static class DateTypeServiceExtensions
+    {
+        public static bool IsDataTypeIgnoringUserStartNodes(this IDataTypeService dataTypeService, Guid key)
+        {
+            var dataType = dataTypeService.GetDataTypeDefinitionById(key);
+
+            if (dataType != null)
+            {
+                var preValues = dataTypeService.GetPreValuesCollectionByDataTypeId(dataType.Id);
+                if (preValues.PreValuesAsDictionary.TryGetValue(
+                    Constants.DataTypes.ReservedPreValueKeys.IgnoreUserStartNodes, out var preValue))
+                    return preValue.Value.InvariantEquals("1");
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Services/IContentService.cs b/src/Umbraco.Core/Services/IContentService.cs
index 8c063890fd..021b483ec2 100644
--- a/src/Umbraco.Core/Services/IContentService.cs
+++ b/src/Umbraco.Core/Services/IContentService.cs
@@ -714,7 +714,7 @@ namespace Umbraco.Core.Services
         /// <returns><see cref="IContent"/></returns>
         IContent CreateContentWithIdentity(string name, int parentId, string contentTypeAlias, int userId = 0);
 
-        IList<string> GetAnchorValuesFromRTEs(int id);
-        IList<string> GetAnchorValuesFromRTEContent(string rteContent);
+        IEnumerable<string> GetAnchorValuesFromRTEs(int id);
+        IEnumerable<string> GetAnchorValuesFromRTEContent(string rteContent);
     }
 }
diff --git a/src/Umbraco.Core/Services/IDataTypeService.cs b/src/Umbraco.Core/Services/IDataTypeService.cs
index de8ee5f49c..7410268ae4 100644
--- a/src/Umbraco.Core/Services/IDataTypeService.cs
+++ b/src/Umbraco.Core/Services/IDataTypeService.cs
@@ -163,6 +163,5 @@ namespace Umbraco.Core.Services
 
         Attempt<OperationStatus<MoveOperationStatusType>> Move(IDataTypeDefinition toMove, int parentId);
 
-        bool IsDataTypeIgnoringUserStartNodes(Guid dataTypeId);
     }
 }
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index f29c1bea46..49f5e8b5d2 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -377,6 +377,7 @@
     <Compile Include="Models\Consent.cs" />
     <Compile Include="Models\ConsentExtensions.cs" />
     <Compile Include="Models\ConsentState.cs" />
+    <Compile Include="Models\DataTypeDefinitionExtensions.cs" />
     <Compile Include="Models\EntityBase\EntityPath.cs" />
     <Compile Include="Models\EntityBase\IDeletableEntity.cs" />
     <Compile Include="Models\IAuditEntry.cs" />
@@ -767,6 +768,7 @@
     <Compile Include="Services\ConsentService.cs" />
     <Compile Include="Services\ContentTypeServiceExtensions.cs" />
     <Compile Include="Models\RedirectUrl.cs" />
+    <Compile Include="Services\DateTypeServiceExtensions.cs" />
     <Compile Include="Services\IConsentService.cs" />
     <Compile Include="Services\IContentServiceBase.cs" />
     <Compile Include="Services\IdkMap.cs" />
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
index d85cc74d7d..fe47c753fa 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
@@ -1,34 +1,34 @@
 /**
-  * @ngdoc service
-  * @name umbraco.resources.contentResource
-  * @description Handles all transactions of content data
-  * from the angular application to the Umbraco database, using the Content WebApi controller
-  *
-  * all methods returns a resource promise async, so all operations won't complete untill .then() is completed.
-  *
-  * @requires $q
-  * @requires $http
-  * @requires umbDataFormatter
-  * @requires umbRequestHelper
-  *
-  * ##usage
-  * To use, simply inject the contentResource into any controller or service that needs it, and make
-  * sure the umbraco.resources module is accesible - which it should be by default.
-  *
-  * <pre>
-  *    contentResource.getById(1234)
-  *          .then(function(data) {
-  *              $scope.content = data;
-  *          });
-  * </pre>
-  **/
+ * @ngdoc service
+ * @name umbraco.resources.contentResource
+ * @description Handles all transactions of content data
+ * from the angular application to the Umbraco database, using the Content WebApi controller
+ *
+ * all methods returns a resource promise async, so all operations won't complete untill .then() is completed.
+ *
+ * @requires $q
+ * @requires $http
+ * @requires umbDataFormatter
+ * @requires umbRequestHelper
+ *
+ * ##usage
+ * To use, simply inject the contentResource into any controller or service that needs it, and make
+ * sure the umbraco.resources module is accesible - which it should be by default.
+ *
+ * <pre>
+ *    contentResource.getById(1234)
+ *          .then(function(data) {
+ *              $scope.content = data;
+ *          });
+ * </pre>
+ **/
 
 function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
 
     /** internal method process the saving of data and post processing the result */
-  function saveContentItem(content, action, files, restApiUrl) {
+    function saveContentItem(content, action, files, restApiUrl) {
         return umbRequestHelper.postSaveContent({
-          restApiUrl: restApiUrl,
+            restApiUrl: restApiUrl,
             content: content,
             action: action,
             files: files,
@@ -41,55 +41,55 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
     return {
 
 
-      savePermissions: function (saveModel) {
-        if (!saveModel) {
-          throw "saveModel cannot be null";
-        }
-        if (!saveModel.contentId) {
-          throw "saveModel.contentId cannot be null";
-        }
-        if (!saveModel.permissions) {
-          throw "saveModel.permissions cannot be null";
-        }
+        savePermissions: function (saveModel) {
+            if (!saveModel) {
+                throw "saveModel cannot be null";
+            }
+            if (!saveModel.contentId) {
+                throw "saveModel.contentId cannot be null";
+            }
+            if (!saveModel.permissions) {
+                throw "saveModel.permissions cannot be null";
+            }
 
-        return umbRequestHelper.resourcePromise(
-          $http.post(umbRequestHelper.getApiUrl("contentApiBaseUrl", "PostSaveUserGroupPermissions"),
-            saveModel),
-          'Failed to save permissions');
-      },
+            return umbRequestHelper.resourcePromise(
+                $http.post(umbRequestHelper.getApiUrl("contentApiBaseUrl", "PostSaveUserGroupPermissions"),
+                    saveModel),
+                'Failed to save permissions');
+        },
 
 
         getRecycleBin: function () {
             return umbRequestHelper.resourcePromise(
-                  $http.get(
-                        umbRequestHelper.getApiUrl(
-                              "contentApiBaseUrl",
-                              "GetRecycleBin")),
-                  'Failed to retrieve data for content recycle bin');
+                $http.get(
+                    umbRequestHelper.getApiUrl(
+                        "contentApiBaseUrl",
+                        "GetRecycleBin")),
+                'Failed to retrieve data for content recycle bin');
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#sort
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Sorts all children below a given parent node id, based on a collection of node-ids
-          *
-          * ##usage
-          * <pre>
-          * var ids = [123,34533,2334,23434];
-          * contentResource.sort({ parentId: 1244, sortedIds: ids })
-          *    .then(function() {
-          *        $scope.complete = true;
-          *    });
-          * </pre>
-          * @param {Object} args arguments object
-          * @param {Int} args.parentId the ID of the parent node
-          * @param {Array} options.sortedIds array of node IDs as they should be sorted
-          * @returns {Promise} resourcePromise object.
-          *
-          */
+         * @ngdoc method
+         * @name umbraco.resources.contentResource#sort
+         * @methodOf umbraco.resources.contentResource
+         *
+         * @description
+         * Sorts all children below a given parent node id, based on a collection of node-ids
+         *
+         * ##usage
+         * <pre>
+         * var ids = [123,34533,2334,23434];
+         * contentResource.sort({ parentId: 1244, sortedIds: ids })
+         *    .then(function() {
+         *        $scope.complete = true;
+         *    });
+         * </pre>
+         * @param {Object} args arguments object
+         * @param {Int} args.parentId the ID of the parent node
+         * @param {Array} options.sortedIds array of node IDs as they should be sorted
+         * @returns {Promise} resourcePromise object.
+         *
+         */
         sort: function (args) {
             if (!args) {
                 throw "args cannot be null";
@@ -102,37 +102,37 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
             }
 
             return umbRequestHelper.resourcePromise(
-                   $http.post(umbRequestHelper.getApiUrl("contentApiBaseUrl", "PostSort"),
-                         {
-                             parentId: args.parentId,
-                             idSortOrder: args.sortedIds
-                         }),
-                   'Failed to sort content');
+                $http.post(umbRequestHelper.getApiUrl("contentApiBaseUrl", "PostSort"),
+                    {
+                        parentId: args.parentId,
+                        idSortOrder: args.sortedIds
+                    }),
+                'Failed to sort content');
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#move
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Moves a node underneath a new parentId
-          *
-          * ##usage
-          * <pre>
-          * contentResource.move({ parentId: 1244, id: 123 })
-          *    .then(function() {
-          *        alert("node was moved");
-          *    }, function(err){
-          *      alert("node didnt move:" + err.data.Message);
-          *    });
-          * </pre>
-          * @param {Object} args arguments object
-          * @param {Int} args.idd the ID of the node to move
-          * @param {Int} args.parentId the ID of the parent node to move to
-          * @returns {Promise} resourcePromise object.
-          *
-          */
+         * @ngdoc method
+         * @name umbraco.resources.contentResource#move
+         * @methodOf umbraco.resources.contentResource
+         *
+         * @description
+         * Moves a node underneath a new parentId
+         *
+         * ##usage
+         * <pre>
+         * contentResource.move({ parentId: 1244, id: 123 })
+         *    .then(function() {
+         *        alert("node was moved");
+         *    }, function(err){
+         *      alert("node didnt move:" + err.data.Message);
+         *    });
+         * </pre>
+         * @param {Object} args arguments object
+         * @param {Int} args.idd the ID of the node to move
+         * @param {Int} args.parentId the ID of the parent node to move to
+         * @returns {Promise} resourcePromise object.
+         *
+         */
         move: function (args) {
             if (!args) {
                 throw "args cannot be null";
@@ -145,38 +145,38 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
             }
 
             return umbRequestHelper.resourcePromise(
-                   $http.post(umbRequestHelper.getApiUrl("contentApiBaseUrl", "PostMove"),
-                         {
-                             parentId: args.parentId,
-                             id: args.id
-                         }),
-                   'Failed to move content');
+                $http.post(umbRequestHelper.getApiUrl("contentApiBaseUrl", "PostMove"),
+                    {
+                        parentId: args.parentId,
+                        id: args.id
+                    }),
+                'Failed to move content');
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#copy
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Copies a node underneath a new parentId
-          *
-          * ##usage
-          * <pre>
-          * contentResource.copy({ parentId: 1244, id: 123 })
-          *    .then(function() {
-          *        alert("node was copied");
-          *    }, function(err){
-          *      alert("node wasnt copy:" + err.data.Message);
-          *    });
-          * </pre>
-          * @param {Object} args arguments object
-          * @param {Int} args.id the ID of the node to copy
-          * @param {Int} args.parentId the ID of the parent node to copy to
-          * @param {Boolean} args.relateToOriginal if true, relates the copy to the original through the relation api
-          * @returns {Promise} resourcePromise object.
-          *
-          */
+         * @ngdoc method
+         * @name umbraco.resources.contentResource#copy
+         * @methodOf umbraco.resources.contentResource
+         *
+         * @description
+         * Copies a node underneath a new parentId
+         *
+         * ##usage
+         * <pre>
+         * contentResource.copy({ parentId: 1244, id: 123 })
+         *    .then(function() {
+         *        alert("node was copied");
+         *    }, function(err){
+         *      alert("node wasnt copy:" + err.data.Message);
+         *    });
+         * </pre>
+         * @param {Object} args arguments object
+         * @param {Int} args.id the ID of the node to copy
+         * @param {Int} args.parentId the ID of the parent node to copy to
+         * @param {Boolean} args.relateToOriginal if true, relates the copy to the original through the relation api
+         * @returns {Promise} resourcePromise object.
+         *
+         */
         copy: function (args) {
             if (!args) {
                 throw "args cannot be null";
@@ -189,169 +189,152 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
             }
 
             return umbRequestHelper.resourcePromise(
-                   $http.post(umbRequestHelper.getApiUrl("contentApiBaseUrl", "PostCopy"),
-                         args),
-                   'Failed to copy content');
+                $http.post(umbRequestHelper.getApiUrl("contentApiBaseUrl", "PostCopy"),
+                    args),
+                'Failed to copy content');
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#unPublish
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Unpublishes a content item with a given Id
-          *
-          * ##usage
-          * <pre>
-          * contentResource.unPublish(1234)
-          *    .then(function() {
-          *        alert("node was unpulished");
-          *    }, function(err){
-          *      alert("node wasnt unpublished:" + err.data.Message);
-          *    });
-          * </pre>
-          * @param {Int} id the ID of the node to unpublish
-          * @returns {Promise} resourcePromise object.
-          *
-          */
+         * @ngdoc method
+         * @name umbraco.resources.contentResource#unPublish
+         * @methodOf umbraco.resources.contentResource
+         *
+         * @description
+         * Unpublishes a content item with a given Id
+         *
+         * ##usage
+         * <pre>
+         * contentResource.unPublish(1234)
+         *    .then(function() {
+         *        alert("node was unpulished");
+         *    }, function(err){
+         *      alert("node wasnt unpublished:" + err.data.Message);
+         *    });
+         * </pre>
+         * @param {Int} id the ID of the node to unpublish
+         * @returns {Promise} resourcePromise object.
+         *
+         */
         unPublish: function (id) {
             if (!id) {
                 throw "id cannot be null";
             }
 
             return umbRequestHelper.resourcePromise(
-                                    $http.post(
-                                          umbRequestHelper.getApiUrl(
-                                                "contentApiBaseUrl",
-                                                "PostUnPublish",
-                                                [{ id: id }])),
-                                    'Failed to publish content with id ' + id);
+                $http.post(
+                    umbRequestHelper.getApiUrl(
+                        "contentApiBaseUrl",
+                        "PostUnPublish",
+                        [{ id: id }])),
+                'Failed to publish content with id ' + id);
         },
         /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#emptyRecycleBin
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Empties the content recycle bin
-          *
-          * ##usage
-          * <pre>
-          * contentResource.emptyRecycleBin()
-          *    .then(function() {
-          *        alert('its empty!');
-          *    });
-          * </pre>
-          *
-          * @returns {Promise} resourcePromise object.
-          *
-          */
+         * @ngdoc method
+         * @name umbraco.resources.contentResource#emptyRecycleBin
+         * @methodOf umbraco.resources.contentResource
+         *
+         * @description
+         * Empties the content recycle bin
+         *
+         * ##usage
+         * <pre>
+         * contentResource.emptyRecycleBin()
+         *    .then(function() {
+         *        alert('its empty!');
+         *    });
+         * </pre>
+         *
+         * @returns {Promise} resourcePromise object.
+         *
+         */
         emptyRecycleBin: function () {
             return umbRequestHelper.resourcePromise(
-                   $http.post(
-                         umbRequestHelper.getApiUrl(
-                               "contentApiBaseUrl",
-                               "EmptyRecycleBin")),
-                   'Failed to empty the recycle bin');
+                $http.post(
+                    umbRequestHelper.getApiUrl(
+                        "contentApiBaseUrl",
+                        "EmptyRecycleBin")),
+                'Failed to empty the recycle bin');
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#deleteById
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Deletes a content item with a given id
-          *
-          * ##usage
-          * <pre>
-          * contentResource.deleteById(1234)
-          *    .then(function() {
-          *        alert('its gone!');
-          *    });
-          * </pre>
-          *
-          * @param {Int} id id of content item to delete
-          * @returns {Promise} resourcePromise object.
-          *
-          */
+         * @ngdoc method
+         * @name umbraco.resources.contentResource#deleteById
+         * @methodOf umbraco.resources.contentResource
+         *
+         * @description
+         * Deletes a content item with a given id
+         *
+         * ##usage
+         * <pre>
+         * contentResource.deleteById(1234)
+         *    .then(function() {
+         *        alert('its gone!');
+         *    });
+         * </pre>
+         *
+         * @param {Int} id id of content item to delete
+         * @returns {Promise} resourcePromise object.
+         *
+         */
         deleteById: function (id) {
             return umbRequestHelper.resourcePromise(
-                   $http.post(
-                         umbRequestHelper.getApiUrl(
-                               "contentApiBaseUrl",
-                               "DeleteById",
-                               [{ id: id }])),
-                   'Failed to delete item ' + id);
+                $http.post(
+                    umbRequestHelper.getApiUrl(
+                        "contentApiBaseUrl",
+                        "DeleteById",
+                        [{ id: id }])),
+                'Failed to delete item ' + id);
         },
 
         deleteBlueprint: function (id) {
-          return umbRequestHelper.resourcePromise(
-            $http.post(
-              umbRequestHelper.getApiUrl(
-                "contentApiBaseUrl",
-                "DeleteBlueprint",
-                [{ id: id }])),
-            'Failed to delete blueprint ' + id);
+            return umbRequestHelper.resourcePromise(
+                $http.post(
+                    umbRequestHelper.getApiUrl(
+                        "contentApiBaseUrl",
+                        "DeleteBlueprint",
+                        [{ id: id }])),
+                'Failed to delete blueprint ' + id);
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#getById
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Gets a content item with a given id
-          *
-          * ##usage
-          * <pre>
-          * contentResource.getById(1234)
-          *    .then(function(content) {
-          *        var myDoc = content;
-          *        alert('its here!');
-          *    });
-          * </pre>
-          *
-          * @param {Int} id id of content item to return
-          * @param {Object} options optional options object
-          * @param {Guid} options.dataTypeId set to determine whether to allow a user to choose nodes that they normally don't have access to
-          * @returns {Promise} resourcePromise object containing the content item.
-          *
-          */
-        getById: function (id, options) {
-            var defaults = {
-                dataTypeId: null
-            };
-            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 args = [{ id: id }];
-            if(options.dataTypeId){
-                args.push({ dataTypeId: options.dataTypeId });
-            }
+         * @ngdoc method
+         * @name umbraco.resources.contentResource#getById
+         * @methodOf umbraco.resources.contentResource
+         *
+         * @description
+         * Gets a content item with a given id
+         *
+         * ##usage
+         * <pre>
+         * contentResource.getById(1234)
+         *    .then(function(content) {
+         *        var myDoc = content;
+         *        alert('its here!');
+         *    });
+         * </pre>
+         *
+         * @param {Int} id id of content item to return
+         * @returns {Promise} resourcePromise object containing the content item.
+         *
+         */
+        getById: function (id) {
             return umbRequestHelper.resourcePromise(
-                  $http.get(
-                        umbRequestHelper.getApiUrl(
-                              "contentApiBaseUrl",
-                              "GetById",
-                                args)),
-                  'Failed to retrieve data for content id ' + id);
+                $http.get(
+                    umbRequestHelper.getApiUrl(
+                        "contentApiBaseUrl",
+                        "GetById",
+                        [{ id: id }])),
+                'Failed to retrieve data for content id ' + id);
         },
 
         getBlueprintById: function (id) {
-          return umbRequestHelper.resourcePromise(
-            $http.get(
-              umbRequestHelper.getApiUrl(
-                "contentApiBaseUrl",
-                "GetBlueprintById",
-                [{ id: id }])),
-            'Failed to retrieve data for content id ' + id);
+            return umbRequestHelper.resourcePromise(
+                $http.get(
+                    umbRequestHelper.getApiUrl(
+                        "contentApiBaseUrl",
+                        "GetBlueprintById",
+                        [{ id: id }])),
+                'Failed to retrieve data for content id ' + id);
         },
 
         getNotifySettingsById: function (id) {
@@ -378,26 +361,26 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#getByIds
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Gets an array of content items, given a collection of ids
-          *
-          * ##usage
-          * <pre>
-          * contentResource.getByIds( [1234,2526,28262])
-          *    .then(function(contentArray) {
-          *        var myDoc = contentArray;
-          *        alert('they are here!');
-          *    });
-          * </pre>
-          *
-          * @param {Array} ids ids of content items to return as an array
-          * @returns {Promise} resourcePromise object containing the content items array.
-          *
-          */
+         * @ngdoc method
+         * @name umbraco.resources.contentResource#getByIds
+         * @methodOf umbraco.resources.contentResource
+         *
+         * @description
+         * Gets an array of content items, given a collection of ids
+         *
+         * ##usage
+         * <pre>
+         * contentResource.getByIds( [1234,2526,28262])
+         *    .then(function(contentArray) {
+         *        var myDoc = contentArray;
+         *        alert('they are here!');
+         *    });
+         * </pre>
+         *
+         * @param {Array} ids ids of content items to return as an array
+         * @returns {Promise} resourcePromise object containing the content items array.
+         *
+         */
         getByIds: function (ids) {
 
             var idQuery = "";
@@ -406,125 +389,125 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
             });
 
             return umbRequestHelper.resourcePromise(
-                  $http.get(
-                        umbRequestHelper.getApiUrl(
-                              "contentApiBaseUrl",
-                              "GetByIds",
-                              idQuery)),
-                  'Failed to retrieve data for content with multiple ids');
+                $http.get(
+                    umbRequestHelper.getApiUrl(
+                        "contentApiBaseUrl",
+                        "GetByIds",
+                        idQuery)),
+                'Failed to retrieve data for content with multiple ids');
         },
 
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#getScaffold
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Returns a scaffold of an empty content item, given the id of the content item to place it underneath and the content type alias.
-          *
-          * - Parent Id must be provided so umbraco knows where to store the content
-          * - Content Type alias must be provided so umbraco knows which properties to put on the content scaffold
-          *
-          * The scaffold is used to build editors for content that has not yet been populated with data.
-          *
-          * ##usage
-          * <pre>
-          * contentResource.getScaffold(1234, 'homepage')
-          *    .then(function(scaffold) {
-          *        var myDoc = scaffold;
-          *        myDoc.name = "My new document";
-          *
-          *        contentResource.publish(myDoc, true)
-          *            .then(function(content){
-          *                alert("Retrieved, updated and published again");
-          *            });
-          *    });
-          * </pre>
-          *
-          * @param {Int} parentId id of content item to return
-          * @param {String} alias contenttype alias to base the scaffold on
-          * @returns {Promise} resourcePromise object containing the content scaffold.
-          *
-          */
+         * @ngdoc method
+         * @name umbraco.resources.contentResource#getScaffold
+         * @methodOf umbraco.resources.contentResource
+         *
+         * @description
+         * Returns a scaffold of an empty content item, given the id of the content item to place it underneath and the content type alias.
+         *
+         * - Parent Id must be provided so umbraco knows where to store the content
+         * - Content Type alias must be provided so umbraco knows which properties to put on the content scaffold
+         *
+         * The scaffold is used to build editors for content that has not yet been populated with data.
+         *
+         * ##usage
+         * <pre>
+         * contentResource.getScaffold(1234, 'homepage')
+         *    .then(function(scaffold) {
+         *        var myDoc = scaffold;
+         *        myDoc.name = "My new document";
+         *
+         *        contentResource.publish(myDoc, true)
+         *            .then(function(content){
+         *                alert("Retrieved, updated and published again");
+         *            });
+         *    });
+         * </pre>
+         *
+         * @param {Int} parentId id of content item to return
+         * @param {String} alias contenttype alias to base the scaffold on
+         * @returns {Promise} resourcePromise object containing the content scaffold.
+         *
+         */
         getScaffold: function (parentId, alias) {
 
             return umbRequestHelper.resourcePromise(
-                  $http.get(
-                        umbRequestHelper.getApiUrl(
-                              "contentApiBaseUrl",
-                              "GetEmpty",
-                              [{ contentTypeAlias: alias }, { parentId: parentId }])),
-                  'Failed to retrieve data for empty content item type ' + alias);
+                $http.get(
+                    umbRequestHelper.getApiUrl(
+                        "contentApiBaseUrl",
+                        "GetEmpty",
+                        [{ contentTypeAlias: alias }, { parentId: parentId }])),
+                'Failed to retrieve data for empty content item type ' + alias);
         },
 
         getBlueprintScaffold: function (parentId, blueprintId) {
 
-          return umbRequestHelper.resourcePromise(
-            $http.get(
-              umbRequestHelper.getApiUrl(
-                "contentApiBaseUrl",
-                      "GetEmpty",
-                      [{ blueprintId: blueprintId }, { parentId: parentId}])),
-            'Failed to retrieve blueprint for id ' + blueprintId);
+            return umbRequestHelper.resourcePromise(
+                $http.get(
+                    umbRequestHelper.getApiUrl(
+                        "contentApiBaseUrl",
+                        "GetEmpty",
+                        [{ blueprintId: blueprintId }, { parentId: parentId}])),
+                'Failed to retrieve blueprint for id ' + blueprintId);
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#getNiceUrl
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Returns a url, given a node ID
-          *
-          * ##usage
-          * <pre>
-          * contentResource.getNiceUrl(id)
-          *    .then(function(url) {
-          *        alert('its here!');
-          *    });
-          * </pre>
-          *
-          * @param {Int} id Id of node to return the public url to
-          * @returns {Promise} resourcePromise object containing the url.
-          *
-          */
+         * @ngdoc method
+         * @name umbraco.resources.contentResource#getNiceUrl
+         * @methodOf umbraco.resources.contentResource
+         *
+         * @description
+         * Returns a url, given a node ID
+         *
+         * ##usage
+         * <pre>
+         * contentResource.getNiceUrl(id)
+         *    .then(function(url) {
+         *        alert('its here!');
+         *    });
+         * </pre>
+         *
+         * @param {Int} id Id of node to return the public url to
+         * @returns {Promise} resourcePromise object containing the url.
+         *
+         */
         getNiceUrl: function (id) {
             return umbRequestHelper.resourcePromise(
-                  $http.get(
-                        umbRequestHelper.getApiUrl(
-                              "contentApiBaseUrl",
-                              "GetNiceUrl", [{ id: id }])),
-                  'Failed to retrieve url for id:' + id);
+                $http.get(
+                    umbRequestHelper.getApiUrl(
+                        "contentApiBaseUrl",
+                        "GetNiceUrl", [{ id: id }])),
+                'Failed to retrieve url for id:' + id);
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#getChildren
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Gets children of a content item with a given id
-          *
-          * ##usage
-          * <pre>
-          * contentResource.getChildren(1234, {pageSize: 10, pageNumber: 2})
-          *    .then(function(contentArray) {
-          *        var children = contentArray;
-          *        alert('they are here!');
-          *    });
-          * </pre>
-          *
-          * @param {Int} parentid id of content item to return children of
-          * @param {Object} options optional options object
-          * @param {Int} options.pageSize if paging data, number of nodes per page, default = 0
-          * @param {Int} options.pageNumber if paging data, current page index, default = 0
-          * @param {String} options.filter if provided, query will only return those with names matching the filter
-          * @param {String} options.orderDirection can be `Ascending` or `Descending` - Default: `Ascending`
-          * @param {String} options.orderBy property to order items by, default: `SortOrder`
-          * @returns {Promise} resourcePromise object containing an array of content items.
-          *
-          */
+         * @ngdoc method
+         * @name umbraco.resources.contentResource#getChildren
+         * @methodOf umbraco.resources.contentResource
+         *
+         * @description
+         * Gets children of a content item with a given id
+         *
+         * ##usage
+         * <pre>
+         * contentResource.getChildren(1234, {pageSize: 10, pageNumber: 2})
+         *    .then(function(contentArray) {
+         *        var children = contentArray;
+         *        alert('they are here!');
+         *    });
+         * </pre>
+         *
+         * @param {Int} parentid id of content item to return children of
+         * @param {Object} options optional options object
+         * @param {Int} options.pageSize if paging data, number of nodes per page, default = 0
+         * @param {Int} options.pageNumber if paging data, current page index, default = 0
+         * @param {String} options.filter if provided, query will only return those with names matching the filter
+         * @param {String} options.orderDirection can be `Ascending` or `Descending` - Default: `Ascending`
+         * @param {String} options.orderBy property to order items by, default: `SortOrder`
+         * @returns {Promise} resourcePromise object containing an array of content items.
+         *
+         */
         getChildren: function (parentId, options) {
 
             var defaults = {
@@ -584,44 +567,44 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#hasPermission
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Returns true/false given a permission char to check against a nodeID
-          * for the current user
-          *
-          * ##usage
-          * <pre>
-          * contentResource.hasPermission('p',1234)
-          *    .then(function() {
-          *        alert('You are allowed to publish this item');
-          *    });
-          * </pre>
-          *
-          * @param {String} permission char representing the permission to check
-          * @param {Int} id id of content item to delete
-          * @returns {Promise} resourcePromise object.
-          *
-          */
+         * @ngdoc method
+         * @name umbraco.resources.contentResource#hasPermission
+         * @methodOf umbraco.resources.contentResource
+         *
+         * @description
+         * Returns true/false given a permission char to check against a nodeID
+         * for the current user
+         *
+         * ##usage
+         * <pre>
+         * contentResource.hasPermission('p',1234)
+         *    .then(function() {
+         *        alert('You are allowed to publish this item');
+         *    });
+         * </pre>
+         *
+         * @param {String} permission char representing the permission to check
+         * @param {Int} id id of content item to delete
+         * @returns {Promise} resourcePromise object.
+         *
+         */
         checkPermission: function (permission, id) {
             return umbRequestHelper.resourcePromise(
-                   $http.get(
-                         umbRequestHelper.getApiUrl(
-                               "contentApiBaseUrl",
-                               "HasPermission",
-                               [{ permissionToCheck: permission }, { nodeId: id }])),
-                   'Failed to check permission for item ' + id);
+                $http.get(
+                    umbRequestHelper.getApiUrl(
+                        "contentApiBaseUrl",
+                        "HasPermission",
+                        [{ permissionToCheck: permission }, { nodeId: id }])),
+                'Failed to check permission for item ' + id);
         },
 
         getDetailedPermissions: function (contentId) {
-          return umbRequestHelper.resourcePromise(
-            $http.get(
-              umbRequestHelper.getApiUrl(
-                "contentApiBaseUrl",
-                "GetDetailedPermissions", { contentId: contentId })),
-            'Failed to retrieve permissions for content item ' + contentId);
+            return umbRequestHelper.resourcePromise(
+                $http.get(
+                    umbRequestHelper.getApiUrl(
+                        "contentApiBaseUrl",
+                        "GetDetailedPermissions", { contentId: contentId })),
+                'Failed to retrieve permissions for content item ' + contentId);
         },
 
         getPermissions: function (nodeIds) {
@@ -635,136 +618,136 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#save
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Saves changes made to a content item to its current version, if the content item is new, the isNew paramater must be passed to force creation
-          * if the content item needs to have files attached, they must be provided as the files param and passed separately
-          *
-          *
-          * ##usage
-          * <pre>
-          * contentResource.getById(1234)
-          *    .then(function(content) {
-          *          content.name = "I want a new name!";
-          *          contentResource.save(content, false)
-          *            .then(function(content){
-          *                alert("Retrieved, updated and saved again");
-          *            });
-          *    });
-          * </pre>
-          *
-          * @param {Object} content The content item object with changes applied
-          * @param {Bool} isNew set to true to create a new item or to update an existing
-          * @param {Array} files collection of files for the document
-          * @returns {Promise} resourcePromise object containing the saved content item.
-          *
-          */
+         * @ngdoc method
+         * @name umbraco.resources.contentResource#save
+         * @methodOf umbraco.resources.contentResource
+         *
+         * @description
+         * Saves changes made to a content item to its current version, if the content item is new, the isNew paramater must be passed to force creation
+         * if the content item needs to have files attached, they must be provided as the files param and passed separately
+         *
+         *
+         * ##usage
+         * <pre>
+         * contentResource.getById(1234)
+         *    .then(function(content) {
+         *          content.name = "I want a new name!";
+         *          contentResource.save(content, false)
+         *            .then(function(content){
+         *                alert("Retrieved, updated and saved again");
+         *            });
+         *    });
+         * </pre>
+         *
+         * @param {Object} content The content item object with changes applied
+         * @param {Bool} isNew set to true to create a new item or to update an existing
+         * @param {Array} files collection of files for the document
+         * @returns {Promise} resourcePromise object containing the saved content item.
+         *
+         */
         save: function (content, isNew, files) {
-          var endpoint = umbRequestHelper.getApiUrl(
-            "contentApiBaseUrl",
-            "PostSave");
-          return saveContentItem(content, "save" + (isNew ? "New" : ""), files, endpoint);
+            var endpoint = umbRequestHelper.getApiUrl(
+                "contentApiBaseUrl",
+                "PostSave");
+            return saveContentItem(content, "save" + (isNew ? "New" : ""), files, endpoint);
         },
 
         saveBlueprint: function (content, isNew, files) {
-          var endpoint = umbRequestHelper.getApiUrl(
-            "contentApiBaseUrl",
-            "PostSaveBlueprint");
-          return saveContentItem(content, "save" + (isNew ? "New" : ""), files, endpoint);
+            var endpoint = umbRequestHelper.getApiUrl(
+                "contentApiBaseUrl",
+                "PostSaveBlueprint");
+            return saveContentItem(content, "save" + (isNew ? "New" : ""), files, endpoint);
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#publish
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Saves and publishes changes made to a content item to a new version, if the content item is new, the isNew paramater must be passed to force creation
-          * if the content item needs to have files attached, they must be provided as the files param and passed separately
-          *
-          *
-          * ##usage
-          * <pre>
-          * contentResource.getById(1234)
-          *    .then(function(content) {
-          *          content.name = "I want a new name, and be published!";
-          *          contentResource.publish(content, false)
-          *            .then(function(content){
-          *                alert("Retrieved, updated and published again");
-          *            });
-          *    });
-          * </pre>
-          *
-          * @param {Object} content The content item object with changes applied
-          * @param {Bool} isNew set to true to create a new item or to update an existing
-          * @param {Array} files collection of files for the document
-          * @returns {Promise} resourcePromise object containing the saved content item.
-          *
-          */
+         * @ngdoc method
+         * @name umbraco.resources.contentResource#publish
+         * @methodOf umbraco.resources.contentResource
+         *
+         * @description
+         * Saves and publishes changes made to a content item to a new version, if the content item is new, the isNew paramater must be passed to force creation
+         * if the content item needs to have files attached, they must be provided as the files param and passed separately
+         *
+         *
+         * ##usage
+         * <pre>
+         * contentResource.getById(1234)
+         *    .then(function(content) {
+         *          content.name = "I want a new name, and be published!";
+         *          contentResource.publish(content, false)
+         *            .then(function(content){
+         *                alert("Retrieved, updated and published again");
+         *            });
+         *    });
+         * </pre>
+         *
+         * @param {Object} content The content item object with changes applied
+         * @param {Bool} isNew set to true to create a new item or to update an existing
+         * @param {Array} files collection of files for the document
+         * @returns {Promise} resourcePromise object containing the saved content item.
+         *
+         */
         publish: function (content, isNew, files) {
-          var endpoint = umbRequestHelper.getApiUrl(
-            "contentApiBaseUrl",
-            "PostSave");
-          return saveContentItem(content, "publish" + (isNew ? "New" : ""), files, endpoint);
+            var endpoint = umbRequestHelper.getApiUrl(
+                "contentApiBaseUrl",
+                "PostSave");
+            return saveContentItem(content, "publish" + (isNew ? "New" : ""), files, endpoint);
         },
 
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#sendToPublish
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Saves changes made to a content item, and notifies any subscribers about a pending publication
-          *
-          * ##usage
-          * <pre>
-          * contentResource.getById(1234)
-          *    .then(function(content) {
-          *          content.name = "I want a new name, and be published!";
-          *          contentResource.sendToPublish(content, false)
-          *            .then(function(content){
-          *                alert("Retrieved, updated and notication send off");
-          *            });
-          *    });
-          * </pre>
-          *
-          * @param {Object} content The content item object with changes applied
-          * @param {Bool} isNew set to true to create a new item or to update an existing
-          * @param {Array} files collection of files for the document
-          * @returns {Promise} resourcePromise object containing the saved content item.
-          *
-          */
+         * @ngdoc method
+         * @name umbraco.resources.contentResource#sendToPublish
+         * @methodOf umbraco.resources.contentResource
+         *
+         * @description
+         * Saves changes made to a content item, and notifies any subscribers about a pending publication
+         *
+         * ##usage
+         * <pre>
+         * contentResource.getById(1234)
+         *    .then(function(content) {
+         *          content.name = "I want a new name, and be published!";
+         *          contentResource.sendToPublish(content, false)
+         *            .then(function(content){
+         *                alert("Retrieved, updated and notication send off");
+         *            });
+         *    });
+         * </pre>
+         *
+         * @param {Object} content The content item object with changes applied
+         * @param {Bool} isNew set to true to create a new item or to update an existing
+         * @param {Array} files collection of files for the document
+         * @returns {Promise} resourcePromise object containing the saved content item.
+         *
+         */
         sendToPublish: function (content, isNew, files) {
-          var endpoint = umbRequestHelper.getApiUrl(
-            "contentApiBaseUrl",
-            "PostSave");
-          return saveContentItem(content, "sendPublish" + (isNew ? "New" : ""), files, endpoint);
+            var endpoint = umbRequestHelper.getApiUrl(
+                "contentApiBaseUrl",
+                "PostSave");
+            return saveContentItem(content, "sendPublish" + (isNew ? "New" : ""), files, endpoint);
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#publishByid
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Publishes a content item with a given ID
-          *
-          * ##usage
-          * <pre>
-          * contentResource.publishById(1234)
-          *    .then(function(content) {
-          *        alert("published");
-          *    });
-          * </pre>
-          *
-          * @param {Int} id The ID of the conten to publish
-          * @returns {Promise} resourcePromise object containing the published content item.
-          *
-          */
+         * @ngdoc method
+         * @name umbraco.resources.contentResource#publishByid
+         * @methodOf umbraco.resources.contentResource
+         *
+         * @description
+         * Publishes a content item with a given ID
+         *
+         * ##usage
+         * <pre>
+         * contentResource.publishById(1234)
+         *    .then(function(content) {
+         *        alert("published");
+         *    });
+         * </pre>
+         *
+         * @param {Int} id The ID of the conten to publish
+         * @returns {Promise} resourcePromise object containing the published content item.
+         *
+         */
         publishById: function (id) {
 
             if (!id) {
@@ -772,12 +755,12 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
             }
 
             return umbRequestHelper.resourcePromise(
-                                    $http.post(
-                                          umbRequestHelper.getApiUrl(
-                                                "contentApiBaseUrl",
-                                                "PostPublishById",
-                                                [{ id: id }])),
-                                    'Failed to publish content with id ' + id);
+                $http.post(
+                    umbRequestHelper.getApiUrl(
+                        "contentApiBaseUrl",
+                        "PostPublishById",
+                        [{ id: id }])),
+                'Failed to publish content with id ' + id);
 
         },
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
index db5e9dd404..416fd0a286 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
@@ -172,14 +172,14 @@ function entityResource($q, $http, umbRequestHelper) {
                     umbRequestHelper.getApiUrl(
                         "entityApiBaseUrl",
                         "GetUrlAndAnchors",
-                        [{ id: id }])),
+                        { id: id })),
                 'Failed to retrieve url and anchors data for id ' + id);
         },
 
 
         getAnchors: function (rteContent) {
 
-            if (rteContent == null || rteContent.length === 0) {
+            if (!rteContent || rteContent.length === 0) {
                 return [];
             }
 
@@ -188,7 +188,7 @@ function entityResource($q, $http, umbRequestHelper) {
                     umbRequestHelper.getApiUrl(
                         "entityApiBaseUrl",
                         "GetAnchors",
-                        [{ rteContent: rteContent }])),
+                        { rteContent: rteContent })),
                 'Failed to anchors data for rte content ' + rteContent);
         },
 
@@ -543,19 +543,16 @@ function entityResource($q, $http, umbRequestHelper) {
          * @returns {Promise} resourcePromise object containing the entity array.
          *
          */
-        search: function (query, type, options, canceler) {
+        search: function (query, type, searchFrom, canceler, dataTypeId) {
 
-            var defaults = {
-                searchFrom: null,
-                dataTypeId: null
-            };
-            if (options === undefined) {
-                options = {};
+            var args = [{ query: query }, { type: type }];
+            if (searchFrom) {
+                args.push({ searchFrom: searchFrom });
+            }
+
+            if (dataTypeId) {
+                args.push({ dataTypeId: dataTypeId });
             }
-            //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) {
@@ -567,12 +564,7 @@ function entityResource($q, $http, umbRequestHelper) {
                     umbRequestHelper.getApiUrl(
                         "entityApiBaseUrl",
                         "Search",
-                        {
-                            query: query,
-                            type: type,
-                            searchFrom: options.searchFrom,
-                            dataTypeId: options.dataTypeId
-                        }),
+                        args),
                     httpConfig),
                 'Failed to retrieve entity data for query ' + query);
         },
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
index 6600aec0c7..ab5b88f841 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
@@ -1,16 +1,16 @@
 /**
-    * @ngdoc service
-    * @name umbraco.resources.mediaResource
-    * @description Loads in data for media
-    **/
+ * @ngdoc service
+ * @name umbraco.resources.mediaResource
+ * @description Loads in data for media
+ **/
 function mediaResource($q, $http, umbDataFormatter, umbRequestHelper) {
 
     /** internal method process the saving of data and post processing the result */
     function saveMediaItem(content, action, files) {
         return umbRequestHelper.postSaveContent({
             restApiUrl: umbRequestHelper.getApiUrl(
-                   "mediaApiBaseUrl",
-                   "PostSave"),
+                "mediaApiBaseUrl",
+                "PostSave"),
             content: content,
             action: action,
             files: files,
@@ -24,35 +24,35 @@ function mediaResource($q, $http, umbDataFormatter, umbRequestHelper) {
 
         getRecycleBin: function () {
             return umbRequestHelper.resourcePromise(
-                  $http.get(
-                        umbRequestHelper.getApiUrl(
-                              "mediaApiBaseUrl",
-                              "GetRecycleBin")),
-                  'Failed to retrieve data for media recycle bin');
+                $http.get(
+                    umbRequestHelper.getApiUrl(
+                        "mediaApiBaseUrl",
+                        "GetRecycleBin")),
+                'Failed to retrieve data for media recycle bin');
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.mediaResource#sort
-          * @methodOf umbraco.resources.mediaResource
-          *
-          * @description
-          * Sorts all children below a given parent node id, based on a collection of node-ids
-          *
-          * ##usage
-          * <pre>
-          * var ids = [123,34533,2334,23434];
-          * mediaResource.sort({ sortedIds: ids })
-          *    .then(function() {
-          *        $scope.complete = true;
-          *    });
-          * </pre>
-          * @param {Object} args arguments object
-          * @param {Int} args.parentId the ID of the parent node
-          * @param {Array} options.sortedIds array of node IDs as they should be sorted
-          * @returns {Promise} resourcePromise object.
-          *
-          */
+         * @ngdoc method
+         * @name umbraco.resources.mediaResource#sort
+         * @methodOf umbraco.resources.mediaResource
+         *
+         * @description
+         * Sorts all children below a given parent node id, based on a collection of node-ids
+         *
+         * ##usage
+         * <pre>
+         * var ids = [123,34533,2334,23434];
+         * mediaResource.sort({ sortedIds: ids })
+         *    .then(function() {
+         *        $scope.complete = true;
+         *    });
+         * </pre>
+         * @param {Object} args arguments object
+         * @param {Int} args.parentId the ID of the parent node
+         * @param {Array} options.sortedIds array of node IDs as they should be sorted
+         * @returns {Promise} resourcePromise object.
+         *
+         */
         sort: function (args) {
             if (!args) {
                 throw "args cannot be null";
@@ -65,37 +65,37 @@ function mediaResource($q, $http, umbDataFormatter, umbRequestHelper) {
             }
 
             return umbRequestHelper.resourcePromise(
-                   $http.post(umbRequestHelper.getApiUrl("mediaApiBaseUrl", "PostSort"),
-                         {
-                             parentId: args.parentId,
-                             idSortOrder: args.sortedIds
-                         }),
-                   'Failed to sort media');
+                $http.post(umbRequestHelper.getApiUrl("mediaApiBaseUrl", "PostSort"),
+                    {
+                        parentId: args.parentId,
+                        idSortOrder: args.sortedIds
+                    }),
+                'Failed to sort media');
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.mediaResource#move
-          * @methodOf umbraco.resources.mediaResource
-          *
-          * @description
-          * Moves a node underneath a new parentId
-          *
-          * ##usage
-          * <pre>
-          * mediaResource.move({ parentId: 1244, id: 123 })
-          *    .then(function() {
-          *        alert("node was moved");
-          *    }, function(err){
-          *      alert("node didnt move:" + err.data.Message);
-          *    });
-          * </pre>
-          * @param {Object} args arguments object
-          * @param {Int} args.idd the ID of the node to move
-          * @param {Int} args.parentId the ID of the parent node to move to
-          * @returns {Promise} resourcePromise object.
-          *
-          */
+         * @ngdoc method
+         * @name umbraco.resources.mediaResource#move
+         * @methodOf umbraco.resources.mediaResource
+         *
+         * @description
+         * Moves a node underneath a new parentId
+         *
+         * ##usage
+         * <pre>
+         * mediaResource.move({ parentId: 1244, id: 123 })
+         *    .then(function() {
+         *        alert("node was moved");
+         *    }, function(err){
+         *      alert("node didnt move:" + err.data.Message);
+         *    });
+         * </pre>
+         * @param {Object} args arguments object
+         * @param {Int} args.idd the ID of the node to move
+         * @param {Int} args.parentId the ID of the parent node to move to
+         * @returns {Promise} resourcePromise object.
+         *
+         */
         move: function (args) {
             if (!args) {
                 throw "args cannot be null";
@@ -108,121 +108,121 @@ function mediaResource($q, $http, umbDataFormatter, umbRequestHelper) {
             }
 
             return umbRequestHelper.resourcePromise(
-                   $http.post(umbRequestHelper.getApiUrl("mediaApiBaseUrl", "PostMove"),
-                        {
-                            parentId: args.parentId,
-                            id: args.id
-                        }),
-                        {
-                        error: function(data){
-                            var errorMsg = 'Failed to move media';
-                            if (data.id !== undefined && data.parentId !== undefined) {
-                                if (data.id === data.parentId) {
-                                    errorMsg = 'Media can\'t be moved into itself';
-                                }
-                            }
-                            else if (data.notifications !== undefined) {
-                                if (data.notifications.length > 0) {
-                                    if (data.notifications[0].header.length > 0) {
-                                        errorMsg = data.notifications[0].header;
-                                    }
-                                    if (data.notifications[0].message.length > 0) {
-                                        errorMsg = errorMsg + ": " + data.notifications[0].message;
-                                    }
+                $http.post(umbRequestHelper.getApiUrl("mediaApiBaseUrl", "PostMove"),
+                    {
+                        parentId: args.parentId,
+                        id: args.id
+                    }),
+                {
+                    error: function(data){
+                        var errorMsg = 'Failed to move media';
+                        if (data.id !== undefined && data.parentId !== undefined) {
+                            if (data.id === data.parentId) {
+                                errorMsg = 'Media can\'t be moved into itself';
+                            }
+                        }
+                        else if (data.notifications !== undefined) {
+                            if (data.notifications.length > 0) {
+                                if (data.notifications[0].header.length > 0) {
+                                    errorMsg = data.notifications[0].header;
+                                }
+                                if (data.notifications[0].message.length > 0) {
+                                    errorMsg = errorMsg + ": " + data.notifications[0].message;
                                 }
                             }
+                        }
 
-                            return {
-                                errorMsg: errorMsg
-                            };
-                       }
-                   });
+                        return {
+                            errorMsg: errorMsg
+                        };
+                    }
+                });
         },
 
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.mediaResource#getById
-          * @methodOf umbraco.resources.mediaResource
-          *
-          * @description
-          * Gets a media item with a given id
-          *
-          * ##usage
-          * <pre>
-          * mediaResource.getById(1234)
-          *    .then(function(media) {
-          *        var myMedia = media;
-          *        alert('its here!');
-          *    });
-          * </pre>
-          *
-          * @param {Int} id id of media item to return
-          * @returns {Promise} resourcePromise object containing the media item.
-          *
-          */
+         * @ngdoc method
+         * @name umbraco.resources.mediaResource#getById
+         * @methodOf umbraco.resources.mediaResource
+         *
+         * @description
+         * Gets a media item with a given id
+         *
+         * ##usage
+         * <pre>
+         * mediaResource.getById(1234)
+         *    .then(function(media) {
+         *        var myMedia = media;
+         *        alert('its here!');
+         *    });
+         * </pre>
+         *
+         * @param {Int} id id of media item to return
+         * @returns {Promise} resourcePromise object containing the media item.
+         *
+         */
         getById: function (id) {
 
             return umbRequestHelper.resourcePromise(
-                  $http.get(
-                        umbRequestHelper.getApiUrl(
-                              "mediaApiBaseUrl",
-                              "GetById",
-                              [{ id: id }])),
-                  'Failed to retrieve data for media id ' + id);
+                $http.get(
+                    umbRequestHelper.getApiUrl(
+                        "mediaApiBaseUrl",
+                        "GetById",
+                        [{ id: id }])),
+                'Failed to retrieve data for media id ' + id);
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.mediaResource#deleteById
-          * @methodOf umbraco.resources.mediaResource
-          *
-          * @description
-          * Deletes a media item with a given id
-          *
-          * ##usage
-          * <pre>
-          * mediaResource.deleteById(1234)
-          *    .then(function() {
-          *        alert('its gone!');
-          *    });
-          * </pre>
-          *
-          * @param {Int} id id of media item to delete
-          * @returns {Promise} resourcePromise object.
-          *
-          */
+         * @ngdoc method
+         * @name umbraco.resources.mediaResource#deleteById
+         * @methodOf umbraco.resources.mediaResource
+         *
+         * @description
+         * Deletes a media item with a given id
+         *
+         * ##usage
+         * <pre>
+         * mediaResource.deleteById(1234)
+         *    .then(function() {
+         *        alert('its gone!');
+         *    });
+         * </pre>
+         *
+         * @param {Int} id id of media item to delete
+         * @returns {Promise} resourcePromise object.
+         *
+         */
         deleteById: function (id) {
             return umbRequestHelper.resourcePromise(
-                   $http.post(
-                         umbRequestHelper.getApiUrl(
-                               "mediaApiBaseUrl",
-                               "DeleteById",
-                               [{ id: id }])),
-                   'Failed to delete item ' + id);
+                $http.post(
+                    umbRequestHelper.getApiUrl(
+                        "mediaApiBaseUrl",
+                        "DeleteById",
+                        [{ id: id }])),
+                'Failed to delete item ' + id);
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.mediaResource#getByIds
-          * @methodOf umbraco.resources.mediaResource
-          *
-          * @description
-          * Gets an array of media items, given a collection of ids
-          *
-          * ##usage
-          * <pre>
-          * mediaResource.getByIds( [1234,2526,28262])
-          *    .then(function(mediaArray) {
-          *        var myDoc = contentArray;
-          *        alert('they are here!');
-          *    });
-          * </pre>
-          *
-          * @param {Array} ids ids of media items to return as an array
-          * @returns {Promise} resourcePromise object containing the media items array.
-          *
-          */
+         * @ngdoc method
+         * @name umbraco.resources.mediaResource#getByIds
+         * @methodOf umbraco.resources.mediaResource
+         *
+         * @description
+         * Gets an array of media items, given a collection of ids
+         *
+         * ##usage
+         * <pre>
+         * mediaResource.getByIds( [1234,2526,28262])
+         *    .then(function(mediaArray) {
+         *        var myDoc = contentArray;
+         *        alert('they are here!');
+         *    });
+         * </pre>
+         *
+         * @param {Array} ids ids of media items to return as an array
+         * @returns {Promise} resourcePromise object containing the media items array.
+         *
+         */
         getByIds: function (ids) {
 
             var idQuery = "";
@@ -231,96 +231,96 @@ function mediaResource($q, $http, umbDataFormatter, umbRequestHelper) {
             });
 
             return umbRequestHelper.resourcePromise(
-                  $http.get(
-                        umbRequestHelper.getApiUrl(
-                              "mediaApiBaseUrl",
-                              "GetByIds",
-                              idQuery)),
-                  'Failed to retrieve data for media ids ' + ids);
+                $http.get(
+                    umbRequestHelper.getApiUrl(
+                        "mediaApiBaseUrl",
+                        "GetByIds",
+                        idQuery)),
+                'Failed to retrieve data for media ids ' + ids);
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.mediaResource#getScaffold
-          * @methodOf umbraco.resources.mediaResource
-          *
-          * @description
-          * Returns a scaffold of an empty media item, given the id of the media item to place it underneath and the media type alias.
-          *
-          * - Parent Id must be provided so umbraco knows where to store the media
-          * - Media Type alias must be provided so umbraco knows which properties to put on the media scaffold
-          *
-          * The scaffold is used to build editors for media that has not yet been populated with data.
-          *
-          * ##usage
-          * <pre>
-          * mediaResource.getScaffold(1234, 'folder')
-          *    .then(function(scaffold) {
-          *        var myDoc = scaffold;
-          *        myDoc.name = "My new media item";
-          *
-          *        mediaResource.save(myDoc, true)
-          *            .then(function(media){
-          *                alert("Retrieved, updated and saved again");
-          *            });
-          *    });
-          * </pre>
-          *
-          * @param {Int} parentId id of media item to return
-          * @param {String} alias mediatype alias to base the scaffold on
-          * @returns {Promise} resourcePromise object containing the media scaffold.
-          *
-          */
+         * @ngdoc method
+         * @name umbraco.resources.mediaResource#getScaffold
+         * @methodOf umbraco.resources.mediaResource
+         *
+         * @description
+         * Returns a scaffold of an empty media item, given the id of the media item to place it underneath and the media type alias.
+         *
+         * - Parent Id must be provided so umbraco knows where to store the media
+         * - Media Type alias must be provided so umbraco knows which properties to put on the media scaffold
+         *
+         * The scaffold is used to build editors for media that has not yet been populated with data.
+         *
+         * ##usage
+         * <pre>
+         * mediaResource.getScaffold(1234, 'folder')
+         *    .then(function(scaffold) {
+         *        var myDoc = scaffold;
+         *        myDoc.name = "My new media item";
+         *
+         *        mediaResource.save(myDoc, true)
+         *            .then(function(media){
+         *                alert("Retrieved, updated and saved again");
+         *            });
+         *    });
+         * </pre>
+         *
+         * @param {Int} parentId id of media item to return
+         * @param {String} alias mediatype alias to base the scaffold on
+         * @returns {Promise} resourcePromise object containing the media scaffold.
+         *
+         */
         getScaffold: function (parentId, alias) {
 
             return umbRequestHelper.resourcePromise(
-                  $http.get(
-                        umbRequestHelper.getApiUrl(
-                              "mediaApiBaseUrl",
-                              "GetEmpty",
-                              [{ contentTypeAlias: alias }, { parentId: parentId }])),
-                  'Failed to retrieve data for empty media item type ' + alias);
+                $http.get(
+                    umbRequestHelper.getApiUrl(
+                        "mediaApiBaseUrl",
+                        "GetEmpty",
+                        [{ contentTypeAlias: alias }, { parentId: parentId }])),
+                'Failed to retrieve data for empty media item type ' + alias);
 
         },
 
         rootMedia: function () {
 
             return umbRequestHelper.resourcePromise(
-                  $http.get(
-                        umbRequestHelper.getApiUrl(
-                              "mediaApiBaseUrl",
-                              "GetRootMedia")),
-                  'Failed to retrieve data for root media');
+                $http.get(
+                    umbRequestHelper.getApiUrl(
+                        "mediaApiBaseUrl",
+                        "GetRootMedia")),
+                'Failed to retrieve data for root media');
 
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.mediaResource#getChildren
-          * @methodOf umbraco.resources.mediaResource
-          *
-          * @description
-          * Gets children of a media item with a given id
-          *
-          * ##usage
-          * <pre>
-          * mediaResource.getChildren(1234, {pageSize: 10, pageNumber: 2})
-          *    .then(function(contentArray) {
-          *        var children = contentArray;
-          *        alert('they are here!');
-          *    });
-          * </pre>
-          *
-          * @param {Int} parentid id of content item to return children of
-          * @param {Object} options optional options object
-          * @param {Int} options.pageSize if paging data, number of nodes per page, default = 0
-          * @param {Int} options.pageNumber if paging data, current page index, default = 0
-          * @param {String} options.filter if provided, query will only return those with names matching the filter
-          * @param {String} options.orderDirection can be `Ascending` or `Descending` - Default: `Ascending`
-          * @param {String} options.orderBy property to order items by, default: `SortOrder`
-          * @returns {Promise} resourcePromise object containing an array of content items.
-          *
-          */
+         * @ngdoc method
+         * @name umbraco.resources.mediaResource#getChildren
+         * @methodOf umbraco.resources.mediaResource
+         *
+         * @description
+         * Gets children of a media item with a given id
+         *
+         * ##usage
+         * <pre>
+         * mediaResource.getChildren(1234, {pageSize: 10, pageNumber: 2})
+         *    .then(function(contentArray) {
+         *        var children = contentArray;
+         *        alert('they are here!');
+         *    });
+         * </pre>
+         *
+         * @param {Int} parentid id of content item to return children of
+         * @param {Object} options optional options object
+         * @param {Int} options.pageSize if paging data, number of nodes per page, default = 0
+         * @param {Int} options.pageNumber if paging data, current page index, default = 0
+         * @param {String} options.filter if provided, query will only return those with names matching the filter
+         * @param {String} options.orderDirection can be `Ascending` or `Descending` - Default: `Ascending`
+         * @param {String} options.orderBy property to order items by, default: `SortOrder`
+         * @returns {Promise} resourcePromise object containing an array of content items.
+         *
+         */
         getChildren: function (parentId, options) {
 
             var defaults = {
@@ -329,8 +329,7 @@ function mediaResource($q, $http, umbDataFormatter, umbRequestHelper) {
                 filter: '',
                 orderDirection: "Ascending",
                 orderBy: "SortOrder",
-                orderBySystemField: true,
-                dataTypeId: null
+                orderBySystemField: true
             };
             if (options === undefined) {
                 options = {};
@@ -362,111 +361,110 @@ function mediaResource($q, $http, umbDataFormatter, umbRequestHelper) {
             }
 
             return umbRequestHelper.resourcePromise(
-                  $http.get(
-                        umbRequestHelper.getApiUrl(
-                              "mediaApiBaseUrl",
-                              "GetChildren",
-                              [
-                                    { id: parentId },
-                                    { pageNumber: options.pageNumber },
-                                    { pageSize: options.pageSize },
-                                    { orderBy: options.orderBy },
-                                    { orderDirection: options.orderDirection },
-                                    { orderBySystemField: toBool(options.orderBySystemField) },
-                                    { filter: options.filter },
-                                    { dataTypeId: options.dataTypeId }
-                              ])),
-                  'Failed to retrieve children for media item ' + parentId);
+                $http.get(
+                    umbRequestHelper.getApiUrl(
+                        "mediaApiBaseUrl",
+                        "GetChildren",
+                        [
+                            { id: parentId },
+                            { pageNumber: options.pageNumber },
+                            { pageSize: options.pageSize },
+                            { orderBy: options.orderBy },
+                            { orderDirection: options.orderDirection },
+                            { orderBySystemField: toBool(options.orderBySystemField) },
+                            { filter: options.filter }
+                        ])),
+                'Failed to retrieve children for media item ' + parentId);
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.mediaResource#save
-          * @methodOf umbraco.resources.mediaResource
-          *
-          * @description
-          * Saves changes made to a media item, if the media item is new, the isNew paramater must be passed to force creation
-          * if the media item needs to have files attached, they must be provided as the files param and passed separately
-          *
-          *
-          * ##usage
-          * <pre>
-          * mediaResource.getById(1234)
-          *    .then(function(media) {
-          *          media.name = "I want a new name!";
-          *          mediaResource.save(media, false)
-          *            .then(function(media){
-          *                alert("Retrieved, updated and saved again");
-          *            });
-          *    });
-          * </pre>
-          *
-          * @param {Object} media The media item object with changes applied
-          * @param {Bool} isNew set to true to create a new item or to update an existing
-          * @param {Array} files collection of files for the media item
-          * @returns {Promise} resourcePromise object containing the saved media item.
-          *
-          */
+         * @ngdoc method
+         * @name umbraco.resources.mediaResource#save
+         * @methodOf umbraco.resources.mediaResource
+         *
+         * @description
+         * Saves changes made to a media item, if the media item is new, the isNew paramater must be passed to force creation
+         * if the media item needs to have files attached, they must be provided as the files param and passed separately
+         *
+         *
+         * ##usage
+         * <pre>
+         * mediaResource.getById(1234)
+         *    .then(function(media) {
+         *          media.name = "I want a new name!";
+         *          mediaResource.save(media, false)
+         *            .then(function(media){
+         *                alert("Retrieved, updated and saved again");
+         *            });
+         *    });
+         * </pre>
+         *
+         * @param {Object} media The media item object with changes applied
+         * @param {Bool} isNew set to true to create a new item or to update an existing
+         * @param {Array} files collection of files for the media item
+         * @returns {Promise} resourcePromise object containing the saved media item.
+         *
+         */
         save: function (media, isNew, files) {
             return saveMediaItem(media, "save" + (isNew ? "New" : ""), files);
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.mediaResource#addFolder
-          * @methodOf umbraco.resources.mediaResource
-          *
-          * @description
-          * Shorthand for adding a media item of the type "Folder" under a given parent ID
-          *
-          * ##usage
-          * <pre>
-          * mediaResource.addFolder("My gallery", 1234)
-          *    .then(function(folder) {
-          *        alert('New folder');
-          *    });
-          * </pre>
-          *
-          * @param {string} name Name of the folder to create
-          * @param {int} parentId Id of the media item to create the folder underneath
-          * @returns {Promise} resourcePromise object.
-          *
-          */
+         * @ngdoc method
+         * @name umbraco.resources.mediaResource#addFolder
+         * @methodOf umbraco.resources.mediaResource
+         *
+         * @description
+         * Shorthand for adding a media item of the type "Folder" under a given parent ID
+         *
+         * ##usage
+         * <pre>
+         * mediaResource.addFolder("My gallery", 1234)
+         *    .then(function(folder) {
+         *        alert('New folder');
+         *    });
+         * </pre>
+         *
+         * @param {string} name Name of the folder to create
+         * @param {int} parentId Id of the media item to create the folder underneath
+         * @returns {Promise} resourcePromise object.
+         *
+         */
         addFolder: function (name, parentId) {
             return umbRequestHelper.resourcePromise(
-                   $http.post(umbRequestHelper
-                         .getApiUrl("mediaApiBaseUrl", "PostAddFolder"),
-                         {
-                             name: name,
-                             parentId: parentId
-                         }),
-                   'Failed to add folder');
+                $http.post(umbRequestHelper
+                        .getApiUrl("mediaApiBaseUrl", "PostAddFolder"),
+                    {
+                        name: name,
+                        parentId: parentId
+                    }),
+                'Failed to add folder');
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.mediaResource#getChildFolders
-          * @methodOf umbraco.resources.mediaResource
-          *
-          * @description
-          * Retrieves all media children with types used as folders.
-          * Uses the convention of looking for media items with mediaTypes ending in
-          * *Folder so will match "Folder", "bannerFolder", "secureFolder" etc,
-          *
-          * NOTE: This will return a max of 500 folders, if more is required it needs to be paged
-          *
-          * ##usage
-          * <pre>
-          * mediaResource.getChildFolders(1234)
-          *    .then(function(data) {
-          *        alert('folders');
-          *    });
-          * </pre>
-          *
-          * @param {int} parentId Id of the media item to query for child folders
-          * @returns {Promise} resourcePromise object.
-          *
-          */
+         * @ngdoc method
+         * @name umbraco.resources.mediaResource#getChildFolders
+         * @methodOf umbraco.resources.mediaResource
+         *
+         * @description
+         * Retrieves all media children with types used as folders.
+         * Uses the convention of looking for media items with mediaTypes ending in
+         * *Folder so will match "Folder", "bannerFolder", "secureFolder" etc,
+         *
+         * NOTE: This will return a max of 500 folders, if more is required it needs to be paged
+         *
+         * ##usage
+         * <pre>
+         * mediaResource.getChildFolders(1234)
+         *    .then(function(data) {
+         *        alert('folders');
+         *    });
+         * </pre>
+         *
+         * @param {int} parentId Id of the media item to query for child folders
+         * @returns {Promise} resourcePromise object.
+         *
+         */
         getChildFolders: function (parentId) {
             if (!parentId) {
                 parentId = -1;
@@ -474,67 +472,67 @@ function mediaResource($q, $http, umbDataFormatter, umbRequestHelper) {
 
             //NOTE: This will return a max of 500 folders, if more is required it needs to be paged
             return umbRequestHelper.resourcePromise(
-                  $http.get(
-                        umbRequestHelper.getApiUrl(
-                              "mediaApiBaseUrl",
-                              "GetChildFolders",
-                            {
-                                id: parentId
-                            })),
-                  'Failed to retrieve child folders for media item ' + parentId);
+                $http.get(
+                    umbRequestHelper.getApiUrl(
+                        "mediaApiBaseUrl",
+                        "GetChildFolders",
+                        {
+                            id: parentId
+                        })),
+                'Failed to retrieve child folders for media item ' + parentId);
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.mediaResource#emptyRecycleBin
-          * @methodOf umbraco.resources.mediaResource
-          *
-          * @description
-          * Empties the media recycle bin
-          *
-          * ##usage
-          * <pre>
-          * mediaResource.emptyRecycleBin()
-          *    .then(function() {
-          *        alert('its empty!');
-          *    });
-          * </pre>
-          *
-          * @returns {Promise} resourcePromise object.
-          *
-          */
+         * @ngdoc method
+         * @name umbraco.resources.mediaResource#emptyRecycleBin
+         * @methodOf umbraco.resources.mediaResource
+         *
+         * @description
+         * Empties the media recycle bin
+         *
+         * ##usage
+         * <pre>
+         * mediaResource.emptyRecycleBin()
+         *    .then(function() {
+         *        alert('its empty!');
+         *    });
+         * </pre>
+         *
+         * @returns {Promise} resourcePromise object.
+         *
+         */
         emptyRecycleBin: function () {
             return umbRequestHelper.resourcePromise(
-                   $http.post(
-                         umbRequestHelper.getApiUrl(
-                               "mediaApiBaseUrl",
-                               "EmptyRecycleBin")),
-                   'Failed to empty the recycle bin');
+                $http.post(
+                    umbRequestHelper.getApiUrl(
+                        "mediaApiBaseUrl",
+                        "EmptyRecycleBin")),
+                'Failed to empty the recycle bin');
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.mediaResource#search
-          * @methodOf umbraco.resources.mediaResource
-          *
-          * @description
-          * Paginated search for media items starting on the supplied nodeId
-          *
-          * ##usage
-          * <pre>
-          * mediaResource.search("my search", 1, 100, -1)
-          *    .then(function(searchResult) {
-          *        alert('it's here!');
-          *    });
-          * </pre>
-          *
-          * @param {string} query The search query
-          * @param {int} pageNumber The page number
-          * @param {int} pageSize The number of media items on a page
-          * @param {int} searchFrom NodeId to search from (-1 for root)
-          * @returns {Promise} resourcePromise object.
-          *
-          */
+         * @ngdoc method
+         * @name umbraco.resources.mediaResource#search
+         * @methodOf umbraco.resources.mediaResource
+         *
+         * @description
+         * Paginated search for media items starting on the supplied nodeId
+         *
+         * ##usage
+         * <pre>
+         * mediaResource.search("my search", 1, 100, -1)
+         *    .then(function(searchResult) {
+         *        alert('it's here!');
+         *    });
+         * </pre>
+         *
+         * @param {string} query The search query
+         * @param {int} pageNumber The page number
+         * @param {int} pageSize The number of media items on a page
+         * @param {int} searchFrom NodeId to search from (-1 for root)
+         * @returns {Promise} resourcePromise object.
+         *
+         */
         search: function (query, pageNumber, pageSize, searchFrom) {
 
             var args = [
@@ -545,12 +543,12 @@ function mediaResource($q, $http, umbDataFormatter, umbRequestHelper) {
             ];
 
             return umbRequestHelper.resourcePromise(
-                  $http.get(
-                        umbRequestHelper.getApiUrl(
-                              "mediaApiBaseUrl",
-                              "Search",
-                              args)),
-                  'Failed to retrieve media items for search: ' + query);
+                $http.get(
+                    umbRequestHelper.getApiUrl(
+                        "mediaApiBaseUrl",
+                        "Search",
+                        args)),
+                'Failed to retrieve media items for search: ' + query);
         }
 
     };
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/search.service.js b/src/Umbraco.Web.UI.Client/src/common/services/search.service.js
index 24b946cdc8..e4f527f2d3 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/search.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/search.service.js
@@ -42,11 +42,7 @@ angular.module('umbraco.services')
                     throw "args.term is required";
                 }
 
-                var options = {
-                    searchFrom: args.searchFrom
-                }
-
-                return entityResource.search(args.term, "Member", options).then(function (data) {
+                return entityResource.search(args.term, "Member", args.searchFrom).then(function (data) {
                     _.each(data, function (item) {
                         searchResultFormatter.configureMemberResult(item);
                     });
@@ -71,12 +67,7 @@ angular.module('umbraco.services')
                     throw "args.term is required";
                 }
 
-                var options = {
-                    searchFrom: args.searchFrom,
-                    dataTypeId: args.dataTypeId
-                }
-
-                return entityResource.search(args.term, "Document", options, args.canceler).then(function (data) {
+                return entityResource.search(args.term, "Document", args.searchFrom, args.canceler, args.dataTypeId).then(function (data) {
                     _.each(data, function (item) {
                         searchResultFormatter.configureContentResult(item);
                     });
@@ -101,12 +92,7 @@ angular.module('umbraco.services')
                     throw "args.term is required";
                 }
 
-                var options = {
-                    searchFrom: args.searchFrom,
-                    dataTypeId: args.dataTypeId
-                }
-
-                return entityResource.search(args.term, "Media", options).then(function (data) {
+                return entityResource.search(args.term, "Media", args.searchFrom, args.canceler, args.dataTypeId).then(function (data) {
                     _.each(data, function (item) {
                         searchResultFormatter.configureMediaResult(item);
                     });
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
index b1fa038c44..e08178ec93 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
@@ -8,7 +8,6 @@ angular.module("umbraco").controller("Umbraco.Dialogs.LinkPickerController",
 			searchText = value + "...";
 		});
 
-		debugger;
 		$scope.dialogTreeEventHandler = $({});
 		$scope.target = {};
 		$scope.searchInfo = {
@@ -134,7 +133,7 @@ angular.module("umbraco").controller("Umbraco.Dialogs.LinkPickerController",
 						$scope.target.id = media.id;
 						$scope.target.isMedia = true;
 						$scope.target.name = media.name;
-						$scope.target.url = mediaHelper.resolveFile(media);
+						$scope.target.url = media.image;
 					}
 				});
 			});
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js
index da7ca307ca..a0de457b87 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js
@@ -83,7 +83,7 @@ angular.module("umbraco")
                 entityResource.getChildren(folder.id, "Media")
                     .then(function(data) {
                         for (i=0;i<data.length;i++){
-                            if(data[i].metaData.MediaPath !== null){
+                            if(data[i].metaData.MediaPath){
                                 data[i].thumbnail = mediaHelper.resolveFileFromEntity(data[i], true);
                                 data[i].image = mediaHelper.resolveFileFromEntity(data[i], false);
                             }
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js
index 539cb418c4..2df5abba25 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js
@@ -1,13 +1,13 @@
 //used for the media picker dialog
 angular.module("umbraco").controller("Umbraco.Dialogs.TreePickerController",
-	function ($scope, entityResource, eventsService, $log, searchService, angularHelper, $timeout, localizationService, treeService) {
+    function ($scope, entityResource, eventsService, $log, searchService, angularHelper, $timeout, localizationService, treeService) {
 
-	    var tree = null;
-	    var dialogOptions = $scope.dialogOptions;
-	    $scope.dialogTreeEventHandler = $({});
-	    $scope.section = dialogOptions.section;
-	    $scope.treeAlias = dialogOptions.treeAlias;
-	    $scope.multiPicker = dialogOptions.multiPicker;
+        var tree = null;
+        var dialogOptions = $scope.dialogOptions;
+        $scope.dialogTreeEventHandler = $({});
+        $scope.section = dialogOptions.section;
+        $scope.treeAlias = dialogOptions.treeAlias;
+        $scope.multiPicker = dialogOptions.multiPicker;
         $scope.hideHeader = (typeof dialogOptions.hideHeader) === "boolean" ? dialogOptions.hideHeader : true;;
         $scope.searchInfo = {
             searchFromId: dialogOptions.startNodeId,
@@ -17,44 +17,44 @@ angular.module("umbraco").controller("Umbraco.Dialogs.TreePickerController",
             selectedSearchResults: []
         }
 
-	    //create the custom query string param for this tree
-	    $scope.customTreeParams = dialogOptions.startNodeId ? "startNodeId=" + dialogOptions.startNodeId : "";
-	    $scope.customTreeParams += dialogOptions.customTreeParams ? "&" + dialogOptions.customTreeParams : "";
+        //create the custom query string param for this tree
+        $scope.customTreeParams = dialogOptions.startNodeId ? "startNodeId=" + dialogOptions.startNodeId : "";
+        $scope.customTreeParams += dialogOptions.customTreeParams ? "&" + dialogOptions.customTreeParams : "";
 
-	    var searchText = "Search...";
-	    localizationService.localize("general_search").then(function (value) {
-	        searchText = value + "...";
-	    });
+        var searchText = "Search...";
+        localizationService.localize("general_search").then(function (value) {
+            searchText = value + "...";
+        });
 
         // Allow the entity type to be passed in but defaults to Document for backwards compatibility.
-	    var entityType = dialogOptions.entityType ? dialogOptions.entityType : "Document";
+        var entityType = dialogOptions.entityType ? dialogOptions.entityType : "Document";
 
 
-	    //min / max values
-	    if (dialogOptions.minNumber) {
-	        dialogOptions.minNumber = parseInt(dialogOptions.minNumber, 10);
-	    }
-	    if (dialogOptions.maxNumber) {
-	        dialogOptions.maxNumber = parseInt(dialogOptions.maxNumber, 10);
-	    }
+        //min / max values
+        if (dialogOptions.minNumber) {
+            dialogOptions.minNumber = parseInt(dialogOptions.minNumber, 10);
+        }
+        if (dialogOptions.maxNumber) {
+            dialogOptions.maxNumber = parseInt(dialogOptions.maxNumber, 10);
+        }
 
-	    if (dialogOptions.section === "member") {
-	        entityType = "Member";
-	    }
-	    else if (dialogOptions.section === "media") {
-	        entityType = "Media";
-	    }
+        if (dialogOptions.section === "member") {
+            entityType = "Member";
+        }
+        else if (dialogOptions.section === "media") {
+            entityType = "Media";
+        }
 
-	    //Configures filtering
-	    if (dialogOptions.filter) {
+        //Configures filtering
+        if (dialogOptions.filter) {
 
-	        dialogOptions.filterExclude = false;
-	        dialogOptions.filterAdvanced = false;
+            dialogOptions.filterExclude = false;
+            dialogOptions.filterAdvanced = false;
 
-	        //used advanced filtering
-	        if (angular.isFunction(dialogOptions.filter)) {
-	            dialogOptions.filterAdvanced = true;
-	        }
+            //used advanced filtering
+            if (angular.isFunction(dialogOptions.filter)) {
+                dialogOptions.filterAdvanced = true;
+            }
             else if (angular.isObject(dialogOptions.filter)) {
                 dialogOptions.filterAdvanced = true;
             }
@@ -71,93 +71,93 @@ angular.module("umbraco").controller("Umbraco.Dialogs.TreePickerController",
                     dialogOptions.filter = angular.fromJson(dialogOptions.filter);
                 }
             }
-	    }
+        }
 
-	    function nodeExpandedHandler(ev, args) {
-	        if (angular.isArray(args.children)) {
+        function nodeExpandedHandler(ev, args) {
+            if (angular.isArray(args.children)) {
 
                 //iterate children
-	            _.each(args.children, function (child) {
+                _.each(args.children, function (child) {
 
-	                //check if any of the items are list views, if so we need to add some custom
-	                // children: A node to activate the search, any nodes that have already been
-	                // selected in the search
-	                if (child.metaData.isContainer) {
-	                    child.hasChildren = true;
-	                    child.children = [
-	                        {
+                    //check if any of the items are list views, if so we need to add some custom
+                    // children: A node to activate the search, any nodes that have already been
+                    // selected in the search
+                    if (child.metaData.isContainer) {
+                        child.hasChildren = true;
+                        child.children = [
+                            {
                                 level: child.level + 1,
                                 hasChildren: false,
                                 parent: function () {
                                     return child;
                                 },
-	                            name: searchText,
-	                            metaData: {
-	                                listViewNode: child
-	                            },
-	                            cssClass: "icon-search",
-	                            cssClasses: ["not-published"]
-	                        }
-	                    ];
+                                name: searchText,
+                                metaData: {
+                                    listViewNode: child
+                                },
+                                cssClass: "icon-search",
+                                cssClasses: ["not-published"]
+                            }
+                        ];
                         //add base transition classes to this node
-	                    child.cssClasses.push("tree-node-slide-up");
+                        child.cssClasses.push("tree-node-slide-up");
 
-	                    var listViewResults = _.filter($scope.searchInfo.selectedSearchResults, function(i) {
-	                        return i.parentId == child.id;
-	                    });
-	                    _.each(listViewResults, function(item) {
-	                        child.children.unshift({
-	                            id: item.id,
-	                            name: item.name,
-	                            cssClass: "icon umb-tree-icon sprTree " + item.icon,
-	                            level: child.level + 1,
-	                            metaData: {
-	                                isSearchResult: true
-	                            },
-	                            hasChildren: false,
-	                            parent: function () {
-	                                return child;
-	                            }
-	                        });
-	                    });
-	                }
+                        var listViewResults = _.filter($scope.searchInfo.selectedSearchResults, function(i) {
+                            return i.parentId == child.id;
+                        });
+                        _.each(listViewResults, function(item) {
+                            child.children.unshift({
+                                id: item.id,
+                                name: item.name,
+                                cssClass: "icon umb-tree-icon sprTree " + item.icon,
+                                level: child.level + 1,
+                                metaData: {
+                                    isSearchResult: true
+                                },
+                                hasChildren: false,
+                                parent: function () {
+                                    return child;
+                                }
+                            });
+                        });
+                    }
 
-	                //now we need to look in the already selected search results and
-	                // toggle the check boxes for those ones that are listed
-	                var exists = _.find($scope.searchInfo.selectedSearchResults, function (selected) {
-	                    return child.id == selected.id;
-	                });
-	                if (exists) {
-	                    child.selected = true;
-	                }
-	            });
+                    //now we need to look in the already selected search results and
+                    // toggle the check boxes for those ones that are listed
+                    var exists = _.find($scope.searchInfo.selectedSearchResults, function (selected) {
+                        return child.id == selected.id;
+                    });
+                    if (exists) {
+                        child.selected = true;
+                    }
+                });
 
-	            //check filter
-	            performFiltering(args.children);
-	        }
-	    }
+                //check filter
+                performFiltering(args.children);
+            }
+        }
 
         //gets the tree object when it loads
-	    function treeLoadedHandler(ev, args) {
-	        tree = args.tree;
-	    }
+        function treeLoadedHandler(ev, args) {
+            tree = args.tree;
+        }
 
-	    //wires up selection
-	    function nodeSelectHandler(ev, args) {
-	        args.event.preventDefault();
-	        args.event.stopPropagation();
+        //wires up selection
+        function nodeSelectHandler(ev, args) {
+            args.event.preventDefault();
+            args.event.stopPropagation();
 
-	        if (args.node.metaData.listViewNode) {
-	            //check if list view 'search' node was selected
+            if (args.node.metaData.listViewNode) {
+                //check if list view 'search' node was selected
 
                 $scope.searchInfo.showSearch = true;
                 $scope.searchInfo.searchFromId = args.node.metaData.listViewNode.id;
                 $scope.searchInfo.searchFromName = args.node.metaData.listViewNode.name;
 
                 //add transition classes
-	            var listViewNode = args.node.parent();
-	            listViewNode.cssClasses.push('tree-node-slide-up-hide-active');
-	        }
+                var listViewNode = args.node.parent();
+                listViewNode.cssClasses.push('tree-node-slide-up-hide-active');
+            }
             else if (args.node.metaData.isSearchResult) {
                 //check if the item selected was a search result from a list view
 
@@ -166,15 +166,15 @@ angular.module("umbraco").controller("Umbraco.Dialogs.TreePickerController",
 
                 //remove it from the list view children
                 var listView = args.node.parent();
-	            listView.children = _.reject(listView.children, function(child) {
-	                return child.id == args.node.id;
-	            });
+                listView.children = _.reject(listView.children, function(child) {
+                    return child.id == args.node.id;
+                });
 
                 //remove it from the custom tracked search result list
-	            $scope.searchInfo.selectedSearchResults = _.reject($scope.searchInfo.selectedSearchResults, function (i) {
-	                return i.id == args.node.id;
-	            });
-	        }
+                $scope.searchInfo.selectedSearchResults = _.reject($scope.searchInfo.selectedSearchResults, function (i) {
+                    return i.id == args.node.id;
+                });
+            }
             else {
                 eventsService.emit("dialogs.treePickerController.select", args);
 
@@ -189,114 +189,114 @@ angular.module("umbraco").controller("Umbraco.Dialogs.TreePickerController",
                 //toggle checked state
                 args.node.selected = args.node.selected === true ? false : true;
             }
-	    }
+        }
 
-	    /** Method used for selecting a node */
-	    function select(text, id, entity) {
-	        //if we get the root, we just return a constructed entity, no need for server data
-	        if (id < 0) {
-	            if ($scope.multiPicker) {
-	                $scope.select(id);
-	            }
-	            else {
-	                var node = {
-	                    alias: null,
-	                    icon: "icon-folder",
-	                    id: id,
-	                    name: text
-	                };
-	                $scope.submit(node);
-	            }
-	        }
-	        else {
+        /** Method used for selecting a node */
+        function select(text, id, entity) {
+            //if we get the root, we just return a constructed entity, no need for server data
+            if (id < 0) {
+                if ($scope.multiPicker) {
+                    $scope.select(id);
+                }
+                else {
+                    var node = {
+                        alias: null,
+                        icon: "icon-folder",
+                        id: id,
+                        name: text
+                    };
+                    $scope.submit(node);
+                }
+            }
+            else {
 
-	            if ($scope.multiPicker) {
-	                $scope.select(Number(id));
-	            }
-	            else {
+                if ($scope.multiPicker) {
+                    $scope.select(Number(id));
+                }
+                else {
 
-	                $scope.hideSearch();
+                    $scope.hideSearch();
 
-	                //if an entity has been passed in, use it
-	                if (entity) {
-	                    $scope.submit(entity);
-	                } else {
-	                    //otherwise we have to get it from the server
-	                    entityResource.getById(id, entityType).then(function (ent) {
-	                        $scope.submit(ent);
-	                    });
-	                }
-	            }
-	        }
-	    }
+                    //if an entity has been passed in, use it
+                    if (entity) {
+                        $scope.submit(entity);
+                    } else {
+                        //otherwise we have to get it from the server
+                        entityResource.getById(id, entityType).then(function (ent) {
+                            $scope.submit(ent);
+                        });
+                    }
+                }
+            }
+        }
 
-	    function performFiltering(nodes) {
+        function performFiltering(nodes) {
 
-	        if (!dialogOptions.filter) {
-	            return;
-	        }
+            if (!dialogOptions.filter) {
+                return;
+            }
 
-	        //remove any list view search nodes from being filtered since these are special nodes that always must
-	        // be allowed to be clicked on
-	        nodes = _.filter(nodes, function(n) {
-	            return !angular.isObject(n.metaData.listViewNode);
-	        });
+            //remove any list view search nodes from being filtered since these are special nodes that always must
+            // be allowed to be clicked on
+            nodes = _.filter(nodes, function(n) {
+                return !angular.isObject(n.metaData.listViewNode);
+            });
 
-	        if (dialogOptions.filterAdvanced) {
+            if (dialogOptions.filterAdvanced) {
 
                 //filter either based on a method or an object
-	            var filtered = angular.isFunction(dialogOptions.filter)
-	                ? _.filter(nodes, dialogOptions.filter)
-	                : _.where(nodes, dialogOptions.filter);
+                var filtered = angular.isFunction(dialogOptions.filter)
+                    ? _.filter(nodes, dialogOptions.filter)
+                    : _.where(nodes, dialogOptions.filter);
 
-	            angular.forEach(filtered, function (value, key) {
-	                value.filtered = true;
-	                if (dialogOptions.filterCssClass) {
+                angular.forEach(filtered, function (value, key) {
+                    value.filtered = true;
+                    if (dialogOptions.filterCssClass) {
                         if (!value.cssClasses) {
                             value.cssClasses = [];
                         }
-	                    value.cssClasses.push(dialogOptions.filterCssClass);
-	                }
-	            });
-	        } else {
-	            var a = dialogOptions.filter.toLowerCase().replace(/\s/g, '').split(',');
-	            angular.forEach(nodes, function (value, key) {
+                        value.cssClasses.push(dialogOptions.filterCssClass);
+                    }
+                });
+            } else {
+                var a = dialogOptions.filter.toLowerCase().replace(/\s/g, '').split(',');
+                angular.forEach(nodes, function (value, key) {
 
-	                var found = a.indexOf(value.metaData.contentType.toLowerCase()) >= 0;
+                    var found = a.indexOf(value.metaData.contentType.toLowerCase()) >= 0;
 
-	                if (!dialogOptions.filterExclude && !found || dialogOptions.filterExclude && found) {
-	                    value.filtered = true;
+                    if (!dialogOptions.filterExclude && !found || dialogOptions.filterExclude && found) {
+                        value.filtered = true;
 
-	                    if (dialogOptions.filterCssClass) {
-	                        if (!value.cssClasses) {
-	                            value.cssClasses = [];
-	                        }
-	                        value.cssClasses.push(dialogOptions.filterCssClass);
-	                    }
-	                }
-	            });
-	        }
-	    }
+                        if (dialogOptions.filterCssClass) {
+                            if (!value.cssClasses) {
+                                value.cssClasses = [];
+                            }
+                            value.cssClasses.push(dialogOptions.filterCssClass);
+                        }
+                    }
+                });
+            }
+        }
 
-	    $scope.multiSubmit = function (result) {
-	        entityResource.getByIds(result, entityType).then(function (ents) {
-	            $scope.submit(ents);
-	        });
-	    };
+        $scope.multiSubmit = function (result) {
+            entityResource.getByIds(result, entityType).then(function (ents) {
+                $scope.submit(ents);
+            });
+        };
 
-	    /** method to select a search result */
-	    $scope.selectResult = function (evt, result) {
+        /** method to select a search result */
+        $scope.selectResult = function (evt, result) {
 
             if (result.filtered) {
                 return;
             }
 
-	        result.selected = result.selected === true ? false : true;
+            result.selected = result.selected === true ? false : true;
 
-	        //since result = an entity, we'll pass it in so we don't have to go back to the server
-	        select(result.name, result.id, result);
+            //since result = an entity, we'll pass it in so we don't have to go back to the server
+            select(result.name, result.id, result);
 
-	        //add/remove to our custom tracked list of selected search results
+            //add/remove to our custom tracked list of selected search results
             if (result.selected) {
                 $scope.searchInfo.selectedSearchResults.push(result);
             }
@@ -306,23 +306,23 @@ angular.module("umbraco").controller("Umbraco.Dialogs.TreePickerController",
                 });
             }
 
-	        //ensure the tree node in the tree is checked/unchecked if it already exists there
-	        if (tree) {
-	            var found = treeService.getDescendantNode(tree.root, result.id);
+            //ensure the tree node in the tree is checked/unchecked if it already exists there
+            if (tree) {
+                var found = treeService.getDescendantNode(tree.root, result.id);
                 if (found) {
                     found.selected = result.selected;
                 }
-	        }
+            }
 
-	    };
+        };
 
-	    $scope.hideSearch = function () {
+        $scope.hideSearch = function () {
 
             //Traverse the entire displayed tree and update each node to sync with the selected search results
-	        if (tree) {
+            if (tree) {
 
-	            //we need to ensure that any currently displayed nodes that get selected
-	            // from the search get updated to have a check box!
+                //we need to ensure that any currently displayed nodes that get selected
+                // from the search get updated to have a check box!
                 function checkChildren(children) {
                     _.each(children, function (child) {
                         //check if the id is in the selection, if so ensure it's flagged as selected
@@ -385,7 +385,7 @@ angular.module("umbraco").controller("Umbraco.Dialogs.TreePickerController",
                     });
                 }
                 checkChildren(tree.root.children);
-	        }
+            }
 
 
             $scope.searchInfo.showSearch = false;
@@ -394,37 +394,38 @@ angular.module("umbraco").controller("Umbraco.Dialogs.TreePickerController",
             $scope.searchInfo.results = [];
         }
 
-	    $scope.onSearchResults = function(results) {;
+        $scope.onSearchResults = function(results) {
+
             //filter all items - this will mark an item as filtered
-	        performFiltering(results);
+            performFiltering(results);
 
-	        //now actually remove all filtered items so they are not even displayed
-	        results = _.filter(results, function(item) {
-	            return !item.filtered;
-	        });
+            //now actually remove all filtered items so they are not even displayed
+            results = _.filter(results, function(item) {
+                return !item.filtered;
+            });
 
-	        $scope.searchInfo.results = results;
+            $scope.searchInfo.results = results;
 
             //sync with the curr selected results
-	        _.each($scope.searchInfo.results, function (result) {
-	            var exists = _.find($scope.dialogData.selection, function (selectedId) {
-	                return result.id == selectedId;
-	            });
-	            if (exists) {
-	                result.selected = true;
-	            }
-	        });
+            _.each($scope.searchInfo.results, function (result) {
+                var exists = _.find($scope.dialogData.selection, function (selectedId) {
+                    return result.id == selectedId;
+                });
+                if (exists) {
+                    result.selected = true;
+                }
+            });
 
-	        $scope.searchInfo.showSearch = true;
-	    };
+            $scope.searchInfo.showSearch = true;
+        };
 
-	    $scope.dialogTreeEventHandler.bind("treeLoaded", treeLoadedHandler);
-	    $scope.dialogTreeEventHandler.bind("treeNodeExpanded", nodeExpandedHandler);
-	    $scope.dialogTreeEventHandler.bind("treeNodeSelect", nodeSelectHandler);
+        $scope.dialogTreeEventHandler.bind("treeLoaded", treeLoadedHandler);
+        $scope.dialogTreeEventHandler.bind("treeNodeExpanded", nodeExpandedHandler);
+        $scope.dialogTreeEventHandler.bind("treeNodeSelect", nodeSelectHandler);
 
-	    $scope.$on('$destroy', function () {
-	        $scope.dialogTreeEventHandler.unbind("treeLoaded", treeLoadedHandler);
-	        $scope.dialogTreeEventHandler.unbind("treeNodeExpanded", nodeExpandedHandler);
-	        $scope.dialogTreeEventHandler.unbind("treeNodeSelect", nodeSelectHandler);
-	    });
-	});
+        $scope.$on('$destroy', function () {
+            $scope.dialogTreeEventHandler.unbind("treeLoaded", treeLoadedHandler);
+            $scope.dialogTreeEventHandler.unbind("treeNodeExpanded", nodeExpandedHandler);
+            $scope.dialogTreeEventHandler.unbind("treeNodeSelect", nodeSelectHandler);
+        });
+    });
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
index 787fe4186e..2b6b77ed41 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
@@ -128,7 +128,7 @@ angular.module("umbraco").controller("Umbraco.Overlays.LinkPickerController",
                         $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.model.target.url = media.image;
 
                         $scope.mediaPickerOverlay.show = false;
                         $scope.mediaPickerOverlay = null;
diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs
index c909c1eb84..1ac8318f9c 100644
--- a/src/Umbraco.Web/Editors/ContentController.cs
+++ b/src/Umbraco.Web/Editors/ContentController.cs
@@ -262,11 +262,10 @@ namespace Umbraco.Web.Editors
         /// Gets the content json for the content id
         /// </summary>
         /// <param name="id"></param>
-        /// <param name="dataTypeId">If set used to lookup whether the user and group start node permissions should be ignored.</param>
         /// <returns></returns>
         [OutgoingEditorModelEvent]
         [EnsureUserPermissionForContent("id")]
-        public ContentItemDisplay GetById(int id, [FromUri]Guid? dataTypeId = null)
+        public ContentItemDisplay GetById(int id)
         {
             var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
             if (foundContent == null)
@@ -1117,7 +1116,6 @@ namespace Umbraco.Web.Editors
         /// <param name="nodeId">The content to lookup, if the contentItem is not specified</param>
         /// <param name="permissionsToCheck"></param>
         /// <param name="contentItem">Specifies the already resolved content item to check against</param>
-        /// <param name="ignoreUserStartNodes">If set to true, user and group start node permissions will be ignored.</param>
         /// <returns></returns>
         internal static bool CheckPermissions(
                 IDictionary<string, object> storage,
@@ -1127,8 +1125,7 @@ namespace Umbraco.Web.Editors
                 IEntityService entityService,
                 int nodeId,
                 char[] permissionsToCheck = null,
-                IContent contentItem = null,
-                bool ignoreUserStartNodes = false)
+                IContent contentItem = null)
         {
             if (storage == null) throw new ArgumentNullException("storage");
             if (user == null) throw new ArgumentNullException("user");
@@ -1149,11 +1146,6 @@ namespace Umbraco.Web.Editors
                 throw new HttpResponseException(HttpStatusCode.NotFound);
             }
 
-            if(ignoreUserStartNodes)
-            {
-                return true;
-            }
-
             var hasPathAccess = (nodeId == Constants.System.Root)
                 ? user.HasContentRootAccess(entityService)
                 : (nodeId == Constants.System.RecycleBinContent)
diff --git a/src/Umbraco.Web/Editors/EntityController.cs b/src/Umbraco.Web/Editors/EntityController.cs
index d6e997b57e..6c9cc7c36b 100644
--- a/src/Umbraco.Web/Editors/EntityController.cs
+++ b/src/Umbraco.Web/Editors/EntityController.cs
@@ -20,6 +20,7 @@ using System.Text.RegularExpressions;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using System.Web.Http.Controllers;
 using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Services;
 using Umbraco.Core.Xml;
 using Umbraco.Web.Search;
 using Umbraco.Web.Trees;
@@ -74,22 +75,6 @@ namespace Umbraco.Web.Editors
             return returnObj;
         }
 
-        /// <summary>
-        /// Searches for results based on the entity type
-        /// </summary>
-        /// <param name="query"></param>
-        /// <param name="type"></param>
-        /// <param name="searchFrom">
-        /// A starting point for the search, generally a node id, but for members this is a member type alias
-        /// </param>
-        /// <returns></returns>
-        [Obsolete("This method is obsolete, use the overload with dataTypeId instead", false)]
-        [HttpGet]
-        public IEnumerable<EntityBasic> Search(string query, UmbracoEntityTypes type, string searchFrom = null)
-        {
-            return Search(query, type, null, searchFrom);
-        }
-
         /// <summary>
         /// Searches for results based on the entity type
         /// </summary>
@@ -101,7 +86,7 @@ namespace Umbraco.Web.Editors
         /// <param name="dataTypeId">If set used to look up whether user and group start node permissions will be ignored.</param>
         /// <returns></returns>
         [HttpGet]
-        public IEnumerable<EntityBasic> Search(string query, UmbracoEntityTypes type, Guid? dataTypeId, string searchFrom = null)
+        public IEnumerable<EntityBasic> Search(string query, UmbracoEntityTypes type, string searchFrom = null, Guid? dataTypeId = null)
         {
             //TODO: Should we restrict search results based on what app the user has access to?
             // - Theoretically you shouldn't be able to see member data if you don't have access to members right?
@@ -301,7 +286,7 @@ namespace Umbraco.Web.Editors
         }
 
         [HttpPost]
-        public IList<string> GetAnchors(string rteContent)
+        public IEnumerable<string> GetAnchors(string rteContent)
         {
 
             var anchorValues = Services.ContentService.GetAnchorValuesFromRTEContent(rteContent);
@@ -565,29 +550,16 @@ namespace Umbraco.Web.Editors
             }
         }
 
-        [Obsolete("This method is obsolete, use the overload with dataTypeId instead", false)]
-        public PagedResult<EntityBasic> GetPagedDescendants(
-            int id,
-            UmbracoEntityTypes type,
-            int pageNumber,
-            int pageSize,
-            string orderBy = "SortOrder",
-            Direction orderDirection = Direction.Ascending,
-            string filter = "")
-        {
-            return GetPagedDescendants(id, type, pageNumber, pageSize,
-                null, orderBy, orderDirection, filter);
-        }
 
         public PagedResult<EntityBasic> GetPagedDescendants(
             int id,
             UmbracoEntityTypes type,
             int pageNumber,
             int pageSize,
-            Guid? dataTypeId,
             string orderBy = "SortOrder",
             Direction orderDirection = Direction.Ascending,
-            string filter = "")
+            string filter = "",
+            Guid? dataTypeId = null)
         {
             if (pageNumber <= 0)
                 throw new HttpResponseException(HttpStatusCode.NotFound);
@@ -654,13 +626,7 @@ namespace Umbraco.Web.Editors
 
         private bool IsDataTypeIgnoringUserStartNodes(Guid? dataTypeId) => dataTypeId.HasValue && Services.DataTypeService.IsDataTypeIgnoringUserStartNodes(dataTypeId.Value);
 
-        [Obsolete("This method is obsolete, use the overload with dataTypeId instead", false)]
-        public IEnumerable<EntityBasic> GetAncestors(int id, UmbracoEntityTypes type)
-        {
-            return GetResultForAncestors(id, type, null);
-        }
-
-        public IEnumerable<EntityBasic> GetAncestors(int id, UmbracoEntityTypes type, Guid? dataTypeId)
+        public IEnumerable<EntityBasic> GetAncestors(int id, UmbracoEntityTypes type, Guid? dataTypeId = null)
         {
             return GetResultForAncestors(id, type, dataTypeId);
         }
@@ -681,7 +647,7 @@ namespace Umbraco.Web.Editors
         private IEnumerable<SearchResultItem> ExamineSearch(string query, UmbracoEntityTypes entityType, string searchFrom = null, bool ignoreUserStartNodes = false)
         {
             long total;
-            return _treeSearcher.ExamineSearch(Umbraco, query, entityType, 200, 0, out total, ignoreUserStartNodes, searchFrom);
+            return _treeSearcher.ExamineSearch(Umbraco, query, entityType, 200, 0, out total, searchFrom, ignoreUserStartNodes);
         }
 
 
diff --git a/src/Umbraco.Web/Editors/MediaController.cs b/src/Umbraco.Web/Editors/MediaController.cs
index 788ae3a0c7..54aaacf2f2 100644
--- a/src/Umbraco.Web/Editors/MediaController.cs
+++ b/src/Umbraco.Web/Editors/MediaController.cs
@@ -264,28 +264,23 @@ namespace Umbraco.Web.Editors
             string orderBy = "SortOrder",
             Direction orderDirection = Direction.Ascending,
             bool orderBySystemField = true,
-            string filter = "",
-            Guid? dataTypeId = null)
+            string filter = "")
         {
             //if a request is made for the root node data but the user's start node is not the default, then
             // we need to return their start nodes
             if (id == Constants.System.Root && UserStartNodes.Length > 0 && UserStartNodes.Contains(Constants.System.Root) == false)
             {
-                var ignoreUserStartNodes = dataTypeId.HasValue && Services.DataTypeService.IsDataTypeIgnoringUserStartNodes(dataTypeId.Value);
-                if (ignoreUserStartNodes == false)
+                if (pageNumber > 0)
+                    return new PagedResult<ContentItemBasic<ContentPropertyBasic, IMedia>>(0, 0, 0);
+                var nodes = Services.MediaService.GetByIds(UserStartNodes).ToArray();
+                if (nodes.Length == 0)
+                    return new PagedResult<ContentItemBasic<ContentPropertyBasic, IMedia>>(0, 0, 0);
+                if (pageSize < nodes.Length) pageSize = nodes.Length; // bah
+                var pr = new PagedResult<ContentItemBasic<ContentPropertyBasic, IMedia>>(nodes.Length, pageNumber, pageSize)
                 {
-                    if (pageNumber > 0)
-                        return new PagedResult<ContentItemBasic<ContentPropertyBasic, IMedia>>(0, 0, 0);
-                    var nodes = Services.MediaService.GetByIds(UserStartNodes).ToArray();
-                    if (nodes.Length == 0)
-                        return new PagedResult<ContentItemBasic<ContentPropertyBasic, IMedia>>(0, 0, 0);
-                    if (pageSize < nodes.Length) pageSize = nodes.Length; // bah
-                    var pr = new PagedResult<ContentItemBasic<ContentPropertyBasic, IMedia>>(nodes.Length, pageNumber, pageSize)
-                    {
-                        Items = nodes.Select(Mapper.Map<IMedia, ContentItemBasic<ContentPropertyBasic, IMedia>>)
-                    };
-                    return pr;
-                }
+                    Items = nodes.Select(Mapper.Map<IMedia, ContentItemBasic<ContentPropertyBasic, IMedia>>)
+                };
+                return pr;
             }
 
             // else proceed as usual
@@ -317,7 +312,7 @@ namespace Umbraco.Web.Editors
         }
 
         /// <summary>
-        /// This method is obsolete, use the overload with dataTypeId instead
+        /// This method is obsolete, use the overload with ignoreUserStartNodes instead
         /// Returns the child media objects - using the entity GUID id
         /// </summary>
         /// <param name="id"></param>
@@ -328,7 +323,7 @@ namespace Umbraco.Web.Editors
         /// <param name="orderBySystemField"></param>
         /// <param name="filter"></param>
         /// <returns></returns>
-        [Obsolete("This method is obsolete, use the overload with dataTypeId instead", false)]
+        [Obsolete("This method is obsolete, use the overload with ignoreUserStartNodes instead", false)]
         [FilterAllowedOutgoingMedia(typeof(IEnumerable<ContentItemBasic<ContentPropertyBasic, IMedia>>), "Items")]
         public PagedResult<ContentItemBasic<ContentPropertyBasic, IMedia>> GetChildren(Guid id,
            int pageNumber = 0,
@@ -338,7 +333,7 @@ namespace Umbraco.Web.Editors
            bool orderBySystemField = true,
            string filter = "")
         {
-            return GetChildren(id, null, pageNumber, pageSize, orderBy, orderDirection, orderBySystemField, filter);
+            return GetChildren(id, false, pageNumber, pageSize, orderBy, orderDirection, orderBySystemField, filter);
         }
 
         /// <summary>
@@ -351,11 +346,10 @@ namespace Umbraco.Web.Editors
         /// <param name="orderDirection"></param>
         /// <param name="orderBySystemField"></param>
         /// <param name="filter"></param>
-        /// <param name="dataTypeId">If set used to lookup whether user and group start node permissions should be ignored.</param>
         /// <returns></returns>
         [FilterAllowedOutgoingMedia(typeof(IEnumerable<ContentItemBasic<ContentPropertyBasic, IMedia>>), "Items")]
         public PagedResult<ContentItemBasic<ContentPropertyBasic, IMedia>> GetChildren(Guid id,
-           Guid? dataTypeId,
+           bool ignoreUserStartNodes,
            int pageNumber = 0,
            int pageSize = 0,
            string orderBy = "SortOrder",
@@ -366,13 +360,13 @@ namespace Umbraco.Web.Editors
             var entity = Services.EntityService.GetByKey(id);
             if (entity != null)
             {
-                return GetChildren(entity.Id, pageNumber, pageSize, orderBy, orderDirection, orderBySystemField, filter, dataTypeId);
+                return GetChildren(entity.Id, pageNumber, pageSize, orderBy, orderDirection, orderBySystemField, filter);
             }
             throw new HttpResponseException(HttpStatusCode.NotFound);
         }
 
         /// <summary>
-        /// This method is obsolete, use the overload with dataTypeId instead
+        /// This method is obsolete, use the overload with ignoreUserStartNodes instead
         /// Returns the child media objects - using the entity UDI id
         /// </summary>
         /// <param name="id"></param>
@@ -383,7 +377,7 @@ namespace Umbraco.Web.Editors
         /// <param name="orderBySystemField"></param>
         /// <param name="filter"></param>
         /// <returns></returns>
-        [Obsolete("This method is obsolete, use the overload with dataTypeId instead", false)]
+        [Obsolete("This method is obsolete, use the overload with ignoreUserStartNodes instead", false)]
         [FilterAllowedOutgoingMedia(typeof(IEnumerable<ContentItemBasic<ContentPropertyBasic, IMedia>>), "Items")]
         public PagedResult<ContentItemBasic<ContentPropertyBasic, IMedia>> GetChildren(Udi id,
            int pageNumber = 0,
@@ -393,7 +387,7 @@ namespace Umbraco.Web.Editors
            bool orderBySystemField = true,
            string filter = "")
         {
-            return GetChildren(id, null, pageNumber, pageSize, orderBy, orderDirection, orderBySystemField, filter);
+            return GetChildren(id, false, pageNumber, pageSize, orderBy, orderDirection, orderBySystemField, filter);
         }
 
         /// <summary>
@@ -406,11 +400,10 @@ namespace Umbraco.Web.Editors
         /// <param name="orderDirection"></param>
         /// <param name="orderBySystemField"></param>
         /// <param name="filter"></param>
-        /// <param name="dataTypeId">If set used to lookup whether the user and group start node permissions will be ignored.</param>
         /// <returns></returns>
         [FilterAllowedOutgoingMedia(typeof(IEnumerable<ContentItemBasic<ContentPropertyBasic, IMedia>>), "Items")]
         public PagedResult<ContentItemBasic<ContentPropertyBasic, IMedia>> GetChildren(Udi id,
-           Guid? dataTypeId,
+           bool ignoreUserStartNodes,
            int pageNumber = 0,
            int pageSize = 0,
            string orderBy = "SortOrder",
@@ -424,7 +417,7 @@ namespace Umbraco.Web.Editors
                 var entity = Services.EntityService.GetByKey(guidUdi.Guid);
                 if (entity != null)
                 {
-                    return GetChildren(entity.Id, pageNumber, pageSize, orderBy, orderDirection, orderBySystemField, filter, dataTypeId);
+                    return GetChildren(entity.Id, pageNumber, pageSize, orderBy, orderDirection, orderBySystemField, filter);
                 }
             }
 
diff --git a/src/Umbraco.Web/Models/ContentEditing/UrlAndAnchors.cs b/src/Umbraco.Web/Models/ContentEditing/UrlAndAnchors.cs
index a8cf2e26ee..86642a8d65 100644
--- a/src/Umbraco.Web/Models/ContentEditing/UrlAndAnchors.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/UrlAndAnchors.cs
@@ -6,7 +6,7 @@ namespace Umbraco.Web.Models.ContentEditing
     [DataContract(Name = "urlAndAnchors", Namespace = "")]
     public class UrlAndAnchors
     {
-        public UrlAndAnchors(string url, IList<string> anchorValues)
+        public UrlAndAnchors(string url, IEnumerable<string> anchorValues)
         {
             Url = url;
             AnchorValues = anchorValues;
@@ -16,6 +16,6 @@ namespace Umbraco.Web.Models.ContentEditing
         public string Url { get; }
 
         [DataMember(Name = "anchorValues")]
-        public IList<string> AnchorValues { get;  }
+        public IEnumerable<string> AnchorValues { get;  }
     }
 }
diff --git a/src/Umbraco.Web/Models/Mapping/ContentPropertyBasicConverter.cs b/src/Umbraco.Web/Models/Mapping/ContentPropertyBasicConverter.cs
index 02cf570f7d..dfff72a6f1 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentPropertyBasicConverter.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentPropertyBasicConverter.cs
@@ -18,13 +18,15 @@ namespace Umbraco.Web.Models.Mapping
     internal class ContentPropertyBasicConverter<T> : ITypeConverter<Property, T>
         where T : ContentPropertyBasic, new()
     {
-        protected IDataTypeService DataTypeService { get; private set; }
+        protected IDataTypeService DataTypeService { get; }
+        protected IEntityService EntityService { get; }
 
         private static readonly List<string> ComplexPropertyTypeAliases = new List<string> {"Umbraco.NestedContent"};
 
-        public ContentPropertyBasicConverter(IDataTypeService dataTypeService)
+        public ContentPropertyBasicConverter(IDataTypeService dataTypeService, IEntityService entityService)
         {
             DataTypeService = dataTypeService;
+            EntityService = entityService;
         }
 
         /// <summary>
@@ -48,12 +50,18 @@ namespace Umbraco.Web.Models.Mapping
                 editor = PropertyEditorResolver.Current.GetByAlias(Constants.PropertyEditors.NoEditAlias);
             }
 
-            var dataTypeDefinition = DataTypeService.GetDataTypeDefinitionById(property.PropertyType.DataTypeDefinitionId);
+            var dataTypeDefinitionKey = EntityService.GetKeyForId(property.PropertyType.DataTypeDefinitionId, UmbracoObjectTypes.DataType);
+
+            if (dataTypeDefinitionKey.Success == false)
+            {
+                throw new InvalidOperationException("Can't get the unique key from the id: " + property.PropertyType.DataTypeDefinitionId);
+            }
+
 
             var result = new T
             {
                 Id = property.Id,
-                DataTypeId = dataTypeDefinition.Key,
+                DataTypeId = dataTypeDefinitionKey.Result,
                 Alias = property.Alias,
                 PropertyEditor = editor,
                 Editor = editor.Alias
diff --git a/src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayConverter.cs b/src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayConverter.cs
index 86c79d9c59..9c9cad560c 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayConverter.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayConverter.cs
@@ -1,67 +1,67 @@
-using System;
-using AutoMapper;
-using Umbraco.Core.Models;
-using Umbraco.Core.Services;
-using Umbraco.Web.Models.ContentEditing;
-
-namespace Umbraco.Web.Models.Mapping
-{
-    /// <summary>
-    /// Creates a ContentPropertyDisplay from a Property
-    /// </summary>
-    internal class ContentPropertyDisplayConverter : ContentPropertyBasicConverter<ContentPropertyDisplay>
-    {
-        private readonly ILocalizedTextService _textService;
-
-        public ContentPropertyDisplayConverter(IDataTypeService dataTypeService, ILocalizedTextService textService)
-            : base(dataTypeService)
-        {
-            _textService = textService;
-        }
-        public override ContentPropertyDisplay Convert(ResolutionContext context)
-        {
-            var display = base.Convert(context);
-
-            var originalProperty = context.SourceValue as Property;
-            if (originalProperty == null)
-                throw new InvalidOperationException("Source value is not a property.");
-
-            var dataTypeService = DataTypeService;
-            var preVals = dataTypeService.GetPreValuesCollectionByDataTypeId(originalProperty.PropertyType.DataTypeDefinitionId);
-
-            //configure the editor for display with the pre-values
-            var valEditor = display.PropertyEditor.ValueEditor;
-            valEditor.ConfigureForDisplay(preVals);
-
-            //set the display properties after mapping
-            display.Alias = originalProperty.Alias;
-            display.Description = originalProperty.PropertyType.Description;
-            display.Label = originalProperty.PropertyType.Name;
-            display.HideLabel = valEditor.HideLabel;
-
-            //add the validation information
-            display.Validation.Mandatory = originalProperty.PropertyType.Mandatory;
-            display.Validation.Pattern = originalProperty.PropertyType.ValidationRegExp;
-
-            if (display.PropertyEditor == null)
-            {
-                //display.Config = PreValueCollection.AsDictionary(preVals);
-                //if there is no property editor it means that it is a legacy data type
-                // we cannot support editing with that so we'll just render the readonly value view.
-                display.View = "views/propertyeditors/readonlyvalue/readonlyvalue.html";
-            }
-            else
-            {
-                //let the property editor format the pre-values
-                display.Config = display.PropertyEditor.PreValueEditor.ConvertDbToEditor(display.PropertyEditor.DefaultPreValues, preVals);
-                display.View = valEditor.View;
-            }
-
-            //Translate
-            display.Label = _textService.UmbracoDictionaryTranslate(display.Label);
-            display.Description = _textService.UmbracoDictionaryTranslate(display.Description);
-
-            return display;
-        }
-    }
-}
+using System;
+using AutoMapper;
+using Umbraco.Core.Models;
+using Umbraco.Core.Services;
+using Umbraco.Web.Models.ContentEditing;
+
+namespace Umbraco.Web.Models.Mapping
+{
+    /// <summary>
+    /// Creates a ContentPropertyDisplay from a Property
+    /// </summary>
+    internal class ContentPropertyDisplayConverter : ContentPropertyBasicConverter<ContentPropertyDisplay>
+    {
+        private readonly ILocalizedTextService _textService;
+
+        public ContentPropertyDisplayConverter(IDataTypeService dataTypeService, ILocalizedTextService textService, IEntityService entityService)
+            : base(dataTypeService, entityService)
+        {
+            _textService = textService;
+        }
+        public override ContentPropertyDisplay Convert(ResolutionContext context)
+        {
+            var display = base.Convert(context);
+
+            var originalProperty = context.SourceValue as Property;
+            if (originalProperty == null)
+                throw new InvalidOperationException("Source value is not a property.");
+
+            var dataTypeService = DataTypeService;
+            var preVals = dataTypeService.GetPreValuesCollectionByDataTypeId(originalProperty.PropertyType.DataTypeDefinitionId);
+
+            //configure the editor for display with the pre-values
+            var valEditor = display.PropertyEditor.ValueEditor;
+            valEditor.ConfigureForDisplay(preVals);
+
+            //set the display properties after mapping
+            display.Alias = originalProperty.Alias;
+            display.Description = originalProperty.PropertyType.Description;
+            display.Label = originalProperty.PropertyType.Name;
+            display.HideLabel = valEditor.HideLabel;
+
+            //add the validation information
+            display.Validation.Mandatory = originalProperty.PropertyType.Mandatory;
+            display.Validation.Pattern = originalProperty.PropertyType.ValidationRegExp;
+
+            if (display.PropertyEditor == null)
+            {
+                //display.Config = PreValueCollection.AsDictionary(preVals);
+                //if there is no property editor it means that it is a legacy data type
+                // we cannot support editing with that so we'll just render the readonly value view.
+                display.View = "views/propertyeditors/readonlyvalue/readonlyvalue.html";
+            }
+            else
+            {
+                //let the property editor format the pre-values
+                display.Config = display.PropertyEditor.PreValueEditor.ConvertDbToEditor(display.PropertyEditor.DefaultPreValues, preVals);
+                display.View = valEditor.View;
+            }
+
+            //Translate
+            display.Label = _textService.UmbracoDictionaryTranslate(display.Label);
+            display.Description = _textService.UmbracoDictionaryTranslate(display.Description);
+
+            return display;
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Models/Mapping/ContentPropertyDtoConverter.cs b/src/Umbraco.Web/Models/Mapping/ContentPropertyDtoConverter.cs
index 61fd4fbe00..03b2fc7bcd 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentPropertyDtoConverter.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentPropertyDtoConverter.cs
@@ -1,41 +1,41 @@
-using System;
-using AutoMapper;
-using Umbraco.Core.Models;
-using Umbraco.Core.Services;
-using Umbraco.Web.Models.ContentEditing;
-
-namespace Umbraco.Web.Models.Mapping
-{
-    /// <summary>
-    /// Creates a ContentPropertyDto from a Property
-    /// </summary>
-    internal class ContentPropertyDtoConverter : ContentPropertyBasicConverter<ContentPropertyDto>
-    {
-        public ContentPropertyDtoConverter(IDataTypeService dataTypeService)
-            : base(dataTypeService)
-        {
-        }
-
-        public override ContentPropertyDto Convert(ResolutionContext context)
-        {
-            var propertyDto = base.Convert(context);
-
-            var originalProperty = context.SourceValue as Property;
-            if (originalProperty == null)
-                throw new InvalidOperationException("Source value is not a property.");
-
-            var dataTypeService = DataTypeService;
-
-            propertyDto.IsRequired = originalProperty.PropertyType.Mandatory;
-            propertyDto.ValidationRegExp = originalProperty.PropertyType.ValidationRegExp;
-            propertyDto.Description = originalProperty.PropertyType.Description;
-            propertyDto.Label = originalProperty.PropertyType.Name;
-
-            //TODO: We should be able to look both of these up at the same time!
-            propertyDto.DataType = dataTypeService.GetDataTypeDefinitionById(originalProperty.PropertyType.DataTypeDefinitionId);
-            propertyDto.PreValues = dataTypeService.GetPreValuesCollectionByDataTypeId(originalProperty.PropertyType.DataTypeDefinitionId);
-
-            return propertyDto;
-        }
-    }
-}
+using System;
+using AutoMapper;
+using Umbraco.Core.Models;
+using Umbraco.Core.Services;
+using Umbraco.Web.Models.ContentEditing;
+
+namespace Umbraco.Web.Models.Mapping
+{
+    /// <summary>
+    /// Creates a ContentPropertyDto from a Property
+    /// </summary>
+    internal class ContentPropertyDtoConverter : ContentPropertyBasicConverter<ContentPropertyDto>
+    {
+        public ContentPropertyDtoConverter(IDataTypeService dataTypeService, IEntityService entityService)
+            : base(dataTypeService, entityService)
+        {
+        }
+
+        public override ContentPropertyDto Convert(ResolutionContext context)
+        {
+            var propertyDto = base.Convert(context);
+
+            var originalProperty = context.SourceValue as Property;
+            if (originalProperty == null)
+                throw new InvalidOperationException("Source value is not a property.");
+
+            var dataTypeService = DataTypeService;
+
+            propertyDto.IsRequired = originalProperty.PropertyType.Mandatory;
+            propertyDto.ValidationRegExp = originalProperty.PropertyType.ValidationRegExp;
+            propertyDto.Description = originalProperty.PropertyType.Description;
+            propertyDto.Label = originalProperty.PropertyType.Name;
+
+            //TODO: We should be able to look both of these up at the same time!
+            propertyDto.DataType = dataTypeService.GetDataTypeDefinitionById(originalProperty.PropertyType.DataTypeDefinitionId);
+            propertyDto.PreValues = dataTypeService.GetPreValuesCollectionByDataTypeId(originalProperty.PropertyType.DataTypeDefinitionId);
+
+            return propertyDto;
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Models/Mapping/ContentPropertyModelMapper.cs b/src/Umbraco.Web/Models/Mapping/ContentPropertyModelMapper.cs
index f401832020..fd9d3d19f8 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentPropertyModelMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentPropertyModelMapper.cs
@@ -1,37 +1,37 @@
-using AutoMapper;
-using Umbraco.Core;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.Mapping;
-using Umbraco.Web.Models.ContentEditing;
-
-namespace Umbraco.Web.Models.Mapping
-{
-    /// <summary>
-    /// A mapper which declares how to map content properties. These mappings are shared among media (and probably members) which is 
-    /// why they are in their own mapper
-    /// </summary>
-    internal class ContentPropertyModelMapper : MapperConfiguration
-    {
-        public override void ConfigureMappings(IConfiguration config, ApplicationContext applicationContext)
-        {
-            //FROM Property TO ContentPropertyBasic
-            config.CreateMap<PropertyGroup, Tab<ContentPropertyDisplay>>()
-                .ForMember(tab => tab.Label, expression => expression.MapFrom(@group => @group.Name))
-                .ForMember(tab => tab.IsActive, expression => expression.UseValue(true))
-                .ForMember(tab => tab.Properties, expression => expression.Ignore())
-                .ForMember(tab => tab.Alias, expression => expression.Ignore());
-
-            //FROM Property TO ContentPropertyBasic
-            config.CreateMap<Property, ContentPropertyBasic>()
-                  .ConvertUsing(new ContentPropertyBasicConverter<ContentPropertyBasic>(applicationContext.Services.DataTypeService));
-
-            //FROM Property TO ContentPropertyDto
-            config.CreateMap<Property, ContentPropertyDto>()
-                  .ConvertUsing(new ContentPropertyDtoConverter(applicationContext.Services.DataTypeService));
-
-            //FROM Property TO ContentPropertyDisplay
-            config.CreateMap<Property, ContentPropertyDisplay>()
-                  .ConvertUsing(new ContentPropertyDisplayConverter(applicationContext.Services.DataTypeService, applicationContext.Services.TextService));
-        }
-    }
-}
+using AutoMapper;
+using Umbraco.Core;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.Mapping;
+using Umbraco.Web.Models.ContentEditing;
+
+namespace Umbraco.Web.Models.Mapping
+{
+    /// <summary>
+    /// A mapper which declares how to map content properties. These mappings are shared among media (and probably members) which is
+    /// why they are in their own mapper
+    /// </summary>
+    internal class ContentPropertyModelMapper : MapperConfiguration
+    {
+        public override void ConfigureMappings(IConfiguration config, ApplicationContext applicationContext)
+        {
+            //FROM Property TO ContentPropertyBasic
+            config.CreateMap<PropertyGroup, Tab<ContentPropertyDisplay>>()
+                .ForMember(tab => tab.Label, expression => expression.MapFrom(@group => @group.Name))
+                .ForMember(tab => tab.IsActive, expression => expression.UseValue(true))
+                .ForMember(tab => tab.Properties, expression => expression.Ignore())
+                .ForMember(tab => tab.Alias, expression => expression.Ignore());
+
+            //FROM Property TO ContentPropertyBasic
+            config.CreateMap<Property, ContentPropertyBasic>()
+                  .ConvertUsing(new ContentPropertyBasicConverter<ContentPropertyBasic>(applicationContext.Services.DataTypeService, applicationContext.Services.EntityService));
+
+            //FROM Property TO ContentPropertyDto
+            config.CreateMap<Property, ContentPropertyDto>()
+                  .ConvertUsing(new ContentPropertyDtoConverter(applicationContext.Services.DataTypeService, applicationContext.Services.EntityService));
+
+            //FROM Property TO ContentPropertyDisplay
+            config.CreateMap<Property, ContentPropertyDisplay>()
+                  .ConvertUsing(new ContentPropertyDisplayConverter(applicationContext.Services.DataTypeService, applicationContext.Services.TextService, applicationContext.Services.EntityService));
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Models/Mapping/PreValueDisplayResolver.cs b/src/Umbraco.Web/Models/Mapping/PreValueDisplayResolver.cs
index af6f99a15d..76e841d65a 100644
--- a/src/Umbraco.Web/Models/Mapping/PreValueDisplayResolver.cs
+++ b/src/Umbraco.Web/Models/Mapping/PreValueDisplayResolver.cs
@@ -67,8 +67,8 @@ namespace Umbraco.Web.Models.Mapping
             // If we have a prop editor, then format the pre-values based on it and create it's fields
             if (propEd != null)
             {
-                result = propEd.PreValueEditor.Fields.Select(Mapper.Map<PreValueFieldDisplay>).AsEnumerable();
-                if (source.IsBuildInDataType)
+                result = propEd.PreValueEditor.Fields.Select(Mapper.Map<PreValueFieldDisplay>);
+                if (source.IsBuildInDataType())
                 {
                     result = RemovePreValuesNotSupportedOnBuildInTypes(result);
                 }
diff --git a/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs b/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
index 8845e9c323..9cfa29985b 100644
--- a/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
+++ b/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
@@ -15,31 +15,6 @@ namespace Umbraco.Web.Search
 {
     internal class UmbracoTreeSearcher
     {
-        /// <summary>
-        /// This method is obsolete, use the overload with ignoreUserStartNodes instead
-        /// Searches for results based on the entity type
-        /// </summary>
-        /// <param name="umbracoHelper"></param>
-        /// <param name="query"></param>
-        /// <param name="entityType"></param>
-        /// <param name="totalFound"></param>
-        /// <param name="searchFrom">
-        /// A starting point for the search, generally a node id, but for members this is a member type alias
-        /// </param>
-        /// <param name="pageSize"></param>
-        /// <param name="pageIndex"></param>
-        /// <returns></returns>
-        [Obsolete("This method is obsolete, use the overload with ignoreUserStartNodes instead", false)]
-        public IEnumerable<SearchResultItem> ExamineSearch(
-            UmbracoHelper umbracoHelper,
-            string query,
-            UmbracoEntityTypes entityType,
-            int pageSize,
-            long pageIndex, out long totalFound, string searchFrom = null)
-        {
-            return ExamineSearch(umbracoHelper, query, entityType, pageSize, pageIndex, out totalFound, false, searchFrom);
-        }
-
         /// <summary>
         /// Searches for results based on the entity type
         /// </summary>
@@ -59,7 +34,7 @@ namespace Umbraco.Web.Search
         string query,
         UmbracoEntityTypes entityType,
         int pageSize,
-        long pageIndex, out long totalFound, bool ignoreUserStartNodes, string searchFrom = null)
+        long pageIndex, out long totalFound, string searchFrom = null, bool ignoreUserStartNodes = false)
         {
             var sb = new StringBuilder();
 
diff --git a/src/Umbraco.Web/Trees/TreeControllerBase.cs b/src/Umbraco.Web/Trees/TreeControllerBase.cs
index f2f83d1133..995cb031d0 100644
--- a/src/Umbraco.Web/Trees/TreeControllerBase.cs
+++ b/src/Umbraco.Web/Trees/TreeControllerBase.cs
@@ -10,6 +10,7 @@ using Umbraco.Web.WebApi;
 using Umbraco.Web.WebApi.Filters;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Services;
 using Umbraco.Web.Search;
 
 namespace Umbraco.Web.Trees
diff --git a/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs b/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
index dfdea268c4..13bceb318f 100644
--- a/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
+++ b/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
@@ -73,24 +73,6 @@ namespace Umbraco.Web.WebApi.Filters
                 throw new HttpResponseException(System.Net.HttpStatusCode.Unauthorized);
             }
 
-            var ignoreUserStartNodes = false;
-
-            if (actionContext.ActionArguments.ContainsKey("dataTypeId"))
-            {
-                if (actionContext.ActionArguments.TryGetValue("dataTypeId", out var dataTypeIdValue))
-                {
-                    var dataTypeIdString = dataTypeIdValue?.ToString();
-                    if (string.IsNullOrEmpty(dataTypeIdString) == false &&
-                        Guid.TryParse(dataTypeIdString, out var dataTypeId))
-                    {
-                        ignoreUserStartNodes =
-                            ApplicationContext.Current.Services.DataTypeService
-                                .IsDataTypeIgnoringUserStartNodes(dataTypeId);
-                    }
-                }
-
-            }
-
             int nodeId;
             if (_nodeId.HasValue == false)
             {
@@ -144,9 +126,7 @@ namespace Umbraco.Web.WebApi.Filters
                 ApplicationContext.Current.Services.UserService,
                 ApplicationContext.Current.Services.ContentService,
                 ApplicationContext.Current.Services.EntityService,
-                nodeId,
-                _permissionToCheck.HasValue ? new[]{_permissionToCheck.Value}: null,
-                ignoreUserStartNodes: ignoreUserStartNodes))
+                nodeId, _permissionToCheck.HasValue ? new[]{_permissionToCheck.Value}: null))
             {
                 base.OnActionExecuting(actionContext);
             }
diff --git a/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs b/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs
index 22ce7a5ce7..33c99cd60a 100644
--- a/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs
+++ b/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs
@@ -3,12 +3,11 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
-using System.Web;
 using System.Web.Http.Filters;
 using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Membership;
-using Umbraco.Web.Trees;
+using Umbraco.Web.Models.ContentEditing;
 
 namespace Umbraco.Web.WebApi.Filters
 {
@@ -78,20 +77,9 @@ namespace Umbraco.Web.WebApi.Filters
 
         protected virtual void FilterItems(IUser user, IList items)
         {
-
-            Guid? dataTypeId = Guid.TryParse(HttpContext.Current.Request.QueryString.Get(TreeQueryStringParameters.DataTypeId), out var temp) ? (Guid?)temp : null;
-
-            if (dataTypeId.HasValue == false) return;
-
-            var ignoreUserStartNodes = ApplicationContext.Current.Services.DataTypeService.IsDataTypeIgnoringUserStartNodes(dataTypeId.Value);
-
-            if (ignoreUserStartNodes == false)
-            {
-                FilterBasedOnStartNode(items, user);
-            }
+            FilterBasedOnStartNode(items, user);
         }
 
-
         internal void FilterBasedOnStartNode(IList items, IUser user)
         {
             var toRemove = new List<dynamic>();

From 9f45d41a4a6b9e88a89b31b60a7b695943022434 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 25 Jun 2019 13:18:15 +0200
Subject: [PATCH 034/776] 
 https://umbraco.visualstudio.com/D-Team%20Tracker/_workitems/edit/1479  -
 Test fixes

---
 .../src/common/resources/entity.resource.js       |  6 ++++--
 .../grid/editors/rte.controller.js                |  2 +-
 src/Umbraco.Web/Editors/EntityController.cs       | 15 +++++++++------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
index 416fd0a286..dce2cd8347 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
@@ -187,8 +187,10 @@ function entityResource($q, $http, umbRequestHelper) {
                 $http.post(
                     umbRequestHelper.getApiUrl(
                         "entityApiBaseUrl",
-                        "GetAnchors",
-                        { rteContent: rteContent })),
+                        'GetAnchors'),
+                    {
+                        rteContent: rteContent
+                    }),
                 'Failed to anchors data for rte content ' + rteContent);
         },
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js
index 601c0a36d2..da869dbf01 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js
@@ -12,7 +12,7 @@
 
         function openLinkPicker(editor, currentTarget, anchorElement) {
 
-            entityResource.getAnchors($scope.model.value).then(function(anchorValues) {
+            entityResource.getAnchors(JSON.stringify($scope.model.value)).then(function(anchorValues) {
                 vm.linkPickerOverlay = {
                     view: "linkpicker",
                     currentTarget: currentTarget,
diff --git a/src/Umbraco.Web/Editors/EntityController.cs b/src/Umbraco.Web/Editors/EntityController.cs
index 6c9cc7c36b..ebdfe59210 100644
--- a/src/Umbraco.Web/Editors/EntityController.cs
+++ b/src/Umbraco.Web/Editors/EntityController.cs
@@ -276,20 +276,23 @@ namespace Umbraco.Web.Editors
 
 
         [HttpGet]
-        public UrlAndAnchors GetUrlAndAnchors(int id)
+        public UrlAndAnchors GetUrlAndAnchors([FromUri]int id)
         {
-            var x = GetResultForId(id, UmbracoEntityTypes.Document);
-
             var url = Umbraco.Url(id);
             var anchorValues = Services.ContentService.GetAnchorValuesFromRTEs(id);
             return new UrlAndAnchors(url, anchorValues);
         }
 
-        [HttpPost]
-        public IEnumerable<string> GetAnchors(string rteContent)
+        public class AnchorsModel
         {
+            public string RteContent { get; set; }
+        }
 
-            var anchorValues = Services.ContentService.GetAnchorValuesFromRTEContent(rteContent);
+        [HttpGet]
+        [HttpPost]
+        public IEnumerable<string> GetAnchors(AnchorsModel model)
+        {
+            var anchorValues = Services.ContentService.GetAnchorValuesFromRTEContent(model.RteContent);
             return anchorValues;
         }
 

From 2f309a2fd625ffa4ddc07f51f2516466dd0e3822 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 25 Jun 2019 15:09:37 +0200
Subject: [PATCH 035/776] 
 https://umbraco.visualstudio.com/D-Team%20Tracker/_workitems/edit/1085 -
 moved the code that adds the ufprt token to the context items, into the
 constructor of UmbracoForm. Because it needs to happen before the 
 @Html.AntiForgeryToken() is called. The dispose method is too late.

---
 src/Umbraco.Web/HtmlHelperRenderExtensions.cs | 2017 +++++++++--------
 1 file changed, 1009 insertions(+), 1008 deletions(-)

diff --git a/src/Umbraco.Web/HtmlHelperRenderExtensions.cs b/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
index a64c00a03c..0e2a2a6450 100644
--- a/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
+++ b/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
@@ -1,1008 +1,1009 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Web;
-using System.Web.Helpers;
-using System.Web.Mvc;
-using System.Web.Mvc.Html;
-using System.Web.Routing;
-using Umbraco.Core;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.Dynamics;
-using Umbraco.Core.IO;
-using Umbraco.Core.Models;
-using Umbraco.Core.Profiling;
-using Umbraco.Web.Models;
-using Umbraco.Web.Mvc;
-using Constants = Umbraco.Core.Constants;
-using Member = umbraco.cms.businesslogic.member.Member;
-
-namespace Umbraco.Web
-{
-    /// <summary>
-	/// HtmlHelper extensions for use in templates
-	/// </summary>
-	public static class HtmlHelperRenderExtensions
-	{
-        /// <summary>
-        /// Renders the markup for the profiler
-        /// </summary>
-        /// <param name="helper"></param>
-        /// <returns></returns>
-        public static IHtmlString RenderProfiler(this HtmlHelper helper)
-        {
-            return new HtmlString(ProfilerResolver.Current.Profiler.Render());
-        }
-
-        /// <summary>
-        /// Renders a partial view that is found in the specified area
-        /// </summary>
-        /// <param name="helper"></param>
-        /// <param name="partial"></param>
-        /// <param name="area"></param>
-        /// <param name="model"></param>
-        /// <param name="viewData"></param>
-        /// <returns></returns>
-        public static MvcHtmlString AreaPartial(this HtmlHelper helper, string partial, string area, object model = null, ViewDataDictionary viewData = null)
-        {
-            var originalArea = helper.ViewContext.RouteData.DataTokens["area"];
-            helper.ViewContext.RouteData.DataTokens["area"] = area;	        
-            var result = helper.Partial(partial, model, viewData);
-            helper.ViewContext.RouteData.DataTokens["area"] = originalArea;
-            return result;
-        }
-
-	    /// <summary>
-        /// Will render the preview badge when in preview mode which is not required ever unless the MVC page you are
-        /// using does not inherit from UmbracoTemplatePage
-        /// </summary>
-        /// <param name="helper"></param>
-        /// <returns></returns>
-        /// <remarks>
-        /// See: http://issues.umbraco.org/issue/U4-1614
-        /// </remarks>
-        public static MvcHtmlString PreviewBadge(this HtmlHelper helper)
-        {
-            if (UmbracoContext.Current.InPreviewMode)
-            {
-                var htmlBadge =
-                    String.Format(UmbracoConfig.For.UmbracoSettings().Content.PreviewBadge,
-                                  IOHelper.ResolveUrl(SystemDirectories.Umbraco),
-                                  IOHelper.ResolveUrl(SystemDirectories.UmbracoClient),
-                                  UmbracoContext.Current.HttpContext.Server.UrlEncode(UmbracoContext.Current.HttpContext.Request.Path));
-                return new MvcHtmlString(htmlBadge);
-            }
-            return new MvcHtmlString("");
-
-        }
-
-		public static IHtmlString CachedPartial(
-			this HtmlHelper htmlHelper, 
-			string partialViewName, 
-			object model, 
-			int cachedSeconds,
-			bool cacheByPage = false,
-			bool cacheByMember = false,
-			ViewDataDictionary viewData = null,
-			Func<object, ViewDataDictionary, string> contextualKeyBuilder = null)
-		{
-			var cacheKey = new StringBuilder(partialViewName);
-			if (cacheByPage)
-			{
-				if (UmbracoContext.Current == null)
-				{
-					throw new InvalidOperationException("Cannot cache by page if the UmbracoContext has not been initialized, this parameter can only be used in the context of an Umbraco request");
-				}
-				cacheKey.AppendFormat("{0}-", UmbracoContext.Current.PageId);
-			}
-			if (cacheByMember)
-			{
-				var currentMember = Member.GetCurrentMember();
-				cacheKey.AppendFormat("m{0}-", currentMember == null ? 0 : currentMember.Id);
-			}
-			if (contextualKeyBuilder != null)
-		    {
-		        var contextualKey = contextualKeyBuilder(model, viewData);
-                cacheKey.AppendFormat("c{0}-", contextualKey);
-		    }
-			return ApplicationContext.Current.ApplicationCache.CachedPartialView(htmlHelper, partialViewName, model, cachedSeconds, cacheKey.ToString(), viewData);
-		}
-
-		public static MvcHtmlString EditorFor<T>(this HtmlHelper htmlHelper, string templateName = "", string htmlFieldName = "", object additionalViewData = null)
-			where T : new()
-		{
-			var model = new T();
-			var typedHelper = new HtmlHelper<T>(
-				htmlHelper.ViewContext.CopyWithModel(model),
-				htmlHelper.ViewDataContainer.CopyWithModel(model));
-
-			return typedHelper.EditorFor(x => model, templateName, htmlFieldName, additionalViewData);
-		}
-
-		/// <summary>
-		/// A validation summary that lets you pass in a prefix so that the summary only displays for elements 
-		/// containing the prefix. This allows you to have more than on validation summary on a page.
-		/// </summary>
-		/// <param name="htmlHelper"></param>
-		/// <param name="prefix"></param>
-		/// <param name="excludePropertyErrors"></param>
-		/// <param name="message"></param>
-		/// <param name="htmlAttributes"></param>
-		/// <returns></returns>
-		public static MvcHtmlString ValidationSummary(this HtmlHelper htmlHelper,
-		                                              string prefix = "",
-		                                              bool excludePropertyErrors = false,
-		                                              string message = "",
-		                                              IDictionary<string, object> htmlAttributes = null)
-		{
-			if (prefix.IsNullOrWhiteSpace())
-			{
-				return htmlHelper.ValidationSummary(excludePropertyErrors, message, htmlAttributes);
-			}
-
-			//if there's a prefix applied, we need to create a new html helper with a filtered ModelState collection so that it only looks for 
-			//specific model state with the prefix.
-			var filteredHtmlHelper = new HtmlHelper(htmlHelper.ViewContext, htmlHelper.ViewDataContainer.FilterContainer(prefix));
-			return filteredHtmlHelper.ValidationSummary(excludePropertyErrors, message, htmlAttributes);
-		}
-
-	    /// <summary>
-	    /// Returns the result of a child action of a strongly typed SurfaceController
-	    /// </summary>
-	    /// <typeparam name="T"></typeparam>
-	    /// <param name="htmlHelper"></param>
-	    /// <param name="actionName"></param>
-	    /// <returns></returns>
-	    public static IHtmlString Action<T>(this HtmlHelper htmlHelper, string actionName)
-            where T : SurfaceController
-        {
-            return htmlHelper.Action(actionName, typeof(T));
-        }
-
-        /// <summary>
-        /// Returns the result of a child action of a SurfaceController
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="htmlHelper"></param>
-        /// <param name="actionName"></param>
-        /// <param name="surfaceType"></param>
-        /// <returns></returns>
-        public static IHtmlString Action(this HtmlHelper htmlHelper, string actionName, Type surfaceType)
-        {
-            Mandate.ParameterNotNull(surfaceType, "surfaceType");
-            Mandate.ParameterNotNullOrEmpty(actionName, "actionName");
-
-            var routeVals = new RouteValueDictionary(new {area = ""});
-
-            var surfaceController = SurfaceControllerResolver.Current.RegisteredSurfaceControllers
-                .SingleOrDefault(x => x == surfaceType);
-            if (surfaceController == null)
-                throw new InvalidOperationException("Could not find the surface controller of type " + surfaceType.FullName);
-            var metaData = PluginController.GetMetadata(surfaceController);
-            if (!metaData.AreaName.IsNullOrWhiteSpace())
-            {
-                //set the area to the plugin area
-                if (routeVals.ContainsKey("area"))
-                {
-                    routeVals["area"] = metaData.AreaName;
-                }
-                else
-                {
-                    routeVals.Add("area", metaData.AreaName);    
-                }
-            }
-
-            return htmlHelper.Action(actionName, metaData.ControllerName, routeVals);
-        }
-
-        #region GetCropUrl
-
-        [Obsolete("Use the UrlHelper.GetCropUrl extension instead")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public static IHtmlString GetCropUrl(this HtmlHelper htmlHelper, IPublishedContent mediaItem, string cropAlias)
-        {
-            return new HtmlString(mediaItem.GetCropUrl(cropAlias: cropAlias, useCropDimensions: true));
-        }
-
-        [Obsolete("Use the UrlHelper.GetCropUrl extension instead")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public static IHtmlString GetCropUrl(this HtmlHelper htmlHelper, IPublishedContent mediaItem, string propertyAlias, string cropAlias)
-        {
-            return new HtmlString(mediaItem.GetCropUrl(propertyAlias: propertyAlias, cropAlias: cropAlias, useCropDimensions: true));
-        }
-
-        [Obsolete("Use the UrlHelper.GetCropUrl extension instead")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public static IHtmlString GetCropUrl(this HtmlHelper htmlHelper,
-            IPublishedContent mediaItem,
-            int? width = null,
-            int? height = null,
-            string propertyAlias = Constants.Conventions.Media.File,
-            string cropAlias = null,
-            int? quality = null,
-            ImageCropMode? imageCropMode = null,
-            ImageCropAnchor? imageCropAnchor = null,
-            bool preferFocalPoint = false,
-            bool useCropDimensions = false,
-            bool cacheBuster = true,
-            string furtherOptions = null,
-            ImageCropRatioMode? ratioMode = null,
-            bool upScale = true)
-        {
-            return
-                new HtmlString(mediaItem.GetCropUrl(width, height, propertyAlias, cropAlias, quality, imageCropMode,
-                    imageCropAnchor, preferFocalPoint, useCropDimensions, cacheBuster, furtherOptions, ratioMode,
-                    upScale));
-        }
-
-        [Obsolete("Use the UrlHelper.GetCropUrl extension instead")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public static IHtmlString GetCropUrl(this HtmlHelper htmlHelper,
-            string imageUrl,
-            int? width = null,
-            int? height = null,
-            string imageCropperValue = null,
-            string cropAlias = null,
-            int? quality = null,
-            ImageCropMode? imageCropMode = null,
-            ImageCropAnchor? imageCropAnchor = null,
-            bool preferFocalPoint = false,
-            bool useCropDimensions = false,
-            string cacheBusterValue = null,
-            string furtherOptions = null,
-            ImageCropRatioMode? ratioMode = null,
-            bool upScale = true)
-        {
-            return
-                new HtmlString(imageUrl.GetCropUrl(width, height, imageCropperValue, cropAlias, quality, imageCropMode,
-                    imageCropAnchor, preferFocalPoint, useCropDimensions, cacheBusterValue, furtherOptions, ratioMode,
-                    upScale));
-        }
-
-        #endregion
-
-        #region BeginUmbracoForm
-
-        /// <summary>
-        /// Used for rendering out the Form for BeginUmbracoForm
-        /// </summary>
-        internal class UmbracoForm : MvcForm
-		{
-		    /// <summary>
-		    /// Creates an UmbracoForm
-		    /// </summary>
-		    /// <param name="viewContext"></param>
-		    /// <param name="controllerName"></param>
-		    /// <param name="controllerAction"></param>
-		    /// <param name="area"></param>
-		    /// <param name="method"></param>
-		    /// <param name="additionalRouteVals"></param>
-		    public UmbracoForm(
-				ViewContext viewContext,
-				string controllerName,
-				string controllerAction,
-				string area,
-                FormMethod method,
-				object additionalRouteVals = null)
-				: base(viewContext)
-			{
-		        _viewContext = viewContext;
-		        _method = method;
-			    _controllerName = controllerName;
-                _encryptedString = UmbracoHelper.CreateEncryptedRouteString(controllerName, controllerAction, area, additionalRouteVals);
-			}
-
-		    private readonly ViewContext _viewContext;
-		    private readonly FormMethod _method;
-			private bool _disposed;
-			private readonly string _encryptedString;
-		    private readonly string _controllerName;
-
-            protected override void Dispose(bool disposing)
-			{
-				if (this._disposed)
-					return;
-				this._disposed = true;
-
-                //For UmbracoForm's we want to add our routing string to the httpcontext items in the case where anti-forgery tokens are used.
-                //In which case our custom UmbracoAntiForgeryAdditionalDataProvider will kick in and validate the values in the request against
-                //the values that will be appended to the token. This essentially means that when anti-forgery tokens are used with UmbracoForm's forms,
-                //that each token is unique to the controller/action/area instead of the default ASP.Net implementation which is that the token is unique
-                //per user.
-                _viewContext.HttpContext.Items["ufprt"] = _encryptedString;
-
-                //Detect if the call is targeting UmbRegisterController/UmbProfileController/UmbLoginStatusController/UmbLoginController and if it is we automatically output a AntiForgeryToken()
-                // We have a controllerName and area so we can match
-                if (_controllerName == "UmbRegister"
-                    || _controllerName == "UmbProfile"
-                    || _controllerName == "UmbLoginStatus"
-                    || _controllerName == "UmbLogin")
-			    {   
-                    _viewContext.Writer.Write(AntiForgery.GetHtml().ToString());
-			    }
-
-                //write out the hidden surface form routes
-                _viewContext.Writer.Write("<input name='ufprt' type='hidden' value='" + _encryptedString + "' />");
-
-				base.Dispose(disposing);
-			}
-		}
-
-        /// <summary>
-        /// Helper method to create a new form to execute in the Umbraco request pipeline against a locally declared controller
-        /// </summary>
-        /// <param name="html"></param>
-        /// <param name="action"></param>
-        /// <param name="controllerName"></param>
-        /// <param name="method"></param>
-        /// <returns></returns>
-        public static MvcForm BeginUmbracoForm(this HtmlHelper html, string action, string controllerName, FormMethod method)
-        {
-            return html.BeginUmbracoForm(action, controllerName, null, new Dictionary<string, object>(), method);
-        }
-
-		/// <summary>
-		/// Helper method to create a new form to execute in the Umbraco request pipeline against a locally declared controller
-		/// </summary>
-		/// <param name="html"></param>
-		/// <param name="action"></param>
-		/// <param name="controllerName"></param>
-		/// <returns></returns>
-		public static MvcForm BeginUmbracoForm(this HtmlHelper html, string action, string controllerName)
-		{
-			return html.BeginUmbracoForm(action, controllerName, null, new Dictionary<string, object>());
-		}
-
-        /// <summary>
-        /// Helper method to create a new form to execute in the Umbraco request pipeline against a locally declared controller
-        /// </summary>
-        /// <param name="html"></param>
-        /// <param name="action"></param>
-        /// <param name="controllerName"></param>
-        /// <param name="additionalRouteVals"></param>
-        /// <param name="method"></param>
-        /// <returns></returns>
-        public static MvcForm BeginUmbracoForm(this HtmlHelper html, string action, string controllerName, object additionalRouteVals, FormMethod method)
-        {
-            return html.BeginUmbracoForm(action, controllerName, additionalRouteVals, new Dictionary<string, object>(), method);
-        }
-
-		/// <summary>
-		/// Helper method to create a new form to execute in the Umbraco request pipeline against a locally declared controller
-		/// </summary>
-		/// <param name="html"></param>
-		/// <param name="action"></param>
-		/// <param name="controllerName"></param>
-		/// <param name="additionalRouteVals"></param>
-		/// <returns></returns>
-		public static MvcForm BeginUmbracoForm(this HtmlHelper html, string action, string controllerName, object additionalRouteVals)
-		{
-			return html.BeginUmbracoForm(action, controllerName, additionalRouteVals, new Dictionary<string, object>());
-		}
-
-        /// <summary>
-        /// Helper method to create a new form to execute in the Umbraco request pipeline against a locally declared controller
-        /// </summary>
-        /// <param name="html"></param>
-        /// <param name="action"></param>
-        /// <param name="controllerName"></param>
-        /// <param name="additionalRouteVals"></param>
-        /// <param name="htmlAttributes"></param>
-        /// <param name="method"></param>
-        /// <returns></returns>
-        public static MvcForm BeginUmbracoForm(this HtmlHelper html, string action, string controllerName,
-                                               object additionalRouteVals,
-                                               object htmlAttributes,
-                                               FormMethod method)
-        {
-            return html.BeginUmbracoForm(action, controllerName, additionalRouteVals, HtmlHelper.AnonymousObjectToHtmlAttributes(htmlAttributes), method);
-        }
-
-        /// <summary>
-		/// Helper method to create a new form to execute in the Umbraco request pipeline against a locally declared controller
-		/// </summary>
-		/// <param name="html"></param>
-		/// <param name="action"></param>
-		/// <param name="controllerName"></param>
-		/// <param name="additionalRouteVals"></param>
-		/// <param name="htmlAttributes"></param>
-		/// <returns></returns>
-		public static MvcForm BeginUmbracoForm(this HtmlHelper html, string action, string controllerName,
-											   object additionalRouteVals,
-											   object htmlAttributes)
-		{
-            return html.BeginUmbracoForm(action, controllerName, additionalRouteVals, HtmlHelper.AnonymousObjectToHtmlAttributes(htmlAttributes));
-		}
-
-        /// <summary>
-        /// Helper method to create a new form to execute in the Umbraco request pipeline against a locally declared controller
-        /// </summary>
-        /// <param name="html"></param>
-        /// <param name="action"></param>
-        /// <param name="controllerName"></param>
-        /// <param name="additionalRouteVals"></param>
-        /// <param name="htmlAttributes"></param>
-        /// <param name="method"></param>
-        /// <returns></returns>
-        public static MvcForm BeginUmbracoForm(this HtmlHelper html, string action, string controllerName,
-                                               object additionalRouteVals,
-                                               IDictionary<string, object> htmlAttributes,
-                                               FormMethod method)
-        {
-            Mandate.ParameterNotNullOrEmpty(action, "action");
-            Mandate.ParameterNotNullOrEmpty(controllerName, "controllerName");
-
-            return html.BeginUmbracoForm(action, controllerName, "", additionalRouteVals, htmlAttributes, method);
-        }
-
-        /// <summary>
-		/// Helper method to create a new form to execute in the Umbraco request pipeline against a locally declared controller
-		/// </summary>
-		/// <param name="html"></param>
-		/// <param name="action"></param>
-		/// <param name="controllerName"></param>
-		/// <param name="additionalRouteVals"></param>
-		/// <param name="htmlAttributes"></param>
-		/// <returns></returns>
-		public static MvcForm BeginUmbracoForm(this HtmlHelper html, string action, string controllerName,
-											   object additionalRouteVals,
-											   IDictionary<string, object> htmlAttributes)
-		{
-			Mandate.ParameterNotNullOrEmpty(action, "action");
-			Mandate.ParameterNotNullOrEmpty(controllerName, "controllerName");
-
-			return html.BeginUmbracoForm(action, controllerName, "", additionalRouteVals, htmlAttributes);
-		}
-
-        /// <summary>
-        /// Helper method to create a new form to execute in the Umbraco request pipeline to a surface controller plugin
-        /// </summary>
-        /// <param name="html"></param>
-        /// <param name="action"></param>
-        /// <param name="surfaceType">The surface controller to route to</param>
-        /// <param name="method"></param>
-        /// <returns></returns>
-        public static MvcForm BeginUmbracoForm(this HtmlHelper html, string action, Type surfaceType, FormMethod method)
-        {
-            return html.BeginUmbracoForm(action, surfaceType, null, new Dictionary<string, object>(), method);
-        }
-
-		/// <summary>
-		/// Helper method to create a new form to execute in the Umbraco request pipeline to a surface controller plugin
-		/// </summary>
-		/// <param name="html"></param>
-		/// <param name="action"></param>
-		/// <param name="surfaceType">The surface controller to route to</param>
-		/// <returns></returns>
-		public static MvcForm BeginUmbracoForm(this HtmlHelper html, string action, Type surfaceType)
-		{
-			return html.BeginUmbracoForm(action, surfaceType, null, new Dictionary<string, object>());
-		}
-
-        /// <summary>
-        /// Helper method to create a new form to execute in the Umbraco request pipeline to a surface controller plugin
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="html"></param>
-        /// <param name="action"></param>
-        /// <param name="method"></param>
-        /// <returns></returns>
-        public static MvcForm BeginUmbracoForm<T>(this HtmlHelper html, string action, FormMethod method)
-            where T : SurfaceController
-        {
-            return html.BeginUmbracoForm(action, typeof(T), method);
-        }
-
-		/// <summary>
-		/// Helper method to create a new form to execute in the Umbraco request pipeline to a surface controller plugin
-		/// </summary>
-		/// <typeparam name="T"></typeparam>
-		/// <param name="html"></param>
-		/// <param name="action"></param>
-		/// <returns></returns>
-		public static MvcForm BeginUmbracoForm<T>(this HtmlHelper html, string action)
-			where T : SurfaceController
-		{
-			return html.BeginUmbracoForm(action, typeof(T));
-		}
-
-        /// <summary>
-        /// Helper method to create a new form to execute in the Umbraco request pipeline to a surface controller plugin
-        /// </summary>
-        /// <param name="html"></param>
-        /// <param name="action"></param>
-        /// <param name="surfaceType">The surface controller to route to</param>
-        /// <param name="additionalRouteVals"></param>
-        /// <param name="method"></param>
-        /// <returns></returns>
-        public static MvcForm BeginUmbracoForm(this HtmlHelper html, string action, Type surfaceType,
-                                               object additionalRouteVals, FormMethod method)
-        {
-            return html.BeginUmbracoForm(action, surfaceType, additionalRouteVals, new Dictionary<string, object>(), method);
-        }
-
-		/// <summary>
-		/// Helper method to create a new form to execute in the Umbraco request pipeline to a surface controller plugin
-		/// </summary>
-		/// <param name="html"></param>
-		/// <param name="action"></param>
-		/// <param name="surfaceType">The surface controller to route to</param>
-		/// <param name="additionalRouteVals"></param>
-		/// <returns></returns>
-		public static MvcForm BeginUmbracoForm(this HtmlHelper html, string action, Type surfaceType,
-											   object additionalRouteVals)
-		{
-			return html.BeginUmbracoForm(action, surfaceType, additionalRouteVals, new Dictionary<string, object>());
-		}
-
-        /// <summary>
-        /// Helper method to create a new form to execute in the Umbraco request pipeline to a surface controller plugin
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="html"></param>
-        /// <param name="action"></param>
-        /// <param name="additionalRouteVals"></param>
-        /// <param name="method"></param>
-        /// <returns></returns>
-        public static MvcForm BeginUmbracoForm<T>(this HtmlHelper html, string action, object additionalRouteVals, FormMethod method)
-            where T : SurfaceController
-        {
-            return html.BeginUmbracoForm(action, typeof(T), additionalRouteVals, method);
-        }
-
-		/// <summary>
-		/// Helper method to create a new form to execute in the Umbraco request pipeline to a surface controller plugin
-		/// </summary>
-		/// <typeparam name="T"></typeparam>
-		/// <param name="html"></param>
-		/// <param name="action"></param>
-		/// <param name="additionalRouteVals"></param>
-		/// <returns></returns>
-		public static MvcForm BeginUmbracoForm<T>(this HtmlHelper html, string action, object additionalRouteVals)
-			where T : SurfaceController
-		{
-			return html.BeginUmbracoForm(action, typeof(T), additionalRouteVals);
-		}
-
-        /// <summary>
-        /// Helper method to create a new form to execute in the Umbraco request pipeline to a surface controller plugin
-        /// </summary>
-        /// <param name="html"></param>
-        /// <param name="action"></param>
-        /// <param name="surfaceType">The surface controller to route to</param>
-        /// <param name="additionalRouteVals"></param>
-        /// <param name="htmlAttributes"></param>
-        /// <param name="method"></param>
-        /// <returns></returns>
-        public static MvcForm BeginUmbracoForm(this HtmlHelper html, string action, Type surfaceType,
-                                               object additionalRouteVals,
-                                               object htmlAttributes,
-                                               FormMethod method)
-        {
-            return html.BeginUmbracoForm(action, surfaceType, additionalRouteVals, HtmlHelper.AnonymousObjectToHtmlAttributes(htmlAttributes), method);
-        }
-
-        /// <summary>
-		/// Helper method to create a new form to execute in the Umbraco request pipeline to a surface controller plugin
-		/// </summary>
-		/// <param name="html"></param>
-		/// <param name="action"></param>
-		/// <param name="surfaceType">The surface controller to route to</param>
-		/// <param name="additionalRouteVals"></param>
-		/// <param name="htmlAttributes"></param>
-		/// <returns></returns>
-		public static MvcForm BeginUmbracoForm(this HtmlHelper html, string action, Type surfaceType,
-											   object additionalRouteVals,
-											   object htmlAttributes)
-		{
-            return html.BeginUmbracoForm(action, surfaceType, additionalRouteVals, HtmlHelper.AnonymousObjectToHtmlAttributes(htmlAttributes));
-		}
-
-        /// <summary>
-        /// Helper method to create a new form to execute in the Umbraco request pipeline to a surface controller plugin
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="html"></param>
-        /// <param name="action"></param>
-        /// <param name="additionalRouteVals"></param>
-        /// <param name="htmlAttributes"></param>
-        /// <param name="method"></param>
-        /// <returns></returns>
-        public static MvcForm BeginUmbracoForm<T>(this HtmlHelper html, string action,
-                                                  object additionalRouteVals,
-                                                  object htmlAttributes,
-                                                  FormMethod method)
-            where T : SurfaceController
-        {
-            return html.BeginUmbracoForm(action, typeof(T), additionalRouteVals, htmlAttributes, method);
-        }
-
-        /// <summary>
-		/// Helper method to create a new form to execute in the Umbraco request pipeline to a surface controller plugin
-		/// </summary>
-		/// <typeparam name="T"></typeparam>
-		/// <param name="html"></param>
-		/// <param name="action"></param>
-		/// <param name="additionalRouteVals"></param>
-		/// <param name="htmlAttributes"></param>
-		/// <returns></returns>
-		public static MvcForm BeginUmbracoForm<T>(this HtmlHelper html, string action,
-											   object additionalRouteVals,
-											   object htmlAttributes)
-			where T : SurfaceController
-		{
-			return html.BeginUmbracoForm(action, typeof(T), additionalRouteVals, htmlAttributes);
-		}
-
-        /// <summary>
-        /// Helper method to create a new form to execute in the Umbraco request pipeline to a surface controller plugin
-        /// </summary>
-        /// <param name="html"></param>
-        /// <param name="action"></param>
-        /// <param name="surfaceType">The surface controller to route to</param>
-        /// <param name="additionalRouteVals"></param>
-        /// <param name="htmlAttributes"></param>
-        /// <param name="method"></param>
-        /// <returns></returns>
-        public static MvcForm BeginUmbracoForm(this HtmlHelper html, string action, Type surfaceType,
-                                               object additionalRouteVals,
-                                               IDictionary<string, object> htmlAttributes,
-                                               FormMethod method)
-        {
-            Mandate.ParameterNotNullOrEmpty(action, "action");
-            Mandate.ParameterNotNull(surfaceType, "surfaceType");
-
-            var area = "";
-
-            var surfaceController = SurfaceControllerResolver.Current.RegisteredSurfaceControllers
-                                                             .SingleOrDefault(x => x == surfaceType);
-            if (surfaceController == null)
-                throw new InvalidOperationException("Could not find the surface controller of type " + surfaceType.FullName);
-            var metaData = PluginController.GetMetadata(surfaceController);
-            if (metaData.AreaName.IsNullOrWhiteSpace() == false)
-            {
-                //set the area to the plugin area
-                area = metaData.AreaName;
-            }
-            return html.BeginUmbracoForm(action, metaData.ControllerName, area, additionalRouteVals, htmlAttributes, method);
-        }
-
-        /// <summary>
-		/// Helper method to create a new form to execute in the Umbraco request pipeline to a surface controller plugin
-		/// </summary>
-		/// <param name="html"></param>
-		/// <param name="action"></param>
-		/// <param name="surfaceType">The surface controller to route to</param>
-		/// <param name="additionalRouteVals"></param>
-		/// <param name="htmlAttributes"></param>
-		/// <returns></returns>
-		public static MvcForm BeginUmbracoForm(this HtmlHelper html, string action, Type surfaceType,
-											   object additionalRouteVals,
-											   IDictionary<string, object> htmlAttributes)
-        {
-            return html.BeginUmbracoForm(action, surfaceType, additionalRouteVals, htmlAttributes, FormMethod.Post);
-        }
-
-        /// <summary>
-        /// Helper method to create a new form to execute in the Umbraco request pipeline to a surface controller plugin
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="html"></param>
-        /// <param name="action"></param>
-        /// <param name="additionalRouteVals"></param>
-        /// <param name="htmlAttributes"></param>
-        /// <param name="method"></param>
-        /// <returns></returns>
-        public static MvcForm BeginUmbracoForm<T>(this HtmlHelper html, string action,
-                                                  object additionalRouteVals,
-                                                  IDictionary<string, object> htmlAttributes,
-                                                  FormMethod method)
-            where T : SurfaceController
-        {
-            return html.BeginUmbracoForm(action, typeof(T), additionalRouteVals, htmlAttributes, method);
-        }
-
-        /// <summary>
-		/// Helper method to create a new form to execute in the Umbraco request pipeline to a surface controller plugin
-		/// </summary>
-		/// <typeparam name="T"></typeparam>
-		/// <param name="html"></param>
-		/// <param name="action"></param>
-		/// <param name="additionalRouteVals"></param>
-		/// <param name="htmlAttributes"></param>
-		/// <returns></returns>
-		public static MvcForm BeginUmbracoForm<T>(this HtmlHelper html, string action,
-											   object additionalRouteVals,
-											   IDictionary<string, object> htmlAttributes)
-			where T : SurfaceController
-		{
-			return html.BeginUmbracoForm(action, typeof(T), additionalRouteVals, htmlAttributes);
-		}
-
-        /// <summary>
-        /// Helper method to create a new form to execute in the Umbraco request pipeline to a surface controller plugin
-        /// </summary>
-        /// <param name="html"></param>
-        /// <param name="action"></param>
-        /// <param name="controllerName"></param>
-        /// <param name="area"></param>
-        /// <param name="method"></param>
-        /// <returns></returns>
-        public static MvcForm BeginUmbracoForm(this HtmlHelper html, string action, string controllerName, string area, FormMethod method)
-        {
-            return html.BeginUmbracoForm(action, controllerName, area, null, new Dictionary<string, object>(), method);
-        }
-
-		/// <summary>
-		/// Helper method to create a new form to execute in the Umbraco request pipeline to a surface controller plugin
-		/// </summary>
-		/// <param name="html"></param>
-		/// <param name="action"></param>
-		/// <param name="controllerName"></param>
-		/// <param name="area"></param>
-		/// <returns></returns>
-		public static MvcForm BeginUmbracoForm(this HtmlHelper html, string action, string controllerName, string area)
-		{
-			return html.BeginUmbracoForm(action, controllerName, area, null, new Dictionary<string, object>());
-		}
-
-        /// <summary>
-        /// Helper method to create a new form to execute in the Umbraco request pipeline to a surface controller plugin
-        /// </summary>
-        /// <param name="html"></param>
-        /// <param name="action"></param>
-        /// <param name="controllerName"></param>
-        /// <param name="area"></param>
-        /// <param name="additionalRouteVals"></param>
-        /// <param name="htmlAttributes"></param>
-        /// <param name="method"></param>
-        /// <returns></returns>
-        public static MvcForm BeginUmbracoForm(this HtmlHelper html, string action, string controllerName, string area,
-                                               object additionalRouteVals,
-                                               IDictionary<string, object> htmlAttributes,
-                                               FormMethod method)
-        {
-            Mandate.ParameterNotNullOrEmpty(action, "action");
-            Mandate.ParameterNotNullOrEmpty(controllerName, "controllerName");
-
-            var formAction = UmbracoContext.Current.OriginalRequestUrl.PathAndQuery;
-            return html.RenderForm(formAction, method, htmlAttributes, controllerName, action, area, additionalRouteVals);
-        }
-
-        /// <summary>
-		/// Helper method to create a new form to execute in the Umbraco request pipeline to a surface controller plugin
-		/// </summary>
-		/// <param name="html"></param>
-		/// <param name="action"></param>
-		/// <param name="controllerName"></param>
-		/// <param name="area"></param>
-		/// <param name="additionalRouteVals"></param>
-		/// <param name="htmlAttributes"></param>
-		/// <returns></returns>
-		public static MvcForm BeginUmbracoForm(this HtmlHelper html, string action, string controllerName, string area,
-											   object additionalRouteVals,
-											   IDictionary<string, object> htmlAttributes)
-        {
-            return html.BeginUmbracoForm(action, controllerName, area, additionalRouteVals, htmlAttributes, FormMethod.Post);
-        }
-
-		/// <summary>
-		/// This renders out the form for us
-		/// </summary>
-		/// <param name="htmlHelper"></param>
-		/// <param name="formAction"></param>
-		/// <param name="method"></param>
-		/// <param name="htmlAttributes"></param>
-		/// <param name="surfaceController"></param>
-		/// <param name="surfaceAction"></param>
-		/// <param name="area"></param>		
-		/// <param name="additionalRouteVals"></param>
-		/// <returns></returns>
-		/// <remarks>
-		/// This code is pretty much the same as the underlying MVC code that writes out the form
-		/// </remarks>
-		private static MvcForm RenderForm(this HtmlHelper htmlHelper,
-										  string formAction,
-										  FormMethod method,
-										  IDictionary<string, object> htmlAttributes,
-										  string surfaceController,
-										  string surfaceAction,
-										  string area,
-										  object additionalRouteVals = null)
-		{
-
-			//ensure that the multipart/form-data is added to the html attributes
-			if (htmlAttributes.ContainsKey("enctype") == false)
-			{
-				htmlAttributes.Add("enctype", "multipart/form-data");
-			}
-
-			var tagBuilder = new TagBuilder("form");
-			tagBuilder.MergeAttributes(htmlAttributes);
-			// action is implicitly generated, so htmlAttributes take precedence.
-			tagBuilder.MergeAttribute("action", formAction);
-			// method is an explicit parameter, so it takes precedence over the htmlAttributes. 
-			tagBuilder.MergeAttribute("method", HtmlHelper.GetFormMethodString(method), true);
-			var traditionalJavascriptEnabled = htmlHelper.ViewContext.ClientValidationEnabled && htmlHelper.ViewContext.UnobtrusiveJavaScriptEnabled == false;
-			if (traditionalJavascriptEnabled)
-			{
-				// forms must have an ID for client validation
-				tagBuilder.GenerateId("form" + Guid.NewGuid().ToString("N"));
-			}
-			htmlHelper.ViewContext.Writer.Write(tagBuilder.ToString(TagRenderMode.StartTag));
-
-            //new UmbracoForm:
-            var theForm = new UmbracoForm(htmlHelper.ViewContext, surfaceController, surfaceAction, area, method, additionalRouteVals);
-
-			if (traditionalJavascriptEnabled)
-			{
-				htmlHelper.ViewContext.FormContext.FormId = tagBuilder.Attributes["id"];
-			}
-			return theForm;
-		}
-
-		#endregion
-        
-		#region Wrap
-
-		public static HtmlTagWrapper Wrap(this HtmlHelper html, string tag, string innerText, params IHtmlTagWrapper[] children)
-		{
-			var item = html.Wrap(tag, innerText, (object)null);
-			foreach (var child in children)
-			{
-				item.AddChild(child);
-			}
-			return item;
-		}
-
-		public static HtmlTagWrapper Wrap(this HtmlHelper html, string tag, object inner, object anonymousAttributes, params IHtmlTagWrapper[] children)
-		{
-			string innerText = null;
-			if (inner != null && inner.GetType() != typeof(DynamicNull))
-			{
-				innerText = string.Format("{0}", inner);
-			}
-			var item = html.Wrap(tag, innerText, anonymousAttributes);
-			foreach (var child in children)
-			{
-				item.AddChild(child);
-			}
-			return item;
-		}
-		public static HtmlTagWrapper Wrap(this HtmlHelper html, string tag, object inner)
-		{
-			string innerText = null;
-			if (inner != null && inner.GetType() != typeof(DynamicNull))
-			{
-				innerText = string.Format("{0}", inner);
-			}
-			return html.Wrap(tag, innerText, (object)null);
-		}
-
-		public static HtmlTagWrapper Wrap(this HtmlHelper html, string tag, string innerText, object anonymousAttributes, params IHtmlTagWrapper[] children)
-		{
-			var wrap = new HtmlTagWrapper(tag);
-			if (anonymousAttributes != null)
-			{
-				wrap.ReflectAttributesFromAnonymousType(anonymousAttributes);
-			}
-			if (!string.IsNullOrWhiteSpace(innerText))
-			{
-				wrap.AddChild(new HtmlTagWrapperTextNode(innerText));
-			}
-			foreach (var child in children)
-			{
-				wrap.AddChild(child);
-			}
-			return wrap;
-		}
-
-		public static HtmlTagWrapper Wrap(this HtmlHelper html, bool visible, string tag, string innerText, object anonymousAttributes, params IHtmlTagWrapper[] children)
-		{
-			var item = html.Wrap(tag, innerText, anonymousAttributes, children);
-			item.Visible = visible;
-			return item;
-		}
-
-        #endregion
-
-        #region canvasdesigner
-
-        public static IHtmlString EnableCanvasDesigner(this HtmlHelper html, 
-            UrlHelper url,
-            UmbracoContext umbCtx)
-        {
-            return html.EnableCanvasDesigner(url, umbCtx, string.Empty, string.Empty);
-        }
-
-        public static IHtmlString EnableCanvasDesigner(this HtmlHelper html,
-            UrlHelper url,
-            UmbracoContext umbCtx, string canvasdesignerConfigPath)
-        {
-            return html.EnableCanvasDesigner(url, umbCtx, canvasdesignerConfigPath, string.Empty);
-        }
-
-        public static IHtmlString EnableCanvasDesigner(this HtmlHelper html,
-            UrlHelper url,
-            UmbracoContext umbCtx, string canvasdesignerConfigPath, string canvasdesignerPalettesPath)
-        {
-            
-            var umbracoPath = url.Content(SystemDirectories.Umbraco);
-
-            string previewLink = @"<script src=""{0}/lib/jquery/jquery.min.js"" type=""text/javascript""></script>" +
-                                 @"<script src=""{1}"" type=""text/javascript""></script>" +
-                                 @"<script src=""{2}"" type=""text/javascript""></script>" +
-                                 @"<script type=""text/javascript"">var pageId = '{3}'</script>" +
-                                 @"<script src=""{0}/js/canvasdesigner.front.js"" type=""text/javascript""></script>";
-
-            string noPreviewLinks = @"<link href=""{1}"" type=""text/css"" rel=""stylesheet"" data-title=""canvasdesignerCss"" />";
-
-            // Get page value
-            int pageId = umbCtx.PublishedContentRequest.UmbracoPage.PageID;
-            string[] path = umbCtx.PublishedContentRequest.UmbracoPage.SplitPath;
-            string result = string.Empty;
-            string cssPath = CanvasDesignerUtility.GetStylesheetPath(path, false);
-
-            if (umbCtx.InPreviewMode)
-            {
-                canvasdesignerConfigPath = string.IsNullOrEmpty(canvasdesignerConfigPath) == false 
-                    ? canvasdesignerConfigPath 
-                    : string.Format("{0}/js/canvasdesigner.config.js", umbracoPath);
-                canvasdesignerPalettesPath = string.IsNullOrEmpty(canvasdesignerPalettesPath) == false 
-                    ? canvasdesignerPalettesPath 
-                    : string.Format("{0}/js/canvasdesigner.palettes.js", umbracoPath);
-
-                if (string.IsNullOrEmpty(cssPath) == false)
-                    result = string.Format(noPreviewLinks, cssPath) + Environment.NewLine;
-
-                result = result + string.Format(previewLink, umbracoPath, canvasdesignerConfigPath, canvasdesignerPalettesPath, pageId);
-            }
-            else
-            {
-                // Get css path for current page
-                if (string.IsNullOrEmpty(cssPath) == false)
-                    result = string.Format(noPreviewLinks, cssPath);
-            }
-
-            return new HtmlString(result);
-
-        }
-
-        #endregion
-
-        #region RelatedLink
-
-        /// <summary>
-        /// Renders an anchor element for a RelatedLink instance.
-        /// Format: &lt;a href=&quot;relatedLink.Link&quot; target=&quot;_blank/_self&quot;&gt;relatedLink.Caption&lt;/a&gt;
-        /// </summary>
-        /// <param name="htmlHelper">The HTML helper instance that this method extends.</param>
-        /// <param name="relatedLink">The RelatedLink instance</param>
-        /// <returns>An anchor element </returns>
-        public static MvcHtmlString GetRelatedLinkHtml(this HtmlHelper htmlHelper, RelatedLink relatedLink)
-        {
-            return htmlHelper.GetRelatedLinkHtml(relatedLink, null);
-        }
-
-        /// <summary>
-        /// Renders an anchor element for a RelatedLink instance, accepting htmlAttributes.
-        /// Format: &lt;a href=&quot;relatedLink.Link&quot; target=&quot;_blank/_self&quot; htmlAttributes&gt;relatedLink.Caption&lt;/a&gt;
-        /// </summary>
-        /// <param name="htmlHelper">The HTML helper instance that this method extends.</param>
-        /// <param name="relatedLink">The RelatedLink instance</param>
-        /// <param name="htmlAttributes">An object that contains the HTML attributes to set for the element.</param>
-        /// <returns></returns>
-        public static MvcHtmlString GetRelatedLinkHtml(this HtmlHelper htmlHelper, RelatedLink relatedLink, object htmlAttributes)
-        {
-            var tagBuilder = new TagBuilder("a");
-            tagBuilder.MergeAttributes(HtmlHelper.AnonymousObjectToHtmlAttributes(htmlAttributes));
-            tagBuilder.MergeAttribute("href", relatedLink.Link);
-            tagBuilder.MergeAttribute("target", relatedLink.NewWindow ? "_blank" : "_self");
-            tagBuilder.InnerHtml = HttpUtility.HtmlEncode(relatedLink.Caption);
-            return MvcHtmlString.Create(tagBuilder.ToString(TagRenderMode.Normal));
-        }
-        #endregion
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Web;
+using System.Web.Helpers;
+using System.Web.Mvc;
+using System.Web.Mvc.Html;
+using System.Web.Routing;
+using Umbraco.Core;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Dynamics;
+using Umbraco.Core.IO;
+using Umbraco.Core.Models;
+using Umbraco.Core.Profiling;
+using Umbraco.Web.Models;
+using Umbraco.Web.Mvc;
+using Constants = Umbraco.Core.Constants;
+using Member = umbraco.cms.businesslogic.member.Member;
+
+namespace Umbraco.Web
+{
+    /// <summary>
+	/// HtmlHelper extensions for use in templates
+	/// </summary>
+	public static class HtmlHelperRenderExtensions
+	{
+        /// <summary>
+        /// Renders the markup for the profiler
+        /// </summary>
+        /// <param name="helper"></param>
+        /// <returns></returns>
+        public static IHtmlString RenderProfiler(this HtmlHelper helper)
+        {
+            return new HtmlString(ProfilerResolver.Current.Profiler.Render());
+        }
+
+        /// <summary>
+        /// Renders a partial view that is found in the specified area
+        /// </summary>
+        /// <param name="helper"></param>
+        /// <param name="partial"></param>
+        /// <param name="area"></param>
+        /// <param name="model"></param>
+        /// <param name="viewData"></param>
+        /// <returns></returns>
+        public static MvcHtmlString AreaPartial(this HtmlHelper helper, string partial, string area, object model = null, ViewDataDictionary viewData = null)
+        {
+            var originalArea = helper.ViewContext.RouteData.DataTokens["area"];
+            helper.ViewContext.RouteData.DataTokens["area"] = area;
+            var result = helper.Partial(partial, model, viewData);
+            helper.ViewContext.RouteData.DataTokens["area"] = originalArea;
+            return result;
+        }
+
+	    /// <summary>
+        /// Will render the preview badge when in preview mode which is not required ever unless the MVC page you are
+        /// using does not inherit from UmbracoTemplatePage
+        /// </summary>
+        /// <param name="helper"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// See: http://issues.umbraco.org/issue/U4-1614
+        /// </remarks>
+        public static MvcHtmlString PreviewBadge(this HtmlHelper helper)
+        {
+            if (UmbracoContext.Current.InPreviewMode)
+            {
+                var htmlBadge =
+                    String.Format(UmbracoConfig.For.UmbracoSettings().Content.PreviewBadge,
+                                  IOHelper.ResolveUrl(SystemDirectories.Umbraco),
+                                  IOHelper.ResolveUrl(SystemDirectories.UmbracoClient),
+                                  UmbracoContext.Current.HttpContext.Server.UrlEncode(UmbracoContext.Current.HttpContext.Request.Path));
+                return new MvcHtmlString(htmlBadge);
+            }
+            return new MvcHtmlString("");
+
+        }
+
+		public static IHtmlString CachedPartial(
+			this HtmlHelper htmlHelper,
+			string partialViewName,
+			object model,
+			int cachedSeconds,
+			bool cacheByPage = false,
+			bool cacheByMember = false,
+			ViewDataDictionary viewData = null,
+			Func<object, ViewDataDictionary, string> contextualKeyBuilder = null)
+		{
+			var cacheKey = new StringBuilder(partialViewName);
+			if (cacheByPage)
+			{
+				if (UmbracoContext.Current == null)
+				{
+					throw new InvalidOperationException("Cannot cache by page if the UmbracoContext has not been initialized, this parameter can only be used in the context of an Umbraco request");
+				}
+				cacheKey.AppendFormat("{0}-", UmbracoContext.Current.PageId);
+			}
+			if (cacheByMember)
+			{
+				var currentMember = Member.GetCurrentMember();
+				cacheKey.AppendFormat("m{0}-", currentMember == null ? 0 : currentMember.Id);
+			}
+			if (contextualKeyBuilder != null)
+		    {
+		        var contextualKey = contextualKeyBuilder(model, viewData);
+                cacheKey.AppendFormat("c{0}-", contextualKey);
+		    }
+			return ApplicationContext.Current.ApplicationCache.CachedPartialView(htmlHelper, partialViewName, model, cachedSeconds, cacheKey.ToString(), viewData);
+		}
+
+		public static MvcHtmlString EditorFor<T>(this HtmlHelper htmlHelper, string templateName = "", string htmlFieldName = "", object additionalViewData = null)
+			where T : new()
+		{
+			var model = new T();
+			var typedHelper = new HtmlHelper<T>(
+				htmlHelper.ViewContext.CopyWithModel(model),
+				htmlHelper.ViewDataContainer.CopyWithModel(model));
+
+			return typedHelper.EditorFor(x => model, templateName, htmlFieldName, additionalViewData);
+		}
+
+		/// <summary>
+		/// A validation summary that lets you pass in a prefix so that the summary only displays for elements
+		/// containing the prefix. This allows you to have more than on validation summary on a page.
+		/// </summary>
+		/// <param name="htmlHelper"></param>
+		/// <param name="prefix"></param>
+		/// <param name="excludePropertyErrors"></param>
+		/// <param name="message"></param>
+		/// <param name="htmlAttributes"></param>
+		/// <returns></returns>
+		public static MvcHtmlString ValidationSummary(this HtmlHelper htmlHelper,
+		                                              string prefix = "",
+		                                              bool excludePropertyErrors = false,
+		                                              string message = "",
+		                                              IDictionary<string, object> htmlAttributes = null)
+		{
+			if (prefix.IsNullOrWhiteSpace())
+			{
+				return htmlHelper.ValidationSummary(excludePropertyErrors, message, htmlAttributes);
+			}
+
+			//if there's a prefix applied, we need to create a new html helper with a filtered ModelState collection so that it only looks for
+			//specific model state with the prefix.
+			var filteredHtmlHelper = new HtmlHelper(htmlHelper.ViewContext, htmlHelper.ViewDataContainer.FilterContainer(prefix));
+			return filteredHtmlHelper.ValidationSummary(excludePropertyErrors, message, htmlAttributes);
+		}
+
+	    /// <summary>
+	    /// Returns the result of a child action of a strongly typed SurfaceController
+	    /// </summary>
+	    /// <typeparam name="T"></typeparam>
+	    /// <param name="htmlHelper"></param>
+	    /// <param name="actionName"></param>
+	    /// <returns></returns>
+	    public static IHtmlString Action<T>(this HtmlHelper htmlHelper, string actionName)
+            where T : SurfaceController
+        {
+            return htmlHelper.Action(actionName, typeof(T));
+        }
+
+        /// <summary>
+        /// Returns the result of a child action of a SurfaceController
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="htmlHelper"></param>
+        /// <param name="actionName"></param>
+        /// <param name="surfaceType"></param>
+        /// <returns></returns>
+        public static IHtmlString Action(this HtmlHelper htmlHelper, string actionName, Type surfaceType)
+        {
+            Mandate.ParameterNotNull(surfaceType, "surfaceType");
+            Mandate.ParameterNotNullOrEmpty(actionName, "actionName");
+
+            var routeVals = new RouteValueDictionary(new {area = ""});
+
+            var surfaceController = SurfaceControllerResolver.Current.RegisteredSurfaceControllers
+                .SingleOrDefault(x => x == surfaceType);
+            if (surfaceController == null)
+                throw new InvalidOperationException("Could not find the surface controller of type " + surfaceType.FullName);
+            var metaData = PluginController.GetMetadata(surfaceController);
+            if (!metaData.AreaName.IsNullOrWhiteSpace())
+            {
+                //set the area to the plugin area
+                if (routeVals.ContainsKey("area"))
+                {
+                    routeVals["area"] = metaData.AreaName;
+                }
+                else
+                {
+                    routeVals.Add("area", metaData.AreaName);
+                }
+            }
+
+            return htmlHelper.Action(actionName, metaData.ControllerName, routeVals);
+        }
+
+        #region GetCropUrl
+
+        [Obsolete("Use the UrlHelper.GetCropUrl extension instead")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public static IHtmlString GetCropUrl(this HtmlHelper htmlHelper, IPublishedContent mediaItem, string cropAlias)
+        {
+            return new HtmlString(mediaItem.GetCropUrl(cropAlias: cropAlias, useCropDimensions: true));
+        }
+
+        [Obsolete("Use the UrlHelper.GetCropUrl extension instead")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public static IHtmlString GetCropUrl(this HtmlHelper htmlHelper, IPublishedContent mediaItem, string propertyAlias, string cropAlias)
+        {
+            return new HtmlString(mediaItem.GetCropUrl(propertyAlias: propertyAlias, cropAlias: cropAlias, useCropDimensions: true));
+        }
+
+        [Obsolete("Use the UrlHelper.GetCropUrl extension instead")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public static IHtmlString GetCropUrl(this HtmlHelper htmlHelper,
+            IPublishedContent mediaItem,
+            int? width = null,
+            int? height = null,
+            string propertyAlias = Constants.Conventions.Media.File,
+            string cropAlias = null,
+            int? quality = null,
+            ImageCropMode? imageCropMode = null,
+            ImageCropAnchor? imageCropAnchor = null,
+            bool preferFocalPoint = false,
+            bool useCropDimensions = false,
+            bool cacheBuster = true,
+            string furtherOptions = null,
+            ImageCropRatioMode? ratioMode = null,
+            bool upScale = true)
+        {
+            return
+                new HtmlString(mediaItem.GetCropUrl(width, height, propertyAlias, cropAlias, quality, imageCropMode,
+                    imageCropAnchor, preferFocalPoint, useCropDimensions, cacheBuster, furtherOptions, ratioMode,
+                    upScale));
+        }
+
+        [Obsolete("Use the UrlHelper.GetCropUrl extension instead")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public static IHtmlString GetCropUrl(this HtmlHelper htmlHelper,
+            string imageUrl,
+            int? width = null,
+            int? height = null,
+            string imageCropperValue = null,
+            string cropAlias = null,
+            int? quality = null,
+            ImageCropMode? imageCropMode = null,
+            ImageCropAnchor? imageCropAnchor = null,
+            bool preferFocalPoint = false,
+            bool useCropDimensions = false,
+            string cacheBusterValue = null,
+            string furtherOptions = null,
+            ImageCropRatioMode? ratioMode = null,
+            bool upScale = true)
+        {
+            return
+                new HtmlString(imageUrl.GetCropUrl(width, height, imageCropperValue, cropAlias, quality, imageCropMode,
+                    imageCropAnchor, preferFocalPoint, useCropDimensions, cacheBusterValue, furtherOptions, ratioMode,
+                    upScale));
+        }
+
+        #endregion
+
+        #region BeginUmbracoForm
+
+        /// <summary>
+        /// Used for rendering out the Form for BeginUmbracoForm
+        /// </summary>
+        internal class UmbracoForm : MvcForm
+		{
+		    /// <summary>
+		    /// Creates an UmbracoForm
+		    /// </summary>
+		    /// <param name="viewContext"></param>
+		    /// <param name="controllerName"></param>
+		    /// <param name="controllerAction"></param>
+		    /// <param name="area"></param>
+		    /// <param name="method"></param>
+		    /// <param name="additionalRouteVals"></param>
+		    public UmbracoForm(
+				ViewContext viewContext,
+				string controllerName,
+				string controllerAction,
+				string area,
+                FormMethod method,
+				object additionalRouteVals = null)
+				: base(viewContext)
+			{
+		        _viewContext = viewContext;
+		        _method = method;
+			    _controllerName = controllerName;
+                _encryptedString = UmbracoHelper.CreateEncryptedRouteString(controllerName, controllerAction, area, additionalRouteVals);
+
+                //For UmbracoForm's we want to add our routing string to the httpcontext items in the case where anti-forgery tokens are used.
+                //In which case our custom UmbracoAntiForgeryAdditionalDataProvider will kick in and validate the values in the request against
+                //the values that will be appended to the token. This essentially means that when anti-forgery tokens are used with UmbracoForm's forms,
+                //that each token is unique to the controller/action/area instead of the default ASP.Net implementation which is that the token is unique
+                //per user.
+                _viewContext.HttpContext.Items["ufprt"] = _encryptedString;
+
+			}
+
+
+		    private readonly ViewContext _viewContext;
+		    private readonly FormMethod _method;
+			private bool _disposed;
+			private readonly string _encryptedString;
+		    private readonly string _controllerName;
+
+            protected override void Dispose(bool disposing)
+			{
+				if (this._disposed)
+					return;
+				this._disposed = true;
+                //Detect if the call is targeting UmbRegisterController/UmbProfileController/UmbLoginStatusController/UmbLoginController and if it is we automatically output a AntiForgeryToken()
+                // We have a controllerName and area so we can match
+                if (_controllerName == "UmbRegister"
+                    || _controllerName == "UmbProfile"
+                    || _controllerName == "UmbLoginStatus"
+                    || _controllerName == "UmbLogin")
+			    {
+                    _viewContext.Writer.Write(AntiForgery.GetHtml().ToString());
+			    }
+
+                //write out the hidden surface form routes
+                _viewContext.Writer.Write("<input name='ufprt' type='hidden' value='" + _encryptedString + "' />");
+
+				base.Dispose(disposing);
+			}
+		}
+
+        /// <summary>
+        /// Helper method to create a new form to execute in the Umbraco request pipeline against a locally declared controller
+        /// </summary>
+        /// <param name="html"></param>
+        /// <param name="action"></param>
+        /// <param name="controllerName"></param>
+        /// <param name="method"></param>
+        /// <returns></returns>
+        public static MvcForm BeginUmbracoForm(this HtmlHelper html, string action, string controllerName, FormMethod method)
+        {
+            return html.BeginUmbracoForm(action, controllerName, null, new Dictionary<string, object>(), method);
+        }
+
+		/// <summary>
+		/// Helper method to create a new form to execute in the Umbraco request pipeline against a locally declared controller
+		/// </summary>
+		/// <param name="html"></param>
+		/// <param name="action"></param>
+		/// <param name="controllerName"></param>
+		/// <returns></returns>
+		public static MvcForm BeginUmbracoForm(this HtmlHelper html, string action, string controllerName)
+		{
+			return html.BeginUmbracoForm(action, controllerName, null, new Dictionary<string, object>());
+		}
+
+        /// <summary>
+        /// Helper method to create a new form to execute in the Umbraco request pipeline against a locally declared controller
+        /// </summary>
+        /// <param name="html"></param>
+        /// <param name="action"></param>
+        /// <param name="controllerName"></param>
+        /// <param name="additionalRouteVals"></param>
+        /// <param name="method"></param>
+        /// <returns></returns>
+        public static MvcForm BeginUmbracoForm(this HtmlHelper html, string action, string controllerName, object additionalRouteVals, FormMethod method)
+        {
+            return html.BeginUmbracoForm(action, controllerName, additionalRouteVals, new Dictionary<string, object>(), method);
+        }
+
+		/// <summary>
+		/// Helper method to create a new form to execute in the Umbraco request pipeline against a locally declared controller
+		/// </summary>
+		/// <param name="html"></param>
+		/// <param name="action"></param>
+		/// <param name="controllerName"></param>
+		/// <param name="additionalRouteVals"></param>
+		/// <returns></returns>
+		public static MvcForm BeginUmbracoForm(this HtmlHelper html, string action, string controllerName, object additionalRouteVals)
+		{
+			return html.BeginUmbracoForm(action, controllerName, additionalRouteVals, new Dictionary<string, object>());
+		}
+
+        /// <summary>
+        /// Helper method to create a new form to execute in the Umbraco request pipeline against a locally declared controller
+        /// </summary>
+        /// <param name="html"></param>
+        /// <param name="action"></param>
+        /// <param name="controllerName"></param>
+        /// <param name="additionalRouteVals"></param>
+        /// <param name="htmlAttributes"></param>
+        /// <param name="method"></param>
+        /// <returns></returns>
+        public static MvcForm BeginUmbracoForm(this HtmlHelper html, string action, string controllerName,
+                                               object additionalRouteVals,
+                                               object htmlAttributes,
+                                               FormMethod method)
+        {
+            return html.BeginUmbracoForm(action, controllerName, additionalRouteVals, HtmlHelper.AnonymousObjectToHtmlAttributes(htmlAttributes), method);
+        }
+
+        /// <summary>
+		/// Helper method to create a new form to execute in the Umbraco request pipeline against a locally declared controller
+		/// </summary>
+		/// <param name="html"></param>
+		/// <param name="action"></param>
+		/// <param name="controllerName"></param>
+		/// <param name="additionalRouteVals"></param>
+		/// <param name="htmlAttributes"></param>
+		/// <returns></returns>
+		public static MvcForm BeginUmbracoForm(this HtmlHelper html, string action, string controllerName,
+											   object additionalRouteVals,
+											   object htmlAttributes)
+		{
+            return html.BeginUmbracoForm(action, controllerName, additionalRouteVals, HtmlHelper.AnonymousObjectToHtmlAttributes(htmlAttributes));
+		}
+
+        /// <summary>
+        /// Helper method to create a new form to execute in the Umbraco request pipeline against a locally declared controller
+        /// </summary>
+        /// <param name="html"></param>
+        /// <param name="action"></param>
+        /// <param name="controllerName"></param>
+        /// <param name="additionalRouteVals"></param>
+        /// <param name="htmlAttributes"></param>
+        /// <param name="method"></param>
+        /// <returns></returns>
+        public static MvcForm BeginUmbracoForm(this HtmlHelper html, string action, string controllerName,
+                                               object additionalRouteVals,
+                                               IDictionary<string, object> htmlAttributes,
+                                               FormMethod method)
+        {
+            Mandate.ParameterNotNullOrEmpty(action, "action");
+            Mandate.ParameterNotNullOrEmpty(controllerName, "controllerName");
+
+            return html.BeginUmbracoForm(action, controllerName, "", additionalRouteVals, htmlAttributes, method);
+        }
+
+        /// <summary>
+		/// Helper method to create a new form to execute in the Umbraco request pipeline against a locally declared controller
+		/// </summary>
+		/// <param name="html"></param>
+		/// <param name="action"></param>
+		/// <param name="controllerName"></param>
+		/// <param name="additionalRouteVals"></param>
+		/// <param name="htmlAttributes"></param>
+		/// <returns></returns>
+		public static MvcForm BeginUmbracoForm(this HtmlHelper html, string action, string controllerName,
+											   object additionalRouteVals,
+											   IDictionary<string, object> htmlAttributes)
+		{
+			Mandate.ParameterNotNullOrEmpty(action, "action");
+			Mandate.ParameterNotNullOrEmpty(controllerName, "controllerName");
+
+			return html.BeginUmbracoForm(action, controllerName, "", additionalRouteVals, htmlAttributes);
+		}
+
+        /// <summary>
+        /// Helper method to create a new form to execute in the Umbraco request pipeline to a surface controller plugin
+        /// </summary>
+        /// <param name="html"></param>
+        /// <param name="action"></param>
+        /// <param name="surfaceType">The surface controller to route to</param>
+        /// <param name="method"></param>
+        /// <returns></returns>
+        public static MvcForm BeginUmbracoForm(this HtmlHelper html, string action, Type surfaceType, FormMethod method)
+        {
+            return html.BeginUmbracoForm(action, surfaceType, null, new Dictionary<string, object>(), method);
+        }
+
+		/// <summary>
+		/// Helper method to create a new form to execute in the Umbraco request pipeline to a surface controller plugin
+		/// </summary>
+		/// <param name="html"></param>
+		/// <param name="action"></param>
+		/// <param name="surfaceType">The surface controller to route to</param>
+		/// <returns></returns>
+		public static MvcForm BeginUmbracoForm(this HtmlHelper html, string action, Type surfaceType)
+		{
+			return html.BeginUmbracoForm(action, surfaceType, null, new Dictionary<string, object>());
+		}
+
+        /// <summary>
+        /// Helper method to create a new form to execute in the Umbraco request pipeline to a surface controller plugin
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="html"></param>
+        /// <param name="action"></param>
+        /// <param name="method"></param>
+        /// <returns></returns>
+        public static MvcForm BeginUmbracoForm<T>(this HtmlHelper html, string action, FormMethod method)
+            where T : SurfaceController
+        {
+            return html.BeginUmbracoForm(action, typeof(T), method);
+        }
+
+		/// <summary>
+		/// Helper method to create a new form to execute in the Umbraco request pipeline to a surface controller plugin
+		/// </summary>
+		/// <typeparam name="T"></typeparam>
+		/// <param name="html"></param>
+		/// <param name="action"></param>
+		/// <returns></returns>
+		public static MvcForm BeginUmbracoForm<T>(this HtmlHelper html, string action)
+			where T : SurfaceController
+		{
+			return html.BeginUmbracoForm(action, typeof(T));
+		}
+
+        /// <summary>
+        /// Helper method to create a new form to execute in the Umbraco request pipeline to a surface controller plugin
+        /// </summary>
+        /// <param name="html"></param>
+        /// <param name="action"></param>
+        /// <param name="surfaceType">The surface controller to route to</param>
+        /// <param name="additionalRouteVals"></param>
+        /// <param name="method"></param>
+        /// <returns></returns>
+        public static MvcForm BeginUmbracoForm(this HtmlHelper html, string action, Type surfaceType,
+                                               object additionalRouteVals, FormMethod method)
+        {
+            return html.BeginUmbracoForm(action, surfaceType, additionalRouteVals, new Dictionary<string, object>(), method);
+        }
+
+		/// <summary>
+		/// Helper method to create a new form to execute in the Umbraco request pipeline to a surface controller plugin
+		/// </summary>
+		/// <param name="html"></param>
+		/// <param name="action"></param>
+		/// <param name="surfaceType">The surface controller to route to</param>
+		/// <param name="additionalRouteVals"></param>
+		/// <returns></returns>
+		public static MvcForm BeginUmbracoForm(this HtmlHelper html, string action, Type surfaceType,
+											   object additionalRouteVals)
+		{
+			return html.BeginUmbracoForm(action, surfaceType, additionalRouteVals, new Dictionary<string, object>());
+		}
+
+        /// <summary>
+        /// Helper method to create a new form to execute in the Umbraco request pipeline to a surface controller plugin
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="html"></param>
+        /// <param name="action"></param>
+        /// <param name="additionalRouteVals"></param>
+        /// <param name="method"></param>
+        /// <returns></returns>
+        public static MvcForm BeginUmbracoForm<T>(this HtmlHelper html, string action, object additionalRouteVals, FormMethod method)
+            where T : SurfaceController
+        {
+            return html.BeginUmbracoForm(action, typeof(T), additionalRouteVals, method);
+        }
+
+		/// <summary>
+		/// Helper method to create a new form to execute in the Umbraco request pipeline to a surface controller plugin
+		/// </summary>
+		/// <typeparam name="T"></typeparam>
+		/// <param name="html"></param>
+		/// <param name="action"></param>
+		/// <param name="additionalRouteVals"></param>
+		/// <returns></returns>
+		public static MvcForm BeginUmbracoForm<T>(this HtmlHelper html, string action, object additionalRouteVals)
+			where T : SurfaceController
+		{
+			return html.BeginUmbracoForm(action, typeof(T), additionalRouteVals);
+		}
+
+        /// <summary>
+        /// Helper method to create a new form to execute in the Umbraco request pipeline to a surface controller plugin
+        /// </summary>
+        /// <param name="html"></param>
+        /// <param name="action"></param>
+        /// <param name="surfaceType">The surface controller to route to</param>
+        /// <param name="additionalRouteVals"></param>
+        /// <param name="htmlAttributes"></param>
+        /// <param name="method"></param>
+        /// <returns></returns>
+        public static MvcForm BeginUmbracoForm(this HtmlHelper html, string action, Type surfaceType,
+                                               object additionalRouteVals,
+                                               object htmlAttributes,
+                                               FormMethod method)
+        {
+            return html.BeginUmbracoForm(action, surfaceType, additionalRouteVals, HtmlHelper.AnonymousObjectToHtmlAttributes(htmlAttributes), method);
+        }
+
+        /// <summary>
+		/// Helper method to create a new form to execute in the Umbraco request pipeline to a surface controller plugin
+		/// </summary>
+		/// <param name="html"></param>
+		/// <param name="action"></param>
+		/// <param name="surfaceType">The surface controller to route to</param>
+		/// <param name="additionalRouteVals"></param>
+		/// <param name="htmlAttributes"></param>
+		/// <returns></returns>
+		public static MvcForm BeginUmbracoForm(this HtmlHelper html, string action, Type surfaceType,
+											   object additionalRouteVals,
+											   object htmlAttributes)
+		{
+            return html.BeginUmbracoForm(action, surfaceType, additionalRouteVals, HtmlHelper.AnonymousObjectToHtmlAttributes(htmlAttributes));
+		}
+
+        /// <summary>
+        /// Helper method to create a new form to execute in the Umbraco request pipeline to a surface controller plugin
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="html"></param>
+        /// <param name="action"></param>
+        /// <param name="additionalRouteVals"></param>
+        /// <param name="htmlAttributes"></param>
+        /// <param name="method"></param>
+        /// <returns></returns>
+        public static MvcForm BeginUmbracoForm<T>(this HtmlHelper html, string action,
+                                                  object additionalRouteVals,
+                                                  object htmlAttributes,
+                                                  FormMethod method)
+            where T : SurfaceController
+        {
+            return html.BeginUmbracoForm(action, typeof(T), additionalRouteVals, htmlAttributes, method);
+        }
+
+        /// <summary>
+		/// Helper method to create a new form to execute in the Umbraco request pipeline to a surface controller plugin
+		/// </summary>
+		/// <typeparam name="T"></typeparam>
+		/// <param name="html"></param>
+		/// <param name="action"></param>
+		/// <param name="additionalRouteVals"></param>
+		/// <param name="htmlAttributes"></param>
+		/// <returns></returns>
+		public static MvcForm BeginUmbracoForm<T>(this HtmlHelper html, string action,
+											   object additionalRouteVals,
+											   object htmlAttributes)
+			where T : SurfaceController
+		{
+			return html.BeginUmbracoForm(action, typeof(T), additionalRouteVals, htmlAttributes);
+		}
+
+        /// <summary>
+        /// Helper method to create a new form to execute in the Umbraco request pipeline to a surface controller plugin
+        /// </summary>
+        /// <param name="html"></param>
+        /// <param name="action"></param>
+        /// <param name="surfaceType">The surface controller to route to</param>
+        /// <param name="additionalRouteVals"></param>
+        /// <param name="htmlAttributes"></param>
+        /// <param name="method"></param>
+        /// <returns></returns>
+        public static MvcForm BeginUmbracoForm(this HtmlHelper html, string action, Type surfaceType,
+                                               object additionalRouteVals,
+                                               IDictionary<string, object> htmlAttributes,
+                                               FormMethod method)
+        {
+            Mandate.ParameterNotNullOrEmpty(action, "action");
+            Mandate.ParameterNotNull(surfaceType, "surfaceType");
+
+            var area = "";
+
+            var surfaceController = SurfaceControllerResolver.Current.RegisteredSurfaceControllers
+                                                             .SingleOrDefault(x => x == surfaceType);
+            if (surfaceController == null)
+                throw new InvalidOperationException("Could not find the surface controller of type " + surfaceType.FullName);
+            var metaData = PluginController.GetMetadata(surfaceController);
+            if (metaData.AreaName.IsNullOrWhiteSpace() == false)
+            {
+                //set the area to the plugin area
+                area = metaData.AreaName;
+            }
+            return html.BeginUmbracoForm(action, metaData.ControllerName, area, additionalRouteVals, htmlAttributes, method);
+        }
+
+        /// <summary>
+		/// Helper method to create a new form to execute in the Umbraco request pipeline to a surface controller plugin
+		/// </summary>
+		/// <param name="html"></param>
+		/// <param name="action"></param>
+		/// <param name="surfaceType">The surface controller to route to</param>
+		/// <param name="additionalRouteVals"></param>
+		/// <param name="htmlAttributes"></param>
+		/// <returns></returns>
+		public static MvcForm BeginUmbracoForm(this HtmlHelper html, string action, Type surfaceType,
+											   object additionalRouteVals,
+											   IDictionary<string, object> htmlAttributes)
+        {
+            return html.BeginUmbracoForm(action, surfaceType, additionalRouteVals, htmlAttributes, FormMethod.Post);
+        }
+
+        /// <summary>
+        /// Helper method to create a new form to execute in the Umbraco request pipeline to a surface controller plugin
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="html"></param>
+        /// <param name="action"></param>
+        /// <param name="additionalRouteVals"></param>
+        /// <param name="htmlAttributes"></param>
+        /// <param name="method"></param>
+        /// <returns></returns>
+        public static MvcForm BeginUmbracoForm<T>(this HtmlHelper html, string action,
+                                                  object additionalRouteVals,
+                                                  IDictionary<string, object> htmlAttributes,
+                                                  FormMethod method)
+            where T : SurfaceController
+        {
+            return html.BeginUmbracoForm(action, typeof(T), additionalRouteVals, htmlAttributes, method);
+        }
+
+        /// <summary>
+		/// Helper method to create a new form to execute in the Umbraco request pipeline to a surface controller plugin
+		/// </summary>
+		/// <typeparam name="T"></typeparam>
+		/// <param name="html"></param>
+		/// <param name="action"></param>
+		/// <param name="additionalRouteVals"></param>
+		/// <param name="htmlAttributes"></param>
+		/// <returns></returns>
+		public static MvcForm BeginUmbracoForm<T>(this HtmlHelper html, string action,
+											   object additionalRouteVals,
+											   IDictionary<string, object> htmlAttributes)
+			where T : SurfaceController
+		{
+			return html.BeginUmbracoForm(action, typeof(T), additionalRouteVals, htmlAttributes);
+		}
+
+        /// <summary>
+        /// Helper method to create a new form to execute in the Umbraco request pipeline to a surface controller plugin
+        /// </summary>
+        /// <param name="html"></param>
+        /// <param name="action"></param>
+        /// <param name="controllerName"></param>
+        /// <param name="area"></param>
+        /// <param name="method"></param>
+        /// <returns></returns>
+        public static MvcForm BeginUmbracoForm(this HtmlHelper html, string action, string controllerName, string area, FormMethod method)
+        {
+            return html.BeginUmbracoForm(action, controllerName, area, null, new Dictionary<string, object>(), method);
+        }
+
+		/// <summary>
+		/// Helper method to create a new form to execute in the Umbraco request pipeline to a surface controller plugin
+		/// </summary>
+		/// <param name="html"></param>
+		/// <param name="action"></param>
+		/// <param name="controllerName"></param>
+		/// <param name="area"></param>
+		/// <returns></returns>
+		public static MvcForm BeginUmbracoForm(this HtmlHelper html, string action, string controllerName, string area)
+		{
+			return html.BeginUmbracoForm(action, controllerName, area, null, new Dictionary<string, object>());
+		}
+
+        /// <summary>
+        /// Helper method to create a new form to execute in the Umbraco request pipeline to a surface controller plugin
+        /// </summary>
+        /// <param name="html"></param>
+        /// <param name="action"></param>
+        /// <param name="controllerName"></param>
+        /// <param name="area"></param>
+        /// <param name="additionalRouteVals"></param>
+        /// <param name="htmlAttributes"></param>
+        /// <param name="method"></param>
+        /// <returns></returns>
+        public static MvcForm BeginUmbracoForm(this HtmlHelper html, string action, string controllerName, string area,
+                                               object additionalRouteVals,
+                                               IDictionary<string, object> htmlAttributes,
+                                               FormMethod method)
+        {
+            Mandate.ParameterNotNullOrEmpty(action, "action");
+            Mandate.ParameterNotNullOrEmpty(controllerName, "controllerName");
+
+            var formAction = UmbracoContext.Current.OriginalRequestUrl.PathAndQuery;
+            return html.RenderForm(formAction, method, htmlAttributes, controllerName, action, area, additionalRouteVals);
+        }
+
+        /// <summary>
+		/// Helper method to create a new form to execute in the Umbraco request pipeline to a surface controller plugin
+		/// </summary>
+		/// <param name="html"></param>
+		/// <param name="action"></param>
+		/// <param name="controllerName"></param>
+		/// <param name="area"></param>
+		/// <param name="additionalRouteVals"></param>
+		/// <param name="htmlAttributes"></param>
+		/// <returns></returns>
+		public static MvcForm BeginUmbracoForm(this HtmlHelper html, string action, string controllerName, string area,
+											   object additionalRouteVals,
+											   IDictionary<string, object> htmlAttributes)
+        {
+            return html.BeginUmbracoForm(action, controllerName, area, additionalRouteVals, htmlAttributes, FormMethod.Post);
+        }
+
+		/// <summary>
+		/// This renders out the form for us
+		/// </summary>
+		/// <param name="htmlHelper"></param>
+		/// <param name="formAction"></param>
+		/// <param name="method"></param>
+		/// <param name="htmlAttributes"></param>
+		/// <param name="surfaceController"></param>
+		/// <param name="surfaceAction"></param>
+		/// <param name="area"></param>
+		/// <param name="additionalRouteVals"></param>
+		/// <returns></returns>
+		/// <remarks>
+		/// This code is pretty much the same as the underlying MVC code that writes out the form
+		/// </remarks>
+		private static MvcForm RenderForm(this HtmlHelper htmlHelper,
+										  string formAction,
+										  FormMethod method,
+										  IDictionary<string, object> htmlAttributes,
+										  string surfaceController,
+										  string surfaceAction,
+										  string area,
+										  object additionalRouteVals = null)
+		{
+
+			//ensure that the multipart/form-data is added to the html attributes
+			if (htmlAttributes.ContainsKey("enctype") == false)
+			{
+				htmlAttributes.Add("enctype", "multipart/form-data");
+			}
+
+			var tagBuilder = new TagBuilder("form");
+			tagBuilder.MergeAttributes(htmlAttributes);
+			// action is implicitly generated, so htmlAttributes take precedence.
+			tagBuilder.MergeAttribute("action", formAction);
+			// method is an explicit parameter, so it takes precedence over the htmlAttributes.
+			tagBuilder.MergeAttribute("method", HtmlHelper.GetFormMethodString(method), true);
+			var traditionalJavascriptEnabled = htmlHelper.ViewContext.ClientValidationEnabled && htmlHelper.ViewContext.UnobtrusiveJavaScriptEnabled == false;
+			if (traditionalJavascriptEnabled)
+			{
+				// forms must have an ID for client validation
+				tagBuilder.GenerateId("form" + Guid.NewGuid().ToString("N"));
+			}
+			htmlHelper.ViewContext.Writer.Write(tagBuilder.ToString(TagRenderMode.StartTag));
+
+            //new UmbracoForm:
+            var theForm = new UmbracoForm(htmlHelper.ViewContext, surfaceController, surfaceAction, area, method, additionalRouteVals);
+
+			if (traditionalJavascriptEnabled)
+			{
+				htmlHelper.ViewContext.FormContext.FormId = tagBuilder.Attributes["id"];
+			}
+			return theForm;
+		}
+
+		#endregion
+
+		#region Wrap
+
+		public static HtmlTagWrapper Wrap(this HtmlHelper html, string tag, string innerText, params IHtmlTagWrapper[] children)
+		{
+			var item = html.Wrap(tag, innerText, (object)null);
+			foreach (var child in children)
+			{
+				item.AddChild(child);
+			}
+			return item;
+		}
+
+		public static HtmlTagWrapper Wrap(this HtmlHelper html, string tag, object inner, object anonymousAttributes, params IHtmlTagWrapper[] children)
+		{
+			string innerText = null;
+			if (inner != null && inner.GetType() != typeof(DynamicNull))
+			{
+				innerText = string.Format("{0}", inner);
+			}
+			var item = html.Wrap(tag, innerText, anonymousAttributes);
+			foreach (var child in children)
+			{
+				item.AddChild(child);
+			}
+			return item;
+		}
+		public static HtmlTagWrapper Wrap(this HtmlHelper html, string tag, object inner)
+		{
+			string innerText = null;
+			if (inner != null && inner.GetType() != typeof(DynamicNull))
+			{
+				innerText = string.Format("{0}", inner);
+			}
+			return html.Wrap(tag, innerText, (object)null);
+		}
+
+		public static HtmlTagWrapper Wrap(this HtmlHelper html, string tag, string innerText, object anonymousAttributes, params IHtmlTagWrapper[] children)
+		{
+			var wrap = new HtmlTagWrapper(tag);
+			if (anonymousAttributes != null)
+			{
+				wrap.ReflectAttributesFromAnonymousType(anonymousAttributes);
+			}
+			if (!string.IsNullOrWhiteSpace(innerText))
+			{
+				wrap.AddChild(new HtmlTagWrapperTextNode(innerText));
+			}
+			foreach (var child in children)
+			{
+				wrap.AddChild(child);
+			}
+			return wrap;
+		}
+
+		public static HtmlTagWrapper Wrap(this HtmlHelper html, bool visible, string tag, string innerText, object anonymousAttributes, params IHtmlTagWrapper[] children)
+		{
+			var item = html.Wrap(tag, innerText, anonymousAttributes, children);
+			item.Visible = visible;
+			return item;
+		}
+
+        #endregion
+
+        #region canvasdesigner
+
+        public static IHtmlString EnableCanvasDesigner(this HtmlHelper html,
+            UrlHelper url,
+            UmbracoContext umbCtx)
+        {
+            return html.EnableCanvasDesigner(url, umbCtx, string.Empty, string.Empty);
+        }
+
+        public static IHtmlString EnableCanvasDesigner(this HtmlHelper html,
+            UrlHelper url,
+            UmbracoContext umbCtx, string canvasdesignerConfigPath)
+        {
+            return html.EnableCanvasDesigner(url, umbCtx, canvasdesignerConfigPath, string.Empty);
+        }
+
+        public static IHtmlString EnableCanvasDesigner(this HtmlHelper html,
+            UrlHelper url,
+            UmbracoContext umbCtx, string canvasdesignerConfigPath, string canvasdesignerPalettesPath)
+        {
+
+            var umbracoPath = url.Content(SystemDirectories.Umbraco);
+
+            string previewLink = @"<script src=""{0}/lib/jquery/jquery.min.js"" type=""text/javascript""></script>" +
+                                 @"<script src=""{1}"" type=""text/javascript""></script>" +
+                                 @"<script src=""{2}"" type=""text/javascript""></script>" +
+                                 @"<script type=""text/javascript"">var pageId = '{3}'</script>" +
+                                 @"<script src=""{0}/js/canvasdesigner.front.js"" type=""text/javascript""></script>";
+
+            string noPreviewLinks = @"<link href=""{1}"" type=""text/css"" rel=""stylesheet"" data-title=""canvasdesignerCss"" />";
+
+            // Get page value
+            int pageId = umbCtx.PublishedContentRequest.UmbracoPage.PageID;
+            string[] path = umbCtx.PublishedContentRequest.UmbracoPage.SplitPath;
+            string result = string.Empty;
+            string cssPath = CanvasDesignerUtility.GetStylesheetPath(path, false);
+
+            if (umbCtx.InPreviewMode)
+            {
+                canvasdesignerConfigPath = string.IsNullOrEmpty(canvasdesignerConfigPath) == false
+                    ? canvasdesignerConfigPath
+                    : string.Format("{0}/js/canvasdesigner.config.js", umbracoPath);
+                canvasdesignerPalettesPath = string.IsNullOrEmpty(canvasdesignerPalettesPath) == false
+                    ? canvasdesignerPalettesPath
+                    : string.Format("{0}/js/canvasdesigner.palettes.js", umbracoPath);
+
+                if (string.IsNullOrEmpty(cssPath) == false)
+                    result = string.Format(noPreviewLinks, cssPath) + Environment.NewLine;
+
+                result = result + string.Format(previewLink, umbracoPath, canvasdesignerConfigPath, canvasdesignerPalettesPath, pageId);
+            }
+            else
+            {
+                // Get css path for current page
+                if (string.IsNullOrEmpty(cssPath) == false)
+                    result = string.Format(noPreviewLinks, cssPath);
+            }
+
+            return new HtmlString(result);
+
+        }
+
+        #endregion
+
+        #region RelatedLink
+
+        /// <summary>
+        /// Renders an anchor element for a RelatedLink instance.
+        /// Format: &lt;a href=&quot;relatedLink.Link&quot; target=&quot;_blank/_self&quot;&gt;relatedLink.Caption&lt;/a&gt;
+        /// </summary>
+        /// <param name="htmlHelper">The HTML helper instance that this method extends.</param>
+        /// <param name="relatedLink">The RelatedLink instance</param>
+        /// <returns>An anchor element </returns>
+        public static MvcHtmlString GetRelatedLinkHtml(this HtmlHelper htmlHelper, RelatedLink relatedLink)
+        {
+            return htmlHelper.GetRelatedLinkHtml(relatedLink, null);
+        }
+
+        /// <summary>
+        /// Renders an anchor element for a RelatedLink instance, accepting htmlAttributes.
+        /// Format: &lt;a href=&quot;relatedLink.Link&quot; target=&quot;_blank/_self&quot; htmlAttributes&gt;relatedLink.Caption&lt;/a&gt;
+        /// </summary>
+        /// <param name="htmlHelper">The HTML helper instance that this method extends.</param>
+        /// <param name="relatedLink">The RelatedLink instance</param>
+        /// <param name="htmlAttributes">An object that contains the HTML attributes to set for the element.</param>
+        /// <returns></returns>
+        public static MvcHtmlString GetRelatedLinkHtml(this HtmlHelper htmlHelper, RelatedLink relatedLink, object htmlAttributes)
+        {
+            var tagBuilder = new TagBuilder("a");
+            tagBuilder.MergeAttributes(HtmlHelper.AnonymousObjectToHtmlAttributes(htmlAttributes));
+            tagBuilder.MergeAttribute("href", relatedLink.Link);
+            tagBuilder.MergeAttribute("target", relatedLink.NewWindow ? "_blank" : "_self");
+            tagBuilder.InnerHtml = HttpUtility.HtmlEncode(relatedLink.Caption);
+            return MvcHtmlString.Create(tagBuilder.ToString(TagRenderMode.Normal));
+        }
+        #endregion
+    }
+}

From cf53ba363d1f32e6daedce98da8b10cb69f789d2 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 26 Jun 2019 13:29:05 +1000
Subject: [PATCH 036/776] Internalizes new methods classes + cleanup

---
 src/Umbraco.Core/Constants-DataTypes.cs          |  2 +-
 ...nitionExtensions.cs => DataTypeExtensions.cs} | 16 ++++++++++++----
 .../Services/DateTypeServiceExtensions.cs        |  7 +++++--
 3 files changed, 18 insertions(+), 7 deletions(-)
 rename src/Umbraco.Core/Models/{DataTypeDefinitionExtensions.cs => DataTypeExtensions.cs} (79%)

diff --git a/src/Umbraco.Core/Constants-DataTypes.cs b/src/Umbraco.Core/Constants-DataTypes.cs
index d5d0e99dab..0e95e57b1b 100644
--- a/src/Umbraco.Core/Constants-DataTypes.cs
+++ b/src/Umbraco.Core/Constants-DataTypes.cs
@@ -7,7 +7,7 @@ namespace Umbraco.Core
         /// <summary>
         ///     Defines the identifiers for Umbraco data types as constants for easy centralized access/management.
         /// </summary>
-        public static class DataTypes
+        internal static class DataTypes
         {
 
             public static class ReservedPreValueKeys
diff --git a/src/Umbraco.Core/Models/DataTypeDefinitionExtensions.cs b/src/Umbraco.Core/Models/DataTypeExtensions.cs
similarity index 79%
rename from src/Umbraco.Core/Models/DataTypeDefinitionExtensions.cs
rename to src/Umbraco.Core/Models/DataTypeExtensions.cs
index 45c4420820..47702de2c5 100644
--- a/src/Umbraco.Core/Models/DataTypeDefinitionExtensions.cs
+++ b/src/Umbraco.Core/Models/DataTypeExtensions.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Umbraco.Core.Models
 {
-    public static class DataTypeDefinitionExtensions
+    internal static class DataTypeExtensions
     {
         private static readonly ISet<Guid> IdsOfBuildInDataTypes = new HashSet<Guid>()
         {
@@ -37,11 +37,19 @@ namespace Umbraco.Core.Models
         /// <summary>
         /// Returns true if this date type is build-in/default.
         /// </summary>
-        /// <param name="dataTypeDefinition">The data type definition.</param>
+        /// <param name="dataType">The data type definition.</param>
         /// <returns></returns>
-        public static bool IsBuildInDataType(this IDataTypeDefinition dataTypeDefinition)
+        public static bool IsBuildInDataType(this IDataTypeDefinition dataType)
         {
-            return IdsOfBuildInDataTypes.Contains(dataTypeDefinition.Key);
+            return IsBuildInDataType(dataType.Key);
+        }
+
+        /// <summary>
+        /// Returns true if this date type is build-in/default.
+        /// </summary>
+        public static bool IsBuildInDataType(Guid key)
+        {
+            return IdsOfBuildInDataTypes.Contains(key);
         }
     }
 }
diff --git a/src/Umbraco.Core/Services/DateTypeServiceExtensions.cs b/src/Umbraco.Core/Services/DateTypeServiceExtensions.cs
index 63006653ab..bea83558a5 100644
--- a/src/Umbraco.Core/Services/DateTypeServiceExtensions.cs
+++ b/src/Umbraco.Core/Services/DateTypeServiceExtensions.cs
@@ -1,17 +1,20 @@
 using System;
+using Umbraco.Core.Models;
 
 namespace Umbraco.Core.Services
 {
-    public static class DateTypeServiceExtensions
+    internal static class DateTypeServiceExtensions
     {
         public static bool IsDataTypeIgnoringUserStartNodes(this IDataTypeService dataTypeService, Guid key)
         {
+            if (DataTypeExtensions.IsBuildInDataType(key)) return false; //built in ones can never be ignoring start nodes
+
             var dataType = dataTypeService.GetDataTypeDefinitionById(key);
 
             if (dataType != null)
             {
                 var preValues = dataTypeService.GetPreValuesCollectionByDataTypeId(dataType.Id);
-                if (preValues.PreValuesAsDictionary.TryGetValue(
+                if (preValues.FormatAsDictionary().TryGetValue(
                     Constants.DataTypes.ReservedPreValueKeys.IgnoreUserStartNodes, out var preValue))
                     return preValue.Value.InvariantEquals("1");
             }

From 23b8e1cce8107aabd8ba5ebbcb0a3ee33aff212d Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 26 Jun 2019 13:31:04 +1000
Subject: [PATCH 037/776] Removes the remaining part of the EntityRepository
 that was loading in ALL properties for media which we don't want whatsoever
 which means some other code is cleaned up/removed

---
 src/Umbraco.Core/Models/UmbracoEntity.cs      |  39 +----
 .../Repositories/EntityRepository.cs          | 146 ++----------------
 src/Umbraco.Core/Services/EntityService.cs    |  21 ---
 .../Models/UmbracoEntityTests.cs              |  27 +---
 .../Trees/ContentTreeController.cs            |   3 -
 .../Trees/ContentTreeControllerBase.cs        |   8 +-
 src/Umbraco.Web/Trees/MediaTreeController.cs  |   8 +-
 src/Umbraco.Web/Umbraco.Web.csproj            |   1 -
 .../WebServices/FolderBrowserService.cs       | 114 --------------
 .../umbraco/Trees/BaseMediaTree.cs            |  31 +---
 .../umbraco/Trees/BaseTree.cs                 |   2 +-
 11 files changed, 27 insertions(+), 373 deletions(-)
 delete mode 100644 src/Umbraco.Web/WebServices/FolderBrowserService.cs

diff --git a/src/Umbraco.Core/Models/UmbracoEntity.cs b/src/Umbraco.Core/Models/UmbracoEntity.cs
index b789698704..7783331952 100644
--- a/src/Umbraco.Core/Models/UmbracoEntity.cs
+++ b/src/Umbraco.Core/Models/UmbracoEntity.cs
@@ -225,42 +225,5 @@ namespace Umbraco.Core.Models
             return clone;
         }
 
-        /// <summary>
-        /// A struction that can be contained in the additional data of an UmbracoEntity representing 
-        /// a user defined property
-        /// </summary>
-        public class EntityProperty : IDeepCloneable
-        {
-            public string PropertyEditorAlias { get; set; }
-            public object Value { get; set; }
-            public object DeepClone()
-            {
-                //Memberwise clone on Entity will work since it doesn't have any deep elements
-                // for any sub class this will work for standard properties as well that aren't complex object's themselves.
-                var clone = MemberwiseClone();
-                return clone;
-            }
-
-            protected bool Equals(EntityProperty other)
-            {
-                return PropertyEditorAlias.Equals(other.PropertyEditorAlias) && string.Equals(Value, other.Value);
-            }
-
-            public override bool Equals(object obj)
-            {
-                if (ReferenceEquals(null, obj)) return false;
-                if (ReferenceEquals(this, obj)) return true;
-                if (obj.GetType() != this.GetType()) return false;
-                return Equals((EntityProperty) obj);
-            }
-
-            public override int GetHashCode()
-            {
-                unchecked
-                {
-                    return (PropertyEditorAlias.GetHashCode() * 397) ^ (Value != null ? Value.GetHashCode() : 0);
-                }
-            }
-        }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs b/src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
index 495c0109ad..7b10b19e1e 100644
--- a/src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
@@ -20,27 +20,22 @@ namespace Umbraco.Core.Persistence.Repositories
     /// </remarks>
     internal class EntityRepository : DisposableObjectSlim, IEntityRepository
     {
-        private readonly IDatabaseUnitOfWork _work;
-
         public EntityRepository(IDatabaseUnitOfWork work)
 		{
-		    _work = work;
+		    UnitOfWork = work;
 		}
 
         /// <summary>
         /// Returns the Unit of Work added to the repository
         /// </summary>
-        protected internal IDatabaseUnitOfWork UnitOfWork
-        {
-            get { return _work; }
-        }
+        protected internal IDatabaseUnitOfWork UnitOfWork { get; }
 
         /// <summary>
         /// Internal for testing purposes
         /// </summary>
         internal Guid UnitKey
         {
-            get { return (Guid)_work.Key; }
+            get { return (Guid)UnitOfWork.Key; }
         }
 
         #region Query Methods
@@ -69,75 +64,8 @@ namespace Umbraco.Core.Persistence.Repositories
 
             IEnumerable<IUmbracoEntity> result;
 
-            if (isMedia)
-            {
-                //Treat media differently for now, as an Entity it will be returned with ALL of it's properties in the AdditionalData bag!
-                var pagedResult = _work.Database.Page<dynamic>(pageIndex + 1, pageSize, pagedSql);
-
-                var ids = pagedResult.Items.Select(x => (int) x.id).InGroupsOf(2000);
-                var entities = pagedResult.Items.Select(factory.BuildEntityFromDynamic).Cast<IUmbracoEntity>().ToList();
-
-                //Now we need to merge in the property data since we need paging and we can't do this the way that the big media query was working before
-                foreach (var idGroup in ids)
-                {
-                    var propSql = GetPropertySql(Constants.ObjectTypes.Media)
-                        .Where("contentNodeId IN (@ids)", new { ids = idGroup });
-                    propSql = (orderDirection == Direction.Descending) ? propSql.OrderByDescending("contentNodeId") : propSql.OrderBy("contentNodeId");
-
-                    //This does NOT fetch all data into memory in a list, this will read
-                    // over the records as a data reader, this is much better for performance and memory,
-                    // but it means that during the reading of this data set, nothing else can be read
-                    // from SQL server otherwise we'll get an exception.
-                    var allPropertyData = _work.Database.Query<dynamic>(propSql);
-
-                    //keep track of the current property data item being enumerated
-                    var propertyDataSetEnumerator = allPropertyData.GetEnumerator();
-                    var hasCurrent = false; // initially there is no enumerator.Current
-
-                    try
-                    {
-                        //This must be sorted by node id (which is done by SQL) because this is how we are sorting the query to lookup property types above,
-                        // which allows us to more efficiently iterate over the large data set of property values.
-                        foreach (var entity in entities)
-                        {
-                            // assemble the dtos for this def
-                            // use the available enumerator.Current if any else move to next
-                            while (hasCurrent || propertyDataSetEnumerator.MoveNext())
-                            {
-                                if (propertyDataSetEnumerator.Current.contentNodeId == entity.Id)
-                                {
-                                    hasCurrent = false; // enumerator.Current is not available
-
-                                    //the property data goes into the additional data
-                                    entity.AdditionalData[propertyDataSetEnumerator.Current.propertyTypeAlias] = new UmbracoEntity.EntityProperty
-                                    {
-                                        PropertyEditorAlias = propertyDataSetEnumerator.Current.propertyEditorAlias,
-                                        Value = StringExtensions.IsNullOrWhiteSpace(propertyDataSetEnumerator.Current.dataNtext)
-                                            ? propertyDataSetEnumerator.Current.dataNvarchar
-                                            : StringExtensions.ConvertToJsonIfPossible(propertyDataSetEnumerator.Current.dataNtext)
-                                    };
-                                }
-                                else
-                                {
-                                    hasCurrent = true; // enumerator.Current is available for another def
-                                    break; // no more propertyDataDto for this def
-                                }
-                            }
-                        }
-                    }
-                    finally
-                    {
-                        propertyDataSetEnumerator.Dispose();
-                    }
-                }
-
-                result = entities;
-            }
-            else
-            {
-                var pagedResult = _work.Database.Page<dynamic>(pageIndex + 1, pageSize, pagedSql);
-                result = pagedResult.Items.Select(factory.BuildEntityFromDynamic).Cast<IUmbracoEntity>().ToList();
-            }
+            var pagedResult = UnitOfWork.Database.Page<dynamic>(pageIndex + 1, pageSize, pagedSql);
+            result = pagedResult.Items.Select(factory.BuildEntityFromDynamic).Cast<IUmbracoEntity>().ToList();
 
             //The total items from the PetaPoco page query will be wrong due to the Outer join used on parent, depending on the search this will
             //return duplicate results when the COUNT is used in conjuction with it, so we need to get the total on our own.
@@ -159,7 +87,7 @@ namespace Umbraco.Core.Persistence.Repositories
             var translatorCount = new SqlTranslator<IUmbracoEntity>(sqlCountClause, query);
             var countSql = translatorCount.Translate();
 
-            totalRecords = _work.Database.ExecuteScalar<int>(countSql);
+            totalRecords = UnitOfWork.Database.ExecuteScalar<int>(countSql);
 
             return result;
         }
@@ -167,7 +95,7 @@ namespace Umbraco.Core.Persistence.Repositories
         public IUmbracoEntity GetByKey(Guid key)
         {
             var sql = GetBaseWhere(GetBase, false, false, key);
-            var nodeDto = _work.Database.FirstOrDefault<dynamic>(sql);
+            var nodeDto = UnitOfWork.Database.FirstOrDefault<dynamic>(sql);
             if (nodeDto == null)
                 return null;
 
@@ -187,7 +115,7 @@ namespace Umbraco.Core.Persistence.Repositories
             var factory = new UmbracoEntityFactory();
 
             //query = read forward data reader, do not load everything into mem
-            var dtos = _work.Database.Query<dynamic>(sql);
+            var dtos = UnitOfWork.Database.Query<dynamic>(sql);
             var collection = new EntityDefinitionCollection();
             foreach (var dto in dtos)
             {
@@ -202,7 +130,7 @@ namespace Umbraco.Core.Persistence.Repositories
         public virtual IUmbracoEntity Get(int id)
         {
             var sql = GetBaseWhere(GetBase, false, false, id);
-            var nodeDto = _work.Database.FirstOrDefault<dynamic>(sql);
+            var nodeDto = UnitOfWork.Database.FirstOrDefault<dynamic>(sql);
             if (nodeDto == null)
                 return null;
 
@@ -222,7 +150,7 @@ namespace Umbraco.Core.Persistence.Repositories
             var factory = new UmbracoEntityFactory();
 
             //query = read forward data reader, do not load everything into mem
-            var dtos = _work.Database.Query<dynamic>(sql);
+            var dtos = UnitOfWork.Database.Query<dynamic>(sql);
             var collection = new EntityDefinitionCollection();
             foreach (var dto in dtos)
             {
@@ -256,7 +184,7 @@ namespace Umbraco.Core.Persistence.Repositories
             var factory = new UmbracoEntityFactory();
 
             //query = read forward data reader, do not load everything into mem
-            var dtos = _work.Database.Query<dynamic>(sql);
+            var dtos = UnitOfWork.Database.Query<dynamic>(sql);
             var collection = new EntityDefinitionCollection();
             foreach (var dto in dtos)
             {
@@ -283,7 +211,7 @@ namespace Umbraco.Core.Persistence.Repositories
         {
             var sql = new Sql("SELECT id, path FROM umbracoNode WHERE umbracoNode.nodeObjectType=@type", new { type = objectTypeId });
             if (filter != null) filter(sql);
-            return _work.Database.Fetch<EntityPath>(sql);
+            return UnitOfWork.Database.Fetch<EntityPath>(sql);
         }
 
         public virtual IEnumerable<IUmbracoEntity> GetByQuery(IQuery<IUmbracoEntity> query)
@@ -292,7 +220,7 @@ namespace Umbraco.Core.Persistence.Repositories
             var translator = new SqlTranslator<IUmbracoEntity>(sqlClause, query);
             var sql = translator.Translate().Append(GetGroupBy(false, false));
 
-            var dtos = _work.Database.Fetch<dynamic>(sql);
+            var dtos = UnitOfWork.Database.Fetch<dynamic>(sql);
 
             var factory = new UmbracoEntityFactory();
             var list = dtos.Select(factory.BuildEntityFromDynamic).Cast<IUmbracoEntity>().ToList();
@@ -306,10 +234,6 @@ namespace Umbraco.Core.Persistence.Repositories
         /// <param name="query"></param>
         /// <param name="objectTypeId"></param>
         /// <returns></returns>
-        /// <remarks>
-        /// Note that this will also fetch all property data for media items, which can cause performance problems
-        /// when used without paging, in sites with large amounts of data in cmsPropertyData.
-        /// </remarks>
         public virtual IEnumerable<IUmbracoEntity> GetByQuery(IQuery<IUmbracoEntity> query, Guid objectTypeId)
         {
             var isContent = objectTypeId == Constants.ObjectTypes.DocumentGuid || objectTypeId == Constants.ObjectTypes.DocumentBlueprintGuid;
@@ -323,27 +247,7 @@ namespace Umbraco.Core.Persistence.Repositories
             return GetByQueryInternal(entitySql, isContent, isMedia);
         }
 
-        /// <summary>
-        /// Gets entities by query without fetching property data.
-        /// </summary>
-        /// <param name="query"></param>
-        /// <param name="objectTypeId"></param>
-        /// <returns></returns>
-        /// <remarks>
-        /// This is supposed to be internal and can be used when getting all entities without paging, without causing
-        /// performance issues.
-        /// </remarks>
-        internal IEnumerable<IUmbracoEntity> GetMediaByQueryWithoutPropertyData(IQuery<IUmbracoEntity> query)
-        {
-            var sqlClause = GetBaseWhere(GetBase, false, true, null, UmbracoObjectTypes.Media.GetGuid());
-
-            var translator = new SqlTranslator<IUmbracoEntity>(sqlClause, query);
-            var entitySql = translator.Translate();
-
-            return GetByQueryInternal(entitySql, false, true);
-        }
-
-        internal IEnumerable<IUmbracoEntity> GetByQueryInternal(Sql entitySql, bool isContent, bool isMedia)
+        private IEnumerable<IUmbracoEntity> GetByQueryInternal(Sql entitySql, bool isContent, bool isMedia)
         {
             var factory = new UmbracoEntityFactory();
 
@@ -351,7 +255,7 @@ namespace Umbraco.Core.Persistence.Repositories
             var finalSql = entitySql.Append(GetGroupBy(isContent, isMedia));
 
             //query = read forward data reader, do not load everything into mem
-            var dtos = _work.Database.Query<dynamic>(finalSql);
+            var dtos = UnitOfWork.Database.Query<dynamic>(finalSql);
             var collection = new EntityDefinitionCollection();
             foreach (var dto in dtos)
             {
@@ -392,22 +296,6 @@ namespace Umbraco.Core.Persistence.Repositories
             return entitySql.Append(GetGroupBy(isContent, true, false));
         }
 
-        private Sql GetPropertySql(string nodeObjectType)
-        {
-            var sql = new Sql()
-                .Select("contentNodeId, versionId, dataNvarchar, dataNtext, propertyEditorAlias, alias as propertyTypeAlias")
-                .From<PropertyDataDto>()
-                .InnerJoin<NodeDto>()
-                .On<PropertyDataDto, NodeDto>(dto => dto.NodeId, dto => dto.NodeId)
-                .InnerJoin<PropertyTypeDto>()
-                .On<PropertyTypeDto, PropertyDataDto>(dto => dto.Id, dto => dto.PropertyTypeId)
-                .InnerJoin<DataTypeDto>()
-                .On<PropertyTypeDto, DataTypeDto>(dto => dto.DataTypeId, dto => dto.DataTypeId)
-                .Where("umbracoNode.nodeObjectType = @nodeObjectType", new { nodeObjectType = nodeObjectType });
-
-            return sql;
-        }
-
         protected virtual Sql GetBase(bool isContent, bool isMedia, Action<Sql> customFilter)
         {
             return GetBase(isContent, isMedia, customFilter, false);
@@ -638,13 +526,13 @@ namespace Umbraco.Core.Persistence.Repositories
         public bool Exists(Guid key)
         {
             var sql = new Sql().Select("COUNT(*)").From("umbracoNode").Where("uniqueID=@uniqueID", new {uniqueID = key});
-            return _work.Database.ExecuteScalar<int>(sql) > 0;
+            return UnitOfWork.Database.ExecuteScalar<int>(sql) > 0;
         }
 
         public bool Exists(int id)
         {
             var sql = new Sql().Select("COUNT(*)").From("umbracoNode").Where("id=@id", new { id = id });
-            return _work.Database.ExecuteScalar<int>(sql) > 0;
+            return UnitOfWork.Database.ExecuteScalar<int>(sql) > 0;
         }
 
         #region private classes
diff --git a/src/Umbraco.Core/Services/EntityService.cs b/src/Umbraco.Core/Services/EntityService.cs
index 906ece1081..f4b1b71732 100644
--- a/src/Umbraco.Core/Services/EntityService.cs
+++ b/src/Umbraco.Core/Services/EntityService.cs
@@ -234,27 +234,6 @@ namespace Umbraco.Core.Services
             }
         }
 
-        /// <summary>
-        /// Gets a collection of children by the parent's Id and UmbracoObjectType without adding property data
-        /// </summary>
-        /// <param name="parentId">Id of the parent to retrieve children for</param>
-        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/> objects</returns>
-        internal IEnumerable<IUmbracoEntity> GetMediaChildrenWithoutPropertyData(int parentId)
-        {
-            var objectTypeId = UmbracoObjectTypes.Media.GetGuid();
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateEntityRepository(uow);
-                var query = Query<IUmbracoEntity>.Builder.Where(x => x.ParentId == parentId);
-
-                // Not pretty having to cast the repository, but it is the only way to get to use an internal method that we
-                // do not want to make public on the interface. Unfortunately also prevents this from being unit tested.
-                // See this issue for details on why we need this:
-                // https://github.com/umbraco/Umbraco-CMS/issues/3457
-                return ((EntityRepository)repository).GetMediaByQueryWithoutPropertyData(query);
-            }
-        }
-
         /// <summary>
         /// Returns a paged collection of children
         /// </summary>
diff --git a/src/Umbraco.Tests/Models/UmbracoEntityTests.cs b/src/Umbraco.Tests/Models/UmbracoEntityTests.cs
index 7186474999..1ab6bbea31 100644
--- a/src/Umbraco.Tests/Models/UmbracoEntityTests.cs
+++ b/src/Umbraco.Tests/Models/UmbracoEntityTests.cs
@@ -177,18 +177,7 @@ namespace Umbraco.Tests.Models
             };
             item.AdditionalData.Add("test1", 3);
             item.AdditionalData.Add("test2", "valuie");
-
-            item.AdditionalData.Add("test3", new UmbracoEntity.EntityProperty()
-            {
-                Value = "test",
-                PropertyEditorAlias = "TestPropertyEditor"
-            });
-            item.AdditionalData.Add("test4", new UmbracoEntity.EntityProperty()
-            {
-                Value = "test2",
-                PropertyEditorAlias = "TestPropertyEditor2"
-            });
-
+            
             var clone = (UmbracoEntity)item.DeepClone();
 
             Assert.AreNotSame(clone, item);
@@ -250,20 +239,10 @@ namespace Umbraco.Tests.Models
             };
             item.AdditionalData.Add("test1", 3);
             item.AdditionalData.Add("test2", "valuie");
-            item.AdditionalData.Add("test3", new UmbracoEntity.EntityProperty()
-            {
-                Value = "test",
-                PropertyEditorAlias = "TestPropertyEditor"
-            });
-            item.AdditionalData.Add("test4", new UmbracoEntity.EntityProperty()
-            {
-                Value = "test2",
-                PropertyEditorAlias = "TestPropertyEditor2"
-            });
-
+           
             var result = ss.ToStream(item);
             var json = result.ResultStream.ToJsonString();
             Debug.Print(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web/Trees/ContentTreeController.cs b/src/Umbraco.Web/Trees/ContentTreeController.cs
index 54adb24b74..e7fb0b8d84 100644
--- a/src/Umbraco.Web/Trees/ContentTreeController.cs
+++ b/src/Umbraco.Web/Trees/ContentTreeController.cs
@@ -207,9 +207,6 @@ namespace Umbraco.Web.Trees
             return HasPathAccess(entity, queryStrings);
         }
 
-        internal override IEnumerable<IUmbracoEntity> GetChildrenFromEntityService(int entityId)
-            => Services.EntityService.GetChildren(entityId, UmbracoObjectType).ToList();
-
         /// <summary>
         /// Returns a collection of all menu items that can be on a content node
         /// </summary>
diff --git a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
index 2624c89b56..4e4086a3c6 100644
--- a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
+++ b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
@@ -205,12 +205,8 @@ namespace Umbraco.Web.Trees
             return GetChildrenFromEntityService(entityId);
         }
 
-        /// <summary>
-        /// Abstract method to fetch the entities from the entity service
-        /// </summary>
-        /// <param name="entityId"></param>
-        /// <returns></returns>
-        internal abstract IEnumerable<IUmbracoEntity> GetChildrenFromEntityService(int entityId);
+        private IEnumerable<IUmbracoEntity> GetChildrenFromEntityService(int entityId)
+            => Services.EntityService.GetChildren(entityId, UmbracoObjectType).ToList();
 
         /// <summary>
         /// Returns true or false if the current user has access to the node based on the user's allowed start node (path) access
diff --git a/src/Umbraco.Web/Trees/MediaTreeController.cs b/src/Umbraco.Web/Trees/MediaTreeController.cs
index f2f59b6bd7..50336dbc10 100644
--- a/src/Umbraco.Web/Trees/MediaTreeController.cs
+++ b/src/Umbraco.Web/Trees/MediaTreeController.cs
@@ -177,12 +177,6 @@ namespace Umbraco.Web.Trees
         {
             return _treeSearcher.ExamineSearch(Umbraco, query, UmbracoEntityTypes.Media, pageSize, pageIndex, out totalFound, searchFrom);
         }
-
-        internal override IEnumerable<IUmbracoEntity> GetChildrenFromEntityService(int entityId)
-            // Not pretty having to cast the service, but it is the only way to get to use an internal method that we
-            // do not want to make public on the interface. Unfortunately also prevents this from being unit tested.
-            // See this issue for details on why we need this:
-            // https://github.com/umbraco/Umbraco-CMS/issues/3457
-            => ((EntityService)Services.EntityService).GetMediaChildrenWithoutPropertyData(entityId).ToList();        
+    
     }
 }
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index d4fd27c323..32eaae1077 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -1812,7 +1812,6 @@
     <Compile Include="WebServices\DomainsApiController.cs" />
     <Compile Include="WebServices\EmbedMediaService.cs" />
     <Compile Include="WebServices\ExamineManagementApiController.cs" />
-    <Compile Include="WebServices\FolderBrowserService.cs" />
     <Compile Include="WebServices\TagsController.cs" />
     <Compile Include="WebServices\UmbracoAuthorizedHttpHandler.cs" />
     <Compile Include="WebServices\SaveFileController.cs" />
diff --git a/src/Umbraco.Web/WebServices/FolderBrowserService.cs b/src/Umbraco.Web/WebServices/FolderBrowserService.cs
deleted file mode 100644
index 15a6c10880..0000000000
--- a/src/Umbraco.Web/WebServices/FolderBrowserService.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Web.Script.Serialization;
-using Umbraco.Core;
-using Umbraco.Core.IO;
-using Umbraco.Core.Models;
-using Umbraco.Web.Media.ThumbnailProviders;
-using umbraco.BusinessLogic;
-using umbraco.cms.businesslogic.Tags;
-using Umbraco.Web.BaseRest;
-using Tag = umbraco.cms.businesslogic.Tags.Tag;
-
-namespace Umbraco.Web.WebServices
-{
-    //TODO: Can we convert this to MVC please instead of /base?
-    [Obsolete("Thumbnails are generated by ImageProcessor, use that instead")]
-    [RestExtension("FolderBrowserService")]
-    public class FolderBrowserService
-    {
-        [RestExtensionMethod(ReturnXml = false)]
-        public static string GetChildren(int parentId)
-        {
-            var currentUser = GetCurrentUser();
-            AuthorizeAccess(parentId, currentUser);
-
-            // Get children and filter
-            var data = new List<object>();
-            var service = ApplicationContext.Current.Services.EntityService;
-
-            var entities = service.GetChildren(parentId, UmbracoObjectTypes.Media);
-            foreach (UmbracoEntity entity in entities)
-            {
-                var uploadFieldProperty = entity.AdditionalData
-                    .Select(x => x.Value as UmbracoEntity.EntityProperty)
-                    .Where(x => x != null)
-                    .FirstOrDefault(x => x.PropertyEditorAlias == Constants.PropertyEditors.UploadFieldAlias);
-                    
-                //var uploadFieldProperty = entity.UmbracoProperties.FirstOrDefault(x => x.PropertyEditorAlias == Constants.PropertyEditors.UploadFieldAlias);
-                
-                var thumbnailUrl = uploadFieldProperty == null ? "" : ThumbnailProvidersResolver.Current.GetThumbnailUrl((string)uploadFieldProperty.Value);
-
-                var item = new
-                {
-                    Id = entity.Id,
-                    Path = entity.Path,
-                    Name = entity.Name,
-                    Tags = string.Join(",", Tag.GetTags(entity.Id).Select(x => x.TagCaption)),
-                    MediaTypeAlias = entity.ContentTypeAlias,
-                    EditUrl = string.Format("editMedia.aspx?id={0}", entity.Id),
-                    FileUrl = uploadFieldProperty == null 
-                        ? "" 
-                        : uploadFieldProperty.Value,
-                    ThumbnailUrl = string.IsNullOrEmpty(thumbnailUrl)
-                        ? IOHelper.ResolveUrl(string.Format("{0}/images/thumbnails/{1}", SystemDirectories.Umbraco, entity.ContentTypeThumbnail))
-                        : thumbnailUrl
-                };
-
-                data.Add(item);
-
-            }
-
-            return new JavaScriptSerializer().Serialize(data);
-        }
-
-        [RestExtensionMethod(ReturnXml = false)]
-        public static string Delete(string nodeIds)
-        {
-            var currentUser = GetCurrentUser();
-
-            var nodeIdParts = nodeIds.Split(',');
-
-            foreach (var nodeIdPart in nodeIdParts.Where(x => string.IsNullOrEmpty(x) == false))
-            {
-                int nodeId;
-                if (Int32.TryParse(nodeIdPart, out nodeId) == false)
-                    continue;
-
-                var node = new global::umbraco.cms.businesslogic.media.Media(nodeId);
-                AuthorizeAccess(node, currentUser);
-
-                node.delete(("," + node.Path + ",").Contains(",-21,"));
-            }
-
-            return new JavaScriptSerializer().Serialize(new { success = true });
-        }
-
-        private static User GetCurrentUser()
-        {
-            var currentUser = User.GetCurrent();
-            if (currentUser == null)
-                throw new UnauthorizedAccessException("You must be logged in to use this service");
-
-            return currentUser;
-        }
-
-        private static void AuthorizeAccess(global::umbraco.cms.businesslogic.media.Media mediaItem, User currentUser)
-        {
-            if (("," + mediaItem.Path + ",").Contains("," + currentUser.StartMediaId + ",") == false)
-                throw new UnauthorizedAccessException("You do not have access to this Media node");
-        }
-
-        private static void AuthorizeAccess(int parentId, User currentUser)
-        {
-            var service = ApplicationContext.Current.Services.EntityService;
-            var parentMedia = service.Get(parentId, UmbracoObjectTypes.Media);
-            var mediaPath = parentMedia == null ? parentId.ToString(CultureInfo.InvariantCulture) : parentMedia.Path;
-
-            if (("," + mediaPath + ",").Contains("," + currentUser.StartMediaId + ",") == false)
-                throw new UnauthorizedAccessException("You do not have access to this Media node");
-        }
-    }
-}
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseMediaTree.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseMediaTree.cs
index f72457d867..f7412f6915 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseMediaTree.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseMediaTree.cs
@@ -189,35 +189,8 @@ function openMedia(id) {
             return "";
         }
 
-        /// <summary>
-        /// NOTE: New implementation of the legacy GetLinkValue. This is however a bit quirky as a media item can have multiple "Linkable DataTypes".
-        /// Returns the value for a link in WYSIWYG mode, by default only media items that have a 
-        /// DataTypeUploadField are linkable, however, a custom tree can be created which overrides
-        /// this method, or another GUID for a custom data type can be added to the LinkableMediaDataTypes
-        /// list on application startup.
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        internal virtual string GetLinkValue(UmbracoEntity entity)
-        {
-            foreach (var property in entity.AdditionalData
-                .Select(x => x.Value as UmbracoEntity.EntityProperty)
-                .Where(x => x != null))
-            {
-
-
-                //required for backwards compatibility with v7 with changing the GUID -> alias
-                var controlId = LegacyPropertyEditorIdToAliasConverter.GetLegacyIdFromAlias(property.PropertyEditorAlias, LegacyPropertyEditorIdToAliasConverter.NotFoundLegacyIdResponseBehavior.ReturnNull);
-                if (controlId != null)
-                {
-                    if (LinkableMediaDataTypes.Contains(controlId.Value) 
-                        && string.IsNullOrEmpty((string)property.Value) == false)
-                        
-                        return property.Value.ToString();
-                }
-            }
-            return "";
-        }
+        [Obsolete("Just like this class is and is not used whatsoever for a very long time, this method will return an empty string")]
+        internal virtual string GetLinkValue(UmbracoEntity entity) => string.Empty;
 
         /// <summary>
         /// By default, any media type that is to be "linkable" in the WYSIWYG editor must contain
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseTree.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseTree.cs
index 49d8c7214d..ab18a1316e 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseTree.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseTree.cs
@@ -652,4 +652,4 @@ namespace umbraco.cms.presentation.Trees
 
     }
 
-}
\ No newline at end of file
+}

From ca15f340b09b8a9df53a49a5089f3ceb7edc6a15 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 26 Jun 2019 13:32:16 +1000
Subject: [PATCH 038/776] Fixes a bunch of N+1, content/media trees should be
 much more snappy

---
 src/Umbraco.Core/Models/UserExtensions.cs     | 13 -----
 .../Factories/UmbracoEntityFactory.cs         | 16 +++---
 src/Umbraco.Core/Umbraco.Core.csproj          |  2 +-
 .../Trees/ContentTreeControllerBase.cs        | 54 ++++++++++++++++---
 src/Umbraco.Web/Trees/TreeControllerBase.cs   | 16 ------
 5 files changed, 58 insertions(+), 43 deletions(-)

diff --git a/src/Umbraco.Core/Models/UserExtensions.cs b/src/Umbraco.Core/Models/UserExtensions.cs
index d989876607..6c29ab56bb 100644
--- a/src/Umbraco.Core/Models/UserExtensions.cs
+++ b/src/Umbraco.Core/Models/UserExtensions.cs
@@ -193,19 +193,6 @@ namespace Umbraco.Core.Models
 
             // check for a start node in the path
             return startNodeIds.Any(x => formattedPath.Contains(string.Concat(",", x, ",")));
-        }
-
-        internal static bool IsInBranchOfStartNode(this IUser user, IUmbracoEntity entity, IEntityService entityService, int recycleBinId, out bool hasPathAccess)
-        {
-            switch (recycleBinId)
-            {
-                case Constants.System.RecycleBinMedia:
-                    return IsInBranchOfStartNode(entity.Path, user.CalculateMediaStartNodeIds(entityService), user.GetMediaStartNodePaths(entityService), out hasPathAccess);
-                case Constants.System.RecycleBinContent:
-                    return IsInBranchOfStartNode(entity.Path, user.CalculateContentStartNodeIds(entityService), user.GetContentStartNodePaths(entityService), out hasPathAccess);
-                default:
-                    throw new NotSupportedException("Path access is only determined on content or media");
-            }
         }
 
         internal static bool IsInBranchOfStartNode(string path, int[] startNodeIds, string[] startNodePaths, out bool hasPathAccess)
diff --git a/src/Umbraco.Core/Persistence/Factories/UmbracoEntityFactory.cs b/src/Umbraco.Core/Persistence/Factories/UmbracoEntityFactory.cs
index 86594836db..f12af4d27a 100644
--- a/src/Umbraco.Core/Persistence/Factories/UmbracoEntityFactory.cs
+++ b/src/Umbraco.Core/Persistence/Factories/UmbracoEntityFactory.cs
@@ -12,14 +12,18 @@ namespace Umbraco.Core.Persistence.Factories
 {
     internal class UmbracoEntityFactory 
     {
+        private static readonly Lazy<string[]> EntityProperties = new Lazy<string[]>(() => typeof(IUmbracoEntity).GetPublicProperties().Select(x => x.Name).ToArray());
+
+        /// <summary>
+        /// Figure out what extra properties we have that are not on the IUmbracoEntity and add them to additional data
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <param name="originalEntityProperties"></param>
         internal void AddAdditionalData(UmbracoEntity entity, IDictionary<string, object> originalEntityProperties)
-        {
-            var entityProps = typeof(IUmbracoEntity).GetPublicProperties().Select(x => x.Name).ToArray();
-            
-            //figure out what extra properties we have that are not on the IUmbracoEntity and add them to additional data
+        {   
             foreach (var k in originalEntityProperties.Keys
                 .Select(x => new { orig = x, title = x.ToCleanString(CleanStringType.PascalCase | CleanStringType.Ascii | CleanStringType.ConvertCase) })
-                .Where(x => entityProps.InvariantContains(x.title) == false))
+                .Where(x => EntityProperties.Value.InvariantContains(x.title) == false))
             {
                 entity.AdditionalData[k.title] = originalEntityProperties[k.orig];
             }
@@ -78,4 +82,4 @@ namespace Umbraco.Core.Persistence.Factories
         }
         
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 49f5e8b5d2..3b5d0aaff6 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -377,7 +377,7 @@
     <Compile Include="Models\Consent.cs" />
     <Compile Include="Models\ConsentExtensions.cs" />
     <Compile Include="Models\ConsentState.cs" />
-    <Compile Include="Models\DataTypeDefinitionExtensions.cs" />
+    <Compile Include="Models\DataTypeExtensions.cs" />
     <Compile Include="Models\EntityBase\EntityPath.cs" />
     <Compile Include="Models\EntityBase\IDeletableEntity.cs" />
     <Compile Include="Models\IAuditEntry.cs" />
diff --git a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
index 4e4086a3c6..d5c7c04235 100644
--- a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
+++ b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
@@ -87,11 +87,12 @@ namespace Umbraco.Web.Trees
         /// <param name="parentId"></param>
         /// <param name="queryStrings"></param>
         /// <returns></returns>
-        internal TreeNode GetSingleTreeNodeWithAccessCheck(IUmbracoEntity e, string parentId, FormDataCollection queryStrings)
+        internal TreeNode GetSingleTreeNodeWithAccessCheck(IUmbracoEntity e, string parentId, FormDataCollection queryStrings,
+            int[] startNodeIds, string[] startNodePaths, bool ignoreUserStartNodes)
         {
             bool hasPathAccess;
-            var entityIsAncestorOfStartNodes = Security.CurrentUser.IsInBranchOfStartNode(e, Services.EntityService, RecycleBinId, out hasPathAccess);
-            if (IgnoreUserStartNodes(queryStrings) == false && entityIsAncestorOfStartNodes == false)
+            var entityIsAncestorOfStartNodes = UserExtensions.IsInBranchOfStartNode(e.Path, startNodeIds, startNodePaths, out hasPathAccess);
+            if (ignoreUserStartNodes == false && entityIsAncestorOfStartNodes == false)
                 return null;
 
             var treeNode = GetSingleTreeNode(e, parentId, queryStrings);
@@ -101,13 +102,30 @@ namespace Umbraco.Web.Trees
                 //the node so we need to return null;
                 return null;
             }
-            if (IgnoreUserStartNodes(queryStrings) == false && hasPathAccess == false)
+            if (ignoreUserStartNodes == false && hasPathAccess == false)
             {
                 treeNode.AdditionalData["noAccess"] = true;
             }
             return treeNode;
         }
 
+        private void GetUserStartNodes(out int[] startNodeIds, out string[] startNodePaths)
+        {
+            switch (RecycleBinId)
+            {
+                case Constants.System.RecycleBinMedia:
+                    startNodeIds = Security.CurrentUser.CalculateMediaStartNodeIds(Services.EntityService);
+                    startNodePaths = Security.CurrentUser.GetMediaStartNodePaths(Services.EntityService);
+                    break;
+                case Constants.System.RecycleBinContent:
+                    startNodeIds = Security.CurrentUser.CalculateContentStartNodeIds(Services.EntityService);
+                    startNodePaths = Security.CurrentUser.GetContentStartNodePaths(Services.EntityService);
+                    break;
+                default:
+                    throw new NotSupportedException("Path access is only determined on content or media");
+            }
+        }
+
         /// <summary>
         /// Returns the
         /// </summary>
@@ -134,6 +152,8 @@ namespace Umbraco.Web.Trees
                 ? queryStrings.GetValue<string>(TreeQueryStringParameters.StartNodeId)
                 : string.Empty;
 
+            var ignoreUserStartNodes = IgnoreUserStartNodes(queryStrings);
+
             if (string.IsNullOrEmpty(startNodeId) == false && startNodeId != "undefined" && startNodeId != rootIdString)
             {
                 // request has been made to render from a specific, non-root, start node
@@ -141,7 +161,7 @@ namespace Umbraco.Web.Trees
 
                 // ensure that the user has access to that node, otherwise return the empty tree nodes collection
                 // TODO: in the future we could return a validation statement so we can have some UI to notify the user they don't have access
-                if (IgnoreUserStartNodes(queryStrings) == false && HasPathAccess(id, queryStrings) == false)
+                if (ignoreUserStartNodes == false && HasPathAccess(id, queryStrings) == false)
                 {
                     LogHelper.Warn<ContentTreeControllerBase>("User " + Security.CurrentUser.Username + " does not have access to node with id " + id);
                     return nodes;
@@ -159,7 +179,11 @@ namespace Umbraco.Web.Trees
             // get child entities - if id is root, but user's start nodes do not contain the
             // root node, this returns the start nodes instead of root's children
             var entities = GetChildEntities(id, queryStrings).ToList();
-            nodes.AddRange(entities.Select(x => GetSingleTreeNodeWithAccessCheck(x, id, queryStrings)).Where(x => x != null));
+
+            //get the current user start node/paths
+            GetUserStartNodes(out var userStartNodes, out var userStartNodePaths);
+
+            nodes.AddRange(entities.Select(x => GetSingleTreeNodeWithAccessCheck(x, id, queryStrings, userStartNodes, userStartNodePaths, ignoreUserStartNodes)).Where(x => x != null));
 
             // if the user does not have access to the root node, what we have is the start nodes,
             // but to provide some context we also need to add their topmost nodes when they are not
@@ -170,7 +194,7 @@ namespace Umbraco.Web.Trees
                 if (topNodeIds.Length > 0)
                 {
                     var topNodes = Services.EntityService.GetAll(UmbracoObjectType, topNodeIds.ToArray());
-                    nodes.AddRange(topNodes.Select(x => GetSingleTreeNodeWithAccessCheck(x, id, queryStrings)).Where(x => x != null));
+                    nodes.AddRange(topNodes.Select(x => GetSingleTreeNodeWithAccessCheck(x, id, queryStrings, userStartNodes, userStartNodePaths, ignoreUserStartNodes)).Where(x => x != null));
                 }
             }
 
@@ -482,5 +506,21 @@ namespace Umbraco.Web.Trees
         }
 
         private readonly ConcurrentDictionary<string, IUmbracoEntity> _entityCache = new ConcurrentDictionary<string, IUmbracoEntity>();
+
+        /// <summary>
+        /// If the request should allows a user to choose nodes that they normally don't have access to
+        /// </summary>
+        /// <param name="queryStrings"></param>
+        /// <returns></returns>
+        internal bool IgnoreUserStartNodes(FormDataCollection queryStrings)
+        {
+            var dataTypeId = queryStrings.GetValue<Guid?>(TreeQueryStringParameters.DataTypeId);
+            if (dataTypeId.HasValue)
+            {
+                return Services.DataTypeService.IsDataTypeIgnoringUserStartNodes(dataTypeId.Value);
+            }
+
+            return false;
+        }
     }
 }
diff --git a/src/Umbraco.Web/Trees/TreeControllerBase.cs b/src/Umbraco.Web/Trees/TreeControllerBase.cs
index 995cb031d0..8962a9ca10 100644
--- a/src/Umbraco.Web/Trees/TreeControllerBase.cs
+++ b/src/Umbraco.Web/Trees/TreeControllerBase.cs
@@ -350,22 +350,6 @@ namespace Umbraco.Web.Trees
             return queryStrings.GetValue<bool>(TreeQueryStringParameters.IsDialog);
         }
 
-        /// <summary>
-        /// If the request should allows a user to choose nodes that they normally don't have access to
-        /// </summary>
-        /// <param name="queryStrings"></param>
-        /// <returns></returns>
-        protected bool IgnoreUserStartNodes(FormDataCollection queryStrings)
-        {
-            var dataTypeId = queryStrings.GetValue<Guid?>(TreeQueryStringParameters.DataTypeId);
-            if (dataTypeId.HasValue)
-            {
-                return Services.DataTypeService.IsDataTypeIgnoringUserStartNodes(dataTypeId.Value);
-            }
-
-            return false;
-        }
-
         /// <summary>
         /// An event that allows developers to modify the tree node collection that is being rendered
         /// </summary>

From 1b83e0a87da3a5c5287d4253700fd2de9ac8e2bf Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 26 Jun 2019 13:49:45 +1000
Subject: [PATCH 039/776] cleanup

---
 .../src/common/resources/entity.resource.js     | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
index dce2cd8347..455fcab956 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
@@ -327,24 +327,13 @@ function entityResource($q, $http, umbRequestHelper) {
          *
          */
         getAncestors: function (id, type, options) {
-            var defaults = {
-                dataTypeId: null
-            };
-            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 args = [
                 { id: id },
                 { type: type }
             ];
-            if(options.dataTypeId){
-                args.push({dataTypeId: options.dataTypeId});
+            if (options.dataTypeId) {
+                args.push({ dataTypeId: options.dataTypeId });
             }
 
             return umbRequestHelper.resourcePromise(

From a55323176f02e2c93150152da30302582f07f933 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 26 Jun 2019 14:35:36 +1000
Subject: [PATCH 040/776] Updates EntityController to support passing in the
 dataTypeId for the GetChildren methods and updates the mediapicker to pass
 along that data

---
 .../src/common/resources/entity.resource.js   |  12 +-
 .../mediaPicker/mediapicker.controller.js     |   2 +-
 src/Umbraco.Web/Editors/EntityController.cs   | 126 +++++++++++++-----
 3 files changed, 103 insertions(+), 37 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
index 455fcab956..5e6f1095e4 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
@@ -358,14 +358,19 @@ function entityResource($q, $http, umbRequestHelper) {
          * @returns {Promise} resourcePromise object containing the entity.
          *
          */
-        getChildren: function (id, type) {
+        getChildren: function (id, type, options) {
+
+            var args = [{ id: id }, { type: type }];
+            if (options.dataTypeId) {
+                args.push({ dataTypeId: options.dataTypeId });
+            }
 
             return umbRequestHelper.resourcePromise(
                $http.get(
                    umbRequestHelper.getApiUrl(
                        "entityApiBaseUrl",
                        "GetChildren",
-                       [{ id: id }, { type: type }])),
+                       args)),
                'Failed to retrieve child data for id ' + id);
         },
 
@@ -433,7 +438,8 @@ function entityResource($q, $http, umbRequestHelper) {
                             pageSize: options.pageSize,
                             orderBy: options.orderBy,
                             orderDirection: options.orderDirection,
-                            filter: encodeURIComponent(options.filter)
+                            filter: encodeURIComponent(options.filter),
+                            dataTypeId: options.dataTypeId
                         }
                     )),
                 'Failed to retrieve child data for id ' + parentId);
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
index 400d3a7bb5..96354d7696 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
@@ -388,7 +388,7 @@ angular.module("umbraco")
 
             function getChildren(id) {
                 $scope.loading = true;
-                return entityResource.getChildren(id, "Media")
+                return entityResource.getChildren(id, "Media", $scope.searchOptions)
                     .then(function(data) {
 
                         for (i=0;i<data.length;i++){
diff --git a/src/Umbraco.Web/Editors/EntityController.cs b/src/Umbraco.Web/Editors/EntityController.cs
index ebdfe59210..029132c51b 100644
--- a/src/Umbraco.Web/Editors/EntityController.cs
+++ b/src/Umbraco.Web/Editors/EntityController.cs
@@ -31,7 +31,12 @@ namespace Umbraco.Web.Editors
     /// The API controller used for getting entity objects, basic name, icon, id representation of umbraco objects that are based on CMSNode
     /// </summary>
     /// <remarks>
-    /// Some objects such as macros are not based on CMSNode
+    /// <para>
+    /// This controller allows resolving basic entity data for various entities without placing the hard restrictions on users that may not have access
+    /// to the sections these entities entities exist in. This is to allow pickers, etc... of data to work for all users. In some cases such as accessing
+    /// Members, more explicit security checks are done.
+    /// </para>
+    /// <para>Some objects such as macros are not based on CMSNode</para>
     /// </remarks>
     [EntityControllerConfiguration]
     [PluginController("UmbracoApi")]
@@ -88,8 +93,7 @@ namespace Umbraco.Web.Editors
         [HttpGet]
         public IEnumerable<EntityBasic> Search(string query, UmbracoEntityTypes type, string searchFrom = null, Guid? dataTypeId = null)
         {
-            //TODO: Should we restrict search results based on what app the user has access to?
-            // - Theoretically you shouldn't be able to see member data if you don't have access to members right?
+            // NOTE: Theoretically you shouldn't be able to see member data if you don't have access to members right? ... but there is a member picker, so can't really do that
 
             if (string.IsNullOrEmpty(query))
                 return Enumerable.Empty<EntityBasic>();
@@ -195,6 +199,9 @@ namespace Umbraco.Web.Editors
         /// <param name="id">Int id of the entity to fetch URL for</param>
         /// <param name="type">The tpye of entity such as Document, Media, Member</param>
         /// <returns>The URL or path to the item</returns>
+        /// <remarks>
+        /// We are not restricting this with security because there is no sensitive data
+        /// </remarks>
         public HttpResponseMessage GetUrl(int id, UmbracoEntityTypes type)
         {
             var returnUrl = string.Empty;
@@ -428,9 +435,52 @@ namespace Umbraco.Web.Editors
             return GetResultForKeys(ids, type);
         }
 
-        public IEnumerable<EntityBasic> GetChildren(int id, UmbracoEntityTypes type)
+        public IEnumerable<EntityBasic> GetChildren(int id, UmbracoEntityTypes type, Guid? dataTypeId = null)
         {
-            return GetResultForChildren(id, type);
+            var objectType = ConvertToObjectType(type);
+            if (objectType.HasValue)
+            {
+                //TODO: Need to check for Object types that support hierarchy here, some might not.
+
+                int[] startNodes = null;
+                switch (type)
+                {
+                    case UmbracoEntityTypes.Document:
+                        startNodes = Security.CurrentUser.CalculateContentStartNodeIds(Services.EntityService);
+                        break;
+                    case UmbracoEntityTypes.Media:
+                        startNodes = Security.CurrentUser.CalculateMediaStartNodeIds(Services.EntityService);
+                        break;
+                }
+
+                var ignoreUserStartNodes = IsDataTypeIgnoringUserStartNodes(dataTypeId);
+
+                // root is special: we reduce it to start nodes if the user's start node is not the default, then we need to return their start nodes
+                if (id == Constants.System.Root && startNodes.Length > 0 && startNodes.Contains(Constants.System.Root) == false && !ignoreUserStartNodes)
+                {
+                    var nodes = Services.EntityService.GetAll(objectType.Value, startNodes).ToArray();
+                    if (nodes.Length == 0)
+                        return Enumerable.Empty<EntityBasic>();
+                    var pr = new List<EntityBasic>(nodes.Select(Mapper.Map<EntityBasic>));
+                    return pr;
+                }
+
+                // else proceed as usual
+
+                return Services.EntityService.GetChildren(id, objectType.Value)
+                    .WhereNotNull()
+                    .Select(Mapper.Map<EntityBasic>);
+            }
+            //now we need to convert the unknown ones
+            switch (type)
+            {
+                case UmbracoEntityTypes.Domain:
+                case UmbracoEntityTypes.Language:
+                case UmbracoEntityTypes.User:
+                case UmbracoEntityTypes.Macro:
+                default:
+                    throw new NotSupportedException("The " + typeof(EntityController) + " does not currently support data for the type " + type);
+            }
         }
 
         /// <summary>
@@ -451,7 +501,8 @@ namespace Umbraco.Web.Editors
             int pageSize,
             string orderBy = "SortOrder",
             Direction orderDirection = Direction.Ascending,
-            string filter = "")
+            string filter = "",
+            Guid? dataTypeId = null)
         {
             int intId;
 
@@ -480,7 +531,7 @@ namespace Umbraco.Web.Editors
                 //the EntityService can search paged members from the root
 
                 intId = -1;
-                return GetPagedChildren(intId, type, pageNumber, pageSize, orderBy, orderDirection, filter);
+                return GetPagedChildren(intId, type, pageNumber, pageSize, orderBy, orderDirection, filter, dataTypeId);
             }
 
             //the EntityService cannot search members of a certain type, this is currently not supported and would require
@@ -513,7 +564,8 @@ namespace Umbraco.Web.Editors
             int pageSize,
             string orderBy = "SortOrder",
             Direction orderDirection = Direction.Ascending,
-            string filter = "")
+            string filter = "",
+            Guid? dataTypeId = null)
         {
             if (pageNumber <= 0)
                 throw new HttpResponseException(HttpStatusCode.NotFound);
@@ -523,8 +575,40 @@ namespace Umbraco.Web.Editors
             var objectType = ConvertToObjectType(type);
             if (objectType.HasValue)
             {
+                IEnumerable<IUmbracoEntity> entities;
                 long totalRecords;
-                var entities = Services.EntityService.GetPagedChildren(id, objectType.Value, pageNumber - 1, pageSize, out totalRecords, orderBy, orderDirection, filter);
+
+                int[] startNodes = null;
+                switch (type)
+                {
+                    case UmbracoEntityTypes.Document:
+                        startNodes = Security.CurrentUser.CalculateContentStartNodeIds(Services.EntityService);
+                        break;
+                    case UmbracoEntityTypes.Media:
+                        startNodes = Security.CurrentUser.CalculateMediaStartNodeIds(Services.EntityService);
+                        break;
+                }
+
+                var ignoreUserStartNodes = IsDataTypeIgnoringUserStartNodes(dataTypeId);
+
+                // root is special: we reduce it to start nodes if the user's start node is not the default, then we need to return their start nodes
+                if (id == Constants.System.Root && startNodes.Length > 0 && startNodes.Contains(Constants.System.Root) == false && !ignoreUserStartNodes)
+                {
+                    if (pageNumber > 0)
+                        return new PagedResult<EntityBasic>(0, 0, 0);
+                    var nodes = Services.EntityService.GetAll(objectType.Value, startNodes).ToArray();
+                    if (nodes.Length == 0)
+                        return new PagedResult<EntityBasic>(0, 0, 0);
+                    if (pageSize < nodes.Length) pageSize = nodes.Length; // bah
+                    var pr = new PagedResult<EntityBasic>(nodes.Length, pageNumber, pageSize)
+                    {
+                        Items = nodes.Select(Mapper.Map<EntityBasic>)
+                    };
+                    return pr;
+                }
+
+                // else proceed as usual
+                entities = Services.EntityService.GetPagedChildren(id, objectType.Value, pageNumber - 1, pageSize, out totalRecords, orderBy, orderDirection, filter);
 
                 if (totalRecords == 0)
                 {
@@ -653,30 +737,6 @@ namespace Umbraco.Web.Editors
             return _treeSearcher.ExamineSearch(Umbraco, query, entityType, 200, 0, out total, searchFrom, ignoreUserStartNodes);
         }
 
-
-        private IEnumerable<EntityBasic> GetResultForChildren(int id, UmbracoEntityTypes entityType)
-        {
-            var objectType = ConvertToObjectType(entityType);
-            if (objectType.HasValue)
-            {
-                //TODO: Need to check for Object types that support hierarchic here, some might not.
-
-                return Services.EntityService.GetChildren(id, objectType.Value)
-                    .WhereNotNull()
-                    .Select(Mapper.Map<EntityBasic>);
-            }
-            //now we need to convert the unknown ones
-            switch (entityType)
-            {
-                case UmbracoEntityTypes.Domain:
-                case UmbracoEntityTypes.Language:
-                case UmbracoEntityTypes.User:
-                case UmbracoEntityTypes.Macro:
-                default:
-                    throw new NotSupportedException("The " + typeof(EntityController) + " does not currently support data for the type " + entityType);
-            }
-        }
-
         private IEnumerable<EntityBasic> GetResultForAncestors(int id, UmbracoEntityTypes entityType, Guid? dataTypeId = null)
         {
             var objectType = ConvertToObjectType(entityType);

From e7a30d0a5dacad7e821714bc2376cdf7f438144b Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 26 Jun 2019 07:39:34 +0200
Subject: [PATCH 041/776] 
 https://umbraco.visualstudio.com/D-Team%20Tracker/_workitems/edit/1085 -
 Fixes for gulp build

---
 .../src/common/resources/entity.resource.js                 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
index 5e6f1095e4..c85a85bb57 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
@@ -327,12 +327,12 @@ function entityResource($q, $http, umbRequestHelper) {
          *
          */
         getAncestors: function (id, type, options) {
-           
+
             var args = [
                 { id: id },
                 { type: type }
             ];
-            if (options.dataTypeId) {
+            if (options && options.dataTypeId) {
                 args.push({ dataTypeId: options.dataTypeId });
             }
 
@@ -361,7 +361,7 @@ function entityResource($q, $http, umbRequestHelper) {
         getChildren: function (id, type, options) {
 
             var args = [{ id: id }, { type: type }];
-            if (options.dataTypeId) {
+            if (options && options.dataTypeId) {
                 args.push({ dataTypeId: options.dataTypeId });
             }
 

From 571a3bc257d3289d0853cd400b799b0d2c21fa40 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 26 Jun 2019 16:48:39 +1000
Subject: [PATCH 042/776] fixes test

---
 src/Umbraco.Tests/Plugins/PluginManagerTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Tests/Plugins/PluginManagerTests.cs b/src/Umbraco.Tests/Plugins/PluginManagerTests.cs
index ef2c61f6b2..94f56ba6e7 100644
--- a/src/Umbraco.Tests/Plugins/PluginManagerTests.cs
+++ b/src/Umbraco.Tests/Plugins/PluginManagerTests.cs
@@ -327,7 +327,7 @@ AnotherContentFinder
         public void Resolves_RestExtensions()
         {
             var types = _manager.ResolveRestExtensions();
-            Assert.AreEqual(3, types.Count());
+            Assert.AreEqual(2, types.Count());
         }
 
         [Test]

From 8033931e3163329a3d841d72364079aa62153a9a Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 26 Jun 2019 09:58:01 +0200
Subject: [PATCH 043/776] 
 https://umbraco.visualstudio.com/D-Team%20Tracker/_workitems/edit/1085 -
 Fixed merge conflict

---
 src/Umbraco.Web/Umbraco.Web.csproj | 6076 +++++++++-------------------
 1 file changed, 2025 insertions(+), 4051 deletions(-)

diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 6174fbb511..0b601f8f94 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -1,4054 +1,2028 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{651E1350-91B6-44B7-BD60-7207006D7003}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>umbraco</AssemblyName>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Umbraco.Web</RootNamespace>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <StartupObject>
-    </StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <SccProjectName>
-    </SccProjectName>
-    <SccLocalPath>
-    </SccLocalPath>
-    <SccAuxPath>
-    </SccAuxPath>
-    <SccProvider>
-    </SccProvider>
-    <OldToolsVersion>4.0</OldToolsVersion>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <TargetFrameworkProfile />
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>bin\Debug\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>bin\Release\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>bin\Release\umbraco.xml</DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>pdbonly</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\UmbracoExamine\UmbracoExamine.csproj">
-      <Project>{07fbc26b-2927-4a22-8d96-d644c667fecc}</Project>
-      <Name>UmbracoExamine</Name>
-    </ProjectReference>
-    <Reference Include="AutoMapper, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
-      <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="AutoMapper.Net4, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
-      <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <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="dotless.Core, Version=1.5.2.0, Culture=neutral, PublicKeyToken=96b446c9e63eae34, processorArchitecture=MSIL">
-      <HintPath>..\packages\dotless.1.5.2\lib\dotless.Core.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="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="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>
-    <Reference Include="Lucene.Net, Version=2.9.4.1, Culture=neutral, PublicKeyToken=85089178b9ac3181, processorArchitecture=MSIL">
-      <HintPath>..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll</HintPath>
-    </Reference>
-    <Reference Include="MarkdownSharp, Version=1.14.5.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Markdown.1.14.7\lib\net45\MarkdownSharp.dll</HintPath>
-      <Private>True</Private>
-    </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.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.2\lib\net45\Microsoft.AspNet.Identity.Owin.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.AspNet.SignalR.Core, Version=2.4.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.SignalR.Core.2.4.1\lib\net45\Microsoft.AspNet.SignalR.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.CSharp" />
-    <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.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.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=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=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="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>
-      <Private>True</Private>
-    </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>
-      <Private>True</Private>
-    </Reference>
-    <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>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Semver, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\semver.1.1.2\lib\net451\Semver.dll</HintPath>
-    </Reference>
-    <Reference Include="System">
-      <Name>System</Name>
-    </Reference>
-    <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.configuration" />
-    <Reference Include="System.Data">
-      <Name>System.Data</Name>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Design" />
-    <Reference Include="System.Drawing">
-      <Name>System.Drawing</Name>
-    </Reference>
-    <Reference Include="System.EnterpriseServices" />
-    <Reference Include="System.IO.Compression.FileSystem" />
-    <Reference Include="System.Net.Http" />
-    <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.Runtime.Serialization" />
-    <Reference Include="System.Security" />
-    <Reference Include="System.ServiceModel" />
-    <Reference Include="System.Threading.Tasks.Dataflow, Version=4.6.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Threading.Tasks.Dataflow.4.9.0\lib\portable-net45+win8+wpa81\System.Threading.Tasks.Dataflow.dll</HintPath>
-    </Reference>
-    <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.Abstractions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Web.ApplicationServices" />
-    <Reference Include="System.Web.DynamicData" />
-    <Reference Include="System.Web.Entity" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Web.Extensions.Design" />
-    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
-    </Reference>
-    <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.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.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.7\lib\net45\System.Web.Razor.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Services">
-      <Name>System.Web.Services</Name>
-    </Reference>
-    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <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.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.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml">
-      <Name>System.XML</Name>
-    </Reference>
-    <Reference Include="System.Xml.Linq" />
-    <ProjectReference Include="..\SQLCE4Umbraco\SqlCE4Umbraco.csproj">
-      <Project>{5BA5425F-27A7-4677-865E-82246498AA2E}</Project>
-      <Name>SqlCE4Umbraco</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj">
-      <Project>{31785BC3-256C-4613-B2F5-A1B0BDDED8C1}</Project>
-      <Name>Umbraco.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\umbraco.controls\umbraco.controls.csproj">
-      <Project>{6EDD2061-82F2-461B-BB6E-879245A832DE}</Project>
-      <Name>umbraco.controls</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\umbraco.businesslogic\umbraco.businesslogic.csproj">
-      <Name>umbraco.businesslogic</Name>
-      <Project>{E469A9CE-1BEC-423F-AC44-713CD72457EA}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-    </ProjectReference>
-    <ProjectReference Include="..\umbraco.cms\umbraco.cms.csproj">
-      <Project>{CCD75EC3-63DB-4184-B49D-51C1DD337230}</Project>
-      <Name>umbraco.cms</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\umbraco.datalayer\umbraco.datalayer.csproj">
-      <Project>{C7CB79F0-1C97-4B33-BFA7-00731B579AE2}</Project>
-      <Name>umbraco.datalayer</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\umbraco.interfaces\umbraco.interfaces.csproj">
-      <Name>umbraco.interfaces</Name>
-      <Project>{511F6D8D-7717-440A-9A57-A507E9A8B27F}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-    </ProjectReference>
-    <ProjectReference Include="..\umbraco.providers\umbraco.providers.csproj">
-      <Project>{D7636876-0756-43CB-A192-138C6F0D5E42}</Project>
-      <Name>umbraco.providers</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\SolutionInfo.cs">
-      <Link>Properties\SolutionInfo.cs</Link>
-    </Compile>
-    <Compile Include="ApplicationContextExtensions.cs" />
-    <Compile Include="AreaRegistrationContextExtensions.cs" />
-    <Compile Include="BatchedDatabaseServerMessengerStartup.cs" />
-    <Compile Include="Cache\ApplicationCacheRefresher.cs" />
-    <Compile Include="Cache\ApplicationTreeCacheRefresher.cs" />
-    <Compile Include="Cache\CacheRefresherEventHandler.cs" />
-    <Compile Include="Cache\ContentTypeCacheRefresher.cs" />
-    <Compile Include="Cache\DataTypeCacheRefresher.cs" />
-    <Compile Include="Cache\DictionaryCacheRefresher.cs" />
-    <Compile Include="Cache\DistributedCache.cs" />
-    <Compile Include="Cache\DistributedCacheExtensions.cs" />
-    <Compile Include="Cache\DomainCacheRefresher.cs" />
-    <Compile Include="Cache\LanguageCacheRefresher.cs" />
-    <Compile Include="Cache\MacroCacheRefresher.cs" />
-    <Compile Include="Cache\MediaCacheRefresher.cs" />
-    <Compile Include="Cache\MemberCacheRefresher.cs" />
-    <Compile Include="Cache\MemberGroupCacheRefresher.cs" />
-    <Compile Include="Cache\PageCacheRefresher.cs" />
-    <Compile Include="Cache\PublicAccessCacheRefresher.cs" />
-    <Compile Include="Cache\RelationTypeCacheRefresher.cs" />
-    <Compile Include="Cache\UserGroupCacheRefresher.cs" />
-    <Compile Include="Cache\StylesheetCacheRefresher.cs" />
-    <Compile Include="Cache\StylesheetPropertyCacheRefresher.cs" />
-    <Compile Include="Cache\TemplateCacheRefresher.cs" />
-    <Compile Include="Cache\UnpublishedPageCacheRefresher.cs" />
-    <Compile Include="Cache\UserCacheRefresher.cs" />
-    <Compile Include="Security\UmbracoAntiForgeryAdditionalDataProvider.cs" />
-    <Compile Include="Editors\PreviewController.cs" />
-    <Compile Include="Editors\BackOfficeAssetsController.cs" />
-    <Compile Include="Features\DisabledFeatures.cs" />
-    <Compile Include="Editors\BackOfficeNotificationsController.cs" />
-    <Compile Include="Editors\DictionaryController.cs" />
-    <Compile Include="Editors\BackOfficeServerVariables.cs" />
-    <Compile Include="Editors\DashboardHelper.cs" />
-    <Compile Include="Editors\EditorModelEventArgs.cs" />
-    <Compile Include="Editors\EditorValidationResolver.cs" />
-    <Compile Include="Editors\EditorValidator.cs" />
-    <Compile Include="Editors\FromJsonPathAttribute.cs" />
-    <Compile Include="Editors\HelpController.cs" />
-    <Compile Include="Editors\IsCurrentUserModelFilterAttribute.cs" />
-    <Compile Include="Editors\PasswordChanger.cs" />
-    <Compile Include="Editors\TemplateController.cs" />
-    <Compile Include="Editors\ParameterSwapControllerActionSelector.cs" />
-    <Compile Include="Editors\CodeFileController.cs" />
-    <Compile Include="Editors\TourController.cs" />
-    <Compile Include="Features\EnabledFeatures.cs" />
-    <Compile Include="HealthCheck\Checks\Services\Tls12Check.cs" />
-    <Compile Include="HealthCheck\Checks\Security\XssProtectionCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Security\HstsCheck.cs" />
-    <Compile Include="Models\BackOfficeTourFilter.cs" />
-    <Compile Include="Models\ContentEditing\BackOfficePreview.cs" />
-    <Compile Include="Models\ContentEditing\DocumentTypeCollectionDisplay.cs" />
-    <Compile Include="Models\ContentEditing\NotifySetting.cs" />
-    <Compile Include="Models\Mapping\AutoMapperExtensions.cs" />
-    <Compile Include="Models\Mapping\ContentTreeNodeUrlResolver.cs" />
-    <Compile Include="Models\Mapping\MemberTreeNodeUrlResolver.cs" />
-    <Compile Include="Models\Trees\ExportMember.cs" />
-    <Compile Include="PropertyEditors\DropdownFlexiblePropertyEditor.cs" />
-    <Compile Include="TourFilterResolver.cs" />
-    <Compile Include="Editors\UserEditorAuthorizationHelper.cs" />
-    <Compile Include="Editors\UserGroupAuthorizationAttribute.cs" />
-    <Compile Include="Editors\UserGroupEditorAuthorizationHelper.cs" />
-    <Compile Include="Editors\UserGroupsController.cs" />
-    <Compile Include="Editors\UserGroupValidateAttribute.cs" />
-    <Compile Include="ExamineStartup.cs" />
-    <Compile Include="Extensions\UdiExtensions.cs" />
-    <Compile Include="Features\UmbracoFeatures.cs" />
-    <Compile Include="Features\FeaturesResolver.cs" />
-    <Compile Include="HealthCheck\Checks\Config\AbstractConfigCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Config\AcceptableConfiguration.cs" />
-    <Compile Include="HealthCheck\Checks\Config\ConfigurationService.cs" />
-    <Compile Include="HealthCheck\Checks\Config\ConfigurationServiceResult.cs" />
-    <Compile Include="HealthCheck\Checks\Config\MacroErrorsCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Config\NotificationEmailCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Config\TrySkipIisCustomErrorsCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Config\CustomErrorsCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Config\TraceCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Config\ValueComparisonType.cs" />
-    <Compile Include="HealthCheck\Checks\Config\CompilationDebugCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Security\BaseHttpHeaderCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Security\NoSniffCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Services\SmtpCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Permissions\FolderAndFilePermissionsCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Security\ExcessiveHeadersCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Security\ClickJackingCheck.cs" />
-    <Compile Include="HealthCheck\HealthCheckAction.cs" />
-    <Compile Include="HealthCheck\HealthCheckNotificationMethodAttribute.cs" />
-    <Compile Include="HealthCheck\HealthCheckAttribute.cs" />
-    <Compile Include="HealthCheck\HealthCheckContext.cs" />
-    <Compile Include="HealthCheck\HealthCheckController.cs" />
-    <Compile Include="HealthCheck\HealthCheckGroup.cs" />
-    <Compile Include="HealthCheck\HealthCheckNotificationMethodResolver.cs" />
-    <Compile Include="HealthCheck\HealthCheckResolver.cs" />
-    <Compile Include="HealthCheck\HealthCheck.cs" />
-    <Compile Include="HealthCheck\HealthCheckResults.cs" />
-    <Compile Include="HealthCheck\HealthCheckStatus.cs" />
-    <Compile Include="HealthCheck\Checks\Security\HttpsCheck.cs" />
-    <Compile Include="HealthCheck\IHealthCheckResolver.cs" />
-    <Compile Include="HealthCheck\IHealthCheckNotificationMethodsResolver.cs" />
-    <Compile Include="HealthCheck\NotificationMethods\NotificationMethodBase.cs" />
-    <Compile Include="HealthCheck\NotificationMethods\EmailNotificationMethod.cs" />
-    <Compile Include="HealthCheck\NotificationMethods\IHealthCheckNotificatationMethod.cs" />
-    <Compile Include="HealthCheck\StatusResultType.cs" />
-    <Compile Include="HealthCheck\Checks\DataIntegrity\XmlDataIntegrityHealthCheck.cs" />
-    <Compile Include="IHttpContextAccessor.cs" />
-    <Compile Include="Install\InstallSteps\ConfigureMachineKey.cs" />
-    <Compile Include="Models\BackOfficeTourFile.cs" />
-    <Compile Include="Models\BackOfficeTourStep.cs" />
-    <Compile Include="Models\ContentEditing\AssignedContentPermissions.cs" />
-    <Compile Include="Models\ContentEditing\AssignedUserGroupPermissions.cs" />
-    <Compile Include="Models\ContentEditing\ContentRedirectUrl.cs" />
-    <Compile Include="Models\ContentEditing\DictionaryDisplay.cs" />
-    <Compile Include="Models\ContentEditing\DictionaryOverviewDisplay.cs" />
-    <Compile Include="Models\ContentEditing\DictionarySave.cs" />
-    <Compile Include="Models\ContentEditing\DictionaryOverviewTranslationDisplay.cs" />
-    <Compile Include="Models\ContentEditing\DictionaryTranslationSave.cs" />
-    <Compile Include="Models\ContentEditing\EditorNavigation.cs" />
-    <Compile Include="Models\ContentEditing\GetAvailableCompositionsFilter.cs" />
-    <Compile Include="Editors\IEditorValidator.cs" />
-    <Compile Include="Editors\EditorModelEventManager.cs" />
-    <Compile Include="HtmlHelperBackOfficeExtensions.cs" />
-    <Compile Include="Install\InstallSteps\Version73FileCleanup.cs" />
-    <Compile Include="Models\ContentEditing\DocumentTypeDisplay.cs" />
-    <Compile Include="Media\EmbedProviders\Flickr.cs" />
-    <Compile Include="Models\ContentEditing\ContentTypeCompositionDisplay.cs" />
-    <Compile Include="Models\ContentEditing\ContentTypeSave.cs" />
-    <Compile Include="Models\ContentEditing\DocumentTypeSave.cs" />
-    <Compile Include="Models\ContentEditing\InstalledPackageModel.cs" />
-    <Compile Include="Models\ContentEditing\LinkDisplay.cs" />
-    <Compile Include="Models\ContentEditing\MediaTypeDisplay.cs" />
-    <Compile Include="Models\ContentEditing\MediaTypeSave.cs" />
-    <Compile Include="Models\ContentEditing\MemberPropertyTypeBasic.cs" />
-    <Compile Include="Models\ContentEditing\MemberPropertyTypeDisplay.cs" />
-    <Compile Include="Models\ContentEditing\MemberTypeDisplay.cs" />
-    <Compile Include="Models\ContentEditing\MemberTypeSave.cs" />
-    <Compile Include="Models\ContentEditing\Permission.cs" />
-    <Compile Include="Models\ContentEditing\PostedFiles.cs" />
-    <Compile Include="Models\ContentEditing\PostedFolder.cs" />
-    <Compile Include="Models\ContentEditing\PropertyGroupBasic.cs" />
-    <Compile Include="Models\ContentEditing\PropertyTypeBasic.cs" />
-    <Compile Include="Models\ContentEditing\SimpleNotificationModel.cs" />
-    <Compile Include="Models\ContentEditing\SnippetDisplay.cs" />
-    <Compile Include="Models\ContentEditing\TemplateDisplay.cs" />
-    <Compile Include="Models\ContentEditing\DictionaryTranslationDisplay.cs" />
-    <Compile Include="Models\ContentEditing\UserDisplay.cs" />
-    <Compile Include="Models\ContentEditing\UserBasic.cs" />
-    <Compile Include="Models\ContentEditing\UserGroupBasic.cs" />
-    <Compile Include="Models\ContentEditing\UserGroupDisplay.cs" />
-    <Compile Include="Models\ContentEditing\UserGroupPermissionsSave.cs" />
-    <Compile Include="Models\ContentEditing\UserGroupSave.cs" />
-    <Compile Include="Models\DetachedPublishedContent.cs" />
-    <Compile Include="Models\DetachedPublishedProperty.cs" />
-    <Compile Include="Models\ContentEditing\UserInvite.cs" />
-    <Compile Include="Models\ContentEditing\UserSave.cs" />
-    <Compile Include="Models\Link.cs" />
-    <Compile Include="Models\LinkType.cs" />
-    <Compile Include="Models\LocalPackageInstallModel.cs" />
-    <Compile Include="Models\Mapping\CodeFileDisplayMapper.cs" />
-    <Compile Include="Models\Mapping\ContentTypeModelMapperExtensions.cs" />
-    <Compile Include="Models\Mapping\ContentTypeUdiResolver.cs" />
-    <Compile Include="Models\Mapping\DictionaryModelMapper.cs" />
-    <Compile Include="Models\Mapping\EntityModelMapperExtensions.cs" />
-    <Compile Include="Models\Mapping\LockedCompositionsResolver.cs" />
-    <Compile Include="Models\Mapping\UserGroupDefaultPermissionsResolver.cs" />
-    <Compile Include="Models\Mapping\PropertyGroupDisplayResolver.cs" />
-    <Compile Include="Models\RelatedLink.cs" />
-    <Compile Include="Models\Mapping\TemplateModelMapper.cs" />
-    <Compile Include="Models\PackageInstallResult.cs" />
-    <Compile Include="Models\RelatedLinkBase.cs" />
-    <Compile Include="Models\ContentEditing\CodeFileDisplay.cs" />
-    <Compile Include="Models\SendCodeViewModel.cs" />
-    <Compile Include="Models\RelatedLinks.cs" />
-    <Compile Include="Models\RelatedLinkType.cs" />
-    <Compile Include="Models\SetPasswordModel.cs" />
-    <Compile Include="Models\RequestPasswordResetModel.cs" />
-    <Compile Include="Models\PublishedContentWithKeyBase.cs" />
-    <Compile Include="Models\BackOfficeTour.cs" />
-    <Compile Include="Models\UserTourStatus.cs" />
-    <Compile Include="Models\ValidatePasswordResetCodeModel.cs" />
-    <Compile Include="Mvc\ControllerContextExtensions.cs" />
-    <Compile Include="Mvc\DisableBrowserCacheAttribute.cs" />
-    <Compile Include="Mvc\EnsurePartialViewMacroViewContextFilterAttribute.cs" />
-    <Compile Include="Mvc\IRenderController.cs" />
-    <Compile Include="Mvc\ModelBindingException.cs" />
-    <Compile Include="Mvc\RenderIndexActionSelectorAttribute.cs" />
-    <Compile Include="Mvc\UmbracoRequireHttpsAttribute.cs" />
-    <Compile Include="Mvc\ValidateMvcAngularAntiForgeryTokenAttribute.cs" />
-    <Compile Include="OwinMiddlewareConfiguredEventArgs.cs" />
-    <Compile Include="Profiling\WebProfilerProvider.cs" />
-    <Compile Include="Profiling\WebProfiler.cs" />
-    <Compile Include="PropertyEditors\ContentPicker2PropertyEditor.cs" />
-    <Compile Include="PropertyEditors\DatePreValueEditor.cs" />
-    <Compile Include="PropertyEditors\DateTimePreValueEditor.cs" />
-    <Compile Include="PropertyEditors\DecimalPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MediaPicker2PropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MemberPicker2PropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MultiNodeTreePicker2PropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MultiUrlPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\NestedContentController.cs" />
-    <Compile Include="PropertyEditors\NestedContentHelper.cs" />
-    <Compile Include="PropertyEditors\NestedContentPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\RelatedLinks2PropertyEditor.cs" />
-    <Compile Include="PropertyEditors\TextOnlyValueEditor.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\ContentPickerPropertyConverter.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\MultipleContentPickerParameterEditor.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\ImageCropDataSetConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\ImageCropperValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\LegacyRelatedLinksEditorValueConvertor.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\MediaPickerPropertyConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\MemberPickerPropertyConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\MultiNodeTreePickerPropertyConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\LegacyMediaPickerPropertyConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\MultiUrlPickerPropertyConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\NestedContentSingleValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\NestedContentManyValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\NestedContentPublishedPropertyTypeExtensions.cs" />
-    <Compile Include="PublishedContentQueryExtensions.cs" />
-    <Compile Include="Routing\RedirectTrackingEventHandler.cs" />
-    <Compile Include="Editors\RedirectUrlManagementController.cs" />
-    <Compile Include="Models\ContentEditing\RedirectUrlSearchResults.cs" />
-    <Compile Include="RelatedLinksTypeConverter.cs" />
-    <Compile Include="RouteDataExtensions.cs" />
-    <Compile Include="Routing\ContentFinderByRedirectUrl.cs" />
-    <Compile Include="Scheduling\HealthCheckNotifier.cs" />
-    <Compile Include="Scheduling\LatchedBackgroundTaskBase.cs" />
-    <Compile Include="Search\SearchableApplicationTree.cs" />
-    <Compile Include="Search\SearchableTreeAttribute.cs" />
-    <Compile Include="Search\SearchableTreeCollection.cs" />
-    <Compile Include="Search\SearchableTreeResolver.cs" />
-    <Compile Include="Search\UmbracoTreeSearcher.cs" />
-    <Compile Include="Security\Identity\ExternalSignInAutoLinkOptions.cs" />
-    <Compile Include="Security\Identity\FixWindowsAuthMiddlware.cs" />
-    <Compile Include="Security\Identity\ForceRenewalCookieAuthenticationHandler.cs" />
-    <Compile Include="Security\Identity\ForceRenewalCookieAuthenticationMiddleware.cs" />
-    <Compile Include="Security\Identity\GetUserSecondsMiddleWare.cs" />
-    <Compile Include="Models\ContentEditing\PropertyTypeDisplay.cs" />
-    <Compile Include="Models\ContentEditing\PropertyGroupDisplay.cs" />
-    <Compile Include="Media\EmbedProviders\OEmbedJson.cs" />
-    <Compile Include="Media\EmbedProviders\OEmbedResponse.cs" />
-    <Compile Include="Media\EmbedProviders\OEmbedPhoto.cs" />
-    <Compile Include="Security\Identity\IUmbracoBackOfficeTwoFactorOptions.cs" />
-    <Compile Include="Models\Mapping\PropertyTypeGroupResolver.cs" />
-    <Compile Include="Security\Identity\PreviewAuthenticationMiddleware.cs" />
-    <Compile Include="SingletonHttpContextAccessor.cs" />
-    <Compile Include="Trees\DictionaryTreeController.cs" />
-    <Compile Include="Trees\MacroTreeController.cs" />
-    <Compile Include="Trees\UserTreeController.cs" />
-    <Compile Include="Suspendable.cs" />
-    <Compile Include="Trees\ContentBlueprintTreeController.cs" />
-    <Compile Include="Trees\ContentTypeTreeController.cs" />
-    <Compile Include="Trees\PackagesTreeController.cs" />
-    <Compile Include="Trees\MediaTypeTreeController.cs" />
-    <Compile Include="Trees\MemberTypeTreeController.cs" />
-    <Compile Include="Security\WebAuthExtensions.cs" />
-    <Compile Include="Trees\XsltTreeController.cs" />
-    <Compile Include="umbraco.presentation\SafeXmlReaderWriter.cs" />
-    <Compile Include="Trees\ScriptTreeController.cs" />
-    <Compile Include="umbraco.presentation\umbraco\developer\Packages\installer.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="UmbracoDefaultOwinStartup.cs" />
-    <Compile Include="IUmbracoContextAccessor.cs" />
-    <Compile Include="Models\ContentEditing\Relation.cs" />
-    <Compile Include="HtmlStringUtilities.cs" />
-    <Compile Include="Models\ContentEditing\RelationType.cs" />
-    <Compile Include="Models\ContentExtensions.cs" />
-    <Compile Include="IDynamicPublishedContentQuery.cs" />
-    <Compile Include="ITagQuery.cs" />
-    <Compile Include="ITypedPublishedContentQuery.cs" />
-    <Compile Include="IUmbracoComponentRenderer.cs" />
-    <Compile Include="Models\LegacyConvertedNode.cs" />
-    <Compile Include="Models\LegacyConvertedNodeProperty.cs" />
-    <Compile Include="Models\Mapping\RelationModelMapper.cs" />
-    <Compile Include="Mvc\DisableClientCacheAttribute.cs" />
-    <Compile Include="Models\UnLinkLoginModel.cs" />
-    <Compile Include="Mvc\MvcVersionCheck.cs" />
-    <Compile Include="Mvc\ReflectedFixedRazorViewEngine.cs" />
-    <Compile Include="Scheduling\ThreadingTaskImmutable.cs" />
-    <Compile Include="Mvc\ProfilingView.cs" />
-    <Compile Include="Mvc\ProfilingViewEngine.cs" />
-    <Compile Include="Mvc\UrlHelperExtensions.cs" />
-    <Compile Include="Scheduling\BackgroundTaskRunner.cs" />
-    <Compile Include="BatchedDatabaseServerMessenger.cs" />
-    <Compile Include="BatchedWebServiceServerMessenger.cs" />
-    <Compile Include="CacheHelperExtensions.cs" />
-    <Compile Include="Cache\UserGroupPermissionsCacheRefresher.cs" />
-    <Compile Include="Editors\AuthenticationController.cs" />
-    <Compile Include="Controllers\UmbProfileController.cs" />
-    <Compile Include="Editors\ContentController.cs" />
-    <Compile Include="Controllers\UmbLoginStatusController.cs" />
-    <Compile Include="Editors\ContentPostValidateAttribute.cs" />
-    <Compile Include="Editors\ContentTypeControllerBase.cs" />
-    <Compile Include="Editors\DashboardController.cs" />
-    <Compile Include="Editors\DashboardSecurity.cs" />
-    <Compile Include="Editors\DataTypeController.cs" />
-    <Compile Include="Editors\DataTypeValidateAttribute.cs" />
-    <Compile Include="Editors\EntityControllerConfigurationAttribute.cs" />
-    <Compile Include="Editors\ImagesController.cs" />
-    <Compile Include="Editors\PackageInstallController.cs" />
-    <Compile Include="Editors\RelationController.cs" />
-    <Compile Include="Editors\CanvasDesignerController.cs" />
-    <Compile Include="Editors\UsersController.cs" />
-    <Compile Include="GridTemplateExtensions.cs" />
-    <Compile Include="Models\PackageInstallModel.cs" />
-    <Compile Include="Models\ContentEditing\DataTypeBasic.cs" />
-    <Compile Include="Models\ContentEditing\MemberBasic.cs" />
-    <Compile Include="Models\ContentEditing\MemberListDisplay.cs" />
-    <Compile Include="Models\TemplateQuery\ContentTypeModel.cs" />
-    <Compile Include="Models\TemplateQuery\PropertyModel.cs" />
-    <Compile Include="Models\TemplateQuery\SourceModel.cs" />
-    <Compile Include="Models\TemplateQuery\TemplateQueryResult.cs" />
-    <Compile Include="Models\TemplateQuery\SortExpression.cs" />
-    <Compile Include="Models\TemplateQuery\Operathor.cs" />
-    <Compile Include="Models\TemplateQuery\OperathorTerm.cs" />
-    <Compile Include="Models\TemplateQuery\QueryCondition.cs" />
-    <Compile Include="Models\TemplateQuery\QueryModel.cs" />
-    <Compile Include="Models\TemplateQuery\QueryResultModel.cs" />
-    <Compile Include="Editors\TemplateQueryController.cs" />
-    <Compile Include="Models\ContentEditing\ContentBaseItemSave.cs" />
-    <Compile Include="Models\ContentEditing\MediaItemSave.cs" />
-    <Compile Include="Models\DetachedContent.cs" />
-    <Compile Include="Models\ImageCropAnchor.cs" />
-    <Compile Include="Models\ImageCropCoordinates.cs" />
-    <Compile Include="Models\ImageCropDataSet.cs" />
-    <Compile Include="Models\ImageCropFocalPoint.cs" />
-    <Compile Include="Models\ImageCropMode.cs" />
-    <Compile Include="Install\DatabaseHelper.cs" />
-    <Compile Include="Install\InstallException.cs" />
-    <Compile Include="Install\InstallStatusTracker.cs" />
-    <Compile Include="Install\InstallSteps\DatabaseConfigureStep.cs" />
-    <Compile Include="Install\InstallSteps\DatabaseInstallStep.cs" />
-    <Compile Include="Install\InstallSteps\DatabaseUpgradeStep.cs" />
-    <Compile Include="Install\InstallSteps\FilePermissionsStep.cs" />
-    <Compile Include="Install\InstallSteps\MajorVersion7UpgradeReport.cs" />
-    <Compile Include="Install\InstallSteps\SetUmbracoVersionStep.cs" />
-    <Compile Include="Install\InstallSteps\StarterKitCleanupStep.cs" />
-    <Compile Include="Install\InstallSteps\StarterKitDownloadStep.cs" />
-    <Compile Include="Install\InstallSteps\StarterKitInstallStep.cs" />
-    <Compile Include="Install\InstallSteps\UpgradeStep.cs" />
-    <Compile Include="Install\InstallSteps\NewInstallStep.cs" />
-    <Compile Include="Install\Controllers\InstallPackageController.cs" />
-    <Compile Include="Install\Models\DatabaseModel.cs" />
-    <Compile Include="Install\Models\DatabaseType.cs" />
-    <Compile Include="Install\Models\InstallationType.cs" />
-    <Compile Include="Install\Models\InstallInstructions.cs" />
-    <Compile Include="Install\Models\InstallPackageModel.cs" />
-    <Compile Include="Install\Models\InstallProgressResultModel.cs" />
-    <Compile Include="Install\Models\InstallSetup.cs" />
-    <Compile Include="Install\Models\InstallSetupResult.cs" />
-    <Compile Include="Install\Models\InstallSetupStep.cs" />
-    <Compile Include="Install\Models\InstallSetupStepAttribute.cs" />
-    <Compile Include="Install\Models\InstallTrackingItem.cs" />
-    <Compile Include="Install\Models\Package.cs" />
-    <Compile Include="Install\Models\UserModel.cs" />
-    <Compile Include="Install\UmbracoInstallArea.cs" />
-    <Compile Include="Install\Controllers\InstallApiController.cs" />
-    <Compile Include="Install\Controllers\InstallController.cs" />
-    <Compile Include="Install\InstallAuthorizeAttribute.cs" />
-    <Compile Include="Models\ContentEditing\TreeSearchResult.cs" />
-    <Compile Include="Models\ContentEditing\ListViewAwareContentItemDisplayBase.cs" />
-    <Compile Include="Models\ContentEditing\PropertyTypeValidation.cs" />
-    <Compile Include="Models\ImageCropData.cs" />
-    <Compile Include="Models\ImageCropRatioMode.cs" />
-    <Compile Include="Models\IRenderModel.cs" />
-    <Compile Include="Models\PartialViewMacroModelExtensions.cs" />
-    <Compile Include="Models\PostRedirectModel.cs" />
-    <Compile Include="Models\PublishedProperty.cs" />
-    <Compile Include="Mvc\ActionExecutedEventArgs.cs" />
-    <Compile Include="Mvc\AdminTokenAuthorizeAttribute.cs" />
-    <Compile Include="Mvc\NotFoundHandler.cs" />
-    <Compile Include="Mvc\PreRenderViewActionFilterAttribute.cs" />
-    <Compile Include="Mvc\RedirectToUmbracoUrlResult.cs" />
-    <Compile Include="PropertyEditors\GridPropertyEditor.cs" />
-    <Compile Include="Mvc\UmbracoVirtualNodeByIdRouteHandler.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\MacroContainerValueConverter.cs" />
-    <Compile Include="PropertyEditors\TagsDataController.cs" />
-    <Compile Include="PublishedCache\MemberPublishedContent.cs" />
-    <Compile Include="PublishedCache\RawValueProperty.cs" />
-    <Compile Include="Models\RenderModelOfTContent.cs" />
-    <Compile Include="Mvc\JsonNetResult.cs" />
-    <Compile Include="Mvc\MinifyJavaScriptResultAttribute.cs" />
-    <Compile Include="Mvc\EnsurePublishedContentRequestAttribute.cs" />
-    <Compile Include="Mvc\UmbracoTemplatePageOfTContent.cs" />
-    <Compile Include="Mvc\UmbracoViewPage.cs" />
-    <Compile Include="Editors\LogController.cs" />
-    <Compile Include="Editors\MacroController.cs" />
-    <Compile Include="Editors\MemberTypeController.cs" />
-    <Compile Include="Editors\UpdateCheckController.cs" />
-    <Compile Include="MembershipProviderExtensions.cs" />
-    <Compile Include="Models\ChangingPasswordModel.cs" />
-    <Compile Include="Models\ContentEditing\ModelWithNotifications.cs" />
-    <Compile Include="Models\ContentEditing\StyleSheet.cs" />
-    <Compile Include="Editors\StylesheetController.cs" />
-    <Compile Include="Models\ContentEditing\AuditLog.cs" />
-    <Compile Include="Models\ContentEditing\MoveOrCopy.cs" />
-    <Compile Include="Models\ContentEditing\MacroParameter.cs" />
-    <Compile Include="Models\ContentEditing\MemberDisplay.cs" />
-    <Compile Include="Models\ContentEditing\MemberSave.cs" />
-    <Compile Include="Models\ContentEditing\RichTextEditorCommand.cs" />
-    <Compile Include="Models\ContentEditing\RichTextEditorConfiguration.cs" />
-    <Compile Include="Models\ContentEditing\RichTextEditorPlugin.cs" />
-    <Compile Include="Models\ContentEditing\StylesheetRule.cs" />
-    <Compile Include="Models\ContentEditing\UmbracoEntityTypes.cs" />
-    <Compile Include="Models\ContentEditing\AuditLogType.cs" />
-    <Compile Include="Models\Mapping\MiscModelsMapper.cs" />
-    <Compile Include="Models\Mapping\MacroModelMapper.cs" />
-    <Compile Include="Models\Mapping\MemberModelMapper.cs" />
-    <Compile Include="Models\Mapping\TabModelMapper.cs" />
-    <Compile Include="Models\TagModel.cs" />
-    <Compile Include="Models\UpgradeCheckResponse.cs" />
-    <Compile Include="Models\PasswordChangedModel.cs" />
-    <Compile Include="NotificationServiceExtensions.cs" />
-    <Compile Include="PropertyEditors\ColorListPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\EmailAddressPropertyEditor.cs" />
-    <Compile Include="ImageCropperBaseExtensions.cs" />
-    <Compile Include="PropertyEditors\ImageCropperPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\ImageCropperPropertyValueEditor.cs" />
-    <Compile Include="PropertyEditors\ListViewPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MacroContainerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MarkdownPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MemberGroupPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MemberPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MultiNodeTreePickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MultipleMediaPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\ContentTypeParameterEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\MultipleContentTypeParameterEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\MultipleMediaPickerParameterEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\MultiplePropertyGroupParameterEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\MultiplePropertyTypeParameterEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\PropertyGroupParameterEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\PropertyTypeParameterEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\SingleMediaPickerParameterEditor.cs" />
-    <Compile Include="PropertyEditors\PropertyEditorAssetAttribute.cs" />
-    <Compile Include="PropertyEditors\RelatedLinksPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\RteEmbedController.cs" />
-    <Compile Include="Editors\EntityController.cs" />
-    <Compile Include="Editors\MediaPostValidateAttribute.cs" />
-    <Compile Include="Editors\MemberController.cs" />
-    <Compile Include="Editors\CurrentUserController.cs" />
-    <Compile Include="Models\ContentEditing\DashboardControl.cs" />
-    <Compile Include="Models\ContentEditing\DataTypeDisplay.cs" />
-    <Compile Include="Models\ContentEditing\DataTypeSave.cs" />
-    <Compile Include="Models\ContentEditing\EntityBasic.cs" />
-    <Compile Include="Models\ContentEditing\PreValueFieldDisplay.cs" />
-    <Compile Include="Models\ContentEditing\PreValueFieldSave.cs" />
-    <Compile Include="Models\ContentEditing\PropertyEditorBasic.cs" />
-    <Compile Include="Models\Mapping\AvailablePropertyEditorsResolver.cs" />
-    <Compile Include="Models\Mapping\DatabaseTypeResolver.cs" />
-    <Compile Include="Models\Mapping\DataTypeModelMapper.cs" />
-    <Compile Include="Models\Mapping\EntityModelMapper.cs" />
-    <Compile Include="Models\Mapping\PreValueDisplayResolver.cs" />
-    <Compile Include="PropertyEditors\CheckBoxListPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\ColorPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\DatePropertyEditor.cs" />
-    <Compile Include="PropertyEditors\DateTimePropertyEditor.cs" />
-    <Compile Include="PropertyEditors\DateTimeValidator.cs" />
-    <Compile Include="PropertyEditors\DropDownMultiplePropertyEditor.cs" />
-    <Compile Include="PropertyEditors\FolderBrowserPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\IntegerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MediaPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MultipleTextStringPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\PublishValuesMultipleValueEditor.cs" />
-    <Compile Include="PropertyEditors\DropDownMultipleWithKeysPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\RadioButtonsPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\RichTextPreValueController.cs" />
-    <Compile Include="PropertyEditors\RichTextPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\SliderPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\TagPropertyEditorTagDefinition.cs" />
-    <Compile Include="PropertyEditors\TagsPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\UploadFileTypeValidator.cs" />
-    <Compile Include="PropertyEditors\UserPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\RelatedLinksEditorValueConvertor.cs" />
-    <Compile Include="PropertyEditors\ValueListPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\DropDownPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\PublishValueValueEditor.cs" />
-    <Compile Include="PropertyEditors\DropDownWithKeysPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\LabelPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\PropertyValueEditorWrapper.cs" />
-    <Compile Include="PublishedContentQuery.cs" />
-    <Compile Include="ImageCropperTemplateExtensions.cs" />
-    <Compile Include="Mvc\UmbracoVirtualNodeRouteHandler.cs" />
-    <Compile Include="Routing\CustomRouteUrlProvider.cs" />
-    <Compile Include="Routing\UrlProviderExtensions.cs" />
-    <Compile Include="Scheduling\BackgroundTaskRunnerOptions.cs" />
-    <Compile Include="Scheduling\IBackgroundTaskRunner.cs" />
-    <Compile Include="Scheduling\ILatchedBackgroundTask.cs" />
-    <Compile Include="Scheduling\RecurringTaskBase.cs" />
-    <Compile Include="Security\Identity\AppBuilderExtensions.cs" />
-    <Compile Include="Security\Identity\AuthenticationOptionsExtensions.cs" />
-    <Compile Include="Security\Identity\AuthenticationManagerExtensions.cs" />
-    <Compile Include="Security\Identity\BackOfficeCookieManager.cs" />
-    <Compile Include="Security\Identity\FormsAuthenticationSecureDataFormat.cs" />
-    <Compile Include="Security\Identity\UmbracoBackOfficeCookieAuthOptions.cs" />
-    <Compile Include="Scheduling\TaskAndFactoryExtensions.cs" />
-    <Compile Include="SingletonUmbracoContextAccessor.cs" />
-    <Compile Include="Strategies\Migrations\ClearCsrfCookiesAfterUpgrade.cs" />
-    <Compile Include="Strategies\Migrations\ClearMediaXmlCacheForDeletedItemsAfterUpgrade.cs" />
-    <Compile Include="Strategies\Migrations\EnsureListViewDataTypeIsCreated.cs" />
-    <Compile Include="Strategies\Migrations\MigrationStartupHander.cs" />
-    <Compile Include="Strategies\Migrations\OverwriteStylesheetFilesFromTempFiles.cs" />
-    <Compile Include="Strategies\NotificationsHandler.cs" />
-    <Compile Include="Strategies\RelateOnCopyHandler.cs" />
-    <Compile Include="TagQuery.cs" />
-    <Compile Include="Trees\CoreTreeAttribute.cs" />
-    <Compile Include="Trees\DataTypeTreeController.cs" />
-    <Compile Include="Trees\FileSystemTreeController.cs" />
-    <Compile Include="Trees\LanguageTreeController.cs" />
-    <Compile Include="Trees\LegacyBaseTreeAttribute.cs" />
-    <Compile Include="Trees\MemberTreeController.cs" />
-    <Compile Include="Trees\MenuRenderingEventArgs.cs" />
-    <Compile Include="Models\Trees\CreateChildEntity.cs" />
-    <Compile Include="Models\Trees\MenuItemList.cs" />
-    <Compile Include="Trees\TemplatesTreeController.cs" />
-    <Compile Include="Trees\TreeControllerBase.cs" />
-    <Compile Include="CanvasDesignerUtility.cs" />
-    <Compile Include="UI\JavaScript\AssetInitialization.cs" />
-    <Compile Include="UI\JavaScript\CssInitialization.cs" />
-    <Compile Include="UI\JavaScript\DependencyPathRenderer.cs" />
-    <Compile Include="umbraco.presentation\umbraco\create.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\create\Language.ascx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\create\xslt.ascx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadPackager.cs" />
-    <Compile Include="PublishedCache\XmlPublishedCache\XmlCacheFilePersister.cs" />
-    <Compile Include="UmbracoComponentRenderer.cs" />
-    <Compile Include="Web References\org.umbraco.our\Reference.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Reference.map</DependentUpon>
-    </Compile>
-    <Compile Include="WebApi\AngularJsonMediaTypeFormatter.cs" />
-    <Compile Include="WebApi\AngularJsonOnlyConfigurationAttribute.cs" />
-    <Compile Include="WebApi\Binders\BlueprintItemBinder.cs" />
-    <Compile Include="WebApi\Binders\MemberBinder.cs" />
-    <Compile Include="WebApi\EnableDetailedErrorsAttribute.cs" />
-    <Compile Include="WebApi\Filters\AdminUsersAuthorizeAttribute.cs" />
-    <Compile Include="WebApi\Filters\AngularAntiForgeryHelper.cs" />
-    <Compile Include="WebApi\Filters\AppendCurrentEventMessagesAttribute.cs" />
-    <Compile Include="WebApi\Filters\AppendUserModifiedHeaderAttribute.cs" />
-    <Compile Include="WebApi\Filters\ClearAngularAntiForgeryTokenAttribute.cs" />
-    <Compile Include="WebApi\Filters\DisableBrowserCacheAttribute.cs" />
-    <Compile Include="WebApi\Filters\EnableOverrideAuthorizationAttribute.cs" />
-    <Compile Include="WebApi\Filters\FeatureAuthorizeAttribute.cs" />
-    <Compile Include="WebApi\Filters\FilterGrouping.cs" />
-    <Compile Include="WebApi\Filters\HttpQueryStringModelBinder.cs" />
-    <Compile Include="WebApi\Filters\LegacyTreeAuthorizeAttribute.cs" />
-    <Compile Include="WebApi\Filters\OutgoingEditorModelEventAttribute.cs" />
-    <Compile Include="WebApi\Filters\OutgoingNoHyphenGuidFormatAttribute.cs" />
-    <Compile Include="WebApi\Filters\OverridableAuthorizationAttribute.cs" />
-    <Compile Include="WebApi\Filters\SetAngularAntiForgeryTokensAttribute.cs" />
-    <Compile Include="WebApi\Filters\UmbracoBackOfficeLogoutAttribute.cs" />
-    <Compile Include="WebApi\Filters\UmbracoWebApiRequireHttpsAttribute.cs" />
-    <Compile Include="WebApi\Filters\UmbracoTreeAuthorizeAttribute.cs" />
-    <Compile Include="WebApi\Filters\UmbracoUseHttps.cs" />
-    <Compile Include="WebApi\Filters\ValidateAngularAntiForgeryTokenAttribute.cs" />
-    <Compile Include="WebApi\Filters\CheckIfUserTicketDataIsStaleAttribute.cs" />
-    <Compile Include="WebApi\HttpControllerContextExtensions.cs" />
-    <Compile Include="WebApi\CustomDateTimeConvertor.cs" />
-    <Compile Include="Models\ContentEditing\ContentSortOrder.cs" />
-    <Compile Include="Editors\ContentControllerBase.cs" />
-    <Compile Include="Editors\ContentTypeController.cs" />
-    <Compile Include="Editors\LegacyController.cs" />
-    <Compile Include="Controllers\UmbRegisterController.cs" />
-    <Compile Include="Models\ProfileModel.cs" />
-    <Compile Include="Models\LoginStatusModel.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\MarkdownEditorValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\TextStringValueConverter.cs" />
-    <Compile Include="PublishedContentPropertyExtension.cs" />
-    <Compile Include="Models\UmbracoProperty.cs" />
-    <Compile Include="Mvc\MergeParentContextViewDataAttribute.cs" />
-    <Compile Include="Mvc\ViewDataDictionaryExtensions.cs" />
-    <Compile Include="Routing\ContentLastChanceFinderByNotFoundHandlers.cs" />
-    <Compile Include="Models\RegisterModel.cs" />
-    <Compile Include="Models\LoginModel.cs" />
-    <Compile Include="Editors\MediaTypeController.cs" />
-    <Compile Include="Scheduling\IBackgroundTask.cs" />
-    <Compile Include="Scheduling\KeepAlive.cs" />
-    <Compile Include="Scheduling\LogScrubber.cs" />
-    <Compile Include="Scheduling\ScheduledPublishing.cs" />
-    <Compile Include="Scheduling\ScheduledTasks.cs" />
-    <Compile Include="Scheduling\TaskEventArgs.cs" />
-    <Compile Include="Security\MembershipHelper.cs" />
-    <Compile Include="Editors\SectionController.cs" />
-    <Compile Include="Editors\UmbracoAuthorizedJsonController.cs" />
-    <Compile Include="Editors\ValidationHelper.cs" />
-    <Compile Include="HttpCookieExtensions.cs" />
-    <Compile Include="Models\ContentEditing\ContentItemDisplayBase.cs" />
-    <Compile Include="Models\ContentEditing\ContentSaveAction.cs" />
-    <Compile Include="Models\ContentEditing\ContentTypeBasic.cs" />
-    <Compile Include="Models\ContentEditing\IErrorModel.cs" />
-    <Compile Include="Models\ContentEditing\IHaveUploadedFiles.cs" />
-    <Compile Include="Models\ContentEditing\INotificationModel.cs" />
-    <Compile Include="Models\ContentEditing\MediaItemDisplay.cs" />
-    <Compile Include="Models\ContentEditing\MessagesExtensions.cs" />
-    <Compile Include="Models\ContentEditing\Notification.cs" />
-    <Compile Include="Models\ContentEditing\Section.cs" />
-    <Compile Include="Models\ContentEditing\Tab.cs" />
-    <Compile Include="Models\ContentEditing\TabbedContentItem.cs" />
-    <Compile Include="Models\ContentEditing\UserProfile.cs" />
-    <Compile Include="Models\ContentEditing\UserDetail.cs" />
-    <Compile Include="FormDataCollectionExtensions.cs" />
-    <Compile Include="Models\Mapping\ContentPropertyBasicConverter.cs" />
-    <Compile Include="Models\Mapping\ContentPropertyDisplayConverter.cs" />
-    <Compile Include="Models\Mapping\ContentPropertyDtoConverter.cs" />
-    <Compile Include="Models\Mapping\ContentPropertyModelMapper.cs" />
-    <Compile Include="Models\Mapping\CreatorResolver.cs" />
-    <Compile Include="Models\Mapping\MediaModelMapper.cs" />
-    <Compile Include="Models\Mapping\ContentTypeModelMapper.cs" />
-    <Compile Include="Models\Mapping\ContentModelMapper.cs" />
-    <Compile Include="Models\Mapping\OwnerResolver.cs" />
-    <Compile Include="Models\Mapping\SectionModelMapper.cs" />
-    <Compile Include="Models\Mapping\TabsAndPropertiesResolver.cs" />
-    <Compile Include="Models\Mapping\UserModelMapper.cs" />
-    <Compile Include="PropertyEditors\ContentPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\FileUploadPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\FileUploadPropertyValueEditor.cs" />
-    <Compile Include="PropertyEditors\RichTextPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\TextAreaPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\TextboxPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\TrueFalsePropertyEditor.cs" />
-    <Compile Include="Trees\MediaTreeController.cs" />
-    <Compile Include="Models\Trees\ActionMenuItem.cs" />
-    <Compile Include="Models\Trees\ActionMenuItemAttribute.cs" />
-    <Compile Include="Trees\ActionUrlMethod.cs" />
-    <Compile Include="Trees\ApplicationTreeRegistrar.cs" />
-    <Compile Include="Trees\ContentTreeControllerBase.cs" />
-    <Compile Include="Trees\LegacyTreeController.cs" />
-    <Compile Include="Search\ISearchableTree.cs" />
-    <Compile Include="Trees\LegacyTreeDataConverter.cs" />
-    <Compile Include="Trees\LegacyTreeJavascript.cs" />
-    <Compile Include="Trees\LegacyTreeParams.cs" />
-    <Compile Include="Models\Trees\MenuItem.cs" />
-    <Compile Include="Models\Trees\MenuItemCollection.cs" />
-    <Compile Include="Models\Trees\RefreshNode.cs" />
-    <Compile Include="Models\ContentEditing\SearchResultItem.cs" />
-    <Compile Include="Models\Trees\SectionRootNode.cs" />
-    <Compile Include="Trees\TreeController.cs" />
-    <Compile Include="Trees\ApplicationTreeExtensions.cs" />
-    <Compile Include="Trees\TreeAttribute.cs" />
-    <Compile Include="Models\Trees\TreeNode.cs" />
-    <Compile Include="Models\Trees\TreeNodeCollection.cs" />
-    <Compile Include="Models\Trees\TreeNodeExtensions.cs" />
-    <Compile Include="Trees\TreeNodeRenderingEventArgs.cs" />
-    <Compile Include="Trees\TreeNodesRenderingEventArgs.cs" />
-    <Compile Include="Trees\TreeQueryStringParameters.cs" />
-    <Compile Include="Trees\ApplicationTreeController.cs" />
-    <Compile Include="Editors\BackOfficeController.cs" />
-    <Compile Include="Security\Providers\MembersMembershipProvider.cs" />
-    <Compile Include="Security\Providers\MembersRoleProvider.cs" />
-    <Compile Include="Security\Providers\UmbracoMembershipProvider.cs" />
-    <Compile Include="Security\Providers\UsersMembershipProvider.cs" />
-    <Compile Include="Trees\ContentTreeController.cs" />
-    <Compile Include="Trees\TreeRenderingEventArgs.cs" />
-    <Compile Include="Trees\UrlHelperExtensions.cs" />
-    <Compile Include="UI\JavaScript\JsInitialization.cs" />
-    <Compile Include="Models\ContentEditing\ContentItemBasic.cs" />
-    <Compile Include="Models\ContentEditing\ContentItemDisplay.cs" />
-    <Compile Include="Models\ContentEditing\ContentItemDto.cs" />
-    <Compile Include="Models\ContentEditing\ContentItemFile.cs" />
-    <Compile Include="Models\ContentEditing\ContentItemSave.cs" />
-    <Compile Include="Models\ContentEditing\ContentPropertyBasic.cs" />
-    <Compile Include="Models\ContentEditing\ContentPropertyDisplay.cs" />
-    <Compile Include="Models\ContentEditing\ContentPropertyDto.cs" />
-    <Compile Include="Dynamics\DynamicExpression.cs" />
-    <Compile Include="Dynamics\DynamicGrouping.cs" />
-    <Compile Include="Dynamics\DynamicPublishedContentIdEqualityComparer.cs" />
-    <Compile Include="Dynamics\DynamicPublishedContentListOrdering.cs" />
-    <Compile Include="Dynamics\DynamicQueryable.cs" />
-    <Compile Include="Dynamics\ExpressionParser.cs" />
-    <Compile Include="Dynamics\ExtensionMethods.cs" />
-    <Compile Include="Dynamics\Grouping.cs" />
-    <Compile Include="HttpRequestExtensions.cs" />
-    <Compile Include="HttpUrlHelperExtensions.cs" />
-    <Compile Include="Install\FilePermissionHelper.cs" />
-    <Compile Include="Install\InstallHelper.cs" />
-    <Compile Include="Install\HttpInstallAuthorizeAttribute.cs" />
-    <Compile Include="Macros\PartialViewMacroController.cs" />
-    <Compile Include="Macros\PartialViewMacroEngine.cs" />
-    <Compile Include="Macros\PartialViewMacroPage.cs" />
-    <Compile Include="Media\ImageUrl.cs" />
-    <Compile Include="Media\ImageUrlProviderResolver.cs" />
-    <Compile Include="Media\ImageUrlProviders\ImageUrlProvider.cs" />
-    <Compile Include="Models\DynamicPublishedContent.cs" />
-    <Compile Include="Models\DynamicPublishedContentList.cs" />
-    <Compile Include="Models\PartialViewMacroModel.cs" />
-    <Compile Include="Models\PublishedContentBase.cs" />
-    <Compile Include="Mvc\AreaRegistrationExtensions.cs" />
-    <Compile Include="BaseRest\BaseRestHandler.cs" />
-    <Compile Include="BaseRest\MemberRest.cs" />
-    <Compile Include="BaseRest\RestExtensionAttribute.cs" />
-    <Compile Include="BaseRest\RestExtensionMethodAttribute.cs" />
-    <Compile Include="BaseRest\RestExtensionMethodInfo.cs" />
-    <Compile Include="ContextualPublishedCacheExtensions.cs" />
-    <Compile Include="Mvc\DefaultRenderMvcControllerResolver.cs" />
-    <Compile Include="Mvc\QueryStringFilterAttribute.cs" />
-    <Compile Include="PublishedCache\ContextualPublishedContentCache.cs" />
-    <Compile Include="PublishedCache\ContextualPublishedCacheOfT.cs" />
-    <Compile Include="PublishedCache\ContextualPublishedCache.cs" />
-    <Compile Include="PublishedCache\ContextualPublishedMediaCache.cs" />
-    <Compile Include="PublishedCache\PublishedCachesResolver.cs" />
-    <Compile Include="PublishedCache\IPublishedCaches.cs" />
-    <Compile Include="PublishedCache\PublishedCaches.cs" />
-    <Compile Include="PublishedCache\XmlPublishedCache\PublishedMediaCache.cs" />
-    <Compile Include="Dictionary\UmbracoCultureDictionary.cs" />
-    <Compile Include="Dictionary\UmbracoCultureDictionaryFactory.cs" />
-    <Compile Include="Mvc\MemberAuthorizeAttribute.cs" />
-    <Compile Include="Mvc\BackOfficeArea.cs" />
-    <Compile Include="Mvc\ControllerFactoryExtensions.cs" />
-    <Compile Include="Mvc\IRenderMvcController.cs" />
-    <Compile Include="Mvc\SurfaceRouteHandler.cs" />
-    <Compile Include="PublishedCache\XmlPublishedCache\RoutesCache.cs" />
-    <Compile Include="PublishedCache\XmlPublishedCache\UmbracoContextCache.cs" />
-    <Compile Include="Routing\UrlProviderMode.cs" />
-    <Compile Include="Search\ExamineIndexerModel.cs" />
-    <Compile Include="Search\LuceneIndexerExtensions.cs" />
-    <Compile Include="Security\ValidateRequestAttempt.cs" />
-    <Compile Include="Security\WebSecurity.cs" />
-    <Compile Include="UI\JavaScript\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="UI\JavaScript\ServerVariablesParser.cs" />
-    <Compile Include="Strategies\Migrations\RebuildXmlCachesAfterUpgrade.cs" />
-    <Compile Include="Strategies\PublicAccessEventHandler.cs" />
-    <Compile Include="UI\Bundles\JsApplicationLib.cs" />
-    <Compile Include="UI\Bundles\JsJQueryCore.cs" />
-    <Compile Include="UI\Bundles\JsJQueryPlugins.cs" />
-    <Compile Include="UI\Bundles\JsUmbracoApplicationCore.cs" />
-    <Compile Include="UI\Bundles\JsUmbracoApplicationUI.cs" />
-    <Compile Include="UI\Bundles\JsUmbracoTree.cs" />
-    <Compile Include="UI\CdfLogger.cs" />
-    <Compile Include="Models\LegacyNodeHelper.cs" />
-    <Compile Include="umbraco.presentation\umbraco\controls\Tree\TreeControl.ascx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\create\simple.ascx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Packages\directoryBrowser.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\ProtectPage.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\create.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\AssignDomain2.aspx.cs">
-      <DependentUpon>AssignDomain2.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\AssignDomain2.aspx.designer.cs">
-      <DependentUpon>AssignDomain2.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="UmbracoContextExtensions.cs" />
-    <Compile Include="umbraco.presentation\umbraco\settings\stylesheet\editstylesheet.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\settings\stylesheet\property\EditStyleSheetProperty.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Controllers\UmbLoginController.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\TranslateTreeNames.cs" />
-    <Compile Include="UrlHelperExtensions.cs" />
-    <Compile Include="Editors\MediaController.cs" />
-    <Compile Include="UrlHelperRenderExtensions.cs" />
-    <Compile Include="WebApi\Binders\ContentItemBaseBinder.cs" />
-    <Compile Include="WebApi\IsBackOfficeAttribute.cs" />
-    <Compile Include="WebApi\Binders\ContentItemBinder.cs" />
-    <Compile Include="WebApi\Binders\MediaItemBinder.cs" />
-    <Compile Include="WebApi\Filters\EnsureUserPermissionForContentAttribute.cs" />
-    <Compile Include="WebApi\Filters\ContentItemValidationHelper.cs" />
-    <Compile Include="WebApi\Filters\EnsureUserPermissionForMediaAttribute.cs" />
-    <Compile Include="WebApi\Filters\FileUploadCleanupFilterAttribute.cs" />
-    <Compile Include="WebApi\Filters\FilterAllowedOutgoingContentAttribute.cs" />
-    <Compile Include="WebApi\Filters\FilterAllowedOutgoingMediaAttribute.cs" />
-    <Compile Include="WebApi\Filters\HttpQueryStringFilterAttribute.cs" />
-    <Compile Include="WebApi\Filters\OutgoingDateTimeFormatAttribute.cs" />
-    <Compile Include="WebApi\Filters\UmbracoApplicationAuthorizeAttribute.cs" />
-    <Compile Include="WebApi\GuidNoHyphenConverter.cs" />
-    <Compile Include="WebApi\HttpRequestMessageExtensions.cs" />
-    <Compile Include="WebApi\JsonCamelCaseFormatter.cs" />
-    <Compile Include="WebApi\MemberAuthorizeAttribute.cs" />
-    <Compile Include="WebApi\MvcVersionCheck.cs" />
-    <Compile Include="WebApi\NamespaceHttpControllerSelector.cs" />
-    <Compile Include="WebApi\PrefixlessBodyModelValidator.cs" />
-    <Compile Include="WebApi\PrefixlessBodyModelValidatorAttribute.cs" />
-    <Compile Include="WebApi\SessionHttpControllerRouteHandler.cs" />
-    <Compile Include="WebApi\UmbracoApiController.cs" />
-    <Compile Include="WebApi\UmbracoApiControllerBase.cs" />
-    <Compile Include="WebApi\UmbracoApiControllerResolver.cs" />
-    <Compile Include="Mvc\UmbracoAuthorizeAttribute.cs" />
-    <Compile Include="Mvc\NotChildAction.cs" />
-    <Compile Include="Mvc\UmbracoAuthorizedController.cs" />
-    <Compile Include="Mvc\UmbracoController.cs" />
-    <Compile Include="Mvc\UmbracoControllerFactory.cs" />
-    <Compile Include="Mvc\UmbracoMvcHandler.cs" />
-    <Compile Include="Mvc\UmbracoViewPageOfTModel.cs" />
-    <Compile Include="PublishedCache\IPublishedCache.cs" />
-    <Compile Include="PublishedCache\IPublishedContentCache.cs" />
-    <Compile Include="PublishedCache\IPublishedMediaCache.cs" />
-    <Compile Include="PublishedContentExtensions.cs" />
-    <Compile Include="ExamineExtensions.cs" />
-    <Compile Include="FormlessPage.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="HtmlHelperRenderExtensions.cs" />
-    <Compile Include="Scheduling\Scheduler.cs" />
-    <Compile Include="Media\EmbedProviders\AbstractOEmbedProvider.cs" />
-    <Compile Include="Media\EmbedProviders\AbstractProvider.cs" />
-    <Compile Include="Media\EmbedProviders\OEmbedRich.cs" />
-    <Compile Include="Media\EmbedProviders\OEmbedVideo.cs" />
-    <Compile Include="Media\EmbedProviders\Settings\Dictionary.cs" />
-    <Compile Include="Media\EmbedProviders\Settings\String.cs" />
-    <Compile Include="Media\EmbedProviders\Twitgoo.cs" />
-    <Compile Include="ModelStateExtensions.cs" />
-    <Compile Include="Mvc\HtmlTagWrapper.cs" />
-    <Compile Include="Mvc\HtmlTagWrapperTextNode.cs" />
-    <Compile Include="Mvc\IHtmlTagWrapper.cs" />
-    <Compile Include="Mvc\MergeModelStateToChildActionAttribute.cs" />
-    <Compile Include="Mvc\PluginController.cs" />
-    <Compile Include="Mvc\PluginViewEngine.cs" />
-    <Compile Include="Mvc\PostedDataProxyInfo.cs" />
-    <Compile Include="Mvc\RedirectToUmbracoPageResult.cs" />
-    <Compile Include="Mvc\Strings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Strings.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Mvc\SurfaceController.cs" />
-    <Compile Include="Mvc\PluginControllerArea.cs" />
-    <Compile Include="Mvc\PluginControllerAttribute.cs" />
-    <Compile Include="Mvc\SurfaceControllerFactory.cs" />
-    <Compile Include="Mvc\PluginControllerMetadata.cs" />
-    <Compile Include="Mvc\UmbracoPageResult.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\RteMacroRenderingValueConverter.cs" />
-    <Compile Include="RenderFieldCaseType.cs" />
-    <Compile Include="RenderFieldEncodingType.cs" />
-    <Compile Include="RouteCollectionExtensions.cs" />
-    <Compile Include="Routing\AliasUrlProvider.cs" />
-    <Compile Include="Routing\ContentFinderByLegacy404.cs" />
-    <Compile Include="Routing\ContentFinderByNotFoundHandler.cs" />
-    <Compile Include="Routing\ContentFinderByPageIdQuery.cs" />
-    <Compile Include="Mvc\SurfaceControllerResolver.cs" />
-    <Compile Include="Routing\ContentFinderByNotFoundHandlers.cs" />
-    <Compile Include="Routing\ISiteDomainHelper.cs" />
-    <Compile Include="Routing\RoutableAttemptEventArgs.cs" />
-    <Compile Include="Routing\DefaultUrlProvider.cs" />
-    <Compile Include="Routing\DomainAndUri.cs" />
-    <Compile Include="Routing\IUrlProvider.cs" />
-    <Compile Include="Routing\SiteDomainHelper.cs" />
-    <Compile Include="Routing\SiteDomainHelperResolver.cs" />
-    <Compile Include="Routing\UrlProviderResolver.cs" />
-    <Compile Include="Routing\NotFoundHandlerHelper.cs" />
-    <Compile Include="Routing\EnsureRoutableOutcome.cs" />
-    <Compile Include="Security\LegacyDefaultAppMapping.cs" />
-    <Compile Include="Routing\PublishedContentRequestEngine.cs" />
-    <Compile Include="Routing\UrlProvider.cs" />
-    <Compile Include="Routing\WebServicesRouteConstraint.cs" />
-    <Compile Include="Search\ExamineSearcherModel.cs" />
-    <Compile Include="Search\ExamineEvents.cs" />
-    <Compile Include="Strategies\DataTypes\LegacyUploadFieldWorkaround.cs" />
-    <Compile Include="Strategies\Migrations\PublishAfterUpgradeToVersionSixth.cs" />
-    <Compile Include="Strategies\LegacyClasses.cs" />
-    <Compile Include="Strategies\Migrations\EnsureAppsTreesUpdatedOnUpgrade.cs" />
-    <Compile Include="Strategies\ServerRegistrationEventHandler.cs" />
-    <Compile Include="Templates\TemplateRenderer.cs" />
-    <Compile Include="Templates\TemplateUtilities.cs" />
-    <Compile Include="Trees\PartialViewMacrosTreeController.cs" />
-    <Compile Include="Trees\PartialViewsTreeController.cs" />
-    <Compile Include="UI\Controls\InsertMacroSplitButton.cs" />
-    <Compile Include="UI\IAssignedApp.cs" />
-    <Compile Include="UI\LegacyDialogHandler.cs" />
-    <Compile Include="UI\LegacyDialogTask.cs" />
-    <Compile Include="UI\Controls\ProgressBar.cs" />
-    <Compile Include="UI\Controls\UmbracoControl.cs" />
-    <Compile Include="UI\Controls\UmbracoUserControl.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="UI\Pages\BasePage.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="UI\Pages\ClientTools.cs" />
-    <Compile Include="UI\Pages\UmbracoEnsuredPage.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="UI\SpeechBubbleIcon.cs" />
-    <Compile Include="umbraco.presentation\AttributeCollectionAdapter.cs" />
-    <Compile Include="umbraco.presentation\Default.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\MacroCacheContent.cs" />
-    <Compile Include="umbraco.presentation\ScriptingMacroResult.cs" />
-    <Compile Include="umbraco.presentation\umbraco\dialogs\sort.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\macroResultWrapper.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\masterpages\default.Master.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\publishStatus.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\Default.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\tree.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\ping.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Macros\editMacro.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Python\editPython.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\editXslt.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\editMacro.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\umbracoField.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\treePicker.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\masterpages\umbracoPage.master.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\masterpages\umbracoDialog.master.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\nodeFactory\UmbracoSiteMapProviderAccessUpdate.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Search\QuickSearch.ascx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\settings\modals\ShowUmbracoTags.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\templateControls\Image.cs" />
-    <Compile Include="umbraco.presentation\umbraco\uQuery\IGetProperty.cs" />
-    <Compile Include="umbraco.presentation\XsltExtensionAttribute.cs" />
-    <Compile Include="UmbracoHelper.cs" />
-    <Compile Include="Mvc\ViewContextExtensions.cs" />
-    <Compile Include="Mvc\ViewDataContainerExtensions.cs" />
-    <Compile Include="PublishedCache\XmlPublishedCache\PublishedContentCache.cs" />
-    <Compile Include="Routing\PublishedContentNotFoundHandler.cs" />
-    <Compile Include="PublishedCache\XmlPublishedCache\XmlPublishedContent.cs" />
-    <Compile Include="PublishedCache\XmlPublishedCache\XmlPublishedProperty.cs" />
-    <Compile Include="Mvc\Constants.cs" />
-    <Compile Include="Mvc\FilteredControllerFactoriesResolver.cs" />
-    <Compile Include="Mvc\IFilteredControllerFactory.cs" />
-    <Compile Include="Mvc\MasterControllerFactory.cs" />
-    <Compile Include="Mvc\RenderActionInvoker.cs" />
-    <Compile Include="Mvc\RenderControllerFactory.cs" />
-    <Compile Include="Models\RenderModel.cs" />
-    <Compile Include="Mvc\RenderModelBinder.cs" />
-    <Compile Include="Mvc\RenderMvcController.cs" />
-    <Compile Include="Mvc\RenderRouteHandler.cs" />
-    <Compile Include="Mvc\RenderViewEngine.cs" />
-    <Compile Include="Mvc\UmbracoTemplatePage.cs" />
-    <Compile Include="Mvc\RouteDefinition.cs" />
-    <Compile Include="Mvc\RouteValueDictionaryExtensions.cs" />
-    <Compile Include="umbraco.presentation\umbraco\nodeFactory\Node.cs" />
-    <Compile Include="umbraco.presentation\umbraco\nodeFactory\Nodes.cs" />
-    <Compile Include="umbraco.presentation\umbraco\nodeFactory\Property.cs" />
-    <Compile Include="Routing\UmbracoRequestEventArgs.cs" />
-    <Compile Include="UmbracoUserControl.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="WebApi\UmbracoAuthorizeAttribute.cs" />
-    <Compile Include="WebApi\UmbracoAuthorizedApiController.cs" />
-    <Compile Include="WebApi\Filters\ValidationFilterAttribute.cs" />
-    <Compile Include="WebApi\Filters\UmbracoUserTimeoutFilterAttribute.cs" />
-    <Compile Include="WebApi\UnhandedExceptionLoggerConfigurationAttribute.cs" />
-    <Compile Include="WebApi\UnhandledExceptionLogger.cs" />
-    <Compile Include="WebApi\WebApiHelper.cs" />
-    <Compile Include="WebBootManager.cs" />
-    <Compile Include="Routing\LegacyRequestInitializer.cs" />
-    <Compile Include="Mvc\ControllerExtensions.cs" />
-    <Compile Include="Routing\ContentLastChanceFinderResolver.cs" />
-    <Compile Include="Routing\ContentFinderByUrlAlias.cs" />
-    <Compile Include="Media\ThumbnailProviders\AbstractThumbnailProvider.cs" />
-    <Compile Include="Media\ThumbnailProviders\MediaTypeIconThumbnailProvider.cs" />
-    <Compile Include="Media\ThumbnailProviders\FileExtensionIconThumbnailProvider.cs" />
-    <Compile Include="Media\ThumbnailProviders\ImageThumbnailProvider.cs" />
-    <Compile Include="Media\ThumbnailProviders\ThumbnailProvidersResolver.cs" />
-    <Compile Include="UI\Controls\FolderBrowser.cs" />
-    <Compile Include="Routing\ContentFinderByIdPath.cs" />
-    <Compile Include="Routing\ContentFinderByNiceUrl.cs" />
-    <Compile Include="Routing\ContentFinderByNiceUrlAndTemplate.cs" />
-    <Compile Include="Routing\ContentFinderByProfile.cs" />
-    <Compile Include="PluginManagerExtensions.cs" />
-    <Compile Include="Routing\DomainHelper.cs" />
-    <Compile Include="Routing\ContentFinderResolver.cs" />
-    <Compile Include="Routing\PublishedContentRequest.cs" />
-    <Compile Include="Routing\IContentFinder.cs" />
-    <Compile Include="Routing\RoutingContext.cs" />
-    <Compile Include="umbraco.presentation\EnsureSystemPathsApplicationStartupHandler.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\BasePageExtensions.cs" />
-    <Compile Include="umbraco.presentation\content.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\helper.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\item.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\keepAliveService.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\library.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\macro.cs" />
-    <Compile Include="umbraco.presentation\page.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\Settings1.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>Settings.settings</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\publishingService.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\PublishQueue.cs" />
-    <Compile Include="umbraco.presentation\python.cs" />
-    <Compile Include="umbraco.presentation\NotFoundHandlers.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\requestModule.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\showField.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\template.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\UmbracoContext.cs" />
-    <Compile Include="umbraco.presentation\UmbracoPage.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbracoPageHolder.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\UmbracoRequest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\UmbracoResponse.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\UmbracoServerUtility.cs" />
-    <Compile Include="umbraco.presentation\umbraco\actions\delete.aspx.cs">
-      <DependentUpon>delete.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\actions\delete.aspx.designer.cs">
-      <DependentUpon>delete.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\actions\editContent.aspx.cs">
-      <DependentUpon>editContent.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\actions\editContent.aspx.designer.cs">
-      <DependentUpon>editContent.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\actions\preview.aspx.cs">
-      <DependentUpon>preview.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\actions\preview.aspx.designer.cs">
-      <DependentUpon>preview.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\actions\publish.aspx.cs">
-      <DependentUpon>publish.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\actions\publish.aspx.designer.cs">
-      <DependentUpon>publish.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\controls\ContentControl.cs" />
-    <Compile Include="umbraco.presentation\umbraco\controls\ContentPicker.cs" />
-    <Compile Include="umbraco.presentation\umbraco\controls\ContentTypeControl.cs" />
-    <Compile Include="umbraco.presentation\umbraco\controls\Images\ImageViewer.ascx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\controls\dualSelectBox.cs" />
-    <Compile Include="umbraco.presentation\umbraco\controls\GenericValidation.cs" />
-    <Compile Include="umbraco.presentation\umbraco\controls\LabelButton.cs" />
-    <Compile Include="umbraco.presentation\umbraco\controls\macroParameterControl.cs" />
-    <Compile Include="umbraco.presentation\umbraco\controls\ProgressBar.ascx.cs">
-      <DependentUpon>ProgressBar.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\controls\ProgressBar.ascx.designer.cs">
-      <DependentUpon>ProgressBar.ascx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\controls\SaveClickEventArgs.cs" />
-    <Compile Include="umbraco.presentation\umbraco\controls\Tree\CustomTreeControl.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\controls\Tree\CustomTreeService.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\controls\Tree\JTreeContextMenu.cs" />
-    <Compile Include="umbraco.presentation\umbraco\controls\Tree\JTreeContextMenuItem.cs" />
-    <Compile Include="umbraco.presentation\umbraco\controls\Tree\NodeInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\create\CreatedPackageTasks.cs" />
-    <Compile Include="umbraco.presentation\umbraco\create\dictionaryTasks.cs" />
-    <Compile Include="umbraco.presentation\umbraco\create\macroTasks.cs" />
-    <Compile Include="umbraco.presentation\umbraco\create\MemberGroupTasks.cs" />
-    <Compile Include="umbraco.presentation\umbraco\create\stylesheetPropertyTasks.cs" />
-    <Compile Include="umbraco.presentation\umbraco\create\StylesheetTasks.cs" />
-    <Compile Include="umbraco.presentation\umbraco\create\XsltTasks.cs" />
-    <Compile Include="umbraco.presentation\umbraco\dashboard\FeedProxy.aspx.cs">
-      <DependentUpon>FeedProxy.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dashboard\FeedProxy.aspx.designer.cs">
-      <DependentUpon>FeedProxy.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\EditRelationType.aspx.cs">
-      <DependentUpon>EditRelationType.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\EditRelationType.aspx.designer.cs">
-      <DependentUpon>EditRelationType.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\NewRelationType.aspx.cs">
-      <DependentUpon>NewRelationType.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\NewRelationType.aspx.designer.cs">
-      <DependentUpon>NewRelationType.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\ReadOnlyRelation.cs" />
-    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\RelationTypesWebService.asmx.cs">
-      <DependentUpon>RelationTypesWebService.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\TreeMenu\ActionDeleteRelationType.cs" />
-    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\TreeMenu\ActionNewRelationType.cs" />
-    <Compile Include="umbraco.presentation\umbraco\dialogs\Preview.aspx.cs">
-      <DependentUpon>Preview.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\Preview.aspx.designer.cs">
-      <DependentUpon>Preview.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\members\MemberSearch.ascx.cs">
-      <DependentUpon>MemberSearch.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\members\MemberSearch.ascx.designer.cs">
-      <DependentUpon>MemberSearch.ascx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\nodeFactory\Page_Legacy.cs" />
-    <Compile Include="umbraco.presentation\umbraco\preview\PreviewContent.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Search\ExamineEvents.cs" />
-    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltVisualize.aspx.cs">
-      <DependentUpon>xsltVisualize.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltVisualize.aspx.designer.cs">
-      <DependentUpon>xsltVisualize.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\insertMasterpageContent.aspx.cs">
-      <DependentUpon>insertMasterpageContent.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\insertMasterpageContent.aspx.designer.cs">
-      <DependentUpon>insertMasterpageContent.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\insertMasterpagePlaceholder.aspx.cs">
-      <DependentUpon>insertMasterpagePlaceholder.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\insertMasterpagePlaceholder.aspx.designer.cs">
-      <DependentUpon>insertMasterpagePlaceholder.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\republish.aspx.cs">
-      <DependentUpon>republish.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\republish.aspx.designer.cs">
-      <DependentUpon>republish.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\search.aspx.cs">
-      <DependentUpon>search.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\search.aspx.designer.cs">
-      <DependentUpon>search.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\SendPublish.aspx.cs">
-      <DependentUpon>SendPublish.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\SendPublish.aspx.designer.cs">
-      <DependentUpon>SendPublish.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\create\dialogHandler_temp.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\create\languageTasks.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Macros\assemblyBrowser.aspx.cs">
-      <DependentUpon>assemblyBrowser.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Macros\assemblyBrowser.aspx.designer.cs">
-      <DependentUpon>assemblyBrowser.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Packages\editPackage.aspx.cs">
-      <DependentUpon>editPackage.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Packages\editPackage.aspx.designer.cs">
-      <DependentUpon>editPackage.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\getXsltStatus.asmx.cs">
-      <DependentUpon>getXsltStatus.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltChooseExtension.aspx.cs">
-      <DependentUpon>xsltChooseExtension.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltChooseExtension.aspx.designer.cs">
-      <DependentUpon>xsltChooseExtension.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltInsertValueOf.aspx.cs">
-      <DependentUpon>xsltInsertValueOf.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltInsertValueOf.aspx.designer.cs">
-      <DependentUpon>xsltInsertValueOf.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\exportDocumenttype.aspx.cs">
-      <DependentUpon>exportDocumenttype.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\importDocumenttype.aspx.cs">
-      <DependentUpon>importDocumenttype.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\rollBack.aspx.cs">
-      <DependentUpon>rollBack.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\rollBack.aspx.designer.cs">
-      <DependentUpon>rollBack.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\sendToTranslation.aspx.cs">
-      <DependentUpon>sendToTranslation.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\sendToTranslation.aspx.designer.cs">
-      <DependentUpon>sendToTranslation.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\viewAuditTrail.aspx.cs">
-      <DependentUpon>viewAuditTrail.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\viewAuditTrail.aspx.designer.cs">
-      <DependentUpon>viewAuditTrail.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\members\EditMemberGroup.aspx.cs">
-      <DependentUpon>EditMemberGroup.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\members\EditMemberGroup.aspx.designer.cs">
-      <DependentUpon>EditMemberGroup.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\members\search.aspx.cs">
-      <DependentUpon>search.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\members\search.aspx.designer.cs">
-      <DependentUpon>search.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\members\ViewMembers.aspx.cs">
-      <DependentUpon>ViewMembers.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\members\ViewMembers.aspx.designer.cs">
-      <DependentUpon>ViewMembers.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\nodeFactory\Properties.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\nodeFactory\UmbracoSiteMapProvider.cs" />
-    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\GzipCompressor.cs" />
-    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\GzipModule.cs" />
-    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\IModule.cs" />
-    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\JSON.cs" />
-    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\JSONReader.cs" />
-    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\JSONWriter.cs" />
-    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\tinymce3tinymceCompress.aspx.cs">
-      <DependentUpon>tinymce3tinymceCompress.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\tinymce3tinymceCompress.aspx.designer.cs">
-      <DependentUpon>tinymce3tinymceCompress.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\Search\QuickSearchHandler.ashx.cs">
-      <DependentUpon>QuickSearchHandler.ashx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\settings\DictionaryItemList.aspx.cs">
-      <DependentUpon>DictionaryItemList.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\settings\DictionaryItemList.aspx.designer.cs">
-      <DependentUpon>DictionaryItemList.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\settings\editLanguage.aspx.cs">
-      <DependentUpon>editLanguage.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\settings\editLanguage.aspx.designer.cs">
-      <DependentUpon>editLanguage.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\templateControls\Script.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\BaseMediaTree.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadDLRScripts.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\ITreeService.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadRelationTypes.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\MediaRecycleBin.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\NodeActionsEventArgs.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\TreeEventArgs.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\TreeRequestParams.cs" />
-    <Compile Include="umbraco.presentation\umbraco\uQuery\ContentExtensions.cs" />
-    <Compile Include="umbraco.presentation\umbraco\uQuery\ContentTypeExtensions.cs" />
-    <Compile Include="umbraco.presentation\umbraco\uQuery\DocumentExtensions.cs" />
-    <Compile Include="umbraco.presentation\umbraco\uQuery\MediaExtensions.cs" />
-    <Compile Include="umbraco.presentation\umbraco\uQuery\MemberExtensions.cs" />
-    <Compile Include="umbraco.presentation\umbraco\uQuery\NodeExtensions.cs" />
-    <Compile Include="umbraco.presentation\umbraco\uQuery\PreValueExtensions.cs" />
-    <Compile Include="umbraco.presentation\umbraco\uQuery\RelationTypeExtensions.cs" />
-    <Compile Include="umbraco.presentation\umbraco\uQuery\UmbracoObjectTypeExtensions.cs" />
-    <Compile Include="umbraco.presentation\umbraco\webservices\MacroContainerService.asmx.cs">
-      <DependentUpon>MacroContainerService.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\webservices\TagsAutoCompleteHandler.ashx.cs">
-      <DependentUpon>TagsAutoCompleteHandler.ashx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\webservices\TreeClientService.asmx.cs">
-      <DependentUpon>TreeClientService.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\templateControls\DisableEventValidation.cs" />
-    <Compile Include="umbraco.presentation\umbraco\templateControls\Item.cs" />
-    <Compile Include="umbraco.presentation\umbraco\templateControls\ItemRenderer.cs" />
-    <Compile Include="umbraco.presentation\umbraco\templateControls\Macro.cs" />
-    <Compile Include="umbraco.presentation\umbraco\templateControls\ContentType.cs" />
-    <Compile Include="umbraco.presentation\umbraco\templateControls\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\translation\default.aspx.cs">
-      <DependentUpon>default.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\translation\default.aspx.designer.cs">
-      <DependentUpon>default.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\translation\details.aspx.cs">
-      <DependentUpon>details.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\translation\details.aspx.designer.cs">
-      <DependentUpon>details.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\translation\preview.aspx.cs">
-      <DependentUpon>preview.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\translation\preview.aspx.designer.cs">
-      <DependentUpon>preview.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\translation\xml.aspx.cs">
-      <DependentUpon>xml.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\translation\xml.aspx.designer.cs">
-      <DependentUpon>xml.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\treeInit.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\Trees\BaseContentTree.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\BaseTree.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\ContentRecycleBin.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\FileSystemTree.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadContent.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadcontentItemType.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadDataTypes.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadLanguages.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadMacros.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadMedia.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadMediaTypes.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadMemberGroups.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadMembers.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadMemberTypes.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadNodeTypes.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadPython.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadScripts.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadStylesheetProperty.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadStylesheets.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadTemplates.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadTranslationTasks.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadUsers.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadXslt.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\NullTree.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\LegacyTree.cs" />
-    <Compile Include="umbraco.presentation\umbraco\webservices\TreeDataService.ashx.cs">
-      <DependentUpon>TreeDataService.ashx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\Trees\TreeDefinitionCollection.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\TreeDefinition.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\TreeDialogModes.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\TreeService.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\XmlTree.cs">
-      <DependentUpon>XmlTree.xsd</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\urlRewriter\UrlRewriterFormWriter.cs" />
-    <Compile Include="umbraco.presentation\umbraco\webservices\ajaxHelpers.cs" />
-    <Compile Include="umbraco.presentation\umbraco\webservices\CacheRefresher.asmx.cs">
-      <DependentUpon>CacheRefresher.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\webservices\CheckForUpgrade.asmx.cs">
-      <DependentUpon>CheckForUpgrade.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\webservices\CMSNode.asmx.cs">
-      <DependentUpon>CMSNode.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\webservices\codeEditorSave.asmx.cs">
-      <DependentUpon>codeEditorSave.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\webservices\legacyAjaxCalls.asmx.cs">
-      <DependentUpon>legacyAjaxCalls.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\webservices\nodeSorter.asmx.cs">
-      <DependentUpon>nodeSorter.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\webservices\progressStatus.asmx.cs">
-      <DependentUpon>progressStatus.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\webservices\publication.asmx.cs">
-      <DependentUpon>publication.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\webservices\RegexComWebservice.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Web\UI\ContentPage.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery.cs" />
-    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Content.cs">
-      <DependentUpon>uQuery.cs</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-DataTypes.cs">
-      <DependentUpon>uQuery.cs</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Dictionary.cs">
-      <DependentUpon>uQuery.cs</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Document.cs">
-      <DependentUpon>uQuery.cs</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Media.cs">
-      <DependentUpon>uQuery.cs</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Members.cs">
-      <DependentUpon>uQuery.cs</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Nodes.cs">
-      <DependentUpon>uQuery.cs</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-PreValues.cs">
-      <DependentUpon>uQuery.cs</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-UmbracoObjectType.cs">
-      <DependentUpon>uQuery.cs</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\viewstateMoverModule.cs" />
-    <Compile Include="UmbracoApplication.cs" />
-    <Compile Include="UmbracoContext.cs" />
-    <Compile Include="UmbracoModule.cs" />
-    <Compile Include="UriUtility.cs" />
-    <Compile Include="Web References\org.umbraco.update\Reference.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Reference.map</DependentUpon>
-    </Compile>
-    <Compile Include="WebServices\BulkPublishController.cs" />
-    <Compile Include="WebServices\CoreStringsController.cs" />
-    <Compile Include="WebServices\DomainsApiController.cs" />
-    <Compile Include="WebServices\EmbedMediaService.cs" />
-    <Compile Include="WebServices\ExamineManagementApiController.cs" />
-    <Compile Include="WebServices\FolderBrowserService.cs" />
-    <Compile Include="WebServices\TagsController.cs" />
-    <Compile Include="WebServices\UmbracoAuthorizedHttpHandler.cs" />
-    <Compile Include="WebServices\SaveFileController.cs" />
-    <Compile Include="WebServices\UmbracoAuthorizedWebService.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="WebServices\UmbracoHttpHandler.cs" />
-    <Compile Include="WebServices\UmbracoWebService.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="WebServices\XmlDataIntegrityController.cs" />
-    <Compile Include="WebViewPageExtensions.cs" />
-    <None Include="..\Umbraco.Web.UI\Views\web.config">
-      <Link>Mvc\web.config</Link>
-    </None>
-    <None Include="packages.config" />
-    <None Include="Web References\org.umbraco.our\Reference.map">
-      <Generator>MSDiscoCodeGenerator</Generator>
-      <LastGenOutput>Reference.cs</LastGenOutput>
-    </None>
-    <None Include="Web References\org.umbraco.our\repository.disco" />
-    <EmbeddedResource Include="UI\JavaScript\Main.js" />
-    <EmbeddedResource Include="UI\JavaScript\JsInitialize.js" />
-    <EmbeddedResource Include="UI\JavaScript\ServerVariables.js" />
-    <Content Include="umbraco.presentation\umbraco\controls\Tree\CustomTreeService.asmx" />
-    <Content Include="umbraco.presentation\umbraco\developer\RelationTypes\EditRelationType.aspx" />
-    <Content Include="umbraco.presentation\umbraco\developer\RelationTypes\NewRelationType.aspx" />
-    <Content Include="umbraco.presentation\umbraco\developer\RelationTypes\RelationTypesWebService.asmx" />
-    <Content Include="umbraco.presentation\umbraco\dashboard\FeedProxy.aspx" />
-    <Content Include="umbraco.presentation\umbraco\dialogs\AssignDomain2.aspx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\members\MemberSearch.ascx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\dialogs\Preview.aspx" />
-    <Content Include="umbraco.presentation\umbraco\controls\ProgressBar.ascx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\actions\delete.aspx" />
-    <Content Include="umbraco.presentation\umbraco\actions\editContent.aspx" />
-    <Content Include="umbraco.presentation\umbraco\actions\preview.aspx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\actions\publish.aspx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\webservices\MacroContainerService.asmx" />
-    <Content Include="umbraco.presentation\umbraco\developer\Xslt\xsltVisualize.aspx" />
-    <Content Include="umbraco.presentation\umbraco\dialogs\empty.htm" />
-    <Content Include="umbraco.presentation\umbraco\dialogs\republish.aspx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\dialogs\search.aspx" />
-    <Content Include="umbraco.presentation\umbraco\dialogs\SendPublish.aspx" />
-    <Content Include="umbraco.presentation\umbraco\webservices\TreeClientService.asmx" />
-    <Content Include="umbraco.presentation\umbraco\members\search.aspx" />
-    <Content Include="umbraco.presentation\umbraco\translation\details.aspx" />
-    <Content Include="umbraco.presentation\umbraco\developer\Packages\editPackage.aspx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\dialogs\exportDocumenttype.aspx" />
-    <Content Include="umbraco.presentation\umbraco\dialogs\importDocumenttype.aspx" />
-    <Content Include="umbraco.presentation\umbraco\dialogs\rollBack.aspx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\dialogs\sendToTranslation.aspx" />
-    <Content Include="umbraco.presentation\umbraco\dialogs\viewAuditTrail.aspx" />
-    <Content Include="umbraco.presentation\umbraco\members\ViewMembers.aspx" />
-    <Content Include="umbraco.presentation\umbraco\plugins\tinymce3\tinymce3tinymceCompress.aspx" />
-    <None Include="app.config" />
-    <None Include="Web References\org.umbraco.our\repository.wsdl" />
-    <None Include="Web References\org.umbraco.update\UpgradeResult.datasource">
-      <DependentUpon>Reference.map</DependentUpon>
-    </None>
-    <None Include="Web References\org.umbraco.update\UpgradeResult1.datasource">
-      <DependentUpon>Reference.map</DependentUpon>
-    </None>
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings1.Designer.cs</LastGenOutput>
-    </None>
-    <Content Include="umbraco.presentation\umbraco\Search\QuickSearchHandler.ashx" />
-    <None Include="umbraco.presentation\umbraco\templateControls\InlineXslt.xsltTemplate" />
-    <Content Include="umbraco.presentation\umbraco\webservices\CheckForUpgrade.asmx" />
-    <Content Include="umbraco.presentation\umbraco\settings\DictionaryItemList.aspx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\translation\default.aspx" />
-    <Content Include="umbraco.presentation\umbraco\translation\preview.aspx" />
-    <Content Include="umbraco.presentation\umbraco\translation\xml.aspx" />
-    <Content Include="umbraco.presentation\umbraco\developer\Macros\assemblyBrowser.aspx" />
-    <Content Include="umbraco.presentation\umbraco\developer\Xslt\getXsltStatus.asmx" />
-    <Content Include="umbraco.presentation\umbraco\developer\Xslt\xsltChooseExtension.aspx" />
-    <Content Include="umbraco.presentation\umbraco\developer\Xslt\xsltInsertValueOf.aspx" />
-    <Content Include="umbraco.presentation\umbraco\members\EditMemberGroup.aspx">
-      <SubType>Form</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\schemas\umbraco.xsd">
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\settings\editLanguage.aspx" />
-    <!--<Content Include="umbraco.presentation\umbraco\users\PermissionEditor.aspx" />-->
-    <Content Include="umbraco.presentation\umbraco\webservices\CacheRefresher.asmx">
-      <SubType>Form</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\webservices\CMSNode.asmx" />
-    <Content Include="umbraco.presentation\umbraco\webservices\codeEditorSave.asmx" />
-    <Content Include="umbraco.presentation\umbraco\webservices\legacyAjaxCalls.asmx" />
-    <Content Include="umbraco.presentation\umbraco\webservices\nodeSorter.asmx" />
-    <Content Include="umbraco.presentation\umbraco\webservices\progressStatus.asmx">
-      <SubType>Form</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\webservices\publication.asmx" />
-    <Content Include="umbraco.presentation\umbraco\webservices\TreeDataService.ashx" />
-    <None Include="umbraco.presentation\umbraco\Trees\Trees.cd" />
-    <None Include="umbraco.presentation\umbraco\Trees\XmlTree.xsd">
-      <SubType>
-      </SubType>
-    </None>
-    <None Include="umbraco.presentation\umbraco\Trees\XmlTree.xsx">
-      <DependentUpon>XmlTree.xsd</DependentUpon>
-    </None>
-    <Content Include="umbraco.presentation\umbraco\webservices\TagsAutoCompleteHandler.ashx" />
-    <None Include="Web References\org.umbraco.update\checkforupgrade.disco" />
-    <None Include="Web References\org.umbraco.update\checkforupgrade.wsdl" />
-    <None Include="Web References\org.umbraco.update\Reference.map">
-      <Generator>MSDiscoCodeGenerator</Generator>
-      <LastGenOutput>Reference.cs</LastGenOutput>
-    </None>
-    <EmbeddedResource Include="UI\JavaScript\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Mvc\Strings.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Strings.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Include="umbraco.presentation\umbraco\templateControls\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <None Include="umbraco.presentation\umbraco\schemas\package.xsd">
-      <SubType>
-      </SubType>
-    </None>
-    <None Include="umbraco.presentation\umbraco\schemas\package.xsx">
-      <DependentUpon>package.xsd</DependentUpon>
-    </None>
-    <None Include="umbraco.presentation\umbraco\schemas\umbraco.xsc">
-      <DependentUpon>umbraco.xsd</DependentUpon>
-    </None>
-    <None Include="umbraco.presentation\umbraco\schemas\umbraco.xss">
-      <DependentUpon>umbraco.xsd</DependentUpon>
-    </None>
-    <None Include="umbraco.presentation\umbraco\schemas\umbraco.xsx">
-      <DependentUpon>umbraco.xsd</DependentUpon>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <WebReferences Include="Web References\" />
-  </ItemGroup>
-  <ItemGroup>
-    <WebReferenceUrl Include="https://our.umbraco.com/umbraco/webservices/api/repository.asmx">
-      <UrlBehavior>Dynamic</UrlBehavior>
-      <RelPath>Web References\org.umbraco.our\</RelPath>
-      <UpdateFromURL>https://our.umbraco.com/umbraco/webservices/api/repository.asmx</UpdateFromURL>
-      <ServiceLocationURL>
-      </ServiceLocationURL>
-      <CachedDynamicPropName>
-      </CachedDynamicPropName>
-      <CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
-      <CachedSettingsPropName>umbraco_org_umbraco_our_Repository</CachedSettingsPropName>
-    </WebReferenceUrl>
-    <WebReferenceUrl Include="http://update.umbraco.org/checkforupgrade.asmx">
-      <UrlBehavior>Dynamic</UrlBehavior>
-      <RelPath>Web References\org.umbraco.update\</RelPath>
-      <UpdateFromURL>http://update.umbraco.org/checkforupgrade.asmx</UpdateFromURL>
-      <ServiceLocationURL>
-      </ServiceLocationURL>
-      <CachedDynamicPropName>
-      </CachedDynamicPropName>
-      <CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
-      <CachedSettingsPropName>umbraco_org_umbraco_update_CheckForUpgrade</CachedSettingsPropName>
-    </WebReferenceUrl>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="umbraco.presentation\umbraco\settings\scripts\" />
-  </ItemGroup>
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
-    <VSToolsPath Condition="exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v11.0\WebApplications\Microsoft.WebApplication.targets')">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v11.0</VSToolsPath>
-    <VSToolsPath Condition="exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v12.0\WebApplications\Microsoft.WebApplication.targets')">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v12.0</VSToolsPath>
-    <VSToolsPath Condition="exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v14.0\WebApplications\Microsoft.WebApplication.targets')">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v14.0</VSToolsPath>
-    <VSToolsPath Condition="exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets')">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
-  <ProjectExtensions />
-  <PropertyGroup>
-    <!--<PostBuildEvent>xcopy "$(ProjectDir)..\..\lib\*.dll" "$(TargetDir)*.dll" /Y</PostBuildEvent>-->
-  </PropertyGroup>
-  <Import Project="..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets" Condition="Exists('..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets')" />
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{651E1350-91B6-44B7-BD60-7207006D7003}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>umbraco</AssemblyName>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Umbraco.Web</RootNamespace>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <StartupObject>
-    </StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <SccProjectName>
-    </SccProjectName>
-    <SccLocalPath>
-    </SccLocalPath>
-    <SccAuxPath>
-    </SccAuxPath>
-    <SccProvider>
-    </SccProvider>
-    <OldToolsVersion>4.0</OldToolsVersion>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <TargetFrameworkProfile />
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>bin\Debug\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>bin\Release\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>bin\Release\umbraco.xml</DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>pdbonly</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\UmbracoExamine\UmbracoExamine.csproj">
-      <Project>{07fbc26b-2927-4a22-8d96-d644c667fecc}</Project>
-      <Name>UmbracoExamine</Name>
-    </ProjectReference>
-    <Reference Include="AutoMapper, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
-      <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="AutoMapper.Net4, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
-      <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <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="dotless.Core, Version=1.5.2.0, Culture=neutral, PublicKeyToken=96b446c9e63eae34, processorArchitecture=MSIL">
-      <HintPath>..\packages\dotless.1.5.2\lib\dotless.Core.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="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="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>
-    <Reference Include="Lucene.Net, Version=2.9.4.1, Culture=neutral, PublicKeyToken=85089178b9ac3181, processorArchitecture=MSIL">
-      <HintPath>..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll</HintPath>
-    </Reference>
-    <Reference Include="MarkdownSharp, Version=1.14.5.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Markdown.1.14.7\lib\net45\MarkdownSharp.dll</HintPath>
-      <Private>True</Private>
-    </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.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.2\lib\net45\Microsoft.AspNet.Identity.Owin.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.AspNet.SignalR.Core, Version=2.4.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.SignalR.Core.2.4.1\lib\net45\Microsoft.AspNet.SignalR.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.CSharp" />
-    <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.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.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=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=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="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>
-      <Private>True</Private>
-    </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>
-      <Private>True</Private>
-    </Reference>
-    <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>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Semver, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\semver.1.1.2\lib\net451\Semver.dll</HintPath>
-    </Reference>
-    <Reference Include="System">
-      <Name>System</Name>
-    </Reference>
-    <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.configuration" />
-    <Reference Include="System.Data">
-      <Name>System.Data</Name>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Design" />
-    <Reference Include="System.Drawing">
-      <Name>System.Drawing</Name>
-    </Reference>
-    <Reference Include="System.EnterpriseServices" />
-    <Reference Include="System.IO.Compression.FileSystem" />
-    <Reference Include="System.Net.Http" />
-    <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.Runtime.Serialization" />
-    <Reference Include="System.Security" />
-    <Reference Include="System.ServiceModel" />
-    <Reference Include="System.Threading.Tasks.Dataflow, Version=4.6.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Threading.Tasks.Dataflow.4.9.0\lib\portable-net45+win8+wpa81\System.Threading.Tasks.Dataflow.dll</HintPath>
-    </Reference>
-    <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.Abstractions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Web.ApplicationServices" />
-    <Reference Include="System.Web.DynamicData" />
-    <Reference Include="System.Web.Entity" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Web.Extensions.Design" />
-    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
-    </Reference>
-    <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.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.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.7\lib\net45\System.Web.Razor.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Services">
-      <Name>System.Web.Services</Name>
-    </Reference>
-    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <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.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.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml">
-      <Name>System.XML</Name>
-    </Reference>
-    <Reference Include="System.Xml.Linq" />
-    <ProjectReference Include="..\SQLCE4Umbraco\SqlCE4Umbraco.csproj">
-      <Project>{5BA5425F-27A7-4677-865E-82246498AA2E}</Project>
-      <Name>SqlCE4Umbraco</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj">
-      <Project>{31785BC3-256C-4613-B2F5-A1B0BDDED8C1}</Project>
-      <Name>Umbraco.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\umbraco.controls\umbraco.controls.csproj">
-      <Project>{6EDD2061-82F2-461B-BB6E-879245A832DE}</Project>
-      <Name>umbraco.controls</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\umbraco.businesslogic\umbraco.businesslogic.csproj">
-      <Name>umbraco.businesslogic</Name>
-      <Project>{E469A9CE-1BEC-423F-AC44-713CD72457EA}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-    </ProjectReference>
-    <ProjectReference Include="..\umbraco.cms\umbraco.cms.csproj">
-      <Project>{CCD75EC3-63DB-4184-B49D-51C1DD337230}</Project>
-      <Name>umbraco.cms</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\umbraco.datalayer\umbraco.datalayer.csproj">
-      <Project>{C7CB79F0-1C97-4B33-BFA7-00731B579AE2}</Project>
-      <Name>umbraco.datalayer</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\umbraco.interfaces\umbraco.interfaces.csproj">
-      <Name>umbraco.interfaces</Name>
-      <Project>{511F6D8D-7717-440A-9A57-A507E9A8B27F}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-    </ProjectReference>
-    <ProjectReference Include="..\umbraco.providers\umbraco.providers.csproj">
-      <Project>{D7636876-0756-43CB-A192-138C6F0D5E42}</Project>
-      <Name>umbraco.providers</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\SolutionInfo.cs">
-      <Link>Properties\SolutionInfo.cs</Link>
-    </Compile>
-    <Compile Include="ApplicationContextExtensions.cs" />
-    <Compile Include="AreaRegistrationContextExtensions.cs" />
-    <Compile Include="BatchedDatabaseServerMessengerStartup.cs" />
-    <Compile Include="Cache\ApplicationCacheRefresher.cs" />
-    <Compile Include="Cache\ApplicationTreeCacheRefresher.cs" />
-    <Compile Include="Cache\CacheRefresherEventHandler.cs" />
-    <Compile Include="Cache\ContentTypeCacheRefresher.cs" />
-    <Compile Include="Cache\DataTypeCacheRefresher.cs" />
-    <Compile Include="Cache\DictionaryCacheRefresher.cs" />
-    <Compile Include="Cache\DistributedCache.cs" />
-    <Compile Include="Cache\DistributedCacheExtensions.cs" />
-    <Compile Include="Cache\DomainCacheRefresher.cs" />
-    <Compile Include="Cache\LanguageCacheRefresher.cs" />
-    <Compile Include="Cache\MacroCacheRefresher.cs" />
-    <Compile Include="Cache\MediaCacheRefresher.cs" />
-    <Compile Include="Cache\MemberCacheRefresher.cs" />
-    <Compile Include="Cache\MemberGroupCacheRefresher.cs" />
-    <Compile Include="Cache\PageCacheRefresher.cs" />
-    <Compile Include="Cache\PublicAccessCacheRefresher.cs" />
-    <Compile Include="Cache\RelationTypeCacheRefresher.cs" />
-    <Compile Include="Cache\UserGroupCacheRefresher.cs" />
-    <Compile Include="Cache\StylesheetCacheRefresher.cs" />
-    <Compile Include="Cache\StylesheetPropertyCacheRefresher.cs" />
-    <Compile Include="Cache\TemplateCacheRefresher.cs" />
-    <Compile Include="Cache\UnpublishedPageCacheRefresher.cs" />
-    <Compile Include="Cache\UserCacheRefresher.cs" />
-    <Compile Include="Editors\PreviewController.cs" />
-    <Compile Include="Editors\BackOfficeAssetsController.cs" />
-    <Compile Include="Features\DisabledFeatures.cs" />
-    <Compile Include="Editors\BackOfficeNotificationsController.cs" />
-    <Compile Include="Editors\DictionaryController.cs" />
-    <Compile Include="Editors\BackOfficeServerVariables.cs" />
-    <Compile Include="Editors\DashboardHelper.cs" />
-    <Compile Include="Editors\EditorModelEventArgs.cs" />
-    <Compile Include="Editors\EditorValidationResolver.cs" />
-    <Compile Include="Editors\EditorValidator.cs" />
-    <Compile Include="Editors\FromJsonPathAttribute.cs" />
-    <Compile Include="Editors\HelpController.cs" />
-    <Compile Include="Editors\IsCurrentUserModelFilterAttribute.cs" />
-    <Compile Include="Editors\PasswordChanger.cs" />
-    <Compile Include="Editors\TemplateController.cs" />
-    <Compile Include="Editors\ParameterSwapControllerActionSelector.cs" />
-    <Compile Include="Editors\CodeFileController.cs" />
-    <Compile Include="Editors\TourController.cs" />
-    <Compile Include="Features\EnabledFeatures.cs" />
-    <Compile Include="HealthCheck\Checks\Services\Tls12Check.cs" />
-    <Compile Include="HealthCheck\Checks\Security\XssProtectionCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Security\HstsCheck.cs" />
-    <Compile Include="Models\BackOfficeTourFilter.cs" />
-    <Compile Include="Models\ContentEditing\BackOfficePreview.cs" />
-    <Compile Include="Models\ContentEditing\DocumentTypeCollectionDisplay.cs" />
-    <Compile Include="Models\ContentEditing\NotifySetting.cs" />
-    <Compile Include="Models\ContentEditing\UrlAndAnchors.cs" />
-    <Compile Include="Models\Mapping\AutoMapperExtensions.cs" />
-    <Compile Include="Models\Mapping\ContentTreeNodeUrlResolver.cs" />
-    <Compile Include="Models\Mapping\MemberTreeNodeUrlResolver.cs" />
-    <Compile Include="Models\Trees\ExportMember.cs" />
-    <Compile Include="PropertyEditors\DropdownFlexiblePropertyEditor.cs" />
-    <Compile Include="TourFilterResolver.cs" />
-    <Compile Include="Editors\UserEditorAuthorizationHelper.cs" />
-    <Compile Include="Editors\UserGroupAuthorizationAttribute.cs" />
-    <Compile Include="Editors\UserGroupEditorAuthorizationHelper.cs" />
-    <Compile Include="Editors\UserGroupsController.cs" />
-    <Compile Include="Editors\UserGroupValidateAttribute.cs" />
-    <Compile Include="ExamineStartup.cs" />
-    <Compile Include="Extensions\UdiExtensions.cs" />
-    <Compile Include="Features\UmbracoFeatures.cs" />
-    <Compile Include="Features\FeaturesResolver.cs" />
-    <Compile Include="HealthCheck\Checks\Config\AbstractConfigCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Config\AcceptableConfiguration.cs" />
-    <Compile Include="HealthCheck\Checks\Config\ConfigurationService.cs" />
-    <Compile Include="HealthCheck\Checks\Config\ConfigurationServiceResult.cs" />
-    <Compile Include="HealthCheck\Checks\Config\MacroErrorsCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Config\NotificationEmailCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Config\TrySkipIisCustomErrorsCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Config\CustomErrorsCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Config\TraceCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Config\ValueComparisonType.cs" />
-    <Compile Include="HealthCheck\Checks\Config\CompilationDebugCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Security\BaseHttpHeaderCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Security\NoSniffCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Services\SmtpCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Permissions\FolderAndFilePermissionsCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Security\ExcessiveHeadersCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Security\ClickJackingCheck.cs" />
-    <Compile Include="HealthCheck\HealthCheckAction.cs" />
-    <Compile Include="HealthCheck\HealthCheckNotificationMethodAttribute.cs" />
-    <Compile Include="HealthCheck\HealthCheckAttribute.cs" />
-    <Compile Include="HealthCheck\HealthCheckContext.cs" />
-    <Compile Include="HealthCheck\HealthCheckController.cs" />
-    <Compile Include="HealthCheck\HealthCheckGroup.cs" />
-    <Compile Include="HealthCheck\HealthCheckNotificationMethodResolver.cs" />
-    <Compile Include="HealthCheck\HealthCheckResolver.cs" />
-    <Compile Include="HealthCheck\HealthCheck.cs" />
-    <Compile Include="HealthCheck\HealthCheckResults.cs" />
-    <Compile Include="HealthCheck\HealthCheckStatus.cs" />
-    <Compile Include="HealthCheck\Checks\Security\HttpsCheck.cs" />
-    <Compile Include="HealthCheck\IHealthCheckResolver.cs" />
-    <Compile Include="HealthCheck\IHealthCheckNotificationMethodsResolver.cs" />
-    <Compile Include="HealthCheck\NotificationMethods\NotificationMethodBase.cs" />
-    <Compile Include="HealthCheck\NotificationMethods\EmailNotificationMethod.cs" />
-    <Compile Include="HealthCheck\NotificationMethods\IHealthCheckNotificatationMethod.cs" />
-    <Compile Include="HealthCheck\StatusResultType.cs" />
-    <Compile Include="HealthCheck\Checks\DataIntegrity\XmlDataIntegrityHealthCheck.cs" />
-    <Compile Include="IHttpContextAccessor.cs" />
-    <Compile Include="Install\InstallSteps\ConfigureMachineKey.cs" />
-    <Compile Include="Models\BackOfficeTourFile.cs" />
-    <Compile Include="Models\BackOfficeTourStep.cs" />
-    <Compile Include="Models\ContentEditing\AssignedContentPermissions.cs" />
-    <Compile Include="Models\ContentEditing\AssignedUserGroupPermissions.cs" />
-    <Compile Include="Models\ContentEditing\ContentRedirectUrl.cs" />
-    <Compile Include="Models\ContentEditing\DictionaryDisplay.cs" />
-    <Compile Include="Models\ContentEditing\DictionaryOverviewDisplay.cs" />
-    <Compile Include="Models\ContentEditing\DictionarySave.cs" />
-    <Compile Include="Models\ContentEditing\DictionaryOverviewTranslationDisplay.cs" />
-    <Compile Include="Models\ContentEditing\DictionaryTranslationSave.cs" />
-    <Compile Include="Models\ContentEditing\EditorNavigation.cs" />
-    <Compile Include="Models\ContentEditing\GetAvailableCompositionsFilter.cs" />
-    <Compile Include="Editors\IEditorValidator.cs" />
-    <Compile Include="Editors\EditorModelEventManager.cs" />
-    <Compile Include="HtmlHelperBackOfficeExtensions.cs" />
-    <Compile Include="Install\InstallSteps\Version73FileCleanup.cs" />
-    <Compile Include="Models\ContentEditing\DocumentTypeDisplay.cs" />
-    <Compile Include="Media\EmbedProviders\Flickr.cs" />
-    <Compile Include="Models\ContentEditing\ContentTypeCompositionDisplay.cs" />
-    <Compile Include="Models\ContentEditing\ContentTypeSave.cs" />
-    <Compile Include="Models\ContentEditing\DocumentTypeSave.cs" />
-    <Compile Include="Models\ContentEditing\InstalledPackageModel.cs" />
-    <Compile Include="Models\ContentEditing\LinkDisplay.cs" />
-    <Compile Include="Models\ContentEditing\MediaTypeDisplay.cs" />
-    <Compile Include="Models\ContentEditing\MediaTypeSave.cs" />
-    <Compile Include="Models\ContentEditing\MemberPropertyTypeBasic.cs" />
-    <Compile Include="Models\ContentEditing\MemberPropertyTypeDisplay.cs" />
-    <Compile Include="Models\ContentEditing\MemberTypeDisplay.cs" />
-    <Compile Include="Models\ContentEditing\MemberTypeSave.cs" />
-    <Compile Include="Models\ContentEditing\Permission.cs" />
-    <Compile Include="Models\ContentEditing\PostedFiles.cs" />
-    <Compile Include="Models\ContentEditing\PostedFolder.cs" />
-    <Compile Include="Models\ContentEditing\PropertyGroupBasic.cs" />
-    <Compile Include="Models\ContentEditing\PropertyTypeBasic.cs" />
-    <Compile Include="Models\ContentEditing\SimpleNotificationModel.cs" />
-    <Compile Include="Models\ContentEditing\SnippetDisplay.cs" />
-    <Compile Include="Models\ContentEditing\TemplateDisplay.cs" />
-    <Compile Include="Models\ContentEditing\DictionaryTranslationDisplay.cs" />
-    <Compile Include="Models\ContentEditing\UserDisplay.cs" />
-    <Compile Include="Models\ContentEditing\UserBasic.cs" />
-    <Compile Include="Models\ContentEditing\UserGroupBasic.cs" />
-    <Compile Include="Models\ContentEditing\UserGroupDisplay.cs" />
-    <Compile Include="Models\ContentEditing\UserGroupPermissionsSave.cs" />
-    <Compile Include="Models\ContentEditing\UserGroupSave.cs" />
-    <Compile Include="Models\DetachedPublishedContent.cs" />
-    <Compile Include="Models\DetachedPublishedProperty.cs" />
-    <Compile Include="Models\ContentEditing\UserInvite.cs" />
-    <Compile Include="Models\ContentEditing\UserSave.cs" />
-    <Compile Include="Models\Link.cs" />
-    <Compile Include="Models\LinkType.cs" />
-    <Compile Include="Models\LocalPackageInstallModel.cs" />
-    <Compile Include="Models\Mapping\CodeFileDisplayMapper.cs" />
-    <Compile Include="Models\Mapping\ContentTypeModelMapperExtensions.cs" />
-    <Compile Include="Models\Mapping\ContentTypeUdiResolver.cs" />
-    <Compile Include="Models\Mapping\DictionaryModelMapper.cs" />
-    <Compile Include="Models\Mapping\EntityModelMapperExtensions.cs" />
-    <Compile Include="Models\Mapping\LockedCompositionsResolver.cs" />
-    <Compile Include="Models\Mapping\UserGroupDefaultPermissionsResolver.cs" />
-    <Compile Include="Models\Mapping\PropertyGroupDisplayResolver.cs" />
-    <Compile Include="Models\RelatedLink.cs" />
-    <Compile Include="Models\Mapping\TemplateModelMapper.cs" />
-    <Compile Include="Models\PackageInstallResult.cs" />
-    <Compile Include="Models\RelatedLinkBase.cs" />
-    <Compile Include="Models\ContentEditing\CodeFileDisplay.cs" />
-    <Compile Include="Models\SendCodeViewModel.cs" />
-    <Compile Include="Models\RelatedLinks.cs" />
-    <Compile Include="Models\RelatedLinkType.cs" />
-    <Compile Include="Models\SetPasswordModel.cs" />
-    <Compile Include="Models\RequestPasswordResetModel.cs" />
-    <Compile Include="Models\PublishedContentWithKeyBase.cs" />
-    <Compile Include="Models\BackOfficeTour.cs" />
-    <Compile Include="Models\UserTourStatus.cs" />
-    <Compile Include="Models\ValidatePasswordResetCodeModel.cs" />
-    <Compile Include="Mvc\ControllerContextExtensions.cs" />
-    <Compile Include="Mvc\DisableBrowserCacheAttribute.cs" />
-    <Compile Include="Mvc\EnsurePartialViewMacroViewContextFilterAttribute.cs" />
-    <Compile Include="Mvc\IRenderController.cs" />
-    <Compile Include="Mvc\ModelBindingException.cs" />
-    <Compile Include="Mvc\RenderIndexActionSelectorAttribute.cs" />
-    <Compile Include="Mvc\UmbracoRequireHttpsAttribute.cs" />
-    <Compile Include="Mvc\ValidateMvcAngularAntiForgeryTokenAttribute.cs" />
-    <Compile Include="OwinMiddlewareConfiguredEventArgs.cs" />
-    <Compile Include="Profiling\WebProfilerProvider.cs" />
-    <Compile Include="Profiling\WebProfiler.cs" />
-    <Compile Include="PropertyEditors\ContentPicker2PropertyEditor.cs" />
-    <Compile Include="PropertyEditors\DatePreValueEditor.cs" />
-    <Compile Include="PropertyEditors\DateTimePreValueEditor.cs" />
-    <Compile Include="PropertyEditors\DecimalPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MediaPicker2PropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MemberPicker2PropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MultiNodeTreePicker2PropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MultiUrlPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\NestedContentController.cs" />
-    <Compile Include="PropertyEditors\NestedContentHelper.cs" />
-    <Compile Include="PropertyEditors\NestedContentPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\RelatedLinks2PropertyEditor.cs" />
-    <Compile Include="PropertyEditors\TextOnlyValueEditor.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\ContentPickerPropertyConverter.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\MultipleContentPickerParameterEditor.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\ImageCropDataSetConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\ImageCropperValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\LegacyRelatedLinksEditorValueConvertor.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\MediaPickerPropertyConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\MemberPickerPropertyConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\MultiNodeTreePickerPropertyConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\LegacyMediaPickerPropertyConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\MultiUrlPickerPropertyConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\NestedContentSingleValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\NestedContentManyValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\NestedContentPublishedPropertyTypeExtensions.cs" />
-    <Compile Include="PublishedContentQueryExtensions.cs" />
-    <Compile Include="Routing\RedirectTrackingEventHandler.cs" />
-    <Compile Include="Editors\RedirectUrlManagementController.cs" />
-    <Compile Include="Models\ContentEditing\RedirectUrlSearchResults.cs" />
-    <Compile Include="RelatedLinksTypeConverter.cs" />
-    <Compile Include="RouteDataExtensions.cs" />
-    <Compile Include="Routing\ContentFinderByRedirectUrl.cs" />
-    <Compile Include="Scheduling\HealthCheckNotifier.cs" />
-    <Compile Include="Scheduling\LatchedBackgroundTaskBase.cs" />
-    <Compile Include="Search\SearchableApplicationTree.cs" />
-    <Compile Include="Search\SearchableTreeAttribute.cs" />
-    <Compile Include="Search\SearchableTreeCollection.cs" />
-    <Compile Include="Search\SearchableTreeResolver.cs" />
-    <Compile Include="Search\UmbracoTreeSearcher.cs" />
-    <Compile Include="Security\Identity\ExternalSignInAutoLinkOptions.cs" />
-    <Compile Include="Security\Identity\FixWindowsAuthMiddlware.cs" />
-    <Compile Include="Security\Identity\ForceRenewalCookieAuthenticationHandler.cs" />
-    <Compile Include="Security\Identity\ForceRenewalCookieAuthenticationMiddleware.cs" />
-    <Compile Include="Security\Identity\GetUserSecondsMiddleWare.cs" />
-    <Compile Include="Models\ContentEditing\PropertyTypeDisplay.cs" />
-    <Compile Include="Models\ContentEditing\PropertyGroupDisplay.cs" />
-    <Compile Include="Media\EmbedProviders\OEmbedJson.cs" />
-    <Compile Include="Media\EmbedProviders\OEmbedResponse.cs" />
-    <Compile Include="Media\EmbedProviders\OEmbedPhoto.cs" />
-    <Compile Include="Security\Identity\IUmbracoBackOfficeTwoFactorOptions.cs" />
-    <Compile Include="Models\Mapping\PropertyTypeGroupResolver.cs" />
-    <Compile Include="Security\Identity\PreviewAuthenticationMiddleware.cs" />
-    <Compile Include="SingletonHttpContextAccessor.cs" />
-    <Compile Include="Trees\DictionaryTreeController.cs" />
-    <Compile Include="Trees\MacroTreeController.cs" />
-    <Compile Include="Trees\UserTreeController.cs" />
-    <Compile Include="Suspendable.cs" />
-    <Compile Include="Trees\ContentBlueprintTreeController.cs" />
-    <Compile Include="Trees\ContentTypeTreeController.cs" />
-    <Compile Include="Trees\PackagesTreeController.cs" />
-    <Compile Include="Trees\MediaTypeTreeController.cs" />
-    <Compile Include="Trees\MemberTypeTreeController.cs" />
-    <Compile Include="Security\WebAuthExtensions.cs" />
-    <Compile Include="Trees\XsltTreeController.cs" />
-    <Compile Include="umbraco.presentation\SafeXmlReaderWriter.cs" />
-    <Compile Include="Trees\ScriptTreeController.cs" />
-    <Compile Include="umbraco.presentation\umbraco\developer\Packages\installer.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="UmbracoDefaultOwinStartup.cs" />
-    <Compile Include="IUmbracoContextAccessor.cs" />
-    <Compile Include="Models\ContentEditing\Relation.cs" />
-    <Compile Include="HtmlStringUtilities.cs" />
-    <Compile Include="Models\ContentEditing\RelationType.cs" />
-    <Compile Include="Models\ContentExtensions.cs" />
-    <Compile Include="IDynamicPublishedContentQuery.cs" />
-    <Compile Include="ITagQuery.cs" />
-    <Compile Include="ITypedPublishedContentQuery.cs" />
-    <Compile Include="IUmbracoComponentRenderer.cs" />
-    <Compile Include="Models\LegacyConvertedNode.cs" />
-    <Compile Include="Models\LegacyConvertedNodeProperty.cs" />
-    <Compile Include="Models\Mapping\RelationModelMapper.cs" />
-    <Compile Include="Mvc\DisableClientCacheAttribute.cs" />
-    <Compile Include="Models\UnLinkLoginModel.cs" />
-    <Compile Include="Mvc\MvcVersionCheck.cs" />
-    <Compile Include="Mvc\ReflectedFixedRazorViewEngine.cs" />
-    <Compile Include="Scheduling\ThreadingTaskImmutable.cs" />
-    <Compile Include="Mvc\ProfilingView.cs" />
-    <Compile Include="Mvc\ProfilingViewEngine.cs" />
-    <Compile Include="Mvc\UrlHelperExtensions.cs" />
-    <Compile Include="Scheduling\BackgroundTaskRunner.cs" />
-    <Compile Include="BatchedDatabaseServerMessenger.cs" />
-    <Compile Include="BatchedWebServiceServerMessenger.cs" />
-    <Compile Include="CacheHelperExtensions.cs" />
-    <Compile Include="Cache\UserGroupPermissionsCacheRefresher.cs" />
-    <Compile Include="Editors\AuthenticationController.cs" />
-    <Compile Include="Controllers\UmbProfileController.cs" />
-    <Compile Include="Editors\ContentController.cs" />
-    <Compile Include="Controllers\UmbLoginStatusController.cs" />
-    <Compile Include="Editors\ContentPostValidateAttribute.cs" />
-    <Compile Include="Editors\ContentTypeControllerBase.cs" />
-    <Compile Include="Editors\DashboardController.cs" />
-    <Compile Include="Editors\DashboardSecurity.cs" />
-    <Compile Include="Editors\DataTypeController.cs" />
-    <Compile Include="Editors\DataTypeValidateAttribute.cs" />
-    <Compile Include="Editors\EntityControllerConfigurationAttribute.cs" />
-    <Compile Include="Editors\ImagesController.cs" />
-    <Compile Include="Editors\PackageInstallController.cs" />
-    <Compile Include="Editors\RelationController.cs" />
-    <Compile Include="Editors\CanvasDesignerController.cs" />
-    <Compile Include="Editors\UsersController.cs" />
-    <Compile Include="GridTemplateExtensions.cs" />
-    <Compile Include="Models\PackageInstallModel.cs" />
-    <Compile Include="Models\ContentEditing\DataTypeBasic.cs" />
-    <Compile Include="Models\ContentEditing\MemberBasic.cs" />
-    <Compile Include="Models\ContentEditing\MemberListDisplay.cs" />
-    <Compile Include="Models\TemplateQuery\ContentTypeModel.cs" />
-    <Compile Include="Models\TemplateQuery\PropertyModel.cs" />
-    <Compile Include="Models\TemplateQuery\SourceModel.cs" />
-    <Compile Include="Models\TemplateQuery\TemplateQueryResult.cs" />
-    <Compile Include="Models\TemplateQuery\SortExpression.cs" />
-    <Compile Include="Models\TemplateQuery\Operathor.cs" />
-    <Compile Include="Models\TemplateQuery\OperathorTerm.cs" />
-    <Compile Include="Models\TemplateQuery\QueryCondition.cs" />
-    <Compile Include="Models\TemplateQuery\QueryModel.cs" />
-    <Compile Include="Models\TemplateQuery\QueryResultModel.cs" />
-    <Compile Include="Editors\TemplateQueryController.cs" />
-    <Compile Include="Models\ContentEditing\ContentBaseItemSave.cs" />
-    <Compile Include="Models\ContentEditing\MediaItemSave.cs" />
-    <Compile Include="Models\DetachedContent.cs" />
-    <Compile Include="Models\ImageCropAnchor.cs" />
-    <Compile Include="Models\ImageCropCoordinates.cs" />
-    <Compile Include="Models\ImageCropDataSet.cs" />
-    <Compile Include="Models\ImageCropFocalPoint.cs" />
-    <Compile Include="Models\ImageCropMode.cs" />
-    <Compile Include="Install\DatabaseHelper.cs" />
-    <Compile Include="Install\InstallException.cs" />
-    <Compile Include="Install\InstallStatusTracker.cs" />
-    <Compile Include="Install\InstallSteps\DatabaseConfigureStep.cs" />
-    <Compile Include="Install\InstallSteps\DatabaseInstallStep.cs" />
-    <Compile Include="Install\InstallSteps\DatabaseUpgradeStep.cs" />
-    <Compile Include="Install\InstallSteps\FilePermissionsStep.cs" />
-    <Compile Include="Install\InstallSteps\MajorVersion7UpgradeReport.cs" />
-    <Compile Include="Install\InstallSteps\SetUmbracoVersionStep.cs" />
-    <Compile Include="Install\InstallSteps\StarterKitCleanupStep.cs" />
-    <Compile Include="Install\InstallSteps\StarterKitDownloadStep.cs" />
-    <Compile Include="Install\InstallSteps\StarterKitInstallStep.cs" />
-    <Compile Include="Install\InstallSteps\UpgradeStep.cs" />
-    <Compile Include="Install\InstallSteps\NewInstallStep.cs" />
-    <Compile Include="Install\Controllers\InstallPackageController.cs" />
-    <Compile Include="Install\Models\DatabaseModel.cs" />
-    <Compile Include="Install\Models\DatabaseType.cs" />
-    <Compile Include="Install\Models\InstallationType.cs" />
-    <Compile Include="Install\Models\InstallInstructions.cs" />
-    <Compile Include="Install\Models\InstallPackageModel.cs" />
-    <Compile Include="Install\Models\InstallProgressResultModel.cs" />
-    <Compile Include="Install\Models\InstallSetup.cs" />
-    <Compile Include="Install\Models\InstallSetupResult.cs" />
-    <Compile Include="Install\Models\InstallSetupStep.cs" />
-    <Compile Include="Install\Models\InstallSetupStepAttribute.cs" />
-    <Compile Include="Install\Models\InstallTrackingItem.cs" />
-    <Compile Include="Install\Models\Package.cs" />
-    <Compile Include="Install\Models\UserModel.cs" />
-    <Compile Include="Install\UmbracoInstallArea.cs" />
-    <Compile Include="Install\Controllers\InstallApiController.cs" />
-    <Compile Include="Install\Controllers\InstallController.cs" />
-    <Compile Include="Install\InstallAuthorizeAttribute.cs" />
-    <Compile Include="Models\ContentEditing\TreeSearchResult.cs" />
-    <Compile Include="Models\ContentEditing\ListViewAwareContentItemDisplayBase.cs" />
-    <Compile Include="Models\ContentEditing\PropertyTypeValidation.cs" />
-    <Compile Include="Models\ImageCropData.cs" />
-    <Compile Include="Models\ImageCropRatioMode.cs" />
-    <Compile Include="Models\IRenderModel.cs" />
-    <Compile Include="Models\PartialViewMacroModelExtensions.cs" />
-    <Compile Include="Models\PostRedirectModel.cs" />
-    <Compile Include="Models\PublishedProperty.cs" />
-    <Compile Include="Mvc\ActionExecutedEventArgs.cs" />
-    <Compile Include="Mvc\AdminTokenAuthorizeAttribute.cs" />
-    <Compile Include="Mvc\NotFoundHandler.cs" />
-    <Compile Include="Mvc\PreRenderViewActionFilterAttribute.cs" />
-    <Compile Include="Mvc\RedirectToUmbracoUrlResult.cs" />
-    <Compile Include="PropertyEditors\GridPropertyEditor.cs" />
-    <Compile Include="Mvc\UmbracoVirtualNodeByIdRouteHandler.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\MacroContainerValueConverter.cs" />
-    <Compile Include="PropertyEditors\TagsDataController.cs" />
-    <Compile Include="PublishedCache\MemberPublishedContent.cs" />
-    <Compile Include="PublishedCache\RawValueProperty.cs" />
-    <Compile Include="Models\RenderModelOfTContent.cs" />
-    <Compile Include="Mvc\JsonNetResult.cs" />
-    <Compile Include="Mvc\MinifyJavaScriptResultAttribute.cs" />
-    <Compile Include="Mvc\EnsurePublishedContentRequestAttribute.cs" />
-    <Compile Include="Mvc\UmbracoTemplatePageOfTContent.cs" />
-    <Compile Include="Mvc\UmbracoViewPage.cs" />
-    <Compile Include="Editors\LogController.cs" />
-    <Compile Include="Editors\MacroController.cs" />
-    <Compile Include="Editors\MemberTypeController.cs" />
-    <Compile Include="Editors\UpdateCheckController.cs" />
-    <Compile Include="MembershipProviderExtensions.cs" />
-    <Compile Include="Models\ChangingPasswordModel.cs" />
-    <Compile Include="Models\ContentEditing\ModelWithNotifications.cs" />
-    <Compile Include="Models\ContentEditing\StyleSheet.cs" />
-    <Compile Include="Editors\StylesheetController.cs" />
-    <Compile Include="Models\ContentEditing\AuditLog.cs" />
-    <Compile Include="Models\ContentEditing\MoveOrCopy.cs" />
-    <Compile Include="Models\ContentEditing\MacroParameter.cs" />
-    <Compile Include="Models\ContentEditing\MemberDisplay.cs" />
-    <Compile Include="Models\ContentEditing\MemberSave.cs" />
-    <Compile Include="Models\ContentEditing\RichTextEditorCommand.cs" />
-    <Compile Include="Models\ContentEditing\RichTextEditorConfiguration.cs" />
-    <Compile Include="Models\ContentEditing\RichTextEditorPlugin.cs" />
-    <Compile Include="Models\ContentEditing\StylesheetRule.cs" />
-    <Compile Include="Models\ContentEditing\UmbracoEntityTypes.cs" />
-    <Compile Include="Models\ContentEditing\AuditLogType.cs" />
-    <Compile Include="Models\Mapping\MiscModelsMapper.cs" />
-    <Compile Include="Models\Mapping\MacroModelMapper.cs" />
-    <Compile Include="Models\Mapping\MemberModelMapper.cs" />
-    <Compile Include="Models\Mapping\TabModelMapper.cs" />
-    <Compile Include="Models\TagModel.cs" />
-    <Compile Include="Models\UpgradeCheckResponse.cs" />
-    <Compile Include="Models\PasswordChangedModel.cs" />
-    <Compile Include="NotificationServiceExtensions.cs" />
-    <Compile Include="PropertyEditors\ColorListPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\EmailAddressPropertyEditor.cs" />
-    <Compile Include="ImageCropperBaseExtensions.cs" />
-    <Compile Include="PropertyEditors\ImageCropperPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\ImageCropperPropertyValueEditor.cs" />
-    <Compile Include="PropertyEditors\ListViewPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MacroContainerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MarkdownPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MemberGroupPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MemberPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MultiNodeTreePickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MultipleMediaPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\ContentTypeParameterEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\MultipleContentTypeParameterEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\MultipleMediaPickerParameterEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\MultiplePropertyGroupParameterEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\MultiplePropertyTypeParameterEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\PropertyGroupParameterEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\PropertyTypeParameterEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\SingleMediaPickerParameterEditor.cs" />
-    <Compile Include="PropertyEditors\PropertyEditorAssetAttribute.cs" />
-    <Compile Include="PropertyEditors\RelatedLinksPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\RteEmbedController.cs" />
-    <Compile Include="Editors\EntityController.cs" />
-    <Compile Include="Editors\MediaPostValidateAttribute.cs" />
-    <Compile Include="Editors\MemberController.cs" />
-    <Compile Include="Editors\CurrentUserController.cs" />
-    <Compile Include="Models\ContentEditing\DashboardControl.cs" />
-    <Compile Include="Models\ContentEditing\DataTypeDisplay.cs" />
-    <Compile Include="Models\ContentEditing\DataTypeSave.cs" />
-    <Compile Include="Models\ContentEditing\EntityBasic.cs" />
-    <Compile Include="Models\ContentEditing\PreValueFieldDisplay.cs" />
-    <Compile Include="Models\ContentEditing\PreValueFieldSave.cs" />
-    <Compile Include="Models\ContentEditing\PropertyEditorBasic.cs" />
-    <Compile Include="Models\Mapping\AvailablePropertyEditorsResolver.cs" />
-    <Compile Include="Models\Mapping\DatabaseTypeResolver.cs" />
-    <Compile Include="Models\Mapping\DataTypeModelMapper.cs" />
-    <Compile Include="Models\Mapping\EntityModelMapper.cs" />
-    <Compile Include="Models\Mapping\PreValueDisplayResolver.cs" />
-    <Compile Include="PropertyEditors\CheckBoxListPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\ColorPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\DatePropertyEditor.cs" />
-    <Compile Include="PropertyEditors\DateTimePropertyEditor.cs" />
-    <Compile Include="PropertyEditors\DateTimeValidator.cs" />
-    <Compile Include="PropertyEditors\DropDownMultiplePropertyEditor.cs" />
-    <Compile Include="PropertyEditors\FolderBrowserPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\IntegerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MediaPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MultipleTextStringPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\PublishValuesMultipleValueEditor.cs" />
-    <Compile Include="PropertyEditors\DropDownMultipleWithKeysPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\RadioButtonsPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\RichTextPreValueController.cs" />
-    <Compile Include="PropertyEditors\RichTextPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\SliderPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\TagPropertyEditorTagDefinition.cs" />
-    <Compile Include="PropertyEditors\TagsPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\UploadFileTypeValidator.cs" />
-    <Compile Include="PropertyEditors\UserPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\RelatedLinksEditorValueConvertor.cs" />
-    <Compile Include="PropertyEditors\ValueListPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\DropDownPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\PublishValueValueEditor.cs" />
-    <Compile Include="PropertyEditors\DropDownWithKeysPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\LabelPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\PropertyValueEditorWrapper.cs" />
-    <Compile Include="PublishedContentQuery.cs" />
-    <Compile Include="ImageCropperTemplateExtensions.cs" />
-    <Compile Include="Mvc\UmbracoVirtualNodeRouteHandler.cs" />
-    <Compile Include="Routing\CustomRouteUrlProvider.cs" />
-    <Compile Include="Routing\UrlProviderExtensions.cs" />
-    <Compile Include="Scheduling\BackgroundTaskRunnerOptions.cs" />
-    <Compile Include="Scheduling\IBackgroundTaskRunner.cs" />
-    <Compile Include="Scheduling\ILatchedBackgroundTask.cs" />
-    <Compile Include="Scheduling\RecurringTaskBase.cs" />
-    <Compile Include="Security\Identity\AppBuilderExtensions.cs" />
-    <Compile Include="Security\Identity\AuthenticationOptionsExtensions.cs" />
-    <Compile Include="Security\Identity\AuthenticationManagerExtensions.cs" />
-    <Compile Include="Security\Identity\BackOfficeCookieManager.cs" />
-    <Compile Include="Security\Identity\FormsAuthenticationSecureDataFormat.cs" />
-    <Compile Include="Security\Identity\UmbracoBackOfficeCookieAuthOptions.cs" />
-    <Compile Include="Scheduling\TaskAndFactoryExtensions.cs" />
-    <Compile Include="SingletonUmbracoContextAccessor.cs" />
-    <Compile Include="Strategies\Migrations\ClearCsrfCookiesAfterUpgrade.cs" />
-    <Compile Include="Strategies\Migrations\ClearMediaXmlCacheForDeletedItemsAfterUpgrade.cs" />
-    <Compile Include="Strategies\Migrations\EnsureListViewDataTypeIsCreated.cs" />
-    <Compile Include="Strategies\Migrations\MigrationStartupHander.cs" />
-    <Compile Include="Strategies\Migrations\OverwriteStylesheetFilesFromTempFiles.cs" />
-    <Compile Include="Strategies\NotificationsHandler.cs" />
-    <Compile Include="Strategies\RelateOnCopyHandler.cs" />
-    <Compile Include="TagQuery.cs" />
-    <Compile Include="Trees\CoreTreeAttribute.cs" />
-    <Compile Include="Trees\DataTypeTreeController.cs" />
-    <Compile Include="Trees\FileSystemTreeController.cs" />
-    <Compile Include="Trees\LanguageTreeController.cs" />
-    <Compile Include="Trees\LegacyBaseTreeAttribute.cs" />
-    <Compile Include="Trees\MemberTreeController.cs" />
-    <Compile Include="Trees\MenuRenderingEventArgs.cs" />
-    <Compile Include="Models\Trees\CreateChildEntity.cs" />
-    <Compile Include="Models\Trees\MenuItemList.cs" />
-    <Compile Include="Trees\TemplatesTreeController.cs" />
-    <Compile Include="Trees\TreeControllerBase.cs" />
-    <Compile Include="CanvasDesignerUtility.cs" />
-    <Compile Include="UI\JavaScript\AssetInitialization.cs" />
-    <Compile Include="UI\JavaScript\CssInitialization.cs" />
-    <Compile Include="UI\JavaScript\DependencyPathRenderer.cs" />
-    <Compile Include="umbraco.presentation\umbraco\create.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\create\Language.ascx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\create\xslt.ascx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadPackager.cs" />
-    <Compile Include="PublishedCache\XmlPublishedCache\XmlCacheFilePersister.cs" />
-    <Compile Include="UmbracoComponentRenderer.cs" />
-    <Compile Include="Web References\org.umbraco.our\Reference.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Reference.map</DependentUpon>
-    </Compile>
-    <Compile Include="WebApi\AngularJsonMediaTypeFormatter.cs" />
-    <Compile Include="WebApi\AngularJsonOnlyConfigurationAttribute.cs" />
-    <Compile Include="WebApi\Binders\BlueprintItemBinder.cs" />
-    <Compile Include="WebApi\Binders\MemberBinder.cs" />
-    <Compile Include="WebApi\EnableDetailedErrorsAttribute.cs" />
-    <Compile Include="WebApi\Filters\AdminUsersAuthorizeAttribute.cs" />
-    <Compile Include="WebApi\Filters\AngularAntiForgeryHelper.cs" />
-    <Compile Include="WebApi\Filters\AppendCurrentEventMessagesAttribute.cs" />
-    <Compile Include="WebApi\Filters\AppendUserModifiedHeaderAttribute.cs" />
-    <Compile Include="WebApi\Filters\ClearAngularAntiForgeryTokenAttribute.cs" />
-    <Compile Include="WebApi\Filters\DisableBrowserCacheAttribute.cs" />
-    <Compile Include="WebApi\Filters\EnableOverrideAuthorizationAttribute.cs" />
-    <Compile Include="WebApi\Filters\FeatureAuthorizeAttribute.cs" />
-    <Compile Include="WebApi\Filters\FilterGrouping.cs" />
-    <Compile Include="WebApi\Filters\HttpQueryStringModelBinder.cs" />
-    <Compile Include="WebApi\Filters\LegacyTreeAuthorizeAttribute.cs" />
-    <Compile Include="WebApi\Filters\OutgoingEditorModelEventAttribute.cs" />
-    <Compile Include="WebApi\Filters\OutgoingNoHyphenGuidFormatAttribute.cs" />
-    <Compile Include="WebApi\Filters\OverridableAuthorizationAttribute.cs" />
-    <Compile Include="WebApi\Filters\SetAngularAntiForgeryTokensAttribute.cs" />
-    <Compile Include="WebApi\Filters\UmbracoBackOfficeLogoutAttribute.cs" />
-    <Compile Include="WebApi\Filters\UmbracoWebApiRequireHttpsAttribute.cs" />
-    <Compile Include="WebApi\Filters\UmbracoTreeAuthorizeAttribute.cs" />
-    <Compile Include="WebApi\Filters\UmbracoUseHttps.cs" />
-    <Compile Include="WebApi\Filters\ValidateAngularAntiForgeryTokenAttribute.cs" />
-    <Compile Include="WebApi\Filters\CheckIfUserTicketDataIsStaleAttribute.cs" />
-    <Compile Include="WebApi\HttpControllerContextExtensions.cs" />
-    <Compile Include="WebApi\CustomDateTimeConvertor.cs" />
-    <Compile Include="Models\ContentEditing\ContentSortOrder.cs" />
-    <Compile Include="Editors\ContentControllerBase.cs" />
-    <Compile Include="Editors\ContentTypeController.cs" />
-    <Compile Include="Editors\LegacyController.cs" />
-    <Compile Include="Controllers\UmbRegisterController.cs" />
-    <Compile Include="Models\ProfileModel.cs" />
-    <Compile Include="Models\LoginStatusModel.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\MarkdownEditorValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\TextStringValueConverter.cs" />
-    <Compile Include="PublishedContentPropertyExtension.cs" />
-    <Compile Include="Models\UmbracoProperty.cs" />
-    <Compile Include="Mvc\MergeParentContextViewDataAttribute.cs" />
-    <Compile Include="Mvc\ViewDataDictionaryExtensions.cs" />
-    <Compile Include="Routing\ContentLastChanceFinderByNotFoundHandlers.cs" />
-    <Compile Include="Models\RegisterModel.cs" />
-    <Compile Include="Models\LoginModel.cs" />
-    <Compile Include="Editors\MediaTypeController.cs" />
-    <Compile Include="Scheduling\IBackgroundTask.cs" />
-    <Compile Include="Scheduling\KeepAlive.cs" />
-    <Compile Include="Scheduling\LogScrubber.cs" />
-    <Compile Include="Scheduling\ScheduledPublishing.cs" />
-    <Compile Include="Scheduling\ScheduledTasks.cs" />
-    <Compile Include="Scheduling\TaskEventArgs.cs" />
-    <Compile Include="Security\MembershipHelper.cs" />
-    <Compile Include="Editors\SectionController.cs" />
-    <Compile Include="Editors\UmbracoAuthorizedJsonController.cs" />
-    <Compile Include="Editors\ValidationHelper.cs" />
-    <Compile Include="HttpCookieExtensions.cs" />
-    <Compile Include="Models\ContentEditing\ContentItemDisplayBase.cs" />
-    <Compile Include="Models\ContentEditing\ContentSaveAction.cs" />
-    <Compile Include="Models\ContentEditing\ContentTypeBasic.cs" />
-    <Compile Include="Models\ContentEditing\IErrorModel.cs" />
-    <Compile Include="Models\ContentEditing\IHaveUploadedFiles.cs" />
-    <Compile Include="Models\ContentEditing\INotificationModel.cs" />
-    <Compile Include="Models\ContentEditing\MediaItemDisplay.cs" />
-    <Compile Include="Models\ContentEditing\MessagesExtensions.cs" />
-    <Compile Include="Models\ContentEditing\Notification.cs" />
-    <Compile Include="Models\ContentEditing\Section.cs" />
-    <Compile Include="Models\ContentEditing\Tab.cs" />
-    <Compile Include="Models\ContentEditing\TabbedContentItem.cs" />
-    <Compile Include="Models\ContentEditing\UserProfile.cs" />
-    <Compile Include="Models\ContentEditing\UserDetail.cs" />
-    <Compile Include="FormDataCollectionExtensions.cs" />
-    <Compile Include="Models\Mapping\ContentPropertyBasicConverter.cs" />
-    <Compile Include="Models\Mapping\ContentPropertyDisplayConverter.cs" />
-    <Compile Include="Models\Mapping\ContentPropertyDtoConverter.cs" />
-    <Compile Include="Models\Mapping\ContentPropertyModelMapper.cs" />
-    <Compile Include="Models\Mapping\CreatorResolver.cs" />
-    <Compile Include="Models\Mapping\MediaModelMapper.cs" />
-    <Compile Include="Models\Mapping\ContentTypeModelMapper.cs" />
-    <Compile Include="Models\Mapping\ContentModelMapper.cs" />
-    <Compile Include="Models\Mapping\OwnerResolver.cs" />
-    <Compile Include="Models\Mapping\SectionModelMapper.cs" />
-    <Compile Include="Models\Mapping\TabsAndPropertiesResolver.cs" />
-    <Compile Include="Models\Mapping\UserModelMapper.cs" />
-    <Compile Include="PropertyEditors\ContentPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\FileUploadPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\FileUploadPropertyValueEditor.cs" />
-    <Compile Include="PropertyEditors\RichTextPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\TextAreaPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\TextboxPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\TrueFalsePropertyEditor.cs" />
-    <Compile Include="Trees\MediaTreeController.cs" />
-    <Compile Include="Models\Trees\ActionMenuItem.cs" />
-    <Compile Include="Models\Trees\ActionMenuItemAttribute.cs" />
-    <Compile Include="Trees\ActionUrlMethod.cs" />
-    <Compile Include="Trees\ApplicationTreeRegistrar.cs" />
-    <Compile Include="Trees\ContentTreeControllerBase.cs" />
-    <Compile Include="Trees\LegacyTreeController.cs" />
-    <Compile Include="Search\ISearchableTree.cs" />
-    <Compile Include="Trees\LegacyTreeDataConverter.cs" />
-    <Compile Include="Trees\LegacyTreeJavascript.cs" />
-    <Compile Include="Trees\LegacyTreeParams.cs" />
-    <Compile Include="Models\Trees\MenuItem.cs" />
-    <Compile Include="Models\Trees\MenuItemCollection.cs" />
-    <Compile Include="Models\Trees\RefreshNode.cs" />
-    <Compile Include="Models\ContentEditing\SearchResultItem.cs" />
-    <Compile Include="Models\Trees\SectionRootNode.cs" />
-    <Compile Include="Trees\TreeController.cs" />
-    <Compile Include="Trees\ApplicationTreeExtensions.cs" />
-    <Compile Include="Trees\TreeAttribute.cs" />
-    <Compile Include="Models\Trees\TreeNode.cs" />
-    <Compile Include="Models\Trees\TreeNodeCollection.cs" />
-    <Compile Include="Models\Trees\TreeNodeExtensions.cs" />
-    <Compile Include="Trees\TreeNodeRenderingEventArgs.cs" />
-    <Compile Include="Trees\TreeNodesRenderingEventArgs.cs" />
-    <Compile Include="Trees\TreeQueryStringParameters.cs" />
-    <Compile Include="Trees\ApplicationTreeController.cs" />
-    <Compile Include="Editors\BackOfficeController.cs" />
-    <Compile Include="Security\Providers\MembersMembershipProvider.cs" />
-    <Compile Include="Security\Providers\MembersRoleProvider.cs" />
-    <Compile Include="Security\Providers\UmbracoMembershipProvider.cs" />
-    <Compile Include="Security\Providers\UsersMembershipProvider.cs" />
-    <Compile Include="Trees\ContentTreeController.cs" />
-    <Compile Include="Trees\TreeRenderingEventArgs.cs" />
-    <Compile Include="Trees\UrlHelperExtensions.cs" />
-    <Compile Include="UI\JavaScript\JsInitialization.cs" />
-    <Compile Include="Models\ContentEditing\ContentItemBasic.cs" />
-    <Compile Include="Models\ContentEditing\ContentItemDisplay.cs" />
-    <Compile Include="Models\ContentEditing\ContentItemDto.cs" />
-    <Compile Include="Models\ContentEditing\ContentItemFile.cs" />
-    <Compile Include="Models\ContentEditing\ContentItemSave.cs" />
-    <Compile Include="Models\ContentEditing\ContentPropertyBasic.cs" />
-    <Compile Include="Models\ContentEditing\ContentPropertyDisplay.cs" />
-    <Compile Include="Models\ContentEditing\ContentPropertyDto.cs" />
-    <Compile Include="Dynamics\DynamicExpression.cs" />
-    <Compile Include="Dynamics\DynamicGrouping.cs" />
-    <Compile Include="Dynamics\DynamicPublishedContentIdEqualityComparer.cs" />
-    <Compile Include="Dynamics\DynamicPublishedContentListOrdering.cs" />
-    <Compile Include="Dynamics\DynamicQueryable.cs" />
-    <Compile Include="Dynamics\ExpressionParser.cs" />
-    <Compile Include="Dynamics\ExtensionMethods.cs" />
-    <Compile Include="Dynamics\Grouping.cs" />
-    <Compile Include="HttpRequestExtensions.cs" />
-    <Compile Include="HttpUrlHelperExtensions.cs" />
-    <Compile Include="Install\FilePermissionHelper.cs" />
-    <Compile Include="Install\InstallHelper.cs" />
-    <Compile Include="Install\HttpInstallAuthorizeAttribute.cs" />
-    <Compile Include="Macros\PartialViewMacroController.cs" />
-    <Compile Include="Macros\PartialViewMacroEngine.cs" />
-    <Compile Include="Macros\PartialViewMacroPage.cs" />
-    <Compile Include="Media\ImageUrl.cs" />
-    <Compile Include="Media\ImageUrlProviderResolver.cs" />
-    <Compile Include="Media\ImageUrlProviders\ImageUrlProvider.cs" />
-    <Compile Include="Models\DynamicPublishedContent.cs" />
-    <Compile Include="Models\DynamicPublishedContentList.cs" />
-    <Compile Include="Models\PartialViewMacroModel.cs" />
-    <Compile Include="Models\PublishedContentBase.cs" />
-    <Compile Include="Mvc\AreaRegistrationExtensions.cs" />
-    <Compile Include="BaseRest\BaseRestHandler.cs" />
-    <Compile Include="BaseRest\MemberRest.cs" />
-    <Compile Include="BaseRest\RestExtensionAttribute.cs" />
-    <Compile Include="BaseRest\RestExtensionMethodAttribute.cs" />
-    <Compile Include="BaseRest\RestExtensionMethodInfo.cs" />
-    <Compile Include="ContextualPublishedCacheExtensions.cs" />
-    <Compile Include="Mvc\DefaultRenderMvcControllerResolver.cs" />
-    <Compile Include="Mvc\QueryStringFilterAttribute.cs" />
-    <Compile Include="PublishedCache\ContextualPublishedContentCache.cs" />
-    <Compile Include="PublishedCache\ContextualPublishedCacheOfT.cs" />
-    <Compile Include="PublishedCache\ContextualPublishedCache.cs" />
-    <Compile Include="PublishedCache\ContextualPublishedMediaCache.cs" />
-    <Compile Include="PublishedCache\PublishedCachesResolver.cs" />
-    <Compile Include="PublishedCache\IPublishedCaches.cs" />
-    <Compile Include="PublishedCache\PublishedCaches.cs" />
-    <Compile Include="PublishedCache\XmlPublishedCache\PublishedMediaCache.cs" />
-    <Compile Include="Dictionary\UmbracoCultureDictionary.cs" />
-    <Compile Include="Dictionary\UmbracoCultureDictionaryFactory.cs" />
-    <Compile Include="Mvc\MemberAuthorizeAttribute.cs" />
-    <Compile Include="Mvc\BackOfficeArea.cs" />
-    <Compile Include="Mvc\ControllerFactoryExtensions.cs" />
-    <Compile Include="Mvc\IRenderMvcController.cs" />
-    <Compile Include="Mvc\SurfaceRouteHandler.cs" />
-    <Compile Include="PublishedCache\XmlPublishedCache\RoutesCache.cs" />
-    <Compile Include="PublishedCache\XmlPublishedCache\UmbracoContextCache.cs" />
-    <Compile Include="Routing\UrlProviderMode.cs" />
-    <Compile Include="Search\ExamineIndexerModel.cs" />
-    <Compile Include="Search\LuceneIndexerExtensions.cs" />
-    <Compile Include="Security\ValidateRequestAttempt.cs" />
-    <Compile Include="Security\WebSecurity.cs" />
-    <Compile Include="UI\JavaScript\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="UI\JavaScript\ServerVariablesParser.cs" />
-    <Compile Include="Strategies\Migrations\RebuildXmlCachesAfterUpgrade.cs" />
-    <Compile Include="Strategies\PublicAccessEventHandler.cs" />
-    <Compile Include="UI\Bundles\JsApplicationLib.cs" />
-    <Compile Include="UI\Bundles\JsJQueryCore.cs" />
-    <Compile Include="UI\Bundles\JsJQueryPlugins.cs" />
-    <Compile Include="UI\Bundles\JsUmbracoApplicationCore.cs" />
-    <Compile Include="UI\Bundles\JsUmbracoApplicationUI.cs" />
-    <Compile Include="UI\Bundles\JsUmbracoTree.cs" />
-    <Compile Include="UI\CdfLogger.cs" />
-    <Compile Include="Models\LegacyNodeHelper.cs" />
-    <Compile Include="umbraco.presentation\umbraco\controls\Tree\TreeControl.ascx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\create\simple.ascx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Packages\directoryBrowser.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\ProtectPage.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\create.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\AssignDomain2.aspx.cs">
-      <DependentUpon>AssignDomain2.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\AssignDomain2.aspx.designer.cs">
-      <DependentUpon>AssignDomain2.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="UmbracoContextExtensions.cs" />
-    <Compile Include="umbraco.presentation\umbraco\settings\stylesheet\editstylesheet.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\settings\stylesheet\property\EditStyleSheetProperty.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Controllers\UmbLoginController.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\TranslateTreeNames.cs" />
-    <Compile Include="UrlHelperExtensions.cs" />
-    <Compile Include="Editors\MediaController.cs" />
-    <Compile Include="UrlHelperRenderExtensions.cs" />
-    <Compile Include="WebApi\Binders\ContentItemBaseBinder.cs" />
-    <Compile Include="WebApi\IsBackOfficeAttribute.cs" />
-    <Compile Include="WebApi\Binders\ContentItemBinder.cs" />
-    <Compile Include="WebApi\Binders\MediaItemBinder.cs" />
-    <Compile Include="WebApi\Filters\EnsureUserPermissionForContentAttribute.cs" />
-    <Compile Include="WebApi\Filters\ContentItemValidationHelper.cs" />
-    <Compile Include="WebApi\Filters\EnsureUserPermissionForMediaAttribute.cs" />
-    <Compile Include="WebApi\Filters\FileUploadCleanupFilterAttribute.cs" />
-    <Compile Include="WebApi\Filters\FilterAllowedOutgoingContentAttribute.cs" />
-    <Compile Include="WebApi\Filters\FilterAllowedOutgoingMediaAttribute.cs" />
-    <Compile Include="WebApi\Filters\HttpQueryStringFilterAttribute.cs" />
-    <Compile Include="WebApi\Filters\OutgoingDateTimeFormatAttribute.cs" />
-    <Compile Include="WebApi\Filters\UmbracoApplicationAuthorizeAttribute.cs" />
-    <Compile Include="WebApi\GuidNoHyphenConverter.cs" />
-    <Compile Include="WebApi\HttpRequestMessageExtensions.cs" />
-    <Compile Include="WebApi\JsonCamelCaseFormatter.cs" />
-    <Compile Include="WebApi\MemberAuthorizeAttribute.cs" />
-    <Compile Include="WebApi\MvcVersionCheck.cs" />
-    <Compile Include="WebApi\NamespaceHttpControllerSelector.cs" />
-    <Compile Include="WebApi\PrefixlessBodyModelValidator.cs" />
-    <Compile Include="WebApi\PrefixlessBodyModelValidatorAttribute.cs" />
-    <Compile Include="WebApi\SessionHttpControllerRouteHandler.cs" />
-    <Compile Include="WebApi\UmbracoApiController.cs" />
-    <Compile Include="WebApi\UmbracoApiControllerBase.cs" />
-    <Compile Include="WebApi\UmbracoApiControllerResolver.cs" />
-    <Compile Include="Mvc\UmbracoAuthorizeAttribute.cs" />
-    <Compile Include="Mvc\NotChildAction.cs" />
-    <Compile Include="Mvc\UmbracoAuthorizedController.cs" />
-    <Compile Include="Mvc\UmbracoController.cs" />
-    <Compile Include="Mvc\UmbracoControllerFactory.cs" />
-    <Compile Include="Mvc\UmbracoMvcHandler.cs" />
-    <Compile Include="Mvc\UmbracoViewPageOfTModel.cs" />
-    <Compile Include="PublishedCache\IPublishedCache.cs" />
-    <Compile Include="PublishedCache\IPublishedContentCache.cs" />
-    <Compile Include="PublishedCache\IPublishedMediaCache.cs" />
-    <Compile Include="PublishedContentExtensions.cs" />
-    <Compile Include="ExamineExtensions.cs" />
-    <Compile Include="FormlessPage.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="HtmlHelperRenderExtensions.cs" />
-    <Compile Include="Scheduling\Scheduler.cs" />
-    <Compile Include="Media\EmbedProviders\AbstractOEmbedProvider.cs" />
-    <Compile Include="Media\EmbedProviders\AbstractProvider.cs" />
-    <Compile Include="Media\EmbedProviders\OEmbedRich.cs" />
-    <Compile Include="Media\EmbedProviders\OEmbedVideo.cs" />
-    <Compile Include="Media\EmbedProviders\Settings\Dictionary.cs" />
-    <Compile Include="Media\EmbedProviders\Settings\String.cs" />
-    <Compile Include="Media\EmbedProviders\Twitgoo.cs" />
-    <Compile Include="ModelStateExtensions.cs" />
-    <Compile Include="Mvc\HtmlTagWrapper.cs" />
-    <Compile Include="Mvc\HtmlTagWrapperTextNode.cs" />
-    <Compile Include="Mvc\IHtmlTagWrapper.cs" />
-    <Compile Include="Mvc\MergeModelStateToChildActionAttribute.cs" />
-    <Compile Include="Mvc\PluginController.cs" />
-    <Compile Include="Mvc\PluginViewEngine.cs" />
-    <Compile Include="Mvc\PostedDataProxyInfo.cs" />
-    <Compile Include="Mvc\RedirectToUmbracoPageResult.cs" />
-    <Compile Include="Mvc\Strings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Strings.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Mvc\SurfaceController.cs" />
-    <Compile Include="Mvc\PluginControllerArea.cs" />
-    <Compile Include="Mvc\PluginControllerAttribute.cs" />
-    <Compile Include="Mvc\SurfaceControllerFactory.cs" />
-    <Compile Include="Mvc\PluginControllerMetadata.cs" />
-    <Compile Include="Mvc\UmbracoPageResult.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\RteMacroRenderingValueConverter.cs" />
-    <Compile Include="RenderFieldCaseType.cs" />
-    <Compile Include="RenderFieldEncodingType.cs" />
-    <Compile Include="RouteCollectionExtensions.cs" />
-    <Compile Include="Routing\AliasUrlProvider.cs" />
-    <Compile Include="Routing\ContentFinderByLegacy404.cs" />
-    <Compile Include="Routing\ContentFinderByNotFoundHandler.cs" />
-    <Compile Include="Routing\ContentFinderByPageIdQuery.cs" />
-    <Compile Include="Mvc\SurfaceControllerResolver.cs" />
-    <Compile Include="Routing\ContentFinderByNotFoundHandlers.cs" />
-    <Compile Include="Routing\ISiteDomainHelper.cs" />
-    <Compile Include="Routing\RoutableAttemptEventArgs.cs" />
-    <Compile Include="Routing\DefaultUrlProvider.cs" />
-    <Compile Include="Routing\DomainAndUri.cs" />
-    <Compile Include="Routing\IUrlProvider.cs" />
-    <Compile Include="Routing\SiteDomainHelper.cs" />
-    <Compile Include="Routing\SiteDomainHelperResolver.cs" />
-    <Compile Include="Routing\UrlProviderResolver.cs" />
-    <Compile Include="Routing\NotFoundHandlerHelper.cs" />
-    <Compile Include="Routing\EnsureRoutableOutcome.cs" />
-    <Compile Include="Security\LegacyDefaultAppMapping.cs" />
-    <Compile Include="Routing\PublishedContentRequestEngine.cs" />
-    <Compile Include="Routing\UrlProvider.cs" />
-    <Compile Include="Routing\WebServicesRouteConstraint.cs" />
-    <Compile Include="Search\ExamineSearcherModel.cs" />
-    <Compile Include="Search\ExamineEvents.cs" />
-    <Compile Include="Strategies\DataTypes\LegacyUploadFieldWorkaround.cs" />
-    <Compile Include="Strategies\Migrations\PublishAfterUpgradeToVersionSixth.cs" />
-    <Compile Include="Strategies\LegacyClasses.cs" />
-    <Compile Include="Strategies\Migrations\EnsureAppsTreesUpdatedOnUpgrade.cs" />
-    <Compile Include="Strategies\ServerRegistrationEventHandler.cs" />
-    <Compile Include="Templates\TemplateRenderer.cs" />
-    <Compile Include="Templates\TemplateUtilities.cs" />
-    <Compile Include="Trees\PartialViewMacrosTreeController.cs" />
-    <Compile Include="Trees\PartialViewsTreeController.cs" />
-    <Compile Include="UI\Controls\InsertMacroSplitButton.cs" />
-    <Compile Include="UI\IAssignedApp.cs" />
-    <Compile Include="UI\LegacyDialogHandler.cs" />
-    <Compile Include="UI\LegacyDialogTask.cs" />
-    <Compile Include="UI\Controls\ProgressBar.cs" />
-    <Compile Include="UI\Controls\UmbracoControl.cs" />
-    <Compile Include="UI\Controls\UmbracoUserControl.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="UI\Pages\BasePage.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="UI\Pages\ClientTools.cs" />
-    <Compile Include="UI\Pages\UmbracoEnsuredPage.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="UI\SpeechBubbleIcon.cs" />
-    <Compile Include="umbraco.presentation\AttributeCollectionAdapter.cs" />
-    <Compile Include="umbraco.presentation\Default.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\MacroCacheContent.cs" />
-    <Compile Include="umbraco.presentation\ScriptingMacroResult.cs" />
-    <Compile Include="umbraco.presentation\umbraco\dialogs\sort.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\macroResultWrapper.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\masterpages\default.Master.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\publishStatus.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\Default.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\tree.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\ping.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Macros\editMacro.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Python\editPython.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\editXslt.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\editMacro.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\umbracoField.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\treePicker.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\masterpages\umbracoPage.master.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\masterpages\umbracoDialog.master.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\nodeFactory\UmbracoSiteMapProviderAccessUpdate.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Search\QuickSearch.ascx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\settings\modals\ShowUmbracoTags.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\templateControls\Image.cs" />
-    <Compile Include="umbraco.presentation\umbraco\uQuery\IGetProperty.cs" />
-    <Compile Include="umbraco.presentation\XsltExtensionAttribute.cs" />
-    <Compile Include="UmbracoHelper.cs" />
-    <Compile Include="Mvc\ViewContextExtensions.cs" />
-    <Compile Include="Mvc\ViewDataContainerExtensions.cs" />
-    <Compile Include="PublishedCache\XmlPublishedCache\PublishedContentCache.cs" />
-    <Compile Include="Routing\PublishedContentNotFoundHandler.cs" />
-    <Compile Include="PublishedCache\XmlPublishedCache\XmlPublishedContent.cs" />
-    <Compile Include="PublishedCache\XmlPublishedCache\XmlPublishedProperty.cs" />
-    <Compile Include="Mvc\Constants.cs" />
-    <Compile Include="Mvc\FilteredControllerFactoriesResolver.cs" />
-    <Compile Include="Mvc\IFilteredControllerFactory.cs" />
-    <Compile Include="Mvc\MasterControllerFactory.cs" />
-    <Compile Include="Mvc\RenderActionInvoker.cs" />
-    <Compile Include="Mvc\RenderControllerFactory.cs" />
-    <Compile Include="Models\RenderModel.cs" />
-    <Compile Include="Mvc\RenderModelBinder.cs" />
-    <Compile Include="Mvc\RenderMvcController.cs" />
-    <Compile Include="Mvc\RenderRouteHandler.cs" />
-    <Compile Include="Mvc\RenderViewEngine.cs" />
-    <Compile Include="Mvc\UmbracoTemplatePage.cs" />
-    <Compile Include="Mvc\RouteDefinition.cs" />
-    <Compile Include="Mvc\RouteValueDictionaryExtensions.cs" />
-    <Compile Include="umbraco.presentation\umbraco\nodeFactory\Node.cs" />
-    <Compile Include="umbraco.presentation\umbraco\nodeFactory\Nodes.cs" />
-    <Compile Include="umbraco.presentation\umbraco\nodeFactory\Property.cs" />
-    <Compile Include="Routing\UmbracoRequestEventArgs.cs" />
-    <Compile Include="UmbracoUserControl.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="WebApi\UmbracoAuthorizeAttribute.cs" />
-    <Compile Include="WebApi\UmbracoAuthorizedApiController.cs" />
-    <Compile Include="WebApi\Filters\ValidationFilterAttribute.cs" />
-    <Compile Include="WebApi\Filters\UmbracoUserTimeoutFilterAttribute.cs" />
-    <Compile Include="WebApi\UnhandedExceptionLoggerConfigurationAttribute.cs" />
-    <Compile Include="WebApi\UnhandledExceptionLogger.cs" />
-    <Compile Include="WebApi\WebApiHelper.cs" />
-    <Compile Include="WebBootManager.cs" />
-    <Compile Include="Routing\LegacyRequestInitializer.cs" />
-    <Compile Include="Mvc\ControllerExtensions.cs" />
-    <Compile Include="Routing\ContentLastChanceFinderResolver.cs" />
-    <Compile Include="Routing\ContentFinderByUrlAlias.cs" />
-    <Compile Include="Media\ThumbnailProviders\AbstractThumbnailProvider.cs" />
-    <Compile Include="Media\ThumbnailProviders\MediaTypeIconThumbnailProvider.cs" />
-    <Compile Include="Media\ThumbnailProviders\FileExtensionIconThumbnailProvider.cs" />
-    <Compile Include="Media\ThumbnailProviders\ImageThumbnailProvider.cs" />
-    <Compile Include="Media\ThumbnailProviders\ThumbnailProvidersResolver.cs" />
-    <Compile Include="UI\Controls\FolderBrowser.cs" />
-    <Compile Include="Routing\ContentFinderByIdPath.cs" />
-    <Compile Include="Routing\ContentFinderByNiceUrl.cs" />
-    <Compile Include="Routing\ContentFinderByNiceUrlAndTemplate.cs" />
-    <Compile Include="Routing\ContentFinderByProfile.cs" />
-    <Compile Include="PluginManagerExtensions.cs" />
-    <Compile Include="Routing\DomainHelper.cs" />
-    <Compile Include="Routing\ContentFinderResolver.cs" />
-    <Compile Include="Routing\PublishedContentRequest.cs" />
-    <Compile Include="Routing\IContentFinder.cs" />
-    <Compile Include="Routing\RoutingContext.cs" />
-    <Compile Include="umbraco.presentation\EnsureSystemPathsApplicationStartupHandler.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\BasePageExtensions.cs" />
-    <Compile Include="umbraco.presentation\content.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\helper.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\item.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\keepAliveService.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\library.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\macro.cs" />
-    <Compile Include="umbraco.presentation\page.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\Settings1.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>Settings.settings</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\publishingService.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\PublishQueue.cs" />
-    <Compile Include="umbraco.presentation\python.cs" />
-    <Compile Include="umbraco.presentation\NotFoundHandlers.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\requestModule.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\showField.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\template.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\UmbracoContext.cs" />
-    <Compile Include="umbraco.presentation\UmbracoPage.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbracoPageHolder.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\UmbracoRequest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\UmbracoResponse.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\UmbracoServerUtility.cs" />
-    <Compile Include="umbraco.presentation\umbraco\actions\delete.aspx.cs">
-      <DependentUpon>delete.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\actions\delete.aspx.designer.cs">
-      <DependentUpon>delete.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\actions\editContent.aspx.cs">
-      <DependentUpon>editContent.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\actions\editContent.aspx.designer.cs">
-      <DependentUpon>editContent.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\actions\preview.aspx.cs">
-      <DependentUpon>preview.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\actions\preview.aspx.designer.cs">
-      <DependentUpon>preview.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\actions\publish.aspx.cs">
-      <DependentUpon>publish.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\actions\publish.aspx.designer.cs">
-      <DependentUpon>publish.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\controls\ContentControl.cs" />
-    <Compile Include="umbraco.presentation\umbraco\controls\ContentPicker.cs" />
-    <Compile Include="umbraco.presentation\umbraco\controls\ContentTypeControl.cs" />
-    <Compile Include="umbraco.presentation\umbraco\controls\Images\ImageViewer.ascx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\controls\dualSelectBox.cs" />
-    <Compile Include="umbraco.presentation\umbraco\controls\GenericValidation.cs" />
-    <Compile Include="umbraco.presentation\umbraco\controls\LabelButton.cs" />
-    <Compile Include="umbraco.presentation\umbraco\controls\macroParameterControl.cs" />
-    <Compile Include="umbraco.presentation\umbraco\controls\ProgressBar.ascx.cs">
-      <DependentUpon>ProgressBar.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\controls\ProgressBar.ascx.designer.cs">
-      <DependentUpon>ProgressBar.ascx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\controls\SaveClickEventArgs.cs" />
-    <Compile Include="umbraco.presentation\umbraco\controls\Tree\CustomTreeControl.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\controls\Tree\CustomTreeService.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\controls\Tree\JTreeContextMenu.cs" />
-    <Compile Include="umbraco.presentation\umbraco\controls\Tree\JTreeContextMenuItem.cs" />
-    <Compile Include="umbraco.presentation\umbraco\controls\Tree\NodeInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\create\CreatedPackageTasks.cs" />
-    <Compile Include="umbraco.presentation\umbraco\create\dictionaryTasks.cs" />
-    <Compile Include="umbraco.presentation\umbraco\create\macroTasks.cs" />
-    <Compile Include="umbraco.presentation\umbraco\create\MemberGroupTasks.cs" />
-    <Compile Include="umbraco.presentation\umbraco\create\stylesheetPropertyTasks.cs" />
-    <Compile Include="umbraco.presentation\umbraco\create\StylesheetTasks.cs" />
-    <Compile Include="umbraco.presentation\umbraco\create\XsltTasks.cs" />
-    <Compile Include="umbraco.presentation\umbraco\dashboard\FeedProxy.aspx.cs">
-      <DependentUpon>FeedProxy.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dashboard\FeedProxy.aspx.designer.cs">
-      <DependentUpon>FeedProxy.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\EditRelationType.aspx.cs">
-      <DependentUpon>EditRelationType.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\EditRelationType.aspx.designer.cs">
-      <DependentUpon>EditRelationType.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\NewRelationType.aspx.cs">
-      <DependentUpon>NewRelationType.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\NewRelationType.aspx.designer.cs">
-      <DependentUpon>NewRelationType.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\ReadOnlyRelation.cs" />
-    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\RelationTypesWebService.asmx.cs">
-      <DependentUpon>RelationTypesWebService.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\TreeMenu\ActionDeleteRelationType.cs" />
-    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\TreeMenu\ActionNewRelationType.cs" />
-    <Compile Include="umbraco.presentation\umbraco\dialogs\Preview.aspx.cs">
-      <DependentUpon>Preview.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\Preview.aspx.designer.cs">
-      <DependentUpon>Preview.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\members\MemberSearch.ascx.cs">
-      <DependentUpon>MemberSearch.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\members\MemberSearch.ascx.designer.cs">
-      <DependentUpon>MemberSearch.ascx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\nodeFactory\Page_Legacy.cs" />
-    <Compile Include="umbraco.presentation\umbraco\preview\PreviewContent.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Search\ExamineEvents.cs" />
-    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltVisualize.aspx.cs">
-      <DependentUpon>xsltVisualize.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltVisualize.aspx.designer.cs">
-      <DependentUpon>xsltVisualize.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\insertMasterpageContent.aspx.cs">
-      <DependentUpon>insertMasterpageContent.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\insertMasterpageContent.aspx.designer.cs">
-      <DependentUpon>insertMasterpageContent.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\insertMasterpagePlaceholder.aspx.cs">
-      <DependentUpon>insertMasterpagePlaceholder.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\insertMasterpagePlaceholder.aspx.designer.cs">
-      <DependentUpon>insertMasterpagePlaceholder.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\republish.aspx.cs">
-      <DependentUpon>republish.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\republish.aspx.designer.cs">
-      <DependentUpon>republish.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\search.aspx.cs">
-      <DependentUpon>search.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\search.aspx.designer.cs">
-      <DependentUpon>search.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\SendPublish.aspx.cs">
-      <DependentUpon>SendPublish.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\SendPublish.aspx.designer.cs">
-      <DependentUpon>SendPublish.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\create\dialogHandler_temp.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\create\languageTasks.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Macros\assemblyBrowser.aspx.cs">
-      <DependentUpon>assemblyBrowser.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Macros\assemblyBrowser.aspx.designer.cs">
-      <DependentUpon>assemblyBrowser.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Packages\editPackage.aspx.cs">
-      <DependentUpon>editPackage.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Packages\editPackage.aspx.designer.cs">
-      <DependentUpon>editPackage.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\getXsltStatus.asmx.cs">
-      <DependentUpon>getXsltStatus.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltChooseExtension.aspx.cs">
-      <DependentUpon>xsltChooseExtension.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltChooseExtension.aspx.designer.cs">
-      <DependentUpon>xsltChooseExtension.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltInsertValueOf.aspx.cs">
-      <DependentUpon>xsltInsertValueOf.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltInsertValueOf.aspx.designer.cs">
-      <DependentUpon>xsltInsertValueOf.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\exportDocumenttype.aspx.cs">
-      <DependentUpon>exportDocumenttype.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\importDocumenttype.aspx.cs">
-      <DependentUpon>importDocumenttype.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\rollBack.aspx.cs">
-      <DependentUpon>rollBack.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\rollBack.aspx.designer.cs">
-      <DependentUpon>rollBack.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\sendToTranslation.aspx.cs">
-      <DependentUpon>sendToTranslation.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\sendToTranslation.aspx.designer.cs">
-      <DependentUpon>sendToTranslation.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\viewAuditTrail.aspx.cs">
-      <DependentUpon>viewAuditTrail.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\viewAuditTrail.aspx.designer.cs">
-      <DependentUpon>viewAuditTrail.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\members\EditMemberGroup.aspx.cs">
-      <DependentUpon>EditMemberGroup.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\members\EditMemberGroup.aspx.designer.cs">
-      <DependentUpon>EditMemberGroup.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\members\search.aspx.cs">
-      <DependentUpon>search.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\members\search.aspx.designer.cs">
-      <DependentUpon>search.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\members\ViewMembers.aspx.cs">
-      <DependentUpon>ViewMembers.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\members\ViewMembers.aspx.designer.cs">
-      <DependentUpon>ViewMembers.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\nodeFactory\Properties.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\nodeFactory\UmbracoSiteMapProvider.cs" />
-    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\GzipCompressor.cs" />
-    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\GzipModule.cs" />
-    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\IModule.cs" />
-    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\JSON.cs" />
-    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\JSONReader.cs" />
-    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\JSONWriter.cs" />
-    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\tinymce3tinymceCompress.aspx.cs">
-      <DependentUpon>tinymce3tinymceCompress.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\tinymce3tinymceCompress.aspx.designer.cs">
-      <DependentUpon>tinymce3tinymceCompress.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\Search\QuickSearchHandler.ashx.cs">
-      <DependentUpon>QuickSearchHandler.ashx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\settings\DictionaryItemList.aspx.cs">
-      <DependentUpon>DictionaryItemList.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\settings\DictionaryItemList.aspx.designer.cs">
-      <DependentUpon>DictionaryItemList.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\settings\editLanguage.aspx.cs">
-      <DependentUpon>editLanguage.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\settings\editLanguage.aspx.designer.cs">
-      <DependentUpon>editLanguage.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\templateControls\Script.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\BaseMediaTree.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadDLRScripts.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\ITreeService.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadRelationTypes.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\MediaRecycleBin.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\NodeActionsEventArgs.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\TreeEventArgs.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\TreeRequestParams.cs" />
-    <Compile Include="umbraco.presentation\umbraco\uQuery\ContentExtensions.cs" />
-    <Compile Include="umbraco.presentation\umbraco\uQuery\ContentTypeExtensions.cs" />
-    <Compile Include="umbraco.presentation\umbraco\uQuery\DocumentExtensions.cs" />
-    <Compile Include="umbraco.presentation\umbraco\uQuery\MediaExtensions.cs" />
-    <Compile Include="umbraco.presentation\umbraco\uQuery\MemberExtensions.cs" />
-    <Compile Include="umbraco.presentation\umbraco\uQuery\NodeExtensions.cs" />
-    <Compile Include="umbraco.presentation\umbraco\uQuery\PreValueExtensions.cs" />
-    <Compile Include="umbraco.presentation\umbraco\uQuery\RelationTypeExtensions.cs" />
-    <Compile Include="umbraco.presentation\umbraco\uQuery\UmbracoObjectTypeExtensions.cs" />
-    <Compile Include="umbraco.presentation\umbraco\webservices\MacroContainerService.asmx.cs">
-      <DependentUpon>MacroContainerService.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\webservices\TagsAutoCompleteHandler.ashx.cs">
-      <DependentUpon>TagsAutoCompleteHandler.ashx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\webservices\TreeClientService.asmx.cs">
-      <DependentUpon>TreeClientService.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\templateControls\DisableEventValidation.cs" />
-    <Compile Include="umbraco.presentation\umbraco\templateControls\Item.cs" />
-    <Compile Include="umbraco.presentation\umbraco\templateControls\ItemRenderer.cs" />
-    <Compile Include="umbraco.presentation\umbraco\templateControls\Macro.cs" />
-    <Compile Include="umbraco.presentation\umbraco\templateControls\ContentType.cs" />
-    <Compile Include="umbraco.presentation\umbraco\templateControls\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\translation\default.aspx.cs">
-      <DependentUpon>default.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\translation\default.aspx.designer.cs">
-      <DependentUpon>default.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\translation\details.aspx.cs">
-      <DependentUpon>details.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\translation\details.aspx.designer.cs">
-      <DependentUpon>details.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\translation\preview.aspx.cs">
-      <DependentUpon>preview.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\translation\preview.aspx.designer.cs">
-      <DependentUpon>preview.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\translation\xml.aspx.cs">
-      <DependentUpon>xml.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\translation\xml.aspx.designer.cs">
-      <DependentUpon>xml.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\treeInit.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\Trees\BaseContentTree.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\BaseTree.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\ContentRecycleBin.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\FileSystemTree.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadContent.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadcontentItemType.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadDataTypes.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadLanguages.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadMacros.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadMedia.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadMediaTypes.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadMemberGroups.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadMembers.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadMemberTypes.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadNodeTypes.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadPython.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadScripts.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadStylesheetProperty.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadStylesheets.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadTemplates.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadTranslationTasks.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadUsers.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadXslt.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\NullTree.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\LegacyTree.cs" />
-    <Compile Include="umbraco.presentation\umbraco\webservices\TreeDataService.ashx.cs">
-      <DependentUpon>TreeDataService.ashx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\Trees\TreeDefinitionCollection.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\TreeDefinition.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\TreeDialogModes.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\TreeService.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\XmlTree.cs">
-      <DependentUpon>XmlTree.xsd</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\urlRewriter\UrlRewriterFormWriter.cs" />
-    <Compile Include="umbraco.presentation\umbraco\webservices\ajaxHelpers.cs" />
-    <Compile Include="umbraco.presentation\umbraco\webservices\CacheRefresher.asmx.cs">
-      <DependentUpon>CacheRefresher.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\webservices\CheckForUpgrade.asmx.cs">
-      <DependentUpon>CheckForUpgrade.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\webservices\CMSNode.asmx.cs">
-      <DependentUpon>CMSNode.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\webservices\codeEditorSave.asmx.cs">
-      <DependentUpon>codeEditorSave.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\webservices\legacyAjaxCalls.asmx.cs">
-      <DependentUpon>legacyAjaxCalls.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\webservices\nodeSorter.asmx.cs">
-      <DependentUpon>nodeSorter.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\webservices\progressStatus.asmx.cs">
-      <DependentUpon>progressStatus.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\webservices\publication.asmx.cs">
-      <DependentUpon>publication.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\webservices\RegexComWebservice.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Web\UI\ContentPage.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery.cs" />
-    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Content.cs">
-      <DependentUpon>uQuery.cs</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-DataTypes.cs">
-      <DependentUpon>uQuery.cs</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Dictionary.cs">
-      <DependentUpon>uQuery.cs</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Document.cs">
-      <DependentUpon>uQuery.cs</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Media.cs">
-      <DependentUpon>uQuery.cs</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Members.cs">
-      <DependentUpon>uQuery.cs</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Nodes.cs">
-      <DependentUpon>uQuery.cs</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-PreValues.cs">
-      <DependentUpon>uQuery.cs</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-UmbracoObjectType.cs">
-      <DependentUpon>uQuery.cs</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\viewstateMoverModule.cs" />
-    <Compile Include="UmbracoApplication.cs" />
-    <Compile Include="UmbracoContext.cs" />
-    <Compile Include="UmbracoModule.cs" />
-    <Compile Include="UriUtility.cs" />
-    <Compile Include="Web References\org.umbraco.update\Reference.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Reference.map</DependentUpon>
-    </Compile>
-    <Compile Include="WebServices\BulkPublishController.cs" />
-    <Compile Include="WebServices\CoreStringsController.cs" />
-    <Compile Include="WebServices\DomainsApiController.cs" />
-    <Compile Include="WebServices\EmbedMediaService.cs" />
-    <Compile Include="WebServices\ExamineManagementApiController.cs" />
-    <Compile Include="WebServices\TagsController.cs" />
-    <Compile Include="WebServices\UmbracoAuthorizedHttpHandler.cs" />
-    <Compile Include="WebServices\SaveFileController.cs" />
-    <Compile Include="WebServices\UmbracoAuthorizedWebService.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="WebServices\UmbracoHttpHandler.cs" />
-    <Compile Include="WebServices\UmbracoWebService.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="WebServices\XmlDataIntegrityController.cs" />
-    <Compile Include="WebViewPageExtensions.cs" />
-    <None Include="..\Umbraco.Web.UI\Views\web.config">
-      <Link>Mvc\web.config</Link>
-    </None>
-    <None Include="packages.config" />
-    <None Include="Web References\org.umbraco.our\Reference.map">
-      <Generator>MSDiscoCodeGenerator</Generator>
-      <LastGenOutput>Reference.cs</LastGenOutput>
-    </None>
-    <None Include="Web References\org.umbraco.our\repository.disco" />
-    <EmbeddedResource Include="UI\JavaScript\Main.js" />
-    <EmbeddedResource Include="UI\JavaScript\JsInitialize.js" />
-    <EmbeddedResource Include="UI\JavaScript\ServerVariables.js" />
-    <Content Include="umbraco.presentation\umbraco\controls\Tree\CustomTreeService.asmx" />
-    <Content Include="umbraco.presentation\umbraco\developer\RelationTypes\EditRelationType.aspx" />
-    <Content Include="umbraco.presentation\umbraco\developer\RelationTypes\NewRelationType.aspx" />
-    <Content Include="umbraco.presentation\umbraco\developer\RelationTypes\RelationTypesWebService.asmx" />
-    <Content Include="umbraco.presentation\umbraco\dashboard\FeedProxy.aspx" />
-    <Content Include="umbraco.presentation\umbraco\dialogs\AssignDomain2.aspx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\members\MemberSearch.ascx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\dialogs\Preview.aspx" />
-    <Content Include="umbraco.presentation\umbraco\controls\ProgressBar.ascx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\actions\delete.aspx" />
-    <Content Include="umbraco.presentation\umbraco\actions\editContent.aspx" />
-    <Content Include="umbraco.presentation\umbraco\actions\preview.aspx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\actions\publish.aspx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\webservices\MacroContainerService.asmx" />
-    <Content Include="umbraco.presentation\umbraco\developer\Xslt\xsltVisualize.aspx" />
-    <Content Include="umbraco.presentation\umbraco\dialogs\empty.htm" />
-    <Content Include="umbraco.presentation\umbraco\dialogs\republish.aspx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\dialogs\search.aspx" />
-    <Content Include="umbraco.presentation\umbraco\dialogs\SendPublish.aspx" />
-    <Content Include="umbraco.presentation\umbraco\webservices\TreeClientService.asmx" />
-    <Content Include="umbraco.presentation\umbraco\members\search.aspx" />
-    <Content Include="umbraco.presentation\umbraco\translation\details.aspx" />
-    <Content Include="umbraco.presentation\umbraco\developer\Packages\editPackage.aspx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\dialogs\exportDocumenttype.aspx" />
-    <Content Include="umbraco.presentation\umbraco\dialogs\importDocumenttype.aspx" />
-    <Content Include="umbraco.presentation\umbraco\dialogs\rollBack.aspx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\dialogs\sendToTranslation.aspx" />
-    <Content Include="umbraco.presentation\umbraco\dialogs\viewAuditTrail.aspx" />
-    <Content Include="umbraco.presentation\umbraco\members\ViewMembers.aspx" />
-    <Content Include="umbraco.presentation\umbraco\plugins\tinymce3\tinymce3tinymceCompress.aspx" />
-    <None Include="app.config" />
-    <None Include="Web References\org.umbraco.our\repository.wsdl" />
-    <None Include="Web References\org.umbraco.update\UpgradeResult.datasource">
-      <DependentUpon>Reference.map</DependentUpon>
-    </None>
-    <None Include="Web References\org.umbraco.update\UpgradeResult1.datasource">
-      <DependentUpon>Reference.map</DependentUpon>
-    </None>
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings1.Designer.cs</LastGenOutput>
-    </None>
-    <Content Include="umbraco.presentation\umbraco\Search\QuickSearchHandler.ashx" />
-    <None Include="umbraco.presentation\umbraco\templateControls\InlineXslt.xsltTemplate" />
-    <Content Include="umbraco.presentation\umbraco\webservices\CheckForUpgrade.asmx" />
-    <Content Include="umbraco.presentation\umbraco\settings\DictionaryItemList.aspx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\translation\default.aspx" />
-    <Content Include="umbraco.presentation\umbraco\translation\preview.aspx" />
-    <Content Include="umbraco.presentation\umbraco\translation\xml.aspx" />
-    <Content Include="umbraco.presentation\umbraco\developer\Macros\assemblyBrowser.aspx" />
-    <Content Include="umbraco.presentation\umbraco\developer\Xslt\getXsltStatus.asmx" />
-    <Content Include="umbraco.presentation\umbraco\developer\Xslt\xsltChooseExtension.aspx" />
-    <Content Include="umbraco.presentation\umbraco\developer\Xslt\xsltInsertValueOf.aspx" />
-    <Content Include="umbraco.presentation\umbraco\members\EditMemberGroup.aspx">
-      <SubType>Form</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\schemas\umbraco.xsd">
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\settings\editLanguage.aspx" />
-    <!--<Content Include="umbraco.presentation\umbraco\users\PermissionEditor.aspx" />-->
-    <Content Include="umbraco.presentation\umbraco\webservices\CacheRefresher.asmx">
-      <SubType>Form</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\webservices\CMSNode.asmx" />
-    <Content Include="umbraco.presentation\umbraco\webservices\codeEditorSave.asmx" />
-    <Content Include="umbraco.presentation\umbraco\webservices\legacyAjaxCalls.asmx" />
-    <Content Include="umbraco.presentation\umbraco\webservices\nodeSorter.asmx" />
-    <Content Include="umbraco.presentation\umbraco\webservices\progressStatus.asmx">
-      <SubType>Form</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\webservices\publication.asmx" />
-    <Content Include="umbraco.presentation\umbraco\webservices\TreeDataService.ashx" />
-    <None Include="umbraco.presentation\umbraco\Trees\Trees.cd" />
-    <None Include="umbraco.presentation\umbraco\Trees\XmlTree.xsd">
-      <SubType>
-      </SubType>
-    </None>
-    <None Include="umbraco.presentation\umbraco\Trees\XmlTree.xsx">
-      <DependentUpon>XmlTree.xsd</DependentUpon>
-    </None>
-    <Content Include="umbraco.presentation\umbraco\webservices\TagsAutoCompleteHandler.ashx" />
-    <None Include="Web References\org.umbraco.update\checkforupgrade.disco" />
-    <None Include="Web References\org.umbraco.update\checkforupgrade.wsdl" />
-    <None Include="Web References\org.umbraco.update\Reference.map">
-      <Generator>MSDiscoCodeGenerator</Generator>
-      <LastGenOutput>Reference.cs</LastGenOutput>
-    </None>
-    <EmbeddedResource Include="UI\JavaScript\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Mvc\Strings.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Strings.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Include="umbraco.presentation\umbraco\templateControls\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <None Include="umbraco.presentation\umbraco\schemas\package.xsd">
-      <SubType>
-      </SubType>
-    </None>
-    <None Include="umbraco.presentation\umbraco\schemas\package.xsx">
-      <DependentUpon>package.xsd</DependentUpon>
-    </None>
-    <None Include="umbraco.presentation\umbraco\schemas\umbraco.xsc">
-      <DependentUpon>umbraco.xsd</DependentUpon>
-    </None>
-    <None Include="umbraco.presentation\umbraco\schemas\umbraco.xss">
-      <DependentUpon>umbraco.xsd</DependentUpon>
-    </None>
-    <None Include="umbraco.presentation\umbraco\schemas\umbraco.xsx">
-      <DependentUpon>umbraco.xsd</DependentUpon>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <WebReferences Include="Web References\" />
-  </ItemGroup>
-  <ItemGroup>
-    <WebReferenceUrl Include="https://our.umbraco.com/umbraco/webservices/api/repository.asmx">
-      <UrlBehavior>Dynamic</UrlBehavior>
-      <RelPath>Web References\org.umbraco.our\</RelPath>
-      <UpdateFromURL>https://our.umbraco.com/umbraco/webservices/api/repository.asmx</UpdateFromURL>
-      <ServiceLocationURL>
-      </ServiceLocationURL>
-      <CachedDynamicPropName>
-      </CachedDynamicPropName>
-      <CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
-      <CachedSettingsPropName>umbraco_org_umbraco_our_Repository</CachedSettingsPropName>
-    </WebReferenceUrl>
-    <WebReferenceUrl Include="http://update.umbraco.org/checkforupgrade.asmx">
-      <UrlBehavior>Dynamic</UrlBehavior>
-      <RelPath>Web References\org.umbraco.update\</RelPath>
-      <UpdateFromURL>http://update.umbraco.org/checkforupgrade.asmx</UpdateFromURL>
-      <ServiceLocationURL>
-      </ServiceLocationURL>
-      <CachedDynamicPropName>
-      </CachedDynamicPropName>
-      <CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
-      <CachedSettingsPropName>umbraco_org_umbraco_update_CheckForUpgrade</CachedSettingsPropName>
-    </WebReferenceUrl>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="umbraco.presentation\umbraco\settings\scripts\" />
-  </ItemGroup>
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
-    <VSToolsPath Condition="exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v11.0\WebApplications\Microsoft.WebApplication.targets')">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v11.0</VSToolsPath>
-    <VSToolsPath Condition="exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v12.0\WebApplications\Microsoft.WebApplication.targets')">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v12.0</VSToolsPath>
-    <VSToolsPath Condition="exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v14.0\WebApplications\Microsoft.WebApplication.targets')">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v14.0</VSToolsPath>
-    <VSToolsPath Condition="exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets')">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
-  <ProjectExtensions />
-  <PropertyGroup>
-    <!--<PostBuildEvent>xcopy "$(ProjectDir)..\..\lib\*.dll" "$(TargetDir)*.dll" /Y</PostBuildEvent>-->
-  </PropertyGroup>
-  <Import Project="..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets" Condition="Exists('..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets')" />
+    <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+    <PropertyGroup>
+        <ProductVersion>9.0.30729</ProductVersion>
+        <SchemaVersion>2.0</SchemaVersion>
+        <ProjectGuid>{651E1350-91B6-44B7-BD60-7207006D7003}</ProjectGuid>
+        <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+        <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+        <ApplicationIcon>
+        </ApplicationIcon>
+        <AssemblyKeyContainerName>
+        </AssemblyKeyContainerName>
+        <AssemblyName>umbraco</AssemblyName>
+        <AssemblyOriginatorKeyFile>
+        </AssemblyOriginatorKeyFile>
+        <DefaultClientScript>JScript</DefaultClientScript>
+        <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+        <DefaultTargetSchema>IE50</DefaultTargetSchema>
+        <DelaySign>false</DelaySign>
+        <OutputType>Library</OutputType>
+        <RootNamespace>Umbraco.Web</RootNamespace>
+        <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+        <StartupObject>
+        </StartupObject>
+        <FileUpgradeFlags>
+        </FileUpgradeFlags>
+        <UpgradeBackupLocation>
+        </UpgradeBackupLocation>
+        <SccProjectName>
+        </SccProjectName>
+        <SccLocalPath>
+        </SccLocalPath>
+        <SccAuxPath>
+        </SccAuxPath>
+        <SccProvider>
+        </SccProvider>
+        <OldToolsVersion>4.0</OldToolsVersion>
+        <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+        <TargetFrameworkProfile />
+        <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+        <RestorePackages>true</RestorePackages>
+        <LangVersion>latest</LangVersion>
+    </PropertyGroup>
+    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+        <OutputPath>bin\Debug\</OutputPath>
+        <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+        <BaseAddress>285212672</BaseAddress>
+        <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+        <ConfigurationOverrideFile>
+        </ConfigurationOverrideFile>
+        <DefineConstants>DEBUG;TRACE</DefineConstants>
+        <DocumentationFile>
+        </DocumentationFile>
+        <DebugSymbols>true</DebugSymbols>
+        <FileAlignment>4096</FileAlignment>
+        <NoStdLib>false</NoStdLib>
+        <NoWarn>
+        </NoWarn>
+        <Optimize>false</Optimize>
+        <RegisterForComInterop>false</RegisterForComInterop>
+        <RemoveIntegerChecks>false</RemoveIntegerChecks>
+        <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+        <WarningLevel>4</WarningLevel>
+        <DebugType>full</DebugType>
+        <ErrorReport>prompt</ErrorReport>
+        <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+        <Prefer32Bit>false</Prefer32Bit>
+        <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
+        <LangVersion>latest</LangVersion>
+    </PropertyGroup>
+    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+        <OutputPath>bin\Release\</OutputPath>
+        <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+        <BaseAddress>285212672</BaseAddress>
+        <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+        <ConfigurationOverrideFile>
+        </ConfigurationOverrideFile>
+        <DefineConstants>TRACE</DefineConstants>
+        <DocumentationFile>bin\Release\umbraco.xml</DocumentationFile>
+        <DebugSymbols>true</DebugSymbols>
+        <FileAlignment>4096</FileAlignment>
+        <NoStdLib>false</NoStdLib>
+        <NoWarn>
+        </NoWarn>
+        <Optimize>true</Optimize>
+        <RegisterForComInterop>false</RegisterForComInterop>
+        <RemoveIntegerChecks>false</RemoveIntegerChecks>
+        <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+        <WarningLevel>4</WarningLevel>
+        <DebugType>pdbonly</DebugType>
+        <ErrorReport>prompt</ErrorReport>
+        <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+        <Prefer32Bit>false</Prefer32Bit>
+        <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
+    </PropertyGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\UmbracoExamine\UmbracoExamine.csproj">
+            <Project>{07fbc26b-2927-4a22-8d96-d644c667fecc}</Project>
+            <Name>UmbracoExamine</Name>
+        </ProjectReference>
+        <Reference Include="AutoMapper, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
+            <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.dll</HintPath>
+            <Private>True</Private>
+        </Reference>
+        <Reference Include="AutoMapper.Net4, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
+            <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll</HintPath>
+            <Private>True</Private>
+        </Reference>
+        <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="dotless.Core, Version=1.5.2.0, Culture=neutral, PublicKeyToken=96b446c9e63eae34, processorArchitecture=MSIL">
+            <HintPath>..\packages\dotless.1.5.2\lib\dotless.Core.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="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="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>
+        <Reference Include="Lucene.Net, Version=2.9.4.1, Culture=neutral, PublicKeyToken=85089178b9ac3181, processorArchitecture=MSIL">
+            <HintPath>..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll</HintPath>
+        </Reference>
+        <Reference Include="MarkdownSharp, Version=1.14.5.0, Culture=neutral, processorArchitecture=MSIL">
+            <HintPath>..\packages\Markdown.1.14.7\lib\net45\MarkdownSharp.dll</HintPath>
+            <Private>True</Private>
+        </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.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.2\lib\net45\Microsoft.AspNet.Identity.Owin.dll</HintPath>
+        </Reference>
+        <Reference Include="Microsoft.AspNet.SignalR.Core, Version=2.4.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+            <HintPath>..\packages\Microsoft.AspNet.SignalR.Core.2.4.1\lib\net45\Microsoft.AspNet.SignalR.Core.dll</HintPath>
+        </Reference>
+        <Reference Include="Microsoft.CSharp" />
+        <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.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.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=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=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="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>
+            <Private>True</Private>
+        </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>
+            <Private>True</Private>
+        </Reference>
+        <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>
+            <Private>True</Private>
+        </Reference>
+        <Reference Include="Semver, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL">
+            <HintPath>..\packages\semver.1.1.2\lib\net451\Semver.dll</HintPath>
+        </Reference>
+        <Reference Include="System">
+            <Name>System</Name>
+        </Reference>
+        <Reference Include="System.ComponentModel.Composition" />
+        <Reference Include="System.ComponentModel.DataAnnotations" />
+        <Reference Include="System.configuration" />
+        <Reference Include="System.Data">
+            <Name>System.Data</Name>
+        </Reference>
+        <Reference Include="System.Data.DataSetExtensions" />
+        <Reference Include="System.Design" />
+        <Reference Include="System.Drawing">
+            <Name>System.Drawing</Name>
+        </Reference>
+        <Reference Include="System.EnterpriseServices" />
+        <Reference Include="System.IO.Compression.FileSystem" />
+        <Reference Include="System.Net.Http" />
+        <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.Runtime.Serialization" />
+        <Reference Include="System.Security" />
+        <Reference Include="System.ServiceModel" />
+        <Reference Include="System.Threading.Tasks.Dataflow, Version=4.6.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+            <HintPath>..\packages\System.Threading.Tasks.Dataflow.4.9.0\lib\portable-net45+win8+wpa81\System.Threading.Tasks.Dataflow.dll</HintPath>
+        </Reference>
+        <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.Abstractions">
+            <RequiredTargetFramework>3.5</RequiredTargetFramework>
+        </Reference>
+        <Reference Include="System.Web.ApplicationServices" />
+        <Reference Include="System.Web.DynamicData" />
+        <Reference Include="System.Web.Entity" />
+        <Reference Include="System.Web.Extensions" />
+        <Reference Include="System.Web.Extensions.Design" />
+        <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+            <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
+        </Reference>
+        <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.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.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.7\lib\net45\System.Web.Razor.dll</HintPath>
+        </Reference>
+        <Reference Include="System.Web.Services">
+            <Name>System.Web.Services</Name>
+        </Reference>
+        <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+            <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.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.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
+        </Reference>
+        <Reference Include="System.Windows.Forms" />
+        <Reference Include="System.Xml">
+            <Name>System.XML</Name>
+        </Reference>
+        <Reference Include="System.Xml.Linq" />
+        <ProjectReference Include="..\SQLCE4Umbraco\SqlCE4Umbraco.csproj">
+            <Project>{5BA5425F-27A7-4677-865E-82246498AA2E}</Project>
+            <Name>SqlCE4Umbraco</Name>
+        </ProjectReference>
+        <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj">
+            <Project>{31785BC3-256C-4613-B2F5-A1B0BDDED8C1}</Project>
+            <Name>Umbraco.Core</Name>
+        </ProjectReference>
+        <ProjectReference Include="..\umbraco.controls\umbraco.controls.csproj">
+            <Project>{6EDD2061-82F2-461B-BB6E-879245A832DE}</Project>
+            <Name>umbraco.controls</Name>
+        </ProjectReference>
+        <ProjectReference Include="..\umbraco.businesslogic\umbraco.businesslogic.csproj">
+            <Name>umbraco.businesslogic</Name>
+            <Project>{E469A9CE-1BEC-423F-AC44-713CD72457EA}</Project>
+            <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+        </ProjectReference>
+        <ProjectReference Include="..\umbraco.cms\umbraco.cms.csproj">
+            <Project>{CCD75EC3-63DB-4184-B49D-51C1DD337230}</Project>
+            <Name>umbraco.cms</Name>
+        </ProjectReference>
+        <ProjectReference Include="..\umbraco.datalayer\umbraco.datalayer.csproj">
+            <Project>{C7CB79F0-1C97-4B33-BFA7-00731B579AE2}</Project>
+            <Name>umbraco.datalayer</Name>
+        </ProjectReference>
+        <ProjectReference Include="..\umbraco.interfaces\umbraco.interfaces.csproj">
+            <Name>umbraco.interfaces</Name>
+            <Project>{511F6D8D-7717-440A-9A57-A507E9A8B27F}</Project>
+            <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+        </ProjectReference>
+        <ProjectReference Include="..\umbraco.providers\umbraco.providers.csproj">
+            <Project>{D7636876-0756-43CB-A192-138C6F0D5E42}</Project>
+            <Name>umbraco.providers</Name>
+        </ProjectReference>
+    </ItemGroup>
+    <ItemGroup>
+        <Compile Include="..\SolutionInfo.cs">
+            <Link>Properties\SolutionInfo.cs</Link>
+        </Compile>
+        <Compile Include="ApplicationContextExtensions.cs" />
+        <Compile Include="AreaRegistrationContextExtensions.cs" />
+        <Compile Include="BatchedDatabaseServerMessengerStartup.cs" />
+        <Compile Include="Cache\ApplicationCacheRefresher.cs" />
+        <Compile Include="Cache\ApplicationTreeCacheRefresher.cs" />
+        <Compile Include="Cache\CacheRefresherEventHandler.cs" />
+        <Compile Include="Cache\ContentTypeCacheRefresher.cs" />
+        <Compile Include="Cache\DataTypeCacheRefresher.cs" />
+        <Compile Include="Cache\DictionaryCacheRefresher.cs" />
+        <Compile Include="Cache\DistributedCache.cs" />
+        <Compile Include="Cache\DistributedCacheExtensions.cs" />
+        <Compile Include="Cache\DomainCacheRefresher.cs" />
+        <Compile Include="Cache\LanguageCacheRefresher.cs" />
+        <Compile Include="Cache\MacroCacheRefresher.cs" />
+        <Compile Include="Cache\MediaCacheRefresher.cs" />
+        <Compile Include="Cache\MemberCacheRefresher.cs" />
+        <Compile Include="Cache\MemberGroupCacheRefresher.cs" />
+        <Compile Include="Cache\PageCacheRefresher.cs" />
+        <Compile Include="Cache\PublicAccessCacheRefresher.cs" />
+        <Compile Include="Cache\RelationTypeCacheRefresher.cs" />
+        <Compile Include="Cache\UserGroupCacheRefresher.cs" />
+        <Compile Include="Cache\StylesheetCacheRefresher.cs" />
+        <Compile Include="Cache\StylesheetPropertyCacheRefresher.cs" />
+        <Compile Include="Cache\TemplateCacheRefresher.cs" />
+        <Compile Include="Cache\UnpublishedPageCacheRefresher.cs" />
+        <Compile Include="Cache\UserCacheRefresher.cs" />
+        <Compile Include="Security\UmbracoAntiForgeryAdditionalDataProvider.cs" />
+        <Compile Include="Editors\PreviewController.cs" />
+        <Compile Include="Editors\BackOfficeAssetsController.cs" />
+        <Compile Include="Features\DisabledFeatures.cs" />
+        <Compile Include="Editors\BackOfficeNotificationsController.cs" />
+        <Compile Include="Editors\DictionaryController.cs" />
+        <Compile Include="Editors\BackOfficeServerVariables.cs" />
+        <Compile Include="Editors\DashboardHelper.cs" />
+        <Compile Include="Editors\EditorModelEventArgs.cs" />
+        <Compile Include="Editors\EditorValidationResolver.cs" />
+        <Compile Include="Editors\EditorValidator.cs" />
+        <Compile Include="Editors\FromJsonPathAttribute.cs" />
+        <Compile Include="Editors\HelpController.cs" />
+        <Compile Include="Editors\IsCurrentUserModelFilterAttribute.cs" />
+        <Compile Include="Editors\PasswordChanger.cs" />
+        <Compile Include="Editors\TemplateController.cs" />
+        <Compile Include="Editors\ParameterSwapControllerActionSelector.cs" />
+        <Compile Include="Editors\CodeFileController.cs" />
+        <Compile Include="Editors\TourController.cs" />
+        <Compile Include="Features\EnabledFeatures.cs" />
+        <Compile Include="HealthCheck\Checks\Services\Tls12Check.cs" />
+        <Compile Include="HealthCheck\Checks\Security\XssProtectionCheck.cs" />
+        <Compile Include="HealthCheck\Checks\Security\HstsCheck.cs" />
+        <Compile Include="Models\BackOfficeTourFilter.cs" />
+        <Compile Include="Models\ContentEditing\BackOfficePreview.cs" />
+        <Compile Include="Models\ContentEditing\DocumentTypeCollectionDisplay.cs" />
+        <Compile Include="Models\ContentEditing\NotifySetting.cs" />
+        <Compile Include="Models\ContentEditing\UrlAndAnchors.cs" />
+        <Compile Include="Models\Mapping\AutoMapperExtensions.cs" />
+        <Compile Include="Models\Mapping\ContentTreeNodeUrlResolver.cs" />
+        <Compile Include="Models\Mapping\MemberTreeNodeUrlResolver.cs" />
+        <Compile Include="Models\Trees\ExportMember.cs" />
+        <Compile Include="PropertyEditors\DropdownFlexiblePropertyEditor.cs" />
+        <Compile Include="TourFilterResolver.cs" />
+        <Compile Include="Editors\UserEditorAuthorizationHelper.cs" />
+        <Compile Include="Editors\UserGroupAuthorizationAttribute.cs" />
+        <Compile Include="Editors\UserGroupEditorAuthorizationHelper.cs" />
+        <Compile Include="Editors\UserGroupsController.cs" />
+        <Compile Include="Editors\UserGroupValidateAttribute.cs" />
+        <Compile Include="ExamineStartup.cs" />
+        <Compile Include="Extensions\UdiExtensions.cs" />
+        <Compile Include="Features\UmbracoFeatures.cs" />
+        <Compile Include="Features\FeaturesResolver.cs" />
+        <Compile Include="HealthCheck\Checks\Config\AbstractConfigCheck.cs" />
+        <Compile Include="HealthCheck\Checks\Config\AcceptableConfiguration.cs" />
+        <Compile Include="HealthCheck\Checks\Config\ConfigurationService.cs" />
+        <Compile Include="HealthCheck\Checks\Config\ConfigurationServiceResult.cs" />
+        <Compile Include="HealthCheck\Checks\Config\MacroErrorsCheck.cs" />
+        <Compile Include="HealthCheck\Checks\Config\NotificationEmailCheck.cs" />
+        <Compile Include="HealthCheck\Checks\Config\TrySkipIisCustomErrorsCheck.cs" />
+        <Compile Include="HealthCheck\Checks\Config\CustomErrorsCheck.cs" />
+        <Compile Include="HealthCheck\Checks\Config\TraceCheck.cs" />
+        <Compile Include="HealthCheck\Checks\Config\ValueComparisonType.cs" />
+        <Compile Include="HealthCheck\Checks\Config\CompilationDebugCheck.cs" />
+        <Compile Include="HealthCheck\Checks\Security\BaseHttpHeaderCheck.cs" />
+        <Compile Include="HealthCheck\Checks\Security\NoSniffCheck.cs" />
+        <Compile Include="HealthCheck\Checks\Services\SmtpCheck.cs" />
+        <Compile Include="HealthCheck\Checks\Permissions\FolderAndFilePermissionsCheck.cs" />
+        <Compile Include="HealthCheck\Checks\Security\ExcessiveHeadersCheck.cs" />
+        <Compile Include="HealthCheck\Checks\Security\ClickJackingCheck.cs" />
+        <Compile Include="HealthCheck\HealthCheckAction.cs" />
+        <Compile Include="HealthCheck\HealthCheckNotificationMethodAttribute.cs" />
+        <Compile Include="HealthCheck\HealthCheckAttribute.cs" />
+        <Compile Include="HealthCheck\HealthCheckContext.cs" />
+        <Compile Include="HealthCheck\HealthCheckController.cs" />
+        <Compile Include="HealthCheck\HealthCheckGroup.cs" />
+        <Compile Include="HealthCheck\HealthCheckNotificationMethodResolver.cs" />
+        <Compile Include="HealthCheck\HealthCheckResolver.cs" />
+        <Compile Include="HealthCheck\HealthCheck.cs" />
+        <Compile Include="HealthCheck\HealthCheckResults.cs" />
+        <Compile Include="HealthCheck\HealthCheckStatus.cs" />
+        <Compile Include="HealthCheck\Checks\Security\HttpsCheck.cs" />
+        <Compile Include="HealthCheck\IHealthCheckResolver.cs" />
+        <Compile Include="HealthCheck\IHealthCheckNotificationMethodsResolver.cs" />
+        <Compile Include="HealthCheck\NotificationMethods\NotificationMethodBase.cs" />
+        <Compile Include="HealthCheck\NotificationMethods\EmailNotificationMethod.cs" />
+        <Compile Include="HealthCheck\NotificationMethods\IHealthCheckNotificatationMethod.cs" />
+        <Compile Include="HealthCheck\StatusResultType.cs" />
+        <Compile Include="HealthCheck\Checks\DataIntegrity\XmlDataIntegrityHealthCheck.cs" />
+        <Compile Include="IHttpContextAccessor.cs" />
+        <Compile Include="Install\InstallSteps\ConfigureMachineKey.cs" />
+        <Compile Include="Models\BackOfficeTourFile.cs" />
+        <Compile Include="Models\BackOfficeTourStep.cs" />
+        <Compile Include="Models\ContentEditing\AssignedContentPermissions.cs" />
+        <Compile Include="Models\ContentEditing\AssignedUserGroupPermissions.cs" />
+        <Compile Include="Models\ContentEditing\ContentRedirectUrl.cs" />
+        <Compile Include="Models\ContentEditing\DictionaryDisplay.cs" />
+        <Compile Include="Models\ContentEditing\DictionaryOverviewDisplay.cs" />
+        <Compile Include="Models\ContentEditing\DictionarySave.cs" />
+        <Compile Include="Models\ContentEditing\DictionaryOverviewTranslationDisplay.cs" />
+        <Compile Include="Models\ContentEditing\DictionaryTranslationSave.cs" />
+        <Compile Include="Models\ContentEditing\EditorNavigation.cs" />
+        <Compile Include="Models\ContentEditing\GetAvailableCompositionsFilter.cs" />
+        <Compile Include="Editors\IEditorValidator.cs" />
+        <Compile Include="Editors\EditorModelEventManager.cs" />
+        <Compile Include="HtmlHelperBackOfficeExtensions.cs" />
+        <Compile Include="Install\InstallSteps\Version73FileCleanup.cs" />
+        <Compile Include="Models\ContentEditing\DocumentTypeDisplay.cs" />
+        <Compile Include="Media\EmbedProviders\Flickr.cs" />
+        <Compile Include="Models\ContentEditing\ContentTypeCompositionDisplay.cs" />
+        <Compile Include="Models\ContentEditing\ContentTypeSave.cs" />
+        <Compile Include="Models\ContentEditing\DocumentTypeSave.cs" />
+        <Compile Include="Models\ContentEditing\InstalledPackageModel.cs" />
+        <Compile Include="Models\ContentEditing\LinkDisplay.cs" />
+        <Compile Include="Models\ContentEditing\MediaTypeDisplay.cs" />
+        <Compile Include="Models\ContentEditing\MediaTypeSave.cs" />
+        <Compile Include="Models\ContentEditing\MemberPropertyTypeBasic.cs" />
+        <Compile Include="Models\ContentEditing\MemberPropertyTypeDisplay.cs" />
+        <Compile Include="Models\ContentEditing\MemberTypeDisplay.cs" />
+        <Compile Include="Models\ContentEditing\MemberTypeSave.cs" />
+        <Compile Include="Models\ContentEditing\Permission.cs" />
+        <Compile Include="Models\ContentEditing\PostedFiles.cs" />
+        <Compile Include="Models\ContentEditing\PostedFolder.cs" />
+        <Compile Include="Models\ContentEditing\PropertyGroupBasic.cs" />
+        <Compile Include="Models\ContentEditing\PropertyTypeBasic.cs" />
+        <Compile Include="Models\ContentEditing\SimpleNotificationModel.cs" />
+        <Compile Include="Models\ContentEditing\SnippetDisplay.cs" />
+        <Compile Include="Models\ContentEditing\TemplateDisplay.cs" />
+        <Compile Include="Models\ContentEditing\DictionaryTranslationDisplay.cs" />
+        <Compile Include="Models\ContentEditing\UserDisplay.cs" />
+        <Compile Include="Models\ContentEditing\UserBasic.cs" />
+        <Compile Include="Models\ContentEditing\UserGroupBasic.cs" />
+        <Compile Include="Models\ContentEditing\UserGroupDisplay.cs" />
+        <Compile Include="Models\ContentEditing\UserGroupPermissionsSave.cs" />
+        <Compile Include="Models\ContentEditing\UserGroupSave.cs" />
+        <Compile Include="Models\DetachedPublishedContent.cs" />
+        <Compile Include="Models\DetachedPublishedProperty.cs" />
+        <Compile Include="Models\ContentEditing\UserInvite.cs" />
+        <Compile Include="Models\ContentEditing\UserSave.cs" />
+        <Compile Include="Models\Link.cs" />
+        <Compile Include="Models\LinkType.cs" />
+        <Compile Include="Models\LocalPackageInstallModel.cs" />
+        <Compile Include="Models\Mapping\CodeFileDisplayMapper.cs" />
+        <Compile Include="Models\Mapping\ContentTypeModelMapperExtensions.cs" />
+        <Compile Include="Models\Mapping\ContentTypeUdiResolver.cs" />
+        <Compile Include="Models\Mapping\DictionaryModelMapper.cs" />
+        <Compile Include="Models\Mapping\EntityModelMapperExtensions.cs" />
+        <Compile Include="Models\Mapping\LockedCompositionsResolver.cs" />
+        <Compile Include="Models\Mapping\UserGroupDefaultPermissionsResolver.cs" />
+        <Compile Include="Models\Mapping\PropertyGroupDisplayResolver.cs" />
+        <Compile Include="Models\RelatedLink.cs" />
+        <Compile Include="Models\Mapping\TemplateModelMapper.cs" />
+        <Compile Include="Models\PackageInstallResult.cs" />
+        <Compile Include="Models\RelatedLinkBase.cs" />
+        <Compile Include="Models\ContentEditing\CodeFileDisplay.cs" />
+        <Compile Include="Models\SendCodeViewModel.cs" />
+        <Compile Include="Models\RelatedLinks.cs" />
+        <Compile Include="Models\RelatedLinkType.cs" />
+        <Compile Include="Models\SetPasswordModel.cs" />
+        <Compile Include="Models\RequestPasswordResetModel.cs" />
+        <Compile Include="Models\PublishedContentWithKeyBase.cs" />
+        <Compile Include="Models\BackOfficeTour.cs" />
+        <Compile Include="Models\UserTourStatus.cs" />
+        <Compile Include="Models\ValidatePasswordResetCodeModel.cs" />
+        <Compile Include="Mvc\ControllerContextExtensions.cs" />
+        <Compile Include="Mvc\DisableBrowserCacheAttribute.cs" />
+        <Compile Include="Mvc\EnsurePartialViewMacroViewContextFilterAttribute.cs" />
+        <Compile Include="Mvc\IRenderController.cs" />
+        <Compile Include="Mvc\ModelBindingException.cs" />
+        <Compile Include="Mvc\RenderIndexActionSelectorAttribute.cs" />
+        <Compile Include="Mvc\UmbracoRequireHttpsAttribute.cs" />
+        <Compile Include="Mvc\ValidateMvcAngularAntiForgeryTokenAttribute.cs" />
+        <Compile Include="OwinMiddlewareConfiguredEventArgs.cs" />
+        <Compile Include="Profiling\WebProfilerProvider.cs" />
+        <Compile Include="Profiling\WebProfiler.cs" />
+        <Compile Include="PropertyEditors\ContentPicker2PropertyEditor.cs" />
+        <Compile Include="PropertyEditors\DatePreValueEditor.cs" />
+        <Compile Include="PropertyEditors\DateTimePreValueEditor.cs" />
+        <Compile Include="PropertyEditors\DecimalPropertyEditor.cs" />
+        <Compile Include="PropertyEditors\MediaPicker2PropertyEditor.cs" />
+        <Compile Include="PropertyEditors\MemberPicker2PropertyEditor.cs" />
+        <Compile Include="PropertyEditors\MultiNodeTreePicker2PropertyEditor.cs" />
+        <Compile Include="PropertyEditors\MultiUrlPickerPropertyEditor.cs" />
+        <Compile Include="PropertyEditors\NestedContentController.cs" />
+        <Compile Include="PropertyEditors\NestedContentHelper.cs" />
+        <Compile Include="PropertyEditors\NestedContentPropertyEditor.cs" />
+        <Compile Include="PropertyEditors\RelatedLinks2PropertyEditor.cs" />
+        <Compile Include="PropertyEditors\TextOnlyValueEditor.cs" />
+        <Compile Include="PropertyEditors\ValueConverters\ContentPickerPropertyConverter.cs" />
+        <Compile Include="PropertyEditors\ParameterEditors\MultipleContentPickerParameterEditor.cs" />
+        <Compile Include="PropertyEditors\ValueConverters\ImageCropDataSetConverter.cs" />
+        <Compile Include="PropertyEditors\ValueConverters\ImageCropperValueConverter.cs" />
+        <Compile Include="PropertyEditors\ValueConverters\LegacyRelatedLinksEditorValueConvertor.cs" />
+        <Compile Include="PropertyEditors\ValueConverters\MediaPickerPropertyConverter.cs" />
+        <Compile Include="PropertyEditors\ValueConverters\MemberPickerPropertyConverter.cs" />
+        <Compile Include="PropertyEditors\ValueConverters\MultiNodeTreePickerPropertyConverter.cs" />
+        <Compile Include="PropertyEditors\ValueConverters\LegacyMediaPickerPropertyConverter.cs" />
+        <Compile Include="PropertyEditors\ValueConverters\MultiUrlPickerPropertyConverter.cs" />
+        <Compile Include="PropertyEditors\ValueConverters\NestedContentSingleValueConverter.cs" />
+        <Compile Include="PropertyEditors\ValueConverters\NestedContentManyValueConverter.cs" />
+        <Compile Include="PropertyEditors\ValueConverters\NestedContentPublishedPropertyTypeExtensions.cs" />
+        <Compile Include="PublishedContentQueryExtensions.cs" />
+        <Compile Include="Routing\RedirectTrackingEventHandler.cs" />
+        <Compile Include="Editors\RedirectUrlManagementController.cs" />
+        <Compile Include="Models\ContentEditing\RedirectUrlSearchResults.cs" />
+        <Compile Include="RelatedLinksTypeConverter.cs" />
+        <Compile Include="RouteDataExtensions.cs" />
+        <Compile Include="Routing\ContentFinderByRedirectUrl.cs" />
+        <Compile Include="Scheduling\HealthCheckNotifier.cs" />
+        <Compile Include="Scheduling\LatchedBackgroundTaskBase.cs" />
+        <Compile Include="Search\SearchableApplicationTree.cs" />
+        <Compile Include="Search\SearchableTreeAttribute.cs" />
+        <Compile Include="Search\SearchableTreeCollection.cs" />
+        <Compile Include="Search\SearchableTreeResolver.cs" />
+        <Compile Include="Search\UmbracoTreeSearcher.cs" />
+        <Compile Include="Security\Identity\ExternalSignInAutoLinkOptions.cs" />
+        <Compile Include="Security\Identity\FixWindowsAuthMiddlware.cs" />
+        <Compile Include="Security\Identity\ForceRenewalCookieAuthenticationHandler.cs" />
+        <Compile Include="Security\Identity\ForceRenewalCookieAuthenticationMiddleware.cs" />
+        <Compile Include="Security\Identity\GetUserSecondsMiddleWare.cs" />
+        <Compile Include="Models\ContentEditing\PropertyTypeDisplay.cs" />
+        <Compile Include="Models\ContentEditing\PropertyGroupDisplay.cs" />
+        <Compile Include="Media\EmbedProviders\OEmbedJson.cs" />
+        <Compile Include="Media\EmbedProviders\OEmbedResponse.cs" />
+        <Compile Include="Media\EmbedProviders\OEmbedPhoto.cs" />
+        <Compile Include="Security\Identity\IUmbracoBackOfficeTwoFactorOptions.cs" />
+        <Compile Include="Models\Mapping\PropertyTypeGroupResolver.cs" />
+        <Compile Include="Security\Identity\PreviewAuthenticationMiddleware.cs" />
+        <Compile Include="SingletonHttpContextAccessor.cs" />
+        <Compile Include="Trees\DictionaryTreeController.cs" />
+        <Compile Include="Trees\MacroTreeController.cs" />
+        <Compile Include="Trees\UserTreeController.cs" />
+        <Compile Include="Suspendable.cs" />
+        <Compile Include="Trees\ContentBlueprintTreeController.cs" />
+        <Compile Include="Trees\ContentTypeTreeController.cs" />
+        <Compile Include="Trees\PackagesTreeController.cs" />
+        <Compile Include="Trees\MediaTypeTreeController.cs" />
+        <Compile Include="Trees\MemberTypeTreeController.cs" />
+        <Compile Include="Security\WebAuthExtensions.cs" />
+        <Compile Include="Trees\XsltTreeController.cs" />
+        <Compile Include="umbraco.presentation\SafeXmlReaderWriter.cs" />
+        <Compile Include="Trees\ScriptTreeController.cs" />
+        <Compile Include="umbraco.presentation\umbraco\developer\Packages\installer.aspx.cs">
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="UmbracoDefaultOwinStartup.cs" />
+        <Compile Include="IUmbracoContextAccessor.cs" />
+        <Compile Include="Models\ContentEditing\Relation.cs" />
+        <Compile Include="HtmlStringUtilities.cs" />
+        <Compile Include="Models\ContentEditing\RelationType.cs" />
+        <Compile Include="Models\ContentExtensions.cs" />
+        <Compile Include="IDynamicPublishedContentQuery.cs" />
+        <Compile Include="ITagQuery.cs" />
+        <Compile Include="ITypedPublishedContentQuery.cs" />
+        <Compile Include="IUmbracoComponentRenderer.cs" />
+        <Compile Include="Models\LegacyConvertedNode.cs" />
+        <Compile Include="Models\LegacyConvertedNodeProperty.cs" />
+        <Compile Include="Models\Mapping\RelationModelMapper.cs" />
+        <Compile Include="Mvc\DisableClientCacheAttribute.cs" />
+        <Compile Include="Models\UnLinkLoginModel.cs" />
+        <Compile Include="Mvc\MvcVersionCheck.cs" />
+        <Compile Include="Mvc\ReflectedFixedRazorViewEngine.cs" />
+        <Compile Include="Scheduling\ThreadingTaskImmutable.cs" />
+        <Compile Include="Mvc\ProfilingView.cs" />
+        <Compile Include="Mvc\ProfilingViewEngine.cs" />
+        <Compile Include="Mvc\UrlHelperExtensions.cs" />
+        <Compile Include="Scheduling\BackgroundTaskRunner.cs" />
+        <Compile Include="BatchedDatabaseServerMessenger.cs" />
+        <Compile Include="BatchedWebServiceServerMessenger.cs" />
+        <Compile Include="CacheHelperExtensions.cs" />
+        <Compile Include="Cache\UserGroupPermissionsCacheRefresher.cs" />
+        <Compile Include="Editors\AuthenticationController.cs" />
+        <Compile Include="Controllers\UmbProfileController.cs" />
+        <Compile Include="Editors\ContentController.cs" />
+        <Compile Include="Controllers\UmbLoginStatusController.cs" />
+        <Compile Include="Editors\ContentPostValidateAttribute.cs" />
+        <Compile Include="Editors\ContentTypeControllerBase.cs" />
+        <Compile Include="Editors\DashboardController.cs" />
+        <Compile Include="Editors\DashboardSecurity.cs" />
+        <Compile Include="Editors\DataTypeController.cs" />
+        <Compile Include="Editors\DataTypeValidateAttribute.cs" />
+        <Compile Include="Editors\EntityControllerConfigurationAttribute.cs" />
+        <Compile Include="Editors\ImagesController.cs" />
+        <Compile Include="Editors\PackageInstallController.cs" />
+        <Compile Include="Editors\RelationController.cs" />
+        <Compile Include="Editors\CanvasDesignerController.cs" />
+        <Compile Include="Editors\UsersController.cs" />
+        <Compile Include="GridTemplateExtensions.cs" />
+        <Compile Include="Models\PackageInstallModel.cs" />
+        <Compile Include="Models\ContentEditing\DataTypeBasic.cs" />
+        <Compile Include="Models\ContentEditing\MemberBasic.cs" />
+        <Compile Include="Models\ContentEditing\MemberListDisplay.cs" />
+        <Compile Include="Models\TemplateQuery\ContentTypeModel.cs" />
+        <Compile Include="Models\TemplateQuery\PropertyModel.cs" />
+        <Compile Include="Models\TemplateQuery\SourceModel.cs" />
+        <Compile Include="Models\TemplateQuery\TemplateQueryResult.cs" />
+        <Compile Include="Models\TemplateQuery\SortExpression.cs" />
+        <Compile Include="Models\TemplateQuery\Operathor.cs" />
+        <Compile Include="Models\TemplateQuery\OperathorTerm.cs" />
+        <Compile Include="Models\TemplateQuery\QueryCondition.cs" />
+        <Compile Include="Models\TemplateQuery\QueryModel.cs" />
+        <Compile Include="Models\TemplateQuery\QueryResultModel.cs" />
+        <Compile Include="Editors\TemplateQueryController.cs" />
+        <Compile Include="Models\ContentEditing\ContentBaseItemSave.cs" />
+        <Compile Include="Models\ContentEditing\MediaItemSave.cs" />
+        <Compile Include="Models\DetachedContent.cs" />
+        <Compile Include="Models\ImageCropAnchor.cs" />
+        <Compile Include="Models\ImageCropCoordinates.cs" />
+        <Compile Include="Models\ImageCropDataSet.cs" />
+        <Compile Include="Models\ImageCropFocalPoint.cs" />
+        <Compile Include="Models\ImageCropMode.cs" />
+        <Compile Include="Install\DatabaseHelper.cs" />
+        <Compile Include="Install\InstallException.cs" />
+        <Compile Include="Install\InstallStatusTracker.cs" />
+        <Compile Include="Install\InstallSteps\DatabaseConfigureStep.cs" />
+        <Compile Include="Install\InstallSteps\DatabaseInstallStep.cs" />
+        <Compile Include="Install\InstallSteps\DatabaseUpgradeStep.cs" />
+        <Compile Include="Install\InstallSteps\FilePermissionsStep.cs" />
+        <Compile Include="Install\InstallSteps\MajorVersion7UpgradeReport.cs" />
+        <Compile Include="Install\InstallSteps\SetUmbracoVersionStep.cs" />
+        <Compile Include="Install\InstallSteps\StarterKitCleanupStep.cs" />
+        <Compile Include="Install\InstallSteps\StarterKitDownloadStep.cs" />
+        <Compile Include="Install\InstallSteps\StarterKitInstallStep.cs" />
+        <Compile Include="Install\InstallSteps\UpgradeStep.cs" />
+        <Compile Include="Install\InstallSteps\NewInstallStep.cs" />
+        <Compile Include="Install\Controllers\InstallPackageController.cs" />
+        <Compile Include="Install\Models\DatabaseModel.cs" />
+        <Compile Include="Install\Models\DatabaseType.cs" />
+        <Compile Include="Install\Models\InstallationType.cs" />
+        <Compile Include="Install\Models\InstallInstructions.cs" />
+        <Compile Include="Install\Models\InstallPackageModel.cs" />
+        <Compile Include="Install\Models\InstallProgressResultModel.cs" />
+        <Compile Include="Install\Models\InstallSetup.cs" />
+        <Compile Include="Install\Models\InstallSetupResult.cs" />
+        <Compile Include="Install\Models\InstallSetupStep.cs" />
+        <Compile Include="Install\Models\InstallSetupStepAttribute.cs" />
+        <Compile Include="Install\Models\InstallTrackingItem.cs" />
+        <Compile Include="Install\Models\Package.cs" />
+        <Compile Include="Install\Models\UserModel.cs" />
+        <Compile Include="Install\UmbracoInstallArea.cs" />
+        <Compile Include="Install\Controllers\InstallApiController.cs" />
+        <Compile Include="Install\Controllers\InstallController.cs" />
+        <Compile Include="Install\InstallAuthorizeAttribute.cs" />
+        <Compile Include="Models\ContentEditing\TreeSearchResult.cs" />
+        <Compile Include="Models\ContentEditing\ListViewAwareContentItemDisplayBase.cs" />
+        <Compile Include="Models\ContentEditing\PropertyTypeValidation.cs" />
+        <Compile Include="Models\ImageCropData.cs" />
+        <Compile Include="Models\ImageCropRatioMode.cs" />
+        <Compile Include="Models\IRenderModel.cs" />
+        <Compile Include="Models\PartialViewMacroModelExtensions.cs" />
+        <Compile Include="Models\PostRedirectModel.cs" />
+        <Compile Include="Models\PublishedProperty.cs" />
+        <Compile Include="Mvc\ActionExecutedEventArgs.cs" />
+        <Compile Include="Mvc\AdminTokenAuthorizeAttribute.cs" />
+        <Compile Include="Mvc\NotFoundHandler.cs" />
+        <Compile Include="Mvc\PreRenderViewActionFilterAttribute.cs" />
+        <Compile Include="Mvc\RedirectToUmbracoUrlResult.cs" />
+        <Compile Include="PropertyEditors\GridPropertyEditor.cs" />
+        <Compile Include="Mvc\UmbracoVirtualNodeByIdRouteHandler.cs" />
+        <Compile Include="PropertyEditors\ValueConverters\MacroContainerValueConverter.cs" />
+        <Compile Include="PropertyEditors\TagsDataController.cs" />
+        <Compile Include="PublishedCache\MemberPublishedContent.cs" />
+        <Compile Include="PublishedCache\RawValueProperty.cs" />
+        <Compile Include="Models\RenderModelOfTContent.cs" />
+        <Compile Include="Mvc\JsonNetResult.cs" />
+        <Compile Include="Mvc\MinifyJavaScriptResultAttribute.cs" />
+        <Compile Include="Mvc\EnsurePublishedContentRequestAttribute.cs" />
+        <Compile Include="Mvc\UmbracoTemplatePageOfTContent.cs" />
+        <Compile Include="Mvc\UmbracoViewPage.cs" />
+        <Compile Include="Editors\LogController.cs" />
+        <Compile Include="Editors\MacroController.cs" />
+        <Compile Include="Editors\MemberTypeController.cs" />
+        <Compile Include="Editors\UpdateCheckController.cs" />
+        <Compile Include="MembershipProviderExtensions.cs" />
+        <Compile Include="Models\ChangingPasswordModel.cs" />
+        <Compile Include="Models\ContentEditing\ModelWithNotifications.cs" />
+        <Compile Include="Models\ContentEditing\StyleSheet.cs" />
+        <Compile Include="Editors\StylesheetController.cs" />
+        <Compile Include="Models\ContentEditing\AuditLog.cs" />
+        <Compile Include="Models\ContentEditing\MoveOrCopy.cs" />
+        <Compile Include="Models\ContentEditing\MacroParameter.cs" />
+        <Compile Include="Models\ContentEditing\MemberDisplay.cs" />
+        <Compile Include="Models\ContentEditing\MemberSave.cs" />
+        <Compile Include="Models\ContentEditing\RichTextEditorCommand.cs" />
+        <Compile Include="Models\ContentEditing\RichTextEditorConfiguration.cs" />
+        <Compile Include="Models\ContentEditing\RichTextEditorPlugin.cs" />
+        <Compile Include="Models\ContentEditing\StylesheetRule.cs" />
+        <Compile Include="Models\ContentEditing\UmbracoEntityTypes.cs" />
+        <Compile Include="Models\ContentEditing\AuditLogType.cs" />
+        <Compile Include="Models\Mapping\MiscModelsMapper.cs" />
+        <Compile Include="Models\Mapping\MacroModelMapper.cs" />
+        <Compile Include="Models\Mapping\MemberModelMapper.cs" />
+        <Compile Include="Models\Mapping\TabModelMapper.cs" />
+        <Compile Include="Models\TagModel.cs" />
+        <Compile Include="Models\UpgradeCheckResponse.cs" />
+        <Compile Include="Models\PasswordChangedModel.cs" />
+        <Compile Include="NotificationServiceExtensions.cs" />
+        <Compile Include="PropertyEditors\ColorListPreValueEditor.cs" />
+        <Compile Include="PropertyEditors\EmailAddressPropertyEditor.cs" />
+        <Compile Include="ImageCropperBaseExtensions.cs" />
+        <Compile Include="PropertyEditors\ImageCropperPropertyEditor.cs" />
+        <Compile Include="PropertyEditors\ImageCropperPropertyValueEditor.cs" />
+        <Compile Include="PropertyEditors\ListViewPropertyEditor.cs" />
+        <Compile Include="PropertyEditors\MacroContainerPropertyEditor.cs" />
+        <Compile Include="PropertyEditors\MarkdownPropertyEditor.cs" />
+        <Compile Include="PropertyEditors\MemberGroupPickerPropertyEditor.cs" />
+        <Compile Include="PropertyEditors\MemberPickerPropertyEditor.cs" />
+        <Compile Include="PropertyEditors\MultiNodeTreePickerPropertyEditor.cs" />
+        <Compile Include="PropertyEditors\MultipleMediaPickerPropertyEditor.cs" />
+        <Compile Include="PropertyEditors\ParameterEditors\ContentTypeParameterEditor.cs" />
+        <Compile Include="PropertyEditors\ParameterEditors\MultipleContentTypeParameterEditor.cs" />
+        <Compile Include="PropertyEditors\ParameterEditors\MultipleMediaPickerParameterEditor.cs" />
+        <Compile Include="PropertyEditors\ParameterEditors\MultiplePropertyGroupParameterEditor.cs" />
+        <Compile Include="PropertyEditors\ParameterEditors\MultiplePropertyTypeParameterEditor.cs" />
+        <Compile Include="PropertyEditors\ParameterEditors\PropertyGroupParameterEditor.cs" />
+        <Compile Include="PropertyEditors\ParameterEditors\PropertyTypeParameterEditor.cs" />
+        <Compile Include="PropertyEditors\ParameterEditors\SingleMediaPickerParameterEditor.cs" />
+        <Compile Include="PropertyEditors\PropertyEditorAssetAttribute.cs" />
+        <Compile Include="PropertyEditors\RelatedLinksPropertyEditor.cs" />
+        <Compile Include="PropertyEditors\RteEmbedController.cs" />
+        <Compile Include="Editors\EntityController.cs" />
+        <Compile Include="Editors\MediaPostValidateAttribute.cs" />
+        <Compile Include="Editors\MemberController.cs" />
+        <Compile Include="Editors\CurrentUserController.cs" />
+        <Compile Include="Models\ContentEditing\DashboardControl.cs" />
+        <Compile Include="Models\ContentEditing\DataTypeDisplay.cs" />
+        <Compile Include="Models\ContentEditing\DataTypeSave.cs" />
+        <Compile Include="Models\ContentEditing\EntityBasic.cs" />
+        <Compile Include="Models\ContentEditing\PreValueFieldDisplay.cs" />
+        <Compile Include="Models\ContentEditing\PreValueFieldSave.cs" />
+        <Compile Include="Models\ContentEditing\PropertyEditorBasic.cs" />
+        <Compile Include="Models\Mapping\AvailablePropertyEditorsResolver.cs" />
+        <Compile Include="Models\Mapping\DatabaseTypeResolver.cs" />
+        <Compile Include="Models\Mapping\DataTypeModelMapper.cs" />
+        <Compile Include="Models\Mapping\EntityModelMapper.cs" />
+        <Compile Include="Models\Mapping\PreValueDisplayResolver.cs" />
+        <Compile Include="PropertyEditors\CheckBoxListPropertyEditor.cs" />
+        <Compile Include="PropertyEditors\ColorPickerPropertyEditor.cs" />
+        <Compile Include="PropertyEditors\DatePropertyEditor.cs" />
+        <Compile Include="PropertyEditors\DateTimePropertyEditor.cs" />
+        <Compile Include="PropertyEditors\DateTimeValidator.cs" />
+        <Compile Include="PropertyEditors\DropDownMultiplePropertyEditor.cs" />
+        <Compile Include="PropertyEditors\FolderBrowserPropertyEditor.cs" />
+        <Compile Include="PropertyEditors\IntegerPropertyEditor.cs" />
+        <Compile Include="PropertyEditors\MediaPickerPropertyEditor.cs" />
+        <Compile Include="PropertyEditors\MultipleTextStringPropertyEditor.cs" />
+        <Compile Include="PropertyEditors\PublishValuesMultipleValueEditor.cs" />
+        <Compile Include="PropertyEditors\DropDownMultipleWithKeysPropertyEditor.cs" />
+        <Compile Include="PropertyEditors\RadioButtonsPropertyEditor.cs" />
+        <Compile Include="PropertyEditors\RichTextPreValueController.cs" />
+        <Compile Include="PropertyEditors\RichTextPreValueEditor.cs" />
+        <Compile Include="PropertyEditors\SliderPropertyEditor.cs" />
+        <Compile Include="PropertyEditors\TagPropertyEditorTagDefinition.cs" />
+        <Compile Include="PropertyEditors\TagsPropertyEditor.cs" />
+        <Compile Include="PropertyEditors\UploadFileTypeValidator.cs" />
+        <Compile Include="PropertyEditors\UserPickerPropertyEditor.cs" />
+        <Compile Include="PropertyEditors\ValueConverters\RelatedLinksEditorValueConvertor.cs" />
+        <Compile Include="PropertyEditors\ValueListPreValueEditor.cs" />
+        <Compile Include="PropertyEditors\DropDownPropertyEditor.cs" />
+        <Compile Include="PropertyEditors\PublishValueValueEditor.cs" />
+        <Compile Include="PropertyEditors\DropDownWithKeysPropertyEditor.cs" />
+        <Compile Include="PropertyEditors\LabelPropertyEditor.cs" />
+        <Compile Include="PropertyEditors\PropertyValueEditorWrapper.cs" />
+        <Compile Include="PublishedContentQuery.cs" />
+        <Compile Include="ImageCropperTemplateExtensions.cs" />
+        <Compile Include="Mvc\UmbracoVirtualNodeRouteHandler.cs" />
+        <Compile Include="Routing\CustomRouteUrlProvider.cs" />
+        <Compile Include="Routing\UrlProviderExtensions.cs" />
+        <Compile Include="Scheduling\BackgroundTaskRunnerOptions.cs" />
+        <Compile Include="Scheduling\IBackgroundTaskRunner.cs" />
+        <Compile Include="Scheduling\ILatchedBackgroundTask.cs" />
+        <Compile Include="Scheduling\RecurringTaskBase.cs" />
+        <Compile Include="Security\Identity\AppBuilderExtensions.cs" />
+        <Compile Include="Security\Identity\AuthenticationOptionsExtensions.cs" />
+        <Compile Include="Security\Identity\AuthenticationManagerExtensions.cs" />
+        <Compile Include="Security\Identity\BackOfficeCookieManager.cs" />
+        <Compile Include="Security\Identity\FormsAuthenticationSecureDataFormat.cs" />
+        <Compile Include="Security\Identity\UmbracoBackOfficeCookieAuthOptions.cs" />
+        <Compile Include="Scheduling\TaskAndFactoryExtensions.cs" />
+        <Compile Include="SingletonUmbracoContextAccessor.cs" />
+        <Compile Include="Strategies\Migrations\ClearCsrfCookiesAfterUpgrade.cs" />
+        <Compile Include="Strategies\Migrations\ClearMediaXmlCacheForDeletedItemsAfterUpgrade.cs" />
+        <Compile Include="Strategies\Migrations\EnsureListViewDataTypeIsCreated.cs" />
+        <Compile Include="Strategies\Migrations\MigrationStartupHander.cs" />
+        <Compile Include="Strategies\Migrations\OverwriteStylesheetFilesFromTempFiles.cs" />
+        <Compile Include="Strategies\NotificationsHandler.cs" />
+        <Compile Include="Strategies\RelateOnCopyHandler.cs" />
+        <Compile Include="TagQuery.cs" />
+        <Compile Include="Trees\CoreTreeAttribute.cs" />
+        <Compile Include="Trees\DataTypeTreeController.cs" />
+        <Compile Include="Trees\FileSystemTreeController.cs" />
+        <Compile Include="Trees\LanguageTreeController.cs" />
+        <Compile Include="Trees\LegacyBaseTreeAttribute.cs" />
+        <Compile Include="Trees\MemberTreeController.cs" />
+        <Compile Include="Trees\MenuRenderingEventArgs.cs" />
+        <Compile Include="Models\Trees\CreateChildEntity.cs" />
+        <Compile Include="Models\Trees\MenuItemList.cs" />
+        <Compile Include="Trees\TemplatesTreeController.cs" />
+        <Compile Include="Trees\TreeControllerBase.cs" />
+        <Compile Include="CanvasDesignerUtility.cs" />
+        <Compile Include="UI\JavaScript\AssetInitialization.cs" />
+        <Compile Include="UI\JavaScript\CssInitialization.cs" />
+        <Compile Include="UI\JavaScript\DependencyPathRenderer.cs" />
+        <Compile Include="umbraco.presentation\umbraco\create.aspx.cs">
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\create\Language.ascx.cs">
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\create\xslt.ascx.cs">
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\Trees\loadPackager.cs" />
+        <Compile Include="PublishedCache\XmlPublishedCache\XmlCacheFilePersister.cs" />
+        <Compile Include="UmbracoComponentRenderer.cs" />
+        <Compile Include="Web References\org.umbraco.our\Reference.cs">
+            <AutoGen>True</AutoGen>
+            <DesignTime>True</DesignTime>
+            <DependentUpon>Reference.map</DependentUpon>
+        </Compile>
+        <Compile Include="WebApi\AngularJsonMediaTypeFormatter.cs" />
+        <Compile Include="WebApi\AngularJsonOnlyConfigurationAttribute.cs" />
+        <Compile Include="WebApi\Binders\BlueprintItemBinder.cs" />
+        <Compile Include="WebApi\Binders\MemberBinder.cs" />
+        <Compile Include="WebApi\EnableDetailedErrorsAttribute.cs" />
+        <Compile Include="WebApi\Filters\AdminUsersAuthorizeAttribute.cs" />
+        <Compile Include="WebApi\Filters\AngularAntiForgeryHelper.cs" />
+        <Compile Include="WebApi\Filters\AppendCurrentEventMessagesAttribute.cs" />
+        <Compile Include="WebApi\Filters\AppendUserModifiedHeaderAttribute.cs" />
+        <Compile Include="WebApi\Filters\ClearAngularAntiForgeryTokenAttribute.cs" />
+        <Compile Include="WebApi\Filters\DisableBrowserCacheAttribute.cs" />
+        <Compile Include="WebApi\Filters\EnableOverrideAuthorizationAttribute.cs" />
+        <Compile Include="WebApi\Filters\FeatureAuthorizeAttribute.cs" />
+        <Compile Include="WebApi\Filters\FilterGrouping.cs" />
+        <Compile Include="WebApi\Filters\HttpQueryStringModelBinder.cs" />
+        <Compile Include="WebApi\Filters\LegacyTreeAuthorizeAttribute.cs" />
+        <Compile Include="WebApi\Filters\OutgoingEditorModelEventAttribute.cs" />
+        <Compile Include="WebApi\Filters\OutgoingNoHyphenGuidFormatAttribute.cs" />
+        <Compile Include="WebApi\Filters\OverridableAuthorizationAttribute.cs" />
+        <Compile Include="WebApi\Filters\SetAngularAntiForgeryTokensAttribute.cs" />
+        <Compile Include="WebApi\Filters\UmbracoBackOfficeLogoutAttribute.cs" />
+        <Compile Include="WebApi\Filters\UmbracoWebApiRequireHttpsAttribute.cs" />
+        <Compile Include="WebApi\Filters\UmbracoTreeAuthorizeAttribute.cs" />
+        <Compile Include="WebApi\Filters\UmbracoUseHttps.cs" />
+        <Compile Include="WebApi\Filters\ValidateAngularAntiForgeryTokenAttribute.cs" />
+        <Compile Include="WebApi\Filters\CheckIfUserTicketDataIsStaleAttribute.cs" />
+        <Compile Include="WebApi\HttpControllerContextExtensions.cs" />
+        <Compile Include="WebApi\CustomDateTimeConvertor.cs" />
+        <Compile Include="Models\ContentEditing\ContentSortOrder.cs" />
+        <Compile Include="Editors\ContentControllerBase.cs" />
+        <Compile Include="Editors\ContentTypeController.cs" />
+        <Compile Include="Editors\LegacyController.cs" />
+        <Compile Include="Controllers\UmbRegisterController.cs" />
+        <Compile Include="Models\ProfileModel.cs" />
+        <Compile Include="Models\LoginStatusModel.cs" />
+        <Compile Include="PropertyEditors\ValueConverters\MarkdownEditorValueConverter.cs" />
+        <Compile Include="PropertyEditors\ValueConverters\TextStringValueConverter.cs" />
+        <Compile Include="PublishedContentPropertyExtension.cs" />
+        <Compile Include="Models\UmbracoProperty.cs" />
+        <Compile Include="Mvc\MergeParentContextViewDataAttribute.cs" />
+        <Compile Include="Mvc\ViewDataDictionaryExtensions.cs" />
+        <Compile Include="Routing\ContentLastChanceFinderByNotFoundHandlers.cs" />
+        <Compile Include="Models\RegisterModel.cs" />
+        <Compile Include="Models\LoginModel.cs" />
+        <Compile Include="Editors\MediaTypeController.cs" />
+        <Compile Include="Scheduling\IBackgroundTask.cs" />
+        <Compile Include="Scheduling\KeepAlive.cs" />
+        <Compile Include="Scheduling\LogScrubber.cs" />
+        <Compile Include="Scheduling\ScheduledPublishing.cs" />
+        <Compile Include="Scheduling\ScheduledTasks.cs" />
+        <Compile Include="Scheduling\TaskEventArgs.cs" />
+        <Compile Include="Security\MembershipHelper.cs" />
+        <Compile Include="Editors\SectionController.cs" />
+        <Compile Include="Editors\UmbracoAuthorizedJsonController.cs" />
+        <Compile Include="Editors\ValidationHelper.cs" />
+        <Compile Include="HttpCookieExtensions.cs" />
+        <Compile Include="Models\ContentEditing\ContentItemDisplayBase.cs" />
+        <Compile Include="Models\ContentEditing\ContentSaveAction.cs" />
+        <Compile Include="Models\ContentEditing\ContentTypeBasic.cs" />
+        <Compile Include="Models\ContentEditing\IErrorModel.cs" />
+        <Compile Include="Models\ContentEditing\IHaveUploadedFiles.cs" />
+        <Compile Include="Models\ContentEditing\INotificationModel.cs" />
+        <Compile Include="Models\ContentEditing\MediaItemDisplay.cs" />
+        <Compile Include="Models\ContentEditing\MessagesExtensions.cs" />
+        <Compile Include="Models\ContentEditing\Notification.cs" />
+        <Compile Include="Models\ContentEditing\Section.cs" />
+        <Compile Include="Models\ContentEditing\Tab.cs" />
+        <Compile Include="Models\ContentEditing\TabbedContentItem.cs" />
+        <Compile Include="Models\ContentEditing\UserProfile.cs" />
+        <Compile Include="Models\ContentEditing\UserDetail.cs" />
+        <Compile Include="FormDataCollectionExtensions.cs" />
+        <Compile Include="Models\Mapping\ContentPropertyBasicConverter.cs" />
+        <Compile Include="Models\Mapping\ContentPropertyDisplayConverter.cs" />
+        <Compile Include="Models\Mapping\ContentPropertyDtoConverter.cs" />
+        <Compile Include="Models\Mapping\ContentPropertyModelMapper.cs" />
+        <Compile Include="Models\Mapping\CreatorResolver.cs" />
+        <Compile Include="Models\Mapping\MediaModelMapper.cs" />
+        <Compile Include="Models\Mapping\ContentTypeModelMapper.cs" />
+        <Compile Include="Models\Mapping\ContentModelMapper.cs" />
+        <Compile Include="Models\Mapping\OwnerResolver.cs" />
+        <Compile Include="Models\Mapping\SectionModelMapper.cs" />
+        <Compile Include="Models\Mapping\TabsAndPropertiesResolver.cs" />
+        <Compile Include="Models\Mapping\UserModelMapper.cs" />
+        <Compile Include="PropertyEditors\ContentPickerPropertyEditor.cs" />
+        <Compile Include="PropertyEditors\FileUploadPropertyEditor.cs" />
+        <Compile Include="PropertyEditors\FileUploadPropertyValueEditor.cs" />
+        <Compile Include="PropertyEditors\RichTextPropertyEditor.cs" />
+        <Compile Include="PropertyEditors\TextAreaPropertyEditor.cs" />
+        <Compile Include="PropertyEditors\TextboxPropertyEditor.cs" />
+        <Compile Include="PropertyEditors\TrueFalsePropertyEditor.cs" />
+        <Compile Include="Trees\MediaTreeController.cs" />
+        <Compile Include="Models\Trees\ActionMenuItem.cs" />
+        <Compile Include="Models\Trees\ActionMenuItemAttribute.cs" />
+        <Compile Include="Trees\ActionUrlMethod.cs" />
+        <Compile Include="Trees\ApplicationTreeRegistrar.cs" />
+        <Compile Include="Trees\ContentTreeControllerBase.cs" />
+        <Compile Include="Trees\LegacyTreeController.cs" />
+        <Compile Include="Search\ISearchableTree.cs" />
+        <Compile Include="Trees\LegacyTreeDataConverter.cs" />
+        <Compile Include="Trees\LegacyTreeJavascript.cs" />
+        <Compile Include="Trees\LegacyTreeParams.cs" />
+        <Compile Include="Models\Trees\MenuItem.cs" />
+        <Compile Include="Models\Trees\MenuItemCollection.cs" />
+        <Compile Include="Models\Trees\RefreshNode.cs" />
+        <Compile Include="Models\ContentEditing\SearchResultItem.cs" />
+        <Compile Include="Models\Trees\SectionRootNode.cs" />
+        <Compile Include="Trees\TreeController.cs" />
+        <Compile Include="Trees\ApplicationTreeExtensions.cs" />
+        <Compile Include="Trees\TreeAttribute.cs" />
+        <Compile Include="Models\Trees\TreeNode.cs" />
+        <Compile Include="Models\Trees\TreeNodeCollection.cs" />
+        <Compile Include="Models\Trees\TreeNodeExtensions.cs" />
+        <Compile Include="Trees\TreeNodeRenderingEventArgs.cs" />
+        <Compile Include="Trees\TreeNodesRenderingEventArgs.cs" />
+        <Compile Include="Trees\TreeQueryStringParameters.cs" />
+        <Compile Include="Trees\ApplicationTreeController.cs" />
+        <Compile Include="Editors\BackOfficeController.cs" />
+        <Compile Include="Security\Providers\MembersMembershipProvider.cs" />
+        <Compile Include="Security\Providers\MembersRoleProvider.cs" />
+        <Compile Include="Security\Providers\UmbracoMembershipProvider.cs" />
+        <Compile Include="Security\Providers\UsersMembershipProvider.cs" />
+        <Compile Include="Trees\ContentTreeController.cs" />
+        <Compile Include="Trees\TreeRenderingEventArgs.cs" />
+        <Compile Include="Trees\UrlHelperExtensions.cs" />
+        <Compile Include="UI\JavaScript\JsInitialization.cs" />
+        <Compile Include="Models\ContentEditing\ContentItemBasic.cs" />
+        <Compile Include="Models\ContentEditing\ContentItemDisplay.cs" />
+        <Compile Include="Models\ContentEditing\ContentItemDto.cs" />
+        <Compile Include="Models\ContentEditing\ContentItemFile.cs" />
+        <Compile Include="Models\ContentEditing\ContentItemSave.cs" />
+        <Compile Include="Models\ContentEditing\ContentPropertyBasic.cs" />
+        <Compile Include="Models\ContentEditing\ContentPropertyDisplay.cs" />
+        <Compile Include="Models\ContentEditing\ContentPropertyDto.cs" />
+        <Compile Include="Dynamics\DynamicExpression.cs" />
+        <Compile Include="Dynamics\DynamicGrouping.cs" />
+        <Compile Include="Dynamics\DynamicPublishedContentIdEqualityComparer.cs" />
+        <Compile Include="Dynamics\DynamicPublishedContentListOrdering.cs" />
+        <Compile Include="Dynamics\DynamicQueryable.cs" />
+        <Compile Include="Dynamics\ExpressionParser.cs" />
+        <Compile Include="Dynamics\ExtensionMethods.cs" />
+        <Compile Include="Dynamics\Grouping.cs" />
+        <Compile Include="HttpRequestExtensions.cs" />
+        <Compile Include="HttpUrlHelperExtensions.cs" />
+        <Compile Include="Install\FilePermissionHelper.cs" />
+        <Compile Include="Install\InstallHelper.cs" />
+        <Compile Include="Install\HttpInstallAuthorizeAttribute.cs" />
+        <Compile Include="Macros\PartialViewMacroController.cs" />
+        <Compile Include="Macros\PartialViewMacroEngine.cs" />
+        <Compile Include="Macros\PartialViewMacroPage.cs" />
+        <Compile Include="Media\ImageUrl.cs" />
+        <Compile Include="Media\ImageUrlProviderResolver.cs" />
+        <Compile Include="Media\ImageUrlProviders\ImageUrlProvider.cs" />
+        <Compile Include="Models\DynamicPublishedContent.cs" />
+        <Compile Include="Models\DynamicPublishedContentList.cs" />
+        <Compile Include="Models\PartialViewMacroModel.cs" />
+        <Compile Include="Models\PublishedContentBase.cs" />
+        <Compile Include="Mvc\AreaRegistrationExtensions.cs" />
+        <Compile Include="BaseRest\BaseRestHandler.cs" />
+        <Compile Include="BaseRest\MemberRest.cs" />
+        <Compile Include="BaseRest\RestExtensionAttribute.cs" />
+        <Compile Include="BaseRest\RestExtensionMethodAttribute.cs" />
+        <Compile Include="BaseRest\RestExtensionMethodInfo.cs" />
+        <Compile Include="ContextualPublishedCacheExtensions.cs" />
+        <Compile Include="Mvc\DefaultRenderMvcControllerResolver.cs" />
+        <Compile Include="Mvc\QueryStringFilterAttribute.cs" />
+        <Compile Include="PublishedCache\ContextualPublishedContentCache.cs" />
+        <Compile Include="PublishedCache\ContextualPublishedCacheOfT.cs" />
+        <Compile Include="PublishedCache\ContextualPublishedCache.cs" />
+        <Compile Include="PublishedCache\ContextualPublishedMediaCache.cs" />
+        <Compile Include="PublishedCache\PublishedCachesResolver.cs" />
+        <Compile Include="PublishedCache\IPublishedCaches.cs" />
+        <Compile Include="PublishedCache\PublishedCaches.cs" />
+        <Compile Include="PublishedCache\XmlPublishedCache\PublishedMediaCache.cs" />
+        <Compile Include="Dictionary\UmbracoCultureDictionary.cs" />
+        <Compile Include="Dictionary\UmbracoCultureDictionaryFactory.cs" />
+        <Compile Include="Mvc\MemberAuthorizeAttribute.cs" />
+        <Compile Include="Mvc\BackOfficeArea.cs" />
+        <Compile Include="Mvc\ControllerFactoryExtensions.cs" />
+        <Compile Include="Mvc\IRenderMvcController.cs" />
+        <Compile Include="Mvc\SurfaceRouteHandler.cs" />
+        <Compile Include="PublishedCache\XmlPublishedCache\RoutesCache.cs" />
+        <Compile Include="PublishedCache\XmlPublishedCache\UmbracoContextCache.cs" />
+        <Compile Include="Routing\UrlProviderMode.cs" />
+        <Compile Include="Search\ExamineIndexerModel.cs" />
+        <Compile Include="Search\LuceneIndexerExtensions.cs" />
+        <Compile Include="Security\ValidateRequestAttempt.cs" />
+        <Compile Include="Security\WebSecurity.cs" />
+        <Compile Include="UI\JavaScript\Resources.Designer.cs">
+            <AutoGen>True</AutoGen>
+            <DesignTime>True</DesignTime>
+            <DependentUpon>Resources.resx</DependentUpon>
+        </Compile>
+        <Compile Include="UI\JavaScript\ServerVariablesParser.cs" />
+        <Compile Include="Strategies\Migrations\RebuildXmlCachesAfterUpgrade.cs" />
+        <Compile Include="Strategies\PublicAccessEventHandler.cs" />
+        <Compile Include="UI\Bundles\JsApplicationLib.cs" />
+        <Compile Include="UI\Bundles\JsJQueryCore.cs" />
+        <Compile Include="UI\Bundles\JsJQueryPlugins.cs" />
+        <Compile Include="UI\Bundles\JsUmbracoApplicationCore.cs" />
+        <Compile Include="UI\Bundles\JsUmbracoApplicationUI.cs" />
+        <Compile Include="UI\Bundles\JsUmbracoTree.cs" />
+        <Compile Include="UI\CdfLogger.cs" />
+        <Compile Include="Models\LegacyNodeHelper.cs" />
+        <Compile Include="umbraco.presentation\umbraco\controls\Tree\TreeControl.ascx.cs">
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\create\simple.ascx.cs">
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\developer\Packages\directoryBrowser.aspx.cs">
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\dialogs\ProtectPage.aspx.cs">
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\dialogs\create.aspx.cs">
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\dialogs\AssignDomain2.aspx.cs">
+            <DependentUpon>AssignDomain2.aspx</DependentUpon>
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\dialogs\AssignDomain2.aspx.designer.cs">
+            <DependentUpon>AssignDomain2.aspx</DependentUpon>
+        </Compile>
+        <Compile Include="UmbracoContextExtensions.cs" />
+        <Compile Include="umbraco.presentation\umbraco\settings\stylesheet\editstylesheet.aspx.cs">
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\settings\stylesheet\property\EditStyleSheetProperty.aspx.cs">
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="Controllers\UmbLoginController.cs" />
+        <Compile Include="umbraco.presentation\umbraco\Trees\TranslateTreeNames.cs" />
+        <Compile Include="UrlHelperExtensions.cs" />
+        <Compile Include="Editors\MediaController.cs" />
+        <Compile Include="UrlHelperRenderExtensions.cs" />
+        <Compile Include="WebApi\Binders\ContentItemBaseBinder.cs" />
+        <Compile Include="WebApi\IsBackOfficeAttribute.cs" />
+        <Compile Include="WebApi\Binders\ContentItemBinder.cs" />
+        <Compile Include="WebApi\Binders\MediaItemBinder.cs" />
+        <Compile Include="WebApi\Filters\EnsureUserPermissionForContentAttribute.cs" />
+        <Compile Include="WebApi\Filters\ContentItemValidationHelper.cs" />
+        <Compile Include="WebApi\Filters\EnsureUserPermissionForMediaAttribute.cs" />
+        <Compile Include="WebApi\Filters\FileUploadCleanupFilterAttribute.cs" />
+        <Compile Include="WebApi\Filters\FilterAllowedOutgoingContentAttribute.cs" />
+        <Compile Include="WebApi\Filters\FilterAllowedOutgoingMediaAttribute.cs" />
+        <Compile Include="WebApi\Filters\HttpQueryStringFilterAttribute.cs" />
+        <Compile Include="WebApi\Filters\OutgoingDateTimeFormatAttribute.cs" />
+        <Compile Include="WebApi\Filters\UmbracoApplicationAuthorizeAttribute.cs" />
+        <Compile Include="WebApi\GuidNoHyphenConverter.cs" />
+        <Compile Include="WebApi\HttpRequestMessageExtensions.cs" />
+        <Compile Include="WebApi\JsonCamelCaseFormatter.cs" />
+        <Compile Include="WebApi\MemberAuthorizeAttribute.cs" />
+        <Compile Include="WebApi\MvcVersionCheck.cs" />
+        <Compile Include="WebApi\NamespaceHttpControllerSelector.cs" />
+        <Compile Include="WebApi\PrefixlessBodyModelValidator.cs" />
+        <Compile Include="WebApi\PrefixlessBodyModelValidatorAttribute.cs" />
+        <Compile Include="WebApi\SessionHttpControllerRouteHandler.cs" />
+        <Compile Include="WebApi\UmbracoApiController.cs" />
+        <Compile Include="WebApi\UmbracoApiControllerBase.cs" />
+        <Compile Include="WebApi\UmbracoApiControllerResolver.cs" />
+        <Compile Include="Mvc\UmbracoAuthorizeAttribute.cs" />
+        <Compile Include="Mvc\NotChildAction.cs" />
+        <Compile Include="Mvc\UmbracoAuthorizedController.cs" />
+        <Compile Include="Mvc\UmbracoController.cs" />
+        <Compile Include="Mvc\UmbracoControllerFactory.cs" />
+        <Compile Include="Mvc\UmbracoMvcHandler.cs" />
+        <Compile Include="Mvc\UmbracoViewPageOfTModel.cs" />
+        <Compile Include="PublishedCache\IPublishedCache.cs" />
+        <Compile Include="PublishedCache\IPublishedContentCache.cs" />
+        <Compile Include="PublishedCache\IPublishedMediaCache.cs" />
+        <Compile Include="PublishedContentExtensions.cs" />
+        <Compile Include="ExamineExtensions.cs" />
+        <Compile Include="FormlessPage.cs">
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="HtmlHelperRenderExtensions.cs" />
+        <Compile Include="Scheduling\Scheduler.cs" />
+        <Compile Include="Media\EmbedProviders\AbstractOEmbedProvider.cs" />
+        <Compile Include="Media\EmbedProviders\AbstractProvider.cs" />
+        <Compile Include="Media\EmbedProviders\OEmbedRich.cs" />
+        <Compile Include="Media\EmbedProviders\OEmbedVideo.cs" />
+        <Compile Include="Media\EmbedProviders\Settings\Dictionary.cs" />
+        <Compile Include="Media\EmbedProviders\Settings\String.cs" />
+        <Compile Include="Media\EmbedProviders\Twitgoo.cs" />
+        <Compile Include="ModelStateExtensions.cs" />
+        <Compile Include="Mvc\HtmlTagWrapper.cs" />
+        <Compile Include="Mvc\HtmlTagWrapperTextNode.cs" />
+        <Compile Include="Mvc\IHtmlTagWrapper.cs" />
+        <Compile Include="Mvc\MergeModelStateToChildActionAttribute.cs" />
+        <Compile Include="Mvc\PluginController.cs" />
+        <Compile Include="Mvc\PluginViewEngine.cs" />
+        <Compile Include="Mvc\PostedDataProxyInfo.cs" />
+        <Compile Include="Mvc\RedirectToUmbracoPageResult.cs" />
+        <Compile Include="Mvc\Strings.Designer.cs">
+            <AutoGen>True</AutoGen>
+            <DesignTime>True</DesignTime>
+            <DependentUpon>Strings.resx</DependentUpon>
+        </Compile>
+        <Compile Include="Mvc\SurfaceController.cs" />
+        <Compile Include="Mvc\PluginControllerArea.cs" />
+        <Compile Include="Mvc\PluginControllerAttribute.cs" />
+        <Compile Include="Mvc\SurfaceControllerFactory.cs" />
+        <Compile Include="Mvc\PluginControllerMetadata.cs" />
+        <Compile Include="Mvc\UmbracoPageResult.cs" />
+        <Compile Include="PropertyEditors\ValueConverters\RteMacroRenderingValueConverter.cs" />
+        <Compile Include="RenderFieldCaseType.cs" />
+        <Compile Include="RenderFieldEncodingType.cs" />
+        <Compile Include="RouteCollectionExtensions.cs" />
+        <Compile Include="Routing\AliasUrlProvider.cs" />
+        <Compile Include="Routing\ContentFinderByLegacy404.cs" />
+        <Compile Include="Routing\ContentFinderByNotFoundHandler.cs" />
+        <Compile Include="Routing\ContentFinderByPageIdQuery.cs" />
+        <Compile Include="Mvc\SurfaceControllerResolver.cs" />
+        <Compile Include="Routing\ContentFinderByNotFoundHandlers.cs" />
+        <Compile Include="Routing\ISiteDomainHelper.cs" />
+        <Compile Include="Routing\RoutableAttemptEventArgs.cs" />
+        <Compile Include="Routing\DefaultUrlProvider.cs" />
+        <Compile Include="Routing\DomainAndUri.cs" />
+        <Compile Include="Routing\IUrlProvider.cs" />
+        <Compile Include="Routing\SiteDomainHelper.cs" />
+        <Compile Include="Routing\SiteDomainHelperResolver.cs" />
+        <Compile Include="Routing\UrlProviderResolver.cs" />
+        <Compile Include="Routing\NotFoundHandlerHelper.cs" />
+        <Compile Include="Routing\EnsureRoutableOutcome.cs" />
+        <Compile Include="Security\LegacyDefaultAppMapping.cs" />
+        <Compile Include="Routing\PublishedContentRequestEngine.cs" />
+        <Compile Include="Routing\UrlProvider.cs" />
+        <Compile Include="Routing\WebServicesRouteConstraint.cs" />
+        <Compile Include="Search\ExamineSearcherModel.cs" />
+        <Compile Include="Search\ExamineEvents.cs" />
+        <Compile Include="Strategies\DataTypes\LegacyUploadFieldWorkaround.cs" />
+        <Compile Include="Strategies\Migrations\PublishAfterUpgradeToVersionSixth.cs" />
+        <Compile Include="Strategies\LegacyClasses.cs" />
+        <Compile Include="Strategies\Migrations\EnsureAppsTreesUpdatedOnUpgrade.cs" />
+        <Compile Include="Strategies\ServerRegistrationEventHandler.cs" />
+        <Compile Include="Templates\TemplateRenderer.cs" />
+        <Compile Include="Templates\TemplateUtilities.cs" />
+        <Compile Include="Trees\PartialViewMacrosTreeController.cs" />
+        <Compile Include="Trees\PartialViewsTreeController.cs" />
+        <Compile Include="UI\Controls\InsertMacroSplitButton.cs" />
+        <Compile Include="UI\IAssignedApp.cs" />
+        <Compile Include="UI\LegacyDialogHandler.cs" />
+        <Compile Include="UI\LegacyDialogTask.cs" />
+        <Compile Include="UI\Controls\ProgressBar.cs" />
+        <Compile Include="UI\Controls\UmbracoControl.cs" />
+        <Compile Include="UI\Controls\UmbracoUserControl.cs">
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="UI\Pages\BasePage.cs">
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="UI\Pages\ClientTools.cs" />
+        <Compile Include="UI\Pages\UmbracoEnsuredPage.cs">
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="UI\SpeechBubbleIcon.cs" />
+        <Compile Include="umbraco.presentation\AttributeCollectionAdapter.cs" />
+        <Compile Include="umbraco.presentation\Default.aspx.cs">
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\MacroCacheContent.cs" />
+        <Compile Include="umbraco.presentation\ScriptingMacroResult.cs" />
+        <Compile Include="umbraco.presentation\umbraco\dialogs\sort.aspx.cs">
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\macroResultWrapper.aspx.cs">
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\masterpages\default.Master.cs">
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\publishStatus.aspx.cs">
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\Default.aspx.cs">
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\tree.aspx.cs">
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\ping.aspx.cs">
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\developer\Macros\editMacro.aspx.cs">
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\developer\Python\editPython.aspx.cs">
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\developer\Xslt\editXslt.aspx.cs">
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\dialogs\editMacro.aspx.cs">
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\dialogs\umbracoField.aspx.cs">
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\dialogs\treePicker.aspx.cs">
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\masterpages\umbracoPage.master.cs">
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\masterpages\umbracoDialog.master.cs">
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\nodeFactory\UmbracoSiteMapProviderAccessUpdate.cs" />
+        <Compile Include="umbraco.presentation\umbraco\Search\QuickSearch.ascx.cs">
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\settings\modals\ShowUmbracoTags.aspx.cs">
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\templateControls\Image.cs" />
+        <Compile Include="umbraco.presentation\umbraco\uQuery\IGetProperty.cs" />
+        <Compile Include="umbraco.presentation\XsltExtensionAttribute.cs" />
+        <Compile Include="UmbracoHelper.cs" />
+        <Compile Include="Mvc\ViewContextExtensions.cs" />
+        <Compile Include="Mvc\ViewDataContainerExtensions.cs" />
+        <Compile Include="PublishedCache\XmlPublishedCache\PublishedContentCache.cs" />
+        <Compile Include="Routing\PublishedContentNotFoundHandler.cs" />
+        <Compile Include="PublishedCache\XmlPublishedCache\XmlPublishedContent.cs" />
+        <Compile Include="PublishedCache\XmlPublishedCache\XmlPublishedProperty.cs" />
+        <Compile Include="Mvc\Constants.cs" />
+        <Compile Include="Mvc\FilteredControllerFactoriesResolver.cs" />
+        <Compile Include="Mvc\IFilteredControllerFactory.cs" />
+        <Compile Include="Mvc\MasterControllerFactory.cs" />
+        <Compile Include="Mvc\RenderActionInvoker.cs" />
+        <Compile Include="Mvc\RenderControllerFactory.cs" />
+        <Compile Include="Models\RenderModel.cs" />
+        <Compile Include="Mvc\RenderModelBinder.cs" />
+        <Compile Include="Mvc\RenderMvcController.cs" />
+        <Compile Include="Mvc\RenderRouteHandler.cs" />
+        <Compile Include="Mvc\RenderViewEngine.cs" />
+        <Compile Include="Mvc\UmbracoTemplatePage.cs" />
+        <Compile Include="Mvc\RouteDefinition.cs" />
+        <Compile Include="Mvc\RouteValueDictionaryExtensions.cs" />
+        <Compile Include="umbraco.presentation\umbraco\nodeFactory\Node.cs" />
+        <Compile Include="umbraco.presentation\umbraco\nodeFactory\Nodes.cs" />
+        <Compile Include="umbraco.presentation\umbraco\nodeFactory\Property.cs" />
+        <Compile Include="Routing\UmbracoRequestEventArgs.cs" />
+        <Compile Include="UmbracoUserControl.cs">
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="WebApi\UmbracoAuthorizeAttribute.cs" />
+        <Compile Include="WebApi\UmbracoAuthorizedApiController.cs" />
+        <Compile Include="WebApi\Filters\ValidationFilterAttribute.cs" />
+        <Compile Include="WebApi\Filters\UmbracoUserTimeoutFilterAttribute.cs" />
+        <Compile Include="WebApi\UnhandedExceptionLoggerConfigurationAttribute.cs" />
+        <Compile Include="WebApi\UnhandledExceptionLogger.cs" />
+        <Compile Include="WebApi\WebApiHelper.cs" />
+        <Compile Include="WebBootManager.cs" />
+        <Compile Include="Routing\LegacyRequestInitializer.cs" />
+        <Compile Include="Mvc\ControllerExtensions.cs" />
+        <Compile Include="Routing\ContentLastChanceFinderResolver.cs" />
+        <Compile Include="Routing\ContentFinderByUrlAlias.cs" />
+        <Compile Include="Media\ThumbnailProviders\AbstractThumbnailProvider.cs" />
+        <Compile Include="Media\ThumbnailProviders\MediaTypeIconThumbnailProvider.cs" />
+        <Compile Include="Media\ThumbnailProviders\FileExtensionIconThumbnailProvider.cs" />
+        <Compile Include="Media\ThumbnailProviders\ImageThumbnailProvider.cs" />
+        <Compile Include="Media\ThumbnailProviders\ThumbnailProvidersResolver.cs" />
+        <Compile Include="UI\Controls\FolderBrowser.cs" />
+        <Compile Include="Routing\ContentFinderByIdPath.cs" />
+        <Compile Include="Routing\ContentFinderByNiceUrl.cs" />
+        <Compile Include="Routing\ContentFinderByNiceUrlAndTemplate.cs" />
+        <Compile Include="Routing\ContentFinderByProfile.cs" />
+        <Compile Include="PluginManagerExtensions.cs" />
+        <Compile Include="Routing\DomainHelper.cs" />
+        <Compile Include="Routing\ContentFinderResolver.cs" />
+        <Compile Include="Routing\PublishedContentRequest.cs" />
+        <Compile Include="Routing\IContentFinder.cs" />
+        <Compile Include="Routing\RoutingContext.cs" />
+        <Compile Include="umbraco.presentation\EnsureSystemPathsApplicationStartupHandler.cs" />
+        <Compile Include="Properties\AssemblyInfo.cs">
+            <SubType>Code</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\BasePageExtensions.cs" />
+        <Compile Include="umbraco.presentation\content.cs">
+            <SubType>Code</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\helper.cs">
+            <SubType>Code</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\item.cs">
+            <SubType>Code</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\keepAliveService.cs">
+            <SubType>Code</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\library.cs">
+            <SubType>Code</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\macro.cs" />
+        <Compile Include="umbraco.presentation\page.cs">
+            <SubType>Code</SubType>
+        </Compile>
+        <Compile Include="Properties\Settings1.Designer.cs">
+            <AutoGen>True</AutoGen>
+            <DesignTimeSharedInput>True</DesignTimeSharedInput>
+            <DependentUpon>Settings.settings</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\publishingService.cs">
+            <SubType>Code</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\PublishQueue.cs" />
+        <Compile Include="umbraco.presentation\python.cs" />
+        <Compile Include="umbraco.presentation\NotFoundHandlers.cs">
+            <SubType>Code</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\requestModule.cs">
+            <SubType>Code</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\showField.cs">
+            <SubType>Code</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\template.cs">
+            <SubType>Code</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\UmbracoContext.cs" />
+        <Compile Include="umbraco.presentation\UmbracoPage.cs">
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbracoPageHolder.cs">
+            <SubType>Code</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\UmbracoRequest.cs">
+            <SubType>Code</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\UmbracoResponse.cs">
+            <SubType>Code</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\UmbracoServerUtility.cs" />
+        <Compile Include="umbraco.presentation\umbraco\actions\delete.aspx.cs">
+            <DependentUpon>delete.aspx</DependentUpon>
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\actions\delete.aspx.designer.cs">
+            <DependentUpon>delete.aspx</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\actions\editContent.aspx.cs">
+            <DependentUpon>editContent.aspx</DependentUpon>
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\actions\editContent.aspx.designer.cs">
+            <DependentUpon>editContent.aspx</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\actions\preview.aspx.cs">
+            <DependentUpon>preview.aspx</DependentUpon>
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\actions\preview.aspx.designer.cs">
+            <DependentUpon>preview.aspx</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\actions\publish.aspx.cs">
+            <DependentUpon>publish.aspx</DependentUpon>
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\actions\publish.aspx.designer.cs">
+            <DependentUpon>publish.aspx</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\controls\ContentControl.cs" />
+        <Compile Include="umbraco.presentation\umbraco\controls\ContentPicker.cs" />
+        <Compile Include="umbraco.presentation\umbraco\controls\ContentTypeControl.cs" />
+        <Compile Include="umbraco.presentation\umbraco\controls\Images\ImageViewer.ascx.cs">
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\controls\dualSelectBox.cs" />
+        <Compile Include="umbraco.presentation\umbraco\controls\GenericValidation.cs" />
+        <Compile Include="umbraco.presentation\umbraco\controls\LabelButton.cs" />
+        <Compile Include="umbraco.presentation\umbraco\controls\macroParameterControl.cs" />
+        <Compile Include="umbraco.presentation\umbraco\controls\ProgressBar.ascx.cs">
+            <DependentUpon>ProgressBar.ascx</DependentUpon>
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\controls\ProgressBar.ascx.designer.cs">
+            <DependentUpon>ProgressBar.ascx</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\controls\SaveClickEventArgs.cs" />
+        <Compile Include="umbraco.presentation\umbraco\controls\Tree\CustomTreeControl.cs">
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\controls\Tree\CustomTreeService.cs">
+            <SubType>Component</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\controls\Tree\JTreeContextMenu.cs" />
+        <Compile Include="umbraco.presentation\umbraco\controls\Tree\JTreeContextMenuItem.cs" />
+        <Compile Include="umbraco.presentation\umbraco\controls\Tree\NodeInfo.cs">
+            <SubType>Code</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\create\CreatedPackageTasks.cs" />
+        <Compile Include="umbraco.presentation\umbraco\create\dictionaryTasks.cs" />
+        <Compile Include="umbraco.presentation\umbraco\create\macroTasks.cs" />
+        <Compile Include="umbraco.presentation\umbraco\create\MemberGroupTasks.cs" />
+        <Compile Include="umbraco.presentation\umbraco\create\stylesheetPropertyTasks.cs" />
+        <Compile Include="umbraco.presentation\umbraco\create\StylesheetTasks.cs" />
+        <Compile Include="umbraco.presentation\umbraco\create\XsltTasks.cs" />
+        <Compile Include="umbraco.presentation\umbraco\dashboard\FeedProxy.aspx.cs">
+            <DependentUpon>FeedProxy.aspx</DependentUpon>
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\dashboard\FeedProxy.aspx.designer.cs">
+            <DependentUpon>FeedProxy.aspx</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\EditRelationType.aspx.cs">
+            <DependentUpon>EditRelationType.aspx</DependentUpon>
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\EditRelationType.aspx.designer.cs">
+            <DependentUpon>EditRelationType.aspx</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\NewRelationType.aspx.cs">
+            <DependentUpon>NewRelationType.aspx</DependentUpon>
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\NewRelationType.aspx.designer.cs">
+            <DependentUpon>NewRelationType.aspx</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\ReadOnlyRelation.cs" />
+        <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\RelationTypesWebService.asmx.cs">
+            <DependentUpon>RelationTypesWebService.asmx</DependentUpon>
+            <SubType>Component</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\TreeMenu\ActionDeleteRelationType.cs" />
+        <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\TreeMenu\ActionNewRelationType.cs" />
+        <Compile Include="umbraco.presentation\umbraco\dialogs\Preview.aspx.cs">
+            <DependentUpon>Preview.aspx</DependentUpon>
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\dialogs\Preview.aspx.designer.cs">
+            <DependentUpon>Preview.aspx</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\members\MemberSearch.ascx.cs">
+            <DependentUpon>MemberSearch.ascx</DependentUpon>
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\members\MemberSearch.ascx.designer.cs">
+            <DependentUpon>MemberSearch.ascx</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\nodeFactory\Page_Legacy.cs" />
+        <Compile Include="umbraco.presentation\umbraco\preview\PreviewContent.cs" />
+        <Compile Include="umbraco.presentation\umbraco\Search\ExamineEvents.cs" />
+        <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltVisualize.aspx.cs">
+            <DependentUpon>xsltVisualize.aspx</DependentUpon>
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltVisualize.aspx.designer.cs">
+            <DependentUpon>xsltVisualize.aspx</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\dialogs\insertMasterpageContent.aspx.cs">
+            <DependentUpon>insertMasterpageContent.aspx</DependentUpon>
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\dialogs\insertMasterpageContent.aspx.designer.cs">
+            <DependentUpon>insertMasterpageContent.aspx</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\dialogs\insertMasterpagePlaceholder.aspx.cs">
+            <DependentUpon>insertMasterpagePlaceholder.aspx</DependentUpon>
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\dialogs\insertMasterpagePlaceholder.aspx.designer.cs">
+            <DependentUpon>insertMasterpagePlaceholder.aspx</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\dialogs\republish.aspx.cs">
+            <DependentUpon>republish.aspx</DependentUpon>
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\dialogs\republish.aspx.designer.cs">
+            <DependentUpon>republish.aspx</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\dialogs\search.aspx.cs">
+            <DependentUpon>search.aspx</DependentUpon>
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\dialogs\search.aspx.designer.cs">
+            <DependentUpon>search.aspx</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\dialogs\SendPublish.aspx.cs">
+            <DependentUpon>SendPublish.aspx</DependentUpon>
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\dialogs\SendPublish.aspx.designer.cs">
+            <DependentUpon>SendPublish.aspx</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\create\dialogHandler_temp.cs">
+            <SubType>Code</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\create\languageTasks.cs">
+            <SubType>Code</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\developer\Macros\assemblyBrowser.aspx.cs">
+            <DependentUpon>assemblyBrowser.aspx</DependentUpon>
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\developer\Macros\assemblyBrowser.aspx.designer.cs">
+            <DependentUpon>assemblyBrowser.aspx</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\developer\Packages\editPackage.aspx.cs">
+            <DependentUpon>editPackage.aspx</DependentUpon>
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\developer\Packages\editPackage.aspx.designer.cs">
+            <DependentUpon>editPackage.aspx</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\developer\Xslt\getXsltStatus.asmx.cs">
+            <DependentUpon>getXsltStatus.asmx</DependentUpon>
+            <SubType>Component</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltChooseExtension.aspx.cs">
+            <DependentUpon>xsltChooseExtension.aspx</DependentUpon>
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltChooseExtension.aspx.designer.cs">
+            <DependentUpon>xsltChooseExtension.aspx</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltInsertValueOf.aspx.cs">
+            <DependentUpon>xsltInsertValueOf.aspx</DependentUpon>
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltInsertValueOf.aspx.designer.cs">
+            <DependentUpon>xsltInsertValueOf.aspx</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\dialogs\exportDocumenttype.aspx.cs">
+            <DependentUpon>exportDocumenttype.aspx</DependentUpon>
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\dialogs\importDocumenttype.aspx.cs">
+            <DependentUpon>importDocumenttype.aspx</DependentUpon>
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\dialogs\rollBack.aspx.cs">
+            <DependentUpon>rollBack.aspx</DependentUpon>
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\dialogs\rollBack.aspx.designer.cs">
+            <DependentUpon>rollBack.aspx</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\dialogs\sendToTranslation.aspx.cs">
+            <DependentUpon>sendToTranslation.aspx</DependentUpon>
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\dialogs\sendToTranslation.aspx.designer.cs">
+            <DependentUpon>sendToTranslation.aspx</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\dialogs\viewAuditTrail.aspx.cs">
+            <DependentUpon>viewAuditTrail.aspx</DependentUpon>
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\dialogs\viewAuditTrail.aspx.designer.cs">
+            <DependentUpon>viewAuditTrail.aspx</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\members\EditMemberGroup.aspx.cs">
+            <DependentUpon>EditMemberGroup.aspx</DependentUpon>
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\members\EditMemberGroup.aspx.designer.cs">
+            <DependentUpon>EditMemberGroup.aspx</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\members\search.aspx.cs">
+            <DependentUpon>search.aspx</DependentUpon>
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\members\search.aspx.designer.cs">
+            <DependentUpon>search.aspx</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\members\ViewMembers.aspx.cs">
+            <DependentUpon>ViewMembers.aspx</DependentUpon>
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\members\ViewMembers.aspx.designer.cs">
+            <DependentUpon>ViewMembers.aspx</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\nodeFactory\Properties.cs">
+            <SubType>Code</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\nodeFactory\UmbracoSiteMapProvider.cs" />
+        <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\GzipCompressor.cs" />
+        <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\GzipModule.cs" />
+        <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\IModule.cs" />
+        <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\JSON.cs" />
+        <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\JSONReader.cs" />
+        <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\JSONWriter.cs" />
+        <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\tinymce3tinymceCompress.aspx.cs">
+            <DependentUpon>tinymce3tinymceCompress.aspx</DependentUpon>
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\tinymce3tinymceCompress.aspx.designer.cs">
+            <DependentUpon>tinymce3tinymceCompress.aspx</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\Search\QuickSearchHandler.ashx.cs">
+            <DependentUpon>QuickSearchHandler.ashx</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\settings\DictionaryItemList.aspx.cs">
+            <DependentUpon>DictionaryItemList.aspx</DependentUpon>
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\settings\DictionaryItemList.aspx.designer.cs">
+            <DependentUpon>DictionaryItemList.aspx</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\settings\editLanguage.aspx.cs">
+            <DependentUpon>editLanguage.aspx</DependentUpon>
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\settings\editLanguage.aspx.designer.cs">
+            <DependentUpon>editLanguage.aspx</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\templateControls\Script.cs" />
+        <Compile Include="umbraco.presentation\umbraco\Trees\BaseMediaTree.cs" />
+        <Compile Include="umbraco.presentation\umbraco\Trees\loadDLRScripts.cs" />
+        <Compile Include="umbraco.presentation\umbraco\Trees\ITreeService.cs">
+            <SubType>Code</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\Trees\loadRelationTypes.cs" />
+        <Compile Include="umbraco.presentation\umbraco\Trees\MediaRecycleBin.cs" />
+        <Compile Include="umbraco.presentation\umbraco\Trees\NodeActionsEventArgs.cs" />
+        <Compile Include="umbraco.presentation\umbraco\Trees\TreeEventArgs.cs" />
+        <Compile Include="umbraco.presentation\umbraco\Trees\TreeRequestParams.cs" />
+        <Compile Include="umbraco.presentation\umbraco\uQuery\ContentExtensions.cs" />
+        <Compile Include="umbraco.presentation\umbraco\uQuery\ContentTypeExtensions.cs" />
+        <Compile Include="umbraco.presentation\umbraco\uQuery\DocumentExtensions.cs" />
+        <Compile Include="umbraco.presentation\umbraco\uQuery\MediaExtensions.cs" />
+        <Compile Include="umbraco.presentation\umbraco\uQuery\MemberExtensions.cs" />
+        <Compile Include="umbraco.presentation\umbraco\uQuery\NodeExtensions.cs" />
+        <Compile Include="umbraco.presentation\umbraco\uQuery\PreValueExtensions.cs" />
+        <Compile Include="umbraco.presentation\umbraco\uQuery\RelationTypeExtensions.cs" />
+        <Compile Include="umbraco.presentation\umbraco\uQuery\UmbracoObjectTypeExtensions.cs" />
+        <Compile Include="umbraco.presentation\umbraco\webservices\MacroContainerService.asmx.cs">
+            <DependentUpon>MacroContainerService.asmx</DependentUpon>
+            <SubType>Component</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\webservices\TagsAutoCompleteHandler.ashx.cs">
+            <DependentUpon>TagsAutoCompleteHandler.ashx</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\webservices\TreeClientService.asmx.cs">
+            <DependentUpon>TreeClientService.asmx</DependentUpon>
+            <SubType>Component</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\templateControls\DisableEventValidation.cs" />
+        <Compile Include="umbraco.presentation\umbraco\templateControls\Item.cs" />
+        <Compile Include="umbraco.presentation\umbraco\templateControls\ItemRenderer.cs" />
+        <Compile Include="umbraco.presentation\umbraco\templateControls\Macro.cs" />
+        <Compile Include="umbraco.presentation\umbraco\templateControls\ContentType.cs" />
+        <Compile Include="umbraco.presentation\umbraco\templateControls\Resources.Designer.cs">
+            <AutoGen>True</AutoGen>
+            <DesignTime>True</DesignTime>
+            <DependentUpon>Resources.resx</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\translation\default.aspx.cs">
+            <DependentUpon>default.aspx</DependentUpon>
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\translation\default.aspx.designer.cs">
+            <DependentUpon>default.aspx</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\translation\details.aspx.cs">
+            <DependentUpon>details.aspx</DependentUpon>
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\translation\details.aspx.designer.cs">
+            <DependentUpon>details.aspx</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\translation\preview.aspx.cs">
+            <DependentUpon>preview.aspx</DependentUpon>
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\translation\preview.aspx.designer.cs">
+            <DependentUpon>preview.aspx</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\translation\xml.aspx.cs">
+            <DependentUpon>xml.aspx</DependentUpon>
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\translation\xml.aspx.designer.cs">
+            <DependentUpon>xml.aspx</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\treeInit.aspx.cs">
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\Trees\BaseContentTree.cs" />
+        <Compile Include="umbraco.presentation\umbraco\Trees\BaseTree.cs" />
+        <Compile Include="umbraco.presentation\umbraco\Trees\ContentRecycleBin.cs" />
+        <Compile Include="umbraco.presentation\umbraco\Trees\FileSystemTree.cs" />
+        <Compile Include="umbraco.presentation\umbraco\Trees\loadContent.cs" />
+        <Compile Include="umbraco.presentation\umbraco\Trees\loadcontentItemType.cs" />
+        <Compile Include="umbraco.presentation\umbraco\Trees\loadDataTypes.cs" />
+        <Compile Include="umbraco.presentation\umbraco\Trees\loadLanguages.cs" />
+        <Compile Include="umbraco.presentation\umbraco\Trees\loadMacros.cs" />
+        <Compile Include="umbraco.presentation\umbraco\Trees\loadMedia.cs" />
+        <Compile Include="umbraco.presentation\umbraco\Trees\loadMediaTypes.cs" />
+        <Compile Include="umbraco.presentation\umbraco\Trees\loadMemberGroups.cs" />
+        <Compile Include="umbraco.presentation\umbraco\Trees\loadMembers.cs" />
+        <Compile Include="umbraco.presentation\umbraco\Trees\loadMemberTypes.cs" />
+        <Compile Include="umbraco.presentation\umbraco\Trees\loadNodeTypes.cs" />
+        <Compile Include="umbraco.presentation\umbraco\Trees\loadPython.cs" />
+        <Compile Include="umbraco.presentation\umbraco\Trees\loadScripts.cs" />
+        <Compile Include="umbraco.presentation\umbraco\Trees\loadStylesheetProperty.cs" />
+        <Compile Include="umbraco.presentation\umbraco\Trees\loadStylesheets.cs" />
+        <Compile Include="umbraco.presentation\umbraco\Trees\loadTemplates.cs" />
+        <Compile Include="umbraco.presentation\umbraco\Trees\loadTranslationTasks.cs" />
+        <Compile Include="umbraco.presentation\umbraco\Trees\loadUsers.cs" />
+        <Compile Include="umbraco.presentation\umbraco\Trees\loadXslt.cs" />
+        <Compile Include="umbraco.presentation\umbraco\Trees\NullTree.cs" />
+        <Compile Include="umbraco.presentation\umbraco\Trees\LegacyTree.cs" />
+        <Compile Include="umbraco.presentation\umbraco\webservices\TreeDataService.ashx.cs">
+            <DependentUpon>TreeDataService.ashx</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\Trees\TreeDefinitionCollection.cs" />
+        <Compile Include="umbraco.presentation\umbraco\Trees\TreeDefinition.cs" />
+        <Compile Include="umbraco.presentation\umbraco\Trees\TreeDialogModes.cs" />
+        <Compile Include="umbraco.presentation\umbraco\Trees\TreeService.cs" />
+        <Compile Include="umbraco.presentation\umbraco\Trees\XmlTree.cs">
+            <DependentUpon>XmlTree.xsd</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\urlRewriter\UrlRewriterFormWriter.cs" />
+        <Compile Include="umbraco.presentation\umbraco\webservices\ajaxHelpers.cs" />
+        <Compile Include="umbraco.presentation\umbraco\webservices\CacheRefresher.asmx.cs">
+            <DependentUpon>CacheRefresher.asmx</DependentUpon>
+            <SubType>Component</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\webservices\CheckForUpgrade.asmx.cs">
+            <DependentUpon>CheckForUpgrade.asmx</DependentUpon>
+            <SubType>Component</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\webservices\CMSNode.asmx.cs">
+            <DependentUpon>CMSNode.asmx</DependentUpon>
+            <SubType>Component</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\webservices\codeEditorSave.asmx.cs">
+            <DependentUpon>codeEditorSave.asmx</DependentUpon>
+            <SubType>Component</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\webservices\legacyAjaxCalls.asmx.cs">
+            <DependentUpon>legacyAjaxCalls.asmx</DependentUpon>
+            <SubType>Component</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\webservices\nodeSorter.asmx.cs">
+            <DependentUpon>nodeSorter.asmx</DependentUpon>
+            <SubType>Component</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\webservices\progressStatus.asmx.cs">
+            <DependentUpon>progressStatus.asmx</DependentUpon>
+            <SubType>Component</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\webservices\publication.asmx.cs">
+            <DependentUpon>publication.asmx</DependentUpon>
+            <SubType>Component</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\webservices\RegexComWebservice.cs" />
+        <Compile Include="umbraco.presentation\umbraco\Web\UI\ContentPage.cs">
+            <SubType>ASPXCodeBehind</SubType>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery.cs" />
+        <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Content.cs">
+            <DependentUpon>uQuery.cs</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-DataTypes.cs">
+            <DependentUpon>uQuery.cs</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Dictionary.cs">
+            <DependentUpon>uQuery.cs</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Document.cs">
+            <DependentUpon>uQuery.cs</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Media.cs">
+            <DependentUpon>uQuery.cs</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Members.cs">
+            <DependentUpon>uQuery.cs</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Nodes.cs">
+            <DependentUpon>uQuery.cs</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-PreValues.cs">
+            <DependentUpon>uQuery.cs</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-UmbracoObjectType.cs">
+            <DependentUpon>uQuery.cs</DependentUpon>
+        </Compile>
+        <Compile Include="umbraco.presentation\viewstateMoverModule.cs" />
+        <Compile Include="UmbracoApplication.cs" />
+        <Compile Include="UmbracoContext.cs" />
+        <Compile Include="UmbracoModule.cs" />
+        <Compile Include="UriUtility.cs" />
+        <Compile Include="Web References\org.umbraco.update\Reference.cs">
+            <AutoGen>True</AutoGen>
+            <DesignTime>True</DesignTime>
+            <DependentUpon>Reference.map</DependentUpon>
+        </Compile>
+        <Compile Include="WebServices\BulkPublishController.cs" />
+        <Compile Include="WebServices\CoreStringsController.cs" />
+        <Compile Include="WebServices\DomainsApiController.cs" />
+        <Compile Include="WebServices\EmbedMediaService.cs" />
+        <Compile Include="WebServices\ExamineManagementApiController.cs" />
+        <Compile Include="WebServices\TagsController.cs" />
+        <Compile Include="WebServices\UmbracoAuthorizedHttpHandler.cs" />
+        <Compile Include="WebServices\SaveFileController.cs" />
+        <Compile Include="WebServices\UmbracoAuthorizedWebService.cs">
+            <SubType>Component</SubType>
+        </Compile>
+        <Compile Include="WebServices\UmbracoHttpHandler.cs" />
+        <Compile Include="WebServices\UmbracoWebService.cs">
+            <SubType>Component</SubType>
+        </Compile>
+        <Compile Include="WebServices\XmlDataIntegrityController.cs" />
+        <Compile Include="WebViewPageExtensions.cs" />
+        <None Include="..\Umbraco.Web.UI\Views\web.config">
+            <Link>Mvc\web.config</Link>
+        </None>
+        <None Include="packages.config" />
+        <None Include="Web References\org.umbraco.our\Reference.map">
+            <Generator>MSDiscoCodeGenerator</Generator>
+            <LastGenOutput>Reference.cs</LastGenOutput>
+        </None>
+        <None Include="Web References\org.umbraco.our\repository.disco" />
+        <EmbeddedResource Include="UI\JavaScript\Main.js" />
+        <EmbeddedResource Include="UI\JavaScript\JsInitialize.js" />
+        <EmbeddedResource Include="UI\JavaScript\ServerVariables.js" />
+        <Content Include="umbraco.presentation\umbraco\controls\Tree\CustomTreeService.asmx" />
+        <Content Include="umbraco.presentation\umbraco\developer\RelationTypes\EditRelationType.aspx" />
+        <Content Include="umbraco.presentation\umbraco\developer\RelationTypes\NewRelationType.aspx" />
+        <Content Include="umbraco.presentation\umbraco\developer\RelationTypes\RelationTypesWebService.asmx" />
+        <Content Include="umbraco.presentation\umbraco\dashboard\FeedProxy.aspx" />
+        <Content Include="umbraco.presentation\umbraco\dialogs\AssignDomain2.aspx">
+            <SubType>ASPXCodeBehind</SubType>
+        </Content>
+        <Content Include="umbraco.presentation\umbraco\members\MemberSearch.ascx">
+            <SubType>ASPXCodeBehind</SubType>
+        </Content>
+        <Content Include="umbraco.presentation\umbraco\dialogs\Preview.aspx" />
+        <Content Include="umbraco.presentation\umbraco\controls\ProgressBar.ascx">
+            <SubType>ASPXCodeBehind</SubType>
+        </Content>
+        <Content Include="umbraco.presentation\umbraco\actions\delete.aspx" />
+        <Content Include="umbraco.presentation\umbraco\actions\editContent.aspx" />
+        <Content Include="umbraco.presentation\umbraco\actions\preview.aspx">
+            <SubType>ASPXCodeBehind</SubType>
+        </Content>
+        <Content Include="umbraco.presentation\umbraco\actions\publish.aspx">
+            <SubType>ASPXCodeBehind</SubType>
+        </Content>
+        <Content Include="umbraco.presentation\umbraco\webservices\MacroContainerService.asmx" />
+        <Content Include="umbraco.presentation\umbraco\developer\Xslt\xsltVisualize.aspx" />
+        <Content Include="umbraco.presentation\umbraco\dialogs\empty.htm" />
+        <Content Include="umbraco.presentation\umbraco\dialogs\republish.aspx">
+            <SubType>ASPXCodeBehind</SubType>
+        </Content>
+        <Content Include="umbraco.presentation\umbraco\dialogs\search.aspx" />
+        <Content Include="umbraco.presentation\umbraco\dialogs\SendPublish.aspx" />
+        <Content Include="umbraco.presentation\umbraco\webservices\TreeClientService.asmx" />
+        <Content Include="umbraco.presentation\umbraco\members\search.aspx" />
+        <Content Include="umbraco.presentation\umbraco\translation\details.aspx" />
+        <Content Include="umbraco.presentation\umbraco\developer\Packages\editPackage.aspx">
+            <SubType>ASPXCodeBehind</SubType>
+        </Content>
+        <Content Include="umbraco.presentation\umbraco\dialogs\exportDocumenttype.aspx" />
+        <Content Include="umbraco.presentation\umbraco\dialogs\importDocumenttype.aspx" />
+        <Content Include="umbraco.presentation\umbraco\dialogs\rollBack.aspx">
+            <SubType>ASPXCodeBehind</SubType>
+        </Content>
+        <Content Include="umbraco.presentation\umbraco\dialogs\sendToTranslation.aspx" />
+        <Content Include="umbraco.presentation\umbraco\dialogs\viewAuditTrail.aspx" />
+        <Content Include="umbraco.presentation\umbraco\members\ViewMembers.aspx" />
+        <Content Include="umbraco.presentation\umbraco\plugins\tinymce3\tinymce3tinymceCompress.aspx" />
+        <None Include="app.config" />
+        <None Include="Web References\org.umbraco.our\repository.wsdl" />
+        <None Include="Web References\org.umbraco.update\UpgradeResult.datasource">
+            <DependentUpon>Reference.map</DependentUpon>
+        </None>
+        <None Include="Web References\org.umbraco.update\UpgradeResult1.datasource">
+            <DependentUpon>Reference.map</DependentUpon>
+        </None>
+        <None Include="Properties\Settings.settings">
+            <Generator>SettingsSingleFileGenerator</Generator>
+            <LastGenOutput>Settings1.Designer.cs</LastGenOutput>
+        </None>
+        <Content Include="umbraco.presentation\umbraco\Search\QuickSearchHandler.ashx" />
+        <None Include="umbraco.presentation\umbraco\templateControls\InlineXslt.xsltTemplate" />
+        <Content Include="umbraco.presentation\umbraco\webservices\CheckForUpgrade.asmx" />
+        <Content Include="umbraco.presentation\umbraco\settings\DictionaryItemList.aspx">
+            <SubType>ASPXCodeBehind</SubType>
+        </Content>
+        <Content Include="umbraco.presentation\umbraco\translation\default.aspx" />
+        <Content Include="umbraco.presentation\umbraco\translation\preview.aspx" />
+        <Content Include="umbraco.presentation\umbraco\translation\xml.aspx" />
+        <Content Include="umbraco.presentation\umbraco\developer\Macros\assemblyBrowser.aspx" />
+        <Content Include="umbraco.presentation\umbraco\developer\Xslt\getXsltStatus.asmx" />
+        <Content Include="umbraco.presentation\umbraco\developer\Xslt\xsltChooseExtension.aspx" />
+        <Content Include="umbraco.presentation\umbraco\developer\Xslt\xsltInsertValueOf.aspx" />
+        <Content Include="umbraco.presentation\umbraco\members\EditMemberGroup.aspx">
+            <SubType>Form</SubType>
+        </Content>
+        <Content Include="umbraco.presentation\umbraco\schemas\umbraco.xsd">
+            <SubType>Designer</SubType>
+        </Content>
+        <Content Include="umbraco.presentation\umbraco\settings\editLanguage.aspx" />
+        <!--<Content Include="umbraco.presentation\umbraco\users\PermissionEditor.aspx" />-->
+        <Content Include="umbraco.presentation\umbraco\webservices\CacheRefresher.asmx">
+            <SubType>Form</SubType>
+        </Content>
+        <Content Include="umbraco.presentation\umbraco\webservices\CMSNode.asmx" />
+        <Content Include="umbraco.presentation\umbraco\webservices\codeEditorSave.asmx" />
+        <Content Include="umbraco.presentation\umbraco\webservices\legacyAjaxCalls.asmx" />
+        <Content Include="umbraco.presentation\umbraco\webservices\nodeSorter.asmx" />
+        <Content Include="umbraco.presentation\umbraco\webservices\progressStatus.asmx">
+            <SubType>Form</SubType>
+        </Content>
+        <Content Include="umbraco.presentation\umbraco\webservices\publication.asmx" />
+        <Content Include="umbraco.presentation\umbraco\webservices\TreeDataService.ashx" />
+        <None Include="umbraco.presentation\umbraco\Trees\Trees.cd" />
+        <None Include="umbraco.presentation\umbraco\Trees\XmlTree.xsd">
+            <SubType>
+            </SubType>
+        </None>
+        <None Include="umbraco.presentation\umbraco\Trees\XmlTree.xsx">
+            <DependentUpon>XmlTree.xsd</DependentUpon>
+        </None>
+        <Content Include="umbraco.presentation\umbraco\webservices\TagsAutoCompleteHandler.ashx" />
+        <None Include="Web References\org.umbraco.update\checkforupgrade.disco" />
+        <None Include="Web References\org.umbraco.update\checkforupgrade.wsdl" />
+        <None Include="Web References\org.umbraco.update\Reference.map">
+            <Generator>MSDiscoCodeGenerator</Generator>
+            <LastGenOutput>Reference.cs</LastGenOutput>
+        </None>
+        <EmbeddedResource Include="UI\JavaScript\Resources.resx">
+            <Generator>ResXFileCodeGenerator</Generator>
+            <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+            <SubType>Designer</SubType>
+        </EmbeddedResource>
+        <EmbeddedResource Include="Mvc\Strings.resx">
+            <Generator>ResXFileCodeGenerator</Generator>
+            <LastGenOutput>Strings.Designer.cs</LastGenOutput>
+        </EmbeddedResource>
+        <EmbeddedResource Include="umbraco.presentation\umbraco\templateControls\Resources.resx">
+            <Generator>ResXFileCodeGenerator</Generator>
+            <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+            <SubType>Designer</SubType>
+        </EmbeddedResource>
+        <None Include="umbraco.presentation\umbraco\schemas\package.xsd">
+            <SubType>
+            </SubType>
+        </None>
+        <None Include="umbraco.presentation\umbraco\schemas\package.xsx">
+            <DependentUpon>package.xsd</DependentUpon>
+        </None>
+        <None Include="umbraco.presentation\umbraco\schemas\umbraco.xsc">
+            <DependentUpon>umbraco.xsd</DependentUpon>
+        </None>
+        <None Include="umbraco.presentation\umbraco\schemas\umbraco.xss">
+            <DependentUpon>umbraco.xsd</DependentUpon>
+        </None>
+        <None Include="umbraco.presentation\umbraco\schemas\umbraco.xsx">
+            <DependentUpon>umbraco.xsd</DependentUpon>
+        </None>
+    </ItemGroup>
+    <ItemGroup>
+        <WebReferences Include="Web References\" />
+    </ItemGroup>
+    <ItemGroup>
+        <WebReferenceUrl Include="https://our.umbraco.com/umbraco/webservices/api/repository.asmx">
+            <UrlBehavior>Dynamic</UrlBehavior>
+            <RelPath>Web References\org.umbraco.our\</RelPath>
+            <UpdateFromURL>https://our.umbraco.com/umbraco/webservices/api/repository.asmx</UpdateFromURL>
+            <ServiceLocationURL>
+            </ServiceLocationURL>
+            <CachedDynamicPropName>
+            </CachedDynamicPropName>
+            <CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
+            <CachedSettingsPropName>umbraco_org_umbraco_our_Repository</CachedSettingsPropName>
+        </WebReferenceUrl>
+        <WebReferenceUrl Include="http://update.umbraco.org/checkforupgrade.asmx">
+            <UrlBehavior>Dynamic</UrlBehavior>
+            <RelPath>Web References\org.umbraco.update\</RelPath>
+            <UpdateFromURL>http://update.umbraco.org/checkforupgrade.asmx</UpdateFromURL>
+            <ServiceLocationURL>
+            </ServiceLocationURL>
+            <CachedDynamicPropName>
+            </CachedDynamicPropName>
+            <CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
+            <CachedSettingsPropName>umbraco_org_umbraco_update_CheckForUpgrade</CachedSettingsPropName>
+        </WebReferenceUrl>
+    </ItemGroup>
+    <ItemGroup>
+        <Folder Include="umbraco.presentation\umbraco\settings\scripts\" />
+    </ItemGroup>
+    <PropertyGroup>
+        <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
+        <VSToolsPath Condition="exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v11.0\WebApplications\Microsoft.WebApplication.targets')">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v11.0</VSToolsPath>
+        <VSToolsPath Condition="exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v12.0\WebApplications\Microsoft.WebApplication.targets')">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v12.0</VSToolsPath>
+        <VSToolsPath Condition="exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v14.0\WebApplications\Microsoft.WebApplication.targets')">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v14.0</VSToolsPath>
+        <VSToolsPath Condition="exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets')">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0</VSToolsPath>
+    </PropertyGroup>
+    <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+    <PropertyGroup>
+        <PreBuildEvent>
+        </PreBuildEvent>
+        <PostBuildEvent>
+        </PostBuildEvent>
+    </PropertyGroup>
+    <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
+    <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
+    <ProjectExtensions />
+    <PropertyGroup>
+        <!--<PostBuildEvent>xcopy "$(ProjectDir)..\..\lib\*.dll" "$(TargetDir)*.dll" /Y</PostBuildEvent>-->
+    </PropertyGroup>
+    <Import Project="..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets" Condition="Exists('..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets')" />
 </Project>
\ No newline at end of file

From fad33a97b24f835c8a09025bcbdff1ac7d52ce96 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 27 Jun 2019 15:47:25 +1000
Subject: [PATCH 044/776] don't throw JS exception when no MediaPath, instead
 warn.

---
 .../src/common/services/mediahelper.service.js              | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
index 2f31d36b62..38a3de8202 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
@@ -3,7 +3,7 @@
 * @name umbraco.services.mediaHelper
 * @description A helper object used for dealing with media items
 **/
-function mediaHelper(umbRequestHelper) {
+function mediaHelper(umbRequestHelper, $log) {
 
     //container of fileresolvers
     var _mediaFileResolvers = {};
@@ -144,7 +144,9 @@ function mediaHelper(umbRequestHelper) {
         resolveFileFromEntity: function (mediaEntity, thumbnail) {
 
             if (!angular.isObject(mediaEntity.metaData) || !mediaEntity.metaData.MediaPath) {
-                throw "Cannot resolve the file url from the mediaEntity, it does not contain the required metaData";
+                //don't throw since this image legitimately might not contain a media path, but output a warning
+                $log.warn("Cannot resolve the file url from the mediaEntity, it does not contain the required metaData");
+                return null;
             }
 
             if (thumbnail) {

From 44e567aa34399660c3e61068b9b47b8781fe5715 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Thu, 27 Jun 2019 12:42:14 +0200
Subject: [PATCH 045/776] Prepare MB future - implement manifest filters to
 tweak manifests after they have been parsed - make IEditorValidator public -
 stop relying on InternalsVisibleTo Umbraco.ModelsBuilder

---
 src/Umbraco.Core/CompositionExtensions.cs     | 10 ++++++-
 src/Umbraco.Core/ConfigsExtensions.cs         |  8 +++++-
 .../Configuration/Grid/GridConfig.cs          |  5 ++--
 .../Configuration/Grid/GridEditorsConfig.cs   | 13 ++++-----
 src/Umbraco.Core/Manifest/IManifestFilter.cs  | 19 +++++++++++++
 .../Manifest/ManifestFilterCollection.cs      | 28 +++++++++++++++++++
 .../ManifestFilterCollectionBuilder.cs        | 12 ++++++++
 src/Umbraco.Core/Manifest/ManifestParser.cs   | 11 ++++++--
 src/Umbraco.Core/Manifest/PackageManifest.cs  | 10 +++++++
 .../Runtime/CoreInitialComposer.cs            |  5 +++-
 src/Umbraco.Core/Umbraco.Core.csproj          |  3 ++
 .../Manifest/ManifestParserTests.cs           |  2 +-
 src/Umbraco.Web/Editors/IEditorValidator.cs   |  2 +-
 src/Umbraco.Web/Properties/AssemblyInfo.cs    |  3 --
 14 files changed, 110 insertions(+), 21 deletions(-)
 create mode 100644 src/Umbraco.Core/Manifest/IManifestFilter.cs
 create mode 100644 src/Umbraco.Core/Manifest/ManifestFilterCollection.cs
 create mode 100644 src/Umbraco.Core/Manifest/ManifestFilterCollectionBuilder.cs

diff --git a/src/Umbraco.Core/CompositionExtensions.cs b/src/Umbraco.Core/CompositionExtensions.cs
index 828a577c34..5dd33c2a60 100644
--- a/src/Umbraco.Core/CompositionExtensions.cs
+++ b/src/Umbraco.Core/CompositionExtensions.cs
@@ -4,6 +4,7 @@ using Umbraco.Core.Composing;
 using Umbraco.Core.Dictionary;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging.Viewer;
+using Umbraco.Core.Manifest;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.PackageActions;
 using Umbraco.Core.Persistence.Mappers;
@@ -66,9 +67,16 @@ namespace Umbraco.Core
         /// Gets the validators collection builder.
         /// </summary>
         /// <param name="composition">The composition.</param>
-        internal static ManifestValueValidatorCollectionBuilder Validators(this Composition composition)
+        internal static ManifestValueValidatorCollectionBuilder ManifestValueValidators(this Composition composition)
             => composition.WithCollectionBuilder<ManifestValueValidatorCollectionBuilder>();
 
+        /// <summary>
+        /// Gets the manifest filter collection builder.
+        /// </summary>
+        /// <param name="composition">The composition.</param>
+        public static ManifestFilterCollectionBuilder ManifestFilters(this Composition composition)
+            => composition.WithCollectionBuilder<ManifestFilterCollectionBuilder>();
+
         /// <summary>
         /// Gets the components collection builder.
         /// </summary>
diff --git a/src/Umbraco.Core/ConfigsExtensions.cs b/src/Umbraco.Core/ConfigsExtensions.cs
index 6fdf7ea3b9..d1672c6c7f 100644
--- a/src/Umbraco.Core/ConfigsExtensions.cs
+++ b/src/Umbraco.Core/ConfigsExtensions.cs
@@ -7,6 +7,7 @@ using Umbraco.Core.Configuration.HealthChecks;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
+using Umbraco.Core.Manifest;
 
 namespace Umbraco.Core
 {
@@ -41,7 +42,12 @@ namespace Umbraco.Core
             configs.Add(() => new CoreDebug());
 
             // GridConfig depends on runtime caches, manifest parsers... and cannot be available during composition
-            configs.Add<IGridConfig>(factory => new GridConfig(factory.GetInstance<ILogger>(), factory.GetInstance<AppCaches>(), configDir, factory.GetInstance<IRuntimeState>().Debug));
+            configs.Add<IGridConfig>(factory => new GridConfig(
+                factory.GetInstance<ILogger>(),
+                factory.GetInstance<AppCaches>(),
+                configDir,
+                factory.GetInstance<ManifestParser>(),
+                factory.GetInstance<IRuntimeState>().Debug));
         }
     }
 }
diff --git a/src/Umbraco.Core/Configuration/Grid/GridConfig.cs b/src/Umbraco.Core/Configuration/Grid/GridConfig.cs
index b2dae09fc9..9aead74886 100644
--- a/src/Umbraco.Core/Configuration/Grid/GridConfig.cs
+++ b/src/Umbraco.Core/Configuration/Grid/GridConfig.cs
@@ -1,14 +1,15 @@
 using System.IO;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Logging;
+using Umbraco.Core.Manifest;
 
 namespace Umbraco.Core.Configuration.Grid
 {
     class GridConfig : IGridConfig
     {
-        public GridConfig(ILogger logger, AppCaches appCaches, DirectoryInfo configFolder, bool isDebug)
+        public GridConfig(ILogger logger, AppCaches appCaches, DirectoryInfo configFolder, ManifestParser manifestParser, bool isDebug)
         {
-            EditorsConfig = new GridEditorsConfig(logger, appCaches, configFolder, isDebug);
+            EditorsConfig = new GridEditorsConfig(logger, appCaches, configFolder, manifestParser, isDebug);
         }
 
         public IGridEditorsConfig EditorsConfig { get; }
diff --git a/src/Umbraco.Core/Configuration/Grid/GridEditorsConfig.cs b/src/Umbraco.Core/Configuration/Grid/GridEditorsConfig.cs
index 0e7ef62c58..d434da8c70 100644
--- a/src/Umbraco.Core/Configuration/Grid/GridEditorsConfig.cs
+++ b/src/Umbraco.Core/Configuration/Grid/GridEditorsConfig.cs
@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using Newtonsoft.Json.Linq;
 using Umbraco.Core.Cache;
-using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Manifest;
 using Umbraco.Core.PropertyEditors;
@@ -15,13 +13,15 @@ namespace Umbraco.Core.Configuration.Grid
         private readonly ILogger _logger;
         private readonly AppCaches _appCaches;
         private readonly DirectoryInfo _configFolder;
+        private readonly ManifestParser _manifestParser;
         private readonly bool _isDebug;
 
-        public GridEditorsConfig(ILogger logger, AppCaches appCaches, DirectoryInfo configFolder, bool isDebug)
+        public GridEditorsConfig(ILogger logger, AppCaches appCaches, DirectoryInfo configFolder, ManifestParser manifestParser, bool isDebug)
         {
             _logger = logger;
             _appCaches = appCaches;
             _configFolder = configFolder;
+            _manifestParser = manifestParser;
             _isDebug = isDebug;
         }
 
@@ -31,9 +31,6 @@ namespace Umbraco.Core.Configuration.Grid
             {
                 List<GridEditor> GetResult()
                 {
-                    // TODO: should use the common one somehow! + ignoring _appPlugins here!
-                    var parser = new ManifestParser(_appCaches, Current.ManifestValidators, _logger);
-
                     var editors = new List<GridEditor>();
                     var gridConfig = Path.Combine(_configFolder.FullName, "grid.editors.config.js");
                     if (File.Exists(gridConfig))
@@ -42,7 +39,7 @@ namespace Umbraco.Core.Configuration.Grid
 
                         try
                         {
-                            editors.AddRange(parser.ParseGridEditors(sourceString));
+                            editors.AddRange(_manifestParser.ParseGridEditors(sourceString));
                         }
                         catch (Exception ex)
                         {
@@ -51,7 +48,7 @@ namespace Umbraco.Core.Configuration.Grid
                     }
 
                     // add manifest editors, skip duplicates
-                    foreach (var gridEditor in parser.Manifest.GridEditors)
+                    foreach (var gridEditor in _manifestParser.Manifest.GridEditors)
                     {
                         if (editors.Contains(gridEditor) == false) editors.Add(gridEditor);
                     }
diff --git a/src/Umbraco.Core/Manifest/IManifestFilter.cs b/src/Umbraco.Core/Manifest/IManifestFilter.cs
new file mode 100644
index 0000000000..505f13d385
--- /dev/null
+++ b/src/Umbraco.Core/Manifest/IManifestFilter.cs
@@ -0,0 +1,19 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Manifest
+{
+    /// <summary>
+    /// Provides filtering for package manifests.
+    /// </summary>
+    public interface IManifestFilter
+    {
+        /// <summary>
+        /// Filters package manifests.
+        /// </summary>
+        /// <param name="manifests">The package manifests.</param>
+        /// <remarks>
+        /// <para>It is possible to remove, change, or add manifests.</para>
+        /// </remarks>
+        void Filter(List<PackageManifest> manifests);
+    }
+}
diff --git a/src/Umbraco.Core/Manifest/ManifestFilterCollection.cs b/src/Umbraco.Core/Manifest/ManifestFilterCollection.cs
new file mode 100644
index 0000000000..febdb7e356
--- /dev/null
+++ b/src/Umbraco.Core/Manifest/ManifestFilterCollection.cs
@@ -0,0 +1,28 @@
+using System.Collections.Generic;
+using Umbraco.Core.Composing;
+
+namespace Umbraco.Core.Manifest
+{
+    /// <summary>
+    /// Contains the manifest filters.
+    /// </summary>
+    public class ManifestFilterCollection : BuilderCollectionBase<IManifestFilter>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ManifestFilterCollection"/> class.
+        /// </summary>
+        public ManifestFilterCollection(IEnumerable<IManifestFilter> items)
+            : base(items)
+        { }
+
+        /// <summary>
+        /// Filters package manifests.
+        /// </summary>
+        /// <param name="manifests">The package manifests.</param>
+        public void Filter(List<PackageManifest> manifests)
+        {
+            foreach (var filter in this)
+                filter.Filter(manifests);
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Manifest/ManifestFilterCollectionBuilder.cs b/src/Umbraco.Core/Manifest/ManifestFilterCollectionBuilder.cs
new file mode 100644
index 0000000000..4d98700f93
--- /dev/null
+++ b/src/Umbraco.Core/Manifest/ManifestFilterCollectionBuilder.cs
@@ -0,0 +1,12 @@
+using Umbraco.Core.Composing;
+
+namespace Umbraco.Core.Manifest
+{
+    public class ManifestFilterCollectionBuilder : OrderedCollectionBuilderBase<ManifestFilterCollectionBuilder, ManifestFilterCollection, IManifestFilter>
+    {
+        protected override ManifestFilterCollectionBuilder This => this;
+
+        // do NOT cache this, it's only used once
+        protected override Lifetime CollectionLifetime => Lifetime.Transient;
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Manifest/ManifestParser.cs b/src/Umbraco.Core/Manifest/ManifestParser.cs
index dc40cd90a2..efd9e92b1f 100644
--- a/src/Umbraco.Core/Manifest/ManifestParser.cs
+++ b/src/Umbraco.Core/Manifest/ManifestParser.cs
@@ -22,24 +22,26 @@ namespace Umbraco.Core.Manifest
         private readonly IAppPolicyCache _cache;
         private readonly ILogger _logger;
         private readonly ManifestValueValidatorCollection _validators;
+        private readonly ManifestFilterCollection _filters;
 
         private string _path;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ManifestParser"/> class.
         /// </summary>
-        public ManifestParser(AppCaches appCaches, ManifestValueValidatorCollection validators, ILogger logger)
-            : this(appCaches, validators, "~/App_Plugins", logger)
+        public ManifestParser(AppCaches appCaches, ManifestValueValidatorCollection validators, ManifestFilterCollection filters, ILogger logger)
+            : this(appCaches, validators, filters, "~/App_Plugins", logger)
         { }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ManifestParser"/> class.
         /// </summary>
-        private ManifestParser(AppCaches appCaches, ManifestValueValidatorCollection validators, string path, ILogger logger)
+        private ManifestParser(AppCaches appCaches, ManifestValueValidatorCollection validators, ManifestFilterCollection filters, string path, ILogger logger)
         {
             if (appCaches == null) throw new ArgumentNullException(nameof(appCaches));
             _cache = appCaches.RuntimeCache;
             _validators = validators ?? throw new ArgumentNullException(nameof(validators));
+            _filters = filters ?? throw new ArgumentNullException(nameof(filters));
             if (string.IsNullOrWhiteSpace(path)) throw new ArgumentNullOrEmptyException(nameof(path));
             Path = path;
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
@@ -78,6 +80,7 @@ namespace Umbraco.Core.Manifest
                     if (string.IsNullOrWhiteSpace(text))
                         continue;
                     var manifest = ParseManifest(text);
+                    manifest.Source = path;
                     manifests.Add(manifest);
                 }
                 catch (Exception e)
@@ -86,6 +89,8 @@ namespace Umbraco.Core.Manifest
                 }
             }
 
+            _filters.Filter(manifests);
+
             return manifests;
         }
 
diff --git a/src/Umbraco.Core/Manifest/PackageManifest.cs b/src/Umbraco.Core/Manifest/PackageManifest.cs
index 475ee8a7f8..e50eb69467 100644
--- a/src/Umbraco.Core/Manifest/PackageManifest.cs
+++ b/src/Umbraco.Core/Manifest/PackageManifest.cs
@@ -9,6 +9,16 @@ namespace Umbraco.Core.Manifest
     /// </summary>
     public class PackageManifest
     {
+        /// <summary>
+        /// Gets the source path of the manifest.
+        /// </summary>
+        /// <remarks>
+        /// <para>Gets the full absolute file path of the manifest,
+        /// using system directory separators.</para>
+        /// </remarks>
+        [JsonIgnore]
+        public string Source { get; set; }
+
         /// <summary>
         /// Gets or sets the scripts listed in the manifest.
         /// </summary>
diff --git a/src/Umbraco.Core/Runtime/CoreInitialComposer.cs b/src/Umbraco.Core/Runtime/CoreInitialComposer.cs
index f32a46f3f8..1f004846d0 100644
--- a/src/Umbraco.Core/Runtime/CoreInitialComposer.cs
+++ b/src/Umbraco.Core/Runtime/CoreInitialComposer.cs
@@ -58,7 +58,7 @@ namespace Umbraco.Core.Runtime
             composition.RegisterUnique<ManifestParser>();
 
             // register our predefined validators
-            composition.WithCollectionBuilder<ManifestValueValidatorCollectionBuilder>()
+            composition.ManifestValueValidators()
                 .Add<RequiredValidator>()
                 .Add<RegexValidator>()
                 .Add<DelimitedValueValidator>()
@@ -66,6 +66,9 @@ namespace Umbraco.Core.Runtime
                 .Add<IntegerValidator>()
                 .Add<DecimalValidator>();
 
+            // register the manifest filter collection builder (collection is empty by default)
+            composition.ManifestFilters();
+
             // properties and parameters derive from data editors
             composition.WithCollectionBuilder<DataEditorCollectionBuilder>()
                 .Add(() => composition.TypeLoader.GetDataEditors());
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 7ac1e9d06e..dcd15427e9 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -219,6 +219,9 @@
     <Compile Include="Composing\TypeLoader.cs" />
     <Compile Include="IO\MediaPathSchemes\UniqueMediaPathScheme.cs" />
     <Compile Include="Logging\Viewer\LogTimePeriod.cs" />
+    <Compile Include="Manifest\IManifestFilter.cs" />
+    <Compile Include="Manifest\ManifestFilterCollection.cs" />
+    <Compile Include="Manifest\ManifestFilterCollectionBuilder.cs" />
     <Compile Include="Mapping\MapperContext.cs" />
     <Compile Include="Migrations\Upgrade\Common\DeleteKeysAndIndexes.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\ContentPickerPreValueMigrator.cs" />
diff --git a/src/Umbraco.Tests/Manifest/ManifestParserTests.cs b/src/Umbraco.Tests/Manifest/ManifestParserTests.cs
index 6605bc4546..1c90f68d62 100644
--- a/src/Umbraco.Tests/Manifest/ManifestParserTests.cs
+++ b/src/Umbraco.Tests/Manifest/ManifestParserTests.cs
@@ -44,7 +44,7 @@ namespace Umbraco.Tests.Manifest
                 new RequiredValidator(Mock.Of<ILocalizedTextService>()),
                 new RegexValidator(Mock.Of<ILocalizedTextService>(), null)
             };
-            _parser = new ManifestParser(AppCaches.Disabled, new ManifestValueValidatorCollection(validators), Mock.Of<ILogger>());
+            _parser = new ManifestParser(AppCaches.Disabled, new ManifestValueValidatorCollection(validators), new ManifestFilterCollection(Array.Empty<IManifestFilter>()),  Mock.Of<ILogger>());
         }
 
         [Test]
diff --git a/src/Umbraco.Web/Editors/IEditorValidator.cs b/src/Umbraco.Web/Editors/IEditorValidator.cs
index bec978788c..d469d9d9eb 100644
--- a/src/Umbraco.Web/Editors/IEditorValidator.cs
+++ b/src/Umbraco.Web/Editors/IEditorValidator.cs
@@ -21,7 +21,7 @@ namespace Umbraco.Web.Editors
     /// <summary>
     /// Provides a general object validator.
     /// </summary>
-    internal interface IEditorValidator : IDiscoverable
+    public interface IEditorValidator : IDiscoverable
     {
         /// <summary>
         /// Gets the object type validated by this validator.
diff --git a/src/Umbraco.Web/Properties/AssemblyInfo.cs b/src/Umbraco.Web/Properties/AssemblyInfo.cs
index 359e8ac3b6..9a1b248284 100644
--- a/src/Umbraco.Web/Properties/AssemblyInfo.cs
+++ b/src/Umbraco.Web/Properties/AssemblyInfo.cs
@@ -32,9 +32,6 @@ using System.Runtime.InteropServices;
 // Umbraco Headless
 [assembly: InternalsVisibleTo("Umbraco.Headless")]
 
-// Umbraco ModelsBuilder
-[assembly: InternalsVisibleTo("Umbraco.ModelsBuilder")]
-
 // code analysis
 // IDE1006 is broken, wants _value syntax for consts, etc - and it's even confusing ppl at MS, kill it
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "~_~")]

From a018ed9e526fbde52ebed7f6afafb8f92150d5ba Mon Sep 17 00:00:00 2001
From: Marc Goodson <marc@snowmoon.co.uk>
Date: Thu, 27 Jun 2019 13:27:34 +0100
Subject: [PATCH 046/776] V7: Less-Urgent-But-Still-Quite-Important - Add Giphy
 EmbeddedMedia support (#5736)

---
 src/Umbraco.Web.UI/config/EmbeddedMedia.Release.config | 7 +++++++
 src/Umbraco.Web.UI/config/EmbeddedMedia.config         | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/src/Umbraco.Web.UI/config/EmbeddedMedia.Release.config b/src/Umbraco.Web.UI/config/EmbeddedMedia.Release.config
index 603683cf30..f8c2be088d 100644
--- a/src/Umbraco.Web.UI/config/EmbeddedMedia.Release.config
+++ b/src/Umbraco.Web.UI/config/EmbeddedMedia.Release.config
@@ -130,5 +130,12 @@
     <apiEndpoint><![CDATA[https://publish.twitter.com/oembed]]></apiEndpoint>
     <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, umbraco">
     </requestParams>
+  </provider>
+      <!-- Giphy Embed support -->
+  <provider name="Giphy" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, umbraco">
+    <urlShemeRegex><![CDATA[giphy\.com/]]></urlShemeRegex>
+    <apiEndpoint><![CDATA[https://giphy.com/services/oembed?url=]]></apiEndpoint>
+    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, umbraco">
+    </requestParams>
   </provider>
 </embed>
diff --git a/src/Umbraco.Web.UI/config/EmbeddedMedia.config b/src/Umbraco.Web.UI/config/EmbeddedMedia.config
index ccefad2983..d88e1d2b4d 100644
--- a/src/Umbraco.Web.UI/config/EmbeddedMedia.config
+++ b/src/Umbraco.Web.UI/config/EmbeddedMedia.config
@@ -130,5 +130,12 @@
     <apiEndpoint><![CDATA[https://publish.twitter.com/oembed]]></apiEndpoint>
     <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, umbraco">
     </requestParams>
+  </provider>
+      <!-- Giphy Embed support -->
+  <provider name="Giphy" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, umbraco">
+    <urlShemeRegex><![CDATA[giphy\.com/]]></urlShemeRegex>
+    <apiEndpoint><![CDATA[https://giphy.com/services/oembed?url=]]></apiEndpoint>
+    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, umbraco">
+    </requestParams>
   </provider>
 </embed>

From f370e738da2fda81e7f48bc5d272ad1a4ed4c281 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Thu, 27 Jun 2019 21:34:19 +0200
Subject: [PATCH 047/776] =?UTF-8?q?V8:=20Use=20an=20overlay=20style=20dial?=
 =?UTF-8?q?og=20for=20deleting=20Nested=20Content=20ite=E2=80=A6=20(#5357)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nestedcontent/nestedcontent.controller.js | 26 ++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
index 4e8b35a276..7ead8974d8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -93,8 +93,9 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
     "iconHelper",
     "clipboardService",
     "eventsService",
-    
-    function ($scope, $interpolate, $filter, $timeout, contentResource, localizationService, iconHelper, clipboardService, eventsService) {
+    "overlayService",
+
+    function ($scope, $interpolate, $filter, $timeout, contentResource, localizationService, iconHelper, clipboardService, eventsService, overlayService) {
         
         var contentTypeAliases = [];
         _.each($scope.model.config.contentTypes, function (contentType) {
@@ -239,10 +240,23 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
         };
         $scope.requestDeleteNode = function (idx) {
             if ($scope.model.config.confirmDeletes === true) {
-                localizationService.localize("content_nestedContentDeleteItem").then(function (value) {
-                    if (confirm(value)) {
-                        $scope.deleteNode(idx);
-                    }
+                localizationService.localizeMany(["content_nestedContentDeleteItem", "general_delete", "general_cancel", "contentTypeEditor_yesDelete"]).then(function (data) {
+                    const overlay = {
+                        title: data[1],
+                        content: data[0],
+                        closeButtonLabel: data[2],
+                        submitButtonLabel: data[3],
+                        submitButtonStyle: "danger",
+                        close: function () {
+                            overlayService.close();
+                        },
+                        submit: function () {
+                            $scope.deleteNode(idx);
+                            overlayService.close();
+                        }
+                    };
+
+                    overlayService.open(overlay);
                 });
             } else {
                 $scope.deleteNode(idx);

From 12dff9bca31aa1486aa418a0d8b66d42154896c9 Mon Sep 17 00:00:00 2001
From: Morten Bock <morten@mortenbock.dk>
Date: Mon, 24 Jun 2019 20:43:12 +0200
Subject: [PATCH 048/776] Reduce size of LocalizedText output. Refactor
 localizationService to not expose internal dictionary. Refactor controllers
 to not access dictionary directly.

---
 .../common/services/localization.service.js   | 56 ++++++++++++-------
 .../contentpicker/contentpicker.controller.js | 25 ++++++---
 .../propertyeditors/grid/grid.controller.js   |  8 +--
 .../mediapicker/mediapicker.controller.js     | 48 +++++++++-------
 .../multiurlpicker.controller.js              | 17 +++++-
 .../Editors/BackOfficeController.cs           | 24 ++++++--
 6 files changed, 121 insertions(+), 57 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/localization.service.js b/src/Umbraco.Web.UI.Client/src/common/services/localization.service.js
index ea2ad73263..6081cbd9ad 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/localization.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/localization.service.js
@@ -29,35 +29,48 @@ angular.module('umbraco.services')
     var resourceFileLoadStatus = "none";
     var resourceLoadingPromise = [];
 
-    function _lookup(value, tokens, dictionary) {
+    // array to hold the localized resource string entries
+    var innerDictionary = [];
+
+    function _lookup(alias, tokens, dictionary, fallbackValue) {
 
         //strip the key identifier if its there
-        if (value && value[0] === "@") {
-            value = value.substring(1);
+        if (alias && alias[0] === "@") {
+            alias = alias.substring(1);
         }
 
+        var underscoreIndex = alias.indexOf("_");
         //if no area specified, add general_
-        if (value && value.indexOf("_") < 0) {
-            value = "general_" + value;
+        if (alias && underscoreIndex < 0) {
+            alias = "general_" + alias;
+            underscoreIndex = alias.indexOf("_");
         }
 
-        var entry = dictionary[value];
-        if (entry) {
-            return service.tokenReplace(entry, tokens);
+        var areaAlias = alias.substring(0, underscoreIndex);
+        var valueAlias = alias.substring(underscoreIndex + 1);
+
+        var areaEntry = dictionary[areaAlias];
+        if (areaEntry) {
+            var valueEntry = areaEntry[valueAlias];
+            if (valueEntry) {
+                return service.tokenReplace(valueEntry, tokens);
+            }
         }
-        return "[" + value + "]";
+
+        if (fallbackValue) return fallbackValue;
+
+        return "[" + alias + "]";
     }
     
     var service = {
-        // array to hold the localized resource string entries
-        dictionary: [],
+        
 
         // loads the language resource file from the server
         initLocalizedResources: function () {
             var deferred = $q.defer();
 
             if (resourceFileLoadStatus === "loaded") {
-                deferred.resolve(service.dictionary);
+                deferred.resolve(innerDictionary);
                 return deferred.promise;
             }
 
@@ -77,7 +90,7 @@ angular.module('umbraco.services')
             $http({ method: "GET", url: url, cache: false })
                 .then(function (response) {
                     resourceFileLoadStatus = "loaded";
-                    service.dictionary = response.data;
+                    innerDictionary = response.data;
 
                     eventsService.emit("localizationService.updated", response.data);
 
@@ -159,11 +172,14 @@ angular.module('umbraco.services')
          * @param {Array} tokens if specified this array will be sent as parameter values
          * This replaces %0% and %1% etc in the dictionary key value with the passed in strings
          * 
+         * @param {String} fallbackValue if specified this string will be returned if no matching 
+         * entry was found in the dictionary
+         * 
          * @returns {String} localized resource string
          */
-        localize: function (value, tokens) {
+        localize: function (value, tokens, fallbackValue) {
             return service.initLocalizedResources().then(function (dic) {
-                return _lookup(value, tokens, dic);
+                return _lookup(value, tokens, dic, fallbackValue);
             });
         },
 
@@ -244,8 +260,8 @@ angular.module('umbraco.services')
                     //Build a concat string by looping over the array of resolved promises/translations
                     var returnValue = "";
 
-                    for(var i = 0; i < localizedValues.length; i++){
-                        returnValue += localizedValues[i];
+                    for(var j = 0; j < localizedValues.length; j++){
+                        returnValue += localizedValues[j];
                     }
 
                     return returnValue;
@@ -292,11 +308,11 @@ angular.module('umbraco.services')
                 return $q.all(promises).then(function(localizedValues){
 
                     //Replace {0} and {1} etc in message with the localized values
-                    for(var i = 0; i < localizedValues.length; i++){
-                        var token = "%" + i + "%";
+                    for(var j = 0; j < localizedValues.length; j++){
+                        var token = "%" + j + "%";
                         var regex = new RegExp(token, "g");
 
-                        message = message.replace(regex, localizedValues[i]);
+                        message = message.replace(regex, localizedValues[j]);
                     }
 
                     return message;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
index 9d810fb433..e657906202 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
@@ -14,6 +14,12 @@
  */
 function contentPickerController($scope, entityResource, editorState, iconHelper, $routeParams, angularHelper, navigationService, $location, localizationService, editorService, $q) {
 
+    var vm = {
+        labels: {
+            general_recycleBin: ""
+        }
+    };
+
     var unsubscribe;
 
     function subscribe() {
@@ -405,7 +411,7 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
                 angular.forEach($scope.renderModel, function (item) {
                     if (item.id === entity.id) {
                         if (entity.trashed) {
-                            item.url = localizationService.dictionary.general_recycleBin;
+                            item.url = vm.labels.general_recycleBin;
                         } else {
                             item.url = data;
                         }
@@ -463,12 +469,17 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
     }
 
     function init() {
-        syncRenderModel(false).then(function () {
-            //everything is loaded, start the watch on the model
-            startWatch();
-            subscribe();
-            validate();
-        });
+        localizationService.localizeMany(["general_recycleBin"])
+            .then(function(data) {
+                vm.labels.general_recycleBin = data[0];
+
+                syncRenderModel(false).then(function () {
+                    //everything is loaded, start the watch on the model
+                    startWatch();
+                    subscribe();
+                    validate();
+                });
+            });
     }
 
     init();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
index 1b84ce4463..ccc390252b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
@@ -920,11 +920,9 @@ angular.module("umbraco")
                 //Localize the grid editor names
                 angular.forEach($scope.availableEditors, function (value, key) {
                     //If no translation is provided, keep using the editor name from the manifest
-                    if (localizationService.dictionary.hasOwnProperty("grid_" + value.alias)) {
-                        localizationService.localize("grid_" + value.alias).then(function (v) {
-                            value.name = v;
-                        });
-                    }
+                    localizationService.localize("grid_" + value.alias, undefined, value.name).then(function (v) {
+                        value.name = v;
+                    });
                 });
 
                 $scope.contentReady = true;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
index d7cac59348..e6e877fc72 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
@@ -3,6 +3,12 @@
 angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerController",
     function ($scope, entityResource, mediaHelper, $timeout, userService, localizationService, editorService) {
 
+        var vm = {
+            labels: {
+                 mediaPicker_deletedItem: ""
+            }
+        }
+
         //check the pre-values for multi-picker
         var multiPicker = $scope.model.config.multiPicker && $scope.model.config.multiPicker !== '0' ? true : false;
         var onlyImages = $scope.model.config.onlyImages && $scope.model.config.onlyImages !== '0' ? true : false;
@@ -50,7 +56,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
                                 return found;
                             } else {
                                 return {
-                                    name: localizationService.dictionary.mediaPicker_deletedItem,
+                                    name: vm.labels.mediaPicker_deletedItem,
                                     id: $scope.model.config.idType !== "udi" ? id : null,
                                     udi: $scope.model.config.idType === "udi" ? id : null,
                                     icon: "icon-picture",
@@ -106,27 +112,31 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
 
         function init() {
 
-            userService.getCurrentUser().then(function (userData) {
-                if (!$scope.model.config.startNodeId) {
-                    $scope.model.config.startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
-                    $scope.model.config.startNodeIsVirtual = userData.startMediaIds.length !== 1;
-                }
-                // only allow users to add and edit media if they have access to the media section
-                var hasAccessToMedia = userData.allowedSections.indexOf("media") !== -1;
-                $scope.allowEditMedia = hasAccessToMedia;
-                $scope.allowAddMedia = hasAccessToMedia;
+            localizationService.localizeMany(["mediaPicker_deletedItem"])
+                .then(function(data) {
+                    vm.labels.mediaPicker_deletedItem = data[0];
 
-                setupViewModel();
-
-                //When the model value changes sync the view model
-                $scope.$watch("model.value",
-                    function (newVal, oldVal) {
-                        if (newVal !== oldVal) {
-                            setupViewModel();
+                    userService.getCurrentUser().then(function (userData) {
+                        if (!$scope.model.config.startNodeId) {
+                            $scope.model.config.startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
+                            $scope.model.config.startNodeIsVirtual = userData.startMediaIds.length !== 1;
                         }
-                    });
-            });
+                        // only allow users to add and edit media if they have access to the media section
+                        var hasAccessToMedia = userData.allowedSections.indexOf("media") !== -1;
+                        $scope.allowEditMedia = hasAccessToMedia;
+                        $scope.allowAddMedia = hasAccessToMedia;
 
+                        setupViewModel();
+
+                        //When the model value changes sync the view model
+                        $scope.$watch("model.value",
+                            function (newVal, oldVal) {
+                                if (newVal !== oldVal) {
+                                    setupViewModel();
+                                }
+                            });
+                    });
+                });
         }
 
         $scope.remove = function (index) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
index 734b06536d..3de94a09cf 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
@@ -1,5 +1,11 @@
 function multiUrlPickerController($scope, angularHelper, localizationService, entityResource, iconHelper, editorService) {
 
+    var vm = {
+        labels: {
+            general_recycleBin: ""
+        }
+    };
+
     $scope.renderModel = [];
 
     if ($scope.preview) {
@@ -102,7 +108,7 @@ function multiUrlPickerController($scope, angularHelper, localizationService, en
                             link.published = (data.metaData && data.metaData.IsPublished === false && entityType === "Document") ? false : true;
                             link.trashed = data.trashed;
                             if (link.trashed) {
-                                item.url = localizationService.dictionary.general_recycleBin;
+                                item.url = vm.labels.general_recycleBin;
                             }
                         });
                     } else {
@@ -120,6 +126,15 @@ function multiUrlPickerController($scope, angularHelper, localizationService, en
         };
         editorService.linkPicker(linkPicker);
     };
+
+    function init() {
+        localizationService.localizeMany(["general_recycleBin"])
+            .then(function (data) {
+                vm.labels.general_recycleBin = data[0];
+            });
+    }
+
+    init();
 }
 
 angular.module("umbraco").controller("Umbraco.PropertyEditors.MultiUrlPickerController", multiUrlPickerController);
diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
index 7ed87c44dd..34022f8f9f 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -170,12 +170,26 @@ namespace Umbraco.Web.Editors
                     : CultureInfo.GetCultureInfo(GlobalSettings.DefaultUILanguage)
                 : CultureInfo.GetCultureInfo(culture);
 
-            var textForCulture = Services.TextService.GetAllStoredValues(cultureInfo)
-                //the dictionary returned is fine but the delimiter between an 'area' and a 'value' is a '/' but the javascript
-                // in the back office requires the delimiter to be a '_' so we'll just replace it
-                .ToDictionary(key => key.Key.Replace("/", "_"), val => val.Value);
+            var allValues = Services.TextService.GetAllStoredValues(cultureInfo);
+            var pathedValues = allValues.Select(kv =>
+            {
+                var slashIndex = kv.Key.IndexOf('/');
+                var areaAlias = kv.Key.Substring(0, slashIndex);
+                var valueAlias = kv.Key.Substring(slashIndex+1);
+                return new
+                {
+                    areaAlias,
+                    valueAlias,
+                    value = kv.Value
+                };
+            });
 
-            return new JsonNetResult { Data = textForCulture, Formatting = Formatting.Indented };
+            Dictionary<string, Dictionary<string, string>> nestedDictionary = pathedValues
+                .GroupBy(pv => pv.areaAlias)
+                .ToDictionary(pv => pv.Key, pv =>
+                    pv.ToDictionary(pve => pve.valueAlias, pve => pve.value));
+
+            return new JsonNetResult { Data = nestedDictionary, Formatting = Formatting.Indented };
         }
 
         /// <summary>

From 734086fcf557c4e416f7cd7ad5ab55b64d5cfc45 Mon Sep 17 00:00:00 2001
From: Patrick de Mooij <patrickdemooij98@hotmail.com>
Date: Thu, 13 Jun 2019 09:35:21 +0200
Subject: [PATCH 049/776] temp-5612: Being able to add your own
 roles/startnodes etc

---
 .../src/views/users/views/user/details.html                 | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html b/src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
index 031bff0a47..793f404f0c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
@@ -71,12 +71,10 @@
                                             sections="userGroup.sections"
                                             content-start-node="userGroup.contentStartNode"
                                             media-start-node="userGroup.mediaStartNode"
-                                            allow-remove="!model.user.isCurrentUser"
                                             on-remove="model.removeSelectedItem($index, model.user.userGroups)">
                     </umb-user-group-preview>
 
                     <a href=""
-                       ng-if="!model.user.isCurrentUser"
                        style="max-width: 100%;"
                        class="umb-node-preview-add"
                        ng-click="model.openUserGroupPicker()"
@@ -92,7 +90,6 @@
                                       ng-repeat="node in model.user.startContentIds"
                                       icon="node.icon"
                                       name="node.name"
-                                      allow-remove="!model.user.isCurrentUser"
                                       on-remove="model.removeSelectedItem($index, model.user.startContentIds)">
                     </umb-node-preview>
 
@@ -102,7 +99,6 @@
                     </umb-node-preview>
 
                     <a href=""
-                       ng-if="!model.user.isCurrentUser"
                        class="umb-node-preview-add"
                        id="content-start-add"
                        ng-click="model.openContentPicker()"
@@ -118,7 +114,6 @@
                                       ng-repeat="node in model.user.startMediaIds"
                                       icon="node.icon"
                                       name="node.name"
-                                      allow-remove="!model.user.isCurrentUser"
                                       on-remove="model.removeSelectedItem($index, model.user.startMediaIds)">
                     </umb-node-preview>
 
@@ -128,7 +123,6 @@
                     </umb-node-preview>
 
                     <a href=""
-                       ng-if="!model.user.isCurrentUser"
                        class="umb-node-preview-add"
                        ng-click="model.openMediaPicker()"
                        id="media-start-add"

From 5333b23c23f23ba0ce433dbf049e6ee40015ea7e Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Thu, 27 Jun 2019 22:17:31 +0200
Subject: [PATCH 050/776] v8: Add keyboard support to slider (#5651)

---
 src/Umbraco.Web.UI.Client/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json
index ef1a9cc28d..35d808056c 100644
--- a/src/Umbraco.Web.UI.Client/package.json
+++ b/src/Umbraco.Web.UI.Client/package.json
@@ -35,7 +35,7 @@
     "lazyload-js": "1.0.0",
     "moment": "2.22.2",
     "ng-file-upload": "12.2.13",
-    "nouislider": "12.1.0",
+    "nouislider": "14.0.1",
     "npm": "^6.4.1",
     "signalr": "2.4.0",
     "spectrum-colorpicker": "1.8.0",

From b3e3475bf562fc5d0f6ae9ce9a79daaab1589ad0 Mon Sep 17 00:00:00 2001
From: BatJan <jaskov@gmail.com>
Date: Mon, 10 Jun 2019 15:06:32 +0200
Subject: [PATCH 051/776] Make sure padding is not overwritten by other
 selectors

---
 .../src/less/components/umb-form-check.less                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less
index d8a5ebf9d8..deb573920f 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less
@@ -6,7 +6,7 @@
     flex-wrap: wrap;
     align-items: center;
     position: relative;
-    padding: 0;
+    padding: 0 !important;
     margin: 0;
     min-height: 22px;
     line-height: 22px;

From 390613c796365f3ffbd281f0d26247cdf3d5f0b3 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland@zonedigital.com>
Date: Sun, 9 Jun 2019 10:56:44 +0200
Subject: [PATCH 052/776] Fixed issue with node deletion not removing related
 records from the public access tables

---
 .../Persistence/Repositories/Implement/DocumentRepository.cs   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
index 6c08e05995..7e867c924c 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
@@ -205,7 +205,10 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
                 "DELETE FROM " + Constants.DatabaseSchema.Tables.ContentVersionCultureVariation + " WHERE versionId IN (SELECT id FROM " + Constants.DatabaseSchema.Tables.ContentVersion + " WHERE nodeId = @id)",
                 "DELETE FROM " + Constants.DatabaseSchema.Tables.ContentVersion + " WHERE nodeId = @id",
                 "DELETE FROM " + Constants.DatabaseSchema.Tables.Content + " WHERE nodeId = @id",
+                "DELETE FROM " + Constants.DatabaseSchema.Tables.AccessRule + " WHERE accessId IN (SELECT id FROM " + Constants.DatabaseSchema.Tables.Access + " WHERE nodeId = @id OR loginNodeId = @id OR noAccessNodeId = @id)",
                 "DELETE FROM " + Constants.DatabaseSchema.Tables.Access + " WHERE nodeId = @id",
+                "DELETE FROM " + Constants.DatabaseSchema.Tables.Access + " WHERE loginNodeId = @id",
+                "DELETE FROM " + Constants.DatabaseSchema.Tables.Access + " WHERE noAccessNodeId = @id",
                 "DELETE FROM " + Constants.DatabaseSchema.Tables.Node + " WHERE id = @id"
             };
             return list;

From 2f7bf413ede66570fd8839429a3670b559e5f10b Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Thu, 27 Jun 2019 22:27:42 +0200
Subject: [PATCH 053/776] V8: Make dialogs prompt to discard changes on outside
 click and ESC (#5740)

---
 .../umbcontextdialog.directive.js             | 47 ++++++++++++++++---
 .../content/content.protect.controller.js     |  6 +++
 .../content/content.rights.controller.js      |  1 +
 3 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbcontextdialog/umbcontextdialog.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbcontextdialog/umbcontextdialog.directive.js
index 99a5dad58c..904a2ce8ca 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbcontextdialog/umbcontextdialog.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbcontextdialog/umbcontextdialog.directive.js
@@ -1,16 +1,20 @@
 (function() {
     'use strict';
 
-    function UmbContextDialog(navigationService, keyboardService) {
+    function UmbContextDialog(navigationService, keyboardService, localizationService, overlayService) {
 
         function link($scope) {
-            
-            $scope.outSideClick = function() {
-                navigationService.hideDialog();
-            }
 
-            keyboardService.bind("esc", function() {
-                navigationService.hideDialog();
+            $scope.dialog = {
+                confirmDiscardChanges: false
+            };
+
+            $scope.outSideClick = function() {
+                hide();
+            };
+
+            keyboardService.bind("esc", function () {
+                hide();
             });
 
             //ensure to unregister from all events!
@@ -18,6 +22,35 @@
                 keyboardService.unbind("esc");
             });
 
+            function hide() {
+                if ($scope.dialog.confirmDiscardChanges) {
+                    localizationService.localizeMany(["prompt_unsavedChanges", "prompt_unsavedChangesWarning", "prompt_discardChanges", "prompt_stay"]).then(
+                        function (values) {
+                            var overlay = {
+                                "view": "default",
+                                "title": values[0],
+                                "content": values[1],
+                                "disableBackdropClick": true,
+                                "disableEscKey": true,
+                                "submitButtonLabel": values[2],
+                                "closeButtonLabel": values[3],
+                                submit: function () {
+                                    overlayService.close();
+                                    navigationService.hideDialog();
+                                },
+                                close: function () {
+                                    overlayService.close();
+                                }
+                            };
+
+                            overlayService.open(overlay);
+                        }
+                    );
+                }
+                else {
+                    navigationService.hideDialog();
+                }
+            }
         }
 
         var directive = {
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.protect.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.protect.controller.js
index 8d80f308ab..fcd0294849 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.protect.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.protect.controller.js
@@ -102,6 +102,7 @@
                         };
                     });
                     navigationService.syncTree({ tree: "content", path: $scope.currentNode.path, forceReload: true });
+                    $scope.dialog.confirmDiscardChanges = true;
                 }, function (error) {
                     vm.error = error;
                     vm.buttonState = "error";
@@ -117,6 +118,7 @@
 
         function toggle(group) {
             group.selected = !group.selected;
+            $scope.dialog.confirmDiscardChanges = true;
         }
 
         function pickGroup() {
@@ -137,6 +139,7 @@
                         });
                     editorService.close();
                     navigationService.allowHideDialog(true);
+                    $scope.dialog.confirmDiscardChanges = true;
                 },
                 close: function() {
                     editorService.close();
@@ -147,6 +150,7 @@
 
         function removeGroup(group) {
             vm.groups = _.reject(vm.groups, function(g) { return g.id === group.id });
+            $scope.dialog.confirmDiscardChanges = true;
         }
 
         function pickMember() {
@@ -186,6 +190,7 @@
                         $q.all(promises).then(function() {
                             vm.loading = false;
                         });
+                        $scope.dialog.confirmDiscardChanges = true;
                     }
                 },
                 close: function () {
@@ -219,6 +224,7 @@
                     }
                     editorService.close();
                     navigationService.allowHideDialog(true);
+                    $scope.dialog.confirmDiscardChanges = true;
                 },
                 close: function () {
                     editorService.close();
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.rights.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.rights.controller.js
index 60a8694eca..0e40fc2e6c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.rights.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.rights.controller.js
@@ -93,6 +93,7 @@
         function setPermissions(group) {
             assignGroupPermissions(group);  
             setViewSate("manageGroups");
+            $scope.dialog.confirmDiscardChanges = true;
         }
 
         /**

From fbe184ef6efb5f6c350ac7342423baadeff801de Mon Sep 17 00:00:00 2001
From: Lee Kelleher <leekelleher@users.noreply.github.com>
Date: Thu, 27 Jun 2019 21:33:19 +0100
Subject: [PATCH 054/776]  Prevent deletion of System DataTypes (#5623)

---
 src/Umbraco.Core/Constants-DataTypes.cs       |  5 ++-
 .../Migrations/Install/DatabaseDataCreator.cs | 36 +++++++++----------
 .../Trees/DataTypeTreeController.cs           | 10 +++++-
 3 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/src/Umbraco.Core/Constants-DataTypes.cs b/src/Umbraco.Core/Constants-DataTypes.cs
index f2b31be28f..63c51e12fd 100644
--- a/src/Umbraco.Core/Constants-DataTypes.cs
+++ b/src/Umbraco.Core/Constants-DataTypes.cs
@@ -4,23 +4,26 @@
     {
         public static class DataTypes
         {
-            public const int LabelString = -92;
+            public const int LabelString = System.DefaultLabelDataTypeId;
             public const int LabelInt = -91;
             public const int LabelBigint = -93;
             public const int LabelDateTime = -94;
             public const int LabelTime = -98;
             public const int LabelDecimal = -99;
 
+            public const int Textarea = -89;
             public const int Textbox = -88;
             public const int Boolean = -49;
             public const int DateTime = -36;
             public const int DropDownSingle = -39;
             public const int DropDownMultiple = -42;
+            public const int Upload = -90;
 
             public const int DefaultContentListView = -95;
             public const int DefaultMediaListView = -96;
             public const int DefaultMembersListView = -97;
 
+            public const int ImageCropper = 1043;
             public const int Tags = 1041;
         }
     }
diff --git a/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs b/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
index 1de983636b..6a6d31ac2f 100644
--- a/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
+++ b/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
@@ -101,33 +101,33 @@ namespace Umbraco.Core.Migrations.Install
             _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -1, Trashed = false, ParentId = -1, UserId = -1, Level = 0, Path = "-1", SortOrder = 0, UniqueId = new Guid("916724a5-173d-4619-b97e-b9de133dd6f5"), Text = "SYSTEM DATA: umbraco master root", NodeObjectType = Constants.ObjectTypes.SystemRoot, CreateDate = DateTime.Now });
             _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -20, Trashed = false, ParentId = -1, UserId = -1, Level = 0, Path = "-1,-20", SortOrder = 0, UniqueId = new Guid("0F582A79-1E41-4CF0-BFA0-76340651891A"), Text = "Recycle Bin", NodeObjectType = Constants.ObjectTypes.ContentRecycleBin, CreateDate = DateTime.Now });
             _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -21, Trashed = false, ParentId = -1, UserId = -1, Level = 0, Path = "-1,-21", SortOrder = 0, UniqueId = new Guid("BF7C7CBC-952F-4518-97A2-69E9C7B33842"), Text = "Recycle Bin", NodeObjectType = Constants.ObjectTypes.MediaRecycleBin, CreateDate = DateTime.Now });
-            InsertDataTypeNodeDto(Constants.DataTypes.LabelString, 35, "f0bc4bfb-b499-40d6-ba86-058885a5178c", "Label");
+            InsertDataTypeNodeDto(Constants.DataTypes.LabelString, 35, "f0bc4bfb-b499-40d6-ba86-058885a5178c", "Label (string)");
             InsertDataTypeNodeDto(Constants.DataTypes.LabelInt, 36, "8e7f995c-bd81-4627-9932-c40e568ec788", "Label (integer)");
             InsertDataTypeNodeDto(Constants.DataTypes.LabelBigint, 36, "930861bf-e262-4ead-a704-f99453565708", "Label (bigint)");
             InsertDataTypeNodeDto(Constants.DataTypes.LabelDateTime, 37, "0e9794eb-f9b5-4f20-a788-93acd233a7e4", "Label (datetime)");
             InsertDataTypeNodeDto(Constants.DataTypes.LabelTime, 38, "a97cec69-9b71-4c30-8b12-ec398860d7e8", "Label (time)");
             InsertDataTypeNodeDto(Constants.DataTypes.LabelDecimal, 39, "8f1ef1e1-9de4-40d3-a072-6673f631ca64", "Label (decimal)");
-            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -90, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,-90", SortOrder = 34, UniqueId = new Guid("84c6b441-31df-4ffe-b67e-67d5bc3ae65a"), Text = "Upload", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
-            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -89, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,-89", SortOrder = 33, UniqueId = new Guid("c6bac0dd-4ab9-45b1-8e30-e4b619ee5da3"), Text = "Textarea", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
+            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = Constants.DataTypes.Upload, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = $"-1,{Constants.DataTypes.Upload}", SortOrder = 34, UniqueId = new Guid("84c6b441-31df-4ffe-b67e-67d5bc3ae65a"), Text = "Upload", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
+            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = Constants.DataTypes.Textarea, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = $"-1,{Constants.DataTypes.Textarea}", SortOrder = 33, UniqueId = new Guid("c6bac0dd-4ab9-45b1-8e30-e4b619ee5da3"), Text = "Textarea", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
             _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -88, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,-88", SortOrder = 32, UniqueId = new Guid("0cc0eba1-9960-42c9-bf9b-60e150b429ae"), Text = "Textstring", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
             _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -87, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,-87", SortOrder = 4, UniqueId = new Guid("ca90c950-0aff-4e72-b976-a30b1ac57dad"), Text = "Richtext editor", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
             _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -51, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,-51", SortOrder = 2, UniqueId = new Guid("2e6d3631-066e-44b8-aec4-96f09099b2b5"), Text = "Numeric", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
-            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -49, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,-49", SortOrder = 2, UniqueId = new Guid("92897bc6-a5f3-4ffe-ae27-f2e7e33dda49"), Text = "True/false", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
+            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = Constants.DataTypes.Boolean, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = $"-1,{Constants.DataTypes.Boolean}", SortOrder = 2, UniqueId = new Guid("92897bc6-a5f3-4ffe-ae27-f2e7e33dda49"), Text = "True/false", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
             _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -43, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,-43", SortOrder = 2, UniqueId = new Guid("fbaf13a8-4036-41f2-93a3-974f678c312a"), Text = "Checkbox list", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
             _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = Constants.DataTypes.DropDownSingle, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = $"-1,{Constants.DataTypes.DropDownSingle}", SortOrder = 2, UniqueId = new Guid("0b6a45e7-44ba-430d-9da5-4e46060b9e03"), Text = "Dropdown", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
             _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -41, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,-41", SortOrder = 2, UniqueId = new Guid("5046194e-4237-453c-a547-15db3a07c4e1"), Text = "Date Picker", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
             _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -40, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,-40", SortOrder = 2, UniqueId = new Guid("bb5f57c9-ce2b-4bb9-b697-4caca783a805"), Text = "Radiobox", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
             _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = Constants.DataTypes.DropDownMultiple, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = $"-1,{Constants.DataTypes.DropDownMultiple}", SortOrder = 2, UniqueId = new Guid("f38f0ac7-1d27-439c-9f3f-089cd8825a53"), Text = "Dropdown multiple", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
             _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -37, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,-37", SortOrder = 2, UniqueId = new Guid("0225af17-b302-49cb-9176-b9f35cab9c17"), Text = "Approved Color", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
-            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -36, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,-36", SortOrder = 2, UniqueId = new Guid("e4d66c0f-b935-4200-81f0-025f7256b89a"), Text = "Date Picker with time", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
+            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = Constants.DataTypes.DateTime, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = $"-1,{Constants.DataTypes.DateTime}", SortOrder = 2, UniqueId = new Guid("e4d66c0f-b935-4200-81f0-025f7256b89a"), Text = "Date Picker with time", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
             _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = Constants.DataTypes.DefaultContentListView, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = $"-1,{Constants.DataTypes.DefaultContentListView}", SortOrder = 2, UniqueId = new Guid("C0808DD3-8133-4E4B-8CE8-E2BEA84A96A4"), Text = Constants.Conventions.DataTypes.ListViewPrefix + "Content", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
             _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = Constants.DataTypes.DefaultMediaListView, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = $"-1,{Constants.DataTypes.DefaultMediaListView}", SortOrder = 2, UniqueId = new Guid("3A0156C4-3B8C-4803-BDC1-6871FAA83FFF"), Text = Constants.Conventions.DataTypes.ListViewPrefix + "Media", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
             _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = Constants.DataTypes.DefaultMembersListView, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = $"-1,{Constants.DataTypes.DefaultMembersListView}", SortOrder = 2, UniqueId = new Guid("AA2C52A0-CE87-4E65-A47C-7DF09358585D"), Text = Constants.Conventions.DataTypes.ListViewPrefix + "Members", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
             _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = 1031, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,1031", SortOrder = 2, UniqueId = new Guid("f38bd2d7-65d0-48e6-95dc-87ce06ec2d3d"), Text = Constants.Conventions.MediaTypes.Folder, NodeObjectType = Constants.ObjectTypes.MediaType, CreateDate = DateTime.Now });
             _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = 1032, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,1032", SortOrder = 2, UniqueId = new Guid("cc07b313-0843-4aa8-bbda-871c8da728c8"), Text = Constants.Conventions.MediaTypes.Image, NodeObjectType = Constants.ObjectTypes.MediaType, CreateDate = DateTime.Now });
             _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = 1033, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,1033", SortOrder = 2, UniqueId = new Guid("4c52d8ab-54e6-40cd-999c-7a5f24903e4d"), Text = Constants.Conventions.MediaTypes.File, NodeObjectType = Constants.ObjectTypes.MediaType, CreateDate = DateTime.Now });
-            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = 1041, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,1041", SortOrder = 2, UniqueId = new Guid("b6b73142-b9c1-4bf8-a16d-e1c23320b549"), Text = "Tags", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
-            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = 1043, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,1043", SortOrder = 2, UniqueId = new Guid("1df9f033-e6d4-451f-b8d2-e0cbc50a836f"), Text = "Image Cropper", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
+            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = Constants.DataTypes.Tags, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = $"-1,{Constants.DataTypes.Tags}", SortOrder = 2, UniqueId = new Guid("b6b73142-b9c1-4bf8-a16d-e1c23320b549"), Text = "Tags", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
+            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = Constants.DataTypes.ImageCropper, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = $"-1,{Constants.DataTypes.ImageCropper}", SortOrder = 2, UniqueId = new Guid("1df9f033-e6d4-451f-b8d2-e0cbc50a836f"), Text = "Image Cropper", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
             _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = 1044, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,1044", SortOrder = 0, UniqueId = new Guid("d59be02f-1df9-4228-aa1e-01917d806cda"), Text = Constants.Conventions.MemberTypes.DefaultAlias, NodeObjectType = Constants.ObjectTypes.MemberType, CreateDate = DateTime.Now });
 
             //New UDI pickers with newer Ids
@@ -210,19 +210,19 @@ namespace Umbraco.Core.Migrations.Install
 
         private void CreatePropertyTypeData()
         {
-            _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 6, UniqueId = 6.ToGuid(), DataTypeId = 1043, ContentTypeId = 1032, PropertyTypeGroupId = 3, Alias = Constants.Conventions.Media.File, Name = "Upload image", SortOrder = 0, Mandatory = true, ValidationRegExp = null, Description = null, Variations = (byte) ContentVariation.Nothing });
+            _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 6, UniqueId = 6.ToGuid(), DataTypeId = Constants.DataTypes.ImageCropper, ContentTypeId = 1032, PropertyTypeGroupId = 3, Alias = Constants.Conventions.Media.File, Name = "Upload image", SortOrder = 0, Mandatory = true, ValidationRegExp = null, Description = null, Variations = (byte) ContentVariation.Nothing });
             _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 7, UniqueId = 7.ToGuid(), DataTypeId = Constants.DataTypes.LabelInt, ContentTypeId = 1032, PropertyTypeGroupId = 3, Alias = Constants.Conventions.Media.Width, Name = "Width", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = "in pixels", Variations = (byte) ContentVariation.Nothing });
             _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 8, UniqueId = 8.ToGuid(), DataTypeId = Constants.DataTypes.LabelInt, ContentTypeId = 1032, PropertyTypeGroupId = 3, Alias = Constants.Conventions.Media.Height, Name = "Height", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = "in pixels", Variations = (byte) ContentVariation.Nothing });
             _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 9, UniqueId = 9.ToGuid(), DataTypeId = Constants.DataTypes.LabelBigint, ContentTypeId = 1032, PropertyTypeGroupId = 3, Alias = Constants.Conventions.Media.Bytes, Name = "Size", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = "in bytes", Variations = (byte) ContentVariation.Nothing });
             _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 10, UniqueId = 10.ToGuid(), DataTypeId = -92, ContentTypeId = 1032, PropertyTypeGroupId = 3, Alias = Constants.Conventions.Media.Extension, Name = "Type", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = null, Variations = (byte) ContentVariation.Nothing });
-            _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 24, UniqueId = 24.ToGuid(), DataTypeId = -90, ContentTypeId = 1033, PropertyTypeGroupId = 4, Alias = Constants.Conventions.Media.File, Name = "Upload file", SortOrder = 0, Mandatory = true, ValidationRegExp = null, Description = null, Variations = (byte) ContentVariation.Nothing });
+            _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 24, UniqueId = 24.ToGuid(), DataTypeId = Constants.DataTypes.Upload, ContentTypeId = 1033, PropertyTypeGroupId = 4, Alias = Constants.Conventions.Media.File, Name = "Upload file", SortOrder = 0, Mandatory = true, ValidationRegExp = null, Description = null, Variations = (byte) ContentVariation.Nothing });
             _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 25, UniqueId = 25.ToGuid(), DataTypeId = -92, ContentTypeId = 1033, PropertyTypeGroupId = 4, Alias = Constants.Conventions.Media.Extension, Name = "Type", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = null, Variations = (byte) ContentVariation.Nothing });
             _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 26, UniqueId = 26.ToGuid(), DataTypeId = Constants.DataTypes.LabelBigint, ContentTypeId = 1033, PropertyTypeGroupId = 4, Alias = Constants.Conventions.Media.Bytes, Name = "Size", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = "in bytes", Variations = (byte) ContentVariation.Nothing });
             //membership property types
-            _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 28, UniqueId = 28.ToGuid(), DataTypeId = -89, ContentTypeId = 1044, PropertyTypeGroupId = 11, Alias = Constants.Conventions.Member.Comments, Name = Constants.Conventions.Member.CommentsLabel, SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = null, Variations = (byte) ContentVariation.Nothing });
+            _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 28, UniqueId = 28.ToGuid(), DataTypeId = Constants.DataTypes.Textarea, ContentTypeId = 1044, PropertyTypeGroupId = 11, Alias = Constants.Conventions.Member.Comments, Name = Constants.Conventions.Member.CommentsLabel, SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = null, Variations = (byte) ContentVariation.Nothing });
             _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 29, UniqueId = 29.ToGuid(), DataTypeId = Constants.DataTypes.LabelInt, ContentTypeId = 1044, PropertyTypeGroupId = 11, Alias = Constants.Conventions.Member.FailedPasswordAttempts, Name = Constants.Conventions.Member.FailedPasswordAttemptsLabel, SortOrder = 1, Mandatory = false, ValidationRegExp = null, Description = null, Variations = (byte) ContentVariation.Nothing });
-            _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 30, UniqueId = 30.ToGuid(), DataTypeId = -49, ContentTypeId = 1044, PropertyTypeGroupId = 11, Alias = Constants.Conventions.Member.IsApproved, Name = Constants.Conventions.Member.IsApprovedLabel, SortOrder = 2, Mandatory = false, ValidationRegExp = null, Description = null, Variations = (byte) ContentVariation.Nothing });
-            _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 31, UniqueId = 31.ToGuid(), DataTypeId = -49, ContentTypeId = 1044, PropertyTypeGroupId = 11, Alias = Constants.Conventions.Member.IsLockedOut, Name = Constants.Conventions.Member.IsLockedOutLabel, SortOrder = 3, Mandatory = false, ValidationRegExp = null, Description = null, Variations = (byte) ContentVariation.Nothing });
+            _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 30, UniqueId = 30.ToGuid(), DataTypeId = Constants.DataTypes.Boolean, ContentTypeId = 1044, PropertyTypeGroupId = 11, Alias = Constants.Conventions.Member.IsApproved, Name = Constants.Conventions.Member.IsApprovedLabel, SortOrder = 2, Mandatory = false, ValidationRegExp = null, Description = null, Variations = (byte) ContentVariation.Nothing });
+            _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 31, UniqueId = 31.ToGuid(), DataTypeId = Constants.DataTypes.Boolean, ContentTypeId = 1044, PropertyTypeGroupId = 11, Alias = Constants.Conventions.Member.IsLockedOut, Name = Constants.Conventions.Member.IsLockedOutLabel, SortOrder = 3, Mandatory = false, ValidationRegExp = null, Description = null, Variations = (byte) ContentVariation.Nothing });
             _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 32, UniqueId = 32.ToGuid(), DataTypeId = Constants.DataTypes.LabelDateTime, ContentTypeId = 1044, PropertyTypeGroupId = 11, Alias = Constants.Conventions.Member.LastLockoutDate, Name = Constants.Conventions.Member.LastLockoutDateLabel, SortOrder = 4, Mandatory = false, ValidationRegExp = null, Description = null, Variations = (byte) ContentVariation.Nothing });
             _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 33, UniqueId = 33.ToGuid(), DataTypeId = Constants.DataTypes.LabelDateTime, ContentTypeId = 1044, PropertyTypeGroupId = 11, Alias = Constants.Conventions.Member.LastLoginDate, Name = Constants.Conventions.Member.LastLoginDateLabel, SortOrder = 5, Mandatory = false, ValidationRegExp = null, Description = null, Variations = (byte) ContentVariation.Nothing });
             _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 34, UniqueId = 34.ToGuid(), DataTypeId = Constants.DataTypes.LabelDateTime, ContentTypeId = 1044, PropertyTypeGroupId = 11, Alias = Constants.Conventions.Member.LastPasswordChangeDate, Name = Constants.Conventions.Member.LastPasswordChangeDateLabel, SortOrder = 6, Mandatory = false, ValidationRegExp = null, Description = null, Variations = (byte) ContentVariation.Nothing });
@@ -266,30 +266,30 @@ namespace Umbraco.Core.Migrations.Install
             const string layouts = "[" + cardLayout + "," + listLayout + "]";
 
             // TODO: Check which of the DataTypeIds below doesn't exist in umbracoNode, which results in a foreign key constraint errors.
-            _database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = -49, EditorAlias = Constants.PropertyEditors.Aliases.Boolean, DbType = "Integer" });
+            _database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = Constants.DataTypes.Boolean, EditorAlias = Constants.PropertyEditors.Aliases.Boolean, DbType = "Integer" });
             _database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = -51, EditorAlias = Constants.PropertyEditors.Aliases.Integer, DbType = "Integer" });
             _database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = -87, EditorAlias = Constants.PropertyEditors.Aliases.TinyMce, DbType = "Ntext",
                 Configuration = "{\"value\":\",code,undo,redo,cut,copy,mcepasteword,stylepicker,bold,italic,bullist,numlist,outdent,indent,mcelink,unlink,mceinsertanchor,mceimage,umbracomacro,mceinserttable,umbracoembed,mcecharmap,|1|1,2,3,|0|500,400|1049,|true|\"}" });
             _database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = -88, EditorAlias = Constants.PropertyEditors.Aliases.TextBox, DbType = "Nvarchar" });
-            _database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = -89, EditorAlias = Constants.PropertyEditors.Aliases.TextArea, DbType = "Ntext" });
-            _database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = -90, EditorAlias = Constants.PropertyEditors.Aliases.UploadField, DbType = "Nvarchar" });
+            _database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = Constants.DataTypes.Textarea, EditorAlias = Constants.PropertyEditors.Aliases.TextArea, DbType = "Ntext" });
+            _database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = Constants.DataTypes.Upload, EditorAlias = Constants.PropertyEditors.Aliases.UploadField, DbType = "Nvarchar" });
             InsertDataTypeDto(Constants.DataTypes.LabelString, Constants.PropertyEditors.Aliases.Label, "Nvarchar", "{\"umbracoDataValueType\":\"STRING\"}");
             InsertDataTypeDto(Constants.DataTypes.LabelInt, Constants.PropertyEditors.Aliases.Label, "Integer", "{\"umbracoDataValueType\":\"INT\"}");
             InsertDataTypeDto(Constants.DataTypes.LabelBigint, Constants.PropertyEditors.Aliases.Label, "Nvarchar", "{\"umbracoDataValueType\":\"BIGINT\"}");
             InsertDataTypeDto(Constants.DataTypes.LabelDateTime, Constants.PropertyEditors.Aliases.Label, "Date", "{\"umbracoDataValueType\":\"DATETIME\"}");
             InsertDataTypeDto(Constants.DataTypes.LabelDecimal, Constants.PropertyEditors.Aliases.Label, "Decimal", "{\"umbracoDataValueType\":\"DECIMAL\"}");
             InsertDataTypeDto(Constants.DataTypes.LabelTime, Constants.PropertyEditors.Aliases.Label, "Date", "{\"umbracoDataValueType\":\"TIME\"}");
-            _database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = -36, EditorAlias = Constants.PropertyEditors.Aliases.DateTime, DbType = "Date" });
+            _database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = Constants.DataTypes.DateTime, EditorAlias = Constants.PropertyEditors.Aliases.DateTime, DbType = "Date" });
             _database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = -37, EditorAlias = Constants.PropertyEditors.Aliases.ColorPicker, DbType = "Nvarchar" });
             InsertDataTypeDto(Constants.DataTypes.DropDownSingle, Constants.PropertyEditors.Aliases.DropDownListFlexible, "Nvarchar", "{\"multiple\":false}");
             _database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = -40, EditorAlias = Constants.PropertyEditors.Aliases.RadioButtonList, DbType = "Nvarchar" });
             _database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = -41, EditorAlias = "Umbraco.DateTime", DbType = "Date", Configuration = "{\"format\":\"YYYY-MM-DD\"}" });
             InsertDataTypeDto(Constants.DataTypes.DropDownMultiple, Constants.PropertyEditors.Aliases.DropDownListFlexible, "Nvarchar", "{\"multiple\":true}");
             _database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = -43, EditorAlias = Constants.PropertyEditors.Aliases.CheckBoxList, DbType = "Nvarchar" });
-            _database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = 1041, EditorAlias = Constants.PropertyEditors.Aliases.Tags, DbType = "Ntext",
+            _database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = Constants.DataTypes.Tags, EditorAlias = Constants.PropertyEditors.Aliases.Tags, DbType = "Ntext",
                 Configuration = "{\"group\":\"default\", \"storageType\":\"Json\"}"
             });
-            _database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = 1043, EditorAlias = Constants.PropertyEditors.Aliases.ImageCropper, DbType = "Ntext" });
+            _database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = Constants.DataTypes.ImageCropper, EditorAlias = Constants.PropertyEditors.Aliases.ImageCropper, DbType = "Ntext" });
             _database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = Constants.DataTypes.DefaultContentListView, EditorAlias = Constants.PropertyEditors.Aliases.ListView, DbType = "Nvarchar",
                 Configuration = "{\"pageSize\":100, \"orderBy\":\"updateDate\", \"orderDirection\":\"desc\", \"layouts\":" + layouts + ", \"includeProperties\":[{\"alias\":\"updateDate\",\"header\":\"Last edited\",\"isSystem\":1},{\"alias\":\"owner\",\"header\":\"Updated by\",\"isSystem\":1}]}" });
             _database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = Constants.DataTypes.DefaultMediaListView, EditorAlias = Constants.PropertyEditors.Aliases.ListView, DbType = "Nvarchar",
diff --git a/src/Umbraco.Web/Trees/DataTypeTreeController.cs b/src/Umbraco.Web/Trees/DataTypeTreeController.cs
index 75260b586d..c4eea7558c 100644
--- a/src/Umbraco.Web/Trees/DataTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/DataTypeTreeController.cs
@@ -72,7 +72,15 @@ namespace Umbraco.Web.Trees
         {
             var systemIds = new[]
             {
-                Constants.System.DefaultLabelDataTypeId
+                Constants.DataTypes.Boolean, // Used by the Member Type: "Member"
+                Constants.DataTypes.Textarea, // Used by the Member Type: "Member"
+                Constants.DataTypes.LabelBigint, // Used by the Media Type: "Image"; Used by the Media Type: "File"
+                Constants.DataTypes.LabelDateTime, // Used by the Member Type: "Member"
+                Constants.DataTypes.LabelDecimal, // Used by the Member Type: "Member"
+                Constants.DataTypes.LabelInt, // Used by the Media Type: "Image"; Used by the Member Type: "Member"
+                Constants.DataTypes.LabelString, // Used by the Media Type: "Image"; Used by the Media Type: "File"
+                Constants.DataTypes.ImageCropper, // Used by the Media Type: "Image"
+                Constants.DataTypes.Upload, // Used by the Media Type: "File"
             };
 
             return systemIds.Concat(GetNonDeletableSystemListViewDataTypeIds());

From 580ba79619cee347512131eff28e53d96af4958b Mon Sep 17 00:00:00 2001
From: leekelleher <leekelleher@gmail.com>
Date: Fri, 7 Jun 2019 17:02:55 +0100
Subject: [PATCH 055/776] Icon Constants consistency

Updated the `Constants.Icons` and replaced the hard-coded strings with
 the const references.
---
 src/Umbraco.Core/Constants-Icons.cs           | 62 +++++++++++++++++--
 .../Migrations/Install/DatabaseDataCreator.cs |  8 +--
 .../Implement/MemberTypeRepository.cs         |  2 +-
 .../ContentEditorContentAppFactory.cs         |  5 +-
 .../Editors/ContentTypeController.cs          |  2 +-
 .../Editors/MediaTypeController.cs            |  5 +-
 .../Editors/MemberTypeController.cs           |  2 +-
 .../Models/Mapping/EntityMapDefinition.cs     | 18 +++---
 .../Models/Mapping/MacroMapDefinition.cs      |  2 +-
 .../Models/Mapping/MemberMapDefinition.cs     |  2 +-
 .../Mapping/MemberTabsAndPropertiesMapper.cs  |  2 +-
 .../Models/Mapping/UserMapDefinition.cs       |  6 +-
 .../PropertyEditors/ListViewPropertyEditor.cs |  2 +-
 .../MacroContainerPropertyEditor.cs           |  2 +-
 .../MediaPickerPropertyEditor.cs              |  2 +-
 .../MemberGroupPickerPropertyEditor.cs        |  2 +-
 .../MemberPickerPropertyEditor.cs             |  2 +-
 .../UserPickerPropertyEditor.cs               |  2 +-
 src/Umbraco.Web/Search/UmbracoTreeSearcher.cs |  8 +--
 .../Trees/ContentBlueprintTreeController.cs   |  2 +-
 .../Trees/ContentTypeTreeController.cs        |  2 +-
 .../Trees/DataTypeTreeController.cs           |  4 +-
 src/Umbraco.Web/Trees/FilesTreeController.cs  |  2 +-
 src/Umbraco.Web/Trees/MacrosTreeController.cs |  2 +-
 .../Trees/MediaTypeTreeController.cs          |  2 +-
 .../Trees/MemberGroupTreeController.cs        |  2 +-
 src/Umbraco.Web/Trees/MemberTreeController.cs |  8 +--
 .../Trees/MemberTypeTreeController.cs         |  2 +-
 src/Umbraco.Web/Trees/UserTreeController.cs   |  2 +-
 29 files changed, 109 insertions(+), 55 deletions(-)

diff --git a/src/Umbraco.Core/Constants-Icons.cs b/src/Umbraco.Core/Constants-Icons.cs
index d3e8b4ad3b..05213ed1c4 100644
--- a/src/Umbraco.Core/Constants-Icons.cs
+++ b/src/Umbraco.Core/Constants-Icons.cs
@@ -5,39 +5,89 @@
         public static class Icons
         {
             /// <summary>
-            /// System contenttype icon
+            /// System default icon
             /// </summary>
-            public const string ContentType = "icon-arrangement";
+            public const string DefaultIcon = Content;
 
             /// <summary>
-            /// System datatype icon
+            /// System content icon
+            /// </summary>
+            public const string Content = "icon-document";
+
+            /// <summary>
+            /// System content type icon
+            /// </summary>
+            public const string ContentType = "icon-item-arrangement";
+
+            /// <summary>
+            /// System data type icon
             /// </summary>
             public const string DataType = "icon-autofill";
 
             /// <summary>
-            /// System property editor icon
+            /// System list view icon
             /// </summary>
-            public const string PropertyEditor = "icon-autofill";
+            public const string ListView = "icon-thumbnail-list";
 
             /// <summary>
             /// System macro icon
             /// </summary>
             public const string Macro = "icon-settings-alt";
 
+            /// <summary>
+            /// System media file icon
+            /// </summary>
+            public const string MediaFile = "icon-document";
+
+            /// <summary>
+            /// System media folder icon
+            /// </summary>
+            public const string MediaFolder = "icon-folder";
+
+            /// <summary>
+            /// System media image icon
+            /// </summary>
+            public const string MediaImage = "icon-picture";
+
+            /// <summary>
+            /// System media type icon
+            /// </summary>
+            public const string MediaType = "icon-thumbnails";
+
             /// <summary>
             /// System member icon
             /// </summary>
             public const string Member = "icon-user";
 
             /// <summary>
-            /// System member icon
+            /// System member group icon
+            /// </summary>
+            public const string MemberGroup = "icon-users-alt";
+
+            /// <summary>
+            /// System member type icon
             /// </summary>
             public const string MemberType = "icon-users";
 
+            /// <summary>
+            /// System property editor icon
+            /// </summary>
+            public const string PropertyEditor = "icon-autofill";
+
             /// <summary>
             /// System member icon
             /// </summary>
             public const string Template = "icon-layout";
+
+            /// <summary>
+            /// System user icon
+            /// </summary>
+            public const string User = "icon-user";
+
+            /// <summary>
+            /// System user group icon
+            /// </summary>
+            public const string UserGroup = "icon-users";
         }
     }
 }
diff --git a/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs b/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
index 6a6d31ac2f..67606bc12a 100644
--- a/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
+++ b/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
@@ -155,10 +155,10 @@ namespace Umbraco.Core.Migrations.Install
 
         private void CreateContentTypeData()
         {
-            _database.Insert(Constants.DatabaseSchema.Tables.ContentType, "pk", false, new ContentTypeDto { PrimaryKey = 532, NodeId = 1031, Alias = Constants.Conventions.MediaTypes.Folder, Icon = "icon-folder", Thumbnail = "icon-folder", IsContainer = false, AllowAtRoot = true, Variations = (byte) ContentVariation.Nothing });
-            _database.Insert(Constants.DatabaseSchema.Tables.ContentType, "pk", false, new ContentTypeDto { PrimaryKey = 533, NodeId = 1032, Alias = Constants.Conventions.MediaTypes.Image, Icon = "icon-picture", Thumbnail = "icon-picture", AllowAtRoot = true, Variations = (byte) ContentVariation.Nothing });
-            _database.Insert(Constants.DatabaseSchema.Tables.ContentType, "pk", false, new ContentTypeDto { PrimaryKey = 534, NodeId = 1033, Alias = Constants.Conventions.MediaTypes.File, Icon = "icon-document", Thumbnail = "icon-document", AllowAtRoot = true, Variations = (byte) ContentVariation.Nothing });
-            _database.Insert(Constants.DatabaseSchema.Tables.ContentType, "pk", false, new ContentTypeDto { PrimaryKey = 531, NodeId = 1044, Alias = Constants.Conventions.MemberTypes.DefaultAlias, Icon = "icon-user", Thumbnail = "icon-user", Variations = (byte) ContentVariation.Nothing });
+            _database.Insert(Constants.DatabaseSchema.Tables.ContentType, "pk", false, new ContentTypeDto { PrimaryKey = 532, NodeId = 1031, Alias = Constants.Conventions.MediaTypes.Folder, Icon = Constants.Icons.MediaFolder, Thumbnail = Constants.Icons.MediaFolder, IsContainer = false, AllowAtRoot = true, Variations = (byte) ContentVariation.Nothing });
+            _database.Insert(Constants.DatabaseSchema.Tables.ContentType, "pk", false, new ContentTypeDto { PrimaryKey = 533, NodeId = 1032, Alias = Constants.Conventions.MediaTypes.Image, Icon = Constants.Icons.MediaImage, Thumbnail = Constants.Icons.MediaImage, AllowAtRoot = true, Variations = (byte) ContentVariation.Nothing });
+            _database.Insert(Constants.DatabaseSchema.Tables.ContentType, "pk", false, new ContentTypeDto { PrimaryKey = 534, NodeId = 1033, Alias = Constants.Conventions.MediaTypes.File, Icon = Constants.Icons.MediaFile, Thumbnail = Constants.Icons.MediaFile, AllowAtRoot = true, Variations = (byte) ContentVariation.Nothing });
+            _database.Insert(Constants.DatabaseSchema.Tables.ContentType, "pk", false, new ContentTypeDto { PrimaryKey = 531, NodeId = 1044, Alias = Constants.Conventions.MemberTypes.DefaultAlias, Icon = Constants.Icons.Member, Thumbnail = Constants.Icons.Member, Variations = (byte) ContentVariation.Nothing });
         }
 
         private void CreateUserData()
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/MemberTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberTypeRepository.cs
index a32ec1b422..ecc0b73ed8 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/MemberTypeRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberTypeRepository.cs
@@ -136,7 +136,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             //set a default icon if one is not specified
             if (entity.Icon.IsNullOrWhiteSpace())
             {
-                entity.Icon = "icon-user";
+                entity.Icon = Constants.Icons.Member;
             }
 
             //By Convention we add 9 standard PropertyTypes to an Umbraco MemberType
diff --git a/src/Umbraco.Web/ContentApps/ContentEditorContentAppFactory.cs b/src/Umbraco.Web/ContentApps/ContentEditorContentAppFactory.cs
index ea2dc1b2d6..8c251cacd2 100644
--- a/src/Umbraco.Web/ContentApps/ContentEditorContentAppFactory.cs
+++ b/src/Umbraco.Web/ContentApps/ContentEditorContentAppFactory.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.ContentEditing;
 using Umbraco.Core.Models.Membership;
@@ -23,7 +24,7 @@ namespace Umbraco.Web.ContentApps
                     {
                         Alias = "umbContent",
                         Name = "Content",
-                        Icon = "icon-document",
+                        Icon = Constants.Icons.Content,
                         View = "views/content/apps/content/content.html",
                         Weight = Weight
                     });
@@ -36,7 +37,7 @@ namespace Umbraco.Web.ContentApps
                     {
                         Alias = "umbContent",
                         Name = "Content",
-                        Icon = "icon-document",
+                        Icon = Constants.Icons.Content,
                         View = "views/media/apps/content/content.html",
                         Weight = Weight
                     });
diff --git a/src/Umbraco.Web/Editors/ContentTypeController.cs b/src/Umbraco.Web/Editors/ContentTypeController.cs
index e2a1e54571..cf8b6c3859 100644
--- a/src/Umbraco.Web/Editors/ContentTypeController.cs
+++ b/src/Umbraco.Web/Editors/ContentTypeController.cs
@@ -373,7 +373,7 @@ namespace Umbraco.Web.Editors
             else
                 ct = new ContentType(parentId);
 
-            ct.Icon = "icon-document";
+            ct.Icon = Constants.Icons.Content;
 
             var dto = Mapper.Map<IContentType, DocumentTypeDisplay>(ct);
             return dto;
diff --git a/src/Umbraco.Web/Editors/MediaTypeController.cs b/src/Umbraco.Web/Editors/MediaTypeController.cs
index 391f3b8cf9..c55f07d559 100644
--- a/src/Umbraco.Web/Editors/MediaTypeController.cs
+++ b/src/Umbraco.Web/Editors/MediaTypeController.cs
@@ -135,7 +135,10 @@ namespace Umbraco.Web.Editors
         }
         public MediaTypeDisplay GetEmpty(int parentId)
         {
-            var ct = new MediaType(parentId) {Icon = "icon-picture"};
+            var ct = new MediaType(parentId)
+            {
+                Icon = Constants.Icons.MediaImage
+            };
 
             var dto = Mapper.Map<IMediaType, MediaTypeDisplay>(ct);
             return dto;
diff --git a/src/Umbraco.Web/Editors/MemberTypeController.cs b/src/Umbraco.Web/Editors/MemberTypeController.cs
index df7faeccf4..f406988ae5 100644
--- a/src/Umbraco.Web/Editors/MemberTypeController.cs
+++ b/src/Umbraco.Web/Editors/MemberTypeController.cs
@@ -102,7 +102,7 @@ namespace Umbraco.Web.Editors
         public MemberTypeDisplay GetEmpty()
         {
             var ct = new MemberType(-1);
-            ct.Icon = "icon-user";
+            ct.Icon = Constants.Icons.Member;
 
             var dto = Mapper.Map<IMemberType, MemberTypeDisplay>(ct);
             return dto;
diff --git a/src/Umbraco.Web/Models/Mapping/EntityMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/EntityMapDefinition.cs
index d5bc6adee9..38ec557fdb 100644
--- a/src/Umbraco.Web/Models/Mapping/EntityMapDefinition.cs
+++ b/src/Umbraco.Web/Models/Mapping/EntityMapDefinition.cs
@@ -43,7 +43,7 @@ namespace Umbraco.Web.Models.Mapping
             target.Udi = Udi.Create(ObjectTypes.GetUdiType(source.NodeObjectType), source.Key);
 
             if (source.NodeObjectType == Constants.ObjectTypes.Member && target.Icon.IsNullOrWhiteSpace())
-                target.Icon = "icon-user";
+                target.Icon = Constants.Icons.Member;
 
             if (source is IContentEntitySlim contentSlim)
                 source.AdditionalData["ContentTypeAlias"] = contentSlim.ContentTypeAlias;
@@ -89,7 +89,7 @@ namespace Umbraco.Web.Models.Mapping
         private static void Map(IUser source, EntityBasic target, MapperContext context)
         {
             target.Alias = source.Username;
-            target.Icon = "icon-user";
+            target.Icon = Constants.Icons.User;
             target.Id = source.Id;
             target.Key = source.Key;
             target.Name = source.Name;
@@ -101,7 +101,7 @@ namespace Umbraco.Web.Models.Mapping
         private static void Map(ITemplate source, EntityBasic target, MapperContext context)
         {
             target.Alias = source.Alias;
-            target.Icon = "icon-layout";
+            target.Icon = Constants.Icons.Template;
             target.Id = source.Id;
             target.Key = source.Key;
             target.Name = source.Name;
@@ -144,15 +144,15 @@ namespace Umbraco.Web.Models.Mapping
             if (target.Icon.IsNullOrWhiteSpace())
             {
                 if (source.NodeObjectType == Constants.ObjectTypes.Member)
-                    target.Icon = "icon-user";
+                    target.Icon = Constants.Icons.Member;
                 else if (source.NodeObjectType == Constants.ObjectTypes.DataType)
-                    target.Icon = "icon-autofill";
+                    target.Icon = Constants.Icons.DataType;
                 else if (source.NodeObjectType == Constants.ObjectTypes.DocumentType)
-                    target.Icon = "icon-item-arrangement";
+                    target.Icon = Constants.Icons.ContentType;
                 else if (source.NodeObjectType == Constants.ObjectTypes.MediaType)
-                    target.Icon = "icon-thumbnails";
+                    target.Icon = Constants.Icons.MediaType;
                 else if (source.NodeObjectType == Constants.ObjectTypes.TemplateType)
-                    target.Icon = "icon-newspaper-alt";
+                    target.Icon = Constants.Icons.Template;
             }
         }
 
@@ -167,7 +167,7 @@ namespace Umbraco.Web.Models.Mapping
             //get the icon if there is one
             target.Icon = source.Values.ContainsKey(UmbracoExamineIndex.IconFieldName)
                 ? source.Values[UmbracoExamineIndex.IconFieldName]
-                : "icon-document";
+                : Constants.Icons.DefaultIcon;
 
             target.Name = source.Values.ContainsKey("nodeName") ? source.Values["nodeName"] : "[no name]";
 
diff --git a/src/Umbraco.Web/Models/Mapping/MacroMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/MacroMapDefinition.cs
index 089f5d5d71..e5bca22287 100644
--- a/src/Umbraco.Web/Models/Mapping/MacroMapDefinition.cs
+++ b/src/Umbraco.Web/Models/Mapping/MacroMapDefinition.cs
@@ -31,7 +31,7 @@ namespace Umbraco.Web.Models.Mapping
         private static void Map(IMacro source, EntityBasic target, MapperContext context)
         {
             target.Alias = source.Alias;
-            target.Icon = "icon-settings-alt";
+            target.Icon = Constants.Icons.Macro;
             target.Id = source.Id;
             target.Key = source.Key;
             target.Name = source.Name;
diff --git a/src/Umbraco.Web/Models/Mapping/MemberMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/MemberMapDefinition.cs
index 1c781255e7..96ca16e18b 100644
--- a/src/Umbraco.Web/Models/Mapping/MemberMapDefinition.cs
+++ b/src/Umbraco.Web/Models/Mapping/MemberMapDefinition.cs
@@ -128,7 +128,7 @@ namespace Umbraco.Web.Models.Mapping
         {
             target.CreateDate = source.CreationDate;
             target.Email = source.Email;
-            target.Icon = "icon-user";
+            target.Icon = Constants.Icons.Member;
             target.Id = int.MaxValue;
             target.Key = source.ProviderUserKey.TryConvertTo<Guid>().Result;
             target.Name = source.UserName;
diff --git a/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesMapper.cs b/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesMapper.cs
index 6ee37ea443..8744b068a7 100644
--- a/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesMapper.cs
@@ -96,7 +96,7 @@ namespace Umbraco.Web.Models.Mapping
                         linkText = source.ContentType.Name,
                         url = memberTypeLink,
                         target = "_self",
-                        icon = "icon-item-arrangement"
+                        icon = Constants.Icons.ContentType
                     }
                 };
                 docTypeProperty.View = "urllist";
diff --git a/src/Umbraco.Web/Models/Mapping/UserMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/UserMapDefinition.cs
index 1b245cdce2..3860d5d525 100644
--- a/src/Umbraco.Web/Models/Mapping/UserMapDefinition.cs
+++ b/src/Umbraco.Web/Models/Mapping/UserMapDefinition.cs
@@ -179,7 +179,7 @@ namespace Umbraco.Web.Models.Mapping
             target.DefaultPermissions = MapUserGroupDefaultPermissions(source);
 
             if (target.Icon.IsNullOrWhiteSpace())
-                target.Icon = "icon-users";
+                target.Icon = Constants.Icons.UserGroup;
         }
 
         // Umbraco.Code.MapAll -Trashed -Alias -AssignedPermissions
@@ -194,7 +194,7 @@ namespace Umbraco.Web.Models.Mapping
             target.Udi = Udi.Create(ObjectTypes.GetUdiType(source.NodeObjectType), source.Key);
 
             if (source.NodeObjectType == Constants.ObjectTypes.Member && target.Icon.IsNullOrWhiteSpace())
-                target.Icon = "icon-user";
+                target.Icon = Constants.Icons.Member;
         }
 
         // Umbraco.Code.MapAll -ContentStartNode -MediaStartNode -Sections -Notifications -Udi
@@ -350,7 +350,7 @@ namespace Umbraco.Web.Models.Mapping
                 target.ContentStartNode = CreateRootNode(_textService.Localize("content/contentRoot"));
 
             if (target.Icon.IsNullOrWhiteSpace())
-                target.Icon = "icon-users";
+                target.Icon = Constants.Icons.UserGroup;
         }
 
         private IDictionary<string, IEnumerable<Permission>> MapUserGroupDefaultPermissions(IUserGroup source)
diff --git a/src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs
index 8e2732cc0f..f170608545 100644
--- a/src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs
@@ -8,7 +8,7 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// Represents a list-view editor.
     /// </summary>
-    [DataEditor(Constants.PropertyEditors.Aliases.ListView, "List view", "listview", HideLabel = true, Group = "lists", Icon = "icon-item-arrangement")]
+    [DataEditor(Constants.PropertyEditors.Aliases.ListView, "List view", "listview", HideLabel = true, Group = "lists", Icon = Constants.Icons.ListView)]
     public class ListViewPropertyEditor : DataEditor
     {
         /// <summary>
diff --git a/src/Umbraco.Web/PropertyEditors/MacroContainerPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/MacroContainerPropertyEditor.cs
index d4d23da3a4..99a9f44487 100644
--- a/src/Umbraco.Web/PropertyEditors/MacroContainerPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MacroContainerPropertyEditor.cs
@@ -5,7 +5,7 @@ using Umbraco.Core.PropertyEditors;
 namespace Umbraco.Web.PropertyEditors
 {
     // TODO: MacroContainerPropertyEditor is deprecated, but what's the alternative?
-    [DataEditor(Constants.PropertyEditors.Aliases.MacroContainer, "(Obsolete) Macro Picker", "macrocontainer", ValueType = ValueTypes.Text, Group="rich content", Icon="icon-settings-alt", IsDeprecated = true)]
+    [DataEditor(Constants.PropertyEditors.Aliases.MacroContainer, "(Obsolete) Macro Picker", "macrocontainer", ValueType = ValueTypes.Text, Group = "rich content", Icon = Constants.Icons.Macro, IsDeprecated = true)]
     public class MacroContainerPropertyEditor : DataEditor
     {
         public MacroContainerPropertyEditor(ILogger logger)
diff --git a/src/Umbraco.Web/PropertyEditors/MediaPickerPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/MediaPickerPropertyEditor.cs
index 6c768f4932..52e616ffbd 100644
--- a/src/Umbraco.Web/PropertyEditors/MediaPickerPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MediaPickerPropertyEditor.cs
@@ -8,7 +8,7 @@ namespace Umbraco.Web.PropertyEditors
     /// Represents a media picker property editor.
     /// </summary>
     [DataEditor(Constants.PropertyEditors.Aliases.MediaPicker, EditorType.PropertyValue | EditorType.MacroParameter,
-        "Media Picker", "mediapicker", ValueType = ValueTypes.Text, Group = "media", Icon = "icon-picture")]
+        "Media Picker", "mediapicker", ValueType = ValueTypes.Text, Group = "media", Icon = Constants.Icons.MediaImage)]
     public class MediaPickerPropertyEditor : DataEditor
     {
         /// <summary>
diff --git a/src/Umbraco.Web/PropertyEditors/MemberGroupPickerPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/MemberGroupPickerPropertyEditor.cs
index b917145dbd..5d89024692 100644
--- a/src/Umbraco.Web/PropertyEditors/MemberGroupPickerPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MemberGroupPickerPropertyEditor.cs
@@ -4,7 +4,7 @@ using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.PropertyEditors
 {
-    [DataEditor(Constants.PropertyEditors.Aliases.MemberGroupPicker, "Member Group Picker", "membergrouppicker", ValueType = ValueTypes.Text, Group = "People", Icon = "icon-users")]
+    [DataEditor(Constants.PropertyEditors.Aliases.MemberGroupPicker, "Member Group Picker", "membergrouppicker", ValueType = ValueTypes.Text, Group = "People", Icon = Constants.Icons.MemberGroup)]
     public class MemberGroupPickerPropertyEditor : DataEditor
     {
          public MemberGroupPickerPropertyEditor(ILogger logger)
diff --git a/src/Umbraco.Web/PropertyEditors/MemberPickerPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/MemberPickerPropertyEditor.cs
index a0705fb373..858582ab72 100644
--- a/src/Umbraco.Web/PropertyEditors/MemberPickerPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MemberPickerPropertyEditor.cs
@@ -4,7 +4,7 @@ using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.PropertyEditors
 {
-    [DataEditor(Constants.PropertyEditors.Aliases.MemberPicker, "Member Picker", "memberpicker", ValueType = ValueTypes.String, Group = "People", Icon = "icon-user")]
+    [DataEditor(Constants.PropertyEditors.Aliases.MemberPicker, "Member Picker", "memberpicker", ValueType = ValueTypes.String, Group = "People", Icon = Constants.Icons.Member)]
     public class MemberPickerPropertyEditor : DataEditor
     {
         public MemberPickerPropertyEditor(ILogger logger)
diff --git a/src/Umbraco.Web/PropertyEditors/UserPickerPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/UserPickerPropertyEditor.cs
index 8cb8b64594..1d3ab05e96 100644
--- a/src/Umbraco.Web/PropertyEditors/UserPickerPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/UserPickerPropertyEditor.cs
@@ -6,7 +6,7 @@ using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.PropertyEditors
 {
-    [DataEditor(Constants.PropertyEditors.Aliases.UserPicker, "User picker", "entitypicker", ValueType = ValueTypes.Integer, Group = "People", Icon = "icon-user")]
+    [DataEditor(Constants.PropertyEditors.Aliases.UserPicker, "User picker", "entitypicker", ValueType = ValueTypes.Integer, Group = "People", Icon = Constants.Icons.User)]
     public class UserPickerPropertyEditor : DataEditor
     {
         public UserPickerPropertyEditor(ILogger logger)
diff --git a/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs b/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
index 43db9ff0ba..e15e434678 100644
--- a/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
+++ b/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
@@ -356,9 +356,9 @@ namespace Umbraco.Web.Search
                 var m = _mapper.Map<SearchResultEntity>(result);
 
                 //if no icon could be mapped, it will be set to document, so change it to picture
-                if (m.Icon == "icon-document")
+                if (m.Icon == Constants.Icons.DefaultIcon)
                 {
-                    m.Icon = "icon-user";
+                    m.Icon = Constants.Icons.Member;
                 }
 
                 if (result.Values.ContainsKey("email") && result.Values["email"] != null)
@@ -389,9 +389,9 @@ namespace Umbraco.Web.Search
             {
                 var m = _mapper.Map<SearchResultEntity>(result);
                 //if no icon could be mapped, it will be set to document, so change it to picture
-                if (m.Icon == "icon-document")
+                if (m.Icon == Constants.Icons.DefaultIcon)
                 {
-                    m.Icon = "icon-picture";
+                    m.Icon = Constants.Icons.MediaImage;
                 }
                 yield return m;
             }
diff --git a/src/Umbraco.Web/Trees/ContentBlueprintTreeController.cs b/src/Umbraco.Web/Trees/ContentBlueprintTreeController.cs
index 8c23a91d5a..ac75fd831d 100644
--- a/src/Umbraco.Web/Trees/ContentBlueprintTreeController.cs
+++ b/src/Umbraco.Web/Trees/ContentBlueprintTreeController.cs
@@ -59,7 +59,7 @@ namespace Umbraco.Web.Trees
                 nodes.AddRange(docTypeEntities
                     .Select(entity =>
                     {
-                        var treeNode = CreateTreeNode(entity, Constants.ObjectTypes.DocumentBlueprint, id, queryStrings, "icon-item-arrangement", true);
+                        var treeNode = CreateTreeNode(entity, Constants.ObjectTypes.DocumentBlueprint, id, queryStrings, Constants.Icons.ContentType, true);
                         treeNode.Path = $"-1,{entity.Id}";
                         treeNode.NodeType = "document-type-blueprints";
                         // TODO: This isn't the best way to ensure a no operation process for clicking a node but it works for now.
diff --git a/src/Umbraco.Web/Trees/ContentTypeTreeController.cs b/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
index 4a8cfba9a5..bead6aa141 100644
--- a/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
@@ -57,7 +57,7 @@ namespace Umbraco.Web.Trees
                         // since 7.4+ child type creation is enabled by a config option. It defaults to on, but can be disabled if we decide to.
                         // need this check to keep supporting sites where children have already been created.
                         var hasChildren = dt.HasChildren;
-                        var node = CreateTreeNode(dt, Constants.ObjectTypes.DocumentType, id, queryStrings, "icon-item-arrangement", hasChildren);
+                        var node = CreateTreeNode(dt, Constants.ObjectTypes.DocumentType, id, queryStrings, Constants.Icons.ContentType, hasChildren);
 
                         node.Path = dt.Path;
                         return node;
diff --git a/src/Umbraco.Web/Trees/DataTypeTreeController.cs b/src/Umbraco.Web/Trees/DataTypeTreeController.cs
index c4eea7558c..2465b4d45a 100644
--- a/src/Umbraco.Web/Trees/DataTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/DataTypeTreeController.cs
@@ -53,11 +53,11 @@ namespace Umbraco.Web.Trees
                     .OrderBy(entity => entity.Name)
                     .Select(dt =>
                     {
-                        var node = CreateTreeNode(dt.Id.ToInvariantString(), id, queryStrings, dt.Name, "icon-autofill", false);
+                        var node = CreateTreeNode(dt.Id.ToInvariantString(), id, queryStrings, dt.Name, Constants.Icons.DataType, false);
                         node.Path = dt.Path;
                         if (systemListViewDataTypeIds.Contains(dt.Id))
                         {
-                            node.Icon = "icon-thumbnail-list";
+                            node.Icon = Constants.Icons.ListView;
                         }
                         return node;
                     }));
diff --git a/src/Umbraco.Web/Trees/FilesTreeController.cs b/src/Umbraco.Web/Trees/FilesTreeController.cs
index 60adb5048e..ae951bebf4 100644
--- a/src/Umbraco.Web/Trees/FilesTreeController.cs
+++ b/src/Umbraco.Web/Trees/FilesTreeController.cs
@@ -14,6 +14,6 @@ namespace Umbraco.Web.Trees
 
         protected override string[] Extensions => ExtensionsStatic;
 
-        protected override string FileIcon => "icon-document";
+        protected override string FileIcon => Constants.Icons.MediaFile;
     }
 }
diff --git a/src/Umbraco.Web/Trees/MacrosTreeController.cs b/src/Umbraco.Web/Trees/MacrosTreeController.cs
index fcfd2e0b3b..cbe1946779 100644
--- a/src/Umbraco.Web/Trees/MacrosTreeController.cs
+++ b/src/Umbraco.Web/Trees/MacrosTreeController.cs
@@ -36,7 +36,7 @@ namespace Umbraco.Web.Trees
                         id,
                         queryStrings,
                         macro.Name,
-                        "icon-settings-alt",
+                        Constants.Icons.Macro,
                         false));
                 }
             }
diff --git a/src/Umbraco.Web/Trees/MediaTypeTreeController.cs b/src/Umbraco.Web/Trees/MediaTypeTreeController.cs
index 5798c546fc..53e30a4ee5 100644
--- a/src/Umbraco.Web/Trees/MediaTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/MediaTypeTreeController.cs
@@ -50,7 +50,7 @@ namespace Umbraco.Web.Trees
                         // since 7.4+ child type creation is enabled by a config option. It defaults to on, but can be disabled if we decide to.
                         // need this check to keep supporting sites where children have already been created.
                         var hasChildren = dt.HasChildren;
-                        var node = CreateTreeNode(dt, Constants.ObjectTypes.MediaType, id, queryStrings, "icon-thumbnails", hasChildren);
+                        var node = CreateTreeNode(dt, Constants.ObjectTypes.MediaType, id, queryStrings, Constants.Icons.MediaType, hasChildren);
 
                         node.Path = dt.Path;
                         return node;
diff --git a/src/Umbraco.Web/Trees/MemberGroupTreeController.cs b/src/Umbraco.Web/Trees/MemberGroupTreeController.cs
index ea2412e4bd..54c499d717 100644
--- a/src/Umbraco.Web/Trees/MemberGroupTreeController.cs
+++ b/src/Umbraco.Web/Trees/MemberGroupTreeController.cs
@@ -17,7 +17,7 @@ namespace Umbraco.Web.Trees
         {
             return Services.MemberGroupService.GetAll()
                 .OrderBy(x => x.Name)
-                .Select(dt => CreateTreeNode(dt.Id.ToString(), id, queryStrings, dt.Name, "icon-item-arrangement", false));
+                .Select(dt => CreateTreeNode(dt.Id.ToString(), id, queryStrings, dt.Name, Constants.Icons.MemberGroup, false));
         }
 
         protected override TreeNode CreateRootNode(FormDataCollection queryStrings)
diff --git a/src/Umbraco.Web/Trees/MemberTreeController.cs b/src/Umbraco.Web/Trees/MemberTreeController.cs
index bb0091af54..2657f13255 100644
--- a/src/Umbraco.Web/Trees/MemberTreeController.cs
+++ b/src/Umbraco.Web/Trees/MemberTreeController.cs
@@ -80,7 +80,7 @@ namespace Umbraco.Web.Trees
                     "-1",
                     queryStrings,
                     member.Name,
-                    "icon-user",
+                    Constants.Icons.Member,
                     false,
                     "",
                     Udi.Create(ObjectTypes.GetUdiType(Constants.ObjectTypes.Member), member.Key));
@@ -110,7 +110,7 @@ namespace Umbraco.Web.Trees
                     "-1",
                     queryStrings,
                     member.UserName,
-                    "icon-user",
+                    Constants.Icons.Member,
                     false);
 
                 return node;
@@ -124,14 +124,14 @@ namespace Umbraco.Web.Trees
             if (id == Constants.System.RootString)
             {
                 nodes.Add(
-                        CreateTreeNode(Constants.Conventions.MemberTypes.AllMembersListId, id, queryStrings, Services.TextService.Localize("member/allMembers"), "icon-users", true,
+                        CreateTreeNode(Constants.Conventions.MemberTypes.AllMembersListId, id, queryStrings, Services.TextService.Localize("member/allMembers"), Constants.Icons.MemberType, true,
                             queryStrings.GetRequiredValue<string>("application") + TreeAlias.EnsureStartsWith('/') + "/list/" + Constants.Conventions.MemberTypes.AllMembersListId));
 
                 if (_isUmbracoProvider)
                 {
                     nodes.AddRange(Services.MemberTypeService.GetAll()
                         .Select(memberType =>
-                            CreateTreeNode(memberType.Alias, id, queryStrings, memberType.Name, "icon-users", true,
+                            CreateTreeNode(memberType.Alias, id, queryStrings, memberType.Name, Constants.Icons.MemberType, true,
                                 queryStrings.GetRequiredValue<string>("application") + TreeAlias.EnsureStartsWith('/') + "/list/" + memberType.Alias)));
                 }
             }
diff --git a/src/Umbraco.Web/Trees/MemberTypeTreeController.cs b/src/Umbraco.Web/Trees/MemberTypeTreeController.cs
index 3a72460963..bd80f63897 100644
--- a/src/Umbraco.Web/Trees/MemberTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/MemberTypeTreeController.cs
@@ -23,7 +23,7 @@ namespace Umbraco.Web.Trees
         {
             return Services.MemberTypeService.GetAll()
                 .OrderBy(x => x.Name)
-                .Select(dt => CreateTreeNode(dt, Constants.ObjectTypes.MemberType, id, queryStrings, "icon-item-arrangement", false));
+                .Select(dt => CreateTreeNode(dt, Constants.ObjectTypes.MemberType, id, queryStrings, Constants.Icons.MemberType, false));
         }
     }
 }
diff --git a/src/Umbraco.Web/Trees/UserTreeController.cs b/src/Umbraco.Web/Trees/UserTreeController.cs
index 7da0b689af..55d98def86 100644
--- a/src/Umbraco.Web/Trees/UserTreeController.cs
+++ b/src/Umbraco.Web/Trees/UserTreeController.cs
@@ -22,7 +22,7 @@ namespace Umbraco.Web.Trees
 
             //this will load in a custom UI instead of the dashboard for the root node
             root.RoutePath = $"{Constants.Applications.Users}/{Constants.Trees.Users}/users";
-            root.Icon = "icon-users";
+            root.Icon = Constants.Icons.UserGroup;
 
             root.HasChildren = false;
             return root;

From 9ce996cbba49199423f4e79e223497d5c3c8cd4f Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Thu, 27 Jun 2019 22:42:05 +0200
Subject: [PATCH 056/776] V8: Don't show multiple open menus (take two) (#5609)

---
 .../directives/components/events/events.directive.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/events/events.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/events/events.directive.js
index 15e74bbd90..abee5e2358 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/events/events.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/events/events.directive.js
@@ -101,14 +101,14 @@ angular.module('umbraco.directives')
             var eventBindings = [];
 
             function oneTimeClick(event) {
-                var el = event.target.nodeName;
-
-                //ignore link and button clicks
-                var els = ["INPUT", "A", "BUTTON"];
-                if (els.indexOf(el) >= 0) { return; }
+                // ignore clicks on button groups toggles (i.e. the save and publish button)
+                var parents = $(event.target).closest("[data-element='button-group-toggle']");
+                if (parents.length > 0) {
+                    return;
+                }
 
                 // ignore clicks on new overlay
-                var parents = $(event.target).parents("a,button,.umb-overlay,.umb-tour");
+                parents = $(event.target).parents(".umb-overlay,.umb-tour");
                 if (parents.length > 0) {
                     return;
                 }

From ee2ebc7d148e3b247583bf35cb96f57f6098c25a Mon Sep 17 00:00:00 2001
From: leekelleher <leekelleher@gmail.com>
Date: Fri, 7 Jun 2019 15:31:00 +0100
Subject: [PATCH 057/776] ReadOnlyValueController - enabled filters

Previously the code checks if the `config` is an array,
but with how config options are set, this would typically
be an object (dictionary). So the previous code would
never allow a filter to be set.

Now the check is on the object property.
---
 .../readonlyvalue/readonlyvalue.controller.js       | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/readonlyvalue/readonlyvalue.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/readonlyvalue/readonlyvalue.controller.js
index 48ec95ba0e..a49ffeadaa 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/readonlyvalue/readonlyvalue.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/readonlyvalue/readonlyvalue.controller.js
@@ -14,13 +14,7 @@
 function ReadOnlyValueController($rootScope, $scope, $filter) {
 
     function formatDisplayValue() {
-        
-        if ($scope.model.config &&
-        angular.isArray($scope.model.config) &&
-        $scope.model.config.length > 0 &&
-        $scope.model.config[0] &&
-        $scope.model.config.filter) {
-
+        if ($scope.model.config && $scope.model.config.filter) {
             if ($scope.model.config.format) {
                 $scope.displayvalue = $filter($scope.model.config.filter)($scope.model.value, $scope.model.config.format);
             } else {
@@ -29,12 +23,11 @@ function ReadOnlyValueController($rootScope, $scope, $filter) {
         } else {
             $scope.displayvalue = $scope.model.value;
         }
-
     }
 
     //format the display value on init:
     formatDisplayValue();
-    
+
     $scope.$watch("model.value", function (newVal, oldVal) {
         //cannot just check for !newVal because it might be an empty string which we 
         //want to look for.
@@ -45,4 +38,4 @@ function ReadOnlyValueController($rootScope, $scope, $filter) {
     });
 }
 
-angular.module('umbraco').controller("Umbraco.PropertyEditors.ReadOnlyValueController", ReadOnlyValueController);
\ No newline at end of file
+angular.module('umbraco').controller("Umbraco.PropertyEditors.ReadOnlyValueController", ReadOnlyValueController);

From 84aa861a5bca9263eae6c89927f6948ecbb96b50 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 28 Jun 2019 13:03:36 +1000
Subject: [PATCH 058/776] Merge remote-tracking branch 'origin/v7/dev' into
 v8/dev - Iniital commit (broken)

# Conflicts:
#	build/NuSpecs/tools/Web.config.install.xdt
#	src/Umbraco.Core/Constants-DataTypes.cs
#	src/Umbraco.Core/Models/DataTypeDefinition.cs
#	src/Umbraco.Core/Models/DataTypeExtensions.cs
#	src/Umbraco.Core/Models/IDataTypeDefinition.cs
#	src/Umbraco.Core/Models/UmbracoEntity.cs
#	src/Umbraco.Core/Models/UserExtensions.cs
#	src/Umbraco.Core/Persistence/Factories/DataTypeDefinitionFactory.cs
#	src/Umbraco.Core/Persistence/Factories/UmbracoEntityFactory.cs
#	src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs
#	src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Core/Services/DataTypeService.cs
#	src/Umbraco.Core/Services/EntityService.cs
#	src/Umbraco.Core/Services/IContentService.cs
#	src/Umbraco.Core/Services/IDataTypeService.cs
#	src/Umbraco.Core/Services/IEntityService.cs
#	src/Umbraco.Core/Services/IRelationService.cs
#	src/Umbraco.Core/Services/Implement/RelationService.cs
#	src/Umbraco.Tests/Models/UmbracoEntityTests.cs
#	src/Umbraco.Tests/Plugins/PluginManagerTests.cs
#	src/Umbraco.Tests/Services/EntityServiceTests.cs
#	src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
#	src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
#	src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
#	src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
#	src/Umbraco.Web.UI.Client/src/common/services/search.service.js
#	src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/contentpicker/contentpicker.html
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html
#	src/Umbraco.Web.UI/packages.config
#	src/Umbraco.Web.UI/web.Template.config
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Editors/EntityController.cs
#	src/Umbraco.Web/Editors/MediaController.cs
#	src/Umbraco.Web/HtmlHelperRenderExtensions.cs
#	src/Umbraco.Web/Models/ContentEditing/ContentPropertyBasic.cs
#	src/Umbraco.Web/Models/Mapping/ContentPropertyBasicConverter.cs
#	src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayConverter.cs
#	src/Umbraco.Web/Models/Mapping/ContentPropertyDtoConverter.cs
#	src/Umbraco.Web/Models/Mapping/ContentPropertyModelMapper.cs
#	src/Umbraco.Web/Models/Mapping/PreValueDisplayResolver.cs
#	src/Umbraco.Web/Mvc/RenderRouteHandler.cs
#	src/Umbraco.Web/PropertyEditors/ContentPicker2PropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/MediaPicker2PropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/MultiNodeTreePicker2PropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/RelatedLinks2PropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/RichTextPreValueEditor.cs
#	src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
#	src/Umbraco.Web/Security/UmbracoAntiForgeryAdditionalDataProvider.cs
#	src/Umbraco.Web/Trees/ContentTreeController.cs
#	src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
#	src/Umbraco.Web/Trees/MediaTreeController.cs
#	src/Umbraco.Web/Trees/TreeControllerBase.cs
#	src/Umbraco.Web/Trees/TreeQueryStringParameters.cs
#	src/Umbraco.Web/UmbracoHelper.cs
#	src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
#	src/Umbraco.Web/WebBootManager.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseMediaTree.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseTree.cs
#	src/umbraco.cms/businesslogic/web/Access.cs
---
 .../tools/Views.Web.config.install.xdt        |  10 +-
 src/Umbraco.Core/Constants-DataTypes.cs       | 292 ++++++-
 src/Umbraco.Core/Models/DataTypeExtensions.cs |  48 ++
 src/Umbraco.Core/Models/UserExtensions.cs     |  13 -
 src/Umbraco.Core/Services/IContentService.cs  |   3 +
 .../Plugins/PluginManagerTests.cs             |   2 +-
 .../tree/umbtreesearchbox.directive.js        |   7 +
 .../src/common/resources/content.resource.js  | 602 +++++++-------
 .../src/common/resources/entity.resource.js   | 176 ++--
 .../src/common/resources/media.resource.js    | 752 +++++++++---------
 .../common/services/mediahelper.service.js    |  38 +-
 .../src/common/services/search.service.js     |  20 +-
 .../src/common/services/tinymce.service.js    |  32 -
 .../mediapicker/mediapicker.controller.js     |  60 +-
 .../contentpicker/contentpicker.controller.js |  10 +-
 .../grid/editors/media.controller.js          |  15 +-
 .../multiurlpicker.controller.js              |   2 +
 .../propertyeditors/rte/rte.prevalues.html    |   1 +
 src/Umbraco.Web/Editors/EntityController.cs   | 204 ++++-
 src/Umbraco.Web/HtmlHelperRenderExtensions.cs |   5 +-
 .../ContentEditing/ContentPropertyBasic.cs    |   6 +-
 src/Umbraco.Web/Mvc/RenderRouteHandler.cs     |   2 +
 src/Umbraco.Web/Search/UmbracoTreeSearcher.cs |   9 +-
 .../Trees/ContentTreeController.cs            |   1 -
 .../Trees/ContentTreeControllerBase.cs        |  50 +-
 src/Umbraco.Web/Trees/MediaTreeController.cs  |   2 +-
 src/Umbraco.Web/Trees/TreeControllerBase.cs   |   1 +
 .../Trees/TreeQueryStringParameters.cs        |   1 +
 src/Umbraco.Web/UmbracoHelper.cs              |   1 +
 29 files changed, 1469 insertions(+), 896 deletions(-)

diff --git a/build/NuSpecs/tools/Views.Web.config.install.xdt b/build/NuSpecs/tools/Views.Web.config.install.xdt
index 4d660301a8..828bb8612f 100644
--- a/build/NuSpecs/tools/Views.Web.config.install.xdt
+++ b/build/NuSpecs/tools/Views.Web.config.install.xdt
@@ -8,7 +8,7 @@
     </configSections>
 
     <system.web.webPages.razor>
-        <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(factoryType)" xdt:Transform="SetAttributes(factoryType)" />
+        <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(factoryType)" xdt:Transform="SetAttributes(factoryType)" />
         <pages pageBaseType="System.Web.Mvc.WebViewPage">
             <namespaces>
                 <add namespace="Umbraco.Web.PublishedContentModels" xdt:Transform="InsertIfMissing" />
@@ -18,13 +18,13 @@
 
     <system.web>
         <pages
-          pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
-          pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
-          userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
+          pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
+          pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
+          userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
         xdt:Locator="Match(pageParserFilterType,pageBaseType,userControlBaseType)"
         xdt:Transform="SetAttributes(pageParserFilterType,pageBaseType,userControlBaseType)">
             <controls>
-                <add assembly="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" xdt:Locator="Match(namespace)" xdt:Transform="SetAttributes(assembly)" />
+                <add assembly="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" xdt:Locator="Match(namespace)" xdt:Transform="SetAttributes(assembly)" />
             </controls>
         </pages>
     </system.web>
diff --git a/src/Umbraco.Core/Constants-DataTypes.cs b/src/Umbraco.Core/Constants-DataTypes.cs
index f2b31be28f..1e9115cde9 100644
--- a/src/Umbraco.Core/Constants-DataTypes.cs
+++ b/src/Umbraco.Core/Constants-DataTypes.cs
@@ -1,4 +1,6 @@
-namespace Umbraco.Core
+using System;
+
+namespace Umbraco.Core
 {
     public static partial class Constants
     {
@@ -22,6 +24,294 @@
             public const int DefaultMembersListView = -97;
 
             public const int Tags = 1041;
+
+            /// <summary>
+            /// Defines the identifiers for Umbraco data types as constants for easy centralized access/management.
+            /// </summary>
+            internal static class BuiltInDataTypes
+            {
+
+                public static class ReservedPreValueKeys
+                {
+                    public const string IgnoreUserStartNodes = "ignoreUserStartNodes";
+                }
+
+                /// <summary>
+                /// Guid for Content Picker as string
+                /// </summary>
+                public const string ContentPicker = "FD1E0DA5-5606-4862-B679-5D0CF3A52A59";
+
+                /// <summary>
+                /// Guid for Content Picker
+                /// </summary>
+                public static readonly Guid ContentPickerGuid = new Guid(ContentPicker);
+
+
+                /// <summary>
+                /// Guid for Member Picker as string
+                /// </summary>
+                public const string MemberPicker = "1EA2E01F-EBD8-4CE1-8D71-6B1149E63548";
+
+                /// <summary>
+                /// Guid for Member Picker
+                /// </summary>
+                public static readonly Guid MemberPickerGuid = new Guid(MemberPicker);
+
+
+                /// <summary>
+                /// Guid for Media Picker as string
+                /// </summary>
+                public const string MediaPicker = "135D60E0-64D9-49ED-AB08-893C9BA44AE5";
+
+                /// <summary>
+                /// Guid for Media Picker
+                /// </summary>
+                public static readonly Guid MediaPickerGuid = new Guid(MediaPicker);
+
+
+                /// <summary>
+                /// Guid for Multiple Media Picker as string
+                /// </summary>
+                public const string MultipleMediaPicker = "9DBBCBBB-2327-434A-B355-AF1B84E5010A";
+
+                /// <summary>
+                /// Guid for Multiple Media Picker
+                /// </summary>
+                public static readonly Guid MultipleMediaPickerGuid = new Guid(MultipleMediaPicker);
+
+
+                /// <summary>
+                /// Guid for Related Links as string
+                /// </summary>
+                public const string RelatedLinks = "B4E3535A-1753-47E2-8568-602CF8CFEE6F";
+
+                /// <summary>
+                /// Guid for Related Links
+                /// </summary>
+                public static readonly Guid RelatedLinksGuid = new Guid(RelatedLinks);
+
+
+                /// <summary>
+                /// Guid for Member as string
+                /// </summary>
+                public const string Member = "d59be02f-1df9-4228-aa1e-01917d806cda";
+
+                /// <summary>
+                /// Guid for Member
+                /// </summary>
+                public static readonly Guid MemberGuid = new Guid(Member);
+
+
+                /// <summary>
+                /// Guid for Image Cropper as string
+                /// </summary>
+                public const string ImageCropper = "1df9f033-e6d4-451f-b8d2-e0cbc50a836f";
+
+                /// <summary>
+                /// Guid for Image Cropper
+                /// </summary>
+                public static readonly Guid ImageCropperGuid = new Guid(ImageCropper);
+
+
+                /// <summary>
+                /// Guid for Tags as string
+                /// </summary>
+                public const string Tags = "b6b73142-b9c1-4bf8-a16d-e1c23320b549";
+
+                /// <summary>
+                /// Guid for Tags
+                /// </summary>
+                public static readonly Guid TagsGuid = new Guid(Tags);
+
+
+                /// <summary>
+                /// Guid for List View - Content as string
+                /// </summary>
+                public const string ListViewContent = "C0808DD3-8133-4E4B-8CE8-E2BEA84A96A4";
+
+                /// <summary>
+                /// Guid for List View - Content
+                /// </summary>
+                public static readonly Guid ListViewContentGuid = new Guid(ListViewContent);
+
+
+                /// <summary>
+                /// Guid for List View - Media as string
+                /// </summary>
+                public const string ListViewMedia = "3A0156C4-3B8C-4803-BDC1-6871FAA83FFF";
+
+                /// <summary>
+                /// Guid for List View - Media
+                /// </summary>
+                public static readonly Guid ListViewMediaGuid = new Guid(ListViewMedia);
+
+
+                /// <summary>
+                /// Guid for List View - Members as string
+                /// </summary>
+                public const string ListViewMembers = "AA2C52A0-CE87-4E65-A47C-7DF09358585D";
+
+                /// <summary>
+                /// Guid for List View - Members
+                /// </summary>
+                public static readonly Guid ListViewMembersGuid = new Guid(ListViewMembers);
+
+
+                /// <summary>
+                /// Guid for Date Picker with time as string
+                /// </summary>
+                public const string DatePickerWithTime = "e4d66c0f-b935-4200-81f0-025f7256b89a";
+
+                /// <summary>
+                /// Guid for Date Picker with time
+                /// </summary>
+                public static readonly Guid DatePickerWithTimeGuid = new Guid(DatePickerWithTime);
+
+
+                /// <summary>
+                /// Guid for Approved Color as string
+                /// </summary>
+                public const string ApprovedColor = "0225af17-b302-49cb-9176-b9f35cab9c17";
+
+                /// <summary>
+                /// Guid for Approved Color
+                /// </summary>
+                public static readonly Guid ApprovedColorGuid = new Guid(ApprovedColor);
+
+
+                /// <summary>
+                /// Guid for Dropdown multiple as string
+                /// </summary>
+                public const string DropdownMultiple = "f38f0ac7-1d27-439c-9f3f-089cd8825a53";
+
+                /// <summary>
+                /// Guid for Dropdown multiple
+                /// </summary>
+                public static readonly Guid DropdownMultipleGuid = new Guid(DropdownMultiple);
+
+
+                /// <summary>
+                /// Guid for Radiobox as string
+                /// </summary>
+                public const string Radiobox = "bb5f57c9-ce2b-4bb9-b697-4caca783a805";
+
+                /// <summary>
+                /// Guid for Radiobox
+                /// </summary>
+                public static readonly Guid RadioboxGuid = new Guid(Radiobox);
+
+
+                /// <summary>
+                /// Guid for Date Picker as string
+                /// </summary>
+                public const string DatePicker = "5046194e-4237-453c-a547-15db3a07c4e1";
+
+                /// <summary>
+                /// Guid for Date Picker
+                /// </summary>
+                public static readonly Guid DatePickerGuid = new Guid(DatePicker);
+
+
+                /// <summary>
+                /// Guid for Dropdown as string
+                /// </summary>
+                public const string Dropdown = "0b6a45e7-44ba-430d-9da5-4e46060b9e03";
+
+                /// <summary>
+                /// Guid for Dropdown
+                /// </summary>
+                public static readonly Guid DropdownGuid = new Guid(Dropdown);
+
+
+                /// <summary>
+                /// Guid for Checkbox list as string
+                /// </summary>
+                public const string CheckboxList = "fbaf13a8-4036-41f2-93a3-974f678c312a";
+
+                /// <summary>
+                /// Guid for Checkbox list
+                /// </summary>
+                public static readonly Guid CheckboxListGuid = new Guid(CheckboxList);
+
+
+                /// <summary>
+                /// Guid for Checkbox as string
+                /// </summary>
+                public const string Checkbox = "92897bc6-a5f3-4ffe-ae27-f2e7e33dda49";
+
+                /// <summary>
+                /// Guid for Checkbox
+                /// </summary>
+                public static readonly Guid CheckboxGuid = new Guid(Checkbox);
+
+
+                /// <summary>
+                /// Guid for Numeric as string
+                /// </summary>
+                public const string Numeric = "2e6d3631-066e-44b8-aec4-96f09099b2b5";
+
+                /// <summary>
+                /// Guid for Dropdown
+                /// </summary>
+                public static readonly Guid NumericGuid = new Guid(Numeric);
+
+
+                /// <summary>
+                /// Guid for Richtext editor as string
+                /// </summary>
+                public const string RichtextEditor = "ca90c950-0aff-4e72-b976-a30b1ac57dad";
+
+                /// <summary>
+                /// Guid for Richtext editor
+                /// </summary>
+                public static readonly Guid RichtextEditorGuid = new Guid(RichtextEditor);
+
+
+                /// <summary>
+                /// Guid for Textstring as string
+                /// </summary>
+                public const string Textstring = "0cc0eba1-9960-42c9-bf9b-60e150b429ae";
+
+                /// <summary>
+                /// Guid for Textstring
+                /// </summary>
+                public static readonly Guid TextstringGuid = new Guid(Textstring);
+
+
+                /// <summary>
+                /// Guid for Textarea as string
+                /// </summary>
+                public const string Textarea = "c6bac0dd-4ab9-45b1-8e30-e4b619ee5da3";
+
+                /// <summary>
+                /// Guid for Dropdown
+                /// </summary>
+                public static readonly Guid TextareaGuid = new Guid(Textarea);
+
+
+                /// <summary>
+                /// Guid for Upload as string
+                /// </summary>
+                public const string Upload = "84c6b441-31df-4ffe-b67e-67d5bc3ae65a";
+
+                /// <summary>
+                /// Guid for Upload
+                /// </summary>
+                public static readonly Guid UploadGuid = new Guid(Upload);
+
+
+                /// <summary>
+                /// Guid for Label as string
+                /// </summary>
+                public const string Label = "f0bc4bfb-b499-40d6-ba86-058885a5178c";
+
+                /// <summary>
+                /// Guid for Label
+                /// </summary>
+                public static readonly Guid LabelGuid = new Guid(Label);
+
+
+            }
         }
     }
 }
diff --git a/src/Umbraco.Core/Models/DataTypeExtensions.cs b/src/Umbraco.Core/Models/DataTypeExtensions.cs
index df8a3caea8..a2603ad3df 100644
--- a/src/Umbraco.Core/Models/DataTypeExtensions.cs
+++ b/src/Umbraco.Core/Models/DataTypeExtensions.cs
@@ -35,5 +35,53 @@ namespace Umbraco.Core.Models
 
             throw new InvalidCastException($"Cannot cast dataType configuration, of type {configuration.GetType().Name}, to {typeof(T).Name}.");
         }
+        
+        private static readonly ISet<Guid> IdsOfBuildInDataTypes = new HashSet<Guid>()
+        {
+            Constants.DataTypes.ContentPickerGuid,
+            Constants.DataTypes.MemberPickerGuid,
+            Constants.DataTypes.MediaPickerGuid,
+            Constants.DataTypes.MultipleMediaPickerGuid,
+            Constants.DataTypes.RelatedLinksGuid,
+            Constants.DataTypes.MemberGuid,
+            Constants.DataTypes.ImageCropperGuid,
+            Constants.DataTypes.TagsGuid,
+            Constants.DataTypes.ListViewContentGuid,
+            Constants.DataTypes.ListViewMediaGuid,
+            Constants.DataTypes.ListViewMembersGuid,
+            Constants.DataTypes.DatePickerWithTimeGuid,
+            Constants.DataTypes.ApprovedColorGuid,
+            Constants.DataTypes.DropdownMultipleGuid,
+            Constants.DataTypes.RadioboxGuid,
+            Constants.DataTypes.DatePickerGuid,
+            Constants.DataTypes.DropdownGuid,
+            Constants.DataTypes.CheckboxListGuid,
+            Constants.DataTypes.CheckboxGuid,
+            Constants.DataTypes.NumericGuid,
+            Constants.DataTypes.RichtextEditorGuid,
+            Constants.DataTypes.TextstringGuid,
+            Constants.DataTypes.TextareaGuid,
+            Constants.DataTypes.UploadGuid,
+            Constants.DataTypes.LabelGuid,
+        };
+
+        /// <summary>
+        /// Returns true if this date type is build-in/default.
+        /// </summary>
+        /// <param name="dataType">The data type definition.</param>
+        /// <returns></returns>
+        internal static bool IsBuildInDataType(this IDataTypeDefinition dataType)
+        {
+            return IsBuildInDataType(dataType.Key);
+        }
+
+        /// <summary>
+        /// Returns true if this date type is build-in/default.
+        /// </summary>
+        internal static bool IsBuildInDataType(Guid key)
+        {
+            return IdsOfBuildInDataTypes.Contains(key);
+        }
+
     }
 }
diff --git a/src/Umbraco.Core/Models/UserExtensions.cs b/src/Umbraco.Core/Models/UserExtensions.cs
index 0f83cf78a4..cf7df4fb86 100644
--- a/src/Umbraco.Core/Models/UserExtensions.cs
+++ b/src/Umbraco.Core/Models/UserExtensions.cs
@@ -193,19 +193,6 @@ namespace Umbraco.Core.Models
             return ContentPermissionsHelper.HasPathAccess(entity.Path, user.CalculateMediaStartNodeIds(entityService), Constants.System.RecycleBinMedia);
         }
 
-        internal static bool IsInBranchOfStartNode(this IUser user, IUmbracoEntity entity, IEntityService entityService, int recycleBinId, out bool hasPathAccess)
-        {
-            switch (recycleBinId)
-            {
-                case Constants.System.RecycleBinMedia:
-                    return ContentPermissionsHelper.IsInBranchOfStartNode(entity.Path, user.CalculateMediaStartNodeIds(entityService), user.GetMediaStartNodePaths(entityService), out hasPathAccess);
-                case Constants.System.RecycleBinContent:
-                    return ContentPermissionsHelper.IsInBranchOfStartNode(entity.Path, user.CalculateContentStartNodeIds(entityService), user.GetContentStartNodePaths(entityService), out hasPathAccess);
-                default:
-                    throw new NotSupportedException("Path access is only determined on content or media");
-            }
-        }
-
         /// <summary>
         /// Determines whether this user has access to view sensitive data
         /// </summary>
diff --git a/src/Umbraco.Core/Services/IContentService.cs b/src/Umbraco.Core/Services/IContentService.cs
index 48e577a8f0..164edca1e6 100644
--- a/src/Umbraco.Core/Services/IContentService.cs
+++ b/src/Umbraco.Core/Services/IContentService.cs
@@ -526,5 +526,8 @@ namespace Umbraco.Core.Services
         OperationResult Rollback(int id, int versionId, string culture = "*", int userId = Constants.Security.SuperUserId);
 
         #endregion
+        
+        IEnumerable<string> GetAnchorValuesFromRTEs(int id);
+        IEnumerable<string> GetAnchorValuesFromRTEContent(string rteContent);  
     }
 }
diff --git a/src/Umbraco.Tests/Plugins/PluginManagerTests.cs b/src/Umbraco.Tests/Plugins/PluginManagerTests.cs
index 809354bd74..44879eae2f 100644
--- a/src/Umbraco.Tests/Plugins/PluginManagerTests.cs
+++ b/src/Umbraco.Tests/Plugins/PluginManagerTests.cs
@@ -327,7 +327,7 @@ AnotherContentFinder
         public void Resolves_RestExtensions()
         {
             var types = _manager.ResolveRestExtensions();
-            Assert.AreEqual(3, types.Count());
+            Assert.AreEqual(2, types.Count());
         }
 
         [Test]
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreesearchbox.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreesearchbox.directive.js
index 4ba4cf96bb..3b6fb5f9cd 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreesearchbox.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreesearchbox.directive.js
@@ -12,6 +12,7 @@ function treeSearchBox(localizationService, searchService, $q) {
             searchFromName: "@",
             showSearch: "@",
             section: "@",
+            datatypeId: "@",
             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 dataTypeId value if there is one
+                    if (scope.datatypeId) {
+                        searchArgs["dataTypeId"] = scope.datatypeId;
+                    }
+
                     searcher(searchArgs).then(function (data) {
                         scope.searchCallback(data);
                         //set back to null so it can be re-created
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
index b807a4dc31..d714ea4938 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
@@ -1,27 +1,27 @@
 /**
-  * @ngdoc service
-  * @name umbraco.resources.contentResource
-  * @description Handles all transactions of content data
-  * from the angular application to the Umbraco database, using the Content WebApi controller
-  *
-  * all methods returns a resource promise async, so all operations won't complete untill .then() is completed.
-  *
-  * @requires $q
-  * @requires $http
-  * @requires umbDataFormatter
-  * @requires umbRequestHelper
-  *
-  * ##usage
-  * To use, simply inject the contentResource into any controller or service that needs it, and make
-  * sure the umbraco.resources module is accesible - which it should be by default.
-  *
-  * <pre>
-  *    contentResource.getById(1234)
-  *          .then(function(data) {
-  *              $scope.content = data;
+ * @ngdoc service
+ * @name umbraco.resources.contentResource
+ * @description Handles all transactions of content data
+ * from the angular application to the Umbraco database, using the Content WebApi controller
+ *
+ * all methods returns a resource promise async, so all operations won't complete untill .then() is completed.
+ *
+ * @requires $q
+ * @requires $http
+ * @requires umbDataFormatter
+ * @requires umbRequestHelper
+ *
+ * ##usage
+ * To use, simply inject the contentResource into any controller or service that needs it, and make
+ * sure the umbraco.resources module is accesible - which it should be by default.
+ *
+ * <pre>
+ *    contentResource.getById(1234)
+ *          .then(function(data) {
+ *              $scope.content = data;
   *          });
   * </pre>
-  **/
+ **/
 
 function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
 
@@ -79,27 +79,27 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#sort
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Sorts all children below a given parent node id, based on a collection of node-ids
-          *
-          * ##usage
-          * <pre>
-          * var ids = [123,34533,2334,23434];
-          * contentResource.sort({ parentId: 1244, sortedIds: ids })
-          *    .then(function() {
-          *        $scope.complete = true;
-          *    });
+         * @ngdoc method
+         * @name umbraco.resources.contentResource#sort
+         * @methodOf umbraco.resources.contentResource
+         *
+         * @description
+         * Sorts all children below a given parent node id, based on a collection of node-ids
+         *
+         * ##usage
+         * <pre>
+         * var ids = [123,34533,2334,23434];
+         * contentResource.sort({ parentId: 1244, sortedIds: ids })
+         *    .then(function() {
+         *        $scope.complete = true;
+         *    });
           * </pre>
-          * @param {Object} args arguments object
-          * @param {Int} args.parentId the ID of the parent node
-          * @param {Array} options.sortedIds array of node IDs as they should be sorted
-          * @returns {Promise} resourcePromise object.
-          *
-          */
+         * @param {Object} args arguments object
+         * @param {Int} args.parentId the ID of the parent node
+         * @param {Array} options.sortedIds array of node IDs as they should be sorted
+         * @returns {Promise} resourcePromise object.
+         *
+         */
         sort: function (args) {
             if (!args) {
                 throw "args cannot be null";
@@ -121,28 +121,28 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#move
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Moves a node underneath a new parentId
-          *
-          * ##usage
-          * <pre>
-          * contentResource.move({ parentId: 1244, id: 123 })
-          *    .then(function() {
-          *        alert("node was moved");
-          *    }, function(err){
+         * @ngdoc method
+         * @name umbraco.resources.contentResource#move
+         * @methodOf umbraco.resources.contentResource
+         *
+         * @description
+         * Moves a node underneath a new parentId
+         *
+         * ##usage
+         * <pre>
+         * contentResource.move({ parentId: 1244, id: 123 })
+         *    .then(function() {
+         *        alert("node was moved");
+         *    }, function(err){
           *      alert("node didnt move:" + err.data.Message);
-          *    });
+         *    });
           * </pre>
-          * @param {Object} args arguments object
-          * @param {Int} args.idd the ID of the node to move
-          * @param {Int} args.parentId the ID of the parent node to move to
-          * @returns {Promise} resourcePromise object.
-          *
-          */
+         * @param {Object} args arguments object
+         * @param {Int} args.idd the ID of the node to move
+         * @param {Int} args.parentId the ID of the parent node to move to
+         * @returns {Promise} resourcePromise object.
+         *
+         */
         move: function (args) {
             if (!args) {
                 throw "args cannot be null";
@@ -164,29 +164,29 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#copy
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Copies a node underneath a new parentId
-          *
-          * ##usage
-          * <pre>
-          * contentResource.copy({ parentId: 1244, id: 123 })
-          *    .then(function() {
-          *        alert("node was copied");
-          *    }, function(err){
+         * @ngdoc method
+         * @name umbraco.resources.contentResource#copy
+         * @methodOf umbraco.resources.contentResource
+         *
+         * @description
+         * Copies a node underneath a new parentId
+         *
+         * ##usage
+         * <pre>
+         * contentResource.copy({ parentId: 1244, id: 123 })
+         *    .then(function() {
+         *        alert("node was copied");
+         *    }, function(err){
           *      alert("node wasnt copy:" + err.data.Message);
-          *    });
+         *    });
           * </pre>
-          * @param {Object} args arguments object
-          * @param {Int} args.id the ID of the node to copy
-          * @param {Int} args.parentId the ID of the parent node to copy to
-          * @param {Boolean} args.relateToOriginal if true, relates the copy to the original through the relation api
-          * @returns {Promise} resourcePromise object.
-          *
-          */
+         * @param {Object} args arguments object
+         * @param {Int} args.id the ID of the node to copy
+         * @param {Int} args.parentId the ID of the parent node to copy to
+         * @param {Boolean} args.relateToOriginal if true, relates the copy to the original through the relation api
+         * @returns {Promise} resourcePromise object.
+         *
+         */
         copy: function (args) {
             if (!args) {
                 throw "args cannot be null";
@@ -205,26 +205,26 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
         },
 
         /**
-          * @ngdoc method
+         * @ngdoc method
           * @name umbraco.resources.contentResource#unpublish
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Unpublishes a content item with a given Id
-          *
-          * ##usage
-          * <pre>
+         * @methodOf umbraco.resources.contentResource
+         *
+         * @description
+         * Unpublishes a content item with a given Id
+         *
+         * ##usage
+         * <pre>
           * contentResource.unpublish(1234)
-          *    .then(function() {
-          *        alert("node was unpulished");
-          *    }, function(err){
+         *    .then(function() {
+         *        alert("node was unpulished");
+         *    }, function(err){
           *      alert("node wasnt unpublished:" + err.data.Message);
-          *    });
+         *    });
           * </pre>
-          * @param {Int} id the ID of the node to unpublish
-          * @returns {Promise} resourcePromise object.
-          *
-          */
+         * @param {Int} id the ID of the node to unpublish
+         * @returns {Promise} resourcePromise object.
+         *
+         */
         unpublish: function (id, cultures) {
             if (!id) {
                 throw "id cannot be null";
@@ -242,7 +242,7 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
                 'Failed to publish content with id ' + id);
         },
         /**
-          * @ngdoc method
+         * @ngdoc method
           * @name umbraco.resources.contentResource#getCultureAndDomains
           * @methodOf umbraco.resources.contentResource
           *
@@ -281,23 +281,23 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
         },
         /**
           * @ngdoc method
-          * @name umbraco.resources.contentResource#emptyRecycleBin
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Empties the content recycle bin
-          *
-          * ##usage
-          * <pre>
-          * contentResource.emptyRecycleBin()
-          *    .then(function() {
-          *        alert('its empty!');
-          *    });
+         * @name umbraco.resources.contentResource#emptyRecycleBin
+         * @methodOf umbraco.resources.contentResource
+         *
+         * @description
+         * Empties the content recycle bin
+         *
+         * ##usage
+         * <pre>
+         * contentResource.emptyRecycleBin()
+         *    .then(function() {
+         *        alert('its empty!');
+         *    });
           * </pre>
           *
-          * @returns {Promise} resourcePromise object.
-          *
-          */
+         * @returns {Promise} resourcePromise object.
+         *
+         */
         emptyRecycleBin: function () {
             return umbRequestHelper.resourcePromise(
                 $http.post(
@@ -308,25 +308,25 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#deleteById
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Deletes a content item with a given id
-          *
-          * ##usage
-          * <pre>
-          * contentResource.deleteById(1234)
-          *    .then(function() {
-          *        alert('its gone!');
-          *    });
+         * @ngdoc method
+         * @name umbraco.resources.contentResource#deleteById
+         * @methodOf umbraco.resources.contentResource
+         *
+         * @description
+         * Deletes a content item with a given id
+         *
+         * ##usage
+         * <pre>
+         * contentResource.deleteById(1234)
+         *    .then(function() {
+         *        alert('its gone!');
+         *    });
           * </pre>
           *
           * @param {Int} id id of content item to delete
-          * @returns {Promise} resourcePromise object.
-          *
-          */
+         * @returns {Promise} resourcePromise object.
+         *
+         */
         deleteById: function (id) {
             return umbRequestHelper.resourcePromise(
                 $http.post(
@@ -348,27 +348,27 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#getById
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Gets a content item with a given id
-          *
-          * ##usage
-          * <pre>
-          * contentResource.getById(1234)
-          *    .then(function(content) {
+         * @ngdoc method
+         * @name umbraco.resources.contentResource#getById
+         * @methodOf umbraco.resources.contentResource
+         *
+         * @description
+         * Gets a content item with a given id
+         *
+         * ##usage
+         * <pre>
+         * contentResource.getById(1234)
+         *    .then(function(content) {
           *        var myDoc = content;
-          *        alert('its here!');
-          *    });
+         *        alert('its here!');
+         *    });
           * </pre>
           *
           * @param {Int} id id of content item to return
           * @param {Int} culture optional culture to retrieve the item in
-          * @returns {Promise} resourcePromise object containing the content item.
-          *
-          */
+         * @returns {Promise} resourcePromise object containing the content item.
+         *
+         */
         getById: function (id) {
             return umbRequestHelper.resourcePromise(
                 $http.get(
@@ -419,26 +419,26 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#getByIds
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Gets an array of content items, given a collection of ids
-          *
-          * ##usage
-          * <pre>
-          * contentResource.getByIds( [1234,2526,28262])
-          *    .then(function(contentArray) {
+         * @ngdoc method
+         * @name umbraco.resources.contentResource#getByIds
+         * @methodOf umbraco.resources.contentResource
+         *
+         * @description
+         * Gets an array of content items, given a collection of ids
+         *
+         * ##usage
+         * <pre>
+         * contentResource.getByIds( [1234,2526,28262])
+         *    .then(function(contentArray) {
           *        var myDoc = contentArray;
-          *        alert('they are here!');
-          *    });
+         *        alert('they are here!');
+         *    });
           * </pre>
           *
           * @param {Array} ids ids of content items to return as an array
-          * @returns {Promise} resourcePromise object containing the content items array.
-          *
-          */
+         * @returns {Promise} resourcePromise object containing the content items array.
+         *
+         */
         getByIds: function (ids) {
 
             var idQuery = "";
@@ -464,37 +464,37 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
 
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#getScaffold
-          * @methodOf umbraco.resources.contentResource
+         * @ngdoc method
+         * @name umbraco.resources.contentResource#getScaffold
+         * @methodOf umbraco.resources.contentResource
+         *
+         * @description
+         * Returns a scaffold of an empty content item, given the id of the content item to place it underneath and the content type alias.
           *
-          * @description
-          * Returns a scaffold of an empty content item, given the id of the content item to place it underneath and the content type alias.
-          *
-          * - Parent Id must be provided so umbraco knows where to store the content
+         * - Parent Id must be provided so umbraco knows where to store the content
           * - Content Type alias must be provided so umbraco knows which properties to put on the content scaffold
           *
-          * The scaffold is used to build editors for content that has not yet been populated with data.
+         * The scaffold is used to build editors for content that has not yet been populated with data.
           *
-          * ##usage
-          * <pre>
-          * contentResource.getScaffold(1234, 'homepage')
-          *    .then(function(scaffold) {
-          *        var myDoc = scaffold;
+         * ##usage
+         * <pre>
+         * contentResource.getScaffold(1234, 'homepage')
+         *    .then(function(scaffold) {
+         *        var myDoc = scaffold;
           *        myDoc.name = "My new document";
-          *
-          *        contentResource.publish(myDoc, true)
-          *            .then(function(content){
-          *                alert("Retrieved, updated and published again");
-          *            });
-          *    });
+         *
+         *        contentResource.publish(myDoc, true)
+         *            .then(function(content){
+         *                alert("Retrieved, updated and published again");
+         *            });
+         *    });
           * </pre>
           *
-          * @param {Int} parentId id of content item to return
+         * @param {Int} parentId id of content item to return
           * @param {String} alias contenttype alias to base the scaffold on
-          * @returns {Promise} resourcePromise object containing the content scaffold.
-          *
-          */
+         * @returns {Promise} resourcePromise object containing the content scaffold.
+         *
+         */
         getScaffold: function (parentId, alias) {
 
             return umbRequestHelper.resourcePromise(
@@ -524,25 +524,25 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#getNiceUrl
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Returns a url, given a node ID
-          *
-          * ##usage
-          * <pre>
-          * contentResource.getNiceUrl(id)
-          *    .then(function(url) {
-          *        alert('its here!');
-          *    });
+         * @ngdoc method
+         * @name umbraco.resources.contentResource#getNiceUrl
+         * @methodOf umbraco.resources.contentResource
+         *
+         * @description
+         * Returns a url, given a node ID
+         *
+         * ##usage
+         * <pre>
+         * contentResource.getNiceUrl(id)
+         *    .then(function(url) {
+         *        alert('its here!');
+         *    });
           * </pre>
           *
-          * @param {Int} id Id of node to return the public url to
-          * @returns {Promise} resourcePromise object containing the url.
-          *
-          */
+         * @param {Int} id Id of node to return the public url to
+         * @returns {Promise} resourcePromise object containing the url.
+         *
+         */
         getNiceUrl: function (id) {
             return umbRequestHelper.resourcePromise(
                 $http.get(
@@ -554,33 +554,33 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#getChildren
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Gets children of a content item with a given id
-          *
-          * ##usage
-          * <pre>
-          * contentResource.getChildren(1234, {pageSize: 10, pageNumber: 2})
-          *    .then(function(contentArray) {
+         * @ngdoc method
+         * @name umbraco.resources.contentResource#getChildren
+         * @methodOf umbraco.resources.contentResource
+         *
+         * @description
+         * Gets children of a content item with a given id
+         *
+         * ##usage
+         * <pre>
+         * contentResource.getChildren(1234, {pageSize: 10, pageNumber: 2})
+         *    .then(function(contentArray) {
           *        var children = contentArray;
-          *        alert('they are here!');
-          *    });
+         *        alert('they are here!');
+         *    });
           * </pre>
           *
-          * @param {Int} parentid id of content item to return children of
-          * @param {Object} options optional options object
-          * @param {Int} options.pageSize if paging data, number of nodes per page, default = 0
-          * @param {Int} options.pageNumber if paging data, current page index, default = 0
-          * @param {String} options.filter if provided, query will only return those with names matching the filter
-          * @param {String} options.orderDirection can be `Ascending` or `Descending` - Default: `Ascending`
-          * @param {String} options.orderBy property to order items by, default: `SortOrder`
+         * @param {Int} parentid id of content item to return children of
+         * @param {Object} options optional options object
+         * @param {Int} options.pageSize if paging data, number of nodes per page, default = 0
+         * @param {Int} options.pageNumber if paging data, current page index, default = 0
+         * @param {String} options.filter if provided, query will only return those with names matching the filter
+         * @param {String} options.orderDirection can be `Ascending` or `Descending` - Default: `Ascending`
+         * @param {String} options.orderBy property to order items by, default: `SortOrder`
           * @param {String} options.cultureName if provided, the results will be for this specific culture/variant
-          * @returns {Promise} resourcePromise object containing an array of content items.
-          *
-          */
+         * @returns {Promise} resourcePromise object containing an array of content items.
+         *
+         */
         getChildren: function (parentId, options) {
 
             var defaults = {
@@ -651,34 +651,34 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#save
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Saves changes made to a content item to its current version, if the content item is new, the isNew paramater must be passed to force creation
+         * @ngdoc method
+         * @name umbraco.resources.contentResource#save
+         * @methodOf umbraco.resources.contentResource
+         *
+         * @description
+         * Saves changes made to a content item to its current version, if the content item is new, the isNew paramater must be passed to force creation
           * if the content item needs to have files attached, they must be provided as the files param and passed separately
           *
           *
-          * ##usage
-          * <pre>
-          * contentResource.getById(1234)
-          *    .then(function(content) {
-          *          content.name = "I want a new name!";
-          *          contentResource.save(content, false)
-          *            .then(function(content){
-          *                alert("Retrieved, updated and saved again");
-          *            });
-          *    });
+         * ##usage
+         * <pre>
+         * contentResource.getById(1234)
+         *    .then(function(content) {
+         *          content.name = "I want a new name!";
+         *          contentResource.save(content, false)
+         *            .then(function(content){
+         *                alert("Retrieved, updated and saved again");
+         *            });
+         *    });
           * </pre>
           *
-          * @param {Object} content The content item object with changes applied
+         * @param {Object} content The content item object with changes applied
           * @param {Bool} isNew set to true to create a new item or to update an existing
           * @param {Array} files collection of files for the document
           * @param {Bool} showNotifications an option to disable/show notifications (default is true)
-          * @returns {Promise} resourcePromise object containing the saved content item.
-          *
-          */
+         * @returns {Promise} resourcePromise object containing the saved content item.
+         *
+         */
         save: function (content, isNew, files, showNotifications) {
             var endpoint = umbRequestHelper.getApiUrl(
                 "contentApiBaseUrl",
@@ -694,34 +694,34 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#publish
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Saves and publishes changes made to a content item to a new version, if the content item is new, the isNew paramater must be passed to force creation
+         * @ngdoc method
+         * @name umbraco.resources.contentResource#publish
+         * @methodOf umbraco.resources.contentResource
+         *
+         * @description
+         * Saves and publishes changes made to a content item to a new version, if the content item is new, the isNew paramater must be passed to force creation
           * if the content item needs to have files attached, they must be provided as the files param and passed separately
           *
           *
-          * ##usage
-          * <pre>
-          * contentResource.getById(1234)
-          *    .then(function(content) {
-          *          content.name = "I want a new name, and be published!";
-          *          contentResource.publish(content, false)
-          *            .then(function(content){
-          *                alert("Retrieved, updated and published again");
-          *            });
-          *    });
+         * ##usage
+         * <pre>
+         * contentResource.getById(1234)
+         *    .then(function(content) {
+         *          content.name = "I want a new name, and be published!";
+         *          contentResource.publish(content, false)
+         *            .then(function(content){
+         *                alert("Retrieved, updated and published again");
+         *            });
+         *    });
           * </pre>
           *
-          * @param {Object} content The content item object with changes applied
+         * @param {Object} content The content item object with changes applied
           * @param {Bool} isNew set to true to create a new item or to update an existing
           * @param {Array} files collection of files for the document
           * @param {Bool} showNotifications an option to disable/show notifications (default is true)
-          * @returns {Promise} resourcePromise object containing the saved content item.
-          *
-          */
+         * @returns {Promise} resourcePromise object containing the saved content item.
+         *
+         */
         publish: function (content, isNew, files, showNotifications) {
             var endpoint = umbRequestHelper.getApiUrl(
                 "contentApiBaseUrl",
@@ -743,31 +743,31 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#sendToPublish
-          * @methodOf umbraco.resources.contentResource
+         * @ngdoc method
+         * @name umbraco.resources.contentResource#sendToPublish
+         * @methodOf umbraco.resources.contentResource
+         *
+         * @description
+         * Saves changes made to a content item, and notifies any subscribers about a pending publication
           *
-          * @description
-          * Saves changes made to a content item, and notifies any subscribers about a pending publication
-          *
-          * ##usage
-          * <pre>
-          * contentResource.getById(1234)
-          *    .then(function(content) {
-          *          content.name = "I want a new name, and be published!";
-          *          contentResource.sendToPublish(content, false)
-          *            .then(function(content){
-          *                alert("Retrieved, updated and notication send off");
-          *            });
-          *    });
+         * ##usage
+         * <pre>
+         * contentResource.getById(1234)
+         *    .then(function(content) {
+         *          content.name = "I want a new name, and be published!";
+         *          contentResource.sendToPublish(content, false)
+         *            .then(function(content){
+         *                alert("Retrieved, updated and notication send off");
+         *            });
+         *    });
           * </pre>
           *
-          * @param {Object} content The content item object with changes applied
+         * @param {Object} content The content item object with changes applied
           * @param {Bool} isNew set to true to create a new item or to update an existing
           * @param {Array} files collection of files for the document
-          * @returns {Promise} resourcePromise object containing the saved content item.
-          *
-          */
+         * @returns {Promise} resourcePromise object containing the saved content item.
+         *
+         */
         sendToPublish: function (content, isNew, files, showNotifications) {
             var endpoint = umbRequestHelper.getApiUrl(
                 "contentApiBaseUrl",
@@ -797,25 +797,25 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#publishByid
-          * @methodOf umbraco.resources.contentResource
+         * @ngdoc method
+         * @name umbraco.resources.contentResource#publishByid
+         * @methodOf umbraco.resources.contentResource
+         *
+         * @description
+         * Publishes a content item with a given ID
           *
-          * @description
-          * Publishes a content item with a given ID
-          *
-          * ##usage
-          * <pre>
-          * contentResource.publishById(1234)
-          *    .then(function(content) {
-          *        alert("published");
-          *    });
+         * ##usage
+         * <pre>
+         * contentResource.publishById(1234)
+         *    .then(function(content) {
+         *        alert("published");
+         *    });
           * </pre>
           *
-          * @param {Int} id The ID of the conten to publish
-          * @returns {Promise} resourcePromise object containing the published content item.
-          *
-          */
+         * @param {Int} id The ID of the conten to publish
+         * @returns {Promise} resourcePromise object containing the published content item.
+         *
+         */
         publishById: function (id) {
 
             if (!id) {
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
index 753d180880..95bfd1e49b 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
@@ -2,10 +2,10 @@
     * @ngdoc service
     * @name umbraco.resources.entityResource
     * @description Loads in basic data for all entities
-    * 
+    *
     * ##What is an entity?
     * An entity is a basic **read-only** representation of an Umbraco node. It contains only the most
-    * basic properties used to display the item in trees, lists and navigation. 
+    * basic properties used to display the item in trees, lists and navigation.
     *
     * ##What is the difference between entity and content/media/etc...?
     * the entity only contains the basic node data, name, id and guid, whereas content
@@ -15,7 +15,7 @@
     *
     * ##Entity object types?
     * You need to specify the type of object you want returned.
-    * 
+    *
     * The core object types are:
     *
     * - Document
@@ -35,7 +35,7 @@ function entityResource($q, $http, umbRequestHelper) {
 
     //the factory object returned
     return {
-        
+
         getSafeAlias: function (value, camelCase) {
 
             if (!value) {
@@ -64,10 +64,10 @@ function entityResource($q, $http, umbRequestHelper) {
          *    .then(function(pathArray) {
          *        alert('its here!');
          *    });
-         * </pre> 
-         * 
+         * </pre>
+         *
          * @param {Int} id Id of node to return the public url to
-         * @param {string} type Object type name     
+         * @param {string} type Object type name
          * @returns {Promise} resourcePromise object containing the url.
          *
          */
@@ -100,8 +100,8 @@ function entityResource($q, $http, umbRequestHelper) {
          *    .then(function(url) {
          *        alert('its here!');
          *    });
-         * </pre> 
-         * 
+         * </pre>
+         *
          * @param {Int} id Id of node to return the public url to
          * @param {string} type Object type name
          * @returns {Promise} resourcePromise object containing the url.
@@ -135,17 +135,17 @@ function entityResource($q, $http, umbRequestHelper) {
          * //get media by id
          * entityResource.getEntityById(0, "Media")
          *    .then(function(ent) {
-         *        var myDoc = ent; 
+         *        var myDoc = ent;
          *        alert('its here!');
          *    });
-         * </pre> 
-         * 
+         * </pre>
+         *
          * @param {Int} id id of entity to return
-         * @param {string} type Object type name        
+         * @param {string} type Object type name
          * @returns {Promise} resourcePromise object containing the entity.
          *
          */
-        getById: function (id, type) {      
+        getById: function (id, type) {
 
             if (id === -1 || id === "-1") {
                 return null;
@@ -160,6 +160,40 @@ function entityResource($q, $http, umbRequestHelper) {
                 'Failed to retrieve entity data for id ' + id);
         },
 
+
+        getUrlAndAnchors: function (id) {
+
+            if (id === -1 || id === "-1") {
+                return null;
+            }
+
+            return umbRequestHelper.resourcePromise(
+                $http.get(
+                    umbRequestHelper.getApiUrl(
+                        "entityApiBaseUrl",
+                        "GetUrlAndAnchors",
+                        { id: id })),
+                'Failed to retrieve url and anchors data for id ' + id);
+        },
+
+
+        getAnchors: function (rteContent) {
+
+            if (!rteContent || rteContent.length === 0) {
+                return [];
+            }
+
+            return umbRequestHelper.resourcePromise(
+                $http.post(
+                    umbRequestHelper.getApiUrl(
+                        "entityApiBaseUrl",
+                        'GetAnchors'),
+                    {
+                        rteContent: rteContent
+                    }),
+                'Failed to anchors data for rte content ' + rteContent);
+        },
+
         /**
          * @ngdoc method
          * @name umbraco.resources.entityResource#getByIds
@@ -173,18 +207,18 @@ function entityResource($q, $http, umbRequestHelper) {
          * //Get templates for ids
          * entityResource.getEntitiesByIds( [1234,2526,28262], "Template")
          *    .then(function(templateArray) {
-         *        var myDoc = contentArray; 
+         *        var myDoc = contentArray;
          *        alert('they are here!');
          *    });
-         * </pre> 
-         * 
+         * </pre>
+         *
          * @param {Array} ids ids of entities to return as an array
-         * @param {string} type type name        
+         * @param {string} type type name
          * @returns {Promise} resourcePromise object containing the entity array.
          *
          */
         getByIds: function (ids, type) {
-            
+
             var query = "type=" + type;
 
             return umbRequestHelper.resourcePromise(
@@ -212,14 +246,14 @@ function entityResource($q, $http, umbRequestHelper) {
          * //get content by xpath
          * entityResource.getByQuery("$current", -1, "Document")
          *    .then(function(ent) {
-         *        var myDoc = ent; 
+         *        var myDoc = ent;
          *        alert('its here!');
          *    });
-         * </pre> 
-         * 
+         * </pre>
+         *
          * @param {string} query xpath to use in query
          * @param {Int} nodeContextId id id to start from
-         * @param {string} type Object type name        
+         * @param {string} type Object type name
          * @returns {Promise} resourcePromise object containing the entity.
          *
          */
@@ -247,12 +281,12 @@ function entityResource($q, $http, umbRequestHelper) {
          * //Only return media
          * entityResource.getAll("Media")
          *    .then(function(ent) {
-         *        var myDoc = ent; 
+         *        var myDoc = ent;
          *        alert('its here!');
          *    });
-         * </pre> 
-         * 
-         * @param {string} type Object type name        
+         * </pre>
+         *
+         * @param {string} type Object type name
          * @param {string} postFilter optional filter expression which will execute a dynamic where clause on the server
          * @returns {Promise} resourcePromise object containing the entity.
          *
@@ -277,24 +311,33 @@ function entityResource($q, $http, umbRequestHelper) {
          *
          * @description
          * Gets ancestor entities for a given item
-         *        
-         * 
+         *
+         *
          * @param {string} type Object type name
          * @param {string} culture Culture
          * @returns {Promise} resourcePromise object containing the entity.
          *
          */
-        getAncestors: function (id, type, culture) {
+        getAncestors: function (id, type, culture, options) {
             if (culture === undefined) culture = "";
+            var args = [
+                { id: id },
+                { type: type },
+                { culture: culture}
+            ];
+            if (options && options.dataTypeId) {
+                args.push({ dataTypeId: options.dataTypeId });
+            }
+
             return umbRequestHelper.resourcePromise(
                $http.get(
                    umbRequestHelper.getApiUrl(
                        "entityApiBaseUrl",
                        "GetAncestors",
-                        [{ id: id }, { type: type }, { culture: culture }])),
-               'Failed to retrieve ancestor data for id ' + id);
+                       args)),
+                       'Failed to retrieve ancestor data for id ' + id);
         },
-        
+
         /**
          * @ngdoc method
          * @name umbraco.resources.entityResource#getChildren
@@ -302,20 +345,25 @@ function entityResource($q, $http, umbRequestHelper) {
          *
          * @description
          * Gets children entities for a given item
-         *        
+         *
          * @param {Int} parentid id of content item to return children of
-         * @param {string} type Object type name        
+         * @param {string} type Object type name
          * @returns {Promise} resourcePromise object containing the entity.
          *
          */
-        getChildren: function (id, type) {
+        getChildren: function (id, type, options) {
+
+            var args = [{ id: id }, { type: type }];
+            if (options && options.dataTypeId) {
+                args.push({ dataTypeId: options.dataTypeId });
+            }
 
             return umbRequestHelper.resourcePromise(
                $http.get(
                    umbRequestHelper.getApiUrl(
                        "entityApiBaseUrl",
                        "GetChildren",
-                       [{ id: id }, { type: type }])),
+                       args)),
                'Failed to retrieve child data for id ' + id);
         },
 
@@ -331,11 +379,11 @@ function entityResource($q, $http, umbRequestHelper) {
           * <pre>
           * entityResource.getPagedChildren(1234, "Content", {pageSize: 10, pageNumber: 2})
           *    .then(function(contentArray) {
-          *        var children = contentArray; 
+          *        var children = contentArray;
           *        alert('they are here!');
           *    });
-          * </pre> 
-          * 
+          * </pre>
+          *
           * @param {Int} parentid id of content item to return children of
           * @param {string} type Object type name
           * @param {Object} options optional options object
@@ -383,7 +431,8 @@ function entityResource($q, $http, umbRequestHelper) {
                             pageSize: options.pageSize,
                             orderBy: options.orderBy,
                             orderDirection: options.orderDirection,
-                            filter: encodeURIComponent(options.filter)
+                            filter: encodeURIComponent(options.filter),
+                            dataTypeId: options.dataTypeId
                         }
                     )),
                 'Failed to retrieve child data for id ' + parentId);
@@ -401,11 +450,11 @@ function entityResource($q, $http, umbRequestHelper) {
           * <pre>
           * entityResource.getPagedDescendants(1234, "Document", {pageSize: 10, pageNumber: 2})
           *    .then(function(contentArray) {
-          *        var children = contentArray; 
+          *        var children = contentArray;
           *        alert('they are here!');
           *    });
-          * </pre> 
-          * 
+          * </pre>
+          *
           * @param {Int} parentid id of content item to return descendants of
           * @param {string} type Object type name
           * @param {Object} options optional options object
@@ -424,7 +473,8 @@ function entityResource($q, $http, umbRequestHelper) {
                 pageNumber: 1,
                 filter: '',
                 orderDirection: "Ascending",
-                orderBy: "SortOrder"
+                orderBy: "SortOrder",
+                dataTypeId: null
             };
             if (options === undefined) {
                 options = {};
@@ -453,12 +503,14 @@ function entityResource($q, $http, umbRequestHelper) {
                             pageSize: options.pageSize,
                             orderBy: options.orderBy,
                             orderDirection: options.orderDirection,
-                            filter: encodeURIComponent(options.filter)
+                            filter: encodeURIComponent(options.filter),
+                            dataTypeId: options.dataTypeId
                         }
                     )),
                 'Failed to retrieve child data for id ' + parentId);
         },
-     
+
+
         /**
          * @ngdoc method
          * @name umbraco.resources.entityResource#search
@@ -471,23 +523,27 @@ function entityResource($q, $http, umbRequestHelper) {
          * <pre>
          * entityResource.search("news", "Media")
          *    .then(function(mediaArray) {
-         *        var myDoc = mediaArray; 
+         *        var myDoc = mediaArray;
          *        alert('they are here!');
          *    });
-         * </pre> 
-         * 
-         * @param {String} Query search query 
-         * @param {String} Type type of conten to search        
+         * </pre>
+         *
+         * @param {String} Query search query
+         * @param {String} Type type of conten to search
          * @returns {Promise} resourcePromise object containing the entity array.
          *
          */
-        search: function (query, type, searchFrom, canceler) {
+        search: function (query, type, searchFrom, canceler, dataTypeId) {
 
             var args = [{ query: query }, { type: type }];
             if (searchFrom) {
                 args.push({ searchFrom: searchFrom });
             }
 
+            if (dataTypeId) {
+                args.push({ dataTypeId: dataTypeId });
+            }
+
             var httpConfig = {};
             if (canceler) {
                 httpConfig["timeout"] = canceler;
@@ -502,7 +558,7 @@ function entityResource($q, $http, umbRequestHelper) {
                     httpConfig),
                 'Failed to retrieve entity data for query ' + query);
         },
-        
+
 
         /**
          * @ngdoc method
@@ -516,12 +572,12 @@ function entityResource($q, $http, umbRequestHelper) {
          * <pre>
          * entityResource.searchAll("bob")
          *    .then(function(array) {
-         *        var myDoc = array; 
+         *        var myDoc = array;
          *        alert('they are here!');
          *    });
-         * </pre> 
-         * 
-         * @param {String} Query search query 
+         * </pre>
+         *
+         * @param {String} Query search query
          * @returns {Promise} resourcePromise object containing the entity array.
          *
          */
@@ -541,7 +597,9 @@ function entityResource($q, $http, umbRequestHelper) {
                     httpConfig),
                 'Failed to retrieve entity data for query ' + query);
         }
-            
+
+
+
     };
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
index 1d6d5171a1..ca7700c188 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
@@ -1,16 +1,16 @@
 /**
-    * @ngdoc service
-    * @name umbraco.resources.mediaResource
-    * @description Loads in data for media
-    **/
+ * @ngdoc service
+ * @name umbraco.resources.mediaResource
+ * @description Loads in data for media
+ **/
 function mediaResource($q, $http, umbDataFormatter, umbRequestHelper) {
 
     /** internal method process the saving of data and post processing the result */
     function saveMediaItem(content, action, files) {
         return umbRequestHelper.postSaveContent({
             restApiUrl: umbRequestHelper.getApiUrl(
-                   "mediaApiBaseUrl",
-                   "PostSave"),
+                "mediaApiBaseUrl",
+                "PostSave"),
             content: content,
             action: action,
             files: files,
@@ -24,35 +24,35 @@ function mediaResource($q, $http, umbDataFormatter, umbRequestHelper) {
 
         getRecycleBin: function () {
             return umbRequestHelper.resourcePromise(
-                  $http.get(
-                        umbRequestHelper.getApiUrl(
-                              "mediaApiBaseUrl",
-                              "GetRecycleBin")),
-                  'Failed to retrieve data for media recycle bin');
+                $http.get(
+                    umbRequestHelper.getApiUrl(
+                        "mediaApiBaseUrl",
+                        "GetRecycleBin")),
+                'Failed to retrieve data for media recycle bin');
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.mediaResource#sort
-          * @methodOf umbraco.resources.mediaResource
-          *
-          * @description
-          * Sorts all children below a given parent node id, based on a collection of node-ids
-          *
-          * ##usage
-          * <pre>
-          * var ids = [123,34533,2334,23434];
-          * mediaResource.sort({ sortedIds: ids })
-          *    .then(function() {
-          *        $scope.complete = true;
-          *    });
-          * </pre>
-          * @param {Object} args arguments object
-          * @param {Int} args.parentId the ID of the parent node
-          * @param {Array} options.sortedIds array of node IDs as they should be sorted
-          * @returns {Promise} resourcePromise object.
-          *
-          */
+         * @ngdoc method
+         * @name umbraco.resources.mediaResource#sort
+         * @methodOf umbraco.resources.mediaResource
+         *
+         * @description
+         * Sorts all children below a given parent node id, based on a collection of node-ids
+         *
+         * ##usage
+         * <pre>
+         * var ids = [123,34533,2334,23434];
+         * mediaResource.sort({ sortedIds: ids })
+         *    .then(function() {
+         *        $scope.complete = true;
+         *    });
+         * </pre>
+         * @param {Object} args arguments object
+         * @param {Int} args.parentId the ID of the parent node
+         * @param {Array} options.sortedIds array of node IDs as they should be sorted
+         * @returns {Promise} resourcePromise object.
+         *
+         */
         sort: function (args) {
             if (!args) {
                 throw "args cannot be null";
@@ -65,37 +65,37 @@ function mediaResource($q, $http, umbDataFormatter, umbRequestHelper) {
             }
 
             return umbRequestHelper.resourcePromise(
-                   $http.post(umbRequestHelper.getApiUrl("mediaApiBaseUrl", "PostSort"),
-                         {
-                             parentId: args.parentId,
-                             idSortOrder: args.sortedIds
-                         }),
-                   'Failed to sort media');
+                $http.post(umbRequestHelper.getApiUrl("mediaApiBaseUrl", "PostSort"),
+                    {
+                        parentId: args.parentId,
+                        idSortOrder: args.sortedIds
+                    }),
+                'Failed to sort media');
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.mediaResource#move
-          * @methodOf umbraco.resources.mediaResource
-          *
-          * @description
-          * Moves a node underneath a new parentId
-          *
-          * ##usage
-          * <pre>
-          * mediaResource.move({ parentId: 1244, id: 123 })
-          *    .then(function() {
-          *        alert("node was moved");
-          *    }, function(err){
-          *      alert("node didnt move:" + err.data.Message);
-          *    });
-          * </pre>
-          * @param {Object} args arguments object
-          * @param {Int} args.idd the ID of the node to move
-          * @param {Int} args.parentId the ID of the parent node to move to
-          * @returns {Promise} resourcePromise object.
-          *
-          */
+         * @ngdoc method
+         * @name umbraco.resources.mediaResource#move
+         * @methodOf umbraco.resources.mediaResource
+         *
+         * @description
+         * Moves a node underneath a new parentId
+         *
+         * ##usage
+         * <pre>
+         * mediaResource.move({ parentId: 1244, id: 123 })
+         *    .then(function() {
+         *        alert("node was moved");
+         *    }, function(err){
+         *      alert("node didnt move:" + err.data.Message);
+         *    });
+         * </pre>
+         * @param {Object} args arguments object
+         * @param {Int} args.idd the ID of the node to move
+         * @param {Int} args.parentId the ID of the parent node to move to
+         * @returns {Promise} resourcePromise object.
+         *
+         */
         move: function (args) {
             if (!args) {
                 throw "args cannot be null";
@@ -108,121 +108,121 @@ function mediaResource($q, $http, umbDataFormatter, umbRequestHelper) {
             }
 
             return umbRequestHelper.resourcePromise(
-                   $http.post(umbRequestHelper.getApiUrl("mediaApiBaseUrl", "PostMove"),
-                        {
-                            parentId: args.parentId,
-                            id: args.id
+                $http.post(umbRequestHelper.getApiUrl("mediaApiBaseUrl", "PostMove"),
+                    {
+                        parentId: args.parentId,
+                        id: args.id
                          }, {responseType: 'text'}),
-                        {
-                        error: function(data){
-                            var errorMsg = 'Failed to move media';
-                            if (data.id !== undefined && data.parentId !== undefined) {
-                                if (data.id === data.parentId) {
-                                    errorMsg = 'Media can\'t be moved into itself';
-                                }
-                            }
-                            else if (data.notifications !== undefined) {
-                                if (data.notifications.length > 0) {
-                                    if (data.notifications[0].header.length > 0) {
-                                        errorMsg = data.notifications[0].header;
-                                    }
-                                    if (data.notifications[0].message.length > 0) {
-                                        errorMsg = errorMsg + ": " + data.notifications[0].message;
-                                    }
+                {
+                    error: function(data){
+                        var errorMsg = 'Failed to move media';
+                        if (data.id !== undefined && data.parentId !== undefined) {
+                            if (data.id === data.parentId) {
+                                errorMsg = 'Media can\'t be moved into itself';
+                            }
+                        }
+                        else if (data.notifications !== undefined) {
+                            if (data.notifications.length > 0) {
+                                if (data.notifications[0].header.length > 0) {
+                                    errorMsg = data.notifications[0].header;
+                                }
+                                if (data.notifications[0].message.length > 0) {
+                                    errorMsg = errorMsg + ": " + data.notifications[0].message;
                                 }
                             }
+                        }
 
-                            return {
-                                errorMsg: errorMsg
-                            };
-                       }
-                   });
+                        return {
+                            errorMsg: errorMsg
+                        };
+                    }
+                });
         },
 
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.mediaResource#getById
-          * @methodOf umbraco.resources.mediaResource
-          *
-          * @description
-          * Gets a media item with a given id
-          *
-          * ##usage
-          * <pre>
-          * mediaResource.getById(1234)
-          *    .then(function(media) {
-          *        var myMedia = media;
-          *        alert('its here!');
-          *    });
-          * </pre>
-          *
-          * @param {Int} id id of media item to return
-          * @returns {Promise} resourcePromise object containing the media item.
-          *
-          */
+         * @ngdoc method
+         * @name umbraco.resources.mediaResource#getById
+         * @methodOf umbraco.resources.mediaResource
+         *
+         * @description
+         * Gets a media item with a given id
+         *
+         * ##usage
+         * <pre>
+         * mediaResource.getById(1234)
+         *    .then(function(media) {
+         *        var myMedia = media;
+         *        alert('its here!');
+         *    });
+         * </pre>
+         *
+         * @param {Int} id id of media item to return
+         * @returns {Promise} resourcePromise object containing the media item.
+         *
+         */
         getById: function (id) {
 
             return umbRequestHelper.resourcePromise(
-                  $http.get(
-                        umbRequestHelper.getApiUrl(
-                              "mediaApiBaseUrl",
-                              "GetById",
-                              [{ id: id }])),
-                  'Failed to retrieve data for media id ' + id);
+                $http.get(
+                    umbRequestHelper.getApiUrl(
+                        "mediaApiBaseUrl",
+                        "GetById",
+                        [{ id: id }])),
+                'Failed to retrieve data for media id ' + id);
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.mediaResource#deleteById
-          * @methodOf umbraco.resources.mediaResource
-          *
-          * @description
-          * Deletes a media item with a given id
-          *
-          * ##usage
-          * <pre>
-          * mediaResource.deleteById(1234)
-          *    .then(function() {
-          *        alert('its gone!');
-          *    });
-          * </pre>
-          *
-          * @param {Int} id id of media item to delete
-          * @returns {Promise} resourcePromise object.
-          *
-          */
+         * @ngdoc method
+         * @name umbraco.resources.mediaResource#deleteById
+         * @methodOf umbraco.resources.mediaResource
+         *
+         * @description
+         * Deletes a media item with a given id
+         *
+         * ##usage
+         * <pre>
+         * mediaResource.deleteById(1234)
+         *    .then(function() {
+         *        alert('its gone!');
+         *    });
+         * </pre>
+         *
+         * @param {Int} id id of media item to delete
+         * @returns {Promise} resourcePromise object.
+         *
+         */
         deleteById: function (id) {
             return umbRequestHelper.resourcePromise(
-                   $http.post(
-                         umbRequestHelper.getApiUrl(
-                               "mediaApiBaseUrl",
-                               "DeleteById",
-                               [{ id: id }])),
-                   'Failed to delete item ' + id);
+                $http.post(
+                    umbRequestHelper.getApiUrl(
+                        "mediaApiBaseUrl",
+                        "DeleteById",
+                        [{ id: id }])),
+                'Failed to delete item ' + id);
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.mediaResource#getByIds
-          * @methodOf umbraco.resources.mediaResource
-          *
-          * @description
-          * Gets an array of media items, given a collection of ids
-          *
-          * ##usage
-          * <pre>
-          * mediaResource.getByIds( [1234,2526,28262])
-          *    .then(function(mediaArray) {
-          *        var myDoc = contentArray;
-          *        alert('they are here!');
-          *    });
-          * </pre>
-          *
-          * @param {Array} ids ids of media items to return as an array
-          * @returns {Promise} resourcePromise object containing the media items array.
-          *
-          */
+         * @ngdoc method
+         * @name umbraco.resources.mediaResource#getByIds
+         * @methodOf umbraco.resources.mediaResource
+         *
+         * @description
+         * Gets an array of media items, given a collection of ids
+         *
+         * ##usage
+         * <pre>
+         * mediaResource.getByIds( [1234,2526,28262])
+         *    .then(function(mediaArray) {
+         *        var myDoc = contentArray;
+         *        alert('they are here!');
+         *    });
+         * </pre>
+         *
+         * @param {Array} ids ids of media items to return as an array
+         * @returns {Promise} resourcePromise object containing the media items array.
+         *
+         */
         getByIds: function (ids) {
 
             var idQuery = "";
@@ -231,96 +231,96 @@ function mediaResource($q, $http, umbDataFormatter, umbRequestHelper) {
             });
 
             return umbRequestHelper.resourcePromise(
-                  $http.get(
-                        umbRequestHelper.getApiUrl(
-                              "mediaApiBaseUrl",
-                              "GetByIds",
-                              idQuery)),
-                  'Failed to retrieve data for media ids ' + ids);
+                $http.get(
+                    umbRequestHelper.getApiUrl(
+                        "mediaApiBaseUrl",
+                        "GetByIds",
+                        idQuery)),
+                'Failed to retrieve data for media ids ' + ids);
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.mediaResource#getScaffold
-          * @methodOf umbraco.resources.mediaResource
-          *
-          * @description
-          * Returns a scaffold of an empty media item, given the id of the media item to place it underneath and the media type alias.
-          *
-          * - Parent Id must be provided so umbraco knows where to store the media
-          * - Media Type alias must be provided so umbraco knows which properties to put on the media scaffold
-          *
-          * The scaffold is used to build editors for media that has not yet been populated with data.
-          *
-          * ##usage
-          * <pre>
-          * mediaResource.getScaffold(1234, 'folder')
-          *    .then(function(scaffold) {
-          *        var myDoc = scaffold;
-          *        myDoc.name = "My new media item";
-          *
-          *        mediaResource.save(myDoc, true)
-          *            .then(function(media){
-          *                alert("Retrieved, updated and saved again");
-          *            });
-          *    });
-          * </pre>
-          *
-          * @param {Int} parentId id of media item to return
-          * @param {String} alias mediatype alias to base the scaffold on
-          * @returns {Promise} resourcePromise object containing the media scaffold.
-          *
-          */
+         * @ngdoc method
+         * @name umbraco.resources.mediaResource#getScaffold
+         * @methodOf umbraco.resources.mediaResource
+         *
+         * @description
+         * Returns a scaffold of an empty media item, given the id of the media item to place it underneath and the media type alias.
+         *
+         * - Parent Id must be provided so umbraco knows where to store the media
+         * - Media Type alias must be provided so umbraco knows which properties to put on the media scaffold
+         *
+         * The scaffold is used to build editors for media that has not yet been populated with data.
+         *
+         * ##usage
+         * <pre>
+         * mediaResource.getScaffold(1234, 'folder')
+         *    .then(function(scaffold) {
+         *        var myDoc = scaffold;
+         *        myDoc.name = "My new media item";
+         *
+         *        mediaResource.save(myDoc, true)
+         *            .then(function(media){
+         *                alert("Retrieved, updated and saved again");
+         *            });
+         *    });
+         * </pre>
+         *
+         * @param {Int} parentId id of media item to return
+         * @param {String} alias mediatype alias to base the scaffold on
+         * @returns {Promise} resourcePromise object containing the media scaffold.
+         *
+         */
         getScaffold: function (parentId, alias) {
 
             return umbRequestHelper.resourcePromise(
-                  $http.get(
-                        umbRequestHelper.getApiUrl(
-                              "mediaApiBaseUrl",
-                              "GetEmpty",
-                              [{ contentTypeAlias: alias }, { parentId: parentId }])),
-                  'Failed to retrieve data for empty media item type ' + alias);
+                $http.get(
+                    umbRequestHelper.getApiUrl(
+                        "mediaApiBaseUrl",
+                        "GetEmpty",
+                        [{ contentTypeAlias: alias }, { parentId: parentId }])),
+                'Failed to retrieve data for empty media item type ' + alias);
 
         },
 
         rootMedia: function () {
 
             return umbRequestHelper.resourcePromise(
-                  $http.get(
-                        umbRequestHelper.getApiUrl(
-                              "mediaApiBaseUrl",
-                              "GetRootMedia")),
-                  'Failed to retrieve data for root media');
+                $http.get(
+                    umbRequestHelper.getApiUrl(
+                        "mediaApiBaseUrl",
+                        "GetRootMedia")),
+                'Failed to retrieve data for root media');
 
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.mediaResource#getChildren
-          * @methodOf umbraco.resources.mediaResource
-          *
-          * @description
-          * Gets children of a media item with a given id
-          *
-          * ##usage
-          * <pre>
-          * mediaResource.getChildren(1234, {pageSize: 10, pageNumber: 2})
-          *    .then(function(contentArray) {
-          *        var children = contentArray;
-          *        alert('they are here!');
-          *    });
-          * </pre>
-          *
-          * @param {Int} parentid id of content item to return children of
-          * @param {Object} options optional options object
-          * @param {Int} options.pageSize if paging data, number of nodes per page, default = 0
-          * @param {Int} options.pageNumber if paging data, current page index, default = 0
-          * @param {String} options.filter if provided, query will only return those with names matching the filter
-          * @param {String} options.orderDirection can be `Ascending` or `Descending` - Default: `Ascending`
-          * @param {String} options.orderBy property to order items by, default: `SortOrder`
-          * @returns {Promise} resourcePromise object containing an array of content items.
-          *
-          */
+         * @ngdoc method
+         * @name umbraco.resources.mediaResource#getChildren
+         * @methodOf umbraco.resources.mediaResource
+         *
+         * @description
+         * Gets children of a media item with a given id
+         *
+         * ##usage
+         * <pre>
+         * mediaResource.getChildren(1234, {pageSize: 10, pageNumber: 2})
+         *    .then(function(contentArray) {
+         *        var children = contentArray;
+         *        alert('they are here!');
+         *    });
+         * </pre>
+         *
+         * @param {Int} parentid id of content item to return children of
+         * @param {Object} options optional options object
+         * @param {Int} options.pageSize if paging data, number of nodes per page, default = 0
+         * @param {Int} options.pageNumber if paging data, current page index, default = 0
+         * @param {String} options.filter if provided, query will only return those with names matching the filter
+         * @param {String} options.orderDirection can be `Ascending` or `Descending` - Default: `Ascending`
+         * @param {String} options.orderBy property to order items by, default: `SortOrder`
+         * @returns {Promise} resourcePromise object containing an array of content items.
+         *
+         */
         getChildren: function (parentId, options) {
 
             var defaults = {
@@ -361,111 +361,111 @@ function mediaResource($q, $http, umbDataFormatter, umbRequestHelper) {
             }
 
             return umbRequestHelper.resourcePromise(
-                  $http.get(
-                        umbRequestHelper.getApiUrl(
-                              "mediaApiBaseUrl",
-                              "GetChildren",
-                              [
-                                    { id: parentId },
-                                    { pageNumber: options.pageNumber },
-                                    { pageSize: options.pageSize },
-                                    { orderBy: options.orderBy },
-                                    { orderDirection: options.orderDirection },
-                                    { orderBySystemField: toBool(options.orderBySystemField) },
-                                    { filter: options.filter }
-                              ])),
-                  'Failed to retrieve children for media item ' + parentId);
+                $http.get(
+                    umbRequestHelper.getApiUrl(
+                        "mediaApiBaseUrl",
+                        "GetChildren",
+                        [
+                            { id: parentId },
+                            { pageNumber: options.pageNumber },
+                            { pageSize: options.pageSize },
+                            { orderBy: options.orderBy },
+                            { orderDirection: options.orderDirection },
+                            { orderBySystemField: toBool(options.orderBySystemField) },
+                            { filter: options.filter }
+                        ])),
+                'Failed to retrieve children for media item ' + parentId);
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.mediaResource#save
-          * @methodOf umbraco.resources.mediaResource
-          *
-          * @description
-          * Saves changes made to a media item, if the media item is new, the isNew paramater must be passed to force creation
-          * if the media item needs to have files attached, they must be provided as the files param and passed separately
-          *
-          *
-          * ##usage
-          * <pre>
-          * mediaResource.getById(1234)
-          *    .then(function(media) {
-          *          media.name = "I want a new name!";
-          *          mediaResource.save(media, false)
-          *            .then(function(media){
-          *                alert("Retrieved, updated and saved again");
-          *            });
-          *    });
-          * </pre>
-          *
-          * @param {Object} media The media item object with changes applied
-          * @param {Bool} isNew set to true to create a new item or to update an existing
-          * @param {Array} files collection of files for the media item
-          * @returns {Promise} resourcePromise object containing the saved media item.
-          *
-          */
+         * @ngdoc method
+         * @name umbraco.resources.mediaResource#save
+         * @methodOf umbraco.resources.mediaResource
+         *
+         * @description
+         * Saves changes made to a media item, if the media item is new, the isNew paramater must be passed to force creation
+         * if the media item needs to have files attached, they must be provided as the files param and passed separately
+         *
+         *
+         * ##usage
+         * <pre>
+         * mediaResource.getById(1234)
+         *    .then(function(media) {
+         *          media.name = "I want a new name!";
+         *          mediaResource.save(media, false)
+         *            .then(function(media){
+         *                alert("Retrieved, updated and saved again");
+         *            });
+         *    });
+         * </pre>
+         *
+         * @param {Object} media The media item object with changes applied
+         * @param {Bool} isNew set to true to create a new item or to update an existing
+         * @param {Array} files collection of files for the media item
+         * @returns {Promise} resourcePromise object containing the saved media item.
+         *
+         */
         save: function (media, isNew, files) {
             return saveMediaItem(media, "save" + (isNew ? "New" : ""), files);
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.mediaResource#addFolder
-          * @methodOf umbraco.resources.mediaResource
-          *
-          * @description
-          * Shorthand for adding a media item of the type "Folder" under a given parent ID
-          *
-          * ##usage
-          * <pre>
-          * mediaResource.addFolder("My gallery", 1234)
-          *    .then(function(folder) {
-          *        alert('New folder');
-          *    });
-          * </pre>
-          *
-          * @param {string} name Name of the folder to create
-          * @param {int} parentId Id of the media item to create the folder underneath
-          * @returns {Promise} resourcePromise object.
-          *
-          */
+         * @ngdoc method
+         * @name umbraco.resources.mediaResource#addFolder
+         * @methodOf umbraco.resources.mediaResource
+         *
+         * @description
+         * Shorthand for adding a media item of the type "Folder" under a given parent ID
+         *
+         * ##usage
+         * <pre>
+         * mediaResource.addFolder("My gallery", 1234)
+         *    .then(function(folder) {
+         *        alert('New folder');
+         *    });
+         * </pre>
+         *
+         * @param {string} name Name of the folder to create
+         * @param {int} parentId Id of the media item to create the folder underneath
+         * @returns {Promise} resourcePromise object.
+         *
+         */
         addFolder: function (name, parentId) {
             return umbRequestHelper.resourcePromise(
-                   $http.post(umbRequestHelper
-                         .getApiUrl("mediaApiBaseUrl", "PostAddFolder"),
-                         {
-                             name: name,
-                             parentId: parentId
-                         }),
-                   'Failed to add folder');
+                $http.post(umbRequestHelper
+                        .getApiUrl("mediaApiBaseUrl", "PostAddFolder"),
+                    {
+                        name: name,
+                        parentId: parentId
+                    }),
+                'Failed to add folder');
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.mediaResource#getChildFolders
-          * @methodOf umbraco.resources.mediaResource
-          *
-          * @description
-          * Retrieves all media children with types used as folders.
-          * Uses the convention of looking for media items with mediaTypes ending in
-          * *Folder so will match "Folder", "bannerFolder", "secureFolder" etc,
-          *
+         * @ngdoc method
+         * @name umbraco.resources.mediaResource#getChildFolders
+         * @methodOf umbraco.resources.mediaResource
+         *
+         * @description
+         * Retrieves all media children with types used as folders.
+         * Uses the convention of looking for media items with mediaTypes ending in
+         * *Folder so will match "Folder", "bannerFolder", "secureFolder" etc,
+         *
           * NOTE: This will return a page of max 500 folders, if more is required it needs to be paged
           *       and then folders are in the .items property of the returned promise data
-          *
-          * ##usage
-          * <pre>
-          * mediaResource.getChildFolders(1234)
+         *
+         * ##usage
+         * <pre>
+         * mediaResource.getChildFolders(1234)
           *    .then(function(page) {
-          *        alert('folders');
-          *    });
-          * </pre>
-          *
-          * @param {int} parentId Id of the media item to query for child folders
-          * @returns {Promise} resourcePromise object.
-          *
-          */
+         *        alert('folders');
+         *    });
+         * </pre>
+         *
+         * @param {int} parentId Id of the media item to query for child folders
+         * @returns {Promise} resourcePromise object.
+         *
+         */
         getChildFolders: function (parentId) {
             if (!parentId) {
                 parentId = -1;
@@ -473,69 +473,69 @@ function mediaResource($q, $http, umbDataFormatter, umbRequestHelper) {
 
             //NOTE: This will return a max of 500 folders, if more is required it needs to be paged
             return umbRequestHelper.resourcePromise(
-                  $http.get(
-                        umbRequestHelper.getApiUrl(
-                              "mediaApiBaseUrl",
-                              "GetChildFolders",
-                            {
+                $http.get(
+                    umbRequestHelper.getApiUrl(
+                        "mediaApiBaseUrl",
+                        "GetChildFolders",
+                        {
                                 id: parentId,
                                 pageNumber: 1,
                                 pageSize: 500
-                            })),
+                        })),
                         'Failed to retrieve child folders for media item ' + parentId);
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.mediaResource#emptyRecycleBin
-          * @methodOf umbraco.resources.mediaResource
-          *
-          * @description
-          * Empties the media recycle bin
-          *
-          * ##usage
-          * <pre>
-          * mediaResource.emptyRecycleBin()
-          *    .then(function() {
-          *        alert('its empty!');
-          *    });
-          * </pre>
-          *
-          * @returns {Promise} resourcePromise object.
-          *
-          */
+         * @ngdoc method
+         * @name umbraco.resources.mediaResource#emptyRecycleBin
+         * @methodOf umbraco.resources.mediaResource
+         *
+         * @description
+         * Empties the media recycle bin
+         *
+         * ##usage
+         * <pre>
+         * mediaResource.emptyRecycleBin()
+         *    .then(function() {
+         *        alert('its empty!');
+         *    });
+         * </pre>
+         *
+         * @returns {Promise} resourcePromise object.
+         *
+         */
         emptyRecycleBin: function () {
             return umbRequestHelper.resourcePromise(
-                   $http.post(
-                         umbRequestHelper.getApiUrl(
-                               "mediaApiBaseUrl",
-                               "EmptyRecycleBin")),
-                   'Failed to empty the recycle bin');
+                $http.post(
+                    umbRequestHelper.getApiUrl(
+                        "mediaApiBaseUrl",
+                        "EmptyRecycleBin")),
+                'Failed to empty the recycle bin');
         },
 
         /**
-          * @ngdoc method
-          * @name umbraco.resources.mediaResource#search
-          * @methodOf umbraco.resources.mediaResource
-          *
-          * @description
-          * Paginated search for media items starting on the supplied nodeId
-          *
-          * ##usage
-          * <pre>
-          * mediaResource.search("my search", 1, 100, -1)
-          *    .then(function(searchResult) {
-          *        alert('it's here!');
-          *    });
-          * </pre>
-          *
-          * @param {string} query The search query
-          * @param {int} pageNumber The page number
-          * @param {int} pageSize The number of media items on a page
-          * @param {int} searchFrom NodeId to search from (-1 for root)
-          * @returns {Promise} resourcePromise object.
-          *
-          */
+         * @ngdoc method
+         * @name umbraco.resources.mediaResource#search
+         * @methodOf umbraco.resources.mediaResource
+         *
+         * @description
+         * Paginated search for media items starting on the supplied nodeId
+         *
+         * ##usage
+         * <pre>
+         * mediaResource.search("my search", 1, 100, -1)
+         *    .then(function(searchResult) {
+         *        alert('it's here!');
+         *    });
+         * </pre>
+         *
+         * @param {string} query The search query
+         * @param {int} pageNumber The page number
+         * @param {int} pageSize The number of media items on a page
+         * @param {int} searchFrom NodeId to search from (-1 for root)
+         * @returns {Promise} resourcePromise object.
+         *
+         */
         search: function (query, pageNumber, pageSize, searchFrom) {
 
             var args = [
@@ -546,12 +546,12 @@ function mediaResource($q, $http, umbDataFormatter, umbRequestHelper) {
             ];
 
             return umbRequestHelper.resourcePromise(
-                  $http.get(
-                        umbRequestHelper.getApiUrl(
-                              "mediaApiBaseUrl",
-                              "Search",
-                              args)),
-                  'Failed to retrieve media items for search: ' + query);
+                $http.get(
+                    umbRequestHelper.getApiUrl(
+                        "mediaApiBaseUrl",
+                        "Search",
+                        args)),
+                'Failed to retrieve media items for search: ' + query);
         }
 
     };
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
index d85a59d836..9350af1c47 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
@@ -3,7 +3,7 @@
 * @name umbraco.services.mediaHelper
 * @description A helper object used for dealing with media items
 **/
-function mediaHelper(umbRequestHelper) {
+function mediaHelper(umbRequestHelper, $log) {
 
     //container of fileresolvers
     var _mediaFileResolvers = {};
@@ -13,11 +13,11 @@ function mediaHelper(umbRequestHelper) {
          * @ngdoc function
          * @name umbraco.services.mediaHelper#getImagePropertyValue
          * @methodOf umbraco.services.mediaHelper
-         * @function    
+         * @function
          *
          * @description
          * Returns the file path associated with the media property if there is one
-         * 
+         *
          * @param {object} options Options object
          * @param {object} options.mediaModel The media object to retrieve the image path from
          * @param {object} options.imageOnly Optional, if true then will only return a path if the media item is an image
@@ -80,11 +80,11 @@ function mediaHelper(umbRequestHelper) {
          * @ngdoc function
          * @name umbraco.services.mediaHelper#getImagePropertyValue
          * @methodOf umbraco.services.mediaHelper
-         * @function    
+         * @function
          *
          * @description
          * Returns the actual image path associated with the image property if there is one
-         * 
+         *
          * @param {object} options Options object
          * @param {object} options.imageModel The media object to retrieve the image path from
          */
@@ -104,11 +104,11 @@ function mediaHelper(umbRequestHelper) {
          * @ngdoc function
          * @name umbraco.services.mediaHelper#getThumbnail
          * @methodOf umbraco.services.mediaHelper
-         * @function    
+         * @function
          *
          * @description
          * formats the display model used to display the content to the model used to save the content
-         * 
+         *
          * @param {object} options Options object
          * @param {object} options.imageModel The media object to retrieve the image path from
          */
@@ -133,18 +133,20 @@ function mediaHelper(umbRequestHelper) {
          * @ngdoc function
          * @name umbraco.services.mediaHelper#resolveFileFromEntity
          * @methodOf umbraco.services.mediaHelper
-         * @function    
+         * @function
          *
          * @description
          * Gets the media file url for a media entity returned with the entityResource
-         * 
+         *
          * @param {object} mediaEntity A media Entity returned from the entityResource
          * @param {boolean} thumbnail Whether to return the thumbnail url or normal url
          */
         resolveFileFromEntity: function (mediaEntity, thumbnail) {
 
             if (!angular.isObject(mediaEntity.metaData) || !mediaEntity.metaData.MediaPath) {
-                throw "Cannot resolve the file url from the mediaEntity, it does not contain the required metaData";
+                //don't throw since this image legitimately might not contain a media path, but output a warning
+                $log.warn("Cannot resolve the file url from the mediaEntity, it does not contain the required metaData");
+                return null;
             }
 
             if (thumbnail) {
@@ -164,11 +166,11 @@ function mediaHelper(umbRequestHelper) {
          * @ngdoc function
          * @name umbraco.services.mediaHelper#resolveFile
          * @methodOf umbraco.services.mediaHelper
-         * @function    
+         * @function
          *
          * @description
          * Gets the media file url for a media object returned with the mediaResource
-         * 
+         *
          * @param {object} mediaEntity A media Entity returned from the entityResource
          * @param {boolean} thumbnail Whether to return the thumbnail url or normal url
          */
@@ -240,11 +242,11 @@ function mediaHelper(umbRequestHelper) {
          * @ngdoc function
          * @name umbraco.services.mediaHelper#scaleToMaxSize
          * @methodOf umbraco.services.mediaHelper
-         * @function    
+         * @function
          *
          * @description
          * Finds the corrct max width and max height, given maximum dimensions and keeping aspect ratios
-         * 
+         *
          * @param {number} maxSize Maximum width & height
          * @param {number} width Current width
          * @param {number} height Current height
@@ -283,11 +285,11 @@ function mediaHelper(umbRequestHelper) {
          * @ngdoc function
          * @name umbraco.services.mediaHelper#getThumbnailFromPath
          * @methodOf umbraco.services.mediaHelper
-         * @function    
+         * @function
          *
          * @description
          * Returns the path to the thumbnail version of a given media library image path
-         * 
+         *
          * @param {string} imagePath Image path, ex: /media/1234/my-image.jpg
          */
         getThumbnailFromPath: function (imagePath) {
@@ -310,11 +312,11 @@ function mediaHelper(umbRequestHelper) {
          * @ngdoc function
          * @name umbraco.services.mediaHelper#detectIfImageByExtension
          * @methodOf umbraco.services.mediaHelper
-         * @function    
+         * @function
          *
          * @description
          * Returns true/false, indicating if the given path has an allowed image extension
-         * 
+         *
          * @param {string} imagePath Image path, ex: /media/1234/my-image.jpg
          */
         detectIfImageByExtension: function (imagePath) {
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/search.service.js b/src/Umbraco.Web.UI.Client/src/common/services/search.service.js
index 04c431767c..cdba3647a3 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/search.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/search.service.js
@@ -2,7 +2,7 @@
  * @ngdoc service
  * @name umbraco.services.searchService
  *
- *  
+ *
  * @description
  * Service for handling the main application search, can currently search content, media and members
  *
@@ -15,10 +15,10 @@
  *          angular.forEach(results, function(result){
  *                  //returns:
  *                  {name: "name", id: 1234, menuUrl: "url", editorPath: "url", metaData: {}, subtitle: "/path/etc" }
- *           })          
- *           var result = 
- *       }) 
- * </pre> 
+ *           })
+ *           var result =
+ *       })
+ * </pre>
  */
 angular.module('umbraco.services')
     .factory('searchService', function ($q, $log, entityResource, contentResource, umbRequestHelper, $injector, searchResultFormatter) {
@@ -67,7 +67,7 @@ angular.module('umbraco.services')
                     throw "args.term is required";
                 }
 
-                return entityResource.search(args.term, "Document", args.searchFrom, args.canceler).then(function (data) {
+                return entityResource.search(args.term, "Document", args.searchFrom, args.canceler, args.dataTypeId).then(function (data) {
                     _.each(data, function (item) {
                         searchResultFormatter.configureContentResult(item);
                     });
@@ -92,7 +92,7 @@ angular.module('umbraco.services')
                     throw "args.term is required";
                 }
 
-                return entityResource.search(args.term, "Media", args.searchFrom).then(function (data) {
+                return entityResource.search(args.term, "Media", args.searchFrom, args.canceler, args.dataTypeId).then(function (data) {
                     _.each(data, function (item) {
                         searchResultFormatter.configureMediaResult(item);
                     });
@@ -122,7 +122,7 @@ angular.module('umbraco.services')
                     _.each(data, function (resultByType) {
 
                         //we need to format the search result data to include things like the subtitle, urls, etc...
-                        // this is done with registered angular services as part of the SearchableTreeAttribute, if that 
+                        // this is done with registered angular services as part of the SearchableTreeAttribute, if that
                         // is not found, than we format with the default formatter
                         var formatterMethod = searchResultFormatter.configureDefaultResult;
                         //check if a custom formatter is specified...
@@ -143,7 +143,7 @@ angular.module('umbraco.services')
                         _.each(resultByType.results, function (item) {
                             formatterMethod.apply(this, [item, resultByType.treeAlias, resultByType.appAlias]);
                         });
-                        
+
                     });
 
                     return data;
@@ -157,4 +157,4 @@ angular.module('umbraco.services')
                 var currentSection = sectionAlias;
             }
         };
-    });
\ No newline at end of file
+    });
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index f72c447627..01eef916b1 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -895,38 +895,6 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
 
         },
 
-		/**
-		 * @ngdoc method
-		 * @name umbraco.services.tinyMceService#getAnchorNames
-		 * @methodOf umbraco.services.tinyMceService
-		 *
-		 * @description
-		 * From the given string, generates a string array where each item is the id attribute value from a named anchor
-		 * 'some string <a id="anchor"></a>with a named anchor' returns ['anchor']
-		 *
-		 * @param {string} input the string to parse
-		 */
-        getAnchorNames: function (input) {
-        var anchors = [];
-        if (!input) {
-            return anchors;
-        }
-
-            var anchorPattern = /<a id=\\"(.*?)\\">/gi;
-            var matches = input.match(anchorPattern);
-
-
-            if (matches) {
-                anchors = matches.map(function (v) {
-                    return v.substring(v.indexOf('"') + 1, v.lastIndexOf('\\'));
-                });
-            }
-
-	    return anchors.filter(function(val, i, self) {
-              return self.indexOf(val) === i;
-            });
-        },
-
         insertLinkInEditor: function (editor, target, anchorElm) {
 
             var href = target.url;
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
index 3a0deb812e..23d9cef9a1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
@@ -1,7 +1,7 @@
 //used for the media picker dialog
 angular.module("umbraco")
     .controller("Umbraco.Editors.MediaPickerController",
-        function($scope, mediaResource, entityResource, mediaHelper, mediaTypeHelper, eventsService, treeService, localStorageService, localizationService, editorService) {
+        function($scope, mediaResource, entityResource, userService, mediaHelper, mediaTypeHelper, eventsService, treeService, localStorageService, localizationService, editorService) {
 
             if (!$scope.model.title) {
                 localizationService.localizeMany(["defaultdialogs_selectMedia", "general_includeFromsubFolders"])
@@ -25,6 +25,8 @@ angular.module("umbraco")
             $scope.lockedFolder = true;
             $scope.allowMediaEdit = dialogOptions.allowMediaEdit ? dialogOptions.allowMediaEdit : false;
 
+            var userStartNodes = [];
+
             var umbracoSettings = Umbraco.Sys.ServerVariables.umbracoSettings;
             var allowedUploadFiles = mediaHelper.formatFileTypes(umbracoSettings.allowedUploadFiles);
             if ($scope.onlyImages) {
@@ -54,7 +56,8 @@ angular.module("umbraco")
                 pageSize: 100,
                 totalItems: 0,
                 totalPages: 0,
-                filter: ''
+                filter: '',
+                dataTypeId: $scope.model.dataTypeId
             };
 
             //preload selected item
@@ -64,15 +67,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() {
@@ -89,7 +96,7 @@ angular.module("umbraco")
                     //media object so we need to look it up
                     var id = $scope.target.udi ? $scope.target.udi : $scope.target.id;
                     var altText = $scope.target.altText;
-                    mediaResource.getById(id)
+                        entityResource.getById(id, "Media")
                         .then(function (node) {
                             $scope.target = node;
                             if (ensureWithinStartNode(node)) {
@@ -153,7 +160,7 @@ angular.module("umbraco")
                 }
 
                 if (folder.id > 0) {
-                    entityResource.getAncestors(folder.id, "media")
+                    entityResource.getAncestors(folder.id, "media", { dataTypeId: $scope.model.dataTypeId })
                         .then(function(anc) {
                             $scope.path = _.filter(anc,
                                 function(f) {
@@ -169,7 +176,7 @@ angular.module("umbraco")
                     $scope.path = [];
                 }
 
-                $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);
@@ -265,6 +272,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" });
             }
@@ -299,7 +317,8 @@ angular.module("umbraco")
                                 pageSize: 100,
                                 totalItems: 0,
                                 totalPages: 0,
-                                filter: ''
+                                filter: '',
+                                dataTypeId: $scope.model.dataTypeId
                             };
                             getChildren($scope.currentFolder.id);
                         }
@@ -369,10 +388,17 @@ angular.module("umbraco")
 
             function getChildren(id) {
                 $scope.loading = true;
-                return mediaResource.getChildren(id)
+                return entityResource.getChildren(id, "Media", $scope.searchOptions)
                     .then(function(data) {
+
+                        for (i=0;i<data.length;i++){
+                            if(data[i].metaData.MediaPath !== null){
+                                data[i].thumbnail = mediaHelper.resolveFileFromEntity(data[i], true);
+                                data[i].image = mediaHelper.resolveFileFromEntity(data[i], false);
+                            }
+                        }
                         $scope.searchOptions.filter = "";
-                        $scope.images = data.items ? data.items : [];
+                        $scope.images = data ? data : [];
                         // set already selected images to selected
                         preSelectImages();
                         $scope.loading = false;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
index 9d810fb433..8fbed8cb9c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
@@ -80,6 +80,7 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
         showOpenButton: false,
         showEditButton: false,
         showPathOnHover: false,
+        dataTypeId: null,
         maxNumber: 1,
         minNumber: 0,
         startNode: {
@@ -150,7 +151,7 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
         idType: "udi"
     };
 
-    //since most of the pre-value config's are used in the dialog options (i.e. maxNumber, minNumber, etc...) we'll merge the 
+    //since most of the pre-value config's are used in the dialog options (i.e. maxNumber, minNumber, etc...) we'll merge the
     // pre-value config on to the dialog options
     angular.extend(dialogOptions, $scope.model.config);
 
@@ -181,7 +182,7 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
             if (!currFilter) {
                 return false;
             }
-            //now we need to filter based on what is stored in the pre-vals, this logic duplicates what is in the treepicker.controller, 
+            //now we need to filter based on what is stored in the pre-vals, this logic duplicates what is in the treepicker.controller,
             // but not much we can do about that since members require special filtering.
             var filterItem = currFilter.toLowerCase().split(',');
             var found = filterItem.indexOf(i.metaData.contentType.toLowerCase()) >= 0;
@@ -210,6 +211,7 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
     //dialog
     $scope.openCurrentPicker = function () {
         $scope.currentPicker = dialogOptions;
+      $scope.contentPickerOverlay.dataTypeId = $scope.model.dataTypeId;
 
         $scope.currentPicker.submit = function (model) {
             if (angular.isArray(model.selection)) {
@@ -401,7 +403,7 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
         // get url for content and media items
         if (entityType !== "Member") {
             entityResource.getUrl(entity.id, entityType).then(function (data) {
-                // update url                
+                // update url
                 angular.forEach($scope.renderModel, function (item) {
                     if (item.id === entity.id) {
                         if (entity.trashed) {
@@ -447,7 +449,7 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
             "url": item.url,
             "trashed": item.trashed,
             "published": (item.metaData && item.metaData.IsPublished === false && entityType === "Document") ? false : true
-            // only content supports published/unpublished content so we set everything else to published so the UI looks correct 
+            // only content supports published/unpublished content so we set everything else to published so the UI looks correct
         });
 
         setEntityUrl(item);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
index eb1032a9c7..2d8e15ea57 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
@@ -7,15 +7,22 @@ angular.module("umbraco")
         
         
         if (!$scope.model.config.startNodeId) {
-            userService.getCurrentUser().then(function (userData) {
-                $scope.model.config.startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
-                $scope.model.config.startNodeIsVirtual = userData.startMediaIds.length !== 1;
-            });
+            if ($scope.model.config.ignoreUserStartNodes === "1" ) {
+                $scope.model.config.startNodeId = -1;
+                $scope.model.config.startNodeIsVirtual = true;
+
+            } else {
+                userService.getCurrentUser().then(function (userData) {
+                    $scope.model.config.startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
+                    $scope.model.config.startNodeIsVirtual = userData.startMediaIds.length !== 1;
+                });
+            }
         }
         
         $scope.setImage = function(){
             var startNodeId = $scope.model.config && $scope.model.config.startNodeId ? $scope.model.config.startNodeId : undefined;
             var startNodeIsVirtual = startNodeId ? $scope.model.config.startNodeIsVirtual : undefined;
+            $scope.mediaPickerOverlay.dataTypeId = $scope.model.dataTypeId;
 
             var mediaPicker = {
                 startNodeId: startNodeId,
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
index 734b06536d..dccf9887ec 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
@@ -71,6 +71,8 @@ function multiUrlPickerController($scope, angularHelper, localizationService, en
 
         var linkPicker = {
             currentTarget: target,
+            dataTypeId: $scope.model.dataTypeId,
+            ignoreUserStartNodes : $scope.model.config.ignoreUserStartNodes,
             submit: function (model) {
                 if (model.target.url || model.target.anchor) {
                     // if an anchor exists, check that it is appropriately prefixed
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html
index 4aa424396d..ade75a1cd6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html
@@ -47,4 +47,5 @@
             </select>
         </div>
     </umb-control-group>
+
 </div>
diff --git a/src/Umbraco.Web/Editors/EntityController.cs b/src/Umbraco.Web/Editors/EntityController.cs
index dbd17205bb..d83ade5a13 100644
--- a/src/Umbraco.Web/Editors/EntityController.cs
+++ b/src/Umbraco.Web/Editors/EntityController.cs
@@ -36,7 +36,12 @@ namespace Umbraco.Web.Editors
     /// The API controller used for getting entity objects, basic name, icon, id representation of umbraco objects that are based on CMSNode
     /// </summary>
     /// <remarks>
-    /// Some objects such as macros are not based on CMSNode
+    /// <para>
+    /// This controller allows resolving basic entity data for various entities without placing the hard restrictions on users that may not have access
+    /// to the sections these entities entities exist in. This is to allow pickers, etc... of data to work for all users. In some cases such as accessing
+    /// Members, more explicit security checks are done.
+    /// </para>
+    /// <para>Some objects such as macros are not based on CMSNode</para>
     /// </remarks>
     [EntityControllerConfiguration]
     [PluginController("UmbracoApi")]
@@ -98,19 +103,20 @@ namespace Umbraco.Web.Editors
         /// <param name="searchFrom">
         /// A starting point for the search, generally a node id, but for members this is a member type alias
         /// </param>
+        /// <param name="dataTypeId">If set used to look up whether user and group start node permissions will be ignored.</param>
         /// <returns></returns>
         [HttpGet]
-        public IEnumerable<EntityBasic> Search(string query, UmbracoEntityTypes type, string searchFrom = null)
+        public IEnumerable<EntityBasic> Search(string query, UmbracoEntityTypes type, string searchFrom = null, Guid? dataTypeId = null)
         {
-            // TODO: Should we restrict search results based on what app the user has access to?
-            // - Theoretically you shouldn't be able to see member data if you don't have access to members right?
+            // NOTE: Theoretically you shouldn't be able to see member data if you don't have access to members right? ... but there is a member picker, so can't really do that
 
             if (string.IsNullOrEmpty(query))
                 return Enumerable.Empty<EntityBasic>();
 
             //TODO: This uses the internal UmbracoTreeSearcher, this instead should delgate to the ISearchableTree implementation for the type
 
-            return ExamineSearch(query, type, searchFrom);
+            var ignoreUserStartNodes = dataTypeId.HasValue && Services.DataTypeService.IsDataTypeIgnoringUserStartNodes(dataTypeId.Value);
+            return ExamineSearch(query, type, searchFrom, ignoreUserStartNodes);
         }
 
         /// <summary>
@@ -204,6 +210,9 @@ namespace Umbraco.Web.Editors
         /// <param name="id">Int id of the entity to fetch URL for</param>
         /// <param name="type">The type of entity such as Document, Media, Member</param>
         /// <returns>The URL or path to the item</returns>
+        /// <remarks>
+        /// We are not restricting this with security because there is no sensitive data
+        /// </remarks>
         public HttpResponseMessage GetUrl(int id, UmbracoEntityTypes type)
         {
             var returnUrl = string.Empty;
@@ -277,6 +286,29 @@ namespace Umbraco.Web.Editors
                 publishedContentExists: i => Umbraco.Content(i) != null);
         }
 
+
+        [HttpGet]
+        public UrlAndAnchors GetUrlAndAnchors([FromUri]int id)
+        {
+            var url = Umbraco.Url(id);
+            var anchorValues = Services.ContentService.GetAnchorValuesFromRTEs(id);
+            return new UrlAndAnchors(url, anchorValues);
+        }
+
+        public class AnchorsModel
+        {
+            public string RteContent { get; set; }
+        }
+
+        [HttpGet]
+        [HttpPost]
+        public IEnumerable<string> GetAnchors(AnchorsModel model)
+        {
+            var anchorValues = Services.ContentService.GetAnchorValuesFromRTEContent(model.RteContent);
+            return anchorValues;
+        }
+
+
         #region GetById
 
         /// <summary>
@@ -397,9 +429,52 @@ namespace Umbraco.Web.Editors
         }
         #endregion
 
-        public IEnumerable<EntityBasic> GetChildren(int id, UmbracoEntityTypes type)
+        public IEnumerable<EntityBasic> GetChildren(int id, UmbracoEntityTypes type, Guid? dataTypeId = null)
         {
-            return GetResultForChildren(id, type);
+            var objectType = ConvertToObjectType(type);
+            if (objectType.HasValue)
+            {
+                //TODO: Need to check for Object types that support hierarchy here, some might not.
+
+                int[] startNodes = null;
+                switch (type)
+                {
+                    case UmbracoEntityTypes.Document:
+                        startNodes = Security.CurrentUser.CalculateContentStartNodeIds(Services.EntityService);
+                        break;
+                    case UmbracoEntityTypes.Media:
+                        startNodes = Security.CurrentUser.CalculateMediaStartNodeIds(Services.EntityService);
+                        break;
+                }
+
+                var ignoreUserStartNodes = IsDataTypeIgnoringUserStartNodes(dataTypeId);
+
+                // root is special: we reduce it to start nodes if the user's start node is not the default, then we need to return their start nodes
+                if (id == Constants.System.Root && startNodes.Length > 0 && startNodes.Contains(Constants.System.Root) == false && !ignoreUserStartNodes)
+                {
+                    var nodes = Services.EntityService.GetAll(objectType.Value, startNodes).ToArray();
+                    if (nodes.Length == 0)
+                        return Enumerable.Empty<EntityBasic>();
+                    var pr = new List<EntityBasic>(nodes.Select(Mapper.Map<EntityBasic>));
+                    return pr;
+                }
+
+                // else proceed as usual
+
+                return Services.EntityService.GetChildren(id, objectType.Value)
+                    .WhereNotNull()
+                    .Select(Mapper.Map<EntityBasic>);
+            }
+            //now we need to convert the unknown ones
+            switch (type)
+            {
+                case UmbracoEntityTypes.Domain:
+                case UmbracoEntityTypes.Language:
+                case UmbracoEntityTypes.User:
+                case UmbracoEntityTypes.Macro:
+                default:
+                    throw new NotSupportedException("The " + typeof(EntityController) + " does not currently support data for the type " + type);
+            }
         }
 
         /// <summary>
@@ -420,7 +495,8 @@ namespace Umbraco.Web.Editors
             int pageSize,
             string orderBy = "SortOrder",
             Direction orderDirection = Direction.Ascending,
-            string filter = "")
+            string filter = "",
+            Guid? dataTypeId = null)
         {
             if (int.TryParse(id, out var intId))
             {
@@ -445,7 +521,7 @@ namespace Umbraco.Web.Editors
                 //the EntityService can search paged members from the root
 
                 intId = -1;
-                return GetPagedChildren(intId, type, pageNumber, pageSize, orderBy, orderDirection, filter);
+                return GetPagedChildren(intId, type, pageNumber, pageSize, orderBy, orderDirection, filter, dataTypeId);
             }
 
             //the EntityService cannot search members of a certain type, this is currently not supported and would require
@@ -480,7 +556,8 @@ namespace Umbraco.Web.Editors
             int pageSize,
             string orderBy = "SortOrder",
             Direction orderDirection = Direction.Ascending,
-            string filter = "")
+            string filter = "",
+            Guid? dataTypeId = null)
         {
             if (pageNumber <= 0)
                 throw new HttpResponseException(HttpStatusCode.NotFound);
@@ -490,12 +567,47 @@ namespace Umbraco.Web.Editors
             var objectType = ConvertToObjectType(type);
             if (objectType.HasValue)
             {
-                var entities = Services.EntityService.GetPagedChildren(id, objectType.Value, pageNumber - 1, pageSize, out var totalRecords,
+                IEnumerable<IUmbracoEntity> entities;
+                long totalRecords;
+
+                int[] startNodes = null;
+                switch (type)
+                {
+                    case UmbracoEntityTypes.Document:
+                        startNodes = Security.CurrentUser.CalculateContentStartNodeIds(Services.EntityService);
+                        break;
+                    case UmbracoEntityTypes.Media:
+                        startNodes = Security.CurrentUser.CalculateMediaStartNodeIds(Services.EntityService);
+                        break;
+                }
+
+                var ignoreUserStartNodes = IsDataTypeIgnoringUserStartNodes(dataTypeId);
+
+                // root is special: we reduce it to start nodes if the user's start node is not the default, then we need to return their start nodes
+                if (id == Constants.System.Root && startNodes.Length > 0 && startNodes.Contains(Constants.System.Root) == false && !ignoreUserStartNodes)
+                {
+                    if (pageNumber > 0)
+                        return new PagedResult<EntityBasic>(0, 0, 0);
+                    var nodes = Services.EntityService.GetAll(objectType.Value, startNodes).ToArray();
+                    if (nodes.Length == 0)
+                        return new PagedResult<EntityBasic>(0, 0, 0);
+                    if (pageSize < nodes.Length) pageSize = nodes.Length; // bah
+                    var pr = new PagedResult<EntityBasic>(nodes.Length, pageNumber, pageSize)
+                    {
+                        Items = nodes.Select(Mapper.Map<EntityBasic>)
+                    };
+                    return pr;
+                }
+
+                // else proceed as usual
+                //entities = Services.EntityService.GetPagedChildren(id, objectType.Value, pageNumber - 1, pageSize, out totalRecords, orderBy, orderDirection, filter);
+                entities = Services.EntityService.GetPagedChildren(id, objectType.Value, pageNumber - 1, pageSize, out var totalRecords,
                     filter.IsNullOrWhiteSpace()
                         ? null
                         : SqlContext.Query<IUmbracoEntity>().Where(x => x.Name.Contains(filter)),
                     Ordering.By(orderBy, orderDirection));
 
+
                 if (totalRecords == 0)
                 {
                     return new PagedResult<EntityBasic>(0, 0, 0);
@@ -532,6 +644,7 @@ namespace Umbraco.Web.Editors
             }
         }
 
+
         public PagedResult<EntityBasic> GetPagedDescendants(
             int id,
             UmbracoEntityTypes type,
@@ -539,7 +652,8 @@ namespace Umbraco.Web.Editors
             int pageSize,
             string orderBy = "SortOrder",
             Direction orderDirection = Direction.Ascending,
-            string filter = "")
+            string filter = "",
+            Guid? dataTypeId = null)
         {
             if (pageNumber <= 0)
                 throw new HttpResponseException(HttpStatusCode.NotFound);
@@ -567,7 +681,8 @@ namespace Umbraco.Web.Editors
                             break;
                     }
 
-                    entities = aids == null || aids.Contains(Constants.System.Root)
+                    var ignoreUserStartNodes = IsDataTypeIgnoringUserStartNodes(dataTypeId);
+                    entities = aids == null || aids.Contains(Constants.System.Root) || ignoreUserStartNodes
                         ? Services.EntityService.GetPagedDescendants(objectType.Value, pageNumber - 1, pageSize, out totalRecords,
                             SqlContext.Query<IUmbracoEntity>().Where(x => x.Name.Contains(filter)),
                             Ordering.By(orderBy, orderDirection), includeTrashed: false)
@@ -609,6 +724,8 @@ namespace Umbraco.Web.Editors
             }
         }
 
+        private bool IsDataTypeIgnoringUserStartNodes(Guid? dataTypeId) => dataTypeId.HasValue && Services.DataTypeService.IsDataTypeIgnoringUserStartNodes(dataTypeId.Value);
+
         public IEnumerable<EntityBasic> GetAncestors(int id, UmbracoEntityTypes type, [ModelBinder(typeof(HttpQueryStringModelBinder))]FormDataCollection queryStrings)
         {
             return GetResultForAncestors(id, type, queryStrings);
@@ -620,10 +737,11 @@ namespace Umbraco.Web.Editors
         /// <param name="query"></param>
         /// <param name="entityType"></param>
         /// <param name="searchFrom"></param>
+        /// <param name="ignoreUserStartNodes">If set to true, user and group start node permissions will be ignored.</param>
         /// <returns></returns>
-        private IEnumerable<SearchResultEntity> ExamineSearch(string query, UmbracoEntityTypes entityType, string searchFrom = null)
+        private IEnumerable<SearchResultEntity> ExamineSearch(string query, UmbracoEntityTypes entityType, string searchFrom = null, bool ignoreUserStartNodes = false)
         {
-            return _treeSearcher.ExamineSearch(query, entityType, 200, 0, out _, searchFrom);
+            return _treeSearcher.ExamineSearch(query, entityType, 200, 0, out _, searchFrom, ignoreUserStartNodes);
         }
 
         private IEnumerable<EntityBasic> GetResultForChildren(int id, UmbracoEntityTypes entityType)
@@ -658,35 +776,39 @@ namespace Umbraco.Web.Editors
 
                 var ids = Services.EntityService.Get(id).Path.Split(',').Select(int.Parse).Distinct().ToArray();
 
-                int[] aids = null;
-                switch (entityType)
+                var ignoreUserStartNodes = IsDataTypeIgnoringUserStartNodes(dataTypeId);
+                if (ignoreUserStartNodes == false)
                 {
-                    case UmbracoEntityTypes.Document:
-                        aids = Security.CurrentUser.CalculateContentStartNodeIds(Services.EntityService);
-                        break;
-                    case UmbracoEntityTypes.Media:
-                        aids = Security.CurrentUser.CalculateMediaStartNodeIds(Services.EntityService);
-                        break;
-                }
-
-                if (aids != null)
-                {
-                    var lids = new List<int>();
-                    var ok = false;
-                    foreach (var i in ids)
+                    int[] aids = null;
+                    switch (entityType)
                     {
-                        if (ok)
-                        {
-                            lids.Add(i);
-                            continue;
-                        }
-                        if (aids.Contains(i))
-                        {
-                            lids.Add(i);
-                            ok = true;
-                        }
+                        case UmbracoEntityTypes.Document:
+                            aids = Security.CurrentUser.CalculateContentStartNodeIds(Services.EntityService);
+                            break;
+                        case UmbracoEntityTypes.Media:
+                            aids = Security.CurrentUser.CalculateMediaStartNodeIds(Services.EntityService);
+                            break;
+                    }
+
+                    if (aids != null)
+                    {
+                        var lids = new List<int>();
+                        var ok = false;
+                        foreach (var i in ids)
+                        {
+                            if (ok)
+                            {
+                                lids.Add(i);
+                                continue;
+                            }
+                            if (aids.Contains(i))
+                            {
+                                lids.Add(i);
+                                ok = true;
+                            }
+                        }
+                        ids = lids.ToArray();
                     }
-                    ids = lids.ToArray();
                 }
 
                 var culture = queryStrings?.GetValue<string>("culture");
diff --git a/src/Umbraco.Web/HtmlHelperRenderExtensions.cs b/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
index 274cc06dd2..e9b731348d 100644
--- a/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
+++ b/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
@@ -230,8 +230,10 @@ namespace Umbraco.Web
                 //that each token is unique to the controller/action/area instead of the default ASP.Net implementation which is that the token is unique
                 //per user.
                 _viewContext.HttpContext.Items["ufprt"] = _encryptedString;
+
             }
 
+
             private readonly ViewContext _viewContext;
             private readonly FormMethod _method;
             private bool _disposed;
@@ -243,7 +245,6 @@ namespace Umbraco.Web
                 if (this._disposed)
                     return;
                 this._disposed = true;
-
                 //Detect if the call is targeting UmbRegisterController/UmbProfileController/UmbLoginStatusController/UmbLoginController and if it is we automatically output a AntiForgeryToken()
                 // We have a controllerName and area so we can match
                 if (_controllerName == "UmbRegister"
@@ -251,7 +252,7 @@ namespace Umbraco.Web
                     || _controllerName == "UmbLoginStatus"
                     || _controllerName == "UmbLogin")
 			    {
-			        _viewContext.Writer.Write(AntiForgery.GetHtml().ToString());
+                    _viewContext.Writer.Write(AntiForgery.GetHtml().ToString());
 			    }
 
                 //write out the hidden surface form routes
diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentPropertyBasic.cs b/src/Umbraco.Web/Models/ContentEditing/ContentPropertyBasic.cs
index d9d730956a..7d6d066e35 100644
--- a/src/Umbraco.Web/Models/ContentEditing/ContentPropertyBasic.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/ContentPropertyBasic.cs
@@ -1,4 +1,5 @@
-using System.ComponentModel;
+using System;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.Runtime.Serialization;
 using Umbraco.Core.PropertyEditors;
@@ -21,6 +22,9 @@ namespace Umbraco.Web.Models.ContentEditing
         [Required]
         public int Id { get; set; }
 
+        [DataMember(Name = "dataTypeId", IsRequired = false)]
+        public Guid? DataTypeId { get; set; }
+
         [DataMember(Name = "value")]
         public object Value { get; set; }
 
diff --git a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
index aa2e5f18a7..284c1344b6 100644
--- a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
+++ b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
@@ -155,6 +155,8 @@ namespace Umbraco.Web.Mvc
             };
         }
 
+       
+
         /// <summary>
         /// Handles a posted form to an Umbraco Url and ensures the correct controller is routed to and that
         /// the right DataTokens are set.
diff --git a/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs b/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
index 43db9ff0ba..19c0d0ed03 100644
--- a/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
+++ b/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
@@ -49,6 +49,7 @@ namespace Umbraco.Web.Search
         /// </param>
         /// <param name="pageSize"></param>
         /// <param name="pageIndex"></param>
+        /// <param name="ignoreUserStartNodes">If set to true, user and group start node permissions will be ignored.</param>
         /// <returns></returns>
         public IEnumerable<SearchResultEntity> ExamineSearch(
             string query,
@@ -85,12 +86,12 @@ namespace Umbraco.Web.Search
                 case UmbracoEntityTypes.Media:
                     type = "media";
                     var allMediaStartNodes = _umbracoContext.Security.CurrentUser.CalculateMediaStartNodeIds(_entityService);
-                    AppendPath(sb, UmbracoObjectTypes.Media,  allMediaStartNodes, searchFrom, _entityService);
+                    AppendPath(sb, UmbracoObjectTypes.Media, allMediaStartNodes, searchFrom, ignoreUserStartNodes, _entityService);
                     break;
                 case UmbracoEntityTypes.Document:
                     type = "content";
                     var allContentStartNodes = _umbracoContext.Security.CurrentUser.CalculateContentStartNodeIds(_entityService);
-                    AppendPath(sb, UmbracoObjectTypes.Document, allContentStartNodes, searchFrom, _entityService);
+                    AppendPath(sb, UmbracoObjectTypes.Document, allContentStartNodes, searchFrom, ignoreUserStartNodes, _entityService);
                     break;
                 default:
                     throw new NotSupportedException("The " + typeof(UmbracoTreeSearcher) + " currently does not support searching against object type " + entityType);
@@ -288,7 +289,7 @@ namespace Umbraco.Web.Search
             }
         }
 
-        private void AppendPath(StringBuilder sb, UmbracoObjectTypes objectType, int[] startNodeIds, string searchFrom, IEntityService entityService)
+        private void AppendPath(StringBuilder sb, UmbracoObjectTypes objectType, int[] startNodeIds, string searchFrom, bool ignoreUserStartNodes, IEntityService entityService)
         {
             if (sb == null) throw new ArgumentNullException(nameof(sb));
             if (entityService == null) throw new ArgumentNullException(nameof(entityService));
@@ -311,7 +312,7 @@ namespace Umbraco.Web.Search
                 // make sure we don't find anything
                 sb.Append("+__Path:none ");
             }
-            else if (startNodeIds.Contains(-1) == false) // -1 = no restriction
+            else if (startNodeIds.Contains(-1) == false && ignoreUserStartNodes == false) // -1 = no restriction
             {
                 var entityPaths = entityService.GetAllPaths(objectType, startNodeIds);
 
diff --git a/src/Umbraco.Web/Trees/ContentTreeController.cs b/src/Umbraco.Web/Trees/ContentTreeController.cs
index 9e481fc4c9..970191e510 100644
--- a/src/Umbraco.Web/Trees/ContentTreeController.cs
+++ b/src/Umbraco.Web/Trees/ContentTreeController.cs
@@ -217,7 +217,6 @@ namespace Umbraco.Web.Trees
 
             return result;
         }
-
         /// <summary>
         /// Returns a collection of all menu items that can be on a content node
         /// </summary>
diff --git a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
index 1b8f3b1434..20d7389da1 100644
--- a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
+++ b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
@@ -69,7 +69,7 @@ namespace Umbraco.Web.Trees
         {
             var node = base.CreateRootNode(queryStrings);
 
-            if (IsDialog(queryStrings) && UserStartNodes.Contains(Constants.System.Root) == false)
+            if (IsDialog(queryStrings) && UserStartNodes.Contains(Constants.System.Root) == false && IgnoreUserStartNodes(queryStrings) == false)
             {
                 node.AdditionalData["noAccess"] = true;
             }
@@ -87,7 +87,8 @@ namespace Umbraco.Web.Trees
         /// <param name="parentId"></param>
         /// <param name="queryStrings"></param>
         /// <returns></returns>
-        internal TreeNode GetSingleTreeNodeWithAccessCheck(IEntitySlim e, string parentId, FormDataCollection queryStrings)
+        internal TreeNode GetSingleTreeNodeWithAccessCheck(IEntitySlim e, string parentId, FormDataCollection queryStrings,
+            int[] startNodeIds, string[] startNodePaths, bool ignoreUserStartNodes)
         {
             var entityIsAncestorOfStartNodes = Security.CurrentUser.IsInBranchOfStartNode(e, Services.EntityService, RecycleBinId, out var hasPathAccess);
             if (entityIsAncestorOfStartNodes == false)
@@ -101,6 +102,23 @@ namespace Umbraco.Web.Trees
             return treeNode;
         }
 
+        private void GetUserStartNodes(out int[] startNodeIds, out string[] startNodePaths)
+        {
+            switch (RecycleBinId)
+            {
+                case Constants.System.RecycleBinMedia:
+                    startNodeIds = Security.CurrentUser.CalculateMediaStartNodeIds(Services.EntityService);
+                    startNodePaths = Security.CurrentUser.GetMediaStartNodePaths(Services.EntityService);
+                    break;
+                case Constants.System.RecycleBinContent:
+                    startNodeIds = Security.CurrentUser.CalculateContentStartNodeIds(Services.EntityService);
+                    startNodePaths = Security.CurrentUser.GetContentStartNodePaths(Services.EntityService);
+                    break;
+                default:
+                    throw new NotSupportedException("Path access is only determined on content or media");
+            }
+        }
+
         /// <summary>
         /// Returns the
         /// </summary>
@@ -127,6 +145,8 @@ namespace Umbraco.Web.Trees
                 ? queryStrings.GetValue<string>(TreeQueryStringParameters.StartNodeId)
                 : string.Empty;
 
+            var ignoreUserStartNodes = IgnoreUserStartNodes(queryStrings);
+
             if (string.IsNullOrEmpty(startNodeId) == false && startNodeId != "undefined" && startNodeId != rootIdString)
             {
                 // request has been made to render from a specific, non-root, start node
@@ -134,7 +154,7 @@ namespace Umbraco.Web.Trees
 
                 // ensure that the user has access to that node, otherwise return the empty tree nodes collection
                 // TODO: in the future we could return a validation statement so we can have some UI to notify the user they don't have access
-                if (HasPathAccess(id, queryStrings) == false)
+                if (ignoreUserStartNodes == false && HasPathAccess(id, queryStrings) == false)
                 {
                     Logger.Warn<ContentTreeControllerBase>("User {Username} does not have access to node with id {Id}", Security.CurrentUser.Username, id);
                     return nodes;
@@ -152,7 +172,11 @@ namespace Umbraco.Web.Trees
             // get child entities - if id is root, but user's start nodes do not contain the
             // root node, this returns the start nodes instead of root's children
             var entities = GetChildEntities(id, queryStrings).ToList();
-            nodes.AddRange(entities.Select(x => GetSingleTreeNodeWithAccessCheck(x, id, queryStrings)).Where(x => x != null));
+
+            //get the current user start node/paths
+            GetUserStartNodes(out var userStartNodes, out var userStartNodePaths);
+
+            nodes.AddRange(entities.Select(x => GetSingleTreeNodeWithAccessCheck(x, id, queryStrings, userStartNodes, userStartNodePaths, ignoreUserStartNodes)).Where(x => x != null));
 
             // if the user does not have access to the root node, what we have is the start nodes,
             // but to provide some context we also need to add their topmost nodes when they are not
@@ -163,7 +187,7 @@ namespace Umbraco.Web.Trees
                 if (topNodeIds.Length > 0)
                 {
                     var topNodes = Services.EntityService.GetAll(UmbracoObjectType, topNodeIds.ToArray());
-                    nodes.AddRange(topNodes.Select(x => GetSingleTreeNodeWithAccessCheck(x, id, queryStrings)).Where(x => x != null));
+                    nodes.AddRange(topNodes.Select(x => GetSingleTreeNodeWithAccessCheck(x, id, queryStrings, userStartNodes, userStartNodePaths, ignoreUserStartNodes)).Where(x => x != null));
                 }
             }
 
@@ -504,5 +528,21 @@ namespace Umbraco.Web.Trees
         }
 
         private readonly ConcurrentDictionary<string, IEntitySlim> _entityCache = new ConcurrentDictionary<string, IEntitySlim>();
+
+        /// <summary>
+        /// If the request should allows a user to choose nodes that they normally don't have access to
+        /// </summary>
+        /// <param name="queryStrings"></param>
+        /// <returns></returns>
+        internal bool IgnoreUserStartNodes(FormDataCollection queryStrings)
+        {
+            var dataTypeId = queryStrings.GetValue<Guid?>(TreeQueryStringParameters.DataTypeId);
+            if (dataTypeId.HasValue)
+            {
+                return Services.DataTypeService.IsDataTypeIgnoringUserStartNodes(dataTypeId.Value);
+            }
+
+            return false;
+        }
     }
 }
diff --git a/src/Umbraco.Web/Trees/MediaTreeController.cs b/src/Umbraco.Web/Trees/MediaTreeController.cs
index 22ad4ed355..f4f373f9a4 100644
--- a/src/Umbraco.Web/Trees/MediaTreeController.cs
+++ b/src/Umbraco.Web/Trees/MediaTreeController.cs
@@ -166,6 +166,6 @@ namespace Umbraco.Web.Trees
         {
             return _treeSearcher.ExamineSearch(query, UmbracoEntityTypes.Media, pageSize, pageIndex, out totalFound, searchFrom);
         }
-
+    
     }
 }
diff --git a/src/Umbraco.Web/Trees/TreeControllerBase.cs b/src/Umbraco.Web/Trees/TreeControllerBase.cs
index 4acf807b77..0f9b61469e 100644
--- a/src/Umbraco.Web/Trees/TreeControllerBase.cs
+++ b/src/Umbraco.Web/Trees/TreeControllerBase.cs
@@ -15,6 +15,7 @@ using Umbraco.Core.Services;
 using Umbraco.Web.Models.Trees;
 using Umbraco.Web.WebApi;
 using Umbraco.Web.WebApi.Filters;
+using Umbraco.Core.Services;
 
 namespace Umbraco.Web.Trees
 {
diff --git a/src/Umbraco.Web/Trees/TreeQueryStringParameters.cs b/src/Umbraco.Web/Trees/TreeQueryStringParameters.cs
index 466aff5a1f..9d012cb25c 100644
--- a/src/Umbraco.Web/Trees/TreeQueryStringParameters.cs
+++ b/src/Umbraco.Web/Trees/TreeQueryStringParameters.cs
@@ -8,6 +8,7 @@
         public const string Use = "use";
         public const string Application = "application";
         public const string StartNodeId = "startNodeId";
+        public const string DataTypeId = "dataTypeId";
         //public const string OnNodeClick = "OnNodeClick";
         //public const string RenderParent = "RenderParent";
     }
diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs
index a330f66c43..bf017c73cc 100644
--- a/src/Umbraco.Web/UmbracoHelper.cs
+++ b/src/Umbraco.Web/UmbracoHelper.cs
@@ -5,6 +5,7 @@ using System.Web;
 using System.Xml.XPath;
 using Umbraco.Core;
 using Umbraco.Core.Dictionary;
+using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Xml;

From 568835f7e2a51fa8ca85e5f61fcd566956e63e94 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 28 Jun 2019 13:24:13 +1000
Subject: [PATCH 059/776] manual merging/fixing, project builds now, but need
 to manually merge the remaining

---
 src/Umbraco.Core/Constants-DataTypes.cs       | 18 ++++---
 src/Umbraco.Core/Models/DataTypeExtensions.cs | 52 +++++++++----------
 src/Umbraco.Core/Services/IContentService.cs  |  4 +-
 src/Umbraco.Core/Services/IDataTypeService.cs |  1 +
 .../Services/Implement/ContentService.cs      | 35 +++++++++++++
 src/Umbraco.Core/Umbraco.Core.csproj          |  2 +
 src/Umbraco.Web/Editors/EntityController.cs   | 11 ++--
 .../Models/ContentEditing/UrlAndAnchors.cs    | 21 ++++++++
 .../MultiUrlPickerConfiguration.cs            |  8 ++-
 src/Umbraco.Web/Search/UmbracoTreeSearcher.cs |  2 +-
 .../Trees/ContentTreeControllerBase.cs        | 14 +++--
 src/Umbraco.Web/Umbraco.Web.csproj            |  1 +
 12 files changed, 123 insertions(+), 46 deletions(-)
 create mode 100644 src/Umbraco.Web/Models/ContentEditing/UrlAndAnchors.cs

diff --git a/src/Umbraco.Core/Constants-DataTypes.cs b/src/Umbraco.Core/Constants-DataTypes.cs
index 1e9115cde9..d33138f398 100644
--- a/src/Umbraco.Core/Constants-DataTypes.cs
+++ b/src/Umbraco.Core/Constants-DataTypes.cs
@@ -6,6 +6,10 @@ namespace Umbraco.Core
     {
         public static class DataTypes
         {
+            //NOTE: unfortunately due to backwards compat we can't move/rename these, with the addition of the GUID
+            //constants, it would make more sense to have these suffixed with "ID" or in a Subclass called "INT", for
+            //now all we can do is make a subclass called Guids to put the GUID IDs.
+
             public const int LabelString = -92;
             public const int LabelInt = -91;
             public const int LabelBigint = -93;
@@ -25,16 +29,16 @@ namespace Umbraco.Core
 
             public const int Tags = 1041;
 
+            public static class ReservedPreValueKeys
+            {
+                public const string IgnoreUserStartNodes = "ignoreUserStartNodes";
+            }
+
             /// <summary>
             /// Defines the identifiers for Umbraco data types as constants for easy centralized access/management.
             /// </summary>
-            internal static class BuiltInDataTypes
-            {
-
-                public static class ReservedPreValueKeys
-                {
-                    public const string IgnoreUserStartNodes = "ignoreUserStartNodes";
-                }
+            public static class Guids
+            {   
 
                 /// <summary>
                 /// Guid for Content Picker as string
diff --git a/src/Umbraco.Core/Models/DataTypeExtensions.cs b/src/Umbraco.Core/Models/DataTypeExtensions.cs
index a2603ad3df..922b6a6a39 100644
--- a/src/Umbraco.Core/Models/DataTypeExtensions.cs
+++ b/src/Umbraco.Core/Models/DataTypeExtensions.cs
@@ -38,31 +38,31 @@ namespace Umbraco.Core.Models
         
         private static readonly ISet<Guid> IdsOfBuildInDataTypes = new HashSet<Guid>()
         {
-            Constants.DataTypes.ContentPickerGuid,
-            Constants.DataTypes.MemberPickerGuid,
-            Constants.DataTypes.MediaPickerGuid,
-            Constants.DataTypes.MultipleMediaPickerGuid,
-            Constants.DataTypes.RelatedLinksGuid,
-            Constants.DataTypes.MemberGuid,
-            Constants.DataTypes.ImageCropperGuid,
-            Constants.DataTypes.TagsGuid,
-            Constants.DataTypes.ListViewContentGuid,
-            Constants.DataTypes.ListViewMediaGuid,
-            Constants.DataTypes.ListViewMembersGuid,
-            Constants.DataTypes.DatePickerWithTimeGuid,
-            Constants.DataTypes.ApprovedColorGuid,
-            Constants.DataTypes.DropdownMultipleGuid,
-            Constants.DataTypes.RadioboxGuid,
-            Constants.DataTypes.DatePickerGuid,
-            Constants.DataTypes.DropdownGuid,
-            Constants.DataTypes.CheckboxListGuid,
-            Constants.DataTypes.CheckboxGuid,
-            Constants.DataTypes.NumericGuid,
-            Constants.DataTypes.RichtextEditorGuid,
-            Constants.DataTypes.TextstringGuid,
-            Constants.DataTypes.TextareaGuid,
-            Constants.DataTypes.UploadGuid,
-            Constants.DataTypes.LabelGuid,
+            Constants.DataTypes.Guids.ContentPickerGuid,
+            Constants.DataTypes.Guids.MemberPickerGuid,
+            Constants.DataTypes.Guids.MediaPickerGuid,
+            Constants.DataTypes.Guids.MultipleMediaPickerGuid,
+            Constants.DataTypes.Guids.RelatedLinksGuid,
+            Constants.DataTypes.Guids.MemberGuid,
+            Constants.DataTypes.Guids.ImageCropperGuid,
+            Constants.DataTypes.Guids.TagsGuid,
+            Constants.DataTypes.Guids.ListViewContentGuid,
+            Constants.DataTypes.Guids.ListViewMediaGuid,
+            Constants.DataTypes.Guids.ListViewMembersGuid,
+            Constants.DataTypes.Guids.DatePickerWithTimeGuid,
+            Constants.DataTypes.Guids.ApprovedColorGuid,
+            Constants.DataTypes.Guids.DropdownMultipleGuid,
+            Constants.DataTypes.Guids.RadioboxGuid,
+            Constants.DataTypes.Guids.DatePickerGuid,
+            Constants.DataTypes.Guids.DropdownGuid,
+            Constants.DataTypes.Guids.CheckboxListGuid,
+            Constants.DataTypes.Guids.CheckboxGuid,
+            Constants.DataTypes.Guids.NumericGuid,
+            Constants.DataTypes.Guids.RichtextEditorGuid,
+            Constants.DataTypes.Guids.TextstringGuid,
+            Constants.DataTypes.Guids.TextareaGuid,
+            Constants.DataTypes.Guids.UploadGuid,
+            Constants.DataTypes.Guids.LabelGuid,
         };
 
         /// <summary>
@@ -70,7 +70,7 @@ namespace Umbraco.Core.Models
         /// </summary>
         /// <param name="dataType">The data type definition.</param>
         /// <returns></returns>
-        internal static bool IsBuildInDataType(this IDataTypeDefinition dataType)
+        internal static bool IsBuildInDataType(this IDataType dataType)
         {
             return IsBuildInDataType(dataType.Key);
         }
diff --git a/src/Umbraco.Core/Services/IContentService.cs b/src/Umbraco.Core/Services/IContentService.cs
index 164edca1e6..a9226fbae2 100644
--- a/src/Umbraco.Core/Services/IContentService.cs
+++ b/src/Umbraco.Core/Services/IContentService.cs
@@ -527,7 +527,7 @@ namespace Umbraco.Core.Services
 
         #endregion
         
-        IEnumerable<string> GetAnchorValuesFromRTEs(int id);
-        IEnumerable<string> GetAnchorValuesFromRTEContent(string rteContent);  
+        IEnumerable<string> GetAnchorValuesFromRTEs(int id, string culture = "*");
+        IEnumerable<string> GetAnchorValuesFromRTEContent(string rteContent, string culture = "*");  
     }
 }
diff --git a/src/Umbraco.Core/Services/IDataTypeService.cs b/src/Umbraco.Core/Services/IDataTypeService.cs
index 3dc530e250..bb56e110cd 100644
--- a/src/Umbraco.Core/Services/IDataTypeService.cs
+++ b/src/Umbraco.Core/Services/IDataTypeService.cs
@@ -4,6 +4,7 @@ using Umbraco.Core.Models;
 
 namespace Umbraco.Core.Services
 {
+
     /// <summary>
     /// Defines the DataType Service, which is an easy access to operations involving <see cref="IDataType"/>
     /// </summary>
diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs
index c79e7aa869..90aaf6fc5d 100644
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Globalization;
 using System.Linq;
+using System.Text.RegularExpressions;
 using Umbraco.Core.Events;
 using Umbraco.Core.Exceptions;
 using Umbraco.Core.Logging;
@@ -31,6 +32,7 @@ namespace Umbraco.Core.Services.Implement
         private IQuery<IContent> _queryNotTrashed;
         //TODO: The non-lazy object should be injected
         private readonly Lazy<PropertyValidationService> _propertyValidationService = new Lazy<PropertyValidationService>(() => new PropertyValidationService());
+        private static readonly Regex AnchorRegex = new Regex("<a id=\"(.*?)\">", RegexOptions.Compiled);
 
         #region Constructors
 
@@ -3024,5 +3026,38 @@ namespace Umbraco.Core.Services.Implement
         }
 
         #endregion
+
+
+        #region RTE Anchor values
+        public IEnumerable<string> GetAnchorValuesFromRTEs(int id, string culture = "*")
+        {
+            var result = new List<string>();
+            var content = GetById(id);
+            foreach (var contentProperty in content.Properties)
+            {
+                if (contentProperty.PropertyType.PropertyEditorAlias.InvariantEquals(Constants.PropertyEditors.Aliases.TinyMce))
+                {
+                    var value = contentProperty.GetValue(culture)?.ToString();
+                    if (!string.IsNullOrEmpty(value))
+                    {
+                        result.AddRange(GetAnchorValuesFromRTEContent(value));
+                    }
+                }
+            }
+            return result;
+        }
+
+
+        public IEnumerable<string> GetAnchorValuesFromRTEContent(string rteContent, string culture = "*")
+        {
+            var result = new List<string>();
+            var matches = AnchorRegex.Matches(rteContent);
+            foreach (Match match in matches)
+            {
+                result.Add(match.Value.Split('\"')[1]);
+            }
+            return result;
+        } 
+        #endregion
     }
 }
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 7ac1e9d06e..86e4cb2f97 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -255,6 +255,7 @@
     <Compile Include="Models\PublishedContent\ILivePublishedModelFactory.cs" />
     <Compile Include="Models\PublishedContent\IPublishedContentType.cs" />
     <Compile Include="Models\PublishedContent\IPublishedPropertyType.cs" />
+    <Compile Include="PropertyEditors\IIgnoreUserStartNodesConfig.cs" />
     <Compile Include="PublishedContentExtensions.cs" />
     <Compile Include="Models\PublishedContent\UrlMode.cs" />
     <Compile Include="Persistence\Dtos\PropertyTypeCommonDto.cs" />
@@ -264,6 +265,7 @@
     <Compile Include="PropertyEditors\DateTimeConfiguration.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\RenameLabelAndRichTextPropertyEditorAliases.cs" />
     <Compile Include="PublishedModelFactoryExtensions.cs" />
+    <Compile Include="Services\DateTypeServiceExtensions.cs" />
     <Compile Include="Services\PropertyValidationService.cs" />
     <Compile Include="Composing\TypeCollectionBuilderBase.cs" />
     <Compile Include="TypeLoaderExtensions.cs" />
diff --git a/src/Umbraco.Web/Editors/EntityController.cs b/src/Umbraco.Web/Editors/EntityController.cs
index d83ade5a13..4184182a1d 100644
--- a/src/Umbraco.Web/Editors/EntityController.cs
+++ b/src/Umbraco.Web/Editors/EntityController.cs
@@ -287,10 +287,11 @@ namespace Umbraco.Web.Editors
         }
 
 
+        //fixme - culture?
         [HttpGet]
         public UrlAndAnchors GetUrlAndAnchors([FromUri]int id)
         {
-            var url = Umbraco.Url(id);
+            var url = UmbracoContext.UrlProvider.GetUrl(id);
             var anchorValues = Services.ContentService.GetAnchorValuesFromRTEs(id);
             return new UrlAndAnchors(url, anchorValues);
         }
@@ -300,6 +301,7 @@ namespace Umbraco.Web.Editors
             public string RteContent { get; set; }
         }
 
+        //fixme - culture?
         [HttpGet]
         [HttpPost]
         public IEnumerable<string> GetAnchors(AnchorsModel model)
@@ -567,7 +569,7 @@ namespace Umbraco.Web.Editors
             var objectType = ConvertToObjectType(type);
             if (objectType.HasValue)
             {
-                IEnumerable<IUmbracoEntity> entities;
+                IEnumerable<IEntitySlim> entities;
                 long totalRecords;
 
                 int[] startNodes = null;
@@ -600,8 +602,7 @@ namespace Umbraco.Web.Editors
                 }
 
                 // else proceed as usual
-                //entities = Services.EntityService.GetPagedChildren(id, objectType.Value, pageNumber - 1, pageSize, out totalRecords, orderBy, orderDirection, filter);
-                entities = Services.EntityService.GetPagedChildren(id, objectType.Value, pageNumber - 1, pageSize, out var totalRecords,
+                entities = Services.EntityService.GetPagedChildren(id, objectType.Value, pageNumber - 1, pageSize, out totalRecords,
                     filter.IsNullOrWhiteSpace()
                         ? null
                         : SqlContext.Query<IUmbracoEntity>().Where(x => x.Name.Contains(filter)),
@@ -776,7 +777,7 @@ namespace Umbraco.Web.Editors
 
                 var ids = Services.EntityService.Get(id).Path.Split(',').Select(int.Parse).Distinct().ToArray();
 
-                var ignoreUserStartNodes = IsDataTypeIgnoringUserStartNodes(dataTypeId);
+                var ignoreUserStartNodes = IsDataTypeIgnoringUserStartNodes(queryStrings?.GetValue<Guid?>("dataTypeId"));
                 if (ignoreUserStartNodes == false)
                 {
                     int[] aids = null;
diff --git a/src/Umbraco.Web/Models/ContentEditing/UrlAndAnchors.cs b/src/Umbraco.Web/Models/ContentEditing/UrlAndAnchors.cs
new file mode 100644
index 0000000000..86642a8d65
--- /dev/null
+++ b/src/Umbraco.Web/Models/ContentEditing/UrlAndAnchors.cs
@@ -0,0 +1,21 @@
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+
+namespace Umbraco.Web.Models.ContentEditing
+{
+    [DataContract(Name = "urlAndAnchors", Namespace = "")]
+    public class UrlAndAnchors
+    {
+        public UrlAndAnchors(string url, IEnumerable<string> anchorValues)
+        {
+            Url = url;
+            AnchorValues = anchorValues;
+        }
+
+        [DataMember(Name = "url")]
+        public string Url { get; }
+
+        [DataMember(Name = "anchorValues")]
+        public IEnumerable<string> AnchorValues { get;  }
+    }
+}
diff --git a/src/Umbraco.Web/PropertyEditors/MultiUrlPickerConfiguration.cs b/src/Umbraco.Web/PropertyEditors/MultiUrlPickerConfiguration.cs
index 515512eff8..8b6a4c15d2 100644
--- a/src/Umbraco.Web/PropertyEditors/MultiUrlPickerConfiguration.cs
+++ b/src/Umbraco.Web/PropertyEditors/MultiUrlPickerConfiguration.cs
@@ -2,12 +2,18 @@ using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.PropertyEditors
 {
-    public class MultiUrlPickerConfiguration
+
+    public class MultiUrlPickerConfiguration : IIgnoreUserStartNodesConfig
     {
         [ConfigurationField("minNumber", "Minimum number of items", "number")]
         public int MinNumber { get; set; }
 
         [ConfigurationField("maxNumber", "Maximum number of items", "number")]
         public int MaxNumber { get; set; }
+
+        [ConfigurationField(Core.Constants.DataTypes.ReservedPreValueKeys.IgnoreUserStartNodes, "Selecting this option allows a user to choose nodes that they normally don't have access to.", "boolean")]
+        public bool IgnoreUserStartNodes { get; set; }
+
+        
     }
 }
diff --git a/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs b/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
index 19c0d0ed03..3a0f5eb361 100644
--- a/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
+++ b/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
@@ -55,7 +55,7 @@ namespace Umbraco.Web.Search
             string query,
             UmbracoEntityTypes entityType,
             int pageSize,
-            long pageIndex, out long totalFound, string searchFrom = null)
+            long pageIndex, out long totalFound, string searchFrom = null, bool ignoreUserStartNodes = false)
         {
             var sb = new StringBuilder();
 
diff --git a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
index 20d7389da1..2f90c7ac29 100644
--- a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
+++ b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
@@ -17,7 +17,7 @@ using Umbraco.Core.Models.Entities;
 using System.Web.Http.ModelBinding;
 using Umbraco.Web.Actions;
 using Umbraco.Web.Composing;
-
+using Umbraco.Core.Security;
 
 namespace Umbraco.Web.Trees
 {
@@ -90,12 +90,18 @@ namespace Umbraco.Web.Trees
         internal TreeNode GetSingleTreeNodeWithAccessCheck(IEntitySlim e, string parentId, FormDataCollection queryStrings,
             int[] startNodeIds, string[] startNodePaths, bool ignoreUserStartNodes)
         {
-            var entityIsAncestorOfStartNodes = Security.CurrentUser.IsInBranchOfStartNode(e, Services.EntityService, RecycleBinId, out var hasPathAccess);
-            if (entityIsAncestorOfStartNodes == false)
+            var entityIsAncestorOfStartNodes = ContentPermissionsHelper.IsInBranchOfStartNode(e.Path, startNodeIds, startNodePaths, out var hasPathAccess);
+            if (ignoreUserStartNodes == false && entityIsAncestorOfStartNodes == false)
                 return null;
 
             var treeNode = GetSingleTreeNode(e, parentId, queryStrings);
-            if (hasPathAccess == false)
+            if (treeNode == null)
+            {
+                //this means that the user has NO access to this node via permissions! They at least need to have browse permissions to see
+                //the node so we need to return null;
+                return null;
+            }
+            if (ignoreUserStartNodes == false && hasPathAccess == false)
             {
                 treeNode.AdditionalData["noAccess"] = true;
             }
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 8d1b106ba4..03a61fc33e 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -206,6 +206,7 @@
     <Compile Include="Models\ContentEditing\LinkDisplay.cs" />
     <Compile Include="Models\ContentEditing\MacroDisplay.cs" />
     <Compile Include="Models\ContentEditing\MacroParameterDisplay.cs" />
+    <Compile Include="Models\ContentEditing\UrlAndAnchors.cs" />
     <Compile Include="Models\Mapping\CommonMapper.cs" />
     <Compile Include="Models\Mapping\MapperContextExtensions.cs" />
     <Compile Include="Models\PublishedContent\HybridVariationContextAccessor.cs" />

From 4a33ca99bab197b48bb21160929fa3531d1cd874 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 28 Jun 2019 15:03:52 +1000
Subject: [PATCH 060/776] More manual merging

---
 src/Umbraco.Core/Constants-DataTypes.cs       | 56 ++++++++++++++++++-
 .../Migrations/Install/DatabaseDataCreator.cs | 44 +++++++--------
 src/Umbraco.Core/Models/DataTypeExtensions.cs |  7 ++-
 .../IIgnoreUserStartNodesConfig.cs            | 10 ++++
 .../Services/DateTypeServiceExtensions.cs     | 21 +++++++
 .../Mapping/ContentPropertyBasicMapper.cs     |  9 ++-
 .../Models/Mapping/DataTypeMapDefinition.cs   | 17 ++++--
 .../ContentPickerConfiguration.cs             |  5 +-
 .../PropertyEditors/GridConfiguration.cs      |  5 +-
 .../MediaPickerConfiguration.cs               |  5 +-
 .../MultiNodePickerConfiguration.cs           |  5 +-
 .../PropertyEditors/RichTextConfiguration.cs  |  5 +-
 .../Trees/ContentTreeControllerBase.cs        |  2 +-
 13 files changed, 153 insertions(+), 38 deletions(-)
 create mode 100644 src/Umbraco.Core/PropertyEditors/IIgnoreUserStartNodesConfig.cs
 create mode 100644 src/Umbraco.Core/Services/DateTypeServiceExtensions.cs

diff --git a/src/Umbraco.Core/Constants-DataTypes.cs b/src/Umbraco.Core/Constants-DataTypes.cs
index d33138f398..021e508b6a 100644
--- a/src/Umbraco.Core/Constants-DataTypes.cs
+++ b/src/Umbraco.Core/Constants-DataTypes.cs
@@ -307,14 +307,64 @@ namespace Umbraco.Core
                 /// <summary>
                 /// Guid for Label as string
                 /// </summary>
-                public const string Label = "f0bc4bfb-b499-40d6-ba86-058885a5178c";
+                public const string LabelString = "f0bc4bfb-b499-40d6-ba86-058885a5178c";
 
                 /// <summary>
-                /// Guid for Label
+                /// Guid for Label string
                 /// </summary>
-                public static readonly Guid LabelGuid = new Guid(Label);
+                public static readonly Guid LabelStringGuid = new Guid(LabelString);
 
+                /// <summary>
+                /// Guid for Label as int
+                /// </summary>
+                public const string LabelInt = "8e7f995c-bd81-4627-9932-c40e568ec788";
 
+                /// <summary>
+                /// Guid for Label int
+                /// </summary>
+                public static readonly Guid LabelIntGuid = new Guid(LabelInt);
+
+                /// <summary>
+                /// Guid for Label as big int
+                /// </summary>
+                public const string LabelBigInt = "930861bf-e262-4ead-a704-f99453565708";
+
+                /// <summary>
+                /// Guid for Label big int
+                /// </summary>
+                public static readonly Guid LabelBigIntGuid = new Guid(LabelBigInt);
+
+                /// <summary>
+                /// Guid for Label as date time
+                /// </summary>
+                public const string LabelDateTime = "0e9794eb-f9b5-4f20-a788-93acd233a7e4";
+
+                /// <summary>
+                /// Guid for Label date time
+                /// </summary>
+                public static readonly Guid LabelDateTimeGuid = new Guid(LabelDateTime);
+
+                /// <summary>
+                /// Guid for Label as time
+                /// </summary>
+                public const string LabelTime = "a97cec69-9b71-4c30-8b12-ec398860d7e8";
+
+                /// <summary>
+                /// Guid for Label time
+                /// </summary>
+                public static readonly Guid LabelTimeGuid = new Guid(LabelTime);
+
+                /// <summary>
+                /// Guid for Label as decimal
+                /// </summary>
+                public const string LabelDecimal = "8f1ef1e1-9de4-40d3-a072-6673f631ca64";
+
+                /// <summary>
+                /// Guid for Label decimal
+                /// </summary>
+                public static readonly Guid LabelDecimalGuid = new Guid(LabelDecimal);
+                
+                
             }
         }
     }
diff --git a/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs b/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
index 1de983636b..d8aced7a8c 100644
--- a/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
+++ b/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
@@ -101,28 +101,28 @@ namespace Umbraco.Core.Migrations.Install
             _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -1, Trashed = false, ParentId = -1, UserId = -1, Level = 0, Path = "-1", SortOrder = 0, UniqueId = new Guid("916724a5-173d-4619-b97e-b9de133dd6f5"), Text = "SYSTEM DATA: umbraco master root", NodeObjectType = Constants.ObjectTypes.SystemRoot, CreateDate = DateTime.Now });
             _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -20, Trashed = false, ParentId = -1, UserId = -1, Level = 0, Path = "-1,-20", SortOrder = 0, UniqueId = new Guid("0F582A79-1E41-4CF0-BFA0-76340651891A"), Text = "Recycle Bin", NodeObjectType = Constants.ObjectTypes.ContentRecycleBin, CreateDate = DateTime.Now });
             _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -21, Trashed = false, ParentId = -1, UserId = -1, Level = 0, Path = "-1,-21", SortOrder = 0, UniqueId = new Guid("BF7C7CBC-952F-4518-97A2-69E9C7B33842"), Text = "Recycle Bin", NodeObjectType = Constants.ObjectTypes.MediaRecycleBin, CreateDate = DateTime.Now });
-            InsertDataTypeNodeDto(Constants.DataTypes.LabelString, 35, "f0bc4bfb-b499-40d6-ba86-058885a5178c", "Label");
-            InsertDataTypeNodeDto(Constants.DataTypes.LabelInt, 36, "8e7f995c-bd81-4627-9932-c40e568ec788", "Label (integer)");
-            InsertDataTypeNodeDto(Constants.DataTypes.LabelBigint, 36, "930861bf-e262-4ead-a704-f99453565708", "Label (bigint)");
-            InsertDataTypeNodeDto(Constants.DataTypes.LabelDateTime, 37, "0e9794eb-f9b5-4f20-a788-93acd233a7e4", "Label (datetime)");
-            InsertDataTypeNodeDto(Constants.DataTypes.LabelTime, 38, "a97cec69-9b71-4c30-8b12-ec398860d7e8", "Label (time)");
-            InsertDataTypeNodeDto(Constants.DataTypes.LabelDecimal, 39, "8f1ef1e1-9de4-40d3-a072-6673f631ca64", "Label (decimal)");
-            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -90, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,-90", SortOrder = 34, UniqueId = new Guid("84c6b441-31df-4ffe-b67e-67d5bc3ae65a"), Text = "Upload", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
-            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -89, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,-89", SortOrder = 33, UniqueId = new Guid("c6bac0dd-4ab9-45b1-8e30-e4b619ee5da3"), Text = "Textarea", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
-            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -88, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,-88", SortOrder = 32, UniqueId = new Guid("0cc0eba1-9960-42c9-bf9b-60e150b429ae"), Text = "Textstring", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
-            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -87, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,-87", SortOrder = 4, UniqueId = new Guid("ca90c950-0aff-4e72-b976-a30b1ac57dad"), Text = "Richtext editor", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
-            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -51, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,-51", SortOrder = 2, UniqueId = new Guid("2e6d3631-066e-44b8-aec4-96f09099b2b5"), Text = "Numeric", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
-            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -49, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,-49", SortOrder = 2, UniqueId = new Guid("92897bc6-a5f3-4ffe-ae27-f2e7e33dda49"), Text = "True/false", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
-            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -43, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,-43", SortOrder = 2, UniqueId = new Guid("fbaf13a8-4036-41f2-93a3-974f678c312a"), Text = "Checkbox list", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
-            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = Constants.DataTypes.DropDownSingle, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = $"-1,{Constants.DataTypes.DropDownSingle}", SortOrder = 2, UniqueId = new Guid("0b6a45e7-44ba-430d-9da5-4e46060b9e03"), Text = "Dropdown", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
-            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -41, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,-41", SortOrder = 2, UniqueId = new Guid("5046194e-4237-453c-a547-15db3a07c4e1"), Text = "Date Picker", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
-            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -40, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,-40", SortOrder = 2, UniqueId = new Guid("bb5f57c9-ce2b-4bb9-b697-4caca783a805"), Text = "Radiobox", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
-            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = Constants.DataTypes.DropDownMultiple, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = $"-1,{Constants.DataTypes.DropDownMultiple}", SortOrder = 2, UniqueId = new Guid("f38f0ac7-1d27-439c-9f3f-089cd8825a53"), Text = "Dropdown multiple", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
-            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -37, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,-37", SortOrder = 2, UniqueId = new Guid("0225af17-b302-49cb-9176-b9f35cab9c17"), Text = "Approved Color", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
-            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -36, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,-36", SortOrder = 2, UniqueId = new Guid("e4d66c0f-b935-4200-81f0-025f7256b89a"), Text = "Date Picker with time", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
-            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = Constants.DataTypes.DefaultContentListView, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = $"-1,{Constants.DataTypes.DefaultContentListView}", SortOrder = 2, UniqueId = new Guid("C0808DD3-8133-4E4B-8CE8-E2BEA84A96A4"), Text = Constants.Conventions.DataTypes.ListViewPrefix + "Content", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
-            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = Constants.DataTypes.DefaultMediaListView, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = $"-1,{Constants.DataTypes.DefaultMediaListView}", SortOrder = 2, UniqueId = new Guid("3A0156C4-3B8C-4803-BDC1-6871FAA83FFF"), Text = Constants.Conventions.DataTypes.ListViewPrefix + "Media", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
-            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = Constants.DataTypes.DefaultMembersListView, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = $"-1,{Constants.DataTypes.DefaultMembersListView}", SortOrder = 2, UniqueId = new Guid("AA2C52A0-CE87-4E65-A47C-7DF09358585D"), Text = Constants.Conventions.DataTypes.ListViewPrefix + "Members", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
+            InsertDataTypeNodeDto(Constants.DataTypes.LabelString, 35, Constants.DataTypes.Guids.LabelString, "Label");
+            InsertDataTypeNodeDto(Constants.DataTypes.LabelInt, 36, Constants.DataTypes.Guids.LabelInt, "Label (integer)");
+            InsertDataTypeNodeDto(Constants.DataTypes.LabelBigint, 36, Constants.DataTypes.Guids.LabelBigInt, "Label (bigint)");
+            InsertDataTypeNodeDto(Constants.DataTypes.LabelDateTime, 37, Constants.DataTypes.Guids.LabelDateTime, "Label (datetime)");
+            InsertDataTypeNodeDto(Constants.DataTypes.LabelTime, 38, Constants.DataTypes.Guids.LabelTime, "Label (time)");
+            InsertDataTypeNodeDto(Constants.DataTypes.LabelDecimal, 39, Constants.DataTypes.Guids.LabelDecimal, "Label (decimal)");
+            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -90, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,-90", SortOrder = 34, UniqueId = Constants.DataTypes.Guids.UploadGuid, Text = "Upload", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
+            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -89, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,-89", SortOrder = 33, UniqueId = Constants.DataTypes.Guids.TextareaGuid, Text = "Textarea", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
+            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -88, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,-88", SortOrder = 32, UniqueId = Constants.DataTypes.Guids.TextstringGuid, Text = "Textstring", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
+            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -87, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,-87", SortOrder = 4, UniqueId = Constants.DataTypes.Guids.RichtextEditorGuid, Text = "Richtext editor", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
+            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -51, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,-51", SortOrder = 2, UniqueId = Constants.DataTypes.Guids.NumericGuid, Text = "Numeric", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
+            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -49, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,-49", SortOrder = 2, UniqueId = Constants.DataTypes.Guids.CheckboxGuid, Text = "True/false", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
+            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -43, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,-43", SortOrder = 2, UniqueId = Constants.DataTypes.Guids.CheckboxListGuid, Text = "Checkbox list", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
+            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = Constants.DataTypes.DropDownSingle, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = $"-1,{Constants.DataTypes.DropDownSingle}", SortOrder = 2, UniqueId = Constants.DataTypes.Guids.DropdownGuid, Text = "Dropdown", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
+            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -41, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,-41", SortOrder = 2, UniqueId = Constants.DataTypes.Guids.DatePickerGuid, Text = "Date Picker", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
+            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -40, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,-40", SortOrder = 2, UniqueId = Constants.DataTypes.Guids.RadioboxGuid, Text = "Radiobox", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
+            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = Constants.DataTypes.DropDownMultiple, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = $"-1,{Constants.DataTypes.DropDownMultiple}", SortOrder = 2, UniqueId = Constants.DataTypes.Guids.DropdownMultipleGuid, Text = "Dropdown multiple", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
+            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -37, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,-37", SortOrder = 2, UniqueId = Constants.DataTypes.Guids.ApprovedColorGuid, Text = "Approved Color", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
+            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -36, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,-36", SortOrder = 2, UniqueId = Constants.DataTypes.Guids.DatePickerWithTimeGuid, Text = "Date Picker with time", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
+            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = Constants.DataTypes.DefaultContentListView, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = $"-1,{Constants.DataTypes.DefaultContentListView}", SortOrder = 2, UniqueId = Constants.DataTypes.Guids.ListViewContentGuid, Text = Constants.Conventions.DataTypes.ListViewPrefix + "Content", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
+            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = Constants.DataTypes.DefaultMediaListView, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = $"-1,{Constants.DataTypes.DefaultMediaListView}", SortOrder = 2, UniqueId = Constants.DataTypes.Guids.ListViewMediaGuid, Text = Constants.Conventions.DataTypes.ListViewPrefix + "Media", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
+            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = Constants.DataTypes.DefaultMembersListView, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = $"-1,{Constants.DataTypes.DefaultMembersListView}", SortOrder = 2, UniqueId = Constants.DataTypes.Guids.ListViewMembersGuid, Text = Constants.Conventions.DataTypes.ListViewPrefix + "Members", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
             _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = 1031, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,1031", SortOrder = 2, UniqueId = new Guid("f38bd2d7-65d0-48e6-95dc-87ce06ec2d3d"), Text = Constants.Conventions.MediaTypes.Folder, NodeObjectType = Constants.ObjectTypes.MediaType, CreateDate = DateTime.Now });
             _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = 1032, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,1032", SortOrder = 2, UniqueId = new Guid("cc07b313-0843-4aa8-bbda-871c8da728c8"), Text = Constants.Conventions.MediaTypes.Image, NodeObjectType = Constants.ObjectTypes.MediaType, CreateDate = DateTime.Now });
             _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = 1033, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,1033", SortOrder = 2, UniqueId = new Guid("4c52d8ab-54e6-40cd-999c-7a5f24903e4d"), Text = Constants.Conventions.MediaTypes.File, NodeObjectType = Constants.ObjectTypes.MediaType, CreateDate = DateTime.Now });
diff --git a/src/Umbraco.Core/Models/DataTypeExtensions.cs b/src/Umbraco.Core/Models/DataTypeExtensions.cs
index 922b6a6a39..f460edbde7 100644
--- a/src/Umbraco.Core/Models/DataTypeExtensions.cs
+++ b/src/Umbraco.Core/Models/DataTypeExtensions.cs
@@ -62,7 +62,12 @@ namespace Umbraco.Core.Models
             Constants.DataTypes.Guids.TextstringGuid,
             Constants.DataTypes.Guids.TextareaGuid,
             Constants.DataTypes.Guids.UploadGuid,
-            Constants.DataTypes.Guids.LabelGuid,
+            Constants.DataTypes.Guids.LabelStringGuid,
+            Constants.DataTypes.Guids.LabelDecimalGuid,
+            Constants.DataTypes.Guids.LabelDateTimeGuid,
+            Constants.DataTypes.Guids.LabelBigIntGuid,
+            Constants.DataTypes.Guids.LabelTimeGuid,
+            Constants.DataTypes.Guids.LabelDateTimeGuid,
         };
 
         /// <summary>
diff --git a/src/Umbraco.Core/PropertyEditors/IIgnoreUserStartNodesConfig.cs b/src/Umbraco.Core/PropertyEditors/IIgnoreUserStartNodesConfig.cs
new file mode 100644
index 0000000000..bef3f42f46
--- /dev/null
+++ b/src/Umbraco.Core/PropertyEditors/IIgnoreUserStartNodesConfig.cs
@@ -0,0 +1,10 @@
+namespace Umbraco.Core.PropertyEditors
+{
+    /// <summary>
+    /// Marker interface for any editor configuration that supports Ignoring user start nodes
+    /// </summary>
+    internal interface IIgnoreUserStartNodesConfig
+    {
+        bool IgnoreUserStartNodes { get; set; }
+    }
+}
diff --git a/src/Umbraco.Core/Services/DateTypeServiceExtensions.cs b/src/Umbraco.Core/Services/DateTypeServiceExtensions.cs
new file mode 100644
index 0000000000..3b72a6f258
--- /dev/null
+++ b/src/Umbraco.Core/Services/DateTypeServiceExtensions.cs
@@ -0,0 +1,21 @@
+using System;
+using Umbraco.Core.Models;
+using Umbraco.Core.PropertyEditors;
+
+namespace Umbraco.Core.Services
+{
+    internal static class DateTypeServiceExtensions
+    {
+        public static bool IsDataTypeIgnoringUserStartNodes(this IDataTypeService dataTypeService, Guid key)
+        {
+            if (DataTypeExtensions.IsBuildInDataType(key)) return false; //built in ones can never be ignoring start nodes
+
+            var dataType = dataTypeService.GetDataType(key);
+
+            if (dataType != null && dataType.Configuration is IIgnoreUserStartNodesConfig ignoreStartNodesConfig)
+                return ignoreStartNodesConfig.IgnoreUserStartNodes;
+
+            return false;
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Models/Mapping/ContentPropertyBasicMapper.cs b/src/Umbraco.Web/Models/Mapping/ContentPropertyBasicMapper.cs
index e7c53f5728..8340d24032 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentPropertyBasicMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentPropertyBasicMapper.cs
@@ -16,15 +16,17 @@ namespace Umbraco.Web.Models.Mapping
     internal class ContentPropertyBasicMapper<TDestination>
         where TDestination : ContentPropertyBasic, new()
     {
+        private readonly IEntityService _entityService;
         private readonly ILogger _logger;
         private readonly PropertyEditorCollection _propertyEditors;
         protected IDataTypeService DataTypeService { get; }
 
-        public ContentPropertyBasicMapper(IDataTypeService dataTypeService, ILogger logger, PropertyEditorCollection propertyEditors)
+        public ContentPropertyBasicMapper(IDataTypeService dataTypeService, IEntityService entityService, ILogger logger, PropertyEditorCollection propertyEditors)
         {
             _logger = logger;
             _propertyEditors = propertyEditors;
             DataTypeService = dataTypeService;
+            _entityService = entityService;
         }
 
         /// <summary>
@@ -49,6 +51,11 @@ namespace Umbraco.Web.Models.Mapping
             dest.PropertyEditor = editor;
             dest.Editor = editor.Alias;
 
+            var dataTypeKey = _entityService.GetKey(property.PropertyType.DataTypeId, UmbracoObjectTypes.DataType);
+            if (!dataTypeKey.Success)
+                throw new InvalidOperationException("Can't get the unique key from the id: " + property.PropertyType.DataTypeId);
+            dest.DataTypeId = dataTypeKey.Result;
+
             // if there's a set of property aliases specified, we will check if the current property's value should be mapped.
             // if it isn't one of the ones specified in 'includeProperties', we will just return the result without mapping the Value.
             var includedProperties = context.GetIncludedProperties();
diff --git a/src/Umbraco.Web/Models/Mapping/DataTypeMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/DataTypeMapDefinition.cs
index 4c4a03939d..6b5797e05b 100644
--- a/src/Umbraco.Web/Models/Mapping/DataTypeMapDefinition.cs
+++ b/src/Umbraco.Web/Models/Mapping/DataTypeMapDefinition.cs
@@ -146,19 +146,26 @@ namespace Umbraco.Web.Models.Mapping
             var fields = context.MapEnumerable<ConfigurationField,DataTypeConfigurationFieldDisplay>(configurationEditor.Fields);
             var configurationDictionary = configurationEditor.ToConfigurationEditor(dataType.Configuration);
 
-            MapConfigurationFields(fields, configurationDictionary);
+            MapConfigurationFields(dataType, fields, configurationDictionary);
 
             return fields;
         }
-
-        private void MapConfigurationFields(List<DataTypeConfigurationFieldDisplay> fields, IDictionary<string, object> configuration)
+        
+        private void MapConfigurationFields(IDataType dataType, List<DataTypeConfigurationFieldDisplay> fields, IDictionary<string, object> configuration)
         {
             if (fields == null) throw new ArgumentNullException(nameof(fields));
             if (configuration == null) throw new ArgumentNullException(nameof(configuration));
 
             // now we need to wire up the pre-values values with the actual fields defined
-            foreach (var field in fields)
+            foreach (var field in fields.ToList())
             {
+                //filter out the not-supported pre-values for built-in data types
+                if (dataType != null && dataType.IsBuildInDataType() && field.Key.InvariantEquals(Constants.DataTypes.ReservedPreValueKeys.IgnoreUserStartNodes))
+                {
+                    fields.Remove(field);
+                    continue;
+                }
+
                 if (configuration.TryGetValue(field.Key, out var value))
                 {
                     field.Value = value;
@@ -194,7 +201,7 @@ namespace Umbraco.Web.Models.Mapping
 
             var defaultConfiguration = configurationEditor.DefaultConfiguration;
             if (defaultConfiguration != null)
-                MapConfigurationFields(fields, defaultConfiguration);
+                MapConfigurationFields(null, fields, defaultConfiguration);
 
             return fields;
         }
diff --git a/src/Umbraco.Web/PropertyEditors/ContentPickerConfiguration.cs b/src/Umbraco.Web/PropertyEditors/ContentPickerConfiguration.cs
index 7879e2b42b..d7f7ca9551 100644
--- a/src/Umbraco.Web/PropertyEditors/ContentPickerConfiguration.cs
+++ b/src/Umbraco.Web/PropertyEditors/ContentPickerConfiguration.cs
@@ -3,12 +3,15 @@ using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.PropertyEditors
 {
-    public class ContentPickerConfiguration
+    public class ContentPickerConfiguration : IIgnoreUserStartNodesConfig
     {
         [ConfigurationField("showOpenButton", "Show open button (this feature is in beta!)", "boolean", Description = "Opens the node in a dialog")]
         public bool ShowOpenButton { get; set; }
 
         [ConfigurationField("startNodeId", "Start node", "treepicker")] // + config in configuration editor ctor
         public Udi StartNodeId { get; set; }
+
+        [ConfigurationField(Core.Constants.DataTypes.ReservedPreValueKeys.IgnoreUserStartNodes, "Selecting this option allows a user to choose nodes that they normally don't have access to.", "boolean")]
+        public bool IgnoreUserStartNodes { get; set; }
     }
 }
diff --git a/src/Umbraco.Web/PropertyEditors/GridConfiguration.cs b/src/Umbraco.Web/PropertyEditors/GridConfiguration.cs
index e2b46b360d..80f09d3f8f 100644
--- a/src/Umbraco.Web/PropertyEditors/GridConfiguration.cs
+++ b/src/Umbraco.Web/PropertyEditors/GridConfiguration.cs
@@ -6,7 +6,7 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// Represents the configuration for the grid value editor.
     /// </summary>
-    public class GridConfiguration
+    public class GridConfiguration : IIgnoreUserStartNodesConfig
     {
         // TODO: Make these strongly typed, for now this works though
         [ConfigurationField("items", "Grid", "views/propertyeditors/grid/grid.prevalues.html", Description = "Grid configuration")]
@@ -15,5 +15,8 @@ namespace Umbraco.Web.PropertyEditors
         // TODO: Make these strongly typed, for now this works though
         [ConfigurationField("rte", "Rich text editor", "views/propertyeditors/rte/rte.prevalues.html", Description = "Rich text editor configuration")]
         public JObject Rte { get; set; }
+
+        [ConfigurationField(Core.Constants.DataTypes.ReservedPreValueKeys.IgnoreUserStartNodes, "Selecting this option allows a user to choose nodes that they normally don't have access to.", "boolean")]
+        public bool IgnoreUserStartNodes { get; set; }
     }
 }
diff --git a/src/Umbraco.Web/PropertyEditors/MediaPickerConfiguration.cs b/src/Umbraco.Web/PropertyEditors/MediaPickerConfiguration.cs
index 4844e2f822..3a9a9e25ac 100644
--- a/src/Umbraco.Web/PropertyEditors/MediaPickerConfiguration.cs
+++ b/src/Umbraco.Web/PropertyEditors/MediaPickerConfiguration.cs
@@ -6,7 +6,7 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// Represents the configuration for the media picker value editor.
     /// </summary>
-    public class MediaPickerConfiguration
+    public class MediaPickerConfiguration : IIgnoreUserStartNodesConfig
     {
         [ConfigurationField("multiPicker", "Pick multiple items", "boolean")]
         public bool Multiple { get; set; }
@@ -19,5 +19,8 @@ namespace Umbraco.Web.PropertyEditors
 
         [ConfigurationField("startNodeId", "Start node", "mediapicker")]
         public Udi StartNodeId { get; set; }
+
+        [ConfigurationField(Core.Constants.DataTypes.ReservedPreValueKeys.IgnoreUserStartNodes, "Selecting this option allows a user to choose nodes that they normally don't have access to.", "boolean")]
+        public bool IgnoreUserStartNodes { get; set; }
     }
 }
diff --git a/src/Umbraco.Web/PropertyEditors/MultiNodePickerConfiguration.cs b/src/Umbraco.Web/PropertyEditors/MultiNodePickerConfiguration.cs
index 279872e2d2..310211ab2b 100644
--- a/src/Umbraco.Web/PropertyEditors/MultiNodePickerConfiguration.cs
+++ b/src/Umbraco.Web/PropertyEditors/MultiNodePickerConfiguration.cs
@@ -6,7 +6,7 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// Represents the configuration for the multinode picker value editor.
     /// </summary>
-    public class MultiNodePickerConfiguration
+    public class MultiNodePickerConfiguration : IIgnoreUserStartNodesConfig
     {
         [ConfigurationField("startNode", "Node type", "treesource")]
         public MultiNodePickerConfigurationTreeSource TreeSource { get; set; }
@@ -22,5 +22,8 @@ namespace Umbraco.Web.PropertyEditors
 
         [ConfigurationField("showOpenButton", "Show open button (this feature is in preview!)", "boolean", Description = "Opens the node in a dialog")]
         public bool ShowOpen { get; set; }
+
+        [ConfigurationField(Core.Constants.DataTypes.ReservedPreValueKeys.IgnoreUserStartNodes, "Selecting this option allows a user to choose nodes that they normally don't have access to.", "boolean")]
+        public bool IgnoreUserStartNodes { get; set; }
     }
 }
diff --git a/src/Umbraco.Web/PropertyEditors/RichTextConfiguration.cs b/src/Umbraco.Web/PropertyEditors/RichTextConfiguration.cs
index 13bf269bcd..30d3ee2113 100644
--- a/src/Umbraco.Web/PropertyEditors/RichTextConfiguration.cs
+++ b/src/Umbraco.Web/PropertyEditors/RichTextConfiguration.cs
@@ -6,7 +6,7 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// Represents the configuration for the rich text value editor.
     /// </summary>
-    public class RichTextConfiguration
+    public class RichTextConfiguration : IIgnoreUserStartNodesConfig
     {
         // TODO: Make these strongly typed, for now this works though
         [ConfigurationField("editor", "Editor", "views/propertyeditors/rte/rte.prevalues.html", HideLabel = true)]
@@ -14,5 +14,8 @@ namespace Umbraco.Web.PropertyEditors
 
         [ConfigurationField("hideLabel", "Hide Label", "boolean")]
         public bool HideLabel { get; set; }
+
+        [ConfigurationField(Core.Constants.DataTypes.ReservedPreValueKeys.IgnoreUserStartNodes, "Selecting this option allows a user to choose nodes that they normally don't have access to.", "boolean")]
+        public bool IgnoreUserStartNodes { get; set; }
     }
 }
diff --git a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
index 2f90c7ac29..091c3a8f8d 100644
--- a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
+++ b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
@@ -244,7 +244,7 @@ namespace Umbraco.Web.Trees
             return result;
         }
 
-        internal virtual IEnumerable<IEntitySlim> GetChildrenFromEntityService(int entityId)
+        private IEnumerable<IEntitySlim> GetChildrenFromEntityService(int entityId)
             => Services.EntityService.GetChildren(entityId, UmbracoObjectType).ToList();
 
         /// <summary>

From 958c3b147b12d19309f7d7c43d2f55820d8c3489 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 28 Jun 2019 15:42:23 +1000
Subject: [PATCH 061/776] more manual merging

---
 .../linkpicker/linkpicker.controller.js       | 25 +++++++++----------
 .../linkpicker/linkpicker.html                |  4 ++-
 .../mediapicker/mediapicker.controller.js     | 14 +++++++++--
 3 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
index 6568cfb567..0286fb2384 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
@@ -1,6 +1,6 @@
 //used for the media picker dialog
 angular.module("umbraco").controller("Umbraco.Editors.LinkPickerController",
-    function ($scope, eventsService, entityResource, contentResource, mediaResource, mediaHelper, udiParser, userService, localizationService, tinyMceService, editorService, contentEditingHelper) {
+    function ($scope, eventsService, entityResource, mediaResource, mediaHelper, udiParser, userService, localizationService, tinyMceService, editorService, contentEditingHelper) {
         
         var vm = this;
         var dialogOptions = $scope.model;
@@ -20,13 +20,14 @@ angular.module("umbraco").controller("Umbraco.Editors.LinkPickerController",
                     $scope.model.title = value;
                 });
         }
-
+        $scope.customTreeParams = dialogOptions.dataTypeId ? "dataTypeId=" + dialogOptions.dataTypeId : "";
         $scope.dialogTreeApi = {};
         $scope.model.target = {};
         $scope.searchInfo = {
             searchFromId: null,
             searchFromName: null,
             showSearch: false,
+            dataTypeId: dialogOptions.dataTypeId,
             results: [],
             selectedSearchResults: []
         };
@@ -86,10 +87,11 @@ angular.module("umbraco").controller("Umbraco.Editors.LinkPickerController",
                         oneTimeTreeSync.sync();
                     });
 
-                    // get the content properties to build the anchor name list
-                    contentResource.getById(id).then(function (resp) {
-                        handleContentTarget(resp);
+                    entityResource.getUrlAndAnchors(id).then(function (resp) {
+                        $scope.anchorValues = resp.anchorValues;
+                        $scope.model.target.url = resp.url;
                     });
+
                 }
             } 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
@@ -136,10 +138,11 @@ angular.module("umbraco").controller("Umbraco.Editors.LinkPickerController",
 
             if (args.node.id < 0) {
                 $scope.model.target.url = "/";
-            } else {
-                contentResource.getById(args.node.id).then(function (resp) {
-                    handleContentTarget(resp);
-
+            }
+            else {
+                entityResource.getUrlAndAnchors(args.node.id).then(function (resp) {
+                    $scope.anchorValues = resp.anchorValues;
+                    $scope.model.target.url = resp.url;
                 });
             }
 
@@ -148,10 +151,6 @@ angular.module("umbraco").controller("Umbraco.Editors.LinkPickerController",
             }
         }
 
-        function handleContentTarget(content) {
-            $scope.anchorValues = tinyMceService.getAnchorNames(JSON.stringify(contentEditingHelper.getAllProps(content.variants[0])));
-            $scope.model.target.url = content.urls.filter(item => item.culture === $scope.currentNode.metaData.culture)[0].text;
-        }
 
         function nodeExpandedHandler(args) {
             // open mini list view for list views
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.html
index 0bb91d8da6..e1880d5ac5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.html
@@ -65,6 +65,7 @@
                                 search-callback="onSearchResults"
                                 search-from-id="{{searchInfo.searchFromId}}"
                                 search-from-name="{{searchInfo.searchFromName}}"
+                                datatype-id="{{searchInfo.dataTypeId}}"
                                 show-search="{{searchInfo.showSearch}}"
                                 section="{{section}}">
                             </umb-tree-search-box>
@@ -86,7 +87,8 @@
                                     on-init="onTreeInit()"
                                     enablelistviewexpand="true"
                                     isdialog="true"
-                                    enablecheckboxes="true">
+                                    enablecheckboxes="true"
+                                    customtreeparams="{{customTreeParams}}">
                                 </umb-tree>
                             </div>
                         </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
index d7cac59348..c32730a2ac 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
@@ -7,6 +7,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
         var multiPicker = $scope.model.config.multiPicker && $scope.model.config.multiPicker !== '0' ? true : false;
         var onlyImages = $scope.model.config.onlyImages && $scope.model.config.onlyImages !== '0' ? true : false;
         var disableFolderSelect = $scope.model.config.disableFolderSelect && $scope.model.config.disableFolderSelect !== '0' ? true : false;
+
         $scope.allowEditMedia = false;
         $scope.allowAddMedia = false;
 
@@ -107,10 +108,18 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
         function init() {
 
             userService.getCurrentUser().then(function (userData) {
+
                 if (!$scope.model.config.startNodeId) {
-                    $scope.model.config.startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
-                    $scope.model.config.startNodeIsVirtual = userData.startMediaIds.length !== 1;
+                    if ($scope.model.config.ignoreUserStartNodes === "1") {
+                        $scope.model.config.startNodeId = -1;
+                        $scope.model.config.startNodeIsVirtual = true;
+                    }
+                    else {
+                        $scope.model.config.startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
+                        $scope.model.config.startNodeIsVirtual = userData.startMediaIds.length !== 1;
+                    }  
                 }
+
                 // only allow users to add and edit media if they have access to the media section
                 var hasAccessToMedia = userData.allowedSections.indexOf("media") !== -1;
                 $scope.allowEditMedia = hasAccessToMedia;
@@ -168,6 +177,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
             var mediaPicker = {
                 startNodeId: $scope.model.config.startNodeId,
                 startNodeIsVirtual: $scope.model.config.startNodeIsVirtual,
+                dataTypeId: $scope.model.dataTypeId,
                 multiPicker: multiPicker,
                 onlyImages: onlyImages,
                 disableFolderSelect: disableFolderSelect,

From e5956e4955474694c12ed6da7a4d5600acd0af8c Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Fri, 28 Jun 2019 09:19:11 +0200
Subject: [PATCH 062/776] V8: Don't cast IContent to Content in
 DocumentRepository (#4611)

---
 .../Models/Entities/EntityBase.cs             |  32 +---
 .../Models/Entities/EntityExtensions.cs       |  46 +++++
 src/Umbraco.Core/Models/Member.cs             |  13 --
 .../Implement/AuditEntryRepository.cs         |   2 +-
 .../Implement/ConsentRepository.cs            |   4 +-
 .../Implement/ContentTypeRepository.cs        |   5 +-
 .../Implement/DataTypeRepository.cs           |   5 +-
 .../Implement/DictionaryRepository.cs         |   2 +-
 .../Implement/DocumentRepository.cs           | 163 +++++++++---------
 .../Implement/DomainRepository.cs             |   5 +-
 .../Implement/ExternalLoginRepository.cs      |   4 +-
 .../Implement/LanguageRepository.cs           |   4 +-
 .../Repositories/Implement/MacroRepository.cs |   4 +-
 .../Repositories/Implement/MediaRepository.cs |   3 +-
 .../Implement/MediaTypeRepository.cs          |   5 +-
 .../Implement/MemberGroupRepository.cs        |   3 +-
 .../Implement/MemberRepository.cs             |   8 +-
 .../Implement/MemberTypeRepository.cs         |   5 +-
 .../Implement/PublicAccessRepository.cs       |   1 +
 .../Implement/RelationRepository.cs           |   4 +-
 .../Implement/RelationTypeRepository.cs       |   4 +-
 .../Implement/ServerRegistrationRepository.cs |   5 +-
 .../Repositories/Implement/TagRepository.cs   |   4 +-
 .../Implement/UserGroupRepository.cs          |   4 +-
 .../Repositories/Implement/UserRepository.cs  |   4 +-
 src/Umbraco.Core/Umbraco.Core.csproj          |   1 +
 26 files changed, 177 insertions(+), 163 deletions(-)
 create mode 100644 src/Umbraco.Core/Models/Entities/EntityExtensions.cs

diff --git a/src/Umbraco.Core/Models/Entities/EntityBase.cs b/src/Umbraco.Core/Models/Entities/EntityBase.cs
index 43837fa776..cdb3ecebc5 100644
--- a/src/Umbraco.Core/Models/Entities/EntityBase.cs
+++ b/src/Umbraco.Core/Models/Entities/EntityBase.cs
@@ -81,37 +81,7 @@ namespace Umbraco.Core.Models.Entities
             _key = Guid.Empty;
             _hasIdentity = false;
         }
-
-        /// <summary>
-        /// Updates the entity when it is being saved for the first time.
-        /// </summary>
-        internal virtual void AddingEntity()
-        {
-            var now = DateTime.Now;
-
-            // set the create and update dates, if not already set
-            if (IsPropertyDirty("CreateDate") == false || _createDate == default)
-                CreateDate = now;
-            if (IsPropertyDirty("UpdateDate") == false || _updateDate == default)
-                UpdateDate = now;
-        }
-
-        /// <summary>
-        /// Updates the entity when it is being saved.
-        /// </summary>
-        internal virtual void UpdatingEntity()
-        {
-            var now = DateTime.Now;
-
-            // just in case
-            if (_createDate == default)
-                CreateDate = now;
-
-            // set the update date if not already set
-            if (IsPropertyDirty("UpdateDate") == false || _updateDate == default)
-                UpdateDate = now;
-        }
-
+        
         public virtual bool Equals(EntityBase other)
         {
             return other != null && (ReferenceEquals(this, other) || SameIdentityAs(other));
diff --git a/src/Umbraco.Core/Models/Entities/EntityExtensions.cs b/src/Umbraco.Core/Models/Entities/EntityExtensions.cs
new file mode 100644
index 0000000000..2ee6a2d5ed
--- /dev/null
+++ b/src/Umbraco.Core/Models/Entities/EntityExtensions.cs
@@ -0,0 +1,46 @@
+using System;
+
+namespace Umbraco.Core.Models.Entities
+{
+    internal static class EntityExtensions
+    {
+        /// <summary>
+        /// Updates the entity when it is being saved.
+        /// </summary>
+        internal static void UpdatingEntity(this IEntity entity)
+        {
+            var now = DateTime.Now;
+
+            // just in case
+            if (entity.CreateDate == default)
+            {
+                entity.CreateDate = now;
+            }
+
+            // set the update date if not already set
+            if (entity.UpdateDate == default || (entity is ICanBeDirty canBeDirty && canBeDirty.IsPropertyDirty("UpdateDate") == false))
+            {
+                entity.UpdateDate = now;
+            }
+        }
+
+        /// <summary>
+        /// Updates the entity when it is being saved for the first time.
+        /// </summary>
+        internal static void AddingEntity(this IEntity entity)
+        {
+            var now = DateTime.Now;
+            var canBeDirty = entity as ICanBeDirty;
+
+            // set the create and update dates, if not already set
+            if (entity.CreateDate == default || canBeDirty?.IsPropertyDirty("CreateDate") == false)
+            {
+                entity.CreateDate = now;
+            }
+            if (entity.UpdateDate == default || canBeDirty?.IsPropertyDirty("UpdateDate") == false)
+            {
+                entity.UpdateDate = now;
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Models/Member.cs b/src/Umbraco.Core/Models/Member.cs
index 0e91065d56..b473a154f1 100644
--- a/src/Umbraco.Core/Models/Member.cs
+++ b/src/Umbraco.Core/Models/Member.cs
@@ -478,19 +478,6 @@ namespace Umbraco.Core.Models
             set => SetPropertyValueAndDetectChanges(value, ref _providerUserKey, nameof(ProviderUserKey));
         }
 
-
-        /// <summary>
-        /// Method to call when Entity is being saved
-        /// </summary>
-        /// <remarks>Created date is set and a Unique key is assigned</remarks>
-        internal override void AddingEntity()
-        {
-            base.AddingEntity();
-
-            if (ProviderUserKey == null)
-                ProviderUserKey = Key;
-        }
-
         /* Internal experiment - only used for mapping queries.
          * Adding these to have first level properties instead of the Properties collection.
          */
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/AuditEntryRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/AuditEntryRepository.cs
index 1486935e2a..c3d34cc3e9 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/AuditEntryRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/AuditEntryRepository.cs
@@ -100,7 +100,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         /// <inheritdoc />
         protected override void PersistNewItem(IAuditEntry entity)
         {
-            ((EntityBase) entity).AddingEntity();
+            entity.AddingEntity();
 
             var dto = AuditEntryFactory.BuildDto(entity);
             Database.Insert(dto);
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ConsentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ConsentRepository.cs
index 8df9bf686d..57d5dfa864 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ConsentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ConsentRepository.cs
@@ -69,7 +69,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         /// <inheritdoc />
         protected override void PersistNewItem(IConsent entity)
         {
-            ((EntityBase) entity).AddingEntity();
+            entity.AddingEntity();
 
             var dto = ConsentFactory.BuildDto(entity);
             Database.Insert(dto);
@@ -80,7 +80,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         /// <inheritdoc />
         protected override void PersistUpdatedItem(IConsent entity)
         {
-            ((EntityBase) entity).UpdatingEntity();
+            entity.UpdatingEntity();
 
             var dto = ConsentFactory.BuildDto(entity);
             Database.Update(dto);
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepository.cs
index 98ddcdcb17..9d77eb0990 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepository.cs
@@ -5,6 +5,7 @@ using NPoco;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
+using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.SqlSyntax;
@@ -230,7 +231,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
                 throw ex;
             }
 
-            ((ContentType)entity).AddingEntity();
+            entity.AddingEntity();
 
             PersistNewBaseContentType(entity);
             PersistTemplates(entity, false);
@@ -270,7 +271,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             ValidateAlias(entity);
 
             //Updates Modified date
-            ((ContentType)entity).UpdatingEntity();
+            entity.UpdatingEntity();
 
             //Look up parent to get and set the correct Path if ParentId has changed
             if (entity.IsPropertyDirty("ParentId"))
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/DataTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DataTypeRepository.cs
index 02ba4d1c13..dac8fda5ec 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/DataTypeRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DataTypeRepository.cs
@@ -9,6 +9,7 @@ using Umbraco.Core.Events;
 using Umbraco.Core.Exceptions;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
+using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Factories;
 using Umbraco.Core.Persistence.Querying;
@@ -106,7 +107,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         protected override void PersistNewItem(IDataType entity)
         {
-            ((DataType)entity).AddingEntity();
+            entity.AddingEntity();
 
             //ensure a datatype has a unique name before creating it
             entity.Name = EnsureUniqueNodeName(entity.Name);
@@ -174,7 +175,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             }
 
             //Updates Modified date
-            ((DataType)entity).UpdatingEntity();
+            entity.UpdatingEntity();
 
             //Look up parent to get and set the correct Path if ParentId has changed
             if (entity.IsPropertyDirty("ParentId"))
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/DictionaryRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DictionaryRepository.cs
index be1e28fcc1..0b58663952 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/DictionaryRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DictionaryRepository.cs
@@ -148,7 +148,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         protected override void PersistUpdatedItem(IDictionaryItem entity)
         {
-            ((EntityBase)entity).UpdatingEntity();
+            entity.UpdatingEntity();
 
             foreach (var translation in entity.Translations)
                 translation.Value = translation.Value.ToValidXmlString();
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
index 7e867c924c..30a2927cc8 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
@@ -6,6 +6,7 @@ using Umbraco.Core.Cache;
 using Umbraco.Core.Exceptions;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
+using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Factories;
@@ -263,21 +264,16 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         protected override void PersistNewItem(IContent entity)
         {
-            // TODO: https://github.com/umbraco/Umbraco-CMS/issues/4234 - sort out IContent vs Content
-            // however, it's not just so we have access to AddingEntity
-            // there are tons of things at the end of the methods, that can only work with a true Content
-            // and basically, the repository requires a Content, not an IContent
-            var content = (Content)entity;
+            entity.AddingEntity();
 
-            content.AddingEntity();
-            var publishing = content.PublishedState == PublishedState.Publishing;
+            var publishing = entity.PublishedState == PublishedState.Publishing;
 
             // ensure that the default template is assigned
             if (entity.TemplateId.HasValue == false)
                 entity.TemplateId = entity.ContentType.DefaultTemplate?.Id;
 
             // sanitize names
-            SanitizeNames(content, publishing);
+            SanitizeNames(entity, publishing);
 
             // ensure that strings don't contain characters that are invalid in xml
             // TODO: do we really want to keep doing this here?
@@ -327,11 +323,11 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             contentVersionDto.NodeId = nodeDto.NodeId;
             contentVersionDto.Current = !publishing;
             Database.Insert(contentVersionDto);
-            content.VersionId = contentVersionDto.Id;
+            entity.VersionId = contentVersionDto.Id;
 
             // persist the document version dto
             var documentVersionDto = dto.DocumentVersionDto;
-            documentVersionDto.Id = content.VersionId;
+            documentVersionDto.Id = entity.VersionId;
             if (publishing)
                 documentVersionDto.Published = true;
             Database.Insert(documentVersionDto);
@@ -339,62 +335,62 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             // and again in case we're publishing immediately
             if (publishing)
             {
-                content.PublishedVersionId = content.VersionId;
+                entity.PublishedVersionId = entity.VersionId;
                 contentVersionDto.Id = 0;
                 contentVersionDto.Current = true;
-                contentVersionDto.Text = content.Name;
+                contentVersionDto.Text = entity.Name;
                 Database.Insert(contentVersionDto);
-                content.VersionId = contentVersionDto.Id;
+                entity.VersionId = contentVersionDto.Id;
 
-                documentVersionDto.Id = content.VersionId;
+                documentVersionDto.Id = entity.VersionId;
                 documentVersionDto.Published = false;
                 Database.Insert(documentVersionDto);
             }
 
             // persist the property data
-            var propertyDataDtos = PropertyFactory.BuildDtos(content.ContentType.Variations, content.VersionId, content.PublishedVersionId, entity.Properties, LanguageRepository, out var edited, out var editedCultures);
+            var propertyDataDtos = PropertyFactory.BuildDtos(entity.ContentType.Variations, entity.VersionId, entity.PublishedVersionId, entity.Properties, LanguageRepository, out var edited, out var editedCultures);
             foreach (var propertyDataDto in propertyDataDtos)
                 Database.Insert(propertyDataDto);
 
             // if !publishing, we may have a new name != current publish name,
             // also impacts 'edited'
-            if (!publishing && content.PublishName != content.Name)
+            if (!publishing && entity.PublishName != entity.Name)
                 edited = true;
 
             // persist the document dto
             // at that point, when publishing, the entity still has its old Published value
             // so we need to explicitly update the dto to persist the correct value
-            if (content.PublishedState == PublishedState.Publishing)
+            if (entity.PublishedState == PublishedState.Publishing)
                 dto.Published = true;
             dto.NodeId = nodeDto.NodeId;
-            content.Edited = dto.Edited = !dto.Published || edited; // if not published, always edited
+            entity.Edited = dto.Edited = !dto.Published || edited; // if not published, always edited
             Database.Insert(dto);
 
             //insert the schedule
-            PersistContentSchedule(content, false);
+            PersistContentSchedule(entity, false);
 
             // persist the variations
-            if (content.ContentType.VariesByCulture())
+            if (entity.ContentType.VariesByCulture())
             {
                 // bump dates to align cultures to version
                 if (publishing)
-                    content.AdjustDates(contentVersionDto.VersionDate);
+                    entity.AdjustDates(contentVersionDto.VersionDate);
 
                 // names also impact 'edited'
                 // ReSharper disable once UseDeconstruction
-                foreach (var cultureInfo in content.CultureInfos)
-                    if (cultureInfo.Name != content.GetPublishName(cultureInfo.Culture))
+                foreach (var cultureInfo in entity.CultureInfos)
+                    if (cultureInfo.Name != entity.GetPublishName(cultureInfo.Culture))
                         (editedCultures ?? (editedCultures = new HashSet<string>(StringComparer.OrdinalIgnoreCase))).Add(cultureInfo.Culture);
 
                 // insert content variations
-                Database.BulkInsertRecords(GetContentVariationDtos(content, publishing));
+                Database.BulkInsertRecords(GetContentVariationDtos(entity, publishing));
 
                 // insert document variations
-                Database.BulkInsertRecords(GetDocumentVariationDtos(content, publishing, editedCultures));
+                Database.BulkInsertRecords(GetDocumentVariationDtos(entity, publishing, editedCultures));
             }
 
             // refresh content
-            content.SetCultureEdited(editedCultures);
+            entity.SetCultureEdited(editedCultures);
 
             // trigger here, before we reset Published etc
             OnUowRefreshedEntity(new ScopedEntityEventArgs(AmbientScope, entity));
@@ -402,23 +398,23 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             // flip the entity's published property
             // this also flips its published state
             // note: what depends on variations (eg PublishNames) is managed directly by the content
-            if (content.PublishedState == PublishedState.Publishing)
+            if (entity.PublishedState == PublishedState.Publishing)
             {
-                content.Published = true;
-                content.PublishTemplateId = content.TemplateId;
-                content.PublisherId = content.WriterId;
-                content.PublishName = content.Name;
-                content.PublishDate = content.UpdateDate;
+                entity.Published = true;
+                entity.PublishTemplateId = entity.TemplateId;
+                entity.PublisherId = entity.WriterId;
+                entity.PublishName = entity.Name;
+                entity.PublishDate = entity.UpdateDate;
 
                 SetEntityTags(entity, _tagRepository);
             }
-            else if (content.PublishedState == PublishedState.Unpublishing)
+            else if (entity.PublishedState == PublishedState.Unpublishing)
             {
-                content.Published = false;
-                content.PublishTemplateId = null;
-                content.PublisherId = null;
-                content.PublishName = null;
-                content.PublishDate = null;
+                entity.Published = false;
+                entity.PublishTemplateId = null;
+                entity.PublisherId = null;
+                entity.PublishName = null;
+                entity.PublishDate = null;
 
                 ClearEntityTags(entity, _tagRepository);
             }
@@ -440,34 +436,33 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         protected override void PersistUpdatedItem(IContent entity)
         {
-            // however, it's not just so we have access to AddingEntity
-            // there are tons of things at the end of the methods, that can only work with a true Content
-            // and basically, the repository requires a Content, not an IContent
-            var content = (Content)entity;
+            var entityBase = entity as EntityBase;
+            var isEntityDirty = entityBase != null && entityBase.IsDirty();
 
             // check if we need to make any database changes at all
-            if ((content.PublishedState == PublishedState.Published || content.PublishedState == PublishedState.Unpublished)
-                    && !content.IsEntityDirty() && !content.IsAnyUserPropertyDirty())
+            if ((entity.PublishedState == PublishedState.Published || entity.PublishedState == PublishedState.Unpublished)
+                    && !isEntityDirty && !entity.IsAnyUserPropertyDirty())
                 return; // no change to save, do nothing, don't even update dates
 
             // whatever we do, we must check that we are saving the current version
-            var version = Database.Fetch<ContentVersionDto>(SqlContext.Sql().Select<ContentVersionDto>().From<ContentVersionDto>().Where<ContentVersionDto>(x => x.Id == content.VersionId)).FirstOrDefault();
+            var version = Database.Fetch<ContentVersionDto>(SqlContext.Sql().Select<ContentVersionDto>().From<ContentVersionDto>().Where<ContentVersionDto>(x => x.Id == entity.VersionId)).FirstOrDefault();
             if (version == null || !version.Current)
                 throw new InvalidOperationException("Cannot save a non-current version.");
 
             // update
-            content.UpdatingEntity();
-            var publishing = content.PublishedState == PublishedState.Publishing;
+            entity.UpdatingEntity();
+
+            var publishing = entity.PublishedState == PublishedState.Publishing;
 
             // check if we need to create a new version
-            if (publishing && content.PublishedVersionId > 0)
+            if (publishing && entity.PublishedVersionId > 0)
             {
                 // published version is not published anymore
-                Database.Execute(Sql().Update<DocumentVersionDto>(u => u.Set(x => x.Published, false)).Where<DocumentVersionDto>(x => x.Id == content.PublishedVersionId));
+                Database.Execute(Sql().Update<DocumentVersionDto>(u => u.Set(x => x.Published, false)).Where<DocumentVersionDto>(x => x.Id == entity.PublishedVersionId));
             }
 
             // sanitize names
-            SanitizeNames(content, publishing);
+            SanitizeNames(entity, publishing);
 
             // ensure that strings don't contain characters that are invalid in xml
             // TODO: do we really want to keep doing this here?
@@ -507,13 +502,13 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             // and, if publishing, insert new content & document version dtos
             if (publishing)
             {
-                content.PublishedVersionId = content.VersionId;
+                entity.PublishedVersionId = entity.VersionId;
 
                 contentVersionDto.Id = 0; // want a new id
                 contentVersionDto.Current = true; // current version
-                contentVersionDto.Text = content.Name;
+                contentVersionDto.Text = entity.Name;
                 Database.Insert(contentVersionDto);
-                content.VersionId = documentVersionDto.Id = contentVersionDto.Id; // get the new id
+                entity.VersionId = documentVersionDto.Id = contentVersionDto.Id; // get the new id
 
                 documentVersionDto.Published = false; // non-published version
                 Database.Insert(documentVersionDto);
@@ -521,31 +516,31 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
             // replace the property data (rather than updating)
             // only need to delete for the version that existed, the new version (if any) has no property data yet
-            var versionToDelete = publishing ? content.PublishedVersionId : content.VersionId;
+            var versionToDelete = publishing ? entity.PublishedVersionId : entity.VersionId;
             var deletePropertyDataSql = Sql().Delete<PropertyDataDto>().Where<PropertyDataDto>(x => x.VersionId == versionToDelete);
             Database.Execute(deletePropertyDataSql);
 
             // insert property data
-            var propertyDataDtos = PropertyFactory.BuildDtos(content.ContentType.Variations, content.VersionId, publishing ? content.PublishedVersionId : 0,
+            var propertyDataDtos = PropertyFactory.BuildDtos(entity.ContentType.Variations, entity.VersionId, publishing ? entity.PublishedVersionId : 0,
                 entity.Properties, LanguageRepository, out var edited, out var editedCultures);
             foreach (var propertyDataDto in propertyDataDtos)
                 Database.Insert(propertyDataDto);
 
             // if !publishing, we may have a new name != current publish name,
             // also impacts 'edited'
-            if (!publishing && content.PublishName != content.Name)
+            if (!publishing && entity.PublishName != entity.Name)
                 edited = true;
 
-            if (content.ContentType.VariesByCulture())
+            if (entity.ContentType.VariesByCulture())
             {
                 // bump dates to align cultures to version
                 if (publishing)
-                    content.AdjustDates(contentVersionDto.VersionDate);
+                    entity.AdjustDates(contentVersionDto.VersionDate);
 
                 // names also impact 'edited'
                 // ReSharper disable once UseDeconstruction
-                foreach (var cultureInfo in content.CultureInfos)
-                    if (cultureInfo.Name != content.GetPublishName(cultureInfo.Culture))
+                foreach (var cultureInfo in entity.CultureInfos)
+                    if (cultureInfo.Name != entity.GetPublishName(cultureInfo.Culture))
                     {
                         edited = true;
                         (editedCultures ?? (editedCultures = new HashSet<string>(StringComparer.OrdinalIgnoreCase))).Add(cultureInfo.Culture);
@@ -563,7 +558,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
                 Database.Execute(deleteContentVariations);
 
                 // replace the document version variations (rather than updating)
-                var deleteDocumentVariations = Sql().Delete<DocumentCultureVariationDto>().Where<DocumentCultureVariationDto>(x => x.NodeId == content.Id);
+                var deleteDocumentVariations = Sql().Delete<DocumentCultureVariationDto>().Where<DocumentCultureVariationDto>(x => x.NodeId == entity.Id);
                 Database.Execute(deleteDocumentVariations);
 
                 // TODO: NPoco InsertBulk issue?
@@ -573,32 +568,32 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
                 // (same in PersistNewItem above)
 
                 // insert content variations
-                Database.BulkInsertRecords(GetContentVariationDtos(content, publishing));
+                Database.BulkInsertRecords(GetContentVariationDtos(entity, publishing));
 
                 // insert document variations
-                Database.BulkInsertRecords(GetDocumentVariationDtos(content, publishing, editedCultures));
+                Database.BulkInsertRecords(GetDocumentVariationDtos(entity, publishing, editedCultures));
             }
 
             // refresh content
-            content.SetCultureEdited(editedCultures);
+            entity.SetCultureEdited(editedCultures);
 
             // update the document dto
             // at that point, when un/publishing, the entity still has its old Published value
             // so we need to explicitly update the dto to persist the correct value
-            if (content.PublishedState == PublishedState.Publishing)
+            if (entity.PublishedState == PublishedState.Publishing)
                 dto.Published = true;
-            else if (content.PublishedState == PublishedState.Unpublishing)
+            else if (entity.PublishedState == PublishedState.Unpublishing)
                 dto.Published = false;
-            content.Edited = dto.Edited = !dto.Published || edited; // if not published, always edited
+            entity.Edited = dto.Edited = !dto.Published || edited; // if not published, always edited
             Database.Update(dto);
 
             //update the schedule
-            if (content.IsPropertyDirty("ContentSchedule"))
-                PersistContentSchedule(content, true);
+            if (entity.IsPropertyDirty("ContentSchedule"))
+                PersistContentSchedule(entity, true);
 
             // if entity is publishing, update tags, else leave tags there
             // means that implicitly unpublished, or trashed, entities *still* have tags in db
-            if (content.PublishedState == PublishedState.Publishing)
+            if (entity.PublishedState == PublishedState.Publishing)
                 SetEntityTags(entity, _tagRepository);
 
             // trigger here, before we reset Published etc
@@ -606,23 +601,23 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
             // flip the entity's published property
             // this also flips its published state
-            if (content.PublishedState == PublishedState.Publishing)
+            if (entity.PublishedState == PublishedState.Publishing)
             {
-                content.Published = true;
-                content.PublishTemplateId = content.TemplateId;
-                content.PublisherId = content.WriterId;
-                content.PublishName = content.Name;
-                content.PublishDate = content.UpdateDate;
+                entity.Published = true;
+                entity.PublishTemplateId = entity.TemplateId;
+                entity.PublisherId = entity.WriterId;
+                entity.PublishName = entity.Name;
+                entity.PublishDate = entity.UpdateDate;
 
                 SetEntityTags(entity, _tagRepository);
             }
-            else if (content.PublishedState == PublishedState.Unpublishing)
+            else if (entity.PublishedState == PublishedState.Unpublishing)
             {
-                content.Published = false;
-                content.PublishTemplateId = null;
-                content.PublisherId = null;
-                content.PublishName = null;
-                content.PublishDate = null;
+                entity.Published = false;
+                entity.PublishTemplateId = null;
+                entity.PublisherId = null;
+                entity.PublishName = null;
+                entity.PublishDate = null;
 
                 ClearEntityTags(entity, _tagRepository);
             }
@@ -1338,7 +1333,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         #region Utilities
 
-        private void SanitizeNames(Content content, bool publishing)
+        private void SanitizeNames(IContent content, bool publishing)
         {
             // a content item *must* have an invariant name, and invariant published name
             // else we just cannot write the invariant rows (node, content version...) to the database
@@ -1403,7 +1398,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
                                  x.NodeId != SqlTemplate.Arg<int>("id"))
             .OrderBy<ContentVersionCultureVariationDto>(x => x.LanguageId));
 
-        private void EnsureVariantNamesAreUnique(Content content, bool publishing)
+        private void EnsureVariantNamesAreUnique(IContent content, bool publishing)
         {
             if (!EnsureUniqueNaming || !content.ContentType.VariesByCulture() || content.CultureInfos.Count == 0) return;
 
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/DomainRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DomainRepository.cs
index 69523a860a..9aa28fb18a 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/DomainRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DomainRepository.cs
@@ -6,6 +6,7 @@ using NPoco;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
+using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Scoping;
@@ -101,7 +102,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
                 if (languageExists == 0) throw new NullReferenceException("No language exists with id " + entity.LanguageId.Value);
             }
 
-            ((UmbracoDomain)entity).AddingEntity();
+            entity.AddingEntity();
 
             var factory = new DomainModelFactory();
             var dto = factory.BuildDto(entity);
@@ -120,7 +121,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         protected override void PersistUpdatedItem(IDomain entity)
         {
-            ((UmbracoDomain)entity).UpdatingEntity();
+            entity.UpdatingEntity();
 
             var exists = Database.ExecuteScalar<int>("SELECT COUNT(*) FROM umbracoDomain WHERE domainName = @domainName AND umbracoDomain.id <> @id",
                 new { domainName = entity.DomainName, id = entity.Id });
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ExternalLoginRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ExternalLoginRepository.cs
index 0fa48e5521..f708590ea8 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ExternalLoginRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ExternalLoginRepository.cs
@@ -139,7 +139,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         protected override void PersistNewItem(IIdentityUserLogin entity)
         {
-            ((EntityBase)entity).AddingEntity();
+            entity.AddingEntity();
 
             var dto = ExternalLoginFactory.BuildDto(entity);
 
@@ -151,7 +151,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         protected override void PersistUpdatedItem(IIdentityUserLogin entity)
         {
-            ((EntityBase)entity).UpdatingEntity();
+            entity.UpdatingEntity();
             
             var dto = ExternalLoginFactory.BuildDto(entity);
 
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/LanguageRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/LanguageRepository.cs
index 5a62c25df7..8429532b01 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/LanguageRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/LanguageRepository.cs
@@ -129,7 +129,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             if (entity.IsoCode.IsNullOrWhiteSpace() || entity.CultureName.IsNullOrWhiteSpace())
                 throw new InvalidOperationException("Cannot save a language without an ISO code and a culture name.");
 
-            ((EntityBase) entity).AddingEntity();
+            entity.AddingEntity();
 
             // deal with entity becoming the new default entity
             if (entity.IsDefault)
@@ -156,7 +156,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             if (entity.IsoCode.IsNullOrWhiteSpace() || entity.CultureName.IsNullOrWhiteSpace())
                 throw new InvalidOperationException("Cannot save a language without an ISO code and a culture name.");
 
-            ((EntityBase) entity).UpdatingEntity();
+            entity.UpdatingEntity();
 
             if (entity.IsDefault)
             {
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/MacroRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/MacroRepository.cs
index 565917e078..f0044e225d 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/MacroRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/MacroRepository.cs
@@ -132,7 +132,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         protected override void PersistNewItem(IMacro entity)
         {
-            ((EntityBase)entity).AddingEntity();
+            entity.AddingEntity();
 
             var dto = MacroFactory.BuildDto(entity);
 
@@ -152,7 +152,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         protected override void PersistUpdatedItem(IMacro entity)
         {
-            ((EntityBase)entity).UpdatingEntity();
+            entity.UpdatingEntity();
 ;
             var dto = MacroFactory.BuildDto(entity);
 
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/MediaRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/MediaRepository.cs
index 65043c4c67..25828b8126 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/MediaRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/MediaRepository.cs
@@ -8,6 +8,7 @@ using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Exceptions;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
+using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Factories;
 using Umbraco.Core.Persistence.Querying;
@@ -217,7 +218,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         protected override void PersistNewItem(IMedia entity)
         {
             var media = (Models.Media) entity;
-            media.AddingEntity();
+            entity.AddingEntity();
 
             // ensure unique name on the same level
             entity.Name = EnsureUniqueNodeName(entity.ParentId, entity.Name);
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/MediaTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/MediaTypeRepository.cs
index 281255e755..1abc75cf3a 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/MediaTypeRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/MediaTypeRepository.cs
@@ -5,6 +5,7 @@ using NPoco;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
+using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Scoping;
@@ -102,7 +103,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         protected override void PersistNewItem(IMediaType entity)
         {
-            ((MediaType)entity).AddingEntity();
+            entity.AddingEntity();
 
             PersistNewBaseContentType(entity);
 
@@ -114,7 +115,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             ValidateAlias(entity);
 
             //Updates Modified date
-            ((MediaType)entity).UpdatingEntity();
+            entity.UpdatingEntity();
 
             //Look up parent to get and set the correct Path if ParentId has changed
             if (entity.IsPropertyDirty("ParentId"))
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/MemberGroupRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberGroupRepository.cs
index ff7a79f98e..c138550de5 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/MemberGroupRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberGroupRepository.cs
@@ -6,6 +6,7 @@ using Umbraco.Core.Cache;
 using Umbraco.Core.Events;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
+using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Factories;
 using Umbraco.Core.Persistence.Querying;
@@ -91,8 +92,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         protected override void PersistNewItem(IMemberGroup entity)
         {
             //Save to db
+            entity.AddingEntity();
             var group = (MemberGroup)entity;
-            group.AddingEntity();
             var dto = MemberGroupFactory.BuildDto(group);
             var o = Database.IsNew(dto) ? Convert.ToInt32(Database.Insert(dto)) : Database.Update(dto);
             group.Id = dto.NodeId; //Set Id on entity to ensure an Id is set
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/MemberRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberRepository.cs
index 808f61305a..1fc3568fc0 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/MemberRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberRepository.cs
@@ -6,6 +6,7 @@ using NPoco;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
+using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Factories;
 using Umbraco.Core.Persistence.Querying;
@@ -232,8 +233,13 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         protected override void PersistNewItem(IMember entity)
         {
+            if (entity.ProviderUserKey == null)
+            {
+                entity.ProviderUserKey = entity.Key;
+            }
+            entity.AddingEntity();
+
             var member = (Member) entity;
-            member.AddingEntity();
 
             // ensure that strings don't contain characters that are invalid in xml
             // TODO: do we really want to keep doing this here?
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/MemberTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberTypeRepository.cs
index ecc0b73ed8..61981a42e3 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/MemberTypeRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberTypeRepository.cs
@@ -5,6 +5,7 @@ using NPoco;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
+using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Factories;
 using Umbraco.Core.Persistence.Querying;
@@ -131,7 +132,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         {
             ValidateAlias(entity);
 
-            ((MemberType)entity).AddingEntity();
+            entity.AddingEntity();
 
             //set a default icon if one is not specified
             if (entity.Icon.IsNullOrWhiteSpace())
@@ -165,7 +166,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             ValidateAlias(entity);
 
             //Updates Modified date
-            ((MemberType)entity).UpdatingEntity();
+            entity.UpdatingEntity();
 
             //Look up parent to get and set the correct Path if ParentId has changed
             if (entity.IsPropertyDirty("ParentId"))
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/PublicAccessRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/PublicAccessRepository.cs
index bd2580b38f..1dc7aa478d 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/PublicAccessRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/PublicAccessRepository.cs
@@ -5,6 +5,7 @@ using NPoco;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
+using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Factories;
 using Umbraco.Core.Persistence.Querying;
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/RelationRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/RelationRepository.cs
index c5ba24f385..4b4af505b8 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/RelationRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/RelationRepository.cs
@@ -134,7 +134,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         protected override void PersistNewItem(IRelation entity)
         {
-            ((EntityBase)entity).AddingEntity();
+            entity.AddingEntity();
 
             var factory = new RelationFactory(entity.RelationType);
             var dto = factory.BuildDto(entity);
@@ -147,7 +147,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         protected override void PersistUpdatedItem(IRelation entity)
         {
-            ((EntityBase)entity).UpdatingEntity();
+            entity.UpdatingEntity();
 
             var factory = new RelationFactory(entity.RelationType);
             var dto = factory.BuildDto(entity);
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/RelationTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/RelationTypeRepository.cs
index 4faf78bd0a..075d4aa769 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/RelationTypeRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/RelationTypeRepository.cs
@@ -133,7 +133,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         protected override void PersistNewItem(IRelationType entity)
         {
-            ((EntityBase)entity).AddingEntity();
+            entity.AddingEntity();
             
             var dto = RelationTypeFactory.BuildDto(entity);
 
@@ -145,7 +145,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         protected override void PersistUpdatedItem(IRelationType entity)
         {
-            ((EntityBase)entity).UpdatingEntity();
+            entity.UpdatingEntity();
             
             var dto = RelationTypeFactory.BuildDto(entity);
             Database.Update(dto);
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ServerRegistrationRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ServerRegistrationRepository.cs
index 6b2dfddaeb..1497c2857c 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ServerRegistrationRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ServerRegistrationRepository.cs
@@ -5,6 +5,7 @@ using NPoco;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
+using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Factories;
 using Umbraco.Core.Persistence.Querying;
@@ -96,7 +97,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         protected override void PersistNewItem(IServerRegistration entity)
         {
-            ((ServerRegistration)entity).AddingEntity();
+            entity.AddingEntity();
 
             var dto = ServerRegistrationFactory.BuildDto(entity);
 
@@ -108,7 +109,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         protected override void PersistUpdatedItem(IServerRegistration entity)
         {
-            ((ServerRegistration)entity).UpdatingEntity();
+            entity.UpdatingEntity();
             
             var dto = ServerRegistrationFactory.BuildDto(entity);
 
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/TagRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/TagRepository.cs
index f26fcca81b..279e03b19e 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/TagRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/TagRepository.cs
@@ -85,7 +85,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         /// <inheritdoc />
         protected override void PersistNewItem(ITag entity)
         {
-            ((EntityBase)entity).AddingEntity();
+            entity.AddingEntity();
 
             var dto = TagFactory.BuildDto(entity);
             var id = Convert.ToInt32(Database.Insert(dto));
@@ -97,7 +97,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         /// <inheritdoc />
         protected override void PersistUpdatedItem(ITag entity)
         {
-            ((EntityBase)entity).UpdatingEntity();
+            entity.UpdatingEntity();
 
             var dto = TagFactory.BuildDto(entity);
             Database.Update(dto);
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/UserGroupRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/UserGroupRepository.cs
index 3b247950e4..0701a0996e 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/UserGroupRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/UserGroupRepository.cs
@@ -290,7 +290,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         protected override void PersistNewItem(IUserGroup entity)
         {
-            ((UserGroup) entity).AddingEntity();
+            entity.AddingEntity();
 
             var userGroupDto = UserGroupFactory.BuildDto(entity);
 
@@ -304,7 +304,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         protected override void PersistUpdatedItem(IUserGroup entity)
         {
-            ((UserGroup) entity).UpdatingEntity();
+            entity.UpdatingEntity();
 
             var userGroupDto = UserGroupFactory.BuildDto(entity);
 
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs
index 91a20c5bdd..96abc37662 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs
@@ -445,7 +445,7 @@ ORDER BY colName";
                 return;
             }
 
-            ((User) entity).AddingEntity();
+            entity.AddingEntity();
 
             // ensure security stamp if missing
             if (entity.SecurityStamp.IsNullOrWhiteSpace())
@@ -495,7 +495,7 @@ ORDER BY colName";
         protected override void PersistUpdatedItem(IUser entity)
         {
             // updates Modified date
-            ((User) entity).UpdatingEntity();
+            entity.UpdatingEntity();
 
             // ensure security stamp if missing
             if (entity.SecurityStamp.IsNullOrWhiteSpace())
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 7ac1e9d06e..343043ea36 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -234,6 +234,7 @@
     <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\RenamingPreValueMigrator.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\RichTextPreValueMigrator.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\MergeDateAndDateTimePropertyEditor.cs" />
+    <Compile Include="Models\Entities\EntityExtensions.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\PreValueMigratorBase.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\PreValueDto.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\PropertyEditorsMigrationBase.cs" />

From 01c89bd3382c9927eb152f95d04cb505232c4971 Mon Sep 17 00:00:00 2001
From: Rasmus John Pedersen <mail@rjp.dk>
Date: Fri, 28 Jun 2019 10:11:20 +0200
Subject: [PATCH 063/776] Make fields set by constructor non static

---
 src/Umbraco.Core/Composing/TypeLoader.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/Composing/TypeLoader.cs b/src/Umbraco.Core/Composing/TypeLoader.cs
index af9277fce9..fe7a561eca 100644
--- a/src/Umbraco.Core/Composing/TypeLoader.cs
+++ b/src/Umbraco.Core/Composing/TypeLoader.cs
@@ -42,8 +42,8 @@ namespace Umbraco.Core.Composing
         private string _currentAssembliesHash;
         private IEnumerable<Assembly> _assemblies;
         private bool _reportedChange;
-        private static string _localTempPath;
-        private static string _fileBasePath;
+        private readonly string _localTempPath;
+        private string _fileBasePath;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="TypeLoader"/> class.

From fabacd1689af72fb0d3d1af6f83cb2a5aed51f15 Mon Sep 17 00:00:00 2001
From: Adam Nelson <anelson@bauerxcelmedia.com.au>
Date: Mon, 1 Jul 2019 00:26:35 +1000
Subject: [PATCH 064/776] V8: Fixes case issue on metaData.hasChildren in mini
 list view as well as .toLowerCase() issue on undefined
 scope.entityTypeFilter.filter (#5744)

---
 .../common/directives/components/umbminilistview.directive.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js
index 196a28c753..9c140d572e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js
@@ -71,7 +71,7 @@
                             }
                             // set published state for content
                             if (c.metaData) {
-                                c.hasChildren = c.metaData.HasChildren;
+                                c.hasChildren = c.metaData.hasChildren;
                                 if(scope.entityType === "Document") {
                                     c.published = c.metaData.IsPublished;
                                 }
@@ -79,7 +79,7 @@
                              
                             // filter items if there is a filter and it's not advanced
                             // ** ignores advanced filter at the moment
-                            if (scope.entityTypeFilter && !scope.entityTypeFilter.filterAdvanced) {
+                            if (scope.entityTypeFilter && scope.entityTypeFilter.filter && !scope.entityTypeFilter.filterAdvanced) {
                                 var a = scope.entityTypeFilter.filter.toLowerCase().replace(/\s/g, '').split(',');
                                 var found = a.indexOf(c.metaData.ContentTypeAlias.toLowerCase()) >= 0;
                                 

From 80e6880bb7fccb89f7a00122fc7b887008a4976c Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 1 Jul 2019 16:22:54 +1000
Subject: [PATCH 065/776] more manual merging - getting anchors back in tinymce

---
 .../DataTypes/PreValueMigratorComposer.cs     | 34 ++++++++--------
 .../src/common/services/tinymce.service.js    | 40 ++++++++++++++++++-
 .../linkpicker/linkpicker.controller.js       |  2 +-
 .../Mapping/ContentPropertyDisplayMapper.cs   |  4 +-
 .../Mapping/ContentPropertyDtoMapper.cs       |  4 +-
 .../Mapping/ContentPropertyMapDefinition.cs   |  8 ++--
 6 files changed, 64 insertions(+), 28 deletions(-)

diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/PreValueMigratorComposer.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/PreValueMigratorComposer.cs
index 9e2dec9b70..4c3f8534e7 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/PreValueMigratorComposer.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/PreValueMigratorComposer.cs
@@ -2,24 +2,24 @@
 
 namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0.DataTypes
 {
-    [RuntimeLevel(MinLevel = RuntimeLevel.Upgrade, MaxLevel = RuntimeLevel.Upgrade)] // only on upgrades
-    public class PreValueMigratorComposer : ICoreComposer
+[RuntimeLevel(MinLevel = RuntimeLevel.Upgrade, MaxLevel = RuntimeLevel.Upgrade)] // only on upgrades
+public class PreValueMigratorComposer : ICoreComposer
+{
+    public void Compose(Composition composition)
     {
-        public void Compose(Composition composition)
-        {
-            // do NOT add DefaultPreValueMigrator to this list!
-            // it will be automatically used if nothing matches
+        // do NOT add DefaultPreValueMigrator to this list!
+        // it will be automatically used if nothing matches
 
-            composition.WithCollectionBuilder<PreValueMigratorCollectionBuilder>()
-                .Append<RenamingPreValueMigrator>()
-                .Append<RichTextPreValueMigrator>()
-                .Append<UmbracoSliderPreValueMigrator>()
-                .Append<MediaPickerPreValueMigrator>()
-                .Append<ContentPickerPreValueMigrator>()
-                .Append<NestedContentPreValueMigrator>()
-                .Append<DecimalPreValueMigrator>()
-                .Append<ListViewPreValueMigrator>()
-                .Append<ValueListPreValueMigrator>();
-        }
+        composition.WithCollectionBuilder<PreValueMigratorCollectionBuilder>()
+            .Append<RenamingPreValueMigrator>()
+            .Append<RichTextPreValueMigrator>()
+            .Append<UmbracoSliderPreValueMigrator>()
+            .Append<MediaPickerPreValueMigrator>()
+            .Append<ContentPickerPreValueMigrator>()
+            .Append<NestedContentPreValueMigrator>()
+            .Append<DecimalPreValueMigrator>()
+            .Append<ListViewPreValueMigrator>()
+            .Append<ValueListPreValueMigrator>();
     }
 }
+}
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 01eef916b1..603e723bec 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -6,7 +6,7 @@
  * @description
  * A service containing all logic for all of the Umbraco TinyMCE plugins
  */
-function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, stylesheetResource, macroResource, macroService, $routeParams, umbRequestHelper, angularHelper, userService, editorService, editorState) {
+function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, stylesheetResource, macroResource, macroService, $routeParams, umbRequestHelper, angularHelper, userService, editorService, editorState, contentEditingHelper) {
 
     //These are absolutely required in order for the macros to render inline
     //we put these as extended elements because they get merged on top of the normal allowed elements by tiny mce
@@ -1077,6 +1077,42 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                 startWatch();
             }
 
+            /**
+             * Internal method ... to retrieve the anchor named properties from the serialized string of a content item's properties 
+             * 
+		     * From the given string, generates a string array where each item is the id attribute value from a named anchor
+		     * 'some string <a id="anchor"></a>with a named anchor' returns ['anchor']		     
+		     */
+            function getCurrentAnchorNames() {
+
+                if (!editorState.current || !editorState.current.variants) {
+                    return null;
+                }
+
+                //fixme - this only takes into account the first variant , not the 'current' one.
+                var jsonProperties = JSON.stringify(contentEditingHelper.getAllProps(editorState.current.variants[0]));
+
+                if (!jsonProperties) {
+                    return null;
+                }
+
+                var anchors = [];
+
+                var anchorPattern = /<a id=\\"(.*?)\\">/gi;
+                var matches = jsonProperties.match(anchorPattern);
+
+
+                if (matches) {
+                    anchors = matches.map(function (v) {
+                        return v.substring(v.indexOf('"') + 1, v.lastIndexOf('\\'));
+                    });
+                }
+
+                return anchors.filter(function (val, i, self) {
+                    return self.indexOf(val) === i;
+                });
+            }
+
             args.editor.on('init', function (e) {
 
                 if (args.model.value) {
@@ -1118,7 +1154,7 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
             self.createLinkPicker(args.editor, function (currentTarget, anchorElement) {
                 var linkPicker = {
                     currentTarget: currentTarget,
-                    anchors: editorState.current ? self.getAnchorNames(JSON.stringify(editorState.current.properties)) : [],
+                    anchors: getCurrentAnchorNames(),
                     submit: function (model) {
                         self.insertLinkInEditor(args.editor, model.target, anchorElement);
                         editorService.close();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
index 0286fb2384..d1743baf10 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
@@ -1,6 +1,6 @@
 //used for the media picker dialog
 angular.module("umbraco").controller("Umbraco.Editors.LinkPickerController",
-    function ($scope, eventsService, entityResource, mediaResource, mediaHelper, udiParser, userService, localizationService, tinyMceService, editorService, contentEditingHelper) {
+    function ($scope, eventsService, entityResource, mediaResource, mediaHelper, udiParser, userService, localizationService, editorService) {
         
         var vm = this;
         var dialogOptions = $scope.model;
diff --git a/src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayMapper.cs b/src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayMapper.cs
index 8a45548e9c..f68c5d8b44 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayMapper.cs
@@ -14,8 +14,8 @@ namespace Umbraco.Web.Models.Mapping
     {
         private readonly ILocalizedTextService _textService;
 
-        public ContentPropertyDisplayMapper(IDataTypeService dataTypeService, ILocalizedTextService textService, ILogger logger, PropertyEditorCollection propertyEditors)
-            : base(dataTypeService, logger, propertyEditors)
+        public ContentPropertyDisplayMapper(IDataTypeService dataTypeService, IEntityService entityService, ILocalizedTextService textService, ILogger logger, PropertyEditorCollection propertyEditors)
+            : base(dataTypeService, entityService, logger, propertyEditors)
         {
             _textService = textService;
         }
diff --git a/src/Umbraco.Web/Models/Mapping/ContentPropertyDtoMapper.cs b/src/Umbraco.Web/Models/Mapping/ContentPropertyDtoMapper.cs
index f192cd32ce..72107c6201 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentPropertyDtoMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentPropertyDtoMapper.cs
@@ -12,8 +12,8 @@ namespace Umbraco.Web.Models.Mapping
     /// </summary>
     internal class ContentPropertyDtoMapper : ContentPropertyBasicMapper<ContentPropertyDto>
     {
-        public ContentPropertyDtoMapper(IDataTypeService dataTypeService, ILogger logger, PropertyEditorCollection propertyEditors)
-            : base(dataTypeService, logger, propertyEditors)
+        public ContentPropertyDtoMapper(IDataTypeService dataTypeService, IEntityService entityService, ILogger logger, PropertyEditorCollection propertyEditors)
+            : base(dataTypeService, entityService, logger, propertyEditors)
         { }
 
         public override void Map(Property property, ContentPropertyDto dest, MapperContext context)
diff --git a/src/Umbraco.Web/Models/Mapping/ContentPropertyMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/ContentPropertyMapDefinition.cs
index 226560c516..e6290cc19e 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentPropertyMapDefinition.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentPropertyMapDefinition.cs
@@ -17,11 +17,11 @@ namespace Umbraco.Web.Models.Mapping
         private readonly ContentPropertyDtoMapper _contentPropertyDtoConverter;
         private readonly ContentPropertyDisplayMapper _contentPropertyDisplayMapper;
 
-        public ContentPropertyMapDefinition(IDataTypeService dataTypeService, ILocalizedTextService textService, ILogger logger, PropertyEditorCollection propertyEditors)
+        public ContentPropertyMapDefinition(IDataTypeService dataTypeService, IEntityService entityService, ILocalizedTextService textService, ILogger logger, PropertyEditorCollection propertyEditors)
         {
-            _contentPropertyBasicConverter = new ContentPropertyBasicMapper<ContentPropertyBasic>(dataTypeService, logger, propertyEditors);
-            _contentPropertyDtoConverter = new ContentPropertyDtoMapper(dataTypeService, logger, propertyEditors);
-            _contentPropertyDisplayMapper = new ContentPropertyDisplayMapper(dataTypeService, textService, logger, propertyEditors);
+            _contentPropertyBasicConverter = new ContentPropertyBasicMapper<ContentPropertyBasic>(dataTypeService, entityService, logger, propertyEditors);
+            _contentPropertyDtoConverter = new ContentPropertyDtoMapper(dataTypeService, entityService, logger, propertyEditors);
+            _contentPropertyDisplayMapper = new ContentPropertyDisplayMapper(dataTypeService, entityService, textService, logger, propertyEditors);
         }
 
         public void DefineMaps(UmbracoMapper mapper)

From 1885767ef118d17b7d72ec9fcb97b491272b1a3e Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 1 Jul 2019 16:33:09 +1000
Subject: [PATCH 066/776] Internalizes the new Anchor logic and removes it from
 the IContentService interface into extensions.

---
 .../Services/ContentServiceExtensions.cs      | 37 +++++++++++++++++++
 src/Umbraco.Core/Services/IContentService.cs  |  4 +-
 .../Services/Implement/ContentService.cs      | 34 +----------------
 .../src/common/resources/entity.resource.js   | 18 ---------
 src/Umbraco.Web/Editors/EntityController.cs   | 20 +---------
 5 files changed, 42 insertions(+), 71 deletions(-)

diff --git a/src/Umbraco.Core/Services/ContentServiceExtensions.cs b/src/Umbraco.Core/Services/ContentServiceExtensions.cs
index 1175df81dc..dfe02ba690 100644
--- a/src/Umbraco.Core/Services/ContentServiceExtensions.cs
+++ b/src/Umbraco.Core/Services/ContentServiceExtensions.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.RegularExpressions;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Membership;
 
@@ -11,6 +12,42 @@ namespace Umbraco.Core.Services
     /// </summary>
     public static class ContentServiceExtensions
     {
+        #region RTE Anchor values
+
+        private static readonly Regex AnchorRegex = new Regex("<a id=\"(.*?)\">", RegexOptions.Compiled);
+
+        internal static IEnumerable<string> GetAnchorValuesFromRTEs(this IContentService contentService, int id, string culture = "*")
+        {
+            var result = new List<string>();
+            var content = contentService.GetById(id);
+
+            foreach (var contentProperty in content.Properties)
+            {
+                if (contentProperty.PropertyType.PropertyEditorAlias.InvariantEquals(Constants.PropertyEditors.Aliases.TinyMce))
+                {
+                    var value = contentProperty.GetValue(culture)?.ToString();
+                    if (!string.IsNullOrEmpty(value))
+                    {
+                        result.AddRange(contentService.GetAnchorValuesFromRTEContent(value));
+                    }
+                }
+            }
+            return result;
+        }
+
+
+        internal static IEnumerable<string> GetAnchorValuesFromRTEContent(this IContentService contentService, string rteContent)
+        {
+            var result = new List<string>();
+            var matches = AnchorRegex.Matches(rteContent);
+            foreach (Match match in matches)
+            {
+                result.Add(match.Value.Split('\"')[1]);
+            }
+            return result;
+        }
+        #endregion
+
         public static IEnumerable<IContent> GetByIds(this IContentService contentService, IEnumerable<Udi> ids)
         {
             var guids = new List<GuidUdi>();
diff --git a/src/Umbraco.Core/Services/IContentService.cs b/src/Umbraco.Core/Services/IContentService.cs
index a9226fbae2..6f9ca58821 100644
--- a/src/Umbraco.Core/Services/IContentService.cs
+++ b/src/Umbraco.Core/Services/IContentService.cs
@@ -526,8 +526,6 @@ namespace Umbraco.Core.Services
         OperationResult Rollback(int id, int versionId, string culture = "*", int userId = Constants.Security.SuperUserId);
 
         #endregion
-        
-        IEnumerable<string> GetAnchorValuesFromRTEs(int id, string culture = "*");
-        IEnumerable<string> GetAnchorValuesFromRTEContent(string rteContent, string culture = "*");  
+      
     }
 }
diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs
index 90aaf6fc5d..e49dcf4a12 100644
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -32,7 +32,7 @@ namespace Umbraco.Core.Services.Implement
         private IQuery<IContent> _queryNotTrashed;
         //TODO: The non-lazy object should be injected
         private readonly Lazy<PropertyValidationService> _propertyValidationService = new Lazy<PropertyValidationService>(() => new PropertyValidationService());
-        private static readonly Regex AnchorRegex = new Regex("<a id=\"(.*?)\">", RegexOptions.Compiled);
+        
 
         #region Constructors
 
@@ -3028,36 +3028,6 @@ namespace Umbraco.Core.Services.Implement
         #endregion
 
 
-        #region RTE Anchor values
-        public IEnumerable<string> GetAnchorValuesFromRTEs(int id, string culture = "*")
-        {
-            var result = new List<string>();
-            var content = GetById(id);
-            foreach (var contentProperty in content.Properties)
-            {
-                if (contentProperty.PropertyType.PropertyEditorAlias.InvariantEquals(Constants.PropertyEditors.Aliases.TinyMce))
-                {
-                    var value = contentProperty.GetValue(culture)?.ToString();
-                    if (!string.IsNullOrEmpty(value))
-                    {
-                        result.AddRange(GetAnchorValuesFromRTEContent(value));
-                    }
-                }
-            }
-            return result;
-        }
-
-
-        public IEnumerable<string> GetAnchorValuesFromRTEContent(string rteContent, string culture = "*")
-        {
-            var result = new List<string>();
-            var matches = AnchorRegex.Matches(rteContent);
-            foreach (Match match in matches)
-            {
-                result.Add(match.Value.Split('\"')[1]);
-            }
-            return result;
-        } 
-        #endregion
+        
     }
 }
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
index 95bfd1e49b..eee877a60c 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
@@ -176,24 +176,6 @@ function entityResource($q, $http, umbRequestHelper) {
                 'Failed to retrieve url and anchors data for id ' + id);
         },
 
-
-        getAnchors: function (rteContent) {
-
-            if (!rteContent || rteContent.length === 0) {
-                return [];
-            }
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "entityApiBaseUrl",
-                        'GetAnchors'),
-                    {
-                        rteContent: rteContent
-                    }),
-                'Failed to anchors data for rte content ' + rteContent);
-        },
-
         /**
          * @ngdoc method
          * @name umbraco.resources.entityResource#getByIds
diff --git a/src/Umbraco.Web/Editors/EntityController.cs b/src/Umbraco.Web/Editors/EntityController.cs
index 4184182a1d..b0868bd2a6 100644
--- a/src/Umbraco.Web/Editors/EntityController.cs
+++ b/src/Umbraco.Web/Editors/EntityController.cs
@@ -286,30 +286,14 @@ namespace Umbraco.Web.Editors
                 publishedContentExists: i => Umbraco.Content(i) != null);
         }
 
-
-        //fixme - culture?
         [HttpGet]
-        public UrlAndAnchors GetUrlAndAnchors([FromUri]int id)
+        public UrlAndAnchors GetUrlAndAnchors([FromUri]int id, [FromUri]string culture = "*")
         {
             var url = UmbracoContext.UrlProvider.GetUrl(id);
-            var anchorValues = Services.ContentService.GetAnchorValuesFromRTEs(id);
+            var anchorValues = Services.ContentService.GetAnchorValuesFromRTEs(id, culture);
             return new UrlAndAnchors(url, anchorValues);
         }
 
-        public class AnchorsModel
-        {
-            public string RteContent { get; set; }
-        }
-
-        //fixme - culture?
-        [HttpGet]
-        [HttpPost]
-        public IEnumerable<string> GetAnchors(AnchorsModel model)
-        {
-            var anchorValues = Services.ContentService.GetAnchorValuesFromRTEContent(model.RteContent);
-            return anchorValues;
-        }
-
 
         #region GetById
 

From fa4acb255b6ebf81b7e285fa7486384d7e26e5c1 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 1 Jul 2019 17:09:11 +1000
Subject: [PATCH 067/776] fixes missing 'var'

---
 .../mediaPicker/mediapicker.controller.js     | 90 +++++++++----------
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
index 96354d7696..bb34ba379c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
@@ -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, userService, $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");
@@ -40,7 +40,7 @@ angular.module("umbraco")
 
             $scope.acceptedMediatypes = [];
             mediaTypeHelper.getAllowedImagetypes($scope.startNodeId)
-                .then(function(types) {
+                .then(function (types) {
                     $scope.acceptedMediatypes = types;
                 });
 
@@ -107,24 +107,24 @@ angular.module("umbraco")
                 }
             }
 
-            $scope.upload = function(v) {
+            $scope.upload = function (v) {
                 angular.element(".umb-file-dropzone-directive .file-select").click();
             };
 
-            $scope.dragLeave = function(el, event) {
+            $scope.dragLeave = function (el, event) {
                 $scope.activeDrag = false;
             };
 
-            $scope.dragEnter = function(el, event) {
+            $scope.dragEnter = function (el, event) {
                 $scope.activeDrag = true;
             };
 
-            $scope.submitFolder = function() {
+            $scope.submitFolder = function () {
                 if ($scope.newFolderName) {
                     $scope.creatingFolder = true;
                     mediaResource
                         .addFolder($scope.newFolderName, $scope.currentFolder.id)
-                        .then(function(data) {
+                        .then(function (data) {
                             //we've added a new folder so lets clear the tree cache for that specific item
                             treeService.clearCache({
                                 cacheKey: "__media", //this is the main media tree cache key
@@ -140,14 +140,14 @@ angular.module("umbraco")
                 }
             };
 
-            $scope.enterSubmitFolder = function(event) {
+            $scope.enterSubmitFolder = function (event) {
                 if (event.keyCode === 13) {
                     $scope.submitFolder();
                     event.stopPropagation();
                 }
             };
 
-            $scope.gotoFolder = function(folder) {
+            $scope.gotoFolder = function (folder) {
                 if (!$scope.multiPicker) {
                     deselectAllImages($scope.model.selectedImages);
                 }
@@ -158,9 +158,9 @@ angular.module("umbraco")
 
                 if (folder.id > 0) {
                     entityResource.getAncestors(folder.id, "media", { dataTypeId: $scope.model.dataTypeId })
-                        .then(function(anc) {
+                        .then(function (anc) {
                             $scope.path = _.filter(anc,
-                                function(f) {
+                                function (f) {
                                     return f.path.indexOf($scope.startNodeId) !== -1;
                                 });
                         });
@@ -181,7 +181,7 @@ angular.module("umbraco")
                 return getChildren(folder.id);
             };
 
-            $scope.clickHandler = function(image, event, index) {
+            $scope.clickHandler = function (image, event, index) {
                 if (image.isFolder) {
                     if ($scope.disableFolderSelect) {
                         $scope.gotoFolder(image);
@@ -209,7 +209,7 @@ angular.module("umbraco")
                 }
             };
 
-            $scope.clickItemName = function(item) {
+            $scope.clickItemName = function (item) {
                 if (item.isFolder) {
                     $scope.gotoFolder(item);
                 }
@@ -241,8 +241,8 @@ angular.module("umbraco")
                 images.length = 0;
             }
 
-            $scope.onUploadComplete = function(files) {
-                $scope.gotoFolder($scope.currentFolder).then(function() {
+            $scope.onUploadComplete = function (files) {
+                $scope.gotoFolder($scope.currentFolder).then(function () {
                     if (files.length === 1 && $scope.model.selectedImages.length === 0) {
                         var image = $scope.images[$scope.images.length - 1];
                         $scope.target = image;
@@ -252,7 +252,7 @@ angular.module("umbraco")
                 });
             };
 
-            $scope.onFilesQueue = function() {
+            $scope.onFilesQueue = function () {
                 $scope.activeDrag = false;
             };
 
@@ -285,12 +285,12 @@ angular.module("umbraco")
                 $scope.gotoFolder({ id: $scope.startNodeId, name: "Media", icon: "icon-folder" });
             }
 
-            $scope.openDetailsDialog = function() {
+            $scope.openDetailsDialog = function () {
 
                 $scope.mediaPickerDetailsOverlay = {};
                 $scope.mediaPickerDetailsOverlay.show = true;
 
-                $scope.mediaPickerDetailsOverlay.submit = function(model) {
+                $scope.mediaPickerDetailsOverlay.submit = function (model) {
                     $scope.model.selectedImages.push($scope.target);
                     $scope.model.submit($scope.model);
 
@@ -298,42 +298,42 @@ angular.module("umbraco")
                     $scope.mediaPickerDetailsOverlay = null;
                 };
 
-                $scope.mediaPickerDetailsOverlay.close = function(oldModel) {
+                $scope.mediaPickerDetailsOverlay.close = function (oldModel) {
                     $scope.mediaPickerDetailsOverlay.show = false;
                     $scope.mediaPickerDetailsOverlay = null;
                 };
             };
 
-            var debounceSearchMedia = _.debounce(function() {
-                    $scope.$apply(function() {
-                        if ($scope.searchOptions.filter) {
-                            searchMedia();
-                        } else {
-                            // reset pagination
-                            $scope.searchOptions = {
-                                pageNumber: 1,
-                                pageSize: 100,
-                                totalItems: 0,
-                                totalPages: 0,
-                                filter: '',
-                                dataTypeId: $scope.model.dataTypeId
-                            };
-                            getChildren($scope.currentFolder.id);
-                        }
-                    });
-                }, 500);
+            var debounceSearchMedia = _.debounce(function () {
+                $scope.$apply(function () {
+                    if ($scope.searchOptions.filter) {
+                        searchMedia();
+                    } else {
+                        // reset pagination
+                        $scope.searchOptions = {
+                            pageNumber: 1,
+                            pageSize: 100,
+                            totalItems: 0,
+                            totalPages: 0,
+                            filter: '',
+                            dataTypeId: $scope.model.dataTypeId
+                        };
+                        getChildren($scope.currentFolder.id);
+                    }
+                });
+            }, 500);
 
-            $scope.changeSearch = function() {
+            $scope.changeSearch = function () {
                 $scope.loading = true;
                 debounceSearchMedia();
             };
 
-            $scope.toggle = function() {
+            $scope.toggle = function () {
                 // Make sure to activate the changeSearch function everytime the toggle is clicked
                 $scope.changeSearch();
             }
 
-            $scope.changePagination = function(pageNumber) {
+            $scope.changePagination = function (pageNumber) {
                 $scope.loading = true;
                 $scope.searchOptions.pageNumber = pageNumber;
                 searchMedia();
@@ -342,10 +342,10 @@ angular.module("umbraco")
             function searchMedia() {
                 $scope.loading = true;
                 entityResource.getPagedDescendants($scope.currentFolder.id, "Media", $scope.searchOptions)
-                    .then(function(data) {
+                    .then(function (data) {
                         // update image data to work with image grid
                         angular.forEach(data.items,
-                            function(mediaItem) {
+                            function (mediaItem) {
                                 // set thumbnail and src
                                 mediaItem.thumbnail = mediaHelper.resolveFileFromEntity(mediaItem, true);
                                 mediaItem.image = mediaHelper.resolveFileFromEntity(mediaItem, false);
@@ -389,10 +389,10 @@ angular.module("umbraco")
             function getChildren(id) {
                 $scope.loading = true;
                 return entityResource.getChildren(id, "Media", $scope.searchOptions)
-                    .then(function(data) {
+                    .then(function (data) {
 
-                        for (i=0;i<data.length;i++){
-                            if(data[i].metaData.MediaPath !== null){
+                        for (var i = 0; i < data.length; i++) {
+                            if (data[i].metaData.MediaPath !== null) {
                                 data[i].thumbnail = mediaHelper.resolveFileFromEntity(data[i], true);
                                 data[i].image = mediaHelper.resolveFileFromEntity(data[i], false);
                             }

From 42d86f147f30be7e09ebde69760ea8b098057364 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 1 Jul 2019 18:23:36 +1000
Subject: [PATCH 068/776] gets content picker ignore start nodes working, fixes
 descriptions

---
 .../mediapicker/mediapicker.controller.js     | 115 +++++++++---------
 .../treepicker/treepicker.controller.js       |   6 +
 .../treepicker/treepicker.html                |   1 +
 .../contentpicker/contentpicker.controller.js |   5 +-
 src/Umbraco.Web/Editors/EntityController.cs   |   1 +
 .../ContentPickerConfiguration.cs             |   6 +-
 .../PropertyEditors/GridConfiguration.cs      |   4 +-
 .../MediaPickerConfiguration.cs               |   4 +-
 .../MultiNodePickerConfiguration.cs           |   4 +-
 .../MultiUrlPickerConfiguration.cs            |   4 +-
 .../PropertyEditors/RichTextConfiguration.cs  |   4 +-
 .../Trees/ContentTreeControllerBase.cs        |  28 +++--
 12 files changed, 103 insertions(+), 79 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
index 23d9cef9a1..015a452e67 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
@@ -1,7 +1,7 @@
 //used for the media picker dialog
 angular.module("umbraco")
     .controller("Umbraco.Editors.MediaPickerController",
-        function($scope, mediaResource, entityResource, userService, mediaHelper, mediaTypeHelper, eventsService, treeService, localStorageService, localizationService, editorService) {
+        function ($scope, mediaResource, entityResource, userService, mediaHelper, mediaTypeHelper, eventsService, treeService, localStorageService, localizationService, editorService) {
 
             if (!$scope.model.title) {
                 localizationService.localizeMany(["defaultdialogs_selectMedia", "general_includeFromsubFolders"])
@@ -47,7 +47,7 @@ angular.module("umbraco")
 
             $scope.acceptedMediatypes = [];
             mediaTypeHelper.getAllowedImagetypes($scope.startNodeId)
-                .then(function(types) {
+                .then(function (types) {
                     $scope.acceptedMediatypes = types;
                 });
 
@@ -96,7 +96,7 @@ angular.module("umbraco")
                     //media object so we need to look it up
                     var id = $scope.target.udi ? $scope.target.udi : $scope.target.id;
                     var altText = $scope.target.altText;
-                        entityResource.getById(id, "Media")
+                    entityResource.getById(id, "Media")
                         .then(function (node) {
                             $scope.target = node;
                             if (ensureWithinStartNode(node)) {
@@ -106,28 +106,28 @@ angular.module("umbraco")
                                 $scope.openDetailsDialog();
                             }
                         },
-                        gotoStartNode);
+                            gotoStartNode);
                 }
             }
 
-            $scope.upload = function(v) {
+            $scope.upload = function (v) {
                 angular.element(".umb-file-dropzone .file-select").trigger("click");
             };
 
-            $scope.dragLeave = function(el, event) {
+            $scope.dragLeave = function (el, event) {
                 $scope.activeDrag = false;
             };
 
-            $scope.dragEnter = function(el, event) {
+            $scope.dragEnter = function (el, event) {
                 $scope.activeDrag = true;
             };
 
-            $scope.submitFolder = function() {
+            $scope.submitFolder = function () {
                 if ($scope.model.newFolderName) {
                     $scope.model.creatingFolder = true;
                     mediaResource
                         .addFolder($scope.model.newFolderName, $scope.currentFolder.id)
-                        .then(function(data) {
+                        .then(function (data) {
                             //we've added a new folder so lets clear the tree cache for that specific item
                             treeService.clearCache({
                                 cacheKey: "__media", //this is the main media tree cache key
@@ -143,14 +143,14 @@ angular.module("umbraco")
                 }
             };
 
-            $scope.enterSubmitFolder = function(event) {
+            $scope.enterSubmitFolder = function (event) {
                 if (event.keyCode === 13) {
                     $scope.submitFolder();
                     event.stopPropagation();
                 }
             };
 
-            $scope.gotoFolder = function(folder) {
+            $scope.gotoFolder = function (folder) {
                 if (!$scope.multiPicker) {
                     deselectAllImages($scope.model.selection);
                 }
@@ -161,15 +161,15 @@ angular.module("umbraco")
 
                 if (folder.id > 0) {
                     entityResource.getAncestors(folder.id, "media", { dataTypeId: $scope.model.dataTypeId })
-                        .then(function(anc) {
+                        .then(function (anc) {
                             $scope.path = _.filter(anc,
-                                function(f) {
+                                function (f) {
                                     return f.path.indexOf($scope.startNodeId) !== -1;
                                 });
                         });
 
                     mediaTypeHelper.getAllowedImagetypes(folder.id)
-                        .then(function(types) {
+                        .then(function (types) {
                             $scope.acceptedMediatypes = types;
                         });
                 } else {
@@ -183,7 +183,7 @@ angular.module("umbraco")
                 return getChildren(folder.id);
             };
 
-            $scope.clickHandler = function(image, event, index) {
+            $scope.clickHandler = function (image, event, index) {
                 if (image.isFolder) {
                     if ($scope.disableFolderSelect) {
                         $scope.gotoFolder(image);
@@ -211,7 +211,7 @@ angular.module("umbraco")
                 }
             };
 
-            $scope.clickItemName = function(item) {
+            $scope.clickItemName = function (item) {
                 if (item.isFolder) {
                     $scope.gotoFolder(item);
                 }
@@ -243,8 +243,8 @@ angular.module("umbraco")
                 images.length = 0;
             }
 
-            $scope.onUploadComplete = function(files) {
-                $scope.gotoFolder($scope.currentFolder).then(function() {
+            $scope.onUploadComplete = function (files) {
+                $scope.gotoFolder($scope.currentFolder).then(function () {
                     if (files.length === 1 && $scope.model.selection.length === 0) {
                         var image = $scope.images[$scope.images.length - 1];
                         $scope.target = image;
@@ -254,7 +254,7 @@ angular.module("umbraco")
                 });
             };
 
-            $scope.onFilesQueue = function() {
+            $scope.onFilesQueue = function () {
                 $scope.activeDrag = false;
             };
 
@@ -287,12 +287,12 @@ angular.module("umbraco")
                 $scope.gotoFolder({ id: $scope.startNodeId, name: "Media", icon: "icon-folder" });
             }
 
-            $scope.openDetailsDialog = function() {
+            $scope.openDetailsDialog = function () {
 
                 $scope.mediaPickerDetailsOverlay = {};
                 $scope.mediaPickerDetailsOverlay.show = true;
 
-                $scope.mediaPickerDetailsOverlay.submit = function(model) {
+                $scope.mediaPickerDetailsOverlay.submit = function (model) {
                     $scope.model.selection.push($scope.target);
                     $scope.model.submit($scope.model);
 
@@ -300,42 +300,42 @@ angular.module("umbraco")
                     $scope.mediaPickerDetailsOverlay = null;
                 };
 
-                $scope.mediaPickerDetailsOverlay.close = function(oldModel) {
+                $scope.mediaPickerDetailsOverlay.close = function (oldModel) {
                     $scope.mediaPickerDetailsOverlay.show = false;
                     $scope.mediaPickerDetailsOverlay = null;
                 };
             };
 
-            var debounceSearchMedia = _.debounce(function() {
-                    $scope.$apply(function() {
-                        if ($scope.searchOptions.filter) {
-                            searchMedia();
-                        } else {
-                            // reset pagination
-                            $scope.searchOptions = {
-                                pageNumber: 1,
-                                pageSize: 100,
-                                totalItems: 0,
-                                totalPages: 0,
-                                filter: '',
-                                dataTypeId: $scope.model.dataTypeId
-                            };
-                            getChildren($scope.currentFolder.id);
-                        }
-                    });
-                }, 500);
+            var debounceSearchMedia = _.debounce(function () {
+                $scope.$apply(function () {
+                    if ($scope.searchOptions.filter) {
+                        searchMedia();
+                    } else {
+                        // reset pagination
+                        $scope.searchOptions = {
+                            pageNumber: 1,
+                            pageSize: 100,
+                            totalItems: 0,
+                            totalPages: 0,
+                            filter: '',
+                            dataTypeId: $scope.model.dataTypeId
+                        };
+                        getChildren($scope.currentFolder.id);
+                    }
+                });
+            }, 500);
 
-            $scope.changeSearch = function() {
+            $scope.changeSearch = function () {
                 $scope.loading = true;
                 debounceSearchMedia();
             };
 
-            $scope.toggle = function() {
+            $scope.toggle = function () {
                 // Make sure to activate the changeSearch function everytime the toggle is clicked
                 $scope.changeSearch();
             }
 
-            $scope.changePagination = function(pageNumber) {
+            $scope.changePagination = function (pageNumber) {
                 $scope.loading = true;
                 $scope.searchOptions.pageNumber = pageNumber;
                 searchMedia();
@@ -344,9 +344,9 @@ angular.module("umbraco")
             function searchMedia() {
                 $scope.loading = true;
                 entityResource.getPagedDescendants($scope.currentFolder.id, "Media", $scope.searchOptions)
-                    .then(function(data) {
+                    .then(function (data) {
                         // update image data to work with image grid
-                        angular.forEach(data.items, function(mediaItem) {
+                        angular.forEach(data.items, function (mediaItem) {
                             setMediaMetaData(mediaItem);
                         });
                         // update images
@@ -389,10 +389,9 @@ angular.module("umbraco")
             function getChildren(id) {
                 $scope.loading = true;
                 return entityResource.getChildren(id, "Media", $scope.searchOptions)
-                    .then(function(data) {
-
-                        for (i=0;i<data.length;i++){
-                            if(data[i].metaData.MediaPath !== null){
+                    .then(function (data) {
+                        for (var i = 0; i < data.length; i++) {
+                            if (data[i].metaData.MediaPath !== null) {
                                 data[i].thumbnail = mediaHelper.resolveFileFromEntity(data[i], true);
                                 data[i].image = mediaHelper.resolveFileFromEntity(data[i], false);
                             }
@@ -428,15 +427,15 @@ angular.module("umbraco")
                 }
             }
 
-            $scope.editMediaItem = function(item) {
+            $scope.editMediaItem = function (item) {
                 var mediaEditor = {
                     id: item.id,
-                    submit: function(model) {
+                    submit: function (model) {
                         editorService.close()
                         // update the media picker item in the picker so it matched the saved media item
                         // the media picker is using media entities so we get the 
                         // entity so we easily can format it for use in the media grid
-                        if(model && model.mediaNode) {
+                        if (model && model.mediaNode) {
                             entityResource.getById(model.mediaNode.id, "media")
                                 .then(function (mediaEntity) {
                                     angular.extend(item, mediaEntity);
@@ -445,7 +444,7 @@ angular.module("umbraco")
                                 });
                         }
                     },
-                    close: function(model) {
+                    close: function (model) {
                         setUpdatedMediaNodes(item);
                         editorService.close();
                     }
@@ -455,19 +454,19 @@ angular.module("umbraco")
 
             function setUpdatedMediaNodes(item) {
                 // add udi to list of updated media items so we easily can update them in other editors
-                if($scope.model.updatedMediaNodes.indexOf(item.udi) === -1) {
+                if ($scope.model.updatedMediaNodes.indexOf(item.udi) === -1) {
                     $scope.model.updatedMediaNodes.push(item.udi);
                 }
             }
 
-            $scope.submit = function() {
-                if($scope.model.submit) {
+            $scope.submit = function () {
+                if ($scope.model.submit) {
                     $scope.model.submit($scope.model);
                 }
             };
 
-            $scope.close = function() {
-                if($scope.model.close) {
+            $scope.close = function () {
+                if ($scope.model.close) {
                     $scope.model.close($scope.model);
                 }
             };
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js
index 259ae3011d..88caac716a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js
@@ -28,10 +28,12 @@ angular.module("umbraco").controller("Umbraco.Editors.TreePickerController",
         vm.treeAlias = $scope.model.treeAlias;
         vm.multiPicker = $scope.model.multiPicker;
         vm.hideHeader = (typeof $scope.model.hideHeader) === "boolean" ? $scope.model.hideHeader : true;
+        vm.dataTypeId = $scope.model.dataTypeId;
         vm.searchInfo = {
             searchFromId: $scope.model.startNodeId,
             searchFromName: null,
             showSearch: false,
+            dataTypeId: vm.dataTypeId,
             results: [],
             selectedSearchResults: []
         }
@@ -190,6 +192,10 @@ angular.module("umbraco").controller("Umbraco.Editors.TreePickerController",
             if (vm.selectedLanguage && vm.selectedLanguage.id) {
                 queryParams["culture"] = vm.selectedLanguage.culture;
             }
+            if (vm.dataTypeId) {
+                queryParams["dataTypeId"] = vm.dataTypeId;
+            }
+                
             var queryString = $.param(queryParams); //create the query string from the params object
             
             if (!queryString) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.html
index 57ee805ba0..f8dd60bfad 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.html
@@ -36,6 +36,7 @@
                                         search-from-id="{{vm.searchInfo.searchFromId}}"
                                         search-from-name="{{vm.searchInfo.searchFromName}}"
                                         show-search="{{vm.searchInfo.showSearch}}"
+                                        datatype-id="{{searchInfo.dataTypeId}}"
                                         section="{{vm.section}}">
                                     </umb-tree-search-box>
                                 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
index 8fbed8cb9c..f8ecb898ae 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
@@ -133,7 +133,7 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
         multiPicker: $scope.model.config.multiPicker,
         entityType: entityType,
         filterCssClass: "not-allowed not-published",
-        startNodeId: null,
+        startNodeId: null,        
         currentNode: editorState ? editorState.current : null,
         callback: function (data) {
             if (angular.isArray(data)) {
@@ -155,6 +155,8 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
     // pre-value config on to the dialog options
     angular.extend(dialogOptions, $scope.model.config);
 
+    dialogOptions.dataTypeId = $scope.model.dataTypeId;
+
     // if we can't pick more than one item, explicitly disable multiPicker in the dialog options
     if ($scope.model.config.maxNumber && parseInt($scope.model.config.maxNumber) === 1) {
         dialogOptions.multiPicker = false;
@@ -211,7 +213,6 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
     //dialog
     $scope.openCurrentPicker = function () {
         $scope.currentPicker = dialogOptions;
-      $scope.contentPickerOverlay.dataTypeId = $scope.model.dataTypeId;
 
         $scope.currentPicker.submit = function (model) {
             if (angular.isArray(model.selection)) {
diff --git a/src/Umbraco.Web/Editors/EntityController.cs b/src/Umbraco.Web/Editors/EntityController.cs
index b0868bd2a6..573bb2b872 100644
--- a/src/Umbraco.Web/Editors/EntityController.cs
+++ b/src/Umbraco.Web/Editors/EntityController.cs
@@ -607,6 +607,7 @@ namespace Umbraco.Web.Editors
                         {
                             context.SetCulture(culture);
                         });
+                        //TODO: Why is this here and not in the mapping?
                         target.AdditionalData["hasChildren"] = source.HasChildren;
                         return target;
                     })
diff --git a/src/Umbraco.Web/PropertyEditors/ContentPickerConfiguration.cs b/src/Umbraco.Web/PropertyEditors/ContentPickerConfiguration.cs
index d7f7ca9551..021d416781 100644
--- a/src/Umbraco.Web/PropertyEditors/ContentPickerConfiguration.cs
+++ b/src/Umbraco.Web/PropertyEditors/ContentPickerConfiguration.cs
@@ -5,13 +5,15 @@ namespace Umbraco.Web.PropertyEditors
 {
     public class ContentPickerConfiguration : IIgnoreUserStartNodesConfig
     {
-        [ConfigurationField("showOpenButton", "Show open button (this feature is in beta!)", "boolean", Description = "Opens the node in a dialog")]
+        [ConfigurationField("showOpenButton", "Show open button", "boolean", Description = "Opens the node in a dialog")]
         public bool ShowOpenButton { get; set; }
 
         [ConfigurationField("startNodeId", "Start node", "treepicker")] // + config in configuration editor ctor
         public Udi StartNodeId { get; set; }
 
-        [ConfigurationField(Core.Constants.DataTypes.ReservedPreValueKeys.IgnoreUserStartNodes, "Selecting this option allows a user to choose nodes that they normally don't have access to.", "boolean")]
+        [ConfigurationField(Core.Constants.DataTypes.ReservedPreValueKeys.IgnoreUserStartNodes,
+            "Ignore User Start Nodes", "boolean",
+            Description = "Selecting this option allows a user to choose nodes that they normally don't have access to.")]
         public bool IgnoreUserStartNodes { get; set; }
     }
 }
diff --git a/src/Umbraco.Web/PropertyEditors/GridConfiguration.cs b/src/Umbraco.Web/PropertyEditors/GridConfiguration.cs
index 80f09d3f8f..b7a76ac960 100644
--- a/src/Umbraco.Web/PropertyEditors/GridConfiguration.cs
+++ b/src/Umbraco.Web/PropertyEditors/GridConfiguration.cs
@@ -16,7 +16,9 @@ namespace Umbraco.Web.PropertyEditors
         [ConfigurationField("rte", "Rich text editor", "views/propertyeditors/rte/rte.prevalues.html", Description = "Rich text editor configuration")]
         public JObject Rte { get; set; }
 
-        [ConfigurationField(Core.Constants.DataTypes.ReservedPreValueKeys.IgnoreUserStartNodes, "Selecting this option allows a user to choose nodes that they normally don't have access to.", "boolean")]
+        [ConfigurationField(Core.Constants.DataTypes.ReservedPreValueKeys.IgnoreUserStartNodes,
+            "Ignore User Start Nodes", "boolean",
+            Description = "Selecting this option allows a user to choose nodes that they normally don't have access to.")]
         public bool IgnoreUserStartNodes { get; set; }
     }
 }
diff --git a/src/Umbraco.Web/PropertyEditors/MediaPickerConfiguration.cs b/src/Umbraco.Web/PropertyEditors/MediaPickerConfiguration.cs
index 3a9a9e25ac..b8b9476184 100644
--- a/src/Umbraco.Web/PropertyEditors/MediaPickerConfiguration.cs
+++ b/src/Umbraco.Web/PropertyEditors/MediaPickerConfiguration.cs
@@ -20,7 +20,9 @@ namespace Umbraco.Web.PropertyEditors
         [ConfigurationField("startNodeId", "Start node", "mediapicker")]
         public Udi StartNodeId { get; set; }
 
-        [ConfigurationField(Core.Constants.DataTypes.ReservedPreValueKeys.IgnoreUserStartNodes, "Selecting this option allows a user to choose nodes that they normally don't have access to.", "boolean")]
+        [ConfigurationField(Core.Constants.DataTypes.ReservedPreValueKeys.IgnoreUserStartNodes,
+            "Ignore User Start Nodes", "boolean",
+            Description = "Selecting this option allows a user to choose nodes that they normally don't have access to.")]
         public bool IgnoreUserStartNodes { get; set; }
     }
 }
diff --git a/src/Umbraco.Web/PropertyEditors/MultiNodePickerConfiguration.cs b/src/Umbraco.Web/PropertyEditors/MultiNodePickerConfiguration.cs
index 310211ab2b..b099573b9f 100644
--- a/src/Umbraco.Web/PropertyEditors/MultiNodePickerConfiguration.cs
+++ b/src/Umbraco.Web/PropertyEditors/MultiNodePickerConfiguration.cs
@@ -23,7 +23,9 @@ namespace Umbraco.Web.PropertyEditors
         [ConfigurationField("showOpenButton", "Show open button (this feature is in preview!)", "boolean", Description = "Opens the node in a dialog")]
         public bool ShowOpen { get; set; }
 
-        [ConfigurationField(Core.Constants.DataTypes.ReservedPreValueKeys.IgnoreUserStartNodes, "Selecting this option allows a user to choose nodes that they normally don't have access to.", "boolean")]
+        [ConfigurationField(Core.Constants.DataTypes.ReservedPreValueKeys.IgnoreUserStartNodes,
+            "Ignore User Start Nodes", "boolean",
+            Description = "Selecting this option allows a user to choose nodes that they normally don't have access to.")]
         public bool IgnoreUserStartNodes { get; set; }
     }
 }
diff --git a/src/Umbraco.Web/PropertyEditors/MultiUrlPickerConfiguration.cs b/src/Umbraco.Web/PropertyEditors/MultiUrlPickerConfiguration.cs
index 8b6a4c15d2..16aff6e0bf 100644
--- a/src/Umbraco.Web/PropertyEditors/MultiUrlPickerConfiguration.cs
+++ b/src/Umbraco.Web/PropertyEditors/MultiUrlPickerConfiguration.cs
@@ -11,7 +11,9 @@ namespace Umbraco.Web.PropertyEditors
         [ConfigurationField("maxNumber", "Maximum number of items", "number")]
         public int MaxNumber { get; set; }
 
-        [ConfigurationField(Core.Constants.DataTypes.ReservedPreValueKeys.IgnoreUserStartNodes, "Selecting this option allows a user to choose nodes that they normally don't have access to.", "boolean")]
+        [ConfigurationField(Core.Constants.DataTypes.ReservedPreValueKeys.IgnoreUserStartNodes,
+            "Ignore User Start Nodes", "boolean",
+            Description = "Selecting this option allows a user to choose nodes that they normally don't have access to.")]
         public bool IgnoreUserStartNodes { get; set; }
 
         
diff --git a/src/Umbraco.Web/PropertyEditors/RichTextConfiguration.cs b/src/Umbraco.Web/PropertyEditors/RichTextConfiguration.cs
index 30d3ee2113..bd153c8e2f 100644
--- a/src/Umbraco.Web/PropertyEditors/RichTextConfiguration.cs
+++ b/src/Umbraco.Web/PropertyEditors/RichTextConfiguration.cs
@@ -15,7 +15,9 @@ namespace Umbraco.Web.PropertyEditors
         [ConfigurationField("hideLabel", "Hide Label", "boolean")]
         public bool HideLabel { get; set; }
 
-        [ConfigurationField(Core.Constants.DataTypes.ReservedPreValueKeys.IgnoreUserStartNodes, "Selecting this option allows a user to choose nodes that they normally don't have access to.", "boolean")]
+        [ConfigurationField(Core.Constants.DataTypes.ReservedPreValueKeys.IgnoreUserStartNodes,
+            "Ignore User Start Nodes", "boolean",
+            Description = "Selecting this option allows a user to choose nodes that they normally don't have access to.")]
         public bool IgnoreUserStartNodes { get; set; }
     }
 }
diff --git a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
index 091c3a8f8d..2ee3d07c83 100644
--- a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
+++ b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
@@ -88,9 +88,10 @@ namespace Umbraco.Web.Trees
         /// <param name="queryStrings"></param>
         /// <returns></returns>
         internal TreeNode GetSingleTreeNodeWithAccessCheck(IEntitySlim e, string parentId, FormDataCollection queryStrings,
-            int[] startNodeIds, string[] startNodePaths, bool ignoreUserStartNodes)
+            int[] startNodeIds, string[] startNodePaths)
         {
             var entityIsAncestorOfStartNodes = ContentPermissionsHelper.IsInBranchOfStartNode(e.Path, startNodeIds, startNodePaths, out var hasPathAccess);
+            var ignoreUserStartNodes = IgnoreUserStartNodes(queryStrings);
             if (ignoreUserStartNodes == false && entityIsAncestorOfStartNodes == false)
                 return null;
 
@@ -101,7 +102,7 @@ namespace Umbraco.Web.Trees
                 //the node so we need to return null;
                 return null;
             }
-            if (ignoreUserStartNodes == false && hasPathAccess == false)
+            if (!ignoreUserStartNodes && !hasPathAccess)
             {
                 treeNode.AdditionalData["noAccess"] = true;
             }
@@ -182,7 +183,7 @@ namespace Umbraco.Web.Trees
             //get the current user start node/paths
             GetUserStartNodes(out var userStartNodes, out var userStartNodePaths);
 
-            nodes.AddRange(entities.Select(x => GetSingleTreeNodeWithAccessCheck(x, id, queryStrings, userStartNodes, userStartNodePaths, ignoreUserStartNodes)).Where(x => x != null));
+            nodes.AddRange(entities.Select(x => GetSingleTreeNodeWithAccessCheck(x, id, queryStrings, userStartNodes, userStartNodePaths)).Where(x => x != null));
 
             // if the user does not have access to the root node, what we have is the start nodes,
             // but to provide some context we also need to add their topmost nodes when they are not
@@ -193,7 +194,7 @@ namespace Umbraco.Web.Trees
                 if (topNodeIds.Length > 0)
                 {
                     var topNodes = Services.EntityService.GetAll(UmbracoObjectType, topNodeIds.ToArray());
-                    nodes.AddRange(topNodes.Select(x => GetSingleTreeNodeWithAccessCheck(x, id, queryStrings, userStartNodes, userStartNodePaths, ignoreUserStartNodes)).Where(x => x != null));
+                    nodes.AddRange(topNodes.Select(x => GetSingleTreeNodeWithAccessCheck(x, id, queryStrings, userStartNodes, userStartNodePaths)).Where(x => x != null));
                 }
             }
 
@@ -217,7 +218,7 @@ namespace Umbraco.Web.Trees
         {
             // try to parse id as an integer else use GetEntityFromId
             // which will grok Guids, Udis, etc and let use obtain the id
-            if (int.TryParse(id, out var entityId) == false)
+            if (!int.TryParse(id, out var entityId))
             {
                 var entity = GetEntityFromId(id);
                 if (entity == null)
@@ -226,11 +227,13 @@ namespace Umbraco.Web.Trees
                 entityId = entity.Id;
             }
 
+            var ignoreUserStartNodes = IgnoreUserStartNodes(queryStrings);
+
             IEntitySlim[] result;
 
             // if a request is made for the root node but user has no access to
             // root node, return start nodes instead
-            if (entityId == Constants.System.Root && UserStartNodes.Contains(Constants.System.Root) == false)
+            if (!ignoreUserStartNodes && entityId == Constants.System.Root && UserStartNodes.Contains(Constants.System.Root) == false)
             {
                 result = UserStartNodes.Length > 0
                     ? Services.EntityService.GetAll(UmbracoObjectType, UserStartNodes).ToArray()
@@ -535,6 +538,8 @@ namespace Umbraco.Web.Trees
 
         private readonly ConcurrentDictionary<string, IEntitySlim> _entityCache = new ConcurrentDictionary<string, IEntitySlim>();
 
+        private bool? _ignoreUserStartNodes;
+
         /// <summary>
         /// If the request should allows a user to choose nodes that they normally don't have access to
         /// </summary>
@@ -542,13 +547,12 @@ namespace Umbraco.Web.Trees
         /// <returns></returns>
         internal bool IgnoreUserStartNodes(FormDataCollection queryStrings)
         {
-            var dataTypeId = queryStrings.GetValue<Guid?>(TreeQueryStringParameters.DataTypeId);
-            if (dataTypeId.HasValue)
-            {
-                return Services.DataTypeService.IsDataTypeIgnoringUserStartNodes(dataTypeId.Value);
-            }
+            if (_ignoreUserStartNodes.HasValue) return _ignoreUserStartNodes.Value;
 
-            return false;
+            var dataTypeId = queryStrings.GetValue<Guid?>(TreeQueryStringParameters.DataTypeId);
+            _ignoreUserStartNodes = dataTypeId.HasValue ? Services.DataTypeService.IsDataTypeIgnoringUserStartNodes(dataTypeId.Value) : false;
+
+            return _ignoreUserStartNodes.Value;
         }
     }
 }

From 1c5ed58074c228bfbd41762d192ee9152e1ae635 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 1 Jul 2019 18:54:39 +1000
Subject: [PATCH 069/776] gets media picker working with ignore user start
 nodes

---
 .../src/common/resources/entity.resource.js                  | 5 ++++-
 .../infiniteeditors/mediapicker/mediapicker.controller.js    | 2 +-
 .../views/propertyeditors/grid/editors/media.controller.js   | 2 +-
 .../propertyeditors/mediapicker/mediapicker.controller.js    | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
index eee877a60c..189732bf3a 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
@@ -301,7 +301,10 @@ function entityResource($q, $http, umbRequestHelper) {
          *
          */
         getAncestors: function (id, type, culture, options) {
-            if (culture === undefined) culture = "";
+            if (!culture) {
+                culture = "";
+            }
+
             var args = [
                 { id: id },
                 { type: type },
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
index 015a452e67..f95a8ec974 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
@@ -160,7 +160,7 @@ angular.module("umbraco")
                 }
 
                 if (folder.id > 0) {
-                    entityResource.getAncestors(folder.id, "media", { dataTypeId: $scope.model.dataTypeId })
+                    entityResource.getAncestors(folder.id, "media", null, { dataTypeId: $scope.model.dataTypeId })
                         .then(function (anc) {
                             $scope.path = _.filter(anc,
                                 function (f) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
index 2d8e15ea57..7defe51d29 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
@@ -7,7 +7,7 @@ angular.module("umbraco")
         
         
         if (!$scope.model.config.startNodeId) {
-            if ($scope.model.config.ignoreUserStartNodes === "1" ) {
+            if ($scope.model.config.ignoreUserStartNodes === true) {
                 $scope.model.config.startNodeId = -1;
                 $scope.model.config.startNodeIsVirtual = true;
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
index c32730a2ac..8fd50387c0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
@@ -110,7 +110,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
             userService.getCurrentUser().then(function (userData) {
 
                 if (!$scope.model.config.startNodeId) {
-                    if ($scope.model.config.ignoreUserStartNodes === "1") {
+                    if ($scope.model.config.ignoreUserStartNodes === true) {
                         $scope.model.config.startNodeId = -1;
                         $scope.model.config.startNodeIsVirtual = true;
                     }

From f01be090750acfad253ab145e79ccb050cf16ec2 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Mon, 1 Jul 2019 10:13:31 +0100
Subject: [PATCH 070/776] Update sourcelink & set from full to portable

---
 src/Umbraco.Core/Umbraco.Core.csproj                   | 4 ++--
 src/Umbraco.Examine/Umbraco.Examine.csproj             | 4 ++--
 src/Umbraco.ModelsBuilder/Umbraco.ModelsBuilder.csproj | 2 +-
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj               | 4 ++--
 src/Umbraco.Web/Umbraco.Web.csproj                     | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 3daeb37392..f2ae7b8d99 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -13,7 +13,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
+    <DebugType>portable</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>TRACE;DEBUG</DefineConstants>
@@ -56,7 +56,7 @@
   <ItemGroup>
     <!-- note: NuGet deals with transitive references now -->
     <PackageReference Include="Microsoft.SourceLink.GitHub">
-      <Version>1.0.0-beta2-19270-01</Version>
+      <Version>1.0.0-beta2-19324-01</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/src/Umbraco.Examine/Umbraco.Examine.csproj b/src/Umbraco.Examine/Umbraco.Examine.csproj
index 14a57c3216..e4116154ae 100644
--- a/src/Umbraco.Examine/Umbraco.Examine.csproj
+++ b/src/Umbraco.Examine/Umbraco.Examine.csproj
@@ -13,7 +13,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
+    <DebugType>portable</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
@@ -50,7 +50,7 @@
     <!-- note: NuGet deals with transitive references now -->
     <PackageReference Include="Examine" Version="1.0.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub">
-      <Version>1.0.0-beta2-19270-01</Version>
+      <Version>1.0.0-beta2-19324-01</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/src/Umbraco.ModelsBuilder/Umbraco.ModelsBuilder.csproj b/src/Umbraco.ModelsBuilder/Umbraco.ModelsBuilder.csproj
index b9a5890d57..39913991f2 100644
--- a/src/Umbraco.ModelsBuilder/Umbraco.ModelsBuilder.csproj
+++ b/src/Umbraco.ModelsBuilder/Umbraco.ModelsBuilder.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
+    <DebugType>portable</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index ee19c27ad0..025aea0fb1 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -34,7 +34,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
+    <DebugType>portable</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\</OutputPath>
     <DefineConstants>TRACE;DEBUG</DefineConstants>
@@ -102,7 +102,7 @@
     <PackageReference Include="Microsoft.Owin.Security.Cookies" Version="4.0.1" />
     <PackageReference Include="Microsoft.Owin.Security.OAuth" Version="4.0.1" />
     <PackageReference Include="Microsoft.SourceLink.GitHub">
-      <Version>1.0.0-beta2-19270-01</Version>
+      <Version>1.0.0-beta2-19324-01</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 9bcc1da13d..2c8e8bc915 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -16,7 +16,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
+    <DebugType>portable</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
@@ -81,7 +81,7 @@
     <PackageReference Include="Microsoft.Owin.Security.Cookies" Version="4.0.1" />
     <PackageReference Include="Microsoft.Owin.Security.OAuth" Version="4.0.1" />
     <PackageReference Include="Microsoft.SourceLink.GitHub">
-      <Version>1.0.0-beta2-19270-01</Version>
+      <Version>1.0.0-beta2-19324-01</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

From 0b64e34f05382ecb4c59f8e2ebe6753ca87c6262 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Mon, 1 Jul 2019 10:19:09 +0100
Subject: [PATCH 071/776] Add in SourceLink Nuget to Umbraco.ModelsBuilder
 csproj

---
 src/Umbraco.ModelsBuilder/Umbraco.ModelsBuilder.csproj | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Umbraco.ModelsBuilder/Umbraco.ModelsBuilder.csproj b/src/Umbraco.ModelsBuilder/Umbraco.ModelsBuilder.csproj
index 39913991f2..7c3af3312d 100644
--- a/src/Umbraco.ModelsBuilder/Umbraco.ModelsBuilder.csproj
+++ b/src/Umbraco.ModelsBuilder/Umbraco.ModelsBuilder.csproj
@@ -103,6 +103,11 @@
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp">
       <Version>2.8.0</Version>
     </PackageReference>
+    <PackageReference Include="Microsoft.SourceLink.GitHub">
+      <Version>1.0.0-beta2-19324-01</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj">

From 760f6a1647df7e15ec4426ca7d31c84798a2a440 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Mon, 1 Jul 2019 10:54:29 +0100
Subject: [PATCH 072/776] Umbraco.Web.UI revert change as no real CS code to
 F11 into this project

---
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 025aea0fb1..b27f6aa335 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -34,7 +34,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
-    <DebugType>portable</DebugType>
+    <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\</OutputPath>
     <DefineConstants>TRACE;DEBUG</DefineConstants>

From b64f30353766470b6ffb05cc42645de99e3e943f Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Mon, 1 Jul 2019 11:20:07 +0100
Subject: [PATCH 073/776] Mark the release PDB as portable too - the Powershell
 build uses Release not Debug

---
 src/Umbraco.Core/Umbraco.Core.csproj                   | 2 +-
 src/Umbraco.Examine/Umbraco.Examine.csproj             | 2 +-
 src/Umbraco.ModelsBuilder/Umbraco.ModelsBuilder.csproj | 2 +-
 src/Umbraco.Web/Umbraco.Web.csproj                     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index f2ae7b8d99..facb7b0346 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -23,7 +23,7 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
+    <DebugType>portable</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
diff --git a/src/Umbraco.Examine/Umbraco.Examine.csproj b/src/Umbraco.Examine/Umbraco.Examine.csproj
index e4116154ae..95690c17e4 100644
--- a/src/Umbraco.Examine/Umbraco.Examine.csproj
+++ b/src/Umbraco.Examine/Umbraco.Examine.csproj
@@ -23,7 +23,7 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
+    <DebugType>portable</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
diff --git a/src/Umbraco.ModelsBuilder/Umbraco.ModelsBuilder.csproj b/src/Umbraco.ModelsBuilder/Umbraco.ModelsBuilder.csproj
index 7c3af3312d..60ef944a8c 100644
--- a/src/Umbraco.ModelsBuilder/Umbraco.ModelsBuilder.csproj
+++ b/src/Umbraco.ModelsBuilder/Umbraco.ModelsBuilder.csproj
@@ -22,7 +22,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
+    <DebugType>portable</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 2c8e8bc915..5f076e60c3 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -26,7 +26,7 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
+    <DebugType>portable</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>

From 3effc66b2c6472334ad19731de0def60ed0b399e Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Mon, 1 Jul 2019 11:53:22 +0100
Subject: [PATCH 074/776] Need to update NuSpec to ensure the PDB are getting
 coppied into the bin when Nuget pacakeg installed into a project

---
 build/NuSpecs/UmbracoCms.Core.nuspec | 4 ++--
 build/NuSpecs/UmbracoCms.Web.nuspec  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec
index d93cd4e241..fce15eb487 100644
--- a/build/NuSpecs/UmbracoCms.Core.nuspec
+++ b/build/NuSpecs/UmbracoCms.Core.nuspec
@@ -45,7 +45,7 @@
                 <dependency id="Umbraco.SqlServerCE" version="[4.0.0.1,4.999999)" />
                 <dependency id="NPoco" version="[3.9.4,3.999999)" />
             </group>
-            
+
         </dependencies>
     </metadata>
     <files>
@@ -56,6 +56,6 @@
         <file src="$BuildTmp$\WebApp\bin\Umbraco.Core.xml" target="lib\net472\Umbraco.Core.xml" />
 
         <!-- symbols -->
-        <file src="$BuildTmp$\bin\Umbraco.Core.pdb" target="lib" />
+        <file src="$BuildTmp$\bin\Umbraco.Core.pdb" target="lib\net472\Umbraco.Core.pdb" />
     </files>
 </package>
diff --git a/build/NuSpecs/UmbracoCms.Web.nuspec b/build/NuSpecs/UmbracoCms.Web.nuspec
index 4937c85466..4aa354eba2 100644
--- a/build/NuSpecs/UmbracoCms.Web.nuspec
+++ b/build/NuSpecs/UmbracoCms.Web.nuspec
@@ -44,7 +44,7 @@
                 <dependency id="System.Threading.Tasks.Dataflow" version="[4.9.0,4.999999)" />
 
             </group>
-            
+
         </dependencies>
     </metadata>
     <files>
@@ -59,7 +59,7 @@
         <file src="$BuildTmp$\WebApp\bin\Umbraco.Examine.xml" target="lib\net472\Umbraco.Examine.xml" />
 
         <!-- symbols -->
-        <file src="$BuildTmp$\bin\Umbraco.Web.pdb" target="lib" />
-        <file src="$BuildTmp$\bin\Umbraco.Examine.pdb" target="lib" />
+        <file src="$BuildTmp$\bin\Umbraco.Web.pdb" target="lib\net472\Umbraco.Web.pdb" />
+        <file src="$BuildTmp$\bin\Umbraco.Examine.pdb" target="lib\net472\Umbraco.Examine.pdb" />
     </files>
 </package>

From 503183331f56b1dbac04ab9256454f8364e7aa79 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 1 Jul 2019 20:59:41 +1000
Subject: [PATCH 075/776] gets media picker with ignore start nodes working in
 rte

---
 .../src/common/services/tinymce.service.js     | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 603e723bec..d0d2d06479 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -1154,6 +1154,7 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
             self.createLinkPicker(args.editor, function (currentTarget, anchorElement) {
                 var linkPicker = {
                     currentTarget: currentTarget,
+                    dataTypeId: args.model.dataTypeId,
                     anchors: getCurrentAnchorNames(),
                     submit: function (model) {
                         self.insertLinkInEditor(args.editor, model.target, anchorElement);
@@ -1168,13 +1169,26 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
 
             //Create the insert media plugin
             self.createMediaPicker(args.editor, function (currentTarget, userData) {
+
+                if (!args.model.config.startNodeId) {
+                    if (args.model.config.ignoreUserStartNodes === true) {
+                        args.model.config.startNodeId = -1;
+                        args.model.config.startNodeIsVirtual = true;
+                    }
+                    else {
+                        args.model.config.startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
+                        args.model.config.startNodeIsVirtual = userData.startMediaIds.length !== 1;
+                    }
+                }
+
                 var mediaPicker = {
                     currentTarget: currentTarget,
                     onlyImages: true,
                     showDetails: true,
                     disableFolderSelect: true,
-                    startNodeId: userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0],
-                    startNodeIsVirtual: userData.startMediaIds.length !== 1,
+                    startNodeId: args.model.config.startNodeId,
+                    startNodeIsVirtual: args.model.config.startNodeIsVirtual,
+                    dataTypeId: args.model.dataTypeId,
                     submit: function (model) {
                         self.insertMediaInEditor(args.editor, model.selection[0]);
                         editorService.close();

From 0a6237af042b0dd353da25c07ab55fed3c8a9319 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 1 Jul 2019 21:13:11 +1000
Subject: [PATCH 076/776] Gets the multi url picker working with ignore start
 nodes

---
 .../src/common/services/tinymce.service.js       | 13 +++++++------
 .../linkpicker/linkpicker.controller.js          | 16 ++++++++++++++--
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index d0d2d06479..3355b15570 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -1170,14 +1170,15 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
             //Create the insert media plugin
             self.createMediaPicker(args.editor, function (currentTarget, userData) {
 
+                var startNodeId, startNodeIsVirtual;
                 if (!args.model.config.startNodeId) {
                     if (args.model.config.ignoreUserStartNodes === true) {
-                        args.model.config.startNodeId = -1;
-                        args.model.config.startNodeIsVirtual = true;
+                        startNodeId = -1;
+                        startNodeIsVirtual = true;
                     }
                     else {
-                        args.model.config.startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
-                        args.model.config.startNodeIsVirtual = userData.startMediaIds.length !== 1;
+                        startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
+                        startNodeIsVirtual = userData.startMediaIds.length !== 1;
                     }
                 }
 
@@ -1186,8 +1187,8 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                     onlyImages: true,
                     showDetails: true,
                     disableFolderSelect: true,
-                    startNodeId: args.model.config.startNodeId,
-                    startNodeIsVirtual: args.model.config.startNodeIsVirtual,
+                    startNodeId: startNodeId,
+                    startNodeIsVirtual: startNodeIsVirtual,
                     dataTypeId: args.model.dataTypeId,
                     submit: function (model) {
                         self.insertMediaInEditor(args.editor, model.selection[0]);
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
index d1743baf10..f09acbcc6a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
@@ -161,9 +161,21 @@ angular.module("umbraco").controller("Umbraco.Editors.LinkPickerController",
 
         $scope.switchToMediaPicker = function () {
             userService.getCurrentUser().then(function (userData) {
+
+                var startNodeId, startNodeIsVirtual;
+                if (dialogOptions.ignoreUserStartNodes === true) {
+                    startNodeId = -1;
+                    startNodeIsVirtual = true;
+                }
+                else {
+                    startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
+                    startNodeIsVirtual = userData.startMediaIds.length !== 1;
+                }
+
                 var mediaPicker = {
-                    startNodeId: userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0],
-                    startNodeIsVirtual: userData.startMediaIds.length !== 1,
+                    startNodeId: startNodeId,
+                    startNodeIsVirtual: startNodeIsVirtual,
+                    dataTypeId: dialogOptions.dataTypeId,
                     submit: function (model) {
                         var media = model.selection[0];
 

From 640d2cedb9c79a99517d9fd503e1361e6844b18f Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 1 Jul 2019 21:48:45 +1000
Subject: [PATCH 077/776] Gets the link and media pickers working in the grid
 in the rte with ignore start nodes

---
 .../directives/components/grid/grid.rte.directive.js | 12 +++++++++++-
 .../src/common/services/tinymce.service.js           |  1 +
 .../src/views/propertyeditors/grid/editors/rte.html  |  4 +++-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
index dee3cfdab7..8e561ff5ca 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
@@ -4,7 +4,9 @@ angular.module("umbraco.directives")
             scope: {
                 uniqueId: '=',
                 value: '=',
-                configuration: "="
+                configuration: "=", //this is the RTE configuration
+                datatypeId: '@',
+                ignoreUserStartNodes: '@'
             },
             templateUrl: 'views/components/grid/grid-rte.html',
             replace: true,
@@ -35,6 +37,14 @@ angular.module("umbraco.directives")
                     editorConfig.maxImageSize = tinyMceService.defaultPrevalues().maxImageSize;
                 }
 
+                //ensure the grid's global config is being passed up to the RTE, these 2 properties need to be in this format
+                //since below we are just passing up `scope` as the actual model and for 2 way binding to work with `value` that
+                //is the way it needs to be unless we start adding watchers. We'll just go with this for now but it's super ugly.
+                scope.config = {
+                    ignoreUserStartNodes: scope.ignoreUserStartNodes === "true"
+                }
+                scope.dataTypeId = scope.datatypeId; //Yes - this casing is rediculous, but it's because the var starts with `data` so it can't be `data-type-id` :/
+
                 //stores a reference to the editor
                 var tinyMceEditor = null;
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 3355b15570..19e3d3d970 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -1155,6 +1155,7 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                 var linkPicker = {
                     currentTarget: currentTarget,
                     dataTypeId: args.model.dataTypeId,
+                    ignoreUserStartNodes: args.model.config.ignoreUserStartNodes,
                     anchors: getCurrentAnchorNames(),
                     submit: function (model) {
                         self.insertLinkInEditor(args.editor, model.target, anchorElement);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.html
index 7741bcadff..63bc7570e1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.html
@@ -3,7 +3,9 @@
 	<grid-rte
 		configuration="model.config.rte"
 		value="control.value"
-		unique-id="control.$uniqueId">
+		unique-id="control.$uniqueId"
+        datatype-id="{{model.dataTypeId}}"
+        ignore-user-start-nodes="{{model.config.ignoreUserStartNodes}}">
 	</grid-rte>
 
 </div>

From 09793a17448b0afff9fce7c61983b305d3275aee Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 2 Jul 2019 11:07:59 +1000
Subject: [PATCH 078/776] Fixes tests

---
 src/Umbraco.Core/Constants-DataTypes.cs             |  1 +
 .../Migrations/Install/DatabaseDataCreator.cs       |  6 +++---
 .../Web/Controllers/ContentControllerTests.cs       | 13 +++++++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Core/Constants-DataTypes.cs b/src/Umbraco.Core/Constants-DataTypes.cs
index 65c5fc4ee7..673da8f9a3 100644
--- a/src/Umbraco.Core/Constants-DataTypes.cs
+++ b/src/Umbraco.Core/Constants-DataTypes.cs
@@ -19,6 +19,7 @@ namespace Umbraco.Core
 
             public const int Textarea = -89;
             public const int Textbox = -88;
+            public const int RichtextEditor = -87;
             public const int Boolean = -49;
             public const int DateTime = -36;
             public const int DropDownSingle = -39;
diff --git a/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs b/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
index b783973f4c..dd5c17713a 100644
--- a/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
+++ b/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
@@ -109,8 +109,8 @@ namespace Umbraco.Core.Migrations.Install
             InsertDataTypeNodeDto(Constants.DataTypes.LabelDecimal, 39, Constants.DataTypes.Guids.LabelDecimal, "Label (decimal)");
             _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = Constants.DataTypes.Upload, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = $"-1,{Constants.DataTypes.Upload}", SortOrder = 34, UniqueId = Constants.DataTypes.Guids.UploadGuid, Text = "Upload", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
             _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = Constants.DataTypes.Textarea, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = $"-1,{Constants.DataTypes.Textarea}", SortOrder = 33, UniqueId = Constants.DataTypes.Guids.TextareaGuid, Text = "Textarea", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
-            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -88, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,-88", SortOrder = 32, UniqueId = Constants.DataTypes.Guids.TextstringGuid, Text = "Textstring", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
-            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -87, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,-87", SortOrder = 4, UniqueId = Constants.DataTypes.Guids.RichtextEditorGuid, Text = "Richtext editor", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
+            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = Constants.DataTypes.Textbox, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = $"-1,{Constants.DataTypes.Textbox}", SortOrder = 32, UniqueId = Constants.DataTypes.Guids.TextstringGuid, Text = "Textstring", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
+            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = Constants.DataTypes.RichtextEditor, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = $"-1,{Constants.DataTypes.RichtextEditor}", SortOrder = 4, UniqueId = Constants.DataTypes.Guids.RichtextEditorGuid, Text = "Richtext editor", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
             _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -51, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,-51", SortOrder = 2, UniqueId = Constants.DataTypes.Guids.NumericGuid, Text = "Numeric", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
             _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = Constants.DataTypes.Boolean, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = $"-1,{Constants.DataTypes.Boolean}", SortOrder = 2, UniqueId = Constants.DataTypes.Guids.CheckboxGuid, Text = "True/false", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
             _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -43, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,-43", SortOrder = 2, UniqueId = Constants.DataTypes.Guids.CheckboxListGuid, Text = "Checkbox list", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
@@ -270,7 +270,7 @@ namespace Umbraco.Core.Migrations.Install
             _database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = -51, EditorAlias = Constants.PropertyEditors.Aliases.Integer, DbType = "Integer" });
             _database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = -87, EditorAlias = Constants.PropertyEditors.Aliases.TinyMce, DbType = "Ntext",
                 Configuration = "{\"value\":\",code,undo,redo,cut,copy,mcepasteword,stylepicker,bold,italic,bullist,numlist,outdent,indent,mcelink,unlink,mceinsertanchor,mceimage,umbracomacro,mceinserttable,umbracoembed,mcecharmap,|1|1,2,3,|0|500,400|1049,|true|\"}" });
-            _database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = -88, EditorAlias = Constants.PropertyEditors.Aliases.TextBox, DbType = "Nvarchar" });
+            _database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = Constants.DataTypes.Textbox, EditorAlias = Constants.PropertyEditors.Aliases.TextBox, DbType = "Nvarchar" });
             _database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = Constants.DataTypes.Textarea, EditorAlias = Constants.PropertyEditors.Aliases.TextArea, DbType = "Ntext" });
             _database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = Constants.DataTypes.Upload, EditorAlias = Constants.PropertyEditors.Aliases.UploadField, DbType = "Nvarchar" });
             InsertDataTypeDto(Constants.DataTypes.LabelString, Constants.PropertyEditors.Aliases.Label, "Nvarchar", "{\"umbracoDataValueType\":\"STRING\"}");
diff --git a/src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs b/src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
index a4213b4f0e..d77867152a 100644
--- a/src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
+++ b/src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
@@ -77,6 +77,19 @@ namespace Umbraco.Tests.Web.Controllers
             var entityService = new Mock<IEntityService>();
             entityService.Setup(x => x.GetAllPaths(UmbracoObjectTypes.Document, It.IsAny<int[]>()))
                 .Returns((UmbracoObjectTypes objType, int[] ids) => ids.Select(x => new TreeEntityPath { Path = $"-1,{x}", Id = x }).ToList());
+            entityService.Setup(x => x.GetKey(It.IsAny<int>(), UmbracoObjectTypes.DataType))
+                .Returns((int id, UmbracoObjectTypes objType) =>
+                {
+                    switch (id)
+                    {
+                        case Constants.DataTypes.Textbox:
+                            return Attempt.Succeed(Constants.DataTypes.Guids.TextstringGuid);
+                        case Constants.DataTypes.RichtextEditor:
+                            return Attempt.Succeed(Constants.DataTypes.Guids.RichtextEditorGuid);
+                    }
+                    return Attempt.Fail<Guid>();
+                });
+
 
             var dataTypeService = new Mock<IDataTypeService>();
             dataTypeService.Setup(service => service.GetDataType(It.IsAny<int>()))

From f81588bb13ce724639400696070326b6d5e24dc8 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 2 Jul 2019 11:48:09 +1000
Subject: [PATCH 079/776] fixes search for content picker with ignore start
 nodes

---
 .../views/common/infiniteeditors/treepicker/treepicker.html    | 2 +-
 .../propertyeditors/contentpicker/contentpicker.controller.js  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.html
index f8dd60bfad..01c14a284f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.html
@@ -36,7 +36,7 @@
                                         search-from-id="{{vm.searchInfo.searchFromId}}"
                                         search-from-name="{{vm.searchInfo.searchFromName}}"
                                         show-search="{{vm.searchInfo.showSearch}}"
-                                        datatype-id="{{searchInfo.dataTypeId}}"
+                                        datatype-id="{{vm.searchInfo.dataTypeId}}"
                                         section="{{vm.section}}">
                                     </umb-tree-search-box>
                                 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
index 8a4020d5f9..7fafa20b0f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
@@ -139,7 +139,8 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
         multiPicker: $scope.model.config.multiPicker,
         entityType: entityType,
         filterCssClass: "not-allowed not-published",
-        startNodeId: null,        
+        startNodeId: null,
+        dataTypeId: $scope.model.dataTypeId,
         currentNode: editorState ? editorState.current : null,
         callback: function (data) {
             if (angular.isArray(data)) {

From 4134dd16df02151ced2bb566c284b87b9ec8ec15 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 2 Jul 2019 12:04:58 +1000
Subject: [PATCH 080/776] adds fixme note

---
 src/Umbraco.Web/Models/Mapping/ContentPropertyBasicMapper.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Umbraco.Web/Models/Mapping/ContentPropertyBasicMapper.cs b/src/Umbraco.Web/Models/Mapping/ContentPropertyBasicMapper.cs
index 8340d24032..57a06c2175 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentPropertyBasicMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentPropertyBasicMapper.cs
@@ -51,6 +51,8 @@ namespace Umbraco.Web.Models.Mapping
             dest.PropertyEditor = editor;
             dest.Editor = editor.Alias;
 
+            //fixme: although this might get cached, if a content item has 100 properties of different data types, then this means this is going to be 100 extra DB queries :( :( :(
+            // - ideally, we'd just have the DataTypeKey alongside the DataTypeId which is loaded in the single sql statement which should be relatively easy.
             var dataTypeKey = _entityService.GetKey(property.PropertyType.DataTypeId, UmbracoObjectTypes.DataType);
             if (!dataTypeKey.Success)
                 throw new InvalidOperationException("Can't get the unique key from the id: " + property.PropertyType.DataTypeId);

From 4ed746e4ef1d01174db393c363ca522db093351c Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 2 Jul 2019 13:37:40 +1000
Subject: [PATCH 081/776] Fixes tree refreshing when changing users, fixes
 memory/event leak

---
 .../components/tree/umbtree.directive.js         |  4 ----
 .../src/common/services/navigation.service.js    |  2 +-
 .../src/controllers/main.controller.js           | 11 +++++++++--
 .../src/controllers/navigation.controller.js     | 16 ++++++++++++----
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js
index 4c7bd2f477..2bd93a4b27 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js
@@ -92,10 +92,6 @@ function umbTreeDirective($q, $rootScope, treeService, notificationsService, use
                 }
             }
 
-            // TODO: This isn't used!?
-            function clearCache(section) {
-                treeService.clearCache({ section: section });
-            }
 
             /**
              * Re-loads the tree with the updated parameters
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
index e51b7b818e..a36e1a7633 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
@@ -349,7 +349,7 @@ function navigationService($routeParams, $location, $q, $injector, eventsService
         
         reloadSection: function(sectionAlias) {
             return navReadyPromise.promise.then(function () {
-                mainTreeApi.clearCache({ section: sectionAlias });
+                treeService.clearCache({ section: sectionAlias });
                 return mainTreeApi.load(sectionAlias);
             });
         },
diff --git a/src/Umbraco.Web.UI.Client/src/controllers/main.controller.js b/src/Umbraco.Web.UI.Client/src/controllers/main.controller.js
index 83b3c920d7..654bbb1d03 100644
--- a/src/Umbraco.Web.UI.Client/src/controllers/main.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/controllers/main.controller.js
@@ -9,8 +9,8 @@
  * 
  */
 function MainController($scope, $location, appState, treeService, notificationsService, 
-    userService, historyService, updateChecker, assetsService, eventsService, 
-    tmhDynamicLocale, localStorageService, editorService, overlayService, focusService) {
+    userService, historyService, updateChecker, navigationService, eventsService, 
+    tmhDynamicLocale, localStorageService, editorService, overlayService) {
 
     //the null is important because we do an explicit bool check on this in the view
     $scope.authenticated = null;
@@ -105,6 +105,13 @@ function MainController($scope, $location, appState, treeService, notificationsS
         //if the user has changed we need to redirect to the root so they don't try to continue editing the
         //last item in the URL (NOTE: the user id can equal zero, so we cannot just do !data.lastUserId since that will resolve to true)
         if (data.lastUserId !== undefined && data.lastUserId !== null && data.lastUserId !== data.user.id) {
+
+            var section = appState.getSectionState("currentSection");
+            if (section) {
+                //if there's a section already assigned, reload it so the tree is cleared
+                navigationService.reloadSection(section);
+            }
+
             $location.path("/").search("");
             historyService.removeAll();
             treeService.clearCache();
diff --git a/src/Umbraco.Web.UI.Client/src/controllers/navigation.controller.js b/src/Umbraco.Web.UI.Client/src/controllers/navigation.controller.js
index c426d0d955..e4c94f3c66 100644
--- a/src/Umbraco.Web.UI.Client/src/controllers/navigation.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/controllers/navigation.controller.js
@@ -140,8 +140,9 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
     //// TODO: remove this it's not a thing
     //$scope.selectedId = navigationService.currentId;
 
+    var isInit = false;
     var evts = [];
-
+    
     //Listen for global state changes
     evts.push(eventsService.on("appState.globalState.changed", function (e, args) {
         if (args.key === "showNavigation") {
@@ -236,8 +237,10 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
     }));
 
     //when the application is ready and the user is authorized, setup the data
+    //this will occur anytime a new user logs in!
     evts.push(eventsService.on("app.ready", function (evt, data) {
-        init();
+        $scope.authenticated = true;
+        ensureInit();
     }));
 
     // event for infinite editors
@@ -305,9 +308,14 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
     /**
      * Called when the app is ready and sets up the navigation (should only be called once)
      */
-    function init() {
+    function ensureInit() {
 
-        $scope.authenticated = true;
+        //only run once ever!
+        if (isInit) {
+            return;
+        }
+
+        isInit = true;
 
         var navInit = false;
 

From c414dd06ccd5f0d16e3f75eef0554b3f6d9e0f02 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 2 Jul 2019 15:38:17 +1000
Subject: [PATCH 082/776] updates package lock

---
 src/Umbraco.Web.UI.Client/package-lock.json | 75 +++++++++++++--------
 1 file changed, 47 insertions(+), 28 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json
index 5622322fda..be1582f1e4 100644
--- a/src/Umbraco.Web.UI.Client/package-lock.json
+++ b/src/Umbraco.Web.UI.Client/package-lock.json
@@ -1224,7 +1224,7 @@
     "arraybuffer.slice": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz",
-      "integrity": "sha1-O7xCdd1YTMGxCAm4nU6LY6aednU=",
+      "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==",
       "dev": true
     },
     "asap": {
@@ -1286,7 +1286,7 @@
     "async-limiter": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
-      "integrity": "sha1-ePrtjD0HSrgfIrTphdeehzj3IPg=",
+      "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==",
       "dev": true
     },
     "asynckit": {
@@ -1538,7 +1538,7 @@
     "bl": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
-      "integrity": "sha1-oWCRFxcQPAdBDO9j71Gzl8Alr5w=",
+      "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==",
       "dev": true,
       "optional": true,
       "requires": {
@@ -2535,7 +2535,7 @@
     "content-type": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha1-4TjMdeBAxyexlm/l5fjJruJW/js=",
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
       "dev": true
     },
     "continuable-cache": {
@@ -4150,7 +4150,7 @@
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -4186,7 +4186,7 @@
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -4581,7 +4581,7 @@
     "eventemitter3": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz",
-      "integrity": "sha1-CQtNbNvWRe0Qv3UNS1QHlC17oWM=",
+      "integrity": "sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==",
       "dev": true
     },
     "exec-buffer": {
@@ -5418,7 +5418,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -5439,12 +5440,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -5459,17 +5462,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5586,7 +5592,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5598,6 +5605,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5612,6 +5620,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -5619,12 +5628,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -5643,6 +5654,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5723,7 +5735,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5735,6 +5748,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5820,7 +5834,8 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5856,6 +5871,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5875,6 +5891,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5918,12 +5935,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -7682,7 +7701,7 @@
     "has-binary2": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz",
-      "integrity": "sha1-d3asYn8+p3JQz8My2rfd9eT10R0=",
+      "integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==",
       "dev": true,
       "requires": {
         "isarray": "2.0.1"
@@ -7885,7 +7904,7 @@
     "http-proxy": {
       "version": "1.17.0",
       "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz",
-      "integrity": "sha1-etOElGWPhGBeL220Q230EPTlvpo=",
+      "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
       "dev": true,
       "requires": {
         "eventemitter3": "^3.0.0",
@@ -9941,9 +9960,9 @@
       "dev": true
     },
     "nouislider": {
-      "version": "12.1.0",
-      "resolved": "https://registry.npmjs.org/nouislider/-/nouislider-12.1.0.tgz",
-      "integrity": "sha512-SAOabF6hBm8201c6LDbkVOVhgwY49+/ms72ZLUF2qkN5RCf7FfUvEh/hGZ7XcwZHU+I/grlicPmcSk1/rrMnOw=="
+      "version": "14.0.1",
+      "resolved": "https://registry.npmjs.org/nouislider/-/nouislider-14.0.1.tgz",
+      "integrity": "sha512-YNLKuABWYxmC5WXJ9TUj3N7+iyL/xT3+jm1mgOMXoqBhAL0Pj9BMgyKmLgwRnrxNN+C/fe7sFmpQDDPsxbMT2w=="
     },
     "npm": {
       "version": "6.4.1",
@@ -13741,7 +13760,7 @@
     "qjobs": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz",
-      "integrity": "sha1-xF6cYYAL0IfviNfiVkI73Unl0HE=",
+      "integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==",
       "dev": true
     },
     "qs": {
@@ -14919,7 +14938,7 @@
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -16022,7 +16041,7 @@
     "type-is": {
       "version": "1.6.16",
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
-      "integrity": "sha1-+JzjQVQcZysl7nrjxz3uOyvlAZQ=",
+      "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
       "dev": true,
       "requires": {
         "media-typer": "0.3.0",
@@ -16064,7 +16083,7 @@
     "ultron": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
-      "integrity": "sha1-n+FTahCmZKZSZqHjzPhf02MCvJw=",
+      "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==",
       "dev": true
     },
     "unc-path-regex": {
@@ -16677,7 +16696,7 @@
     "ws": {
       "version": "3.3.3",
       "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
-      "integrity": "sha1-8c+E/i1ekB686U767OeF8YeiKPI=",
+      "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
       "dev": true,
       "requires": {
         "async-limiter": "~1.0.0",

From 3d3647b476aa9b78cdf2ef1fb79f7f2be2747cce Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Tue, 2 Jul 2019 10:11:51 +0200
Subject: [PATCH 083/776] Fix tests

---
 src/Umbraco.Tests/Testing/UmbracoTestBase.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
index 2d2cbaa3fd..7e72a5aefb 100644
--- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
+++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
@@ -248,6 +248,11 @@ namespace Umbraco.Tests.Testing
 
             // register empty content apps collection
             Composition.WithCollectionBuilder<ContentAppFactoryCollectionBuilder>();
+
+            // manifest
+            Composition.ManifestValueValidators();
+            Composition.ManifestFilters();
+
         }
 
         protected virtual void ComposeMapper(bool configure)

From 3c0565e516e1a26f42e93128e2207dd48e811259 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 2 Jul 2019 10:56:44 +0200
Subject: [PATCH 084/776] Bugfix: Null ref-exception when using member pickers.

---
 src/Umbraco.Web/Editors/EntityController.cs | 47 ++++++++-------------
 1 file changed, 17 insertions(+), 30 deletions(-)

diff --git a/src/Umbraco.Web/Editors/EntityController.cs b/src/Umbraco.Web/Editors/EntityController.cs
index 029132c51b..85d5b607b6 100644
--- a/src/Umbraco.Web/Editors/EntityController.cs
+++ b/src/Umbraco.Web/Editors/EntityController.cs
@@ -442,16 +442,7 @@ namespace Umbraco.Web.Editors
             {
                 //TODO: Need to check for Object types that support hierarchy here, some might not.
 
-                int[] startNodes = null;
-                switch (type)
-                {
-                    case UmbracoEntityTypes.Document:
-                        startNodes = Security.CurrentUser.CalculateContentStartNodeIds(Services.EntityService);
-                        break;
-                    case UmbracoEntityTypes.Media:
-                        startNodes = Security.CurrentUser.CalculateMediaStartNodeIds(Services.EntityService);
-                        break;
-                }
+                var startNodes = GetStartNodes(type);
 
                 var ignoreUserStartNodes = IsDataTypeIgnoringUserStartNodes(dataTypeId);
 
@@ -578,16 +569,7 @@ namespace Umbraco.Web.Editors
                 IEnumerable<IUmbracoEntity> entities;
                 long totalRecords;
 
-                int[] startNodes = null;
-                switch (type)
-                {
-                    case UmbracoEntityTypes.Document:
-                        startNodes = Security.CurrentUser.CalculateContentStartNodeIds(Services.EntityService);
-                        break;
-                    case UmbracoEntityTypes.Media:
-                        startNodes = Security.CurrentUser.CalculateMediaStartNodeIds(Services.EntityService);
-                        break;
-                }
+                var startNodes = GetStartNodes(type);
 
                 var ignoreUserStartNodes = IsDataTypeIgnoringUserStartNodes(dataTypeId);
 
@@ -637,6 +619,20 @@ namespace Umbraco.Web.Editors
             }
         }
 
+        private int[] GetStartNodes(UmbracoEntityTypes type)
+        {
+            switch (type)
+            {
+                case UmbracoEntityTypes.Document:
+                    return Security.CurrentUser.CalculateContentStartNodeIds(Services.EntityService);
+                case UmbracoEntityTypes.Media:
+                    return Security.CurrentUser.CalculateMediaStartNodeIds(Services.EntityService);
+                default:
+                    return new int[0];
+            }
+
+        }
+
 
         public PagedResult<EntityBasic> GetPagedDescendants(
             int id,
@@ -663,16 +659,7 @@ namespace Umbraco.Web.Editors
                 {
                     // root is special: we reduce it to start nodes
 
-                    int[] aids = null;
-                    switch (type)
-                    {
-                        case UmbracoEntityTypes.Document:
-                            aids = Security.CurrentUser.CalculateContentStartNodeIds(Services.EntityService);
-                            break;
-                        case UmbracoEntityTypes.Media:
-                            aids = Security.CurrentUser.CalculateMediaStartNodeIds(Services.EntityService);
-                            break;
-                    }
+                    int[] aids = GetStartNodes(type);
 
                     var ignoreUserStartNodes = IsDataTypeIgnoringUserStartNodes(dataTypeId);
                     entities = aids == null || aids.Contains(Constants.System.Root) || ignoreUserStartNodes

From 1a437c1c6abe77ef5edd337bbbdb169edde5f41e Mon Sep 17 00:00:00 2001
From: Dave Woestenborghs <dave.woestenborghs@gmail.com>
Date: Mon, 1 Jul 2019 10:26:47 +0200
Subject: [PATCH 085/776] #5750 - fix outside click directive so it doesn't
 close dialogues from create action

---
 .../common/directives/components/events/events.directive.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/events/events.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/events/events.directive.js
index abee5e2358..47e6818466 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/events/events.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/events/events.directive.js
@@ -131,6 +131,12 @@ angular.module('umbraco.directives')
                     return;
                 }
 
+                // ignore clicks on dialog actions
+                var actions = $(event.target).parents(".umb-action");
+                if (actions.length === 1) {
+                    return;
+                }
+
                 //ignore clicks inside this element
                 if ($(element).has($(event.target)).length > 0) {
                     return;

From 7b0979f9fda8c23f3970e83ff4290bd9e8c73f8a Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 2 Jul 2019 19:15:04 +1000
Subject: [PATCH 086/776] Fixes install.ps1 and updates sln to remove old ps1
 file

---
 build/NuSpecs/tools/install.ps1 | 25 +++++++++++++++++++++----
 src/umbraco.sln                 |  1 -
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/build/NuSpecs/tools/install.ps1 b/build/NuSpecs/tools/install.ps1
index 1411cb5c97..0be28f9467 100644
--- a/build/NuSpecs/tools/install.ps1
+++ b/build/NuSpecs/tools/install.ps1
@@ -18,9 +18,20 @@ if ($project) {
 
 	# Copy umbraco and umbraco_files from package to project folder
 	$umbracoFolder = Join-Path $projectPath "Umbraco"
-	New-Item -ItemType Directory -Force -Path $umbracoFolder
+	New-Item -ItemType Directory -Force -Path $umbracoFolder	
 	$umbracoFolderSource = Join-Path $installPath "UmbracoFiles\Umbraco"		
-	robocopy $umbracoFolderSource $umbracoFolder /is /it /e /xf UI.xml /LOG:$copyLogsPath\UmbracoCopy.log
+
+    Write-Host "copying files to $umbracoFolder ..."
+    # see https://support.microsoft.com/en-us/help/954404/return-codes-that-are-used-by-the-robocopy-utility-in-windows-server-2
+    robocopy $umbracoFolderSource $umbracoFolder /is /it /e
+    if (($lastexitcode -eq 1) -or ($lastexitcode -eq 3) -or ($lastexitcode -eq 5) -or ($lastexitcode -eq 7))
+    {
+        write-host "Copy succeeded!"
+    }
+    else
+    {
+        write-host "Copy failed with exit code:" $lastexitcode
+    }
 
 	$copyWebconfig = $true
 	$destinationWebConfig = Join-Path $projectPath "Web.config"
@@ -40,7 +51,11 @@ if ($project) {
 				}
 			}
 		} 
-		Catch { }
+		Catch 
+		{ 
+			Write-Host "An error occurred:"
+  			Write-Host $_
+		}
 	}
 	
 	if($copyWebconfig -eq $true) 
@@ -74,7 +89,9 @@ if ($project) {
 		} 
 		Catch 
 		{
-			# Not a big problem if this fails, let it go
+            # Not a big problem if this fails, let it go
+			# Write-Host "An error occurred:"
+  			# Write-Host $_			
 		}
 	}
 	
diff --git a/src/umbraco.sln b/src/umbraco.sln
index 7313e06e49..39b757f88c 100644
--- a/src/umbraco.sln
+++ b/src/umbraco.sln
@@ -70,7 +70,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{E3F9F378
 	ProjectSection(SolutionItems) = preProject
 		..\build\NuSpecs\tools\applications.config.install.xdt = ..\build\NuSpecs\tools\applications.config.install.xdt
 		..\build\NuSpecs\tools\ClientDependency.config.install.xdt = ..\build\NuSpecs\tools\ClientDependency.config.install.xdt
-		..\build\NuSpecs\tools\install.core.ps1 = ..\build\NuSpecs\tools\install.core.ps1
 		..\build\NuSpecs\tools\install.ps1 = ..\build\NuSpecs\tools\install.ps1
 		..\build\NuSpecs\tools\Readme.txt = ..\build\NuSpecs\tools\Readme.txt
 		..\build\NuSpecs\tools\ReadmeUpgrade.txt = ..\build\NuSpecs\tools\ReadmeUpgrade.txt

From e6484687e51f06171e16a66827ef0ac326ad24de Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 2 Jul 2019 11:17:23 +0200
Subject: [PATCH 087/776] Small fixes after v7 to v8 merge regarding the bypass
 security feature

---
 src/Umbraco.Web.UI.Client/package-lock.json   | 400 +++++-------------
 .../src/common/resources/entity.resource.js   |  17 +
 .../src/common/services/tinymce.service.js    |  71 +---
 .../linkpicker/linkpicker.controller.js       |   2 +-
 .../grid/editors/media.controller.js          |   2 +-
 src/Umbraco.Web/Editors/EntityController.cs   |  50 ++-
 src/Umbraco.Web/Models/AnchorsModel.cs        |   7 +
 src/Umbraco.Web/Umbraco.Web.csproj            |   1 +
 8 files changed, 181 insertions(+), 369 deletions(-)
 create mode 100644 src/Umbraco.Web/Models/AnchorsModel.cs

diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json
index be1582f1e4..3e8f053bc6 100644
--- a/src/Umbraco.Web.UI.Client/package-lock.json
+++ b/src/Umbraco.Web.UI.Client/package-lock.json
@@ -955,7 +955,7 @@
     },
     "ansi-escapes": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
+      "resolved": "http://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
       "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==",
       "dev": true
     },
@@ -1104,7 +1104,6 @@
       "resolved": "https://registry.npmjs.org/archive-type/-/archive-type-3.2.0.tgz",
       "integrity": "sha1-nNnABpV+vpX62tW9YJiUKoE3N/Y=",
       "dev": true,
-      "optional": true,
       "requires": {
         "file-type": "^3.1.0"
       },
@@ -1113,8 +1112,7 @@
           "version": "3.9.0",
           "resolved": "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
           "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -1178,7 +1176,7 @@
     "array-slice": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
-      "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
+      "integrity": "sha1-42jqFfibxwaff/uJrsOmx9SsItQ=",
       "dev": true
     },
     "array-sort": {
@@ -1540,7 +1538,6 @@
       "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
       "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==",
       "dev": true,
-      "optional": true,
       "requires": {
         "readable-stream": "^2.3.5",
         "safe-buffer": "^5.1.1"
@@ -1550,15 +1547,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -1574,7 +1569,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -1763,8 +1757,7 @@
       "version": "0.2.13",
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
       "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "buffer-fill": {
       "version": "1.0.0",
@@ -1783,7 +1776,6 @@
       "resolved": "https://registry.npmjs.org/buffer-to-vinyl/-/buffer-to-vinyl-1.1.0.tgz",
       "integrity": "sha1-APFfruOreh3aLN5tkSG//dB7ImI=",
       "dev": true,
-      "optional": true,
       "requires": {
         "file-type": "^3.1.0",
         "readable-stream": "^2.0.2",
@@ -1795,22 +1787,19 @@
           "version": "3.9.0",
           "resolved": "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
           "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "isarray": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -1826,7 +1815,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -1835,15 +1823,13 @@
           "version": "2.0.3",
           "resolved": "http://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
           "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "vinyl": {
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -1964,8 +1950,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz",
       "integrity": "sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "caseless": {
       "version": "0.12.0",
@@ -1978,7 +1963,6 @@
       "resolved": "https://registry.npmjs.org/caw/-/caw-1.2.0.tgz",
       "integrity": "sha1-/7Im/n78VHKI3GLuPpcHPCEtEDQ=",
       "dev": true,
-      "optional": true,
       "requires": {
         "get-proxy": "^1.0.1",
         "is-obj": "^1.0.0",
@@ -1990,8 +1974,7 @@
           "version": "0.4.3",
           "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
           "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -2266,8 +2249,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/co/-/co-3.1.0.tgz",
       "integrity": "sha1-TqVOpaCJOBUxheFSEMaNkJK8G3g=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "coa": {
       "version": "2.0.1",
@@ -2391,7 +2373,6 @@
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
       "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
       "dev": true,
-      "optional": true,
       "requires": {
         "graceful-readlink": ">= 1.0.0"
       }
@@ -2455,7 +2436,7 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
@@ -2578,7 +2559,7 @@
     "core-js": {
       "version": "2.5.7",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz",
-      "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==",
+      "integrity": "sha1-+XJgj/DOrWi4QaFqky0LGDeRgU4=",
       "dev": true
     },
     "core-util-is": {
@@ -2604,7 +2585,6 @@
       "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
       "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
       "dev": true,
-      "optional": true,
       "requires": {
         "capture-stack-trace": "^1.0.0"
       }
@@ -2859,7 +2839,6 @@
       "resolved": "https://registry.npmjs.org/decompress/-/decompress-3.0.0.tgz",
       "integrity": "sha1-rx3VDQbjv8QyRh033hGzjA2ZG+0=",
       "dev": true,
-      "optional": true,
       "requires": {
         "buffer-to-vinyl": "^1.0.0",
         "concat-stream": "^1.4.6",
@@ -2877,7 +2856,6 @@
           "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
           "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
           "dev": true,
-          "optional": true,
           "requires": {
             "arr-flatten": "^1.0.1"
           }
@@ -2886,15 +2864,13 @@
           "version": "0.2.1",
           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
           "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "braces": {
           "version": "1.8.5",
           "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
           "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
           "dev": true,
-          "optional": true,
           "requires": {
             "expand-range": "^1.8.1",
             "preserve": "^0.2.0",
@@ -2906,7 +2882,6 @@
           "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
           "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-posix-bracket": "^0.1.0"
           }
@@ -2916,7 +2891,6 @@
           "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
           "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -2926,7 +2900,6 @@
           "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
           "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
           "dev": true,
-          "optional": true,
           "requires": {
             "inflight": "^1.0.4",
             "inherits": "2",
@@ -2940,7 +2913,6 @@
           "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz",
           "integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=",
           "dev": true,
-          "optional": true,
           "requires": {
             "extend": "^3.0.0",
             "glob": "^5.0.3",
@@ -2956,15 +2928,13 @@
               "version": "0.0.1",
               "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
               "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "readable-stream": {
               "version": "1.0.34",
               "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
               "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
               "dev": true,
-              "optional": true,
               "requires": {
                 "core-util-is": "~1.0.0",
                 "inherits": "~2.0.1",
@@ -2976,15 +2946,13 @@
               "version": "0.10.31",
               "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
               "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "through2": {
               "version": "0.6.5",
               "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
               "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
               "dev": true,
-              "optional": true,
               "requires": {
                 "readable-stream": ">=1.0.33-1 <1.1.0-0",
                 "xtend": ">=4.0.0 <4.1.0-0"
@@ -2996,22 +2964,19 @@
           "version": "4.1.15",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
           "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "is-extglob": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
           "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "is-glob": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
           "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -3020,15 +2985,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -3038,7 +3001,6 @@
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
           "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
           "dev": true,
-          "optional": true,
           "requires": {
             "arr-diff": "^2.0.0",
             "array-unique": "^0.2.1",
@@ -3059,15 +3021,13 @@
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ordered-read-streams": {
           "version": "0.3.0",
           "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz",
           "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-stream": "^1.0.1",
             "readable-stream": "^2.0.1"
@@ -3078,7 +3038,6 @@
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -3094,7 +3053,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -3104,7 +3062,6 @@
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
           "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-utf8": "^0.2.0"
           }
@@ -3114,7 +3071,6 @@
           "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz",
           "integrity": "sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=",
           "dev": true,
-          "optional": true,
           "requires": {
             "first-chunk-stream": "^1.0.0",
             "strip-bom": "^2.0.0"
@@ -3125,7 +3081,6 @@
           "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
           "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
           "dev": true,
-          "optional": true,
           "requires": {
             "json-stable-stringify-without-jsonify": "^1.0.1",
             "through2-filter": "^3.0.0"
@@ -3136,7 +3091,6 @@
               "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
               "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
               "dev": true,
-              "optional": true,
               "requires": {
                 "through2": "~2.0.0",
                 "xtend": "~4.0.0"
@@ -3149,7 +3103,6 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -3161,7 +3114,6 @@
           "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz",
           "integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=",
           "dev": true,
-          "optional": true,
           "requires": {
             "duplexify": "^3.2.0",
             "glob-stream": "^5.3.2",
@@ -3189,7 +3141,6 @@
       "resolved": "https://registry.npmjs.org/decompress-tar/-/decompress-tar-3.1.0.tgz",
       "integrity": "sha1-IXx4n5uURQ76rcXF5TeXj8MzxGY=",
       "dev": true,
-      "optional": true,
       "requires": {
         "is-tar": "^1.0.0",
         "object-assign": "^2.0.0",
@@ -3203,22 +3154,19 @@
           "version": "0.2.0",
           "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
           "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
           "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "1.0.34",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.1",
@@ -3231,7 +3179,6 @@
           "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
           "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
           "dev": true,
-          "optional": true,
           "requires": {
             "readable-stream": ">=1.0.33-1 <1.1.0-0",
             "xtend": ">=4.0.0 <4.1.0-0"
@@ -3242,7 +3189,6 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^0.2.0",
             "clone-stats": "^0.0.1"
@@ -3255,7 +3201,6 @@
       "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-3.1.0.tgz",
       "integrity": "sha1-iyOTVoE1X58YnYclag+L3ZbZZm0=",
       "dev": true,
-      "optional": true,
       "requires": {
         "is-bzip2": "^1.0.0",
         "object-assign": "^2.0.0",
@@ -3270,22 +3215,19 @@
           "version": "0.2.0",
           "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
           "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
           "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "1.0.34",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.1",
@@ -3298,7 +3240,6 @@
           "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
           "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
           "dev": true,
-          "optional": true,
           "requires": {
             "readable-stream": ">=1.0.33-1 <1.1.0-0",
             "xtend": ">=4.0.0 <4.1.0-0"
@@ -3309,7 +3250,6 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^0.2.0",
             "clone-stats": "^0.0.1"
@@ -3322,7 +3262,6 @@
       "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-3.1.0.tgz",
       "integrity": "sha1-ssE9+YFmJomRtxXWRH9kLpaW9aA=",
       "dev": true,
-      "optional": true,
       "requires": {
         "is-gzip": "^1.0.0",
         "object-assign": "^2.0.0",
@@ -3336,22 +3275,19 @@
           "version": "0.2.0",
           "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
           "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
           "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "1.0.34",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.1",
@@ -3364,7 +3300,6 @@
           "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
           "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
           "dev": true,
-          "optional": true,
           "requires": {
             "readable-stream": ">=1.0.33-1 <1.1.0-0",
             "xtend": ">=4.0.0 <4.1.0-0"
@@ -3375,7 +3310,6 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^0.2.0",
             "clone-stats": "^0.0.1"
@@ -3388,7 +3322,6 @@
       "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-3.4.0.tgz",
       "integrity": "sha1-YUdbQVIGa74/7hL51inRX+ZHjus=",
       "dev": true,
-      "optional": true,
       "requires": {
         "is-zip": "^1.0.0",
         "read-all-stream": "^3.0.0",
@@ -3404,7 +3337,6 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -3417,8 +3349,7 @@
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
       "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "deep-is": {
       "version": "0.1.3",
@@ -3562,7 +3493,7 @@
     "doctrine": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "integrity": "sha1-XNAfwQFiG0LEzX9dGmYkNxbT850=",
       "dev": true,
       "requires": {
         "esutils": "^2.0.2"
@@ -3637,7 +3568,6 @@
       "resolved": "https://registry.npmjs.org/download/-/download-4.4.3.tgz",
       "integrity": "sha1-qlX9rTktldS2jowr4D4MKqIbqaw=",
       "dev": true,
-      "optional": true,
       "requires": {
         "caw": "^1.0.1",
         "concat-stream": "^1.4.7",
@@ -3661,7 +3591,6 @@
           "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
           "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
           "dev": true,
-          "optional": true,
           "requires": {
             "arr-flatten": "^1.0.1"
           }
@@ -3670,15 +3599,13 @@
           "version": "0.2.1",
           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
           "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "braces": {
           "version": "1.8.5",
           "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
           "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
           "dev": true,
-          "optional": true,
           "requires": {
             "expand-range": "^1.8.1",
             "preserve": "^0.2.0",
@@ -3690,7 +3617,6 @@
           "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
           "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-posix-bracket": "^0.1.0"
           }
@@ -3700,7 +3626,6 @@
           "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
           "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -3710,7 +3635,6 @@
           "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
           "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
           "dev": true,
-          "optional": true,
           "requires": {
             "inflight": "^1.0.4",
             "inherits": "2",
@@ -3724,7 +3648,6 @@
           "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz",
           "integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=",
           "dev": true,
-          "optional": true,
           "requires": {
             "extend": "^3.0.0",
             "glob": "^5.0.3",
@@ -3740,15 +3663,13 @@
               "version": "0.0.1",
               "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
               "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "readable-stream": {
               "version": "1.0.34",
               "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
               "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
               "dev": true,
-              "optional": true,
               "requires": {
                 "core-util-is": "~1.0.0",
                 "inherits": "~2.0.1",
@@ -3760,15 +3681,13 @@
               "version": "0.10.31",
               "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
               "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "through2": {
               "version": "0.6.5",
               "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
               "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
               "dev": true,
-              "optional": true,
               "requires": {
                 "readable-stream": ">=1.0.33-1 <1.1.0-0",
                 "xtend": ">=4.0.0 <4.1.0-0"
@@ -3780,22 +3699,19 @@
           "version": "4.1.15",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
           "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "is-extglob": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
           "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "is-glob": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
           "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -3804,15 +3720,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -3822,7 +3736,6 @@
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
           "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
           "dev": true,
-          "optional": true,
           "requires": {
             "arr-diff": "^2.0.0",
             "array-unique": "^0.2.1",
@@ -3843,15 +3756,13 @@
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ordered-read-streams": {
           "version": "0.3.0",
           "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz",
           "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-stream": "^1.0.1",
             "readable-stream": "^2.0.1"
@@ -3862,7 +3773,6 @@
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -3878,7 +3788,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -3888,7 +3797,6 @@
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
           "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-utf8": "^0.2.0"
           }
@@ -3898,7 +3806,6 @@
           "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz",
           "integrity": "sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=",
           "dev": true,
-          "optional": true,
           "requires": {
             "first-chunk-stream": "^1.0.0",
             "strip-bom": "^2.0.0"
@@ -3909,7 +3816,6 @@
           "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
           "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
           "dev": true,
-          "optional": true,
           "requires": {
             "json-stable-stringify-without-jsonify": "^1.0.1",
             "through2-filter": "^3.0.0"
@@ -3920,7 +3826,6 @@
               "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
               "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
               "dev": true,
-              "optional": true,
               "requires": {
                 "through2": "~2.0.0",
                 "xtend": "~4.0.0"
@@ -3933,7 +3838,6 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -3945,7 +3849,6 @@
           "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz",
           "integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=",
           "dev": true,
-          "optional": true,
           "requires": {
             "duplexify": "^3.2.0",
             "glob-stream": "^5.3.2",
@@ -3988,7 +3891,6 @@
       "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.1.tgz",
       "integrity": "sha512-vM58DwdnKmty+FSPzT14K9JXb90H+j5emaR4KYbr2KTIz00WHGbWOe5ghQTx233ZCLZtrGDALzKwcjEtSt35mA==",
       "dev": true,
-      "optional": true,
       "requires": {
         "end-of-stream": "^1.0.0",
         "inherits": "^2.0.1",
@@ -4001,7 +3903,6 @@
           "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
           "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
           "dev": true,
-          "optional": true,
           "requires": {
             "once": "^1.4.0"
           }
@@ -4010,15 +3911,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "once": {
           "version": "1.4.0",
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -4028,7 +3927,6 @@
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -4044,7 +3942,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -4056,7 +3953,6 @@
       "resolved": "https://registry.npmjs.org/each-async/-/each-async-1.1.1.tgz",
       "integrity": "sha1-3uUim98KtrogEqOV4bhpq/iBNHM=",
       "dev": true,
-      "optional": true,
       "requires": {
         "onetime": "^1.0.0",
         "set-immediate-shim": "^1.0.0"
@@ -4066,8 +3962,7 @@
           "version": "1.1.0",
           "resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
           "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -4368,7 +4263,7 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
           "dev": true,
           "optional": true
         }
@@ -4463,7 +4358,7 @@
     "eslint-scope": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz",
-      "integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==",
+      "integrity": "sha1-UL8wcekzi83EMzF5Sgy1M/ATYXI=",
       "dev": true,
       "requires": {
         "esrecurse": "^4.1.0",
@@ -4473,13 +4368,13 @@
     "eslint-utils": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.3.1.tgz",
-      "integrity": "sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==",
+      "integrity": "sha1-moUbqJ7nxGA0b5fPiTnHKYgn5RI=",
       "dev": true
     },
     "eslint-visitor-keys": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
-      "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==",
+      "integrity": "sha1-PzGA+y4pEBdxastMnW1bXDSmqB0=",
       "dev": true
     },
     "espree": {
@@ -4502,7 +4397,7 @@
     "esquery": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
-      "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
+      "integrity": "sha1-QGxRZYsfWZGl+bYrHcJbAOPlxwg=",
       "dev": true,
       "requires": {
         "estraverse": "^4.0.0"
@@ -4511,7 +4406,7 @@
     "esrecurse": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
-      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
+      "integrity": "sha1-AHo7n9vCs7uH5IeeoZyS/b05Qs8=",
       "dev": true,
       "requires": {
         "estraverse": "^4.1.0"
@@ -4796,7 +4691,7 @@
         "fill-range": {
           "version": "2.2.4",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
-          "integrity": "sha1-6x53OrsFbc2N8r/favWbizqTZWU=",
+          "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
           "dev": true,
           "requires": {
             "is-number": "^2.1.0",
@@ -5050,7 +4945,6 @@
       "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
       "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
       "dev": true,
-      "optional": true,
       "requires": {
         "pend": "~1.2.0"
       }
@@ -5098,15 +4992,13 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-1.0.0.tgz",
       "integrity": "sha1-5hz4BfDeHJhFZ9A4bcXfUO5a9+Q=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "filenamify": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-1.2.1.tgz",
       "integrity": "sha1-qfL/0RxQO+0wABUCknI3jx8TZaU=",
       "dev": true,
-      "optional": true,
       "requires": {
         "filename-reserved-regex": "^1.0.0",
         "strip-outer": "^1.0.0",
@@ -5353,8 +5245,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
       "integrity": "sha1-a+Dem+mYzhavivwkSXue6bfM2a0=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "fs-extra": {
       "version": "1.0.0",
@@ -5978,7 +5869,6 @@
       "resolved": "https://registry.npmjs.org/get-proxy/-/get-proxy-1.1.0.tgz",
       "integrity": "sha1-iUhUSRvFkbDxR9euVw9cZ4tyVus=",
       "dev": true,
-      "optional": true,
       "requires": {
         "rc": "^1.1.2"
       }
@@ -6140,7 +6030,7 @@
     "global-modules": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+      "integrity": "sha1-bXcPDrUjrHgWTXK15xqIdyZcw+o=",
       "dev": true,
       "requires": {
         "global-prefix": "^1.0.1",
@@ -6285,7 +6175,6 @@
       "resolved": "http://registry.npmjs.org/got/-/got-5.7.1.tgz",
       "integrity": "sha1-X4FjWmHkplifGAVp6k44FoClHzU=",
       "dev": true,
-      "optional": true,
       "requires": {
         "create-error-class": "^3.0.1",
         "duplexer2": "^0.1.4",
@@ -6309,7 +6198,6 @@
           "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
           "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
           "dev": true,
-          "optional": true,
           "requires": {
             "readable-stream": "^2.0.2"
           }
@@ -6318,22 +6206,19 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "parse-json": {
           "version": "2.2.0",
           "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
           "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
           "dev": true,
-          "optional": true,
           "requires": {
             "error-ex": "^1.2.0"
           }
@@ -6343,7 +6228,6 @@
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -6359,7 +6243,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -6379,8 +6262,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
       "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "growly": {
       "version": "1.3.0",
@@ -6697,7 +6579,6 @@
       "resolved": "https://registry.npmjs.org/gulp-decompress/-/gulp-decompress-1.2.0.tgz",
       "integrity": "sha1-jutlpeAV+O2FMsr+KEVJYGJvDcc=",
       "dev": true,
-      "optional": true,
       "requires": {
         "archive-type": "^3.0.0",
         "decompress": "^3.0.0",
@@ -6709,15 +6590,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -6733,7 +6612,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -6743,7 +6621,7 @@
     "gulp-eslint": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/gulp-eslint/-/gulp-eslint-5.0.0.tgz",
-      "integrity": "sha512-9GUqCqh85C7rP9120cpxXuZz2ayq3BZc85pCTuPJS03VQYxne0aWPIXWx6LSvsGPa3uRqtSO537vaugOh+5cXg==",
+      "integrity": "sha1-KiaECV93Syz3kxAmIHjFbMehK1I=",
       "dev": true,
       "requires": {
         "eslint": "^5.0.1",
@@ -7351,7 +7229,6 @@
       "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz",
       "integrity": "sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=",
       "dev": true,
-      "optional": true,
       "requires": {
         "convert-source-map": "^1.1.1",
         "graceful-fs": "^4.1.2",
@@ -7364,15 +7241,13 @@
           "version": "4.1.15",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
           "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "strip-bom": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
           "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-utf8": "^0.2.0"
           }
@@ -7382,7 +7257,6 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -8198,7 +8072,7 @@
     "is-absolute": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
-      "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
+      "integrity": "sha1-OV4a6EsR8mrReV5zwXN45IowFXY=",
       "dev": true,
       "requires": {
         "is-relative": "^1.0.0",
@@ -8265,8 +8139,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-bzip2/-/is-bzip2-1.0.0.tgz",
       "integrity": "sha1-XuWOqlounIDiFAe+3yOuWsCRs/w=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-callable": {
       "version": "1.1.4",
@@ -8401,8 +8274,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-gzip/-/is-gzip-1.0.0.tgz",
       "integrity": "sha1-bKiwe5nHeZgCWQDlVc7Y7YCHmoM=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-jpg": {
       "version": "1.0.1",
@@ -8415,8 +8287,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-2.1.1.tgz",
       "integrity": "sha1-fUxXKDd+84bD4ZSpkRv1fG3DNec=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-number": {
       "version": "3.0.0",
@@ -8482,8 +8353,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
       "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-regex": {
       "version": "1.0.4",
@@ -8497,7 +8367,7 @@
     "is-relative": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
-      "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
+      "integrity": "sha1-obtpNc6MXboei5dUubLcwCDiJg0=",
       "dev": true,
       "requires": {
         "is-unc-path": "^1.0.0"
@@ -8506,15 +8376,14 @@
     "is-resolvable": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
-      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
+      "integrity": "sha1-+xj4fOH+uSUWnJpAfBkxijIG7Yg=",
       "dev": true
     },
     "is-retry-allowed": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
       "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-stream": {
       "version": "1.1.0",
@@ -8544,8 +8413,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-tar/-/is-tar-1.0.0.tgz",
       "integrity": "sha1-L2suF5LB9bs2UZrKqdZcDSb+hT0=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-typedarray": {
       "version": "1.0.0",
@@ -8556,7 +8424,7 @@
     "is-unc-path": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
-      "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
+      "integrity": "sha1-1zHoiY7QkKEsNSrS6u1Qla0yLJ0=",
       "dev": true,
       "requires": {
         "unc-path-regex": "^0.1.2"
@@ -8566,8 +8434,7 @@
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz",
       "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-utf8": {
       "version": "0.2.1",
@@ -8579,8 +8446,7 @@
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz",
       "integrity": "sha1-1LVcafUYhvm2XHDWwmItN+KfSP4=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-windows": {
       "version": "1.0.2",
@@ -8598,8 +8464,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-zip/-/is-zip-1.0.0.tgz",
       "integrity": "sha1-R7Co/004p2QxzP2ZqOFaTIa6IyU=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "isarray": {
       "version": "0.0.1",
@@ -8716,7 +8581,7 @@
     "json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=",
       "dev": true
     },
     "json-stable-stringify-without-jsonify": {
@@ -8939,7 +8804,6 @@
       "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
       "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
       "dev": true,
-      "optional": true,
       "requires": {
         "readable-stream": "^2.0.5"
       },
@@ -8948,15 +8812,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -8972,7 +8834,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -9278,8 +9139,7 @@
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
       "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "lodash.isobject": {
       "version": "2.4.1",
@@ -9476,8 +9336,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
       "integrity": "sha1-b54wtHCE2XGnyCD/FabFFnt0wm8=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "lpad-align": {
       "version": "1.1.2",
@@ -9527,7 +9386,7 @@
     "make-iterator": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
-      "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
+      "integrity": "sha1-KbM/MSqo9UfEpeSQ9Wr87JkTOtY=",
       "dev": true,
       "requires": {
         "kind-of": "^6.0.2"
@@ -9724,7 +9583,7 @@
     "mimic-fn": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
+      "integrity": "sha1-ggyGo5M0ZA6ZUWkovQP8qIBX0CI=",
       "dev": true
     },
     "minimatch": {
@@ -9913,8 +9772,7 @@
       "version": "1.0.0",
       "resolved": "http://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz",
       "integrity": "sha1-WuVUHQJGRdMqWPzdyc7s6nrjrC8=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "node.extend": {
       "version": "1.1.8",
@@ -12964,8 +12822,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
       "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "p-pipe": {
       "version": "1.2.0",
@@ -13269,7 +13126,7 @@
     "pluralize": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
-      "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==",
+      "integrity": "sha1-KYuJ34uTsCIdv0Ia0rGx6iP8Z3c=",
       "dev": true
     },
     "posix-character-classes": {
@@ -13676,8 +13533,7 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
       "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "preserve": {
       "version": "0.2.0",
@@ -13809,7 +13665,6 @@
       "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
       "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
       "dev": true,
-      "optional": true,
       "requires": {
         "deep-extend": "^0.6.0",
         "ini": "~1.3.0",
@@ -13822,7 +13677,6 @@
       "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz",
       "integrity": "sha1-NcPhd/IHjveJ7kv6+kNzB06u9Po=",
       "dev": true,
-      "optional": true,
       "requires": {
         "pinkie-promise": "^2.0.0",
         "readable-stream": "^2.0.0"
@@ -13832,15 +13686,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -13856,7 +13708,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -13961,7 +13812,7 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
@@ -14459,7 +14310,7 @@
     "safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo=",
       "dev": true
     },
     "sax": {
@@ -14473,7 +14324,6 @@
       "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz",
       "integrity": "sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=",
       "dev": true,
-      "optional": true,
       "requires": {
         "commander": "~2.8.1"
       }
@@ -14619,8 +14469,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
       "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "set-value": {
       "version": "2.0.0",
@@ -14648,7 +14497,7 @@
     "setprototypeof": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+      "integrity": "sha1-0L2FU2iHtv58DYGMuWLZ2RxU5lY=",
       "dev": true
     },
     "shebang-command": {
@@ -15125,8 +14974,7 @@
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-0.2.2.tgz",
       "integrity": "sha1-5sgLYjEj19gM8TLOU480YokHJQI=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "static-extend": {
       "version": "0.1.2",
@@ -15170,7 +15018,6 @@
       "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz",
       "integrity": "sha1-+02KFCDqNidk4hrUeAOXvry0HL4=",
       "dev": true,
-      "optional": true,
       "requires": {
         "duplexer2": "~0.1.0",
         "readable-stream": "^2.0.2"
@@ -15181,7 +15028,6 @@
           "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
           "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
           "dev": true,
-          "optional": true,
           "requires": {
             "readable-stream": "^2.0.2"
           }
@@ -15190,15 +15036,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -15214,7 +15058,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -15224,20 +15067,19 @@
     "stream-consume": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.1.tgz",
-      "integrity": "sha512-tNa3hzgkjEP7XbCkbRXe1jpg+ievoa0O4SCFlMOYEscGSS4JJsckGL8swUyAa/ApGU3Ae4t6Honor4HhL+tRyg==",
+      "integrity": "sha1-0721mMK9CugrjKx6xQsRB6eZbEg=",
       "dev": true
     },
     "stream-shift": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
       "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "streamroller": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-0.7.0.tgz",
-      "integrity": "sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==",
+      "integrity": "sha1-odG3z4PTmvsNYwSaWsv5NJO99ks=",
       "dev": true,
       "requires": {
         "date-format": "^1.2.0",
@@ -15264,7 +15106,7 @@
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+          "integrity": "sha1-sRwn2IuP8fvgcGQ8+UsMea4bCq8=",
           "dev": true,
           "requires": {
             "core-util-is": "~1.0.0",
@@ -15279,7 +15121,7 @@
         "string_decoder": {
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=",
           "dev": true,
           "requires": {
             "safe-buffer": "~5.1.0"
@@ -15296,7 +15138,7 @@
     "string-width": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
       "dev": true,
       "requires": {
         "is-fullwidth-code-point": "^2.0.0",
@@ -15410,7 +15252,6 @@
       "resolved": "http://registry.npmjs.org/strip-dirs/-/strip-dirs-1.1.1.tgz",
       "integrity": "sha1-lgu9EoeETzl1pFWKoQOoJV4kVqA=",
       "dev": true,
-      "optional": true,
       "requires": {
         "chalk": "^1.0.0",
         "get-stdin": "^4.0.1",
@@ -15424,15 +15265,13 @@
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "chalk": {
           "version": "1.1.3",
           "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-styles": "^2.2.1",
             "escape-string-regexp": "^1.0.2",
@@ -15446,7 +15285,6 @@
           "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz",
           "integrity": "sha1-hHSREZ/MtftDYhfMc39/qtUPYD8=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-relative": "^0.1.0"
           }
@@ -15455,15 +15293,13 @@
           "version": "0.1.3",
           "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz",
           "integrity": "sha1-kF/uiuhvRbPsYUvDwVyGnfCHboI=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "supports-color": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
           "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -15494,7 +15330,6 @@
       "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz",
       "integrity": "sha1-sv0qv2YEudHmATBXGV34Nrip1jE=",
       "dev": true,
-      "optional": true,
       "requires": {
         "escape-string-regexp": "^1.0.2"
       }
@@ -15528,7 +15363,6 @@
       "resolved": "https://registry.npmjs.org/sum-up/-/sum-up-1.0.3.tgz",
       "integrity": "sha1-HGYfZnBX9jvLeHWqFDi8FiUlFW4=",
       "dev": true,
-      "optional": true,
       "requires": {
         "chalk": "^1.0.0"
       },
@@ -15537,15 +15371,13 @@
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "chalk": {
           "version": "1.1.3",
           "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-styles": "^2.2.1",
             "escape-string-regexp": "^1.0.2",
@@ -15558,8 +15390,7 @@
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
           "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -15621,7 +15452,6 @@
       "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz",
       "integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==",
       "dev": true,
-      "optional": true,
       "requires": {
         "bl": "^1.0.0",
         "buffer-alloc": "^1.2.0",
@@ -15637,7 +15467,6 @@
           "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
           "integrity": "sha1-7SljTRm6ukY7bOa4CjchPqtx7EM=",
           "dev": true,
-          "optional": true,
           "requires": {
             "once": "^1.4.0"
           }
@@ -15646,15 +15475,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "once": {
           "version": "1.4.0",
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -15664,7 +15491,6 @@
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -15680,7 +15506,6 @@
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -15785,7 +15610,6 @@
       "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz",
       "integrity": "sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=",
       "dev": true,
-      "optional": true,
       "requires": {
         "through2": "~2.0.0",
         "xtend": "~4.0.0"
@@ -15810,8 +15634,7 @@
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz",
       "integrity": "sha1-lYYL/MXHbCd/j4Mm/Q9bLiDrohc=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "timers-ext": {
       "version": "0.1.7",
@@ -15873,7 +15696,7 @@
     "tmp": {
       "version": "0.0.33",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "integrity": "sha1-bTQzWIl2jSGyvNoKonfO07G/rfk=",
       "dev": true,
       "requires": {
         "os-tmpdir": "~1.0.2"
@@ -15884,7 +15707,6 @@
       "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz",
       "integrity": "sha1-HN+kcqnvUMI57maZm2YsoOs5k38=",
       "dev": true,
-      "optional": true,
       "requires": {
         "extend-shallow": "^2.0.1"
       },
@@ -15894,7 +15716,6 @@
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-extendable": "^0.1.0"
           }
@@ -15911,8 +15732,7 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz",
       "integrity": "sha1-STvUj2LXxD/N7TE6A9ytsuEhOoA=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "to-fast-properties": {
       "version": "2.0.0",
@@ -15991,7 +15811,6 @@
       "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz",
       "integrity": "sha1-42RqLqTokTEr9+rObPsFOAvAHCE=",
       "dev": true,
-      "optional": true,
       "requires": {
         "escape-string-regexp": "^1.0.2"
       }
@@ -16240,19 +16059,18 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz",
       "integrity": "sha1-uYTwh3/AqJwsdzzB73tbIytbBv4=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "upath": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
-      "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==",
+      "integrity": "sha1-NSVll+RqWB20eT0M5H+prr/J+r0=",
       "dev": true
     },
     "uri-js": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+      "integrity": "sha1-lMVA4f93KVbiKZUHwBCupsiDjrA=",
       "dev": true,
       "requires": {
         "punycode": "^2.1.0"
@@ -16269,7 +16087,6 @@
       "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
       "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
       "dev": true,
-      "optional": true,
       "requires": {
         "prepend-http": "^1.0.1"
       }
@@ -16355,8 +16172,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz",
       "integrity": "sha1-G5BKWWCfsyjvB4E4Qgk09rhnCaY=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "validate-npm-package-license": {
       "version": "3.0.4",
@@ -16401,7 +16217,6 @@
       "resolved": "https://registry.npmjs.org/vinyl-assign/-/vinyl-assign-1.2.1.tgz",
       "integrity": "sha1-TRmIkbVRWRHXcajNnFSApGoHSkU=",
       "dev": true,
-      "optional": true,
       "requires": {
         "object-assign": "^4.0.1",
         "readable-stream": "^2.0.0"
@@ -16411,22 +16226,19 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -16442,7 +16254,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -16582,7 +16393,6 @@
       "resolved": "https://registry.npmjs.org/ware/-/ware-1.3.0.tgz",
       "integrity": "sha1-0bFPOdLiy0q4xAmPdW/ksWTkc9Q=",
       "dev": true,
-      "optional": true,
       "requires": {
         "wrap-fn": "^0.1.0"
       }
@@ -16673,7 +16483,6 @@
       "resolved": "https://registry.npmjs.org/wrap-fn/-/wrap-fn-0.1.5.tgz",
       "integrity": "sha1-8htuQQFv9KfjFyDbxjoJAWvfmEU=",
       "dev": true,
-      "optional": true,
       "requires": {
         "co": "3.1.0"
       }
@@ -16777,7 +16586,6 @@
       "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
       "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
       "dev": true,
-      "optional": true,
       "requires": {
         "buffer-crc32": "~0.2.3",
         "fd-slicer": "~1.1.0"
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
index 189732bf3a..01bb2369dc 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
@@ -176,6 +176,23 @@ function entityResource($q, $http, umbRequestHelper) {
                 'Failed to retrieve url and anchors data for id ' + id);
         },
 
+        getAnchors: function (rteContent) {
+
+            if (!rteContent || rteContent.length === 0) {
+                return [];
+            }
+
+            return umbRequestHelper.resourcePromise(
+                $http.post(
+                    umbRequestHelper.getApiUrl(
+                        "entityApiBaseUrl",
+                        'GetAnchors'),
+                    {
+                        rteContent: rteContent
+                    }),
+                'Failed to anchors data for rte content ' + rteContent);
+        },
+        
         /**
          * @ngdoc method
          * @name umbraco.resources.entityResource#getByIds
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 19e3d3d970..d3bdceddc4 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -6,7 +6,7 @@
  * @description
  * A service containing all logic for all of the Umbraco TinyMCE plugins
  */
-function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, stylesheetResource, macroResource, macroService, $routeParams, umbRequestHelper, angularHelper, userService, editorService, editorState, contentEditingHelper) {
+function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, stylesheetResource, macroResource, macroService, $routeParams, umbRequestHelper, angularHelper, userService, editorService, entityResource) {
 
     //These are absolutely required in order for the macros to render inline
     //we put these as extended elements because they get merged on top of the normal allowed elements by tiny mce
@@ -1077,42 +1077,6 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                 startWatch();
             }
 
-            /**
-             * Internal method ... to retrieve the anchor named properties from the serialized string of a content item's properties 
-             * 
-		     * From the given string, generates a string array where each item is the id attribute value from a named anchor
-		     * 'some string <a id="anchor"></a>with a named anchor' returns ['anchor']		     
-		     */
-            function getCurrentAnchorNames() {
-
-                if (!editorState.current || !editorState.current.variants) {
-                    return null;
-                }
-
-                //fixme - this only takes into account the first variant , not the 'current' one.
-                var jsonProperties = JSON.stringify(contentEditingHelper.getAllProps(editorState.current.variants[0]));
-
-                if (!jsonProperties) {
-                    return null;
-                }
-
-                var anchors = [];
-
-                var anchorPattern = /<a id=\\"(.*?)\\">/gi;
-                var matches = jsonProperties.match(anchorPattern);
-
-
-                if (matches) {
-                    anchors = matches.map(function (v) {
-                        return v.substring(v.indexOf('"') + 1, v.lastIndexOf('\\'));
-                    });
-                }
-
-                return anchors.filter(function (val, i, self) {
-                    return self.indexOf(val) === i;
-                });
-            }
-
             args.editor.on('init', function (e) {
 
                 if (args.model.value) {
@@ -1152,20 +1116,25 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
 
             //create link picker
             self.createLinkPicker(args.editor, function (currentTarget, anchorElement) {
-                var linkPicker = {
-                    currentTarget: currentTarget,
-                    dataTypeId: args.model.dataTypeId,
-                    ignoreUserStartNodes: args.model.config.ignoreUserStartNodes,
-                    anchors: getCurrentAnchorNames(),
-                    submit: function (model) {
-                        self.insertLinkInEditor(args.editor, model.target, anchorElement);
-                        editorService.close();
-                    },
-                    close: function () {
-                        editorService.close();
-                    }
-                };
-                editorService.linkPicker(linkPicker);
+
+
+                entityResource.getAnchors(args.model.value).then(function (anchorValues) {
+                    var linkPicker = {
+                        currentTarget: currentTarget,
+                        dataTypeId: args.model.dataTypeId,
+                        ignoreUserStartNodes: args.model.config.ignoreUserStartNodes,
+                        anchors: anchorValues,
+                        submit: function (model) {
+                            self.insertLinkInEditor(args.editor, model.target, anchorElement);
+                            editorService.close();
+                        },
+                        close: function () {
+                            editorService.close();
+                        }
+                    };
+                    editorService.linkPicker(linkPicker);
+                });
+             
             });
 
             //Create the insert media plugin
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
index f09acbcc6a..5fd23f0dd6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
@@ -183,7 +183,7 @@ angular.module("umbraco").controller("Umbraco.Editors.LinkPickerController",
                         $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.model.target.url = media.image;
 
                         editorService.close();
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
index 7defe51d29..4e6c87d7a8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
@@ -22,7 +22,6 @@ angular.module("umbraco")
         $scope.setImage = function(){
             var startNodeId = $scope.model.config && $scope.model.config.startNodeId ? $scope.model.config.startNodeId : undefined;
             var startNodeIsVirtual = startNodeId ? $scope.model.config.startNodeIsVirtual : undefined;
-            $scope.mediaPickerOverlay.dataTypeId = $scope.model.dataTypeId;
 
             var mediaPicker = {
                 startNodeId: startNodeId,
@@ -31,6 +30,7 @@ angular.module("umbraco")
                 showDetails: true,
                 disableFolderSelect: true,
                 onlyImages: true,
+                dataTypeId: $scope.model.dataTypeId,
                 submit: function(model) {
                     var selectedImage = model.selection[0];
                    
diff --git a/src/Umbraco.Web/Editors/EntityController.cs b/src/Umbraco.Web/Editors/EntityController.cs
index 573bb2b872..5ee2dec506 100644
--- a/src/Umbraco.Web/Editors/EntityController.cs
+++ b/src/Umbraco.Web/Editors/EntityController.cs
@@ -21,6 +21,7 @@ using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Services;
 using Umbraco.Core.Xml;
+using Umbraco.Web.Models;
 using Umbraco.Web.Models.Mapping;
 using Umbraco.Web.Models.TemplateQuery;
 using Umbraco.Web.Search;
@@ -294,6 +295,14 @@ namespace Umbraco.Web.Editors
             return new UrlAndAnchors(url, anchorValues);
         }
 
+        [HttpGet]
+        [HttpPost]
+        public IEnumerable<string> GetAnchors(AnchorsModel model)
+        {
+            var anchorValues = Services.ContentService.GetAnchorValuesFromRTEContent(model.RteContent);
+            return anchorValues;
+        }
+
 
         #region GetById
 
@@ -422,16 +431,7 @@ namespace Umbraco.Web.Editors
             {
                 //TODO: Need to check for Object types that support hierarchy here, some might not.
 
-                int[] startNodes = null;
-                switch (type)
-                {
-                    case UmbracoEntityTypes.Document:
-                        startNodes = Security.CurrentUser.CalculateContentStartNodeIds(Services.EntityService);
-                        break;
-                    case UmbracoEntityTypes.Media:
-                        startNodes = Security.CurrentUser.CalculateMediaStartNodeIds(Services.EntityService);
-                        break;
-                }
+                var startNodes = GetStartNodes(type);
 
                 var ignoreUserStartNodes = IsDataTypeIgnoringUserStartNodes(dataTypeId);
 
@@ -556,16 +556,7 @@ namespace Umbraco.Web.Editors
                 IEnumerable<IEntitySlim> entities;
                 long totalRecords;
 
-                int[] startNodes = null;
-                switch (type)
-                {
-                    case UmbracoEntityTypes.Document:
-                        startNodes = Security.CurrentUser.CalculateContentStartNodeIds(Services.EntityService);
-                        break;
-                    case UmbracoEntityTypes.Media:
-                        startNodes = Security.CurrentUser.CalculateMediaStartNodeIds(Services.EntityService);
-                        break;
-                }
+                var startNodes = GetStartNodes(type);
 
                 var ignoreUserStartNodes = IsDataTypeIgnoringUserStartNodes(dataTypeId);
 
@@ -630,6 +621,25 @@ namespace Umbraco.Web.Editors
             }
         }
 
+        private int[] GetStartNodes(UmbracoEntityTypes type)
+        {
+            int[] startNodes = null;
+            switch (type)
+            {
+                case UmbracoEntityTypes.Document:
+                    startNodes = Security.CurrentUser.CalculateContentStartNodeIds(Services.EntityService);
+                    break;
+                case UmbracoEntityTypes.Media:
+                    startNodes = Security.CurrentUser.CalculateMediaStartNodeIds(Services.EntityService);
+                    break;
+                default:
+                    startNodes = Array.Empty<int>();
+                    break;
+            }
+
+            return startNodes;
+        }
+
 
         public PagedResult<EntityBasic> GetPagedDescendants(
             int id,
diff --git a/src/Umbraco.Web/Models/AnchorsModel.cs b/src/Umbraco.Web/Models/AnchorsModel.cs
new file mode 100644
index 0000000000..9edcf3466b
--- /dev/null
+++ b/src/Umbraco.Web/Models/AnchorsModel.cs
@@ -0,0 +1,7 @@
+namespace Umbraco.Web.Models
+{
+    public class AnchorsModel
+    {
+        public string RteContent { get; set; }
+    }
+}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 0c1ab83de0..3c4f9fdfd7 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -204,6 +204,7 @@
     <Compile Include="Media\TypeDetector\TIFFDetector.cs" />
     <Compile Include="Media\UploadAutoFillProperties.cs" />
     <Compile Include="Migrations\PostMigrations\PublishedSnapshotRebuilder.cs" />
+    <Compile Include="Models\AnchorsModel.cs" />
     <Compile Include="Models\ContentEditing\LinkDisplay.cs" />
     <Compile Include="Models\ContentEditing\MacroDisplay.cs" />
     <Compile Include="Models\ContentEditing\MacroParameterDisplay.cs" />

From 5625102e2c0bc37b1d3ff0ffd036834a89a30352 Mon Sep 17 00:00:00 2001
From: Claus <claus@umbraco.com>
Date: Tue, 2 Jul 2019 12:42:18 +0200
Subject: [PATCH 088/776] making EditorValidatorOfT public instead of internal.

---
 src/Umbraco.Web/Editors/EditorValidatorOfT.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/Editors/EditorValidatorOfT.cs b/src/Umbraco.Web/Editors/EditorValidatorOfT.cs
index 4ca008cf0d..715a49179e 100644
--- a/src/Umbraco.Web/Editors/EditorValidatorOfT.cs
+++ b/src/Umbraco.Web/Editors/EditorValidatorOfT.cs
@@ -8,7 +8,7 @@ namespace Umbraco.Web.Editors
     /// Provides a base class for <see cref="IEditorValidator"/> implementations.
     /// </summary>
     /// <typeparam name="T">The validated object type.</typeparam>
-    internal abstract class EditorValidator<T> : IEditorValidator
+    public abstract class EditorValidator<T> : IEditorValidator
     {
         public Type ModelType => typeof (T);
 
@@ -16,4 +16,4 @@ namespace Umbraco.Web.Editors
 
         protected abstract IEnumerable<ValidationResult> Validate(T model);
     }
-}
\ No newline at end of file
+}

From d5bc54cf6c4f7211ed3e4687c75c4a8659c54f20 Mon Sep 17 00:00:00 2001
From: Claus <claus@umbraco.com>
Date: Tue, 2 Jul 2019 13:00:50 +0200
Subject: [PATCH 089/776] refixing #4708 - old merge error.

---
 src/Umbraco.Web.UI.Client/src/preview/preview.controller.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js b/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
index 7d6584d2f1..1316642e93 100644
--- a/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
@@ -113,7 +113,10 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
         $scope.exitPreview = function () {
 
             var culture = $location.search().culture || getParameterByName("culture");
-            var relativeUrl = "/" +  $scope.pageId +'?culture='+ culture;
+            var relativeUrl = "/" + $scope.pageId;
+            if (culture) {
+                relativeUrl += '?culture=' + culture;
+            }
             window.top.location.href = "../preview/end?redir=" + encodeURIComponent(relativeUrl);
         };
 

From 7b4023fd5a034a0938b59582da61d6475e0d88ad Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 2 Jul 2019 13:17:47 +0200
Subject: [PATCH 090/776] Fixes issue when creating DateTypes of type
 Umbraco.MultiNodeTreePicker with type member, because `-1` can't be casted to
 `Udi`

---
 .../views/prevalueeditors/treesource.controller.js | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.controller.js
index e20f2f8d3a..fb2dddd72c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.controller.js
@@ -60,20 +60,6 @@ angular.module('umbraco')
 			$scope.model.value.query = undefined;
 		};
 		
-
-		//we always need to ensure we dont submit anything broken
-	    var unsubscribe = $scope.$on("formSubmitting", function (ev, args) {
-	    	if($scope.model.value.type === "member"){
-	    		$scope.model.value.id = -1;
-	    		$scope.model.value.query = "";
-	    	}
-	    });
-
-	    //when the scope is destroyed we need to unsubscribe
-	    $scope.$on('$destroy', function () {
-	        unsubscribe();
-	    });
-
 		function populate(item){
 			$scope.clear();
 			item.icon = iconHelper.convertFromLegacyIcon(item.icon);

From 96d5bdd7b20c3b45c05f2ac177b25be78bdb2b14 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 2 Jul 2019 15:26:54 +0200
Subject: [PATCH 091/776] https://github.com/umbraco/Umbraco-CMS/issues/5671 -
 If modelsbuilder is in live mode, we need to clear cache for all document
 types when at least one is cleared. This is due to modelsbuilder updating all
 the models to different versions.

---
 .../Cache/ContentTypeCacheRefresher.cs        | 29 ++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs b/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs
index 86ff709541..a5134426c2 100644
--- a/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
@@ -17,15 +18,17 @@ namespace Umbraco.Web.Cache
         private readonly IPublishedSnapshotService _publishedSnapshotService;
         private readonly IPublishedModelFactory _publishedModelFactory;
         private readonly IContentTypeCommonRepository _contentTypeCommonRepository;
+        private readonly IContentTypeService _contentTypeService;
         private readonly IdkMap _idkMap;
 
-        public ContentTypeCacheRefresher(AppCaches appCaches, IPublishedSnapshotService publishedSnapshotService, IPublishedModelFactory publishedModelFactory, IdkMap idkMap, IContentTypeCommonRepository contentTypeCommonRepository)
+        public ContentTypeCacheRefresher(AppCaches appCaches, IPublishedSnapshotService publishedSnapshotService, IPublishedModelFactory publishedModelFactory, IdkMap idkMap, IContentTypeCommonRepository contentTypeCommonRepository, IContentTypeService contentTypeService)
             : base(appCaches)
         {
             _publishedSnapshotService = publishedSnapshotService;
             _publishedModelFactory = publishedModelFactory;
             _idkMap = idkMap;
             _contentTypeCommonRepository = contentTypeCommonRepository;
+            _contentTypeService = contentTypeService;
         }
 
         #region Define
@@ -50,6 +53,16 @@ namespace Umbraco.Web.Cache
 
             _contentTypeCommonRepository.ClearCache(); // always
 
+            // We need to special handle the IContentType if modelsbuilder is in live mode, because all models are updated when a IContentType is changed, we need to clear all from cache also.
+            if (_publishedModelFactory is ILivePublishedModelFactory && payloads.Any(x => x.ItemType == typeof(IContentType).Name))
+            {
+                //This is super nasty, and we need to figure out a better way to to this
+                //Ensure all doc type ids is part of the payload
+                var missingPayloads = GetMissingContentTypePayloads(payloads);
+
+                payloads = payloads.Union(missingPayloads).ToArray();
+            }
+
             if (payloads.Any(x => x.ItemType == typeof(IContentType).Name))
             {
                 ClearAllIsolatedCacheByEntityType<IContent>();
@@ -96,6 +109,20 @@ namespace Umbraco.Web.Cache
             base.Refresh(payloads);
         }
 
+        private IEnumerable<JsonPayload> GetMissingContentTypePayloads(JsonPayload[] payloads)
+        {
+            var existingPayloadIds = new HashSet<int>(payloads.Select(x => x.Id));
+            var contentTypeIds = _contentTypeService.GetAll().Select(x => x.Id).ToArray();
+
+            foreach (var contentTypeId in contentTypeIds)
+            {
+                if (!existingPayloadIds.Contains(contentTypeId))
+                {
+                    yield return new JsonPayload(typeof(IContentType).Name, contentTypeId, ContentTypeChangeTypes.RefreshOther);
+                }
+            }
+        }
+
         public override void RefreshAll()
         {
             throw new NotSupportedException();

From 5bf29a907a3c422994be284ce84d26955669d5ab Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Tue, 2 Jul 2019 21:45:45 +0200
Subject: [PATCH 092/776] Fixes #5206

---
 .../Editors/BackOfficeServerVariables.cs      |    4 -
 src/Umbraco.Web/Umbraco.Web.csproj            | 2025 +++++++++++++++++
 src/Umbraco.Web/WebServices/TagsController.cs |   84 -
 3 files changed, 2025 insertions(+), 88 deletions(-)
 delete mode 100644 src/Umbraco.Web/WebServices/TagsController.cs

diff --git a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
index 6e27a8f8e5..88c6b5b70a 100644
--- a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
@@ -224,10 +224,6 @@ namespace Umbraco.Web.Editors
                             "updateCheckApiBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl<UpdateCheckController>(
                                 controller => controller.GetCheck())
                         },
-                        {
-                            "tagApiBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl<TagsController>(
-                                controller => controller.GetAllTags(null))
-                        },
                         {
                             "templateApiBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl<TemplateController>(
                                 controller => controller.GetById(0))
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 0b601f8f94..fc5ed8f8be 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -2025,4 +2025,2029 @@
         <!--<PostBuildEvent>xcopy "$(ProjectDir)..\..\lib\*.dll" "$(TargetDir)*.dll" /Y</PostBuildEvent>-->
     </PropertyGroup>
     <Import Project="..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets" Condition="Exists('..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets')" />
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{651E1350-91B6-44B7-BD60-7207006D7003}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>umbraco</AssemblyName>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Umbraco.Web</RootNamespace>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <StartupObject>
+    </StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <SccProjectName>
+    </SccProjectName>
+    <SccLocalPath>
+    </SccLocalPath>
+    <SccAuxPath>
+    </SccAuxPath>
+    <SccProvider>
+    </SccProvider>
+    <OldToolsVersion>4.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
+    <LangVersion>latest</LangVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
+    <LangVersion>latest</LangVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile>bin\Release\umbraco.xml</DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>pdbonly</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\UmbracoExamine\UmbracoExamine.csproj">
+      <Project>{07fbc26b-2927-4a22-8d96-d644c667fecc}</Project>
+      <Name>UmbracoExamine</Name>
+    </ProjectReference>
+    <Reference Include="AutoMapper, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
+      <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="AutoMapper.Net4, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
+      <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <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="dotless.Core, Version=1.5.2.0, Culture=neutral, PublicKeyToken=96b446c9e63eae34, processorArchitecture=MSIL">
+      <HintPath>..\packages\dotless.1.5.2\lib\dotless.Core.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="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="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>
+    <Reference Include="Lucene.Net, Version=2.9.4.1, Culture=neutral, PublicKeyToken=85089178b9ac3181, processorArchitecture=MSIL">
+      <HintPath>..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll</HintPath>
+    </Reference>
+    <Reference Include="MarkdownSharp, Version=1.14.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Markdown.1.14.7\lib\net45\MarkdownSharp.dll</HintPath>
+      <Private>True</Private>
+    </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.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.2\lib\net45\Microsoft.AspNet.Identity.Owin.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNet.SignalR.Core, Version=2.4.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.SignalR.Core.2.4.1\lib\net45\Microsoft.AspNet.SignalR.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CSharp" />
+    <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.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.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=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=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="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>
+      <Private>True</Private>
+    </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>
+      <Private>True</Private>
+    </Reference>
+    <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>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Semver, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\semver.1.1.2\lib\net451\Semver.dll</HintPath>
+    </Reference>
+    <Reference Include="System">
+      <Name>System</Name>
+    </Reference>
+    <Reference Include="System.ComponentModel.Composition" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.configuration" />
+    <Reference Include="System.Data">
+      <Name>System.Data</Name>
+    </Reference>
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Design" />
+    <Reference Include="System.Drawing">
+      <Name>System.Drawing</Name>
+    </Reference>
+    <Reference Include="System.EnterpriseServices" />
+    <Reference Include="System.IO.Compression.FileSystem" />
+    <Reference Include="System.Net.Http" />
+    <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.Runtime.Serialization" />
+    <Reference Include="System.Security" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Threading.Tasks.Dataflow, Version=4.6.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Dataflow.4.9.0\lib\portable-net45+win8+wpa81\System.Threading.Tasks.Dataflow.dll</HintPath>
+    </Reference>
+    <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.Abstractions">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Web.ApplicationServices" />
+    <Reference Include="System.Web.DynamicData" />
+    <Reference Include="System.Web.Entity" />
+    <Reference Include="System.Web.Extensions" />
+    <Reference Include="System.Web.Extensions.Design" />
+    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
+    </Reference>
+    <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.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.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.7\lib\net45\System.Web.Razor.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Services">
+      <Name>System.Web.Services</Name>
+    </Reference>
+    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <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.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.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml">
+      <Name>System.XML</Name>
+    </Reference>
+    <Reference Include="System.Xml.Linq" />
+    <ProjectReference Include="..\SQLCE4Umbraco\SqlCE4Umbraco.csproj">
+      <Project>{5BA5425F-27A7-4677-865E-82246498AA2E}</Project>
+      <Name>SqlCE4Umbraco</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj">
+      <Project>{31785BC3-256C-4613-B2F5-A1B0BDDED8C1}</Project>
+      <Name>Umbraco.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\umbraco.controls\umbraco.controls.csproj">
+      <Project>{6EDD2061-82F2-461B-BB6E-879245A832DE}</Project>
+      <Name>umbraco.controls</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\umbraco.businesslogic\umbraco.businesslogic.csproj">
+      <Name>umbraco.businesslogic</Name>
+      <Project>{E469A9CE-1BEC-423F-AC44-713CD72457EA}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+    </ProjectReference>
+    <ProjectReference Include="..\umbraco.cms\umbraco.cms.csproj">
+      <Project>{CCD75EC3-63DB-4184-B49D-51C1DD337230}</Project>
+      <Name>umbraco.cms</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\umbraco.datalayer\umbraco.datalayer.csproj">
+      <Project>{C7CB79F0-1C97-4B33-BFA7-00731B579AE2}</Project>
+      <Name>umbraco.datalayer</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\umbraco.interfaces\umbraco.interfaces.csproj">
+      <Name>umbraco.interfaces</Name>
+      <Project>{511F6D8D-7717-440A-9A57-A507E9A8B27F}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+    </ProjectReference>
+    <ProjectReference Include="..\umbraco.providers\umbraco.providers.csproj">
+      <Project>{D7636876-0756-43CB-A192-138C6F0D5E42}</Project>
+      <Name>umbraco.providers</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\SolutionInfo.cs">
+      <Link>Properties\SolutionInfo.cs</Link>
+    </Compile>
+    <Compile Include="ApplicationContextExtensions.cs" />
+    <Compile Include="AreaRegistrationContextExtensions.cs" />
+    <Compile Include="BatchedDatabaseServerMessengerStartup.cs" />
+    <Compile Include="Cache\ApplicationCacheRefresher.cs" />
+    <Compile Include="Cache\ApplicationTreeCacheRefresher.cs" />
+    <Compile Include="Cache\CacheRefresherEventHandler.cs" />
+    <Compile Include="Cache\ContentTypeCacheRefresher.cs" />
+    <Compile Include="Cache\DataTypeCacheRefresher.cs" />
+    <Compile Include="Cache\DictionaryCacheRefresher.cs" />
+    <Compile Include="Cache\DistributedCache.cs" />
+    <Compile Include="Cache\DistributedCacheExtensions.cs" />
+    <Compile Include="Cache\DomainCacheRefresher.cs" />
+    <Compile Include="Cache\LanguageCacheRefresher.cs" />
+    <Compile Include="Cache\MacroCacheRefresher.cs" />
+    <Compile Include="Cache\MediaCacheRefresher.cs" />
+    <Compile Include="Cache\MemberCacheRefresher.cs" />
+    <Compile Include="Cache\MemberGroupCacheRefresher.cs" />
+    <Compile Include="Cache\PageCacheRefresher.cs" />
+    <Compile Include="Cache\PublicAccessCacheRefresher.cs" />
+    <Compile Include="Cache\RelationTypeCacheRefresher.cs" />
+    <Compile Include="Cache\UserGroupCacheRefresher.cs" />
+    <Compile Include="Cache\StylesheetCacheRefresher.cs" />
+    <Compile Include="Cache\StylesheetPropertyCacheRefresher.cs" />
+    <Compile Include="Cache\TemplateCacheRefresher.cs" />
+    <Compile Include="Cache\UnpublishedPageCacheRefresher.cs" />
+    <Compile Include="Cache\UserCacheRefresher.cs" />
+    <Compile Include="Editors\PreviewController.cs" />
+    <Compile Include="Editors\BackOfficeAssetsController.cs" />
+    <Compile Include="Features\DisabledFeatures.cs" />
+    <Compile Include="Editors\BackOfficeNotificationsController.cs" />
+    <Compile Include="Editors\DictionaryController.cs" />
+    <Compile Include="Editors\BackOfficeServerVariables.cs" />
+    <Compile Include="Editors\DashboardHelper.cs" />
+    <Compile Include="Editors\EditorModelEventArgs.cs" />
+    <Compile Include="Editors\EditorValidationResolver.cs" />
+    <Compile Include="Editors\EditorValidator.cs" />
+    <Compile Include="Editors\FromJsonPathAttribute.cs" />
+    <Compile Include="Editors\HelpController.cs" />
+    <Compile Include="Editors\IsCurrentUserModelFilterAttribute.cs" />
+    <Compile Include="Editors\PasswordChanger.cs" />
+    <Compile Include="Editors\TemplateController.cs" />
+    <Compile Include="Editors\ParameterSwapControllerActionSelector.cs" />
+    <Compile Include="Editors\CodeFileController.cs" />
+    <Compile Include="Editors\TourController.cs" />
+    <Compile Include="Features\EnabledFeatures.cs" />
+    <Compile Include="HealthCheck\Checks\Services\Tls12Check.cs" />
+    <Compile Include="HealthCheck\Checks\Security\XssProtectionCheck.cs" />
+    <Compile Include="HealthCheck\Checks\Security\HstsCheck.cs" />
+    <Compile Include="Models\BackOfficeTourFilter.cs" />
+    <Compile Include="Models\ContentEditing\BackOfficePreview.cs" />
+    <Compile Include="Models\ContentEditing\DocumentTypeCollectionDisplay.cs" />
+    <Compile Include="Models\ContentEditing\NotifySetting.cs" />
+    <Compile Include="Models\Mapping\AutoMapperExtensions.cs" />
+    <Compile Include="Models\Mapping\ContentTreeNodeUrlResolver.cs" />
+    <Compile Include="Models\Mapping\MemberTreeNodeUrlResolver.cs" />
+    <Compile Include="Models\Trees\ExportMember.cs" />
+    <Compile Include="PropertyEditors\DropdownFlexiblePropertyEditor.cs" />
+    <Compile Include="TourFilterResolver.cs" />
+    <Compile Include="Editors\UserEditorAuthorizationHelper.cs" />
+    <Compile Include="Editors\UserGroupAuthorizationAttribute.cs" />
+    <Compile Include="Editors\UserGroupEditorAuthorizationHelper.cs" />
+    <Compile Include="Editors\UserGroupsController.cs" />
+    <Compile Include="Editors\UserGroupValidateAttribute.cs" />
+    <Compile Include="ExamineStartup.cs" />
+    <Compile Include="Extensions\UdiExtensions.cs" />
+    <Compile Include="Features\UmbracoFeatures.cs" />
+    <Compile Include="Features\FeaturesResolver.cs" />
+    <Compile Include="HealthCheck\Checks\Config\AbstractConfigCheck.cs" />
+    <Compile Include="HealthCheck\Checks\Config\AcceptableConfiguration.cs" />
+    <Compile Include="HealthCheck\Checks\Config\ConfigurationService.cs" />
+    <Compile Include="HealthCheck\Checks\Config\ConfigurationServiceResult.cs" />
+    <Compile Include="HealthCheck\Checks\Config\MacroErrorsCheck.cs" />
+    <Compile Include="HealthCheck\Checks\Config\NotificationEmailCheck.cs" />
+    <Compile Include="HealthCheck\Checks\Config\TrySkipIisCustomErrorsCheck.cs" />
+    <Compile Include="HealthCheck\Checks\Config\CustomErrorsCheck.cs" />
+    <Compile Include="HealthCheck\Checks\Config\TraceCheck.cs" />
+    <Compile Include="HealthCheck\Checks\Config\ValueComparisonType.cs" />
+    <Compile Include="HealthCheck\Checks\Config\CompilationDebugCheck.cs" />
+    <Compile Include="HealthCheck\Checks\Security\BaseHttpHeaderCheck.cs" />
+    <Compile Include="HealthCheck\Checks\Security\NoSniffCheck.cs" />
+    <Compile Include="HealthCheck\Checks\Services\SmtpCheck.cs" />
+    <Compile Include="HealthCheck\Checks\Permissions\FolderAndFilePermissionsCheck.cs" />
+    <Compile Include="HealthCheck\Checks\Security\ExcessiveHeadersCheck.cs" />
+    <Compile Include="HealthCheck\Checks\Security\ClickJackingCheck.cs" />
+    <Compile Include="HealthCheck\HealthCheckAction.cs" />
+    <Compile Include="HealthCheck\HealthCheckNotificationMethodAttribute.cs" />
+    <Compile Include="HealthCheck\HealthCheckAttribute.cs" />
+    <Compile Include="HealthCheck\HealthCheckContext.cs" />
+    <Compile Include="HealthCheck\HealthCheckController.cs" />
+    <Compile Include="HealthCheck\HealthCheckGroup.cs" />
+    <Compile Include="HealthCheck\HealthCheckNotificationMethodResolver.cs" />
+    <Compile Include="HealthCheck\HealthCheckResolver.cs" />
+    <Compile Include="HealthCheck\HealthCheck.cs" />
+    <Compile Include="HealthCheck\HealthCheckResults.cs" />
+    <Compile Include="HealthCheck\HealthCheckStatus.cs" />
+    <Compile Include="HealthCheck\Checks\Security\HttpsCheck.cs" />
+    <Compile Include="HealthCheck\IHealthCheckResolver.cs" />
+    <Compile Include="HealthCheck\IHealthCheckNotificationMethodsResolver.cs" />
+    <Compile Include="HealthCheck\NotificationMethods\NotificationMethodBase.cs" />
+    <Compile Include="HealthCheck\NotificationMethods\EmailNotificationMethod.cs" />
+    <Compile Include="HealthCheck\NotificationMethods\IHealthCheckNotificatationMethod.cs" />
+    <Compile Include="HealthCheck\StatusResultType.cs" />
+    <Compile Include="HealthCheck\Checks\DataIntegrity\XmlDataIntegrityHealthCheck.cs" />
+    <Compile Include="IHttpContextAccessor.cs" />
+    <Compile Include="Install\InstallSteps\ConfigureMachineKey.cs" />
+    <Compile Include="Models\BackOfficeTourFile.cs" />
+    <Compile Include="Models\BackOfficeTourStep.cs" />
+    <Compile Include="Models\ContentEditing\AssignedContentPermissions.cs" />
+    <Compile Include="Models\ContentEditing\AssignedUserGroupPermissions.cs" />
+    <Compile Include="Models\ContentEditing\ContentRedirectUrl.cs" />
+    <Compile Include="Models\ContentEditing\DictionaryDisplay.cs" />
+    <Compile Include="Models\ContentEditing\DictionaryOverviewDisplay.cs" />
+    <Compile Include="Models\ContentEditing\DictionarySave.cs" />
+    <Compile Include="Models\ContentEditing\DictionaryOverviewTranslationDisplay.cs" />
+    <Compile Include="Models\ContentEditing\DictionaryTranslationSave.cs" />
+    <Compile Include="Models\ContentEditing\EditorNavigation.cs" />
+    <Compile Include="Models\ContentEditing\GetAvailableCompositionsFilter.cs" />
+    <Compile Include="Editors\IEditorValidator.cs" />
+    <Compile Include="Editors\EditorModelEventManager.cs" />
+    <Compile Include="HtmlHelperBackOfficeExtensions.cs" />
+    <Compile Include="Install\InstallSteps\Version73FileCleanup.cs" />
+    <Compile Include="Models\ContentEditing\DocumentTypeDisplay.cs" />
+    <Compile Include="Media\EmbedProviders\Flickr.cs" />
+    <Compile Include="Models\ContentEditing\ContentTypeCompositionDisplay.cs" />
+    <Compile Include="Models\ContentEditing\ContentTypeSave.cs" />
+    <Compile Include="Models\ContentEditing\DocumentTypeSave.cs" />
+    <Compile Include="Models\ContentEditing\InstalledPackageModel.cs" />
+    <Compile Include="Models\ContentEditing\LinkDisplay.cs" />
+    <Compile Include="Models\ContentEditing\MediaTypeDisplay.cs" />
+    <Compile Include="Models\ContentEditing\MediaTypeSave.cs" />
+    <Compile Include="Models\ContentEditing\MemberPropertyTypeBasic.cs" />
+    <Compile Include="Models\ContentEditing\MemberPropertyTypeDisplay.cs" />
+    <Compile Include="Models\ContentEditing\MemberTypeDisplay.cs" />
+    <Compile Include="Models\ContentEditing\MemberTypeSave.cs" />
+    <Compile Include="Models\ContentEditing\Permission.cs" />
+    <Compile Include="Models\ContentEditing\PostedFiles.cs" />
+    <Compile Include="Models\ContentEditing\PostedFolder.cs" />
+    <Compile Include="Models\ContentEditing\PropertyGroupBasic.cs" />
+    <Compile Include="Models\ContentEditing\PropertyTypeBasic.cs" />
+    <Compile Include="Models\ContentEditing\SimpleNotificationModel.cs" />
+    <Compile Include="Models\ContentEditing\SnippetDisplay.cs" />
+    <Compile Include="Models\ContentEditing\TemplateDisplay.cs" />
+    <Compile Include="Models\ContentEditing\DictionaryTranslationDisplay.cs" />
+    <Compile Include="Models\ContentEditing\UserDisplay.cs" />
+    <Compile Include="Models\ContentEditing\UserBasic.cs" />
+    <Compile Include="Models\ContentEditing\UserGroupBasic.cs" />
+    <Compile Include="Models\ContentEditing\UserGroupDisplay.cs" />
+    <Compile Include="Models\ContentEditing\UserGroupPermissionsSave.cs" />
+    <Compile Include="Models\ContentEditing\UserGroupSave.cs" />
+    <Compile Include="Models\DetachedPublishedContent.cs" />
+    <Compile Include="Models\DetachedPublishedProperty.cs" />
+    <Compile Include="Models\ContentEditing\UserInvite.cs" />
+    <Compile Include="Models\ContentEditing\UserSave.cs" />
+    <Compile Include="Models\Link.cs" />
+    <Compile Include="Models\LinkType.cs" />
+    <Compile Include="Models\LocalPackageInstallModel.cs" />
+    <Compile Include="Models\Mapping\CodeFileDisplayMapper.cs" />
+    <Compile Include="Models\Mapping\ContentTypeModelMapperExtensions.cs" />
+    <Compile Include="Models\Mapping\ContentTypeUdiResolver.cs" />
+    <Compile Include="Models\Mapping\DictionaryModelMapper.cs" />
+    <Compile Include="Models\Mapping\EntityModelMapperExtensions.cs" />
+    <Compile Include="Models\Mapping\LockedCompositionsResolver.cs" />
+    <Compile Include="Models\Mapping\UserGroupDefaultPermissionsResolver.cs" />
+    <Compile Include="Models\Mapping\PropertyGroupDisplayResolver.cs" />
+    <Compile Include="Models\RelatedLink.cs" />
+    <Compile Include="Models\Mapping\TemplateModelMapper.cs" />
+    <Compile Include="Models\PackageInstallResult.cs" />
+    <Compile Include="Models\RelatedLinkBase.cs" />
+    <Compile Include="Models\ContentEditing\CodeFileDisplay.cs" />
+    <Compile Include="Models\SendCodeViewModel.cs" />
+    <Compile Include="Models\RelatedLinks.cs" />
+    <Compile Include="Models\RelatedLinkType.cs" />
+    <Compile Include="Models\SetPasswordModel.cs" />
+    <Compile Include="Models\RequestPasswordResetModel.cs" />
+    <Compile Include="Models\PublishedContentWithKeyBase.cs" />
+    <Compile Include="Models\BackOfficeTour.cs" />
+    <Compile Include="Models\UserTourStatus.cs" />
+    <Compile Include="Models\ValidatePasswordResetCodeModel.cs" />
+    <Compile Include="Mvc\ControllerContextExtensions.cs" />
+    <Compile Include="Mvc\DisableBrowserCacheAttribute.cs" />
+    <Compile Include="Mvc\EnsurePartialViewMacroViewContextFilterAttribute.cs" />
+    <Compile Include="Mvc\IRenderController.cs" />
+    <Compile Include="Mvc\ModelBindingException.cs" />
+    <Compile Include="Mvc\RenderIndexActionSelectorAttribute.cs" />
+    <Compile Include="Mvc\UmbracoRequireHttpsAttribute.cs" />
+    <Compile Include="Mvc\ValidateMvcAngularAntiForgeryTokenAttribute.cs" />
+    <Compile Include="OwinMiddlewareConfiguredEventArgs.cs" />
+    <Compile Include="Profiling\WebProfilerProvider.cs" />
+    <Compile Include="Profiling\WebProfiler.cs" />
+    <Compile Include="PropertyEditors\ContentPicker2PropertyEditor.cs" />
+    <Compile Include="PropertyEditors\DatePreValueEditor.cs" />
+    <Compile Include="PropertyEditors\DateTimePreValueEditor.cs" />
+    <Compile Include="PropertyEditors\DecimalPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\MediaPicker2PropertyEditor.cs" />
+    <Compile Include="PropertyEditors\MemberPicker2PropertyEditor.cs" />
+    <Compile Include="PropertyEditors\MultiNodeTreePicker2PropertyEditor.cs" />
+    <Compile Include="PropertyEditors\MultiUrlPickerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\NestedContentController.cs" />
+    <Compile Include="PropertyEditors\NestedContentHelper.cs" />
+    <Compile Include="PropertyEditors\NestedContentPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\RelatedLinks2PropertyEditor.cs" />
+    <Compile Include="PropertyEditors\TextOnlyValueEditor.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\ContentPickerPropertyConverter.cs" />
+    <Compile Include="PropertyEditors\ParameterEditors\MultipleContentPickerParameterEditor.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\ImageCropDataSetConverter.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\ImageCropperValueConverter.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\LegacyRelatedLinksEditorValueConvertor.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\MediaPickerPropertyConverter.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\MemberPickerPropertyConverter.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\MultiNodeTreePickerPropertyConverter.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\LegacyMediaPickerPropertyConverter.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\MultiUrlPickerPropertyConverter.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\NestedContentSingleValueConverter.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\NestedContentManyValueConverter.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\NestedContentPublishedPropertyTypeExtensions.cs" />
+    <Compile Include="PublishedContentQueryExtensions.cs" />
+    <Compile Include="Routing\RedirectTrackingEventHandler.cs" />
+    <Compile Include="Editors\RedirectUrlManagementController.cs" />
+    <Compile Include="Models\ContentEditing\RedirectUrlSearchResults.cs" />
+    <Compile Include="RelatedLinksTypeConverter.cs" />
+    <Compile Include="RouteDataExtensions.cs" />
+    <Compile Include="Routing\ContentFinderByRedirectUrl.cs" />
+    <Compile Include="Scheduling\HealthCheckNotifier.cs" />
+    <Compile Include="Scheduling\LatchedBackgroundTaskBase.cs" />
+    <Compile Include="Search\SearchableApplicationTree.cs" />
+    <Compile Include="Search\SearchableTreeAttribute.cs" />
+    <Compile Include="Search\SearchableTreeCollection.cs" />
+    <Compile Include="Search\SearchableTreeResolver.cs" />
+    <Compile Include="Search\UmbracoTreeSearcher.cs" />
+    <Compile Include="Security\Identity\ExternalSignInAutoLinkOptions.cs" />
+    <Compile Include="Security\Identity\FixWindowsAuthMiddlware.cs" />
+    <Compile Include="Security\Identity\ForceRenewalCookieAuthenticationHandler.cs" />
+    <Compile Include="Security\Identity\ForceRenewalCookieAuthenticationMiddleware.cs" />
+    <Compile Include="Security\Identity\GetUserSecondsMiddleWare.cs" />
+    <Compile Include="Models\ContentEditing\PropertyTypeDisplay.cs" />
+    <Compile Include="Models\ContentEditing\PropertyGroupDisplay.cs" />
+    <Compile Include="Media\EmbedProviders\OEmbedJson.cs" />
+    <Compile Include="Media\EmbedProviders\OEmbedResponse.cs" />
+    <Compile Include="Media\EmbedProviders\OEmbedPhoto.cs" />
+    <Compile Include="Security\Identity\IUmbracoBackOfficeTwoFactorOptions.cs" />
+    <Compile Include="Models\Mapping\PropertyTypeGroupResolver.cs" />
+    <Compile Include="Security\Identity\PreviewAuthenticationMiddleware.cs" />
+    <Compile Include="SingletonHttpContextAccessor.cs" />
+    <Compile Include="Trees\DictionaryTreeController.cs" />
+    <Compile Include="Trees\MacroTreeController.cs" />
+    <Compile Include="Trees\UserTreeController.cs" />
+    <Compile Include="Suspendable.cs" />
+    <Compile Include="Trees\ContentBlueprintTreeController.cs" />
+    <Compile Include="Trees\ContentTypeTreeController.cs" />
+    <Compile Include="Trees\PackagesTreeController.cs" />
+    <Compile Include="Trees\MediaTypeTreeController.cs" />
+    <Compile Include="Trees\MemberTypeTreeController.cs" />
+    <Compile Include="Security\WebAuthExtensions.cs" />
+    <Compile Include="Trees\XsltTreeController.cs" />
+    <Compile Include="umbraco.presentation\SafeXmlReaderWriter.cs" />
+    <Compile Include="Trees\ScriptTreeController.cs" />
+    <Compile Include="umbraco.presentation\umbraco\developer\Packages\installer.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="UmbracoDefaultOwinStartup.cs" />
+    <Compile Include="IUmbracoContextAccessor.cs" />
+    <Compile Include="Models\ContentEditing\Relation.cs" />
+    <Compile Include="HtmlStringUtilities.cs" />
+    <Compile Include="Models\ContentEditing\RelationType.cs" />
+    <Compile Include="Models\ContentExtensions.cs" />
+    <Compile Include="IDynamicPublishedContentQuery.cs" />
+    <Compile Include="ITagQuery.cs" />
+    <Compile Include="ITypedPublishedContentQuery.cs" />
+    <Compile Include="IUmbracoComponentRenderer.cs" />
+    <Compile Include="Models\LegacyConvertedNode.cs" />
+    <Compile Include="Models\LegacyConvertedNodeProperty.cs" />
+    <Compile Include="Models\Mapping\RelationModelMapper.cs" />
+    <Compile Include="Mvc\DisableClientCacheAttribute.cs" />
+    <Compile Include="Models\UnLinkLoginModel.cs" />
+    <Compile Include="Mvc\MvcVersionCheck.cs" />
+    <Compile Include="Mvc\ReflectedFixedRazorViewEngine.cs" />
+    <Compile Include="Scheduling\ThreadingTaskImmutable.cs" />
+    <Compile Include="Mvc\ProfilingView.cs" />
+    <Compile Include="Mvc\ProfilingViewEngine.cs" />
+    <Compile Include="Mvc\UrlHelperExtensions.cs" />
+    <Compile Include="Scheduling\BackgroundTaskRunner.cs" />
+    <Compile Include="BatchedDatabaseServerMessenger.cs" />
+    <Compile Include="BatchedWebServiceServerMessenger.cs" />
+    <Compile Include="CacheHelperExtensions.cs" />
+    <Compile Include="Cache\UserGroupPermissionsCacheRefresher.cs" />
+    <Compile Include="Editors\AuthenticationController.cs" />
+    <Compile Include="Controllers\UmbProfileController.cs" />
+    <Compile Include="Editors\ContentController.cs" />
+    <Compile Include="Controllers\UmbLoginStatusController.cs" />
+    <Compile Include="Editors\ContentPostValidateAttribute.cs" />
+    <Compile Include="Editors\ContentTypeControllerBase.cs" />
+    <Compile Include="Editors\DashboardController.cs" />
+    <Compile Include="Editors\DashboardSecurity.cs" />
+    <Compile Include="Editors\DataTypeController.cs" />
+    <Compile Include="Editors\DataTypeValidateAttribute.cs" />
+    <Compile Include="Editors\EntityControllerConfigurationAttribute.cs" />
+    <Compile Include="Editors\ImagesController.cs" />
+    <Compile Include="Editors\PackageInstallController.cs" />
+    <Compile Include="Editors\RelationController.cs" />
+    <Compile Include="Editors\CanvasDesignerController.cs" />
+    <Compile Include="Editors\UsersController.cs" />
+    <Compile Include="GridTemplateExtensions.cs" />
+    <Compile Include="Models\PackageInstallModel.cs" />
+    <Compile Include="Models\ContentEditing\DataTypeBasic.cs" />
+    <Compile Include="Models\ContentEditing\MemberBasic.cs" />
+    <Compile Include="Models\ContentEditing\MemberListDisplay.cs" />
+    <Compile Include="Models\TemplateQuery\ContentTypeModel.cs" />
+    <Compile Include="Models\TemplateQuery\PropertyModel.cs" />
+    <Compile Include="Models\TemplateQuery\SourceModel.cs" />
+    <Compile Include="Models\TemplateQuery\TemplateQueryResult.cs" />
+    <Compile Include="Models\TemplateQuery\SortExpression.cs" />
+    <Compile Include="Models\TemplateQuery\Operathor.cs" />
+    <Compile Include="Models\TemplateQuery\OperathorTerm.cs" />
+    <Compile Include="Models\TemplateQuery\QueryCondition.cs" />
+    <Compile Include="Models\TemplateQuery\QueryModel.cs" />
+    <Compile Include="Models\TemplateQuery\QueryResultModel.cs" />
+    <Compile Include="Editors\TemplateQueryController.cs" />
+    <Compile Include="Models\ContentEditing\ContentBaseItemSave.cs" />
+    <Compile Include="Models\ContentEditing\MediaItemSave.cs" />
+    <Compile Include="Models\DetachedContent.cs" />
+    <Compile Include="Models\ImageCropAnchor.cs" />
+    <Compile Include="Models\ImageCropCoordinates.cs" />
+    <Compile Include="Models\ImageCropDataSet.cs" />
+    <Compile Include="Models\ImageCropFocalPoint.cs" />
+    <Compile Include="Models\ImageCropMode.cs" />
+    <Compile Include="Install\DatabaseHelper.cs" />
+    <Compile Include="Install\InstallException.cs" />
+    <Compile Include="Install\InstallStatusTracker.cs" />
+    <Compile Include="Install\InstallSteps\DatabaseConfigureStep.cs" />
+    <Compile Include="Install\InstallSteps\DatabaseInstallStep.cs" />
+    <Compile Include="Install\InstallSteps\DatabaseUpgradeStep.cs" />
+    <Compile Include="Install\InstallSteps\FilePermissionsStep.cs" />
+    <Compile Include="Install\InstallSteps\MajorVersion7UpgradeReport.cs" />
+    <Compile Include="Install\InstallSteps\SetUmbracoVersionStep.cs" />
+    <Compile Include="Install\InstallSteps\StarterKitCleanupStep.cs" />
+    <Compile Include="Install\InstallSteps\StarterKitDownloadStep.cs" />
+    <Compile Include="Install\InstallSteps\StarterKitInstallStep.cs" />
+    <Compile Include="Install\InstallSteps\UpgradeStep.cs" />
+    <Compile Include="Install\InstallSteps\NewInstallStep.cs" />
+    <Compile Include="Install\Controllers\InstallPackageController.cs" />
+    <Compile Include="Install\Models\DatabaseModel.cs" />
+    <Compile Include="Install\Models\DatabaseType.cs" />
+    <Compile Include="Install\Models\InstallationType.cs" />
+    <Compile Include="Install\Models\InstallInstructions.cs" />
+    <Compile Include="Install\Models\InstallPackageModel.cs" />
+    <Compile Include="Install\Models\InstallProgressResultModel.cs" />
+    <Compile Include="Install\Models\InstallSetup.cs" />
+    <Compile Include="Install\Models\InstallSetupResult.cs" />
+    <Compile Include="Install\Models\InstallSetupStep.cs" />
+    <Compile Include="Install\Models\InstallSetupStepAttribute.cs" />
+    <Compile Include="Install\Models\InstallTrackingItem.cs" />
+    <Compile Include="Install\Models\Package.cs" />
+    <Compile Include="Install\Models\UserModel.cs" />
+    <Compile Include="Install\UmbracoInstallArea.cs" />
+    <Compile Include="Install\Controllers\InstallApiController.cs" />
+    <Compile Include="Install\Controllers\InstallController.cs" />
+    <Compile Include="Install\InstallAuthorizeAttribute.cs" />
+    <Compile Include="Models\ContentEditing\TreeSearchResult.cs" />
+    <Compile Include="Models\ContentEditing\ListViewAwareContentItemDisplayBase.cs" />
+    <Compile Include="Models\ContentEditing\PropertyTypeValidation.cs" />
+    <Compile Include="Models\ImageCropData.cs" />
+    <Compile Include="Models\ImageCropRatioMode.cs" />
+    <Compile Include="Models\IRenderModel.cs" />
+    <Compile Include="Models\PartialViewMacroModelExtensions.cs" />
+    <Compile Include="Models\PostRedirectModel.cs" />
+    <Compile Include="Models\PublishedProperty.cs" />
+    <Compile Include="Mvc\ActionExecutedEventArgs.cs" />
+    <Compile Include="Mvc\AdminTokenAuthorizeAttribute.cs" />
+    <Compile Include="Mvc\NotFoundHandler.cs" />
+    <Compile Include="Mvc\PreRenderViewActionFilterAttribute.cs" />
+    <Compile Include="Mvc\RedirectToUmbracoUrlResult.cs" />
+    <Compile Include="PropertyEditors\GridPropertyEditor.cs" />
+    <Compile Include="Mvc\UmbracoVirtualNodeByIdRouteHandler.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\MacroContainerValueConverter.cs" />
+    <Compile Include="PropertyEditors\TagsDataController.cs" />
+    <Compile Include="PublishedCache\MemberPublishedContent.cs" />
+    <Compile Include="PublishedCache\RawValueProperty.cs" />
+    <Compile Include="Models\RenderModelOfTContent.cs" />
+    <Compile Include="Mvc\JsonNetResult.cs" />
+    <Compile Include="Mvc\MinifyJavaScriptResultAttribute.cs" />
+    <Compile Include="Mvc\EnsurePublishedContentRequestAttribute.cs" />
+    <Compile Include="Mvc\UmbracoTemplatePageOfTContent.cs" />
+    <Compile Include="Mvc\UmbracoViewPage.cs" />
+    <Compile Include="Editors\LogController.cs" />
+    <Compile Include="Editors\MacroController.cs" />
+    <Compile Include="Editors\MemberTypeController.cs" />
+    <Compile Include="Editors\UpdateCheckController.cs" />
+    <Compile Include="MembershipProviderExtensions.cs" />
+    <Compile Include="Models\ChangingPasswordModel.cs" />
+    <Compile Include="Models\ContentEditing\ModelWithNotifications.cs" />
+    <Compile Include="Models\ContentEditing\StyleSheet.cs" />
+    <Compile Include="Editors\StylesheetController.cs" />
+    <Compile Include="Models\ContentEditing\AuditLog.cs" />
+    <Compile Include="Models\ContentEditing\MoveOrCopy.cs" />
+    <Compile Include="Models\ContentEditing\MacroParameter.cs" />
+    <Compile Include="Models\ContentEditing\MemberDisplay.cs" />
+    <Compile Include="Models\ContentEditing\MemberSave.cs" />
+    <Compile Include="Models\ContentEditing\RichTextEditorCommand.cs" />
+    <Compile Include="Models\ContentEditing\RichTextEditorConfiguration.cs" />
+    <Compile Include="Models\ContentEditing\RichTextEditorPlugin.cs" />
+    <Compile Include="Models\ContentEditing\StylesheetRule.cs" />
+    <Compile Include="Models\ContentEditing\UmbracoEntityTypes.cs" />
+    <Compile Include="Models\ContentEditing\AuditLogType.cs" />
+    <Compile Include="Models\Mapping\MiscModelsMapper.cs" />
+    <Compile Include="Models\Mapping\MacroModelMapper.cs" />
+    <Compile Include="Models\Mapping\MemberModelMapper.cs" />
+    <Compile Include="Models\Mapping\TabModelMapper.cs" />
+    <Compile Include="Models\TagModel.cs" />
+    <Compile Include="Models\UpgradeCheckResponse.cs" />
+    <Compile Include="Models\PasswordChangedModel.cs" />
+    <Compile Include="NotificationServiceExtensions.cs" />
+    <Compile Include="PropertyEditors\ColorListPreValueEditor.cs" />
+    <Compile Include="PropertyEditors\EmailAddressPropertyEditor.cs" />
+    <Compile Include="ImageCropperBaseExtensions.cs" />
+    <Compile Include="PropertyEditors\ImageCropperPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\ImageCropperPropertyValueEditor.cs" />
+    <Compile Include="PropertyEditors\ListViewPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\MacroContainerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\MarkdownPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\MemberGroupPickerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\MemberPickerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\MultiNodeTreePickerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\MultipleMediaPickerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\ParameterEditors\ContentTypeParameterEditor.cs" />
+    <Compile Include="PropertyEditors\ParameterEditors\MultipleContentTypeParameterEditor.cs" />
+    <Compile Include="PropertyEditors\ParameterEditors\MultipleMediaPickerParameterEditor.cs" />
+    <Compile Include="PropertyEditors\ParameterEditors\MultiplePropertyGroupParameterEditor.cs" />
+    <Compile Include="PropertyEditors\ParameterEditors\MultiplePropertyTypeParameterEditor.cs" />
+    <Compile Include="PropertyEditors\ParameterEditors\PropertyGroupParameterEditor.cs" />
+    <Compile Include="PropertyEditors\ParameterEditors\PropertyTypeParameterEditor.cs" />
+    <Compile Include="PropertyEditors\ParameterEditors\SingleMediaPickerParameterEditor.cs" />
+    <Compile Include="PropertyEditors\PropertyEditorAssetAttribute.cs" />
+    <Compile Include="PropertyEditors\RelatedLinksPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\RteEmbedController.cs" />
+    <Compile Include="Editors\EntityController.cs" />
+    <Compile Include="Editors\MediaPostValidateAttribute.cs" />
+    <Compile Include="Editors\MemberController.cs" />
+    <Compile Include="Editors\CurrentUserController.cs" />
+    <Compile Include="Models\ContentEditing\DashboardControl.cs" />
+    <Compile Include="Models\ContentEditing\DataTypeDisplay.cs" />
+    <Compile Include="Models\ContentEditing\DataTypeSave.cs" />
+    <Compile Include="Models\ContentEditing\EntityBasic.cs" />
+    <Compile Include="Models\ContentEditing\PreValueFieldDisplay.cs" />
+    <Compile Include="Models\ContentEditing\PreValueFieldSave.cs" />
+    <Compile Include="Models\ContentEditing\PropertyEditorBasic.cs" />
+    <Compile Include="Models\Mapping\AvailablePropertyEditorsResolver.cs" />
+    <Compile Include="Models\Mapping\DatabaseTypeResolver.cs" />
+    <Compile Include="Models\Mapping\DataTypeModelMapper.cs" />
+    <Compile Include="Models\Mapping\EntityModelMapper.cs" />
+    <Compile Include="Models\Mapping\PreValueDisplayResolver.cs" />
+    <Compile Include="PropertyEditors\CheckBoxListPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\ColorPickerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\DatePropertyEditor.cs" />
+    <Compile Include="PropertyEditors\DateTimePropertyEditor.cs" />
+    <Compile Include="PropertyEditors\DateTimeValidator.cs" />
+    <Compile Include="PropertyEditors\DropDownMultiplePropertyEditor.cs" />
+    <Compile Include="PropertyEditors\FolderBrowserPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\IntegerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\MediaPickerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\MultipleTextStringPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\PublishValuesMultipleValueEditor.cs" />
+    <Compile Include="PropertyEditors\DropDownMultipleWithKeysPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\RadioButtonsPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\RichTextPreValueController.cs" />
+    <Compile Include="PropertyEditors\RichTextPreValueEditor.cs" />
+    <Compile Include="PropertyEditors\SliderPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\TagPropertyEditorTagDefinition.cs" />
+    <Compile Include="PropertyEditors\TagsPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\UploadFileTypeValidator.cs" />
+    <Compile Include="PropertyEditors\UserPickerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\RelatedLinksEditorValueConvertor.cs" />
+    <Compile Include="PropertyEditors\ValueListPreValueEditor.cs" />
+    <Compile Include="PropertyEditors\DropDownPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\PublishValueValueEditor.cs" />
+    <Compile Include="PropertyEditors\DropDownWithKeysPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\LabelPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\PropertyValueEditorWrapper.cs" />
+    <Compile Include="PublishedContentQuery.cs" />
+    <Compile Include="ImageCropperTemplateExtensions.cs" />
+    <Compile Include="Mvc\UmbracoVirtualNodeRouteHandler.cs" />
+    <Compile Include="Routing\CustomRouteUrlProvider.cs" />
+    <Compile Include="Routing\UrlProviderExtensions.cs" />
+    <Compile Include="Scheduling\BackgroundTaskRunnerOptions.cs" />
+    <Compile Include="Scheduling\IBackgroundTaskRunner.cs" />
+    <Compile Include="Scheduling\ILatchedBackgroundTask.cs" />
+    <Compile Include="Scheduling\RecurringTaskBase.cs" />
+    <Compile Include="Security\Identity\AppBuilderExtensions.cs" />
+    <Compile Include="Security\Identity\AuthenticationOptionsExtensions.cs" />
+    <Compile Include="Security\Identity\AuthenticationManagerExtensions.cs" />
+    <Compile Include="Security\Identity\BackOfficeCookieManager.cs" />
+    <Compile Include="Security\Identity\FormsAuthenticationSecureDataFormat.cs" />
+    <Compile Include="Security\Identity\UmbracoBackOfficeCookieAuthOptions.cs" />
+    <Compile Include="Scheduling\TaskAndFactoryExtensions.cs" />
+    <Compile Include="SingletonUmbracoContextAccessor.cs" />
+    <Compile Include="Strategies\Migrations\ClearCsrfCookiesAfterUpgrade.cs" />
+    <Compile Include="Strategies\Migrations\ClearMediaXmlCacheForDeletedItemsAfterUpgrade.cs" />
+    <Compile Include="Strategies\Migrations\EnsureListViewDataTypeIsCreated.cs" />
+    <Compile Include="Strategies\Migrations\MigrationStartupHander.cs" />
+    <Compile Include="Strategies\Migrations\OverwriteStylesheetFilesFromTempFiles.cs" />
+    <Compile Include="Strategies\NotificationsHandler.cs" />
+    <Compile Include="Strategies\RelateOnCopyHandler.cs" />
+    <Compile Include="TagQuery.cs" />
+    <Compile Include="Trees\CoreTreeAttribute.cs" />
+    <Compile Include="Trees\DataTypeTreeController.cs" />
+    <Compile Include="Trees\FileSystemTreeController.cs" />
+    <Compile Include="Trees\LanguageTreeController.cs" />
+    <Compile Include="Trees\LegacyBaseTreeAttribute.cs" />
+    <Compile Include="Trees\MemberTreeController.cs" />
+    <Compile Include="Trees\MenuRenderingEventArgs.cs" />
+    <Compile Include="Models\Trees\CreateChildEntity.cs" />
+    <Compile Include="Models\Trees\MenuItemList.cs" />
+    <Compile Include="Trees\TemplatesTreeController.cs" />
+    <Compile Include="Trees\TreeControllerBase.cs" />
+    <Compile Include="CanvasDesignerUtility.cs" />
+    <Compile Include="UI\JavaScript\AssetInitialization.cs" />
+    <Compile Include="UI\JavaScript\CssInitialization.cs" />
+    <Compile Include="UI\JavaScript\DependencyPathRenderer.cs" />
+    <Compile Include="umbraco.presentation\umbraco\create.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\create\Language.ascx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\create\xslt.ascx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadPackager.cs" />
+    <Compile Include="PublishedCache\XmlPublishedCache\XmlCacheFilePersister.cs" />
+    <Compile Include="UmbracoComponentRenderer.cs" />
+    <Compile Include="Web References\org.umbraco.our\Reference.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Reference.map</DependentUpon>
+    </Compile>
+    <Compile Include="WebApi\AngularJsonMediaTypeFormatter.cs" />
+    <Compile Include="WebApi\AngularJsonOnlyConfigurationAttribute.cs" />
+    <Compile Include="WebApi\Binders\BlueprintItemBinder.cs" />
+    <Compile Include="WebApi\Binders\MemberBinder.cs" />
+    <Compile Include="WebApi\EnableDetailedErrorsAttribute.cs" />
+    <Compile Include="WebApi\Filters\AdminUsersAuthorizeAttribute.cs" />
+    <Compile Include="WebApi\Filters\AngularAntiForgeryHelper.cs" />
+    <Compile Include="WebApi\Filters\AppendCurrentEventMessagesAttribute.cs" />
+    <Compile Include="WebApi\Filters\AppendUserModifiedHeaderAttribute.cs" />
+    <Compile Include="WebApi\Filters\ClearAngularAntiForgeryTokenAttribute.cs" />
+    <Compile Include="WebApi\Filters\DisableBrowserCacheAttribute.cs" />
+    <Compile Include="WebApi\Filters\EnableOverrideAuthorizationAttribute.cs" />
+    <Compile Include="WebApi\Filters\FeatureAuthorizeAttribute.cs" />
+    <Compile Include="WebApi\Filters\FilterGrouping.cs" />
+    <Compile Include="WebApi\Filters\HttpQueryStringModelBinder.cs" />
+    <Compile Include="WebApi\Filters\LegacyTreeAuthorizeAttribute.cs" />
+    <Compile Include="WebApi\Filters\OutgoingEditorModelEventAttribute.cs" />
+    <Compile Include="WebApi\Filters\OutgoingNoHyphenGuidFormatAttribute.cs" />
+    <Compile Include="WebApi\Filters\OverridableAuthorizationAttribute.cs" />
+    <Compile Include="WebApi\Filters\SetAngularAntiForgeryTokensAttribute.cs" />
+    <Compile Include="WebApi\Filters\UmbracoBackOfficeLogoutAttribute.cs" />
+    <Compile Include="WebApi\Filters\UmbracoWebApiRequireHttpsAttribute.cs" />
+    <Compile Include="WebApi\Filters\UmbracoTreeAuthorizeAttribute.cs" />
+    <Compile Include="WebApi\Filters\UmbracoUseHttps.cs" />
+    <Compile Include="WebApi\Filters\ValidateAngularAntiForgeryTokenAttribute.cs" />
+    <Compile Include="WebApi\Filters\CheckIfUserTicketDataIsStaleAttribute.cs" />
+    <Compile Include="WebApi\HttpControllerContextExtensions.cs" />
+    <Compile Include="WebApi\CustomDateTimeConvertor.cs" />
+    <Compile Include="Models\ContentEditing\ContentSortOrder.cs" />
+    <Compile Include="Editors\ContentControllerBase.cs" />
+    <Compile Include="Editors\ContentTypeController.cs" />
+    <Compile Include="Editors\LegacyController.cs" />
+    <Compile Include="Controllers\UmbRegisterController.cs" />
+    <Compile Include="Models\ProfileModel.cs" />
+    <Compile Include="Models\LoginStatusModel.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\MarkdownEditorValueConverter.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\TextStringValueConverter.cs" />
+    <Compile Include="PublishedContentPropertyExtension.cs" />
+    <Compile Include="Models\UmbracoProperty.cs" />
+    <Compile Include="Mvc\MergeParentContextViewDataAttribute.cs" />
+    <Compile Include="Mvc\ViewDataDictionaryExtensions.cs" />
+    <Compile Include="Routing\ContentLastChanceFinderByNotFoundHandlers.cs" />
+    <Compile Include="Models\RegisterModel.cs" />
+    <Compile Include="Models\LoginModel.cs" />
+    <Compile Include="Editors\MediaTypeController.cs" />
+    <Compile Include="Scheduling\IBackgroundTask.cs" />
+    <Compile Include="Scheduling\KeepAlive.cs" />
+    <Compile Include="Scheduling\LogScrubber.cs" />
+    <Compile Include="Scheduling\ScheduledPublishing.cs" />
+    <Compile Include="Scheduling\ScheduledTasks.cs" />
+    <Compile Include="Scheduling\TaskEventArgs.cs" />
+    <Compile Include="Security\MembershipHelper.cs" />
+    <Compile Include="Editors\SectionController.cs" />
+    <Compile Include="Editors\UmbracoAuthorizedJsonController.cs" />
+    <Compile Include="Editors\ValidationHelper.cs" />
+    <Compile Include="HttpCookieExtensions.cs" />
+    <Compile Include="Models\ContentEditing\ContentItemDisplayBase.cs" />
+    <Compile Include="Models\ContentEditing\ContentSaveAction.cs" />
+    <Compile Include="Models\ContentEditing\ContentTypeBasic.cs" />
+    <Compile Include="Models\ContentEditing\IErrorModel.cs" />
+    <Compile Include="Models\ContentEditing\IHaveUploadedFiles.cs" />
+    <Compile Include="Models\ContentEditing\INotificationModel.cs" />
+    <Compile Include="Models\ContentEditing\MediaItemDisplay.cs" />
+    <Compile Include="Models\ContentEditing\MessagesExtensions.cs" />
+    <Compile Include="Models\ContentEditing\Notification.cs" />
+    <Compile Include="Models\ContentEditing\Section.cs" />
+    <Compile Include="Models\ContentEditing\Tab.cs" />
+    <Compile Include="Models\ContentEditing\TabbedContentItem.cs" />
+    <Compile Include="Models\ContentEditing\UserProfile.cs" />
+    <Compile Include="Models\ContentEditing\UserDetail.cs" />
+    <Compile Include="FormDataCollectionExtensions.cs" />
+    <Compile Include="Models\Mapping\ContentPropertyBasicConverter.cs" />
+    <Compile Include="Models\Mapping\ContentPropertyDisplayConverter.cs" />
+    <Compile Include="Models\Mapping\ContentPropertyDtoConverter.cs" />
+    <Compile Include="Models\Mapping\ContentPropertyModelMapper.cs" />
+    <Compile Include="Models\Mapping\CreatorResolver.cs" />
+    <Compile Include="Models\Mapping\MediaModelMapper.cs" />
+    <Compile Include="Models\Mapping\ContentTypeModelMapper.cs" />
+    <Compile Include="Models\Mapping\ContentModelMapper.cs" />
+    <Compile Include="Models\Mapping\OwnerResolver.cs" />
+    <Compile Include="Models\Mapping\SectionModelMapper.cs" />
+    <Compile Include="Models\Mapping\TabsAndPropertiesResolver.cs" />
+    <Compile Include="Models\Mapping\UserModelMapper.cs" />
+    <Compile Include="PropertyEditors\ContentPickerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\FileUploadPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\FileUploadPropertyValueEditor.cs" />
+    <Compile Include="PropertyEditors\RichTextPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\TextAreaPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\TextboxPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\TrueFalsePropertyEditor.cs" />
+    <Compile Include="Trees\MediaTreeController.cs" />
+    <Compile Include="Models\Trees\ActionMenuItem.cs" />
+    <Compile Include="Models\Trees\ActionMenuItemAttribute.cs" />
+    <Compile Include="Trees\ActionUrlMethod.cs" />
+    <Compile Include="Trees\ApplicationTreeRegistrar.cs" />
+    <Compile Include="Trees\ContentTreeControllerBase.cs" />
+    <Compile Include="Trees\LegacyTreeController.cs" />
+    <Compile Include="Search\ISearchableTree.cs" />
+    <Compile Include="Trees\LegacyTreeDataConverter.cs" />
+    <Compile Include="Trees\LegacyTreeJavascript.cs" />
+    <Compile Include="Trees\LegacyTreeParams.cs" />
+    <Compile Include="Models\Trees\MenuItem.cs" />
+    <Compile Include="Models\Trees\MenuItemCollection.cs" />
+    <Compile Include="Models\Trees\RefreshNode.cs" />
+    <Compile Include="Models\ContentEditing\SearchResultItem.cs" />
+    <Compile Include="Models\Trees\SectionRootNode.cs" />
+    <Compile Include="Trees\TreeController.cs" />
+    <Compile Include="Trees\ApplicationTreeExtensions.cs" />
+    <Compile Include="Trees\TreeAttribute.cs" />
+    <Compile Include="Models\Trees\TreeNode.cs" />
+    <Compile Include="Models\Trees\TreeNodeCollection.cs" />
+    <Compile Include="Models\Trees\TreeNodeExtensions.cs" />
+    <Compile Include="Trees\TreeNodeRenderingEventArgs.cs" />
+    <Compile Include="Trees\TreeNodesRenderingEventArgs.cs" />
+    <Compile Include="Trees\TreeQueryStringParameters.cs" />
+    <Compile Include="Trees\ApplicationTreeController.cs" />
+    <Compile Include="Editors\BackOfficeController.cs" />
+    <Compile Include="Security\Providers\MembersMembershipProvider.cs" />
+    <Compile Include="Security\Providers\MembersRoleProvider.cs" />
+    <Compile Include="Security\Providers\UmbracoMembershipProvider.cs" />
+    <Compile Include="Security\Providers\UsersMembershipProvider.cs" />
+    <Compile Include="Trees\ContentTreeController.cs" />
+    <Compile Include="Trees\TreeRenderingEventArgs.cs" />
+    <Compile Include="Trees\UrlHelperExtensions.cs" />
+    <Compile Include="UI\JavaScript\JsInitialization.cs" />
+    <Compile Include="Models\ContentEditing\ContentItemBasic.cs" />
+    <Compile Include="Models\ContentEditing\ContentItemDisplay.cs" />
+    <Compile Include="Models\ContentEditing\ContentItemDto.cs" />
+    <Compile Include="Models\ContentEditing\ContentItemFile.cs" />
+    <Compile Include="Models\ContentEditing\ContentItemSave.cs" />
+    <Compile Include="Models\ContentEditing\ContentPropertyBasic.cs" />
+    <Compile Include="Models\ContentEditing\ContentPropertyDisplay.cs" />
+    <Compile Include="Models\ContentEditing\ContentPropertyDto.cs" />
+    <Compile Include="Dynamics\DynamicExpression.cs" />
+    <Compile Include="Dynamics\DynamicGrouping.cs" />
+    <Compile Include="Dynamics\DynamicPublishedContentIdEqualityComparer.cs" />
+    <Compile Include="Dynamics\DynamicPublishedContentListOrdering.cs" />
+    <Compile Include="Dynamics\DynamicQueryable.cs" />
+    <Compile Include="Dynamics\ExpressionParser.cs" />
+    <Compile Include="Dynamics\ExtensionMethods.cs" />
+    <Compile Include="Dynamics\Grouping.cs" />
+    <Compile Include="HttpRequestExtensions.cs" />
+    <Compile Include="HttpUrlHelperExtensions.cs" />
+    <Compile Include="Install\FilePermissionHelper.cs" />
+    <Compile Include="Install\InstallHelper.cs" />
+    <Compile Include="Install\HttpInstallAuthorizeAttribute.cs" />
+    <Compile Include="Macros\PartialViewMacroController.cs" />
+    <Compile Include="Macros\PartialViewMacroEngine.cs" />
+    <Compile Include="Macros\PartialViewMacroPage.cs" />
+    <Compile Include="Media\ImageUrl.cs" />
+    <Compile Include="Media\ImageUrlProviderResolver.cs" />
+    <Compile Include="Media\ImageUrlProviders\ImageUrlProvider.cs" />
+    <Compile Include="Models\DynamicPublishedContent.cs" />
+    <Compile Include="Models\DynamicPublishedContentList.cs" />
+    <Compile Include="Models\PartialViewMacroModel.cs" />
+    <Compile Include="Models\PublishedContentBase.cs" />
+    <Compile Include="Mvc\AreaRegistrationExtensions.cs" />
+    <Compile Include="BaseRest\BaseRestHandler.cs" />
+    <Compile Include="BaseRest\MemberRest.cs" />
+    <Compile Include="BaseRest\RestExtensionAttribute.cs" />
+    <Compile Include="BaseRest\RestExtensionMethodAttribute.cs" />
+    <Compile Include="BaseRest\RestExtensionMethodInfo.cs" />
+    <Compile Include="ContextualPublishedCacheExtensions.cs" />
+    <Compile Include="Mvc\DefaultRenderMvcControllerResolver.cs" />
+    <Compile Include="Mvc\QueryStringFilterAttribute.cs" />
+    <Compile Include="PublishedCache\ContextualPublishedContentCache.cs" />
+    <Compile Include="PublishedCache\ContextualPublishedCacheOfT.cs" />
+    <Compile Include="PublishedCache\ContextualPublishedCache.cs" />
+    <Compile Include="PublishedCache\ContextualPublishedMediaCache.cs" />
+    <Compile Include="PublishedCache\PublishedCachesResolver.cs" />
+    <Compile Include="PublishedCache\IPublishedCaches.cs" />
+    <Compile Include="PublishedCache\PublishedCaches.cs" />
+    <Compile Include="PublishedCache\XmlPublishedCache\PublishedMediaCache.cs" />
+    <Compile Include="Dictionary\UmbracoCultureDictionary.cs" />
+    <Compile Include="Dictionary\UmbracoCultureDictionaryFactory.cs" />
+    <Compile Include="Mvc\MemberAuthorizeAttribute.cs" />
+    <Compile Include="Mvc\BackOfficeArea.cs" />
+    <Compile Include="Mvc\ControllerFactoryExtensions.cs" />
+    <Compile Include="Mvc\IRenderMvcController.cs" />
+    <Compile Include="Mvc\SurfaceRouteHandler.cs" />
+    <Compile Include="PublishedCache\XmlPublishedCache\RoutesCache.cs" />
+    <Compile Include="PublishedCache\XmlPublishedCache\UmbracoContextCache.cs" />
+    <Compile Include="Routing\UrlProviderMode.cs" />
+    <Compile Include="Search\ExamineIndexerModel.cs" />
+    <Compile Include="Search\LuceneIndexerExtensions.cs" />
+    <Compile Include="Security\ValidateRequestAttempt.cs" />
+    <Compile Include="Security\WebSecurity.cs" />
+    <Compile Include="UI\JavaScript\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="UI\JavaScript\ServerVariablesParser.cs" />
+    <Compile Include="Strategies\Migrations\RebuildXmlCachesAfterUpgrade.cs" />
+    <Compile Include="Strategies\PublicAccessEventHandler.cs" />
+    <Compile Include="UI\Bundles\JsApplicationLib.cs" />
+    <Compile Include="UI\Bundles\JsJQueryCore.cs" />
+    <Compile Include="UI\Bundles\JsJQueryPlugins.cs" />
+    <Compile Include="UI\Bundles\JsUmbracoApplicationCore.cs" />
+    <Compile Include="UI\Bundles\JsUmbracoApplicationUI.cs" />
+    <Compile Include="UI\Bundles\JsUmbracoTree.cs" />
+    <Compile Include="UI\CdfLogger.cs" />
+    <Compile Include="Models\LegacyNodeHelper.cs" />
+    <Compile Include="umbraco.presentation\umbraco\controls\Tree\TreeControl.ascx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\create\simple.ascx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\Packages\directoryBrowser.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\ProtectPage.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\create.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\AssignDomain2.aspx.cs">
+      <DependentUpon>AssignDomain2.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\AssignDomain2.aspx.designer.cs">
+      <DependentUpon>AssignDomain2.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="UmbracoContextExtensions.cs" />
+    <Compile Include="umbraco.presentation\umbraco\settings\stylesheet\editstylesheet.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\settings\stylesheet\property\EditStyleSheetProperty.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Controllers\UmbLoginController.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\TranslateTreeNames.cs" />
+    <Compile Include="UrlHelperExtensions.cs" />
+    <Compile Include="Editors\MediaController.cs" />
+    <Compile Include="UrlHelperRenderExtensions.cs" />
+    <Compile Include="WebApi\Binders\ContentItemBaseBinder.cs" />
+    <Compile Include="WebApi\IsBackOfficeAttribute.cs" />
+    <Compile Include="WebApi\Binders\ContentItemBinder.cs" />
+    <Compile Include="WebApi\Binders\MediaItemBinder.cs" />
+    <Compile Include="WebApi\Filters\EnsureUserPermissionForContentAttribute.cs" />
+    <Compile Include="WebApi\Filters\ContentItemValidationHelper.cs" />
+    <Compile Include="WebApi\Filters\EnsureUserPermissionForMediaAttribute.cs" />
+    <Compile Include="WebApi\Filters\FileUploadCleanupFilterAttribute.cs" />
+    <Compile Include="WebApi\Filters\FilterAllowedOutgoingContentAttribute.cs" />
+    <Compile Include="WebApi\Filters\FilterAllowedOutgoingMediaAttribute.cs" />
+    <Compile Include="WebApi\Filters\HttpQueryStringFilterAttribute.cs" />
+    <Compile Include="WebApi\Filters\OutgoingDateTimeFormatAttribute.cs" />
+    <Compile Include="WebApi\Filters\UmbracoApplicationAuthorizeAttribute.cs" />
+    <Compile Include="WebApi\GuidNoHyphenConverter.cs" />
+    <Compile Include="WebApi\HttpRequestMessageExtensions.cs" />
+    <Compile Include="WebApi\JsonCamelCaseFormatter.cs" />
+    <Compile Include="WebApi\MemberAuthorizeAttribute.cs" />
+    <Compile Include="WebApi\MvcVersionCheck.cs" />
+    <Compile Include="WebApi\NamespaceHttpControllerSelector.cs" />
+    <Compile Include="WebApi\PrefixlessBodyModelValidator.cs" />
+    <Compile Include="WebApi\PrefixlessBodyModelValidatorAttribute.cs" />
+    <Compile Include="WebApi\SessionHttpControllerRouteHandler.cs" />
+    <Compile Include="WebApi\UmbracoApiController.cs" />
+    <Compile Include="WebApi\UmbracoApiControllerBase.cs" />
+    <Compile Include="WebApi\UmbracoApiControllerResolver.cs" />
+    <Compile Include="Mvc\UmbracoAuthorizeAttribute.cs" />
+    <Compile Include="Mvc\NotChildAction.cs" />
+    <Compile Include="Mvc\UmbracoAuthorizedController.cs" />
+    <Compile Include="Mvc\UmbracoController.cs" />
+    <Compile Include="Mvc\UmbracoControllerFactory.cs" />
+    <Compile Include="Mvc\UmbracoMvcHandler.cs" />
+    <Compile Include="Mvc\UmbracoViewPageOfTModel.cs" />
+    <Compile Include="PublishedCache\IPublishedCache.cs" />
+    <Compile Include="PublishedCache\IPublishedContentCache.cs" />
+    <Compile Include="PublishedCache\IPublishedMediaCache.cs" />
+    <Compile Include="PublishedContentExtensions.cs" />
+    <Compile Include="ExamineExtensions.cs" />
+    <Compile Include="FormlessPage.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HtmlHelperRenderExtensions.cs" />
+    <Compile Include="Scheduling\Scheduler.cs" />
+    <Compile Include="Media\EmbedProviders\AbstractOEmbedProvider.cs" />
+    <Compile Include="Media\EmbedProviders\AbstractProvider.cs" />
+    <Compile Include="Media\EmbedProviders\OEmbedRich.cs" />
+    <Compile Include="Media\EmbedProviders\OEmbedVideo.cs" />
+    <Compile Include="Media\EmbedProviders\Settings\Dictionary.cs" />
+    <Compile Include="Media\EmbedProviders\Settings\String.cs" />
+    <Compile Include="Media\EmbedProviders\Twitgoo.cs" />
+    <Compile Include="ModelStateExtensions.cs" />
+    <Compile Include="Mvc\HtmlTagWrapper.cs" />
+    <Compile Include="Mvc\HtmlTagWrapperTextNode.cs" />
+    <Compile Include="Mvc\IHtmlTagWrapper.cs" />
+    <Compile Include="Mvc\MergeModelStateToChildActionAttribute.cs" />
+    <Compile Include="Mvc\PluginController.cs" />
+    <Compile Include="Mvc\PluginViewEngine.cs" />
+    <Compile Include="Mvc\PostedDataProxyInfo.cs" />
+    <Compile Include="Mvc\RedirectToUmbracoPageResult.cs" />
+    <Compile Include="Mvc\Strings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Strings.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Mvc\SurfaceController.cs" />
+    <Compile Include="Mvc\PluginControllerArea.cs" />
+    <Compile Include="Mvc\PluginControllerAttribute.cs" />
+    <Compile Include="Mvc\SurfaceControllerFactory.cs" />
+    <Compile Include="Mvc\PluginControllerMetadata.cs" />
+    <Compile Include="Mvc\UmbracoPageResult.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\RteMacroRenderingValueConverter.cs" />
+    <Compile Include="RenderFieldCaseType.cs" />
+    <Compile Include="RenderFieldEncodingType.cs" />
+    <Compile Include="RouteCollectionExtensions.cs" />
+    <Compile Include="Routing\AliasUrlProvider.cs" />
+    <Compile Include="Routing\ContentFinderByLegacy404.cs" />
+    <Compile Include="Routing\ContentFinderByNotFoundHandler.cs" />
+    <Compile Include="Routing\ContentFinderByPageIdQuery.cs" />
+    <Compile Include="Mvc\SurfaceControllerResolver.cs" />
+    <Compile Include="Routing\ContentFinderByNotFoundHandlers.cs" />
+    <Compile Include="Routing\ISiteDomainHelper.cs" />
+    <Compile Include="Routing\RoutableAttemptEventArgs.cs" />
+    <Compile Include="Routing\DefaultUrlProvider.cs" />
+    <Compile Include="Routing\DomainAndUri.cs" />
+    <Compile Include="Routing\IUrlProvider.cs" />
+    <Compile Include="Routing\SiteDomainHelper.cs" />
+    <Compile Include="Routing\SiteDomainHelperResolver.cs" />
+    <Compile Include="Routing\UrlProviderResolver.cs" />
+    <Compile Include="Routing\NotFoundHandlerHelper.cs" />
+    <Compile Include="Routing\EnsureRoutableOutcome.cs" />
+    <Compile Include="Security\LegacyDefaultAppMapping.cs" />
+    <Compile Include="Routing\PublishedContentRequestEngine.cs" />
+    <Compile Include="Routing\UrlProvider.cs" />
+    <Compile Include="Routing\WebServicesRouteConstraint.cs" />
+    <Compile Include="Search\ExamineSearcherModel.cs" />
+    <Compile Include="Search\ExamineEvents.cs" />
+    <Compile Include="Strategies\DataTypes\LegacyUploadFieldWorkaround.cs" />
+    <Compile Include="Strategies\Migrations\PublishAfterUpgradeToVersionSixth.cs" />
+    <Compile Include="Strategies\LegacyClasses.cs" />
+    <Compile Include="Strategies\Migrations\EnsureAppsTreesUpdatedOnUpgrade.cs" />
+    <Compile Include="Strategies\ServerRegistrationEventHandler.cs" />
+    <Compile Include="Templates\TemplateRenderer.cs" />
+    <Compile Include="Templates\TemplateUtilities.cs" />
+    <Compile Include="Trees\PartialViewMacrosTreeController.cs" />
+    <Compile Include="Trees\PartialViewsTreeController.cs" />
+    <Compile Include="UI\Controls\InsertMacroSplitButton.cs" />
+    <Compile Include="UI\IAssignedApp.cs" />
+    <Compile Include="UI\LegacyDialogHandler.cs" />
+    <Compile Include="UI\LegacyDialogTask.cs" />
+    <Compile Include="UI\Controls\ProgressBar.cs" />
+    <Compile Include="UI\Controls\UmbracoControl.cs" />
+    <Compile Include="UI\Controls\UmbracoUserControl.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="UI\Pages\BasePage.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="UI\Pages\ClientTools.cs" />
+    <Compile Include="UI\Pages\UmbracoEnsuredPage.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="UI\SpeechBubbleIcon.cs" />
+    <Compile Include="umbraco.presentation\AttributeCollectionAdapter.cs" />
+    <Compile Include="umbraco.presentation\Default.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\MacroCacheContent.cs" />
+    <Compile Include="umbraco.presentation\ScriptingMacroResult.cs" />
+    <Compile Include="umbraco.presentation\umbraco\dialogs\sort.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\macroResultWrapper.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\masterpages\default.Master.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\publishStatus.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\Default.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\tree.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\ping.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\Macros\editMacro.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\Python\editPython.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\editXslt.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\editMacro.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\umbracoField.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\treePicker.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\masterpages\umbracoPage.master.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\masterpages\umbracoDialog.master.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\nodeFactory\UmbracoSiteMapProviderAccessUpdate.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Search\QuickSearch.ascx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\settings\modals\ShowUmbracoTags.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\templateControls\Image.cs" />
+    <Compile Include="umbraco.presentation\umbraco\uQuery\IGetProperty.cs" />
+    <Compile Include="umbraco.presentation\XsltExtensionAttribute.cs" />
+    <Compile Include="UmbracoHelper.cs" />
+    <Compile Include="Mvc\ViewContextExtensions.cs" />
+    <Compile Include="Mvc\ViewDataContainerExtensions.cs" />
+    <Compile Include="PublishedCache\XmlPublishedCache\PublishedContentCache.cs" />
+    <Compile Include="Routing\PublishedContentNotFoundHandler.cs" />
+    <Compile Include="PublishedCache\XmlPublishedCache\XmlPublishedContent.cs" />
+    <Compile Include="PublishedCache\XmlPublishedCache\XmlPublishedProperty.cs" />
+    <Compile Include="Mvc\Constants.cs" />
+    <Compile Include="Mvc\FilteredControllerFactoriesResolver.cs" />
+    <Compile Include="Mvc\IFilteredControllerFactory.cs" />
+    <Compile Include="Mvc\MasterControllerFactory.cs" />
+    <Compile Include="Mvc\RenderActionInvoker.cs" />
+    <Compile Include="Mvc\RenderControllerFactory.cs" />
+    <Compile Include="Models\RenderModel.cs" />
+    <Compile Include="Mvc\RenderModelBinder.cs" />
+    <Compile Include="Mvc\RenderMvcController.cs" />
+    <Compile Include="Mvc\RenderRouteHandler.cs" />
+    <Compile Include="Mvc\RenderViewEngine.cs" />
+    <Compile Include="Mvc\UmbracoTemplatePage.cs" />
+    <Compile Include="Mvc\RouteDefinition.cs" />
+    <Compile Include="Mvc\RouteValueDictionaryExtensions.cs" />
+    <Compile Include="umbraco.presentation\umbraco\nodeFactory\Node.cs" />
+    <Compile Include="umbraco.presentation\umbraco\nodeFactory\Nodes.cs" />
+    <Compile Include="umbraco.presentation\umbraco\nodeFactory\Property.cs" />
+    <Compile Include="Routing\UmbracoRequestEventArgs.cs" />
+    <Compile Include="UmbracoUserControl.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="WebApi\UmbracoAuthorizeAttribute.cs" />
+    <Compile Include="WebApi\UmbracoAuthorizedApiController.cs" />
+    <Compile Include="WebApi\Filters\ValidationFilterAttribute.cs" />
+    <Compile Include="WebApi\Filters\UmbracoUserTimeoutFilterAttribute.cs" />
+    <Compile Include="WebApi\UnhandedExceptionLoggerConfigurationAttribute.cs" />
+    <Compile Include="WebApi\UnhandledExceptionLogger.cs" />
+    <Compile Include="WebApi\WebApiHelper.cs" />
+    <Compile Include="WebBootManager.cs" />
+    <Compile Include="Routing\LegacyRequestInitializer.cs" />
+    <Compile Include="Mvc\ControllerExtensions.cs" />
+    <Compile Include="Routing\ContentLastChanceFinderResolver.cs" />
+    <Compile Include="Routing\ContentFinderByUrlAlias.cs" />
+    <Compile Include="Media\ThumbnailProviders\AbstractThumbnailProvider.cs" />
+    <Compile Include="Media\ThumbnailProviders\MediaTypeIconThumbnailProvider.cs" />
+    <Compile Include="Media\ThumbnailProviders\FileExtensionIconThumbnailProvider.cs" />
+    <Compile Include="Media\ThumbnailProviders\ImageThumbnailProvider.cs" />
+    <Compile Include="Media\ThumbnailProviders\ThumbnailProvidersResolver.cs" />
+    <Compile Include="UI\Controls\FolderBrowser.cs" />
+    <Compile Include="Routing\ContentFinderByIdPath.cs" />
+    <Compile Include="Routing\ContentFinderByNiceUrl.cs" />
+    <Compile Include="Routing\ContentFinderByNiceUrlAndTemplate.cs" />
+    <Compile Include="Routing\ContentFinderByProfile.cs" />
+    <Compile Include="PluginManagerExtensions.cs" />
+    <Compile Include="Routing\DomainHelper.cs" />
+    <Compile Include="Routing\ContentFinderResolver.cs" />
+    <Compile Include="Routing\PublishedContentRequest.cs" />
+    <Compile Include="Routing\IContentFinder.cs" />
+    <Compile Include="Routing\RoutingContext.cs" />
+    <Compile Include="umbraco.presentation\EnsureSystemPathsApplicationStartupHandler.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\BasePageExtensions.cs" />
+    <Compile Include="umbraco.presentation\content.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\helper.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\item.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\keepAliveService.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\library.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\macro.cs" />
+    <Compile Include="umbraco.presentation\page.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\Settings1.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <DependentUpon>Settings.settings</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\publishingService.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\PublishQueue.cs" />
+    <Compile Include="umbraco.presentation\python.cs" />
+    <Compile Include="umbraco.presentation\NotFoundHandlers.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\requestModule.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\showField.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\template.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\UmbracoContext.cs" />
+    <Compile Include="umbraco.presentation\UmbracoPage.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbracoPageHolder.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\UmbracoRequest.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\UmbracoResponse.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\UmbracoServerUtility.cs" />
+    <Compile Include="umbraco.presentation\umbraco\actions\delete.aspx.cs">
+      <DependentUpon>delete.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\actions\delete.aspx.designer.cs">
+      <DependentUpon>delete.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\actions\editContent.aspx.cs">
+      <DependentUpon>editContent.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\actions\editContent.aspx.designer.cs">
+      <DependentUpon>editContent.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\actions\preview.aspx.cs">
+      <DependentUpon>preview.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\actions\preview.aspx.designer.cs">
+      <DependentUpon>preview.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\actions\publish.aspx.cs">
+      <DependentUpon>publish.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\actions\publish.aspx.designer.cs">
+      <DependentUpon>publish.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\controls\ContentControl.cs" />
+    <Compile Include="umbraco.presentation\umbraco\controls\ContentPicker.cs" />
+    <Compile Include="umbraco.presentation\umbraco\controls\ContentTypeControl.cs" />
+    <Compile Include="umbraco.presentation\umbraco\controls\Images\ImageViewer.ascx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\controls\dualSelectBox.cs" />
+    <Compile Include="umbraco.presentation\umbraco\controls\GenericValidation.cs" />
+    <Compile Include="umbraco.presentation\umbraco\controls\LabelButton.cs" />
+    <Compile Include="umbraco.presentation\umbraco\controls\macroParameterControl.cs" />
+    <Compile Include="umbraco.presentation\umbraco\controls\ProgressBar.ascx.cs">
+      <DependentUpon>ProgressBar.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\controls\ProgressBar.ascx.designer.cs">
+      <DependentUpon>ProgressBar.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\controls\SaveClickEventArgs.cs" />
+    <Compile Include="umbraco.presentation\umbraco\controls\Tree\CustomTreeControl.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\controls\Tree\CustomTreeService.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\controls\Tree\JTreeContextMenu.cs" />
+    <Compile Include="umbraco.presentation\umbraco\controls\Tree\JTreeContextMenuItem.cs" />
+    <Compile Include="umbraco.presentation\umbraco\controls\Tree\NodeInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\create\CreatedPackageTasks.cs" />
+    <Compile Include="umbraco.presentation\umbraco\create\dictionaryTasks.cs" />
+    <Compile Include="umbraco.presentation\umbraco\create\macroTasks.cs" />
+    <Compile Include="umbraco.presentation\umbraco\create\MemberGroupTasks.cs" />
+    <Compile Include="umbraco.presentation\umbraco\create\stylesheetPropertyTasks.cs" />
+    <Compile Include="umbraco.presentation\umbraco\create\StylesheetTasks.cs" />
+    <Compile Include="umbraco.presentation\umbraco\create\XsltTasks.cs" />
+    <Compile Include="umbraco.presentation\umbraco\dashboard\FeedProxy.aspx.cs">
+      <DependentUpon>FeedProxy.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dashboard\FeedProxy.aspx.designer.cs">
+      <DependentUpon>FeedProxy.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\EditRelationType.aspx.cs">
+      <DependentUpon>EditRelationType.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\EditRelationType.aspx.designer.cs">
+      <DependentUpon>EditRelationType.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\NewRelationType.aspx.cs">
+      <DependentUpon>NewRelationType.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\NewRelationType.aspx.designer.cs">
+      <DependentUpon>NewRelationType.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\ReadOnlyRelation.cs" />
+    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\RelationTypesWebService.asmx.cs">
+      <DependentUpon>RelationTypesWebService.asmx</DependentUpon>
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\TreeMenu\ActionDeleteRelationType.cs" />
+    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\TreeMenu\ActionNewRelationType.cs" />
+    <Compile Include="umbraco.presentation\umbraco\dialogs\Preview.aspx.cs">
+      <DependentUpon>Preview.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\Preview.aspx.designer.cs">
+      <DependentUpon>Preview.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\members\MemberSearch.ascx.cs">
+      <DependentUpon>MemberSearch.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\members\MemberSearch.ascx.designer.cs">
+      <DependentUpon>MemberSearch.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\nodeFactory\Page_Legacy.cs" />
+    <Compile Include="umbraco.presentation\umbraco\preview\PreviewContent.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Search\ExamineEvents.cs" />
+    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltVisualize.aspx.cs">
+      <DependentUpon>xsltVisualize.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltVisualize.aspx.designer.cs">
+      <DependentUpon>xsltVisualize.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\insertMasterpageContent.aspx.cs">
+      <DependentUpon>insertMasterpageContent.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\insertMasterpageContent.aspx.designer.cs">
+      <DependentUpon>insertMasterpageContent.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\insertMasterpagePlaceholder.aspx.cs">
+      <DependentUpon>insertMasterpagePlaceholder.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\insertMasterpagePlaceholder.aspx.designer.cs">
+      <DependentUpon>insertMasterpagePlaceholder.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\republish.aspx.cs">
+      <DependentUpon>republish.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\republish.aspx.designer.cs">
+      <DependentUpon>republish.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\search.aspx.cs">
+      <DependentUpon>search.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\search.aspx.designer.cs">
+      <DependentUpon>search.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\SendPublish.aspx.cs">
+      <DependentUpon>SendPublish.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\SendPublish.aspx.designer.cs">
+      <DependentUpon>SendPublish.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\create\dialogHandler_temp.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\create\languageTasks.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\Macros\assemblyBrowser.aspx.cs">
+      <DependentUpon>assemblyBrowser.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\Macros\assemblyBrowser.aspx.designer.cs">
+      <DependentUpon>assemblyBrowser.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\Packages\editPackage.aspx.cs">
+      <DependentUpon>editPackage.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\Packages\editPackage.aspx.designer.cs">
+      <DependentUpon>editPackage.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\getXsltStatus.asmx.cs">
+      <DependentUpon>getXsltStatus.asmx</DependentUpon>
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltChooseExtension.aspx.cs">
+      <DependentUpon>xsltChooseExtension.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltChooseExtension.aspx.designer.cs">
+      <DependentUpon>xsltChooseExtension.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltInsertValueOf.aspx.cs">
+      <DependentUpon>xsltInsertValueOf.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltInsertValueOf.aspx.designer.cs">
+      <DependentUpon>xsltInsertValueOf.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\exportDocumenttype.aspx.cs">
+      <DependentUpon>exportDocumenttype.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\importDocumenttype.aspx.cs">
+      <DependentUpon>importDocumenttype.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\rollBack.aspx.cs">
+      <DependentUpon>rollBack.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\rollBack.aspx.designer.cs">
+      <DependentUpon>rollBack.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\sendToTranslation.aspx.cs">
+      <DependentUpon>sendToTranslation.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\sendToTranslation.aspx.designer.cs">
+      <DependentUpon>sendToTranslation.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\viewAuditTrail.aspx.cs">
+      <DependentUpon>viewAuditTrail.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\viewAuditTrail.aspx.designer.cs">
+      <DependentUpon>viewAuditTrail.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\members\EditMemberGroup.aspx.cs">
+      <DependentUpon>EditMemberGroup.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\members\EditMemberGroup.aspx.designer.cs">
+      <DependentUpon>EditMemberGroup.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\members\search.aspx.cs">
+      <DependentUpon>search.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\members\search.aspx.designer.cs">
+      <DependentUpon>search.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\members\ViewMembers.aspx.cs">
+      <DependentUpon>ViewMembers.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\members\ViewMembers.aspx.designer.cs">
+      <DependentUpon>ViewMembers.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\nodeFactory\Properties.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\nodeFactory\UmbracoSiteMapProvider.cs" />
+    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\GzipCompressor.cs" />
+    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\GzipModule.cs" />
+    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\IModule.cs" />
+    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\JSON.cs" />
+    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\JSONReader.cs" />
+    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\JSONWriter.cs" />
+    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\tinymce3tinymceCompress.aspx.cs">
+      <DependentUpon>tinymce3tinymceCompress.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\tinymce3tinymceCompress.aspx.designer.cs">
+      <DependentUpon>tinymce3tinymceCompress.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\Search\QuickSearchHandler.ashx.cs">
+      <DependentUpon>QuickSearchHandler.ashx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\settings\DictionaryItemList.aspx.cs">
+      <DependentUpon>DictionaryItemList.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\settings\DictionaryItemList.aspx.designer.cs">
+      <DependentUpon>DictionaryItemList.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\settings\editLanguage.aspx.cs">
+      <DependentUpon>editLanguage.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\settings\editLanguage.aspx.designer.cs">
+      <DependentUpon>editLanguage.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\templateControls\Script.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\BaseMediaTree.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadDLRScripts.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\ITreeService.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadRelationTypes.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\MediaRecycleBin.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\NodeActionsEventArgs.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\TreeEventArgs.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\TreeRequestParams.cs" />
+    <Compile Include="umbraco.presentation\umbraco\uQuery\ContentExtensions.cs" />
+    <Compile Include="umbraco.presentation\umbraco\uQuery\ContentTypeExtensions.cs" />
+    <Compile Include="umbraco.presentation\umbraco\uQuery\DocumentExtensions.cs" />
+    <Compile Include="umbraco.presentation\umbraco\uQuery\MediaExtensions.cs" />
+    <Compile Include="umbraco.presentation\umbraco\uQuery\MemberExtensions.cs" />
+    <Compile Include="umbraco.presentation\umbraco\uQuery\NodeExtensions.cs" />
+    <Compile Include="umbraco.presentation\umbraco\uQuery\PreValueExtensions.cs" />
+    <Compile Include="umbraco.presentation\umbraco\uQuery\RelationTypeExtensions.cs" />
+    <Compile Include="umbraco.presentation\umbraco\uQuery\UmbracoObjectTypeExtensions.cs" />
+    <Compile Include="umbraco.presentation\umbraco\webservices\MacroContainerService.asmx.cs">
+      <DependentUpon>MacroContainerService.asmx</DependentUpon>
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\webservices\TagsAutoCompleteHandler.ashx.cs">
+      <DependentUpon>TagsAutoCompleteHandler.ashx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\webservices\TreeClientService.asmx.cs">
+      <DependentUpon>TreeClientService.asmx</DependentUpon>
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\templateControls\DisableEventValidation.cs" />
+    <Compile Include="umbraco.presentation\umbraco\templateControls\Item.cs" />
+    <Compile Include="umbraco.presentation\umbraco\templateControls\ItemRenderer.cs" />
+    <Compile Include="umbraco.presentation\umbraco\templateControls\Macro.cs" />
+    <Compile Include="umbraco.presentation\umbraco\templateControls\ContentType.cs" />
+    <Compile Include="umbraco.presentation\umbraco\templateControls\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\translation\default.aspx.cs">
+      <DependentUpon>default.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\translation\default.aspx.designer.cs">
+      <DependentUpon>default.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\translation\details.aspx.cs">
+      <DependentUpon>details.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\translation\details.aspx.designer.cs">
+      <DependentUpon>details.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\translation\preview.aspx.cs">
+      <DependentUpon>preview.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\translation\preview.aspx.designer.cs">
+      <DependentUpon>preview.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\translation\xml.aspx.cs">
+      <DependentUpon>xml.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\translation\xml.aspx.designer.cs">
+      <DependentUpon>xml.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\treeInit.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\Trees\BaseContentTree.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\BaseTree.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\ContentRecycleBin.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\FileSystemTree.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadContent.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadcontentItemType.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadDataTypes.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadLanguages.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadMacros.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadMedia.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadMediaTypes.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadMemberGroups.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadMembers.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadMemberTypes.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadNodeTypes.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadPython.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadScripts.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadStylesheetProperty.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadStylesheets.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadTemplates.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadTranslationTasks.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadUsers.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadXslt.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\NullTree.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\LegacyTree.cs" />
+    <Compile Include="umbraco.presentation\umbraco\webservices\TreeDataService.ashx.cs">
+      <DependentUpon>TreeDataService.ashx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\Trees\TreeDefinitionCollection.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\TreeDefinition.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\TreeDialogModes.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\TreeService.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\XmlTree.cs">
+      <DependentUpon>XmlTree.xsd</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\urlRewriter\UrlRewriterFormWriter.cs" />
+    <Compile Include="umbraco.presentation\umbraco\webservices\ajaxHelpers.cs" />
+    <Compile Include="umbraco.presentation\umbraco\webservices\CacheRefresher.asmx.cs">
+      <DependentUpon>CacheRefresher.asmx</DependentUpon>
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\webservices\CheckForUpgrade.asmx.cs">
+      <DependentUpon>CheckForUpgrade.asmx</DependentUpon>
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\webservices\CMSNode.asmx.cs">
+      <DependentUpon>CMSNode.asmx</DependentUpon>
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\webservices\codeEditorSave.asmx.cs">
+      <DependentUpon>codeEditorSave.asmx</DependentUpon>
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\webservices\legacyAjaxCalls.asmx.cs">
+      <DependentUpon>legacyAjaxCalls.asmx</DependentUpon>
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\webservices\nodeSorter.asmx.cs">
+      <DependentUpon>nodeSorter.asmx</DependentUpon>
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\webservices\progressStatus.asmx.cs">
+      <DependentUpon>progressStatus.asmx</DependentUpon>
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\webservices\publication.asmx.cs">
+      <DependentUpon>publication.asmx</DependentUpon>
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\webservices\RegexComWebservice.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Web\UI\ContentPage.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery.cs" />
+    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Content.cs">
+      <DependentUpon>uQuery.cs</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-DataTypes.cs">
+      <DependentUpon>uQuery.cs</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Dictionary.cs">
+      <DependentUpon>uQuery.cs</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Document.cs">
+      <DependentUpon>uQuery.cs</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Media.cs">
+      <DependentUpon>uQuery.cs</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Members.cs">
+      <DependentUpon>uQuery.cs</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Nodes.cs">
+      <DependentUpon>uQuery.cs</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-PreValues.cs">
+      <DependentUpon>uQuery.cs</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-UmbracoObjectType.cs">
+      <DependentUpon>uQuery.cs</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\viewstateMoverModule.cs" />
+    <Compile Include="UmbracoApplication.cs" />
+    <Compile Include="UmbracoContext.cs" />
+    <Compile Include="UmbracoModule.cs" />
+    <Compile Include="UriUtility.cs" />
+    <Compile Include="Web References\org.umbraco.update\Reference.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Reference.map</DependentUpon>
+    </Compile>
+    <Compile Include="WebServices\BulkPublishController.cs" />
+    <Compile Include="WebServices\CoreStringsController.cs" />
+    <Compile Include="WebServices\DomainsApiController.cs" />
+    <Compile Include="WebServices\EmbedMediaService.cs" />
+    <Compile Include="WebServices\ExamineManagementApiController.cs" />
+    <Compile Include="WebServices\FolderBrowserService.cs" />
+    <Compile Include="WebServices\UmbracoAuthorizedHttpHandler.cs" />
+    <Compile Include="WebServices\SaveFileController.cs" />
+    <Compile Include="WebServices\UmbracoAuthorizedWebService.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="WebServices\UmbracoHttpHandler.cs" />
+    <Compile Include="WebServices\UmbracoWebService.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="WebServices\XmlDataIntegrityController.cs" />
+    <Compile Include="WebViewPageExtensions.cs" />
+    <None Include="..\Umbraco.Web.UI\Views\web.config">
+      <Link>Mvc\web.config</Link>
+    </None>
+    <None Include="packages.config" />
+    <None Include="Web References\org.umbraco.our\Reference.map">
+      <Generator>MSDiscoCodeGenerator</Generator>
+      <LastGenOutput>Reference.cs</LastGenOutput>
+    </None>
+    <None Include="Web References\org.umbraco.our\repository.disco" />
+    <EmbeddedResource Include="UI\JavaScript\Main.js" />
+    <EmbeddedResource Include="UI\JavaScript\JsInitialize.js" />
+    <EmbeddedResource Include="UI\JavaScript\ServerVariables.js" />
+    <Content Include="umbraco.presentation\umbraco\controls\Tree\CustomTreeService.asmx" />
+    <Content Include="umbraco.presentation\umbraco\developer\RelationTypes\EditRelationType.aspx" />
+    <Content Include="umbraco.presentation\umbraco\developer\RelationTypes\NewRelationType.aspx" />
+    <Content Include="umbraco.presentation\umbraco\developer\RelationTypes\RelationTypesWebService.asmx" />
+    <Content Include="umbraco.presentation\umbraco\dashboard\FeedProxy.aspx" />
+    <Content Include="umbraco.presentation\umbraco\dialogs\AssignDomain2.aspx">
+      <SubType>ASPXCodeBehind</SubType>
+    </Content>
+    <Content Include="umbraco.presentation\umbraco\members\MemberSearch.ascx">
+      <SubType>ASPXCodeBehind</SubType>
+    </Content>
+    <Content Include="umbraco.presentation\umbraco\dialogs\Preview.aspx" />
+    <Content Include="umbraco.presentation\umbraco\controls\ProgressBar.ascx">
+      <SubType>ASPXCodeBehind</SubType>
+    </Content>
+    <Content Include="umbraco.presentation\umbraco\actions\delete.aspx" />
+    <Content Include="umbraco.presentation\umbraco\actions\editContent.aspx" />
+    <Content Include="umbraco.presentation\umbraco\actions\preview.aspx">
+      <SubType>ASPXCodeBehind</SubType>
+    </Content>
+    <Content Include="umbraco.presentation\umbraco\actions\publish.aspx">
+      <SubType>ASPXCodeBehind</SubType>
+    </Content>
+    <Content Include="umbraco.presentation\umbraco\webservices\MacroContainerService.asmx" />
+    <Content Include="umbraco.presentation\umbraco\developer\Xslt\xsltVisualize.aspx" />
+    <Content Include="umbraco.presentation\umbraco\dialogs\empty.htm" />
+    <Content Include="umbraco.presentation\umbraco\dialogs\republish.aspx">
+      <SubType>ASPXCodeBehind</SubType>
+    </Content>
+    <Content Include="umbraco.presentation\umbraco\dialogs\search.aspx" />
+    <Content Include="umbraco.presentation\umbraco\dialogs\SendPublish.aspx" />
+    <Content Include="umbraco.presentation\umbraco\webservices\TreeClientService.asmx" />
+    <Content Include="umbraco.presentation\umbraco\members\search.aspx" />
+    <Content Include="umbraco.presentation\umbraco\translation\details.aspx" />
+    <Content Include="umbraco.presentation\umbraco\developer\Packages\editPackage.aspx">
+      <SubType>ASPXCodeBehind</SubType>
+    </Content>
+    <Content Include="umbraco.presentation\umbraco\dialogs\exportDocumenttype.aspx" />
+    <Content Include="umbraco.presentation\umbraco\dialogs\importDocumenttype.aspx" />
+    <Content Include="umbraco.presentation\umbraco\dialogs\rollBack.aspx">
+      <SubType>ASPXCodeBehind</SubType>
+    </Content>
+    <Content Include="umbraco.presentation\umbraco\dialogs\sendToTranslation.aspx" />
+    <Content Include="umbraco.presentation\umbraco\dialogs\viewAuditTrail.aspx" />
+    <Content Include="umbraco.presentation\umbraco\members\ViewMembers.aspx" />
+    <Content Include="umbraco.presentation\umbraco\plugins\tinymce3\tinymce3tinymceCompress.aspx" />
+    <None Include="app.config" />
+    <None Include="Web References\org.umbraco.our\repository.wsdl" />
+    <None Include="Web References\org.umbraco.update\UpgradeResult.datasource">
+      <DependentUpon>Reference.map</DependentUpon>
+    </None>
+    <None Include="Web References\org.umbraco.update\UpgradeResult1.datasource">
+      <DependentUpon>Reference.map</DependentUpon>
+    </None>
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings1.Designer.cs</LastGenOutput>
+    </None>
+    <Content Include="umbraco.presentation\umbraco\Search\QuickSearchHandler.ashx" />
+    <None Include="umbraco.presentation\umbraco\templateControls\InlineXslt.xsltTemplate" />
+    <Content Include="umbraco.presentation\umbraco\webservices\CheckForUpgrade.asmx" />
+    <Content Include="umbraco.presentation\umbraco\settings\DictionaryItemList.aspx">
+      <SubType>ASPXCodeBehind</SubType>
+    </Content>
+    <Content Include="umbraco.presentation\umbraco\translation\default.aspx" />
+    <Content Include="umbraco.presentation\umbraco\translation\preview.aspx" />
+    <Content Include="umbraco.presentation\umbraco\translation\xml.aspx" />
+    <Content Include="umbraco.presentation\umbraco\developer\Macros\assemblyBrowser.aspx" />
+    <Content Include="umbraco.presentation\umbraco\developer\Xslt\getXsltStatus.asmx" />
+    <Content Include="umbraco.presentation\umbraco\developer\Xslt\xsltChooseExtension.aspx" />
+    <Content Include="umbraco.presentation\umbraco\developer\Xslt\xsltInsertValueOf.aspx" />
+    <Content Include="umbraco.presentation\umbraco\members\EditMemberGroup.aspx">
+      <SubType>Form</SubType>
+    </Content>
+    <Content Include="umbraco.presentation\umbraco\schemas\umbraco.xsd">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="umbraco.presentation\umbraco\settings\editLanguage.aspx" />
+    <!--<Content Include="umbraco.presentation\umbraco\users\PermissionEditor.aspx" />-->
+    <Content Include="umbraco.presentation\umbraco\webservices\CacheRefresher.asmx">
+      <SubType>Form</SubType>
+    </Content>
+    <Content Include="umbraco.presentation\umbraco\webservices\CMSNode.asmx" />
+    <Content Include="umbraco.presentation\umbraco\webservices\codeEditorSave.asmx" />
+    <Content Include="umbraco.presentation\umbraco\webservices\legacyAjaxCalls.asmx" />
+    <Content Include="umbraco.presentation\umbraco\webservices\nodeSorter.asmx" />
+    <Content Include="umbraco.presentation\umbraco\webservices\progressStatus.asmx">
+      <SubType>Form</SubType>
+    </Content>
+    <Content Include="umbraco.presentation\umbraco\webservices\publication.asmx" />
+    <Content Include="umbraco.presentation\umbraco\webservices\TreeDataService.ashx" />
+    <None Include="umbraco.presentation\umbraco\Trees\Trees.cd" />
+    <None Include="umbraco.presentation\umbraco\Trees\XmlTree.xsd">
+      <SubType>
+      </SubType>
+    </None>
+    <None Include="umbraco.presentation\umbraco\Trees\XmlTree.xsx">
+      <DependentUpon>XmlTree.xsd</DependentUpon>
+    </None>
+    <Content Include="umbraco.presentation\umbraco\webservices\TagsAutoCompleteHandler.ashx" />
+    <None Include="Web References\org.umbraco.update\checkforupgrade.disco" />
+    <None Include="Web References\org.umbraco.update\checkforupgrade.wsdl" />
+    <None Include="Web References\org.umbraco.update\Reference.map">
+      <Generator>MSDiscoCodeGenerator</Generator>
+      <LastGenOutput>Reference.cs</LastGenOutput>
+    </None>
+    <EmbeddedResource Include="UI\JavaScript\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Mvc\Strings.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Strings.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Include="umbraco.presentation\umbraco\templateControls\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <None Include="umbraco.presentation\umbraco\schemas\package.xsd">
+      <SubType>
+      </SubType>
+    </None>
+    <None Include="umbraco.presentation\umbraco\schemas\package.xsx">
+      <DependentUpon>package.xsd</DependentUpon>
+    </None>
+    <None Include="umbraco.presentation\umbraco\schemas\umbraco.xsc">
+      <DependentUpon>umbraco.xsd</DependentUpon>
+    </None>
+    <None Include="umbraco.presentation\umbraco\schemas\umbraco.xss">
+      <DependentUpon>umbraco.xsd</DependentUpon>
+    </None>
+    <None Include="umbraco.presentation\umbraco\schemas\umbraco.xsx">
+      <DependentUpon>umbraco.xsd</DependentUpon>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <WebReferences Include="Web References\" />
+  </ItemGroup>
+  <ItemGroup>
+    <WebReferenceUrl Include="https://our.umbraco.com/umbraco/webservices/api/repository.asmx">
+      <UrlBehavior>Dynamic</UrlBehavior>
+      <RelPath>Web References\org.umbraco.our\</RelPath>
+      <UpdateFromURL>https://our.umbraco.com/umbraco/webservices/api/repository.asmx</UpdateFromURL>
+      <ServiceLocationURL>
+      </ServiceLocationURL>
+      <CachedDynamicPropName>
+      </CachedDynamicPropName>
+      <CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
+      <CachedSettingsPropName>umbraco_org_umbraco_our_Repository</CachedSettingsPropName>
+    </WebReferenceUrl>
+    <WebReferenceUrl Include="http://update.umbraco.org/checkforupgrade.asmx">
+      <UrlBehavior>Dynamic</UrlBehavior>
+      <RelPath>Web References\org.umbraco.update\</RelPath>
+      <UpdateFromURL>http://update.umbraco.org/checkforupgrade.asmx</UpdateFromURL>
+      <ServiceLocationURL>
+      </ServiceLocationURL>
+      <CachedDynamicPropName>
+      </CachedDynamicPropName>
+      <CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
+      <CachedSettingsPropName>umbraco_org_umbraco_update_CheckForUpgrade</CachedSettingsPropName>
+    </WebReferenceUrl>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="umbraco.presentation\umbraco\settings\scripts\" />
+  </ItemGroup>
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
+    <VSToolsPath Condition="exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v11.0\WebApplications\Microsoft.WebApplication.targets')">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v11.0</VSToolsPath>
+    <VSToolsPath Condition="exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v12.0\WebApplications\Microsoft.WebApplication.targets')">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v12.0</VSToolsPath>
+    <VSToolsPath Condition="exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v14.0\WebApplications\Microsoft.WebApplication.targets')">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v14.0</VSToolsPath>
+    <VSToolsPath Condition="exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets')">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0</VSToolsPath>
+  </PropertyGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
+  <ProjectExtensions />
+  <PropertyGroup>
+    <!--<PostBuildEvent>xcopy "$(ProjectDir)..\..\lib\*.dll" "$(TargetDir)*.dll" /Y</PostBuildEvent>-->
+  </PropertyGroup>
+  <Import Project="..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets" Condition="Exists('..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets')" />
 </Project>
\ No newline at end of file
diff --git a/src/Umbraco.Web/WebServices/TagsController.cs b/src/Umbraco.Web/WebServices/TagsController.cs
deleted file mode 100644
index e314e0a609..0000000000
--- a/src/Umbraco.Web/WebServices/TagsController.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using AutoMapper;
-using Examine;
-using Umbraco.Core.Persistence.SqlSyntax;
-using Umbraco.Web.Models;
-using Umbraco.Web.WebApi;
-
-namespace Umbraco.Web.WebServices
-{
-    /// <summary>
-    /// A public web service for querying tags
-    /// </summary>
-    /// <remarks>
-    /// This controller does not contain methods to query for content, media or members based on tags, those methods would require
-    /// authentication and should not be exposed publicly.
-    /// </remarks>
-    public class TagsController : UmbracoApiController
-    {
-        /// <summary>
-        /// Get every tag stored in the database (with optional group)
-        /// </summary>
-        public IEnumerable<TagModel> GetAllTags(string group = null)
-        {
-            return Umbraco.TagQuery.GetAllTags(group);
-        }
-
-        /// <summary>
-        /// Get all tags for content items (with optional group)
-        /// </summary>
-        /// <param name="group"></param>
-        /// <returns></returns>
-        public IEnumerable<TagModel> GetAllContentTags(string group = null)
-        {
-            return Umbraco.TagQuery.GetAllContentTags(group);
-        }
-
-        /// <summary>
-        /// Get all tags for media items (with optional group)
-        /// </summary>
-        /// <param name="group"></param>
-        /// <returns></returns>
-        public IEnumerable<TagModel> GetAllMediaTags(string group = null)
-        {
-            return Umbraco.TagQuery.GetAllMediaTags(group);
-        }
-
-        /// <summary>
-        /// Get all tags for member items (with optional group)
-        /// </summary>
-        /// <param name="group"></param>
-        /// <returns></returns>
-        public IEnumerable<TagModel> GetAllMemberTags(string group = null)
-        {
-            return Umbraco.TagQuery.GetAllMemberTags(group);
-        }
-
-        /// <summary>
-        /// Returns all tags attached to a property by entity id
-        /// </summary>
-        /// <param name="contentId"></param>
-        /// <param name="propertyTypeAlias"></param>
-        /// <param name="tagGroup"></param>
-        /// <returns></returns>
-        public IEnumerable<TagModel> GetTagsForProperty(int contentId, string propertyTypeAlias, string tagGroup = null)
-        {
-            return Umbraco.TagQuery.GetTagsForProperty(contentId, propertyTypeAlias, tagGroup);
-        }
-
-        /// <summary>
-        /// Returns all tags attached to an entity (content, media or member) by entity id
-        /// </summary>
-        /// <param name="contentId"></param>
-        /// <param name="tagGroup"></param>
-        /// <returns></returns>
-        public IEnumerable<TagModel> GetTagsForEntity(int contentId, string tagGroup = null)
-        {
-            return Umbraco.TagQuery.GetTagsForEntity(contentId, tagGroup);
-        }
-
-    }
-}

From 5b7ae7150fecc1b665b306a5f3eab37958b7e433 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Tue, 2 Jul 2019 21:55:54 +0200
Subject: [PATCH 093/776] Fix weird merge

---
 src/Umbraco.Web/Umbraco.Web.csproj | 6074 +++++++++-------------------
 1 file changed, 2024 insertions(+), 4050 deletions(-)

diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index fc5ed8f8be..167c99b9b9 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -1,4053 +1,2027 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
-    <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-    <PropertyGroup>
-        <ProductVersion>9.0.30729</ProductVersion>
-        <SchemaVersion>2.0</SchemaVersion>
-        <ProjectGuid>{651E1350-91B6-44B7-BD60-7207006D7003}</ProjectGuid>
-        <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-        <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-        <ApplicationIcon>
-        </ApplicationIcon>
-        <AssemblyKeyContainerName>
-        </AssemblyKeyContainerName>
-        <AssemblyName>umbraco</AssemblyName>
-        <AssemblyOriginatorKeyFile>
-        </AssemblyOriginatorKeyFile>
-        <DefaultClientScript>JScript</DefaultClientScript>
-        <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-        <DefaultTargetSchema>IE50</DefaultTargetSchema>
-        <DelaySign>false</DelaySign>
-        <OutputType>Library</OutputType>
-        <RootNamespace>Umbraco.Web</RootNamespace>
-        <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-        <StartupObject>
-        </StartupObject>
-        <FileUpgradeFlags>
-        </FileUpgradeFlags>
-        <UpgradeBackupLocation>
-        </UpgradeBackupLocation>
-        <SccProjectName>
-        </SccProjectName>
-        <SccLocalPath>
-        </SccLocalPath>
-        <SccAuxPath>
-        </SccAuxPath>
-        <SccProvider>
-        </SccProvider>
-        <OldToolsVersion>4.0</OldToolsVersion>
-        <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-        <TargetFrameworkProfile />
-        <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-        <RestorePackages>true</RestorePackages>
-        <LangVersion>latest</LangVersion>
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-        <OutputPath>bin\Debug\</OutputPath>
-        <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-        <BaseAddress>285212672</BaseAddress>
-        <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-        <ConfigurationOverrideFile>
-        </ConfigurationOverrideFile>
-        <DefineConstants>DEBUG;TRACE</DefineConstants>
-        <DocumentationFile>
-        </DocumentationFile>
-        <DebugSymbols>true</DebugSymbols>
-        <FileAlignment>4096</FileAlignment>
-        <NoStdLib>false</NoStdLib>
-        <NoWarn>
-        </NoWarn>
-        <Optimize>false</Optimize>
-        <RegisterForComInterop>false</RegisterForComInterop>
-        <RemoveIntegerChecks>false</RemoveIntegerChecks>
-        <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-        <WarningLevel>4</WarningLevel>
-        <DebugType>full</DebugType>
-        <ErrorReport>prompt</ErrorReport>
-        <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-        <Prefer32Bit>false</Prefer32Bit>
-        <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-        <LangVersion>latest</LangVersion>
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-        <OutputPath>bin\Release\</OutputPath>
-        <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-        <BaseAddress>285212672</BaseAddress>
-        <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-        <ConfigurationOverrideFile>
-        </ConfigurationOverrideFile>
-        <DefineConstants>TRACE</DefineConstants>
-        <DocumentationFile>bin\Release\umbraco.xml</DocumentationFile>
-        <DebugSymbols>true</DebugSymbols>
-        <FileAlignment>4096</FileAlignment>
-        <NoStdLib>false</NoStdLib>
-        <NoWarn>
-        </NoWarn>
-        <Optimize>true</Optimize>
-        <RegisterForComInterop>false</RegisterForComInterop>
-        <RemoveIntegerChecks>false</RemoveIntegerChecks>
-        <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-        <WarningLevel>4</WarningLevel>
-        <DebugType>pdbonly</DebugType>
-        <ErrorReport>prompt</ErrorReport>
-        <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-        <Prefer32Bit>false</Prefer32Bit>
-        <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-    </PropertyGroup>
-    <ItemGroup>
-        <ProjectReference Include="..\UmbracoExamine\UmbracoExamine.csproj">
-            <Project>{07fbc26b-2927-4a22-8d96-d644c667fecc}</Project>
-            <Name>UmbracoExamine</Name>
-        </ProjectReference>
-        <Reference Include="AutoMapper, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
-            <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.dll</HintPath>
-            <Private>True</Private>
-        </Reference>
-        <Reference Include="AutoMapper.Net4, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
-            <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll</HintPath>
-            <Private>True</Private>
-        </Reference>
-        <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="dotless.Core, Version=1.5.2.0, Culture=neutral, PublicKeyToken=96b446c9e63eae34, processorArchitecture=MSIL">
-            <HintPath>..\packages\dotless.1.5.2\lib\dotless.Core.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="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="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>
-        <Reference Include="Lucene.Net, Version=2.9.4.1, Culture=neutral, PublicKeyToken=85089178b9ac3181, processorArchitecture=MSIL">
-            <HintPath>..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll</HintPath>
-        </Reference>
-        <Reference Include="MarkdownSharp, Version=1.14.5.0, Culture=neutral, processorArchitecture=MSIL">
-            <HintPath>..\packages\Markdown.1.14.7\lib\net45\MarkdownSharp.dll</HintPath>
-            <Private>True</Private>
-        </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.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.2\lib\net45\Microsoft.AspNet.Identity.Owin.dll</HintPath>
-        </Reference>
-        <Reference Include="Microsoft.AspNet.SignalR.Core, Version=2.4.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-            <HintPath>..\packages\Microsoft.AspNet.SignalR.Core.2.4.1\lib\net45\Microsoft.AspNet.SignalR.Core.dll</HintPath>
-        </Reference>
-        <Reference Include="Microsoft.CSharp" />
-        <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.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.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=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=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="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>
-            <Private>True</Private>
-        </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>
-            <Private>True</Private>
-        </Reference>
-        <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>
-            <Private>True</Private>
-        </Reference>
-        <Reference Include="Semver, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL">
-            <HintPath>..\packages\semver.1.1.2\lib\net451\Semver.dll</HintPath>
-        </Reference>
-        <Reference Include="System">
-            <Name>System</Name>
-        </Reference>
-        <Reference Include="System.ComponentModel.Composition" />
-        <Reference Include="System.ComponentModel.DataAnnotations" />
-        <Reference Include="System.configuration" />
-        <Reference Include="System.Data">
-            <Name>System.Data</Name>
-        </Reference>
-        <Reference Include="System.Data.DataSetExtensions" />
-        <Reference Include="System.Design" />
-        <Reference Include="System.Drawing">
-            <Name>System.Drawing</Name>
-        </Reference>
-        <Reference Include="System.EnterpriseServices" />
-        <Reference Include="System.IO.Compression.FileSystem" />
-        <Reference Include="System.Net.Http" />
-        <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.Runtime.Serialization" />
-        <Reference Include="System.Security" />
-        <Reference Include="System.ServiceModel" />
-        <Reference Include="System.Threading.Tasks.Dataflow, Version=4.6.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-            <HintPath>..\packages\System.Threading.Tasks.Dataflow.4.9.0\lib\portable-net45+win8+wpa81\System.Threading.Tasks.Dataflow.dll</HintPath>
-        </Reference>
-        <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.Abstractions">
-            <RequiredTargetFramework>3.5</RequiredTargetFramework>
-        </Reference>
-        <Reference Include="System.Web.ApplicationServices" />
-        <Reference Include="System.Web.DynamicData" />
-        <Reference Include="System.Web.Entity" />
-        <Reference Include="System.Web.Extensions" />
-        <Reference Include="System.Web.Extensions.Design" />
-        <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-            <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
-        </Reference>
-        <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.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.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.7\lib\net45\System.Web.Razor.dll</HintPath>
-        </Reference>
-        <Reference Include="System.Web.Services">
-            <Name>System.Web.Services</Name>
-        </Reference>
-        <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-            <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.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.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
-        </Reference>
-        <Reference Include="System.Windows.Forms" />
-        <Reference Include="System.Xml">
-            <Name>System.XML</Name>
-        </Reference>
-        <Reference Include="System.Xml.Linq" />
-        <ProjectReference Include="..\SQLCE4Umbraco\SqlCE4Umbraco.csproj">
-            <Project>{5BA5425F-27A7-4677-865E-82246498AA2E}</Project>
-            <Name>SqlCE4Umbraco</Name>
-        </ProjectReference>
-        <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj">
-            <Project>{31785BC3-256C-4613-B2F5-A1B0BDDED8C1}</Project>
-            <Name>Umbraco.Core</Name>
-        </ProjectReference>
-        <ProjectReference Include="..\umbraco.controls\umbraco.controls.csproj">
-            <Project>{6EDD2061-82F2-461B-BB6E-879245A832DE}</Project>
-            <Name>umbraco.controls</Name>
-        </ProjectReference>
-        <ProjectReference Include="..\umbraco.businesslogic\umbraco.businesslogic.csproj">
-            <Name>umbraco.businesslogic</Name>
-            <Project>{E469A9CE-1BEC-423F-AC44-713CD72457EA}</Project>
-            <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-        </ProjectReference>
-        <ProjectReference Include="..\umbraco.cms\umbraco.cms.csproj">
-            <Project>{CCD75EC3-63DB-4184-B49D-51C1DD337230}</Project>
-            <Name>umbraco.cms</Name>
-        </ProjectReference>
-        <ProjectReference Include="..\umbraco.datalayer\umbraco.datalayer.csproj">
-            <Project>{C7CB79F0-1C97-4B33-BFA7-00731B579AE2}</Project>
-            <Name>umbraco.datalayer</Name>
-        </ProjectReference>
-        <ProjectReference Include="..\umbraco.interfaces\umbraco.interfaces.csproj">
-            <Name>umbraco.interfaces</Name>
-            <Project>{511F6D8D-7717-440A-9A57-A507E9A8B27F}</Project>
-            <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-        </ProjectReference>
-        <ProjectReference Include="..\umbraco.providers\umbraco.providers.csproj">
-            <Project>{D7636876-0756-43CB-A192-138C6F0D5E42}</Project>
-            <Name>umbraco.providers</Name>
-        </ProjectReference>
-    </ItemGroup>
-    <ItemGroup>
-        <Compile Include="..\SolutionInfo.cs">
-            <Link>Properties\SolutionInfo.cs</Link>
-        </Compile>
-        <Compile Include="ApplicationContextExtensions.cs" />
-        <Compile Include="AreaRegistrationContextExtensions.cs" />
-        <Compile Include="BatchedDatabaseServerMessengerStartup.cs" />
-        <Compile Include="Cache\ApplicationCacheRefresher.cs" />
-        <Compile Include="Cache\ApplicationTreeCacheRefresher.cs" />
-        <Compile Include="Cache\CacheRefresherEventHandler.cs" />
-        <Compile Include="Cache\ContentTypeCacheRefresher.cs" />
-        <Compile Include="Cache\DataTypeCacheRefresher.cs" />
-        <Compile Include="Cache\DictionaryCacheRefresher.cs" />
-        <Compile Include="Cache\DistributedCache.cs" />
-        <Compile Include="Cache\DistributedCacheExtensions.cs" />
-        <Compile Include="Cache\DomainCacheRefresher.cs" />
-        <Compile Include="Cache\LanguageCacheRefresher.cs" />
-        <Compile Include="Cache\MacroCacheRefresher.cs" />
-        <Compile Include="Cache\MediaCacheRefresher.cs" />
-        <Compile Include="Cache\MemberCacheRefresher.cs" />
-        <Compile Include="Cache\MemberGroupCacheRefresher.cs" />
-        <Compile Include="Cache\PageCacheRefresher.cs" />
-        <Compile Include="Cache\PublicAccessCacheRefresher.cs" />
-        <Compile Include="Cache\RelationTypeCacheRefresher.cs" />
-        <Compile Include="Cache\UserGroupCacheRefresher.cs" />
-        <Compile Include="Cache\StylesheetCacheRefresher.cs" />
-        <Compile Include="Cache\StylesheetPropertyCacheRefresher.cs" />
-        <Compile Include="Cache\TemplateCacheRefresher.cs" />
-        <Compile Include="Cache\UnpublishedPageCacheRefresher.cs" />
-        <Compile Include="Cache\UserCacheRefresher.cs" />
-        <Compile Include="Security\UmbracoAntiForgeryAdditionalDataProvider.cs" />
-        <Compile Include="Editors\PreviewController.cs" />
-        <Compile Include="Editors\BackOfficeAssetsController.cs" />
-        <Compile Include="Features\DisabledFeatures.cs" />
-        <Compile Include="Editors\BackOfficeNotificationsController.cs" />
-        <Compile Include="Editors\DictionaryController.cs" />
-        <Compile Include="Editors\BackOfficeServerVariables.cs" />
-        <Compile Include="Editors\DashboardHelper.cs" />
-        <Compile Include="Editors\EditorModelEventArgs.cs" />
-        <Compile Include="Editors\EditorValidationResolver.cs" />
-        <Compile Include="Editors\EditorValidator.cs" />
-        <Compile Include="Editors\FromJsonPathAttribute.cs" />
-        <Compile Include="Editors\HelpController.cs" />
-        <Compile Include="Editors\IsCurrentUserModelFilterAttribute.cs" />
-        <Compile Include="Editors\PasswordChanger.cs" />
-        <Compile Include="Editors\TemplateController.cs" />
-        <Compile Include="Editors\ParameterSwapControllerActionSelector.cs" />
-        <Compile Include="Editors\CodeFileController.cs" />
-        <Compile Include="Editors\TourController.cs" />
-        <Compile Include="Features\EnabledFeatures.cs" />
-        <Compile Include="HealthCheck\Checks\Services\Tls12Check.cs" />
-        <Compile Include="HealthCheck\Checks\Security\XssProtectionCheck.cs" />
-        <Compile Include="HealthCheck\Checks\Security\HstsCheck.cs" />
-        <Compile Include="Models\BackOfficeTourFilter.cs" />
-        <Compile Include="Models\ContentEditing\BackOfficePreview.cs" />
-        <Compile Include="Models\ContentEditing\DocumentTypeCollectionDisplay.cs" />
-        <Compile Include="Models\ContentEditing\NotifySetting.cs" />
-        <Compile Include="Models\ContentEditing\UrlAndAnchors.cs" />
-        <Compile Include="Models\Mapping\AutoMapperExtensions.cs" />
-        <Compile Include="Models\Mapping\ContentTreeNodeUrlResolver.cs" />
-        <Compile Include="Models\Mapping\MemberTreeNodeUrlResolver.cs" />
-        <Compile Include="Models\Trees\ExportMember.cs" />
-        <Compile Include="PropertyEditors\DropdownFlexiblePropertyEditor.cs" />
-        <Compile Include="TourFilterResolver.cs" />
-        <Compile Include="Editors\UserEditorAuthorizationHelper.cs" />
-        <Compile Include="Editors\UserGroupAuthorizationAttribute.cs" />
-        <Compile Include="Editors\UserGroupEditorAuthorizationHelper.cs" />
-        <Compile Include="Editors\UserGroupsController.cs" />
-        <Compile Include="Editors\UserGroupValidateAttribute.cs" />
-        <Compile Include="ExamineStartup.cs" />
-        <Compile Include="Extensions\UdiExtensions.cs" />
-        <Compile Include="Features\UmbracoFeatures.cs" />
-        <Compile Include="Features\FeaturesResolver.cs" />
-        <Compile Include="HealthCheck\Checks\Config\AbstractConfigCheck.cs" />
-        <Compile Include="HealthCheck\Checks\Config\AcceptableConfiguration.cs" />
-        <Compile Include="HealthCheck\Checks\Config\ConfigurationService.cs" />
-        <Compile Include="HealthCheck\Checks\Config\ConfigurationServiceResult.cs" />
-        <Compile Include="HealthCheck\Checks\Config\MacroErrorsCheck.cs" />
-        <Compile Include="HealthCheck\Checks\Config\NotificationEmailCheck.cs" />
-        <Compile Include="HealthCheck\Checks\Config\TrySkipIisCustomErrorsCheck.cs" />
-        <Compile Include="HealthCheck\Checks\Config\CustomErrorsCheck.cs" />
-        <Compile Include="HealthCheck\Checks\Config\TraceCheck.cs" />
-        <Compile Include="HealthCheck\Checks\Config\ValueComparisonType.cs" />
-        <Compile Include="HealthCheck\Checks\Config\CompilationDebugCheck.cs" />
-        <Compile Include="HealthCheck\Checks\Security\BaseHttpHeaderCheck.cs" />
-        <Compile Include="HealthCheck\Checks\Security\NoSniffCheck.cs" />
-        <Compile Include="HealthCheck\Checks\Services\SmtpCheck.cs" />
-        <Compile Include="HealthCheck\Checks\Permissions\FolderAndFilePermissionsCheck.cs" />
-        <Compile Include="HealthCheck\Checks\Security\ExcessiveHeadersCheck.cs" />
-        <Compile Include="HealthCheck\Checks\Security\ClickJackingCheck.cs" />
-        <Compile Include="HealthCheck\HealthCheckAction.cs" />
-        <Compile Include="HealthCheck\HealthCheckNotificationMethodAttribute.cs" />
-        <Compile Include="HealthCheck\HealthCheckAttribute.cs" />
-        <Compile Include="HealthCheck\HealthCheckContext.cs" />
-        <Compile Include="HealthCheck\HealthCheckController.cs" />
-        <Compile Include="HealthCheck\HealthCheckGroup.cs" />
-        <Compile Include="HealthCheck\HealthCheckNotificationMethodResolver.cs" />
-        <Compile Include="HealthCheck\HealthCheckResolver.cs" />
-        <Compile Include="HealthCheck\HealthCheck.cs" />
-        <Compile Include="HealthCheck\HealthCheckResults.cs" />
-        <Compile Include="HealthCheck\HealthCheckStatus.cs" />
-        <Compile Include="HealthCheck\Checks\Security\HttpsCheck.cs" />
-        <Compile Include="HealthCheck\IHealthCheckResolver.cs" />
-        <Compile Include="HealthCheck\IHealthCheckNotificationMethodsResolver.cs" />
-        <Compile Include="HealthCheck\NotificationMethods\NotificationMethodBase.cs" />
-        <Compile Include="HealthCheck\NotificationMethods\EmailNotificationMethod.cs" />
-        <Compile Include="HealthCheck\NotificationMethods\IHealthCheckNotificatationMethod.cs" />
-        <Compile Include="HealthCheck\StatusResultType.cs" />
-        <Compile Include="HealthCheck\Checks\DataIntegrity\XmlDataIntegrityHealthCheck.cs" />
-        <Compile Include="IHttpContextAccessor.cs" />
-        <Compile Include="Install\InstallSteps\ConfigureMachineKey.cs" />
-        <Compile Include="Models\BackOfficeTourFile.cs" />
-        <Compile Include="Models\BackOfficeTourStep.cs" />
-        <Compile Include="Models\ContentEditing\AssignedContentPermissions.cs" />
-        <Compile Include="Models\ContentEditing\AssignedUserGroupPermissions.cs" />
-        <Compile Include="Models\ContentEditing\ContentRedirectUrl.cs" />
-        <Compile Include="Models\ContentEditing\DictionaryDisplay.cs" />
-        <Compile Include="Models\ContentEditing\DictionaryOverviewDisplay.cs" />
-        <Compile Include="Models\ContentEditing\DictionarySave.cs" />
-        <Compile Include="Models\ContentEditing\DictionaryOverviewTranslationDisplay.cs" />
-        <Compile Include="Models\ContentEditing\DictionaryTranslationSave.cs" />
-        <Compile Include="Models\ContentEditing\EditorNavigation.cs" />
-        <Compile Include="Models\ContentEditing\GetAvailableCompositionsFilter.cs" />
-        <Compile Include="Editors\IEditorValidator.cs" />
-        <Compile Include="Editors\EditorModelEventManager.cs" />
-        <Compile Include="HtmlHelperBackOfficeExtensions.cs" />
-        <Compile Include="Install\InstallSteps\Version73FileCleanup.cs" />
-        <Compile Include="Models\ContentEditing\DocumentTypeDisplay.cs" />
-        <Compile Include="Media\EmbedProviders\Flickr.cs" />
-        <Compile Include="Models\ContentEditing\ContentTypeCompositionDisplay.cs" />
-        <Compile Include="Models\ContentEditing\ContentTypeSave.cs" />
-        <Compile Include="Models\ContentEditing\DocumentTypeSave.cs" />
-        <Compile Include="Models\ContentEditing\InstalledPackageModel.cs" />
-        <Compile Include="Models\ContentEditing\LinkDisplay.cs" />
-        <Compile Include="Models\ContentEditing\MediaTypeDisplay.cs" />
-        <Compile Include="Models\ContentEditing\MediaTypeSave.cs" />
-        <Compile Include="Models\ContentEditing\MemberPropertyTypeBasic.cs" />
-        <Compile Include="Models\ContentEditing\MemberPropertyTypeDisplay.cs" />
-        <Compile Include="Models\ContentEditing\MemberTypeDisplay.cs" />
-        <Compile Include="Models\ContentEditing\MemberTypeSave.cs" />
-        <Compile Include="Models\ContentEditing\Permission.cs" />
-        <Compile Include="Models\ContentEditing\PostedFiles.cs" />
-        <Compile Include="Models\ContentEditing\PostedFolder.cs" />
-        <Compile Include="Models\ContentEditing\PropertyGroupBasic.cs" />
-        <Compile Include="Models\ContentEditing\PropertyTypeBasic.cs" />
-        <Compile Include="Models\ContentEditing\SimpleNotificationModel.cs" />
-        <Compile Include="Models\ContentEditing\SnippetDisplay.cs" />
-        <Compile Include="Models\ContentEditing\TemplateDisplay.cs" />
-        <Compile Include="Models\ContentEditing\DictionaryTranslationDisplay.cs" />
-        <Compile Include="Models\ContentEditing\UserDisplay.cs" />
-        <Compile Include="Models\ContentEditing\UserBasic.cs" />
-        <Compile Include="Models\ContentEditing\UserGroupBasic.cs" />
-        <Compile Include="Models\ContentEditing\UserGroupDisplay.cs" />
-        <Compile Include="Models\ContentEditing\UserGroupPermissionsSave.cs" />
-        <Compile Include="Models\ContentEditing\UserGroupSave.cs" />
-        <Compile Include="Models\DetachedPublishedContent.cs" />
-        <Compile Include="Models\DetachedPublishedProperty.cs" />
-        <Compile Include="Models\ContentEditing\UserInvite.cs" />
-        <Compile Include="Models\ContentEditing\UserSave.cs" />
-        <Compile Include="Models\Link.cs" />
-        <Compile Include="Models\LinkType.cs" />
-        <Compile Include="Models\LocalPackageInstallModel.cs" />
-        <Compile Include="Models\Mapping\CodeFileDisplayMapper.cs" />
-        <Compile Include="Models\Mapping\ContentTypeModelMapperExtensions.cs" />
-        <Compile Include="Models\Mapping\ContentTypeUdiResolver.cs" />
-        <Compile Include="Models\Mapping\DictionaryModelMapper.cs" />
-        <Compile Include="Models\Mapping\EntityModelMapperExtensions.cs" />
-        <Compile Include="Models\Mapping\LockedCompositionsResolver.cs" />
-        <Compile Include="Models\Mapping\UserGroupDefaultPermissionsResolver.cs" />
-        <Compile Include="Models\Mapping\PropertyGroupDisplayResolver.cs" />
-        <Compile Include="Models\RelatedLink.cs" />
-        <Compile Include="Models\Mapping\TemplateModelMapper.cs" />
-        <Compile Include="Models\PackageInstallResult.cs" />
-        <Compile Include="Models\RelatedLinkBase.cs" />
-        <Compile Include="Models\ContentEditing\CodeFileDisplay.cs" />
-        <Compile Include="Models\SendCodeViewModel.cs" />
-        <Compile Include="Models\RelatedLinks.cs" />
-        <Compile Include="Models\RelatedLinkType.cs" />
-        <Compile Include="Models\SetPasswordModel.cs" />
-        <Compile Include="Models\RequestPasswordResetModel.cs" />
-        <Compile Include="Models\PublishedContentWithKeyBase.cs" />
-        <Compile Include="Models\BackOfficeTour.cs" />
-        <Compile Include="Models\UserTourStatus.cs" />
-        <Compile Include="Models\ValidatePasswordResetCodeModel.cs" />
-        <Compile Include="Mvc\ControllerContextExtensions.cs" />
-        <Compile Include="Mvc\DisableBrowserCacheAttribute.cs" />
-        <Compile Include="Mvc\EnsurePartialViewMacroViewContextFilterAttribute.cs" />
-        <Compile Include="Mvc\IRenderController.cs" />
-        <Compile Include="Mvc\ModelBindingException.cs" />
-        <Compile Include="Mvc\RenderIndexActionSelectorAttribute.cs" />
-        <Compile Include="Mvc\UmbracoRequireHttpsAttribute.cs" />
-        <Compile Include="Mvc\ValidateMvcAngularAntiForgeryTokenAttribute.cs" />
-        <Compile Include="OwinMiddlewareConfiguredEventArgs.cs" />
-        <Compile Include="Profiling\WebProfilerProvider.cs" />
-        <Compile Include="Profiling\WebProfiler.cs" />
-        <Compile Include="PropertyEditors\ContentPicker2PropertyEditor.cs" />
-        <Compile Include="PropertyEditors\DatePreValueEditor.cs" />
-        <Compile Include="PropertyEditors\DateTimePreValueEditor.cs" />
-        <Compile Include="PropertyEditors\DecimalPropertyEditor.cs" />
-        <Compile Include="PropertyEditors\MediaPicker2PropertyEditor.cs" />
-        <Compile Include="PropertyEditors\MemberPicker2PropertyEditor.cs" />
-        <Compile Include="PropertyEditors\MultiNodeTreePicker2PropertyEditor.cs" />
-        <Compile Include="PropertyEditors\MultiUrlPickerPropertyEditor.cs" />
-        <Compile Include="PropertyEditors\NestedContentController.cs" />
-        <Compile Include="PropertyEditors\NestedContentHelper.cs" />
-        <Compile Include="PropertyEditors\NestedContentPropertyEditor.cs" />
-        <Compile Include="PropertyEditors\RelatedLinks2PropertyEditor.cs" />
-        <Compile Include="PropertyEditors\TextOnlyValueEditor.cs" />
-        <Compile Include="PropertyEditors\ValueConverters\ContentPickerPropertyConverter.cs" />
-        <Compile Include="PropertyEditors\ParameterEditors\MultipleContentPickerParameterEditor.cs" />
-        <Compile Include="PropertyEditors\ValueConverters\ImageCropDataSetConverter.cs" />
-        <Compile Include="PropertyEditors\ValueConverters\ImageCropperValueConverter.cs" />
-        <Compile Include="PropertyEditors\ValueConverters\LegacyRelatedLinksEditorValueConvertor.cs" />
-        <Compile Include="PropertyEditors\ValueConverters\MediaPickerPropertyConverter.cs" />
-        <Compile Include="PropertyEditors\ValueConverters\MemberPickerPropertyConverter.cs" />
-        <Compile Include="PropertyEditors\ValueConverters\MultiNodeTreePickerPropertyConverter.cs" />
-        <Compile Include="PropertyEditors\ValueConverters\LegacyMediaPickerPropertyConverter.cs" />
-        <Compile Include="PropertyEditors\ValueConverters\MultiUrlPickerPropertyConverter.cs" />
-        <Compile Include="PropertyEditors\ValueConverters\NestedContentSingleValueConverter.cs" />
-        <Compile Include="PropertyEditors\ValueConverters\NestedContentManyValueConverter.cs" />
-        <Compile Include="PropertyEditors\ValueConverters\NestedContentPublishedPropertyTypeExtensions.cs" />
-        <Compile Include="PublishedContentQueryExtensions.cs" />
-        <Compile Include="Routing\RedirectTrackingEventHandler.cs" />
-        <Compile Include="Editors\RedirectUrlManagementController.cs" />
-        <Compile Include="Models\ContentEditing\RedirectUrlSearchResults.cs" />
-        <Compile Include="RelatedLinksTypeConverter.cs" />
-        <Compile Include="RouteDataExtensions.cs" />
-        <Compile Include="Routing\ContentFinderByRedirectUrl.cs" />
-        <Compile Include="Scheduling\HealthCheckNotifier.cs" />
-        <Compile Include="Scheduling\LatchedBackgroundTaskBase.cs" />
-        <Compile Include="Search\SearchableApplicationTree.cs" />
-        <Compile Include="Search\SearchableTreeAttribute.cs" />
-        <Compile Include="Search\SearchableTreeCollection.cs" />
-        <Compile Include="Search\SearchableTreeResolver.cs" />
-        <Compile Include="Search\UmbracoTreeSearcher.cs" />
-        <Compile Include="Security\Identity\ExternalSignInAutoLinkOptions.cs" />
-        <Compile Include="Security\Identity\FixWindowsAuthMiddlware.cs" />
-        <Compile Include="Security\Identity\ForceRenewalCookieAuthenticationHandler.cs" />
-        <Compile Include="Security\Identity\ForceRenewalCookieAuthenticationMiddleware.cs" />
-        <Compile Include="Security\Identity\GetUserSecondsMiddleWare.cs" />
-        <Compile Include="Models\ContentEditing\PropertyTypeDisplay.cs" />
-        <Compile Include="Models\ContentEditing\PropertyGroupDisplay.cs" />
-        <Compile Include="Media\EmbedProviders\OEmbedJson.cs" />
-        <Compile Include="Media\EmbedProviders\OEmbedResponse.cs" />
-        <Compile Include="Media\EmbedProviders\OEmbedPhoto.cs" />
-        <Compile Include="Security\Identity\IUmbracoBackOfficeTwoFactorOptions.cs" />
-        <Compile Include="Models\Mapping\PropertyTypeGroupResolver.cs" />
-        <Compile Include="Security\Identity\PreviewAuthenticationMiddleware.cs" />
-        <Compile Include="SingletonHttpContextAccessor.cs" />
-        <Compile Include="Trees\DictionaryTreeController.cs" />
-        <Compile Include="Trees\MacroTreeController.cs" />
-        <Compile Include="Trees\UserTreeController.cs" />
-        <Compile Include="Suspendable.cs" />
-        <Compile Include="Trees\ContentBlueprintTreeController.cs" />
-        <Compile Include="Trees\ContentTypeTreeController.cs" />
-        <Compile Include="Trees\PackagesTreeController.cs" />
-        <Compile Include="Trees\MediaTypeTreeController.cs" />
-        <Compile Include="Trees\MemberTypeTreeController.cs" />
-        <Compile Include="Security\WebAuthExtensions.cs" />
-        <Compile Include="Trees\XsltTreeController.cs" />
-        <Compile Include="umbraco.presentation\SafeXmlReaderWriter.cs" />
-        <Compile Include="Trees\ScriptTreeController.cs" />
-        <Compile Include="umbraco.presentation\umbraco\developer\Packages\installer.aspx.cs">
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="UmbracoDefaultOwinStartup.cs" />
-        <Compile Include="IUmbracoContextAccessor.cs" />
-        <Compile Include="Models\ContentEditing\Relation.cs" />
-        <Compile Include="HtmlStringUtilities.cs" />
-        <Compile Include="Models\ContentEditing\RelationType.cs" />
-        <Compile Include="Models\ContentExtensions.cs" />
-        <Compile Include="IDynamicPublishedContentQuery.cs" />
-        <Compile Include="ITagQuery.cs" />
-        <Compile Include="ITypedPublishedContentQuery.cs" />
-        <Compile Include="IUmbracoComponentRenderer.cs" />
-        <Compile Include="Models\LegacyConvertedNode.cs" />
-        <Compile Include="Models\LegacyConvertedNodeProperty.cs" />
-        <Compile Include="Models\Mapping\RelationModelMapper.cs" />
-        <Compile Include="Mvc\DisableClientCacheAttribute.cs" />
-        <Compile Include="Models\UnLinkLoginModel.cs" />
-        <Compile Include="Mvc\MvcVersionCheck.cs" />
-        <Compile Include="Mvc\ReflectedFixedRazorViewEngine.cs" />
-        <Compile Include="Scheduling\ThreadingTaskImmutable.cs" />
-        <Compile Include="Mvc\ProfilingView.cs" />
-        <Compile Include="Mvc\ProfilingViewEngine.cs" />
-        <Compile Include="Mvc\UrlHelperExtensions.cs" />
-        <Compile Include="Scheduling\BackgroundTaskRunner.cs" />
-        <Compile Include="BatchedDatabaseServerMessenger.cs" />
-        <Compile Include="BatchedWebServiceServerMessenger.cs" />
-        <Compile Include="CacheHelperExtensions.cs" />
-        <Compile Include="Cache\UserGroupPermissionsCacheRefresher.cs" />
-        <Compile Include="Editors\AuthenticationController.cs" />
-        <Compile Include="Controllers\UmbProfileController.cs" />
-        <Compile Include="Editors\ContentController.cs" />
-        <Compile Include="Controllers\UmbLoginStatusController.cs" />
-        <Compile Include="Editors\ContentPostValidateAttribute.cs" />
-        <Compile Include="Editors\ContentTypeControllerBase.cs" />
-        <Compile Include="Editors\DashboardController.cs" />
-        <Compile Include="Editors\DashboardSecurity.cs" />
-        <Compile Include="Editors\DataTypeController.cs" />
-        <Compile Include="Editors\DataTypeValidateAttribute.cs" />
-        <Compile Include="Editors\EntityControllerConfigurationAttribute.cs" />
-        <Compile Include="Editors\ImagesController.cs" />
-        <Compile Include="Editors\PackageInstallController.cs" />
-        <Compile Include="Editors\RelationController.cs" />
-        <Compile Include="Editors\CanvasDesignerController.cs" />
-        <Compile Include="Editors\UsersController.cs" />
-        <Compile Include="GridTemplateExtensions.cs" />
-        <Compile Include="Models\PackageInstallModel.cs" />
-        <Compile Include="Models\ContentEditing\DataTypeBasic.cs" />
-        <Compile Include="Models\ContentEditing\MemberBasic.cs" />
-        <Compile Include="Models\ContentEditing\MemberListDisplay.cs" />
-        <Compile Include="Models\TemplateQuery\ContentTypeModel.cs" />
-        <Compile Include="Models\TemplateQuery\PropertyModel.cs" />
-        <Compile Include="Models\TemplateQuery\SourceModel.cs" />
-        <Compile Include="Models\TemplateQuery\TemplateQueryResult.cs" />
-        <Compile Include="Models\TemplateQuery\SortExpression.cs" />
-        <Compile Include="Models\TemplateQuery\Operathor.cs" />
-        <Compile Include="Models\TemplateQuery\OperathorTerm.cs" />
-        <Compile Include="Models\TemplateQuery\QueryCondition.cs" />
-        <Compile Include="Models\TemplateQuery\QueryModel.cs" />
-        <Compile Include="Models\TemplateQuery\QueryResultModel.cs" />
-        <Compile Include="Editors\TemplateQueryController.cs" />
-        <Compile Include="Models\ContentEditing\ContentBaseItemSave.cs" />
-        <Compile Include="Models\ContentEditing\MediaItemSave.cs" />
-        <Compile Include="Models\DetachedContent.cs" />
-        <Compile Include="Models\ImageCropAnchor.cs" />
-        <Compile Include="Models\ImageCropCoordinates.cs" />
-        <Compile Include="Models\ImageCropDataSet.cs" />
-        <Compile Include="Models\ImageCropFocalPoint.cs" />
-        <Compile Include="Models\ImageCropMode.cs" />
-        <Compile Include="Install\DatabaseHelper.cs" />
-        <Compile Include="Install\InstallException.cs" />
-        <Compile Include="Install\InstallStatusTracker.cs" />
-        <Compile Include="Install\InstallSteps\DatabaseConfigureStep.cs" />
-        <Compile Include="Install\InstallSteps\DatabaseInstallStep.cs" />
-        <Compile Include="Install\InstallSteps\DatabaseUpgradeStep.cs" />
-        <Compile Include="Install\InstallSteps\FilePermissionsStep.cs" />
-        <Compile Include="Install\InstallSteps\MajorVersion7UpgradeReport.cs" />
-        <Compile Include="Install\InstallSteps\SetUmbracoVersionStep.cs" />
-        <Compile Include="Install\InstallSteps\StarterKitCleanupStep.cs" />
-        <Compile Include="Install\InstallSteps\StarterKitDownloadStep.cs" />
-        <Compile Include="Install\InstallSteps\StarterKitInstallStep.cs" />
-        <Compile Include="Install\InstallSteps\UpgradeStep.cs" />
-        <Compile Include="Install\InstallSteps\NewInstallStep.cs" />
-        <Compile Include="Install\Controllers\InstallPackageController.cs" />
-        <Compile Include="Install\Models\DatabaseModel.cs" />
-        <Compile Include="Install\Models\DatabaseType.cs" />
-        <Compile Include="Install\Models\InstallationType.cs" />
-        <Compile Include="Install\Models\InstallInstructions.cs" />
-        <Compile Include="Install\Models\InstallPackageModel.cs" />
-        <Compile Include="Install\Models\InstallProgressResultModel.cs" />
-        <Compile Include="Install\Models\InstallSetup.cs" />
-        <Compile Include="Install\Models\InstallSetupResult.cs" />
-        <Compile Include="Install\Models\InstallSetupStep.cs" />
-        <Compile Include="Install\Models\InstallSetupStepAttribute.cs" />
-        <Compile Include="Install\Models\InstallTrackingItem.cs" />
-        <Compile Include="Install\Models\Package.cs" />
-        <Compile Include="Install\Models\UserModel.cs" />
-        <Compile Include="Install\UmbracoInstallArea.cs" />
-        <Compile Include="Install\Controllers\InstallApiController.cs" />
-        <Compile Include="Install\Controllers\InstallController.cs" />
-        <Compile Include="Install\InstallAuthorizeAttribute.cs" />
-        <Compile Include="Models\ContentEditing\TreeSearchResult.cs" />
-        <Compile Include="Models\ContentEditing\ListViewAwareContentItemDisplayBase.cs" />
-        <Compile Include="Models\ContentEditing\PropertyTypeValidation.cs" />
-        <Compile Include="Models\ImageCropData.cs" />
-        <Compile Include="Models\ImageCropRatioMode.cs" />
-        <Compile Include="Models\IRenderModel.cs" />
-        <Compile Include="Models\PartialViewMacroModelExtensions.cs" />
-        <Compile Include="Models\PostRedirectModel.cs" />
-        <Compile Include="Models\PublishedProperty.cs" />
-        <Compile Include="Mvc\ActionExecutedEventArgs.cs" />
-        <Compile Include="Mvc\AdminTokenAuthorizeAttribute.cs" />
-        <Compile Include="Mvc\NotFoundHandler.cs" />
-        <Compile Include="Mvc\PreRenderViewActionFilterAttribute.cs" />
-        <Compile Include="Mvc\RedirectToUmbracoUrlResult.cs" />
-        <Compile Include="PropertyEditors\GridPropertyEditor.cs" />
-        <Compile Include="Mvc\UmbracoVirtualNodeByIdRouteHandler.cs" />
-        <Compile Include="PropertyEditors\ValueConverters\MacroContainerValueConverter.cs" />
-        <Compile Include="PropertyEditors\TagsDataController.cs" />
-        <Compile Include="PublishedCache\MemberPublishedContent.cs" />
-        <Compile Include="PublishedCache\RawValueProperty.cs" />
-        <Compile Include="Models\RenderModelOfTContent.cs" />
-        <Compile Include="Mvc\JsonNetResult.cs" />
-        <Compile Include="Mvc\MinifyJavaScriptResultAttribute.cs" />
-        <Compile Include="Mvc\EnsurePublishedContentRequestAttribute.cs" />
-        <Compile Include="Mvc\UmbracoTemplatePageOfTContent.cs" />
-        <Compile Include="Mvc\UmbracoViewPage.cs" />
-        <Compile Include="Editors\LogController.cs" />
-        <Compile Include="Editors\MacroController.cs" />
-        <Compile Include="Editors\MemberTypeController.cs" />
-        <Compile Include="Editors\UpdateCheckController.cs" />
-        <Compile Include="MembershipProviderExtensions.cs" />
-        <Compile Include="Models\ChangingPasswordModel.cs" />
-        <Compile Include="Models\ContentEditing\ModelWithNotifications.cs" />
-        <Compile Include="Models\ContentEditing\StyleSheet.cs" />
-        <Compile Include="Editors\StylesheetController.cs" />
-        <Compile Include="Models\ContentEditing\AuditLog.cs" />
-        <Compile Include="Models\ContentEditing\MoveOrCopy.cs" />
-        <Compile Include="Models\ContentEditing\MacroParameter.cs" />
-        <Compile Include="Models\ContentEditing\MemberDisplay.cs" />
-        <Compile Include="Models\ContentEditing\MemberSave.cs" />
-        <Compile Include="Models\ContentEditing\RichTextEditorCommand.cs" />
-        <Compile Include="Models\ContentEditing\RichTextEditorConfiguration.cs" />
-        <Compile Include="Models\ContentEditing\RichTextEditorPlugin.cs" />
-        <Compile Include="Models\ContentEditing\StylesheetRule.cs" />
-        <Compile Include="Models\ContentEditing\UmbracoEntityTypes.cs" />
-        <Compile Include="Models\ContentEditing\AuditLogType.cs" />
-        <Compile Include="Models\Mapping\MiscModelsMapper.cs" />
-        <Compile Include="Models\Mapping\MacroModelMapper.cs" />
-        <Compile Include="Models\Mapping\MemberModelMapper.cs" />
-        <Compile Include="Models\Mapping\TabModelMapper.cs" />
-        <Compile Include="Models\TagModel.cs" />
-        <Compile Include="Models\UpgradeCheckResponse.cs" />
-        <Compile Include="Models\PasswordChangedModel.cs" />
-        <Compile Include="NotificationServiceExtensions.cs" />
-        <Compile Include="PropertyEditors\ColorListPreValueEditor.cs" />
-        <Compile Include="PropertyEditors\EmailAddressPropertyEditor.cs" />
-        <Compile Include="ImageCropperBaseExtensions.cs" />
-        <Compile Include="PropertyEditors\ImageCropperPropertyEditor.cs" />
-        <Compile Include="PropertyEditors\ImageCropperPropertyValueEditor.cs" />
-        <Compile Include="PropertyEditors\ListViewPropertyEditor.cs" />
-        <Compile Include="PropertyEditors\MacroContainerPropertyEditor.cs" />
-        <Compile Include="PropertyEditors\MarkdownPropertyEditor.cs" />
-        <Compile Include="PropertyEditors\MemberGroupPickerPropertyEditor.cs" />
-        <Compile Include="PropertyEditors\MemberPickerPropertyEditor.cs" />
-        <Compile Include="PropertyEditors\MultiNodeTreePickerPropertyEditor.cs" />
-        <Compile Include="PropertyEditors\MultipleMediaPickerPropertyEditor.cs" />
-        <Compile Include="PropertyEditors\ParameterEditors\ContentTypeParameterEditor.cs" />
-        <Compile Include="PropertyEditors\ParameterEditors\MultipleContentTypeParameterEditor.cs" />
-        <Compile Include="PropertyEditors\ParameterEditors\MultipleMediaPickerParameterEditor.cs" />
-        <Compile Include="PropertyEditors\ParameterEditors\MultiplePropertyGroupParameterEditor.cs" />
-        <Compile Include="PropertyEditors\ParameterEditors\MultiplePropertyTypeParameterEditor.cs" />
-        <Compile Include="PropertyEditors\ParameterEditors\PropertyGroupParameterEditor.cs" />
-        <Compile Include="PropertyEditors\ParameterEditors\PropertyTypeParameterEditor.cs" />
-        <Compile Include="PropertyEditors\ParameterEditors\SingleMediaPickerParameterEditor.cs" />
-        <Compile Include="PropertyEditors\PropertyEditorAssetAttribute.cs" />
-        <Compile Include="PropertyEditors\RelatedLinksPropertyEditor.cs" />
-        <Compile Include="PropertyEditors\RteEmbedController.cs" />
-        <Compile Include="Editors\EntityController.cs" />
-        <Compile Include="Editors\MediaPostValidateAttribute.cs" />
-        <Compile Include="Editors\MemberController.cs" />
-        <Compile Include="Editors\CurrentUserController.cs" />
-        <Compile Include="Models\ContentEditing\DashboardControl.cs" />
-        <Compile Include="Models\ContentEditing\DataTypeDisplay.cs" />
-        <Compile Include="Models\ContentEditing\DataTypeSave.cs" />
-        <Compile Include="Models\ContentEditing\EntityBasic.cs" />
-        <Compile Include="Models\ContentEditing\PreValueFieldDisplay.cs" />
-        <Compile Include="Models\ContentEditing\PreValueFieldSave.cs" />
-        <Compile Include="Models\ContentEditing\PropertyEditorBasic.cs" />
-        <Compile Include="Models\Mapping\AvailablePropertyEditorsResolver.cs" />
-        <Compile Include="Models\Mapping\DatabaseTypeResolver.cs" />
-        <Compile Include="Models\Mapping\DataTypeModelMapper.cs" />
-        <Compile Include="Models\Mapping\EntityModelMapper.cs" />
-        <Compile Include="Models\Mapping\PreValueDisplayResolver.cs" />
-        <Compile Include="PropertyEditors\CheckBoxListPropertyEditor.cs" />
-        <Compile Include="PropertyEditors\ColorPickerPropertyEditor.cs" />
-        <Compile Include="PropertyEditors\DatePropertyEditor.cs" />
-        <Compile Include="PropertyEditors\DateTimePropertyEditor.cs" />
-        <Compile Include="PropertyEditors\DateTimeValidator.cs" />
-        <Compile Include="PropertyEditors\DropDownMultiplePropertyEditor.cs" />
-        <Compile Include="PropertyEditors\FolderBrowserPropertyEditor.cs" />
-        <Compile Include="PropertyEditors\IntegerPropertyEditor.cs" />
-        <Compile Include="PropertyEditors\MediaPickerPropertyEditor.cs" />
-        <Compile Include="PropertyEditors\MultipleTextStringPropertyEditor.cs" />
-        <Compile Include="PropertyEditors\PublishValuesMultipleValueEditor.cs" />
-        <Compile Include="PropertyEditors\DropDownMultipleWithKeysPropertyEditor.cs" />
-        <Compile Include="PropertyEditors\RadioButtonsPropertyEditor.cs" />
-        <Compile Include="PropertyEditors\RichTextPreValueController.cs" />
-        <Compile Include="PropertyEditors\RichTextPreValueEditor.cs" />
-        <Compile Include="PropertyEditors\SliderPropertyEditor.cs" />
-        <Compile Include="PropertyEditors\TagPropertyEditorTagDefinition.cs" />
-        <Compile Include="PropertyEditors\TagsPropertyEditor.cs" />
-        <Compile Include="PropertyEditors\UploadFileTypeValidator.cs" />
-        <Compile Include="PropertyEditors\UserPickerPropertyEditor.cs" />
-        <Compile Include="PropertyEditors\ValueConverters\RelatedLinksEditorValueConvertor.cs" />
-        <Compile Include="PropertyEditors\ValueListPreValueEditor.cs" />
-        <Compile Include="PropertyEditors\DropDownPropertyEditor.cs" />
-        <Compile Include="PropertyEditors\PublishValueValueEditor.cs" />
-        <Compile Include="PropertyEditors\DropDownWithKeysPropertyEditor.cs" />
-        <Compile Include="PropertyEditors\LabelPropertyEditor.cs" />
-        <Compile Include="PropertyEditors\PropertyValueEditorWrapper.cs" />
-        <Compile Include="PublishedContentQuery.cs" />
-        <Compile Include="ImageCropperTemplateExtensions.cs" />
-        <Compile Include="Mvc\UmbracoVirtualNodeRouteHandler.cs" />
-        <Compile Include="Routing\CustomRouteUrlProvider.cs" />
-        <Compile Include="Routing\UrlProviderExtensions.cs" />
-        <Compile Include="Scheduling\BackgroundTaskRunnerOptions.cs" />
-        <Compile Include="Scheduling\IBackgroundTaskRunner.cs" />
-        <Compile Include="Scheduling\ILatchedBackgroundTask.cs" />
-        <Compile Include="Scheduling\RecurringTaskBase.cs" />
-        <Compile Include="Security\Identity\AppBuilderExtensions.cs" />
-        <Compile Include="Security\Identity\AuthenticationOptionsExtensions.cs" />
-        <Compile Include="Security\Identity\AuthenticationManagerExtensions.cs" />
-        <Compile Include="Security\Identity\BackOfficeCookieManager.cs" />
-        <Compile Include="Security\Identity\FormsAuthenticationSecureDataFormat.cs" />
-        <Compile Include="Security\Identity\UmbracoBackOfficeCookieAuthOptions.cs" />
-        <Compile Include="Scheduling\TaskAndFactoryExtensions.cs" />
-        <Compile Include="SingletonUmbracoContextAccessor.cs" />
-        <Compile Include="Strategies\Migrations\ClearCsrfCookiesAfterUpgrade.cs" />
-        <Compile Include="Strategies\Migrations\ClearMediaXmlCacheForDeletedItemsAfterUpgrade.cs" />
-        <Compile Include="Strategies\Migrations\EnsureListViewDataTypeIsCreated.cs" />
-        <Compile Include="Strategies\Migrations\MigrationStartupHander.cs" />
-        <Compile Include="Strategies\Migrations\OverwriteStylesheetFilesFromTempFiles.cs" />
-        <Compile Include="Strategies\NotificationsHandler.cs" />
-        <Compile Include="Strategies\RelateOnCopyHandler.cs" />
-        <Compile Include="TagQuery.cs" />
-        <Compile Include="Trees\CoreTreeAttribute.cs" />
-        <Compile Include="Trees\DataTypeTreeController.cs" />
-        <Compile Include="Trees\FileSystemTreeController.cs" />
-        <Compile Include="Trees\LanguageTreeController.cs" />
-        <Compile Include="Trees\LegacyBaseTreeAttribute.cs" />
-        <Compile Include="Trees\MemberTreeController.cs" />
-        <Compile Include="Trees\MenuRenderingEventArgs.cs" />
-        <Compile Include="Models\Trees\CreateChildEntity.cs" />
-        <Compile Include="Models\Trees\MenuItemList.cs" />
-        <Compile Include="Trees\TemplatesTreeController.cs" />
-        <Compile Include="Trees\TreeControllerBase.cs" />
-        <Compile Include="CanvasDesignerUtility.cs" />
-        <Compile Include="UI\JavaScript\AssetInitialization.cs" />
-        <Compile Include="UI\JavaScript\CssInitialization.cs" />
-        <Compile Include="UI\JavaScript\DependencyPathRenderer.cs" />
-        <Compile Include="umbraco.presentation\umbraco\create.aspx.cs">
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\create\Language.ascx.cs">
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\create\xslt.ascx.cs">
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\Trees\loadPackager.cs" />
-        <Compile Include="PublishedCache\XmlPublishedCache\XmlCacheFilePersister.cs" />
-        <Compile Include="UmbracoComponentRenderer.cs" />
-        <Compile Include="Web References\org.umbraco.our\Reference.cs">
-            <AutoGen>True</AutoGen>
-            <DesignTime>True</DesignTime>
-            <DependentUpon>Reference.map</DependentUpon>
-        </Compile>
-        <Compile Include="WebApi\AngularJsonMediaTypeFormatter.cs" />
-        <Compile Include="WebApi\AngularJsonOnlyConfigurationAttribute.cs" />
-        <Compile Include="WebApi\Binders\BlueprintItemBinder.cs" />
-        <Compile Include="WebApi\Binders\MemberBinder.cs" />
-        <Compile Include="WebApi\EnableDetailedErrorsAttribute.cs" />
-        <Compile Include="WebApi\Filters\AdminUsersAuthorizeAttribute.cs" />
-        <Compile Include="WebApi\Filters\AngularAntiForgeryHelper.cs" />
-        <Compile Include="WebApi\Filters\AppendCurrentEventMessagesAttribute.cs" />
-        <Compile Include="WebApi\Filters\AppendUserModifiedHeaderAttribute.cs" />
-        <Compile Include="WebApi\Filters\ClearAngularAntiForgeryTokenAttribute.cs" />
-        <Compile Include="WebApi\Filters\DisableBrowserCacheAttribute.cs" />
-        <Compile Include="WebApi\Filters\EnableOverrideAuthorizationAttribute.cs" />
-        <Compile Include="WebApi\Filters\FeatureAuthorizeAttribute.cs" />
-        <Compile Include="WebApi\Filters\FilterGrouping.cs" />
-        <Compile Include="WebApi\Filters\HttpQueryStringModelBinder.cs" />
-        <Compile Include="WebApi\Filters\LegacyTreeAuthorizeAttribute.cs" />
-        <Compile Include="WebApi\Filters\OutgoingEditorModelEventAttribute.cs" />
-        <Compile Include="WebApi\Filters\OutgoingNoHyphenGuidFormatAttribute.cs" />
-        <Compile Include="WebApi\Filters\OverridableAuthorizationAttribute.cs" />
-        <Compile Include="WebApi\Filters\SetAngularAntiForgeryTokensAttribute.cs" />
-        <Compile Include="WebApi\Filters\UmbracoBackOfficeLogoutAttribute.cs" />
-        <Compile Include="WebApi\Filters\UmbracoWebApiRequireHttpsAttribute.cs" />
-        <Compile Include="WebApi\Filters\UmbracoTreeAuthorizeAttribute.cs" />
-        <Compile Include="WebApi\Filters\UmbracoUseHttps.cs" />
-        <Compile Include="WebApi\Filters\ValidateAngularAntiForgeryTokenAttribute.cs" />
-        <Compile Include="WebApi\Filters\CheckIfUserTicketDataIsStaleAttribute.cs" />
-        <Compile Include="WebApi\HttpControllerContextExtensions.cs" />
-        <Compile Include="WebApi\CustomDateTimeConvertor.cs" />
-        <Compile Include="Models\ContentEditing\ContentSortOrder.cs" />
-        <Compile Include="Editors\ContentControllerBase.cs" />
-        <Compile Include="Editors\ContentTypeController.cs" />
-        <Compile Include="Editors\LegacyController.cs" />
-        <Compile Include="Controllers\UmbRegisterController.cs" />
-        <Compile Include="Models\ProfileModel.cs" />
-        <Compile Include="Models\LoginStatusModel.cs" />
-        <Compile Include="PropertyEditors\ValueConverters\MarkdownEditorValueConverter.cs" />
-        <Compile Include="PropertyEditors\ValueConverters\TextStringValueConverter.cs" />
-        <Compile Include="PublishedContentPropertyExtension.cs" />
-        <Compile Include="Models\UmbracoProperty.cs" />
-        <Compile Include="Mvc\MergeParentContextViewDataAttribute.cs" />
-        <Compile Include="Mvc\ViewDataDictionaryExtensions.cs" />
-        <Compile Include="Routing\ContentLastChanceFinderByNotFoundHandlers.cs" />
-        <Compile Include="Models\RegisterModel.cs" />
-        <Compile Include="Models\LoginModel.cs" />
-        <Compile Include="Editors\MediaTypeController.cs" />
-        <Compile Include="Scheduling\IBackgroundTask.cs" />
-        <Compile Include="Scheduling\KeepAlive.cs" />
-        <Compile Include="Scheduling\LogScrubber.cs" />
-        <Compile Include="Scheduling\ScheduledPublishing.cs" />
-        <Compile Include="Scheduling\ScheduledTasks.cs" />
-        <Compile Include="Scheduling\TaskEventArgs.cs" />
-        <Compile Include="Security\MembershipHelper.cs" />
-        <Compile Include="Editors\SectionController.cs" />
-        <Compile Include="Editors\UmbracoAuthorizedJsonController.cs" />
-        <Compile Include="Editors\ValidationHelper.cs" />
-        <Compile Include="HttpCookieExtensions.cs" />
-        <Compile Include="Models\ContentEditing\ContentItemDisplayBase.cs" />
-        <Compile Include="Models\ContentEditing\ContentSaveAction.cs" />
-        <Compile Include="Models\ContentEditing\ContentTypeBasic.cs" />
-        <Compile Include="Models\ContentEditing\IErrorModel.cs" />
-        <Compile Include="Models\ContentEditing\IHaveUploadedFiles.cs" />
-        <Compile Include="Models\ContentEditing\INotificationModel.cs" />
-        <Compile Include="Models\ContentEditing\MediaItemDisplay.cs" />
-        <Compile Include="Models\ContentEditing\MessagesExtensions.cs" />
-        <Compile Include="Models\ContentEditing\Notification.cs" />
-        <Compile Include="Models\ContentEditing\Section.cs" />
-        <Compile Include="Models\ContentEditing\Tab.cs" />
-        <Compile Include="Models\ContentEditing\TabbedContentItem.cs" />
-        <Compile Include="Models\ContentEditing\UserProfile.cs" />
-        <Compile Include="Models\ContentEditing\UserDetail.cs" />
-        <Compile Include="FormDataCollectionExtensions.cs" />
-        <Compile Include="Models\Mapping\ContentPropertyBasicConverter.cs" />
-        <Compile Include="Models\Mapping\ContentPropertyDisplayConverter.cs" />
-        <Compile Include="Models\Mapping\ContentPropertyDtoConverter.cs" />
-        <Compile Include="Models\Mapping\ContentPropertyModelMapper.cs" />
-        <Compile Include="Models\Mapping\CreatorResolver.cs" />
-        <Compile Include="Models\Mapping\MediaModelMapper.cs" />
-        <Compile Include="Models\Mapping\ContentTypeModelMapper.cs" />
-        <Compile Include="Models\Mapping\ContentModelMapper.cs" />
-        <Compile Include="Models\Mapping\OwnerResolver.cs" />
-        <Compile Include="Models\Mapping\SectionModelMapper.cs" />
-        <Compile Include="Models\Mapping\TabsAndPropertiesResolver.cs" />
-        <Compile Include="Models\Mapping\UserModelMapper.cs" />
-        <Compile Include="PropertyEditors\ContentPickerPropertyEditor.cs" />
-        <Compile Include="PropertyEditors\FileUploadPropertyEditor.cs" />
-        <Compile Include="PropertyEditors\FileUploadPropertyValueEditor.cs" />
-        <Compile Include="PropertyEditors\RichTextPropertyEditor.cs" />
-        <Compile Include="PropertyEditors\TextAreaPropertyEditor.cs" />
-        <Compile Include="PropertyEditors\TextboxPropertyEditor.cs" />
-        <Compile Include="PropertyEditors\TrueFalsePropertyEditor.cs" />
-        <Compile Include="Trees\MediaTreeController.cs" />
-        <Compile Include="Models\Trees\ActionMenuItem.cs" />
-        <Compile Include="Models\Trees\ActionMenuItemAttribute.cs" />
-        <Compile Include="Trees\ActionUrlMethod.cs" />
-        <Compile Include="Trees\ApplicationTreeRegistrar.cs" />
-        <Compile Include="Trees\ContentTreeControllerBase.cs" />
-        <Compile Include="Trees\LegacyTreeController.cs" />
-        <Compile Include="Search\ISearchableTree.cs" />
-        <Compile Include="Trees\LegacyTreeDataConverter.cs" />
-        <Compile Include="Trees\LegacyTreeJavascript.cs" />
-        <Compile Include="Trees\LegacyTreeParams.cs" />
-        <Compile Include="Models\Trees\MenuItem.cs" />
-        <Compile Include="Models\Trees\MenuItemCollection.cs" />
-        <Compile Include="Models\Trees\RefreshNode.cs" />
-        <Compile Include="Models\ContentEditing\SearchResultItem.cs" />
-        <Compile Include="Models\Trees\SectionRootNode.cs" />
-        <Compile Include="Trees\TreeController.cs" />
-        <Compile Include="Trees\ApplicationTreeExtensions.cs" />
-        <Compile Include="Trees\TreeAttribute.cs" />
-        <Compile Include="Models\Trees\TreeNode.cs" />
-        <Compile Include="Models\Trees\TreeNodeCollection.cs" />
-        <Compile Include="Models\Trees\TreeNodeExtensions.cs" />
-        <Compile Include="Trees\TreeNodeRenderingEventArgs.cs" />
-        <Compile Include="Trees\TreeNodesRenderingEventArgs.cs" />
-        <Compile Include="Trees\TreeQueryStringParameters.cs" />
-        <Compile Include="Trees\ApplicationTreeController.cs" />
-        <Compile Include="Editors\BackOfficeController.cs" />
-        <Compile Include="Security\Providers\MembersMembershipProvider.cs" />
-        <Compile Include="Security\Providers\MembersRoleProvider.cs" />
-        <Compile Include="Security\Providers\UmbracoMembershipProvider.cs" />
-        <Compile Include="Security\Providers\UsersMembershipProvider.cs" />
-        <Compile Include="Trees\ContentTreeController.cs" />
-        <Compile Include="Trees\TreeRenderingEventArgs.cs" />
-        <Compile Include="Trees\UrlHelperExtensions.cs" />
-        <Compile Include="UI\JavaScript\JsInitialization.cs" />
-        <Compile Include="Models\ContentEditing\ContentItemBasic.cs" />
-        <Compile Include="Models\ContentEditing\ContentItemDisplay.cs" />
-        <Compile Include="Models\ContentEditing\ContentItemDto.cs" />
-        <Compile Include="Models\ContentEditing\ContentItemFile.cs" />
-        <Compile Include="Models\ContentEditing\ContentItemSave.cs" />
-        <Compile Include="Models\ContentEditing\ContentPropertyBasic.cs" />
-        <Compile Include="Models\ContentEditing\ContentPropertyDisplay.cs" />
-        <Compile Include="Models\ContentEditing\ContentPropertyDto.cs" />
-        <Compile Include="Dynamics\DynamicExpression.cs" />
-        <Compile Include="Dynamics\DynamicGrouping.cs" />
-        <Compile Include="Dynamics\DynamicPublishedContentIdEqualityComparer.cs" />
-        <Compile Include="Dynamics\DynamicPublishedContentListOrdering.cs" />
-        <Compile Include="Dynamics\DynamicQueryable.cs" />
-        <Compile Include="Dynamics\ExpressionParser.cs" />
-        <Compile Include="Dynamics\ExtensionMethods.cs" />
-        <Compile Include="Dynamics\Grouping.cs" />
-        <Compile Include="HttpRequestExtensions.cs" />
-        <Compile Include="HttpUrlHelperExtensions.cs" />
-        <Compile Include="Install\FilePermissionHelper.cs" />
-        <Compile Include="Install\InstallHelper.cs" />
-        <Compile Include="Install\HttpInstallAuthorizeAttribute.cs" />
-        <Compile Include="Macros\PartialViewMacroController.cs" />
-        <Compile Include="Macros\PartialViewMacroEngine.cs" />
-        <Compile Include="Macros\PartialViewMacroPage.cs" />
-        <Compile Include="Media\ImageUrl.cs" />
-        <Compile Include="Media\ImageUrlProviderResolver.cs" />
-        <Compile Include="Media\ImageUrlProviders\ImageUrlProvider.cs" />
-        <Compile Include="Models\DynamicPublishedContent.cs" />
-        <Compile Include="Models\DynamicPublishedContentList.cs" />
-        <Compile Include="Models\PartialViewMacroModel.cs" />
-        <Compile Include="Models\PublishedContentBase.cs" />
-        <Compile Include="Mvc\AreaRegistrationExtensions.cs" />
-        <Compile Include="BaseRest\BaseRestHandler.cs" />
-        <Compile Include="BaseRest\MemberRest.cs" />
-        <Compile Include="BaseRest\RestExtensionAttribute.cs" />
-        <Compile Include="BaseRest\RestExtensionMethodAttribute.cs" />
-        <Compile Include="BaseRest\RestExtensionMethodInfo.cs" />
-        <Compile Include="ContextualPublishedCacheExtensions.cs" />
-        <Compile Include="Mvc\DefaultRenderMvcControllerResolver.cs" />
-        <Compile Include="Mvc\QueryStringFilterAttribute.cs" />
-        <Compile Include="PublishedCache\ContextualPublishedContentCache.cs" />
-        <Compile Include="PublishedCache\ContextualPublishedCacheOfT.cs" />
-        <Compile Include="PublishedCache\ContextualPublishedCache.cs" />
-        <Compile Include="PublishedCache\ContextualPublishedMediaCache.cs" />
-        <Compile Include="PublishedCache\PublishedCachesResolver.cs" />
-        <Compile Include="PublishedCache\IPublishedCaches.cs" />
-        <Compile Include="PublishedCache\PublishedCaches.cs" />
-        <Compile Include="PublishedCache\XmlPublishedCache\PublishedMediaCache.cs" />
-        <Compile Include="Dictionary\UmbracoCultureDictionary.cs" />
-        <Compile Include="Dictionary\UmbracoCultureDictionaryFactory.cs" />
-        <Compile Include="Mvc\MemberAuthorizeAttribute.cs" />
-        <Compile Include="Mvc\BackOfficeArea.cs" />
-        <Compile Include="Mvc\ControllerFactoryExtensions.cs" />
-        <Compile Include="Mvc\IRenderMvcController.cs" />
-        <Compile Include="Mvc\SurfaceRouteHandler.cs" />
-        <Compile Include="PublishedCache\XmlPublishedCache\RoutesCache.cs" />
-        <Compile Include="PublishedCache\XmlPublishedCache\UmbracoContextCache.cs" />
-        <Compile Include="Routing\UrlProviderMode.cs" />
-        <Compile Include="Search\ExamineIndexerModel.cs" />
-        <Compile Include="Search\LuceneIndexerExtensions.cs" />
-        <Compile Include="Security\ValidateRequestAttempt.cs" />
-        <Compile Include="Security\WebSecurity.cs" />
-        <Compile Include="UI\JavaScript\Resources.Designer.cs">
-            <AutoGen>True</AutoGen>
-            <DesignTime>True</DesignTime>
-            <DependentUpon>Resources.resx</DependentUpon>
-        </Compile>
-        <Compile Include="UI\JavaScript\ServerVariablesParser.cs" />
-        <Compile Include="Strategies\Migrations\RebuildXmlCachesAfterUpgrade.cs" />
-        <Compile Include="Strategies\PublicAccessEventHandler.cs" />
-        <Compile Include="UI\Bundles\JsApplicationLib.cs" />
-        <Compile Include="UI\Bundles\JsJQueryCore.cs" />
-        <Compile Include="UI\Bundles\JsJQueryPlugins.cs" />
-        <Compile Include="UI\Bundles\JsUmbracoApplicationCore.cs" />
-        <Compile Include="UI\Bundles\JsUmbracoApplicationUI.cs" />
-        <Compile Include="UI\Bundles\JsUmbracoTree.cs" />
-        <Compile Include="UI\CdfLogger.cs" />
-        <Compile Include="Models\LegacyNodeHelper.cs" />
-        <Compile Include="umbraco.presentation\umbraco\controls\Tree\TreeControl.ascx.cs">
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\create\simple.ascx.cs">
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\developer\Packages\directoryBrowser.aspx.cs">
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\dialogs\ProtectPage.aspx.cs">
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\dialogs\create.aspx.cs">
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\dialogs\AssignDomain2.aspx.cs">
-            <DependentUpon>AssignDomain2.aspx</DependentUpon>
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\dialogs\AssignDomain2.aspx.designer.cs">
-            <DependentUpon>AssignDomain2.aspx</DependentUpon>
-        </Compile>
-        <Compile Include="UmbracoContextExtensions.cs" />
-        <Compile Include="umbraco.presentation\umbraco\settings\stylesheet\editstylesheet.aspx.cs">
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\settings\stylesheet\property\EditStyleSheetProperty.aspx.cs">
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="Controllers\UmbLoginController.cs" />
-        <Compile Include="umbraco.presentation\umbraco\Trees\TranslateTreeNames.cs" />
-        <Compile Include="UrlHelperExtensions.cs" />
-        <Compile Include="Editors\MediaController.cs" />
-        <Compile Include="UrlHelperRenderExtensions.cs" />
-        <Compile Include="WebApi\Binders\ContentItemBaseBinder.cs" />
-        <Compile Include="WebApi\IsBackOfficeAttribute.cs" />
-        <Compile Include="WebApi\Binders\ContentItemBinder.cs" />
-        <Compile Include="WebApi\Binders\MediaItemBinder.cs" />
-        <Compile Include="WebApi\Filters\EnsureUserPermissionForContentAttribute.cs" />
-        <Compile Include="WebApi\Filters\ContentItemValidationHelper.cs" />
-        <Compile Include="WebApi\Filters\EnsureUserPermissionForMediaAttribute.cs" />
-        <Compile Include="WebApi\Filters\FileUploadCleanupFilterAttribute.cs" />
-        <Compile Include="WebApi\Filters\FilterAllowedOutgoingContentAttribute.cs" />
-        <Compile Include="WebApi\Filters\FilterAllowedOutgoingMediaAttribute.cs" />
-        <Compile Include="WebApi\Filters\HttpQueryStringFilterAttribute.cs" />
-        <Compile Include="WebApi\Filters\OutgoingDateTimeFormatAttribute.cs" />
-        <Compile Include="WebApi\Filters\UmbracoApplicationAuthorizeAttribute.cs" />
-        <Compile Include="WebApi\GuidNoHyphenConverter.cs" />
-        <Compile Include="WebApi\HttpRequestMessageExtensions.cs" />
-        <Compile Include="WebApi\JsonCamelCaseFormatter.cs" />
-        <Compile Include="WebApi\MemberAuthorizeAttribute.cs" />
-        <Compile Include="WebApi\MvcVersionCheck.cs" />
-        <Compile Include="WebApi\NamespaceHttpControllerSelector.cs" />
-        <Compile Include="WebApi\PrefixlessBodyModelValidator.cs" />
-        <Compile Include="WebApi\PrefixlessBodyModelValidatorAttribute.cs" />
-        <Compile Include="WebApi\SessionHttpControllerRouteHandler.cs" />
-        <Compile Include="WebApi\UmbracoApiController.cs" />
-        <Compile Include="WebApi\UmbracoApiControllerBase.cs" />
-        <Compile Include="WebApi\UmbracoApiControllerResolver.cs" />
-        <Compile Include="Mvc\UmbracoAuthorizeAttribute.cs" />
-        <Compile Include="Mvc\NotChildAction.cs" />
-        <Compile Include="Mvc\UmbracoAuthorizedController.cs" />
-        <Compile Include="Mvc\UmbracoController.cs" />
-        <Compile Include="Mvc\UmbracoControllerFactory.cs" />
-        <Compile Include="Mvc\UmbracoMvcHandler.cs" />
-        <Compile Include="Mvc\UmbracoViewPageOfTModel.cs" />
-        <Compile Include="PublishedCache\IPublishedCache.cs" />
-        <Compile Include="PublishedCache\IPublishedContentCache.cs" />
-        <Compile Include="PublishedCache\IPublishedMediaCache.cs" />
-        <Compile Include="PublishedContentExtensions.cs" />
-        <Compile Include="ExamineExtensions.cs" />
-        <Compile Include="FormlessPage.cs">
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="HtmlHelperRenderExtensions.cs" />
-        <Compile Include="Scheduling\Scheduler.cs" />
-        <Compile Include="Media\EmbedProviders\AbstractOEmbedProvider.cs" />
-        <Compile Include="Media\EmbedProviders\AbstractProvider.cs" />
-        <Compile Include="Media\EmbedProviders\OEmbedRich.cs" />
-        <Compile Include="Media\EmbedProviders\OEmbedVideo.cs" />
-        <Compile Include="Media\EmbedProviders\Settings\Dictionary.cs" />
-        <Compile Include="Media\EmbedProviders\Settings\String.cs" />
-        <Compile Include="Media\EmbedProviders\Twitgoo.cs" />
-        <Compile Include="ModelStateExtensions.cs" />
-        <Compile Include="Mvc\HtmlTagWrapper.cs" />
-        <Compile Include="Mvc\HtmlTagWrapperTextNode.cs" />
-        <Compile Include="Mvc\IHtmlTagWrapper.cs" />
-        <Compile Include="Mvc\MergeModelStateToChildActionAttribute.cs" />
-        <Compile Include="Mvc\PluginController.cs" />
-        <Compile Include="Mvc\PluginViewEngine.cs" />
-        <Compile Include="Mvc\PostedDataProxyInfo.cs" />
-        <Compile Include="Mvc\RedirectToUmbracoPageResult.cs" />
-        <Compile Include="Mvc\Strings.Designer.cs">
-            <AutoGen>True</AutoGen>
-            <DesignTime>True</DesignTime>
-            <DependentUpon>Strings.resx</DependentUpon>
-        </Compile>
-        <Compile Include="Mvc\SurfaceController.cs" />
-        <Compile Include="Mvc\PluginControllerArea.cs" />
-        <Compile Include="Mvc\PluginControllerAttribute.cs" />
-        <Compile Include="Mvc\SurfaceControllerFactory.cs" />
-        <Compile Include="Mvc\PluginControllerMetadata.cs" />
-        <Compile Include="Mvc\UmbracoPageResult.cs" />
-        <Compile Include="PropertyEditors\ValueConverters\RteMacroRenderingValueConverter.cs" />
-        <Compile Include="RenderFieldCaseType.cs" />
-        <Compile Include="RenderFieldEncodingType.cs" />
-        <Compile Include="RouteCollectionExtensions.cs" />
-        <Compile Include="Routing\AliasUrlProvider.cs" />
-        <Compile Include="Routing\ContentFinderByLegacy404.cs" />
-        <Compile Include="Routing\ContentFinderByNotFoundHandler.cs" />
-        <Compile Include="Routing\ContentFinderByPageIdQuery.cs" />
-        <Compile Include="Mvc\SurfaceControllerResolver.cs" />
-        <Compile Include="Routing\ContentFinderByNotFoundHandlers.cs" />
-        <Compile Include="Routing\ISiteDomainHelper.cs" />
-        <Compile Include="Routing\RoutableAttemptEventArgs.cs" />
-        <Compile Include="Routing\DefaultUrlProvider.cs" />
-        <Compile Include="Routing\DomainAndUri.cs" />
-        <Compile Include="Routing\IUrlProvider.cs" />
-        <Compile Include="Routing\SiteDomainHelper.cs" />
-        <Compile Include="Routing\SiteDomainHelperResolver.cs" />
-        <Compile Include="Routing\UrlProviderResolver.cs" />
-        <Compile Include="Routing\NotFoundHandlerHelper.cs" />
-        <Compile Include="Routing\EnsureRoutableOutcome.cs" />
-        <Compile Include="Security\LegacyDefaultAppMapping.cs" />
-        <Compile Include="Routing\PublishedContentRequestEngine.cs" />
-        <Compile Include="Routing\UrlProvider.cs" />
-        <Compile Include="Routing\WebServicesRouteConstraint.cs" />
-        <Compile Include="Search\ExamineSearcherModel.cs" />
-        <Compile Include="Search\ExamineEvents.cs" />
-        <Compile Include="Strategies\DataTypes\LegacyUploadFieldWorkaround.cs" />
-        <Compile Include="Strategies\Migrations\PublishAfterUpgradeToVersionSixth.cs" />
-        <Compile Include="Strategies\LegacyClasses.cs" />
-        <Compile Include="Strategies\Migrations\EnsureAppsTreesUpdatedOnUpgrade.cs" />
-        <Compile Include="Strategies\ServerRegistrationEventHandler.cs" />
-        <Compile Include="Templates\TemplateRenderer.cs" />
-        <Compile Include="Templates\TemplateUtilities.cs" />
-        <Compile Include="Trees\PartialViewMacrosTreeController.cs" />
-        <Compile Include="Trees\PartialViewsTreeController.cs" />
-        <Compile Include="UI\Controls\InsertMacroSplitButton.cs" />
-        <Compile Include="UI\IAssignedApp.cs" />
-        <Compile Include="UI\LegacyDialogHandler.cs" />
-        <Compile Include="UI\LegacyDialogTask.cs" />
-        <Compile Include="UI\Controls\ProgressBar.cs" />
-        <Compile Include="UI\Controls\UmbracoControl.cs" />
-        <Compile Include="UI\Controls\UmbracoUserControl.cs">
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="UI\Pages\BasePage.cs">
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="UI\Pages\ClientTools.cs" />
-        <Compile Include="UI\Pages\UmbracoEnsuredPage.cs">
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="UI\SpeechBubbleIcon.cs" />
-        <Compile Include="umbraco.presentation\AttributeCollectionAdapter.cs" />
-        <Compile Include="umbraco.presentation\Default.aspx.cs">
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\MacroCacheContent.cs" />
-        <Compile Include="umbraco.presentation\ScriptingMacroResult.cs" />
-        <Compile Include="umbraco.presentation\umbraco\dialogs\sort.aspx.cs">
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\macroResultWrapper.aspx.cs">
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\masterpages\default.Master.cs">
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\publishStatus.aspx.cs">
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\Default.aspx.cs">
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\tree.aspx.cs">
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\ping.aspx.cs">
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\developer\Macros\editMacro.aspx.cs">
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\developer\Python\editPython.aspx.cs">
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\developer\Xslt\editXslt.aspx.cs">
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\dialogs\editMacro.aspx.cs">
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\dialogs\umbracoField.aspx.cs">
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\dialogs\treePicker.aspx.cs">
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\masterpages\umbracoPage.master.cs">
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\masterpages\umbracoDialog.master.cs">
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\nodeFactory\UmbracoSiteMapProviderAccessUpdate.cs" />
-        <Compile Include="umbraco.presentation\umbraco\Search\QuickSearch.ascx.cs">
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\settings\modals\ShowUmbracoTags.aspx.cs">
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\templateControls\Image.cs" />
-        <Compile Include="umbraco.presentation\umbraco\uQuery\IGetProperty.cs" />
-        <Compile Include="umbraco.presentation\XsltExtensionAttribute.cs" />
-        <Compile Include="UmbracoHelper.cs" />
-        <Compile Include="Mvc\ViewContextExtensions.cs" />
-        <Compile Include="Mvc\ViewDataContainerExtensions.cs" />
-        <Compile Include="PublishedCache\XmlPublishedCache\PublishedContentCache.cs" />
-        <Compile Include="Routing\PublishedContentNotFoundHandler.cs" />
-        <Compile Include="PublishedCache\XmlPublishedCache\XmlPublishedContent.cs" />
-        <Compile Include="PublishedCache\XmlPublishedCache\XmlPublishedProperty.cs" />
-        <Compile Include="Mvc\Constants.cs" />
-        <Compile Include="Mvc\FilteredControllerFactoriesResolver.cs" />
-        <Compile Include="Mvc\IFilteredControllerFactory.cs" />
-        <Compile Include="Mvc\MasterControllerFactory.cs" />
-        <Compile Include="Mvc\RenderActionInvoker.cs" />
-        <Compile Include="Mvc\RenderControllerFactory.cs" />
-        <Compile Include="Models\RenderModel.cs" />
-        <Compile Include="Mvc\RenderModelBinder.cs" />
-        <Compile Include="Mvc\RenderMvcController.cs" />
-        <Compile Include="Mvc\RenderRouteHandler.cs" />
-        <Compile Include="Mvc\RenderViewEngine.cs" />
-        <Compile Include="Mvc\UmbracoTemplatePage.cs" />
-        <Compile Include="Mvc\RouteDefinition.cs" />
-        <Compile Include="Mvc\RouteValueDictionaryExtensions.cs" />
-        <Compile Include="umbraco.presentation\umbraco\nodeFactory\Node.cs" />
-        <Compile Include="umbraco.presentation\umbraco\nodeFactory\Nodes.cs" />
-        <Compile Include="umbraco.presentation\umbraco\nodeFactory\Property.cs" />
-        <Compile Include="Routing\UmbracoRequestEventArgs.cs" />
-        <Compile Include="UmbracoUserControl.cs">
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="WebApi\UmbracoAuthorizeAttribute.cs" />
-        <Compile Include="WebApi\UmbracoAuthorizedApiController.cs" />
-        <Compile Include="WebApi\Filters\ValidationFilterAttribute.cs" />
-        <Compile Include="WebApi\Filters\UmbracoUserTimeoutFilterAttribute.cs" />
-        <Compile Include="WebApi\UnhandedExceptionLoggerConfigurationAttribute.cs" />
-        <Compile Include="WebApi\UnhandledExceptionLogger.cs" />
-        <Compile Include="WebApi\WebApiHelper.cs" />
-        <Compile Include="WebBootManager.cs" />
-        <Compile Include="Routing\LegacyRequestInitializer.cs" />
-        <Compile Include="Mvc\ControllerExtensions.cs" />
-        <Compile Include="Routing\ContentLastChanceFinderResolver.cs" />
-        <Compile Include="Routing\ContentFinderByUrlAlias.cs" />
-        <Compile Include="Media\ThumbnailProviders\AbstractThumbnailProvider.cs" />
-        <Compile Include="Media\ThumbnailProviders\MediaTypeIconThumbnailProvider.cs" />
-        <Compile Include="Media\ThumbnailProviders\FileExtensionIconThumbnailProvider.cs" />
-        <Compile Include="Media\ThumbnailProviders\ImageThumbnailProvider.cs" />
-        <Compile Include="Media\ThumbnailProviders\ThumbnailProvidersResolver.cs" />
-        <Compile Include="UI\Controls\FolderBrowser.cs" />
-        <Compile Include="Routing\ContentFinderByIdPath.cs" />
-        <Compile Include="Routing\ContentFinderByNiceUrl.cs" />
-        <Compile Include="Routing\ContentFinderByNiceUrlAndTemplate.cs" />
-        <Compile Include="Routing\ContentFinderByProfile.cs" />
-        <Compile Include="PluginManagerExtensions.cs" />
-        <Compile Include="Routing\DomainHelper.cs" />
-        <Compile Include="Routing\ContentFinderResolver.cs" />
-        <Compile Include="Routing\PublishedContentRequest.cs" />
-        <Compile Include="Routing\IContentFinder.cs" />
-        <Compile Include="Routing\RoutingContext.cs" />
-        <Compile Include="umbraco.presentation\EnsureSystemPathsApplicationStartupHandler.cs" />
-        <Compile Include="Properties\AssemblyInfo.cs">
-            <SubType>Code</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\BasePageExtensions.cs" />
-        <Compile Include="umbraco.presentation\content.cs">
-            <SubType>Code</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\helper.cs">
-            <SubType>Code</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\item.cs">
-            <SubType>Code</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\keepAliveService.cs">
-            <SubType>Code</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\library.cs">
-            <SubType>Code</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\macro.cs" />
-        <Compile Include="umbraco.presentation\page.cs">
-            <SubType>Code</SubType>
-        </Compile>
-        <Compile Include="Properties\Settings1.Designer.cs">
-            <AutoGen>True</AutoGen>
-            <DesignTimeSharedInput>True</DesignTimeSharedInput>
-            <DependentUpon>Settings.settings</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\publishingService.cs">
-            <SubType>Code</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\PublishQueue.cs" />
-        <Compile Include="umbraco.presentation\python.cs" />
-        <Compile Include="umbraco.presentation\NotFoundHandlers.cs">
-            <SubType>Code</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\requestModule.cs">
-            <SubType>Code</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\showField.cs">
-            <SubType>Code</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\template.cs">
-            <SubType>Code</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\UmbracoContext.cs" />
-        <Compile Include="umbraco.presentation\UmbracoPage.cs">
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbracoPageHolder.cs">
-            <SubType>Code</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\UmbracoRequest.cs">
-            <SubType>Code</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\UmbracoResponse.cs">
-            <SubType>Code</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\UmbracoServerUtility.cs" />
-        <Compile Include="umbraco.presentation\umbraco\actions\delete.aspx.cs">
-            <DependentUpon>delete.aspx</DependentUpon>
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\actions\delete.aspx.designer.cs">
-            <DependentUpon>delete.aspx</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\actions\editContent.aspx.cs">
-            <DependentUpon>editContent.aspx</DependentUpon>
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\actions\editContent.aspx.designer.cs">
-            <DependentUpon>editContent.aspx</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\actions\preview.aspx.cs">
-            <DependentUpon>preview.aspx</DependentUpon>
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\actions\preview.aspx.designer.cs">
-            <DependentUpon>preview.aspx</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\actions\publish.aspx.cs">
-            <DependentUpon>publish.aspx</DependentUpon>
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\actions\publish.aspx.designer.cs">
-            <DependentUpon>publish.aspx</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\controls\ContentControl.cs" />
-        <Compile Include="umbraco.presentation\umbraco\controls\ContentPicker.cs" />
-        <Compile Include="umbraco.presentation\umbraco\controls\ContentTypeControl.cs" />
-        <Compile Include="umbraco.presentation\umbraco\controls\Images\ImageViewer.ascx.cs">
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\controls\dualSelectBox.cs" />
-        <Compile Include="umbraco.presentation\umbraco\controls\GenericValidation.cs" />
-        <Compile Include="umbraco.presentation\umbraco\controls\LabelButton.cs" />
-        <Compile Include="umbraco.presentation\umbraco\controls\macroParameterControl.cs" />
-        <Compile Include="umbraco.presentation\umbraco\controls\ProgressBar.ascx.cs">
-            <DependentUpon>ProgressBar.ascx</DependentUpon>
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\controls\ProgressBar.ascx.designer.cs">
-            <DependentUpon>ProgressBar.ascx</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\controls\SaveClickEventArgs.cs" />
-        <Compile Include="umbraco.presentation\umbraco\controls\Tree\CustomTreeControl.cs">
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\controls\Tree\CustomTreeService.cs">
-            <SubType>Component</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\controls\Tree\JTreeContextMenu.cs" />
-        <Compile Include="umbraco.presentation\umbraco\controls\Tree\JTreeContextMenuItem.cs" />
-        <Compile Include="umbraco.presentation\umbraco\controls\Tree\NodeInfo.cs">
-            <SubType>Code</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\create\CreatedPackageTasks.cs" />
-        <Compile Include="umbraco.presentation\umbraco\create\dictionaryTasks.cs" />
-        <Compile Include="umbraco.presentation\umbraco\create\macroTasks.cs" />
-        <Compile Include="umbraco.presentation\umbraco\create\MemberGroupTasks.cs" />
-        <Compile Include="umbraco.presentation\umbraco\create\stylesheetPropertyTasks.cs" />
-        <Compile Include="umbraco.presentation\umbraco\create\StylesheetTasks.cs" />
-        <Compile Include="umbraco.presentation\umbraco\create\XsltTasks.cs" />
-        <Compile Include="umbraco.presentation\umbraco\dashboard\FeedProxy.aspx.cs">
-            <DependentUpon>FeedProxy.aspx</DependentUpon>
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\dashboard\FeedProxy.aspx.designer.cs">
-            <DependentUpon>FeedProxy.aspx</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\EditRelationType.aspx.cs">
-            <DependentUpon>EditRelationType.aspx</DependentUpon>
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\EditRelationType.aspx.designer.cs">
-            <DependentUpon>EditRelationType.aspx</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\NewRelationType.aspx.cs">
-            <DependentUpon>NewRelationType.aspx</DependentUpon>
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\NewRelationType.aspx.designer.cs">
-            <DependentUpon>NewRelationType.aspx</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\ReadOnlyRelation.cs" />
-        <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\RelationTypesWebService.asmx.cs">
-            <DependentUpon>RelationTypesWebService.asmx</DependentUpon>
-            <SubType>Component</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\TreeMenu\ActionDeleteRelationType.cs" />
-        <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\TreeMenu\ActionNewRelationType.cs" />
-        <Compile Include="umbraco.presentation\umbraco\dialogs\Preview.aspx.cs">
-            <DependentUpon>Preview.aspx</DependentUpon>
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\dialogs\Preview.aspx.designer.cs">
-            <DependentUpon>Preview.aspx</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\members\MemberSearch.ascx.cs">
-            <DependentUpon>MemberSearch.ascx</DependentUpon>
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\members\MemberSearch.ascx.designer.cs">
-            <DependentUpon>MemberSearch.ascx</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\nodeFactory\Page_Legacy.cs" />
-        <Compile Include="umbraco.presentation\umbraco\preview\PreviewContent.cs" />
-        <Compile Include="umbraco.presentation\umbraco\Search\ExamineEvents.cs" />
-        <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltVisualize.aspx.cs">
-            <DependentUpon>xsltVisualize.aspx</DependentUpon>
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltVisualize.aspx.designer.cs">
-            <DependentUpon>xsltVisualize.aspx</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\dialogs\insertMasterpageContent.aspx.cs">
-            <DependentUpon>insertMasterpageContent.aspx</DependentUpon>
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\dialogs\insertMasterpageContent.aspx.designer.cs">
-            <DependentUpon>insertMasterpageContent.aspx</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\dialogs\insertMasterpagePlaceholder.aspx.cs">
-            <DependentUpon>insertMasterpagePlaceholder.aspx</DependentUpon>
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\dialogs\insertMasterpagePlaceholder.aspx.designer.cs">
-            <DependentUpon>insertMasterpagePlaceholder.aspx</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\dialogs\republish.aspx.cs">
-            <DependentUpon>republish.aspx</DependentUpon>
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\dialogs\republish.aspx.designer.cs">
-            <DependentUpon>republish.aspx</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\dialogs\search.aspx.cs">
-            <DependentUpon>search.aspx</DependentUpon>
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\dialogs\search.aspx.designer.cs">
-            <DependentUpon>search.aspx</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\dialogs\SendPublish.aspx.cs">
-            <DependentUpon>SendPublish.aspx</DependentUpon>
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\dialogs\SendPublish.aspx.designer.cs">
-            <DependentUpon>SendPublish.aspx</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\create\dialogHandler_temp.cs">
-            <SubType>Code</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\create\languageTasks.cs">
-            <SubType>Code</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\developer\Macros\assemblyBrowser.aspx.cs">
-            <DependentUpon>assemblyBrowser.aspx</DependentUpon>
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\developer\Macros\assemblyBrowser.aspx.designer.cs">
-            <DependentUpon>assemblyBrowser.aspx</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\developer\Packages\editPackage.aspx.cs">
-            <DependentUpon>editPackage.aspx</DependentUpon>
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\developer\Packages\editPackage.aspx.designer.cs">
-            <DependentUpon>editPackage.aspx</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\developer\Xslt\getXsltStatus.asmx.cs">
-            <DependentUpon>getXsltStatus.asmx</DependentUpon>
-            <SubType>Component</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltChooseExtension.aspx.cs">
-            <DependentUpon>xsltChooseExtension.aspx</DependentUpon>
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltChooseExtension.aspx.designer.cs">
-            <DependentUpon>xsltChooseExtension.aspx</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltInsertValueOf.aspx.cs">
-            <DependentUpon>xsltInsertValueOf.aspx</DependentUpon>
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltInsertValueOf.aspx.designer.cs">
-            <DependentUpon>xsltInsertValueOf.aspx</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\dialogs\exportDocumenttype.aspx.cs">
-            <DependentUpon>exportDocumenttype.aspx</DependentUpon>
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\dialogs\importDocumenttype.aspx.cs">
-            <DependentUpon>importDocumenttype.aspx</DependentUpon>
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\dialogs\rollBack.aspx.cs">
-            <DependentUpon>rollBack.aspx</DependentUpon>
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\dialogs\rollBack.aspx.designer.cs">
-            <DependentUpon>rollBack.aspx</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\dialogs\sendToTranslation.aspx.cs">
-            <DependentUpon>sendToTranslation.aspx</DependentUpon>
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\dialogs\sendToTranslation.aspx.designer.cs">
-            <DependentUpon>sendToTranslation.aspx</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\dialogs\viewAuditTrail.aspx.cs">
-            <DependentUpon>viewAuditTrail.aspx</DependentUpon>
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\dialogs\viewAuditTrail.aspx.designer.cs">
-            <DependentUpon>viewAuditTrail.aspx</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\members\EditMemberGroup.aspx.cs">
-            <DependentUpon>EditMemberGroup.aspx</DependentUpon>
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\members\EditMemberGroup.aspx.designer.cs">
-            <DependentUpon>EditMemberGroup.aspx</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\members\search.aspx.cs">
-            <DependentUpon>search.aspx</DependentUpon>
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\members\search.aspx.designer.cs">
-            <DependentUpon>search.aspx</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\members\ViewMembers.aspx.cs">
-            <DependentUpon>ViewMembers.aspx</DependentUpon>
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\members\ViewMembers.aspx.designer.cs">
-            <DependentUpon>ViewMembers.aspx</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\nodeFactory\Properties.cs">
-            <SubType>Code</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\nodeFactory\UmbracoSiteMapProvider.cs" />
-        <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\GzipCompressor.cs" />
-        <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\GzipModule.cs" />
-        <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\IModule.cs" />
-        <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\JSON.cs" />
-        <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\JSONReader.cs" />
-        <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\JSONWriter.cs" />
-        <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\tinymce3tinymceCompress.aspx.cs">
-            <DependentUpon>tinymce3tinymceCompress.aspx</DependentUpon>
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\tinymce3tinymceCompress.aspx.designer.cs">
-            <DependentUpon>tinymce3tinymceCompress.aspx</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\Search\QuickSearchHandler.ashx.cs">
-            <DependentUpon>QuickSearchHandler.ashx</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\settings\DictionaryItemList.aspx.cs">
-            <DependentUpon>DictionaryItemList.aspx</DependentUpon>
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\settings\DictionaryItemList.aspx.designer.cs">
-            <DependentUpon>DictionaryItemList.aspx</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\settings\editLanguage.aspx.cs">
-            <DependentUpon>editLanguage.aspx</DependentUpon>
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\settings\editLanguage.aspx.designer.cs">
-            <DependentUpon>editLanguage.aspx</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\templateControls\Script.cs" />
-        <Compile Include="umbraco.presentation\umbraco\Trees\BaseMediaTree.cs" />
-        <Compile Include="umbraco.presentation\umbraco\Trees\loadDLRScripts.cs" />
-        <Compile Include="umbraco.presentation\umbraco\Trees\ITreeService.cs">
-            <SubType>Code</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\Trees\loadRelationTypes.cs" />
-        <Compile Include="umbraco.presentation\umbraco\Trees\MediaRecycleBin.cs" />
-        <Compile Include="umbraco.presentation\umbraco\Trees\NodeActionsEventArgs.cs" />
-        <Compile Include="umbraco.presentation\umbraco\Trees\TreeEventArgs.cs" />
-        <Compile Include="umbraco.presentation\umbraco\Trees\TreeRequestParams.cs" />
-        <Compile Include="umbraco.presentation\umbraco\uQuery\ContentExtensions.cs" />
-        <Compile Include="umbraco.presentation\umbraco\uQuery\ContentTypeExtensions.cs" />
-        <Compile Include="umbraco.presentation\umbraco\uQuery\DocumentExtensions.cs" />
-        <Compile Include="umbraco.presentation\umbraco\uQuery\MediaExtensions.cs" />
-        <Compile Include="umbraco.presentation\umbraco\uQuery\MemberExtensions.cs" />
-        <Compile Include="umbraco.presentation\umbraco\uQuery\NodeExtensions.cs" />
-        <Compile Include="umbraco.presentation\umbraco\uQuery\PreValueExtensions.cs" />
-        <Compile Include="umbraco.presentation\umbraco\uQuery\RelationTypeExtensions.cs" />
-        <Compile Include="umbraco.presentation\umbraco\uQuery\UmbracoObjectTypeExtensions.cs" />
-        <Compile Include="umbraco.presentation\umbraco\webservices\MacroContainerService.asmx.cs">
-            <DependentUpon>MacroContainerService.asmx</DependentUpon>
-            <SubType>Component</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\webservices\TagsAutoCompleteHandler.ashx.cs">
-            <DependentUpon>TagsAutoCompleteHandler.ashx</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\webservices\TreeClientService.asmx.cs">
-            <DependentUpon>TreeClientService.asmx</DependentUpon>
-            <SubType>Component</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\templateControls\DisableEventValidation.cs" />
-        <Compile Include="umbraco.presentation\umbraco\templateControls\Item.cs" />
-        <Compile Include="umbraco.presentation\umbraco\templateControls\ItemRenderer.cs" />
-        <Compile Include="umbraco.presentation\umbraco\templateControls\Macro.cs" />
-        <Compile Include="umbraco.presentation\umbraco\templateControls\ContentType.cs" />
-        <Compile Include="umbraco.presentation\umbraco\templateControls\Resources.Designer.cs">
-            <AutoGen>True</AutoGen>
-            <DesignTime>True</DesignTime>
-            <DependentUpon>Resources.resx</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\translation\default.aspx.cs">
-            <DependentUpon>default.aspx</DependentUpon>
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\translation\default.aspx.designer.cs">
-            <DependentUpon>default.aspx</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\translation\details.aspx.cs">
-            <DependentUpon>details.aspx</DependentUpon>
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\translation\details.aspx.designer.cs">
-            <DependentUpon>details.aspx</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\translation\preview.aspx.cs">
-            <DependentUpon>preview.aspx</DependentUpon>
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\translation\preview.aspx.designer.cs">
-            <DependentUpon>preview.aspx</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\translation\xml.aspx.cs">
-            <DependentUpon>xml.aspx</DependentUpon>
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\translation\xml.aspx.designer.cs">
-            <DependentUpon>xml.aspx</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\treeInit.aspx.cs">
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\Trees\BaseContentTree.cs" />
-        <Compile Include="umbraco.presentation\umbraco\Trees\BaseTree.cs" />
-        <Compile Include="umbraco.presentation\umbraco\Trees\ContentRecycleBin.cs" />
-        <Compile Include="umbraco.presentation\umbraco\Trees\FileSystemTree.cs" />
-        <Compile Include="umbraco.presentation\umbraco\Trees\loadContent.cs" />
-        <Compile Include="umbraco.presentation\umbraco\Trees\loadcontentItemType.cs" />
-        <Compile Include="umbraco.presentation\umbraco\Trees\loadDataTypes.cs" />
-        <Compile Include="umbraco.presentation\umbraco\Trees\loadLanguages.cs" />
-        <Compile Include="umbraco.presentation\umbraco\Trees\loadMacros.cs" />
-        <Compile Include="umbraco.presentation\umbraco\Trees\loadMedia.cs" />
-        <Compile Include="umbraco.presentation\umbraco\Trees\loadMediaTypes.cs" />
-        <Compile Include="umbraco.presentation\umbraco\Trees\loadMemberGroups.cs" />
-        <Compile Include="umbraco.presentation\umbraco\Trees\loadMembers.cs" />
-        <Compile Include="umbraco.presentation\umbraco\Trees\loadMemberTypes.cs" />
-        <Compile Include="umbraco.presentation\umbraco\Trees\loadNodeTypes.cs" />
-        <Compile Include="umbraco.presentation\umbraco\Trees\loadPython.cs" />
-        <Compile Include="umbraco.presentation\umbraco\Trees\loadScripts.cs" />
-        <Compile Include="umbraco.presentation\umbraco\Trees\loadStylesheetProperty.cs" />
-        <Compile Include="umbraco.presentation\umbraco\Trees\loadStylesheets.cs" />
-        <Compile Include="umbraco.presentation\umbraco\Trees\loadTemplates.cs" />
-        <Compile Include="umbraco.presentation\umbraco\Trees\loadTranslationTasks.cs" />
-        <Compile Include="umbraco.presentation\umbraco\Trees\loadUsers.cs" />
-        <Compile Include="umbraco.presentation\umbraco\Trees\loadXslt.cs" />
-        <Compile Include="umbraco.presentation\umbraco\Trees\NullTree.cs" />
-        <Compile Include="umbraco.presentation\umbraco\Trees\LegacyTree.cs" />
-        <Compile Include="umbraco.presentation\umbraco\webservices\TreeDataService.ashx.cs">
-            <DependentUpon>TreeDataService.ashx</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\Trees\TreeDefinitionCollection.cs" />
-        <Compile Include="umbraco.presentation\umbraco\Trees\TreeDefinition.cs" />
-        <Compile Include="umbraco.presentation\umbraco\Trees\TreeDialogModes.cs" />
-        <Compile Include="umbraco.presentation\umbraco\Trees\TreeService.cs" />
-        <Compile Include="umbraco.presentation\umbraco\Trees\XmlTree.cs">
-            <DependentUpon>XmlTree.xsd</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\urlRewriter\UrlRewriterFormWriter.cs" />
-        <Compile Include="umbraco.presentation\umbraco\webservices\ajaxHelpers.cs" />
-        <Compile Include="umbraco.presentation\umbraco\webservices\CacheRefresher.asmx.cs">
-            <DependentUpon>CacheRefresher.asmx</DependentUpon>
-            <SubType>Component</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\webservices\CheckForUpgrade.asmx.cs">
-            <DependentUpon>CheckForUpgrade.asmx</DependentUpon>
-            <SubType>Component</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\webservices\CMSNode.asmx.cs">
-            <DependentUpon>CMSNode.asmx</DependentUpon>
-            <SubType>Component</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\webservices\codeEditorSave.asmx.cs">
-            <DependentUpon>codeEditorSave.asmx</DependentUpon>
-            <SubType>Component</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\webservices\legacyAjaxCalls.asmx.cs">
-            <DependentUpon>legacyAjaxCalls.asmx</DependentUpon>
-            <SubType>Component</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\webservices\nodeSorter.asmx.cs">
-            <DependentUpon>nodeSorter.asmx</DependentUpon>
-            <SubType>Component</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\webservices\progressStatus.asmx.cs">
-            <DependentUpon>progressStatus.asmx</DependentUpon>
-            <SubType>Component</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\webservices\publication.asmx.cs">
-            <DependentUpon>publication.asmx</DependentUpon>
-            <SubType>Component</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\webservices\RegexComWebservice.cs" />
-        <Compile Include="umbraco.presentation\umbraco\Web\UI\ContentPage.cs">
-            <SubType>ASPXCodeBehind</SubType>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery.cs" />
-        <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Content.cs">
-            <DependentUpon>uQuery.cs</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-DataTypes.cs">
-            <DependentUpon>uQuery.cs</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Dictionary.cs">
-            <DependentUpon>uQuery.cs</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Document.cs">
-            <DependentUpon>uQuery.cs</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Media.cs">
-            <DependentUpon>uQuery.cs</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Members.cs">
-            <DependentUpon>uQuery.cs</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Nodes.cs">
-            <DependentUpon>uQuery.cs</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-PreValues.cs">
-            <DependentUpon>uQuery.cs</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-UmbracoObjectType.cs">
-            <DependentUpon>uQuery.cs</DependentUpon>
-        </Compile>
-        <Compile Include="umbraco.presentation\viewstateMoverModule.cs" />
-        <Compile Include="UmbracoApplication.cs" />
-        <Compile Include="UmbracoContext.cs" />
-        <Compile Include="UmbracoModule.cs" />
-        <Compile Include="UriUtility.cs" />
-        <Compile Include="Web References\org.umbraco.update\Reference.cs">
-            <AutoGen>True</AutoGen>
-            <DesignTime>True</DesignTime>
-            <DependentUpon>Reference.map</DependentUpon>
-        </Compile>
-        <Compile Include="WebServices\BulkPublishController.cs" />
-        <Compile Include="WebServices\CoreStringsController.cs" />
-        <Compile Include="WebServices\DomainsApiController.cs" />
-        <Compile Include="WebServices\EmbedMediaService.cs" />
-        <Compile Include="WebServices\ExamineManagementApiController.cs" />
-        <Compile Include="WebServices\TagsController.cs" />
-        <Compile Include="WebServices\UmbracoAuthorizedHttpHandler.cs" />
-        <Compile Include="WebServices\SaveFileController.cs" />
-        <Compile Include="WebServices\UmbracoAuthorizedWebService.cs">
-            <SubType>Component</SubType>
-        </Compile>
-        <Compile Include="WebServices\UmbracoHttpHandler.cs" />
-        <Compile Include="WebServices\UmbracoWebService.cs">
-            <SubType>Component</SubType>
-        </Compile>
-        <Compile Include="WebServices\XmlDataIntegrityController.cs" />
-        <Compile Include="WebViewPageExtensions.cs" />
-        <None Include="..\Umbraco.Web.UI\Views\web.config">
-            <Link>Mvc\web.config</Link>
-        </None>
-        <None Include="packages.config" />
-        <None Include="Web References\org.umbraco.our\Reference.map">
-            <Generator>MSDiscoCodeGenerator</Generator>
-            <LastGenOutput>Reference.cs</LastGenOutput>
-        </None>
-        <None Include="Web References\org.umbraco.our\repository.disco" />
-        <EmbeddedResource Include="UI\JavaScript\Main.js" />
-        <EmbeddedResource Include="UI\JavaScript\JsInitialize.js" />
-        <EmbeddedResource Include="UI\JavaScript\ServerVariables.js" />
-        <Content Include="umbraco.presentation\umbraco\controls\Tree\CustomTreeService.asmx" />
-        <Content Include="umbraco.presentation\umbraco\developer\RelationTypes\EditRelationType.aspx" />
-        <Content Include="umbraco.presentation\umbraco\developer\RelationTypes\NewRelationType.aspx" />
-        <Content Include="umbraco.presentation\umbraco\developer\RelationTypes\RelationTypesWebService.asmx" />
-        <Content Include="umbraco.presentation\umbraco\dashboard\FeedProxy.aspx" />
-        <Content Include="umbraco.presentation\umbraco\dialogs\AssignDomain2.aspx">
-            <SubType>ASPXCodeBehind</SubType>
-        </Content>
-        <Content Include="umbraco.presentation\umbraco\members\MemberSearch.ascx">
-            <SubType>ASPXCodeBehind</SubType>
-        </Content>
-        <Content Include="umbraco.presentation\umbraco\dialogs\Preview.aspx" />
-        <Content Include="umbraco.presentation\umbraco\controls\ProgressBar.ascx">
-            <SubType>ASPXCodeBehind</SubType>
-        </Content>
-        <Content Include="umbraco.presentation\umbraco\actions\delete.aspx" />
-        <Content Include="umbraco.presentation\umbraco\actions\editContent.aspx" />
-        <Content Include="umbraco.presentation\umbraco\actions\preview.aspx">
-            <SubType>ASPXCodeBehind</SubType>
-        </Content>
-        <Content Include="umbraco.presentation\umbraco\actions\publish.aspx">
-            <SubType>ASPXCodeBehind</SubType>
-        </Content>
-        <Content Include="umbraco.presentation\umbraco\webservices\MacroContainerService.asmx" />
-        <Content Include="umbraco.presentation\umbraco\developer\Xslt\xsltVisualize.aspx" />
-        <Content Include="umbraco.presentation\umbraco\dialogs\empty.htm" />
-        <Content Include="umbraco.presentation\umbraco\dialogs\republish.aspx">
-            <SubType>ASPXCodeBehind</SubType>
-        </Content>
-        <Content Include="umbraco.presentation\umbraco\dialogs\search.aspx" />
-        <Content Include="umbraco.presentation\umbraco\dialogs\SendPublish.aspx" />
-        <Content Include="umbraco.presentation\umbraco\webservices\TreeClientService.asmx" />
-        <Content Include="umbraco.presentation\umbraco\members\search.aspx" />
-        <Content Include="umbraco.presentation\umbraco\translation\details.aspx" />
-        <Content Include="umbraco.presentation\umbraco\developer\Packages\editPackage.aspx">
-            <SubType>ASPXCodeBehind</SubType>
-        </Content>
-        <Content Include="umbraco.presentation\umbraco\dialogs\exportDocumenttype.aspx" />
-        <Content Include="umbraco.presentation\umbraco\dialogs\importDocumenttype.aspx" />
-        <Content Include="umbraco.presentation\umbraco\dialogs\rollBack.aspx">
-            <SubType>ASPXCodeBehind</SubType>
-        </Content>
-        <Content Include="umbraco.presentation\umbraco\dialogs\sendToTranslation.aspx" />
-        <Content Include="umbraco.presentation\umbraco\dialogs\viewAuditTrail.aspx" />
-        <Content Include="umbraco.presentation\umbraco\members\ViewMembers.aspx" />
-        <Content Include="umbraco.presentation\umbraco\plugins\tinymce3\tinymce3tinymceCompress.aspx" />
-        <None Include="app.config" />
-        <None Include="Web References\org.umbraco.our\repository.wsdl" />
-        <None Include="Web References\org.umbraco.update\UpgradeResult.datasource">
-            <DependentUpon>Reference.map</DependentUpon>
-        </None>
-        <None Include="Web References\org.umbraco.update\UpgradeResult1.datasource">
-            <DependentUpon>Reference.map</DependentUpon>
-        </None>
-        <None Include="Properties\Settings.settings">
-            <Generator>SettingsSingleFileGenerator</Generator>
-            <LastGenOutput>Settings1.Designer.cs</LastGenOutput>
-        </None>
-        <Content Include="umbraco.presentation\umbraco\Search\QuickSearchHandler.ashx" />
-        <None Include="umbraco.presentation\umbraco\templateControls\InlineXslt.xsltTemplate" />
-        <Content Include="umbraco.presentation\umbraco\webservices\CheckForUpgrade.asmx" />
-        <Content Include="umbraco.presentation\umbraco\settings\DictionaryItemList.aspx">
-            <SubType>ASPXCodeBehind</SubType>
-        </Content>
-        <Content Include="umbraco.presentation\umbraco\translation\default.aspx" />
-        <Content Include="umbraco.presentation\umbraco\translation\preview.aspx" />
-        <Content Include="umbraco.presentation\umbraco\translation\xml.aspx" />
-        <Content Include="umbraco.presentation\umbraco\developer\Macros\assemblyBrowser.aspx" />
-        <Content Include="umbraco.presentation\umbraco\developer\Xslt\getXsltStatus.asmx" />
-        <Content Include="umbraco.presentation\umbraco\developer\Xslt\xsltChooseExtension.aspx" />
-        <Content Include="umbraco.presentation\umbraco\developer\Xslt\xsltInsertValueOf.aspx" />
-        <Content Include="umbraco.presentation\umbraco\members\EditMemberGroup.aspx">
-            <SubType>Form</SubType>
-        </Content>
-        <Content Include="umbraco.presentation\umbraco\schemas\umbraco.xsd">
-            <SubType>Designer</SubType>
-        </Content>
-        <Content Include="umbraco.presentation\umbraco\settings\editLanguage.aspx" />
-        <!--<Content Include="umbraco.presentation\umbraco\users\PermissionEditor.aspx" />-->
-        <Content Include="umbraco.presentation\umbraco\webservices\CacheRefresher.asmx">
-            <SubType>Form</SubType>
-        </Content>
-        <Content Include="umbraco.presentation\umbraco\webservices\CMSNode.asmx" />
-        <Content Include="umbraco.presentation\umbraco\webservices\codeEditorSave.asmx" />
-        <Content Include="umbraco.presentation\umbraco\webservices\legacyAjaxCalls.asmx" />
-        <Content Include="umbraco.presentation\umbraco\webservices\nodeSorter.asmx" />
-        <Content Include="umbraco.presentation\umbraco\webservices\progressStatus.asmx">
-            <SubType>Form</SubType>
-        </Content>
-        <Content Include="umbraco.presentation\umbraco\webservices\publication.asmx" />
-        <Content Include="umbraco.presentation\umbraco\webservices\TreeDataService.ashx" />
-        <None Include="umbraco.presentation\umbraco\Trees\Trees.cd" />
-        <None Include="umbraco.presentation\umbraco\Trees\XmlTree.xsd">
-            <SubType>
-            </SubType>
-        </None>
-        <None Include="umbraco.presentation\umbraco\Trees\XmlTree.xsx">
-            <DependentUpon>XmlTree.xsd</DependentUpon>
-        </None>
-        <Content Include="umbraco.presentation\umbraco\webservices\TagsAutoCompleteHandler.ashx" />
-        <None Include="Web References\org.umbraco.update\checkforupgrade.disco" />
-        <None Include="Web References\org.umbraco.update\checkforupgrade.wsdl" />
-        <None Include="Web References\org.umbraco.update\Reference.map">
-            <Generator>MSDiscoCodeGenerator</Generator>
-            <LastGenOutput>Reference.cs</LastGenOutput>
-        </None>
-        <EmbeddedResource Include="UI\JavaScript\Resources.resx">
-            <Generator>ResXFileCodeGenerator</Generator>
-            <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-            <SubType>Designer</SubType>
-        </EmbeddedResource>
-        <EmbeddedResource Include="Mvc\Strings.resx">
-            <Generator>ResXFileCodeGenerator</Generator>
-            <LastGenOutput>Strings.Designer.cs</LastGenOutput>
-        </EmbeddedResource>
-        <EmbeddedResource Include="umbraco.presentation\umbraco\templateControls\Resources.resx">
-            <Generator>ResXFileCodeGenerator</Generator>
-            <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-            <SubType>Designer</SubType>
-        </EmbeddedResource>
-        <None Include="umbraco.presentation\umbraco\schemas\package.xsd">
-            <SubType>
-            </SubType>
-        </None>
-        <None Include="umbraco.presentation\umbraco\schemas\package.xsx">
-            <DependentUpon>package.xsd</DependentUpon>
-        </None>
-        <None Include="umbraco.presentation\umbraco\schemas\umbraco.xsc">
-            <DependentUpon>umbraco.xsd</DependentUpon>
-        </None>
-        <None Include="umbraco.presentation\umbraco\schemas\umbraco.xss">
-            <DependentUpon>umbraco.xsd</DependentUpon>
-        </None>
-        <None Include="umbraco.presentation\umbraco\schemas\umbraco.xsx">
-            <DependentUpon>umbraco.xsd</DependentUpon>
-        </None>
-    </ItemGroup>
-    <ItemGroup>
-        <WebReferences Include="Web References\" />
-    </ItemGroup>
-    <ItemGroup>
-        <WebReferenceUrl Include="https://our.umbraco.com/umbraco/webservices/api/repository.asmx">
-            <UrlBehavior>Dynamic</UrlBehavior>
-            <RelPath>Web References\org.umbraco.our\</RelPath>
-            <UpdateFromURL>https://our.umbraco.com/umbraco/webservices/api/repository.asmx</UpdateFromURL>
-            <ServiceLocationURL>
-            </ServiceLocationURL>
-            <CachedDynamicPropName>
-            </CachedDynamicPropName>
-            <CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
-            <CachedSettingsPropName>umbraco_org_umbraco_our_Repository</CachedSettingsPropName>
-        </WebReferenceUrl>
-        <WebReferenceUrl Include="http://update.umbraco.org/checkforupgrade.asmx">
-            <UrlBehavior>Dynamic</UrlBehavior>
-            <RelPath>Web References\org.umbraco.update\</RelPath>
-            <UpdateFromURL>http://update.umbraco.org/checkforupgrade.asmx</UpdateFromURL>
-            <ServiceLocationURL>
-            </ServiceLocationURL>
-            <CachedDynamicPropName>
-            </CachedDynamicPropName>
-            <CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
-            <CachedSettingsPropName>umbraco_org_umbraco_update_CheckForUpgrade</CachedSettingsPropName>
-        </WebReferenceUrl>
-    </ItemGroup>
-    <ItemGroup>
-        <Folder Include="umbraco.presentation\umbraco\settings\scripts\" />
-    </ItemGroup>
-    <PropertyGroup>
-        <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
-        <VSToolsPath Condition="exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v11.0\WebApplications\Microsoft.WebApplication.targets')">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v11.0</VSToolsPath>
-        <VSToolsPath Condition="exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v12.0\WebApplications\Microsoft.WebApplication.targets')">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v12.0</VSToolsPath>
-        <VSToolsPath Condition="exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v14.0\WebApplications\Microsoft.WebApplication.targets')">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v14.0</VSToolsPath>
-        <VSToolsPath Condition="exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets')">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0</VSToolsPath>
-    </PropertyGroup>
-    <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-    <PropertyGroup>
-        <PreBuildEvent>
-        </PreBuildEvent>
-        <PostBuildEvent>
-        </PostBuildEvent>
-    </PropertyGroup>
-    <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
-    <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
-    <ProjectExtensions />
-    <PropertyGroup>
-        <!--<PostBuildEvent>xcopy "$(ProjectDir)..\..\lib\*.dll" "$(TargetDir)*.dll" /Y</PostBuildEvent>-->
-    </PropertyGroup>
-    <Import Project="..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets" Condition="Exists('..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets')" />
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{651E1350-91B6-44B7-BD60-7207006D7003}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>umbraco</AssemblyName>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Umbraco.Web</RootNamespace>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <StartupObject>
-    </StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <SccProjectName>
-    </SccProjectName>
-    <SccLocalPath>
-    </SccLocalPath>
-    <SccAuxPath>
-    </SccAuxPath>
-    <SccProvider>
-    </SccProvider>
-    <OldToolsVersion>4.0</OldToolsVersion>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <TargetFrameworkProfile />
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>bin\Debug\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>bin\Release\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>bin\Release\umbraco.xml</DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>pdbonly</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\UmbracoExamine\UmbracoExamine.csproj">
-      <Project>{07fbc26b-2927-4a22-8d96-d644c667fecc}</Project>
-      <Name>UmbracoExamine</Name>
-    </ProjectReference>
-    <Reference Include="AutoMapper, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
-      <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="AutoMapper.Net4, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
-      <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <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="dotless.Core, Version=1.5.2.0, Culture=neutral, PublicKeyToken=96b446c9e63eae34, processorArchitecture=MSIL">
-      <HintPath>..\packages\dotless.1.5.2\lib\dotless.Core.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="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="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>
-    <Reference Include="Lucene.Net, Version=2.9.4.1, Culture=neutral, PublicKeyToken=85089178b9ac3181, processorArchitecture=MSIL">
-      <HintPath>..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll</HintPath>
-    </Reference>
-    <Reference Include="MarkdownSharp, Version=1.14.5.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Markdown.1.14.7\lib\net45\MarkdownSharp.dll</HintPath>
-      <Private>True</Private>
-    </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.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.2\lib\net45\Microsoft.AspNet.Identity.Owin.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.AspNet.SignalR.Core, Version=2.4.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.SignalR.Core.2.4.1\lib\net45\Microsoft.AspNet.SignalR.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.CSharp" />
-    <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.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.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=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=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="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>
-      <Private>True</Private>
-    </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>
-      <Private>True</Private>
-    </Reference>
-    <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>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Semver, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\semver.1.1.2\lib\net451\Semver.dll</HintPath>
-    </Reference>
-    <Reference Include="System">
-      <Name>System</Name>
-    </Reference>
-    <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.configuration" />
-    <Reference Include="System.Data">
-      <Name>System.Data</Name>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Design" />
-    <Reference Include="System.Drawing">
-      <Name>System.Drawing</Name>
-    </Reference>
-    <Reference Include="System.EnterpriseServices" />
-    <Reference Include="System.IO.Compression.FileSystem" />
-    <Reference Include="System.Net.Http" />
-    <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.Runtime.Serialization" />
-    <Reference Include="System.Security" />
-    <Reference Include="System.ServiceModel" />
-    <Reference Include="System.Threading.Tasks.Dataflow, Version=4.6.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Threading.Tasks.Dataflow.4.9.0\lib\portable-net45+win8+wpa81\System.Threading.Tasks.Dataflow.dll</HintPath>
-    </Reference>
-    <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.Abstractions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Web.ApplicationServices" />
-    <Reference Include="System.Web.DynamicData" />
-    <Reference Include="System.Web.Entity" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Web.Extensions.Design" />
-    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
-    </Reference>
-    <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.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.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.7\lib\net45\System.Web.Razor.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Services">
-      <Name>System.Web.Services</Name>
-    </Reference>
-    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <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.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.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml">
-      <Name>System.XML</Name>
-    </Reference>
-    <Reference Include="System.Xml.Linq" />
-    <ProjectReference Include="..\SQLCE4Umbraco\SqlCE4Umbraco.csproj">
-      <Project>{5BA5425F-27A7-4677-865E-82246498AA2E}</Project>
-      <Name>SqlCE4Umbraco</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj">
-      <Project>{31785BC3-256C-4613-B2F5-A1B0BDDED8C1}</Project>
-      <Name>Umbraco.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\umbraco.controls\umbraco.controls.csproj">
-      <Project>{6EDD2061-82F2-461B-BB6E-879245A832DE}</Project>
-      <Name>umbraco.controls</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\umbraco.businesslogic\umbraco.businesslogic.csproj">
-      <Name>umbraco.businesslogic</Name>
-      <Project>{E469A9CE-1BEC-423F-AC44-713CD72457EA}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-    </ProjectReference>
-    <ProjectReference Include="..\umbraco.cms\umbraco.cms.csproj">
-      <Project>{CCD75EC3-63DB-4184-B49D-51C1DD337230}</Project>
-      <Name>umbraco.cms</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\umbraco.datalayer\umbraco.datalayer.csproj">
-      <Project>{C7CB79F0-1C97-4B33-BFA7-00731B579AE2}</Project>
-      <Name>umbraco.datalayer</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\umbraco.interfaces\umbraco.interfaces.csproj">
-      <Name>umbraco.interfaces</Name>
-      <Project>{511F6D8D-7717-440A-9A57-A507E9A8B27F}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-    </ProjectReference>
-    <ProjectReference Include="..\umbraco.providers\umbraco.providers.csproj">
-      <Project>{D7636876-0756-43CB-A192-138C6F0D5E42}</Project>
-      <Name>umbraco.providers</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\SolutionInfo.cs">
-      <Link>Properties\SolutionInfo.cs</Link>
-    </Compile>
-    <Compile Include="ApplicationContextExtensions.cs" />
-    <Compile Include="AreaRegistrationContextExtensions.cs" />
-    <Compile Include="BatchedDatabaseServerMessengerStartup.cs" />
-    <Compile Include="Cache\ApplicationCacheRefresher.cs" />
-    <Compile Include="Cache\ApplicationTreeCacheRefresher.cs" />
-    <Compile Include="Cache\CacheRefresherEventHandler.cs" />
-    <Compile Include="Cache\ContentTypeCacheRefresher.cs" />
-    <Compile Include="Cache\DataTypeCacheRefresher.cs" />
-    <Compile Include="Cache\DictionaryCacheRefresher.cs" />
-    <Compile Include="Cache\DistributedCache.cs" />
-    <Compile Include="Cache\DistributedCacheExtensions.cs" />
-    <Compile Include="Cache\DomainCacheRefresher.cs" />
-    <Compile Include="Cache\LanguageCacheRefresher.cs" />
-    <Compile Include="Cache\MacroCacheRefresher.cs" />
-    <Compile Include="Cache\MediaCacheRefresher.cs" />
-    <Compile Include="Cache\MemberCacheRefresher.cs" />
-    <Compile Include="Cache\MemberGroupCacheRefresher.cs" />
-    <Compile Include="Cache\PageCacheRefresher.cs" />
-    <Compile Include="Cache\PublicAccessCacheRefresher.cs" />
-    <Compile Include="Cache\RelationTypeCacheRefresher.cs" />
-    <Compile Include="Cache\UserGroupCacheRefresher.cs" />
-    <Compile Include="Cache\StylesheetCacheRefresher.cs" />
-    <Compile Include="Cache\StylesheetPropertyCacheRefresher.cs" />
-    <Compile Include="Cache\TemplateCacheRefresher.cs" />
-    <Compile Include="Cache\UnpublishedPageCacheRefresher.cs" />
-    <Compile Include="Cache\UserCacheRefresher.cs" />
-    <Compile Include="Editors\PreviewController.cs" />
-    <Compile Include="Editors\BackOfficeAssetsController.cs" />
-    <Compile Include="Features\DisabledFeatures.cs" />
-    <Compile Include="Editors\BackOfficeNotificationsController.cs" />
-    <Compile Include="Editors\DictionaryController.cs" />
-    <Compile Include="Editors\BackOfficeServerVariables.cs" />
-    <Compile Include="Editors\DashboardHelper.cs" />
-    <Compile Include="Editors\EditorModelEventArgs.cs" />
-    <Compile Include="Editors\EditorValidationResolver.cs" />
-    <Compile Include="Editors\EditorValidator.cs" />
-    <Compile Include="Editors\FromJsonPathAttribute.cs" />
-    <Compile Include="Editors\HelpController.cs" />
-    <Compile Include="Editors\IsCurrentUserModelFilterAttribute.cs" />
-    <Compile Include="Editors\PasswordChanger.cs" />
-    <Compile Include="Editors\TemplateController.cs" />
-    <Compile Include="Editors\ParameterSwapControllerActionSelector.cs" />
-    <Compile Include="Editors\CodeFileController.cs" />
-    <Compile Include="Editors\TourController.cs" />
-    <Compile Include="Features\EnabledFeatures.cs" />
-    <Compile Include="HealthCheck\Checks\Services\Tls12Check.cs" />
-    <Compile Include="HealthCheck\Checks\Security\XssProtectionCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Security\HstsCheck.cs" />
-    <Compile Include="Models\BackOfficeTourFilter.cs" />
-    <Compile Include="Models\ContentEditing\BackOfficePreview.cs" />
-    <Compile Include="Models\ContentEditing\DocumentTypeCollectionDisplay.cs" />
-    <Compile Include="Models\ContentEditing\NotifySetting.cs" />
-    <Compile Include="Models\Mapping\AutoMapperExtensions.cs" />
-    <Compile Include="Models\Mapping\ContentTreeNodeUrlResolver.cs" />
-    <Compile Include="Models\Mapping\MemberTreeNodeUrlResolver.cs" />
-    <Compile Include="Models\Trees\ExportMember.cs" />
-    <Compile Include="PropertyEditors\DropdownFlexiblePropertyEditor.cs" />
-    <Compile Include="TourFilterResolver.cs" />
-    <Compile Include="Editors\UserEditorAuthorizationHelper.cs" />
-    <Compile Include="Editors\UserGroupAuthorizationAttribute.cs" />
-    <Compile Include="Editors\UserGroupEditorAuthorizationHelper.cs" />
-    <Compile Include="Editors\UserGroupsController.cs" />
-    <Compile Include="Editors\UserGroupValidateAttribute.cs" />
-    <Compile Include="ExamineStartup.cs" />
-    <Compile Include="Extensions\UdiExtensions.cs" />
-    <Compile Include="Features\UmbracoFeatures.cs" />
-    <Compile Include="Features\FeaturesResolver.cs" />
-    <Compile Include="HealthCheck\Checks\Config\AbstractConfigCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Config\AcceptableConfiguration.cs" />
-    <Compile Include="HealthCheck\Checks\Config\ConfigurationService.cs" />
-    <Compile Include="HealthCheck\Checks\Config\ConfigurationServiceResult.cs" />
-    <Compile Include="HealthCheck\Checks\Config\MacroErrorsCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Config\NotificationEmailCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Config\TrySkipIisCustomErrorsCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Config\CustomErrorsCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Config\TraceCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Config\ValueComparisonType.cs" />
-    <Compile Include="HealthCheck\Checks\Config\CompilationDebugCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Security\BaseHttpHeaderCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Security\NoSniffCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Services\SmtpCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Permissions\FolderAndFilePermissionsCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Security\ExcessiveHeadersCheck.cs" />
-    <Compile Include="HealthCheck\Checks\Security\ClickJackingCheck.cs" />
-    <Compile Include="HealthCheck\HealthCheckAction.cs" />
-    <Compile Include="HealthCheck\HealthCheckNotificationMethodAttribute.cs" />
-    <Compile Include="HealthCheck\HealthCheckAttribute.cs" />
-    <Compile Include="HealthCheck\HealthCheckContext.cs" />
-    <Compile Include="HealthCheck\HealthCheckController.cs" />
-    <Compile Include="HealthCheck\HealthCheckGroup.cs" />
-    <Compile Include="HealthCheck\HealthCheckNotificationMethodResolver.cs" />
-    <Compile Include="HealthCheck\HealthCheckResolver.cs" />
-    <Compile Include="HealthCheck\HealthCheck.cs" />
-    <Compile Include="HealthCheck\HealthCheckResults.cs" />
-    <Compile Include="HealthCheck\HealthCheckStatus.cs" />
-    <Compile Include="HealthCheck\Checks\Security\HttpsCheck.cs" />
-    <Compile Include="HealthCheck\IHealthCheckResolver.cs" />
-    <Compile Include="HealthCheck\IHealthCheckNotificationMethodsResolver.cs" />
-    <Compile Include="HealthCheck\NotificationMethods\NotificationMethodBase.cs" />
-    <Compile Include="HealthCheck\NotificationMethods\EmailNotificationMethod.cs" />
-    <Compile Include="HealthCheck\NotificationMethods\IHealthCheckNotificatationMethod.cs" />
-    <Compile Include="HealthCheck\StatusResultType.cs" />
-    <Compile Include="HealthCheck\Checks\DataIntegrity\XmlDataIntegrityHealthCheck.cs" />
-    <Compile Include="IHttpContextAccessor.cs" />
-    <Compile Include="Install\InstallSteps\ConfigureMachineKey.cs" />
-    <Compile Include="Models\BackOfficeTourFile.cs" />
-    <Compile Include="Models\BackOfficeTourStep.cs" />
-    <Compile Include="Models\ContentEditing\AssignedContentPermissions.cs" />
-    <Compile Include="Models\ContentEditing\AssignedUserGroupPermissions.cs" />
-    <Compile Include="Models\ContentEditing\ContentRedirectUrl.cs" />
-    <Compile Include="Models\ContentEditing\DictionaryDisplay.cs" />
-    <Compile Include="Models\ContentEditing\DictionaryOverviewDisplay.cs" />
-    <Compile Include="Models\ContentEditing\DictionarySave.cs" />
-    <Compile Include="Models\ContentEditing\DictionaryOverviewTranslationDisplay.cs" />
-    <Compile Include="Models\ContentEditing\DictionaryTranslationSave.cs" />
-    <Compile Include="Models\ContentEditing\EditorNavigation.cs" />
-    <Compile Include="Models\ContentEditing\GetAvailableCompositionsFilter.cs" />
-    <Compile Include="Editors\IEditorValidator.cs" />
-    <Compile Include="Editors\EditorModelEventManager.cs" />
-    <Compile Include="HtmlHelperBackOfficeExtensions.cs" />
-    <Compile Include="Install\InstallSteps\Version73FileCleanup.cs" />
-    <Compile Include="Models\ContentEditing\DocumentTypeDisplay.cs" />
-    <Compile Include="Media\EmbedProviders\Flickr.cs" />
-    <Compile Include="Models\ContentEditing\ContentTypeCompositionDisplay.cs" />
-    <Compile Include="Models\ContentEditing\ContentTypeSave.cs" />
-    <Compile Include="Models\ContentEditing\DocumentTypeSave.cs" />
-    <Compile Include="Models\ContentEditing\InstalledPackageModel.cs" />
-    <Compile Include="Models\ContentEditing\LinkDisplay.cs" />
-    <Compile Include="Models\ContentEditing\MediaTypeDisplay.cs" />
-    <Compile Include="Models\ContentEditing\MediaTypeSave.cs" />
-    <Compile Include="Models\ContentEditing\MemberPropertyTypeBasic.cs" />
-    <Compile Include="Models\ContentEditing\MemberPropertyTypeDisplay.cs" />
-    <Compile Include="Models\ContentEditing\MemberTypeDisplay.cs" />
-    <Compile Include="Models\ContentEditing\MemberTypeSave.cs" />
-    <Compile Include="Models\ContentEditing\Permission.cs" />
-    <Compile Include="Models\ContentEditing\PostedFiles.cs" />
-    <Compile Include="Models\ContentEditing\PostedFolder.cs" />
-    <Compile Include="Models\ContentEditing\PropertyGroupBasic.cs" />
-    <Compile Include="Models\ContentEditing\PropertyTypeBasic.cs" />
-    <Compile Include="Models\ContentEditing\SimpleNotificationModel.cs" />
-    <Compile Include="Models\ContentEditing\SnippetDisplay.cs" />
-    <Compile Include="Models\ContentEditing\TemplateDisplay.cs" />
-    <Compile Include="Models\ContentEditing\DictionaryTranslationDisplay.cs" />
-    <Compile Include="Models\ContentEditing\UserDisplay.cs" />
-    <Compile Include="Models\ContentEditing\UserBasic.cs" />
-    <Compile Include="Models\ContentEditing\UserGroupBasic.cs" />
-    <Compile Include="Models\ContentEditing\UserGroupDisplay.cs" />
-    <Compile Include="Models\ContentEditing\UserGroupPermissionsSave.cs" />
-    <Compile Include="Models\ContentEditing\UserGroupSave.cs" />
-    <Compile Include="Models\DetachedPublishedContent.cs" />
-    <Compile Include="Models\DetachedPublishedProperty.cs" />
-    <Compile Include="Models\ContentEditing\UserInvite.cs" />
-    <Compile Include="Models\ContentEditing\UserSave.cs" />
-    <Compile Include="Models\Link.cs" />
-    <Compile Include="Models\LinkType.cs" />
-    <Compile Include="Models\LocalPackageInstallModel.cs" />
-    <Compile Include="Models\Mapping\CodeFileDisplayMapper.cs" />
-    <Compile Include="Models\Mapping\ContentTypeModelMapperExtensions.cs" />
-    <Compile Include="Models\Mapping\ContentTypeUdiResolver.cs" />
-    <Compile Include="Models\Mapping\DictionaryModelMapper.cs" />
-    <Compile Include="Models\Mapping\EntityModelMapperExtensions.cs" />
-    <Compile Include="Models\Mapping\LockedCompositionsResolver.cs" />
-    <Compile Include="Models\Mapping\UserGroupDefaultPermissionsResolver.cs" />
-    <Compile Include="Models\Mapping\PropertyGroupDisplayResolver.cs" />
-    <Compile Include="Models\RelatedLink.cs" />
-    <Compile Include="Models\Mapping\TemplateModelMapper.cs" />
-    <Compile Include="Models\PackageInstallResult.cs" />
-    <Compile Include="Models\RelatedLinkBase.cs" />
-    <Compile Include="Models\ContentEditing\CodeFileDisplay.cs" />
-    <Compile Include="Models\SendCodeViewModel.cs" />
-    <Compile Include="Models\RelatedLinks.cs" />
-    <Compile Include="Models\RelatedLinkType.cs" />
-    <Compile Include="Models\SetPasswordModel.cs" />
-    <Compile Include="Models\RequestPasswordResetModel.cs" />
-    <Compile Include="Models\PublishedContentWithKeyBase.cs" />
-    <Compile Include="Models\BackOfficeTour.cs" />
-    <Compile Include="Models\UserTourStatus.cs" />
-    <Compile Include="Models\ValidatePasswordResetCodeModel.cs" />
-    <Compile Include="Mvc\ControllerContextExtensions.cs" />
-    <Compile Include="Mvc\DisableBrowserCacheAttribute.cs" />
-    <Compile Include="Mvc\EnsurePartialViewMacroViewContextFilterAttribute.cs" />
-    <Compile Include="Mvc\IRenderController.cs" />
-    <Compile Include="Mvc\ModelBindingException.cs" />
-    <Compile Include="Mvc\RenderIndexActionSelectorAttribute.cs" />
-    <Compile Include="Mvc\UmbracoRequireHttpsAttribute.cs" />
-    <Compile Include="Mvc\ValidateMvcAngularAntiForgeryTokenAttribute.cs" />
-    <Compile Include="OwinMiddlewareConfiguredEventArgs.cs" />
-    <Compile Include="Profiling\WebProfilerProvider.cs" />
-    <Compile Include="Profiling\WebProfiler.cs" />
-    <Compile Include="PropertyEditors\ContentPicker2PropertyEditor.cs" />
-    <Compile Include="PropertyEditors\DatePreValueEditor.cs" />
-    <Compile Include="PropertyEditors\DateTimePreValueEditor.cs" />
-    <Compile Include="PropertyEditors\DecimalPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MediaPicker2PropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MemberPicker2PropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MultiNodeTreePicker2PropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MultiUrlPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\NestedContentController.cs" />
-    <Compile Include="PropertyEditors\NestedContentHelper.cs" />
-    <Compile Include="PropertyEditors\NestedContentPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\RelatedLinks2PropertyEditor.cs" />
-    <Compile Include="PropertyEditors\TextOnlyValueEditor.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\ContentPickerPropertyConverter.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\MultipleContentPickerParameterEditor.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\ImageCropDataSetConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\ImageCropperValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\LegacyRelatedLinksEditorValueConvertor.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\MediaPickerPropertyConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\MemberPickerPropertyConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\MultiNodeTreePickerPropertyConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\LegacyMediaPickerPropertyConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\MultiUrlPickerPropertyConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\NestedContentSingleValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\NestedContentManyValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\NestedContentPublishedPropertyTypeExtensions.cs" />
-    <Compile Include="PublishedContentQueryExtensions.cs" />
-    <Compile Include="Routing\RedirectTrackingEventHandler.cs" />
-    <Compile Include="Editors\RedirectUrlManagementController.cs" />
-    <Compile Include="Models\ContentEditing\RedirectUrlSearchResults.cs" />
-    <Compile Include="RelatedLinksTypeConverter.cs" />
-    <Compile Include="RouteDataExtensions.cs" />
-    <Compile Include="Routing\ContentFinderByRedirectUrl.cs" />
-    <Compile Include="Scheduling\HealthCheckNotifier.cs" />
-    <Compile Include="Scheduling\LatchedBackgroundTaskBase.cs" />
-    <Compile Include="Search\SearchableApplicationTree.cs" />
-    <Compile Include="Search\SearchableTreeAttribute.cs" />
-    <Compile Include="Search\SearchableTreeCollection.cs" />
-    <Compile Include="Search\SearchableTreeResolver.cs" />
-    <Compile Include="Search\UmbracoTreeSearcher.cs" />
-    <Compile Include="Security\Identity\ExternalSignInAutoLinkOptions.cs" />
-    <Compile Include="Security\Identity\FixWindowsAuthMiddlware.cs" />
-    <Compile Include="Security\Identity\ForceRenewalCookieAuthenticationHandler.cs" />
-    <Compile Include="Security\Identity\ForceRenewalCookieAuthenticationMiddleware.cs" />
-    <Compile Include="Security\Identity\GetUserSecondsMiddleWare.cs" />
-    <Compile Include="Models\ContentEditing\PropertyTypeDisplay.cs" />
-    <Compile Include="Models\ContentEditing\PropertyGroupDisplay.cs" />
-    <Compile Include="Media\EmbedProviders\OEmbedJson.cs" />
-    <Compile Include="Media\EmbedProviders\OEmbedResponse.cs" />
-    <Compile Include="Media\EmbedProviders\OEmbedPhoto.cs" />
-    <Compile Include="Security\Identity\IUmbracoBackOfficeTwoFactorOptions.cs" />
-    <Compile Include="Models\Mapping\PropertyTypeGroupResolver.cs" />
-    <Compile Include="Security\Identity\PreviewAuthenticationMiddleware.cs" />
-    <Compile Include="SingletonHttpContextAccessor.cs" />
-    <Compile Include="Trees\DictionaryTreeController.cs" />
-    <Compile Include="Trees\MacroTreeController.cs" />
-    <Compile Include="Trees\UserTreeController.cs" />
-    <Compile Include="Suspendable.cs" />
-    <Compile Include="Trees\ContentBlueprintTreeController.cs" />
-    <Compile Include="Trees\ContentTypeTreeController.cs" />
-    <Compile Include="Trees\PackagesTreeController.cs" />
-    <Compile Include="Trees\MediaTypeTreeController.cs" />
-    <Compile Include="Trees\MemberTypeTreeController.cs" />
-    <Compile Include="Security\WebAuthExtensions.cs" />
-    <Compile Include="Trees\XsltTreeController.cs" />
-    <Compile Include="umbraco.presentation\SafeXmlReaderWriter.cs" />
-    <Compile Include="Trees\ScriptTreeController.cs" />
-    <Compile Include="umbraco.presentation\umbraco\developer\Packages\installer.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="UmbracoDefaultOwinStartup.cs" />
-    <Compile Include="IUmbracoContextAccessor.cs" />
-    <Compile Include="Models\ContentEditing\Relation.cs" />
-    <Compile Include="HtmlStringUtilities.cs" />
-    <Compile Include="Models\ContentEditing\RelationType.cs" />
-    <Compile Include="Models\ContentExtensions.cs" />
-    <Compile Include="IDynamicPublishedContentQuery.cs" />
-    <Compile Include="ITagQuery.cs" />
-    <Compile Include="ITypedPublishedContentQuery.cs" />
-    <Compile Include="IUmbracoComponentRenderer.cs" />
-    <Compile Include="Models\LegacyConvertedNode.cs" />
-    <Compile Include="Models\LegacyConvertedNodeProperty.cs" />
-    <Compile Include="Models\Mapping\RelationModelMapper.cs" />
-    <Compile Include="Mvc\DisableClientCacheAttribute.cs" />
-    <Compile Include="Models\UnLinkLoginModel.cs" />
-    <Compile Include="Mvc\MvcVersionCheck.cs" />
-    <Compile Include="Mvc\ReflectedFixedRazorViewEngine.cs" />
-    <Compile Include="Scheduling\ThreadingTaskImmutable.cs" />
-    <Compile Include="Mvc\ProfilingView.cs" />
-    <Compile Include="Mvc\ProfilingViewEngine.cs" />
-    <Compile Include="Mvc\UrlHelperExtensions.cs" />
-    <Compile Include="Scheduling\BackgroundTaskRunner.cs" />
-    <Compile Include="BatchedDatabaseServerMessenger.cs" />
-    <Compile Include="BatchedWebServiceServerMessenger.cs" />
-    <Compile Include="CacheHelperExtensions.cs" />
-    <Compile Include="Cache\UserGroupPermissionsCacheRefresher.cs" />
-    <Compile Include="Editors\AuthenticationController.cs" />
-    <Compile Include="Controllers\UmbProfileController.cs" />
-    <Compile Include="Editors\ContentController.cs" />
-    <Compile Include="Controllers\UmbLoginStatusController.cs" />
-    <Compile Include="Editors\ContentPostValidateAttribute.cs" />
-    <Compile Include="Editors\ContentTypeControllerBase.cs" />
-    <Compile Include="Editors\DashboardController.cs" />
-    <Compile Include="Editors\DashboardSecurity.cs" />
-    <Compile Include="Editors\DataTypeController.cs" />
-    <Compile Include="Editors\DataTypeValidateAttribute.cs" />
-    <Compile Include="Editors\EntityControllerConfigurationAttribute.cs" />
-    <Compile Include="Editors\ImagesController.cs" />
-    <Compile Include="Editors\PackageInstallController.cs" />
-    <Compile Include="Editors\RelationController.cs" />
-    <Compile Include="Editors\CanvasDesignerController.cs" />
-    <Compile Include="Editors\UsersController.cs" />
-    <Compile Include="GridTemplateExtensions.cs" />
-    <Compile Include="Models\PackageInstallModel.cs" />
-    <Compile Include="Models\ContentEditing\DataTypeBasic.cs" />
-    <Compile Include="Models\ContentEditing\MemberBasic.cs" />
-    <Compile Include="Models\ContentEditing\MemberListDisplay.cs" />
-    <Compile Include="Models\TemplateQuery\ContentTypeModel.cs" />
-    <Compile Include="Models\TemplateQuery\PropertyModel.cs" />
-    <Compile Include="Models\TemplateQuery\SourceModel.cs" />
-    <Compile Include="Models\TemplateQuery\TemplateQueryResult.cs" />
-    <Compile Include="Models\TemplateQuery\SortExpression.cs" />
-    <Compile Include="Models\TemplateQuery\Operathor.cs" />
-    <Compile Include="Models\TemplateQuery\OperathorTerm.cs" />
-    <Compile Include="Models\TemplateQuery\QueryCondition.cs" />
-    <Compile Include="Models\TemplateQuery\QueryModel.cs" />
-    <Compile Include="Models\TemplateQuery\QueryResultModel.cs" />
-    <Compile Include="Editors\TemplateQueryController.cs" />
-    <Compile Include="Models\ContentEditing\ContentBaseItemSave.cs" />
-    <Compile Include="Models\ContentEditing\MediaItemSave.cs" />
-    <Compile Include="Models\DetachedContent.cs" />
-    <Compile Include="Models\ImageCropAnchor.cs" />
-    <Compile Include="Models\ImageCropCoordinates.cs" />
-    <Compile Include="Models\ImageCropDataSet.cs" />
-    <Compile Include="Models\ImageCropFocalPoint.cs" />
-    <Compile Include="Models\ImageCropMode.cs" />
-    <Compile Include="Install\DatabaseHelper.cs" />
-    <Compile Include="Install\InstallException.cs" />
-    <Compile Include="Install\InstallStatusTracker.cs" />
-    <Compile Include="Install\InstallSteps\DatabaseConfigureStep.cs" />
-    <Compile Include="Install\InstallSteps\DatabaseInstallStep.cs" />
-    <Compile Include="Install\InstallSteps\DatabaseUpgradeStep.cs" />
-    <Compile Include="Install\InstallSteps\FilePermissionsStep.cs" />
-    <Compile Include="Install\InstallSteps\MajorVersion7UpgradeReport.cs" />
-    <Compile Include="Install\InstallSteps\SetUmbracoVersionStep.cs" />
-    <Compile Include="Install\InstallSteps\StarterKitCleanupStep.cs" />
-    <Compile Include="Install\InstallSteps\StarterKitDownloadStep.cs" />
-    <Compile Include="Install\InstallSteps\StarterKitInstallStep.cs" />
-    <Compile Include="Install\InstallSteps\UpgradeStep.cs" />
-    <Compile Include="Install\InstallSteps\NewInstallStep.cs" />
-    <Compile Include="Install\Controllers\InstallPackageController.cs" />
-    <Compile Include="Install\Models\DatabaseModel.cs" />
-    <Compile Include="Install\Models\DatabaseType.cs" />
-    <Compile Include="Install\Models\InstallationType.cs" />
-    <Compile Include="Install\Models\InstallInstructions.cs" />
-    <Compile Include="Install\Models\InstallPackageModel.cs" />
-    <Compile Include="Install\Models\InstallProgressResultModel.cs" />
-    <Compile Include="Install\Models\InstallSetup.cs" />
-    <Compile Include="Install\Models\InstallSetupResult.cs" />
-    <Compile Include="Install\Models\InstallSetupStep.cs" />
-    <Compile Include="Install\Models\InstallSetupStepAttribute.cs" />
-    <Compile Include="Install\Models\InstallTrackingItem.cs" />
-    <Compile Include="Install\Models\Package.cs" />
-    <Compile Include="Install\Models\UserModel.cs" />
-    <Compile Include="Install\UmbracoInstallArea.cs" />
-    <Compile Include="Install\Controllers\InstallApiController.cs" />
-    <Compile Include="Install\Controllers\InstallController.cs" />
-    <Compile Include="Install\InstallAuthorizeAttribute.cs" />
-    <Compile Include="Models\ContentEditing\TreeSearchResult.cs" />
-    <Compile Include="Models\ContentEditing\ListViewAwareContentItemDisplayBase.cs" />
-    <Compile Include="Models\ContentEditing\PropertyTypeValidation.cs" />
-    <Compile Include="Models\ImageCropData.cs" />
-    <Compile Include="Models\ImageCropRatioMode.cs" />
-    <Compile Include="Models\IRenderModel.cs" />
-    <Compile Include="Models\PartialViewMacroModelExtensions.cs" />
-    <Compile Include="Models\PostRedirectModel.cs" />
-    <Compile Include="Models\PublishedProperty.cs" />
-    <Compile Include="Mvc\ActionExecutedEventArgs.cs" />
-    <Compile Include="Mvc\AdminTokenAuthorizeAttribute.cs" />
-    <Compile Include="Mvc\NotFoundHandler.cs" />
-    <Compile Include="Mvc\PreRenderViewActionFilterAttribute.cs" />
-    <Compile Include="Mvc\RedirectToUmbracoUrlResult.cs" />
-    <Compile Include="PropertyEditors\GridPropertyEditor.cs" />
-    <Compile Include="Mvc\UmbracoVirtualNodeByIdRouteHandler.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\MacroContainerValueConverter.cs" />
-    <Compile Include="PropertyEditors\TagsDataController.cs" />
-    <Compile Include="PublishedCache\MemberPublishedContent.cs" />
-    <Compile Include="PublishedCache\RawValueProperty.cs" />
-    <Compile Include="Models\RenderModelOfTContent.cs" />
-    <Compile Include="Mvc\JsonNetResult.cs" />
-    <Compile Include="Mvc\MinifyJavaScriptResultAttribute.cs" />
-    <Compile Include="Mvc\EnsurePublishedContentRequestAttribute.cs" />
-    <Compile Include="Mvc\UmbracoTemplatePageOfTContent.cs" />
-    <Compile Include="Mvc\UmbracoViewPage.cs" />
-    <Compile Include="Editors\LogController.cs" />
-    <Compile Include="Editors\MacroController.cs" />
-    <Compile Include="Editors\MemberTypeController.cs" />
-    <Compile Include="Editors\UpdateCheckController.cs" />
-    <Compile Include="MembershipProviderExtensions.cs" />
-    <Compile Include="Models\ChangingPasswordModel.cs" />
-    <Compile Include="Models\ContentEditing\ModelWithNotifications.cs" />
-    <Compile Include="Models\ContentEditing\StyleSheet.cs" />
-    <Compile Include="Editors\StylesheetController.cs" />
-    <Compile Include="Models\ContentEditing\AuditLog.cs" />
-    <Compile Include="Models\ContentEditing\MoveOrCopy.cs" />
-    <Compile Include="Models\ContentEditing\MacroParameter.cs" />
-    <Compile Include="Models\ContentEditing\MemberDisplay.cs" />
-    <Compile Include="Models\ContentEditing\MemberSave.cs" />
-    <Compile Include="Models\ContentEditing\RichTextEditorCommand.cs" />
-    <Compile Include="Models\ContentEditing\RichTextEditorConfiguration.cs" />
-    <Compile Include="Models\ContentEditing\RichTextEditorPlugin.cs" />
-    <Compile Include="Models\ContentEditing\StylesheetRule.cs" />
-    <Compile Include="Models\ContentEditing\UmbracoEntityTypes.cs" />
-    <Compile Include="Models\ContentEditing\AuditLogType.cs" />
-    <Compile Include="Models\Mapping\MiscModelsMapper.cs" />
-    <Compile Include="Models\Mapping\MacroModelMapper.cs" />
-    <Compile Include="Models\Mapping\MemberModelMapper.cs" />
-    <Compile Include="Models\Mapping\TabModelMapper.cs" />
-    <Compile Include="Models\TagModel.cs" />
-    <Compile Include="Models\UpgradeCheckResponse.cs" />
-    <Compile Include="Models\PasswordChangedModel.cs" />
-    <Compile Include="NotificationServiceExtensions.cs" />
-    <Compile Include="PropertyEditors\ColorListPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\EmailAddressPropertyEditor.cs" />
-    <Compile Include="ImageCropperBaseExtensions.cs" />
-    <Compile Include="PropertyEditors\ImageCropperPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\ImageCropperPropertyValueEditor.cs" />
-    <Compile Include="PropertyEditors\ListViewPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MacroContainerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MarkdownPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MemberGroupPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MemberPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MultiNodeTreePickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MultipleMediaPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\ContentTypeParameterEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\MultipleContentTypeParameterEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\MultipleMediaPickerParameterEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\MultiplePropertyGroupParameterEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\MultiplePropertyTypeParameterEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\PropertyGroupParameterEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\PropertyTypeParameterEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\SingleMediaPickerParameterEditor.cs" />
-    <Compile Include="PropertyEditors\PropertyEditorAssetAttribute.cs" />
-    <Compile Include="PropertyEditors\RelatedLinksPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\RteEmbedController.cs" />
-    <Compile Include="Editors\EntityController.cs" />
-    <Compile Include="Editors\MediaPostValidateAttribute.cs" />
-    <Compile Include="Editors\MemberController.cs" />
-    <Compile Include="Editors\CurrentUserController.cs" />
-    <Compile Include="Models\ContentEditing\DashboardControl.cs" />
-    <Compile Include="Models\ContentEditing\DataTypeDisplay.cs" />
-    <Compile Include="Models\ContentEditing\DataTypeSave.cs" />
-    <Compile Include="Models\ContentEditing\EntityBasic.cs" />
-    <Compile Include="Models\ContentEditing\PreValueFieldDisplay.cs" />
-    <Compile Include="Models\ContentEditing\PreValueFieldSave.cs" />
-    <Compile Include="Models\ContentEditing\PropertyEditorBasic.cs" />
-    <Compile Include="Models\Mapping\AvailablePropertyEditorsResolver.cs" />
-    <Compile Include="Models\Mapping\DatabaseTypeResolver.cs" />
-    <Compile Include="Models\Mapping\DataTypeModelMapper.cs" />
-    <Compile Include="Models\Mapping\EntityModelMapper.cs" />
-    <Compile Include="Models\Mapping\PreValueDisplayResolver.cs" />
-    <Compile Include="PropertyEditors\CheckBoxListPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\ColorPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\DatePropertyEditor.cs" />
-    <Compile Include="PropertyEditors\DateTimePropertyEditor.cs" />
-    <Compile Include="PropertyEditors\DateTimeValidator.cs" />
-    <Compile Include="PropertyEditors\DropDownMultiplePropertyEditor.cs" />
-    <Compile Include="PropertyEditors\FolderBrowserPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\IntegerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MediaPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MultipleTextStringPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\PublishValuesMultipleValueEditor.cs" />
-    <Compile Include="PropertyEditors\DropDownMultipleWithKeysPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\RadioButtonsPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\RichTextPreValueController.cs" />
-    <Compile Include="PropertyEditors\RichTextPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\SliderPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\TagPropertyEditorTagDefinition.cs" />
-    <Compile Include="PropertyEditors\TagsPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\UploadFileTypeValidator.cs" />
-    <Compile Include="PropertyEditors\UserPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\RelatedLinksEditorValueConvertor.cs" />
-    <Compile Include="PropertyEditors\ValueListPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\DropDownPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\PublishValueValueEditor.cs" />
-    <Compile Include="PropertyEditors\DropDownWithKeysPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\LabelPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\PropertyValueEditorWrapper.cs" />
-    <Compile Include="PublishedContentQuery.cs" />
-    <Compile Include="ImageCropperTemplateExtensions.cs" />
-    <Compile Include="Mvc\UmbracoVirtualNodeRouteHandler.cs" />
-    <Compile Include="Routing\CustomRouteUrlProvider.cs" />
-    <Compile Include="Routing\UrlProviderExtensions.cs" />
-    <Compile Include="Scheduling\BackgroundTaskRunnerOptions.cs" />
-    <Compile Include="Scheduling\IBackgroundTaskRunner.cs" />
-    <Compile Include="Scheduling\ILatchedBackgroundTask.cs" />
-    <Compile Include="Scheduling\RecurringTaskBase.cs" />
-    <Compile Include="Security\Identity\AppBuilderExtensions.cs" />
-    <Compile Include="Security\Identity\AuthenticationOptionsExtensions.cs" />
-    <Compile Include="Security\Identity\AuthenticationManagerExtensions.cs" />
-    <Compile Include="Security\Identity\BackOfficeCookieManager.cs" />
-    <Compile Include="Security\Identity\FormsAuthenticationSecureDataFormat.cs" />
-    <Compile Include="Security\Identity\UmbracoBackOfficeCookieAuthOptions.cs" />
-    <Compile Include="Scheduling\TaskAndFactoryExtensions.cs" />
-    <Compile Include="SingletonUmbracoContextAccessor.cs" />
-    <Compile Include="Strategies\Migrations\ClearCsrfCookiesAfterUpgrade.cs" />
-    <Compile Include="Strategies\Migrations\ClearMediaXmlCacheForDeletedItemsAfterUpgrade.cs" />
-    <Compile Include="Strategies\Migrations\EnsureListViewDataTypeIsCreated.cs" />
-    <Compile Include="Strategies\Migrations\MigrationStartupHander.cs" />
-    <Compile Include="Strategies\Migrations\OverwriteStylesheetFilesFromTempFiles.cs" />
-    <Compile Include="Strategies\NotificationsHandler.cs" />
-    <Compile Include="Strategies\RelateOnCopyHandler.cs" />
-    <Compile Include="TagQuery.cs" />
-    <Compile Include="Trees\CoreTreeAttribute.cs" />
-    <Compile Include="Trees\DataTypeTreeController.cs" />
-    <Compile Include="Trees\FileSystemTreeController.cs" />
-    <Compile Include="Trees\LanguageTreeController.cs" />
-    <Compile Include="Trees\LegacyBaseTreeAttribute.cs" />
-    <Compile Include="Trees\MemberTreeController.cs" />
-    <Compile Include="Trees\MenuRenderingEventArgs.cs" />
-    <Compile Include="Models\Trees\CreateChildEntity.cs" />
-    <Compile Include="Models\Trees\MenuItemList.cs" />
-    <Compile Include="Trees\TemplatesTreeController.cs" />
-    <Compile Include="Trees\TreeControllerBase.cs" />
-    <Compile Include="CanvasDesignerUtility.cs" />
-    <Compile Include="UI\JavaScript\AssetInitialization.cs" />
-    <Compile Include="UI\JavaScript\CssInitialization.cs" />
-    <Compile Include="UI\JavaScript\DependencyPathRenderer.cs" />
-    <Compile Include="umbraco.presentation\umbraco\create.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\create\Language.ascx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\create\xslt.ascx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadPackager.cs" />
-    <Compile Include="PublishedCache\XmlPublishedCache\XmlCacheFilePersister.cs" />
-    <Compile Include="UmbracoComponentRenderer.cs" />
-    <Compile Include="Web References\org.umbraco.our\Reference.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Reference.map</DependentUpon>
-    </Compile>
-    <Compile Include="WebApi\AngularJsonMediaTypeFormatter.cs" />
-    <Compile Include="WebApi\AngularJsonOnlyConfigurationAttribute.cs" />
-    <Compile Include="WebApi\Binders\BlueprintItemBinder.cs" />
-    <Compile Include="WebApi\Binders\MemberBinder.cs" />
-    <Compile Include="WebApi\EnableDetailedErrorsAttribute.cs" />
-    <Compile Include="WebApi\Filters\AdminUsersAuthorizeAttribute.cs" />
-    <Compile Include="WebApi\Filters\AngularAntiForgeryHelper.cs" />
-    <Compile Include="WebApi\Filters\AppendCurrentEventMessagesAttribute.cs" />
-    <Compile Include="WebApi\Filters\AppendUserModifiedHeaderAttribute.cs" />
-    <Compile Include="WebApi\Filters\ClearAngularAntiForgeryTokenAttribute.cs" />
-    <Compile Include="WebApi\Filters\DisableBrowserCacheAttribute.cs" />
-    <Compile Include="WebApi\Filters\EnableOverrideAuthorizationAttribute.cs" />
-    <Compile Include="WebApi\Filters\FeatureAuthorizeAttribute.cs" />
-    <Compile Include="WebApi\Filters\FilterGrouping.cs" />
-    <Compile Include="WebApi\Filters\HttpQueryStringModelBinder.cs" />
-    <Compile Include="WebApi\Filters\LegacyTreeAuthorizeAttribute.cs" />
-    <Compile Include="WebApi\Filters\OutgoingEditorModelEventAttribute.cs" />
-    <Compile Include="WebApi\Filters\OutgoingNoHyphenGuidFormatAttribute.cs" />
-    <Compile Include="WebApi\Filters\OverridableAuthorizationAttribute.cs" />
-    <Compile Include="WebApi\Filters\SetAngularAntiForgeryTokensAttribute.cs" />
-    <Compile Include="WebApi\Filters\UmbracoBackOfficeLogoutAttribute.cs" />
-    <Compile Include="WebApi\Filters\UmbracoWebApiRequireHttpsAttribute.cs" />
-    <Compile Include="WebApi\Filters\UmbracoTreeAuthorizeAttribute.cs" />
-    <Compile Include="WebApi\Filters\UmbracoUseHttps.cs" />
-    <Compile Include="WebApi\Filters\ValidateAngularAntiForgeryTokenAttribute.cs" />
-    <Compile Include="WebApi\Filters\CheckIfUserTicketDataIsStaleAttribute.cs" />
-    <Compile Include="WebApi\HttpControllerContextExtensions.cs" />
-    <Compile Include="WebApi\CustomDateTimeConvertor.cs" />
-    <Compile Include="Models\ContentEditing\ContentSortOrder.cs" />
-    <Compile Include="Editors\ContentControllerBase.cs" />
-    <Compile Include="Editors\ContentTypeController.cs" />
-    <Compile Include="Editors\LegacyController.cs" />
-    <Compile Include="Controllers\UmbRegisterController.cs" />
-    <Compile Include="Models\ProfileModel.cs" />
-    <Compile Include="Models\LoginStatusModel.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\MarkdownEditorValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\TextStringValueConverter.cs" />
-    <Compile Include="PublishedContentPropertyExtension.cs" />
-    <Compile Include="Models\UmbracoProperty.cs" />
-    <Compile Include="Mvc\MergeParentContextViewDataAttribute.cs" />
-    <Compile Include="Mvc\ViewDataDictionaryExtensions.cs" />
-    <Compile Include="Routing\ContentLastChanceFinderByNotFoundHandlers.cs" />
-    <Compile Include="Models\RegisterModel.cs" />
-    <Compile Include="Models\LoginModel.cs" />
-    <Compile Include="Editors\MediaTypeController.cs" />
-    <Compile Include="Scheduling\IBackgroundTask.cs" />
-    <Compile Include="Scheduling\KeepAlive.cs" />
-    <Compile Include="Scheduling\LogScrubber.cs" />
-    <Compile Include="Scheduling\ScheduledPublishing.cs" />
-    <Compile Include="Scheduling\ScheduledTasks.cs" />
-    <Compile Include="Scheduling\TaskEventArgs.cs" />
-    <Compile Include="Security\MembershipHelper.cs" />
-    <Compile Include="Editors\SectionController.cs" />
-    <Compile Include="Editors\UmbracoAuthorizedJsonController.cs" />
-    <Compile Include="Editors\ValidationHelper.cs" />
-    <Compile Include="HttpCookieExtensions.cs" />
-    <Compile Include="Models\ContentEditing\ContentItemDisplayBase.cs" />
-    <Compile Include="Models\ContentEditing\ContentSaveAction.cs" />
-    <Compile Include="Models\ContentEditing\ContentTypeBasic.cs" />
-    <Compile Include="Models\ContentEditing\IErrorModel.cs" />
-    <Compile Include="Models\ContentEditing\IHaveUploadedFiles.cs" />
-    <Compile Include="Models\ContentEditing\INotificationModel.cs" />
-    <Compile Include="Models\ContentEditing\MediaItemDisplay.cs" />
-    <Compile Include="Models\ContentEditing\MessagesExtensions.cs" />
-    <Compile Include="Models\ContentEditing\Notification.cs" />
-    <Compile Include="Models\ContentEditing\Section.cs" />
-    <Compile Include="Models\ContentEditing\Tab.cs" />
-    <Compile Include="Models\ContentEditing\TabbedContentItem.cs" />
-    <Compile Include="Models\ContentEditing\UserProfile.cs" />
-    <Compile Include="Models\ContentEditing\UserDetail.cs" />
-    <Compile Include="FormDataCollectionExtensions.cs" />
-    <Compile Include="Models\Mapping\ContentPropertyBasicConverter.cs" />
-    <Compile Include="Models\Mapping\ContentPropertyDisplayConverter.cs" />
-    <Compile Include="Models\Mapping\ContentPropertyDtoConverter.cs" />
-    <Compile Include="Models\Mapping\ContentPropertyModelMapper.cs" />
-    <Compile Include="Models\Mapping\CreatorResolver.cs" />
-    <Compile Include="Models\Mapping\MediaModelMapper.cs" />
-    <Compile Include="Models\Mapping\ContentTypeModelMapper.cs" />
-    <Compile Include="Models\Mapping\ContentModelMapper.cs" />
-    <Compile Include="Models\Mapping\OwnerResolver.cs" />
-    <Compile Include="Models\Mapping\SectionModelMapper.cs" />
-    <Compile Include="Models\Mapping\TabsAndPropertiesResolver.cs" />
-    <Compile Include="Models\Mapping\UserModelMapper.cs" />
-    <Compile Include="PropertyEditors\ContentPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\FileUploadPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\FileUploadPropertyValueEditor.cs" />
-    <Compile Include="PropertyEditors\RichTextPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\TextAreaPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\TextboxPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\TrueFalsePropertyEditor.cs" />
-    <Compile Include="Trees\MediaTreeController.cs" />
-    <Compile Include="Models\Trees\ActionMenuItem.cs" />
-    <Compile Include="Models\Trees\ActionMenuItemAttribute.cs" />
-    <Compile Include="Trees\ActionUrlMethod.cs" />
-    <Compile Include="Trees\ApplicationTreeRegistrar.cs" />
-    <Compile Include="Trees\ContentTreeControllerBase.cs" />
-    <Compile Include="Trees\LegacyTreeController.cs" />
-    <Compile Include="Search\ISearchableTree.cs" />
-    <Compile Include="Trees\LegacyTreeDataConverter.cs" />
-    <Compile Include="Trees\LegacyTreeJavascript.cs" />
-    <Compile Include="Trees\LegacyTreeParams.cs" />
-    <Compile Include="Models\Trees\MenuItem.cs" />
-    <Compile Include="Models\Trees\MenuItemCollection.cs" />
-    <Compile Include="Models\Trees\RefreshNode.cs" />
-    <Compile Include="Models\ContentEditing\SearchResultItem.cs" />
-    <Compile Include="Models\Trees\SectionRootNode.cs" />
-    <Compile Include="Trees\TreeController.cs" />
-    <Compile Include="Trees\ApplicationTreeExtensions.cs" />
-    <Compile Include="Trees\TreeAttribute.cs" />
-    <Compile Include="Models\Trees\TreeNode.cs" />
-    <Compile Include="Models\Trees\TreeNodeCollection.cs" />
-    <Compile Include="Models\Trees\TreeNodeExtensions.cs" />
-    <Compile Include="Trees\TreeNodeRenderingEventArgs.cs" />
-    <Compile Include="Trees\TreeNodesRenderingEventArgs.cs" />
-    <Compile Include="Trees\TreeQueryStringParameters.cs" />
-    <Compile Include="Trees\ApplicationTreeController.cs" />
-    <Compile Include="Editors\BackOfficeController.cs" />
-    <Compile Include="Security\Providers\MembersMembershipProvider.cs" />
-    <Compile Include="Security\Providers\MembersRoleProvider.cs" />
-    <Compile Include="Security\Providers\UmbracoMembershipProvider.cs" />
-    <Compile Include="Security\Providers\UsersMembershipProvider.cs" />
-    <Compile Include="Trees\ContentTreeController.cs" />
-    <Compile Include="Trees\TreeRenderingEventArgs.cs" />
-    <Compile Include="Trees\UrlHelperExtensions.cs" />
-    <Compile Include="UI\JavaScript\JsInitialization.cs" />
-    <Compile Include="Models\ContentEditing\ContentItemBasic.cs" />
-    <Compile Include="Models\ContentEditing\ContentItemDisplay.cs" />
-    <Compile Include="Models\ContentEditing\ContentItemDto.cs" />
-    <Compile Include="Models\ContentEditing\ContentItemFile.cs" />
-    <Compile Include="Models\ContentEditing\ContentItemSave.cs" />
-    <Compile Include="Models\ContentEditing\ContentPropertyBasic.cs" />
-    <Compile Include="Models\ContentEditing\ContentPropertyDisplay.cs" />
-    <Compile Include="Models\ContentEditing\ContentPropertyDto.cs" />
-    <Compile Include="Dynamics\DynamicExpression.cs" />
-    <Compile Include="Dynamics\DynamicGrouping.cs" />
-    <Compile Include="Dynamics\DynamicPublishedContentIdEqualityComparer.cs" />
-    <Compile Include="Dynamics\DynamicPublishedContentListOrdering.cs" />
-    <Compile Include="Dynamics\DynamicQueryable.cs" />
-    <Compile Include="Dynamics\ExpressionParser.cs" />
-    <Compile Include="Dynamics\ExtensionMethods.cs" />
-    <Compile Include="Dynamics\Grouping.cs" />
-    <Compile Include="HttpRequestExtensions.cs" />
-    <Compile Include="HttpUrlHelperExtensions.cs" />
-    <Compile Include="Install\FilePermissionHelper.cs" />
-    <Compile Include="Install\InstallHelper.cs" />
-    <Compile Include="Install\HttpInstallAuthorizeAttribute.cs" />
-    <Compile Include="Macros\PartialViewMacroController.cs" />
-    <Compile Include="Macros\PartialViewMacroEngine.cs" />
-    <Compile Include="Macros\PartialViewMacroPage.cs" />
-    <Compile Include="Media\ImageUrl.cs" />
-    <Compile Include="Media\ImageUrlProviderResolver.cs" />
-    <Compile Include="Media\ImageUrlProviders\ImageUrlProvider.cs" />
-    <Compile Include="Models\DynamicPublishedContent.cs" />
-    <Compile Include="Models\DynamicPublishedContentList.cs" />
-    <Compile Include="Models\PartialViewMacroModel.cs" />
-    <Compile Include="Models\PublishedContentBase.cs" />
-    <Compile Include="Mvc\AreaRegistrationExtensions.cs" />
-    <Compile Include="BaseRest\BaseRestHandler.cs" />
-    <Compile Include="BaseRest\MemberRest.cs" />
-    <Compile Include="BaseRest\RestExtensionAttribute.cs" />
-    <Compile Include="BaseRest\RestExtensionMethodAttribute.cs" />
-    <Compile Include="BaseRest\RestExtensionMethodInfo.cs" />
-    <Compile Include="ContextualPublishedCacheExtensions.cs" />
-    <Compile Include="Mvc\DefaultRenderMvcControllerResolver.cs" />
-    <Compile Include="Mvc\QueryStringFilterAttribute.cs" />
-    <Compile Include="PublishedCache\ContextualPublishedContentCache.cs" />
-    <Compile Include="PublishedCache\ContextualPublishedCacheOfT.cs" />
-    <Compile Include="PublishedCache\ContextualPublishedCache.cs" />
-    <Compile Include="PublishedCache\ContextualPublishedMediaCache.cs" />
-    <Compile Include="PublishedCache\PublishedCachesResolver.cs" />
-    <Compile Include="PublishedCache\IPublishedCaches.cs" />
-    <Compile Include="PublishedCache\PublishedCaches.cs" />
-    <Compile Include="PublishedCache\XmlPublishedCache\PublishedMediaCache.cs" />
-    <Compile Include="Dictionary\UmbracoCultureDictionary.cs" />
-    <Compile Include="Dictionary\UmbracoCultureDictionaryFactory.cs" />
-    <Compile Include="Mvc\MemberAuthorizeAttribute.cs" />
-    <Compile Include="Mvc\BackOfficeArea.cs" />
-    <Compile Include="Mvc\ControllerFactoryExtensions.cs" />
-    <Compile Include="Mvc\IRenderMvcController.cs" />
-    <Compile Include="Mvc\SurfaceRouteHandler.cs" />
-    <Compile Include="PublishedCache\XmlPublishedCache\RoutesCache.cs" />
-    <Compile Include="PublishedCache\XmlPublishedCache\UmbracoContextCache.cs" />
-    <Compile Include="Routing\UrlProviderMode.cs" />
-    <Compile Include="Search\ExamineIndexerModel.cs" />
-    <Compile Include="Search\LuceneIndexerExtensions.cs" />
-    <Compile Include="Security\ValidateRequestAttempt.cs" />
-    <Compile Include="Security\WebSecurity.cs" />
-    <Compile Include="UI\JavaScript\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="UI\JavaScript\ServerVariablesParser.cs" />
-    <Compile Include="Strategies\Migrations\RebuildXmlCachesAfterUpgrade.cs" />
-    <Compile Include="Strategies\PublicAccessEventHandler.cs" />
-    <Compile Include="UI\Bundles\JsApplicationLib.cs" />
-    <Compile Include="UI\Bundles\JsJQueryCore.cs" />
-    <Compile Include="UI\Bundles\JsJQueryPlugins.cs" />
-    <Compile Include="UI\Bundles\JsUmbracoApplicationCore.cs" />
-    <Compile Include="UI\Bundles\JsUmbracoApplicationUI.cs" />
-    <Compile Include="UI\Bundles\JsUmbracoTree.cs" />
-    <Compile Include="UI\CdfLogger.cs" />
-    <Compile Include="Models\LegacyNodeHelper.cs" />
-    <Compile Include="umbraco.presentation\umbraco\controls\Tree\TreeControl.ascx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\create\simple.ascx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Packages\directoryBrowser.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\ProtectPage.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\create.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\AssignDomain2.aspx.cs">
-      <DependentUpon>AssignDomain2.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\AssignDomain2.aspx.designer.cs">
-      <DependentUpon>AssignDomain2.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="UmbracoContextExtensions.cs" />
-    <Compile Include="umbraco.presentation\umbraco\settings\stylesheet\editstylesheet.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\settings\stylesheet\property\EditStyleSheetProperty.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Controllers\UmbLoginController.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\TranslateTreeNames.cs" />
-    <Compile Include="UrlHelperExtensions.cs" />
-    <Compile Include="Editors\MediaController.cs" />
-    <Compile Include="UrlHelperRenderExtensions.cs" />
-    <Compile Include="WebApi\Binders\ContentItemBaseBinder.cs" />
-    <Compile Include="WebApi\IsBackOfficeAttribute.cs" />
-    <Compile Include="WebApi\Binders\ContentItemBinder.cs" />
-    <Compile Include="WebApi\Binders\MediaItemBinder.cs" />
-    <Compile Include="WebApi\Filters\EnsureUserPermissionForContentAttribute.cs" />
-    <Compile Include="WebApi\Filters\ContentItemValidationHelper.cs" />
-    <Compile Include="WebApi\Filters\EnsureUserPermissionForMediaAttribute.cs" />
-    <Compile Include="WebApi\Filters\FileUploadCleanupFilterAttribute.cs" />
-    <Compile Include="WebApi\Filters\FilterAllowedOutgoingContentAttribute.cs" />
-    <Compile Include="WebApi\Filters\FilterAllowedOutgoingMediaAttribute.cs" />
-    <Compile Include="WebApi\Filters\HttpQueryStringFilterAttribute.cs" />
-    <Compile Include="WebApi\Filters\OutgoingDateTimeFormatAttribute.cs" />
-    <Compile Include="WebApi\Filters\UmbracoApplicationAuthorizeAttribute.cs" />
-    <Compile Include="WebApi\GuidNoHyphenConverter.cs" />
-    <Compile Include="WebApi\HttpRequestMessageExtensions.cs" />
-    <Compile Include="WebApi\JsonCamelCaseFormatter.cs" />
-    <Compile Include="WebApi\MemberAuthorizeAttribute.cs" />
-    <Compile Include="WebApi\MvcVersionCheck.cs" />
-    <Compile Include="WebApi\NamespaceHttpControllerSelector.cs" />
-    <Compile Include="WebApi\PrefixlessBodyModelValidator.cs" />
-    <Compile Include="WebApi\PrefixlessBodyModelValidatorAttribute.cs" />
-    <Compile Include="WebApi\SessionHttpControllerRouteHandler.cs" />
-    <Compile Include="WebApi\UmbracoApiController.cs" />
-    <Compile Include="WebApi\UmbracoApiControllerBase.cs" />
-    <Compile Include="WebApi\UmbracoApiControllerResolver.cs" />
-    <Compile Include="Mvc\UmbracoAuthorizeAttribute.cs" />
-    <Compile Include="Mvc\NotChildAction.cs" />
-    <Compile Include="Mvc\UmbracoAuthorizedController.cs" />
-    <Compile Include="Mvc\UmbracoController.cs" />
-    <Compile Include="Mvc\UmbracoControllerFactory.cs" />
-    <Compile Include="Mvc\UmbracoMvcHandler.cs" />
-    <Compile Include="Mvc\UmbracoViewPageOfTModel.cs" />
-    <Compile Include="PublishedCache\IPublishedCache.cs" />
-    <Compile Include="PublishedCache\IPublishedContentCache.cs" />
-    <Compile Include="PublishedCache\IPublishedMediaCache.cs" />
-    <Compile Include="PublishedContentExtensions.cs" />
-    <Compile Include="ExamineExtensions.cs" />
-    <Compile Include="FormlessPage.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="HtmlHelperRenderExtensions.cs" />
-    <Compile Include="Scheduling\Scheduler.cs" />
-    <Compile Include="Media\EmbedProviders\AbstractOEmbedProvider.cs" />
-    <Compile Include="Media\EmbedProviders\AbstractProvider.cs" />
-    <Compile Include="Media\EmbedProviders\OEmbedRich.cs" />
-    <Compile Include="Media\EmbedProviders\OEmbedVideo.cs" />
-    <Compile Include="Media\EmbedProviders\Settings\Dictionary.cs" />
-    <Compile Include="Media\EmbedProviders\Settings\String.cs" />
-    <Compile Include="Media\EmbedProviders\Twitgoo.cs" />
-    <Compile Include="ModelStateExtensions.cs" />
-    <Compile Include="Mvc\HtmlTagWrapper.cs" />
-    <Compile Include="Mvc\HtmlTagWrapperTextNode.cs" />
-    <Compile Include="Mvc\IHtmlTagWrapper.cs" />
-    <Compile Include="Mvc\MergeModelStateToChildActionAttribute.cs" />
-    <Compile Include="Mvc\PluginController.cs" />
-    <Compile Include="Mvc\PluginViewEngine.cs" />
-    <Compile Include="Mvc\PostedDataProxyInfo.cs" />
-    <Compile Include="Mvc\RedirectToUmbracoPageResult.cs" />
-    <Compile Include="Mvc\Strings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Strings.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Mvc\SurfaceController.cs" />
-    <Compile Include="Mvc\PluginControllerArea.cs" />
-    <Compile Include="Mvc\PluginControllerAttribute.cs" />
-    <Compile Include="Mvc\SurfaceControllerFactory.cs" />
-    <Compile Include="Mvc\PluginControllerMetadata.cs" />
-    <Compile Include="Mvc\UmbracoPageResult.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\RteMacroRenderingValueConverter.cs" />
-    <Compile Include="RenderFieldCaseType.cs" />
-    <Compile Include="RenderFieldEncodingType.cs" />
-    <Compile Include="RouteCollectionExtensions.cs" />
-    <Compile Include="Routing\AliasUrlProvider.cs" />
-    <Compile Include="Routing\ContentFinderByLegacy404.cs" />
-    <Compile Include="Routing\ContentFinderByNotFoundHandler.cs" />
-    <Compile Include="Routing\ContentFinderByPageIdQuery.cs" />
-    <Compile Include="Mvc\SurfaceControllerResolver.cs" />
-    <Compile Include="Routing\ContentFinderByNotFoundHandlers.cs" />
-    <Compile Include="Routing\ISiteDomainHelper.cs" />
-    <Compile Include="Routing\RoutableAttemptEventArgs.cs" />
-    <Compile Include="Routing\DefaultUrlProvider.cs" />
-    <Compile Include="Routing\DomainAndUri.cs" />
-    <Compile Include="Routing\IUrlProvider.cs" />
-    <Compile Include="Routing\SiteDomainHelper.cs" />
-    <Compile Include="Routing\SiteDomainHelperResolver.cs" />
-    <Compile Include="Routing\UrlProviderResolver.cs" />
-    <Compile Include="Routing\NotFoundHandlerHelper.cs" />
-    <Compile Include="Routing\EnsureRoutableOutcome.cs" />
-    <Compile Include="Security\LegacyDefaultAppMapping.cs" />
-    <Compile Include="Routing\PublishedContentRequestEngine.cs" />
-    <Compile Include="Routing\UrlProvider.cs" />
-    <Compile Include="Routing\WebServicesRouteConstraint.cs" />
-    <Compile Include="Search\ExamineSearcherModel.cs" />
-    <Compile Include="Search\ExamineEvents.cs" />
-    <Compile Include="Strategies\DataTypes\LegacyUploadFieldWorkaround.cs" />
-    <Compile Include="Strategies\Migrations\PublishAfterUpgradeToVersionSixth.cs" />
-    <Compile Include="Strategies\LegacyClasses.cs" />
-    <Compile Include="Strategies\Migrations\EnsureAppsTreesUpdatedOnUpgrade.cs" />
-    <Compile Include="Strategies\ServerRegistrationEventHandler.cs" />
-    <Compile Include="Templates\TemplateRenderer.cs" />
-    <Compile Include="Templates\TemplateUtilities.cs" />
-    <Compile Include="Trees\PartialViewMacrosTreeController.cs" />
-    <Compile Include="Trees\PartialViewsTreeController.cs" />
-    <Compile Include="UI\Controls\InsertMacroSplitButton.cs" />
-    <Compile Include="UI\IAssignedApp.cs" />
-    <Compile Include="UI\LegacyDialogHandler.cs" />
-    <Compile Include="UI\LegacyDialogTask.cs" />
-    <Compile Include="UI\Controls\ProgressBar.cs" />
-    <Compile Include="UI\Controls\UmbracoControl.cs" />
-    <Compile Include="UI\Controls\UmbracoUserControl.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="UI\Pages\BasePage.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="UI\Pages\ClientTools.cs" />
-    <Compile Include="UI\Pages\UmbracoEnsuredPage.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="UI\SpeechBubbleIcon.cs" />
-    <Compile Include="umbraco.presentation\AttributeCollectionAdapter.cs" />
-    <Compile Include="umbraco.presentation\Default.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\MacroCacheContent.cs" />
-    <Compile Include="umbraco.presentation\ScriptingMacroResult.cs" />
-    <Compile Include="umbraco.presentation\umbraco\dialogs\sort.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\macroResultWrapper.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\masterpages\default.Master.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\publishStatus.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\Default.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\tree.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\ping.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Macros\editMacro.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Python\editPython.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\editXslt.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\editMacro.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\umbracoField.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\treePicker.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\masterpages\umbracoPage.master.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\masterpages\umbracoDialog.master.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\nodeFactory\UmbracoSiteMapProviderAccessUpdate.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Search\QuickSearch.ascx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\settings\modals\ShowUmbracoTags.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\templateControls\Image.cs" />
-    <Compile Include="umbraco.presentation\umbraco\uQuery\IGetProperty.cs" />
-    <Compile Include="umbraco.presentation\XsltExtensionAttribute.cs" />
-    <Compile Include="UmbracoHelper.cs" />
-    <Compile Include="Mvc\ViewContextExtensions.cs" />
-    <Compile Include="Mvc\ViewDataContainerExtensions.cs" />
-    <Compile Include="PublishedCache\XmlPublishedCache\PublishedContentCache.cs" />
-    <Compile Include="Routing\PublishedContentNotFoundHandler.cs" />
-    <Compile Include="PublishedCache\XmlPublishedCache\XmlPublishedContent.cs" />
-    <Compile Include="PublishedCache\XmlPublishedCache\XmlPublishedProperty.cs" />
-    <Compile Include="Mvc\Constants.cs" />
-    <Compile Include="Mvc\FilteredControllerFactoriesResolver.cs" />
-    <Compile Include="Mvc\IFilteredControllerFactory.cs" />
-    <Compile Include="Mvc\MasterControllerFactory.cs" />
-    <Compile Include="Mvc\RenderActionInvoker.cs" />
-    <Compile Include="Mvc\RenderControllerFactory.cs" />
-    <Compile Include="Models\RenderModel.cs" />
-    <Compile Include="Mvc\RenderModelBinder.cs" />
-    <Compile Include="Mvc\RenderMvcController.cs" />
-    <Compile Include="Mvc\RenderRouteHandler.cs" />
-    <Compile Include="Mvc\RenderViewEngine.cs" />
-    <Compile Include="Mvc\UmbracoTemplatePage.cs" />
-    <Compile Include="Mvc\RouteDefinition.cs" />
-    <Compile Include="Mvc\RouteValueDictionaryExtensions.cs" />
-    <Compile Include="umbraco.presentation\umbraco\nodeFactory\Node.cs" />
-    <Compile Include="umbraco.presentation\umbraco\nodeFactory\Nodes.cs" />
-    <Compile Include="umbraco.presentation\umbraco\nodeFactory\Property.cs" />
-    <Compile Include="Routing\UmbracoRequestEventArgs.cs" />
-    <Compile Include="UmbracoUserControl.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="WebApi\UmbracoAuthorizeAttribute.cs" />
-    <Compile Include="WebApi\UmbracoAuthorizedApiController.cs" />
-    <Compile Include="WebApi\Filters\ValidationFilterAttribute.cs" />
-    <Compile Include="WebApi\Filters\UmbracoUserTimeoutFilterAttribute.cs" />
-    <Compile Include="WebApi\UnhandedExceptionLoggerConfigurationAttribute.cs" />
-    <Compile Include="WebApi\UnhandledExceptionLogger.cs" />
-    <Compile Include="WebApi\WebApiHelper.cs" />
-    <Compile Include="WebBootManager.cs" />
-    <Compile Include="Routing\LegacyRequestInitializer.cs" />
-    <Compile Include="Mvc\ControllerExtensions.cs" />
-    <Compile Include="Routing\ContentLastChanceFinderResolver.cs" />
-    <Compile Include="Routing\ContentFinderByUrlAlias.cs" />
-    <Compile Include="Media\ThumbnailProviders\AbstractThumbnailProvider.cs" />
-    <Compile Include="Media\ThumbnailProviders\MediaTypeIconThumbnailProvider.cs" />
-    <Compile Include="Media\ThumbnailProviders\FileExtensionIconThumbnailProvider.cs" />
-    <Compile Include="Media\ThumbnailProviders\ImageThumbnailProvider.cs" />
-    <Compile Include="Media\ThumbnailProviders\ThumbnailProvidersResolver.cs" />
-    <Compile Include="UI\Controls\FolderBrowser.cs" />
-    <Compile Include="Routing\ContentFinderByIdPath.cs" />
-    <Compile Include="Routing\ContentFinderByNiceUrl.cs" />
-    <Compile Include="Routing\ContentFinderByNiceUrlAndTemplate.cs" />
-    <Compile Include="Routing\ContentFinderByProfile.cs" />
-    <Compile Include="PluginManagerExtensions.cs" />
-    <Compile Include="Routing\DomainHelper.cs" />
-    <Compile Include="Routing\ContentFinderResolver.cs" />
-    <Compile Include="Routing\PublishedContentRequest.cs" />
-    <Compile Include="Routing\IContentFinder.cs" />
-    <Compile Include="Routing\RoutingContext.cs" />
-    <Compile Include="umbraco.presentation\EnsureSystemPathsApplicationStartupHandler.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\BasePageExtensions.cs" />
-    <Compile Include="umbraco.presentation\content.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\helper.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\item.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\keepAliveService.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\library.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\macro.cs" />
-    <Compile Include="umbraco.presentation\page.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\Settings1.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>Settings.settings</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\publishingService.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\PublishQueue.cs" />
-    <Compile Include="umbraco.presentation\python.cs" />
-    <Compile Include="umbraco.presentation\NotFoundHandlers.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\requestModule.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\showField.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\template.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\UmbracoContext.cs" />
-    <Compile Include="umbraco.presentation\UmbracoPage.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbracoPageHolder.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\UmbracoRequest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\UmbracoResponse.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\UmbracoServerUtility.cs" />
-    <Compile Include="umbraco.presentation\umbraco\actions\delete.aspx.cs">
-      <DependentUpon>delete.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\actions\delete.aspx.designer.cs">
-      <DependentUpon>delete.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\actions\editContent.aspx.cs">
-      <DependentUpon>editContent.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\actions\editContent.aspx.designer.cs">
-      <DependentUpon>editContent.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\actions\preview.aspx.cs">
-      <DependentUpon>preview.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\actions\preview.aspx.designer.cs">
-      <DependentUpon>preview.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\actions\publish.aspx.cs">
-      <DependentUpon>publish.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\actions\publish.aspx.designer.cs">
-      <DependentUpon>publish.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\controls\ContentControl.cs" />
-    <Compile Include="umbraco.presentation\umbraco\controls\ContentPicker.cs" />
-    <Compile Include="umbraco.presentation\umbraco\controls\ContentTypeControl.cs" />
-    <Compile Include="umbraco.presentation\umbraco\controls\Images\ImageViewer.ascx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\controls\dualSelectBox.cs" />
-    <Compile Include="umbraco.presentation\umbraco\controls\GenericValidation.cs" />
-    <Compile Include="umbraco.presentation\umbraco\controls\LabelButton.cs" />
-    <Compile Include="umbraco.presentation\umbraco\controls\macroParameterControl.cs" />
-    <Compile Include="umbraco.presentation\umbraco\controls\ProgressBar.ascx.cs">
-      <DependentUpon>ProgressBar.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\controls\ProgressBar.ascx.designer.cs">
-      <DependentUpon>ProgressBar.ascx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\controls\SaveClickEventArgs.cs" />
-    <Compile Include="umbraco.presentation\umbraco\controls\Tree\CustomTreeControl.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\controls\Tree\CustomTreeService.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\controls\Tree\JTreeContextMenu.cs" />
-    <Compile Include="umbraco.presentation\umbraco\controls\Tree\JTreeContextMenuItem.cs" />
-    <Compile Include="umbraco.presentation\umbraco\controls\Tree\NodeInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\create\CreatedPackageTasks.cs" />
-    <Compile Include="umbraco.presentation\umbraco\create\dictionaryTasks.cs" />
-    <Compile Include="umbraco.presentation\umbraco\create\macroTasks.cs" />
-    <Compile Include="umbraco.presentation\umbraco\create\MemberGroupTasks.cs" />
-    <Compile Include="umbraco.presentation\umbraco\create\stylesheetPropertyTasks.cs" />
-    <Compile Include="umbraco.presentation\umbraco\create\StylesheetTasks.cs" />
-    <Compile Include="umbraco.presentation\umbraco\create\XsltTasks.cs" />
-    <Compile Include="umbraco.presentation\umbraco\dashboard\FeedProxy.aspx.cs">
-      <DependentUpon>FeedProxy.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dashboard\FeedProxy.aspx.designer.cs">
-      <DependentUpon>FeedProxy.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\EditRelationType.aspx.cs">
-      <DependentUpon>EditRelationType.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\EditRelationType.aspx.designer.cs">
-      <DependentUpon>EditRelationType.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\NewRelationType.aspx.cs">
-      <DependentUpon>NewRelationType.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\NewRelationType.aspx.designer.cs">
-      <DependentUpon>NewRelationType.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\ReadOnlyRelation.cs" />
-    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\RelationTypesWebService.asmx.cs">
-      <DependentUpon>RelationTypesWebService.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\TreeMenu\ActionDeleteRelationType.cs" />
-    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\TreeMenu\ActionNewRelationType.cs" />
-    <Compile Include="umbraco.presentation\umbraco\dialogs\Preview.aspx.cs">
-      <DependentUpon>Preview.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\Preview.aspx.designer.cs">
-      <DependentUpon>Preview.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\members\MemberSearch.ascx.cs">
-      <DependentUpon>MemberSearch.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\members\MemberSearch.ascx.designer.cs">
-      <DependentUpon>MemberSearch.ascx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\nodeFactory\Page_Legacy.cs" />
-    <Compile Include="umbraco.presentation\umbraco\preview\PreviewContent.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Search\ExamineEvents.cs" />
-    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltVisualize.aspx.cs">
-      <DependentUpon>xsltVisualize.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltVisualize.aspx.designer.cs">
-      <DependentUpon>xsltVisualize.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\insertMasterpageContent.aspx.cs">
-      <DependentUpon>insertMasterpageContent.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\insertMasterpageContent.aspx.designer.cs">
-      <DependentUpon>insertMasterpageContent.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\insertMasterpagePlaceholder.aspx.cs">
-      <DependentUpon>insertMasterpagePlaceholder.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\insertMasterpagePlaceholder.aspx.designer.cs">
-      <DependentUpon>insertMasterpagePlaceholder.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\republish.aspx.cs">
-      <DependentUpon>republish.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\republish.aspx.designer.cs">
-      <DependentUpon>republish.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\search.aspx.cs">
-      <DependentUpon>search.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\search.aspx.designer.cs">
-      <DependentUpon>search.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\SendPublish.aspx.cs">
-      <DependentUpon>SendPublish.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\SendPublish.aspx.designer.cs">
-      <DependentUpon>SendPublish.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\create\dialogHandler_temp.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\create\languageTasks.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Macros\assemblyBrowser.aspx.cs">
-      <DependentUpon>assemblyBrowser.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Macros\assemblyBrowser.aspx.designer.cs">
-      <DependentUpon>assemblyBrowser.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Packages\editPackage.aspx.cs">
-      <DependentUpon>editPackage.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Packages\editPackage.aspx.designer.cs">
-      <DependentUpon>editPackage.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\getXsltStatus.asmx.cs">
-      <DependentUpon>getXsltStatus.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltChooseExtension.aspx.cs">
-      <DependentUpon>xsltChooseExtension.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltChooseExtension.aspx.designer.cs">
-      <DependentUpon>xsltChooseExtension.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltInsertValueOf.aspx.cs">
-      <DependentUpon>xsltInsertValueOf.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltInsertValueOf.aspx.designer.cs">
-      <DependentUpon>xsltInsertValueOf.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\exportDocumenttype.aspx.cs">
-      <DependentUpon>exportDocumenttype.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\importDocumenttype.aspx.cs">
-      <DependentUpon>importDocumenttype.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\rollBack.aspx.cs">
-      <DependentUpon>rollBack.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\rollBack.aspx.designer.cs">
-      <DependentUpon>rollBack.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\sendToTranslation.aspx.cs">
-      <DependentUpon>sendToTranslation.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\sendToTranslation.aspx.designer.cs">
-      <DependentUpon>sendToTranslation.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\viewAuditTrail.aspx.cs">
-      <DependentUpon>viewAuditTrail.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\viewAuditTrail.aspx.designer.cs">
-      <DependentUpon>viewAuditTrail.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\members\EditMemberGroup.aspx.cs">
-      <DependentUpon>EditMemberGroup.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\members\EditMemberGroup.aspx.designer.cs">
-      <DependentUpon>EditMemberGroup.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\members\search.aspx.cs">
-      <DependentUpon>search.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\members\search.aspx.designer.cs">
-      <DependentUpon>search.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\members\ViewMembers.aspx.cs">
-      <DependentUpon>ViewMembers.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\members\ViewMembers.aspx.designer.cs">
-      <DependentUpon>ViewMembers.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\nodeFactory\Properties.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\nodeFactory\UmbracoSiteMapProvider.cs" />
-    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\GzipCompressor.cs" />
-    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\GzipModule.cs" />
-    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\IModule.cs" />
-    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\JSON.cs" />
-    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\JSONReader.cs" />
-    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\JSONWriter.cs" />
-    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\tinymce3tinymceCompress.aspx.cs">
-      <DependentUpon>tinymce3tinymceCompress.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\tinymce3tinymceCompress.aspx.designer.cs">
-      <DependentUpon>tinymce3tinymceCompress.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\Search\QuickSearchHandler.ashx.cs">
-      <DependentUpon>QuickSearchHandler.ashx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\settings\DictionaryItemList.aspx.cs">
-      <DependentUpon>DictionaryItemList.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\settings\DictionaryItemList.aspx.designer.cs">
-      <DependentUpon>DictionaryItemList.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\settings\editLanguage.aspx.cs">
-      <DependentUpon>editLanguage.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\settings\editLanguage.aspx.designer.cs">
-      <DependentUpon>editLanguage.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\templateControls\Script.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\BaseMediaTree.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadDLRScripts.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\ITreeService.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadRelationTypes.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\MediaRecycleBin.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\NodeActionsEventArgs.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\TreeEventArgs.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\TreeRequestParams.cs" />
-    <Compile Include="umbraco.presentation\umbraco\uQuery\ContentExtensions.cs" />
-    <Compile Include="umbraco.presentation\umbraco\uQuery\ContentTypeExtensions.cs" />
-    <Compile Include="umbraco.presentation\umbraco\uQuery\DocumentExtensions.cs" />
-    <Compile Include="umbraco.presentation\umbraco\uQuery\MediaExtensions.cs" />
-    <Compile Include="umbraco.presentation\umbraco\uQuery\MemberExtensions.cs" />
-    <Compile Include="umbraco.presentation\umbraco\uQuery\NodeExtensions.cs" />
-    <Compile Include="umbraco.presentation\umbraco\uQuery\PreValueExtensions.cs" />
-    <Compile Include="umbraco.presentation\umbraco\uQuery\RelationTypeExtensions.cs" />
-    <Compile Include="umbraco.presentation\umbraco\uQuery\UmbracoObjectTypeExtensions.cs" />
-    <Compile Include="umbraco.presentation\umbraco\webservices\MacroContainerService.asmx.cs">
-      <DependentUpon>MacroContainerService.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\webservices\TagsAutoCompleteHandler.ashx.cs">
-      <DependentUpon>TagsAutoCompleteHandler.ashx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\webservices\TreeClientService.asmx.cs">
-      <DependentUpon>TreeClientService.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\templateControls\DisableEventValidation.cs" />
-    <Compile Include="umbraco.presentation\umbraco\templateControls\Item.cs" />
-    <Compile Include="umbraco.presentation\umbraco\templateControls\ItemRenderer.cs" />
-    <Compile Include="umbraco.presentation\umbraco\templateControls\Macro.cs" />
-    <Compile Include="umbraco.presentation\umbraco\templateControls\ContentType.cs" />
-    <Compile Include="umbraco.presentation\umbraco\templateControls\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\translation\default.aspx.cs">
-      <DependentUpon>default.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\translation\default.aspx.designer.cs">
-      <DependentUpon>default.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\translation\details.aspx.cs">
-      <DependentUpon>details.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\translation\details.aspx.designer.cs">
-      <DependentUpon>details.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\translation\preview.aspx.cs">
-      <DependentUpon>preview.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\translation\preview.aspx.designer.cs">
-      <DependentUpon>preview.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\translation\xml.aspx.cs">
-      <DependentUpon>xml.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\translation\xml.aspx.designer.cs">
-      <DependentUpon>xml.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\treeInit.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\Trees\BaseContentTree.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\BaseTree.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\ContentRecycleBin.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\FileSystemTree.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadContent.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadcontentItemType.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadDataTypes.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadLanguages.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadMacros.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadMedia.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadMediaTypes.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadMemberGroups.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadMembers.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadMemberTypes.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadNodeTypes.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadPython.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadScripts.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadStylesheetProperty.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadStylesheets.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadTemplates.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadTranslationTasks.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadUsers.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadXslt.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\NullTree.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\LegacyTree.cs" />
-    <Compile Include="umbraco.presentation\umbraco\webservices\TreeDataService.ashx.cs">
-      <DependentUpon>TreeDataService.ashx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\Trees\TreeDefinitionCollection.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\TreeDefinition.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\TreeDialogModes.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\TreeService.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\XmlTree.cs">
-      <DependentUpon>XmlTree.xsd</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\urlRewriter\UrlRewriterFormWriter.cs" />
-    <Compile Include="umbraco.presentation\umbraco\webservices\ajaxHelpers.cs" />
-    <Compile Include="umbraco.presentation\umbraco\webservices\CacheRefresher.asmx.cs">
-      <DependentUpon>CacheRefresher.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\webservices\CheckForUpgrade.asmx.cs">
-      <DependentUpon>CheckForUpgrade.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\webservices\CMSNode.asmx.cs">
-      <DependentUpon>CMSNode.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\webservices\codeEditorSave.asmx.cs">
-      <DependentUpon>codeEditorSave.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\webservices\legacyAjaxCalls.asmx.cs">
-      <DependentUpon>legacyAjaxCalls.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\webservices\nodeSorter.asmx.cs">
-      <DependentUpon>nodeSorter.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\webservices\progressStatus.asmx.cs">
-      <DependentUpon>progressStatus.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\webservices\publication.asmx.cs">
-      <DependentUpon>publication.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\webservices\RegexComWebservice.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Web\UI\ContentPage.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery.cs" />
-    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Content.cs">
-      <DependentUpon>uQuery.cs</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-DataTypes.cs">
-      <DependentUpon>uQuery.cs</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Dictionary.cs">
-      <DependentUpon>uQuery.cs</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Document.cs">
-      <DependentUpon>uQuery.cs</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Media.cs">
-      <DependentUpon>uQuery.cs</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Members.cs">
-      <DependentUpon>uQuery.cs</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Nodes.cs">
-      <DependentUpon>uQuery.cs</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-PreValues.cs">
-      <DependentUpon>uQuery.cs</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-UmbracoObjectType.cs">
-      <DependentUpon>uQuery.cs</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\viewstateMoverModule.cs" />
-    <Compile Include="UmbracoApplication.cs" />
-    <Compile Include="UmbracoContext.cs" />
-    <Compile Include="UmbracoModule.cs" />
-    <Compile Include="UriUtility.cs" />
-    <Compile Include="Web References\org.umbraco.update\Reference.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Reference.map</DependentUpon>
-    </Compile>
-    <Compile Include="WebServices\BulkPublishController.cs" />
-    <Compile Include="WebServices\CoreStringsController.cs" />
-    <Compile Include="WebServices\DomainsApiController.cs" />
-    <Compile Include="WebServices\EmbedMediaService.cs" />
-    <Compile Include="WebServices\ExamineManagementApiController.cs" />
-    <Compile Include="WebServices\FolderBrowserService.cs" />
-    <Compile Include="WebServices\UmbracoAuthorizedHttpHandler.cs" />
-    <Compile Include="WebServices\SaveFileController.cs" />
-    <Compile Include="WebServices\UmbracoAuthorizedWebService.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="WebServices\UmbracoHttpHandler.cs" />
-    <Compile Include="WebServices\UmbracoWebService.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="WebServices\XmlDataIntegrityController.cs" />
-    <Compile Include="WebViewPageExtensions.cs" />
-    <None Include="..\Umbraco.Web.UI\Views\web.config">
-      <Link>Mvc\web.config</Link>
-    </None>
-    <None Include="packages.config" />
-    <None Include="Web References\org.umbraco.our\Reference.map">
-      <Generator>MSDiscoCodeGenerator</Generator>
-      <LastGenOutput>Reference.cs</LastGenOutput>
-    </None>
-    <None Include="Web References\org.umbraco.our\repository.disco" />
-    <EmbeddedResource Include="UI\JavaScript\Main.js" />
-    <EmbeddedResource Include="UI\JavaScript\JsInitialize.js" />
-    <EmbeddedResource Include="UI\JavaScript\ServerVariables.js" />
-    <Content Include="umbraco.presentation\umbraco\controls\Tree\CustomTreeService.asmx" />
-    <Content Include="umbraco.presentation\umbraco\developer\RelationTypes\EditRelationType.aspx" />
-    <Content Include="umbraco.presentation\umbraco\developer\RelationTypes\NewRelationType.aspx" />
-    <Content Include="umbraco.presentation\umbraco\developer\RelationTypes\RelationTypesWebService.asmx" />
-    <Content Include="umbraco.presentation\umbraco\dashboard\FeedProxy.aspx" />
-    <Content Include="umbraco.presentation\umbraco\dialogs\AssignDomain2.aspx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\members\MemberSearch.ascx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\dialogs\Preview.aspx" />
-    <Content Include="umbraco.presentation\umbraco\controls\ProgressBar.ascx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\actions\delete.aspx" />
-    <Content Include="umbraco.presentation\umbraco\actions\editContent.aspx" />
-    <Content Include="umbraco.presentation\umbraco\actions\preview.aspx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\actions\publish.aspx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\webservices\MacroContainerService.asmx" />
-    <Content Include="umbraco.presentation\umbraco\developer\Xslt\xsltVisualize.aspx" />
-    <Content Include="umbraco.presentation\umbraco\dialogs\empty.htm" />
-    <Content Include="umbraco.presentation\umbraco\dialogs\republish.aspx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\dialogs\search.aspx" />
-    <Content Include="umbraco.presentation\umbraco\dialogs\SendPublish.aspx" />
-    <Content Include="umbraco.presentation\umbraco\webservices\TreeClientService.asmx" />
-    <Content Include="umbraco.presentation\umbraco\members\search.aspx" />
-    <Content Include="umbraco.presentation\umbraco\translation\details.aspx" />
-    <Content Include="umbraco.presentation\umbraco\developer\Packages\editPackage.aspx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\dialogs\exportDocumenttype.aspx" />
-    <Content Include="umbraco.presentation\umbraco\dialogs\importDocumenttype.aspx" />
-    <Content Include="umbraco.presentation\umbraco\dialogs\rollBack.aspx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\dialogs\sendToTranslation.aspx" />
-    <Content Include="umbraco.presentation\umbraco\dialogs\viewAuditTrail.aspx" />
-    <Content Include="umbraco.presentation\umbraco\members\ViewMembers.aspx" />
-    <Content Include="umbraco.presentation\umbraco\plugins\tinymce3\tinymce3tinymceCompress.aspx" />
-    <None Include="app.config" />
-    <None Include="Web References\org.umbraco.our\repository.wsdl" />
-    <None Include="Web References\org.umbraco.update\UpgradeResult.datasource">
-      <DependentUpon>Reference.map</DependentUpon>
-    </None>
-    <None Include="Web References\org.umbraco.update\UpgradeResult1.datasource">
-      <DependentUpon>Reference.map</DependentUpon>
-    </None>
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings1.Designer.cs</LastGenOutput>
-    </None>
-    <Content Include="umbraco.presentation\umbraco\Search\QuickSearchHandler.ashx" />
-    <None Include="umbraco.presentation\umbraco\templateControls\InlineXslt.xsltTemplate" />
-    <Content Include="umbraco.presentation\umbraco\webservices\CheckForUpgrade.asmx" />
-    <Content Include="umbraco.presentation\umbraco\settings\DictionaryItemList.aspx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\translation\default.aspx" />
-    <Content Include="umbraco.presentation\umbraco\translation\preview.aspx" />
-    <Content Include="umbraco.presentation\umbraco\translation\xml.aspx" />
-    <Content Include="umbraco.presentation\umbraco\developer\Macros\assemblyBrowser.aspx" />
-    <Content Include="umbraco.presentation\umbraco\developer\Xslt\getXsltStatus.asmx" />
-    <Content Include="umbraco.presentation\umbraco\developer\Xslt\xsltChooseExtension.aspx" />
-    <Content Include="umbraco.presentation\umbraco\developer\Xslt\xsltInsertValueOf.aspx" />
-    <Content Include="umbraco.presentation\umbraco\members\EditMemberGroup.aspx">
-      <SubType>Form</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\schemas\umbraco.xsd">
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\settings\editLanguage.aspx" />
-    <!--<Content Include="umbraco.presentation\umbraco\users\PermissionEditor.aspx" />-->
-    <Content Include="umbraco.presentation\umbraco\webservices\CacheRefresher.asmx">
-      <SubType>Form</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\webservices\CMSNode.asmx" />
-    <Content Include="umbraco.presentation\umbraco\webservices\codeEditorSave.asmx" />
-    <Content Include="umbraco.presentation\umbraco\webservices\legacyAjaxCalls.asmx" />
-    <Content Include="umbraco.presentation\umbraco\webservices\nodeSorter.asmx" />
-    <Content Include="umbraco.presentation\umbraco\webservices\progressStatus.asmx">
-      <SubType>Form</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\webservices\publication.asmx" />
-    <Content Include="umbraco.presentation\umbraco\webservices\TreeDataService.ashx" />
-    <None Include="umbraco.presentation\umbraco\Trees\Trees.cd" />
-    <None Include="umbraco.presentation\umbraco\Trees\XmlTree.xsd">
-      <SubType>
-      </SubType>
-    </None>
-    <None Include="umbraco.presentation\umbraco\Trees\XmlTree.xsx">
-      <DependentUpon>XmlTree.xsd</DependentUpon>
-    </None>
-    <Content Include="umbraco.presentation\umbraco\webservices\TagsAutoCompleteHandler.ashx" />
-    <None Include="Web References\org.umbraco.update\checkforupgrade.disco" />
-    <None Include="Web References\org.umbraco.update\checkforupgrade.wsdl" />
-    <None Include="Web References\org.umbraco.update\Reference.map">
-      <Generator>MSDiscoCodeGenerator</Generator>
-      <LastGenOutput>Reference.cs</LastGenOutput>
-    </None>
-    <EmbeddedResource Include="UI\JavaScript\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Mvc\Strings.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Strings.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Include="umbraco.presentation\umbraco\templateControls\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <None Include="umbraco.presentation\umbraco\schemas\package.xsd">
-      <SubType>
-      </SubType>
-    </None>
-    <None Include="umbraco.presentation\umbraco\schemas\package.xsx">
-      <DependentUpon>package.xsd</DependentUpon>
-    </None>
-    <None Include="umbraco.presentation\umbraco\schemas\umbraco.xsc">
-      <DependentUpon>umbraco.xsd</DependentUpon>
-    </None>
-    <None Include="umbraco.presentation\umbraco\schemas\umbraco.xss">
-      <DependentUpon>umbraco.xsd</DependentUpon>
-    </None>
-    <None Include="umbraco.presentation\umbraco\schemas\umbraco.xsx">
-      <DependentUpon>umbraco.xsd</DependentUpon>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <WebReferences Include="Web References\" />
-  </ItemGroup>
-  <ItemGroup>
-    <WebReferenceUrl Include="https://our.umbraco.com/umbraco/webservices/api/repository.asmx">
-      <UrlBehavior>Dynamic</UrlBehavior>
-      <RelPath>Web References\org.umbraco.our\</RelPath>
-      <UpdateFromURL>https://our.umbraco.com/umbraco/webservices/api/repository.asmx</UpdateFromURL>
-      <ServiceLocationURL>
-      </ServiceLocationURL>
-      <CachedDynamicPropName>
-      </CachedDynamicPropName>
-      <CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
-      <CachedSettingsPropName>umbraco_org_umbraco_our_Repository</CachedSettingsPropName>
-    </WebReferenceUrl>
-    <WebReferenceUrl Include="http://update.umbraco.org/checkforupgrade.asmx">
-      <UrlBehavior>Dynamic</UrlBehavior>
-      <RelPath>Web References\org.umbraco.update\</RelPath>
-      <UpdateFromURL>http://update.umbraco.org/checkforupgrade.asmx</UpdateFromURL>
-      <ServiceLocationURL>
-      </ServiceLocationURL>
-      <CachedDynamicPropName>
-      </CachedDynamicPropName>
-      <CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
-      <CachedSettingsPropName>umbraco_org_umbraco_update_CheckForUpgrade</CachedSettingsPropName>
-    </WebReferenceUrl>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="umbraco.presentation\umbraco\settings\scripts\" />
-  </ItemGroup>
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
-    <VSToolsPath Condition="exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v11.0\WebApplications\Microsoft.WebApplication.targets')">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v11.0</VSToolsPath>
-    <VSToolsPath Condition="exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v12.0\WebApplications\Microsoft.WebApplication.targets')">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v12.0</VSToolsPath>
-    <VSToolsPath Condition="exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v14.0\WebApplications\Microsoft.WebApplication.targets')">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v14.0</VSToolsPath>
-    <VSToolsPath Condition="exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets')">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
-  <ProjectExtensions />
-  <PropertyGroup>
-    <!--<PostBuildEvent>xcopy "$(ProjectDir)..\..\lib\*.dll" "$(TargetDir)*.dll" /Y</PostBuildEvent>-->
-  </PropertyGroup>
-  <Import Project="..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets" Condition="Exists('..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets')" />
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{651E1350-91B6-44B7-BD60-7207006D7003}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>umbraco</AssemblyName>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Umbraco.Web</RootNamespace>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <StartupObject>
+    </StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <SccProjectName>
+    </SccProjectName>
+    <SccLocalPath>
+    </SccLocalPath>
+    <SccAuxPath>
+    </SccAuxPath>
+    <SccProvider>
+    </SccProvider>
+    <OldToolsVersion>4.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
+    <LangVersion>latest</LangVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
+    <LangVersion>latest</LangVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile>bin\Release\umbraco.xml</DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>pdbonly</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\UmbracoExamine\UmbracoExamine.csproj">
+      <Project>{07fbc26b-2927-4a22-8d96-d644c667fecc}</Project>
+      <Name>UmbracoExamine</Name>
+    </ProjectReference>
+    <Reference Include="AutoMapper, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
+      <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="AutoMapper.Net4, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
+      <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <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="dotless.Core, Version=1.5.2.0, Culture=neutral, PublicKeyToken=96b446c9e63eae34, processorArchitecture=MSIL">
+      <HintPath>..\packages\dotless.1.5.2\lib\dotless.Core.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="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="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>
+    <Reference Include="Lucene.Net, Version=2.9.4.1, Culture=neutral, PublicKeyToken=85089178b9ac3181, processorArchitecture=MSIL">
+      <HintPath>..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll</HintPath>
+    </Reference>
+    <Reference Include="MarkdownSharp, Version=1.14.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Markdown.1.14.7\lib\net45\MarkdownSharp.dll</HintPath>
+      <Private>True</Private>
+    </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.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.2\lib\net45\Microsoft.AspNet.Identity.Owin.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNet.SignalR.Core, Version=2.4.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.SignalR.Core.2.4.1\lib\net45\Microsoft.AspNet.SignalR.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CSharp" />
+    <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.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.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=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=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="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>
+      <Private>True</Private>
+    </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>
+      <Private>True</Private>
+    </Reference>
+    <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>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Semver, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\semver.1.1.2\lib\net451\Semver.dll</HintPath>
+    </Reference>
+    <Reference Include="System">
+      <Name>System</Name>
+    </Reference>
+    <Reference Include="System.ComponentModel.Composition" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.configuration" />
+    <Reference Include="System.Data">
+      <Name>System.Data</Name>
+    </Reference>
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Design" />
+    <Reference Include="System.Drawing">
+      <Name>System.Drawing</Name>
+    </Reference>
+    <Reference Include="System.EnterpriseServices" />
+    <Reference Include="System.IO.Compression.FileSystem" />
+    <Reference Include="System.Net.Http" />
+    <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.Runtime.Serialization" />
+    <Reference Include="System.Security" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Threading.Tasks.Dataflow, Version=4.6.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Dataflow.4.9.0\lib\portable-net45+win8+wpa81\System.Threading.Tasks.Dataflow.dll</HintPath>
+    </Reference>
+    <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.Abstractions">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Web.ApplicationServices" />
+    <Reference Include="System.Web.DynamicData" />
+    <Reference Include="System.Web.Entity" />
+    <Reference Include="System.Web.Extensions" />
+    <Reference Include="System.Web.Extensions.Design" />
+    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
+    </Reference>
+    <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.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.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.7\lib\net45\System.Web.Razor.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Services">
+      <Name>System.Web.Services</Name>
+    </Reference>
+    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <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.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.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml">
+      <Name>System.XML</Name>
+    </Reference>
+    <Reference Include="System.Xml.Linq" />
+    <ProjectReference Include="..\SQLCE4Umbraco\SqlCE4Umbraco.csproj">
+      <Project>{5BA5425F-27A7-4677-865E-82246498AA2E}</Project>
+      <Name>SqlCE4Umbraco</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj">
+      <Project>{31785BC3-256C-4613-B2F5-A1B0BDDED8C1}</Project>
+      <Name>Umbraco.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\umbraco.controls\umbraco.controls.csproj">
+      <Project>{6EDD2061-82F2-461B-BB6E-879245A832DE}</Project>
+      <Name>umbraco.controls</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\umbraco.businesslogic\umbraco.businesslogic.csproj">
+      <Name>umbraco.businesslogic</Name>
+      <Project>{E469A9CE-1BEC-423F-AC44-713CD72457EA}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+    </ProjectReference>
+    <ProjectReference Include="..\umbraco.cms\umbraco.cms.csproj">
+      <Project>{CCD75EC3-63DB-4184-B49D-51C1DD337230}</Project>
+      <Name>umbraco.cms</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\umbraco.datalayer\umbraco.datalayer.csproj">
+      <Project>{C7CB79F0-1C97-4B33-BFA7-00731B579AE2}</Project>
+      <Name>umbraco.datalayer</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\umbraco.interfaces\umbraco.interfaces.csproj">
+      <Name>umbraco.interfaces</Name>
+      <Project>{511F6D8D-7717-440A-9A57-A507E9A8B27F}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+    </ProjectReference>
+    <ProjectReference Include="..\umbraco.providers\umbraco.providers.csproj">
+      <Project>{D7636876-0756-43CB-A192-138C6F0D5E42}</Project>
+      <Name>umbraco.providers</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\SolutionInfo.cs">
+      <Link>Properties\SolutionInfo.cs</Link>
+    </Compile>
+    <Compile Include="ApplicationContextExtensions.cs" />
+    <Compile Include="AreaRegistrationContextExtensions.cs" />
+    <Compile Include="BatchedDatabaseServerMessengerStartup.cs" />
+    <Compile Include="Cache\ApplicationCacheRefresher.cs" />
+    <Compile Include="Cache\ApplicationTreeCacheRefresher.cs" />
+    <Compile Include="Cache\CacheRefresherEventHandler.cs" />
+    <Compile Include="Cache\ContentTypeCacheRefresher.cs" />
+    <Compile Include="Cache\DataTypeCacheRefresher.cs" />
+    <Compile Include="Cache\DictionaryCacheRefresher.cs" />
+    <Compile Include="Cache\DistributedCache.cs" />
+    <Compile Include="Cache\DistributedCacheExtensions.cs" />
+    <Compile Include="Cache\DomainCacheRefresher.cs" />
+    <Compile Include="Cache\LanguageCacheRefresher.cs" />
+    <Compile Include="Cache\MacroCacheRefresher.cs" />
+    <Compile Include="Cache\MediaCacheRefresher.cs" />
+    <Compile Include="Cache\MemberCacheRefresher.cs" />
+    <Compile Include="Cache\MemberGroupCacheRefresher.cs" />
+    <Compile Include="Cache\PageCacheRefresher.cs" />
+    <Compile Include="Cache\PublicAccessCacheRefresher.cs" />
+    <Compile Include="Cache\RelationTypeCacheRefresher.cs" />
+    <Compile Include="Cache\UserGroupCacheRefresher.cs" />
+    <Compile Include="Cache\StylesheetCacheRefresher.cs" />
+    <Compile Include="Cache\StylesheetPropertyCacheRefresher.cs" />
+    <Compile Include="Cache\TemplateCacheRefresher.cs" />
+    <Compile Include="Cache\UnpublishedPageCacheRefresher.cs" />
+    <Compile Include="Cache\UserCacheRefresher.cs" />
+    <Compile Include="Security\UmbracoAntiForgeryAdditionalDataProvider.cs" />
+    <Compile Include="Editors\PreviewController.cs" />
+    <Compile Include="Editors\BackOfficeAssetsController.cs" />
+    <Compile Include="Features\DisabledFeatures.cs" />
+    <Compile Include="Editors\BackOfficeNotificationsController.cs" />
+    <Compile Include="Editors\DictionaryController.cs" />
+    <Compile Include="Editors\BackOfficeServerVariables.cs" />
+    <Compile Include="Editors\DashboardHelper.cs" />
+    <Compile Include="Editors\EditorModelEventArgs.cs" />
+    <Compile Include="Editors\EditorValidationResolver.cs" />
+    <Compile Include="Editors\EditorValidator.cs" />
+    <Compile Include="Editors\FromJsonPathAttribute.cs" />
+    <Compile Include="Editors\HelpController.cs" />
+    <Compile Include="Editors\IsCurrentUserModelFilterAttribute.cs" />
+    <Compile Include="Editors\PasswordChanger.cs" />
+    <Compile Include="Editors\TemplateController.cs" />
+    <Compile Include="Editors\ParameterSwapControllerActionSelector.cs" />
+    <Compile Include="Editors\CodeFileController.cs" />
+    <Compile Include="Editors\TourController.cs" />
+    <Compile Include="Features\EnabledFeatures.cs" />
+    <Compile Include="HealthCheck\Checks\Services\Tls12Check.cs" />
+    <Compile Include="HealthCheck\Checks\Security\XssProtectionCheck.cs" />
+    <Compile Include="HealthCheck\Checks\Security\HstsCheck.cs" />
+    <Compile Include="Models\BackOfficeTourFilter.cs" />
+    <Compile Include="Models\ContentEditing\BackOfficePreview.cs" />
+    <Compile Include="Models\ContentEditing\DocumentTypeCollectionDisplay.cs" />
+    <Compile Include="Models\ContentEditing\NotifySetting.cs" />
+    <Compile Include="Models\ContentEditing\UrlAndAnchors.cs" />
+    <Compile Include="Models\Mapping\AutoMapperExtensions.cs" />
+    <Compile Include="Models\Mapping\ContentTreeNodeUrlResolver.cs" />
+    <Compile Include="Models\Mapping\MemberTreeNodeUrlResolver.cs" />
+    <Compile Include="Models\Trees\ExportMember.cs" />
+    <Compile Include="PropertyEditors\DropdownFlexiblePropertyEditor.cs" />
+    <Compile Include="TourFilterResolver.cs" />
+    <Compile Include="Editors\UserEditorAuthorizationHelper.cs" />
+    <Compile Include="Editors\UserGroupAuthorizationAttribute.cs" />
+    <Compile Include="Editors\UserGroupEditorAuthorizationHelper.cs" />
+    <Compile Include="Editors\UserGroupsController.cs" />
+    <Compile Include="Editors\UserGroupValidateAttribute.cs" />
+    <Compile Include="ExamineStartup.cs" />
+    <Compile Include="Extensions\UdiExtensions.cs" />
+    <Compile Include="Features\UmbracoFeatures.cs" />
+    <Compile Include="Features\FeaturesResolver.cs" />
+    <Compile Include="HealthCheck\Checks\Config\AbstractConfigCheck.cs" />
+    <Compile Include="HealthCheck\Checks\Config\AcceptableConfiguration.cs" />
+    <Compile Include="HealthCheck\Checks\Config\ConfigurationService.cs" />
+    <Compile Include="HealthCheck\Checks\Config\ConfigurationServiceResult.cs" />
+    <Compile Include="HealthCheck\Checks\Config\MacroErrorsCheck.cs" />
+    <Compile Include="HealthCheck\Checks\Config\NotificationEmailCheck.cs" />
+    <Compile Include="HealthCheck\Checks\Config\TrySkipIisCustomErrorsCheck.cs" />
+    <Compile Include="HealthCheck\Checks\Config\CustomErrorsCheck.cs" />
+    <Compile Include="HealthCheck\Checks\Config\TraceCheck.cs" />
+    <Compile Include="HealthCheck\Checks\Config\ValueComparisonType.cs" />
+    <Compile Include="HealthCheck\Checks\Config\CompilationDebugCheck.cs" />
+    <Compile Include="HealthCheck\Checks\Security\BaseHttpHeaderCheck.cs" />
+    <Compile Include="HealthCheck\Checks\Security\NoSniffCheck.cs" />
+    <Compile Include="HealthCheck\Checks\Services\SmtpCheck.cs" />
+    <Compile Include="HealthCheck\Checks\Permissions\FolderAndFilePermissionsCheck.cs" />
+    <Compile Include="HealthCheck\Checks\Security\ExcessiveHeadersCheck.cs" />
+    <Compile Include="HealthCheck\Checks\Security\ClickJackingCheck.cs" />
+    <Compile Include="HealthCheck\HealthCheckAction.cs" />
+    <Compile Include="HealthCheck\HealthCheckNotificationMethodAttribute.cs" />
+    <Compile Include="HealthCheck\HealthCheckAttribute.cs" />
+    <Compile Include="HealthCheck\HealthCheckContext.cs" />
+    <Compile Include="HealthCheck\HealthCheckController.cs" />
+    <Compile Include="HealthCheck\HealthCheckGroup.cs" />
+    <Compile Include="HealthCheck\HealthCheckNotificationMethodResolver.cs" />
+    <Compile Include="HealthCheck\HealthCheckResolver.cs" />
+    <Compile Include="HealthCheck\HealthCheck.cs" />
+    <Compile Include="HealthCheck\HealthCheckResults.cs" />
+    <Compile Include="HealthCheck\HealthCheckStatus.cs" />
+    <Compile Include="HealthCheck\Checks\Security\HttpsCheck.cs" />
+    <Compile Include="HealthCheck\IHealthCheckResolver.cs" />
+    <Compile Include="HealthCheck\IHealthCheckNotificationMethodsResolver.cs" />
+    <Compile Include="HealthCheck\NotificationMethods\NotificationMethodBase.cs" />
+    <Compile Include="HealthCheck\NotificationMethods\EmailNotificationMethod.cs" />
+    <Compile Include="HealthCheck\NotificationMethods\IHealthCheckNotificatationMethod.cs" />
+    <Compile Include="HealthCheck\StatusResultType.cs" />
+    <Compile Include="HealthCheck\Checks\DataIntegrity\XmlDataIntegrityHealthCheck.cs" />
+    <Compile Include="IHttpContextAccessor.cs" />
+    <Compile Include="Install\InstallSteps\ConfigureMachineKey.cs" />
+    <Compile Include="Models\BackOfficeTourFile.cs" />
+    <Compile Include="Models\BackOfficeTourStep.cs" />
+    <Compile Include="Models\ContentEditing\AssignedContentPermissions.cs" />
+    <Compile Include="Models\ContentEditing\AssignedUserGroupPermissions.cs" />
+    <Compile Include="Models\ContentEditing\ContentRedirectUrl.cs" />
+    <Compile Include="Models\ContentEditing\DictionaryDisplay.cs" />
+    <Compile Include="Models\ContentEditing\DictionaryOverviewDisplay.cs" />
+    <Compile Include="Models\ContentEditing\DictionarySave.cs" />
+    <Compile Include="Models\ContentEditing\DictionaryOverviewTranslationDisplay.cs" />
+    <Compile Include="Models\ContentEditing\DictionaryTranslationSave.cs" />
+    <Compile Include="Models\ContentEditing\EditorNavigation.cs" />
+    <Compile Include="Models\ContentEditing\GetAvailableCompositionsFilter.cs" />
+    <Compile Include="Editors\IEditorValidator.cs" />
+    <Compile Include="Editors\EditorModelEventManager.cs" />
+    <Compile Include="HtmlHelperBackOfficeExtensions.cs" />
+    <Compile Include="Install\InstallSteps\Version73FileCleanup.cs" />
+    <Compile Include="Models\ContentEditing\DocumentTypeDisplay.cs" />
+    <Compile Include="Media\EmbedProviders\Flickr.cs" />
+    <Compile Include="Models\ContentEditing\ContentTypeCompositionDisplay.cs" />
+    <Compile Include="Models\ContentEditing\ContentTypeSave.cs" />
+    <Compile Include="Models\ContentEditing\DocumentTypeSave.cs" />
+    <Compile Include="Models\ContentEditing\InstalledPackageModel.cs" />
+    <Compile Include="Models\ContentEditing\LinkDisplay.cs" />
+    <Compile Include="Models\ContentEditing\MediaTypeDisplay.cs" />
+    <Compile Include="Models\ContentEditing\MediaTypeSave.cs" />
+    <Compile Include="Models\ContentEditing\MemberPropertyTypeBasic.cs" />
+    <Compile Include="Models\ContentEditing\MemberPropertyTypeDisplay.cs" />
+    <Compile Include="Models\ContentEditing\MemberTypeDisplay.cs" />
+    <Compile Include="Models\ContentEditing\MemberTypeSave.cs" />
+    <Compile Include="Models\ContentEditing\Permission.cs" />
+    <Compile Include="Models\ContentEditing\PostedFiles.cs" />
+    <Compile Include="Models\ContentEditing\PostedFolder.cs" />
+    <Compile Include="Models\ContentEditing\PropertyGroupBasic.cs" />
+    <Compile Include="Models\ContentEditing\PropertyTypeBasic.cs" />
+    <Compile Include="Models\ContentEditing\SimpleNotificationModel.cs" />
+    <Compile Include="Models\ContentEditing\SnippetDisplay.cs" />
+    <Compile Include="Models\ContentEditing\TemplateDisplay.cs" />
+    <Compile Include="Models\ContentEditing\DictionaryTranslationDisplay.cs" />
+    <Compile Include="Models\ContentEditing\UserDisplay.cs" />
+    <Compile Include="Models\ContentEditing\UserBasic.cs" />
+    <Compile Include="Models\ContentEditing\UserGroupBasic.cs" />
+    <Compile Include="Models\ContentEditing\UserGroupDisplay.cs" />
+    <Compile Include="Models\ContentEditing\UserGroupPermissionsSave.cs" />
+    <Compile Include="Models\ContentEditing\UserGroupSave.cs" />
+    <Compile Include="Models\DetachedPublishedContent.cs" />
+    <Compile Include="Models\DetachedPublishedProperty.cs" />
+    <Compile Include="Models\ContentEditing\UserInvite.cs" />
+    <Compile Include="Models\ContentEditing\UserSave.cs" />
+    <Compile Include="Models\Link.cs" />
+    <Compile Include="Models\LinkType.cs" />
+    <Compile Include="Models\LocalPackageInstallModel.cs" />
+    <Compile Include="Models\Mapping\CodeFileDisplayMapper.cs" />
+    <Compile Include="Models\Mapping\ContentTypeModelMapperExtensions.cs" />
+    <Compile Include="Models\Mapping\ContentTypeUdiResolver.cs" />
+    <Compile Include="Models\Mapping\DictionaryModelMapper.cs" />
+    <Compile Include="Models\Mapping\EntityModelMapperExtensions.cs" />
+    <Compile Include="Models\Mapping\LockedCompositionsResolver.cs" />
+    <Compile Include="Models\Mapping\UserGroupDefaultPermissionsResolver.cs" />
+    <Compile Include="Models\Mapping\PropertyGroupDisplayResolver.cs" />
+    <Compile Include="Models\RelatedLink.cs" />
+    <Compile Include="Models\Mapping\TemplateModelMapper.cs" />
+    <Compile Include="Models\PackageInstallResult.cs" />
+    <Compile Include="Models\RelatedLinkBase.cs" />
+    <Compile Include="Models\ContentEditing\CodeFileDisplay.cs" />
+    <Compile Include="Models\SendCodeViewModel.cs" />
+    <Compile Include="Models\RelatedLinks.cs" />
+    <Compile Include="Models\RelatedLinkType.cs" />
+    <Compile Include="Models\SetPasswordModel.cs" />
+    <Compile Include="Models\RequestPasswordResetModel.cs" />
+    <Compile Include="Models\PublishedContentWithKeyBase.cs" />
+    <Compile Include="Models\BackOfficeTour.cs" />
+    <Compile Include="Models\UserTourStatus.cs" />
+    <Compile Include="Models\ValidatePasswordResetCodeModel.cs" />
+    <Compile Include="Mvc\ControllerContextExtensions.cs" />
+    <Compile Include="Mvc\DisableBrowserCacheAttribute.cs" />
+    <Compile Include="Mvc\EnsurePartialViewMacroViewContextFilterAttribute.cs" />
+    <Compile Include="Mvc\IRenderController.cs" />
+    <Compile Include="Mvc\ModelBindingException.cs" />
+    <Compile Include="Mvc\RenderIndexActionSelectorAttribute.cs" />
+    <Compile Include="Mvc\UmbracoRequireHttpsAttribute.cs" />
+    <Compile Include="Mvc\ValidateMvcAngularAntiForgeryTokenAttribute.cs" />
+    <Compile Include="OwinMiddlewareConfiguredEventArgs.cs" />
+    <Compile Include="Profiling\WebProfilerProvider.cs" />
+    <Compile Include="Profiling\WebProfiler.cs" />
+    <Compile Include="PropertyEditors\ContentPicker2PropertyEditor.cs" />
+    <Compile Include="PropertyEditors\DatePreValueEditor.cs" />
+    <Compile Include="PropertyEditors\DateTimePreValueEditor.cs" />
+    <Compile Include="PropertyEditors\DecimalPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\MediaPicker2PropertyEditor.cs" />
+    <Compile Include="PropertyEditors\MemberPicker2PropertyEditor.cs" />
+    <Compile Include="PropertyEditors\MultiNodeTreePicker2PropertyEditor.cs" />
+    <Compile Include="PropertyEditors\MultiUrlPickerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\NestedContentController.cs" />
+    <Compile Include="PropertyEditors\NestedContentHelper.cs" />
+    <Compile Include="PropertyEditors\NestedContentPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\RelatedLinks2PropertyEditor.cs" />
+    <Compile Include="PropertyEditors\TextOnlyValueEditor.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\ContentPickerPropertyConverter.cs" />
+    <Compile Include="PropertyEditors\ParameterEditors\MultipleContentPickerParameterEditor.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\ImageCropDataSetConverter.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\ImageCropperValueConverter.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\LegacyRelatedLinksEditorValueConvertor.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\MediaPickerPropertyConverter.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\MemberPickerPropertyConverter.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\MultiNodeTreePickerPropertyConverter.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\LegacyMediaPickerPropertyConverter.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\MultiUrlPickerPropertyConverter.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\NestedContentSingleValueConverter.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\NestedContentManyValueConverter.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\NestedContentPublishedPropertyTypeExtensions.cs" />
+    <Compile Include="PublishedContentQueryExtensions.cs" />
+    <Compile Include="Routing\RedirectTrackingEventHandler.cs" />
+    <Compile Include="Editors\RedirectUrlManagementController.cs" />
+    <Compile Include="Models\ContentEditing\RedirectUrlSearchResults.cs" />
+    <Compile Include="RelatedLinksTypeConverter.cs" />
+    <Compile Include="RouteDataExtensions.cs" />
+    <Compile Include="Routing\ContentFinderByRedirectUrl.cs" />
+    <Compile Include="Scheduling\HealthCheckNotifier.cs" />
+    <Compile Include="Scheduling\LatchedBackgroundTaskBase.cs" />
+    <Compile Include="Search\SearchableApplicationTree.cs" />
+    <Compile Include="Search\SearchableTreeAttribute.cs" />
+    <Compile Include="Search\SearchableTreeCollection.cs" />
+    <Compile Include="Search\SearchableTreeResolver.cs" />
+    <Compile Include="Search\UmbracoTreeSearcher.cs" />
+    <Compile Include="Security\Identity\ExternalSignInAutoLinkOptions.cs" />
+    <Compile Include="Security\Identity\FixWindowsAuthMiddlware.cs" />
+    <Compile Include="Security\Identity\ForceRenewalCookieAuthenticationHandler.cs" />
+    <Compile Include="Security\Identity\ForceRenewalCookieAuthenticationMiddleware.cs" />
+    <Compile Include="Security\Identity\GetUserSecondsMiddleWare.cs" />
+    <Compile Include="Models\ContentEditing\PropertyTypeDisplay.cs" />
+    <Compile Include="Models\ContentEditing\PropertyGroupDisplay.cs" />
+    <Compile Include="Media\EmbedProviders\OEmbedJson.cs" />
+    <Compile Include="Media\EmbedProviders\OEmbedResponse.cs" />
+    <Compile Include="Media\EmbedProviders\OEmbedPhoto.cs" />
+    <Compile Include="Security\Identity\IUmbracoBackOfficeTwoFactorOptions.cs" />
+    <Compile Include="Models\Mapping\PropertyTypeGroupResolver.cs" />
+    <Compile Include="Security\Identity\PreviewAuthenticationMiddleware.cs" />
+    <Compile Include="SingletonHttpContextAccessor.cs" />
+    <Compile Include="Trees\DictionaryTreeController.cs" />
+    <Compile Include="Trees\MacroTreeController.cs" />
+    <Compile Include="Trees\UserTreeController.cs" />
+    <Compile Include="Suspendable.cs" />
+    <Compile Include="Trees\ContentBlueprintTreeController.cs" />
+    <Compile Include="Trees\ContentTypeTreeController.cs" />
+    <Compile Include="Trees\PackagesTreeController.cs" />
+    <Compile Include="Trees\MediaTypeTreeController.cs" />
+    <Compile Include="Trees\MemberTypeTreeController.cs" />
+    <Compile Include="Security\WebAuthExtensions.cs" />
+    <Compile Include="Trees\XsltTreeController.cs" />
+    <Compile Include="umbraco.presentation\SafeXmlReaderWriter.cs" />
+    <Compile Include="Trees\ScriptTreeController.cs" />
+    <Compile Include="umbraco.presentation\umbraco\developer\Packages\installer.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="UmbracoDefaultOwinStartup.cs" />
+    <Compile Include="IUmbracoContextAccessor.cs" />
+    <Compile Include="Models\ContentEditing\Relation.cs" />
+    <Compile Include="HtmlStringUtilities.cs" />
+    <Compile Include="Models\ContentEditing\RelationType.cs" />
+    <Compile Include="Models\ContentExtensions.cs" />
+    <Compile Include="IDynamicPublishedContentQuery.cs" />
+    <Compile Include="ITagQuery.cs" />
+    <Compile Include="ITypedPublishedContentQuery.cs" />
+    <Compile Include="IUmbracoComponentRenderer.cs" />
+    <Compile Include="Models\LegacyConvertedNode.cs" />
+    <Compile Include="Models\LegacyConvertedNodeProperty.cs" />
+    <Compile Include="Models\Mapping\RelationModelMapper.cs" />
+    <Compile Include="Mvc\DisableClientCacheAttribute.cs" />
+    <Compile Include="Models\UnLinkLoginModel.cs" />
+    <Compile Include="Mvc\MvcVersionCheck.cs" />
+    <Compile Include="Mvc\ReflectedFixedRazorViewEngine.cs" />
+    <Compile Include="Scheduling\ThreadingTaskImmutable.cs" />
+    <Compile Include="Mvc\ProfilingView.cs" />
+    <Compile Include="Mvc\ProfilingViewEngine.cs" />
+    <Compile Include="Mvc\UrlHelperExtensions.cs" />
+    <Compile Include="Scheduling\BackgroundTaskRunner.cs" />
+    <Compile Include="BatchedDatabaseServerMessenger.cs" />
+    <Compile Include="BatchedWebServiceServerMessenger.cs" />
+    <Compile Include="CacheHelperExtensions.cs" />
+    <Compile Include="Cache\UserGroupPermissionsCacheRefresher.cs" />
+    <Compile Include="Editors\AuthenticationController.cs" />
+    <Compile Include="Controllers\UmbProfileController.cs" />
+    <Compile Include="Editors\ContentController.cs" />
+    <Compile Include="Controllers\UmbLoginStatusController.cs" />
+    <Compile Include="Editors\ContentPostValidateAttribute.cs" />
+    <Compile Include="Editors\ContentTypeControllerBase.cs" />
+    <Compile Include="Editors\DashboardController.cs" />
+    <Compile Include="Editors\DashboardSecurity.cs" />
+    <Compile Include="Editors\DataTypeController.cs" />
+    <Compile Include="Editors\DataTypeValidateAttribute.cs" />
+    <Compile Include="Editors\EntityControllerConfigurationAttribute.cs" />
+    <Compile Include="Editors\ImagesController.cs" />
+    <Compile Include="Editors\PackageInstallController.cs" />
+    <Compile Include="Editors\RelationController.cs" />
+    <Compile Include="Editors\CanvasDesignerController.cs" />
+    <Compile Include="Editors\UsersController.cs" />
+    <Compile Include="GridTemplateExtensions.cs" />
+    <Compile Include="Models\PackageInstallModel.cs" />
+    <Compile Include="Models\ContentEditing\DataTypeBasic.cs" />
+    <Compile Include="Models\ContentEditing\MemberBasic.cs" />
+    <Compile Include="Models\ContentEditing\MemberListDisplay.cs" />
+    <Compile Include="Models\TemplateQuery\ContentTypeModel.cs" />
+    <Compile Include="Models\TemplateQuery\PropertyModel.cs" />
+    <Compile Include="Models\TemplateQuery\SourceModel.cs" />
+    <Compile Include="Models\TemplateQuery\TemplateQueryResult.cs" />
+    <Compile Include="Models\TemplateQuery\SortExpression.cs" />
+    <Compile Include="Models\TemplateQuery\Operathor.cs" />
+    <Compile Include="Models\TemplateQuery\OperathorTerm.cs" />
+    <Compile Include="Models\TemplateQuery\QueryCondition.cs" />
+    <Compile Include="Models\TemplateQuery\QueryModel.cs" />
+    <Compile Include="Models\TemplateQuery\QueryResultModel.cs" />
+    <Compile Include="Editors\TemplateQueryController.cs" />
+    <Compile Include="Models\ContentEditing\ContentBaseItemSave.cs" />
+    <Compile Include="Models\ContentEditing\MediaItemSave.cs" />
+    <Compile Include="Models\DetachedContent.cs" />
+    <Compile Include="Models\ImageCropAnchor.cs" />
+    <Compile Include="Models\ImageCropCoordinates.cs" />
+    <Compile Include="Models\ImageCropDataSet.cs" />
+    <Compile Include="Models\ImageCropFocalPoint.cs" />
+    <Compile Include="Models\ImageCropMode.cs" />
+    <Compile Include="Install\DatabaseHelper.cs" />
+    <Compile Include="Install\InstallException.cs" />
+    <Compile Include="Install\InstallStatusTracker.cs" />
+    <Compile Include="Install\InstallSteps\DatabaseConfigureStep.cs" />
+    <Compile Include="Install\InstallSteps\DatabaseInstallStep.cs" />
+    <Compile Include="Install\InstallSteps\DatabaseUpgradeStep.cs" />
+    <Compile Include="Install\InstallSteps\FilePermissionsStep.cs" />
+    <Compile Include="Install\InstallSteps\MajorVersion7UpgradeReport.cs" />
+    <Compile Include="Install\InstallSteps\SetUmbracoVersionStep.cs" />
+    <Compile Include="Install\InstallSteps\StarterKitCleanupStep.cs" />
+    <Compile Include="Install\InstallSteps\StarterKitDownloadStep.cs" />
+    <Compile Include="Install\InstallSteps\StarterKitInstallStep.cs" />
+    <Compile Include="Install\InstallSteps\UpgradeStep.cs" />
+    <Compile Include="Install\InstallSteps\NewInstallStep.cs" />
+    <Compile Include="Install\Controllers\InstallPackageController.cs" />
+    <Compile Include="Install\Models\DatabaseModel.cs" />
+    <Compile Include="Install\Models\DatabaseType.cs" />
+    <Compile Include="Install\Models\InstallationType.cs" />
+    <Compile Include="Install\Models\InstallInstructions.cs" />
+    <Compile Include="Install\Models\InstallPackageModel.cs" />
+    <Compile Include="Install\Models\InstallProgressResultModel.cs" />
+    <Compile Include="Install\Models\InstallSetup.cs" />
+    <Compile Include="Install\Models\InstallSetupResult.cs" />
+    <Compile Include="Install\Models\InstallSetupStep.cs" />
+    <Compile Include="Install\Models\InstallSetupStepAttribute.cs" />
+    <Compile Include="Install\Models\InstallTrackingItem.cs" />
+    <Compile Include="Install\Models\Package.cs" />
+    <Compile Include="Install\Models\UserModel.cs" />
+    <Compile Include="Install\UmbracoInstallArea.cs" />
+    <Compile Include="Install\Controllers\InstallApiController.cs" />
+    <Compile Include="Install\Controllers\InstallController.cs" />
+    <Compile Include="Install\InstallAuthorizeAttribute.cs" />
+    <Compile Include="Models\ContentEditing\TreeSearchResult.cs" />
+    <Compile Include="Models\ContentEditing\ListViewAwareContentItemDisplayBase.cs" />
+    <Compile Include="Models\ContentEditing\PropertyTypeValidation.cs" />
+    <Compile Include="Models\ImageCropData.cs" />
+    <Compile Include="Models\ImageCropRatioMode.cs" />
+    <Compile Include="Models\IRenderModel.cs" />
+    <Compile Include="Models\PartialViewMacroModelExtensions.cs" />
+    <Compile Include="Models\PostRedirectModel.cs" />
+    <Compile Include="Models\PublishedProperty.cs" />
+    <Compile Include="Mvc\ActionExecutedEventArgs.cs" />
+    <Compile Include="Mvc\AdminTokenAuthorizeAttribute.cs" />
+    <Compile Include="Mvc\NotFoundHandler.cs" />
+    <Compile Include="Mvc\PreRenderViewActionFilterAttribute.cs" />
+    <Compile Include="Mvc\RedirectToUmbracoUrlResult.cs" />
+    <Compile Include="PropertyEditors\GridPropertyEditor.cs" />
+    <Compile Include="Mvc\UmbracoVirtualNodeByIdRouteHandler.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\MacroContainerValueConverter.cs" />
+    <Compile Include="PropertyEditors\TagsDataController.cs" />
+    <Compile Include="PublishedCache\MemberPublishedContent.cs" />
+    <Compile Include="PublishedCache\RawValueProperty.cs" />
+    <Compile Include="Models\RenderModelOfTContent.cs" />
+    <Compile Include="Mvc\JsonNetResult.cs" />
+    <Compile Include="Mvc\MinifyJavaScriptResultAttribute.cs" />
+    <Compile Include="Mvc\EnsurePublishedContentRequestAttribute.cs" />
+    <Compile Include="Mvc\UmbracoTemplatePageOfTContent.cs" />
+    <Compile Include="Mvc\UmbracoViewPage.cs" />
+    <Compile Include="Editors\LogController.cs" />
+    <Compile Include="Editors\MacroController.cs" />
+    <Compile Include="Editors\MemberTypeController.cs" />
+    <Compile Include="Editors\UpdateCheckController.cs" />
+    <Compile Include="MembershipProviderExtensions.cs" />
+    <Compile Include="Models\ChangingPasswordModel.cs" />
+    <Compile Include="Models\ContentEditing\ModelWithNotifications.cs" />
+    <Compile Include="Models\ContentEditing\StyleSheet.cs" />
+    <Compile Include="Editors\StylesheetController.cs" />
+    <Compile Include="Models\ContentEditing\AuditLog.cs" />
+    <Compile Include="Models\ContentEditing\MoveOrCopy.cs" />
+    <Compile Include="Models\ContentEditing\MacroParameter.cs" />
+    <Compile Include="Models\ContentEditing\MemberDisplay.cs" />
+    <Compile Include="Models\ContentEditing\MemberSave.cs" />
+    <Compile Include="Models\ContentEditing\RichTextEditorCommand.cs" />
+    <Compile Include="Models\ContentEditing\RichTextEditorConfiguration.cs" />
+    <Compile Include="Models\ContentEditing\RichTextEditorPlugin.cs" />
+    <Compile Include="Models\ContentEditing\StylesheetRule.cs" />
+    <Compile Include="Models\ContentEditing\UmbracoEntityTypes.cs" />
+    <Compile Include="Models\ContentEditing\AuditLogType.cs" />
+    <Compile Include="Models\Mapping\MiscModelsMapper.cs" />
+    <Compile Include="Models\Mapping\MacroModelMapper.cs" />
+    <Compile Include="Models\Mapping\MemberModelMapper.cs" />
+    <Compile Include="Models\Mapping\TabModelMapper.cs" />
+    <Compile Include="Models\TagModel.cs" />
+    <Compile Include="Models\UpgradeCheckResponse.cs" />
+    <Compile Include="Models\PasswordChangedModel.cs" />
+    <Compile Include="NotificationServiceExtensions.cs" />
+    <Compile Include="PropertyEditors\ColorListPreValueEditor.cs" />
+    <Compile Include="PropertyEditors\EmailAddressPropertyEditor.cs" />
+    <Compile Include="ImageCropperBaseExtensions.cs" />
+    <Compile Include="PropertyEditors\ImageCropperPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\ImageCropperPropertyValueEditor.cs" />
+    <Compile Include="PropertyEditors\ListViewPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\MacroContainerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\MarkdownPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\MemberGroupPickerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\MemberPickerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\MultiNodeTreePickerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\MultipleMediaPickerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\ParameterEditors\ContentTypeParameterEditor.cs" />
+    <Compile Include="PropertyEditors\ParameterEditors\MultipleContentTypeParameterEditor.cs" />
+    <Compile Include="PropertyEditors\ParameterEditors\MultipleMediaPickerParameterEditor.cs" />
+    <Compile Include="PropertyEditors\ParameterEditors\MultiplePropertyGroupParameterEditor.cs" />
+    <Compile Include="PropertyEditors\ParameterEditors\MultiplePropertyTypeParameterEditor.cs" />
+    <Compile Include="PropertyEditors\ParameterEditors\PropertyGroupParameterEditor.cs" />
+    <Compile Include="PropertyEditors\ParameterEditors\PropertyTypeParameterEditor.cs" />
+    <Compile Include="PropertyEditors\ParameterEditors\SingleMediaPickerParameterEditor.cs" />
+    <Compile Include="PropertyEditors\PropertyEditorAssetAttribute.cs" />
+    <Compile Include="PropertyEditors\RelatedLinksPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\RteEmbedController.cs" />
+    <Compile Include="Editors\EntityController.cs" />
+    <Compile Include="Editors\MediaPostValidateAttribute.cs" />
+    <Compile Include="Editors\MemberController.cs" />
+    <Compile Include="Editors\CurrentUserController.cs" />
+    <Compile Include="Models\ContentEditing\DashboardControl.cs" />
+    <Compile Include="Models\ContentEditing\DataTypeDisplay.cs" />
+    <Compile Include="Models\ContentEditing\DataTypeSave.cs" />
+    <Compile Include="Models\ContentEditing\EntityBasic.cs" />
+    <Compile Include="Models\ContentEditing\PreValueFieldDisplay.cs" />
+    <Compile Include="Models\ContentEditing\PreValueFieldSave.cs" />
+    <Compile Include="Models\ContentEditing\PropertyEditorBasic.cs" />
+    <Compile Include="Models\Mapping\AvailablePropertyEditorsResolver.cs" />
+    <Compile Include="Models\Mapping\DatabaseTypeResolver.cs" />
+    <Compile Include="Models\Mapping\DataTypeModelMapper.cs" />
+    <Compile Include="Models\Mapping\EntityModelMapper.cs" />
+    <Compile Include="Models\Mapping\PreValueDisplayResolver.cs" />
+    <Compile Include="PropertyEditors\CheckBoxListPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\ColorPickerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\DatePropertyEditor.cs" />
+    <Compile Include="PropertyEditors\DateTimePropertyEditor.cs" />
+    <Compile Include="PropertyEditors\DateTimeValidator.cs" />
+    <Compile Include="PropertyEditors\DropDownMultiplePropertyEditor.cs" />
+    <Compile Include="PropertyEditors\FolderBrowserPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\IntegerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\MediaPickerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\MultipleTextStringPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\PublishValuesMultipleValueEditor.cs" />
+    <Compile Include="PropertyEditors\DropDownMultipleWithKeysPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\RadioButtonsPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\RichTextPreValueController.cs" />
+    <Compile Include="PropertyEditors\RichTextPreValueEditor.cs" />
+    <Compile Include="PropertyEditors\SliderPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\TagPropertyEditorTagDefinition.cs" />
+    <Compile Include="PropertyEditors\TagsPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\UploadFileTypeValidator.cs" />
+    <Compile Include="PropertyEditors\UserPickerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\RelatedLinksEditorValueConvertor.cs" />
+    <Compile Include="PropertyEditors\ValueListPreValueEditor.cs" />
+    <Compile Include="PropertyEditors\DropDownPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\PublishValueValueEditor.cs" />
+    <Compile Include="PropertyEditors\DropDownWithKeysPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\LabelPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\PropertyValueEditorWrapper.cs" />
+    <Compile Include="PublishedContentQuery.cs" />
+    <Compile Include="ImageCropperTemplateExtensions.cs" />
+    <Compile Include="Mvc\UmbracoVirtualNodeRouteHandler.cs" />
+    <Compile Include="Routing\CustomRouteUrlProvider.cs" />
+    <Compile Include="Routing\UrlProviderExtensions.cs" />
+    <Compile Include="Scheduling\BackgroundTaskRunnerOptions.cs" />
+    <Compile Include="Scheduling\IBackgroundTaskRunner.cs" />
+    <Compile Include="Scheduling\ILatchedBackgroundTask.cs" />
+    <Compile Include="Scheduling\RecurringTaskBase.cs" />
+    <Compile Include="Security\Identity\AppBuilderExtensions.cs" />
+    <Compile Include="Security\Identity\AuthenticationOptionsExtensions.cs" />
+    <Compile Include="Security\Identity\AuthenticationManagerExtensions.cs" />
+    <Compile Include="Security\Identity\BackOfficeCookieManager.cs" />
+    <Compile Include="Security\Identity\FormsAuthenticationSecureDataFormat.cs" />
+    <Compile Include="Security\Identity\UmbracoBackOfficeCookieAuthOptions.cs" />
+    <Compile Include="Scheduling\TaskAndFactoryExtensions.cs" />
+    <Compile Include="SingletonUmbracoContextAccessor.cs" />
+    <Compile Include="Strategies\Migrations\ClearCsrfCookiesAfterUpgrade.cs" />
+    <Compile Include="Strategies\Migrations\ClearMediaXmlCacheForDeletedItemsAfterUpgrade.cs" />
+    <Compile Include="Strategies\Migrations\EnsureListViewDataTypeIsCreated.cs" />
+    <Compile Include="Strategies\Migrations\MigrationStartupHander.cs" />
+    <Compile Include="Strategies\Migrations\OverwriteStylesheetFilesFromTempFiles.cs" />
+    <Compile Include="Strategies\NotificationsHandler.cs" />
+    <Compile Include="Strategies\RelateOnCopyHandler.cs" />
+    <Compile Include="TagQuery.cs" />
+    <Compile Include="Trees\CoreTreeAttribute.cs" />
+    <Compile Include="Trees\DataTypeTreeController.cs" />
+    <Compile Include="Trees\FileSystemTreeController.cs" />
+    <Compile Include="Trees\LanguageTreeController.cs" />
+    <Compile Include="Trees\LegacyBaseTreeAttribute.cs" />
+    <Compile Include="Trees\MemberTreeController.cs" />
+    <Compile Include="Trees\MenuRenderingEventArgs.cs" />
+    <Compile Include="Models\Trees\CreateChildEntity.cs" />
+    <Compile Include="Models\Trees\MenuItemList.cs" />
+    <Compile Include="Trees\TemplatesTreeController.cs" />
+    <Compile Include="Trees\TreeControllerBase.cs" />
+    <Compile Include="CanvasDesignerUtility.cs" />
+    <Compile Include="UI\JavaScript\AssetInitialization.cs" />
+    <Compile Include="UI\JavaScript\CssInitialization.cs" />
+    <Compile Include="UI\JavaScript\DependencyPathRenderer.cs" />
+    <Compile Include="umbraco.presentation\umbraco\create.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\create\Language.ascx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\create\xslt.ascx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadPackager.cs" />
+    <Compile Include="PublishedCache\XmlPublishedCache\XmlCacheFilePersister.cs" />
+    <Compile Include="UmbracoComponentRenderer.cs" />
+    <Compile Include="Web References\org.umbraco.our\Reference.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Reference.map</DependentUpon>
+    </Compile>
+    <Compile Include="WebApi\AngularJsonMediaTypeFormatter.cs" />
+    <Compile Include="WebApi\AngularJsonOnlyConfigurationAttribute.cs" />
+    <Compile Include="WebApi\Binders\BlueprintItemBinder.cs" />
+    <Compile Include="WebApi\Binders\MemberBinder.cs" />
+    <Compile Include="WebApi\EnableDetailedErrorsAttribute.cs" />
+    <Compile Include="WebApi\Filters\AdminUsersAuthorizeAttribute.cs" />
+    <Compile Include="WebApi\Filters\AngularAntiForgeryHelper.cs" />
+    <Compile Include="WebApi\Filters\AppendCurrentEventMessagesAttribute.cs" />
+    <Compile Include="WebApi\Filters\AppendUserModifiedHeaderAttribute.cs" />
+    <Compile Include="WebApi\Filters\ClearAngularAntiForgeryTokenAttribute.cs" />
+    <Compile Include="WebApi\Filters\DisableBrowserCacheAttribute.cs" />
+    <Compile Include="WebApi\Filters\EnableOverrideAuthorizationAttribute.cs" />
+    <Compile Include="WebApi\Filters\FeatureAuthorizeAttribute.cs" />
+    <Compile Include="WebApi\Filters\FilterGrouping.cs" />
+    <Compile Include="WebApi\Filters\HttpQueryStringModelBinder.cs" />
+    <Compile Include="WebApi\Filters\LegacyTreeAuthorizeAttribute.cs" />
+    <Compile Include="WebApi\Filters\OutgoingEditorModelEventAttribute.cs" />
+    <Compile Include="WebApi\Filters\OutgoingNoHyphenGuidFormatAttribute.cs" />
+    <Compile Include="WebApi\Filters\OverridableAuthorizationAttribute.cs" />
+    <Compile Include="WebApi\Filters\SetAngularAntiForgeryTokensAttribute.cs" />
+    <Compile Include="WebApi\Filters\UmbracoBackOfficeLogoutAttribute.cs" />
+    <Compile Include="WebApi\Filters\UmbracoWebApiRequireHttpsAttribute.cs" />
+    <Compile Include="WebApi\Filters\UmbracoTreeAuthorizeAttribute.cs" />
+    <Compile Include="WebApi\Filters\UmbracoUseHttps.cs" />
+    <Compile Include="WebApi\Filters\ValidateAngularAntiForgeryTokenAttribute.cs" />
+    <Compile Include="WebApi\Filters\CheckIfUserTicketDataIsStaleAttribute.cs" />
+    <Compile Include="WebApi\HttpControllerContextExtensions.cs" />
+    <Compile Include="WebApi\CustomDateTimeConvertor.cs" />
+    <Compile Include="Models\ContentEditing\ContentSortOrder.cs" />
+    <Compile Include="Editors\ContentControllerBase.cs" />
+    <Compile Include="Editors\ContentTypeController.cs" />
+    <Compile Include="Editors\LegacyController.cs" />
+    <Compile Include="Controllers\UmbRegisterController.cs" />
+    <Compile Include="Models\ProfileModel.cs" />
+    <Compile Include="Models\LoginStatusModel.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\MarkdownEditorValueConverter.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\TextStringValueConverter.cs" />
+    <Compile Include="PublishedContentPropertyExtension.cs" />
+    <Compile Include="Models\UmbracoProperty.cs" />
+    <Compile Include="Mvc\MergeParentContextViewDataAttribute.cs" />
+    <Compile Include="Mvc\ViewDataDictionaryExtensions.cs" />
+    <Compile Include="Routing\ContentLastChanceFinderByNotFoundHandlers.cs" />
+    <Compile Include="Models\RegisterModel.cs" />
+    <Compile Include="Models\LoginModel.cs" />
+    <Compile Include="Editors\MediaTypeController.cs" />
+    <Compile Include="Scheduling\IBackgroundTask.cs" />
+    <Compile Include="Scheduling\KeepAlive.cs" />
+    <Compile Include="Scheduling\LogScrubber.cs" />
+    <Compile Include="Scheduling\ScheduledPublishing.cs" />
+    <Compile Include="Scheduling\ScheduledTasks.cs" />
+    <Compile Include="Scheduling\TaskEventArgs.cs" />
+    <Compile Include="Security\MembershipHelper.cs" />
+    <Compile Include="Editors\SectionController.cs" />
+    <Compile Include="Editors\UmbracoAuthorizedJsonController.cs" />
+    <Compile Include="Editors\ValidationHelper.cs" />
+    <Compile Include="HttpCookieExtensions.cs" />
+    <Compile Include="Models\ContentEditing\ContentItemDisplayBase.cs" />
+    <Compile Include="Models\ContentEditing\ContentSaveAction.cs" />
+    <Compile Include="Models\ContentEditing\ContentTypeBasic.cs" />
+    <Compile Include="Models\ContentEditing\IErrorModel.cs" />
+    <Compile Include="Models\ContentEditing\IHaveUploadedFiles.cs" />
+    <Compile Include="Models\ContentEditing\INotificationModel.cs" />
+    <Compile Include="Models\ContentEditing\MediaItemDisplay.cs" />
+    <Compile Include="Models\ContentEditing\MessagesExtensions.cs" />
+    <Compile Include="Models\ContentEditing\Notification.cs" />
+    <Compile Include="Models\ContentEditing\Section.cs" />
+    <Compile Include="Models\ContentEditing\Tab.cs" />
+    <Compile Include="Models\ContentEditing\TabbedContentItem.cs" />
+    <Compile Include="Models\ContentEditing\UserProfile.cs" />
+    <Compile Include="Models\ContentEditing\UserDetail.cs" />
+    <Compile Include="FormDataCollectionExtensions.cs" />
+    <Compile Include="Models\Mapping\ContentPropertyBasicConverter.cs" />
+    <Compile Include="Models\Mapping\ContentPropertyDisplayConverter.cs" />
+    <Compile Include="Models\Mapping\ContentPropertyDtoConverter.cs" />
+    <Compile Include="Models\Mapping\ContentPropertyModelMapper.cs" />
+    <Compile Include="Models\Mapping\CreatorResolver.cs" />
+    <Compile Include="Models\Mapping\MediaModelMapper.cs" />
+    <Compile Include="Models\Mapping\ContentTypeModelMapper.cs" />
+    <Compile Include="Models\Mapping\ContentModelMapper.cs" />
+    <Compile Include="Models\Mapping\OwnerResolver.cs" />
+    <Compile Include="Models\Mapping\SectionModelMapper.cs" />
+    <Compile Include="Models\Mapping\TabsAndPropertiesResolver.cs" />
+    <Compile Include="Models\Mapping\UserModelMapper.cs" />
+    <Compile Include="PropertyEditors\ContentPickerPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\FileUploadPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\FileUploadPropertyValueEditor.cs" />
+    <Compile Include="PropertyEditors\RichTextPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\TextAreaPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\TextboxPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\TrueFalsePropertyEditor.cs" />
+    <Compile Include="Trees\MediaTreeController.cs" />
+    <Compile Include="Models\Trees\ActionMenuItem.cs" />
+    <Compile Include="Models\Trees\ActionMenuItemAttribute.cs" />
+    <Compile Include="Trees\ActionUrlMethod.cs" />
+    <Compile Include="Trees\ApplicationTreeRegistrar.cs" />
+    <Compile Include="Trees\ContentTreeControllerBase.cs" />
+    <Compile Include="Trees\LegacyTreeController.cs" />
+    <Compile Include="Search\ISearchableTree.cs" />
+    <Compile Include="Trees\LegacyTreeDataConverter.cs" />
+    <Compile Include="Trees\LegacyTreeJavascript.cs" />
+    <Compile Include="Trees\LegacyTreeParams.cs" />
+    <Compile Include="Models\Trees\MenuItem.cs" />
+    <Compile Include="Models\Trees\MenuItemCollection.cs" />
+    <Compile Include="Models\Trees\RefreshNode.cs" />
+    <Compile Include="Models\ContentEditing\SearchResultItem.cs" />
+    <Compile Include="Models\Trees\SectionRootNode.cs" />
+    <Compile Include="Trees\TreeController.cs" />
+    <Compile Include="Trees\ApplicationTreeExtensions.cs" />
+    <Compile Include="Trees\TreeAttribute.cs" />
+    <Compile Include="Models\Trees\TreeNode.cs" />
+    <Compile Include="Models\Trees\TreeNodeCollection.cs" />
+    <Compile Include="Models\Trees\TreeNodeExtensions.cs" />
+    <Compile Include="Trees\TreeNodeRenderingEventArgs.cs" />
+    <Compile Include="Trees\TreeNodesRenderingEventArgs.cs" />
+    <Compile Include="Trees\TreeQueryStringParameters.cs" />
+    <Compile Include="Trees\ApplicationTreeController.cs" />
+    <Compile Include="Editors\BackOfficeController.cs" />
+    <Compile Include="Security\Providers\MembersMembershipProvider.cs" />
+    <Compile Include="Security\Providers\MembersRoleProvider.cs" />
+    <Compile Include="Security\Providers\UmbracoMembershipProvider.cs" />
+    <Compile Include="Security\Providers\UsersMembershipProvider.cs" />
+    <Compile Include="Trees\ContentTreeController.cs" />
+    <Compile Include="Trees\TreeRenderingEventArgs.cs" />
+    <Compile Include="Trees\UrlHelperExtensions.cs" />
+    <Compile Include="UI\JavaScript\JsInitialization.cs" />
+    <Compile Include="Models\ContentEditing\ContentItemBasic.cs" />
+    <Compile Include="Models\ContentEditing\ContentItemDisplay.cs" />
+    <Compile Include="Models\ContentEditing\ContentItemDto.cs" />
+    <Compile Include="Models\ContentEditing\ContentItemFile.cs" />
+    <Compile Include="Models\ContentEditing\ContentItemSave.cs" />
+    <Compile Include="Models\ContentEditing\ContentPropertyBasic.cs" />
+    <Compile Include="Models\ContentEditing\ContentPropertyDisplay.cs" />
+    <Compile Include="Models\ContentEditing\ContentPropertyDto.cs" />
+    <Compile Include="Dynamics\DynamicExpression.cs" />
+    <Compile Include="Dynamics\DynamicGrouping.cs" />
+    <Compile Include="Dynamics\DynamicPublishedContentIdEqualityComparer.cs" />
+    <Compile Include="Dynamics\DynamicPublishedContentListOrdering.cs" />
+    <Compile Include="Dynamics\DynamicQueryable.cs" />
+    <Compile Include="Dynamics\ExpressionParser.cs" />
+    <Compile Include="Dynamics\ExtensionMethods.cs" />
+    <Compile Include="Dynamics\Grouping.cs" />
+    <Compile Include="HttpRequestExtensions.cs" />
+    <Compile Include="HttpUrlHelperExtensions.cs" />
+    <Compile Include="Install\FilePermissionHelper.cs" />
+    <Compile Include="Install\InstallHelper.cs" />
+    <Compile Include="Install\HttpInstallAuthorizeAttribute.cs" />
+    <Compile Include="Macros\PartialViewMacroController.cs" />
+    <Compile Include="Macros\PartialViewMacroEngine.cs" />
+    <Compile Include="Macros\PartialViewMacroPage.cs" />
+    <Compile Include="Media\ImageUrl.cs" />
+    <Compile Include="Media\ImageUrlProviderResolver.cs" />
+    <Compile Include="Media\ImageUrlProviders\ImageUrlProvider.cs" />
+    <Compile Include="Models\DynamicPublishedContent.cs" />
+    <Compile Include="Models\DynamicPublishedContentList.cs" />
+    <Compile Include="Models\PartialViewMacroModel.cs" />
+    <Compile Include="Models\PublishedContentBase.cs" />
+    <Compile Include="Mvc\AreaRegistrationExtensions.cs" />
+    <Compile Include="BaseRest\BaseRestHandler.cs" />
+    <Compile Include="BaseRest\MemberRest.cs" />
+    <Compile Include="BaseRest\RestExtensionAttribute.cs" />
+    <Compile Include="BaseRest\RestExtensionMethodAttribute.cs" />
+    <Compile Include="BaseRest\RestExtensionMethodInfo.cs" />
+    <Compile Include="ContextualPublishedCacheExtensions.cs" />
+    <Compile Include="Mvc\DefaultRenderMvcControllerResolver.cs" />
+    <Compile Include="Mvc\QueryStringFilterAttribute.cs" />
+    <Compile Include="PublishedCache\ContextualPublishedContentCache.cs" />
+    <Compile Include="PublishedCache\ContextualPublishedCacheOfT.cs" />
+    <Compile Include="PublishedCache\ContextualPublishedCache.cs" />
+    <Compile Include="PublishedCache\ContextualPublishedMediaCache.cs" />
+    <Compile Include="PublishedCache\PublishedCachesResolver.cs" />
+    <Compile Include="PublishedCache\IPublishedCaches.cs" />
+    <Compile Include="PublishedCache\PublishedCaches.cs" />
+    <Compile Include="PublishedCache\XmlPublishedCache\PublishedMediaCache.cs" />
+    <Compile Include="Dictionary\UmbracoCultureDictionary.cs" />
+    <Compile Include="Dictionary\UmbracoCultureDictionaryFactory.cs" />
+    <Compile Include="Mvc\MemberAuthorizeAttribute.cs" />
+    <Compile Include="Mvc\BackOfficeArea.cs" />
+    <Compile Include="Mvc\ControllerFactoryExtensions.cs" />
+    <Compile Include="Mvc\IRenderMvcController.cs" />
+    <Compile Include="Mvc\SurfaceRouteHandler.cs" />
+    <Compile Include="PublishedCache\XmlPublishedCache\RoutesCache.cs" />
+    <Compile Include="PublishedCache\XmlPublishedCache\UmbracoContextCache.cs" />
+    <Compile Include="Routing\UrlProviderMode.cs" />
+    <Compile Include="Search\ExamineIndexerModel.cs" />
+    <Compile Include="Search\LuceneIndexerExtensions.cs" />
+    <Compile Include="Security\ValidateRequestAttempt.cs" />
+    <Compile Include="Security\WebSecurity.cs" />
+    <Compile Include="UI\JavaScript\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="UI\JavaScript\ServerVariablesParser.cs" />
+    <Compile Include="Strategies\Migrations\RebuildXmlCachesAfterUpgrade.cs" />
+    <Compile Include="Strategies\PublicAccessEventHandler.cs" />
+    <Compile Include="UI\Bundles\JsApplicationLib.cs" />
+    <Compile Include="UI\Bundles\JsJQueryCore.cs" />
+    <Compile Include="UI\Bundles\JsJQueryPlugins.cs" />
+    <Compile Include="UI\Bundles\JsUmbracoApplicationCore.cs" />
+    <Compile Include="UI\Bundles\JsUmbracoApplicationUI.cs" />
+    <Compile Include="UI\Bundles\JsUmbracoTree.cs" />
+    <Compile Include="UI\CdfLogger.cs" />
+    <Compile Include="Models\LegacyNodeHelper.cs" />
+    <Compile Include="umbraco.presentation\umbraco\controls\Tree\TreeControl.ascx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\create\simple.ascx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\Packages\directoryBrowser.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\ProtectPage.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\create.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\AssignDomain2.aspx.cs">
+      <DependentUpon>AssignDomain2.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\AssignDomain2.aspx.designer.cs">
+      <DependentUpon>AssignDomain2.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="UmbracoContextExtensions.cs" />
+    <Compile Include="umbraco.presentation\umbraco\settings\stylesheet\editstylesheet.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\settings\stylesheet\property\EditStyleSheetProperty.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Controllers\UmbLoginController.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\TranslateTreeNames.cs" />
+    <Compile Include="UrlHelperExtensions.cs" />
+    <Compile Include="Editors\MediaController.cs" />
+    <Compile Include="UrlHelperRenderExtensions.cs" />
+    <Compile Include="WebApi\Binders\ContentItemBaseBinder.cs" />
+    <Compile Include="WebApi\IsBackOfficeAttribute.cs" />
+    <Compile Include="WebApi\Binders\ContentItemBinder.cs" />
+    <Compile Include="WebApi\Binders\MediaItemBinder.cs" />
+    <Compile Include="WebApi\Filters\EnsureUserPermissionForContentAttribute.cs" />
+    <Compile Include="WebApi\Filters\ContentItemValidationHelper.cs" />
+    <Compile Include="WebApi\Filters\EnsureUserPermissionForMediaAttribute.cs" />
+    <Compile Include="WebApi\Filters\FileUploadCleanupFilterAttribute.cs" />
+    <Compile Include="WebApi\Filters\FilterAllowedOutgoingContentAttribute.cs" />
+    <Compile Include="WebApi\Filters\FilterAllowedOutgoingMediaAttribute.cs" />
+    <Compile Include="WebApi\Filters\HttpQueryStringFilterAttribute.cs" />
+    <Compile Include="WebApi\Filters\OutgoingDateTimeFormatAttribute.cs" />
+    <Compile Include="WebApi\Filters\UmbracoApplicationAuthorizeAttribute.cs" />
+    <Compile Include="WebApi\GuidNoHyphenConverter.cs" />
+    <Compile Include="WebApi\HttpRequestMessageExtensions.cs" />
+    <Compile Include="WebApi\JsonCamelCaseFormatter.cs" />
+    <Compile Include="WebApi\MemberAuthorizeAttribute.cs" />
+    <Compile Include="WebApi\MvcVersionCheck.cs" />
+    <Compile Include="WebApi\NamespaceHttpControllerSelector.cs" />
+    <Compile Include="WebApi\PrefixlessBodyModelValidator.cs" />
+    <Compile Include="WebApi\PrefixlessBodyModelValidatorAttribute.cs" />
+    <Compile Include="WebApi\SessionHttpControllerRouteHandler.cs" />
+    <Compile Include="WebApi\UmbracoApiController.cs" />
+    <Compile Include="WebApi\UmbracoApiControllerBase.cs" />
+    <Compile Include="WebApi\UmbracoApiControllerResolver.cs" />
+    <Compile Include="Mvc\UmbracoAuthorizeAttribute.cs" />
+    <Compile Include="Mvc\NotChildAction.cs" />
+    <Compile Include="Mvc\UmbracoAuthorizedController.cs" />
+    <Compile Include="Mvc\UmbracoController.cs" />
+    <Compile Include="Mvc\UmbracoControllerFactory.cs" />
+    <Compile Include="Mvc\UmbracoMvcHandler.cs" />
+    <Compile Include="Mvc\UmbracoViewPageOfTModel.cs" />
+    <Compile Include="PublishedCache\IPublishedCache.cs" />
+    <Compile Include="PublishedCache\IPublishedContentCache.cs" />
+    <Compile Include="PublishedCache\IPublishedMediaCache.cs" />
+    <Compile Include="PublishedContentExtensions.cs" />
+    <Compile Include="ExamineExtensions.cs" />
+    <Compile Include="FormlessPage.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HtmlHelperRenderExtensions.cs" />
+    <Compile Include="Scheduling\Scheduler.cs" />
+    <Compile Include="Media\EmbedProviders\AbstractOEmbedProvider.cs" />
+    <Compile Include="Media\EmbedProviders\AbstractProvider.cs" />
+    <Compile Include="Media\EmbedProviders\OEmbedRich.cs" />
+    <Compile Include="Media\EmbedProviders\OEmbedVideo.cs" />
+    <Compile Include="Media\EmbedProviders\Settings\Dictionary.cs" />
+    <Compile Include="Media\EmbedProviders\Settings\String.cs" />
+    <Compile Include="Media\EmbedProviders\Twitgoo.cs" />
+    <Compile Include="ModelStateExtensions.cs" />
+    <Compile Include="Mvc\HtmlTagWrapper.cs" />
+    <Compile Include="Mvc\HtmlTagWrapperTextNode.cs" />
+    <Compile Include="Mvc\IHtmlTagWrapper.cs" />
+    <Compile Include="Mvc\MergeModelStateToChildActionAttribute.cs" />
+    <Compile Include="Mvc\PluginController.cs" />
+    <Compile Include="Mvc\PluginViewEngine.cs" />
+    <Compile Include="Mvc\PostedDataProxyInfo.cs" />
+    <Compile Include="Mvc\RedirectToUmbracoPageResult.cs" />
+    <Compile Include="Mvc\Strings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Strings.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Mvc\SurfaceController.cs" />
+    <Compile Include="Mvc\PluginControllerArea.cs" />
+    <Compile Include="Mvc\PluginControllerAttribute.cs" />
+    <Compile Include="Mvc\SurfaceControllerFactory.cs" />
+    <Compile Include="Mvc\PluginControllerMetadata.cs" />
+    <Compile Include="Mvc\UmbracoPageResult.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\RteMacroRenderingValueConverter.cs" />
+    <Compile Include="RenderFieldCaseType.cs" />
+    <Compile Include="RenderFieldEncodingType.cs" />
+    <Compile Include="RouteCollectionExtensions.cs" />
+    <Compile Include="Routing\AliasUrlProvider.cs" />
+    <Compile Include="Routing\ContentFinderByLegacy404.cs" />
+    <Compile Include="Routing\ContentFinderByNotFoundHandler.cs" />
+    <Compile Include="Routing\ContentFinderByPageIdQuery.cs" />
+    <Compile Include="Mvc\SurfaceControllerResolver.cs" />
+    <Compile Include="Routing\ContentFinderByNotFoundHandlers.cs" />
+    <Compile Include="Routing\ISiteDomainHelper.cs" />
+    <Compile Include="Routing\RoutableAttemptEventArgs.cs" />
+    <Compile Include="Routing\DefaultUrlProvider.cs" />
+    <Compile Include="Routing\DomainAndUri.cs" />
+    <Compile Include="Routing\IUrlProvider.cs" />
+    <Compile Include="Routing\SiteDomainHelper.cs" />
+    <Compile Include="Routing\SiteDomainHelperResolver.cs" />
+    <Compile Include="Routing\UrlProviderResolver.cs" />
+    <Compile Include="Routing\NotFoundHandlerHelper.cs" />
+    <Compile Include="Routing\EnsureRoutableOutcome.cs" />
+    <Compile Include="Security\LegacyDefaultAppMapping.cs" />
+    <Compile Include="Routing\PublishedContentRequestEngine.cs" />
+    <Compile Include="Routing\UrlProvider.cs" />
+    <Compile Include="Routing\WebServicesRouteConstraint.cs" />
+    <Compile Include="Search\ExamineSearcherModel.cs" />
+    <Compile Include="Search\ExamineEvents.cs" />
+    <Compile Include="Strategies\DataTypes\LegacyUploadFieldWorkaround.cs" />
+    <Compile Include="Strategies\Migrations\PublishAfterUpgradeToVersionSixth.cs" />
+    <Compile Include="Strategies\LegacyClasses.cs" />
+    <Compile Include="Strategies\Migrations\EnsureAppsTreesUpdatedOnUpgrade.cs" />
+    <Compile Include="Strategies\ServerRegistrationEventHandler.cs" />
+    <Compile Include="Templates\TemplateRenderer.cs" />
+    <Compile Include="Templates\TemplateUtilities.cs" />
+    <Compile Include="Trees\PartialViewMacrosTreeController.cs" />
+    <Compile Include="Trees\PartialViewsTreeController.cs" />
+    <Compile Include="UI\Controls\InsertMacroSplitButton.cs" />
+    <Compile Include="UI\IAssignedApp.cs" />
+    <Compile Include="UI\LegacyDialogHandler.cs" />
+    <Compile Include="UI\LegacyDialogTask.cs" />
+    <Compile Include="UI\Controls\ProgressBar.cs" />
+    <Compile Include="UI\Controls\UmbracoControl.cs" />
+    <Compile Include="UI\Controls\UmbracoUserControl.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="UI\Pages\BasePage.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="UI\Pages\ClientTools.cs" />
+    <Compile Include="UI\Pages\UmbracoEnsuredPage.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="UI\SpeechBubbleIcon.cs" />
+    <Compile Include="umbraco.presentation\AttributeCollectionAdapter.cs" />
+    <Compile Include="umbraco.presentation\Default.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\MacroCacheContent.cs" />
+    <Compile Include="umbraco.presentation\ScriptingMacroResult.cs" />
+    <Compile Include="umbraco.presentation\umbraco\dialogs\sort.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\macroResultWrapper.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\masterpages\default.Master.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\publishStatus.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\Default.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\tree.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\ping.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\Macros\editMacro.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\Python\editPython.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\editXslt.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\editMacro.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\umbracoField.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\treePicker.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\masterpages\umbracoPage.master.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\masterpages\umbracoDialog.master.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\nodeFactory\UmbracoSiteMapProviderAccessUpdate.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Search\QuickSearch.ascx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\settings\modals\ShowUmbracoTags.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\templateControls\Image.cs" />
+    <Compile Include="umbraco.presentation\umbraco\uQuery\IGetProperty.cs" />
+    <Compile Include="umbraco.presentation\XsltExtensionAttribute.cs" />
+    <Compile Include="UmbracoHelper.cs" />
+    <Compile Include="Mvc\ViewContextExtensions.cs" />
+    <Compile Include="Mvc\ViewDataContainerExtensions.cs" />
+    <Compile Include="PublishedCache\XmlPublishedCache\PublishedContentCache.cs" />
+    <Compile Include="Routing\PublishedContentNotFoundHandler.cs" />
+    <Compile Include="PublishedCache\XmlPublishedCache\XmlPublishedContent.cs" />
+    <Compile Include="PublishedCache\XmlPublishedCache\XmlPublishedProperty.cs" />
+    <Compile Include="Mvc\Constants.cs" />
+    <Compile Include="Mvc\FilteredControllerFactoriesResolver.cs" />
+    <Compile Include="Mvc\IFilteredControllerFactory.cs" />
+    <Compile Include="Mvc\MasterControllerFactory.cs" />
+    <Compile Include="Mvc\RenderActionInvoker.cs" />
+    <Compile Include="Mvc\RenderControllerFactory.cs" />
+    <Compile Include="Models\RenderModel.cs" />
+    <Compile Include="Mvc\RenderModelBinder.cs" />
+    <Compile Include="Mvc\RenderMvcController.cs" />
+    <Compile Include="Mvc\RenderRouteHandler.cs" />
+    <Compile Include="Mvc\RenderViewEngine.cs" />
+    <Compile Include="Mvc\UmbracoTemplatePage.cs" />
+    <Compile Include="Mvc\RouteDefinition.cs" />
+    <Compile Include="Mvc\RouteValueDictionaryExtensions.cs" />
+    <Compile Include="umbraco.presentation\umbraco\nodeFactory\Node.cs" />
+    <Compile Include="umbraco.presentation\umbraco\nodeFactory\Nodes.cs" />
+    <Compile Include="umbraco.presentation\umbraco\nodeFactory\Property.cs" />
+    <Compile Include="Routing\UmbracoRequestEventArgs.cs" />
+    <Compile Include="UmbracoUserControl.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="WebApi\UmbracoAuthorizeAttribute.cs" />
+    <Compile Include="WebApi\UmbracoAuthorizedApiController.cs" />
+    <Compile Include="WebApi\Filters\ValidationFilterAttribute.cs" />
+    <Compile Include="WebApi\Filters\UmbracoUserTimeoutFilterAttribute.cs" />
+    <Compile Include="WebApi\UnhandedExceptionLoggerConfigurationAttribute.cs" />
+    <Compile Include="WebApi\UnhandledExceptionLogger.cs" />
+    <Compile Include="WebApi\WebApiHelper.cs" />
+    <Compile Include="WebBootManager.cs" />
+    <Compile Include="Routing\LegacyRequestInitializer.cs" />
+    <Compile Include="Mvc\ControllerExtensions.cs" />
+    <Compile Include="Routing\ContentLastChanceFinderResolver.cs" />
+    <Compile Include="Routing\ContentFinderByUrlAlias.cs" />
+    <Compile Include="Media\ThumbnailProviders\AbstractThumbnailProvider.cs" />
+    <Compile Include="Media\ThumbnailProviders\MediaTypeIconThumbnailProvider.cs" />
+    <Compile Include="Media\ThumbnailProviders\FileExtensionIconThumbnailProvider.cs" />
+    <Compile Include="Media\ThumbnailProviders\ImageThumbnailProvider.cs" />
+    <Compile Include="Media\ThumbnailProviders\ThumbnailProvidersResolver.cs" />
+    <Compile Include="UI\Controls\FolderBrowser.cs" />
+    <Compile Include="Routing\ContentFinderByIdPath.cs" />
+    <Compile Include="Routing\ContentFinderByNiceUrl.cs" />
+    <Compile Include="Routing\ContentFinderByNiceUrlAndTemplate.cs" />
+    <Compile Include="Routing\ContentFinderByProfile.cs" />
+    <Compile Include="PluginManagerExtensions.cs" />
+    <Compile Include="Routing\DomainHelper.cs" />
+    <Compile Include="Routing\ContentFinderResolver.cs" />
+    <Compile Include="Routing\PublishedContentRequest.cs" />
+    <Compile Include="Routing\IContentFinder.cs" />
+    <Compile Include="Routing\RoutingContext.cs" />
+    <Compile Include="umbraco.presentation\EnsureSystemPathsApplicationStartupHandler.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\BasePageExtensions.cs" />
+    <Compile Include="umbraco.presentation\content.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\helper.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\item.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\keepAliveService.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\library.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\macro.cs" />
+    <Compile Include="umbraco.presentation\page.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\Settings1.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <DependentUpon>Settings.settings</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\publishingService.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\PublishQueue.cs" />
+    <Compile Include="umbraco.presentation\python.cs" />
+    <Compile Include="umbraco.presentation\NotFoundHandlers.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\requestModule.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\showField.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\template.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\UmbracoContext.cs" />
+    <Compile Include="umbraco.presentation\UmbracoPage.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbracoPageHolder.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\UmbracoRequest.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\UmbracoResponse.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\UmbracoServerUtility.cs" />
+    <Compile Include="umbraco.presentation\umbraco\actions\delete.aspx.cs">
+      <DependentUpon>delete.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\actions\delete.aspx.designer.cs">
+      <DependentUpon>delete.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\actions\editContent.aspx.cs">
+      <DependentUpon>editContent.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\actions\editContent.aspx.designer.cs">
+      <DependentUpon>editContent.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\actions\preview.aspx.cs">
+      <DependentUpon>preview.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\actions\preview.aspx.designer.cs">
+      <DependentUpon>preview.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\actions\publish.aspx.cs">
+      <DependentUpon>publish.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\actions\publish.aspx.designer.cs">
+      <DependentUpon>publish.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\controls\ContentControl.cs" />
+    <Compile Include="umbraco.presentation\umbraco\controls\ContentPicker.cs" />
+    <Compile Include="umbraco.presentation\umbraco\controls\ContentTypeControl.cs" />
+    <Compile Include="umbraco.presentation\umbraco\controls\Images\ImageViewer.ascx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\controls\dualSelectBox.cs" />
+    <Compile Include="umbraco.presentation\umbraco\controls\GenericValidation.cs" />
+    <Compile Include="umbraco.presentation\umbraco\controls\LabelButton.cs" />
+    <Compile Include="umbraco.presentation\umbraco\controls\macroParameterControl.cs" />
+    <Compile Include="umbraco.presentation\umbraco\controls\ProgressBar.ascx.cs">
+      <DependentUpon>ProgressBar.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\controls\ProgressBar.ascx.designer.cs">
+      <DependentUpon>ProgressBar.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\controls\SaveClickEventArgs.cs" />
+    <Compile Include="umbraco.presentation\umbraco\controls\Tree\CustomTreeControl.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\controls\Tree\CustomTreeService.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\controls\Tree\JTreeContextMenu.cs" />
+    <Compile Include="umbraco.presentation\umbraco\controls\Tree\JTreeContextMenuItem.cs" />
+    <Compile Include="umbraco.presentation\umbraco\controls\Tree\NodeInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\create\CreatedPackageTasks.cs" />
+    <Compile Include="umbraco.presentation\umbraco\create\dictionaryTasks.cs" />
+    <Compile Include="umbraco.presentation\umbraco\create\macroTasks.cs" />
+    <Compile Include="umbraco.presentation\umbraco\create\MemberGroupTasks.cs" />
+    <Compile Include="umbraco.presentation\umbraco\create\stylesheetPropertyTasks.cs" />
+    <Compile Include="umbraco.presentation\umbraco\create\StylesheetTasks.cs" />
+    <Compile Include="umbraco.presentation\umbraco\create\XsltTasks.cs" />
+    <Compile Include="umbraco.presentation\umbraco\dashboard\FeedProxy.aspx.cs">
+      <DependentUpon>FeedProxy.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dashboard\FeedProxy.aspx.designer.cs">
+      <DependentUpon>FeedProxy.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\EditRelationType.aspx.cs">
+      <DependentUpon>EditRelationType.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\EditRelationType.aspx.designer.cs">
+      <DependentUpon>EditRelationType.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\NewRelationType.aspx.cs">
+      <DependentUpon>NewRelationType.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\NewRelationType.aspx.designer.cs">
+      <DependentUpon>NewRelationType.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\ReadOnlyRelation.cs" />
+    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\RelationTypesWebService.asmx.cs">
+      <DependentUpon>RelationTypesWebService.asmx</DependentUpon>
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\TreeMenu\ActionDeleteRelationType.cs" />
+    <Compile Include="umbraco.presentation\umbraco\developer\RelationTypes\TreeMenu\ActionNewRelationType.cs" />
+    <Compile Include="umbraco.presentation\umbraco\dialogs\Preview.aspx.cs">
+      <DependentUpon>Preview.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\Preview.aspx.designer.cs">
+      <DependentUpon>Preview.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\members\MemberSearch.ascx.cs">
+      <DependentUpon>MemberSearch.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\members\MemberSearch.ascx.designer.cs">
+      <DependentUpon>MemberSearch.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\nodeFactory\Page_Legacy.cs" />
+    <Compile Include="umbraco.presentation\umbraco\preview\PreviewContent.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Search\ExamineEvents.cs" />
+    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltVisualize.aspx.cs">
+      <DependentUpon>xsltVisualize.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltVisualize.aspx.designer.cs">
+      <DependentUpon>xsltVisualize.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\insertMasterpageContent.aspx.cs">
+      <DependentUpon>insertMasterpageContent.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\insertMasterpageContent.aspx.designer.cs">
+      <DependentUpon>insertMasterpageContent.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\insertMasterpagePlaceholder.aspx.cs">
+      <DependentUpon>insertMasterpagePlaceholder.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\insertMasterpagePlaceholder.aspx.designer.cs">
+      <DependentUpon>insertMasterpagePlaceholder.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\republish.aspx.cs">
+      <DependentUpon>republish.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\republish.aspx.designer.cs">
+      <DependentUpon>republish.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\search.aspx.cs">
+      <DependentUpon>search.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\search.aspx.designer.cs">
+      <DependentUpon>search.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\SendPublish.aspx.cs">
+      <DependentUpon>SendPublish.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\SendPublish.aspx.designer.cs">
+      <DependentUpon>SendPublish.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\create\dialogHandler_temp.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\create\languageTasks.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\Macros\assemblyBrowser.aspx.cs">
+      <DependentUpon>assemblyBrowser.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\Macros\assemblyBrowser.aspx.designer.cs">
+      <DependentUpon>assemblyBrowser.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\Packages\editPackage.aspx.cs">
+      <DependentUpon>editPackage.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\Packages\editPackage.aspx.designer.cs">
+      <DependentUpon>editPackage.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\getXsltStatus.asmx.cs">
+      <DependentUpon>getXsltStatus.asmx</DependentUpon>
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltChooseExtension.aspx.cs">
+      <DependentUpon>xsltChooseExtension.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltChooseExtension.aspx.designer.cs">
+      <DependentUpon>xsltChooseExtension.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltInsertValueOf.aspx.cs">
+      <DependentUpon>xsltInsertValueOf.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\Xslt\xsltInsertValueOf.aspx.designer.cs">
+      <DependentUpon>xsltInsertValueOf.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\exportDocumenttype.aspx.cs">
+      <DependentUpon>exportDocumenttype.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\importDocumenttype.aspx.cs">
+      <DependentUpon>importDocumenttype.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\rollBack.aspx.cs">
+      <DependentUpon>rollBack.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\rollBack.aspx.designer.cs">
+      <DependentUpon>rollBack.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\sendToTranslation.aspx.cs">
+      <DependentUpon>sendToTranslation.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\sendToTranslation.aspx.designer.cs">
+      <DependentUpon>sendToTranslation.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\viewAuditTrail.aspx.cs">
+      <DependentUpon>viewAuditTrail.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\viewAuditTrail.aspx.designer.cs">
+      <DependentUpon>viewAuditTrail.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\members\EditMemberGroup.aspx.cs">
+      <DependentUpon>EditMemberGroup.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\members\EditMemberGroup.aspx.designer.cs">
+      <DependentUpon>EditMemberGroup.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\members\search.aspx.cs">
+      <DependentUpon>search.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\members\search.aspx.designer.cs">
+      <DependentUpon>search.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\members\ViewMembers.aspx.cs">
+      <DependentUpon>ViewMembers.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\members\ViewMembers.aspx.designer.cs">
+      <DependentUpon>ViewMembers.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\nodeFactory\Properties.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\nodeFactory\UmbracoSiteMapProvider.cs" />
+    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\GzipCompressor.cs" />
+    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\GzipModule.cs" />
+    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\IModule.cs" />
+    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\JSON.cs" />
+    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\JSONReader.cs" />
+    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\JSONWriter.cs" />
+    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\tinymce3tinymceCompress.aspx.cs">
+      <DependentUpon>tinymce3tinymceCompress.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\tinymce3tinymceCompress.aspx.designer.cs">
+      <DependentUpon>tinymce3tinymceCompress.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\Search\QuickSearchHandler.ashx.cs">
+      <DependentUpon>QuickSearchHandler.ashx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\settings\DictionaryItemList.aspx.cs">
+      <DependentUpon>DictionaryItemList.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\settings\DictionaryItemList.aspx.designer.cs">
+      <DependentUpon>DictionaryItemList.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\settings\editLanguage.aspx.cs">
+      <DependentUpon>editLanguage.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\settings\editLanguage.aspx.designer.cs">
+      <DependentUpon>editLanguage.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\templateControls\Script.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\BaseMediaTree.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadDLRScripts.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\ITreeService.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadRelationTypes.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\MediaRecycleBin.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\NodeActionsEventArgs.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\TreeEventArgs.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\TreeRequestParams.cs" />
+    <Compile Include="umbraco.presentation\umbraco\uQuery\ContentExtensions.cs" />
+    <Compile Include="umbraco.presentation\umbraco\uQuery\ContentTypeExtensions.cs" />
+    <Compile Include="umbraco.presentation\umbraco\uQuery\DocumentExtensions.cs" />
+    <Compile Include="umbraco.presentation\umbraco\uQuery\MediaExtensions.cs" />
+    <Compile Include="umbraco.presentation\umbraco\uQuery\MemberExtensions.cs" />
+    <Compile Include="umbraco.presentation\umbraco\uQuery\NodeExtensions.cs" />
+    <Compile Include="umbraco.presentation\umbraco\uQuery\PreValueExtensions.cs" />
+    <Compile Include="umbraco.presentation\umbraco\uQuery\RelationTypeExtensions.cs" />
+    <Compile Include="umbraco.presentation\umbraco\uQuery\UmbracoObjectTypeExtensions.cs" />
+    <Compile Include="umbraco.presentation\umbraco\webservices\MacroContainerService.asmx.cs">
+      <DependentUpon>MacroContainerService.asmx</DependentUpon>
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\webservices\TagsAutoCompleteHandler.ashx.cs">
+      <DependentUpon>TagsAutoCompleteHandler.ashx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\webservices\TreeClientService.asmx.cs">
+      <DependentUpon>TreeClientService.asmx</DependentUpon>
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\templateControls\DisableEventValidation.cs" />
+    <Compile Include="umbraco.presentation\umbraco\templateControls\Item.cs" />
+    <Compile Include="umbraco.presentation\umbraco\templateControls\ItemRenderer.cs" />
+    <Compile Include="umbraco.presentation\umbraco\templateControls\Macro.cs" />
+    <Compile Include="umbraco.presentation\umbraco\templateControls\ContentType.cs" />
+    <Compile Include="umbraco.presentation\umbraco\templateControls\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\translation\default.aspx.cs">
+      <DependentUpon>default.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\translation\default.aspx.designer.cs">
+      <DependentUpon>default.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\translation\details.aspx.cs">
+      <DependentUpon>details.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\translation\details.aspx.designer.cs">
+      <DependentUpon>details.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\translation\preview.aspx.cs">
+      <DependentUpon>preview.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\translation\preview.aspx.designer.cs">
+      <DependentUpon>preview.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\translation\xml.aspx.cs">
+      <DependentUpon>xml.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\translation\xml.aspx.designer.cs">
+      <DependentUpon>xml.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\treeInit.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\Trees\BaseContentTree.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\BaseTree.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\ContentRecycleBin.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\FileSystemTree.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadContent.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadcontentItemType.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadDataTypes.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadLanguages.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadMacros.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadMedia.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadMediaTypes.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadMemberGroups.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadMembers.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadMemberTypes.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadNodeTypes.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadPython.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadScripts.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadStylesheetProperty.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadStylesheets.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadTemplates.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadTranslationTasks.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadUsers.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\loadXslt.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\NullTree.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\LegacyTree.cs" />
+    <Compile Include="umbraco.presentation\umbraco\webservices\TreeDataService.ashx.cs">
+      <DependentUpon>TreeDataService.ashx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\Trees\TreeDefinitionCollection.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\TreeDefinition.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\TreeDialogModes.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\TreeService.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Trees\XmlTree.cs">
+      <DependentUpon>XmlTree.xsd</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\urlRewriter\UrlRewriterFormWriter.cs" />
+    <Compile Include="umbraco.presentation\umbraco\webservices\ajaxHelpers.cs" />
+    <Compile Include="umbraco.presentation\umbraco\webservices\CacheRefresher.asmx.cs">
+      <DependentUpon>CacheRefresher.asmx</DependentUpon>
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\webservices\CheckForUpgrade.asmx.cs">
+      <DependentUpon>CheckForUpgrade.asmx</DependentUpon>
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\webservices\CMSNode.asmx.cs">
+      <DependentUpon>CMSNode.asmx</DependentUpon>
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\webservices\codeEditorSave.asmx.cs">
+      <DependentUpon>codeEditorSave.asmx</DependentUpon>
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\webservices\legacyAjaxCalls.asmx.cs">
+      <DependentUpon>legacyAjaxCalls.asmx</DependentUpon>
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\webservices\nodeSorter.asmx.cs">
+      <DependentUpon>nodeSorter.asmx</DependentUpon>
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\webservices\progressStatus.asmx.cs">
+      <DependentUpon>progressStatus.asmx</DependentUpon>
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\webservices\publication.asmx.cs">
+      <DependentUpon>publication.asmx</DependentUpon>
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\webservices\RegexComWebservice.cs" />
+    <Compile Include="umbraco.presentation\umbraco\Web\UI\ContentPage.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery.cs" />
+    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Content.cs">
+      <DependentUpon>uQuery.cs</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-DataTypes.cs">
+      <DependentUpon>uQuery.cs</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Dictionary.cs">
+      <DependentUpon>uQuery.cs</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Document.cs">
+      <DependentUpon>uQuery.cs</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Media.cs">
+      <DependentUpon>uQuery.cs</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Members.cs">
+      <DependentUpon>uQuery.cs</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-Nodes.cs">
+      <DependentUpon>uQuery.cs</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-PreValues.cs">
+      <DependentUpon>uQuery.cs</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\uQuery\uQuery-UmbracoObjectType.cs">
+      <DependentUpon>uQuery.cs</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco.presentation\viewstateMoverModule.cs" />
+    <Compile Include="UmbracoApplication.cs" />
+    <Compile Include="UmbracoContext.cs" />
+    <Compile Include="UmbracoModule.cs" />
+    <Compile Include="UriUtility.cs" />
+    <Compile Include="Web References\org.umbraco.update\Reference.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Reference.map</DependentUpon>
+    </Compile>
+    <Compile Include="WebServices\BulkPublishController.cs" />
+    <Compile Include="WebServices\CoreStringsController.cs" />
+    <Compile Include="WebServices\DomainsApiController.cs" />
+    <Compile Include="WebServices\EmbedMediaService.cs" />
+    <Compile Include="WebServices\ExamineManagementApiController.cs" />
+    <Compile Include="WebServices\UmbracoAuthorizedHttpHandler.cs" />
+    <Compile Include="WebServices\SaveFileController.cs" />
+    <Compile Include="WebServices\UmbracoAuthorizedWebService.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="WebServices\UmbracoHttpHandler.cs" />
+    <Compile Include="WebServices\UmbracoWebService.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="WebServices\XmlDataIntegrityController.cs" />
+    <Compile Include="WebViewPageExtensions.cs" />
+    <None Include="..\Umbraco.Web.UI\Views\web.config">
+      <Link>Mvc\web.config</Link>
+    </None>
+    <None Include="packages.config" />
+    <None Include="Web References\org.umbraco.our\Reference.map">
+      <Generator>MSDiscoCodeGenerator</Generator>
+      <LastGenOutput>Reference.cs</LastGenOutput>
+    </None>
+    <None Include="Web References\org.umbraco.our\repository.disco" />
+    <EmbeddedResource Include="UI\JavaScript\Main.js" />
+    <EmbeddedResource Include="UI\JavaScript\JsInitialize.js" />
+    <EmbeddedResource Include="UI\JavaScript\ServerVariables.js" />
+    <Content Include="umbraco.presentation\umbraco\controls\Tree\CustomTreeService.asmx" />
+    <Content Include="umbraco.presentation\umbraco\developer\RelationTypes\EditRelationType.aspx" />
+    <Content Include="umbraco.presentation\umbraco\developer\RelationTypes\NewRelationType.aspx" />
+    <Content Include="umbraco.presentation\umbraco\developer\RelationTypes\RelationTypesWebService.asmx" />
+    <Content Include="umbraco.presentation\umbraco\dashboard\FeedProxy.aspx" />
+    <Content Include="umbraco.presentation\umbraco\dialogs\AssignDomain2.aspx">
+      <SubType>ASPXCodeBehind</SubType>
+    </Content>
+    <Content Include="umbraco.presentation\umbraco\members\MemberSearch.ascx">
+      <SubType>ASPXCodeBehind</SubType>
+    </Content>
+    <Content Include="umbraco.presentation\umbraco\dialogs\Preview.aspx" />
+    <Content Include="umbraco.presentation\umbraco\controls\ProgressBar.ascx">
+      <SubType>ASPXCodeBehind</SubType>
+    </Content>
+    <Content Include="umbraco.presentation\umbraco\actions\delete.aspx" />
+    <Content Include="umbraco.presentation\umbraco\actions\editContent.aspx" />
+    <Content Include="umbraco.presentation\umbraco\actions\preview.aspx">
+      <SubType>ASPXCodeBehind</SubType>
+    </Content>
+    <Content Include="umbraco.presentation\umbraco\actions\publish.aspx">
+      <SubType>ASPXCodeBehind</SubType>
+    </Content>
+    <Content Include="umbraco.presentation\umbraco\webservices\MacroContainerService.asmx" />
+    <Content Include="umbraco.presentation\umbraco\developer\Xslt\xsltVisualize.aspx" />
+    <Content Include="umbraco.presentation\umbraco\dialogs\empty.htm" />
+    <Content Include="umbraco.presentation\umbraco\dialogs\republish.aspx">
+      <SubType>ASPXCodeBehind</SubType>
+    </Content>
+    <Content Include="umbraco.presentation\umbraco\dialogs\search.aspx" />
+    <Content Include="umbraco.presentation\umbraco\dialogs\SendPublish.aspx" />
+    <Content Include="umbraco.presentation\umbraco\webservices\TreeClientService.asmx" />
+    <Content Include="umbraco.presentation\umbraco\members\search.aspx" />
+    <Content Include="umbraco.presentation\umbraco\translation\details.aspx" />
+    <Content Include="umbraco.presentation\umbraco\developer\Packages\editPackage.aspx">
+      <SubType>ASPXCodeBehind</SubType>
+    </Content>
+    <Content Include="umbraco.presentation\umbraco\dialogs\exportDocumenttype.aspx" />
+    <Content Include="umbraco.presentation\umbraco\dialogs\importDocumenttype.aspx" />
+    <Content Include="umbraco.presentation\umbraco\dialogs\rollBack.aspx">
+      <SubType>ASPXCodeBehind</SubType>
+    </Content>
+    <Content Include="umbraco.presentation\umbraco\dialogs\sendToTranslation.aspx" />
+    <Content Include="umbraco.presentation\umbraco\dialogs\viewAuditTrail.aspx" />
+    <Content Include="umbraco.presentation\umbraco\members\ViewMembers.aspx" />
+    <Content Include="umbraco.presentation\umbraco\plugins\tinymce3\tinymce3tinymceCompress.aspx" />
+    <None Include="app.config" />
+    <None Include="Web References\org.umbraco.our\repository.wsdl" />
+    <None Include="Web References\org.umbraco.update\UpgradeResult.datasource">
+      <DependentUpon>Reference.map</DependentUpon>
+    </None>
+    <None Include="Web References\org.umbraco.update\UpgradeResult1.datasource">
+      <DependentUpon>Reference.map</DependentUpon>
+    </None>
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings1.Designer.cs</LastGenOutput>
+    </None>
+    <Content Include="umbraco.presentation\umbraco\Search\QuickSearchHandler.ashx" />
+    <None Include="umbraco.presentation\umbraco\templateControls\InlineXslt.xsltTemplate" />
+    <Content Include="umbraco.presentation\umbraco\webservices\CheckForUpgrade.asmx" />
+    <Content Include="umbraco.presentation\umbraco\settings\DictionaryItemList.aspx">
+      <SubType>ASPXCodeBehind</SubType>
+    </Content>
+    <Content Include="umbraco.presentation\umbraco\translation\default.aspx" />
+    <Content Include="umbraco.presentation\umbraco\translation\preview.aspx" />
+    <Content Include="umbraco.presentation\umbraco\translation\xml.aspx" />
+    <Content Include="umbraco.presentation\umbraco\developer\Macros\assemblyBrowser.aspx" />
+    <Content Include="umbraco.presentation\umbraco\developer\Xslt\getXsltStatus.asmx" />
+    <Content Include="umbraco.presentation\umbraco\developer\Xslt\xsltChooseExtension.aspx" />
+    <Content Include="umbraco.presentation\umbraco\developer\Xslt\xsltInsertValueOf.aspx" />
+    <Content Include="umbraco.presentation\umbraco\members\EditMemberGroup.aspx">
+      <SubType>Form</SubType>
+    </Content>
+    <Content Include="umbraco.presentation\umbraco\schemas\umbraco.xsd">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="umbraco.presentation\umbraco\settings\editLanguage.aspx" />
+    <!--<Content Include="umbraco.presentation\umbraco\users\PermissionEditor.aspx" />-->
+    <Content Include="umbraco.presentation\umbraco\webservices\CacheRefresher.asmx">
+      <SubType>Form</SubType>
+    </Content>
+    <Content Include="umbraco.presentation\umbraco\webservices\CMSNode.asmx" />
+    <Content Include="umbraco.presentation\umbraco\webservices\codeEditorSave.asmx" />
+    <Content Include="umbraco.presentation\umbraco\webservices\legacyAjaxCalls.asmx" />
+    <Content Include="umbraco.presentation\umbraco\webservices\nodeSorter.asmx" />
+    <Content Include="umbraco.presentation\umbraco\webservices\progressStatus.asmx">
+      <SubType>Form</SubType>
+    </Content>
+    <Content Include="umbraco.presentation\umbraco\webservices\publication.asmx" />
+    <Content Include="umbraco.presentation\umbraco\webservices\TreeDataService.ashx" />
+    <None Include="umbraco.presentation\umbraco\Trees\Trees.cd" />
+    <None Include="umbraco.presentation\umbraco\Trees\XmlTree.xsd">
+      <SubType>
+      </SubType>
+    </None>
+    <None Include="umbraco.presentation\umbraco\Trees\XmlTree.xsx">
+      <DependentUpon>XmlTree.xsd</DependentUpon>
+    </None>
+    <Content Include="umbraco.presentation\umbraco\webservices\TagsAutoCompleteHandler.ashx" />
+    <None Include="Web References\org.umbraco.update\checkforupgrade.disco" />
+    <None Include="Web References\org.umbraco.update\checkforupgrade.wsdl" />
+    <None Include="Web References\org.umbraco.update\Reference.map">
+      <Generator>MSDiscoCodeGenerator</Generator>
+      <LastGenOutput>Reference.cs</LastGenOutput>
+    </None>
+    <EmbeddedResource Include="UI\JavaScript\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Mvc\Strings.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Strings.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Include="umbraco.presentation\umbraco\templateControls\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <None Include="umbraco.presentation\umbraco\schemas\package.xsd">
+      <SubType>
+      </SubType>
+    </None>
+    <None Include="umbraco.presentation\umbraco\schemas\package.xsx">
+      <DependentUpon>package.xsd</DependentUpon>
+    </None>
+    <None Include="umbraco.presentation\umbraco\schemas\umbraco.xsc">
+      <DependentUpon>umbraco.xsd</DependentUpon>
+    </None>
+    <None Include="umbraco.presentation\umbraco\schemas\umbraco.xss">
+      <DependentUpon>umbraco.xsd</DependentUpon>
+    </None>
+    <None Include="umbraco.presentation\umbraco\schemas\umbraco.xsx">
+      <DependentUpon>umbraco.xsd</DependentUpon>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <WebReferences Include="Web References\" />
+  </ItemGroup>
+  <ItemGroup>
+    <WebReferenceUrl Include="https://our.umbraco.com/umbraco/webservices/api/repository.asmx">
+      <UrlBehavior>Dynamic</UrlBehavior>
+      <RelPath>Web References\org.umbraco.our\</RelPath>
+      <UpdateFromURL>https://our.umbraco.com/umbraco/webservices/api/repository.asmx</UpdateFromURL>
+      <ServiceLocationURL>
+      </ServiceLocationURL>
+      <CachedDynamicPropName>
+      </CachedDynamicPropName>
+      <CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
+      <CachedSettingsPropName>umbraco_org_umbraco_our_Repository</CachedSettingsPropName>
+    </WebReferenceUrl>
+    <WebReferenceUrl Include="http://update.umbraco.org/checkforupgrade.asmx">
+      <UrlBehavior>Dynamic</UrlBehavior>
+      <RelPath>Web References\org.umbraco.update\</RelPath>
+      <UpdateFromURL>http://update.umbraco.org/checkforupgrade.asmx</UpdateFromURL>
+      <ServiceLocationURL>
+      </ServiceLocationURL>
+      <CachedDynamicPropName>
+      </CachedDynamicPropName>
+      <CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
+      <CachedSettingsPropName>umbraco_org_umbraco_update_CheckForUpgrade</CachedSettingsPropName>
+    </WebReferenceUrl>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="umbraco.presentation\umbraco\settings\scripts\" />
+  </ItemGroup>
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
+    <VSToolsPath Condition="exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v11.0\WebApplications\Microsoft.WebApplication.targets')">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v11.0</VSToolsPath>
+    <VSToolsPath Condition="exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v12.0\WebApplications\Microsoft.WebApplication.targets')">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v12.0</VSToolsPath>
+    <VSToolsPath Condition="exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v14.0\WebApplications\Microsoft.WebApplication.targets')">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v14.0</VSToolsPath>
+    <VSToolsPath Condition="exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets')">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0</VSToolsPath>
+  </PropertyGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
+  <ProjectExtensions />
+  <PropertyGroup>
+    <!--<PostBuildEvent>xcopy "$(ProjectDir)..\..\lib\*.dll" "$(TargetDir)*.dll" /Y</PostBuildEvent>-->
+  </PropertyGroup>
+  <Import Project="..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets" Condition="Exists('..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets')" />
 </Project>
\ No newline at end of file

From d3b4b9fe64aedbc21a9b338834ceb97f4b1029e3 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 3 Jul 2019 11:10:34 +1000
Subject: [PATCH 094/776] fix merge

---
 src/Umbraco.Web/Editors/EntityController.cs | 23 +--------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/src/Umbraco.Web/Editors/EntityController.cs b/src/Umbraco.Web/Editors/EntityController.cs
index 822a5bdab1..6ee16ae1ee 100644
--- a/src/Umbraco.Web/Editors/EntityController.cs
+++ b/src/Umbraco.Web/Editors/EntityController.cs
@@ -621,25 +621,6 @@ namespace Umbraco.Web.Editors
             }
         }
 
-        private int[] GetStartNodes(UmbracoEntityTypes type)
-        {
-            int[] startNodes = null;
-            switch (type)
-            {
-                case UmbracoEntityTypes.Document:
-                    startNodes = Security.CurrentUser.CalculateContentStartNodeIds(Services.EntityService);
-                    break;
-                case UmbracoEntityTypes.Media:
-                    startNodes = Security.CurrentUser.CalculateMediaStartNodeIds(Services.EntityService);
-                    break;
-                default:
-                    startNodes = Array.Empty<int>();
-                    break;
-            }
-
-            return startNodes;
-        }
-
         private int[] GetStartNodes(UmbracoEntityTypes type)
         {
             switch (type)
@@ -649,12 +630,10 @@ namespace Umbraco.Web.Editors
                 case UmbracoEntityTypes.Media:
                     return Security.CurrentUser.CalculateMediaStartNodeIds(Services.EntityService);
                 default:
-                    return new int[0];
+                    return  Array.Empty<int>();
             }
-
         }
 
-
         public PagedResult<EntityBasic> GetPagedDescendants(
             int id,
             UmbracoEntityTypes type,

From df11935598cd33779bedefa2ed28d942e66b219d Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 3 Jul 2019 11:23:25 +1000
Subject: [PATCH 095/776] Revert and adjusts "Fixes issue when creating
 DateTypes of type Umbraco.MultiNodeTreePicker with type member, because `-1`
 can't be casted to `Udi`"

---
 .../prevalueeditors/treesource.controller.js  | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.controller.js
index fb2dddd72c..404abbab1f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.controller.js
@@ -55,11 +55,25 @@ angular.module('umbraco')
 		};
 
 		$scope.clear = function() {
-			$scope.model.value.id = undefined;
-			$scope.node = undefined;
-			$scope.model.value.query = undefined;
+			$scope.model.value.id = null;
+            $scope.node = null;
+            $scope.model.value.query = null;
 		};
 		
+
+		//we always need to ensure we dont submit anything broken
+	    var unsubscribe = $scope.$on("formSubmitting", function (ev, args) {
+	    	if($scope.model.value.type === "member"){
+	    		$scope.model.value.id = null;
+	    		$scope.model.value.query = "";
+	    	}
+	    });
+
+	    //when the scope is destroyed we need to unsubscribe
+	    $scope.$on('$destroy', function () {
+	        unsubscribe();
+	    });
+
 		function populate(item){
 			$scope.clear();
 			item.icon = iconHelper.convertFromLegacyIcon(item.icon);

From f7382255c2628cdb867effd24d5582503dc05c82 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 3 Jul 2019 13:16:40 +1000
Subject: [PATCH 096/776] Fixes N+1 Issues caused by the new bypass start nodes
 changes

---
 src/Umbraco.Core/Models/PropertyType.cs       |  8 +++++++
 .../Factories/PropertyGroupFactory.cs         |  1 +
 .../Implement/ContentTypeCommonRepository.cs  | 23 +++++++++++++++++++
 .../Implement/ContentTypeRepositoryBase.cs    |  4 +++-
 .../Implement/MemberTypeRepository.cs         |  1 +
 .../ContentEditing/ContentPropertyBasic.cs    |  6 +++--
 .../ContentEditing/PropertyTypeBasic.cs       |  5 ++++
 .../Mapping/ContentPropertyBasicMapper.cs     |  8 +------
 .../Mapping/ContentTypeMapDefinition.cs       |  3 +++
 .../Models/Mapping/PropertyTypeGroupMapper.cs |  1 +
 10 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/src/Umbraco.Core/Models/PropertyType.cs b/src/Umbraco.Core/Models/PropertyType.cs
index 1e950a876c..34775ccf89 100644
--- a/src/Umbraco.Core/Models/PropertyType.cs
+++ b/src/Umbraco.Core/Models/PropertyType.cs
@@ -21,6 +21,7 @@ namespace Umbraco.Core.Models
         private string _alias;
         private string _description;
         private int _dataTypeId;
+        private Guid _dataTypeKey;
         private Lazy<int> _propertyGroupId;
         private string _propertyEditorAlias;
         private ValueStorageType _valueStorageType;
@@ -139,6 +140,13 @@ namespace Umbraco.Core.Models
             set => SetPropertyValueAndDetectChanges(value, ref _dataTypeId, nameof(DataTypeId));
         }
 
+        [DataMember]
+        public Guid DataTypeKey
+        {
+            get => _dataTypeKey;
+            set => SetPropertyValueAndDetectChanges(value, ref _dataTypeKey, nameof(DataTypeKey));
+        }
+
         /// <summary>
         /// Gets or sets the alias of the property editor for this property type.
         /// </summary>
diff --git a/src/Umbraco.Core/Persistence/Factories/PropertyGroupFactory.cs b/src/Umbraco.Core/Persistence/Factories/PropertyGroupFactory.cs
index c134748047..db8e2b20d9 100644
--- a/src/Umbraco.Core/Persistence/Factories/PropertyGroupFactory.cs
+++ b/src/Umbraco.Core/Persistence/Factories/PropertyGroupFactory.cs
@@ -54,6 +54,7 @@ namespace Umbraco.Core.Persistence.Factories
 
                             propertyType.Alias = typeDto.Alias;
                             propertyType.DataTypeId = typeDto.DataTypeId;
+                            propertyType.DataTypeKey = typeDto.DataTypeDto.NodeDto.UniqueId;
                             propertyType.Description = typeDto.Description;
                             propertyType.Id = typeDto.Id;
                             propertyType.Key = typeDto.UniqueId;
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeCommonRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeCommonRepository.cs
index ccafb9f771..5ecd041bc5 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeCommonRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeCommonRepository.cs
@@ -7,6 +7,7 @@ using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Factories;
 using Umbraco.Core.Scoping;
+using static Umbraco.Core.Persistence.NPocoSqlExtensions.Statics;
 
 namespace Umbraco.Core.Persistence.Repositories.Implement
 {
@@ -189,9 +190,30 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
             var sql2 = Sql()
                 .Select<PropertyTypeDto>(r => r.Select(x => x.DataTypeDto))
+
+                //TODO: Why doesn't this overload have the ability to auto alias columns like the inner select above, instead we need to manually apply all aliases
+                //QUESTION: Why doesn't this work? but the below `.AndSelect<NodeDto>()` works? The problem now is that the output SQL has duplicate column names.
+                // NPoco seems to be able to map this correctly but it would be better to have aliased columns like below. These alias names seem to follow some sort
+                // of convention with the double underscore and these columns are in the exact same order as the auto-produced ones, however NPoco does not map these
+                // columns? 
+                //.AndSelect<NodeDto>(
+                //    x => Alias(x.NodeId, "NodeDto__NodeId"),
+                //    x => Alias(x.UniqueId, "NodeDto__UniqueId"),
+                //    x => Alias(x.ParentId, "NodeDto__ParentId"),
+                //    x => Alias(x.Level, "NodeDto__Level"),
+                //    x => Alias(x.Path, "NodeDto__Path"),
+                //    x => Alias(x.SortOrder, "NodeDto__SortOrder"),
+                //    x => Alias(x.Trashed, "NodeDto__Trashed"),
+                //    x => Alias(x.UserId, "NodeDto__UserId"),
+                //    x => Alias(x.Text, "NodeDto__Text"),
+                //    x => Alias(x.NodeObjectType, "NodeDto__NodeObjectType"),
+                //    x => Alias(x.CreateDate, "NodeDto__CreateDate"))
+                .AndSelect<NodeDto>()
+
                 .AndSelect<MemberPropertyTypeDto>()
                 .From<PropertyTypeDto>()
                 .InnerJoin<DataTypeDto>().On<PropertyTypeDto, DataTypeDto>((pt, dt) => pt.DataTypeId == dt.NodeId)
+                .InnerJoin<NodeDto>().On<DataTypeDto, NodeDto>((dt, n) => dt.NodeId == n.NodeId)
                 .InnerJoin<ContentTypeDto>().On<PropertyTypeDto, ContentTypeDto>((pt, ct) => pt.ContentTypeId == ct.NodeId)
                 .LeftJoin<PropertyTypeGroupDto>().On<PropertyTypeDto, PropertyTypeGroupDto>((pt, ptg) => pt.PropertyTypeGroupId == ptg.Id)
                 .LeftJoin<MemberPropertyTypeDto>().On<PropertyTypeDto, MemberPropertyTypeDto>((pt, mpt) => pt.Id == mpt.PropertyTypeId)
@@ -290,6 +312,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             {
                 Description = dto.Description,
                 DataTypeId = dto.DataTypeId,
+                DataTypeKey = dto.DataTypeDto.NodeDto.UniqueId,
                 Id = dto.Id,
                 Key = dto.UniqueId,
                 Mandatory = dto.Mandatory,
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
index 591fa2b660..22c9244d8f 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
@@ -1013,8 +1013,9 @@ AND umbracoNode.id <> @id",
             if (propertyType.PropertyEditorAlias.IsNullOrWhiteSpace() == false)
             {
                 var sql = Sql()
-                    .SelectAll()
+                    .Select<DataTypeDto>(dt => dt.Select(x => x.NodeDto))
                     .From<DataTypeDto>()
+                    .InnerJoin<NodeDto>().On<DataTypeDto, NodeDto>((dt, n) => dt.NodeId == n.NodeId)
                     .Where("propertyEditorAlias = @propertyEditorAlias", new { propertyEditorAlias = propertyType.PropertyEditorAlias })
                     .OrderBy<DataTypeDto>(typeDto => typeDto.NodeId);
                 var datatype = Database.FirstOrDefault<DataTypeDto>(sql);
@@ -1022,6 +1023,7 @@ AND umbracoNode.id <> @id",
                 if (datatype != null)
                 {
                     propertyType.DataTypeId = datatype.NodeId;
+                    propertyType.DataTypeKey = datatype.NodeDto.UniqueId;
                 }
                 else
                 {
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/MemberTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberTypeRepository.cs
index 61981a42e3..d96854743e 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/MemberTypeRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberTypeRepository.cs
@@ -225,6 +225,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
                 {
                     //this reset's its current data type reference which will be re-assigned based on the property editor assigned on the next line
                     propertyType.DataTypeId = 0;
+                    propertyType.DataTypeKey = default;
                 }
             }
         }
diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentPropertyBasic.cs b/src/Umbraco.Web/Models/ContentEditing/ContentPropertyBasic.cs
index 7d6d066e35..f0f5bba7c4 100644
--- a/src/Umbraco.Web/Models/ContentEditing/ContentPropertyBasic.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/ContentPropertyBasic.cs
@@ -22,8 +22,10 @@ namespace Umbraco.Web.Models.ContentEditing
         [Required]
         public int Id { get; set; }
 
-        [DataMember(Name = "dataTypeId", IsRequired = false)]
-        public Guid? DataTypeId { get; set; }
+        //fixme: This name dataTypeId is inconsistent, but requires us to change it everywhere in angular
+        [DataMember(Name = "dataTypeId", IsRequired = false)] 
+        [ReadOnly(true)]
+        public Guid DataTypeKey { get; set; }
 
         [DataMember(Name = "value")]
         public object Value { get; set; }
diff --git a/src/Umbraco.Web/Models/ContentEditing/PropertyTypeBasic.cs b/src/Umbraco.Web/Models/ContentEditing/PropertyTypeBasic.cs
index cde9d0dabc..d180a68a2c 100644
--- a/src/Umbraco.Web/Models/ContentEditing/PropertyTypeBasic.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/PropertyTypeBasic.cs
@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.Runtime.Serialization;
 
@@ -43,6 +44,10 @@ namespace Umbraco.Web.Models.ContentEditing
         [Required]
         public int DataTypeId { get; set; }
 
+        [DataMember(Name = "dataTypeKey")]
+        [ReadOnly(true)]
+        public Guid DataTypeKey { get; set; }
+
         //SD: Is this really needed ?
         [DataMember(Name = "groupId")]
         public int GroupId { get; set; }
diff --git a/src/Umbraco.Web/Models/Mapping/ContentPropertyBasicMapper.cs b/src/Umbraco.Web/Models/Mapping/ContentPropertyBasicMapper.cs
index 57a06c2175..36c1b360b2 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentPropertyBasicMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentPropertyBasicMapper.cs
@@ -50,13 +50,7 @@ namespace Umbraco.Web.Models.Mapping
             dest.Alias = property.Alias;
             dest.PropertyEditor = editor;
             dest.Editor = editor.Alias;
-
-            //fixme: although this might get cached, if a content item has 100 properties of different data types, then this means this is going to be 100 extra DB queries :( :( :(
-            // - ideally, we'd just have the DataTypeKey alongside the DataTypeId which is loaded in the single sql statement which should be relatively easy.
-            var dataTypeKey = _entityService.GetKey(property.PropertyType.DataTypeId, UmbracoObjectTypes.DataType);
-            if (!dataTypeKey.Success)
-                throw new InvalidOperationException("Can't get the unique key from the id: " + property.PropertyType.DataTypeId);
-            dest.DataTypeId = dataTypeKey.Result;
+            dest.DataTypeKey = property.PropertyType.DataTypeKey;
 
             // if there's a set of property aliases specified, we will check if the current property's value should be mapped.
             // if it isn't one of the ones specified in 'includeProperties', we will just return the result without mapping the Value.
diff --git a/src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs
index a438f04781..fc029eabe4 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs
@@ -219,6 +219,7 @@ namespace Umbraco.Web.Models.Mapping
         {
             target.Name = source.Label;
             target.DataTypeId = source.DataTypeId;
+            target.DataTypeKey = source.DataTypeKey;
             target.Mandatory = source.Validation.Mandatory;
             target.ValidationRegExp = source.Validation.Pattern;
             target.Variations = source.AllowCultureVariant ? ContentVariation.Culture : ContentVariation.Nothing;
@@ -334,6 +335,7 @@ namespace Umbraco.Web.Models.Mapping
             target.Alias = source.Alias;
             target.AllowCultureVariant = source.AllowCultureVariant;
             target.DataTypeId = source.DataTypeId;
+            target.DataTypeKey = source.DataTypeKey;
             target.Description = source.Description;
             target.GroupId = source.GroupId;
             target.Id = source.Id;
@@ -349,6 +351,7 @@ namespace Umbraco.Web.Models.Mapping
             target.Alias = source.Alias;
             target.AllowCultureVariant = source.AllowCultureVariant;
             target.DataTypeId = source.DataTypeId;
+            target.DataTypeKey = source.DataTypeKey;
             target.Description = source.Description;
             target.GroupId = source.GroupId;
             target.Id = source.Id;
diff --git a/src/Umbraco.Web/Models/Mapping/PropertyTypeGroupMapper.cs b/src/Umbraco.Web/Models/Mapping/PropertyTypeGroupMapper.cs
index 8c5f347799..a184ac92cf 100644
--- a/src/Umbraco.Web/Models/Mapping/PropertyTypeGroupMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/PropertyTypeGroupMapper.cs
@@ -231,6 +231,7 @@ namespace Umbraco.Web.Models.Mapping
                     GroupId = groupId,
                     Inherited = inherited,
                     DataTypeId = p.DataTypeId,
+                    DataTypeKey = p.DataTypeKey,
                     SortOrder = p.SortOrder,
                     ContentTypeId = contentType.Id,
                     ContentTypeName = contentType.Name,

From cd6ef35bf9e33f47d2ea888fe9e63502b45a25fb Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 3 Jul 2019 15:17:51 +1000
Subject: [PATCH 097/776] comments out the fix during investigation - adds some
 notes

---
 .../ILivePublishedModelFactory.cs             |  4 ++
 .../PublishedModelFactoryExtensions.cs        |  3 +-
 .../Cache/ContentTypeCacheRefresher.cs        | 40 +++++++++----------
 3 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/src/Umbraco.Core/Models/PublishedContent/ILivePublishedModelFactory.cs b/src/Umbraco.Core/Models/PublishedContent/ILivePublishedModelFactory.cs
index 4027184f3c..0810f2207b 100644
--- a/src/Umbraco.Core/Models/PublishedContent/ILivePublishedModelFactory.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/ILivePublishedModelFactory.cs
@@ -13,6 +13,10 @@
         /// <summary>
         /// Refreshes the factory.
         /// </summary>
+        /// <remarks>
+        /// <para>This will typically re-compiled models/classes into a new DLL that are used to populate the cache.</para>
+        /// <para>This is called prior to refreshing the cache.</para>
+        /// </remarks>
         void Refresh();
     }
 }
diff --git a/src/Umbraco.Core/PublishedModelFactoryExtensions.cs b/src/Umbraco.Core/PublishedModelFactoryExtensions.cs
index 4e026490a4..d428accbbf 100644
--- a/src/Umbraco.Core/PublishedModelFactoryExtensions.cs
+++ b/src/Umbraco.Core/PublishedModelFactoryExtensions.cs
@@ -9,7 +9,7 @@ namespace Umbraco.Core
     public static class PublishedModelFactoryExtensions
     {
         /// <summary>
-        /// Executes an action with a safe live factory/
+        /// Executes an action with a safe live factory
         /// </summary>
         /// <remarks>
         /// <para>If the factory is a live factory, ensures it is refreshed and locked while executing the action.</para>
@@ -20,6 +20,7 @@ namespace Umbraco.Core
             {
                 lock (liveFactory.SyncRoot)
                 {
+                    //Call refresh on the live factory to re-compile the models
                     liveFactory.Refresh();
                     action();
                 }
diff --git a/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs b/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs
index a5134426c2..75f2889cab 100644
--- a/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs
@@ -53,15 +53,15 @@ namespace Umbraco.Web.Cache
 
             _contentTypeCommonRepository.ClearCache(); // always
 
-            // We need to special handle the IContentType if modelsbuilder is in live mode, because all models are updated when a IContentType is changed, we need to clear all from cache also.
-            if (_publishedModelFactory is ILivePublishedModelFactory && payloads.Any(x => x.ItemType == typeof(IContentType).Name))
-            {
-                //This is super nasty, and we need to figure out a better way to to this
-                //Ensure all doc type ids is part of the payload
-                var missingPayloads = GetMissingContentTypePayloads(payloads);
+            //// We need to special handle the IContentType if modelsbuilder is in live mode, because all models are updated when a IContentType is changed, we need to clear all from cache also.
+            //if (_publishedModelFactory is ILivePublishedModelFactory && payloads.Any(x => x.ItemType == typeof(IContentType).Name))
+            //{
+            //    //This is super nasty, and we need to figure out a better way to to this
+            //    //Ensure all doc type ids is part of the payload
+            //    var missingPayloads = GetMissingContentTypePayloads(payloads);
 
-                payloads = payloads.Union(missingPayloads).ToArray();
-            }
+            //    payloads = payloads.Union(missingPayloads).ToArray();
+            //}
 
             if (payloads.Any(x => x.ItemType == typeof(IContentType).Name))
             {
@@ -109,19 +109,19 @@ namespace Umbraco.Web.Cache
             base.Refresh(payloads);
         }
 
-        private IEnumerable<JsonPayload> GetMissingContentTypePayloads(JsonPayload[] payloads)
-        {
-            var existingPayloadIds = new HashSet<int>(payloads.Select(x => x.Id));
-            var contentTypeIds = _contentTypeService.GetAll().Select(x => x.Id).ToArray();
+        //private IEnumerable<JsonPayload> GetMissingContentTypePayloads(JsonPayload[] payloads)
+        //{
+        //    var existingPayloadIds = new HashSet<int>(payloads.Select(x => x.Id));
+        //    var contentTypeIds = _contentTypeService.GetAll().Select(x => x.Id).ToArray();
 
-            foreach (var contentTypeId in contentTypeIds)
-            {
-                if (!existingPayloadIds.Contains(contentTypeId))
-                {
-                    yield return new JsonPayload(typeof(IContentType).Name, contentTypeId, ContentTypeChangeTypes.RefreshOther);
-                }
-            }
-        }
+        //    foreach (var contentTypeId in contentTypeIds)
+        //    {
+        //        if (!existingPayloadIds.Contains(contentTypeId))
+        //        {
+        //            yield return new JsonPayload(typeof(IContentType).Name, contentTypeId, ContentTypeChangeTypes.RefreshOther);
+        //        }
+        //    }
+        //}
 
         public override void RefreshAll()
         {

From d0895186818b550c266ad3966a71fe7a0f0dec26 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 3 Jul 2019 15:40:18 +1000
Subject: [PATCH 098/776] Fixes SQL generation to populate the nodedto object
 of the datatypedto

---
 .../Implement/ContentTypeCommonRepository.cs  | 22 +------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeCommonRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeCommonRepository.cs
index 5ecd041bc5..6b751eb8ff 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeCommonRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeCommonRepository.cs
@@ -189,27 +189,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             var groupDtos = Database.Fetch<PropertyTypeGroupDto>(sql1);
 
             var sql2 = Sql()
-                .Select<PropertyTypeDto>(r => r.Select(x => x.DataTypeDto))
-
-                //TODO: Why doesn't this overload have the ability to auto alias columns like the inner select above, instead we need to manually apply all aliases
-                //QUESTION: Why doesn't this work? but the below `.AndSelect<NodeDto>()` works? The problem now is that the output SQL has duplicate column names.
-                // NPoco seems to be able to map this correctly but it would be better to have aliased columns like below. These alias names seem to follow some sort
-                // of convention with the double underscore and these columns are in the exact same order as the auto-produced ones, however NPoco does not map these
-                // columns? 
-                //.AndSelect<NodeDto>(
-                //    x => Alias(x.NodeId, "NodeDto__NodeId"),
-                //    x => Alias(x.UniqueId, "NodeDto__UniqueId"),
-                //    x => Alias(x.ParentId, "NodeDto__ParentId"),
-                //    x => Alias(x.Level, "NodeDto__Level"),
-                //    x => Alias(x.Path, "NodeDto__Path"),
-                //    x => Alias(x.SortOrder, "NodeDto__SortOrder"),
-                //    x => Alias(x.Trashed, "NodeDto__Trashed"),
-                //    x => Alias(x.UserId, "NodeDto__UserId"),
-                //    x => Alias(x.Text, "NodeDto__Text"),
-                //    x => Alias(x.NodeObjectType, "NodeDto__NodeObjectType"),
-                //    x => Alias(x.CreateDate, "NodeDto__CreateDate"))
-                .AndSelect<NodeDto>()
-
+                .Select<PropertyTypeDto>(r => r.Select(x => x.DataTypeDto, r1 => r1.Select(x => x.NodeDto)))
                 .AndSelect<MemberPropertyTypeDto>()
                 .From<PropertyTypeDto>()
                 .InnerJoin<DataTypeDto>().On<PropertyTypeDto, DataTypeDto>((pt, dt) => pt.DataTypeId == dt.NodeId)

From c5f1cc15fdb37c00c4c9460a48e0cf1f1b23df7c Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 3 Jul 2019 08:33:30 +0200
Subject: [PATCH 099/776] Refactored `dataTypeId` when a guid into
 `dataTypeKey`

---
 .../components/grid/grid.rte.directive.js     |  4 +--
 .../tree/umbtreesearchbox.directive.js        |  6 ++--
 .../src/common/resources/entity.resource.js   | 20 ++++++------
 .../src/common/services/search.service.js     |  4 +--
 .../src/common/services/tinymce.service.js    |  4 +--
 .../linkpicker/linkpicker.controller.js       |  6 ++--
 .../linkpicker/linkpicker.html                | 32 +++++++++----------
 .../mediapicker/mediapicker.controller.js     |  6 ++--
 .../treepicker/treepicker.controller.js       |  8 ++---
 .../treepicker/treepicker.html                | 22 ++++++-------
 .../contentpicker/contentpicker.controller.js |  6 ++--
 .../grid/editors/media.controller.js          |  2 +-
 .../propertyeditors/grid/editors/rte.html     |  2 +-
 .../mediapicker/mediapicker.controller.js     |  2 +-
 .../multiurlpicker.controller.js              |  2 +-
 src/Umbraco.Web/Editors/EntityController.cs   | 24 +++++++-------
 .../ContentEditing/ContentPropertyBasic.cs    |  3 +-
 .../Trees/ContentTreeControllerBase.cs        |  8 ++---
 .../Trees/TreeQueryStringParameters.cs        |  2 +-
 19 files changed, 81 insertions(+), 82 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
index 8e561ff5ca..cd1f011018 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
@@ -5,7 +5,7 @@ angular.module("umbraco.directives")
                 uniqueId: '=',
                 value: '=',
                 configuration: "=", //this is the RTE configuration
-                datatypeId: '@',
+                datatypeKey: '@',
                 ignoreUserStartNodes: '@'
             },
             templateUrl: 'views/components/grid/grid-rte.html',
@@ -43,7 +43,7 @@ angular.module("umbraco.directives")
                 scope.config = {
                     ignoreUserStartNodes: scope.ignoreUserStartNodes === "true"
                 }
-                scope.dataTypeId = scope.datatypeId; //Yes - this casing is rediculous, but it's because the var starts with `data` so it can't be `data-type-id` :/
+                scope.dataTypeKey = scope.datatypeKey; //Yes - this casing is rediculous, but it's because the var starts with `data` so it can't be `data-type-id` :/
 
                 //stores a reference to the editor
                 var tinyMceEditor = null;
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreesearchbox.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreesearchbox.directive.js
index 3b6fb5f9cd..9c28cbe367 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreesearchbox.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreesearchbox.directive.js
@@ -12,7 +12,7 @@ function treeSearchBox(localizationService, searchService, $q) {
             searchFromName: "@",
             showSearch: "@",
             section: "@",
-            datatypeId: "@",
+            datatypeKey: "@",
             hideSearchCallback: "=",
             searchCallback: "="
         },
@@ -63,8 +63,8 @@ function treeSearchBox(localizationService, searchService, $q) {
                     }
 
                     //append dataTypeId value if there is one
-                    if (scope.datatypeId) {
-                        searchArgs["dataTypeId"] = scope.datatypeId;
+                    if (scope.datatypeKey) {
+                        searchArgs["dataTypeKey"] = scope.datatypeKey;
                     }
 
                     searcher(searchArgs).then(function (data) {
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
index 01bb2369dc..69522f3fa4 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
@@ -327,8 +327,8 @@ function entityResource($q, $http, umbRequestHelper) {
                 { type: type },
                 { culture: culture}
             ];
-            if (options && options.dataTypeId) {
-                args.push({ dataTypeId: options.dataTypeId });
+            if (options && options.dataTypeKey) {
+                args.push({ dataTypeKey: options.dataTypeKey });
             }
 
             return umbRequestHelper.resourcePromise(
@@ -356,8 +356,8 @@ function entityResource($q, $http, umbRequestHelper) {
         getChildren: function (id, type, options) {
 
             var args = [{ id: id }, { type: type }];
-            if (options && options.dataTypeId) {
-                args.push({ dataTypeId: options.dataTypeId });
+            if (options && options.dataTypeKey) {
+                args.push({ dataTypeKey: options.dataTypeKey });
             }
 
             return umbRequestHelper.resourcePromise(
@@ -434,7 +434,7 @@ function entityResource($q, $http, umbRequestHelper) {
                             orderBy: options.orderBy,
                             orderDirection: options.orderDirection,
                             filter: encodeURIComponent(options.filter),
-                            dataTypeId: options.dataTypeId
+                            dataTypeKey: options.dataTypeKey
                         }
                     )),
                 'Failed to retrieve child data for id ' + parentId);
@@ -476,7 +476,7 @@ function entityResource($q, $http, umbRequestHelper) {
                 filter: '',
                 orderDirection: "Ascending",
                 orderBy: "SortOrder",
-                dataTypeId: null
+                dataTypeKey: null
             };
             if (options === undefined) {
                 options = {};
@@ -506,7 +506,7 @@ function entityResource($q, $http, umbRequestHelper) {
                             orderBy: options.orderBy,
                             orderDirection: options.orderDirection,
                             filter: encodeURIComponent(options.filter),
-                            dataTypeId: options.dataTypeId
+                            dataTypeKey: options.dataTypeKey
                         }
                     )),
                 'Failed to retrieve child data for id ' + parentId);
@@ -535,15 +535,15 @@ function entityResource($q, $http, umbRequestHelper) {
          * @returns {Promise} resourcePromise object containing the entity array.
          *
          */
-        search: function (query, type, searchFrom, canceler, dataTypeId) {
+        search: function (query, type, searchFrom, canceler, dataTypeKey) {
 
             var args = [{ query: query }, { type: type }];
             if (searchFrom) {
                 args.push({ searchFrom: searchFrom });
             }
 
-            if (dataTypeId) {
-                args.push({ dataTypeId: dataTypeId });
+            if (dataTypeKey) {
+                args.push({ dataTypeKey: dataTypeKey });
             }
 
             var httpConfig = {};
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/search.service.js b/src/Umbraco.Web.UI.Client/src/common/services/search.service.js
index cdba3647a3..fef286ec7e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/search.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/search.service.js
@@ -67,7 +67,7 @@ angular.module('umbraco.services')
                     throw "args.term is required";
                 }
 
-                return entityResource.search(args.term, "Document", args.searchFrom, args.canceler, args.dataTypeId).then(function (data) {
+                return entityResource.search(args.term, "Document", args.searchFrom, args.canceler, args.dataTypeKey).then(function (data) {
                     _.each(data, function (item) {
                         searchResultFormatter.configureContentResult(item);
                     });
@@ -92,7 +92,7 @@ angular.module('umbraco.services')
                     throw "args.term is required";
                 }
 
-                return entityResource.search(args.term, "Media", args.searchFrom, args.canceler, args.dataTypeId).then(function (data) {
+                return entityResource.search(args.term, "Media", args.searchFrom, args.canceler, args.dataTypeKey).then(function (data) {
                     _.each(data, function (item) {
                         searchResultFormatter.configureMediaResult(item);
                     });
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index d3bdceddc4..e61bd38bc0 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -1121,7 +1121,7 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                 entityResource.getAnchors(args.model.value).then(function (anchorValues) {
                     var linkPicker = {
                         currentTarget: currentTarget,
-                        dataTypeId: args.model.dataTypeId,
+                        dataTypeKey: args.model.dataTypeKey,
                         ignoreUserStartNodes: args.model.config.ignoreUserStartNodes,
                         anchors: anchorValues,
                         submit: function (model) {
@@ -1159,7 +1159,7 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                     disableFolderSelect: true,
                     startNodeId: startNodeId,
                     startNodeIsVirtual: startNodeIsVirtual,
-                    dataTypeId: args.model.dataTypeId,
+                    dataTypeKey: args.model.dataTypeKey,
                     submit: function (model) {
                         self.insertMediaInEditor(args.editor, model.selection[0]);
                         editorService.close();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
index 5fd23f0dd6..5a0ab51fd0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
@@ -20,14 +20,14 @@ angular.module("umbraco").controller("Umbraco.Editors.LinkPickerController",
                     $scope.model.title = value;
                 });
         }
-        $scope.customTreeParams = dialogOptions.dataTypeId ? "dataTypeId=" + dialogOptions.dataTypeId : "";
+        $scope.customTreeParams = dialogOptions.dataTypeKey ? "dataTypeKey=" + dialogOptions.dataTypeKey : "";
         $scope.dialogTreeApi = {};
         $scope.model.target = {};
         $scope.searchInfo = {
             searchFromId: null,
             searchFromName: null,
             showSearch: false,
-            dataTypeId: dialogOptions.dataTypeId,
+            dataTypeKey: dialogOptions.dataTypeKey,
             results: [],
             selectedSearchResults: []
         };
@@ -175,7 +175,7 @@ angular.module("umbraco").controller("Umbraco.Editors.LinkPickerController",
                 var mediaPicker = {
                     startNodeId: startNodeId,
                     startNodeIsVirtual: startNodeIsVirtual,
-                    dataTypeId: dialogOptions.dataTypeId,
+                    dataTypeKey: dialogOptions.dataTypeKey,
                     submit: function (model) {
                         var media = model.selection[0];
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.html
index e1880d5ac5..704b61e333 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.html
@@ -25,7 +25,7 @@
                                     ng-model="model.target.url"
                                     ng-disabled="model.target.id || model.target.udi" />
                         </umb-control-group>
-                
+
                         <umb-control-group label="@defaultdialogs_anchorLinkPicker">
                             <input type="text"
                                     list="anchors"
@@ -33,13 +33,13 @@
                                     placeholder="@placeholders_anchor"
                                     class="umb-property-editor umb-textstring"
                                     ng-model="model.target.anchor" />
-                    
+
                             <datalist id="anchors">
                                 <option value="{{a}}" ng-repeat="a in anchorValues"></option>
                             </datalist>
                         </umb-control-group>
                     </div>
-                
+
                     <umb-control-group label="@defaultdialogs_nodeNameLinkPicker">
                         <input type="text"
                                 localize="placeholder"
@@ -47,7 +47,7 @@
                                 class="umb-property-editor umb-textstring"
                                 ng-model="model.target.name" />
                     </umb-control-group>
-                
+
                     <umb-control-group ng-if="showTarget" label="@content_target">
                         <umb-checkbox
                                       model="vm.openInNewWindow"
@@ -58,28 +58,28 @@
 
                     <div class="umb-control-group">
                         <h5><localize key="defaultdialogs_linkToPage">Link to page</localize></h5>
-                
+
                         <div ng-hide="miniListView">
-                            <umb-tree-search-box 
+                            <umb-tree-search-box
                                 hide-search-callback="hideSearch"
                                 search-callback="onSearchResults"
                                 search-from-id="{{searchInfo.searchFromId}}"
                                 search-from-name="{{searchInfo.searchFromName}}"
-                                datatype-id="{{searchInfo.dataTypeId}}"
+                                datatype-key="{{searchInfo.dataTypeKey}}"
                                 show-search="{{searchInfo.showSearch}}"
                                 section="{{section}}">
                             </umb-tree-search-box>
-                
+
                             <br />
-                
-                            <umb-tree-search-results 
+
+                            <umb-tree-search-results
                                 ng-if="searchInfo.showSearch"
                                 results="searchInfo.results"
                                 select-result-callback="selectResult">
                             </umb-tree-search-results>
-                
+
                             <div ng-hide="searchInfo.showSearch">
-                                <umb-tree 
+                                <umb-tree
                                     section="content"
                                     hideheader="true"
                                     hideoptions="true"
@@ -92,17 +92,17 @@
                                 </umb-tree>
                             </div>
                         </div>
-                
-                        <umb-mini-list-view 
+
+                        <umb-mini-list-view
                             ng-if="miniListView"
                             node="miniListView"
                             entity-type="Document"
                             on-select="selectListViewNode(node)"
                             on-close="closeMiniListView()">
                         </umb-mini-list-view>
-                
+
                     </div>
-                
+
                     <div class="umb-control-group">
                         <h5><localize key="defaultdialogs_linkToMedia">Link to media</localize></h5>
                         <a href ng-click="switchToMediaPicker()" class="btn">
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
index 481f15f647..bcda921269 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
@@ -57,7 +57,7 @@ angular.module("umbraco")
                 totalItems: 0,
                 totalPages: 0,
                 filter: '',
-                dataTypeId: $scope.model.dataTypeId
+                dataTypeKey: $scope.model.dataTypeKey
             };
 
             //preload selected item
@@ -160,7 +160,7 @@ angular.module("umbraco")
                 }
 
                 if (folder.id > 0) {
-                    entityResource.getAncestors(folder.id, "media", null, { dataTypeId: $scope.model.dataTypeId })
+                    entityResource.getAncestors(folder.id, "media", null, { dataTypeKey: $scope.model.dataTypeKey })
                         .then(function (anc) {
                             $scope.path = _.filter(anc,
                                 function (f) {
@@ -318,7 +318,7 @@ angular.module("umbraco")
                             totalItems: 0,
                             totalPages: 0,
                             filter: '',
-                            dataTypeId: $scope.model.dataTypeId
+                            dataTypeKey: $scope.model.dataTypeKey
                         };
                         getChildren($scope.currentFolder.id);
                     }
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js
index 88caac716a..31430c81cb 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js
@@ -28,12 +28,12 @@ angular.module("umbraco").controller("Umbraco.Editors.TreePickerController",
         vm.treeAlias = $scope.model.treeAlias;
         vm.multiPicker = $scope.model.multiPicker;
         vm.hideHeader = (typeof $scope.model.hideHeader) === "boolean" ? $scope.model.hideHeader : true;
-        vm.dataTypeId = $scope.model.dataTypeId;
+        vm.dataTypeKey = $scope.model.dataTypeKey;
         vm.searchInfo = {
             searchFromId: $scope.model.startNodeId,
             searchFromName: null,
             showSearch: false,
-            dataTypeId: vm.dataTypeId,
+            dataTypeKey: vm.dataTypeKey,
             results: [],
             selectedSearchResults: []
         }
@@ -192,8 +192,8 @@ angular.module("umbraco").controller("Umbraco.Editors.TreePickerController",
             if (vm.selectedLanguage && vm.selectedLanguage.id) {
                 queryParams["culture"] = vm.selectedLanguage.culture;
             }
-            if (vm.dataTypeId) {
-                queryParams["dataTypeId"] = vm.dataTypeId;
+            if (vm.dataTypeKey) {
+                queryParams["dataTypeKey"] = vm.dataTypeKey;
             }
                 
             var queryString = $.param(queryParams); //create the query string from the params object
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.html
index 01c14a284f..78c75f6f8d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.html
@@ -27,7 +27,7 @@
                                         <a ng-click="vm.selectLanguage(language)" ng-repeat="language in vm.languages" href="">{{language.name}}</a>
                                     </div>
                                 </div>
-                        
+
                                 <div class="umb-control-group">
                                     <umb-tree-search-box
                                         ng-if="vm.enableSearh"
@@ -36,22 +36,22 @@
                                         search-from-id="{{vm.searchInfo.searchFromId}}"
                                         search-from-name="{{vm.searchInfo.searchFromName}}"
                                         show-search="{{vm.searchInfo.showSearch}}"
-                                        datatype-id="{{vm.searchInfo.dataTypeId}}"
+                                        datatype-key="{{vm.searchInfo.dataTypeKey}}"
                                         section="{{vm.section}}">
                                     </umb-tree-search-box>
                                 </div>
-                        
+
                                 <umb-tree-search-results ng-if="vm.searchInfo.showSearch"
                                                             results="vm.searchInfo.results"
                                                             select-result-callback="vm.selectResult">
                                 </umb-tree-search-results>
-                        
+
                                 <umb-empty-state ng-if="!vm.hasItems && vm.emptyStateMessage" position="center">
                                     {{ vm.emptyStateMessage }}
                                 </umb-empty-state>
-                        
+
                                 <div ng-if="vm.treeReady" ng-hide="vm.searchInfo.showSearch" ng-animate="'tree-fade-out'">
-                                    <umb-tree 
+                                    <umb-tree
                                         section="{{vm.section}}"
                                         treealias="{{vm.treeAlias}}"
                                         hideheader="{{vm.hideHeader}}"
@@ -65,10 +65,10 @@
                                         api="vm.dialogTreeApi">
                                     </umb-tree>
                                 </div>
-                        
+
                             </div>
-                        
-                            <umb-mini-list-view 
+
+                            <umb-mini-list-view
                                 ng-if="vm.miniListView"
                                 node="vm.miniListView"
                                 entity-type="{{vm.entityType}}"
@@ -93,7 +93,7 @@
                         shortcut="esc"
                         action="vm.close()">
                     </umb-button>
-    
+
                     <umb-button
                         ng-if="vm.multiPicker"
                         type="button"
@@ -101,7 +101,7 @@
                         label-key="general_submit"
                         action="vm.submit(model)">
                     </umb-button>
-            
+
                 </umb-editor-footer-content-right>
 
             </umb-editor-footer>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
index 7fafa20b0f..6667c3b539 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
@@ -86,7 +86,7 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
         showOpenButton: false,
         showEditButton: false,
         showPathOnHover: false,
-        dataTypeId: null,
+        dataTypeKey: null,
         maxNumber: 1,
         minNumber: 0,
         startNode: {
@@ -140,7 +140,7 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
         entityType: entityType,
         filterCssClass: "not-allowed not-published",
         startNodeId: null,
-        dataTypeId: $scope.model.dataTypeId,
+        dataTypeKey: $scope.model.dataTypeKey,
         currentNode: editorState ? editorState.current : null,
         callback: function (data) {
             if (angular.isArray(data)) {
@@ -162,7 +162,7 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
     // pre-value config on to the dialog options
     angular.extend(dialogOptions, $scope.model.config);
 
-    dialogOptions.dataTypeId = $scope.model.dataTypeId;
+    dialogOptions.dataTypeKey = $scope.model.dataTypeKey;
 
     // if we can't pick more than one item, explicitly disable multiPicker in the dialog options
     if ($scope.model.config.maxNumber && parseInt($scope.model.config.maxNumber) === 1) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
index 4e6c87d7a8..574aa87557 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
@@ -30,7 +30,7 @@ angular.module("umbraco")
                 showDetails: true,
                 disableFolderSelect: true,
                 onlyImages: true,
-                dataTypeId: $scope.model.dataTypeId,
+                dataTypeKey: $scope.model.dataTypeKey,
                 submit: function(model) {
                     var selectedImage = model.selection[0];
                    
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.html
index 63bc7570e1..7bfc6d125e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.html
@@ -4,7 +4,7 @@
 		configuration="model.config.rte"
 		value="control.value"
 		unique-id="control.$uniqueId"
-        datatype-id="{{model.dataTypeId}}"
+        datatype-key="{{model.dataTypeKey}}"
         ignore-user-start-nodes="{{model.config.ignoreUserStartNodes}}">
 	</grid-rte>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
index 41c1fa8c16..f7e88bef36 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
@@ -187,7 +187,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
             var mediaPicker = {
                 startNodeId: $scope.model.config.startNodeId,
                 startNodeIsVirtual: $scope.model.config.startNodeIsVirtual,
-                dataTypeId: $scope.model.dataTypeId,
+                dataTypeKey: $scope.model.dataTypeKey,
                 multiPicker: multiPicker,
                 onlyImages: onlyImages,
                 disableFolderSelect: disableFolderSelect,
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
index abaee3fca0..69bcc6b41a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
@@ -77,7 +77,7 @@ function multiUrlPickerController($scope, angularHelper, localizationService, en
 
         var linkPicker = {
             currentTarget: target,
-            dataTypeId: $scope.model.dataTypeId,
+            dataTypeKey: $scope.model.dataTypeKey,
             ignoreUserStartNodes : $scope.model.config.ignoreUserStartNodes,
             submit: function (model) {
                 if (model.target.url || model.target.anchor) {
diff --git a/src/Umbraco.Web/Editors/EntityController.cs b/src/Umbraco.Web/Editors/EntityController.cs
index 6ee16ae1ee..b3edb308a2 100644
--- a/src/Umbraco.Web/Editors/EntityController.cs
+++ b/src/Umbraco.Web/Editors/EntityController.cs
@@ -104,10 +104,10 @@ namespace Umbraco.Web.Editors
         /// <param name="searchFrom">
         /// A starting point for the search, generally a node id, but for members this is a member type alias
         /// </param>
-        /// <param name="dataTypeId">If set used to look up whether user and group start node permissions will be ignored.</param>
+        /// <param name="dataTypeKey">If set used to look up whether user and group start node permissions will be ignored.</param>
         /// <returns></returns>
         [HttpGet]
-        public IEnumerable<EntityBasic> Search(string query, UmbracoEntityTypes type, string searchFrom = null, Guid? dataTypeId = null)
+        public IEnumerable<EntityBasic> Search(string query, UmbracoEntityTypes type, string searchFrom = null, Guid? dataTypeKey = null)
         {
             // NOTE: Theoretically you shouldn't be able to see member data if you don't have access to members right? ... but there is a member picker, so can't really do that
 
@@ -116,7 +116,7 @@ namespace Umbraco.Web.Editors
 
             //TODO: This uses the internal UmbracoTreeSearcher, this instead should delgate to the ISearchableTree implementation for the type
 
-            var ignoreUserStartNodes = dataTypeId.HasValue && Services.DataTypeService.IsDataTypeIgnoringUserStartNodes(dataTypeId.Value);
+            var ignoreUserStartNodes = dataTypeKey.HasValue && Services.DataTypeService.IsDataTypeIgnoringUserStartNodes(dataTypeKey.Value);
             return ExamineSearch(query, type, searchFrom, ignoreUserStartNodes);
         }
 
@@ -424,7 +424,7 @@ namespace Umbraco.Web.Editors
         }
         #endregion
 
-        public IEnumerable<EntityBasic> GetChildren(int id, UmbracoEntityTypes type, Guid? dataTypeId = null)
+        public IEnumerable<EntityBasic> GetChildren(int id, UmbracoEntityTypes type, Guid? dataTypeKey = null)
         {
             var objectType = ConvertToObjectType(type);
             if (objectType.HasValue)
@@ -433,7 +433,7 @@ namespace Umbraco.Web.Editors
 
                 var startNodes = GetStartNodes(type);
 
-                var ignoreUserStartNodes = IsDataTypeIgnoringUserStartNodes(dataTypeId);
+                var ignoreUserStartNodes = IsDataTypeIgnoringUserStartNodes(dataTypeKey);
 
                 // root is special: we reduce it to start nodes if the user's start node is not the default, then we need to return their start nodes
                 if (id == Constants.System.Root && startNodes.Length > 0 && startNodes.Contains(Constants.System.Root) == false && !ignoreUserStartNodes)
@@ -482,7 +482,7 @@ namespace Umbraco.Web.Editors
             string orderBy = "SortOrder",
             Direction orderDirection = Direction.Ascending,
             string filter = "",
-            Guid? dataTypeId = null)
+            Guid? dataTypeKey = null)
         {
             if (int.TryParse(id, out var intId))
             {
@@ -507,7 +507,7 @@ namespace Umbraco.Web.Editors
                 //the EntityService can search paged members from the root
 
                 intId = -1;
-                return GetPagedChildren(intId, type, pageNumber, pageSize, orderBy, orderDirection, filter, dataTypeId);
+                return GetPagedChildren(intId, type, pageNumber, pageSize, orderBy, orderDirection, filter, dataTypeKey);
             }
 
             //the EntityService cannot search members of a certain type, this is currently not supported and would require
@@ -543,7 +543,7 @@ namespace Umbraco.Web.Editors
             string orderBy = "SortOrder",
             Direction orderDirection = Direction.Ascending,
             string filter = "",
-            Guid? dataTypeId = null)
+            Guid? dataTypeKey = null)
         {
             if (pageNumber <= 0)
                 throw new HttpResponseException(HttpStatusCode.NotFound);
@@ -558,7 +558,7 @@ namespace Umbraco.Web.Editors
 
                 var startNodes = GetStartNodes(type);
 
-                var ignoreUserStartNodes = IsDataTypeIgnoringUserStartNodes(dataTypeId);
+                var ignoreUserStartNodes = IsDataTypeIgnoringUserStartNodes(dataTypeKey);
 
                 // root is special: we reduce it to start nodes if the user's start node is not the default, then we need to return their start nodes
                 if (id == Constants.System.Root && startNodes.Length > 0 && startNodes.Contains(Constants.System.Root) == false && !ignoreUserStartNodes)
@@ -642,7 +642,7 @@ namespace Umbraco.Web.Editors
             string orderBy = "SortOrder",
             Direction orderDirection = Direction.Ascending,
             string filter = "",
-            Guid? dataTypeId = null)
+            Guid? dataTypeKey = null)
         {
             if (pageNumber <= 0)
                 throw new HttpResponseException(HttpStatusCode.NotFound);
@@ -661,7 +661,7 @@ namespace Umbraco.Web.Editors
 
                     int[] aids = GetStartNodes(type);
 
-                    var ignoreUserStartNodes = IsDataTypeIgnoringUserStartNodes(dataTypeId);
+                    var ignoreUserStartNodes = IsDataTypeIgnoringUserStartNodes(dataTypeKey);
                     entities = aids == null || aids.Contains(Constants.System.Root) || ignoreUserStartNodes
                         ? Services.EntityService.GetPagedDescendants(objectType.Value, pageNumber - 1, pageSize, out totalRecords,
                             SqlContext.Query<IUmbracoEntity>().Where(x => x.Name.Contains(filter)),
@@ -704,7 +704,7 @@ namespace Umbraco.Web.Editors
             }
         }
 
-        private bool IsDataTypeIgnoringUserStartNodes(Guid? dataTypeId) => dataTypeId.HasValue && Services.DataTypeService.IsDataTypeIgnoringUserStartNodes(dataTypeId.Value);
+        private bool IsDataTypeIgnoringUserStartNodes(Guid? dataTypeKey) => dataTypeKey.HasValue && Services.DataTypeService.IsDataTypeIgnoringUserStartNodes(dataTypeKey.Value);
 
         public IEnumerable<EntityBasic> GetAncestors(int id, UmbracoEntityTypes type, [ModelBinder(typeof(HttpQueryStringModelBinder))]FormDataCollection queryStrings)
         {
diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentPropertyBasic.cs b/src/Umbraco.Web/Models/ContentEditing/ContentPropertyBasic.cs
index f0f5bba7c4..c5c22484ad 100644
--- a/src/Umbraco.Web/Models/ContentEditing/ContentPropertyBasic.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/ContentPropertyBasic.cs
@@ -22,8 +22,7 @@ namespace Umbraco.Web.Models.ContentEditing
         [Required]
         public int Id { get; set; }
 
-        //fixme: This name dataTypeId is inconsistent, but requires us to change it everywhere in angular
-        [DataMember(Name = "dataTypeId", IsRequired = false)] 
+        [DataMember(Name = "dataTypeKey", IsRequired = false)]
         [ReadOnly(true)]
         public Guid DataTypeKey { get; set; }
 
diff --git a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
index 4fa9db13e3..015c91cb81 100644
--- a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
+++ b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
@@ -338,7 +338,7 @@ namespace Umbraco.Web.Trees
             //Here we need to figure out if the node is a container and if so check if the user has a custom start node, then check if that start node is a child
             // of this container node. If that is true, the HasChildren must be true so that the tree node still renders even though this current node is a container/list view.
             if (isContainer && UserStartNodes.Length > 0 && UserStartNodes.Contains(Constants.System.Root) == false)
-            {                    
+            {
                 var startNodes = Services.EntityService.GetAll(UmbracoObjectType, UserStartNodes);
                 //if any of these start nodes' parent is current, then we need to render children normally so we need to switch some logic and tell
                 // the UI that this node does have children and that it isn't a container
@@ -396,7 +396,7 @@ namespace Umbraco.Web.Trees
                 }
 
                 var menu = new MenuItemCollection();
-                // only add empty recycle bin if the current user is allowed to delete by default 
+                // only add empty recycle bin if the current user is allowed to delete by default
                 if (deleteAllowed)
                 {
 	                menu.Items.Add(new MenuItem("emptyRecycleBin", Services.TextService)
@@ -538,8 +538,8 @@ namespace Umbraco.Web.Trees
         {
             if (_ignoreUserStartNodes.HasValue) return _ignoreUserStartNodes.Value;
 
-            var dataTypeId = queryStrings.GetValue<Guid?>(TreeQueryStringParameters.DataTypeId);
-            _ignoreUserStartNodes = dataTypeId.HasValue ? Services.DataTypeService.IsDataTypeIgnoringUserStartNodes(dataTypeId.Value) : false;
+            var dataTypeKey = queryStrings.GetValue<Guid?>(TreeQueryStringParameters.DataTypeKey);
+            _ignoreUserStartNodes = dataTypeKey.HasValue && Services.DataTypeService.IsDataTypeIgnoringUserStartNodes(dataTypeKey.Value);
 
             return _ignoreUserStartNodes.Value;
         }
diff --git a/src/Umbraco.Web/Trees/TreeQueryStringParameters.cs b/src/Umbraco.Web/Trees/TreeQueryStringParameters.cs
index 9d012cb25c..02a198401b 100644
--- a/src/Umbraco.Web/Trees/TreeQueryStringParameters.cs
+++ b/src/Umbraco.Web/Trees/TreeQueryStringParameters.cs
@@ -8,7 +8,7 @@
         public const string Use = "use";
         public const string Application = "application";
         public const string StartNodeId = "startNodeId";
-        public const string DataTypeId = "dataTypeId";
+        public const string DataTypeKey = "dataTypeKey";
         //public const string OnNodeClick = "OnNodeClick";
         //public const string RenderParent = "RenderParent";
     }

From 7c52b9602c957d914b115a556a06f75acd1522fe Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 3 Jul 2019 17:43:30 +1000
Subject: [PATCH 100/776] Reduce some allocations and in advertent SQL calls
 along with inadvertent enumeration of the entire cache, adds some notes

---
 src/Umbraco.Core/EnumerableExtensions.cs      |  3 +-
 .../PublishedCache/NuCache/ContentStore.cs    | 17 +++--
 .../NuCache/DataSource/DatabaseDataSource.cs  |  4 +
 .../NuCache/PublishedSnapshotService.cs       | 73 ++++++++++++-------
 4 files changed, 65 insertions(+), 32 deletions(-)

diff --git a/src/Umbraco.Core/EnumerableExtensions.cs b/src/Umbraco.Core/EnumerableExtensions.cs
index 3719bb0750..59f5937874 100644
--- a/src/Umbraco.Core/EnumerableExtensions.cs
+++ b/src/Umbraco.Core/EnumerableExtensions.cs
@@ -10,6 +10,8 @@ namespace Umbraco.Core
     ///</summary>
     public static class EnumerableExtensions
     {
+        internal static bool IsCollectionEmpty<T>(this IReadOnlyCollection<T> list) => list == null || list.Count == 0;
+
         internal static bool HasDuplicates<T>(this IEnumerable<T> items, bool includeNull)
         {
             var hs = new HashSet<T>();
@@ -112,7 +114,6 @@ namespace Umbraco.Core
             }
         }
 
-
         /// <summary>
         /// Returns true if all items in the other collection exist in this collection
         /// </summary>
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
index f13fb21d33..182450b149 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using CSharpTest.Net.Collections;
+using Umbraco.Core;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Scoping;
@@ -275,6 +276,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         public void UpdateContentTypes(IEnumerable<IPublishedContentType> types)
         {
+            //nothing to do if this is empty, no need to lock/allocate/iterate/etc...            
+            if (!types.Any()) return; 
+
             var lockInfo = new WriteLockInfo();
             try
             {
@@ -330,13 +334,16 @@ namespace Umbraco.Web.PublishedCache.NuCache
             }
         }
 
-        public void UpdateContentTypes(IEnumerable<int> removedIds, IEnumerable<IPublishedContentType> refreshedTypes, IEnumerable<ContentNodeKit> kits)
+        public void UpdateContentTypes(IReadOnlyCollection<int> removedIds, IReadOnlyCollection<IPublishedContentType> refreshedTypes, IReadOnlyCollection<ContentNodeKit> kits)
         {
-            var removedIdsA = removedIds?.ToArray() ?? Array.Empty<int>();
-            var refreshedTypesA = refreshedTypes?.ToArray() ?? Array.Empty<IPublishedContentType>();
-            var refreshedIdsA = refreshedTypesA.Select(x => x.Id).ToArray();
+            var removedIdsA = removedIds ?? Array.Empty<int>();
+            var refreshedTypesA = refreshedTypes ?? Array.Empty<IPublishedContentType>();
+            var refreshedIdsA = refreshedTypesA.Select(x => x.Id).ToList();
             kits = kits ?? Array.Empty<ContentNodeKit>();
 
+            if (kits.Count == 0 && refreshedIdsA.Count == 0 && removedIdsA.Count == 0)
+                return; //exit - there is nothing to do here
+
             var lockInfo = new WriteLockInfo();
             try
             {
@@ -352,7 +359,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     var node = link.Value;
                     if (node == null) continue;
                     var contentTypeId = node.ContentType.Id;
-                    if (removedIdsA.Contains(contentTypeId)) removedContentTypeNodes.Add(node.Id);
+                    if (removedIds.Contains(contentTypeId)) removedContentTypeNodes.Add(node.Id);
                     if (refreshedIdsA.Contains(contentTypeId)) refreshedContentTypeNodes.Add(node.Id);
                 }
 
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
index dcb3f44487..3b66bd52d0 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
@@ -98,6 +98,8 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
 
         public IEnumerable<ContentNodeKit> GetTypeContentSources(IScope scope, IEnumerable<int> ids)
         {
+            if (!ids.Any()) return Enumerable.Empty<ContentNodeKit>();
+
             var sql = ContentSourcesSelect(scope)
                 .Where<NodeDto>(x => x.NodeObjectType == Constants.ObjectTypes.Document && !x.Trashed)
                 .WhereIn<ContentDto>(x => x.ContentTypeId, ids)
@@ -169,6 +171,8 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
 
         public IEnumerable<ContentNodeKit> GetTypeMediaSources(IScope scope, IEnumerable<int> ids)
         {
+            if (!ids.Any()) return Enumerable.Empty<ContentNodeKit>();
+
             var sql = MediaSourcesSelect(scope)
                     .Where<NodeDto>(x => x.NodeObjectType == Constants.ObjectTypes.Media && !x.Trashed)
                     .WhereIn<ContentDto>(x => x.ContentTypeId, ids)
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index 642e969819..e407dde1bb 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -814,31 +814,34 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
             ((PublishedSnapshot)CurrentPublishedSnapshot)?.Resync();
         }
-
-        private void Notify<T>(ContentStore store, ContentTypeCacheRefresher.JsonPayload[] payloads, Action<IEnumerable<int>, IEnumerable<int>, IEnumerable<int>, IEnumerable<int>> action)
+        
+        private void Notify<T>(ContentStore store, ContentTypeCacheRefresher.JsonPayload[] payloads, Action<List<int>, List<int>, List<int>, List<int>> action)
+            where T: IContentTypeComposition
         {
+            if (payloads.Length == 0) return; //nothing to do
+
+            //TODO: In the case of Pure Live here - we actually need to refresh all of the content types
+            // AFAIK this is a call to SetValueLocked(_contentNodes... ) or is it a call to _contentStore.SetAll
+
             var nameOfT = typeof(T).Name;
 
-            var removedIds = new List<int>();
-            var refreshedIds = new List<int>();
-            var otherIds = new List<int>();
-            var newIds = new List<int>();
+            List<int> removedIds = null, refreshedIds = null, otherIds = null, newIds = null;
 
             foreach (var payload in payloads)
             {
                 if (payload.ItemType != nameOfT) continue;
 
                 if (payload.ChangeTypes.HasType(ContentTypeChangeTypes.Remove))
-                    removedIds.Add(payload.Id);
+                    AddToList(ref removedIds, payload.Id);
                 else if (payload.ChangeTypes.HasType(ContentTypeChangeTypes.RefreshMain))
-                    refreshedIds.Add(payload.Id);
+                    AddToList(ref refreshedIds, payload.Id);
                 else if (payload.ChangeTypes.HasType(ContentTypeChangeTypes.RefreshOther))
-                    otherIds.Add(payload.Id);
+                    AddToList(ref otherIds, payload.Id);
                 else if (payload.ChangeTypes.HasType(ContentTypeChangeTypes.Create))
-                    newIds.Add(payload.Id);
+                    AddToList(ref newIds, payload.Id);
             }
 
-            if (removedIds.Count == 0 && refreshedIds.Count == 0 && otherIds.Count == 0 && newIds.Count == 0) return;
+            if (removedIds.IsCollectionEmpty() && refreshedIds.IsCollectionEmpty() && otherIds.IsCollectionEmpty() && newIds.IsCollectionEmpty()) return;
 
             using (store.GetScopedWriteLock(_scopeProvider))
             {
@@ -925,15 +928,19 @@ namespace Umbraco.Web.PublishedCache.NuCache
             }
         }
 
+        //Methods used to prevent allocations of lists        
+        private void AddToList(ref List<int> list, int val) => GetOrCreateList(ref list).Add(val);
+        private List<int> GetOrCreateList(ref List<int> list) => list ?? (list = new List<int>());
+
         #endregion
 
         #region Content Types
 
-        private IEnumerable<IPublishedContentType> CreateContentTypes(PublishedItemType itemType, int[] ids)
+        private IReadOnlyCollection<IPublishedContentType> CreateContentTypes(PublishedItemType itemType, int[] ids)
         {
             // XxxTypeService.GetAll(empty) returns everything!
             if (ids.Length == 0)
-                return Enumerable.Empty<IPublishedContentType>();
+                return Array.Empty<IPublishedContentType>();
 
             IEnumerable<IContentTypeComposition> contentTypes;
             switch (itemType)
@@ -953,7 +960,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
             // some may be missing - not checking here
 
-            return contentTypes.Select(x => _publishedContentTypeFactory.CreateContentType(x));
+            return contentTypes.Select(x => _publishedContentTypeFactory.CreateContentType(x)).ToList();
         }
 
         private IPublishedContentType CreateContentType(PublishedItemType itemType, int id)
@@ -977,44 +984,58 @@ namespace Umbraco.Web.PublishedCache.NuCache
             return contentType == null ? null : _publishedContentTypeFactory.CreateContentType(contentType);
         }
 
-        private void RefreshContentTypesLocked(IEnumerable<int> removedIds, IEnumerable<int> refreshedIds, IEnumerable<int> otherIds, IEnumerable<int> newIds)
+        private void RefreshContentTypesLocked(List<int> removedIds, List<int> refreshedIds, List<int> otherIds, List<int> newIds)
         {
+            if (removedIds.IsCollectionEmpty() && refreshedIds.IsCollectionEmpty() && otherIds.IsCollectionEmpty() && newIds.IsCollectionEmpty())
+                return;
+
             // locks:
             // content (and content types) are read-locked while reading content
             // contentStore is wlocked (so readable, only no new views)
             // and it can be wlocked by 1 thread only at a time
 
-            var refreshedIdsA = refreshedIds.ToArray();
-
             using (var scope = _scopeProvider.CreateScope())
             {
                 scope.ReadLock(Constants.Locks.ContentTypes);
 
-                var typesA = CreateContentTypes(PublishedItemType.Content, refreshedIdsA).ToArray();
-                var kits = _dataSource.GetTypeContentSources(scope, refreshedIdsA);
+                var typesA = refreshedIds.IsCollectionEmpty()
+                    ? Array.Empty<IPublishedContentType>()
+                    : CreateContentTypes(PublishedItemType.Content, refreshedIds.ToArray()).ToArray();
+
+                var kits = refreshedIds.IsCollectionEmpty()
+                    ? Array.Empty<ContentNodeKit>()
+                    : _dataSource.GetTypeContentSources(scope, refreshedIds).ToArray();
 
                 _contentStore.UpdateContentTypes(removedIds, typesA, kits);
-                _contentStore.UpdateContentTypes(CreateContentTypes(PublishedItemType.Content, otherIds.ToArray()).ToArray());
-                _contentStore.NewContentTypes(CreateContentTypes(PublishedItemType.Content, newIds.ToArray()).ToArray());
+                if (!otherIds.IsCollectionEmpty())
+                    _contentStore.UpdateContentTypes(CreateContentTypes(PublishedItemType.Content, otherIds.ToArray()));
+                if (!newIds.IsCollectionEmpty())
+                    _contentStore.NewContentTypes(CreateContentTypes(PublishedItemType.Content, newIds.ToArray()));
                 scope.Complete();
             }
         }
 
-        private void RefreshMediaTypesLocked(IEnumerable<int> removedIds, IEnumerable<int> refreshedIds, IEnumerable<int> otherIds, IEnumerable<int> newIds)
+        private void RefreshMediaTypesLocked(List<int> removedIds, List<int> refreshedIds, List<int> otherIds, List<int> newIds)
         {
+            if (removedIds.IsCollectionEmpty() && refreshedIds.IsCollectionEmpty() && otherIds.IsCollectionEmpty() && newIds.IsCollectionEmpty())
+                return;
+
             // locks:
             // media (and content types) are read-locked while reading media
             // mediaStore is wlocked (so readable, only no new views)
             // and it can be wlocked by 1 thread only at a time
 
-            var refreshedIdsA = refreshedIds.ToArray();
-
             using (var scope = _scopeProvider.CreateScope())
             {
                 scope.ReadLock(Constants.Locks.MediaTypes);
 
-                var typesA = CreateContentTypes(PublishedItemType.Media, refreshedIdsA).ToArray();
-                var kits = _dataSource.GetTypeMediaSources(scope, refreshedIdsA);
+                var typesA = refreshedIds == null
+                    ? Array.Empty<IPublishedContentType>()
+                    : CreateContentTypes(PublishedItemType.Media, refreshedIds.ToArray()).ToArray();
+
+                var kits = refreshedIds == null
+                    ? Array.Empty<ContentNodeKit>()
+                    : _dataSource.GetTypeMediaSources(scope, refreshedIds).ToArray();
 
                 _mediaStore.UpdateContentTypes(removedIds, typesA, kits);
                 _mediaStore.UpdateContentTypes(CreateContentTypes(PublishedItemType.Media, otherIds.ToArray()).ToArray());

From 7cc91f71c2582c73121d1b0b1af81e69e0c394e1 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 3 Jul 2019 18:11:00 +1000
Subject: [PATCH 101/776] Fixes pure live mode when changing doc types

---
 .../PublishedModelFactoryExtensions.cs        |  7 +++++
 .../Changes/ContentTypeChangeTypes.cs         | 24 ++++++++++++++---
 .../Cache/ContentTypeCacheRefresher.cs        | 27 +------------------
 .../NuCache/PublishedSnapshotService.cs       | 20 +++++++++++---
 4 files changed, 44 insertions(+), 34 deletions(-)

diff --git a/src/Umbraco.Core/PublishedModelFactoryExtensions.cs b/src/Umbraco.Core/PublishedModelFactoryExtensions.cs
index d428accbbf..de6eeb6a42 100644
--- a/src/Umbraco.Core/PublishedModelFactoryExtensions.cs
+++ b/src/Umbraco.Core/PublishedModelFactoryExtensions.cs
@@ -8,6 +8,13 @@ namespace Umbraco.Core
     /// </summary>
     public static class PublishedModelFactoryExtensions
     {
+        /// <summary>
+        /// Returns true if the current <see cref="IPublishedModelFactory"/> is an implementation of <see cref="ILivePublishedModelFactory"/>
+        /// </summary>
+        /// <param name="factory"></param>
+        /// <returns></returns>
+        public static bool IsLiveFactory(this IPublishedModelFactory factory) => factory is ILivePublishedModelFactory;
+
         /// <summary>
         /// Executes an action with a safe live factory
         /// </summary>
diff --git a/src/Umbraco.Core/Services/Changes/ContentTypeChangeTypes.cs b/src/Umbraco.Core/Services/Changes/ContentTypeChangeTypes.cs
index 497f7d47a9..bf7f87fd1a 100644
--- a/src/Umbraco.Core/Services/Changes/ContentTypeChangeTypes.cs
+++ b/src/Umbraco.Core/Services/Changes/ContentTypeChangeTypes.cs
@@ -6,9 +6,25 @@ namespace Umbraco.Core.Services.Changes
     public enum ContentTypeChangeTypes : byte
     {
         None = 0,
-        Create = 1, // item type has been created, no impact
-        RefreshMain = 2, // changed, impacts content (adding property or composition does NOT)
-        RefreshOther = 4, // changed, other changes
-        Remove = 8 // item type has been removed
+
+        /// <summary>
+        /// Item type has been created, no impact
+        /// </summary>
+        Create = 1,
+
+        /// <summary>
+        /// Content type changes impact only the Content type being saved
+        /// </summary>
+        RefreshMain = 2,
+
+        /// <summary>
+        /// Content type changes impacts the content type being saved and others used that are composed of it
+        /// </summary>
+        RefreshOther = 4, // changed, other change
+
+        /// <summary>
+        /// Content type was removed
+        /// </summary>
+        Remove = 8 
     }
 }
diff --git a/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs b/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs
index 75f2889cab..266cddf6d5 100644
--- a/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs
@@ -18,17 +18,15 @@ namespace Umbraco.Web.Cache
         private readonly IPublishedSnapshotService _publishedSnapshotService;
         private readonly IPublishedModelFactory _publishedModelFactory;
         private readonly IContentTypeCommonRepository _contentTypeCommonRepository;
-        private readonly IContentTypeService _contentTypeService;
         private readonly IdkMap _idkMap;
 
-        public ContentTypeCacheRefresher(AppCaches appCaches, IPublishedSnapshotService publishedSnapshotService, IPublishedModelFactory publishedModelFactory, IdkMap idkMap, IContentTypeCommonRepository contentTypeCommonRepository, IContentTypeService contentTypeService)
+        public ContentTypeCacheRefresher(AppCaches appCaches, IPublishedSnapshotService publishedSnapshotService, IPublishedModelFactory publishedModelFactory, IdkMap idkMap, IContentTypeCommonRepository contentTypeCommonRepository)
             : base(appCaches)
         {
             _publishedSnapshotService = publishedSnapshotService;
             _publishedModelFactory = publishedModelFactory;
             _idkMap = idkMap;
             _contentTypeCommonRepository = contentTypeCommonRepository;
-            _contentTypeService = contentTypeService;
         }
 
         #region Define
@@ -53,16 +51,6 @@ namespace Umbraco.Web.Cache
 
             _contentTypeCommonRepository.ClearCache(); // always
 
-            //// We need to special handle the IContentType if modelsbuilder is in live mode, because all models are updated when a IContentType is changed, we need to clear all from cache also.
-            //if (_publishedModelFactory is ILivePublishedModelFactory && payloads.Any(x => x.ItemType == typeof(IContentType).Name))
-            //{
-            //    //This is super nasty, and we need to figure out a better way to to this
-            //    //Ensure all doc type ids is part of the payload
-            //    var missingPayloads = GetMissingContentTypePayloads(payloads);
-
-            //    payloads = payloads.Union(missingPayloads).ToArray();
-            //}
-
             if (payloads.Any(x => x.ItemType == typeof(IContentType).Name))
             {
                 ClearAllIsolatedCacheByEntityType<IContent>();
@@ -109,19 +97,6 @@ namespace Umbraco.Web.Cache
             base.Refresh(payloads);
         }
 
-        //private IEnumerable<JsonPayload> GetMissingContentTypePayloads(JsonPayload[] payloads)
-        //{
-        //    var existingPayloadIds = new HashSet<int>(payloads.Select(x => x.Id));
-        //    var contentTypeIds = _contentTypeService.GetAll().Select(x => x.Id).ToArray();
-
-        //    foreach (var contentTypeId in contentTypeIds)
-        //    {
-        //        if (!existingPayloadIds.Contains(contentTypeId))
-        //        {
-        //            yield return new JsonPayload(typeof(IContentType).Name, contentTypeId, ContentTypeChangeTypes.RefreshOther);
-        //        }
-        //    }
-        //}
 
         public override void RefreshAll()
         {
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index e407dde1bb..b585781ea4 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -42,6 +42,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
         private readonly IMemberRepository _memberRepository;
         private readonly IGlobalSettings _globalSettings;
         private readonly IEntityXmlSerializer _entitySerializer;
+        private readonly IPublishedModelFactory _publishedModelFactory;
         private readonly IDefaultCultureAccessor _defaultCultureAccessor;
         private readonly UrlSegmentProviderCollection _urlSegmentProviders;
 
@@ -73,7 +74,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
             IDocumentRepository documentRepository, IMediaRepository mediaRepository, IMemberRepository memberRepository,
             IDefaultCultureAccessor defaultCultureAccessor,
             IDataSource dataSource, IGlobalSettings globalSettings,
-            IEntityXmlSerializer entitySerializer, IPublishedModelFactory publishedModelFactory,
+            IEntityXmlSerializer entitySerializer,
+            IPublishedModelFactory publishedModelFactory,
             UrlSegmentProviderCollection urlSegmentProviders)
             : base(publishedSnapshotAccessor, variationContextAccessor)
         {
@@ -95,6 +97,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             // we need an Xml serializer here so that the member cache can support XPath,
             // for members this is done by navigating the serialized-to-xml member
             _entitySerializer = entitySerializer;
+            _publishedModelFactory = publishedModelFactory;
 
             // we always want to handle repository events, configured or not
             // assuming no repository event will trigger before the whole db is ready
@@ -708,6 +711,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             }
         }
 
+        /// <inheritdoc />
         public override void Notify(MediaCacheRefresher.JsonPayload[] payloads, out bool anythingChanged)
         {
             // no cache, trash everything
@@ -800,6 +804,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             }
         }
 
+        /// <inheritdoc />
         public override void Notify(ContentTypeCacheRefresher.JsonPayload[] payloads)
         {
             // no cache, nothing we can do
@@ -812,6 +817,16 @@ namespace Umbraco.Web.PublishedCache.NuCache
             Notify<IContentType>(_contentStore, payloads, RefreshContentTypesLocked);
             Notify<IMediaType>(_mediaStore, payloads, RefreshMediaTypesLocked);
 
+            if (_publishedModelFactory.IsLiveFactory())
+            {
+                //In the case of Pure Live - we actually need to refresh all of the content
+                using (_contentStore.GetScopedWriteLock(_scopeProvider))
+                {
+                    NotifyLocked(new[] { new ContentCacheRefresher.JsonPayload(0, TreeChangeTypes.RefreshAll) }, out var draftChanged, out var publishedChanged);
+                    
+                }
+            }
+
             ((PublishedSnapshot)CurrentPublishedSnapshot)?.Resync();
         }
         
@@ -820,9 +835,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
         {
             if (payloads.Length == 0) return; //nothing to do
 
-            //TODO: In the case of Pure Live here - we actually need to refresh all of the content types
-            // AFAIK this is a call to SetValueLocked(_contentNodes... ) or is it a call to _contentStore.SetAll
-
             var nameOfT = typeof(T).Name;
 
             List<int> removedIds = null, refreshedIds = null, otherIds = null, newIds = null;

From 126c4cbd46de303bd3cf6ca095d68216d16f914a Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 3 Jul 2019 18:25:19 +1000
Subject: [PATCH 102/776] ensures media is rebuild and adds more notes

---
 .../NuCache/PublishedSnapshotService.cs            | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index b585781ea4..dad9811af8 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -819,19 +819,25 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
             if (_publishedModelFactory.IsLiveFactory())
             {
-                //In the case of Pure Live - we actually need to refresh all of the content
+                //In the case of Pure Live - we actually need to refresh all of the content and the media
+                //see https://github.com/umbraco/Umbraco-CMS/issues/5671
+                //The underlying issue is that in Pure Live the ILivePublishedModelFactory will re-compile all of the classes/models
+                //into a new DLL for the application which includes both content types and media types.
+                //Since the models in the cache are based on these actual classes, all of the objects in the cache need to be updated
+                //to use the newest version of the class.
                 using (_contentStore.GetScopedWriteLock(_scopeProvider))
+                using (_mediaStore.GetScopedWriteLock(_scopeProvider))
                 {
                     NotifyLocked(new[] { new ContentCacheRefresher.JsonPayload(0, TreeChangeTypes.RefreshAll) }, out var draftChanged, out var publishedChanged);
-                    
+                    NotifyLocked(new[] { new MediaCacheRefresher.JsonPayload(0, TreeChangeTypes.RefreshAll) }, out var anythingChanged);
                 }
             }
 
             ((PublishedSnapshot)CurrentPublishedSnapshot)?.Resync();
         }
-        
+
         private void Notify<T>(ContentStore store, ContentTypeCacheRefresher.JsonPayload[] payloads, Action<List<int>, List<int>, List<int>, List<int>> action)
-            where T: IContentTypeComposition
+            where T : IContentTypeComposition
         {
             if (payloads.Length == 0) return; //nothing to do
 

From 31716e574ca0e6c5aa002a59711452d1ece4cc5b Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Wed, 3 Jul 2019 18:34:11 +1000
Subject: [PATCH 103/776] Update
 src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs

good catch!

Co-Authored-By: Bjarke Berg <mail@bergmania.dk>
---
 src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
index 182450b149..2d501fa3b5 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
@@ -359,7 +359,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     var node = link.Value;
                     if (node == null) continue;
                     var contentTypeId = node.ContentType.Id;
-                    if (removedIds.Contains(contentTypeId)) removedContentTypeNodes.Add(node.Id);
+                    if (removedIdsA.Contains(contentTypeId)) removedContentTypeNodes.Add(node.Id);
                     if (refreshedIdsA.Contains(contentTypeId)) refreshedContentTypeNodes.Add(node.Id);
                 }
 

From 37bf6fe9385f026f6921ea03330e2ded57914fa6 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 3 Jul 2019 19:15:54 +1000
Subject: [PATCH 104/776] Automatically refresh the page if we encounter a
 ModelBindingException

---
 .../Mvc/ModelBindingExceptionFilter.cs        | 23 +++++++++++++++++++
 src/Umbraco.Web/Mvc/RenderMvcController.cs    |  2 ++
 src/Umbraco.Web/Umbraco.Web.csproj            |  1 +
 3 files changed, 26 insertions(+)
 create mode 100644 src/Umbraco.Web/Mvc/ModelBindingExceptionFilter.cs

diff --git a/src/Umbraco.Web/Mvc/ModelBindingExceptionFilter.cs b/src/Umbraco.Web/Mvc/ModelBindingExceptionFilter.cs
new file mode 100644
index 0000000000..714a916e6a
--- /dev/null
+++ b/src/Umbraco.Web/Mvc/ModelBindingExceptionFilter.cs
@@ -0,0 +1,23 @@
+using System.Web.Mvc;
+
+namespace Umbraco.Web.Mvc
+{
+    /// <summary>
+    /// An exception filter checking if we get a <see cref="ModelBindingException"/> in which case it returns the html to auto refresh the page
+    /// </summary>
+    internal class ModelBindingExceptionFilter : FilterAttribute, IExceptionFilter
+    {
+        public void OnException(ExceptionContext filterContext)
+        {
+            if (!filterContext.ExceptionHandled && filterContext.Exception is ModelBindingException)
+            {
+                filterContext.Result = new ContentResult
+                {
+                    Content = "<html><head><meta http-equiv=\"refresh\" content=\"3\" /></head><body><p>Loading page...</p></body></html>",
+                    ContentType = "text/html"
+                };
+                filterContext.ExceptionHandled = true;
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Mvc/RenderMvcController.cs b/src/Umbraco.Web/Mvc/RenderMvcController.cs
index c2aa3bd8ed..64c9ad52c4 100644
--- a/src/Umbraco.Web/Mvc/RenderMvcController.cs
+++ b/src/Umbraco.Web/Mvc/RenderMvcController.cs
@@ -10,10 +10,12 @@ using Umbraco.Web.Routing;
 
 namespace Umbraco.Web.Mvc
 {
+
     /// <summary>
     /// Represents the default front-end rendering controller.
     /// </summary>
     [PreRenderViewActionFilter]
+    [ModelBindingExceptionFilter]
     public class RenderMvcController : UmbracoController, IRenderMvcController
     {
         private PublishedRequest _publishedRequest;
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index c9cbc46a35..b6b7bc5599 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -218,6 +218,7 @@
     <Compile Include="Models\Mapping\MapperContextExtensions.cs" />
     <Compile Include="Models\PublishedContent\HybridVariationContextAccessor.cs" />
     <Compile Include="Models\TemplateQuery\QueryConditionExtensions.cs" />
+    <Compile Include="Mvc\ModelBindingExceptionFilter.cs" />
     <Compile Include="Mvc\SurfaceControllerTypeCollectionBuilder.cs" />
     <Compile Include="Profiling\WebProfilingController.cs" />
     <Compile Include="PublishedCache\NuCache\Snap\GenObj.cs" />

From 4133a1fe76638defdb41527c0355f7a75cb38e0d Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 3 Jul 2019 13:14:35 +0200
Subject: [PATCH 105/776] Refactored the ModelBindingExceptionFilter to also
 handle InvalidCastException, and also ensure the models are the same type.
 Otherwise a infinite loop was introduced, when requesting a wrong model in
 the view. Also refactored the why we do the retry from Html to Http headers

---
 .../Mvc/ModelBindingExceptionFilter.cs        | 47 +++++++++++++++----
 1 file changed, 39 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Web/Mvc/ModelBindingExceptionFilter.cs b/src/Umbraco.Web/Mvc/ModelBindingExceptionFilter.cs
index 714a916e6a..b9161dbea0 100644
--- a/src/Umbraco.Web/Mvc/ModelBindingExceptionFilter.cs
+++ b/src/Umbraco.Web/Mvc/ModelBindingExceptionFilter.cs
@@ -1,23 +1,54 @@
-using System.Web.Mvc;
+using System;
+using System.Net;
+using System.Text.RegularExpressions;
+using System.Web.Mvc;
 
 namespace Umbraco.Web.Mvc
 {
     /// <summary>
-    /// An exception filter checking if we get a <see cref="ModelBindingException"/> in which case it returns the html to auto refresh the page
+    ///     An exception filter checking if we get a <see cref="ModelBindingException" /> or <see cref="InvalidCastException" /> with the same model. in which case it returns a redirect to the same page after 1 sec.
     /// </summary>
     internal class ModelBindingExceptionFilter : FilterAttribute, IExceptionFilter
     {
+        private static readonly Regex GetPublishedModelsTypesRegex = new Regex("Umbraco.Web.PublishedModels.(\\w+)", RegexOptions.Compiled);
+
         public void OnException(ExceptionContext filterContext)
         {
-            if (!filterContext.ExceptionHandled && filterContext.Exception is ModelBindingException)
+            if (!filterContext.ExceptionHandled
+                && ((filterContext.Exception is ModelBindingException || filterContext.Exception is InvalidCastException)
+                    && IsMessageAboutTheSameModelType(filterContext.Exception.Message)))
             {
-                filterContext.Result = new ContentResult
-                {
-                    Content = "<html><head><meta http-equiv=\"refresh\" content=\"3\" /></head><body><p>Loading page...</p></body></html>",
-                    ContentType = "text/html"
-                };
+                filterContext.HttpContext.Response.Headers.Add(HttpResponseHeader.RetryAfter.ToString(), "1");
+                filterContext.Result = new RedirectResult(filterContext.HttpContext.Request.RawUrl, false);
+
                 filterContext.ExceptionHandled = true;
             }
         }
+
+        /// <summary>
+        ///     Returns true if the message is about two models with the same name.
+        /// </summary>
+        /// <remarks>
+        ///     Message could be something like:
+        /// <para>
+        ///     InvalidCastException:
+        ///     [A]Umbraco.Web.PublishedModels.Home cannot be cast to [B]Umbraco.Web.PublishedModels.Home. Type A originates from 'App_Web_all.generated.cs.8f9494c4.rtdigm_z, Version=0.0.0.3, Culture=neutral, PublicKeyToken=null' in the context 'Default' at location 'C:\Users\User\AppData\Local\Temp\Temporary ASP.NET Files\root\c5c63f4d\c168d9d4\App_Web_all.generated.cs.8f9494c4.rtdigm_z.dll'. Type B originates from 'App_Web_all.generated.cs.8f9494c4.rbyqlplu, Version=0.0.0.5, Culture=neutral, PublicKeyToken=null' in the context 'Default' at location 'C:\Users\User\AppData\Local\Temp\Temporary ASP.NET Files\root\c5c63f4d\c168d9d4\App_Web_all.generated.cs.8f9494c4.rbyqlplu.dll'.
+        ///</para>
+        /// <para>
+        ///     ModelBindingException:
+        ///     Cannot bind source content type Umbraco.Web.PublishedModels.Home to model type Umbraco.Web.PublishedModels.Home. Both view and content models are PureLive, with different versions. The application is in an unstable state and is going to be restarted. The application is restarting now.
+        /// </para>
+        /// </remarks>
+        private bool IsMessageAboutTheSameModelType(string exceptionMessage)
+        {
+            var matches = GetPublishedModelsTypesRegex.Matches(exceptionMessage);
+
+            if (matches.Count >= 2)
+            {
+                return string.Equals(matches[0].Value, matches[1].Value, StringComparison.InvariantCulture);
+            }
+
+            return false;
+        }
     }
 }

From 57e3187e3a84c3992c7797bc041e5eb3fa9a1bad Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Wed, 3 Jul 2019 22:10:01 +0200
Subject: [PATCH 106/776] For some reason this file was not part of the project
 any more :-(

---
 src/Umbraco.Web/Umbraco.Web.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index b6b7bc5599..105a40b4a7 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -137,6 +137,7 @@
     <Compile Include="Dashboards\HealthCheckDashboard.cs" />
     <Compile Include="Dashboards\MediaDashboard.cs" />
     <Compile Include="Dashboards\MembersDashboard.cs" />
+    <Compile Include="Dashboards\ProfilerDashboard.cs" />
     <Compile Include="Dashboards\PublishedStatusDashboard.cs" />
     <Compile Include="Dashboards\RedirectUrlDashboard.cs" />
     <Compile Include="Dashboards\SettingsDashboards.cs" />

From c4b5483d8c1c5c0b44e356ee856319ec1821fa76 Mon Sep 17 00:00:00 2001
From: Nathan Woulfe <nathan@nathanw.com.au>
Date: Thu, 4 Jul 2019 11:19:10 +1000
Subject: [PATCH 107/776] make log naming and colors consistent between views

---
 .../views/logviewer/overview.controller.js    | 12 +++----
 .../src/views/logviewer/overview.html         |  2 +-
 .../src/views/logviewer/search.controller.js  | 35 ++++++-------------
 3 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.controller.js b/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.controller.js
index fc24fbe1bc..5cee21668e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.controller.js
@@ -12,9 +12,9 @@
         vm.commonLogMessagesCount = 10;
 
         // ChartJS Options - for count/overview of log distribution
-        vm.logTypeLabels = ["Info", "Debug", "Warning", "Error", "Critical"];
+        vm.logTypeLabels = ["Debug", "Info", "Warning", "Error", "Fatal"];
         vm.logTypeData = [0, 0, 0, 0, 0];
-        vm.logTypeColors = [ '#dcdcdc', '#97bbcd', '#46bfbd', '#fdb45c', '#f7464a'];
+        vm.logTypeColors = ['#eaddd5', '#2bc37c', '#3544b1', '#ff9412', '#d42054'];
         vm.chartOptions = {
             legend: {
                 display: true,
@@ -74,7 +74,7 @@
                         "query": "Not(@Level='Verbose') and Not(@Level='Debug')"
                     },
                     {
-                        "name": "Find all logs that has an exception property (Warning, Error & Critical with Exceptions)",
+                        "name": "Find all logs that has an exception property (Warning, Error & Fatal with Exceptions)",
                         "query": "Has(@Exception)"
                     },
                     {
@@ -113,8 +113,8 @@
                 vm.commonLogMessages = data;
             });
 
-            //Set loading indicatior to false when these 3 queries complete
-            $q.all([savedSearches, numOfErrors, logCounts, commonMsgs]).then(function(data) {
+            //Set loading indicator to false when these 3 queries complete
+            $q.all([savedSearches, numOfErrors, logCounts, commonMsgs]).then(function() {
                 vm.loading = false;
             });
 
@@ -148,7 +148,7 @@
             conjunction: " to "
         };
         
-        vm.dateRangeChange = function(selectedDates, dateStr, instance) {
+        vm.dateRangeChange = function(selectedDates) {
             
             if(selectedDates.length > 0){
                 vm.startDate = selectedDates[0].toIsoDateString();
diff --git a/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html b/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html
index 854bed755f..896cb17da7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html
@@ -78,7 +78,7 @@
                             class="datepicker"
                             ng-model="vm.period"
                             options="vm.config"
-                            on-close="vm.dateRangeChange(selectedDates, dateStr, instance)">
+                            on-close="vm.dateRangeChange(selectedDates)">
                         </umb-flatpickr>
                     </umb-box>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/logviewer/search.controller.js b/src/Umbraco.Web.UI.Client/src/views/logviewer/search.controller.js
index d4b0ea8f8e..fb627855b6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/logviewer/search.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/logviewer/search.controller.js
@@ -11,26 +11,28 @@
         vm.showBackButton = true;
         vm.page = {};
 
+        // this array is also used to map the logTypeColor param onto the log items
+        // in setLogTypeColors()
         vm.logLevels = [
             {
                 name: 'Verbose',
-                logTypeColor: 'gray'
+                logTypeColor: ''
             },
             {
                 name: 'Debug',
-                logTypeColor: 'secondary'
+                logTypeColor: 'gray'
             },
             {
                 name: 'Information',
-                logTypeColor: 'primary'
+                logTypeColor: 'success' 
             },
             {
                 name: 'Warning',
-                logTypeColor: 'warning'
+                logTypeColor: 'primary'
             },
             {
                 name: 'Error',
-                logTypeColor: 'danger'
+                logTypeColor: 'warning'
             },
             {
                 name: 'Fatal',
@@ -118,7 +120,7 @@
                         "query": "Not(@Level='Verbose') and Not(@Level='Debug')"
                     },
                     {
-                        "name": "Find all logs that has an exception property (Warning, Error & Critical with Exceptions)",
+                        "name": "Find all logs that has an exception property (Warning, Error & Fatal with Exceptions)",
                         "query": "Has(@Exception)"
                     },
                     {
@@ -173,25 +175,8 @@
         }
 
         function setLogTypeColor(logItems) {
-            angular.forEach(logItems, function (log) {
-                switch (log.Level) {
-                    case "Information":
-                        log.logTypeColor = "primary";
-                        break;
-                    case "Debug":
-                        log.logTypeColor = "secondary";
-                        break;
-                    case "Warning":
-                        log.logTypeColor = "warning";
-                        break;
-                    case "Fatal":
-                    case "Error":
-                        log.logTypeColor = "danger";
-                        break;
-                    default:
-                        log.logTypeColor = "gray";
-                }
-            });
+            logItems.forEach(logItem => 
+                logItem.logTypeColor = vm.logLevels.find(x => x.name === logItem.Level).logTypeColor);
         }
 
         function getFilterName(array) {

From a0bcfeddcc6631a48d73dfb6fd3e88a96fa7d146 Mon Sep 17 00:00:00 2001
From: Nathan Woulfe <nathan@nathanw.com.au>
Date: Thu, 4 Jul 2019 11:48:02 +1000
Subject: [PATCH 108/776] fix date range formatting on flatpickr - 'to' wasnt
 displayed after choosing a range

---
 .../views/logviewer/overview.controller.js    | 24 ++++++++++++-------
 .../src/views/logviewer/overview.html         |  2 +-
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.controller.js b/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.controller.js
index 5cee21668e..79ac8af5f8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.controller.js
@@ -43,14 +43,20 @@
         vm.searchLogQuery = searchLogQuery;
         vm.findMessageTemplate = findMessageTemplate;
         
-        function preFlightCheck(){
-            vm.loading = true;
+        function preFlightCheck(instance){
+            vm.loading = true;          
+
+            
             //Do our pre-flight check (to see if we can view logs)
             //IE the log file is NOT too big such as 1GB & crash the site
             logViewerResource.canViewLogs(vm.startDate, vm.endDate).then(function(result){
                 vm.loading = false;
                 vm.canLoadLogs = result;
 
+                if (instance) {
+                    instance.setDate(vm.period);
+                }
+                
                 if(result){
                     //Can view logs - so initalise
                     init();
@@ -117,7 +123,7 @@
             $q.all([savedSearches, numOfErrors, logCounts, commonMsgs]).then(function() {
                 vm.loading = false;
             });
-
+            
             $timeout(function () {
                 navigationService.syncTree({ tree: "logViewer", path: "-1" });
             });
@@ -146,9 +152,9 @@
             mode: "range",
             maxDate: "today",
             conjunction: " to "
-        };
-        
-        vm.dateRangeChange = function(selectedDates) {
+        };        
+            
+        vm.dateRangeChange = function(selectedDates, dateStr, instance) {
             
             if(selectedDates.length > 0){
                 vm.startDate = selectedDates[0].toIsoDateString();
@@ -158,9 +164,9 @@
                     vm.period = [vm.startDate];
                 }else{
                     vm.period = [vm.startDate, vm.endDate];
-                }
-                
-                preFlightCheck();
+                }                
+                                
+                preFlightCheck(instance);
             }
 
         }
diff --git a/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html b/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html
index 896cb17da7..854bed755f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html
@@ -78,7 +78,7 @@
                             class="datepicker"
                             ng-model="vm.period"
                             options="vm.config"
-                            on-close="vm.dateRangeChange(selectedDates)">
+                            on-close="vm.dateRangeChange(selectedDates, dateStr, instance)">
                         </umb-flatpickr>
                     </umb-box>
 

From 926acb910e2dd3c20b782f3a34b4bc60147e5257 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 4 Jul 2019 10:35:48 +0200
Subject: [PATCH 109/776] Forces the initial migration state of V7 sites that
 are allowed to be migrated into v7.14 state.

---
 src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
index 834eade986..6c8099ffb0 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
@@ -74,6 +74,10 @@ namespace Umbraco.Core.Migrations.Upgrade
                     throw new InvalidOperationException($"Version {currentVersion} cannot be migrated to {UmbracoVersion.SemanticVersion}."
                                                         + $" Please upgrade first to at least {minVersion}.");
 
+                // Force newer versions of 7, into 7.14, when migrating
+                if (currentVersion.Major == 7)
+                    return GetInitState(minVersion);
+
                 // initial state is eg "{init-7.14.0}"
                 return GetInitState(currentVersion);
             }

From 6dbb9889035fdc5e5447053787cd315343831f6b Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 4 Jul 2019 10:47:56 +0200
Subject: [PATCH 110/776] Refactor to limit to only v7.14.0 - V7.15.*

---
 src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
index 6c8099ffb0..e8fd3414ec 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
@@ -74,8 +74,9 @@ namespace Umbraco.Core.Migrations.Upgrade
                     throw new InvalidOperationException($"Version {currentVersion} cannot be migrated to {UmbracoVersion.SemanticVersion}."
                                                         + $" Please upgrade first to at least {minVersion}.");
 
-                // Force newer versions of 7, into 7.14, when migrating
-                if (currentVersion.Major == 7)
+                // Force versions between 7.14.*-7.15.* into into 7.14 initial state. Because there is no db-changes,
+                // and we don't want users to workaround my putting in version 7.14.0 them self.
+                if (minVersion <= currentVersion && currentVersion < new SemVersion(7, 16))
                     return GetInitState(minVersion);
 
                 // initial state is eg "{init-7.14.0}"

From 2cd01735343e49e853555d662ad6e9493ee69a45 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland@zonedigital.com>
Date: Thu, 4 Jul 2019 14:35:06 +0200
Subject: [PATCH 111/776] Fixed incorrect label for "Fatal" errors on the log
 viewer pie chart. Made the log viewer title variable so it either says "Log
 Overview For Today" or "Log Overview For Selected Time Period" (previously it
 said the former even if you'd adjusted the dates you were looking at. Fixed
 up the selected date period display so the conjunction "to" is used between
 the dates when the selected time period is changed and querystring is
 updated. Minor code tidy-up.

---
 .../views/logviewer/overview.controller.js    | 134 +++++++++---------
 .../src/views/logviewer/overview.html         |  11 +-
 .../Editors/LogViewerController.cs            |   6 +-
 3 files changed, 77 insertions(+), 74 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.controller.js b/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.controller.js
index fc24fbe1bc..0afad09b81 100644
--- a/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.controller.js
@@ -10,11 +10,12 @@
         vm.numberOfErrors = 0;
         vm.commonLogMessages = [];
         vm.commonLogMessagesCount = 10;
+        vm.dateRangeLabel = "";
 
         // ChartJS Options - for count/overview of log distribution
-        vm.logTypeLabels = ["Info", "Debug", "Warning", "Error", "Critical"];
+        vm.logTypeLabels = ["Info", "Debug", "Warning", "Error", "Fatal"];
         vm.logTypeData = [0, 0, 0, 0, 0];
-        vm.logTypeColors = [ '#dcdcdc', '#97bbcd', '#46bfbd', '#fdb45c', '#f7464a'];
+        vm.logTypeColors = ["#dcdcdc", "#97bbcd", "#46bfbd", "#fdb45c", "#f7464a"];
         vm.chartOptions = {
             legend: {
                 display: true,
@@ -23,35 +24,41 @@
         };
 
         let querystring = $location.search();
-        if(querystring.startDate){
+        if (querystring.startDate) {
             vm.startDate = querystring.startDate;
-        }else{
+            vm.dateRangeLabel = getDateRangeLabel("Selected Time Period");
+        } else {
             vm.startDate = new Date(Date.now());
-            vm.startDate.setDate(vm.startDate.getDate()-1);
+            vm.startDate.setDate(vm.startDate.getDate() - 1);
             vm.startDate = vm.startDate.toIsoDateString();
+            vm.dateRangeLabel = getDateRangeLabel("Today");
         }
 
-        if(querystring.endDate){
+        if (querystring.endDate) {
             vm.endDate = querystring.endDate;
-        }else{
+
+            if (querystring.endDate === querystring.startDate) {
+                vm.dateRangeLabel = getDateRangeLabel("Selected Date");
+            }
+        } else {
             vm.endDate = new Date(Date.now()).toIsoDateString();
         }
-        vm.period = [vm.startDate, vm.endDate];
 
+        vm.period = [vm.startDate, vm.endDate];
 
         //functions
         vm.searchLogQuery = searchLogQuery;
         vm.findMessageTemplate = findMessageTemplate;
-        
-        function preFlightCheck(){
+
+        function preFlightCheck() {
             vm.loading = true;
             //Do our pre-flight check (to see if we can view logs)
             //IE the log file is NOT too big such as 1GB & crash the site
-            logViewerResource.canViewLogs(vm.startDate, vm.endDate).then(function(result){
+            logViewerResource.canViewLogs(vm.startDate, vm.endDate).then(function (result) {
                 vm.loading = false;
                 vm.canLoadLogs = result;
 
-                if(result){
+                if (result) {
                     //Can view logs - so initalise
                     init();
                 }
@@ -62,39 +69,39 @@
         function init() {
 
             vm.loading = true;
-            
+
             var savedSearches = logViewerResource.getSavedSearches().then(function (data) {
                 vm.searches = data;
             },
-            // fallback to some defaults if error from API response
-            function () {
-                vm.searches = [
-                    {
-                        "name": "Find all logs where the Level is NOT Verbose and NOT Debug",
-                        "query": "Not(@Level='Verbose') and Not(@Level='Debug')"
-                    },
-                    {
-                        "name": "Find all logs that has an exception property (Warning, Error & Critical with Exceptions)",
-                        "query": "Has(@Exception)"
-                    },
-                    {
-                        "name": "Find all logs that have the property 'Duration'",
-                        "query": "Has(Duration)"
-                    },
-                    {
-                        "name": "Find all logs that have the property 'Duration' and the duration is greater than 1000ms",
-                        "query": "Has(Duration) and Duration > 1000"
-                    },
-                    {
-                        "name": "Find all logs that are from the namespace 'Umbraco.Core'",
-                        "query": "StartsWith(SourceContext, 'Umbraco.Core')"
-                    },
-                    {
-                        "name": "Find all logs that use a specific log message template",
-                        "query": "@MessageTemplate = '[Timing {TimingId}] {EndMessage} ({TimingDuration}ms)'"
-                    }
-                ]
-            });
+                // fallback to some defaults if error from API response
+                function () {
+                    vm.searches = [
+                        {
+                            "name": "Find all logs where the Level is NOT Verbose and NOT Debug",
+                            "query": "Not(@Level='Verbose') and Not(@Level='Debug')"
+                        },
+                        {
+                            "name": "Find all logs that has an exception property (Warning, Error & Critical with Exceptions)",
+                            "query": "Has(@Exception)"
+                        },
+                        {
+                            "name": "Find all logs that have the property 'Duration'",
+                            "query": "Has(Duration)"
+                        },
+                        {
+                            "name": "Find all logs that have the property 'Duration' and the duration is greater than 1000ms",
+                            "query": "Has(Duration) and Duration > 1000"
+                        },
+                        {
+                            "name": "Find all logs that are from the namespace 'Umbraco.Core'",
+                            "query": "StartsWith(SourceContext, 'Umbraco.Core')"
+                        },
+                        {
+                            "name": "Find all logs that use a specific log message template",
+                            "query": "@MessageTemplate = '[Timing {TimingId}] {EndMessage} ({TimingDuration}ms)'"
+                        }
+                    ];
+                });
 
             var numOfErrors = logViewerResource.getNumberOfErrors(vm.startDate, vm.endDate).then(function (data) {
                 vm.numberOfErrors = data;
@@ -109,12 +116,12 @@
                 vm.logTypeData.push(data.Fatal);
             });
 
-            var commonMsgs = logViewerResource.getMessageTemplates(vm.startDate, vm.endDate).then(function(data){
+            var commonMsgs = logViewerResource.getMessageTemplates(vm.startDate, vm.endDate).then(function (data) {
                 vm.commonLogMessages = data;
             });
 
             //Set loading indicatior to false when these 3 queries complete
-            $q.all([savedSearches, numOfErrors, logCounts, commonMsgs]).then(function(data) {
+            $q.all([savedSearches, numOfErrors, logCounts, commonMsgs]).then(function (data) {
                 vm.loading = false;
             });
 
@@ -123,20 +130,21 @@
             });
         }
 
-        function searchLogQuery(logQuery){
-            $location.path("/settings/logViewer/search").search({lq: logQuery, startDate: vm.startDate, endDate: vm.endDate});
+        function searchLogQuery(logQuery) {
+            $location.path("/settings/logViewer/search").search({ lq: logQuery, startDate: vm.startDate, endDate: vm.endDate });
         }
 
-        function findMessageTemplate(template){
+        function findMessageTemplate(template) {
             var logQuery = "@MessageTemplate='" + template.MessageTemplate + "'";
             searchLogQuery(logQuery);
         }
 
-
-
-
-        preFlightCheck();
+        function getDateRangeLabel(suffix) {
+            return "Log Overview for " + suffix;
+        }
         
+        preFlightCheck();
+
         /////////////////////
 
         vm.config = {
@@ -147,20 +155,18 @@
             maxDate: "today",
             conjunction: " to "
         };
-        
-        vm.dateRangeChange = function(selectedDates, dateStr, instance) {
-            
-            if(selectedDates.length > 0){
-                vm.startDate = selectedDates[0].toIsoDateString();
-                vm.endDate = selectedDates[selectedDates.length-1].toIsoDateString(); // Take the last date as end
 
-                if(vm.startDate === vm.endDate){
-                    vm.period = [vm.startDate];
-                }else{
-                    vm.period = [vm.startDate, vm.endDate];
-                }
-                
-                preFlightCheck();
+        vm.dateRangeChange = function (selectedDates, dateStr, instance) {
+
+            if (selectedDates.length > 0) {
+
+                // Update view by re-requesting route with updated querystring.
+                // By doing this we make sure the URL matches the selected time period, aiding sharing the link.
+                // Also resolves a minor layout issue where the " to " conjunction between the selected dates
+                // is collapsed to a comma.
+                const startDate = selectedDates[0].toIsoDateString();
+                const endDate = selectedDates[selectedDates.length - 1].toIsoDateString(); // Take the last date as end
+                $location.path("/settings/logViewer/overview").search({ startDate: startDate, endDate: endDate });
             }
 
         }
diff --git a/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html b/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html
index 854bed755f..7648bbf162 100644
--- a/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html
@@ -3,7 +3,7 @@
     <umb-editor-view footer="false">
 
         <umb-editor-header
-            name="'Log Overview for Today'"
+            name="vm.dateRangeLabel"
             name-locked="true"
             hide-icon="true"
             hide-description="true"
@@ -74,11 +74,10 @@
                     <umb-box>
                         <umb-box-header title="Time Period"></umb-box-header>
 
-                        <umb-flatpickr
-                            class="datepicker"
-                            ng-model="vm.period"
-                            options="vm.config"
-                            on-close="vm.dateRangeChange(selectedDates, dateStr, instance)">
+                        <umb-flatpickr class="datepicker"
+                                       ng-model="vm.period"
+                                       options="vm.config"
+                                       on-close="vm.dateRangeChange(selectedDates, dateStr, instance)">
                         </umb-flatpickr>
                     </umb-box>
 
diff --git a/src/Umbraco.Web/Editors/LogViewerController.cs b/src/Umbraco.Web/Editors/LogViewerController.cs
index 79eb3bb312..d9fcfd108a 100644
--- a/src/Umbraco.Web/Editors/LogViewerController.cs
+++ b/src/Umbraco.Web/Editors/LogViewerController.cs
@@ -15,11 +15,11 @@ namespace Umbraco.Web.Editors
     [PluginController("UmbracoApi")]
     public class LogViewerController : UmbracoAuthorizedJsonController
     {
-        private ILogViewer _logViewer;
+        private readonly ILogViewer _logViewer;
 
         public LogViewerController(ILogViewer logViewer)
         {
-            _logViewer = logViewer;
+            _logViewer = logViewer ?? throw new ArgumentNullException(nameof(logViewer));
         }
 
         private bool CanViewLogs(LogTimePeriod logTimePeriod)
@@ -91,8 +91,6 @@ namespace Umbraco.Web.Editors
 
             var direction = orderDirection == "Descending" ? Direction.Descending : Direction.Ascending;
 
-
-
             return _logViewer.GetLogs(logTimePeriod, filterExpression: filterExpression, pageNumber: pageNumber, orderDirection: direction, logLevels: logLevels);
         }
 

From 015ad64e30c090a4ce4a63a5366b5f24481f96d6 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 5 Jul 2019 14:36:33 +1000
Subject: [PATCH 112/776] Updates the exception thrown during upgrade to
 provide some meaningful feedback to the user.

---
 .../Upgrade/V_8_0_0/PropertyEditorsMigration.cs   | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/PropertyEditorsMigration.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/PropertyEditorsMigration.cs
index 064ffc7228..dac62abb75 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/PropertyEditorsMigration.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/PropertyEditorsMigration.cs
@@ -30,7 +30,20 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
                     .Where<DataTypeDto>(x => x.EditorAlias == toAlias));
 
                 if (oldCount > 0)
-                    throw new InvalidOperationException($"Cannot rename datatype alias \"{fromAlias}\" to \"{toAlias}\" because the target alias is already used.");
+                {
+                    // If we throw it means that the upgrade will exit and cannot continue.
+                    // This will occur if a v7 site has the old "Obsolete" property editors that are already named with the `toAlias` name.
+                    // TODO: We should have an additional upgrade step when going from 7 -> 8 like we did with 6 -> 7 that shows a compatibility report,
+                    // this would include this check and then we can provide users with information on what they should do (i.e. before upgrading to v8 they will
+                    // need to migrate these old obsolete editors to non-obsolete editors)
+
+                    throw new InvalidOperationException(
+                        $"Cannot rename datatype alias \"{fromAlias}\" to \"{toAlias}\" because the target alias is already used." +
+                        $"This is generally because when upgrading from a v7 to v8 site, the v7 site contains Data Types that reference old and already Obsolete " +
+                        $"Property Editors. Before upgrading to v8, any Data Types using property editors that are named with the prefix '(Obsolete)' must be migrated " +
+                        $"to the non-obsolete v7 property editors of the same type.");
+                }
+                    
             }
 
             Database.Execute(Sql()

From 5ada85df29dee4793eff496d70e674b881c07e85 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Fri, 5 Jul 2019 12:11:03 +0200
Subject: [PATCH 113/776] Provide the correct assembly redirects

---
 build/NuSpecs/tools/Web.config.install.xdt | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/build/NuSpecs/tools/Web.config.install.xdt b/build/NuSpecs/tools/Web.config.install.xdt
index 4f8a1927a8..f0d194d341 100644
--- a/build/NuSpecs/tools/Web.config.install.xdt
+++ b/build/NuSpecs/tools/Web.config.install.xdt
@@ -346,7 +346,7 @@
         <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
             <dependentAssembly xdt:Transform="Insert">
                 <assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-1.4.9.5" newVersion="1.4.9.5" />
+                <bindingRedirect oldVersion="0.0.0.0-1.8.8.0" newVersion="1.8.8.0" />
             </dependentAssembly>
             <dependentAssembly xdt:Transform="Insert">
                 <assemblyIdentity name="AutoMapper" publicKeyToken="be96cd2c38ef1005" culture="neutral" />
@@ -358,11 +358,11 @@
             </dependentAssembly>
             <dependentAssembly xdt:Transform="Insert">
                 <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 xdt:Transform="Insert">
                 <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 xdt:Transform="Insert">
                 <assemblyIdentity name="System.Web.WebPages.Razor" publicKeyToken="31bf3856ad364e35" />
@@ -370,27 +370,27 @@
             </dependentAssembly>
             <dependentAssembly xdt:Transform="Insert">
                 <assemblyIdentity name="System.Web.Http" 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 xdt:Transform="Insert">
                 <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 xdt:Transform="Insert">
                 <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 xdt:Transform="Insert">
                 <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 xdt:Transform="Insert">
                 <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 xdt:Transform="Insert">
                 <assemblyIdentity name="System.Net.Http.Formatting" 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 xdt:Transform="Insert">
                 <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral"/>

From 1af43498d97ff588cc9636e7d7542de830b4f1f1 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sun, 7 Jul 2019 11:16:02 +0200
Subject: [PATCH 114/776] Make it possible to save a member without resetting
 the password

---
 .../src/views/member/member.edit.controller.js                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
index b2d91e2f66..7276bd9a86 100644
--- a/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
@@ -139,7 +139,7 @@ function MemberEditController($scope, $routeParams, $location, appState, memberR
 
             //anytime a user is changing a member's password without the oldPassword, we are in effect resetting it so we need to set that flag here
             var passwordProp = _.find(contentEditingHelper.getAllProps($scope.content), function (e) { return e.alias === '_umb_password' });
-            if (!passwordProp.value.reset) {
+            if (passwordProp && passwordProp.value && !passwordProp.value.reset) {
                 //so if the admin is not explicitly resetting the password, flag it for resetting if a new password is being entered
                 passwordProp.value.reset = !passwordProp.value.oldPassword && passwordProp.config.allowManuallyChangingPassword;
             }

From 80d7f1b2c99eb0332446e70170ebe78bbb44e160 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sun, 7 Jul 2019 11:36:26 +0200
Subject: [PATCH 115/776] Make it possible to save a member without resetting
 the password

---
 .../src/views/member/member.edit.controller.js                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
index 339358dbf2..eb99e46a1f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
@@ -133,7 +133,7 @@ function MemberEditController($scope, $routeParams, $location, $q, $window, appS
 
             //anytime a user is changing a member's password without the oldPassword, we are in effect resetting it so we need to set that flag here
             var passwordProp = _.find(contentEditingHelper.getAllProps($scope.content), function (e) { return e.alias === '_umb_password' });
-            if (!passwordProp.value.reset) {
+            if (passwordProp && passwordProp.value && !passwordProp.value.reset) {
                 //so if the admin is not explicitly resetting the password, flag it for resetting if a new password is being entered
                 passwordProp.value.reset = !passwordProp.value.oldPassword && passwordProp.config.allowManuallyChangingPassword;
             }

From 6473f600c732c4d0be2af96c0f424374cec8685f Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Mon, 8 Jul 2019 08:48:49 +0100
Subject: [PATCH 116/776] Remove last casting to LucenIndex

---
 src/Umbraco.Web/Editors/ExamineManagementController.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web/Editors/ExamineManagementController.cs b/src/Umbraco.Web/Editors/ExamineManagementController.cs
index 5f969cdd80..7c040ae508 100644
--- a/src/Umbraco.Web/Editors/ExamineManagementController.cs
+++ b/src/Umbraco.Web/Editors/ExamineManagementController.cs
@@ -85,7 +85,7 @@ namespace Umbraco.Web.Editors
             };
         }
 
-       
+
 
         /// <summary>
         /// Check if the index has been rebuilt
@@ -250,7 +250,7 @@ namespace Umbraco.Web.Editors
 
         private void Indexer_IndexOperationComplete(object sender, EventArgs e)
         {
-            var indexer = (LuceneIndex)sender;
+            var indexer = (IIndex)sender;
 
             _logger.Debug<ExamineManagementController>("Logging operation completed for index {IndexName}", indexer.Name);
 
@@ -259,7 +259,7 @@ namespace Umbraco.Web.Editors
 
             _logger
                 .Info<ExamineManagementController
-                >($"Rebuilding index '{indexer.Name}' done, {indexer.CommitCount} items committed (can differ from the number of items in the index)");
+                >($"Rebuilding index '{indexer.Name}' done.");
 
             var cacheKey = "temp_indexing_op_" + indexer.Name;
             _runtimeCache.Clear(cacheKey);

From a4749f201d33918c3b576a86cd1c54fdce9c9ab5 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 8 Jul 2019 23:03:20 +1000
Subject: [PATCH 117/776] Ensures luceneIndexer.WaitForIndexQueueOnShutdown is
 called even when not in MainDom

---
 src/Umbraco.Examine/ExamineExtensions.cs   |  4 ++-
 src/Umbraco.Web/Search/ExamineComponent.cs | 36 +++++++++++-----------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/Umbraco.Examine/ExamineExtensions.cs b/src/Umbraco.Examine/ExamineExtensions.cs
index 43a3ccc196..1b8033c458 100644
--- a/src/Umbraco.Examine/ExamineExtensions.cs
+++ b/src/Umbraco.Examine/ExamineExtensions.cs
@@ -77,7 +77,7 @@ namespace Umbraco.Examine
         /// <remarks>
         /// This is not thread safe, use with care
         /// </remarks>
-        internal static void UnlockLuceneIndexes(this IExamineManager examineManager, ILogger logger)
+        internal static void ConfigureLuceneIndexes(this IExamineManager examineManager, ILogger logger, bool disableExamineIndexing)
         {
             foreach (var luceneIndexer in examineManager.Indexes.OfType<LuceneIndex>())
             {
@@ -86,6 +86,8 @@ namespace Umbraco.Examine
                 //that could end up halting shutdown for a very long time causing overlapping appdomains and many other problems.
                 luceneIndexer.WaitForIndexQueueOnShutdown = false;
 
+                if (disableExamineIndexing) continue; //exit if not enabled, we don't need to unlock them if we're not maindom
+
                 //we should check if the index is locked ... it shouldn't be! We are using simple fs lock now and we are also ensuring that
                 //the indexes are not operational unless MainDom is true
                 var dir = luceneIndexer.GetLuceneDirectory();
diff --git a/src/Umbraco.Web/Search/ExamineComponent.cs b/src/Umbraco.Web/Search/ExamineComponent.cs
index 74b9e720b1..ed248a9e24 100644
--- a/src/Umbraco.Web/Search/ExamineComponent.cs
+++ b/src/Umbraco.Web/Search/ExamineComponent.cs
@@ -30,8 +30,9 @@ namespace Umbraco.Web.Search
         private readonly IValueSetBuilder<IMedia> _mediaValueSetBuilder;
         private readonly IValueSetBuilder<IMember> _memberValueSetBuilder;
         private static bool _disableExamineIndexing = false;
-        private static volatile bool _isConfigured = false;
-        private static readonly object IsConfiguredLocker = new object();
+        private static bool _isConfigured = false;
+        private static object _configuredInit = null;
+        private static object _isConfiguredLocker = new object();
         private readonly IScopeProvider _scopeProvider;
         private readonly ServiceContext _services;
         private static BackgroundTaskRunner<IBackgroundTask> _rebuildOnStartupRunner;
@@ -91,7 +92,7 @@ namespace Umbraco.Web.Search
 
             if (!examineShutdownRegistered)
             {
-                _logger.Debug<ExamineComponent>("Examine shutdown not registered, this AppDomain is not the MainDom, Examine will be disabled");
+                _logger.Info<ExamineComponent>("Examine shutdown not registered, this AppDomain is not the MainDom, Examine will be disabled");
 
                 //if we could not register the shutdown examine ourselves, it means we are not maindom! in this case all of examine should be disabled!
                 Suspendable.ExamineEvents.SuspendIndexers(_logger);
@@ -120,7 +121,7 @@ namespace Umbraco.Web.Search
             MediaCacheRefresher.CacheUpdated += MediaCacheRefresherUpdated;
             MemberCacheRefresher.CacheUpdated += MemberCacheRefresherUpdated;
 
-            EnsureUnlocked(_logger, _examineManager);
+            ConfigureIndexes(_logger, _examineManager);
 
             // TODO: Instead of waiting 5000 ms, we could add an event handler on to fulfilling the first request, then start?
             RebuildIndexes(_indexRebuilder, _logger, true, 5000);
@@ -161,25 +162,24 @@ namespace Umbraco.Web.Search
         }
 
         /// <summary>
-        /// Must be called to each index is unlocked before any indexing occurs
+        /// Called on startup to configure each index.
         /// </summary>
         /// <remarks>
         /// Indexing rebuilding can occur on a normal boot if the indexes are empty or on a cold boot by the database server messenger. Before
         /// either of these happens, we need to configure the indexes.
+        /// Configuring also ensure the indexes are not locked.
         /// </remarks>
-        private static void EnsureUnlocked(ILogger logger, IExamineManager examineManager)
+        private static void ConfigureIndexes(ILogger logger, IExamineManager examineManager)
         {
-            if (_disableExamineIndexing) return;
-            if (_isConfigured) return;
-
-            lock (IsConfiguredLocker)
-            {
-                //double check
-                if (_isConfigured) return;
-
-                _isConfigured = true;
-                examineManager.UnlockLuceneIndexes(logger);
-            }
+            LazyInitializer.EnsureInitialized(
+                ref _configuredInit,
+                ref _isConfigured,
+                ref _isConfiguredLocker,
+                () =>
+                {
+                    examineManager.ConfigureLuceneIndexes(logger, _disableExamineIndexing);
+                    return null;
+                });
         }
 
         #region Cache refresher updated event handlers
@@ -800,7 +800,7 @@ namespace Umbraco.Web.Search
                 if (_waitMilliseconds > 0)
                     Thread.Sleep(_waitMilliseconds);
 
-                EnsureUnlocked(_logger, _indexRebuilder.ExamineManager);
+                ConfigureIndexes(_logger, _indexRebuilder.ExamineManager);
                 _indexRebuilder.RebuildIndexes(_onlyEmptyIndexes);
             }
         }

From 686562909032fe95f618fd047f1297e7e087c108 Mon Sep 17 00:00:00 2001
From: Nathan Woulfe <nathan@nathanw.com.au>
Date: Tue, 4 Jun 2019 14:41:50 +1000
Subject: [PATCH 118/776] use position:sticky and IntersectionObserver instead
 of element cloning and position:fixed - much simpler.

---
 .../components/umbstickybar.directive.js      | 197 +++++++-----------
 1 file changed, 75 insertions(+), 122 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbstickybar.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbstickybar.directive.js
index 2f2df7c12b..912a122c91 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbstickybar.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbstickybar.directive.js
@@ -4,7 +4,7 @@
 @restrict A
 
 @description
-Use this directive make an element sticky and follow the page when scrolling.
+Use this directive make an element sticky and follow the page when scrolling. `umb-sticky-bar--active` class is applied when the element is stuck
 
 <h3>Markup example</h3>
 <pre>
@@ -12,140 +12,93 @@ Use this directive make an element sticky and follow the page when scrolling.
 
         <div
            class="my-sticky-bar"
-           umb-sticky-bar
-           scrollable-container=".container">
+           umb-sticky-bar>
         </div>
 
     </div>
 </pre>
 
-<h3>CSS example</h3>
-<pre>
-    .my-sticky-bar {
-        padding: 15px 0;
-        background: #000000;
-        position: relative;
-        top: 0;
-    }
-
-    .my-sticky-bar.-umb-sticky-bar {
-        top: 100px;
-    }
-</pre>
-
-@param {string} scrollableContainer Set the class (".element") or the id ("#element") of the scrollable container element.
 **/
 
 (function () {
     'use strict';
 
-    function StickyBarDirective($rootScope) {
+    function StickyBarDirective() {
+        
+        /**
+        Toggle `umb-sticky-bar--active` class on the sticky-bar element
+        **/        
+        function setClass(addClass, current) {
+            current.classList.toggle('umb-sticky-bar--active', addClass);
+        }
+        
+        /**
+        Inserts two elements in the umbStickyBar parent element
+        These are used by the IntersectionObserve to calculate scroll position
+        **/
+        function addSentinels(current) {
+            ['-top', '-bottom'].forEach(s => {
+                const sentinel = document.createElement('div');
+                sentinel.classList.add('umb-sticky-sentinel', s);
+                current.parentElement.appendChild(sentinel);                
+            });
+        }        
+
+        /**
+        Calls into setClass when the footer sentinel enters/exits the bottom of the container
+        Container is the parent element of the umbStickyBar element
+        **/
+        function observeFooter(current, container) {
+            const observer = new IntersectionObserver((records, observer) => {
+                let [target, rootBounds, intersected] 
+                    = [records[0].boundingClientRect, records[0].rootBounds, records[0].intersectionRatio === 1];                
+                
+                if (target.bottom > rootBounds.top && intersected) {
+                    setClass(true, current);
+                }
+                if (target.top < rootBounds.top && target.bottom < rootBounds.bottom) {
+                    setClass(false, current);
+                }                
+            }, {
+                threshold: [1],
+                root: container
+            });
+
+            observer.observe(current.parentElement.querySelector('.umb-sticky-sentinel.-bottom'));
+        }
+        
+        /**
+        Calls into setClass when the header sentinel enters/exits the top of the container
+        Container is the parent element of the umbStickyBar element
+        **/        
+        function observeHeader(current, container) {
+            const observer = new IntersectionObserver((records, observer) => {
+                let [target, rootBounds] = [records[0].boundingClientRect, records[0].rootBounds];                
+
+                if (target.bottom < rootBounds.top) {
+                    setClass(true, current);
+                }
+
+                if (target.bottom >= rootBounds.top && target.bottom < rootBounds.bottom) {
+                    setClass(false, current);
+                }
+            }, {
+                threshold: [0],
+                root: container
+            });
+            
+            observer.observe(current.parentElement.querySelector('.umb-sticky-sentinel.-top'));
+        }
 
         function link(scope, el, attr, ctrl) {
+            
+            let _el = el[0];           
+            let container = _el.closest('[data-element="editor-container"]');
+            
+            addSentinels(_el);
 
-            var bar = $(el);
-            var scrollableContainer = null;
-            var clonedBar = null;
-            var cloneIsMade = false;
-
-            function activate() {
-
-                if (bar.parents(".umb-property").length > 1) {
-                    bar.addClass("nested");
-                    return;
-                }
-
-                if (attr.scrollableContainer) {
-                    scrollableContainer = bar.closest(attr.scrollableContainer);
-                } else {
-                    scrollableContainer = $(window);
-                }
-
-                scrollableContainer.on('scroll.umbStickyBar', determineVisibility).trigger("scroll");
-                $(window).on('resize.umbStickyBar', determineVisibility);
-
-                scope.$on('$destroy', function () {
-                    scrollableContainer.off('.umbStickyBar');
-                    $(window).off('.umbStickyBar');
-                });
-
-            }
-
-            function determineVisibility() {
-
-                var barTop = bar[0].offsetTop;
-                var scrollTop = scrollableContainer.scrollTop();
-
-                if (scrollTop > barTop) {
-
-                    if (!cloneIsMade) {
-
-                        createClone();
-
-                        clonedBar.css({
-                            'visibility': 'visible'
-                        });
-
-                    } else {
-
-                        calculateSize();
-
-                    }
-
-                } else {
-
-                    if (cloneIsMade) {
-
-                        //remove cloned element (switched places with original on creation)
-                        bar.remove();
-                        bar = clonedBar;
-                        clonedBar = null;
-
-                        bar.removeClass('-umb-sticky-bar');
-                        bar.css({
-                            position: 'relative',
-                            'width': 'auto',
-                            'height': 'auto',
-                            'z-index': 'auto',
-                            'visibility': 'visible'
-                        });
-
-                        cloneIsMade = false;
-
-                    }
-
-                }
-
-            }
-
-            function calculateSize() {
-                var width = bar.innerWidth();
-                clonedBar.css({
-                    width: width + 10 // + 10 (5*2) because we need to add border to avoid seeing the shadow beneath. Look at the CSS.
-                });
-            }
-
-            function createClone() {
-                //switch place with cloned element, to keep binding intact
-                clonedBar = bar;
-                bar = clonedBar.clone();
-                clonedBar.after(bar);
-                clonedBar.addClass('-umb-sticky-bar');
-                clonedBar.css({
-                    'position': 'fixed',
-                    // if you change this z-index value, make sure the sticky editor sub headers do not 
-                    // clash with umb-dropdown (e.g. the content actions dropdown in content list view)
-                    'z-index': 99, 
-                    'visibility': 'hidden'
-                });
-
-                cloneIsMade = true;
-                calculateSize();
-
-            }
-
-            activate();
-
+            observeHeader(_el, container);
+            observeFooter(_el, container);            
         }
 
         var directive = {

From d17022d87dcdb6a6867be6caf2da5f7f36cec47b Mon Sep 17 00:00:00 2001
From: Nathan Woulfe <nathan@nathanw.com.au>
Date: Tue, 4 Jun 2019 14:42:04 +1000
Subject: [PATCH 119/776] make it look pretty

---
 .../subheader/umb-editor-sub-header.less      | 29 +++++++++++++++----
 .../src/less/property-editors.less            |  3 +-
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less b/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less
index 78cccac57a..6cf3598638 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less
@@ -32,15 +32,32 @@
     border-radius: 3px;
 }
 
-.umb-editor-sub-header.-umb-sticky-bar {
-    box-shadow: 0 6px 3px -3px rgba(0,0,0,.16);
+[umb-sticky-bar] {
     transition: box-shadow 240ms;
-    margin-top: 0;
+    margin-top: 0; 
     margin-bottom: 0;
-    top: calc(@appHeaderHeight + @editorHeaderHeight);
+    position:sticky;
+    z-index: 99;
     
-    .umb-editor--infinityMode & {
-        top: calc(@editorHeaderHeight);
+    &.umb-sticky-bar--active {
+        box-shadow: 0 6px 3px -3px rgba(0,0,0,.16);
+    }
+}
+
+.umb-sticky-sentinel {
+    position: absolute;
+    left: 0;
+    width: 100%;
+    pointer-events: none;
+    
+    &.-top {
+        top:0px;
+        height:1px;
+    }
+    
+    &.-bottom {        
+        bottom:50px;
+        height:10px;
     }
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
index 9e8dd37ab9..92351d09ca 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -5,6 +5,7 @@
 // --------------------------------------------------
 .umb-property-editor {
     width: 100%;
+    position:relative;
 }
 
 .umb-property-editor-tiny {
@@ -165,8 +166,6 @@
     .sp-replacer {
         display: inline-flex;
         margin-right: 18px;
-        border: solid 1px @gray-8;
-        border-radius: 3px;
     }
 
     label {

From 469054e9b34293f08cf6ef97ea131f916d324d88 Mon Sep 17 00:00:00 2001
From: Nathan Woulfe <nathan@nathanw.com.au>
Date: Tue, 4 Jun 2019 14:42:20 +1000
Subject: [PATCH 120/776] No longer need scrollable-container attribute

---
 .../views/components/editor/subheader/umb-editor-sub-header.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/subheader/umb-editor-sub-header.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/subheader/umb-editor-sub-header.html
index c385223baf..140931ec4b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/subheader/umb-editor-sub-header.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/subheader/umb-editor-sub-header.html
@@ -1,6 +1,5 @@
 <div
    class="umb-editor-sub-header umb-editor-sub-header--{{appearance}}"
    umb-sticky-bar
-   scrollable-container=".umb-editor-container"
    ng-transclude>
 </div>

From e92f68d04054ead39f10f12f270003d985d7a276 Mon Sep 17 00:00:00 2001
From: Nathan Woulfe <nathan@nathanw.com.au>
Date: Tue, 4 Jun 2019 14:55:12 +1000
Subject: [PATCH 121/776] improve variable naming

---
 .../directives/components/umbstickybar.directive.js       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbstickybar.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbstickybar.directive.js
index 912a122c91..9538930e0a 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbstickybar.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbstickybar.directive.js
@@ -92,13 +92,13 @@ Use this directive make an element sticky and follow the page when scrolling. `u
 
         function link(scope, el, attr, ctrl) {
             
-            let _el = el[0];           
+            let current = el[0];           
             let container = _el.closest('[data-element="editor-container"]');
             
-            addSentinels(_el);
+            addSentinels(current);
 
-            observeHeader(_el, container);
-            observeFooter(_el, container);            
+            observeHeader(current, container);
+            observeFooter(current, container);            
         }
 
         var directive = {

From 3144b51c91cc8843811a235e3b2161fc3f9b9f2a Mon Sep 17 00:00:00 2001
From: Nathan Woulfe <nathan@nathanw.com.au>
Date: Thu, 27 Jun 2019 18:58:39 +1000
Subject: [PATCH 122/776] fix behaviour on page load - don't add active class
 if sticky-bar is in viewport

---
 .../components/umbstickybar.directive.js      | 47 +++++++++++--------
 1 file changed, 28 insertions(+), 19 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbstickybar.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbstickybar.directive.js
index 9538930e0a..07e45ff0f7 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbstickybar.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbstickybar.directive.js
@@ -24,14 +24,24 @@ Use this directive make an element sticky and follow the page when scrolling. `u
     'use strict';
 
     function StickyBarDirective() {
-        
+
+        /**
+        On initial load, the intersector fires if the grid editor is in the viewport
+        This flag is used to suppress the setClass behaviour on the initial load
+        **/
+        var initial = true;
+
         /**
         Toggle `umb-sticky-bar--active` class on the sticky-bar element
-        **/        
+        **/
         function setClass(addClass, current) {
-            current.classList.toggle('umb-sticky-bar--active', addClass);
+            if (!initial) {
+                current.classList.toggle('umb-sticky-bar--active', addClass);
+            } else {
+                initial = false;
+            }
         }
-        
+
         /**
         Inserts two elements in the umbStickyBar parent element
         These are used by the IntersectionObserve to calculate scroll position
@@ -40,9 +50,9 @@ Use this directive make an element sticky and follow the page when scrolling. `u
             ['-top', '-bottom'].forEach(s => {
                 const sentinel = document.createElement('div');
                 sentinel.classList.add('umb-sticky-sentinel', s);
-                current.parentElement.appendChild(sentinel);                
+                current.parentElement.appendChild(sentinel);
             });
-        }        
+        }
 
         /**
         Calls into setClass when the footer sentinel enters/exits the bottom of the container
@@ -50,15 +60,14 @@ Use this directive make an element sticky and follow the page when scrolling. `u
         **/
         function observeFooter(current, container) {
             const observer = new IntersectionObserver((records, observer) => {
-                let [target, rootBounds, intersected] 
-                    = [records[0].boundingClientRect, records[0].rootBounds, records[0].intersectionRatio === 1];                
-                
+                let [target, rootBounds, intersected] = [records[0].boundingClientRect, records[0].rootBounds, records[0].intersectionRatio === 1];
+
                 if (target.bottom > rootBounds.top && intersected) {
                     setClass(true, current);
                 }
                 if (target.top < rootBounds.top && target.bottom < rootBounds.bottom) {
                     setClass(false, current);
-                }                
+                }
             }, {
                 threshold: [1],
                 root: container
@@ -66,14 +75,14 @@ Use this directive make an element sticky and follow the page when scrolling. `u
 
             observer.observe(current.parentElement.querySelector('.umb-sticky-sentinel.-bottom'));
         }
-        
+
         /**
         Calls into setClass when the header sentinel enters/exits the top of the container
         Container is the parent element of the umbStickyBar element
-        **/        
+        **/
         function observeHeader(current, container) {
             const observer = new IntersectionObserver((records, observer) => {
-                let [target, rootBounds] = [records[0].boundingClientRect, records[0].rootBounds];                
+                let [target, rootBounds] = [records[0].boundingClientRect, records[0].rootBounds];
 
                 if (target.bottom < rootBounds.top) {
                     setClass(true, current);
@@ -86,19 +95,19 @@ Use this directive make an element sticky and follow the page when scrolling. `u
                 threshold: [0],
                 root: container
             });
-            
+
             observer.observe(current.parentElement.querySelector('.umb-sticky-sentinel.-top'));
         }
 
         function link(scope, el, attr, ctrl) {
-            
-            let current = el[0];           
-            let container = _el.closest('[data-element="editor-container"]');
-            
+
+            let current = el[0];
+            let container = current.closest('[data-element="editor-container"]');
+
             addSentinels(current);
 
             observeHeader(current, container);
-            observeFooter(current, container);            
+            observeFooter(current, container);
         }
 
         var directive = {

From df896af47672b37b70526492e197c98077ce7d1e Mon Sep 17 00:00:00 2001
From: Claus <claus@umbraco.com>
Date: Wed, 10 Jul 2019 12:58:15 +0200
Subject: [PATCH 123/776] adding build targets package.

---
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 2 ++
 src/Umbraco.Web.UI/packages.config       | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index a0624a2dd7..646b86f665 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
+  <Import Project="..\packages\MSBuild.Microsoft.VisualStudio.Web.targets.14.0.0.3\build\MSBuild.Microsoft.VisualStudio.Web.targets.props" Condition="Exists('..\packages\MSBuild.Microsoft.VisualStudio.Web.targets.14.0.0.3\build\MSBuild.Microsoft.VisualStudio.Web.targets.props')" />
   <Import Project="..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
   <Import Project="..\packages\Microsoft.Net.Compilers.1.3.2\build\Microsoft.Net.Compilers.props" Condition="Exists('..\packages\Microsoft.Net.Compilers.1.3.2\build\Microsoft.Net.Compilers.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
@@ -1088,5 +1089,6 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\Microsoft.Net.Compilers.1.3.2\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Net.Compilers.1.3.2\build\Microsoft.Net.Compilers.props'))" />
     <Error Condition="!Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
+    <Error Condition="!Exists('..\packages\MSBuild.Microsoft.VisualStudio.Web.targets.14.0.0.3\build\MSBuild.Microsoft.VisualStudio.Web.targets.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSBuild.Microsoft.VisualStudio.Web.targets.14.0.0.3\build\MSBuild.Microsoft.VisualStudio.Web.targets.props'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/packages.config b/src/Umbraco.Web.UI/packages.config
index 18cbfdb042..a8271c1370 100644
--- a/src/Umbraco.Web.UI/packages.config
+++ b/src/Umbraco.Web.UI/packages.config
@@ -32,6 +32,7 @@
   <package id="Microsoft.Owin.Security.OAuth" 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="MSBuild.Microsoft.VisualStudio.Web.targets" version="14.0.0.3" targetFramework="net452" />
   <package id="MySql.Data" version="6.9.9" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net452" />
   <package id="Owin" version="1.0" targetFramework="net45" />

From 39bd18ec1a7bcd5449753d737af46b0203b42792 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Thu, 11 Jul 2019 10:45:41 +0100
Subject: [PATCH 124/776] At some point we have upgraded
 Serilog.Filters.Expressions package & the signature/method name got changed
 to ByIncludingOnly()

---
 src/Umbraco.Web.UI/config/serilog.user.Release.config | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI/config/serilog.user.Release.config b/src/Umbraco.Web.UI/config/serilog.user.Release.config
index 24e5e4e4be..8f207406e3 100644
--- a/src/Umbraco.Web.UI/config/serilog.user.Release.config
+++ b/src/Umbraco.Web.UI/config/serilog.user.Release.config
@@ -26,12 +26,13 @@
         <add key="serilog:write-to:File.restrictedToMinimumLevel" value="Debug" />
         <add key="serilog:write-to:File.retainedFileCountLimit" value="32" />--> <!-- Number of log files to keep (or remove value to keep all files) -->
         <!--<add key="serilog:write-to:File.rollingInterval" value="Day" />--> <!-- Create a new log file every Minute/Hour/Day/Month/Year/infinite -->
+        <!--<add key="serilog:write-to:File.outputTemplate" value="{Timestamp:yyyy-MM-dd HH:mm:ss,fff} [P{ProcessId}/D{AppDomainId}/T{ThreadId}] {Log4NetLevel}  {SourceContext} - {Message:lj}{NewLine}{Exception}" /> -->
 
         <!-- Filters all above sink's to use this expression -->
         <!-- Common use case is to include SourceType starting with your own namespace -->
         <!--
         <add key="serilog:using:FilterExpressions" value="Serilog.Filters.Expressions" />
-        <add key="serilog:filter:ByIncluding.expression" value="StartsWith(SourceContext, 'Umbraco.Core')" />
+        <add key="serilog:filter:ByIncludingOnly.expression" value="StartsWith(SourceContext, 'Umbraco.Core')" />
         -->
 
     </appSettings>

From 943b54dcf7713617c529c10edd115d65e0078f1b Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 11 Jul 2019 11:55:01 +0200
Subject: [PATCH 125/776] Update 1_Bug.md

---
 .github/ISSUE_TEMPLATE/1_Bug.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/1_Bug.md b/.github/ISSUE_TEMPLATE/1_Bug.md
index a1e33e3854..619452f700 100644
--- a/.github/ISSUE_TEMPLATE/1_Bug.md
+++ b/.github/ISSUE_TEMPLATE/1_Bug.md
@@ -12,7 +12,7 @@ thoroughly. Then, proceed by filling out the rest of the details in the issue
 template below. The more details you can give us, the easier it will be for us
 to determine the cause of a problem.
 
-See: https://github.com/umbraco/Umbraco-CMS/blob/dev-v7/.github/CONTRIBUTING.md
+See: https://github.com/umbraco/Umbraco-CMS/blob/v8/dev/.github/CONTRIBUTING.md
 
 -->
 

From 03a4b75176052cc15afe81e26b2b8f307c888e75 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Thu, 11 Jul 2019 15:11:37 +0100
Subject: [PATCH 126/776] Ran .\build SetUmbracoVersion 8.1.1 to bump version

---
 src/SolutionInfo.cs                      | 4 ++--
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index 9ed398d52f..841e054aee 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -18,5 +18,5 @@ using System.Resources;
 [assembly: AssemblyVersion("8.0.0")]
 
 // these are FYI and changed automatically
-[assembly: AssemblyFileVersion("8.1.0")]
-[assembly: AssemblyInformationalVersion("8.1.0")]
+[assembly: AssemblyFileVersion("8.1.1")]
+[assembly: AssemblyInformationalVersion("8.1.1")]
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index b27f6aa335..e58f44e1ae 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -345,9 +345,9 @@
         <WebProjectProperties>
           <UseIIS>False</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>8100</DevelopmentServerPort>
+          <DevelopmentServerPort>8110</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:8100</IISUrl>
+          <IISUrl>http://localhost:8110</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

From 89bb94aa1ae542b17bf4f3672f0f00e69b37e5bc Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 12 Jul 2019 10:57:26 +1000
Subject: [PATCH 127/776] Fixes issue during upgrade where umbraco can't clear
 cdf log files

---
 .../JavaScript/ClientDependencyConfiguration.cs   | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web/JavaScript/ClientDependencyConfiguration.cs b/src/Umbraco.Web/JavaScript/ClientDependencyConfiguration.cs
index 777786675f..2bf069b06d 100644
--- a/src/Umbraco.Web/JavaScript/ClientDependencyConfiguration.cs
+++ b/src/Umbraco.Web/JavaScript/ClientDependencyConfiguration.cs
@@ -106,8 +106,10 @@ namespace Umbraco.Web.JavaScript
             }
 
             try
-            {
-                var fullPath = currentHttpContext.Server.MapPath(XmlFileMapper.FileMapDefaultFolder);
+            {               
+                var fullPath = XmlFileMapper.FileMapDefaultFolder.StartsWith("~/")
+                    ? currentHttpContext.Server.MapPath(XmlFileMapper.FileMapDefaultFolder)
+                    : XmlFileMapper.FileMapDefaultFolder;
                 if (fullPath != null)
                 {
                     cdfTempDirectories.Add(fullPath);
@@ -122,13 +124,12 @@ namespace Umbraco.Web.JavaScript
             var success = true;
             foreach (var directory in cdfTempDirectories)
             {
-                var directoryInfo = new DirectoryInfo(directory);
-                if (directoryInfo.Exists == false)
-                    continue;
-
                 try
                 {
-                    directoryInfo.Delete(true);
+                    if (!Directory.Exists(directory))
+                        continue;
+
+                    Directory.Delete(directory, true);
                 }
                 catch (Exception ex)
                 {

From 1d49c8626ec40519a19764959b18efb2868d8f61 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 12 Jul 2019 11:23:36 +1000
Subject: [PATCH 128/776] Revert "V8: Don't show multiple open menus (take two)
 (#5609)"

This reverts commit 9ce996cbba49199423f4e79e223497d5c3c8cd4f.
---
 .../components/events/events.directive.js      | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/events/events.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/events/events.directive.js
index 47e6818466..15e74bbd90 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/events/events.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/events/events.directive.js
@@ -101,14 +101,14 @@ angular.module('umbraco.directives')
             var eventBindings = [];
 
             function oneTimeClick(event) {
-                // ignore clicks on button groups toggles (i.e. the save and publish button)
-                var parents = $(event.target).closest("[data-element='button-group-toggle']");
-                if (parents.length > 0) {
-                    return;
-                }
+                var el = event.target.nodeName;
+
+                //ignore link and button clicks
+                var els = ["INPUT", "A", "BUTTON"];
+                if (els.indexOf(el) >= 0) { return; }
 
                 // ignore clicks on new overlay
-                parents = $(event.target).parents(".umb-overlay,.umb-tour");
+                var parents = $(event.target).parents("a,button,.umb-overlay,.umb-tour");
                 if (parents.length > 0) {
                     return;
                 }
@@ -131,12 +131,6 @@ angular.module('umbraco.directives')
                     return;
                 }
 
-                // ignore clicks on dialog actions
-                var actions = $(event.target).parents(".umb-action");
-                if (actions.length === 1) {
-                    return;
-                }
-
                 //ignore clicks inside this element
                 if ($(element).has($(event.target)).length > 0) {
                     return;

From 2252db0d55ae0c7f4ddba19bde6f408dbfb9eb93 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 12 Jul 2019 13:40:21 +1000
Subject: [PATCH 129/776] Fixes 5822 by reinstating optional method overloads
 of loadBaseType

---
 src/Umbraco.Core/Services/EntityService.cs    | 28 +++++++++++++++++++
 src/Umbraco.Core/Services/IEntityService.cs   | 26 ++++++++++++++++-
 src/Umbraco.Core/Services/IRelationService.cs | 27 ++++++++++++++++++
 src/Umbraco.Core/Services/RelationService.cs  | 27 ++++++++++++++++++
 4 files changed, 107 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Services/EntityService.cs b/src/Umbraco.Core/Services/EntityService.cs
index f4b1b71732..84f5e2d9fd 100644
--- a/src/Umbraco.Core/Services/EntityService.cs
+++ b/src/Umbraco.Core/Services/EntityService.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Linq.Expressions;
 using Umbraco.Core.CodeAnnotations;
@@ -717,5 +718,32 @@ namespace Umbraco.Core.Services
             }
             return node.NodeId;
         }
+
+        #region Obsolete - only here for compat
+
+        [Obsolete("Use the overload that doesn't specify loadBaseType instead, loadBaseType will not affect any results")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public IUmbracoEntity GetByKey(Guid key, bool loadBaseType = true) => GetByKey(key);
+
+        [Obsolete("Use the overload that doesn't specify loadBaseType instead, loadBaseType will not affect any results")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public IUmbracoEntity Get(int id, bool loadBaseType = true) => Get(id);
+
+        [Obsolete("Use the overload that doesn't specify loadBaseType instead, loadBaseType will not affect any results")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public IUmbracoEntity GetByKey(Guid key, UmbracoObjectTypes umbracoObjectType, bool loadBaseType = true) => GetByKey(key, umbracoObjectType);
+
+        [Obsolete("Use the overload that doesn't specify loadBaseType instead, loadBaseType will not affect any results")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public IUmbracoEntity GetByKey<T>(Guid key, bool loadBaseType = true) where T : IUmbracoEntity => GetByKey<T>(key);
+
+        [Obsolete("Use the overload that doesn't specify loadBaseType instead, loadBaseType will not affect any results")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public IUmbracoEntity Get(int id, UmbracoObjectTypes umbracoObjectType, bool loadBaseType = true) => Get(id, umbracoObjectType);
+
+        [Obsolete("Use the overload that doesn't specify loadBaseType instead, loadBaseType will not affect any results")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public IUmbracoEntity Get<T>(int id, bool loadBaseType = true) where T : IUmbracoEntity => Get<T>(id);
+        #endregion
     }
 }
diff --git a/src/Umbraco.Core/Services/IEntityService.cs b/src/Umbraco.Core/Services/IEntityService.cs
index a6a2254138..a0c7363c60 100644
--- a/src/Umbraco.Core/Services/IEntityService.cs
+++ b/src/Umbraco.Core/Services/IEntityService.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.EntityBase;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
@@ -55,6 +56,10 @@ namespace Umbraco.Core.Services
         /// <returns>An <see cref="IUmbracoEntity"/></returns>
         IUmbracoEntity GetByKey(Guid key);
 
+        [Obsolete("Use the overload that doesn't specify loadBaseType instead, loadBaseType will not affect any results")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        IUmbracoEntity GetByKey(Guid key, bool loadBaseType = true);
+
         /// <summary>
         /// Gets an UmbracoEntity by its Id, and optionally loads the complete object graph.
         /// </summary>
@@ -62,9 +67,13 @@ namespace Umbraco.Core.Services
         /// By default this will load the base type <see cref="IUmbracoEntity"/> with a minimum set of properties.
         /// </returns>
         /// <param name="id">Id of the object to retrieve</param>
-       /// <returns>An <see cref="IUmbracoEntity"/></returns>
+        /// <returns>An <see cref="IUmbracoEntity"/></returns>
         IUmbracoEntity Get(int id);
 
+        [Obsolete("Use the overload that doesn't specify loadBaseType instead, loadBaseType will not affect any results")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        IUmbracoEntity Get(int id, bool loadBaseType = true);
+
         /// <summary>
         /// Gets an UmbracoEntity by its Id and UmbracoObjectType, and optionally loads the complete object graph.
         /// </summary>
@@ -76,6 +85,14 @@ namespace Umbraco.Core.Services
         /// <returns>An <see cref="IUmbracoEntity"/></returns>
         IUmbracoEntity GetByKey(Guid key, UmbracoObjectTypes umbracoObjectType);
 
+        [Obsolete("Use the overload that doesn't specify loadBaseType instead, loadBaseType will not affect any results")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        IUmbracoEntity GetByKey(Guid key, UmbracoObjectTypes umbracoObjectType, bool loadBaseType = true);
+
+        [Obsolete("Use the overload that doesn't specify loadBaseType instead, loadBaseType will not affect any results")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        IUmbracoEntity GetByKey<T>(Guid key, bool loadBaseType = true) where T : IUmbracoEntity;
+
         /// <summary>
         /// Gets an UmbracoEntity by its Id and UmbracoObjectType, and optionally loads the complete object graph.
         /// </summary>
@@ -87,6 +104,9 @@ namespace Umbraco.Core.Services
         /// <returns>An <see cref="IUmbracoEntity"/></returns>
         IUmbracoEntity Get(int id, UmbracoObjectTypes umbracoObjectType);
 
+        [Obsolete("Use the overload that doesn't specify loadBaseType instead, loadBaseType will not affect any results")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        IUmbracoEntity Get(int id, UmbracoObjectTypes umbracoObjectType, bool loadBaseType = true);
 
         /// <summary>
         /// Gets an UmbracoEntity by its Id and specified Type. Optionally loads the complete object graph.
@@ -99,6 +119,10 @@ namespace Umbraco.Core.Services
         /// <returns>An <see cref="IUmbracoEntity"/></returns>
         IUmbracoEntity Get<T>(int id) where T : IUmbracoEntity;
 
+        [Obsolete("Use the overload that doesn't specify loadBaseType instead, loadBaseType will not affect any results")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        IUmbracoEntity Get<T>(int id, bool loadBaseType = true) where T : IUmbracoEntity;
+
         /// <summary>
         /// Gets the parent of entity by its id
         /// </summary>
diff --git a/src/Umbraco.Core/Services/IRelationService.cs b/src/Umbraco.Core/Services/IRelationService.cs
index b5ca9ee019..819952b697 100644
--- a/src/Umbraco.Core/Services/IRelationService.cs
+++ b/src/Umbraco.Core/Services/IRelationService.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.EntityBase;
 
@@ -145,6 +146,10 @@ namespace Umbraco.Core.Services
         /// <returns>An <see cref="IUmbracoEntity"/></returns>
         IUmbracoEntity GetChildEntityFromRelation(IRelation relation);
 
+        [Obsolete("Use the overload that doesn't specify loadBaseType instead, loadBaseType will not affect any results")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        IUmbracoEntity GetChildEntityFromRelation(IRelation relation, bool loadBaseType = false);
+
         /// <summary>
         /// Gets the Parent object from a Relation as an <see cref="IUmbracoEntity"/>
         /// </summary>
@@ -152,6 +157,10 @@ namespace Umbraco.Core.Services
         /// <returns>An <see cref="IUmbracoEntity"/></returns>
         IUmbracoEntity GetParentEntityFromRelation(IRelation relation);
 
+        [Obsolete("Use the overload that doesn't specify loadBaseType instead, loadBaseType will not affect any results")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        IUmbracoEntity GetParentEntityFromRelation(IRelation relation, bool loadBaseType = false);
+
         /// <summary>
         /// Gets the Parent and Child objects from a Relation as a <see cref="Tuple"/>"/> with <see cref="IUmbracoEntity"/>.
         /// </summary>
@@ -159,6 +168,10 @@ namespace Umbraco.Core.Services
         /// <returns>Returns a Tuple with Parent (item1) and Child (item2)</returns>
         Tuple<IUmbracoEntity, IUmbracoEntity> GetEntitiesFromRelation(IRelation relation);
 
+        [Obsolete("Use the overload that doesn't specify loadBaseType instead, loadBaseType will not affect any results")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        Tuple<IUmbracoEntity, IUmbracoEntity> GetEntitiesFromRelation(IRelation relation, bool loadBaseType = false);
+
         /// <summary>
         /// Gets the Child objects from a list of Relations as a list of <see cref="IUmbracoEntity"/> objects.
         /// </summary>
@@ -166,6 +179,10 @@ namespace Umbraco.Core.Services
         /// <returns>An enumerable list of <see cref="IUmbracoEntity"/></returns>
         IEnumerable<IUmbracoEntity> GetChildEntitiesFromRelations(IEnumerable<IRelation> relations);
 
+        [Obsolete("Use the overload that doesn't specify loadBaseType instead, loadBaseType will not affect any results")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        IEnumerable<IUmbracoEntity> GetChildEntitiesFromRelations(IEnumerable<IRelation> relations, bool loadBaseType = false);
+
         /// <summary>
         /// Gets the Parent objects from a list of Relations as a list of <see cref="IUmbracoEntity"/> objects.
         /// </summary>
@@ -173,6 +190,10 @@ namespace Umbraco.Core.Services
         /// <returns>An enumerable list of <see cref="IUmbracoEntity"/></returns>
         IEnumerable<IUmbracoEntity> GetParentEntitiesFromRelations(IEnumerable<IRelation> relations);
 
+        [Obsolete("Use the overload that doesn't specify loadBaseType instead, loadBaseType will not affect any results")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        IEnumerable<IUmbracoEntity> GetParentEntitiesFromRelations(IEnumerable<IRelation> relations, bool loadBaseType = false);
+
         /// <summary>
         /// Gets the Parent and Child objects from a list of Relations as a list of <see cref="IUmbracoEntity"/> objects.
         /// </summary>
@@ -181,6 +202,12 @@ namespace Umbraco.Core.Services
         IEnumerable<Tuple<IUmbracoEntity, IUmbracoEntity>> GetEntitiesFromRelations(
             IEnumerable<IRelation> relations);
 
+        [Obsolete("Use the overload that doesn't specify loadBaseType instead, loadBaseType will not affect any results")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        IEnumerable<Tuple<IUmbracoEntity, IUmbracoEntity>> GetEntitiesFromRelations(
+            IEnumerable<IRelation> relations,
+            bool loadBaseType = false);
+
         /// <summary>
         /// Relates two objects by their entity Ids.
         /// </summary>
diff --git a/src/Umbraco.Core/Services/RelationService.cs b/src/Umbraco.Core/Services/RelationService.cs
index a940096ded..7ddd2ecf12 100644
--- a/src/Umbraco.Core/Services/RelationService.cs
+++ b/src/Umbraco.Core/Services/RelationService.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using Umbraco.Core.Events;
 using Umbraco.Core.Logging;
@@ -736,5 +737,31 @@ namespace Umbraco.Core.Services
         /// </summary>
         public static event TypedEventHandler<IRelationService, SaveEventArgs<IRelationType>> SavedRelationType;
         #endregion
+
+        #region Obsolete - only here for compat
+        [Obsolete("Use the overload that doesn't specify loadBaseType instead, loadBaseType will not affect any results")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public IUmbracoEntity GetChildEntityFromRelation(IRelation relation, bool loadBaseType = false) => GetChildEntityFromRelation(relation);
+
+        [Obsolete("Use the overload that doesn't specify loadBaseType instead, loadBaseType will not affect any results")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public IUmbracoEntity GetParentEntityFromRelation(IRelation relation, bool loadBaseType = false) => GetParentEntityFromRelation(relation);
+
+        [Obsolete("Use the overload that doesn't specify loadBaseType instead, loadBaseType will not affect any results")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public Tuple<IUmbracoEntity, IUmbracoEntity> GetEntitiesFromRelation(IRelation relation, bool loadBaseType = false) => GetEntitiesFromRelation(relation);
+
+        [Obsolete("Use the overload that doesn't specify loadBaseType instead, loadBaseType will not affect any results")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public IEnumerable<IUmbracoEntity> GetChildEntitiesFromRelations(IEnumerable<IRelation> relations, bool loadBaseType = false) => GetChildEntitiesFromRelations(relations);
+
+        [Obsolete("Use the overload that doesn't specify loadBaseType instead, loadBaseType will not affect any results")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public IEnumerable<IUmbracoEntity> GetParentEntitiesFromRelations(IEnumerable<IRelation> relations, bool loadBaseType = false) => GetParentEntitiesFromRelations(relations);
+
+        [Obsolete("Use the overload that doesn't specify loadBaseType instead, loadBaseType will not affect any results")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public IEnumerable<Tuple<IUmbracoEntity, IUmbracoEntity>> GetEntitiesFromRelations(IEnumerable<IRelation> relations, bool loadBaseType = false) => GetEntitiesFromRelations(relations);
+        #endregion
     }
 }

From cf49e6160a691e1646cbebc139950f03b554dffe Mon Sep 17 00:00:00 2001
From: Nathan Woulfe <nathan@nathanw.com.au>
Date: Fri, 12 Jul 2019 14:20:28 +1000
Subject: [PATCH 130/776] critical => fatal

---
 src/Umbraco.Web.UI/config/logviewer.searches.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI/config/logviewer.searches.config.js b/src/Umbraco.Web.UI/config/logviewer.searches.config.js
index 25ee9b2242..345fe23764 100644
--- a/src/Umbraco.Web.UI/config/logviewer.searches.config.js
+++ b/src/Umbraco.Web.UI/config/logviewer.searches.config.js
@@ -4,7 +4,7 @@
     "query": "Not(@Level='Verbose') and Not(@Level='Debug')"
   },
   {
-    "name": "Find all logs that has an exception property (Warning, Error & Critical with Exceptions)",
+    "name": "Find all logs that has an exception property (Warning, Error & Fatal with Exceptions)",
     "query": "Has(@Exception)"
   },
   {

From 3c2a92d3b630bdaf23ce20331b2501c21820adb0 Mon Sep 17 00:00:00 2001
From: Nathan Woulfe <nathan@nathanw.com.au>
Date: Fri, 12 Jul 2019 14:21:28 +1000
Subject: [PATCH 131/776] map log values into logtypedata array - removes need
 to add these in the correct order.

---
 .../views/logviewer/overview.controller.js    | 82 +++++++++++--------
 1 file changed, 47 insertions(+), 35 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.controller.js b/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.controller.js
index 830a9f5c39..86d72feffd 100644
--- a/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.controller.js
@@ -71,37 +71,37 @@
             vm.loading = true;
 
             var savedSearches = logViewerResource.getSavedSearches().then(function (data) {
-                vm.searches = data;
-            },
-            // fallback to some defaults if error from API response
-            function () {
-                vm.searches = [
-                    {
-                        "name": "Find all logs where the Level is NOT Verbose and NOT Debug",
-                        "query": "Not(@Level='Verbose') and Not(@Level='Debug')"
+                    vm.searches = data;
+                },
+                // fallback to some defaults if error from API response
+                function () {
+                    vm.searches = [
+                        {
+                            "name": "Find all logs where the Level is NOT Verbose and NOT Debug",
+                            "query": "Not(@Level='Verbose') and Not(@Level='Debug')"
                     },
-                    {
-                        "name": "Find all logs that has an exception property (Warning, Error & Fatal with Exceptions)",
-                        "query": "Has(@Exception)"
+                        {
+                            "name": "Find all logs that has an exception property (Warning, Error & Fatal with Exceptions)",
+                            "query": "Has(@Exception)"
                     },
-                    {
-                        "name": "Find all logs that have the property 'Duration'",
-                        "query": "Has(Duration)"
+                        {
+                            "name": "Find all logs that have the property 'Duration'",
+                            "query": "Has(Duration)"
                     },
-                    {
-                        "name": "Find all logs that have the property 'Duration' and the duration is greater than 1000ms",
-                        "query": "Has(Duration) and Duration > 1000"
+                        {
+                            "name": "Find all logs that have the property 'Duration' and the duration is greater than 1000ms",
+                            "query": "Has(Duration) and Duration > 1000"
                     },
-                    {
-                        "name": "Find all logs that are from the namespace 'Umbraco.Core'",
-                        "query": "StartsWith(SourceContext, 'Umbraco.Core')"
+                        {
+                            "name": "Find all logs that are from the namespace 'Umbraco.Core'",
+                            "query": "StartsWith(SourceContext, 'Umbraco.Core')"
                     },
-                    {
-                        "name": "Find all logs that use a specific log message template",
-                        "query": "@MessageTemplate = '[Timing {TimingId}] {EndMessage} ({TimingDuration}ms)'"
+                        {
+                            "name": "Find all logs that use a specific log message template",
+                            "query": "@MessageTemplate = '[Timing {TimingId}] {EndMessage} ({TimingDuration}ms)'"
                     }
                 ]
-            });
+                });
 
             var numOfErrors = logViewerResource.getNumberOfErrors(vm.startDate, vm.endDate).then(function (data) {
                 vm.numberOfErrors = data;
@@ -109,11 +109,13 @@
 
             var logCounts = logViewerResource.getLogLevelCounts(vm.startDate, vm.endDate).then(function (data) {
                 vm.logTypeData = [];
-                vm.logTypeData.push(data.Information);
-                vm.logTypeData.push(data.Debug);
-                vm.logTypeData.push(data.Warning);
-                vm.logTypeData.push(data.Error);
-                vm.logTypeData.push(data.Fatal);
+
+                for (let [key, value] of Object.entries(data)) {
+                    const index = vm.logTypeLabels.findIndex(x => key.startsWith(x));
+                    if (index > -1 && index < vm.logTypeData.length) {
+                        vm.logTypeData[index] = value;
+                    }                
+                }
             });
 
             var commonMsgs = logViewerResource.getMessageTemplates(vm.startDate, vm.endDate).then(function (data) {
@@ -121,17 +123,24 @@
             });
 
             //Set loading indicator to false when these 3 queries complete
-            $q.all([savedSearches, numOfErrors, logCounts, commonMsgs]).then(function() {
+            $q.all([savedSearches, numOfErrors, logCounts, commonMsgs]).then(function () {
                 vm.loading = false;
             });
-            
+
             $timeout(function () {
-                navigationService.syncTree({ tree: "logViewer", path: "-1" });
+                navigationService.syncTree({
+                    tree: "logViewer",
+                    path: "-1"
+                });
             });
         }
 
         function searchLogQuery(logQuery) {
-            $location.path("/settings/logViewer/search").search({ lq: logQuery, startDate: vm.startDate, endDate: vm.endDate });
+            $location.path("/settings/logViewer/search").search({
+                lq: logQuery,
+                startDate: vm.startDate,
+                endDate: vm.endDate
+            });
         }
 
         function findMessageTemplate(template) {
@@ -142,7 +151,7 @@
         function getDateRangeLabel(suffix) {
             return "Log Overview for " + suffix;
         }
-        
+
         preFlightCheck();
 
         /////////////////////
@@ -166,7 +175,10 @@
                 // is collapsed to a comma.
                 const startDate = selectedDates[0].toIsoDateString();
                 const endDate = selectedDates[selectedDates.length - 1].toIsoDateString(); // Take the last date as end
-                $location.path("/settings/logViewer/overview").search({ startDate: startDate, endDate: endDate });
+                $location.path("/settings/logViewer/overview").search({
+                    startDate: startDate,
+                    endDate: endDate
+                });
             }
 
         }

From d31e71a838abbbe5391049ad9cfc331ec31e895b Mon Sep 17 00:00:00 2001
From: skttl <sk@ecreo.dk>
Date: Fri, 12 Jul 2019 07:33:17 +0200
Subject: [PATCH 132/776] changes innerjoin to left join, to allow folders in
 sql query

---
 src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs b/src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
index 7b10b19e1e..c8fdd8da57 100644
--- a/src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
@@ -370,7 +370,7 @@ namespace Umbraco.Core.Persistence.Repositories
 
                 if (isMedia)
                 {
-                    entitySql.InnerJoin("cmsMedia media").On("media.nodeId = umbracoNode.id");
+                    entitySql.LeftJoin("cmsMedia media").On("media.nodeId = umbracoNode.id");
                 }
 
                 entitySql.LeftJoin("cmsContentType contenttype").On("contenttype.nodeId = content.contentType");

From 59bf24c46110730ff59b070e47545316f9fb48a0 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Fri, 12 Jul 2019 11:22:31 +0200
Subject: [PATCH 133/776] Added null checks when *.dataTypeId is used

---
 .../src/common/resources/entity.resource.js   |  4 +++-
 .../common/dialogs/linkpicker.controller.js   |  6 +++++-
 .../linkpicker/linkpicker.controller.js       | 15 ++++++++++++--
 .../mediaPicker/mediapicker.controller.js     | 20 ++++++++++++++++---
 .../treepicker/treepicker.controller.js       |  7 ++++++-
 .../contentpicker/contentpicker.controller.js |  7 ++++++-
 .../grid/editors/media.controller.js          |  7 ++++++-
 .../grid/editors/rte.controller.js            | 14 +++++++++++--
 .../mediapicker/mediapicker.controller.js     |  6 +++++-
 .../multiurlpicker.controller.js              |  7 ++++++-
 .../relatedlinks/relatedlinks.controller.js   | 14 +++++++++++--
 .../propertyeditors/rte/rte.controller.js     | 13 ++++++++++--
 12 files changed, 102 insertions(+), 18 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
index c85a85bb57..4e164cacf6 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
@@ -409,7 +409,8 @@ function entityResource($q, $http, umbRequestHelper) {
                 pageNumber: 100,
                 filter: '',
                 orderDirection: "Ascending",
-                orderBy: "SortOrder"
+                orderBy: "SortOrder",
+                dataTypeId: null
             };
             if (options === undefined) {
                 options = {};
@@ -426,6 +427,7 @@ function entityResource($q, $http, umbRequestHelper) {
                 options.orderDirection = "Descending";
             }
 
+
             return umbRequestHelper.resourcePromise(
                 $http.get(
                     umbRequestHelper.getApiUrl(
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
index e08178ec93..876a9f9426 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
@@ -8,13 +8,17 @@ angular.module("umbraco").controller("Umbraco.Dialogs.LinkPickerController",
 			searchText = value + "...";
 		});
 
+        var dataTypeId = null;
+        if($scope.model && $scope.model.dataTypeId) {
+            dataTypeId = $scope.model.dataTypeId;
+        }
 		$scope.dialogTreeEventHandler = $({});
 		$scope.target = {};
 		$scope.searchInfo = {
 			searchFromId: null,
 			searchFromName: null,
 			showSearch: false,
-            dataTypeId: $scope.model.dataTypeId,
+            dataTypeId: dataTypeId,
 			results: [],
 			selectedSearchResults: []
 		}
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
index 2b6b77ed41..0c5641ba0a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
@@ -12,13 +12,19 @@ angular.module("umbraco").controller("Umbraco.Overlays.LinkPickerController",
             $scope.model.title = localizationService.localize("defaultdialogs_selectLink");
         }
 
+        var dataTypeId = null;
+        if(dialogOptions && dialogOptions.dataTypeId){
+            dataTypeId = dialogOptions.dataTypeId;
+        }
+
+
         $scope.dialogTreeEventHandler = $({});
         $scope.model.target = {};
         $scope.searchInfo = {
             searchFromId: null,
             searchFromName: null,
             showSearch: false,
-            dataTypeId: dialogOptions.dataTypeId,
+            dataTypeId: dataTypeId,
             results: [],
             selectedSearchResults: []
         };
@@ -115,12 +121,17 @@ angular.module("umbraco").controller("Umbraco.Overlays.LinkPickerController",
                     startNodeId = -1;
                     startNodeIsVirtual = true;
                 }
+                var dataTypeId = null;
+                if(dialogOptions && dialogOptions.dataTypeId){
+                    dataTypeId = dialogOptions.dataTypeId;
+                }
+
                 $scope.mediaPickerOverlay = {
                     view: "mediapicker",
                     startNodeId: startNodeId,
                     startNodeIsVirtual: startNodeIsVirtual,
                     show: true,
-                    dataTypeId: dialogOptions.dataTypeId,
+                    dataTypeId: dataTypeId,
                     submit: function (model) {
                         var media = model.selectedImages[0];
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
index bb34ba379c..61f9619a52 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
@@ -44,13 +44,17 @@ angular.module("umbraco")
                     $scope.acceptedMediatypes = types;
                 });
 
+            var dataTypeId = null;
+            if($scope.model && $scope.model.dataTypeId) {
+                dataTypeId = $scope.model.dataTypeId;
+            }
             $scope.searchOptions = {
                 pageNumber: 1,
                 pageSize: 100,
                 totalItems: 0,
                 totalPages: 0,
                 filter: '',
-                dataTypeId: $scope.model.dataTypeId
+                dataTypeId: dataTypeId
             };
 
             //preload selected item
@@ -157,7 +161,12 @@ angular.module("umbraco")
                 }
 
                 if (folder.id > 0) {
-                    entityResource.getAncestors(folder.id, "media", { dataTypeId: $scope.model.dataTypeId })
+                    var dataTypeId = null;
+                    if($scope.model && $scope.model.dataTypeId) {
+                        dataTypeId = $scope.model.dataTypeId;
+                    }
+
+                    entityResource.getAncestors(folder.id, "media", { dataTypeId: dataTypeId })
                         .then(function (anc) {
                             $scope.path = _.filter(anc,
                                 function (f) {
@@ -309,6 +318,11 @@ angular.module("umbraco")
                     if ($scope.searchOptions.filter) {
                         searchMedia();
                     } else {
+                        var dataTypeId = null;
+                        if($scope.model && $scope.model.dataTypeId) {
+                            dataTypeId = $scope.model.dataTypeId;
+                        }
+
                         // reset pagination
                         $scope.searchOptions = {
                             pageNumber: 1,
@@ -316,7 +330,7 @@ angular.module("umbraco")
                             totalItems: 0,
                             totalPages: 0,
                             filter: '',
-                            dataTypeId: $scope.model.dataTypeId
+                            dataTypeId: dataTypeId
                         };
                         getChildren($scope.currentFolder.id);
                     }
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
index b4dd34dfff..851d270789 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
@@ -4,6 +4,11 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController",
 
         var tree = null;
         var dialogOptions = $scope.model;
+
+        var dataTypeId = null;
+        if(dialogOptions && dialogOptions.dataTypeId){
+            dataTypeId = dialogOptions.dataTypeId;
+        }
         $scope.treeReady = false;
         $scope.dialogTreeEventHandler = $({});
         $scope.section = dialogOptions.section;
@@ -16,7 +21,7 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController",
             searchFromId: dialogOptions.startNodeId,
             searchFromName: null,
             showSearch: false,
-            dataTypeId: dialogOptions.dataTypeId,
+            dataTypeId: dataTypeId,
             results: [],
             selectedSearchResults: []
         }
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
index 187b86a811..37a372a5b1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
@@ -180,10 +180,15 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
 
     //dialog
     $scope.openContentPicker = function() {
+        var dataTypeId = null;
+        if($scope.model && $scope.model.dataTypeId) {
+            dataTypeId = $scope.model.dataTypeId;
+        }
+
       $scope.contentPickerOverlay = dialogOptions;
       $scope.contentPickerOverlay.view = "treepicker";
       $scope.contentPickerOverlay.show = true;
-      $scope.contentPickerOverlay.dataTypeId = $scope.model.dataTypeId;
+      $scope.contentPickerOverlay.dataTypeId = dataTypeId;
 
       $scope.contentPickerOverlay.submit = function(model) {
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
index c61f5419ca..e9c095c1b9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
@@ -16,11 +16,16 @@ angular.module("umbraco")
         }
 
         $scope.setImage = function(){
+            var dataTypeId = null;
+            if($scope.model && $scope.model.dataTypeId) {
+                dataTypeId = $scope.model.dataTypeId;
+            }
+
             $scope.mediaPickerOverlay = {};
             $scope.mediaPickerOverlay.view = "mediapicker";
             $scope.mediaPickerOverlay.startNodeId = $scope.model.config && $scope.model.config.startNodeId ? $scope.model.config.startNodeId : undefined;
             $scope.mediaPickerOverlay.startNodeIsVirtual = $scope.mediaPickerOverlay.startNodeId ? $scope.model.config.startNodeIsVirtual : undefined;
-            $scope.mediaPickerOverlay.dataTypeId = $scope.model.dataTypeId;
+            $scope.mediaPickerOverlay.dataTypeId = dataTypeId;
             $scope.mediaPickerOverlay.cropSize = $scope.control.editor.config && $scope.control.editor.config.size ? $scope.control.editor.config.size : undefined;
             $scope.mediaPickerOverlay.showDetails = true;
             $scope.mediaPickerOverlay.disableFolderSelect = true;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js
index da869dbf01..580d231de8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js
@@ -13,11 +13,16 @@
         function openLinkPicker(editor, currentTarget, anchorElement) {
 
             entityResource.getAnchors(JSON.stringify($scope.model.value)).then(function(anchorValues) {
+                var dataTypeId = null;
+                if($scope.model && $scope.model.dataTypeId) {
+                    dataTypeId = $scope.model.dataTypeId;
+                }
+
                 vm.linkPickerOverlay = {
                     view: "linkpicker",
                     currentTarget: currentTarget,
                     anchors: anchorValues,
-                    dataTypeId: $scope.model.dataTypeId,
+                    dataTypeId: dataTypeId,
                     ignoreUserStartNodes : $scope.model.config.ignoreUserStartNodes,
                     show: true,
                     submit: function(model) {
@@ -40,13 +45,18 @@
                 startNodeIsVirtual = true;
             }
 
+            var dataTypeId = null;
+            if($scope.model && $scope.model.dataTypeId) {
+                dataTypeId = $scope.model.dataTypeId;
+            }
+
             vm.mediaPickerOverlay = {
                 currentTarget: currentTarget,
                 onlyImages: true,
                 showDetails: true,
                 startNodeId: startNodeId,
                 startNodeIsVirtual: startNodeIsVirtual,
-                dataTypeId: $scope.model.dataTypeId,
+                dataTypeId: dataTypeId,
                 view: "mediapicker",
                 show: true,
                 submit: function(model) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
index 138bb386be..63beddb49c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
@@ -107,13 +107,17 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
         };
 
        $scope.add = function() {
+           var dataTypeId = null;
+           if($scope.model && $scope.model.dataTypeId) {
+               dataTypeId = $scope.model.dataTypeId;
+           }
 
            $scope.mediaPickerOverlay = {
                view: "mediapicker",
                title: "Select media",
                startNodeId: $scope.model.config.startNodeId,
                startNodeIsVirtual: $scope.model.config.startNodeIsVirtual,
-               dataTypeId:  $scope.model.dataTypeId,
+               dataTypeId:  dataTypeId,
                multiPicker: multiPicker,
                onlyImages: onlyImages,
                disableFolderSelect: disableFolderSelect,
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
index 124f342741..cab124ad23 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
@@ -68,10 +68,15 @@ function multiUrlPickerController($scope, angularHelper, localizationService, en
             target: link.target
         } : null;
 
+        var dataTypeId = null;
+        if($scope.model && $scope.model.dataTypeId) {
+            dataTypeId = $scope.model.dataTypeId;
+        }
+
         $scope.linkPickerOverlay = {
             view: "linkpicker",
             currentTarget: target,
-            dataTypeId: $scope.model.dataTypeId,
+            dataTypeId: dataTypeId,
             ignoreUserStartNodes : $scope.model.config.ignoreUserStartNodes,
             show: true,
             submit: function (model) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
index 26c6a0c051..fa92442eac 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
@@ -19,13 +19,18 @@
             $scope.hasError = false;
 
             $scope.internal = function($event) {
+                var dataTypeId = null;
+                if($scope.model && $scope.model.dataTypeId) {
+                    dataTypeId = $scope.model.dataTypeId;
+                }
+
                $scope.currentEditLink = null;
 
                $scope.contentPickerOverlay = {};
                $scope.contentPickerOverlay.view = "contentpicker";
                $scope.contentPickerOverlay.multiPicker = false;
                $scope.contentPickerOverlay.show = true;
-               $scope.contentPickerOverlay.dataTypeId = $scope.model.dataTypeId;
+               $scope.contentPickerOverlay.dataTypeId = dataTypeId;
                $scope.contentPickerOverlay.idType = $scope.model.config.idType ? $scope.model.config.idType : "int";
 
                $scope.contentPickerOverlay.submit = function(model) {
@@ -45,13 +50,18 @@
             };
 
             $scope.selectInternal = function ($event, link) {
+                var dataTypeId = null;
+                if($scope.model && $scope.model.dataTypeId) {
+                    dataTypeId = $scope.model.dataTypeId;
+                }
+
                $scope.currentEditLink = link;
 
                $scope.contentPickerOverlay = {};
                $scope.contentPickerOverlay.view = "contentpicker";
                $scope.contentPickerOverlay.multiPicker = false;
                $scope.contentPickerOverlay.show = true;
-               $scope.contentPickerOverlay.dataTypeId = $scope.model.dataTypeId;
+               $scope.contentPickerOverlay.dataTypeId = dataTypeId;
                $scope.contentPickerOverlay.idType = $scope.model.config.idType ? $scope.model.config.idType : "int";
 
                $scope.contentPickerOverlay.submit = function(model) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
index dd9fb404c1..2b3ee930d9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
@@ -272,11 +272,16 @@ angular.module("umbraco")
                     tinyMceService.createLinkPicker(editor, $scope, function(currentTarget, anchorElement) {
 
                         entityResource.getAnchors($scope.model.value).then(function(anchorValues){
+                            var dataTypeId = null;
+                            if($scope.model && $scope.model.dataTypeId) {
+                                dataTypeId = $scope.model.dataTypeId;
+                            }
+
                             $scope.linkPickerOverlay = {
                                 view: "linkpicker",
                                 currentTarget: currentTarget,
                                 anchors: anchorValues,
-                                dataTypeId: $scope.model.dataTypeId,
+                                dataTypeId: dataTypeId,
                                 ignoreUserStartNodes: $scope.model.config.ignoreUserStartNodes,
                                 show: true,
                                 submit: function(model) {
@@ -300,6 +305,10 @@ angular.module("umbraco")
                             startNodeId = -1;
                             startNodeIsVirtual = true;
                         }
+                        var dataTypeId = null;
+                        if($scope.model && $scope.model.dataTypeId) {
+                            dataTypeId = $scope.model.dataTypeId;
+                        }
 
                         $scope.mediaPickerOverlay = {
                             currentTarget: currentTarget,
@@ -308,7 +317,7 @@ angular.module("umbraco")
                             disableFolderSelect: true,
                             startNodeId: startNodeId,
                             startNodeIsVirtual: startNodeIsVirtual,
-                            dataTypeId: $scope.model.dataTypeId,
+                            dataTypeId: dataTypeId,
                             view: "mediapicker",
                             show: true,
                             submit: function(model) {

From fdd9aee7737bccfa7e70ee957a30b10c100d0863 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Fri, 12 Jul 2019 11:07:15 +0100
Subject: [PATCH 134/776] Fixes LogViewer Error Count search result
 clickthrough to include errors & fatal without exception as well

---
 .../src/views/logviewer/overview.controller.js             | 7 ++++++-
 .../src/views/logviewer/overview.html                      | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.controller.js b/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.controller.js
index fc24fbe1bc..ffc05e8146 100644
--- a/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.controller.js
@@ -42,7 +42,8 @@
         //functions
         vm.searchLogQuery = searchLogQuery;
         vm.findMessageTemplate = findMessageTemplate;
-        
+        vm.searchErrors = searchErrors;
+
         function preFlightCheck(){
             vm.loading = true;
             //Do our pre-flight check (to see if we can view logs)
@@ -132,6 +133,10 @@
             searchLogQuery(logQuery);
         }
 
+        function searchErrors(){
+            var logQuery = "@Level='Fatal' or @Level='Error' or Has(@Exception)";
+            searchLogQuery(logQuery);
+        }
 
 
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html b/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html
index 854bed755f..5c3cf13072 100644
--- a/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html
@@ -84,7 +84,7 @@
 
                     <div ng-show=" vm.canLoadLogs">
                         <!-- No of Errors -->
-                        <umb-box ng-click="vm.searchLogQuery('Has(@Exception)')" style="cursor:pointer;">
+                        <umb-box ng-click="vm.searchErrors()" style="cursor:pointer;">
                             <umb-box-header title="Number of Errors"></umb-box-header>
                             <umb-box-content class="block-form" style="font-size: 40px; font-weight:900; text-align:center; color:#fe6561;">
                                 {{ vm.numberOfErrors }}

From 61a18297d96bd12ca7982863b06c207c93921912 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Fri, 12 Jul 2019 13:03:20 +0100
Subject: [PATCH 135/776] Make v8/dev now 8.2.0

---
 src/SolutionInfo.cs                      | 4 ++--
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index 841e054aee..a4e859988e 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -18,5 +18,5 @@ using System.Resources;
 [assembly: AssemblyVersion("8.0.0")]
 
 // these are FYI and changed automatically
-[assembly: AssemblyFileVersion("8.1.1")]
-[assembly: AssemblyInformationalVersion("8.1.1")]
+[assembly: AssemblyFileVersion("8.2.0")]
+[assembly: AssemblyInformationalVersion("8.2.0")]
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index e58f44e1ae..147912ed41 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -345,9 +345,9 @@
         <WebProjectProperties>
           <UseIIS>False</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>8110</DevelopmentServerPort>
+          <DevelopmentServerPort>8200</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:8110</IISUrl>
+          <IISUrl>http://localhost:8200</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

From 5d5bd54aee50a92fef3e096c1c97524c958b1c4f Mon Sep 17 00:00:00 2001
From: skttl <sk@ecreo.dk>
Date: Fri, 12 Jul 2019 21:07:55 +0200
Subject: [PATCH 136/776] 5867 enables tabbing to field-lock-toggler, and adds
 tab-focus styling

---
 .../src/less/components/umb-locked-field.less | 19 ++++++++++++++++---
 .../views/components/umb-locked-field.html    |  8 ++++----
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-locked-field.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-locked-field.less
index 8d9ae86ce7..5a14c82210 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-locked-field.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-locked-field.less
@@ -6,13 +6,26 @@
 }
 
 .umb-locked-field__wrapper {
-   display: flex;
-   align-items: center;
-   margin-bottom: 5px;
+  display: flex;
+  align-items: center;
+  margin-bottom: 5px;
 }
 
 .umb-locked-field__toggle {
   margin-right: 3px;
+  padding: 0;
+  background: none;
+  border: 0;
+  font-size: inherit;
+  line-height: inherit;
+
+  &:focus {
+    outline: none;
+
+    .tabbing-active & {
+      outline: 2px solid @inputBorderTabFocus;
+    }
+  }
 }
 
 .umb-locked-field__toggle:hover,
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-locked-field.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-locked-field.html
index 624ca8e923..5d5f10218f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-locked-field.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-locked-field.html
@@ -2,13 +2,13 @@
 
     <div class="umb-locked-field__wrapper">
 
-        <a ng-if="locked" href="" ng-click="unlock()" class="umb-locked-field__toggle">
+        <button ng-if="locked" ng-click="unlock()" class="umb-locked-field__toggle">
             <i class="umb-locked-field__lock-icon icon-lock"></i>
-        </a>
+        </button>
 
-        <a ng-if="!locked" href="" ng-click="lock()" class="umb-locked-field__toggle">
+        <button ng-if="!locked" ng-click="lock()" class="umb-locked-field__toggle">
             <i class="umb-locked-field__lock-icon icon-unlocked -unlocked"></i>
-        </a>
+        </button>
 
         <input type="text"
                no-password-manager

From 1a7251909cbd6d56d6fb27335cfdfd164d3d468b Mon Sep 17 00:00:00 2001
From: Nathan Woulfe <nathan@nathanw.com.au>
Date: Sat, 13 Jul 2019 13:45:13 +1000
Subject: [PATCH 137/776] fix empty array - was checking index against empty
 array, so condition was never met

---
 .../src/views/logviewer/overview.controller.js                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.controller.js b/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.controller.js
index 86d72feffd..b622d7a517 100644
--- a/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.controller.js
@@ -112,7 +112,7 @@
 
                 for (let [key, value] of Object.entries(data)) {
                     const index = vm.logTypeLabels.findIndex(x => key.startsWith(x));
-                    if (index > -1 && index < vm.logTypeData.length) {
+                    if (index > -1) {
                         vm.logTypeData[index] = value;
                     }                
                 }

From 1073e6257c56f8cd118e09695468d43c4616be2a Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bf@oerskov.dk>
Date: Sat, 13 Jul 2019 14:48:35 +0200
Subject: [PATCH 138/776] Adjust comments

---
 .../common/overlays/linkpicker/linkpicker.controller.js    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
index 2b6b77ed41..d9f907eacc 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
@@ -28,24 +28,23 @@ angular.module("umbraco").controller("Umbraco.Overlays.LinkPickerController",
         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 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
+                // 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
+                        // now sync the tree to this path
                         $scope.dialogTreeEventHandler.syncTree({
                             path: path,
                             tree: "content"
                         });
                     });
 
-
                     entityResource.getUrlAndAnchors(id).then(function(resp){
                         $scope.anchorValues = resp.anchorValues;
                         $scope.model.target.url = resp.url;

From 82eb241119a39f4ee49283538c562241dca6e326 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bf@oerskov.dk>
Date: Sat, 13 Jul 2019 14:49:05 +0200
Subject: [PATCH 139/776] Add overload method for Udi

---
 src/Umbraco.Web/Editors/EntityController.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Editors/EntityController.cs b/src/Umbraco.Web/Editors/EntityController.cs
index 85d5b607b6..ada0206545 100644
--- a/src/Umbraco.Web/Editors/EntityController.cs
+++ b/src/Umbraco.Web/Editors/EntityController.cs
@@ -56,6 +56,7 @@ namespace Umbraco.Web.Editors
                     //id is passed in eventually we'll probably want to support GUID + Udi too
                     new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetPagedChildren", "id", typeof(int), typeof(string)),
                     new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetPath", "id", typeof(int), typeof(Guid), typeof(Udi)),
+                    new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetUrlAndAnchors", "id", typeof(int), typeof(Guid), typeof(Udi)),
                     new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetById", "id", typeof(int), typeof(Guid), typeof(Udi)),
                     new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetByIds", "ids", typeof(int[]), typeof(Guid[]), typeof(Udi[]))));
             }
@@ -281,9 +282,17 @@ namespace Umbraco.Web.Editors
                 publishedContentExists: i => Umbraco.TypedContent(i) != null);
         }
 
+        [HttpGet]
+        public UrlAndAnchors GetUrlAndAnchors(Udi id)
+        {
+            var nodeId = Umbraco.GetIdForUdi(id);
+            var url = Umbraco.Url(nodeId);
+            var anchorValues = Services.ContentService.GetAnchorValuesFromRTEs(nodeId);
+            return new UrlAndAnchors(url, anchorValues);
+        }
 
         [HttpGet]
-        public UrlAndAnchors GetUrlAndAnchors([FromUri]int id)
+        public UrlAndAnchors GetUrlAndAnchors(int id)
         {
             var url = Umbraco.Url(id);
             var anchorValues = Services.ContentService.GetAnchorValuesFromRTEs(id);

From 7c03fe3c1f4e963f1e68e32968aef39ca577beeb Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bf@oerskov.dk>
Date: Sat, 13 Jul 2019 14:49:35 +0200
Subject: [PATCH 140/776] Adjust parameter

---
 .../src/common/resources/entity.resource.js                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
index c85a85bb57..9453ca8c41 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
@@ -172,7 +172,7 @@ function entityResource($q, $http, umbRequestHelper) {
                     umbRequestHelper.getApiUrl(
                         "entityApiBaseUrl",
                         "GetUrlAndAnchors",
-                        { id: id })),
+                        [{ id: id }])),
                 'Failed to retrieve url and anchors data for id ' + id);
         },
 

From de9241bcf592ca9994810d43232545844fc06848 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bf@oerskov.dk>
Date: Sat, 13 Jul 2019 14:50:25 +0200
Subject: [PATCH 141/776] Add UmbracoHelper overload methods to get url by guid

---
 src/Umbraco.Web/UmbracoHelper.cs | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs
index c00d37f216..2c7cafb298 100644
--- a/src/Umbraco.Web/UmbracoHelper.cs
+++ b/src/Umbraco.Web/UmbracoHelper.cs
@@ -502,6 +502,16 @@ namespace Umbraco.Web
             return UrlProvider.GetUrl(contentId);
         }
 
+        /// <summary>
+        /// Gets the url of a content identified by its identifier.
+        /// </summary>
+        /// <param name="contentGuid">The content identifier.</param>
+        /// <returns>The url for the content.</returns>
+        public string Url(Guid contentGuid)
+        {
+            return UrlProvider.GetUrl(contentGuid);
+        }
+
         /// <summary>
         /// Gets the url of a content identified by its identifier, in a specified mode.
         /// </summary>
@@ -513,6 +523,17 @@ namespace Umbraco.Web
             return UrlProvider.GetUrl(contentId, mode);
         }
 
+        /// <summary>
+        /// Gets the url of a content identified by its identifier, in a specified mode.
+        /// </summary>
+        /// <param name="contentGuid">The content identifier.</param>
+        /// <param name="mode">The mode.</param>
+        /// <returns>The url for the content.</returns>
+        public string Url(Guid contentGuid, UrlProviderMode mode)
+        {
+            return UrlProvider.GetUrl(contentGuid, mode);
+        }
+
         /// <summary>
         /// This method will always add the domain to the path if the hostnames are set up correctly.
         /// </summary>

From c47a08b5532aa3b858ec2cfbe3daa2f09b7bf4f6 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bf@oerskov.dk>
Date: Sat, 13 Jul 2019 16:40:01 +0200
Subject: [PATCH 142/776] Add overload for NiceUrl

---
 src/Umbraco.Web/UmbracoHelper.cs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs
index 2c7cafb298..46ae098e2e 100644
--- a/src/Umbraco.Web/UmbracoHelper.cs
+++ b/src/Umbraco.Web/UmbracoHelper.cs
@@ -492,6 +492,18 @@ namespace Umbraco.Web
             return Url(nodeId);
         }
 
+        /// <summary>
+        /// Returns a string with a friendly url from a node.
+        /// IE.: Instead of having /482 (id) as an url, you can have
+        /// /screenshots/developer/macros (spoken url)
+        /// </summary>
+        /// <param name="guid">Identifier for the node that should be returned</param>
+        /// <returns>String with a friendly url from a node</returns>
+        public string NiceUrl(Guid guid)
+        {
+            return Url(guid);
+        }
+
         /// <summary>
         /// Gets the url of a content identified by its identifier.
         /// </summary>

From 62f924a7572b92c84398b994c83ff1a5da961b07 Mon Sep 17 00:00:00 2001
From: hifi-phil <phil@hifi.agency>
Date: Sun, 14 Jul 2019 09:45:12 +0100
Subject: [PATCH 143/776] Change PropertyType.Alias to virtual

When unit testing PropertyType.Alias needs to be virtual to make it mockable. The underlying code on the set triggers IOC logic and makes it hard to test anything that uses Property Types.
---
 src/Umbraco.Core/Models/PropertyType.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Models/PropertyType.cs b/src/Umbraco.Core/Models/PropertyType.cs
index 34775ccf89..61736607c6 100644
--- a/src/Umbraco.Core/Models/PropertyType.cs
+++ b/src/Umbraco.Core/Models/PropertyType.cs
@@ -114,7 +114,7 @@ namespace Umbraco.Core.Models
         /// Gets of sets the alias of the property type.
         /// </summary>
         [DataMember]
-        public string Alias
+        public virtual string Alias
         {
             get => _alias;
             set => SetPropertyValueAndDetectChanges(SanitizeAlias(value), ref _alias, nameof(Alias));

From 320ccf810556f6381b35eba6943ffa824f5a7985 Mon Sep 17 00:00:00 2001
From: Steve Megson <steve@megson.org>
Date: Sun, 14 Jul 2019 16:46:01 +0100
Subject: [PATCH 144/776] Fixes #5852 - TablesForScheduledPublishing

---
 .../V_8_0_0/TablesForScheduledPublishing.cs   | 36 ++++++++++++-------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/TablesForScheduledPublishing.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/TablesForScheduledPublishing.cs
index 70dbe3d29e..2f7ffe8679 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/TablesForScheduledPublishing.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/TablesForScheduledPublishing.cs
@@ -14,11 +14,18 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
         public override void Migrate()
         {
             //Get anything currently scheduled
-            var scheduleSql = new Sql()
-                .Select("nodeId", "releaseDate", "expireDate")
+            var releaseSql = new Sql()
+                .Select("nodeId", "releaseDate")
                 .From("umbracoDocument")
-                .Where("releaseDate IS NOT NULL OR expireDate IS NOT NULL");
-            var schedules = Database.Dictionary<int, (DateTime? releaseDate, DateTime? expireDate)> (scheduleSql);
+                .Where("releaseDate IS NOT NULL");
+            var releases = Database.Dictionary<int, DateTime> (releaseSql);
+
+            var expireSql = new Sql()
+                .Select("nodeId", "expireDate")
+                .From("umbracoDocument")
+                .Where("expireDate IS NOT NULL");
+            var expires = Database.Dictionary<int, DateTime>(expireSql);
+
 
             //drop old cols
             Delete.Column("releaseDate").FromTable("umbracoDocument").Do();
@@ -27,20 +34,25 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
             Create.Table<ContentScheduleDto>(true).Do();
 
             //migrate the schedule
-            foreach(var s in schedules)
+            foreach(var s in releases)
             {
-                var date = s.Value.releaseDate;
+                var date = s.Value;
                 var action = ContentScheduleAction.Release.ToString();
-                if (!date.HasValue)
-                {
-                    date = s.Value.expireDate;
-                    action = ContentScheduleAction.Expire.ToString();
-                }
 
                 Insert.IntoTable(ContentScheduleDto.TableName)
-                    .Row(new { nodeId = s.Key, date = date.Value, action = action })
+                    .Row(new { id = Guid.NewGuid(), nodeId = s.Key, date = date, action = action })
                     .Do();
             }
+
+            foreach (var s in expires)
+            {
+                var date = s.Value;
+                var action = ContentScheduleAction.Expire.ToString();
+
+                Insert.IntoTable(ContentScheduleDto.TableName)
+                    .Row(new { id = Guid.NewGuid(), nodeId = s.Key, date = date, action = action })
+                    .Do();
+            }            
         }
     }
 }

From 4e0dd728a82a20a25b6500a6e450d0e4ecac376d Mon Sep 17 00:00:00 2001
From: Steve Megson <steve@megson.org>
Date: Sun, 14 Jul 2019 16:48:33 +0100
Subject: [PATCH 145/776] Fixes #5864 - migrate prevalues for
 Umbraco.DropDown.Flexible

---
 .../DropDownFlexiblePreValueMigrator.cs       | 32 +++++++++++++++++++
 .../DataTypes/PreValueMigratorComposer.cs     |  1 +
 src/Umbraco.Core/Umbraco.Core.csproj          |  1 +
 3 files changed, 34 insertions(+)
 create mode 100644 src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/DropDownFlexiblePreValueMigrator.cs

diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/DropDownFlexiblePreValueMigrator.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/DropDownFlexiblePreValueMigrator.cs
new file mode 100644
index 0000000000..35ca574bab
--- /dev/null
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/DropDownFlexiblePreValueMigrator.cs
@@ -0,0 +1,32 @@
+using System.Collections.Generic;
+using System.Linq;
+using Umbraco.Core.PropertyEditors;
+
+namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0.DataTypes
+{
+    class DropDownFlexiblePreValueMigrator : IPreValueMigrator
+    {
+        public bool CanMigrate(string editorAlias)
+            => editorAlias == "Umbraco.DropDown.Flexible";
+
+        public virtual string GetNewAlias(string editorAlias)
+            => null;
+
+        public object GetConfiguration(int dataTypeId, string editorAlias, Dictionary<string, PreValueDto> preValues)
+        {
+            var config = new DropDownFlexibleConfiguration();
+            foreach (var preValue in preValues.Values)
+            {
+                if (preValue.Alias == "multiple")
+                {
+                    config.Multiple = (preValue.Value == "1");
+                }
+                else
+                {
+                    config.Items.Add(new ValueListConfiguration.ValueListItem { Id = preValue.Id, Value = preValue.Value });
+                }
+            }
+            return config;
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/PreValueMigratorComposer.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/PreValueMigratorComposer.cs
index 4c3f8534e7..8dfa464508 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/PreValueMigratorComposer.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/PreValueMigratorComposer.cs
@@ -19,6 +19,7 @@ public class PreValueMigratorComposer : ICoreComposer
             .Append<NestedContentPreValueMigrator>()
             .Append<DecimalPreValueMigrator>()
             .Append<ListViewPreValueMigrator>()
+            .Append<DropDownFlexiblePreValueMigrator>()
             .Append<ValueListPreValueMigrator>();
     }
 }
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index ca9b7d4034..6adce1944f 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -241,6 +241,7 @@
     <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\DefaultPreValueMigrator.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\RenamingPreValueMigrator.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\RichTextPreValueMigrator.cs" />
+    <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\DropDownFlexiblePreValueMigrator.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\MergeDateAndDateTimePropertyEditor.cs" />
     <Compile Include="Models\Entities\EntityExtensions.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\PreValueMigratorBase.cs" />

From f7a10e3a15d89ac57e457b8c936597f31d72b7c7 Mon Sep 17 00:00:00 2001
From: Ronald Barendse <ronald@panoramastudios.nl>
Date: Sat, 13 Jul 2019 23:55:50 +0200
Subject: [PATCH 146/776] Added attribute to validate Umbraco form route
 strings (ufprt)

---
 .../HttpUmbracoFormRouteStringException.cs    | 46 +++++++++++++++++
 ...ValidateUmbracoFormRouteStringAttribute.cs | 51 +++++++++++++++++++
 src/Umbraco.Web/Umbraco.Web.csproj            |  2 +
 3 files changed, 99 insertions(+)
 create mode 100644 src/Umbraco.Web/Mvc/HttpUmbracoFormRouteStringException.cs
 create mode 100644 src/Umbraco.Web/Mvc/ValidateUmbracoFormRouteStringAttribute.cs

diff --git a/src/Umbraco.Web/Mvc/HttpUmbracoFormRouteStringException.cs b/src/Umbraco.Web/Mvc/HttpUmbracoFormRouteStringException.cs
new file mode 100644
index 0000000000..8e0b50b11c
--- /dev/null
+++ b/src/Umbraco.Web/Mvc/HttpUmbracoFormRouteStringException.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Runtime.Serialization;
+using System.Web;
+
+namespace Umbraco.Web.Mvc
+{
+    /// <summary>
+    /// Describes an exception that occurred during the processing of an Umbraco form route string.
+    /// </summary>
+    /// <seealso cref="System.Web.HttpException" />
+    [Serializable]
+    public sealed class HttpUmbracoFormRouteStringException : HttpException
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HttpUmbracoFormRouteStringException" /> class.
+        /// </summary>
+        public HttpUmbracoFormRouteStringException()
+        { }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HttpUmbracoFormRouteStringException" /> class.
+        /// </summary>
+        /// <param name="info">The <see cref="T:System.Runtime.Serialization.SerializationInfo" /> that holds the serialized object data about the exception being thrown.</param>
+        /// <param name="context">The <see cref="T:System.Runtime.Serialization.StreamingContext" /> that holds the contextual information about the source or destination.</param>
+        private HttpUmbracoFormRouteStringException(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        { }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HttpUmbracoFormRouteStringException" /> class.
+        /// </summary>
+        /// <param name="message">The error message displayed to the client when the exception is thrown.</param>
+        public HttpUmbracoFormRouteStringException(string message)
+            : base(message)
+        { }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HttpUmbracoFormRouteStringException" /> class.
+        /// </summary>
+        /// <param name="message">The error message displayed to the client when the exception is thrown.</param>
+        /// <param name="innerException">The <see cref="P:System.Exception.InnerException" />, if any, that threw the current exception.</param>
+        public HttpUmbracoFormRouteStringException(string message, Exception innerException)
+            : base(message, innerException)
+        { }
+    }
+}
diff --git a/src/Umbraco.Web/Mvc/ValidateUmbracoFormRouteStringAttribute.cs b/src/Umbraco.Web/Mvc/ValidateUmbracoFormRouteStringAttribute.cs
new file mode 100644
index 0000000000..2be89f05a6
--- /dev/null
+++ b/src/Umbraco.Web/Mvc/ValidateUmbracoFormRouteStringAttribute.cs
@@ -0,0 +1,51 @@
+using System;
+using System.Web.Mvc;
+using Umbraco.Core;
+
+namespace Umbraco.Web.Mvc
+{
+    /// <summary>
+    /// Represents an attribute that is used to prevent an invalid Umbraco form request route string on a request.
+    /// </summary>
+    /// <seealso cref="System.Web.Mvc.FilterAttribute" />
+    /// <seealso cref="System.Web.Mvc.IAuthorizationFilter" />
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
+    public sealed class ValidateUmbracoFormRouteStringAttribute : FilterAttribute, IAuthorizationFilter
+    {
+        /// <summary>
+        /// Called when authorization is required.
+        /// </summary>
+        /// <param name="filterContext">The filter context.</param>
+        /// <exception cref="ArgumentNullException">filterContext</exception>
+        /// <exception cref="Umbraco.Web.Mvc.HttpUmbracoFormRouteStringException">The required request field \"ufprt\" is not present.
+        /// or
+        /// The Umbraco form request route string could not be decrypted.
+        /// or
+        /// The provided Umbraco form request route string was meant for a different controller and action.</exception>
+        public void OnAuthorization(AuthorizationContext filterContext)
+        {
+            if (filterContext == null)
+            {
+                throw new ArgumentNullException(nameof(filterContext));
+            }
+
+            var ufprt = filterContext.HttpContext.Request["ufprt"];
+            if (ufprt.IsNullOrWhiteSpace())
+            {
+                throw new HttpUmbracoFormRouteStringException("The required request field \"ufprt\" is not present.");
+            }
+
+            if (!UmbracoHelper.DecryptAndValidateEncryptedRouteString(ufprt, out var additionalDataParts))
+            {
+                throw new HttpUmbracoFormRouteStringException("The Umbraco form request route string could not be decrypted.");
+            }
+
+            if (additionalDataParts[RenderRouteHandler.ReservedAdditionalKeys.Controller] != filterContext.ActionDescriptor.ControllerDescriptor.ControllerName ||
+                additionalDataParts[RenderRouteHandler.ReservedAdditionalKeys.Action] != filterContext.ActionDescriptor.ActionName ||
+                additionalDataParts[RenderRouteHandler.ReservedAdditionalKeys.Area].NullOrWhiteSpaceAsNull() != filterContext.RouteData.DataTokens["area"]?.ToString().NullOrWhiteSpaceAsNull())
+            {
+                throw new HttpUmbracoFormRouteStringException("The provided Umbraco form request route string was meant for a different controller and action.");
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 105a40b4a7..39a05ddbc4 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -219,8 +219,10 @@
     <Compile Include="Models\Mapping\MapperContextExtensions.cs" />
     <Compile Include="Models\PublishedContent\HybridVariationContextAccessor.cs" />
     <Compile Include="Models\TemplateQuery\QueryConditionExtensions.cs" />
+    <Compile Include="Mvc\HttpUmbracoFormRouteStringException.cs" />
     <Compile Include="Mvc\ModelBindingExceptionFilter.cs" />
     <Compile Include="Mvc\SurfaceControllerTypeCollectionBuilder.cs" />
+    <Compile Include="Mvc\ValidateUmbracoFormRouteStringAttribute.cs" />
     <Compile Include="Profiling\WebProfilingController.cs" />
     <Compile Include="PublishedCache\NuCache\Snap\GenObj.cs" />
     <Compile Include="PublishedCache\NuCache\Snap\GenRef.cs" />

From 101a8b6c782db20c6018ad8f3120a1a0055d7a75 Mon Sep 17 00:00:00 2001
From: Ronald Barendse <ronald@panoramastudios.nl>
Date: Sat, 13 Jul 2019 23:56:29 +0200
Subject: [PATCH 147/776] Added ValidateUmbracoFormRouteStringAttribute to
 public controllers

---
 src/Umbraco.Web/Controllers/UmbLoginController.cs       | 1 +
 src/Umbraco.Web/Controllers/UmbLoginStatusController.cs | 1 +
 src/Umbraco.Web/Controllers/UmbProfileController.cs     | 1 +
 src/Umbraco.Web/Controllers/UmbRegisterController.cs    | 1 +
 4 files changed, 4 insertions(+)

diff --git a/src/Umbraco.Web/Controllers/UmbLoginController.cs b/src/Umbraco.Web/Controllers/UmbLoginController.cs
index 2980b4a4c0..2ff80e2668 100644
--- a/src/Umbraco.Web/Controllers/UmbLoginController.cs
+++ b/src/Umbraco.Web/Controllers/UmbLoginController.cs
@@ -22,6 +22,7 @@ namespace Umbraco.Web.Controllers
 
         [HttpPost]
         [ValidateAntiForgeryToken]
+        [ValidateUmbracoFormRouteString]
         public ActionResult HandleLogin([Bind(Prefix = "loginModel")]LoginModel model)
         {
             if (ModelState.IsValid == false)
diff --git a/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs b/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
index fdc2de8c5f..8f572404fc 100644
--- a/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
+++ b/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
@@ -24,6 +24,7 @@ namespace Umbraco.Web.Controllers
 
         [HttpPost]
         [ValidateAntiForgeryToken]
+        [ValidateUmbracoFormRouteString]
         public ActionResult HandleLogout([Bind(Prefix = "logoutModel")]PostRedirectModel model)
         {
             if (ModelState.IsValid == false)
diff --git a/src/Umbraco.Web/Controllers/UmbProfileController.cs b/src/Umbraco.Web/Controllers/UmbProfileController.cs
index b14652ad2e..d9333e8e65 100644
--- a/src/Umbraco.Web/Controllers/UmbProfileController.cs
+++ b/src/Umbraco.Web/Controllers/UmbProfileController.cs
@@ -23,6 +23,7 @@ namespace Umbraco.Web.Controllers
 
         [HttpPost]
         [ValidateAntiForgeryToken]
+        [ValidateUmbracoFormRouteString]
         public ActionResult HandleUpdateProfile([Bind(Prefix = "profileModel")] ProfileModel model)
         {
             var provider = Core.Security.MembershipProviderExtensions.GetMembersMembershipProvider();
diff --git a/src/Umbraco.Web/Controllers/UmbRegisterController.cs b/src/Umbraco.Web/Controllers/UmbRegisterController.cs
index b0187d6127..4f4173a67d 100644
--- a/src/Umbraco.Web/Controllers/UmbRegisterController.cs
+++ b/src/Umbraco.Web/Controllers/UmbRegisterController.cs
@@ -24,6 +24,7 @@ namespace Umbraco.Web.Controllers
 
         [HttpPost]
         [ValidateAntiForgeryToken]
+        [ValidateUmbracoFormRouteString]
         public ActionResult HandleRegisterMember([Bind(Prefix = "registerModel")]RegisterModel model)
         {
             if (ModelState.IsValid == false)

From b0c4042e8748baff647e9e12d0d6b9aeaf3f1636 Mon Sep 17 00:00:00 2001
From: Ronald Barendse <ronald@panoramastudios.nl>
Date: Mon, 15 Jul 2019 10:16:09 +0200
Subject: [PATCH 148/776] Removed UmbracoAntiForgeryAdditionalDataProvider

---
 ...oAntiForgeryAdditionalDataProviderTests.cs | 157 ------------------
 src/Umbraco.Tests/Umbraco.Tests.csproj        |   1 -
 src/Umbraco.Web/HtmlHelperRenderExtensions.cs |   8 -
 src/Umbraco.Web/Runtime/WebFinalComponent.cs  |   2 -
 ...mbracoAntiForgeryAdditionalDataProvider.cs |  92 ----------
 src/Umbraco.Web/Umbraco.Web.csproj            |   1 -
 6 files changed, 261 deletions(-)
 delete mode 100644 src/Umbraco.Tests/Security/UmbracoAntiForgeryAdditionalDataProviderTests.cs
 delete mode 100644 src/Umbraco.Web/Security/UmbracoAntiForgeryAdditionalDataProvider.cs

diff --git a/src/Umbraco.Tests/Security/UmbracoAntiForgeryAdditionalDataProviderTests.cs b/src/Umbraco.Tests/Security/UmbracoAntiForgeryAdditionalDataProviderTests.cs
deleted file mode 100644
index c81c108e0d..0000000000
--- a/src/Umbraco.Tests/Security/UmbracoAntiForgeryAdditionalDataProviderTests.cs
+++ /dev/null
@@ -1,157 +0,0 @@
-using System.Collections.Specialized;
-using System.Web;
-using System.Web.Helpers;
-using Moq;
-using Newtonsoft.Json;
-using NUnit.Framework;
-using Umbraco.Core;
-using Umbraco.Tests.TestHelpers;
-using Umbraco.Web.Mvc;
-using Umbraco.Web.Security;
-
-namespace Umbraco.Tests.Security
-{
-    [TestFixture]
-    public class UmbracoAntiForgeryAdditionalDataProviderTests
-    {
-        [Test]
-        public void Test_Wrapped_Non_BeginUmbracoForm()
-        {
-            var wrapped = Mock.Of<IAntiForgeryAdditionalDataProvider>(x => x.GetAdditionalData(It.IsAny<HttpContextBase>()) == "custom");
-            var provider = new UmbracoAntiForgeryAdditionalDataProvider(wrapped);
-
-            var httpContextFactory = new FakeHttpContextFactory("/hello/world");
-            var data = provider.GetAdditionalData(httpContextFactory.HttpContext);
-
-            Assert.IsTrue(data.DetectIsJson());
-            var json = JsonConvert.DeserializeObject<UmbracoAntiForgeryAdditionalDataProvider.AdditionalData>(data);
-            Assert.AreEqual(null, json.Ufprt);
-            Assert.IsTrue(json.Stamp != default);
-            Assert.AreEqual("custom", json.WrappedValue);
-        }
-
-        [Test]
-        public void Null_Wrapped_Non_BeginUmbracoForm()
-        {
-            var provider = new UmbracoAntiForgeryAdditionalDataProvider(null);
-
-            var httpContextFactory = new FakeHttpContextFactory("/hello/world");
-            var data = provider.GetAdditionalData(httpContextFactory.HttpContext);
-
-            Assert.IsTrue(data.DetectIsJson());
-            var json = JsonConvert.DeserializeObject<UmbracoAntiForgeryAdditionalDataProvider.AdditionalData>(data);
-            Assert.AreEqual(null, json.Ufprt);
-            Assert.IsTrue(json.Stamp != default);
-            Assert.AreEqual("default", json.WrappedValue);
-        }
-
-        [Test]
-        public void Validate_Non_Json()
-        {
-            var provider = new UmbracoAntiForgeryAdditionalDataProvider(null);
-
-            var httpContextFactory = new FakeHttpContextFactory("/hello/world");
-            var isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "hello");
-
-            Assert.IsFalse(isValid);
-        }
-
-        [Test]
-        public void Validate_Invalid_Json()
-        {
-            var provider = new UmbracoAntiForgeryAdditionalDataProvider(null);
-
-            var httpContextFactory = new FakeHttpContextFactory("/hello/world");
-            var isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "{'Stamp': '0'}");
-            Assert.IsFalse(isValid);
-
-            isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "{'Stamp': ''}");
-            Assert.IsFalse(isValid);
-
-            isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "{'hello': 'world'}");
-            Assert.IsFalse(isValid);
-
-        }
-
-        [Test]
-        public void Validate_No_Request_Ufprt()
-        {
-            var provider = new UmbracoAntiForgeryAdditionalDataProvider(null);
-
-            var httpContextFactory = new FakeHttpContextFactory("/hello/world");
-            //there is a ufprt in the additional data, but not in the request
-            var isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "{'Stamp': '636970328040070330', 'WrappedValue': 'default', 'Ufprt': 'ASBVDFDFDFDF'}");
-            Assert.IsFalse(isValid);
-        }
-
-        [Test]
-        public void Validate_No_AdditionalData_Ufprt()
-        {
-            var provider = new UmbracoAntiForgeryAdditionalDataProvider(null);
-
-            var httpContextFactory = new FakeHttpContextFactory("/hello/world");
-            var requestMock = Mock.Get(httpContextFactory.HttpContext.Request);
-            requestMock.SetupGet(x => x["ufprt"]).Returns("ABCDEFG");
-
-            //there is a ufprt in the additional data, but not in the request
-            var isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "{'Stamp': '636970328040070330', 'WrappedValue': 'default', 'Ufprt': ''}");
-            Assert.IsFalse(isValid);
-        }
-
-        [Test]
-        public void Validate_No_AdditionalData_Or_Request_Ufprt()
-        {
-            var provider = new UmbracoAntiForgeryAdditionalDataProvider(null);
-
-            var httpContextFactory = new FakeHttpContextFactory("/hello/world");
-            
-            //there is a ufprt in the additional data, but not in the request
-            var isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "{'Stamp': '636970328040070330', 'WrappedValue': 'default', 'Ufprt': ''}");
-            Assert.IsTrue(isValid);
-        }
-
-        [Test]
-        public void Validate_Request_And_AdditionalData_Ufprt()
-        {
-            var provider = new UmbracoAntiForgeryAdditionalDataProvider(null);
-
-            var routeParams1 = $"{RenderRouteHandler.ReservedAdditionalKeys.Controller}={HttpUtility.UrlEncode("Test")}&{RenderRouteHandler.ReservedAdditionalKeys.Action}={HttpUtility.UrlEncode("Index")}&{RenderRouteHandler.ReservedAdditionalKeys.Area}=Umbraco";
-            var routeParams2 = $"{RenderRouteHandler.ReservedAdditionalKeys.Controller}={HttpUtility.UrlEncode("Test")}&{RenderRouteHandler.ReservedAdditionalKeys.Action}={HttpUtility.UrlEncode("Index")}&{RenderRouteHandler.ReservedAdditionalKeys.Area}=Umbraco";
-
-            var httpContextFactory = new FakeHttpContextFactory("/hello/world");
-            var requestMock = Mock.Get(httpContextFactory.HttpContext.Request);
-            requestMock.SetupGet(x => x["ufprt"]).Returns(routeParams1.EncryptWithMachineKey());
-
-            var isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "{'Stamp': '636970328040070330', 'WrappedValue': 'default', 'Ufprt': '" + routeParams2.EncryptWithMachineKey() + "'}");
-            Assert.IsTrue(isValid);
-
-            routeParams2 = $"{RenderRouteHandler.ReservedAdditionalKeys.Controller}={HttpUtility.UrlEncode("Invalid")}&{RenderRouteHandler.ReservedAdditionalKeys.Action}={HttpUtility.UrlEncode("Index")}&{RenderRouteHandler.ReservedAdditionalKeys.Area}=Umbraco";
-            isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "{'Stamp': '636970328040070330', 'WrappedValue': 'default', 'Ufprt': '" + routeParams2.EncryptWithMachineKey() + "'}");
-            Assert.IsFalse(isValid);
-        }
-
-        [Test]
-        public void Validate_Wrapped_Request_And_AdditionalData_Ufprt()
-        {
-            var wrapped = Mock.Of<IAntiForgeryAdditionalDataProvider>(x => x.ValidateAdditionalData(It.IsAny<HttpContextBase>(), "custom") == true);
-            var provider = new UmbracoAntiForgeryAdditionalDataProvider(wrapped);
-
-            var routeParams1 = $"{RenderRouteHandler.ReservedAdditionalKeys.Controller}={HttpUtility.UrlEncode("Test")}&{RenderRouteHandler.ReservedAdditionalKeys.Action}={HttpUtility.UrlEncode("Index")}&{RenderRouteHandler.ReservedAdditionalKeys.Area}=Umbraco";
-            var routeParams2 = $"{RenderRouteHandler.ReservedAdditionalKeys.Controller}={HttpUtility.UrlEncode("Test")}&{RenderRouteHandler.ReservedAdditionalKeys.Action}={HttpUtility.UrlEncode("Index")}&{RenderRouteHandler.ReservedAdditionalKeys.Area}=Umbraco";
-
-            var httpContextFactory = new FakeHttpContextFactory("/hello/world");
-            var requestMock = Mock.Get(httpContextFactory.HttpContext.Request);
-            requestMock.SetupGet(x => x["ufprt"]).Returns(routeParams1.EncryptWithMachineKey());
-
-            var isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "{'Stamp': '636970328040070330', 'WrappedValue': 'default', 'Ufprt': '" + routeParams2.EncryptWithMachineKey() + "'}");
-            Assert.IsFalse(isValid);
-
-            isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "{'Stamp': '636970328040070330', 'WrappedValue': 'custom', 'Ufprt': '" + routeParams2.EncryptWithMachineKey() + "'}");
-            Assert.IsTrue(isValid);
-
-            routeParams2 = $"{RenderRouteHandler.ReservedAdditionalKeys.Controller}={HttpUtility.UrlEncode("Invalid")}&{RenderRouteHandler.ReservedAdditionalKeys.Action}={HttpUtility.UrlEncode("Index")}&{RenderRouteHandler.ReservedAdditionalKeys.Area}=Umbraco";
-            isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "{'Stamp': '636970328040070330', 'WrappedValue': 'default', 'Ufprt': '" + routeParams2.EncryptWithMachineKey() + "'}");
-            Assert.IsFalse(isValid);
-        }
-    }
-}
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index cc569d6989..4f4a83dc26 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -147,7 +147,6 @@
     <Compile Include="Routing\MediaUrlProviderTests.cs" />
     <Compile Include="Runtimes\StandaloneTests.cs" />
     <Compile Include="Routing\GetContentUrlsTests.cs" />
-    <Compile Include="Security\UmbracoAntiForgeryAdditionalDataProviderTests.cs" />
     <Compile Include="Services\AmbiguousEventTests.cs" />
     <Compile Include="Services\ContentServiceEventTests.cs" />
     <Compile Include="Services\ContentServicePublishBranchTests.cs" />
diff --git a/src/Umbraco.Web/HtmlHelperRenderExtensions.cs b/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
index e9b731348d..7249500441 100644
--- a/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
+++ b/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
@@ -223,14 +223,6 @@ namespace Umbraco.Web
                 _method = method;
 			    _controllerName = controllerName;
                 _encryptedString = UrlHelperRenderExtensions.CreateEncryptedRouteString(controllerName, controllerAction, area, additionalRouteVals);
-
-                //For UmbracoForm's we want to add our routing string to the httpcontext items in the case where anti-forgery tokens are used.
-                //In which case our custom UmbracoAntiForgeryAdditionalDataProvider will kick in and validate the values in the request against
-                //the values that will be appended to the token. This essentially means that when anti-forgery tokens are used with UmbracoForm's forms,
-                //that each token is unique to the controller/action/area instead of the default ASP.Net implementation which is that the token is unique
-                //per user.
-                _viewContext.HttpContext.Items["ufprt"] = _encryptedString;
-
             }
 
 
diff --git a/src/Umbraco.Web/Runtime/WebFinalComponent.cs b/src/Umbraco.Web/Runtime/WebFinalComponent.cs
index ba606e8d5e..6177d9b868 100644
--- a/src/Umbraco.Web/Runtime/WebFinalComponent.cs
+++ b/src/Umbraco.Web/Runtime/WebFinalComponent.cs
@@ -36,8 +36,6 @@ namespace Umbraco.Web.Runtime
 
             // ensure WebAPI is initialized, after everything
             GlobalConfiguration.Configuration.EnsureInitialized();
-
-            AntiForgeryConfig.AdditionalDataProvider = new UmbracoAntiForgeryAdditionalDataProvider(AntiForgeryConfig.AdditionalDataProvider);
         }
 
         public void Terminate()
diff --git a/src/Umbraco.Web/Security/UmbracoAntiForgeryAdditionalDataProvider.cs b/src/Umbraco.Web/Security/UmbracoAntiForgeryAdditionalDataProvider.cs
deleted file mode 100644
index c6ad4c6901..0000000000
--- a/src/Umbraco.Web/Security/UmbracoAntiForgeryAdditionalDataProvider.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-using System;
-using Umbraco.Web.Mvc;
-using Umbraco.Core;
-using System.Web.Helpers;
-using System.Web;
-using Newtonsoft.Json;
-using Umbraco.Web.Composing;
-
-namespace Umbraco.Web.Security
-{
-    /// <summary>
-    /// A custom <see cref="IAntiForgeryAdditionalDataProvider"/> to create a unique antiforgery token/validator per form created with BeginUmbracoForm
-    /// </summary>
-    public class UmbracoAntiForgeryAdditionalDataProvider : IAntiForgeryAdditionalDataProvider
-    {
-        private readonly IAntiForgeryAdditionalDataProvider _defaultProvider;
-
-        /// <summary>
-        /// Constructor, allows wrapping a default provider
-        /// </summary>
-        /// <param name="defaultProvider"></param>
-        public UmbracoAntiForgeryAdditionalDataProvider(IAntiForgeryAdditionalDataProvider defaultProvider)
-        {
-            _defaultProvider = defaultProvider;
-        }
-
-        public string GetAdditionalData(HttpContextBase context)
-        {
-            return JsonConvert.SerializeObject(new AdditionalData
-            {
-                Stamp = DateTime.UtcNow.Ticks,
-                //this value will be here if this is a BeginUmbracoForms form
-                Ufprt = context.Items["ufprt"]?.ToString(),
-                //if there was a wrapped provider, add it's value to the json, else just a static value
-                WrappedValue = _defaultProvider?.GetAdditionalData(context) ?? "default"
-            });
-        }
-
-        public bool ValidateAdditionalData(HttpContextBase context, string additionalData)
-        {
-            if (!additionalData.DetectIsJson())
-                return false; //must be json
-
-            AdditionalData json;
-            try
-            {
-                json = JsonConvert.DeserializeObject<AdditionalData>(additionalData);
-            }
-            catch
-            {
-                return false; //couldn't parse
-            }
-
-            if (json.Stamp == default) return false;
-
-            //if there was a wrapped provider, validate it, else validate the static value
-            var validateWrapped = _defaultProvider?.ValidateAdditionalData(context, json.WrappedValue) ?? json.WrappedValue == "default";
-            if (!validateWrapped)
-                return false;
-
-            var ufprtRequest = context.Request["ufprt"]?.ToString();
-
-            //if the custom BeginUmbracoForms route value is not there, then it's nothing more to validate
-            if (ufprtRequest.IsNullOrWhiteSpace() && json.Ufprt.IsNullOrWhiteSpace())
-                return true;
-
-            //if one or the other is null then something is wrong
-            if (!ufprtRequest.IsNullOrWhiteSpace() && json.Ufprt.IsNullOrWhiteSpace()) return false;
-            if (ufprtRequest.IsNullOrWhiteSpace() && !json.Ufprt.IsNullOrWhiteSpace()) return false;
-
-            if (!UmbracoHelper.DecryptAndValidateEncryptedRouteString(json.Ufprt, out var additionalDataParts))
-                return false;
-
-            if (!UmbracoHelper.DecryptAndValidateEncryptedRouteString(ufprtRequest, out var requestParts))
-                return false;
-
-            //ensure they all match
-            return additionalDataParts.Count == requestParts.Count
-                && additionalDataParts[RenderRouteHandler.ReservedAdditionalKeys.Controller] == requestParts[RenderRouteHandler.ReservedAdditionalKeys.Controller]
-                && additionalDataParts[RenderRouteHandler.ReservedAdditionalKeys.Action] == requestParts[RenderRouteHandler.ReservedAdditionalKeys.Action]
-                && additionalDataParts[RenderRouteHandler.ReservedAdditionalKeys.Area] == requestParts[RenderRouteHandler.ReservedAdditionalKeys.Area];
-        }
-
-        internal class AdditionalData
-        {
-            public string Ufprt { get; set; }
-            public long Stamp { get; set; }
-            public string WrappedValue { get; set; }
-        }
-
-    }
-}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 39a05ddbc4..41a3393fa4 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -232,7 +232,6 @@
     <Compile Include="Routing\IPublishedRouter.cs" />
     <Compile Include="Routing\MediaUrlProviderCollection.cs" />
     <Compile Include="Routing\MediaUrlProviderCollectionBuilder.cs" />
-    <Compile Include="Security\UmbracoAntiForgeryAdditionalDataProvider.cs" />
     <Compile Include="Services\DashboardService.cs" />
     <Compile Include="Services\IDashboardService.cs" />
     <Compile Include="Models\Link.cs" />

From d60fc63e789f01202d5c86544b2ed994666fb475 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Mon, 15 Jul 2019 12:23:09 +0200
Subject: [PATCH 149/776] Fix YSOD when editing media types

---
 .../PublishedCache/NuCache/PublishedSnapshotService.cs       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index dad9811af8..f26122d4d0 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -1057,7 +1057,10 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
                 _mediaStore.UpdateContentTypes(removedIds, typesA, kits);
                 _mediaStore.UpdateContentTypes(CreateContentTypes(PublishedItemType.Media, otherIds.ToArray()).ToArray());
-                _mediaStore.NewContentTypes(CreateContentTypes(PublishedItemType.Media, newIds.ToArray()).ToArray());
+                if(newIds != null && newIds.Any())
+                {
+                    _mediaStore.NewContentTypes(CreateContentTypes(PublishedItemType.Media, newIds.ToArray()).ToArray());
+                }
                 scope.Complete();
             }
         }

From f6a8d487ccd6a29487f6ef5f8d9e9aad0e6a54f6 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 15 Jul 2019 13:06:47 +0200
Subject: [PATCH 150/776] AB#1695 -
 https://github.com/umbraco/Umbraco-CMS/issues/5846 Give better exception, if
 a json exception happens doing migration of grid properties in
 ConvertTinyMceAndGridMediaUrlsToLocalLink

---
 ...nvertTinyMceAndGridMediaUrlsToLocalLink.cs | 39 +++++++++++++++----
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs
index bf048bf2bd..5f49680d89 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
 using Newtonsoft.Json;
@@ -36,6 +37,7 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_1_0
 
             var properties = Database.Fetch<PropertyDataDto>(sqlPropertyData);
 
+            var exceptions = new List<Exception>();
             foreach (var property in properties)
             {
                 var value = property.TextValue;
@@ -43,19 +45,34 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_1_0
 
                 if (property.PropertyTypeDto.DataTypeDto.EditorAlias == Constants.PropertyEditors.Aliases.Grid)
                 {
-                    var obj = JsonConvert.DeserializeObject<JObject>(value);
-                    var allControls = obj.SelectTokens("$.sections..rows..areas..controls");
-
-                    foreach (var control in allControls.SelectMany(c => c))
+                    try
                     {
-                        var controlValue = control["value"];
-                        if (controlValue.Type == JTokenType.String)
+                        var obj = JsonConvert.DeserializeObject<JObject>(value);
+                        var allControls = obj.SelectTokens("$.sections..rows..areas..controls");
+
+                        foreach (var control in allControls.SelectMany(c => c))
                         {
-                            control["value"] = UpdateMediaUrls(mediaLinkPattern, controlValue.Value<string>());
+                            var controlValue = control["value"];
+                            if (controlValue.Type == JTokenType.String)
+                            {
+                                control["value"] = UpdateMediaUrls(mediaLinkPattern, controlValue.Value<string>());
+                            }
                         }
+
+                        property.TextValue = JsonConvert.SerializeObject(obj);
+                    }
+                    catch (JsonException e)
+                    {
+                        exceptions.Add(new InvalidOperationException(
+                            "Cannot deserialize the value as json. This can be because the property editor " +
+                            "type is changed from another type into a grid. Old versions of the value in this " +
+                            "property can have the structure from the old property editor type. This needs to be " +
+                            "changed manually before updating the database.\n" +
+                            $"Property info: Id = {property.Id}, LanguageId = {property.LanguageId}, VersionId = {property.VersionId}, Value = {property.Value}"
+                            , e));
+                        continue;
                     }
 
-                    property.TextValue = JsonConvert.SerializeObject(obj);
                 }
                 else
                 {
@@ -65,6 +82,12 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_1_0
                 Database.Update(property);
             }
 
+
+            if (exceptions.Any())
+            {
+                throw new AggregateException(exceptions);
+            }
+
             Context.AddPostMigration<RebuildPublishedSnapshot>();
         }
 

From 77dda5a70f139b272a0e442980f04d9978bf96d4 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 12 Jul 2019 02:57:26 +0200
Subject: [PATCH 151/776] Fixes issue during upgrade where umbraco can't clear
 cdf log files

---
 .../JavaScript/ClientDependencyConfiguration.cs   | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web/JavaScript/ClientDependencyConfiguration.cs b/src/Umbraco.Web/JavaScript/ClientDependencyConfiguration.cs
index 777786675f..2bf069b06d 100644
--- a/src/Umbraco.Web/JavaScript/ClientDependencyConfiguration.cs
+++ b/src/Umbraco.Web/JavaScript/ClientDependencyConfiguration.cs
@@ -106,8 +106,10 @@ namespace Umbraco.Web.JavaScript
             }
 
             try
-            {
-                var fullPath = currentHttpContext.Server.MapPath(XmlFileMapper.FileMapDefaultFolder);
+            {               
+                var fullPath = XmlFileMapper.FileMapDefaultFolder.StartsWith("~/")
+                    ? currentHttpContext.Server.MapPath(XmlFileMapper.FileMapDefaultFolder)
+                    : XmlFileMapper.FileMapDefaultFolder;
                 if (fullPath != null)
                 {
                     cdfTempDirectories.Add(fullPath);
@@ -122,13 +124,12 @@ namespace Umbraco.Web.JavaScript
             var success = true;
             foreach (var directory in cdfTempDirectories)
             {
-                var directoryInfo = new DirectoryInfo(directory);
-                if (directoryInfo.Exists == false)
-                    continue;
-
                 try
                 {
-                    directoryInfo.Delete(true);
+                    if (!Directory.Exists(directory))
+                        continue;
+
+                    Directory.Delete(directory, true);
                 }
                 catch (Exception ex)
                 {

From 2aaca865e76ba45720b5b9954d81a83af6233dbb Mon Sep 17 00:00:00 2001
From: skttl <sk@ecreo.dk>
Date: Fri, 12 Jul 2019 07:33:17 +0200
Subject: [PATCH 152/776] changes innerjoin to left join, to allow folders in
 sql query

---
 src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs b/src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
index 7b10b19e1e..c8fdd8da57 100644
--- a/src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
@@ -370,7 +370,7 @@ namespace Umbraco.Core.Persistence.Repositories
 
                 if (isMedia)
                 {
-                    entitySql.InnerJoin("cmsMedia media").On("media.nodeId = umbracoNode.id");
+                    entitySql.LeftJoin("cmsMedia media").On("media.nodeId = umbracoNode.id");
                 }
 
                 entitySql.LeftJoin("cmsContentType contenttype").On("contenttype.nodeId = content.contentType");

From da71a94c39fbd5403c114344a5d5627adacc88b0 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Tue, 16 Jul 2019 12:45:27 +0200
Subject: [PATCH 153/776] Use IsCollectionEmpty() as per review

---
 .../PublishedCache/NuCache/PublishedSnapshotService.cs          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index f26122d4d0..b78c806824 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -1057,7 +1057,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
                 _mediaStore.UpdateContentTypes(removedIds, typesA, kits);
                 _mediaStore.UpdateContentTypes(CreateContentTypes(PublishedItemType.Media, otherIds.ToArray()).ToArray());
-                if(newIds != null && newIds.Any())
+                if(newIds.IsCollectionEmpty() == false)
                 {
                     _mediaStore.NewContentTypes(CreateContentTypes(PublishedItemType.Media, newIds.ToArray()).ToArray());
                 }

From 09c8ae4e7ec9a3c8e321d8bdaa1f988a9ed62780 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 16 Jul 2019 13:36:16 +0200
Subject: [PATCH 154/776] Fixed null ref exception in related links migrations

---
 .../V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs
index ed1c08f0f8..44f7affe8e 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs
@@ -50,10 +50,10 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
             var properties = Database.Fetch<PropertyDataDto>(sqlPropertyData);
 
             // Create a Multi URL Picker datatype for the converted RelatedLinks data
-            
+
             foreach (var property in properties)
             {
-                var value = property.Value.ToString();
+                var value = property.Value?.ToString();
                 if (string.IsNullOrWhiteSpace(value))
                     continue;
 
@@ -89,7 +89,7 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
                         Name = relatedLink.Caption,
                         Target = relatedLink.NewWindow ? "_blank" : null,
                         Udi = udi,
-                        // Should only have a URL if it's an external link otherwise it wil be a UDI 
+                        // Should only have a URL if it's an external link otherwise it wil be a UDI
                         Url = relatedLink.IsInternal == false ? relatedLink.Link : null
                     };
 
@@ -103,7 +103,7 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
                 Database.Update(property);
             }
 
-            
+
         }
     }
 

From 0feb053e517047bd8941f7234911e8284bd229cc Mon Sep 17 00:00:00 2001
From: Steve Megson <steve@megson.org>
Date: Sun, 14 Jul 2019 17:46:01 +0200
Subject: [PATCH 155/776] Fixes #5852 - TablesForScheduledPublishing

---
 .../V_8_0_0/TablesForScheduledPublishing.cs   | 36 ++++++++++++-------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/TablesForScheduledPublishing.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/TablesForScheduledPublishing.cs
index 70dbe3d29e..2f7ffe8679 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/TablesForScheduledPublishing.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/TablesForScheduledPublishing.cs
@@ -14,11 +14,18 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
         public override void Migrate()
         {
             //Get anything currently scheduled
-            var scheduleSql = new Sql()
-                .Select("nodeId", "releaseDate", "expireDate")
+            var releaseSql = new Sql()
+                .Select("nodeId", "releaseDate")
                 .From("umbracoDocument")
-                .Where("releaseDate IS NOT NULL OR expireDate IS NOT NULL");
-            var schedules = Database.Dictionary<int, (DateTime? releaseDate, DateTime? expireDate)> (scheduleSql);
+                .Where("releaseDate IS NOT NULL");
+            var releases = Database.Dictionary<int, DateTime> (releaseSql);
+
+            var expireSql = new Sql()
+                .Select("nodeId", "expireDate")
+                .From("umbracoDocument")
+                .Where("expireDate IS NOT NULL");
+            var expires = Database.Dictionary<int, DateTime>(expireSql);
+
 
             //drop old cols
             Delete.Column("releaseDate").FromTable("umbracoDocument").Do();
@@ -27,20 +34,25 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
             Create.Table<ContentScheduleDto>(true).Do();
 
             //migrate the schedule
-            foreach(var s in schedules)
+            foreach(var s in releases)
             {
-                var date = s.Value.releaseDate;
+                var date = s.Value;
                 var action = ContentScheduleAction.Release.ToString();
-                if (!date.HasValue)
-                {
-                    date = s.Value.expireDate;
-                    action = ContentScheduleAction.Expire.ToString();
-                }
 
                 Insert.IntoTable(ContentScheduleDto.TableName)
-                    .Row(new { nodeId = s.Key, date = date.Value, action = action })
+                    .Row(new { id = Guid.NewGuid(), nodeId = s.Key, date = date, action = action })
                     .Do();
             }
+
+            foreach (var s in expires)
+            {
+                var date = s.Value;
+                var action = ContentScheduleAction.Expire.ToString();
+
+                Insert.IntoTable(ContentScheduleDto.TableName)
+                    .Row(new { id = Guid.NewGuid(), nodeId = s.Key, date = date, action = action })
+                    .Do();
+            }            
         }
     }
 }

From 3062f40ef5dd8ccc50dfee7c6edd5401690da71a Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 16 Jul 2019 13:43:10 +0200
Subject: [PATCH 156/776] Missing file in project file

---
 src/Umbraco.Core/Umbraco.Core.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index ca9b7d4034..6adce1944f 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -241,6 +241,7 @@
     <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\DefaultPreValueMigrator.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\RenamingPreValueMigrator.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\RichTextPreValueMigrator.cs" />
+    <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\DropDownFlexiblePreValueMigrator.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\MergeDateAndDateTimePropertyEditor.cs" />
     <Compile Include="Models\Entities\EntityExtensions.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\PreValueMigratorBase.cs" />

From 0cbe0b47967f7cc70f8d6291e983a1b706e37405 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 16 Jul 2019 22:34:34 +1000
Subject: [PATCH 157/776] Cherry picks ValidateUmbracoFormRouteStringAttribute
 implementation

---
 .../Controllers/UmbLoginController.cs         |  1 +
 .../Controllers/UmbLoginStatusController.cs   |  1 +
 .../Controllers/UmbProfileController.cs       |  1 +
 .../Controllers/UmbRegisterController.cs      |  1 +
 .../HttpUmbracoFormRouteStringException.cs    | 23 ++++++++
 ...ValidateUmbracoFormRouteStringAttribute.cs | 52 +++++++++++++++++++
 src/Umbraco.Web/Umbraco.Web.csproj            |  2 +
 7 files changed, 81 insertions(+)
 create mode 100644 src/Umbraco.Web/Mvc/HttpUmbracoFormRouteStringException.cs
 create mode 100644 src/Umbraco.Web/Mvc/ValidateUmbracoFormRouteStringAttribute.cs

diff --git a/src/Umbraco.Web/Controllers/UmbLoginController.cs b/src/Umbraco.Web/Controllers/UmbLoginController.cs
index 2980b4a4c0..2ff80e2668 100644
--- a/src/Umbraco.Web/Controllers/UmbLoginController.cs
+++ b/src/Umbraco.Web/Controllers/UmbLoginController.cs
@@ -22,6 +22,7 @@ namespace Umbraco.Web.Controllers
 
         [HttpPost]
         [ValidateAntiForgeryToken]
+        [ValidateUmbracoFormRouteString]
         public ActionResult HandleLogin([Bind(Prefix = "loginModel")]LoginModel model)
         {
             if (ModelState.IsValid == false)
diff --git a/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs b/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
index fdc2de8c5f..8f572404fc 100644
--- a/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
+++ b/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
@@ -24,6 +24,7 @@ namespace Umbraco.Web.Controllers
 
         [HttpPost]
         [ValidateAntiForgeryToken]
+        [ValidateUmbracoFormRouteString]
         public ActionResult HandleLogout([Bind(Prefix = "logoutModel")]PostRedirectModel model)
         {
             if (ModelState.IsValid == false)
diff --git a/src/Umbraco.Web/Controllers/UmbProfileController.cs b/src/Umbraco.Web/Controllers/UmbProfileController.cs
index b14652ad2e..d9333e8e65 100644
--- a/src/Umbraco.Web/Controllers/UmbProfileController.cs
+++ b/src/Umbraco.Web/Controllers/UmbProfileController.cs
@@ -23,6 +23,7 @@ namespace Umbraco.Web.Controllers
 
         [HttpPost]
         [ValidateAntiForgeryToken]
+        [ValidateUmbracoFormRouteString]
         public ActionResult HandleUpdateProfile([Bind(Prefix = "profileModel")] ProfileModel model)
         {
             var provider = Core.Security.MembershipProviderExtensions.GetMembersMembershipProvider();
diff --git a/src/Umbraco.Web/Controllers/UmbRegisterController.cs b/src/Umbraco.Web/Controllers/UmbRegisterController.cs
index b0187d6127..4f4173a67d 100644
--- a/src/Umbraco.Web/Controllers/UmbRegisterController.cs
+++ b/src/Umbraco.Web/Controllers/UmbRegisterController.cs
@@ -24,6 +24,7 @@ namespace Umbraco.Web.Controllers
 
         [HttpPost]
         [ValidateAntiForgeryToken]
+        [ValidateUmbracoFormRouteString]
         public ActionResult HandleRegisterMember([Bind(Prefix = "registerModel")]RegisterModel model)
         {
             if (ModelState.IsValid == false)
diff --git a/src/Umbraco.Web/Mvc/HttpUmbracoFormRouteStringException.cs b/src/Umbraco.Web/Mvc/HttpUmbracoFormRouteStringException.cs
new file mode 100644
index 0000000000..d4734e5d24
--- /dev/null
+++ b/src/Umbraco.Web/Mvc/HttpUmbracoFormRouteStringException.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Net;
+using System.Web;
+
+namespace Umbraco.Web.Mvc
+{
+    /// <summary>
+    /// Exception that occurs when an Umbraco form route string is invalid
+    /// </summary>
+    /// <seealso cref="System.Web.HttpException" />
+    [Serializable]
+    public sealed class HttpUmbracoFormRouteStringException : HttpException
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HttpUmbracoFormRouteStringException" /> class.
+        /// </summary>
+        /// <param name="message">The error message displayed to the client when the exception is thrown.</param>
+        public HttpUmbracoFormRouteStringException(string message)
+            : base(message)
+        { }
+
+    }
+}
diff --git a/src/Umbraco.Web/Mvc/ValidateUmbracoFormRouteStringAttribute.cs b/src/Umbraco.Web/Mvc/ValidateUmbracoFormRouteStringAttribute.cs
new file mode 100644
index 0000000000..a57ce7e7f7
--- /dev/null
+++ b/src/Umbraco.Web/Mvc/ValidateUmbracoFormRouteStringAttribute.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Net;
+using System.Web.Mvc;
+using Umbraco.Core;
+
+namespace Umbraco.Web.Mvc
+{
+    /// <summary>
+    /// Represents an attribute that is used to prevent an invalid Umbraco form request route string on a request.
+    /// </summary>
+    /// <seealso cref="System.Web.Mvc.FilterAttribute" />
+    /// <seealso cref="System.Web.Mvc.IAuthorizationFilter" />
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
+    public sealed class ValidateUmbracoFormRouteStringAttribute : FilterAttribute, IAuthorizationFilter
+    {
+        /// <summary>
+        /// Called when authorization is required.
+        /// </summary>
+        /// <param name="filterContext">The filter context.</param>
+        /// <exception cref="ArgumentNullException">filterContext</exception>
+        /// <exception cref="Umbraco.Web.Mvc.HttpUmbracoFormRouteStringException">The required request field \"ufprt\" is not present.
+        /// or
+        /// The Umbraco form request route string could not be decrypted.
+        /// or
+        /// The provided Umbraco form request route string was meant for a different controller and action.</exception>
+        public void OnAuthorization(AuthorizationContext filterContext)
+        {
+            if (filterContext == null)
+            {
+                throw new ArgumentNullException(nameof(filterContext));
+            }
+
+            var ufprt = filterContext.HttpContext.Request["ufprt"];
+            if (ufprt.IsNullOrWhiteSpace())
+            {
+                throw new HttpUmbracoFormRouteStringException("The required Umbraco request data is invalid.");
+            }
+
+            if (!UmbracoHelper.DecryptAndValidateEncryptedRouteString(ufprt, out var additionalDataParts))
+            {
+                throw new HttpUmbracoFormRouteStringException("The required Umbraco request data is invalid.");
+            }
+
+            if (additionalDataParts[RenderRouteHandler.ReservedAdditionalKeys.Controller] != filterContext.ActionDescriptor.ControllerDescriptor.ControllerName ||
+                additionalDataParts[RenderRouteHandler.ReservedAdditionalKeys.Action] != filterContext.ActionDescriptor.ActionName ||
+                additionalDataParts[RenderRouteHandler.ReservedAdditionalKeys.Area].NullOrWhiteSpaceAsNull() != filterContext.RouteData.DataTokens["area"]?.ToString().NullOrWhiteSpaceAsNull())
+            {
+                throw new HttpUmbracoFormRouteStringException("The required Umbraco request data is invalid.");
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 105a40b4a7..39a05ddbc4 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -219,8 +219,10 @@
     <Compile Include="Models\Mapping\MapperContextExtensions.cs" />
     <Compile Include="Models\PublishedContent\HybridVariationContextAccessor.cs" />
     <Compile Include="Models\TemplateQuery\QueryConditionExtensions.cs" />
+    <Compile Include="Mvc\HttpUmbracoFormRouteStringException.cs" />
     <Compile Include="Mvc\ModelBindingExceptionFilter.cs" />
     <Compile Include="Mvc\SurfaceControllerTypeCollectionBuilder.cs" />
+    <Compile Include="Mvc\ValidateUmbracoFormRouteStringAttribute.cs" />
     <Compile Include="Profiling\WebProfilingController.cs" />
     <Compile Include="PublishedCache\NuCache\Snap\GenObj.cs" />
     <Compile Include="PublishedCache\NuCache\Snap\GenRef.cs" />

From d52420183e85e8a94b70b2cb0c68ab46e6f4a681 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 16 Jul 2019 23:03:26 +1000
Subject: [PATCH 158/776] Cherry picks ValidateUmbracoFormRouteStringAttribute
 implementation and fixes up some logic

---
 ...oAntiForgeryAdditionalDataProviderTests.cs | 157 ------------------
 src/Umbraco.Tests/Umbraco.Tests.csproj        |   1 -
 .../Controllers/UmbLoginController.cs         |   1 +
 .../Controllers/UmbLoginStatusController.cs   |   1 +
 .../Controllers/UmbProfileController.cs       |   1 +
 .../Controllers/UmbRegisterController.cs      |   1 +
 src/Umbraco.Web/HtmlHelperRenderExtensions.cs |   7 -
 .../HttpUmbracoFormRouteStringException.cs    |  23 +++
 ...ValidateUmbracoFormRouteStringAttribute.cs |  52 ++++++
 ...mbracoAntiForgeryAdditionalDataProvider.cs |  91 ----------
 src/Umbraco.Web/Umbraco.Web.csproj            |   3 +-
 src/Umbraco.Web/WebBootManager.cs             |   2 -
 12 files changed, 81 insertions(+), 259 deletions(-)
 delete mode 100644 src/Umbraco.Tests/Security/UmbracoAntiForgeryAdditionalDataProviderTests.cs
 create mode 100644 src/Umbraco.Web/Mvc/HttpUmbracoFormRouteStringException.cs
 create mode 100644 src/Umbraco.Web/Mvc/ValidateUmbracoFormRouteStringAttribute.cs
 delete mode 100644 src/Umbraco.Web/Security/UmbracoAntiForgeryAdditionalDataProvider.cs

diff --git a/src/Umbraco.Tests/Security/UmbracoAntiForgeryAdditionalDataProviderTests.cs b/src/Umbraco.Tests/Security/UmbracoAntiForgeryAdditionalDataProviderTests.cs
deleted file mode 100644
index c81c108e0d..0000000000
--- a/src/Umbraco.Tests/Security/UmbracoAntiForgeryAdditionalDataProviderTests.cs
+++ /dev/null
@@ -1,157 +0,0 @@
-using System.Collections.Specialized;
-using System.Web;
-using System.Web.Helpers;
-using Moq;
-using Newtonsoft.Json;
-using NUnit.Framework;
-using Umbraco.Core;
-using Umbraco.Tests.TestHelpers;
-using Umbraco.Web.Mvc;
-using Umbraco.Web.Security;
-
-namespace Umbraco.Tests.Security
-{
-    [TestFixture]
-    public class UmbracoAntiForgeryAdditionalDataProviderTests
-    {
-        [Test]
-        public void Test_Wrapped_Non_BeginUmbracoForm()
-        {
-            var wrapped = Mock.Of<IAntiForgeryAdditionalDataProvider>(x => x.GetAdditionalData(It.IsAny<HttpContextBase>()) == "custom");
-            var provider = new UmbracoAntiForgeryAdditionalDataProvider(wrapped);
-
-            var httpContextFactory = new FakeHttpContextFactory("/hello/world");
-            var data = provider.GetAdditionalData(httpContextFactory.HttpContext);
-
-            Assert.IsTrue(data.DetectIsJson());
-            var json = JsonConvert.DeserializeObject<UmbracoAntiForgeryAdditionalDataProvider.AdditionalData>(data);
-            Assert.AreEqual(null, json.Ufprt);
-            Assert.IsTrue(json.Stamp != default);
-            Assert.AreEqual("custom", json.WrappedValue);
-        }
-
-        [Test]
-        public void Null_Wrapped_Non_BeginUmbracoForm()
-        {
-            var provider = new UmbracoAntiForgeryAdditionalDataProvider(null);
-
-            var httpContextFactory = new FakeHttpContextFactory("/hello/world");
-            var data = provider.GetAdditionalData(httpContextFactory.HttpContext);
-
-            Assert.IsTrue(data.DetectIsJson());
-            var json = JsonConvert.DeserializeObject<UmbracoAntiForgeryAdditionalDataProvider.AdditionalData>(data);
-            Assert.AreEqual(null, json.Ufprt);
-            Assert.IsTrue(json.Stamp != default);
-            Assert.AreEqual("default", json.WrappedValue);
-        }
-
-        [Test]
-        public void Validate_Non_Json()
-        {
-            var provider = new UmbracoAntiForgeryAdditionalDataProvider(null);
-
-            var httpContextFactory = new FakeHttpContextFactory("/hello/world");
-            var isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "hello");
-
-            Assert.IsFalse(isValid);
-        }
-
-        [Test]
-        public void Validate_Invalid_Json()
-        {
-            var provider = new UmbracoAntiForgeryAdditionalDataProvider(null);
-
-            var httpContextFactory = new FakeHttpContextFactory("/hello/world");
-            var isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "{'Stamp': '0'}");
-            Assert.IsFalse(isValid);
-
-            isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "{'Stamp': ''}");
-            Assert.IsFalse(isValid);
-
-            isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "{'hello': 'world'}");
-            Assert.IsFalse(isValid);
-
-        }
-
-        [Test]
-        public void Validate_No_Request_Ufprt()
-        {
-            var provider = new UmbracoAntiForgeryAdditionalDataProvider(null);
-
-            var httpContextFactory = new FakeHttpContextFactory("/hello/world");
-            //there is a ufprt in the additional data, but not in the request
-            var isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "{'Stamp': '636970328040070330', 'WrappedValue': 'default', 'Ufprt': 'ASBVDFDFDFDF'}");
-            Assert.IsFalse(isValid);
-        }
-
-        [Test]
-        public void Validate_No_AdditionalData_Ufprt()
-        {
-            var provider = new UmbracoAntiForgeryAdditionalDataProvider(null);
-
-            var httpContextFactory = new FakeHttpContextFactory("/hello/world");
-            var requestMock = Mock.Get(httpContextFactory.HttpContext.Request);
-            requestMock.SetupGet(x => x["ufprt"]).Returns("ABCDEFG");
-
-            //there is a ufprt in the additional data, but not in the request
-            var isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "{'Stamp': '636970328040070330', 'WrappedValue': 'default', 'Ufprt': ''}");
-            Assert.IsFalse(isValid);
-        }
-
-        [Test]
-        public void Validate_No_AdditionalData_Or_Request_Ufprt()
-        {
-            var provider = new UmbracoAntiForgeryAdditionalDataProvider(null);
-
-            var httpContextFactory = new FakeHttpContextFactory("/hello/world");
-            
-            //there is a ufprt in the additional data, but not in the request
-            var isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "{'Stamp': '636970328040070330', 'WrappedValue': 'default', 'Ufprt': ''}");
-            Assert.IsTrue(isValid);
-        }
-
-        [Test]
-        public void Validate_Request_And_AdditionalData_Ufprt()
-        {
-            var provider = new UmbracoAntiForgeryAdditionalDataProvider(null);
-
-            var routeParams1 = $"{RenderRouteHandler.ReservedAdditionalKeys.Controller}={HttpUtility.UrlEncode("Test")}&{RenderRouteHandler.ReservedAdditionalKeys.Action}={HttpUtility.UrlEncode("Index")}&{RenderRouteHandler.ReservedAdditionalKeys.Area}=Umbraco";
-            var routeParams2 = $"{RenderRouteHandler.ReservedAdditionalKeys.Controller}={HttpUtility.UrlEncode("Test")}&{RenderRouteHandler.ReservedAdditionalKeys.Action}={HttpUtility.UrlEncode("Index")}&{RenderRouteHandler.ReservedAdditionalKeys.Area}=Umbraco";
-
-            var httpContextFactory = new FakeHttpContextFactory("/hello/world");
-            var requestMock = Mock.Get(httpContextFactory.HttpContext.Request);
-            requestMock.SetupGet(x => x["ufprt"]).Returns(routeParams1.EncryptWithMachineKey());
-
-            var isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "{'Stamp': '636970328040070330', 'WrappedValue': 'default', 'Ufprt': '" + routeParams2.EncryptWithMachineKey() + "'}");
-            Assert.IsTrue(isValid);
-
-            routeParams2 = $"{RenderRouteHandler.ReservedAdditionalKeys.Controller}={HttpUtility.UrlEncode("Invalid")}&{RenderRouteHandler.ReservedAdditionalKeys.Action}={HttpUtility.UrlEncode("Index")}&{RenderRouteHandler.ReservedAdditionalKeys.Area}=Umbraco";
-            isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "{'Stamp': '636970328040070330', 'WrappedValue': 'default', 'Ufprt': '" + routeParams2.EncryptWithMachineKey() + "'}");
-            Assert.IsFalse(isValid);
-        }
-
-        [Test]
-        public void Validate_Wrapped_Request_And_AdditionalData_Ufprt()
-        {
-            var wrapped = Mock.Of<IAntiForgeryAdditionalDataProvider>(x => x.ValidateAdditionalData(It.IsAny<HttpContextBase>(), "custom") == true);
-            var provider = new UmbracoAntiForgeryAdditionalDataProvider(wrapped);
-
-            var routeParams1 = $"{RenderRouteHandler.ReservedAdditionalKeys.Controller}={HttpUtility.UrlEncode("Test")}&{RenderRouteHandler.ReservedAdditionalKeys.Action}={HttpUtility.UrlEncode("Index")}&{RenderRouteHandler.ReservedAdditionalKeys.Area}=Umbraco";
-            var routeParams2 = $"{RenderRouteHandler.ReservedAdditionalKeys.Controller}={HttpUtility.UrlEncode("Test")}&{RenderRouteHandler.ReservedAdditionalKeys.Action}={HttpUtility.UrlEncode("Index")}&{RenderRouteHandler.ReservedAdditionalKeys.Area}=Umbraco";
-
-            var httpContextFactory = new FakeHttpContextFactory("/hello/world");
-            var requestMock = Mock.Get(httpContextFactory.HttpContext.Request);
-            requestMock.SetupGet(x => x["ufprt"]).Returns(routeParams1.EncryptWithMachineKey());
-
-            var isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "{'Stamp': '636970328040070330', 'WrappedValue': 'default', 'Ufprt': '" + routeParams2.EncryptWithMachineKey() + "'}");
-            Assert.IsFalse(isValid);
-
-            isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "{'Stamp': '636970328040070330', 'WrappedValue': 'custom', 'Ufprt': '" + routeParams2.EncryptWithMachineKey() + "'}");
-            Assert.IsTrue(isValid);
-
-            routeParams2 = $"{RenderRouteHandler.ReservedAdditionalKeys.Controller}={HttpUtility.UrlEncode("Invalid")}&{RenderRouteHandler.ReservedAdditionalKeys.Action}={HttpUtility.UrlEncode("Index")}&{RenderRouteHandler.ReservedAdditionalKeys.Area}=Umbraco";
-            isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "{'Stamp': '636970328040070330', 'WrappedValue': 'default', 'Ufprt': '" + routeParams2.EncryptWithMachineKey() + "'}");
-            Assert.IsFalse(isValid);
-        }
-    }
-}
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 7e6fdf4823..72939c12d9 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -197,7 +197,6 @@
     <Compile Include="Packaging\PackageExtractionTests.cs" />
     <Compile Include="Persistence\Repositories\SimilarNodeNameTests.cs" />
     <Compile Include="PublishedContent\StronglyTypedModels\Home.cs" />
-    <Compile Include="Security\UmbracoAntiForgeryAdditionalDataProviderTests.cs" />
     <Compile Include="Services\AuditServiceTests.cs" />
     <Compile Include="Services\ConsentServiceTests.cs" />
     <Compile Include="Services\MemberGroupServiceTests.cs" />
diff --git a/src/Umbraco.Web/Controllers/UmbLoginController.cs b/src/Umbraco.Web/Controllers/UmbLoginController.cs
index ba46d0a17e..a952a944bc 100644
--- a/src/Umbraco.Web/Controllers/UmbLoginController.cs
+++ b/src/Umbraco.Web/Controllers/UmbLoginController.cs
@@ -12,6 +12,7 @@ namespace Umbraco.Web.Controllers
     {
         [HttpPost]
         [ValidateAntiForgeryToken]
+        [ValidateUmbracoFormRouteString]
         public ActionResult HandleLogin([Bind(Prefix = "loginModel")]LoginModel model)
         {
             if (ModelState.IsValid == false)
diff --git a/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs b/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
index 8e063bf2a3..e1c334bf0b 100644
--- a/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
+++ b/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
@@ -13,6 +13,7 @@ namespace Umbraco.Web.Controllers
     {
         [HttpPost]
         [ValidateAntiForgeryToken]
+        [ValidateUmbracoFormRouteString]
         public ActionResult HandleLogout([Bind(Prefix = "logoutModel")]PostRedirectModel model)
         {
             if (ModelState.IsValid == false)
diff --git a/src/Umbraco.Web/Controllers/UmbProfileController.cs b/src/Umbraco.Web/Controllers/UmbProfileController.cs
index 7def7af826..19d2905da1 100644
--- a/src/Umbraco.Web/Controllers/UmbProfileController.cs
+++ b/src/Umbraco.Web/Controllers/UmbProfileController.cs
@@ -16,6 +16,7 @@ namespace Umbraco.Web.Controllers
     {
         [HttpPost]
         [ValidateAntiForgeryToken]
+        [ValidateUmbracoFormRouteString]
         public ActionResult HandleUpdateProfile([Bind(Prefix = "profileModel")] ProfileModel model)
         {
             var provider = global::Umbraco.Core.Security.MembershipProviderExtensions.GetMembersMembershipProvider();
diff --git a/src/Umbraco.Web/Controllers/UmbRegisterController.cs b/src/Umbraco.Web/Controllers/UmbRegisterController.cs
index 7931565c47..3e20277537 100644
--- a/src/Umbraco.Web/Controllers/UmbRegisterController.cs
+++ b/src/Umbraco.Web/Controllers/UmbRegisterController.cs
@@ -11,6 +11,7 @@ namespace Umbraco.Web.Controllers
     {
         [HttpPost]
         [ValidateAntiForgeryToken]
+        [ValidateUmbracoFormRouteString]
         public ActionResult HandleRegisterMember([Bind(Prefix = "registerModel")]RegisterModel model)
         {
             if (ModelState.IsValid == false)
diff --git a/src/Umbraco.Web/HtmlHelperRenderExtensions.cs b/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
index 0e2a2a6450..180cf195aa 100644
--- a/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
+++ b/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
@@ -293,13 +293,6 @@ namespace Umbraco.Web
 			    _controllerName = controllerName;
                 _encryptedString = UmbracoHelper.CreateEncryptedRouteString(controllerName, controllerAction, area, additionalRouteVals);
 
-                //For UmbracoForm's we want to add our routing string to the httpcontext items in the case where anti-forgery tokens are used.
-                //In which case our custom UmbracoAntiForgeryAdditionalDataProvider will kick in and validate the values in the request against
-                //the values that will be appended to the token. This essentially means that when anti-forgery tokens are used with UmbracoForm's forms,
-                //that each token is unique to the controller/action/area instead of the default ASP.Net implementation which is that the token is unique
-                //per user.
-                _viewContext.HttpContext.Items["ufprt"] = _encryptedString;
-
 			}
 
 
diff --git a/src/Umbraco.Web/Mvc/HttpUmbracoFormRouteStringException.cs b/src/Umbraco.Web/Mvc/HttpUmbracoFormRouteStringException.cs
new file mode 100644
index 0000000000..d4734e5d24
--- /dev/null
+++ b/src/Umbraco.Web/Mvc/HttpUmbracoFormRouteStringException.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Net;
+using System.Web;
+
+namespace Umbraco.Web.Mvc
+{
+    /// <summary>
+    /// Exception that occurs when an Umbraco form route string is invalid
+    /// </summary>
+    /// <seealso cref="System.Web.HttpException" />
+    [Serializable]
+    public sealed class HttpUmbracoFormRouteStringException : HttpException
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HttpUmbracoFormRouteStringException" /> class.
+        /// </summary>
+        /// <param name="message">The error message displayed to the client when the exception is thrown.</param>
+        public HttpUmbracoFormRouteStringException(string message)
+            : base(message)
+        { }
+
+    }
+}
diff --git a/src/Umbraco.Web/Mvc/ValidateUmbracoFormRouteStringAttribute.cs b/src/Umbraco.Web/Mvc/ValidateUmbracoFormRouteStringAttribute.cs
new file mode 100644
index 0000000000..f3d0cc0e27
--- /dev/null
+++ b/src/Umbraco.Web/Mvc/ValidateUmbracoFormRouteStringAttribute.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Net;
+using System.Web.Mvc;
+using Umbraco.Core;
+
+namespace Umbraco.Web.Mvc
+{
+    /// <summary>
+    /// Represents an attribute that is used to prevent an invalid Umbraco form request route string on a request.
+    /// </summary>
+    /// <seealso cref="System.Web.Mvc.FilterAttribute" />
+    /// <seealso cref="System.Web.Mvc.IAuthorizationFilter" />
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
+    public sealed class ValidateUmbracoFormRouteStringAttribute : FilterAttribute, IAuthorizationFilter
+    {
+        /// <summary>
+        /// Called when authorization is required.
+        /// </summary>
+        /// <param name="filterContext">The filter context.</param>
+        /// <exception cref="ArgumentNullException">filterContext</exception>
+        /// <exception cref="Umbraco.Web.Mvc.HttpUmbracoFormRouteStringException">The required request field \"ufprt\" is not present.
+        /// or
+        /// The Umbraco form request route string could not be decrypted.
+        /// or
+        /// The provided Umbraco form request route string was meant for a different controller and action.</exception>
+        public void OnAuthorization(AuthorizationContext filterContext)
+        {
+            if (filterContext == null)
+            {
+                throw new ArgumentNullException(nameof(filterContext));
+            }
+
+            var ufprt = filterContext.HttpContext.Request["ufprt"];
+            if (ufprt.IsNullOrWhiteSpace())
+            {
+                throw new HttpUmbracoFormRouteStringException("The required Umbraco request data is invalid.");
+            }
+
+            if (!UmbracoHelper.DecryptAndValidateEncryptedRouteString(ufprt, out var additionalDataParts))
+            {
+                throw new HttpUmbracoFormRouteStringException("The required Umbraco request data is invalid.");
+            }
+
+            if (!additionalDataParts[RenderRouteHandler.ReservedAdditionalKeys.Controller].InvariantEquals(filterContext.ActionDescriptor.ControllerDescriptor.ControllerName) ||
+                !additionalDataParts[RenderRouteHandler.ReservedAdditionalKeys.Action].InvariantEquals(filterContext.ActionDescriptor.ActionName) ||
+                (!additionalDataParts[RenderRouteHandler.ReservedAdditionalKeys.Area].IsNullOrWhiteSpace() && !additionalDataParts[RenderRouteHandler.ReservedAdditionalKeys.Area].InvariantEquals(filterContext.RouteData.DataTokens["area"]?.ToString())))
+            {
+                throw new HttpUmbracoFormRouteStringException("The required Umbraco request data is invalid.");
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Security/UmbracoAntiForgeryAdditionalDataProvider.cs b/src/Umbraco.Web/Security/UmbracoAntiForgeryAdditionalDataProvider.cs
deleted file mode 100644
index 660f7e58fc..0000000000
--- a/src/Umbraco.Web/Security/UmbracoAntiForgeryAdditionalDataProvider.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-using System;
-using Umbraco.Web.Mvc;
-using Umbraco.Core;
-using System.Web.Helpers;
-using System.Web;
-using Newtonsoft.Json;
-
-namespace Umbraco.Web.Security
-{
-    /// <summary>
-    /// A custom <see cref="IAntiForgeryAdditionalDataProvider"/> to create a unique antiforgery token/validator per form created with BeginUmbracoForm
-    /// </summary>
-    public class UmbracoAntiForgeryAdditionalDataProvider : IAntiForgeryAdditionalDataProvider
-    {
-        private readonly IAntiForgeryAdditionalDataProvider _defaultProvider;
-
-        /// <summary>
-        /// Constructor, allows wrapping a default provider
-        /// </summary>
-        /// <param name="defaultProvider"></param>
-        public UmbracoAntiForgeryAdditionalDataProvider(IAntiForgeryAdditionalDataProvider defaultProvider)
-        {
-            _defaultProvider = defaultProvider;
-        }
-
-        public string GetAdditionalData(HttpContextBase context)
-        {
-            return JsonConvert.SerializeObject(new AdditionalData
-            {
-                Stamp = DateTime.UtcNow.Ticks,
-                //this value will be here if this is a BeginUmbracoForms form
-                Ufprt = context.Items["ufprt"]?.ToString(),
-                //if there was a wrapped provider, add it's value to the json, else just a static value
-                WrappedValue = _defaultProvider?.GetAdditionalData(context) ?? "default"
-            });
-        }
-
-        public bool ValidateAdditionalData(HttpContextBase context, string additionalData)
-        {
-            if (!additionalData.DetectIsJson())
-                return false; //must be json
-
-            AdditionalData json;
-            try
-            {
-                json = JsonConvert.DeserializeObject<AdditionalData>(additionalData);
-            }
-            catch
-            {
-                return false; //couldn't parse
-            }
-
-            if (json.Stamp == default) return false;
-
-            //if there was a wrapped provider, validate it, else validate the static value
-            var validateWrapped = _defaultProvider?.ValidateAdditionalData(context, json.WrappedValue) ?? json.WrappedValue == "default";
-            if (!validateWrapped)
-                return false;
-
-            var ufprtRequest = context.Request["ufprt"]?.ToString();
-
-            //if the custom BeginUmbracoForms route value is not there, then it's nothing more to validate
-            if (ufprtRequest.IsNullOrWhiteSpace() && json.Ufprt.IsNullOrWhiteSpace())
-                return true;
-
-            //if one or the other is null then something is wrong
-            if (!ufprtRequest.IsNullOrWhiteSpace() && json.Ufprt.IsNullOrWhiteSpace()) return false;
-            if (ufprtRequest.IsNullOrWhiteSpace() && !json.Ufprt.IsNullOrWhiteSpace()) return false;
-
-            if (!UmbracoHelper.DecryptAndValidateEncryptedRouteString(json.Ufprt, out var additionalDataParts))
-                return false;
-
-            if (!UmbracoHelper.DecryptAndValidateEncryptedRouteString(ufprtRequest, out var requestParts))
-                return false;
-
-            //ensure they all match
-            return additionalDataParts.Count == requestParts.Count
-                && additionalDataParts[RenderRouteHandler.ReservedAdditionalKeys.Controller] == requestParts[RenderRouteHandler.ReservedAdditionalKeys.Controller]
-                && additionalDataParts[RenderRouteHandler.ReservedAdditionalKeys.Action] == requestParts[RenderRouteHandler.ReservedAdditionalKeys.Action]
-                && additionalDataParts[RenderRouteHandler.ReservedAdditionalKeys.Area] == requestParts[RenderRouteHandler.ReservedAdditionalKeys.Area];
-        }
-
-        internal class AdditionalData
-        {
-            public string Ufprt { get; set; }
-            public long Stamp { get; set; }
-            public string WrappedValue { get; set; }
-        }
-
-    }
-}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 167c99b9b9..2fb54a2c80 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -307,7 +307,8 @@
     <Compile Include="Cache\TemplateCacheRefresher.cs" />
     <Compile Include="Cache\UnpublishedPageCacheRefresher.cs" />
     <Compile Include="Cache\UserCacheRefresher.cs" />
-    <Compile Include="Security\UmbracoAntiForgeryAdditionalDataProvider.cs" />
+    <Compile Include="Mvc\HttpUmbracoFormRouteStringException.cs" />
+    <Compile Include="Mvc\ValidateUmbracoFormRouteStringAttribute.cs" />
     <Compile Include="Editors\PreviewController.cs" />
     <Compile Include="Editors\BackOfficeAssetsController.cs" />
     <Compile Include="Features\DisabledFeatures.cs" />
diff --git a/src/Umbraco.Web/WebBootManager.cs b/src/Umbraco.Web/WebBootManager.cs
index ff6fcff164..46b67a60c7 100644
--- a/src/Umbraco.Web/WebBootManager.cs
+++ b/src/Umbraco.Web/WebBootManager.cs
@@ -190,8 +190,6 @@ namespace Umbraco.Web
 
             base.Complete(afterComplete);
 
-            AntiForgeryConfig.AdditionalDataProvider = new UmbracoAntiForgeryAdditionalDataProvider(AntiForgeryConfig.AdditionalDataProvider);
-
             //Now, startup all of our legacy startup handler
             ApplicationEventsResolver.Current.InstantiateLegacyStartupHandlers();
 

From b675f6252c1bb471e5a76c01329844905c379e4a Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 16 Jul 2019 23:07:31 +1000
Subject: [PATCH 159/776] removes files (should have been part of cherry
 pick?), fixes logic

---
 ...oAntiForgeryAdditionalDataProviderTests.cs | 157 ------------------
 src/Umbraco.Tests/Umbraco.Tests.csproj        |   1 -
 ...ValidateUmbracoFormRouteStringAttribute.cs |   6 +-
 src/Umbraco.Web/Runtime/WebFinalComponent.cs  |   2 -
 ...mbracoAntiForgeryAdditionalDataProvider.cs |  92 ----------
 src/Umbraco.Web/Umbraco.Web.csproj            |   1 -
 6 files changed, 3 insertions(+), 256 deletions(-)
 delete mode 100644 src/Umbraco.Tests/Security/UmbracoAntiForgeryAdditionalDataProviderTests.cs
 delete mode 100644 src/Umbraco.Web/Security/UmbracoAntiForgeryAdditionalDataProvider.cs

diff --git a/src/Umbraco.Tests/Security/UmbracoAntiForgeryAdditionalDataProviderTests.cs b/src/Umbraco.Tests/Security/UmbracoAntiForgeryAdditionalDataProviderTests.cs
deleted file mode 100644
index c81c108e0d..0000000000
--- a/src/Umbraco.Tests/Security/UmbracoAntiForgeryAdditionalDataProviderTests.cs
+++ /dev/null
@@ -1,157 +0,0 @@
-using System.Collections.Specialized;
-using System.Web;
-using System.Web.Helpers;
-using Moq;
-using Newtonsoft.Json;
-using NUnit.Framework;
-using Umbraco.Core;
-using Umbraco.Tests.TestHelpers;
-using Umbraco.Web.Mvc;
-using Umbraco.Web.Security;
-
-namespace Umbraco.Tests.Security
-{
-    [TestFixture]
-    public class UmbracoAntiForgeryAdditionalDataProviderTests
-    {
-        [Test]
-        public void Test_Wrapped_Non_BeginUmbracoForm()
-        {
-            var wrapped = Mock.Of<IAntiForgeryAdditionalDataProvider>(x => x.GetAdditionalData(It.IsAny<HttpContextBase>()) == "custom");
-            var provider = new UmbracoAntiForgeryAdditionalDataProvider(wrapped);
-
-            var httpContextFactory = new FakeHttpContextFactory("/hello/world");
-            var data = provider.GetAdditionalData(httpContextFactory.HttpContext);
-
-            Assert.IsTrue(data.DetectIsJson());
-            var json = JsonConvert.DeserializeObject<UmbracoAntiForgeryAdditionalDataProvider.AdditionalData>(data);
-            Assert.AreEqual(null, json.Ufprt);
-            Assert.IsTrue(json.Stamp != default);
-            Assert.AreEqual("custom", json.WrappedValue);
-        }
-
-        [Test]
-        public void Null_Wrapped_Non_BeginUmbracoForm()
-        {
-            var provider = new UmbracoAntiForgeryAdditionalDataProvider(null);
-
-            var httpContextFactory = new FakeHttpContextFactory("/hello/world");
-            var data = provider.GetAdditionalData(httpContextFactory.HttpContext);
-
-            Assert.IsTrue(data.DetectIsJson());
-            var json = JsonConvert.DeserializeObject<UmbracoAntiForgeryAdditionalDataProvider.AdditionalData>(data);
-            Assert.AreEqual(null, json.Ufprt);
-            Assert.IsTrue(json.Stamp != default);
-            Assert.AreEqual("default", json.WrappedValue);
-        }
-
-        [Test]
-        public void Validate_Non_Json()
-        {
-            var provider = new UmbracoAntiForgeryAdditionalDataProvider(null);
-
-            var httpContextFactory = new FakeHttpContextFactory("/hello/world");
-            var isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "hello");
-
-            Assert.IsFalse(isValid);
-        }
-
-        [Test]
-        public void Validate_Invalid_Json()
-        {
-            var provider = new UmbracoAntiForgeryAdditionalDataProvider(null);
-
-            var httpContextFactory = new FakeHttpContextFactory("/hello/world");
-            var isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "{'Stamp': '0'}");
-            Assert.IsFalse(isValid);
-
-            isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "{'Stamp': ''}");
-            Assert.IsFalse(isValid);
-
-            isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "{'hello': 'world'}");
-            Assert.IsFalse(isValid);
-
-        }
-
-        [Test]
-        public void Validate_No_Request_Ufprt()
-        {
-            var provider = new UmbracoAntiForgeryAdditionalDataProvider(null);
-
-            var httpContextFactory = new FakeHttpContextFactory("/hello/world");
-            //there is a ufprt in the additional data, but not in the request
-            var isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "{'Stamp': '636970328040070330', 'WrappedValue': 'default', 'Ufprt': 'ASBVDFDFDFDF'}");
-            Assert.IsFalse(isValid);
-        }
-
-        [Test]
-        public void Validate_No_AdditionalData_Ufprt()
-        {
-            var provider = new UmbracoAntiForgeryAdditionalDataProvider(null);
-
-            var httpContextFactory = new FakeHttpContextFactory("/hello/world");
-            var requestMock = Mock.Get(httpContextFactory.HttpContext.Request);
-            requestMock.SetupGet(x => x["ufprt"]).Returns("ABCDEFG");
-
-            //there is a ufprt in the additional data, but not in the request
-            var isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "{'Stamp': '636970328040070330', 'WrappedValue': 'default', 'Ufprt': ''}");
-            Assert.IsFalse(isValid);
-        }
-
-        [Test]
-        public void Validate_No_AdditionalData_Or_Request_Ufprt()
-        {
-            var provider = new UmbracoAntiForgeryAdditionalDataProvider(null);
-
-            var httpContextFactory = new FakeHttpContextFactory("/hello/world");
-            
-            //there is a ufprt in the additional data, but not in the request
-            var isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "{'Stamp': '636970328040070330', 'WrappedValue': 'default', 'Ufprt': ''}");
-            Assert.IsTrue(isValid);
-        }
-
-        [Test]
-        public void Validate_Request_And_AdditionalData_Ufprt()
-        {
-            var provider = new UmbracoAntiForgeryAdditionalDataProvider(null);
-
-            var routeParams1 = $"{RenderRouteHandler.ReservedAdditionalKeys.Controller}={HttpUtility.UrlEncode("Test")}&{RenderRouteHandler.ReservedAdditionalKeys.Action}={HttpUtility.UrlEncode("Index")}&{RenderRouteHandler.ReservedAdditionalKeys.Area}=Umbraco";
-            var routeParams2 = $"{RenderRouteHandler.ReservedAdditionalKeys.Controller}={HttpUtility.UrlEncode("Test")}&{RenderRouteHandler.ReservedAdditionalKeys.Action}={HttpUtility.UrlEncode("Index")}&{RenderRouteHandler.ReservedAdditionalKeys.Area}=Umbraco";
-
-            var httpContextFactory = new FakeHttpContextFactory("/hello/world");
-            var requestMock = Mock.Get(httpContextFactory.HttpContext.Request);
-            requestMock.SetupGet(x => x["ufprt"]).Returns(routeParams1.EncryptWithMachineKey());
-
-            var isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "{'Stamp': '636970328040070330', 'WrappedValue': 'default', 'Ufprt': '" + routeParams2.EncryptWithMachineKey() + "'}");
-            Assert.IsTrue(isValid);
-
-            routeParams2 = $"{RenderRouteHandler.ReservedAdditionalKeys.Controller}={HttpUtility.UrlEncode("Invalid")}&{RenderRouteHandler.ReservedAdditionalKeys.Action}={HttpUtility.UrlEncode("Index")}&{RenderRouteHandler.ReservedAdditionalKeys.Area}=Umbraco";
-            isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "{'Stamp': '636970328040070330', 'WrappedValue': 'default', 'Ufprt': '" + routeParams2.EncryptWithMachineKey() + "'}");
-            Assert.IsFalse(isValid);
-        }
-
-        [Test]
-        public void Validate_Wrapped_Request_And_AdditionalData_Ufprt()
-        {
-            var wrapped = Mock.Of<IAntiForgeryAdditionalDataProvider>(x => x.ValidateAdditionalData(It.IsAny<HttpContextBase>(), "custom") == true);
-            var provider = new UmbracoAntiForgeryAdditionalDataProvider(wrapped);
-
-            var routeParams1 = $"{RenderRouteHandler.ReservedAdditionalKeys.Controller}={HttpUtility.UrlEncode("Test")}&{RenderRouteHandler.ReservedAdditionalKeys.Action}={HttpUtility.UrlEncode("Index")}&{RenderRouteHandler.ReservedAdditionalKeys.Area}=Umbraco";
-            var routeParams2 = $"{RenderRouteHandler.ReservedAdditionalKeys.Controller}={HttpUtility.UrlEncode("Test")}&{RenderRouteHandler.ReservedAdditionalKeys.Action}={HttpUtility.UrlEncode("Index")}&{RenderRouteHandler.ReservedAdditionalKeys.Area}=Umbraco";
-
-            var httpContextFactory = new FakeHttpContextFactory("/hello/world");
-            var requestMock = Mock.Get(httpContextFactory.HttpContext.Request);
-            requestMock.SetupGet(x => x["ufprt"]).Returns(routeParams1.EncryptWithMachineKey());
-
-            var isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "{'Stamp': '636970328040070330', 'WrappedValue': 'default', 'Ufprt': '" + routeParams2.EncryptWithMachineKey() + "'}");
-            Assert.IsFalse(isValid);
-
-            isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "{'Stamp': '636970328040070330', 'WrappedValue': 'custom', 'Ufprt': '" + routeParams2.EncryptWithMachineKey() + "'}");
-            Assert.IsTrue(isValid);
-
-            routeParams2 = $"{RenderRouteHandler.ReservedAdditionalKeys.Controller}={HttpUtility.UrlEncode("Invalid")}&{RenderRouteHandler.ReservedAdditionalKeys.Action}={HttpUtility.UrlEncode("Index")}&{RenderRouteHandler.ReservedAdditionalKeys.Area}=Umbraco";
-            isValid = provider.ValidateAdditionalData(httpContextFactory.HttpContext, "{'Stamp': '636970328040070330', 'WrappedValue': 'default', 'Ufprt': '" + routeParams2.EncryptWithMachineKey() + "'}");
-            Assert.IsFalse(isValid);
-        }
-    }
-}
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index cc569d6989..4f4a83dc26 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -147,7 +147,6 @@
     <Compile Include="Routing\MediaUrlProviderTests.cs" />
     <Compile Include="Runtimes\StandaloneTests.cs" />
     <Compile Include="Routing\GetContentUrlsTests.cs" />
-    <Compile Include="Security\UmbracoAntiForgeryAdditionalDataProviderTests.cs" />
     <Compile Include="Services\AmbiguousEventTests.cs" />
     <Compile Include="Services\ContentServiceEventTests.cs" />
     <Compile Include="Services\ContentServicePublishBranchTests.cs" />
diff --git a/src/Umbraco.Web/Mvc/ValidateUmbracoFormRouteStringAttribute.cs b/src/Umbraco.Web/Mvc/ValidateUmbracoFormRouteStringAttribute.cs
index a57ce7e7f7..f3d0cc0e27 100644
--- a/src/Umbraco.Web/Mvc/ValidateUmbracoFormRouteStringAttribute.cs
+++ b/src/Umbraco.Web/Mvc/ValidateUmbracoFormRouteStringAttribute.cs
@@ -41,9 +41,9 @@ namespace Umbraco.Web.Mvc
                 throw new HttpUmbracoFormRouteStringException("The required Umbraco request data is invalid.");
             }
 
-            if (additionalDataParts[RenderRouteHandler.ReservedAdditionalKeys.Controller] != filterContext.ActionDescriptor.ControllerDescriptor.ControllerName ||
-                additionalDataParts[RenderRouteHandler.ReservedAdditionalKeys.Action] != filterContext.ActionDescriptor.ActionName ||
-                additionalDataParts[RenderRouteHandler.ReservedAdditionalKeys.Area].NullOrWhiteSpaceAsNull() != filterContext.RouteData.DataTokens["area"]?.ToString().NullOrWhiteSpaceAsNull())
+            if (!additionalDataParts[RenderRouteHandler.ReservedAdditionalKeys.Controller].InvariantEquals(filterContext.ActionDescriptor.ControllerDescriptor.ControllerName) ||
+                !additionalDataParts[RenderRouteHandler.ReservedAdditionalKeys.Action].InvariantEquals(filterContext.ActionDescriptor.ActionName) ||
+                (!additionalDataParts[RenderRouteHandler.ReservedAdditionalKeys.Area].IsNullOrWhiteSpace() && !additionalDataParts[RenderRouteHandler.ReservedAdditionalKeys.Area].InvariantEquals(filterContext.RouteData.DataTokens["area"]?.ToString())))
             {
                 throw new HttpUmbracoFormRouteStringException("The required Umbraco request data is invalid.");
             }
diff --git a/src/Umbraco.Web/Runtime/WebFinalComponent.cs b/src/Umbraco.Web/Runtime/WebFinalComponent.cs
index ba606e8d5e..6177d9b868 100644
--- a/src/Umbraco.Web/Runtime/WebFinalComponent.cs
+++ b/src/Umbraco.Web/Runtime/WebFinalComponent.cs
@@ -36,8 +36,6 @@ namespace Umbraco.Web.Runtime
 
             // ensure WebAPI is initialized, after everything
             GlobalConfiguration.Configuration.EnsureInitialized();
-
-            AntiForgeryConfig.AdditionalDataProvider = new UmbracoAntiForgeryAdditionalDataProvider(AntiForgeryConfig.AdditionalDataProvider);
         }
 
         public void Terminate()
diff --git a/src/Umbraco.Web/Security/UmbracoAntiForgeryAdditionalDataProvider.cs b/src/Umbraco.Web/Security/UmbracoAntiForgeryAdditionalDataProvider.cs
deleted file mode 100644
index c6ad4c6901..0000000000
--- a/src/Umbraco.Web/Security/UmbracoAntiForgeryAdditionalDataProvider.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-using System;
-using Umbraco.Web.Mvc;
-using Umbraco.Core;
-using System.Web.Helpers;
-using System.Web;
-using Newtonsoft.Json;
-using Umbraco.Web.Composing;
-
-namespace Umbraco.Web.Security
-{
-    /// <summary>
-    /// A custom <see cref="IAntiForgeryAdditionalDataProvider"/> to create a unique antiforgery token/validator per form created with BeginUmbracoForm
-    /// </summary>
-    public class UmbracoAntiForgeryAdditionalDataProvider : IAntiForgeryAdditionalDataProvider
-    {
-        private readonly IAntiForgeryAdditionalDataProvider _defaultProvider;
-
-        /// <summary>
-        /// Constructor, allows wrapping a default provider
-        /// </summary>
-        /// <param name="defaultProvider"></param>
-        public UmbracoAntiForgeryAdditionalDataProvider(IAntiForgeryAdditionalDataProvider defaultProvider)
-        {
-            _defaultProvider = defaultProvider;
-        }
-
-        public string GetAdditionalData(HttpContextBase context)
-        {
-            return JsonConvert.SerializeObject(new AdditionalData
-            {
-                Stamp = DateTime.UtcNow.Ticks,
-                //this value will be here if this is a BeginUmbracoForms form
-                Ufprt = context.Items["ufprt"]?.ToString(),
-                //if there was a wrapped provider, add it's value to the json, else just a static value
-                WrappedValue = _defaultProvider?.GetAdditionalData(context) ?? "default"
-            });
-        }
-
-        public bool ValidateAdditionalData(HttpContextBase context, string additionalData)
-        {
-            if (!additionalData.DetectIsJson())
-                return false; //must be json
-
-            AdditionalData json;
-            try
-            {
-                json = JsonConvert.DeserializeObject<AdditionalData>(additionalData);
-            }
-            catch
-            {
-                return false; //couldn't parse
-            }
-
-            if (json.Stamp == default) return false;
-
-            //if there was a wrapped provider, validate it, else validate the static value
-            var validateWrapped = _defaultProvider?.ValidateAdditionalData(context, json.WrappedValue) ?? json.WrappedValue == "default";
-            if (!validateWrapped)
-                return false;
-
-            var ufprtRequest = context.Request["ufprt"]?.ToString();
-
-            //if the custom BeginUmbracoForms route value is not there, then it's nothing more to validate
-            if (ufprtRequest.IsNullOrWhiteSpace() && json.Ufprt.IsNullOrWhiteSpace())
-                return true;
-
-            //if one or the other is null then something is wrong
-            if (!ufprtRequest.IsNullOrWhiteSpace() && json.Ufprt.IsNullOrWhiteSpace()) return false;
-            if (ufprtRequest.IsNullOrWhiteSpace() && !json.Ufprt.IsNullOrWhiteSpace()) return false;
-
-            if (!UmbracoHelper.DecryptAndValidateEncryptedRouteString(json.Ufprt, out var additionalDataParts))
-                return false;
-
-            if (!UmbracoHelper.DecryptAndValidateEncryptedRouteString(ufprtRequest, out var requestParts))
-                return false;
-
-            //ensure they all match
-            return additionalDataParts.Count == requestParts.Count
-                && additionalDataParts[RenderRouteHandler.ReservedAdditionalKeys.Controller] == requestParts[RenderRouteHandler.ReservedAdditionalKeys.Controller]
-                && additionalDataParts[RenderRouteHandler.ReservedAdditionalKeys.Action] == requestParts[RenderRouteHandler.ReservedAdditionalKeys.Action]
-                && additionalDataParts[RenderRouteHandler.ReservedAdditionalKeys.Area] == requestParts[RenderRouteHandler.ReservedAdditionalKeys.Area];
-        }
-
-        internal class AdditionalData
-        {
-            public string Ufprt { get; set; }
-            public long Stamp { get; set; }
-            public string WrappedValue { get; set; }
-        }
-
-    }
-}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 39a05ddbc4..41a3393fa4 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -232,7 +232,6 @@
     <Compile Include="Routing\IPublishedRouter.cs" />
     <Compile Include="Routing\MediaUrlProviderCollection.cs" />
     <Compile Include="Routing\MediaUrlProviderCollectionBuilder.cs" />
-    <Compile Include="Security\UmbracoAntiForgeryAdditionalDataProvider.cs" />
     <Compile Include="Services\DashboardService.cs" />
     <Compile Include="Services\IDashboardService.cs" />
     <Compile Include="Models\Link.cs" />

From bfb69a34ef2353229d390b9129103e61f6b4c704 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 17 Jul 2019 21:15:18 +1000
Subject: [PATCH 160/776] re-adds back in the serialization overloads for the
 custom exception, re-adds detailed error messages, adds more documentation.
 Adds unit tests.

---
 src/Umbraco.Tests/Umbraco.Tests.csproj        |  1 +
 .../Mvc/HtmlHelperExtensionMethodsTests.cs    |  3 +-
 ...ateUmbracoFormRouteStringAttributeTests.cs | 37 +++++++++++++++++++
 .../HttpUmbracoFormRouteStringException.cs    | 18 +++++++++
 ...ValidateUmbracoFormRouteStringAttribute.cs | 28 +++++++++-----
 src/Umbraco.Web/UmbracoHelper.cs              |  2 +-
 6 files changed, 78 insertions(+), 11 deletions(-)
 create mode 100644 src/Umbraco.Tests/Web/Mvc/ValidateUmbracoFormRouteStringAttributeTests.cs

diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 72939c12d9..d45c556d37 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -398,6 +398,7 @@
     <Compile Include="Models\ContentExtensionsTests.cs" />
     <Compile Include="Models\UserExtensionsTests.cs" />
     <Compile Include="Web\Mvc\MergeParentContextViewDataAttributeTests.cs" />
+    <Compile Include="Web\Mvc\ValidateUmbracoFormRouteStringAttributeTests.cs" />
     <Compile Include="Web\Mvc\ViewDataDictionaryExtensionTests.cs" />
     <Compile Include="Persistence\PetaPocoExtensionsTest.cs" />
     <Compile Include="Persistence\Querying\ContentTypeSqlMappingTests.cs" />
diff --git a/src/Umbraco.Tests/Web/Mvc/HtmlHelperExtensionMethodsTests.cs b/src/Umbraco.Tests/Web/Mvc/HtmlHelperExtensionMethodsTests.cs
index e7e4f363c1..7be0717c7e 100644
--- a/src/Umbraco.Tests/Web/Mvc/HtmlHelperExtensionMethodsTests.cs
+++ b/src/Umbraco.Tests/Web/Mvc/HtmlHelperExtensionMethodsTests.cs
@@ -4,7 +4,8 @@ using Umbraco.Web;
 
 namespace Umbraco.Tests.Web.Mvc
 {
-	[TestFixture]
+
+    [TestFixture]
 	public class HtmlHelperExtensionMethodsTests
 	{
 		[SetUp]
diff --git a/src/Umbraco.Tests/Web/Mvc/ValidateUmbracoFormRouteStringAttributeTests.cs b/src/Umbraco.Tests/Web/Mvc/ValidateUmbracoFormRouteStringAttributeTests.cs
new file mode 100644
index 0000000000..a942f846a0
--- /dev/null
+++ b/src/Umbraco.Tests/Web/Mvc/ValidateUmbracoFormRouteStringAttributeTests.cs
@@ -0,0 +1,37 @@
+using NUnit.Framework;
+using Umbraco.Web;
+using Umbraco.Web.Mvc;
+
+namespace Umbraco.Tests.Web.Mvc
+{
+    [TestFixture]
+    public class ValidateUmbracoFormRouteStringAttributeTests
+    {
+        [Test]
+        public void Validate_Route_String()
+        {
+            var attribute = new ValidateUmbracoFormRouteStringAttribute();
+
+            Assert.Throws<HttpUmbracoFormRouteStringException>(() => attribute.ValidateRouteString(null, null, null, null));
+
+            const string ControllerName = "Test";
+            const string ControllerAction = "Index";
+            const string Area = "MyArea";
+            var validUfprt = UmbracoHelper.CreateEncryptedRouteString(ControllerName, ControllerAction, Area);
+
+            var invalidUfprt = validUfprt + "z";
+            Assert.Throws<HttpUmbracoFormRouteStringException>(() => attribute.ValidateRouteString(invalidUfprt, null, null, null));
+
+            Assert.Throws<HttpUmbracoFormRouteStringException>(() => attribute.ValidateRouteString(validUfprt, ControllerName, ControllerAction, "doesntMatch"));
+            Assert.Throws<HttpUmbracoFormRouteStringException>(() => attribute.ValidateRouteString(validUfprt, ControllerName, ControllerAction, null));
+            Assert.Throws<HttpUmbracoFormRouteStringException>(() => attribute.ValidateRouteString(validUfprt, ControllerName, "doesntMatch", Area));
+            Assert.Throws<HttpUmbracoFormRouteStringException>(() => attribute.ValidateRouteString(validUfprt, ControllerName, null, Area));
+            Assert.Throws<HttpUmbracoFormRouteStringException>(() => attribute.ValidateRouteString(validUfprt, "doesntMatch", ControllerAction, Area));
+            Assert.Throws<HttpUmbracoFormRouteStringException>(() => attribute.ValidateRouteString(validUfprt, null, ControllerAction, Area));
+
+            Assert.DoesNotThrow(() => attribute.ValidateRouteString(validUfprt, ControllerName, ControllerAction, Area));
+            Assert.DoesNotThrow(() => attribute.ValidateRouteString(validUfprt, ControllerName.ToLowerInvariant(), ControllerAction.ToLowerInvariant(), Area.ToLowerInvariant()));
+        }
+
+    }
+}
diff --git a/src/Umbraco.Web/Mvc/HttpUmbracoFormRouteStringException.cs b/src/Umbraco.Web/Mvc/HttpUmbracoFormRouteStringException.cs
index d4734e5d24..b08fde081a 100644
--- a/src/Umbraco.Web/Mvc/HttpUmbracoFormRouteStringException.cs
+++ b/src/Umbraco.Web/Mvc/HttpUmbracoFormRouteStringException.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Net;
+using System.Runtime.Serialization;
 using System.Web;
 
 namespace Umbraco.Web.Mvc
@@ -11,6 +12,14 @@ namespace Umbraco.Web.Mvc
     [Serializable]
     public sealed class HttpUmbracoFormRouteStringException : HttpException
     {
+        /// Initializes a new instance of the <see cref="HttpUmbracoFormRouteStringException" /> class.
+        /// </summary>
+        /// <param name="info">The <see cref="T:System.Runtime.Serialization.SerializationInfo" /> that holds the serialized object data about the exception being thrown.</param>
+        /// <param name="context">The <see cref="T:System.Runtime.Serialization.StreamingContext" /> that holds the contextual information about the source or destination.</param>
+        private HttpUmbracoFormRouteStringException(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        { }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="HttpUmbracoFormRouteStringException" /> class.
         /// </summary>
@@ -19,5 +28,14 @@ namespace Umbraco.Web.Mvc
             : base(message)
         { }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HttpUmbracoFormRouteStringException" /> class.
+        /// </summary>
+        /// <param name="message">The error message displayed to the client when the exception is thrown.</param>
+        /// <param name="innerException">The <see cref="P:System.Exception.InnerException" />, if any, that threw the current exception.</param>
+        public HttpUmbracoFormRouteStringException(string message, Exception innerException)
+            : base(message, innerException)
+        { }
+
     }
 }
diff --git a/src/Umbraco.Web/Mvc/ValidateUmbracoFormRouteStringAttribute.cs b/src/Umbraco.Web/Mvc/ValidateUmbracoFormRouteStringAttribute.cs
index f3d0cc0e27..8d929197e1 100644
--- a/src/Umbraco.Web/Mvc/ValidateUmbracoFormRouteStringAttribute.cs
+++ b/src/Umbraco.Web/Mvc/ValidateUmbracoFormRouteStringAttribute.cs
@@ -1,15 +1,21 @@
 using System;
 using System.Net;
+using System.Net.Http;
 using System.Web.Mvc;
 using Umbraco.Core;
 
 namespace Umbraco.Web.Mvc
 {
     /// <summary>
-    /// Represents an attribute that is used to prevent an invalid Umbraco form request route string on a request.
+    /// Attribute used to check that the request contains a valid Umbraco form request string.
     /// </summary>
     /// <seealso cref="System.Web.Mvc.FilterAttribute" />
     /// <seealso cref="System.Web.Mvc.IAuthorizationFilter" />
+    /// <remarks>
+    /// Applying this attribute/filter to a <see cref="SurfaceController"/> or SurfaceController Action will ensure that the Action can only be executed
+    /// when it is routed to from within Umbraco, typically when rendering a form with BegingUmbracoForm. It will mean that the natural MVC route for this Action
+    /// will fail with a <see cref="HttpUmbracoFormRouteStringException"/>.
+    /// </remarks>
     [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
     public sealed class ValidateUmbracoFormRouteStringAttribute : FilterAttribute, IAuthorizationFilter
     {
@@ -26,27 +32,31 @@ namespace Umbraco.Web.Mvc
         public void OnAuthorization(AuthorizationContext filterContext)
         {
             if (filterContext == null)
-            {
                 throw new ArgumentNullException(nameof(filterContext));
-            }
 
             var ufprt = filterContext.HttpContext.Request["ufprt"];
+            ValidateRouteString(ufprt, filterContext.ActionDescriptor?.ControllerDescriptor.ControllerName, filterContext.ActionDescriptor?.ActionName, filterContext.RouteData?.DataTokens["area"]?.ToString());
+        }
+
+        public void ValidateRouteString(string ufprt, string currentController, string currentAction, string currentArea)
+        {
             if (ufprt.IsNullOrWhiteSpace())
             {
-                throw new HttpUmbracoFormRouteStringException("The required Umbraco request data is invalid.");
+                throw new HttpUmbracoFormRouteStringException("The required request field \"ufprt\" is not present.");
             }
 
             if (!UmbracoHelper.DecryptAndValidateEncryptedRouteString(ufprt, out var additionalDataParts))
             {
-                throw new HttpUmbracoFormRouteStringException("The required Umbraco request data is invalid.");
+                throw new HttpUmbracoFormRouteStringException("The Umbraco form request route string could not be decrypted.");
             }
 
-            if (!additionalDataParts[RenderRouteHandler.ReservedAdditionalKeys.Controller].InvariantEquals(filterContext.ActionDescriptor.ControllerDescriptor.ControllerName) ||
-                !additionalDataParts[RenderRouteHandler.ReservedAdditionalKeys.Action].InvariantEquals(filterContext.ActionDescriptor.ActionName) ||
-                (!additionalDataParts[RenderRouteHandler.ReservedAdditionalKeys.Area].IsNullOrWhiteSpace() && !additionalDataParts[RenderRouteHandler.ReservedAdditionalKeys.Area].InvariantEquals(filterContext.RouteData.DataTokens["area"]?.ToString())))
+            if (!additionalDataParts[RenderRouteHandler.ReservedAdditionalKeys.Controller].InvariantEquals(currentController) ||
+                !additionalDataParts[RenderRouteHandler.ReservedAdditionalKeys.Action].InvariantEquals(currentAction) ||
+                (!additionalDataParts[RenderRouteHandler.ReservedAdditionalKeys.Area].IsNullOrWhiteSpace() && !additionalDataParts[RenderRouteHandler.ReservedAdditionalKeys.Area].InvariantEquals(currentArea)))
             {
-                throw new HttpUmbracoFormRouteStringException("The required Umbraco request data is invalid.");
+                throw new HttpUmbracoFormRouteStringException("The provided Umbraco form request route string was meant for a different controller and action.");
             }
+
         }
     }
 }
diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs
index c00d37f216..5320b6085a 100644
--- a/src/Umbraco.Web/UmbracoHelper.cs
+++ b/src/Umbraco.Web/UmbracoHelper.cs
@@ -1656,7 +1656,7 @@ namespace Umbraco.Web
             {
                 decryptedString = ufprt.DecryptWithMachineKey();
             }
-            catch (FormatException)
+            catch (Exception ex) when (ex is FormatException || ex is ArgumentException)
             {
                 LogHelper.Warn<UmbracoHelper>("A value was detected in the ufprt parameter but Umbraco could not decrypt the string");
                 parts = null;

From 14c4c4815d20de5d2cc69868d303ce58309bd7ba Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 17 Jul 2019 21:35:43 +1000
Subject: [PATCH 161/776] bumps version

---
 src/SolutionInfo.cs                              | 4 ++--
 src/Umbraco.Core/Configuration/UmbracoVersion.cs | 2 +-
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj         | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index 0d6b3bcc6b..3a85915cf5 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -11,5 +11,5 @@ using System.Resources;
 
 [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyFileVersion("7.15.0")]
-[assembly: AssemblyInformationalVersion("7.15.0")]
+[assembly: AssemblyFileVersion("7.15.1")]
+[assembly: AssemblyInformationalVersion("7.15.1")]
diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
index 6bb5dbf78e..f23078dbd0 100644
--- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
@@ -6,7 +6,7 @@ namespace Umbraco.Core.Configuration
 {
     public class UmbracoVersion
     {
-        private static readonly Version Version = new Version("7.15.0");
+        private static readonly Version Version = new Version("7.15.1");
 
         /// <summary>
         /// Gets the current version of Umbraco.
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index a0624a2dd7..6884f21bcf 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -1027,9 +1027,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
         <WebProjectProperties>
           <UseIIS>True</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>7150</DevelopmentServerPort>
+          <DevelopmentServerPort>7151</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:7150</IISUrl>
+          <IISUrl>http://localhost:7151</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

From 26d4d056be662a3e91e33740c9813b1604c5be96 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 17 Jul 2019 22:28:06 +1000
Subject: [PATCH 162/776] bumps version

---
 src/SolutionInfo.cs                      | 4 ++--
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index 9ed398d52f..841e054aee 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -18,5 +18,5 @@ using System.Resources;
 [assembly: AssemblyVersion("8.0.0")]
 
 // these are FYI and changed automatically
-[assembly: AssemblyFileVersion("8.1.0")]
-[assembly: AssemblyInformationalVersion("8.1.0")]
+[assembly: AssemblyFileVersion("8.1.1")]
+[assembly: AssemblyInformationalVersion("8.1.1")]
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index b27f6aa335..e58f44e1ae 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -345,9 +345,9 @@
         <WebProjectProperties>
           <UseIIS>False</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>8100</DevelopmentServerPort>
+          <DevelopmentServerPort>8110</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:8100</IISUrl>
+          <IISUrl>http://localhost:8110</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

From 79159b684dabcbe8b54597691380bb17982285cf Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 17 Jul 2019 14:30:02 +0200
Subject: [PATCH 163/776] https://github.com/umbraco/Umbraco-CMS/issues/5902 -
 Fixed issue with migration of Umbraco.Date if it was never saved in v7, the
 default format was added the time-part. - Fixed issue with warnings of
 migrations of build in types, that was renamed between v7 and v8. These are
 handled correct. - Added constants for some of the legacy property editor
 aliases.

---
 src/Umbraco.Core/Constants-PropertyEditors.cs | 17 ++++++++++
 .../ConvertRelatedLinksToMultiUrlPicker.cs    |  4 +--
 .../Upgrade/V_8_0_0/DataTypeMigration.cs      | 34 +++++++++++++++----
 .../ContentPickerPreValueMigrator.cs          |  2 +-
 .../DataTypes/MediaPickerPreValueMigrator.cs  |  6 ++--
 .../MergeDateAndDateTimePropertyEditor.cs     | 10 +++++-
 .../V_8_0_0/PropertyEditorsMigration.cs       | 14 ++++----
 7 files changed, 66 insertions(+), 21 deletions(-)

diff --git a/src/Umbraco.Core/Constants-PropertyEditors.cs b/src/Umbraco.Core/Constants-PropertyEditors.cs
index 0c2e246721..b48286f197 100644
--- a/src/Umbraco.Core/Constants-PropertyEditors.cs
+++ b/src/Umbraco.Core/Constants-PropertyEditors.cs
@@ -14,6 +14,23 @@ namespace Umbraco.Core
             /// </summary>
             public const string InternalGenericPropertiesPrefix = "_umb_";
 
+            public static class Legacy
+            {
+                public static class Aliases
+                {
+                    public const string Textbox = "Umbraco.Textbox";
+                    public const string Date = "Umbraco.Date";
+                    public const string ContentPicker2 = "Umbraco.ContentPicker2";
+                    public const string MediaPicker2 = "Umbraco.MediaPicker2";
+                    public const string MemberPicker2 = "Umbraco.MemberPicker2";
+                    public const string MultiNodeTreePicker2 = "Umbraco.MultiNodeTreePicker2";
+                    public const string TextboxMultiple = "Umbraco.TextboxMultiple";
+                    public const string RelatedLinks2 = "Umbraco.RelatedLinks2";
+                    public const string RelatedLinks = "Umbraco.RelatedLinks";
+
+                }
+            }
+
             /// <summary>
             /// Defines Umbraco built-in property editor aliases.
             /// </summary>
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs
index 44f7affe8e..4802750f4b 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs
@@ -19,8 +19,8 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
             var sqlDataTypes = Sql()
                 .Select<DataTypeDto>()
                 .From<DataTypeDto>()
-                .Where<DataTypeDto>(x => x.EditorAlias == "Umbraco.RelatedLinks"
-                                         || x.EditorAlias == "Umbraco.RelatedLinks2");
+                .Where<DataTypeDto>(x => x.EditorAlias == Constants.PropertyEditors.Legacy.Aliases.RelatedLinks
+                                         || x.EditorAlias == Constants.PropertyEditors.Legacy.Aliases.RelatedLinks2);
 
             var dataTypes = Database.Fetch<DataTypeDto>(sqlDataTypes);
             var dataTypeIds = dataTypes.Select(x => x.NodeId).ToList();
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypeMigration.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypeMigration.cs
index 438b02385b..7b2daa99ef 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypeMigration.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypeMigration.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using Newtonsoft.Json;
 using Umbraco.Core.Composing;
@@ -18,6 +19,18 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
         private readonly PropertyEditorCollection _propertyEditors;
         private readonly ILogger _logger;
 
+        private static readonly ISet<string> LegacyAliases = new HashSet<string>()
+        {
+            Constants.PropertyEditors.Legacy.Aliases.Date,
+            Constants.PropertyEditors.Legacy.Aliases.Textbox,
+            Constants.PropertyEditors.Legacy.Aliases.ContentPicker2,
+            Constants.PropertyEditors.Legacy.Aliases.MediaPicker2,
+            Constants.PropertyEditors.Legacy.Aliases.MemberPicker2,
+            Constants.PropertyEditors.Legacy.Aliases.RelatedLinks2,
+            Constants.PropertyEditors.Legacy.Aliases.TextboxMultiple,
+            Constants.PropertyEditors.Legacy.Aliases.MultiNodeTreePicker2,
+        };
+
         public DataTypeMigration(IMigrationContext context, PreValueMigratorCollection preValueMigrators, PropertyEditorCollection propertyEditors, ILogger logger)
             : base(context)
         {
@@ -70,16 +83,23 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
                 var newAlias = migrator.GetNewAlias(dataType.EditorAlias);
                 if (newAlias == null)
                 {
-                    _logger.Warn<DataTypeMigration>("Skipping validation of configuration for data type {NodeId} : {EditorAlias}."
-                                                    + " Please ensure that the configuration is valid. The site may fail to start and / or load data types and run.",
-                                                    dataType.NodeId, dataType.EditorAlias);
+                    if (!LegacyAliases.Contains(dataType.EditorAlias))
+                    {
+                        _logger.Warn<DataTypeMigration>(
+                            "Skipping validation of configuration for data type {NodeId} : {EditorAlias}."
+                            + " Please ensure that the configuration is valid. The site may fail to start and / or load data types and run.",
+                            dataType.NodeId, dataType.EditorAlias);
+                    }
                 }
                 else if (!_propertyEditors.TryGet(newAlias, out var propertyEditor))
                 {
-                    _logger.Warn<DataTypeMigration>("Skipping validation of configuration for data type {NodeId} : {NewEditorAlias} (was: {EditorAlias})"
-                                                    + " because no property editor with that alias was found."
-                                                    + " Please ensure that the configuration is valid. The site may fail to start and / or load data types and run.",
-                                                    dataType.NodeId, newAlias, dataType.EditorAlias);
+                    if (!LegacyAliases.Contains(newAlias))
+                    {
+                        _logger.Warn<DataTypeMigration>("Skipping validation of configuration for data type {NodeId} : {NewEditorAlias} (was: {EditorAlias})"
+                                                        + " because no property editor with that alias was found."
+                                                        + " Please ensure that the configuration is valid. The site may fail to start and / or load data types and run.",
+                            dataType.NodeId, newAlias, dataType.EditorAlias);
+                    }
                 }
                 else
                 {
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/ContentPickerPreValueMigrator.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/ContentPickerPreValueMigrator.cs
index 2e341ad091..f445742aa9 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/ContentPickerPreValueMigrator.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/ContentPickerPreValueMigrator.cs
@@ -3,7 +3,7 @@
     class ContentPickerPreValueMigrator : DefaultPreValueMigrator
     {
         public override bool CanMigrate(string editorAlias)
-            => editorAlias == "Umbraco.ContentPicker2";
+            => editorAlias == Constants.PropertyEditors.Legacy.Aliases.ContentPicker2;
 
         public override string GetNewAlias(string editorAlias)
             => null;
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/MediaPickerPreValueMigrator.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/MediaPickerPreValueMigrator.cs
index a46b1eefb7..922d886595 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/MediaPickerPreValueMigrator.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/MediaPickerPreValueMigrator.cs
@@ -6,15 +6,15 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0.DataTypes
     {
         private readonly string[] _editors =
         {
-            "Umbraco.MediaPicker2",
-            "Umbraco.MediaPicker"
+            Constants.PropertyEditors.Legacy.Aliases.MediaPicker2,
+            Constants.PropertyEditors.Aliases.MediaPicker
         };
 
         public override bool CanMigrate(string editorAlias)
             => _editors.Contains(editorAlias);
 
         public override string GetNewAlias(string editorAlias)
-            => "Umbraco.MediaPicker";
+            => Constants.PropertyEditors.Aliases.MediaPicker;
 
         // you wish - but MediaPickerConfiguration lives in Umbraco.Web
         /*
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/MergeDateAndDateTimePropertyEditor.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/MergeDateAndDateTimePropertyEditor.cs
index a434b9f1c1..0d451e8460 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/MergeDateAndDateTimePropertyEditor.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/MergeDateAndDateTimePropertyEditor.cs
@@ -16,7 +16,7 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
 
         public override void Migrate()
         {
-            var dataTypes = GetDataTypes("Umbraco.Date");
+            var dataTypes = GetDataTypes(Constants.PropertyEditors.Legacy.Aliases.Date);
 
             foreach (var dataType in dataTypes)
             {
@@ -25,6 +25,14 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
                 {
                     config = (DateTimeConfiguration) new CustomDateTimeConfigurationEditor().FromDatabase(
                         dataType.Configuration);
+
+                    // If the Umbraco.Date type is the default from V7 and it has never been updated, then the
+                    // configuration is empty, and the format stuff is handled by in JS by moment.js. - We can't do that
+                    // after the migration, so we force the format to the default from V7.
+                    if (string.IsNullOrEmpty(dataType.Configuration))
+                    {
+                        config.Format = "YYYY-MM-DD";
+                    };
                 }
                 catch (Exception ex)
                 {
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/PropertyEditorsMigration.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/PropertyEditorsMigration.cs
index dac62abb75..89a8f010ec 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/PropertyEditorsMigration.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/PropertyEditorsMigration.cs
@@ -12,12 +12,12 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
 
         public override void Migrate()
         {
-            RenameDataType(Constants.PropertyEditors.Aliases.ContentPicker + "2", Constants.PropertyEditors.Aliases.ContentPicker);
-            RenameDataType(Constants.PropertyEditors.Aliases.MediaPicker + "2", Constants.PropertyEditors.Aliases.MediaPicker);
-            RenameDataType(Constants.PropertyEditors.Aliases.MemberPicker + "2", Constants.PropertyEditors.Aliases.MemberPicker);
-            RenameDataType(Constants.PropertyEditors.Aliases.MultiNodeTreePicker + "2", Constants.PropertyEditors.Aliases.MultiNodeTreePicker);
-            RenameDataType("Umbraco.TextboxMultiple", Constants.PropertyEditors.Aliases.TextArea, false);
-            RenameDataType("Umbraco.Textbox", Constants.PropertyEditors.Aliases.TextBox, false);
+            RenameDataType(Constants.PropertyEditors.Legacy.Aliases.ContentPicker2, Constants.PropertyEditors.Aliases.ContentPicker);
+            RenameDataType(Constants.PropertyEditors.Legacy.Aliases.MediaPicker2, Constants.PropertyEditors.Aliases.MediaPicker);
+            RenameDataType(Constants.PropertyEditors.Legacy.Aliases.MemberPicker2, Constants.PropertyEditors.Aliases.MemberPicker);
+            RenameDataType(Constants.PropertyEditors.Legacy.Aliases.MultiNodeTreePicker2, Constants.PropertyEditors.Aliases.MultiNodeTreePicker);
+            RenameDataType(Constants.PropertyEditors.Legacy.Aliases.TextboxMultiple, Constants.PropertyEditors.Aliases.TextArea, false);
+            RenameDataType(Constants.PropertyEditors.Legacy.Aliases.Textbox, Constants.PropertyEditors.Aliases.TextBox, false);
         }
 
         private void RenameDataType(string fromAlias, string toAlias, bool checkCollision = true)
@@ -43,7 +43,7 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
                         $"Property Editors. Before upgrading to v8, any Data Types using property editors that are named with the prefix '(Obsolete)' must be migrated " +
                         $"to the non-obsolete v7 property editors of the same type.");
                 }
-                    
+
             }
 
             Database.Execute(Sql()

From 36030904212d321af75f96bfc894742e86629ec3 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 17 Jul 2019 22:51:14 +1000
Subject: [PATCH 164/776] Fixes race condition in PublishedSnapshotService and
 more...

---
 src/Umbraco.Core/AsyncLock.cs                 | 47 ++++++++--------
 src/Umbraco.Core/MainDom.cs                   |  7 ++-
 src/Umbraco.Core/Runtime/CoreRuntime.cs       |  6 +-
 src/Umbraco.Core/RuntimeState.cs              |  5 ++
 src/Umbraco.Core/WaitHandleExtensions.cs      |  2 +
 .../PublishedContent/NuCacheChildrenTests.cs  |  2 +-
 .../PublishedContent/NuCacheTests.cs          |  2 +-
 .../Scoping/ScopedNuCacheTests.cs             |  2 +-
 .../ContentTypeServiceVariantsTests.cs        |  2 +-
 .../PublishedCache/NuCache/NuCacheComposer.cs |  2 +-
 .../NuCache/PublishedSnapshotService.cs       | 56 +++++++++----------
 .../PublishedSnapshotServiceOptions.cs        | 28 ++++++++++
 src/Umbraco.Web/Scheduling/KeepAlive.cs       |  2 +-
 src/Umbraco.Web/Umbraco.Web.csproj            |  1 +
 14 files changed, 101 insertions(+), 63 deletions(-)
 create mode 100644 src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotServiceOptions.cs

diff --git a/src/Umbraco.Core/AsyncLock.cs b/src/Umbraco.Core/AsyncLock.cs
index 158b132f26..6dd866705e 100644
--- a/src/Umbraco.Core/AsyncLock.cs
+++ b/src/Umbraco.Core/AsyncLock.cs
@@ -67,31 +67,34 @@ namespace Umbraco.Core
                 : new NamedSemaphoreReleaser(_semaphore2);
         }
 
-        public Task<IDisposable> LockAsync()
-        {
-            var wait = _semaphore != null
-                ? _semaphore.WaitAsync()
-                : _semaphore2.WaitOneAsync();
+        //NOTE: We don't use the "Async" part of this lock at all
+        //TODO: Remove this and rename this class something like SystemWideLock, then we can re-instate this logic if we ever need an Async lock again
 
-            return wait.IsCompleted
-                ? _releaserTask ?? Task.FromResult(CreateReleaser()) // anonymous vs named
-                : wait.ContinueWith((_, state) => (((AsyncLock) state).CreateReleaser()),
-                    this, CancellationToken.None,
-                    TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default);
-        }
+        //public Task<IDisposable> LockAsync()
+        //{
+        //    var wait = _semaphore != null
+        //        ? _semaphore.WaitAsync()
+        //        : _semaphore2.WaitOneAsync();
 
-        public Task<IDisposable> LockAsync(int millisecondsTimeout)
-        {
-            var wait = _semaphore != null
-                ? _semaphore.WaitAsync(millisecondsTimeout)
-                : _semaphore2.WaitOneAsync(millisecondsTimeout);
+        //    return wait.IsCompleted
+        //        ? _releaserTask ?? Task.FromResult(CreateReleaser()) // anonymous vs named
+        //        : wait.ContinueWith((_, state) => (((AsyncLock) state).CreateReleaser()),
+        //            this, CancellationToken.None,
+        //            TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default);
+        //}
 
-            return wait.IsCompleted
-                ? _releaserTask ?? Task.FromResult(CreateReleaser()) // anonymous vs named
-                : wait.ContinueWith((_, state) => (((AsyncLock)state).CreateReleaser()),
-                    this, CancellationToken.None,
-                    TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default);
-        }
+        //public Task<IDisposable> LockAsync(int millisecondsTimeout)
+        //{
+        //    var wait = _semaphore != null
+        //        ? _semaphore.WaitAsync(millisecondsTimeout)
+        //        : _semaphore2.WaitOneAsync(millisecondsTimeout);
+
+        //    return wait.IsCompleted
+        //        ? _releaserTask ?? Task.FromResult(CreateReleaser()) // anonymous vs named
+        //        : wait.ContinueWith((_, state) => (((AsyncLock)state).CreateReleaser()),
+        //            this, CancellationToken.None,
+        //            TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default);
+        //}
 
         public IDisposable Lock()
         {
diff --git a/src/Umbraco.Core/MainDom.cs b/src/Umbraco.Core/MainDom.cs
index ca875c2167..d1012fb669 100644
--- a/src/Umbraco.Core/MainDom.cs
+++ b/src/Umbraco.Core/MainDom.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Threading;
 using System.Web.Hosting;
@@ -113,7 +114,7 @@ namespace Umbraco.Core
 
             lock (_locko)
             {
-                _logger.Debug<MainDom>("Signaled {Signaled} ({SignalSource})", _signaled ? "(again)" : string.Empty, source);
+                _logger.Debug<MainDom>("Signaled ({Signaled}) ({SignalSource})", _signaled ? "again" : "first", source);
                 if (_signaled) return;
                 if (_isMainDom == false) return; // probably not needed
                 _signaled = true;
@@ -171,6 +172,7 @@ namespace Umbraco.Core
                 // if more than 1 instance reach that point, one will get the lock
                 // and the other one will timeout, which is accepted
 
+                //TODO: This can throw a TimeoutException - in which case should this be in a try/finally to ensure the signal is always reset?
                 _asyncLocker = _asyncLock.Lock(LockTimeoutMilliseconds);
                 _isMainDom = true;
 
@@ -181,6 +183,9 @@ namespace Umbraco.Core
                 // which is accepted
 
                 _signal.Reset();
+
+                //WaitOneAsync (ext method) will wait for a signal without blocking the main thread, the waiting is done on a background thread
+
                 _signal.WaitOneAsync()
                     .ContinueWith(_ => OnSignal("signal"));
 
diff --git a/src/Umbraco.Core/Runtime/CoreRuntime.cs b/src/Umbraco.Core/Runtime/CoreRuntime.cs
index f9a41b4f66..5b069641c4 100644
--- a/src/Umbraco.Core/Runtime/CoreRuntime.cs
+++ b/src/Umbraco.Core/Runtime/CoreRuntime.cs
@@ -139,7 +139,7 @@ namespace Umbraco.Core.Runtime
                 // there should be none, really - this is here "just in case"
                 Compose(composition);
 
-                // acquire the main domain
+                // acquire the main domain - if this fails then anything that should be registered with MainDom will not operate
                 AcquireMainDom(mainDom);
 
                 // determine our runtime level
@@ -218,13 +218,13 @@ namespace Umbraco.Core.Runtime
                 IOHelper.SetRootDirectory(path);
         }
 
-        private void AcquireMainDom(MainDom mainDom)
+        private bool AcquireMainDom(MainDom mainDom)
         {
             using (var timer = ProfilingLogger.DebugDuration<CoreRuntime>("Acquiring MainDom.", "Acquired."))
             {
                 try
                 {
-                    mainDom.Acquire();
+                    return mainDom.Acquire();
                 }
                 catch
                 {
diff --git a/src/Umbraco.Core/RuntimeState.cs b/src/Umbraco.Core/RuntimeState.cs
index 6fb8a04c0d..5d34fe70a1 100644
--- a/src/Umbraco.Core/RuntimeState.cs
+++ b/src/Umbraco.Core/RuntimeState.cs
@@ -97,6 +97,11 @@ namespace Umbraco.Core
         /// <param name="request"></param>
         internal void EnsureApplicationUrl(HttpRequestBase request = null)
         {
+            //Fixme: This causes problems with site swap on azure because azure pre-warms a site by calling into `localhost` and when it does that
+            // it changes the URL to `localhost:80` which actually doesn't work for pinging itself, it only works internally in Azure. The ironic part
+            // about this is that this is here specifically for the slot swap scenario https://issues.umbraco.org/issue/U4-10626
+
+
             // see U4-10626 - in some cases we want to reset the application url
             // (this is a simplified version of what was in 7.x)
             // note: should this be optional? is it expensive?
diff --git a/src/Umbraco.Core/WaitHandleExtensions.cs b/src/Umbraco.Core/WaitHandleExtensions.cs
index 0d840a2496..7a9294c113 100644
--- a/src/Umbraco.Core/WaitHandleExtensions.cs
+++ b/src/Umbraco.Core/WaitHandleExtensions.cs
@@ -23,6 +23,8 @@ namespace Umbraco.Core
                     handle,
                     (state, timedOut) =>
                     {
+                        //TODO: We aren't checking if this is timed out
+
                         tcs.SetResult(null);
 
                         // we take a lock here to make sure the outer method has completed setting the local variable callbackHandle.
diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
index f3a520ead1..55304d257b 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
@@ -124,7 +124,7 @@ namespace Umbraco.Tests.PublishedContent
             _source = new TestDataSource(kits);
 
             // at last, create the complete NuCache snapshot service!
-            var options = new PublishedSnapshotService.Options { IgnoreLocalDb = true };
+            var options = new PublishedSnapshotServiceOptions { IgnoreLocalDb = true };
             _snapshotService = new PublishedSnapshotService(options,
                 null,
                 runtime,
diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
index b66404c954..399b0c1342 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
@@ -169,7 +169,7 @@ namespace Umbraco.Tests.PublishedContent
             _variationAccesor = new TestVariationContextAccessor();
 
             // at last, create the complete NuCache snapshot service!
-            var options = new PublishedSnapshotService.Options { IgnoreLocalDb = true };
+            var options = new PublishedSnapshotServiceOptions { IgnoreLocalDb = true };
             _snapshotService = new PublishedSnapshotService(options,
                 null,
                 runtime,
diff --git a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
index 397a22fc62..c974fed99e 100644
--- a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
@@ -72,7 +72,7 @@ namespace Umbraco.Tests.Scoping
 
         protected override IPublishedSnapshotService CreatePublishedSnapshotService()
         {
-            var options = new PublishedSnapshotService.Options { IgnoreLocalDb = true };
+            var options = new PublishedSnapshotServiceOptions { IgnoreLocalDb = true };
             var publishedSnapshotAccessor = new UmbracoContextPublishedSnapshotAccessor(Umbraco.Web.Composing.Current.UmbracoContextAccessor);
             var runtimeStateMock = new Mock<IRuntimeState>();
             runtimeStateMock.Setup(x => x.Level).Returns(() => RuntimeLevel.Run);
diff --git a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
index 3121988bfe..18ea95cd98 100644
--- a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
+++ b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
@@ -42,7 +42,7 @@ namespace Umbraco.Tests.Services
 
         protected override IPublishedSnapshotService CreatePublishedSnapshotService()
         {
-            var options = new PublishedSnapshotService.Options { IgnoreLocalDb = true };
+            var options = new PublishedSnapshotServiceOptions { IgnoreLocalDb = true };
             var publishedSnapshotAccessor = new UmbracoContextPublishedSnapshotAccessor(Umbraco.Web.Composing.Current.UmbracoContextAccessor);
             var runtimeStateMock = new Mock<IRuntimeState>();
             runtimeStateMock.Setup(x => x.Level).Returns(() => RuntimeLevel.Run);
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/NuCacheComposer.cs b/src/Umbraco.Web/PublishedCache/NuCache/NuCacheComposer.cs
index 72fa39e7e4..f748fd555c 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/NuCacheComposer.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/NuCacheComposer.cs
@@ -15,7 +15,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
             // register the NuCache published snapshot service
             // must register default options, required in the service ctor
-            composition.Register(factory => new PublishedSnapshotService.Options());
+            composition.Register(factory => new PublishedSnapshotServiceOptions());
             composition.SetPublishedSnapshotService<PublishedSnapshotService>();
 
             // add the NuCache health check (hidden from type finder)
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index dad9811af8..5e7c0542db 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -30,7 +30,8 @@ using File = System.IO.File;
 
 namespace Umbraco.Web.PublishedCache.NuCache
 {
-    class PublishedSnapshotService : PublishedSnapshotServiceBase
+
+    internal class PublishedSnapshotService : PublishedSnapshotServiceBase
     {
         private readonly ServiceContext _serviceContext;
         private readonly IPublishedContentTypeFactory _publishedContentTypeFactory;
@@ -56,7 +57,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         private BPlusTree<int, ContentNodeKit> _localContentDb;
         private BPlusTree<int, ContentNodeKit> _localMediaDb;
-        private readonly bool _localDbExists;
+        private bool _localDbExists;
 
         // define constant - determines whether to use cache when previewing
         // to store eg routes, property converted values, anything - caching
@@ -68,7 +69,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         //private static int _singletonCheck;
 
-        public PublishedSnapshotService(Options options, IMainDom mainDom, IRuntimeState runtime,
+        public PublishedSnapshotService(PublishedSnapshotServiceOptions options, IMainDom mainDom, IRuntimeState runtime,
             ServiceContext serviceContext, IPublishedContentTypeFactory publishedContentTypeFactory, IdkMap idkMap,
             IPublishedSnapshotAccessor publishedSnapshotAccessor, IVariationContextAccessor variationContextAccessor, ILogger logger, IScopeProvider scopeProvider,
             IDocumentRepository documentRepository, IMediaRepository mediaRepository, IMemberRepository memberRepository,
@@ -115,30 +116,36 @@ namespace Umbraco.Web.PublishedCache.NuCache
             if (options.IgnoreLocalDb == false)
             {
                 var registered = mainDom.Register(
-                    null,
                     () =>
                     {
+                        //"install" phase of MainDom
+                        //this is inside of a lock in MainDom so this is guaranteed to run if MainDom was acquired and guaranteed
+                        //to not run if MainDom wasn't acquired.
+                        //If MainDom was not acquired, then _localContentDb and _localMediaDb will remain null which means this appdomain
+                        //will load in published content via the DB and in that case this appdomain will probably not exist long enough to
+                        //serve more than a page of content.
+
+                        var path = GetLocalFilesPath();
+                        var localContentDbPath = Path.Combine(path, "NuCache.Content.db");
+                        var localMediaDbPath = Path.Combine(path, "NuCache.Media.db");
+                        _localDbExists = File.Exists(localContentDbPath) && File.Exists(localMediaDbPath);
+                        // if both local databases exist then GetTree will open them, else new databases will be created
+                        _localContentDb = BTree.GetTree(localContentDbPath, _localDbExists);
+                        _localMediaDb = BTree.GetTree(localMediaDbPath, _localDbExists);
+                    },
+                    () =>
+                    {
+                        //"release" phase of MainDom
+
                         lock (_storesLock)
                         {
-                            _contentStore.ReleaseLocalDb();
+                            _contentStore?.ReleaseLocalDb(); //null check because we could shut down before being assigned
                             _localContentDb = null;
-                            _mediaStore.ReleaseLocalDb();
+                            _mediaStore?.ReleaseLocalDb(); //null check because we could shut down before being assigned
                             _localMediaDb = null;
                         }
                     });
 
-                if (registered)
-                {
-                    var path = GetLocalFilesPath();
-                    var localContentDbPath = Path.Combine(path, "NuCache.Content.db");
-                    var localMediaDbPath = Path.Combine(path, "NuCache.Media.db");
-                    _localDbExists = System.IO.File.Exists(localContentDbPath) && System.IO.File.Exists(localMediaDbPath);
-
-                    // if both local databases exist then GetTree will open them, else new databases will be created
-                    _localContentDb = BTree.GetTree(localContentDbPath, _localDbExists);
-                    _localMediaDb = BTree.GetTree(localMediaDbPath, _localDbExists);
-                }
-
                 // stores are created with a db so they can write to it, but they do not read from it,
                 // stores need to be populated, happens in OnResolutionFrozen which uses _localDbExists to
                 // figure out whether it can read the databases or it should populate them from sql
@@ -251,19 +258,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
             base.Dispose();
         }
 
-        public class Options
-        {
-            // disabled: prevents the published snapshot from updating and exposing changes
-            //           or even creating a new published snapshot to see changes, uses old cache = bad
-            //
-            //// indicates that the snapshot cache should reuse the application request cache
-            //// otherwise a new cache object would be created for the snapshot specifically,
-            //// which is the default - web boot manager uses this to optimize facades
-            //public bool PublishedSnapshotCacheIsApplicationRequestCache;
-
-            public bool IgnoreLocalDb;
-        }
-
         #endregion
 
         #region Local files
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotServiceOptions.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotServiceOptions.cs
new file mode 100644
index 0000000000..ef9d83a802
--- /dev/null
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotServiceOptions.cs
@@ -0,0 +1,28 @@
+namespace Umbraco.Web.PublishedCache.NuCache
+{
+    /// <summary>
+    /// Options class for configuring the <see cref="IPublishedSnapshotService"/>
+    /// </summary>
+    public class PublishedSnapshotServiceOptions
+    {
+        // disabled: prevents the published snapshot from updating and exposing changes
+        //           or even creating a new published snapshot to see changes, uses old cache = bad
+        //
+        //// indicates that the snapshot cache should reuse the application request cache
+        //// otherwise a new cache object would be created for the snapshot specifically,
+        //// which is the default - web boot manager uses this to optimize facades
+        //public bool PublishedSnapshotCacheIsApplicationRequestCache;
+
+
+        /// <summary>
+        /// If true this disables the persisted local cache files for content and media
+        /// </summary>
+        /// <remarks>
+        /// By default this is false which means umbraco will use locally persisted cache files for reading in all published content and media on application startup.
+        /// The reason for this is to improve startup times because the alternative to populating the published content and media on application startup is to read
+        /// these values from the database. In scenarios where sites are relatively small (below a few thousand nodes) reading the content/media from the database to populate
+        /// the in memory cache isn't that slow and is only marginally slower than reading from the locally persisted cache files.
+        /// </remarks>
+        public bool IgnoreLocalDb { get; set; }
+    }
+}
diff --git a/src/Umbraco.Web/Scheduling/KeepAlive.cs b/src/Umbraco.Web/Scheduling/KeepAlive.cs
index 6dd7572b87..c07430df04 100644
--- a/src/Umbraco.Web/Scheduling/KeepAlive.cs
+++ b/src/Umbraco.Web/Scheduling/KeepAlive.cs
@@ -64,7 +64,7 @@ namespace Umbraco.Web.Scheduling
                 }
                 catch (Exception ex)
                 {
-                    _logger.Error<KeepAlive>(ex, "Failed (at '{UmbracoAppUrl}').", umbracoAppUrl);
+                    _logger.Error<KeepAlive>(ex, "Keep alive failed (at '{UmbracoAppUrl}').", umbracoAppUrl);
                 }
             }
 
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 41a3393fa4..331b2ac7d0 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -224,6 +224,7 @@
     <Compile Include="Mvc\SurfaceControllerTypeCollectionBuilder.cs" />
     <Compile Include="Mvc\ValidateUmbracoFormRouteStringAttribute.cs" />
     <Compile Include="Profiling\WebProfilingController.cs" />
+    <Compile Include="PublishedCache\NuCache\PublishedSnapshotServiceOptions.cs" />
     <Compile Include="PublishedCache\NuCache\Snap\GenObj.cs" />
     <Compile Include="PublishedCache\NuCache\Snap\GenRef.cs" />
     <Compile Include="PublishedCache\NuCache\Snap\LinkedNode.cs" />

From f3bfc1ffb27618f129d1fdb2e05872e14b3a9f15 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 18 Jul 2019 16:18:11 +1000
Subject: [PATCH 165/776] Puts back UmbracoAntiForgeryAdditionalDataProvider
 for backwards compat reasons but it is not used

---
 ...mbracoAntiForgeryAdditionalDataProvider.cs | 91 +++++++++++++++++++
 src/Umbraco.Web/Umbraco.Web.csproj            |  1 +
 2 files changed, 92 insertions(+)
 create mode 100644 src/Umbraco.Web/Security/UmbracoAntiForgeryAdditionalDataProvider.cs

diff --git a/src/Umbraco.Web/Security/UmbracoAntiForgeryAdditionalDataProvider.cs b/src/Umbraco.Web/Security/UmbracoAntiForgeryAdditionalDataProvider.cs
new file mode 100644
index 0000000000..12d7cce753
--- /dev/null
+++ b/src/Umbraco.Web/Security/UmbracoAntiForgeryAdditionalDataProvider.cs
@@ -0,0 +1,91 @@
+using System;
+using Umbraco.Web.Mvc;
+using Umbraco.Core;
+using System.Web.Helpers;
+using System.Web;
+using Newtonsoft.Json;
+using System.ComponentModel;
+
+namespace Umbraco.Web.Security
+{
+    [Obsolete("This is no longer used and will be removed from the codebase in future versions")]
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public class UmbracoAntiForgeryAdditionalDataProvider : IAntiForgeryAdditionalDataProvider
+    {
+        private readonly IAntiForgeryAdditionalDataProvider _defaultProvider;
+
+        /// <summary>
+        /// Constructor, allows wrapping a default provider
+        /// </summary>
+        /// <param name="defaultProvider"></param>
+        public UmbracoAntiForgeryAdditionalDataProvider(IAntiForgeryAdditionalDataProvider defaultProvider)
+        {
+            _defaultProvider = defaultProvider;
+        }
+
+        public string GetAdditionalData(HttpContextBase context)
+        {
+            return JsonConvert.SerializeObject(new AdditionalData
+            {
+                Stamp = DateTime.UtcNow.Ticks,
+                //this value will be here if this is a BeginUmbracoForms form
+                Ufprt = context.Items["ufprt"]?.ToString(),
+                //if there was a wrapped provider, add it's value to the json, else just a static value
+                WrappedValue = _defaultProvider?.GetAdditionalData(context) ?? "default"
+            });
+        }
+
+        public bool ValidateAdditionalData(HttpContextBase context, string additionalData)
+        {
+            if (!additionalData.DetectIsJson())
+                return false; //must be json
+
+            AdditionalData json;
+            try
+            {
+                json = JsonConvert.DeserializeObject<AdditionalData>(additionalData);
+            }
+            catch
+            {
+                return false; //couldn't parse
+            }
+
+            if (json.Stamp == default) return false;
+
+            //if there was a wrapped provider, validate it, else validate the static value
+            var validateWrapped = _defaultProvider?.ValidateAdditionalData(context, json.WrappedValue) ?? json.WrappedValue == "default";
+            if (!validateWrapped)
+                return false;
+
+            var ufprtRequest = context.Request["ufprt"]?.ToString();
+
+            //if the custom BeginUmbracoForms route value is not there, then it's nothing more to validate
+            if (ufprtRequest.IsNullOrWhiteSpace() && json.Ufprt.IsNullOrWhiteSpace())
+                return true;
+
+            //if one or the other is null then something is wrong
+            if (!ufprtRequest.IsNullOrWhiteSpace() && json.Ufprt.IsNullOrWhiteSpace()) return false;
+            if (ufprtRequest.IsNullOrWhiteSpace() && !json.Ufprt.IsNullOrWhiteSpace()) return false;
+
+            if (!UmbracoHelper.DecryptAndValidateEncryptedRouteString(json.Ufprt, out var additionalDataParts))
+                return false;
+
+            if (!UmbracoHelper.DecryptAndValidateEncryptedRouteString(ufprtRequest, out var requestParts))
+                return false;
+
+            //ensure they all match
+            return additionalDataParts.Count == requestParts.Count
+                && additionalDataParts[RenderRouteHandler.ReservedAdditionalKeys.Controller] == requestParts[RenderRouteHandler.ReservedAdditionalKeys.Controller]
+                && additionalDataParts[RenderRouteHandler.ReservedAdditionalKeys.Action] == requestParts[RenderRouteHandler.ReservedAdditionalKeys.Action]
+                && additionalDataParts[RenderRouteHandler.ReservedAdditionalKeys.Area] == requestParts[RenderRouteHandler.ReservedAdditionalKeys.Area];
+        }
+
+        internal class AdditionalData
+        {
+            public string Ufprt { get; set; }
+            public long Stamp { get; set; }
+            public string WrappedValue { get; set; }
+        }
+
+    }
+}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 2fb54a2c80..01524e5962 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -341,6 +341,7 @@
     <Compile Include="Models\Mapping\MemberTreeNodeUrlResolver.cs" />
     <Compile Include="Models\Trees\ExportMember.cs" />
     <Compile Include="PropertyEditors\DropdownFlexiblePropertyEditor.cs" />
+    <Compile Include="Security\UmbracoAntiForgeryAdditionalDataProvider.cs" />
     <Compile Include="TourFilterResolver.cs" />
     <Compile Include="Editors\UserEditorAuthorizationHelper.cs" />
     <Compile Include="Editors\UserGroupAuthorizationAttribute.cs" />

From 6544b5c27242be6a80bd1da7b05a774521a75e75 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Thu, 18 Jul 2019 13:03:14 +0100
Subject: [PATCH 166/776] Update
 src/Umbraco.Core/Migrations/Upgrade/V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs

Co-Authored-By: Bjarke Berg <mail@bergmania.dk>
---
 .../V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs
index 5f49680d89..1b6597a660 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs
@@ -85,7 +85,7 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_1_0
 
             if (exceptions.Any())
             {
-                throw new AggregateException(exceptions);
+                throw new AggregateException("One or more errors related to unexpected data in grid values occurred.", exceptions);
             }
 
             Context.AddPostMigration<RebuildPublishedSnapshot>();

From 929c84822aaabe9437756c5272d13b32245d3f6a Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 19 Jul 2019 15:18:00 +1000
Subject: [PATCH 167/776] Fixes the Children ext method and adds unit tests

---
 .../PublishedContentExtensions.cs             |   4 -
 .../PublishedContent/NuCacheChildrenTests.cs  | 306 ++++++++++++------
 2 files changed, 209 insertions(+), 101 deletions(-)

diff --git a/src/Umbraco.Core/PublishedContentExtensions.cs b/src/Umbraco.Core/PublishedContentExtensions.cs
index f220f307d6..e09e76d06a 100644
--- a/src/Umbraco.Core/PublishedContentExtensions.cs
+++ b/src/Umbraco.Core/PublishedContentExtensions.cs
@@ -111,10 +111,6 @@ namespace Umbraco.Core
         /// </remarks>
         public static IEnumerable<IPublishedContent> Children(this IPublishedContent content, string culture = null)
         {
-            // invariant has invariant value (whatever the requested culture)
-            if (!content.ContentType.VariesByCulture() && culture != "*")
-                culture = "";
-
             // handle context culture for variant
             if (culture == null)
                 culture = VariationContextAccessor?.VariationContext?.Culture ?? "";
diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
index f3a520ead1..cc6bcab036 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
@@ -151,117 +151,139 @@ namespace Umbraco.Tests.PublishedContent
             Mock.Get(factory).Setup(x => x.GetInstance(typeof(IVariationContextAccessor))).Returns(_variationAccesor);
         }
 
+        private IEnumerable<ContentNodeKit> GetNestedVariantKits()
+        {
+            var paths = new Dictionary<int, string> { { -1, "-1" } };
+
+            //1x variant (root)
+            yield return CreateVariantKit(1, -1, 1, paths);
+            
+            //1x invariant under root
+            yield return CreateInvariantKit(4, 1, 1, paths);
+
+            //1x variant under root
+            yield return CreateVariantKit(7, 1, 4, paths);
+
+            //2x mixed under invariant
+            yield return CreateVariantKit(10, 4, 1, paths);
+            yield return CreateInvariantKit(11, 4, 2, paths);
+
+            //2x mixed under variant
+            yield return CreateVariantKit(12, 7, 1, paths);
+            yield return CreateInvariantKit(13, 7, 2, paths);
+        }
+
         private IEnumerable<ContentNodeKit> GetInvariantKits()
         {
             var paths = new Dictionary<int, string> { { -1, "-1" } };
 
-            ContentNodeKit CreateKit(int id, int parentId, int sortOrder)
+            yield return CreateInvariantKit(1, -1, 1, paths);
+            yield return CreateInvariantKit(2, -1, 2, paths);
+            yield return CreateInvariantKit(3, -1, 3, paths);
+
+            yield return CreateInvariantKit(4, 1, 1, paths);
+            yield return CreateInvariantKit(5, 1, 2, paths);
+            yield return CreateInvariantKit(6, 1, 3, paths);
+
+            yield return CreateInvariantKit(7, 2, 3, paths);
+            yield return CreateInvariantKit(8, 2, 2, paths);
+            yield return CreateInvariantKit(9, 2, 1, paths);
+
+            yield return CreateInvariantKit(10, 3, 1, paths);
+
+            yield return CreateInvariantKit(11, 4, 1, paths);
+            yield return CreateInvariantKit(12, 4, 2, paths);
+        }
+
+        private ContentNodeKit CreateInvariantKit(int id, int parentId, int sortOrder, Dictionary<int, string> paths)
+        {
+            if (!paths.TryGetValue(parentId, out var parentPath))
+                throw new Exception("Unknown parent.");
+
+            var path = paths[id] = parentPath + "," + id;
+            var level = path.Count(x => x == ',');
+            var now = DateTime.Now;
+
+            return new ContentNodeKit
             {
-                if (!paths.TryGetValue(parentId, out var parentPath))
-                    throw new Exception("Unknown parent.");
-
-                var path = paths[id] = parentPath + "," + id;
-                var level = path.Count(x => x == ',');
-                var now = DateTime.Now;
-
-                return new ContentNodeKit
+                ContentTypeId = _contentTypeInvariant.Id,
+                Node = new ContentNode(id, Guid.NewGuid(), level, path, sortOrder, parentId, DateTime.Now, 0),
+                DraftData = null,
+                PublishedData = new ContentData
                 {
-                    ContentTypeId = _contentTypeInvariant.Id,
-                    Node = new ContentNode(id, Guid.NewGuid(), level, path, sortOrder, parentId, DateTime.Now, 0),
-                    DraftData = null,
-                    PublishedData = new ContentData
-                    {
-                        Name = "N" + id,
-                        Published = true,
-                        TemplateId = 0,
-                        VersionId = 1,
-                        VersionDate = now,
-                        WriterId = 0,
-                        Properties = new Dictionary<string, PropertyData[]>(),
-                        CultureInfos = new Dictionary<string, CultureVariation>()
-                    }
-                };
-            }
-
-            yield return CreateKit(1, -1, 1);
-            yield return CreateKit(2, -1, 2);
-            yield return CreateKit(3, -1, 3);
-
-            yield return CreateKit(4, 1, 1);
-            yield return CreateKit(5, 1, 2);
-            yield return CreateKit(6, 1, 3);
-
-            yield return CreateKit(7, 2, 3);
-            yield return CreateKit(8, 2, 2);
-            yield return CreateKit(9, 2, 1);
-
-            yield return CreateKit(10, 3, 1);
-
-            yield return CreateKit(11, 4, 1);
-            yield return CreateKit(12, 4, 2);
+                    Name = "N" + id,
+                    Published = true,
+                    TemplateId = 0,
+                    VersionId = 1,
+                    VersionDate = now,
+                    WriterId = 0,
+                    Properties = new Dictionary<string, PropertyData[]>(),
+                    CultureInfos = new Dictionary<string, CultureVariation>()
+                }
+            };
         }
 
         private IEnumerable<ContentNodeKit> GetVariantKits()
         {
             var paths = new Dictionary<int, string> { { -1, "-1" } };
 
-            Dictionary<string, CultureVariation> GetCultureInfos(int id, DateTime now)
+            yield return CreateVariantKit(1, -1, 1, paths);
+            yield return CreateVariantKit(2, -1, 2, paths);
+            yield return CreateVariantKit(3, -1, 3, paths);
+
+            yield return CreateVariantKit(4, 1, 1, paths);
+            yield return CreateVariantKit(5, 1, 2, paths);
+            yield return CreateVariantKit(6, 1, 3, paths);
+
+            yield return CreateVariantKit(7, 2, 3, paths);
+            yield return CreateVariantKit(8, 2, 2, paths);
+            yield return CreateVariantKit(9, 2, 1, paths);
+
+            yield return CreateVariantKit(10, 3, 1, paths);
+
+            yield return CreateVariantKit(11, 4, 1, paths);
+            yield return CreateVariantKit(12, 4, 2, paths);
+        }
+
+        private static Dictionary<string, CultureVariation> GetCultureInfos(int id, DateTime now)
+        {
+            var en = new[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 };
+            var fr = new[] { 1, 3, 4, 6, 7, 9, 10, 12 };
+
+            var infos = new Dictionary<string, CultureVariation>();
+            if (en.Contains(id))
+                infos["en-US"] = new CultureVariation { Name = "N" + id + "-" + "en-US", Date = now, IsDraft = false };
+            if (fr.Contains(id))
+                infos["fr-FR"] = new CultureVariation { Name = "N" + id + "-" + "fr-FR", Date = now, IsDraft = false };
+            return infos;
+        }
+
+        private ContentNodeKit CreateVariantKit(int id, int parentId, int sortOrder, Dictionary<int, string> paths)
+        {
+            if (!paths.TryGetValue(parentId, out var parentPath))
+                throw new Exception("Unknown parent.");
+
+            var path = paths[id] = parentPath + "," + id;
+            var level = path.Count(x => x == ',');
+            var now = DateTime.Now;
+
+            return new ContentNodeKit
             {
-                var en = new[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 };
-                var fr = new[] { 1, 3, 4, 6, 7, 9, 10, 12 };
-
-                var infos = new Dictionary<string, CultureVariation>();
-                if (en.Contains(id))
-                    infos["en-US"] = new CultureVariation { Name = "N" + id + "-" + "en-US", Date = now, IsDraft = false };
-                if (fr.Contains(id))
-                    infos["fr-FR"] = new CultureVariation { Name = "N" + id + "-" + "fr-FR", Date = now, IsDraft = false };
-                return infos;
-            }
-
-            ContentNodeKit CreateKit(int id, int parentId, int sortOrder)
-            {
-                if (!paths.TryGetValue(parentId, out var parentPath))
-                    throw new Exception("Unknown parent.");
-
-                var path = paths[id] = parentPath + "," + id;
-                var level = path.Count(x => x == ',');
-                var now = DateTime.Now;
-
-                return new ContentNodeKit
+                ContentTypeId = _contentTypeVariant.Id,
+                Node = new ContentNode(id, Guid.NewGuid(), level, path, sortOrder, parentId, DateTime.Now, 0),
+                DraftData = null,
+                PublishedData = new ContentData
                 {
-                    ContentTypeId = _contentTypeVariant.Id,
-                    Node = new ContentNode(id, Guid.NewGuid(), level, path, sortOrder, parentId, DateTime.Now, 0),
-                    DraftData = null,
-                    PublishedData = new ContentData
-                    {
-                        Name = "N" + id,
-                        Published = true,
-                        TemplateId = 0,
-                        VersionId = 1,
-                        VersionDate = now,
-                        WriterId = 0,
-                        Properties = new Dictionary<string, PropertyData[]>(),
-                        CultureInfos = GetCultureInfos(id, now)
-                    }
-                };
-            }
-
-            yield return CreateKit(1, -1, 1);
-            yield return CreateKit(2, -1, 2);
-            yield return CreateKit(3, -1, 3);
-
-            yield return CreateKit(4, 1, 1);
-            yield return CreateKit(5, 1, 2);
-            yield return CreateKit(6, 1, 3);
-
-            yield return CreateKit(7, 2, 3);
-            yield return CreateKit(8, 2, 2);
-            yield return CreateKit(9, 2, 1);
-
-            yield return CreateKit(10, 3, 1);
-
-            yield return CreateKit(11, 4, 1);
-            yield return CreateKit(12, 4, 2);
+                    Name = "N" + id,
+                    Published = true,
+                    TemplateId = 0,
+                    VersionId = 1,
+                    VersionDate = now,
+                    WriterId = 0,
+                    Properties = new Dictionary<string, PropertyData[]>(),
+                    CultureInfos = GetCultureInfos(id, now)
+                }
+            };
         }
 
         private IEnumerable<ContentNodeKit> GetVariantWithDraftKits()
@@ -660,6 +682,96 @@ namespace Umbraco.Tests.PublishedContent
             Assert.AreEqual(1, snapshot.Content.GetById(7).Parent?.Id);
         }
 
+        [Test]
+        public void NestedVariationChildrenTest()
+        {
+            var mixedKits = GetNestedVariantKits();
+            Init(mixedKits);
+
+            var snapshot = _snapshotService.CreatePublishedSnapshot(previewToken: null);
+            _snapshotAccessor.PublishedSnapshot = snapshot;
+
+            //TEST with en-us variation context
+
+            _variationAccesor.VariationContext = new VariationContext("en-US");
+
+            var documents = snapshot.Content.GetAtRoot().ToArray();
+            AssertDocuments(documents, "N1-en-US");
+
+            documents = snapshot.Content.GetById(1).Children().ToArray();
+            AssertDocuments(documents, "N4", "N7-en-US");
+
+            //Get the invariant and list children, there's a variation context so it should return invariant AND en-us variants
+            documents = snapshot.Content.GetById(4).Children().ToArray();
+            AssertDocuments(documents, "N10-en-US", "N11");
+
+            //Get the variant and list children, there's a variation context so it should return invariant AND en-us variants
+            documents = snapshot.Content.GetById(7).Children().ToArray();
+            AssertDocuments(documents, "N12-en-US", "N13");
+
+            //TEST with fr-fr variation context
+
+            _variationAccesor.VariationContext = new VariationContext("fr-FR");
+
+            documents = snapshot.Content.GetAtRoot().ToArray();
+            AssertDocuments(documents, "N1-fr-FR");
+
+            documents = snapshot.Content.GetById(1).Children().ToArray();
+            AssertDocuments(documents, "N4", "N7-fr-FR");
+
+            //Get the invariant and list children, there's a variation context so it should return invariant AND en-us variants
+            documents = snapshot.Content.GetById(4).Children().ToArray();
+            AssertDocuments(documents, "N10-fr-FR", "N11");
+
+            //Get the variant and list children, there's a variation context so it should return invariant AND en-us variants
+            documents = snapshot.Content.GetById(7).Children().ToArray();
+            AssertDocuments(documents, "N12-fr-FR", "N13");
+
+            //TEST specific cultures
+
+            documents = snapshot.Content.GetAtRoot("fr-FR").ToArray();
+            AssertDocuments(documents, "N1-fr-FR");
+
+            documents = snapshot.Content.GetById(1).Children("fr-FR").ToArray();
+            AssertDocuments(documents, "N4", "N7-fr-FR"); //TODO: Returns invariant ... is that expected?
+            documents = snapshot.Content.GetById(1).Children("").ToArray();
+            AssertDocuments(documents, "N4"); //Only returns invariant since that is what was requested
+
+            documents = snapshot.Content.GetById(4).Children("fr-FR").ToArray();
+            AssertDocuments(documents, "N10-fr-FR", "N11"); //TODO: Returns invariant ... is that expected?
+            documents = snapshot.Content.GetById(4).Children("").ToArray();
+            AssertDocuments(documents, "N11"); //Only returns invariant since that is what was requested
+
+            documents = snapshot.Content.GetById(7).Children("fr-FR").ToArray();
+            AssertDocuments(documents, "N12-fr-FR", "N13"); //TODO: Returns invariant ... is that expected?
+            documents = snapshot.Content.GetById(7).Children("").ToArray();
+            AssertDocuments(documents, "N13"); //Only returns invariant since that is what was requested
+
+            //TEST without variation context
+            // This will actually convert the culture to "" which will be invariant since that's all it will know how to do
+            // This will return a NULL name for culture specific entities because there is no variation context
+
+            _variationAccesor.VariationContext = null;
+
+            documents = snapshot.Content.GetAtRoot().ToArray();
+            //will return nothing because there's only variant at root
+            Assert.AreEqual(0, documents.Length);
+            //so we'll continue to getting the known variant, do not fully assert this because the Name will NULL
+            documents = snapshot.Content.GetAtRoot("fr-FR").ToArray();
+            Assert.AreEqual(1, documents.Length);
+
+            documents = snapshot.Content.GetById(1).Children().ToArray();
+            AssertDocuments(documents, "N4");
+
+            //Get the invariant and list children
+            documents = snapshot.Content.GetById(4).Children().ToArray();
+            AssertDocuments(documents, "N11");
+
+            //Get the variant and list children
+            documents = snapshot.Content.GetById(7).Children().ToArray();
+            AssertDocuments(documents, "N13");
+        }
+
         [Test]
         public void VariantChildrenTest()
         {

From 487e45b45bf8d74095838bd1268c809c1e3c49b3 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 19 Jul 2019 15:26:31 +1000
Subject: [PATCH 168/776] updates note

---
 src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
index cc6bcab036..65736aabd4 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
@@ -733,17 +733,17 @@ namespace Umbraco.Tests.PublishedContent
             AssertDocuments(documents, "N1-fr-FR");
 
             documents = snapshot.Content.GetById(1).Children("fr-FR").ToArray();
-            AssertDocuments(documents, "N4", "N7-fr-FR"); //TODO: Returns invariant ... is that expected?
+            AssertDocuments(documents, "N4", "N7-fr-FR"); //NOTE: Returns invariant, this is expected
             documents = snapshot.Content.GetById(1).Children("").ToArray();
             AssertDocuments(documents, "N4"); //Only returns invariant since that is what was requested
 
             documents = snapshot.Content.GetById(4).Children("fr-FR").ToArray();
-            AssertDocuments(documents, "N10-fr-FR", "N11"); //TODO: Returns invariant ... is that expected?
+            AssertDocuments(documents, "N10-fr-FR", "N11"); //NOTE: Returns invariant, this is expected
             documents = snapshot.Content.GetById(4).Children("").ToArray();
             AssertDocuments(documents, "N11"); //Only returns invariant since that is what was requested
 
             documents = snapshot.Content.GetById(7).Children("fr-FR").ToArray();
-            AssertDocuments(documents, "N12-fr-FR", "N13"); //TODO: Returns invariant ... is that expected?
+            AssertDocuments(documents, "N12-fr-FR", "N13"); //NOTE: Returns invariant, this is expected
             documents = snapshot.Content.GetById(7).Children("").ToArray();
             AssertDocuments(documents, "N13"); //Only returns invariant since that is what was requested
 

From b07df634224443152e8d4aebce967c12fe2c39f4 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 19 Jul 2019 15:49:39 +1000
Subject: [PATCH 169/776] Adds some better notes to the api docs

---
 src/Umbraco.Core/PublishedContentExtensions.cs | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/PublishedContentExtensions.cs b/src/Umbraco.Core/PublishedContentExtensions.cs
index e09e76d06a..921883b822 100644
--- a/src/Umbraco.Core/PublishedContentExtensions.cs
+++ b/src/Umbraco.Core/PublishedContentExtensions.cs
@@ -103,11 +103,23 @@ namespace Umbraco.Core
         /// Gets the children of the content item.
         /// </summary>
         /// <param name="content">The content item.</param>
-        /// <param name="culture">The specific culture to get the url children for. If null is used the current culture is used (Default is null).</param>
+        /// <param name="culture">
+        /// The specific culture to get the url children for. Default is null which will use the current culture in <see cref="VariationContext"/>        
+        /// </param>
         /// <remarks>
         /// <para>Gets children that are available for the specified culture.</para>
         /// <para>Children are sorted by their sortOrder.</para>
-        /// <para>The '*' culture and supported and returns everything.</para>
+        /// <para>
+        /// For culture, 
+        /// if null is used the current culture is used.
+        /// If an empty string is used only invariant children are returned.
+        /// If "*" is used all children are returned.
+        /// </para>
+        /// <para>
+        /// If a variant culture is specified or there is a current culture in the <see cref="VariationContext"/> then the Children returned
+        /// will include both the variant children matching the culture AND the invariant children because the invariant children flow with the current culture.
+        /// However, if an empty string is specified only invariant children are returned.
+        /// </para>
         /// </remarks>
         public static IEnumerable<IPublishedContent> Children(this IPublishedContent content, string culture = null)
         {

From 02f49a003931a82d0a827e641206ab15d5acd150 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 19 Jul 2019 16:00:42 +1000
Subject: [PATCH 170/776] Cherry picks fix for 5894 and makes adjustments

---
 .../PublishedCache/NuCache/PublishedSnapshotService.cs      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index dad9811af8..75f6d2f5c3 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -1056,8 +1056,10 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     : _dataSource.GetTypeMediaSources(scope, refreshedIds).ToArray();
 
                 _mediaStore.UpdateContentTypes(removedIds, typesA, kits);
-                _mediaStore.UpdateContentTypes(CreateContentTypes(PublishedItemType.Media, otherIds.ToArray()).ToArray());
-                _mediaStore.NewContentTypes(CreateContentTypes(PublishedItemType.Media, newIds.ToArray()).ToArray());
+                if (!otherIds.IsCollectionEmpty())
+                    _mediaStore.UpdateContentTypes(CreateContentTypes(PublishedItemType.Media, otherIds.ToArray()).ToArray());
+                if (!newIds.IsCollectionEmpty())
+                    _mediaStore.NewContentTypes(CreateContentTypes(PublishedItemType.Media, newIds.ToArray()).ToArray());
                 scope.Complete();
             }
         }

From 47c3e3a79f4c40a53390b1a3867a13bbf50e895b Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Fri, 19 Jul 2019 11:20:31 +0200
Subject: [PATCH 171/776] https://github.com/umbraco/Umbraco-CMS/issues/5921 -
 AB#1794 - Remove trashed nodes from sql when building xml for previews

---
 .../Repositories/ContentRepository.cs         | 2745 +++++++++--------
 1 file changed, 1373 insertions(+), 1372 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
index be5cc20cb6..a0b211b6b2 100644
--- a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
@@ -1,1372 +1,1373 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Globalization;
-using System.Linq;
-using System.Xml;
-using System.Xml.Linq;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.EntityBase;
-using Umbraco.Core.Models.Membership;
-using Umbraco.Core.Models.Rdbms;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
-using Umbraco.Core.Persistence.Factories;
-using Umbraco.Core.Persistence.Querying;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Configuration.UmbracoSettings;
-using Umbraco.Core.Persistence.SqlSyntax;
-using Umbraco.Core.Persistence.UnitOfWork;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    /// <summary>
-    /// Represents a repository for doing CRUD operations for <see cref="IContent"/>
-    /// </summary>
-    internal class ContentRepository : RecycleBinRepository<int, IContent>, IContentRepository
-    {
-        private readonly IContentTypeRepository _contentTypeRepository;
-        private readonly ITemplateRepository _templateRepository;
-        private readonly ITagRepository _tagRepository;
-        private readonly ContentPreviewRepository<IContent> _contentPreviewRepository;
-        private readonly ContentXmlRepository<IContent> _contentXmlRepository;
-        private readonly PermissionRepository<IContent> _permissionRepository;
-        private readonly ContentByGuidReadRepository _contentByGuidReadRepository;
-
-        public ContentRepository(IScopeUnitOfWork work, CacheHelper cacheHelper, ILogger logger, ISqlSyntaxProvider syntaxProvider, IContentTypeRepository contentTypeRepository, ITemplateRepository templateRepository, ITagRepository tagRepository, IContentSection contentSection)
-            : base(work, cacheHelper, logger, syntaxProvider, contentSection)
-        {
-            if (contentTypeRepository == null) throw new ArgumentNullException("contentTypeRepository");
-            if (templateRepository == null) throw new ArgumentNullException("templateRepository");
-            if (tagRepository == null) throw new ArgumentNullException("tagRepository");
-            _contentTypeRepository = contentTypeRepository;
-            _templateRepository = templateRepository;
-            _tagRepository = tagRepository;
-            _contentPreviewRepository = new ContentPreviewRepository<IContent>(work, CacheHelper.NoCache, logger, syntaxProvider);
-            _contentXmlRepository = new ContentXmlRepository<IContent>(work, CacheHelper.NoCache, logger, syntaxProvider);
-            _permissionRepository = new PermissionRepository<IContent>(UnitOfWork, cacheHelper, Logger, SqlSyntax);
-            _contentByGuidReadRepository = new ContentByGuidReadRepository(this, work, cacheHelper, logger, syntaxProvider);
-            EnsureUniqueNaming = true;
-        }
-
-        public bool EnsureUniqueNaming { get; set; }
-
-        #region Overrides of RepositoryBase<IContent>
-
-        protected override IContent PerformGet(int id)
-        {
-            var sql = GetBaseQuery(BaseQueryType.FullSingle)
-                .Where(GetBaseWhereClause(), new { Id = id })
-                .Where<DocumentDto>(x => x.Newest, SqlSyntax)
-                .OrderByDescending<ContentVersionDto>(x => x.VersionDate, SqlSyntax);
-
-            var dto = Database.Fetch<DocumentDto, ContentVersionDto, ContentDto, NodeDto, DocumentPublishedReadOnlyDto>(SqlSyntax.SelectTop(sql, 1)).FirstOrDefault();
-
-            if (dto == null)
-                return null;
-
-            var content = CreateContentFromDto(dto, sql);
-
-            return content;
-        }
-
-        protected override IEnumerable<IContent> PerformGetAll(params int[] ids)
-        {
-            Func<Sql, Sql> translate = s =>
-            {
-                if (ids.Any())
-                {
-                    s.Where("umbracoNode.id in (@ids)", new { ids });
-                }
-                //we only want the newest ones with this method
-                s.Where<DocumentDto>(x => x.Newest, SqlSyntax);
-                return s;
-            };
-
-            var sqlBaseFull = GetBaseQuery(BaseQueryType.FullMultiple);
-            var sqlBaseIds = GetBaseQuery(BaseQueryType.Ids);
-
-            return ProcessQuery(translate(sqlBaseFull), new PagingSqlQuery(translate(sqlBaseIds)));
-        }
-
-        protected override IEnumerable<IContent> PerformGetByQuery(IQuery<IContent> query)
-        {
-            var sqlBaseFull = GetBaseQuery(BaseQueryType.FullMultiple);
-            var sqlBaseIds = GetBaseQuery(BaseQueryType.Ids);
-
-            Func<SqlTranslator<IContent>, Sql> translate = (translator) =>
-            {
-                return translator.Translate()
-                    .Where<DocumentDto>(x => x.Newest, SqlSyntax)
-                    .OrderByDescending<ContentVersionDto>(x => x.VersionDate, SqlSyntax)
-                    .OrderBy<NodeDto>(x => x.SortOrder, SqlSyntax);
-            };
-
-            var translatorFull = new SqlTranslator<IContent>(sqlBaseFull, query);
-            var translatorIds = new SqlTranslator<IContent>(sqlBaseIds, query);
-
-            return ProcessQuery(translate(translatorFull), new PagingSqlQuery(translate(translatorIds)));
-        }
-
-        #endregion
-
-        #region Overrides of PetaPocoRepositoryBase<IContent>
-
-        /// <summary>
-        /// Returns the base query to return Content
-        /// </summary>
-        /// <param name="queryType"></param>
-        /// <returns></returns>
-        /// <remarks>
-        /// Content queries will differ depending on what needs to be returned:
-        /// * FullSingle: When querying for a single document, this will include the Outer join to fetch the content item's published version info
-        /// * FullMultiple: When querying for multiple documents, this will exclude the Outer join to fetch the content item's published version info - this info would need to be fetched separately
-        /// * Ids: This would essentially be the same as FullMultiple however the columns specified will only return the Ids for the documents
-        /// * Count: A query to return the count for documents
-        /// </remarks>
-        protected override Sql GetBaseQuery(BaseQueryType queryType)
-        {
-            var sql = new Sql();
-            sql.Select(queryType == BaseQueryType.Count ? "COUNT(*)" : (queryType == BaseQueryType.Ids ? "cmsDocument.nodeId" : "*"))
-                .From<DocumentDto>(SqlSyntax)
-                .InnerJoin<ContentVersionDto>(SqlSyntax)
-                .On<DocumentDto, ContentVersionDto>(SqlSyntax, left => left.VersionId, right => right.VersionId)
-                .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)
-                .InnerJoin<ContentTypeDto>()
-                .On<ContentTypeDto, ContentDto>(left => left.NodeId, right => right.ContentTypeId);
-            //TODO: IF we want to enable querying on content type information this will need to be joined
-            //.InnerJoin<ContentTypeDto>(SqlSyntax)
-            //.On<ContentDto, ContentTypeDto>(SqlSyntax, left => left.ContentTypeId, right => right.NodeId, SqlSyntax);
-
-            if (queryType == BaseQueryType.FullSingle)
-            {
-                //The only reason we apply this left outer join is to be able to pull back the DocumentPublishedReadOnlyDto
-                //information with the entire data set, so basically this will get both the latest document and also it's published
-                //version if it has one. When performing a count or when retrieving Ids like in paging, this is unecessary
-                //and causes huge performance overhead for the SQL server, especially when sorting the result.
-                //We also don't include this outer join when querying for multiple entities since it is much faster to fetch this information
-                //in a separate query. For a single entity this is ok.
-
-                var sqlx = string.Format("LEFT OUTER JOIN {0} {1} ON ({1}.{2}={0}.{2} AND {1}.{3}=1)",
-                SqlSyntax.GetQuotedTableName("cmsDocument"),
-                SqlSyntax.GetQuotedTableName("cmsDocument2"),
-                SqlSyntax.GetQuotedColumnName("nodeId"),
-                SqlSyntax.GetQuotedColumnName("published"));
-
-                // cannot do this because PetaPoco does not know how to alias the table
-                //.LeftOuterJoin<DocumentPublishedReadOnlyDto>()
-                //.On<DocumentDto, DocumentPublishedReadOnlyDto>(left => left.NodeId, right => right.NodeId)
-                // so have to rely on writing our own SQL
-                sql.Append(sqlx /*, new { @published = true }*/);
-            }
-
-            sql.Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId, SqlSyntax);
-
-            return sql;
-        }
-
-        protected override Sql GetBaseQuery(bool isCount)
-        {
-            return GetBaseQuery(isCount ? BaseQueryType.Count : BaseQueryType.FullSingle);
-        }
-
-        protected override string GetBaseWhereClause()
-        {
-            return "umbracoNode.id = @Id";
-        }
-
-        protected override IEnumerable<string> GetDeleteClauses()
-        {
-            var list = new List<string>
-                           {
-                               "DELETE FROM umbracoRedirectUrl WHERE contentKey IN (SELECT uniqueID FROM umbracoNode WHERE id = @Id)",
-                               "DELETE FROM cmsTask WHERE nodeId = @Id",
-                               "DELETE FROM umbracoUser2NodeNotify WHERE nodeId = @Id",
-                               "DELETE FROM umbracoUserGroup2NodePermission WHERE nodeId = @Id",
-                               "DELETE FROM umbracoUserStartNode WHERE startNode = @Id",
-                               "UPDATE umbracoUserGroup SET startContentId = NULL WHERE startContentId = @Id",
-                               "DELETE FROM umbracoRelation WHERE parentId = @Id",
-                               "DELETE FROM umbracoRelation WHERE childId = @Id",
-                               "DELETE FROM cmsTagRelationship WHERE nodeId = @Id",
-                               "DELETE FROM umbracoDomains WHERE domainRootStructureID = @Id",
-                               "DELETE FROM cmsDocument WHERE nodeId = @Id",
-                               "DELETE FROM cmsPropertyData WHERE contentNodeId = @Id",
-                               "DELETE FROM cmsPreviewXml WHERE nodeId = @Id",
-                               "DELETE FROM cmsContentVersion WHERE ContentId = @Id",
-                               "DELETE FROM cmsContentXml WHERE nodeId = @Id",
-                               "DELETE FROM cmsContent WHERE nodeId = @Id",
-                               "DELETE FROM umbracoAccess WHERE nodeId = @Id",
-                               "DELETE FROM umbracoNode WHERE id = @Id"
-                           };
-            return list;
-        }
-
-        protected override Guid NodeObjectTypeId
-        {
-            get { return Constants.ObjectTypes.DocumentGuid; }
-        }
-
-        #endregion
-
-        #region Overrides of VersionableRepositoryBase<IContent>
-
-        public void RebuildXmlStructures(Func<IContent, XElement> serializer, int groupSize = 200, IEnumerable<int> contentTypeIds = null)
-        {
-            // the previous way of doing this was to run it all in one big transaction,
-            // and to bulk-insert groups of xml rows - which works, until the transaction
-            // times out - and besides, because v7 transactions are ReadCommited, it does
-            // not bring much safety - so this reverts to updating each record individually,
-            // and it may be slower in the end, but should be more resilient.
-
-            var contentTypeIdsA = contentTypeIds == null ? new int[0] : contentTypeIds.ToArray();
-
-            Func<int, Sql, Sql> translate = (bId, sql) =>
-            {
-                if (contentTypeIdsA.Length > 0)
-                {
-                    sql.WhereIn<ContentDto>(x => x.ContentTypeId, contentTypeIdsA, SqlSyntax);
-                }
-
-                sql
-                    .Where<NodeDto>(x => x.NodeId > bId && x.Trashed == false, SqlSyntax)
-                    .Where<DocumentDto>(x => x.Published, SqlSyntax)
-                    .OrderBy<NodeDto>(x => x.NodeId, SqlSyntax);
-
-                return sql;
-            };
-
-            var baseId = 0;
-
-            while (true)
-            {
-                // get the next group of nodes
-                var sqlFull = translate(baseId, GetBaseQuery(BaseQueryType.FullMultiple));
-                var sqlIds = translate(baseId, GetBaseQuery(BaseQueryType.Ids));
-
-                var xmlItems = ProcessQuery(SqlSyntax.SelectTop(sqlFull, groupSize), new PagingSqlQuery(SqlSyntax.SelectTop(sqlIds, groupSize)))
-                    .Select(x => new ContentXmlDto { NodeId = x.Id, Xml = serializer(x).ToString() })
-                    .ToList();
-
-                // no more nodes, break
-                if (xmlItems.Count == 0) break;
-
-                foreach (var xmlItem in xmlItems)
-                {
-                    try
-                    {
-                        // should happen in most cases, then it tries to insert, and it should work
-                        // unless the node has been deleted, and we just report the exception
-                        Database.InsertOrUpdate(xmlItem);
-                    }
-                    catch (Exception e)
-                    {
-                        Logger.Error<MediaRepository>("Could not rebuild XML for nodeId=" + xmlItem.NodeId, e);
-                    }
-                }
-                baseId = xmlItems[xmlItems.Count - 1].NodeId;
-            }
-
-            //now delete the items that shouldn't be there
-            var sqlAllIds = translate(0, GetBaseQuery(BaseQueryType.Ids));
-            var allContentIds = Database.Fetch<int>(sqlAllIds);
-            var docObjectType = NodeObjectTypeId;
-            var xmlIdsQuery = new Sql()
-                .Select("DISTINCT cmsContentXml.nodeId")
-                .From<ContentXmlDto>(SqlSyntax)
-                .InnerJoin<NodeDto>(SqlSyntax)
-                .On<ContentXmlDto, NodeDto>(SqlSyntax, left => left.NodeId, right => right.NodeId);
-
-            if (contentTypeIdsA.Length > 0)
-            {
-                xmlIdsQuery.InnerJoin<ContentDto>(SqlSyntax)
-                    .On<ContentDto, NodeDto>(SqlSyntax, left => left.NodeId, right => right.NodeId)
-                    .InnerJoin<ContentTypeDto>(SqlSyntax)
-                    .On<ContentTypeDto, ContentDto>(SqlSyntax, left => left.NodeId, right => right.ContentTypeId)
-                    .WhereIn<ContentDto>(x => x.ContentTypeId, contentTypeIdsA, SqlSyntax);
-            }
-
-            xmlIdsQuery.Where<NodeDto>(dto => dto.NodeObjectType == docObjectType, SqlSyntax);
-
-            var allXmlIds = Database.Fetch<int>(xmlIdsQuery);
-
-            var toRemove = allXmlIds.Except(allContentIds).ToArray();
-            if (toRemove.Length > 0)
-            {
-                foreach (var idGroup in toRemove.InGroupsOf(2000))
-                {
-                    Database.Execute("DELETE FROM cmsContentXml WHERE nodeId IN (@ids)", new { ids = idGroup });
-                }
-            }
-
-        }
-
-        public override IEnumerable<IContent> GetAllVersions(int id)
-        {
-            Func<Sql, Sql> translate = s =>
-            {
-                return s.Where(GetBaseWhereClause(), new {Id = id})
-                    .OrderByDescending<ContentVersionDto>(x => x.VersionDate, SqlSyntax);
-            };
-
-            var sqlFull = translate(GetBaseQuery(BaseQueryType.FullMultiple));
-            var sqlIds = translate(GetBaseQuery(BaseQueryType.Ids));
-
-            return ProcessQuery(sqlFull, new PagingSqlQuery(sqlIds), true,  includeAllVersions:true);
-        }
-
-        public override IContent GetByVersion(Guid versionId)
-        {
-            var sql = GetBaseQuery(BaseQueryType.FullSingle);
-            //TODO: cmsContentVersion.VersionId has a Unique Index constraint applied, seems silly then to also add OrderByDescending since it would be impossible to return more than one.
-            sql.Where("cmsContentVersion.VersionId = @VersionId", new { VersionId = versionId });
-            sql.OrderByDescending<ContentVersionDto>(x => x.VersionDate, SqlSyntax);
-
-            var dto = Database.Fetch<DocumentDto, ContentVersionDto, ContentDto, NodeDto, DocumentPublishedReadOnlyDto>(sql).FirstOrDefault();
-
-            if (dto == null)
-                return null;
-
-            var content = CreateContentFromDto(dto, sql);
-
-            return content;
-        }
-
-        public override void DeleteVersion(Guid versionId)
-        {
-            var sql = new Sql()
-                .Select("*")
-                .From<DocumentDto>(SqlSyntax)
-                .InnerJoin<ContentVersionDto>(SqlSyntax)
-                .On<ContentVersionDto, DocumentDto>(SqlSyntax, left => left.VersionId, right => right.VersionId)
-                .Where<ContentVersionDto>(x => x.VersionId == versionId, SqlSyntax)
-                .Where<DocumentDto>(x => x.Newest != true, SqlSyntax);
-            var dto = Database.Fetch<DocumentDto, ContentVersionDto>(sql).FirstOrDefault();
-
-            if (dto == null) return;
-
-            using (var transaction = Database.GetTransaction())
-            {
-                PerformDeleteVersion(dto.NodeId, versionId);
-
-                transaction.Complete();
-            }
-        }
-
-        public override void DeleteVersions(int id, DateTime versionDate)
-        {
-            var sql = new Sql()
-                .Select("*")
-                .From<DocumentDto>()
-                .InnerJoin<ContentVersionDto>()
-                .On<ContentVersionDto, DocumentDto>(left => left.VersionId, right => right.VersionId)
-                .Where<ContentVersionDto>(x => x.NodeId == id)
-                .Where<ContentVersionDto>(x => x.VersionDate < versionDate)
-                .Where<DocumentDto>(x => x.Newest != true);
-            var list = Database.Fetch<DocumentDto, ContentVersionDto>(sql);
-            if (list.Any() == false) return;
-
-            using (var transaction = Database.GetTransaction())
-            {
-                foreach (var dto in list)
-                {
-                    PerformDeleteVersion(id, dto.VersionId);
-                }
-
-                transaction.Complete();
-            }
-        }
-
-        protected override void PerformDeleteVersion(int id, Guid versionId)
-        {
-            Database.Delete<PreviewXmlDto>("WHERE nodeId = @Id AND versionId = @VersionId", new { Id = id, VersionId = versionId });
-            Database.Delete<PropertyDataDto>("WHERE contentNodeId = @Id AND versionId = @VersionId", new { Id = id, VersionId = versionId });
-            Database.Delete<ContentVersionDto>("WHERE ContentId = @Id AND VersionId = @VersionId", new { Id = id, VersionId = versionId });
-            Database.Delete<DocumentDto>("WHERE nodeId = @Id AND versionId = @VersionId", new { Id = id, VersionId = versionId });
-        }
-
-        #endregion
-
-        #region Unit of Work Implementation
-
-        protected override void PersistDeletedItem(IContent entity)
-        {
-            //We need to clear out all access rules but we need to do this in a manual way since
-            // nothing in that table is joined to a content id
-            var subQuery = new Sql()
-                .Select("umbracoAccessRule.accessId")
-                .From<AccessRuleDto>(SqlSyntax)
-                .InnerJoin<AccessDto>(SqlSyntax)
-                .On<AccessRuleDto, AccessDto>(SqlSyntax, left => left.AccessId, right => right.Id)
-                .Where<AccessDto>(dto => dto.NodeId == entity.Id);
-            Database.Execute(SqlSyntax.GetDeleteSubquery("umbracoAccessRule", "accessId", subQuery));
-
-            //now let the normal delete clauses take care of everything else
-            base.PersistDeletedItem(entity);
-        }
-
-        protected override void PersistNewItem(IContent entity)
-        {
-            ((Content)entity).AddingEntity();
-
-            //ensure the default template is assigned
-            if (entity.Template == null)
-            {
-                entity.Template = entity.ContentType.DefaultTemplate;
-            }
-
-            //Ensure unique name on the same level
-            entity.Name = EnsureUniqueNodeName(entity.ParentId, entity.Name);
-
-            //Ensure that strings don't contain characters that are invalid in XML
-            entity.SanitizeEntityPropertiesForXmlStorage();
-
-            var factory = new ContentFactory(NodeObjectTypeId, entity.Id);
-            var dto = factory.BuildDto(entity);
-
-            //NOTE Should the logic below have some kind of fallback for empty parent ids ?
-            //Logic for setting Path, Level and SortOrder
-            var parent = Database.First<NodeDto>("WHERE id = @ParentId", new { ParentId = entity.ParentId });
-            var level = parent.Level + 1;
-            var maxSortOrder = Database.ExecuteScalar<int>(
-                "SELECT coalesce(max(sortOrder),-1) FROM umbracoNode WHERE parentid = @ParentId AND nodeObjectType = @NodeObjectType",
-                new { /*ParentId =*/ entity.ParentId, NodeObjectType = NodeObjectTypeId });
-            var sortOrder = maxSortOrder + 1;
-
-            //Create the (base) node data - umbracoNode
-            var nodeDto = dto.ContentVersionDto.ContentDto.NodeDto;
-            nodeDto.Path = parent.Path;
-            nodeDto.Level = short.Parse(level.ToString(CultureInfo.InvariantCulture));
-            nodeDto.SortOrder = sortOrder;
-
-            // note:
-            // there used to be a check on Database.IsNew(nodeDto) here to either Insert or Update,
-            // but I cannot figure out what was the point, as the node should obviously be new if
-            // we reach that point - removed.
-
-            // see if there's a reserved identifier for this unique id
-            var sql = new Sql("SELECT id FROM umbracoNode WHERE uniqueID=@0 AND nodeObjectType=@1", nodeDto.UniqueId, Constants.ObjectTypes.IdReservationGuid);
-            var id = Database.ExecuteScalar<int>(sql);
-            if (id > 0)
-            {
-                nodeDto.NodeId = id;
-                Database.Update(nodeDto);
-            }
-            else
-            {
-                Database.Insert(nodeDto);
-            }
-
-            //Update with new correct path
-            nodeDto.Path = string.Concat(parent.Path, ",", nodeDto.NodeId);
-            nodeDto.ValidatePathWithException();
-            Database.Update(nodeDto);
-
-            //Update entity with correct values
-            entity.Id = nodeDto.NodeId; //Set Id on entity to ensure an Id is set
-            entity.Path = nodeDto.Path;
-            entity.SortOrder = sortOrder;
-            entity.Level = level;
-
-            //Create the Content specific data - cmsContent
-            var contentDto = dto.ContentVersionDto.ContentDto;
-            contentDto.NodeId = nodeDto.NodeId;
-            Database.Insert(contentDto);
-
-            //Create the first version - cmsContentVersion
-            //Assumes a new Version guid and Version date (modified date) has been set
-            var contentVersionDto = dto.ContentVersionDto;
-            contentVersionDto.NodeId = nodeDto.NodeId;
-            Database.Insert(contentVersionDto);
-
-            //Create the Document specific data for this version - cmsDocument
-            //Assumes a new Version guid has been generated
-            dto.NodeId = nodeDto.NodeId;
-            Database.Insert(dto);
-
-            //Create the PropertyData for this version - cmsPropertyData
-            var propertyFactory = new PropertyFactory(entity.ContentType.CompositionPropertyTypes.ToArray(), entity.Version, entity.Id);
-            var propertyDataDtos = propertyFactory.BuildDto(entity.Properties);
-            var keyDictionary = new Dictionary<int, int>();
-
-            //Add Properties
-            foreach (var propertyDataDto in propertyDataDtos)
-            {
-                var primaryKey = Convert.ToInt32(Database.Insert(propertyDataDto));
-                keyDictionary.Add(propertyDataDto.PropertyTypeId, primaryKey);
-            }
-
-            //Update Properties with its newly set Id
-            foreach (var property in entity.Properties)
-            {
-                property.Id = keyDictionary[property.PropertyTypeId];
-            }
-
-            //lastly, check if we are a creating a published version , then update the tags table
-            if (entity.Published)
-            {
-                UpdatePropertyTags(entity, _tagRepository);
-            }
-
-            // published => update published version infos, else leave it blank
-            if (entity.Published)
-            {
-                dto.DocumentPublishedReadOnlyDto = new DocumentPublishedReadOnlyDto
-                {
-                    VersionId = dto.VersionId,
-                    VersionDate = dto.UpdateDate,
-                    Newest = true,
-                    NodeId = dto.NodeId,
-                    Published = true
-                };
-                ((Content) entity).PublishedVersionGuid = dto.VersionId;
-                ((Content) entity).PublishedDate = dto.UpdateDate;
-            }
-
-            entity.ResetDirtyProperties();
-        }
-
-        protected override void PersistUpdatedItem(IContent entity)
-        {
-            var publishedState = ((Content)entity).PublishedState;
-
-            //check if we need to make any database changes at all
-            if (entity.RequiresSaving(publishedState) == false)
-            {
-                entity.ResetDirtyProperties();
-                return;
-            }
-
-            //check if we need to create a new version
-            bool shouldCreateNewVersion = entity.ShouldCreateNewVersion(publishedState);
-            if (shouldCreateNewVersion)
-            {
-                //Updates Modified date and Version Guid
-                ((Content)entity).UpdatingEntity();
-            }
-            else
-            {
-                if (entity.IsPropertyDirty("UpdateDate") == false || entity.UpdateDate == default(DateTime))
-                    entity.UpdateDate = DateTime.Now;
-            }
-
-            //Ensure unique name on the same level
-            entity.Name = EnsureUniqueNodeName(entity.ParentId, entity.Name, entity.Id);
-
-            //Ensure that strings don't contain characters that are invalid in XML
-            entity.SanitizeEntityPropertiesForXmlStorage();
-
-            //Look up parent to get and set the correct Path and update SortOrder if ParentId has changed
-            if (entity.IsPropertyDirty("ParentId"))
-            {
-                var parent = Database.First<NodeDto>("WHERE id = @ParentId", new { ParentId = entity.ParentId });
-                entity.Path = string.Concat(parent.Path, ",", entity.Id);
-                entity.Level = parent.Level + 1;
-                var maxSortOrder =
-                    Database.ExecuteScalar<int>(
-                        "SELECT coalesce(max(sortOrder),0) FROM umbracoNode WHERE parentid = @ParentId AND nodeObjectType = @NodeObjectType",
-                        new { ParentId = entity.ParentId, NodeObjectType = NodeObjectTypeId });
-                entity.SortOrder = maxSortOrder + 1;
-
-                //Question: If we move a node, should we update permissions to inherit from the new parent if the parent has permissions assigned?
-                // if we do that, then we'd need to propogate permissions all the way downward which might not be ideal for many people.
-                // Gonna just leave it as is for now, and not re-propogate permissions.
-            }
-
-            var factory = new ContentFactory(NodeObjectTypeId, entity.Id);
-            //Look up Content entry to get Primary for updating the DTO
-            var contentDto = Database.SingleOrDefault<ContentDto>("WHERE nodeId = @Id", new { Id = entity.Id });
-            factory.SetPrimaryKey(contentDto.PrimaryKey);
-            var dto = factory.BuildDto(entity);
-
-            //Updates the (base) node data - umbracoNode
-            var nodeDto = dto.ContentVersionDto.ContentDto.NodeDto;
-            nodeDto.ValidatePathWithException();
-            var o = Database.Update(nodeDto);
-
-            //Only update this DTO if the contentType has actually changed
-            if (contentDto.ContentTypeId != entity.ContentTypeId)
-            {
-                //Create the Content specific data - cmsContent
-                var newContentDto = dto.ContentVersionDto.ContentDto;
-                Database.Update(newContentDto);
-            }
-
-            //a flag that we'll use later to create the tags in the tag db table
-            var publishedStateChanged = false;
-
-            //If Published state has changed then previous versions should have their publish state reset.
-            //If state has been changed to unpublished the previous versions publish state should also be reset.
-            //if (((ICanBeDirty)entity).IsPropertyDirty("Published") && (entity.Published || publishedState == PublishedState.Unpublished))
-            if (entity.ShouldClearPublishedFlagForPreviousVersions(publishedState, shouldCreateNewVersion))
-            {
-                //TODO: This perf can be improved, it could easily be UPDATE WHERE.... (one SQL call instead of many)
-                var publishedDocs = Database.Fetch<DocumentDto>("WHERE nodeId = @Id AND published = @IsPublished", new { Id = entity.Id, IsPublished = true });
-                foreach (var doc in publishedDocs)
-                {
-                    var docDto = doc;
-                    docDto.Published = false;
-                    Database.Update(docDto);
-                }
-
-                //this is a newly published version so we'll update the tags table too (end of this method)
-                publishedStateChanged = true;
-            }
-
-            //Look up (newest) entries by id in cmsDocument table to set newest = false
-            //TODO: This perf can be improved, it could easily be UPDATE WHERE.... (one SQL call instead of many)
-            var documentDtos = Database.Fetch<DocumentDto>("WHERE nodeId = @Id AND newest = @IsNewest", new { Id = entity.Id, IsNewest = true });
-            foreach (var documentDto in documentDtos)
-            {
-                var docDto = documentDto;
-                docDto.Newest = false;
-                Database.Update(docDto);
-            }
-
-            var contentVersionDto = dto.ContentVersionDto;
-            if (shouldCreateNewVersion)
-            {
-                //Create a new version - cmsContentVersion
-                //Assumes a new Version guid and Version date (modified date) has been set
-                Database.Insert(contentVersionDto);
-                //Create the Document specific data for this version - cmsDocument
-                //Assumes a new Version guid has been generated
-                Database.Insert(dto);
-            }
-            else
-            {
-                //In order to update the ContentVersion we need to retrieve its primary key id
-                var contentVerDto = Database.SingleOrDefault<ContentVersionDto>("WHERE VersionId = @Version", new { Version = entity.Version });
-                if (contentVerDto != null)
-                {
-                    contentVersionDto.Id = contentVerDto.Id;
-                    Database.Update(contentVersionDto);
-                }
-
-                Database.Update(dto);
-            }
-
-            //Create the PropertyData for this version - cmsPropertyData
-            var propertyFactory = new PropertyFactory(entity.ContentType.CompositionPropertyTypes.ToArray(), entity.Version, entity.Id);
-            var propertyDataDtos = propertyFactory.BuildDto(entity.Properties);
-            var keyDictionary = new Dictionary<int, int>();
-
-            //Add Properties
-            foreach (var propertyDataDto in propertyDataDtos)
-            {
-                if (shouldCreateNewVersion == false && propertyDataDto.Id > 0)
-                {
-                    Database.Update(propertyDataDto);
-                }
-                else
-                {
-                    int primaryKey = Convert.ToInt32(Database.Insert(propertyDataDto));
-                    keyDictionary.Add(propertyDataDto.PropertyTypeId, primaryKey);
-                }
-            }
-
-            //Update Properties with its newly set Id
-            if (keyDictionary.Any())
-            {
-                foreach (var property in entity.Properties)
-                {
-                    if (keyDictionary.ContainsKey(property.PropertyTypeId) == false) continue;
-
-                    property.Id = keyDictionary[property.PropertyTypeId];
-                }
-            }
-
-            //lastly, check if we are a newly published version and then update the tags table
-            if (publishedStateChanged && entity.Published)
-            {
-                UpdatePropertyTags(entity, _tagRepository);
-            }
-            else if (publishedStateChanged && (entity.Trashed || entity.Published == false))
-            {
-                //it's in the trash or not published remove all entity tags
-                ClearEntityTags(entity, _tagRepository);
-            }
-
-            // published => update published version infos,
-            // else if unpublished then clear published version infos
-            if (entity.Published)
-            {
-                dto.DocumentPublishedReadOnlyDto = new DocumentPublishedReadOnlyDto
-                {
-                    VersionId = dto.VersionId,
-                    VersionDate = dto.UpdateDate,
-                    Newest = true,
-                    NodeId = dto.NodeId,
-                    Published = true
-                };
-                ((Content) entity).PublishedVersionGuid = dto.VersionId;
-                ((Content) entity).PublishedDate = dto.UpdateDate;
-            }
-            else if (publishedStateChanged)
-            {
-                dto.DocumentPublishedReadOnlyDto = new DocumentPublishedReadOnlyDto
-                {
-                    VersionId = default (Guid),
-                    VersionDate = default (DateTime),
-                    Newest = false,
-                    NodeId = dto.NodeId,
-                    Published = false
-                };
-                ((Content) entity).PublishedVersionGuid = default(Guid);
-                ((Content) entity).PublishedDate = default (DateTime);
-            }
-
-            entity.ResetDirtyProperties();
-        }
-
-
-        #endregion
-
-        #region Implementation of IContentRepository
-
-        public IEnumerable<IContent> GetByPublishedVersion(IQuery<IContent> query)
-        {
-            Func<SqlTranslator<IContent>, Sql> translate = t =>
-            {
-                return t.Translate()
-                    .Where<DocumentDto>(x => x.Published, SqlSyntax)
-                    .OrderBy<NodeDto>(x => x.Level, SqlSyntax)
-                    .OrderBy<NodeDto>(x => x.SortOrder, SqlSyntax);
-            };
-
-            // we WANT to return contents in top-down order, ie parents should come before children
-            // ideal would be pure xml "document order" which can be achieved with:
-            // ORDER BY substring(path, 1, len(path) - charindex(',', reverse(path))), sortOrder
-            // but that's probably an overkill - sorting by level,sortOrder should be enough
-
-            var sqlFull = GetBaseQuery(BaseQueryType.FullMultiple);
-            var translatorFull = new SqlTranslator<IContent>(sqlFull, query);
-            var sqlIds = GetBaseQuery(BaseQueryType.Ids);
-            var translatorIds = new SqlTranslator<IContent>(sqlIds, query);
-
-            return ProcessQuery(translate(translatorFull), new PagingSqlQuery(translate(translatorIds)), true);
-        }
-
-        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);
-            var translatorIds = new SqlTranslator<IContent>(sqlIds, query);
-
-            return ProcessQuery(translate(translatorFull), new PagingSqlQuery(translate(translatorIds)), true);
-        }
-
-        /// <summary>
-        /// This builds the Xml document used for the XML cache
-        /// </summary>
-        /// <returns></returns>
-        public XmlDocument BuildXmlCache()
-        {
-            //TODO: This is what we should do , but converting to use XDocument would be breaking unless we convert
-            // to XmlDocument at the end of this, but again, this would be bad for memory... though still not nearly as
-            // bad as what is happening before!
-            // We'll keep using XmlDocument for now though, but XDocument xml generation is much faster:
-            // https://blogs.msdn.microsoft.com/codejunkie/2008/10/08/xmldocument-vs-xelement-performance/
-            // I think we already have code in here to convert XDocument to XmlDocument but in case we don't here
-            // it is: https://blogs.msdn.microsoft.com/marcelolr/2009/03/13/fast-way-to-convert-xmldocument-into-xdocument/
-
-            //// Prepare an XmlDocument with an appropriate inline DTD to match
-            //// the expected content
-            //var parent = new XElement("root", new XAttribute("id", "-1"));
-            //var xmlDoc = new XDocument(
-            //    new XDocumentType("root", null, null, DocumentType.GenerateDtd()),
-            //    parent);
-
-            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, cmsContentXml.{0}, umbracoNode.{1} from umbracoNode
-inner join cmsContentXml on cmsContentXml.nodeId = umbracoNode.id and umbracoNode.nodeObjectType = @type
-where umbracoNode.id in (select cmsDocument.nodeId from cmsDocument where cmsDocument.published = 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 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())
-            {
-                var sql = GetBaseQuery(true).Where<NodeDto>(x => x.Trashed == false)
-                .Where<DocumentDto>(x => x.Published == true);
-                return Database.ExecuteScalar<int>(sql);
-            }
-            else
-            {
-                var sql = GetBaseQuery(true).Where<NodeDto>(x => x.Trashed == false)
-                .Where<DocumentDto>(x => x.Published == true)
-                .Where<ContentTypeDto>(x => x.Alias == contentTypeAlias);
-                return Database.ExecuteScalar<int>(sql);
-            }
-        }
-
-        public void ReplaceContentPermissions(EntityPermissionSet permissionSet)
-        {
-            _permissionRepository.ReplaceEntityPermissions(permissionSet);
-        }
-
-        public void ClearPublished(IContent content)
-        {
-            var sql = "UPDATE cmsDocument SET published=0 WHERE nodeId=@id AND published=1";
-            Database.Execute(sql, new {id = content.Id});
-        }
-
-        /// <summary>
-        /// Assigns a single permission to the current content item for the specified user group ids
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <param name="permission"></param>
-        /// <param name="groupIds"></param>
-        public void AssignEntityPermission(IContent entity, char permission, IEnumerable<int> groupIds)
-        {
-            _permissionRepository.AssignEntityPermission(entity, permission, groupIds);
-        }
-
-        /// <summary>
-        /// Gets the explicit list of permissions for the content item
-        /// </summary>
-        /// <param name="entityId"></param>
-        /// <returns></returns>
-        public EntityPermissionCollection GetPermissionsForEntity(int entityId)
-        {
-            return _permissionRepository.GetPermissionsForEntity(entityId);
-        }
-
-        /// <summary>
-        /// Adds/updates content/published xml
-        /// </summary>
-        /// <param name="content"></param>
-        /// <param name="xml"></param>
-        public void AddOrUpdateContentXml(IContent content, Func<IContent, XElement> xml)
-        {
-            _contentXmlRepository.AddOrUpdate(new ContentXmlEntity<IContent>(content, xml));
-        }
-
-        /// <summary>
-        /// Used to add/update a permission for a content item
-        /// </summary>
-        /// <param name="permission"></param>
-        public void AddOrUpdatePermissions(ContentPermissionSet permission)
-        {
-            _permissionRepository.AddOrUpdate(permission);
-        }
-
-        /// <summary>
-        /// Used to remove the content xml for a content item
-        /// </summary>
-        /// <param name="content"></param>
-        public void DeleteContentXml(IContent content)
-        {
-            _contentXmlRepository.Delete(new ContentXmlEntity<IContent>(content));
-        }
-
-        /// <summary>
-        /// Adds/updates preview xml
-        /// </summary>
-        /// <param name="content"></param>
-        /// <param name="xml"></param>
-        public void AddOrUpdatePreviewXml(IContent content, Func<IContent, XElement> xml)
-        {
-            _contentPreviewRepository.AddOrUpdate(new ContentPreviewEntity<IContent>(content, xml));
-        }
-
-        /// <summary>
-        /// Gets paged content results
-        /// </summary>
-        /// <param name="query">Query to excute</param>
-        /// <param name="pageIndex">Page number</param>
-        /// <param name="pageSize">Page size</param>
-        /// <param name="totalRecords">Total records query would return without paging</param>
-        /// <param name="orderBy">Field to order by</param>
-        /// <param name="orderDirection">Direction to order by</param>
-        /// <param name="orderBySystemField">Flag to indicate when ordering by system field</param>
-        /// <param name="filter">Search text filter</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetPagedResultsByQuery(IQuery<IContent> query, long pageIndex, int pageSize, out long totalRecords,
-            string orderBy, Direction orderDirection, bool orderBySystemField, IQuery<IContent> filter = null)
-        {
-
-            //NOTE: This uses the GetBaseQuery method but that does not take into account the required 'newest' field which is
-            // what we always require for a paged result, so we'll ensure it's included in the filter
-
-            var filterSql = new Sql().Append("AND (cmsDocument.newest = 1)");
-            if (filter != null)
-            {
-                foreach (var filterClause in filter.GetWhereClauses())
-                {
-                    filterSql.Append(string.Format("AND ({0})", filterClause.Item1), filterClause.Item2);
-                }
-            }
-
-            Func<Tuple<string, object[]>> filterCallback = () => new Tuple<string, object[]>(filterSql.SQL, filterSql.Arguments);
-
-            return GetPagedResultsByQuery<DocumentDto>(query, pageIndex, pageSize, out totalRecords,
-                new Tuple<string, string>("cmsDocument", "nodeId"),
-                (sqlFull, pagingSqlQuery) => ProcessQuery(sqlFull, pagingSqlQuery), orderBy, orderDirection, orderBySystemField,
-                filterCallback);
-
-        }
-
-        #endregion
-
-        #region IRecycleBinRepository members
-
-        protected override int RecycleBinId
-        {
-            get { return Constants.System.RecycleBinContent; }
-        }
-
-        #endregion
-
-        #region Read Repository implementation for GUID keys
-        public IContent Get(Guid id)
-        {
-            return _contentByGuidReadRepository.Get(id);
-        }
-
-        IEnumerable<IContent> IReadRepository<Guid, IContent>.GetAll(params Guid[] ids)
-        {
-            return _contentByGuidReadRepository.GetAll(ids);
-        }
-
-        public bool Exists(Guid id)
-        {
-            return _contentByGuidReadRepository.Exists(id);
-        }
-
-        /// <summary>
-        /// A reading repository purely for looking up by GUID
-        /// </summary>
-        /// <remarks>
-        /// TODO: This is ugly and to fix we need to decouple the IRepositoryQueryable -> IRepository -> IReadRepository which should all be separate things!
-        /// Then we can do the same thing with repository instances and we wouldn't need to leave all these methods as not implemented because we wouldn't need to implement them
-        /// </remarks>
-        private class ContentByGuidReadRepository : PetaPocoRepositoryBase<Guid, IContent>
-        {
-            private readonly ContentRepository _outerRepo;
-
-            public ContentByGuidReadRepository(ContentRepository outerRepo,
-                IScopeUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
-                : base(work, cache, logger, sqlSyntax)
-            {
-                _outerRepo = outerRepo;
-            }
-
-            protected override IContent PerformGet(Guid id)
-            {
-                var sql = _outerRepo.GetBaseQuery(BaseQueryType.FullSingle)
-                    .Where(GetBaseWhereClause(), new { Id = id })
-                    .Where<DocumentDto>(x => x.Newest, SqlSyntax)
-                    .OrderByDescending<ContentVersionDto>(x => x.VersionDate, SqlSyntax);
-
-                var dto = Database.Fetch<DocumentDto, ContentVersionDto, ContentDto, NodeDto, DocumentPublishedReadOnlyDto>(SqlSyntax.SelectTop(sql, 1)).FirstOrDefault();
-
-                if (dto == null)
-                    return null;
-
-                var content = _outerRepo.CreateContentFromDto(dto, sql);
-
-                return content;
-            }
-
-            protected override IEnumerable<IContent> PerformGetAll(params Guid[] ids)
-            {
-                Func<Sql, Sql> translate = s =>
-                {
-                    if (ids.Any())
-                    {
-                        s.Where("umbracoNode.uniqueID in (@ids)", new { ids });
-                    }
-                    //we only want the newest ones with this method
-                    s.Where<DocumentDto>(x => x.Newest, SqlSyntax);
-                    return s;
-                };
-
-                var sqlBaseFull = _outerRepo.GetBaseQuery(BaseQueryType.FullMultiple);
-                var sqlBaseIds = _outerRepo.GetBaseQuery(BaseQueryType.Ids);
-
-                return _outerRepo.ProcessQuery(translate(sqlBaseFull), new PagingSqlQuery(translate(sqlBaseIds)));
-            }
-
-            protected override Sql GetBaseQuery(bool isCount)
-            {
-                return _outerRepo.GetBaseQuery(isCount);
-            }
-
-            protected override string GetBaseWhereClause()
-            {
-                return "umbracoNode.uniqueID = @Id";
-            }
-
-            protected override Guid NodeObjectTypeId
-            {
-                get { return _outerRepo.NodeObjectTypeId; }
-            }
-
-            #region Not needed to implement
-
-            protected override IEnumerable<IContent> PerformGetByQuery(IQuery<IContent> query)
-            {
-                throw new NotImplementedException();
-            }
-            protected override IEnumerable<string> GetDeleteClauses()
-            {
-                throw new NotImplementedException();
-            }
-            protected override void PersistNewItem(IContent entity)
-            {
-                throw new NotImplementedException();
-            }
-            protected override void PersistUpdatedItem(IContent entity)
-            {
-                throw new NotImplementedException();
-            }
-            #endregion
-        }
-        #endregion
-
-        protected override string GetDatabaseFieldNameForOrderBy(string orderBy)
-        {
-            //Some custom ones
-            switch (orderBy.ToUpperInvariant())
-            {
-                case "NAME":
-                    return "cmsDocument.text";
-                case "UPDATER":
-                    //TODO: This isn't going to work very nicely because it's going to order by ID, not by letter
-                    return "cmsDocument.documentUser";
-            }
-
-            return base.GetDatabaseFieldNameForOrderBy(orderBy);
-        }
-
-        /// <summary>
-        /// This is the underlying method that processes most queries for this repository
-        /// </summary>
-        /// <param name="sqlFull">
-        /// The FullMultiple SQL without the outer join to return all data required to create an IContent excluding it's published state data which this will query separately
-        /// </param>
-        /// <param name="pagingSqlQuery">
-        /// The Id SQL without the outer join to just return all document ids - used to process the properties for the content item
-        /// </param>
-        /// <param name="withCache"></param>
-        /// <param name="includeAllVersions">
-        /// Generally when querying for content we only want to return the most recent version of the content item, however in some cases like when
-        /// we want to return all versions of a content item, we can't simply return the latest
-        /// </param>
-        /// <returns></returns>
-        private IEnumerable<IContent> ProcessQuery(Sql sqlFull, PagingSqlQuery pagingSqlQuery, bool withCache = false, bool includeAllVersions = false)
-        {
-            // fetch returns a list so it's ok to iterate it in this method
-            var dtos = Database.Fetch<DocumentDto, ContentVersionDto, ContentDto, NodeDto>(sqlFull);
-            if (dtos.Count == 0) return Enumerable.Empty<IContent>();
-
-            //Go and get all of the published version data separately for this data, this is because when we are querying
-            //for multiple content items we don't include the outer join to fetch this data in the same query because
-            //it is insanely slow. Instead we just fetch the published version data separately in one query.
-
-            //we need to parse the original SQL statement and reduce the columns to just cmsDocument.nodeId so that we can use
-            // the statement to go get the published data for all of the items by using an inner join
-            var parsedOriginalSql = "SELECT cmsDocument.nodeId " + sqlFull.SQL.Substring(sqlFull.SQL.IndexOf("FROM", StringComparison.Ordinal));
-            //now remove everything from an Orderby clause and beyond
-            if (parsedOriginalSql.InvariantContains("ORDER BY "))
-            {
-                parsedOriginalSql = parsedOriginalSql.Substring(0, parsedOriginalSql.LastIndexOf("ORDER BY ", StringComparison.Ordinal));
-            }
-
-            //order by update date DESC, if there is corrupted published flags we only want the latest!
-            var publishedSql = new Sql(@"SELECT cmsDocument.nodeId, cmsDocument.published, cmsDocument.versionId, cmsDocument.updateDate, cmsDocument.newest
-FROM cmsDocument INNER JOIN cmsContentVersion ON cmsContentVersion.VersionId = cmsDocument.versionId
-WHERE cmsDocument.published = 1 AND cmsDocument.nodeId IN 
-(" + parsedOriginalSql + @")
-ORDER BY cmsContentVersion.id DESC
-", sqlFull.Arguments);
-
-            //go and get the published version data, we do a Query here and not a Fetch so we are
-            //not allocating a whole list to memory just to allocate another list in memory since
-            //we are assigning this data to a keyed collection for fast lookup below
-            var publishedData = Database.Query<DocumentPublishedReadOnlyDto>(publishedSql);
-            var publishedDataCollection = new DocumentPublishedReadOnlyDtoCollection();
-            foreach (var publishedDto in publishedData)
-            {
-                //double check that there's no corrupt db data, there should only be a single published item
-                if (publishedDataCollection.Contains(publishedDto.NodeId) == false)
-                    publishedDataCollection.Add(publishedDto);
-            }
-
-            //This is a tuple list identifying if the content item came from the cache or not
-            var content = new List<Tuple<IContent, bool>>();
-            var defs = new DocumentDefinitionCollection(includeAllVersions);
-            var templateIds = new List<int>();
-
-            //track the looked up content types, even though the content types are cached
-            // they still need to be deep cloned out of the cache and we don't want to add
-            // the overhead of deep cloning them on every item in this loop
-            var contentTypes = new Dictionary<int, IContentType>();
-
-            foreach (var dto in dtos)
-            {
-                DocumentPublishedReadOnlyDto publishedDto;
-                publishedDataCollection.TryGetValue(dto.NodeId, out publishedDto);
-
-                // if the cache contains the published version, use it
-                if (withCache)
-                {
-                    var cached = IsolatedCache.GetCacheItem<IContent>(GetCacheIdKey<IContent>(dto.NodeId));
-                    //only use this cached version if the dto returned is also the publish version, they must match and be teh same version
-                    if (cached != null && cached.Version == dto.VersionId && cached.Published && dto.Published)
-                    {
-                        content.Add(new Tuple<IContent, bool>(cached, true));
-                        continue;
-                    }
-                }
-
-                // else, need to fetch from the database
-                // content type repository is full-cache so OK to get each one independently
-
-                IContentType contentType;
-                if (contentTypes.ContainsKey(dto.ContentVersionDto.ContentDto.ContentTypeId))
-                {
-                    contentType = contentTypes[dto.ContentVersionDto.ContentDto.ContentTypeId];
-                }
-                else
-                {
-                    contentType = _contentTypeRepository.Get(dto.ContentVersionDto.ContentDto.ContentTypeId);
-                    contentTypes[dto.ContentVersionDto.ContentDto.ContentTypeId] = contentType;
-                }
-
-                // track the definition and if it's successfully added or updated then processed
-                if (defs.AddOrUpdate(new DocumentDefinition(dto, contentType)))
-                {
-                    // assign template
-                    if (dto.TemplateId.HasValue && dto.TemplateId.Value > 0)
-                        templateIds.Add(dto.TemplateId.Value);
-
-                    content.Add(new Tuple<IContent, bool>(ContentFactory.BuildEntity(dto, contentType, publishedDto), false));
-                }
-            }
-
-            // load all required templates in 1 query
-            var templates = _templateRepository.GetAll(templateIds.ToArray())
-                .ToDictionary(x => x.Id, x => x);
-
-            // load all properties for all documents from database in 1 query
-            var propertyData = GetPropertyCollection(pagingSqlQuery, defs);
-
-            // assign template and property data
-            foreach (var contentItem in content)
-            {
-                var cc = contentItem.Item1;
-                var fromCache = contentItem.Item2;
-
-                //if this has come from cache, we do not need to build up it's structure
-                if (fromCache) continue;
-
-                var def = defs[includeAllVersions ? (ValueType)cc.Version : cc.Id];
-
-                ITemplate template = null;
-                if (def.DocumentDto.TemplateId.HasValue)
-                    templates.TryGetValue(def.DocumentDto.TemplateId.Value, out template); // else null
-                cc.Template = template;
-                if (propertyData.ContainsKey(cc.Version))
-                {
-                    cc.Properties = propertyData[cc.Version];
-                }
-                else
-                {
-                    throw new InvalidOperationException($"No property data found for version: '{cc.Version}'.");
-                }
-
-                //on initial construction we don't want to have dirty properties tracked
-                // http://issues.umbraco.org/issue/U4-1946
-                cc.ResetDirtyProperties(false);
-            }
-
-            return content.Select(x => x.Item1).ToArray();
-        }
-
-        /// <summary>
-        /// Private method to create a content object from a DocumentDto, which is used by Get and GetByVersion.
-        /// </summary>
-        /// <param name="dto"></param>
-        /// <param name="docSql"></param>
-        /// <returns></returns>
-        private IContent CreateContentFromDto(DocumentDto dto, Sql docSql)
-        {
-            var contentType = _contentTypeRepository.Get(dto.ContentVersionDto.ContentDto.ContentTypeId);
-
-            var content = ContentFactory.BuildEntity(dto, contentType);
-
-            //Check if template id is set on DocumentDto, and get ITemplate if it is.
-            if (dto.TemplateId.HasValue && dto.TemplateId.Value > 0)
-            {
-                content.Template = _templateRepository.Get(dto.TemplateId.Value);
-            }
-
-            var docDef = new DocumentDefinition(dto, contentType);
-
-            var properties = GetPropertyCollection(docSql, new[] { docDef });
-
-            content.Properties = properties[dto.VersionId];
-
-            //on initial construction we don't want to have dirty properties tracked
-            // http://issues.umbraco.org/issue/U4-1946
-            ((Entity)content).ResetDirtyProperties(false);
-            return content;
-        }
-
-        private string EnsureUniqueNodeName(int parentId, string nodeName, int id = 0)
-        {
-            if (EnsureUniqueNaming == false)
-                return nodeName;
-
-            var names = Database.Fetch<SimilarNodeName>("SELECT id, text AS name FROM umbracoNode WHERE nodeObjectType=@objectType AND parentId=@parentId",
-                new { objectType = NodeObjectTypeId, parentId });
-
-            return SimilarNodeName.GetUniqueName(names, id, nodeName);
-        }
-
-        /// <summary>
-        /// Dispose disposable properties
-        /// </summary>
-        /// <remarks>
-        /// Ensure the unit of work is disposed
-        /// </remarks>
-        protected override void DisposeResources()
-        {
-            _contentTypeRepository.Dispose();
-            _templateRepository.Dispose();
-            _tagRepository.Dispose();
-            _contentPreviewRepository.Dispose();
-            _contentXmlRepository.Dispose();
-        }
-
-        /// <summary>
-        /// A keyed collection for fast lookup when retrieving a separate list of published version data
-        /// </summary>
-        private class DocumentPublishedReadOnlyDtoCollection : KeyedCollection<int, DocumentPublishedReadOnlyDto>
-        {
-            protected override int GetKeyForItem(DocumentPublishedReadOnlyDto item)
-            {
-                return item.NodeId;
-            }
-
-            public bool TryGetValue(int key, out DocumentPublishedReadOnlyDto val)
-            {
-                if (Dictionary == null)
-                {
-                    val = null;
-                    return false;
-                }
-                return Dictionary.TryGetValue(key, out val);
-            }
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Globalization;
+using System.Linq;
+using System.Xml;
+using System.Xml.Linq;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Models.Membership;
+using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
+using Umbraco.Core.Persistence.Factories;
+using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Persistence.SqlSyntax;
+using Umbraco.Core.Persistence.UnitOfWork;
+
+namespace Umbraco.Core.Persistence.Repositories
+{
+    /// <summary>
+    /// Represents a repository for doing CRUD operations for <see cref="IContent"/>
+    /// </summary>
+    internal class ContentRepository : RecycleBinRepository<int, IContent>, IContentRepository
+    {
+        private readonly IContentTypeRepository _contentTypeRepository;
+        private readonly ITemplateRepository _templateRepository;
+        private readonly ITagRepository _tagRepository;
+        private readonly ContentPreviewRepository<IContent> _contentPreviewRepository;
+        private readonly ContentXmlRepository<IContent> _contentXmlRepository;
+        private readonly PermissionRepository<IContent> _permissionRepository;
+        private readonly ContentByGuidReadRepository _contentByGuidReadRepository;
+
+        public ContentRepository(IScopeUnitOfWork work, CacheHelper cacheHelper, ILogger logger, ISqlSyntaxProvider syntaxProvider, IContentTypeRepository contentTypeRepository, ITemplateRepository templateRepository, ITagRepository tagRepository, IContentSection contentSection)
+            : base(work, cacheHelper, logger, syntaxProvider, contentSection)
+        {
+            if (contentTypeRepository == null) throw new ArgumentNullException("contentTypeRepository");
+            if (templateRepository == null) throw new ArgumentNullException("templateRepository");
+            if (tagRepository == null) throw new ArgumentNullException("tagRepository");
+            _contentTypeRepository = contentTypeRepository;
+            _templateRepository = templateRepository;
+            _tagRepository = tagRepository;
+            _contentPreviewRepository = new ContentPreviewRepository<IContent>(work, CacheHelper.NoCache, logger, syntaxProvider);
+            _contentXmlRepository = new ContentXmlRepository<IContent>(work, CacheHelper.NoCache, logger, syntaxProvider);
+            _permissionRepository = new PermissionRepository<IContent>(UnitOfWork, cacheHelper, Logger, SqlSyntax);
+            _contentByGuidReadRepository = new ContentByGuidReadRepository(this, work, cacheHelper, logger, syntaxProvider);
+            EnsureUniqueNaming = true;
+        }
+
+        public bool EnsureUniqueNaming { get; set; }
+
+        #region Overrides of RepositoryBase<IContent>
+
+        protected override IContent PerformGet(int id)
+        {
+            var sql = GetBaseQuery(BaseQueryType.FullSingle)
+                .Where(GetBaseWhereClause(), new { Id = id })
+                .Where<DocumentDto>(x => x.Newest, SqlSyntax)
+                .OrderByDescending<ContentVersionDto>(x => x.VersionDate, SqlSyntax);
+
+            var dto = Database.Fetch<DocumentDto, ContentVersionDto, ContentDto, NodeDto, DocumentPublishedReadOnlyDto>(SqlSyntax.SelectTop(sql, 1)).FirstOrDefault();
+
+            if (dto == null)
+                return null;
+
+            var content = CreateContentFromDto(dto, sql);
+
+            return content;
+        }
+
+        protected override IEnumerable<IContent> PerformGetAll(params int[] ids)
+        {
+            Func<Sql, Sql> translate = s =>
+            {
+                if (ids.Any())
+                {
+                    s.Where("umbracoNode.id in (@ids)", new { ids });
+                }
+                //we only want the newest ones with this method
+                s.Where<DocumentDto>(x => x.Newest, SqlSyntax);
+                return s;
+            };
+
+            var sqlBaseFull = GetBaseQuery(BaseQueryType.FullMultiple);
+            var sqlBaseIds = GetBaseQuery(BaseQueryType.Ids);
+
+            return ProcessQuery(translate(sqlBaseFull), new PagingSqlQuery(translate(sqlBaseIds)));
+        }
+
+        protected override IEnumerable<IContent> PerformGetByQuery(IQuery<IContent> query)
+        {
+            var sqlBaseFull = GetBaseQuery(BaseQueryType.FullMultiple);
+            var sqlBaseIds = GetBaseQuery(BaseQueryType.Ids);
+
+            Func<SqlTranslator<IContent>, Sql> translate = (translator) =>
+            {
+                return translator.Translate()
+                    .Where<DocumentDto>(x => x.Newest, SqlSyntax)
+                    .OrderByDescending<ContentVersionDto>(x => x.VersionDate, SqlSyntax)
+                    .OrderBy<NodeDto>(x => x.SortOrder, SqlSyntax);
+            };
+
+            var translatorFull = new SqlTranslator<IContent>(sqlBaseFull, query);
+            var translatorIds = new SqlTranslator<IContent>(sqlBaseIds, query);
+
+            return ProcessQuery(translate(translatorFull), new PagingSqlQuery(translate(translatorIds)));
+        }
+
+        #endregion
+
+        #region Overrides of PetaPocoRepositoryBase<IContent>
+
+        /// <summary>
+        /// Returns the base query to return Content
+        /// </summary>
+        /// <param name="queryType"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// Content queries will differ depending on what needs to be returned:
+        /// * FullSingle: When querying for a single document, this will include the Outer join to fetch the content item's published version info
+        /// * FullMultiple: When querying for multiple documents, this will exclude the Outer join to fetch the content item's published version info - this info would need to be fetched separately
+        /// * Ids: This would essentially be the same as FullMultiple however the columns specified will only return the Ids for the documents
+        /// * Count: A query to return the count for documents
+        /// </remarks>
+        protected override Sql GetBaseQuery(BaseQueryType queryType)
+        {
+            var sql = new Sql();
+            sql.Select(queryType == BaseQueryType.Count ? "COUNT(*)" : (queryType == BaseQueryType.Ids ? "cmsDocument.nodeId" : "*"))
+                .From<DocumentDto>(SqlSyntax)
+                .InnerJoin<ContentVersionDto>(SqlSyntax)
+                .On<DocumentDto, ContentVersionDto>(SqlSyntax, left => left.VersionId, right => right.VersionId)
+                .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)
+                .InnerJoin<ContentTypeDto>()
+                .On<ContentTypeDto, ContentDto>(left => left.NodeId, right => right.ContentTypeId);
+            //TODO: IF we want to enable querying on content type information this will need to be joined
+            //.InnerJoin<ContentTypeDto>(SqlSyntax)
+            //.On<ContentDto, ContentTypeDto>(SqlSyntax, left => left.ContentTypeId, right => right.NodeId, SqlSyntax);
+
+            if (queryType == BaseQueryType.FullSingle)
+            {
+                //The only reason we apply this left outer join is to be able to pull back the DocumentPublishedReadOnlyDto
+                //information with the entire data set, so basically this will get both the latest document and also it's published
+                //version if it has one. When performing a count or when retrieving Ids like in paging, this is unecessary
+                //and causes huge performance overhead for the SQL server, especially when sorting the result.
+                //We also don't include this outer join when querying for multiple entities since it is much faster to fetch this information
+                //in a separate query. For a single entity this is ok.
+
+                var sqlx = string.Format("LEFT OUTER JOIN {0} {1} ON ({1}.{2}={0}.{2} AND {1}.{3}=1)",
+                SqlSyntax.GetQuotedTableName("cmsDocument"),
+                SqlSyntax.GetQuotedTableName("cmsDocument2"),
+                SqlSyntax.GetQuotedColumnName("nodeId"),
+                SqlSyntax.GetQuotedColumnName("published"));
+
+                // cannot do this because PetaPoco does not know how to alias the table
+                //.LeftOuterJoin<DocumentPublishedReadOnlyDto>()
+                //.On<DocumentDto, DocumentPublishedReadOnlyDto>(left => left.NodeId, right => right.NodeId)
+                // so have to rely on writing our own SQL
+                sql.Append(sqlx /*, new { @published = true }*/);
+            }
+
+            sql.Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId, SqlSyntax);
+
+            return sql;
+        }
+
+        protected override Sql GetBaseQuery(bool isCount)
+        {
+            return GetBaseQuery(isCount ? BaseQueryType.Count : BaseQueryType.FullSingle);
+        }
+
+        protected override string GetBaseWhereClause()
+        {
+            return "umbracoNode.id = @Id";
+        }
+
+        protected override IEnumerable<string> GetDeleteClauses()
+        {
+            var list = new List<string>
+                           {
+                               "DELETE FROM umbracoRedirectUrl WHERE contentKey IN (SELECT uniqueID FROM umbracoNode WHERE id = @Id)",
+                               "DELETE FROM cmsTask WHERE nodeId = @Id",
+                               "DELETE FROM umbracoUser2NodeNotify WHERE nodeId = @Id",
+                               "DELETE FROM umbracoUserGroup2NodePermission WHERE nodeId = @Id",
+                               "DELETE FROM umbracoUserStartNode WHERE startNode = @Id",
+                               "UPDATE umbracoUserGroup SET startContentId = NULL WHERE startContentId = @Id",
+                               "DELETE FROM umbracoRelation WHERE parentId = @Id",
+                               "DELETE FROM umbracoRelation WHERE childId = @Id",
+                               "DELETE FROM cmsTagRelationship WHERE nodeId = @Id",
+                               "DELETE FROM umbracoDomains WHERE domainRootStructureID = @Id",
+                               "DELETE FROM cmsDocument WHERE nodeId = @Id",
+                               "DELETE FROM cmsPropertyData WHERE contentNodeId = @Id",
+                               "DELETE FROM cmsPreviewXml WHERE nodeId = @Id",
+                               "DELETE FROM cmsContentVersion WHERE ContentId = @Id",
+                               "DELETE FROM cmsContentXml WHERE nodeId = @Id",
+                               "DELETE FROM cmsContent WHERE nodeId = @Id",
+                               "DELETE FROM umbracoAccess WHERE nodeId = @Id",
+                               "DELETE FROM umbracoNode WHERE id = @Id"
+                           };
+            return list;
+        }
+
+        protected override Guid NodeObjectTypeId
+        {
+            get { return Constants.ObjectTypes.DocumentGuid; }
+        }
+
+        #endregion
+
+        #region Overrides of VersionableRepositoryBase<IContent>
+
+        public void RebuildXmlStructures(Func<IContent, XElement> serializer, int groupSize = 200, IEnumerable<int> contentTypeIds = null)
+        {
+            // the previous way of doing this was to run it all in one big transaction,
+            // and to bulk-insert groups of xml rows - which works, until the transaction
+            // times out - and besides, because v7 transactions are ReadCommited, it does
+            // not bring much safety - so this reverts to updating each record individually,
+            // and it may be slower in the end, but should be more resilient.
+
+            var contentTypeIdsA = contentTypeIds == null ? new int[0] : contentTypeIds.ToArray();
+
+            Func<int, Sql, Sql> translate = (bId, sql) =>
+            {
+                if (contentTypeIdsA.Length > 0)
+                {
+                    sql.WhereIn<ContentDto>(x => x.ContentTypeId, contentTypeIdsA, SqlSyntax);
+                }
+
+                sql
+                    .Where<NodeDto>(x => x.NodeId > bId && x.Trashed == false, SqlSyntax)
+                    .Where<DocumentDto>(x => x.Published, SqlSyntax)
+                    .OrderBy<NodeDto>(x => x.NodeId, SqlSyntax);
+
+                return sql;
+            };
+
+            var baseId = 0;
+
+            while (true)
+            {
+                // get the next group of nodes
+                var sqlFull = translate(baseId, GetBaseQuery(BaseQueryType.FullMultiple));
+                var sqlIds = translate(baseId, GetBaseQuery(BaseQueryType.Ids));
+
+                var xmlItems = ProcessQuery(SqlSyntax.SelectTop(sqlFull, groupSize), new PagingSqlQuery(SqlSyntax.SelectTop(sqlIds, groupSize)))
+                    .Select(x => new ContentXmlDto { NodeId = x.Id, Xml = serializer(x).ToString() })
+                    .ToList();
+
+                // no more nodes, break
+                if (xmlItems.Count == 0) break;
+
+                foreach (var xmlItem in xmlItems)
+                {
+                    try
+                    {
+                        // should happen in most cases, then it tries to insert, and it should work
+                        // unless the node has been deleted, and we just report the exception
+                        Database.InsertOrUpdate(xmlItem);
+                    }
+                    catch (Exception e)
+                    {
+                        Logger.Error<MediaRepository>("Could not rebuild XML for nodeId=" + xmlItem.NodeId, e);
+                    }
+                }
+                baseId = xmlItems[xmlItems.Count - 1].NodeId;
+            }
+
+            //now delete the items that shouldn't be there
+            var sqlAllIds = translate(0, GetBaseQuery(BaseQueryType.Ids));
+            var allContentIds = Database.Fetch<int>(sqlAllIds);
+            var docObjectType = NodeObjectTypeId;
+            var xmlIdsQuery = new Sql()
+                .Select("DISTINCT cmsContentXml.nodeId")
+                .From<ContentXmlDto>(SqlSyntax)
+                .InnerJoin<NodeDto>(SqlSyntax)
+                .On<ContentXmlDto, NodeDto>(SqlSyntax, left => left.NodeId, right => right.NodeId);
+
+            if (contentTypeIdsA.Length > 0)
+            {
+                xmlIdsQuery.InnerJoin<ContentDto>(SqlSyntax)
+                    .On<ContentDto, NodeDto>(SqlSyntax, left => left.NodeId, right => right.NodeId)
+                    .InnerJoin<ContentTypeDto>(SqlSyntax)
+                    .On<ContentTypeDto, ContentDto>(SqlSyntax, left => left.NodeId, right => right.ContentTypeId)
+                    .WhereIn<ContentDto>(x => x.ContentTypeId, contentTypeIdsA, SqlSyntax);
+            }
+
+            xmlIdsQuery.Where<NodeDto>(dto => dto.NodeObjectType == docObjectType, SqlSyntax);
+
+            var allXmlIds = Database.Fetch<int>(xmlIdsQuery);
+
+            var toRemove = allXmlIds.Except(allContentIds).ToArray();
+            if (toRemove.Length > 0)
+            {
+                foreach (var idGroup in toRemove.InGroupsOf(2000))
+                {
+                    Database.Execute("DELETE FROM cmsContentXml WHERE nodeId IN (@ids)", new { ids = idGroup });
+                }
+            }
+
+        }
+
+        public override IEnumerable<IContent> GetAllVersions(int id)
+        {
+            Func<Sql, Sql> translate = s =>
+            {
+                return s.Where(GetBaseWhereClause(), new {Id = id})
+                    .OrderByDescending<ContentVersionDto>(x => x.VersionDate, SqlSyntax);
+            };
+
+            var sqlFull = translate(GetBaseQuery(BaseQueryType.FullMultiple));
+            var sqlIds = translate(GetBaseQuery(BaseQueryType.Ids));
+
+            return ProcessQuery(sqlFull, new PagingSqlQuery(sqlIds), true,  includeAllVersions:true);
+        }
+
+        public override IContent GetByVersion(Guid versionId)
+        {
+            var sql = GetBaseQuery(BaseQueryType.FullSingle);
+            //TODO: cmsContentVersion.VersionId has a Unique Index constraint applied, seems silly then to also add OrderByDescending since it would be impossible to return more than one.
+            sql.Where("cmsContentVersion.VersionId = @VersionId", new { VersionId = versionId });
+            sql.OrderByDescending<ContentVersionDto>(x => x.VersionDate, SqlSyntax);
+
+            var dto = Database.Fetch<DocumentDto, ContentVersionDto, ContentDto, NodeDto, DocumentPublishedReadOnlyDto>(sql).FirstOrDefault();
+
+            if (dto == null)
+                return null;
+
+            var content = CreateContentFromDto(dto, sql);
+
+            return content;
+        }
+
+        public override void DeleteVersion(Guid versionId)
+        {
+            var sql = new Sql()
+                .Select("*")
+                .From<DocumentDto>(SqlSyntax)
+                .InnerJoin<ContentVersionDto>(SqlSyntax)
+                .On<ContentVersionDto, DocumentDto>(SqlSyntax, left => left.VersionId, right => right.VersionId)
+                .Where<ContentVersionDto>(x => x.VersionId == versionId, SqlSyntax)
+                .Where<DocumentDto>(x => x.Newest != true, SqlSyntax);
+            var dto = Database.Fetch<DocumentDto, ContentVersionDto>(sql).FirstOrDefault();
+
+            if (dto == null) return;
+
+            using (var transaction = Database.GetTransaction())
+            {
+                PerformDeleteVersion(dto.NodeId, versionId);
+
+                transaction.Complete();
+            }
+        }
+
+        public override void DeleteVersions(int id, DateTime versionDate)
+        {
+            var sql = new Sql()
+                .Select("*")
+                .From<DocumentDto>()
+                .InnerJoin<ContentVersionDto>()
+                .On<ContentVersionDto, DocumentDto>(left => left.VersionId, right => right.VersionId)
+                .Where<ContentVersionDto>(x => x.NodeId == id)
+                .Where<ContentVersionDto>(x => x.VersionDate < versionDate)
+                .Where<DocumentDto>(x => x.Newest != true);
+            var list = Database.Fetch<DocumentDto, ContentVersionDto>(sql);
+            if (list.Any() == false) return;
+
+            using (var transaction = Database.GetTransaction())
+            {
+                foreach (var dto in list)
+                {
+                    PerformDeleteVersion(id, dto.VersionId);
+                }
+
+                transaction.Complete();
+            }
+        }
+
+        protected override void PerformDeleteVersion(int id, Guid versionId)
+        {
+            Database.Delete<PreviewXmlDto>("WHERE nodeId = @Id AND versionId = @VersionId", new { Id = id, VersionId = versionId });
+            Database.Delete<PropertyDataDto>("WHERE contentNodeId = @Id AND versionId = @VersionId", new { Id = id, VersionId = versionId });
+            Database.Delete<ContentVersionDto>("WHERE ContentId = @Id AND VersionId = @VersionId", new { Id = id, VersionId = versionId });
+            Database.Delete<DocumentDto>("WHERE nodeId = @Id AND versionId = @VersionId", new { Id = id, VersionId = versionId });
+        }
+
+        #endregion
+
+        #region Unit of Work Implementation
+
+        protected override void PersistDeletedItem(IContent entity)
+        {
+            //We need to clear out all access rules but we need to do this in a manual way since
+            // nothing in that table is joined to a content id
+            var subQuery = new Sql()
+                .Select("umbracoAccessRule.accessId")
+                .From<AccessRuleDto>(SqlSyntax)
+                .InnerJoin<AccessDto>(SqlSyntax)
+                .On<AccessRuleDto, AccessDto>(SqlSyntax, left => left.AccessId, right => right.Id)
+                .Where<AccessDto>(dto => dto.NodeId == entity.Id);
+            Database.Execute(SqlSyntax.GetDeleteSubquery("umbracoAccessRule", "accessId", subQuery));
+
+            //now let the normal delete clauses take care of everything else
+            base.PersistDeletedItem(entity);
+        }
+
+        protected override void PersistNewItem(IContent entity)
+        {
+            ((Content)entity).AddingEntity();
+
+            //ensure the default template is assigned
+            if (entity.Template == null)
+            {
+                entity.Template = entity.ContentType.DefaultTemplate;
+            }
+
+            //Ensure unique name on the same level
+            entity.Name = EnsureUniqueNodeName(entity.ParentId, entity.Name);
+
+            //Ensure that strings don't contain characters that are invalid in XML
+            entity.SanitizeEntityPropertiesForXmlStorage();
+
+            var factory = new ContentFactory(NodeObjectTypeId, entity.Id);
+            var dto = factory.BuildDto(entity);
+
+            //NOTE Should the logic below have some kind of fallback for empty parent ids ?
+            //Logic for setting Path, Level and SortOrder
+            var parent = Database.First<NodeDto>("WHERE id = @ParentId", new { ParentId = entity.ParentId });
+            var level = parent.Level + 1;
+            var maxSortOrder = Database.ExecuteScalar<int>(
+                "SELECT coalesce(max(sortOrder),-1) FROM umbracoNode WHERE parentid = @ParentId AND nodeObjectType = @NodeObjectType",
+                new { /*ParentId =*/ entity.ParentId, NodeObjectType = NodeObjectTypeId });
+            var sortOrder = maxSortOrder + 1;
+
+            //Create the (base) node data - umbracoNode
+            var nodeDto = dto.ContentVersionDto.ContentDto.NodeDto;
+            nodeDto.Path = parent.Path;
+            nodeDto.Level = short.Parse(level.ToString(CultureInfo.InvariantCulture));
+            nodeDto.SortOrder = sortOrder;
+
+            // note:
+            // there used to be a check on Database.IsNew(nodeDto) here to either Insert or Update,
+            // but I cannot figure out what was the point, as the node should obviously be new if
+            // we reach that point - removed.
+
+            // see if there's a reserved identifier for this unique id
+            var sql = new Sql("SELECT id FROM umbracoNode WHERE uniqueID=@0 AND nodeObjectType=@1", nodeDto.UniqueId, Constants.ObjectTypes.IdReservationGuid);
+            var id = Database.ExecuteScalar<int>(sql);
+            if (id > 0)
+            {
+                nodeDto.NodeId = id;
+                Database.Update(nodeDto);
+            }
+            else
+            {
+                Database.Insert(nodeDto);
+            }
+
+            //Update with new correct path
+            nodeDto.Path = string.Concat(parent.Path, ",", nodeDto.NodeId);
+            nodeDto.ValidatePathWithException();
+            Database.Update(nodeDto);
+
+            //Update entity with correct values
+            entity.Id = nodeDto.NodeId; //Set Id on entity to ensure an Id is set
+            entity.Path = nodeDto.Path;
+            entity.SortOrder = sortOrder;
+            entity.Level = level;
+
+            //Create the Content specific data - cmsContent
+            var contentDto = dto.ContentVersionDto.ContentDto;
+            contentDto.NodeId = nodeDto.NodeId;
+            Database.Insert(contentDto);
+
+            //Create the first version - cmsContentVersion
+            //Assumes a new Version guid and Version date (modified date) has been set
+            var contentVersionDto = dto.ContentVersionDto;
+            contentVersionDto.NodeId = nodeDto.NodeId;
+            Database.Insert(contentVersionDto);
+
+            //Create the Document specific data for this version - cmsDocument
+            //Assumes a new Version guid has been generated
+            dto.NodeId = nodeDto.NodeId;
+            Database.Insert(dto);
+
+            //Create the PropertyData for this version - cmsPropertyData
+            var propertyFactory = new PropertyFactory(entity.ContentType.CompositionPropertyTypes.ToArray(), entity.Version, entity.Id);
+            var propertyDataDtos = propertyFactory.BuildDto(entity.Properties);
+            var keyDictionary = new Dictionary<int, int>();
+
+            //Add Properties
+            foreach (var propertyDataDto in propertyDataDtos)
+            {
+                var primaryKey = Convert.ToInt32(Database.Insert(propertyDataDto));
+                keyDictionary.Add(propertyDataDto.PropertyTypeId, primaryKey);
+            }
+
+            //Update Properties with its newly set Id
+            foreach (var property in entity.Properties)
+            {
+                property.Id = keyDictionary[property.PropertyTypeId];
+            }
+
+            //lastly, check if we are a creating a published version , then update the tags table
+            if (entity.Published)
+            {
+                UpdatePropertyTags(entity, _tagRepository);
+            }
+
+            // published => update published version infos, else leave it blank
+            if (entity.Published)
+            {
+                dto.DocumentPublishedReadOnlyDto = new DocumentPublishedReadOnlyDto
+                {
+                    VersionId = dto.VersionId,
+                    VersionDate = dto.UpdateDate,
+                    Newest = true,
+                    NodeId = dto.NodeId,
+                    Published = true
+                };
+                ((Content) entity).PublishedVersionGuid = dto.VersionId;
+                ((Content) entity).PublishedDate = dto.UpdateDate;
+            }
+
+            entity.ResetDirtyProperties();
+        }
+
+        protected override void PersistUpdatedItem(IContent entity)
+        {
+            var publishedState = ((Content)entity).PublishedState;
+
+            //check if we need to make any database changes at all
+            if (entity.RequiresSaving(publishedState) == false)
+            {
+                entity.ResetDirtyProperties();
+                return;
+            }
+
+            //check if we need to create a new version
+            bool shouldCreateNewVersion = entity.ShouldCreateNewVersion(publishedState);
+            if (shouldCreateNewVersion)
+            {
+                //Updates Modified date and Version Guid
+                ((Content)entity).UpdatingEntity();
+            }
+            else
+            {
+                if (entity.IsPropertyDirty("UpdateDate") == false || entity.UpdateDate == default(DateTime))
+                    entity.UpdateDate = DateTime.Now;
+            }
+
+            //Ensure unique name on the same level
+            entity.Name = EnsureUniqueNodeName(entity.ParentId, entity.Name, entity.Id);
+
+            //Ensure that strings don't contain characters that are invalid in XML
+            entity.SanitizeEntityPropertiesForXmlStorage();
+
+            //Look up parent to get and set the correct Path and update SortOrder if ParentId has changed
+            if (entity.IsPropertyDirty("ParentId"))
+            {
+                var parent = Database.First<NodeDto>("WHERE id = @ParentId", new { ParentId = entity.ParentId });
+                entity.Path = string.Concat(parent.Path, ",", entity.Id);
+                entity.Level = parent.Level + 1;
+                var maxSortOrder =
+                    Database.ExecuteScalar<int>(
+                        "SELECT coalesce(max(sortOrder),0) FROM umbracoNode WHERE parentid = @ParentId AND nodeObjectType = @NodeObjectType",
+                        new { ParentId = entity.ParentId, NodeObjectType = NodeObjectTypeId });
+                entity.SortOrder = maxSortOrder + 1;
+
+                //Question: If we move a node, should we update permissions to inherit from the new parent if the parent has permissions assigned?
+                // if we do that, then we'd need to propogate permissions all the way downward which might not be ideal for many people.
+                // Gonna just leave it as is for now, and not re-propogate permissions.
+            }
+
+            var factory = new ContentFactory(NodeObjectTypeId, entity.Id);
+            //Look up Content entry to get Primary for updating the DTO
+            var contentDto = Database.SingleOrDefault<ContentDto>("WHERE nodeId = @Id", new { Id = entity.Id });
+            factory.SetPrimaryKey(contentDto.PrimaryKey);
+            var dto = factory.BuildDto(entity);
+
+            //Updates the (base) node data - umbracoNode
+            var nodeDto = dto.ContentVersionDto.ContentDto.NodeDto;
+            nodeDto.ValidatePathWithException();
+            var o = Database.Update(nodeDto);
+
+            //Only update this DTO if the contentType has actually changed
+            if (contentDto.ContentTypeId != entity.ContentTypeId)
+            {
+                //Create the Content specific data - cmsContent
+                var newContentDto = dto.ContentVersionDto.ContentDto;
+                Database.Update(newContentDto);
+            }
+
+            //a flag that we'll use later to create the tags in the tag db table
+            var publishedStateChanged = false;
+
+            //If Published state has changed then previous versions should have their publish state reset.
+            //If state has been changed to unpublished the previous versions publish state should also be reset.
+            //if (((ICanBeDirty)entity).IsPropertyDirty("Published") && (entity.Published || publishedState == PublishedState.Unpublished))
+            if (entity.ShouldClearPublishedFlagForPreviousVersions(publishedState, shouldCreateNewVersion))
+            {
+                //TODO: This perf can be improved, it could easily be UPDATE WHERE.... (one SQL call instead of many)
+                var publishedDocs = Database.Fetch<DocumentDto>("WHERE nodeId = @Id AND published = @IsPublished", new { Id = entity.Id, IsPublished = true });
+                foreach (var doc in publishedDocs)
+                {
+                    var docDto = doc;
+                    docDto.Published = false;
+                    Database.Update(docDto);
+                }
+
+                //this is a newly published version so we'll update the tags table too (end of this method)
+                publishedStateChanged = true;
+            }
+
+            //Look up (newest) entries by id in cmsDocument table to set newest = false
+            //TODO: This perf can be improved, it could easily be UPDATE WHERE.... (one SQL call instead of many)
+            var documentDtos = Database.Fetch<DocumentDto>("WHERE nodeId = @Id AND newest = @IsNewest", new { Id = entity.Id, IsNewest = true });
+            foreach (var documentDto in documentDtos)
+            {
+                var docDto = documentDto;
+                docDto.Newest = false;
+                Database.Update(docDto);
+            }
+
+            var contentVersionDto = dto.ContentVersionDto;
+            if (shouldCreateNewVersion)
+            {
+                //Create a new version - cmsContentVersion
+                //Assumes a new Version guid and Version date (modified date) has been set
+                Database.Insert(contentVersionDto);
+                //Create the Document specific data for this version - cmsDocument
+                //Assumes a new Version guid has been generated
+                Database.Insert(dto);
+            }
+            else
+            {
+                //In order to update the ContentVersion we need to retrieve its primary key id
+                var contentVerDto = Database.SingleOrDefault<ContentVersionDto>("WHERE VersionId = @Version", new { Version = entity.Version });
+                if (contentVerDto != null)
+                {
+                    contentVersionDto.Id = contentVerDto.Id;
+                    Database.Update(contentVersionDto);
+                }
+
+                Database.Update(dto);
+            }
+
+            //Create the PropertyData for this version - cmsPropertyData
+            var propertyFactory = new PropertyFactory(entity.ContentType.CompositionPropertyTypes.ToArray(), entity.Version, entity.Id);
+            var propertyDataDtos = propertyFactory.BuildDto(entity.Properties);
+            var keyDictionary = new Dictionary<int, int>();
+
+            //Add Properties
+            foreach (var propertyDataDto in propertyDataDtos)
+            {
+                if (shouldCreateNewVersion == false && propertyDataDto.Id > 0)
+                {
+                    Database.Update(propertyDataDto);
+                }
+                else
+                {
+                    int primaryKey = Convert.ToInt32(Database.Insert(propertyDataDto));
+                    keyDictionary.Add(propertyDataDto.PropertyTypeId, primaryKey);
+                }
+            }
+
+            //Update Properties with its newly set Id
+            if (keyDictionary.Any())
+            {
+                foreach (var property in entity.Properties)
+                {
+                    if (keyDictionary.ContainsKey(property.PropertyTypeId) == false) continue;
+
+                    property.Id = keyDictionary[property.PropertyTypeId];
+                }
+            }
+
+            //lastly, check if we are a newly published version and then update the tags table
+            if (publishedStateChanged && entity.Published)
+            {
+                UpdatePropertyTags(entity, _tagRepository);
+            }
+            else if (publishedStateChanged && (entity.Trashed || entity.Published == false))
+            {
+                //it's in the trash or not published remove all entity tags
+                ClearEntityTags(entity, _tagRepository);
+            }
+
+            // published => update published version infos,
+            // else if unpublished then clear published version infos
+            if (entity.Published)
+            {
+                dto.DocumentPublishedReadOnlyDto = new DocumentPublishedReadOnlyDto
+                {
+                    VersionId = dto.VersionId,
+                    VersionDate = dto.UpdateDate,
+                    Newest = true,
+                    NodeId = dto.NodeId,
+                    Published = true
+                };
+                ((Content) entity).PublishedVersionGuid = dto.VersionId;
+                ((Content) entity).PublishedDate = dto.UpdateDate;
+            }
+            else if (publishedStateChanged)
+            {
+                dto.DocumentPublishedReadOnlyDto = new DocumentPublishedReadOnlyDto
+                {
+                    VersionId = default (Guid),
+                    VersionDate = default (DateTime),
+                    Newest = false,
+                    NodeId = dto.NodeId,
+                    Published = false
+                };
+                ((Content) entity).PublishedVersionGuid = default(Guid);
+                ((Content) entity).PublishedDate = default (DateTime);
+            }
+
+            entity.ResetDirtyProperties();
+        }
+
+
+        #endregion
+
+        #region Implementation of IContentRepository
+
+        public IEnumerable<IContent> GetByPublishedVersion(IQuery<IContent> query)
+        {
+            Func<SqlTranslator<IContent>, Sql> translate = t =>
+            {
+                return t.Translate()
+                    .Where<DocumentDto>(x => x.Published, SqlSyntax)
+                    .OrderBy<NodeDto>(x => x.Level, SqlSyntax)
+                    .OrderBy<NodeDto>(x => x.SortOrder, SqlSyntax);
+            };
+
+            // we WANT to return contents in top-down order, ie parents should come before children
+            // ideal would be pure xml "document order" which can be achieved with:
+            // ORDER BY substring(path, 1, len(path) - charindex(',', reverse(path))), sortOrder
+            // but that's probably an overkill - sorting by level,sortOrder should be enough
+
+            var sqlFull = GetBaseQuery(BaseQueryType.FullMultiple);
+            var translatorFull = new SqlTranslator<IContent>(sqlFull, query);
+            var sqlIds = GetBaseQuery(BaseQueryType.Ids);
+            var translatorIds = new SqlTranslator<IContent>(sqlIds, query);
+
+            return ProcessQuery(translate(translatorFull), new PagingSqlQuery(translate(translatorIds)), true);
+        }
+
+        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);
+            var translatorIds = new SqlTranslator<IContent>(sqlIds, query);
+
+            return ProcessQuery(translate(translatorFull), new PagingSqlQuery(translate(translatorIds)), true);
+        }
+
+        /// <summary>
+        /// This builds the Xml document used for the XML cache
+        /// </summary>
+        /// <returns></returns>
+        public XmlDocument BuildXmlCache()
+        {
+            //TODO: This is what we should do , but converting to use XDocument would be breaking unless we convert
+            // to XmlDocument at the end of this, but again, this would be bad for memory... though still not nearly as
+            // bad as what is happening before!
+            // We'll keep using XmlDocument for now though, but XDocument xml generation is much faster:
+            // https://blogs.msdn.microsoft.com/codejunkie/2008/10/08/xmldocument-vs-xelement-performance/
+            // I think we already have code in here to convert XDocument to XmlDocument but in case we don't here
+            // it is: https://blogs.msdn.microsoft.com/marcelolr/2009/03/13/fast-way-to-convert-xmldocument-into-xdocument/
+
+            //// Prepare an XmlDocument with an appropriate inline DTD to match
+            //// the expected content
+            //var parent = new XElement("root", new XAttribute("id", "-1"));
+            //var xmlDoc = new XDocument(
+            //    new XDocumentType("root", null, null, DocumentType.GenerateDtd()),
+            //    parent);
+
+            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, cmsContentXml.{0}, umbracoNode.{1} from umbracoNode
+inner join cmsContentXml on cmsContentXml.nodeId = umbracoNode.id and umbracoNode.nodeObjectType = @type
+where umbracoNode.id in (select cmsDocument.nodeId from cmsDocument where cmsDocument.published = 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 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
+where umbracoNode.trashed = 0
+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())
+            {
+                var sql = GetBaseQuery(true).Where<NodeDto>(x => x.Trashed == false)
+                .Where<DocumentDto>(x => x.Published == true);
+                return Database.ExecuteScalar<int>(sql);
+            }
+            else
+            {
+                var sql = GetBaseQuery(true).Where<NodeDto>(x => x.Trashed == false)
+                .Where<DocumentDto>(x => x.Published == true)
+                .Where<ContentTypeDto>(x => x.Alias == contentTypeAlias);
+                return Database.ExecuteScalar<int>(sql);
+            }
+        }
+
+        public void ReplaceContentPermissions(EntityPermissionSet permissionSet)
+        {
+            _permissionRepository.ReplaceEntityPermissions(permissionSet);
+        }
+
+        public void ClearPublished(IContent content)
+        {
+            var sql = "UPDATE cmsDocument SET published=0 WHERE nodeId=@id AND published=1";
+            Database.Execute(sql, new {id = content.Id});
+        }
+
+        /// <summary>
+        /// Assigns a single permission to the current content item for the specified user group ids
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <param name="permission"></param>
+        /// <param name="groupIds"></param>
+        public void AssignEntityPermission(IContent entity, char permission, IEnumerable<int> groupIds)
+        {
+            _permissionRepository.AssignEntityPermission(entity, permission, groupIds);
+        }
+
+        /// <summary>
+        /// Gets the explicit list of permissions for the content item
+        /// </summary>
+        /// <param name="entityId"></param>
+        /// <returns></returns>
+        public EntityPermissionCollection GetPermissionsForEntity(int entityId)
+        {
+            return _permissionRepository.GetPermissionsForEntity(entityId);
+        }
+
+        /// <summary>
+        /// Adds/updates content/published xml
+        /// </summary>
+        /// <param name="content"></param>
+        /// <param name="xml"></param>
+        public void AddOrUpdateContentXml(IContent content, Func<IContent, XElement> xml)
+        {
+            _contentXmlRepository.AddOrUpdate(new ContentXmlEntity<IContent>(content, xml));
+        }
+
+        /// <summary>
+        /// Used to add/update a permission for a content item
+        /// </summary>
+        /// <param name="permission"></param>
+        public void AddOrUpdatePermissions(ContentPermissionSet permission)
+        {
+            _permissionRepository.AddOrUpdate(permission);
+        }
+
+        /// <summary>
+        /// Used to remove the content xml for a content item
+        /// </summary>
+        /// <param name="content"></param>
+        public void DeleteContentXml(IContent content)
+        {
+            _contentXmlRepository.Delete(new ContentXmlEntity<IContent>(content));
+        }
+
+        /// <summary>
+        /// Adds/updates preview xml
+        /// </summary>
+        /// <param name="content"></param>
+        /// <param name="xml"></param>
+        public void AddOrUpdatePreviewXml(IContent content, Func<IContent, XElement> xml)
+        {
+            _contentPreviewRepository.AddOrUpdate(new ContentPreviewEntity<IContent>(content, xml));
+        }
+
+        /// <summary>
+        /// Gets paged content results
+        /// </summary>
+        /// <param name="query">Query to excute</param>
+        /// <param name="pageIndex">Page number</param>
+        /// <param name="pageSize">Page size</param>
+        /// <param name="totalRecords">Total records query would return without paging</param>
+        /// <param name="orderBy">Field to order by</param>
+        /// <param name="orderDirection">Direction to order by</param>
+        /// <param name="orderBySystemField">Flag to indicate when ordering by system field</param>
+        /// <param name="filter">Search text filter</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetPagedResultsByQuery(IQuery<IContent> query, long pageIndex, int pageSize, out long totalRecords,
+            string orderBy, Direction orderDirection, bool orderBySystemField, IQuery<IContent> filter = null)
+        {
+
+            //NOTE: This uses the GetBaseQuery method but that does not take into account the required 'newest' field which is
+            // what we always require for a paged result, so we'll ensure it's included in the filter
+
+            var filterSql = new Sql().Append("AND (cmsDocument.newest = 1)");
+            if (filter != null)
+            {
+                foreach (var filterClause in filter.GetWhereClauses())
+                {
+                    filterSql.Append(string.Format("AND ({0})", filterClause.Item1), filterClause.Item2);
+                }
+            }
+
+            Func<Tuple<string, object[]>> filterCallback = () => new Tuple<string, object[]>(filterSql.SQL, filterSql.Arguments);
+
+            return GetPagedResultsByQuery<DocumentDto>(query, pageIndex, pageSize, out totalRecords,
+                new Tuple<string, string>("cmsDocument", "nodeId"),
+                (sqlFull, pagingSqlQuery) => ProcessQuery(sqlFull, pagingSqlQuery), orderBy, orderDirection, orderBySystemField,
+                filterCallback);
+
+        }
+
+        #endregion
+
+        #region IRecycleBinRepository members
+
+        protected override int RecycleBinId
+        {
+            get { return Constants.System.RecycleBinContent; }
+        }
+
+        #endregion
+
+        #region Read Repository implementation for GUID keys
+        public IContent Get(Guid id)
+        {
+            return _contentByGuidReadRepository.Get(id);
+        }
+
+        IEnumerable<IContent> IReadRepository<Guid, IContent>.GetAll(params Guid[] ids)
+        {
+            return _contentByGuidReadRepository.GetAll(ids);
+        }
+
+        public bool Exists(Guid id)
+        {
+            return _contentByGuidReadRepository.Exists(id);
+        }
+
+        /// <summary>
+        /// A reading repository purely for looking up by GUID
+        /// </summary>
+        /// <remarks>
+        /// TODO: This is ugly and to fix we need to decouple the IRepositoryQueryable -> IRepository -> IReadRepository which should all be separate things!
+        /// Then we can do the same thing with repository instances and we wouldn't need to leave all these methods as not implemented because we wouldn't need to implement them
+        /// </remarks>
+        private class ContentByGuidReadRepository : PetaPocoRepositoryBase<Guid, IContent>
+        {
+            private readonly ContentRepository _outerRepo;
+
+            public ContentByGuidReadRepository(ContentRepository outerRepo,
+                IScopeUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
+                : base(work, cache, logger, sqlSyntax)
+            {
+                _outerRepo = outerRepo;
+            }
+
+            protected override IContent PerformGet(Guid id)
+            {
+                var sql = _outerRepo.GetBaseQuery(BaseQueryType.FullSingle)
+                    .Where(GetBaseWhereClause(), new { Id = id })
+                    .Where<DocumentDto>(x => x.Newest, SqlSyntax)
+                    .OrderByDescending<ContentVersionDto>(x => x.VersionDate, SqlSyntax);
+
+                var dto = Database.Fetch<DocumentDto, ContentVersionDto, ContentDto, NodeDto, DocumentPublishedReadOnlyDto>(SqlSyntax.SelectTop(sql, 1)).FirstOrDefault();
+
+                if (dto == null)
+                    return null;
+
+                var content = _outerRepo.CreateContentFromDto(dto, sql);
+
+                return content;
+            }
+
+            protected override IEnumerable<IContent> PerformGetAll(params Guid[] ids)
+            {
+                Func<Sql, Sql> translate = s =>
+                {
+                    if (ids.Any())
+                    {
+                        s.Where("umbracoNode.uniqueID in (@ids)", new { ids });
+                    }
+                    //we only want the newest ones with this method
+                    s.Where<DocumentDto>(x => x.Newest, SqlSyntax);
+                    return s;
+                };
+
+                var sqlBaseFull = _outerRepo.GetBaseQuery(BaseQueryType.FullMultiple);
+                var sqlBaseIds = _outerRepo.GetBaseQuery(BaseQueryType.Ids);
+
+                return _outerRepo.ProcessQuery(translate(sqlBaseFull), new PagingSqlQuery(translate(sqlBaseIds)));
+            }
+
+            protected override Sql GetBaseQuery(bool isCount)
+            {
+                return _outerRepo.GetBaseQuery(isCount);
+            }
+
+            protected override string GetBaseWhereClause()
+            {
+                return "umbracoNode.uniqueID = @Id";
+            }
+
+            protected override Guid NodeObjectTypeId
+            {
+                get { return _outerRepo.NodeObjectTypeId; }
+            }
+
+            #region Not needed to implement
+
+            protected override IEnumerable<IContent> PerformGetByQuery(IQuery<IContent> query)
+            {
+                throw new NotImplementedException();
+            }
+            protected override IEnumerable<string> GetDeleteClauses()
+            {
+                throw new NotImplementedException();
+            }
+            protected override void PersistNewItem(IContent entity)
+            {
+                throw new NotImplementedException();
+            }
+            protected override void PersistUpdatedItem(IContent entity)
+            {
+                throw new NotImplementedException();
+            }
+            #endregion
+        }
+        #endregion
+
+        protected override string GetDatabaseFieldNameForOrderBy(string orderBy)
+        {
+            //Some custom ones
+            switch (orderBy.ToUpperInvariant())
+            {
+                case "NAME":
+                    return "cmsDocument.text";
+                case "UPDATER":
+                    //TODO: This isn't going to work very nicely because it's going to order by ID, not by letter
+                    return "cmsDocument.documentUser";
+            }
+
+            return base.GetDatabaseFieldNameForOrderBy(orderBy);
+        }
+
+        /// <summary>
+        /// This is the underlying method that processes most queries for this repository
+        /// </summary>
+        /// <param name="sqlFull">
+        /// The FullMultiple SQL without the outer join to return all data required to create an IContent excluding it's published state data which this will query separately
+        /// </param>
+        /// <param name="pagingSqlQuery">
+        /// The Id SQL without the outer join to just return all document ids - used to process the properties for the content item
+        /// </param>
+        /// <param name="withCache"></param>
+        /// <param name="includeAllVersions">
+        /// Generally when querying for content we only want to return the most recent version of the content item, however in some cases like when
+        /// we want to return all versions of a content item, we can't simply return the latest
+        /// </param>
+        /// <returns></returns>
+        private IEnumerable<IContent> ProcessQuery(Sql sqlFull, PagingSqlQuery pagingSqlQuery, bool withCache = false, bool includeAllVersions = false)
+        {
+            // fetch returns a list so it's ok to iterate it in this method
+            var dtos = Database.Fetch<DocumentDto, ContentVersionDto, ContentDto, NodeDto>(sqlFull);
+            if (dtos.Count == 0) return Enumerable.Empty<IContent>();
+
+            //Go and get all of the published version data separately for this data, this is because when we are querying
+            //for multiple content items we don't include the outer join to fetch this data in the same query because
+            //it is insanely slow. Instead we just fetch the published version data separately in one query.
+
+            //we need to parse the original SQL statement and reduce the columns to just cmsDocument.nodeId so that we can use
+            // the statement to go get the published data for all of the items by using an inner join
+            var parsedOriginalSql = "SELECT cmsDocument.nodeId " + sqlFull.SQL.Substring(sqlFull.SQL.IndexOf("FROM", StringComparison.Ordinal));
+            //now remove everything from an Orderby clause and beyond
+            if (parsedOriginalSql.InvariantContains("ORDER BY "))
+            {
+                parsedOriginalSql = parsedOriginalSql.Substring(0, parsedOriginalSql.LastIndexOf("ORDER BY ", StringComparison.Ordinal));
+            }
+
+            //order by update date DESC, if there is corrupted published flags we only want the latest!
+            var publishedSql = new Sql(@"SELECT cmsDocument.nodeId, cmsDocument.published, cmsDocument.versionId, cmsDocument.updateDate, cmsDocument.newest
+FROM cmsDocument INNER JOIN cmsContentVersion ON cmsContentVersion.VersionId = cmsDocument.versionId
+WHERE cmsDocument.published = 1 AND cmsDocument.nodeId IN
+(" + parsedOriginalSql + @")
+ORDER BY cmsContentVersion.id DESC
+", sqlFull.Arguments);
+
+            //go and get the published version data, we do a Query here and not a Fetch so we are
+            //not allocating a whole list to memory just to allocate another list in memory since
+            //we are assigning this data to a keyed collection for fast lookup below
+            var publishedData = Database.Query<DocumentPublishedReadOnlyDto>(publishedSql);
+            var publishedDataCollection = new DocumentPublishedReadOnlyDtoCollection();
+            foreach (var publishedDto in publishedData)
+            {
+                //double check that there's no corrupt db data, there should only be a single published item
+                if (publishedDataCollection.Contains(publishedDto.NodeId) == false)
+                    publishedDataCollection.Add(publishedDto);
+            }
+
+            //This is a tuple list identifying if the content item came from the cache or not
+            var content = new List<Tuple<IContent, bool>>();
+            var defs = new DocumentDefinitionCollection(includeAllVersions);
+            var templateIds = new List<int>();
+
+            //track the looked up content types, even though the content types are cached
+            // they still need to be deep cloned out of the cache and we don't want to add
+            // the overhead of deep cloning them on every item in this loop
+            var contentTypes = new Dictionary<int, IContentType>();
+
+            foreach (var dto in dtos)
+            {
+                DocumentPublishedReadOnlyDto publishedDto;
+                publishedDataCollection.TryGetValue(dto.NodeId, out publishedDto);
+
+                // if the cache contains the published version, use it
+                if (withCache)
+                {
+                    var cached = IsolatedCache.GetCacheItem<IContent>(GetCacheIdKey<IContent>(dto.NodeId));
+                    //only use this cached version if the dto returned is also the publish version, they must match and be teh same version
+                    if (cached != null && cached.Version == dto.VersionId && cached.Published && dto.Published)
+                    {
+                        content.Add(new Tuple<IContent, bool>(cached, true));
+                        continue;
+                    }
+                }
+
+                // else, need to fetch from the database
+                // content type repository is full-cache so OK to get each one independently
+
+                IContentType contentType;
+                if (contentTypes.ContainsKey(dto.ContentVersionDto.ContentDto.ContentTypeId))
+                {
+                    contentType = contentTypes[dto.ContentVersionDto.ContentDto.ContentTypeId];
+                }
+                else
+                {
+                    contentType = _contentTypeRepository.Get(dto.ContentVersionDto.ContentDto.ContentTypeId);
+                    contentTypes[dto.ContentVersionDto.ContentDto.ContentTypeId] = contentType;
+                }
+
+                // track the definition and if it's successfully added or updated then processed
+                if (defs.AddOrUpdate(new DocumentDefinition(dto, contentType)))
+                {
+                    // assign template
+                    if (dto.TemplateId.HasValue && dto.TemplateId.Value > 0)
+                        templateIds.Add(dto.TemplateId.Value);
+
+                    content.Add(new Tuple<IContent, bool>(ContentFactory.BuildEntity(dto, contentType, publishedDto), false));
+                }
+            }
+
+            // load all required templates in 1 query
+            var templates = _templateRepository.GetAll(templateIds.ToArray())
+                .ToDictionary(x => x.Id, x => x);
+
+            // load all properties for all documents from database in 1 query
+            var propertyData = GetPropertyCollection(pagingSqlQuery, defs);
+
+            // assign template and property data
+            foreach (var contentItem in content)
+            {
+                var cc = contentItem.Item1;
+                var fromCache = contentItem.Item2;
+
+                //if this has come from cache, we do not need to build up it's structure
+                if (fromCache) continue;
+
+                var def = defs[includeAllVersions ? (ValueType)cc.Version : cc.Id];
+
+                ITemplate template = null;
+                if (def.DocumentDto.TemplateId.HasValue)
+                    templates.TryGetValue(def.DocumentDto.TemplateId.Value, out template); // else null
+                cc.Template = template;
+                if (propertyData.ContainsKey(cc.Version))
+                {
+                    cc.Properties = propertyData[cc.Version];
+                }
+                else
+                {
+                    throw new InvalidOperationException($"No property data found for version: '{cc.Version}'.");
+                }
+
+                //on initial construction we don't want to have dirty properties tracked
+                // http://issues.umbraco.org/issue/U4-1946
+                cc.ResetDirtyProperties(false);
+            }
+
+            return content.Select(x => x.Item1).ToArray();
+        }
+
+        /// <summary>
+        /// Private method to create a content object from a DocumentDto, which is used by Get and GetByVersion.
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <param name="docSql"></param>
+        /// <returns></returns>
+        private IContent CreateContentFromDto(DocumentDto dto, Sql docSql)
+        {
+            var contentType = _contentTypeRepository.Get(dto.ContentVersionDto.ContentDto.ContentTypeId);
+
+            var content = ContentFactory.BuildEntity(dto, contentType);
+
+            //Check if template id is set on DocumentDto, and get ITemplate if it is.
+            if (dto.TemplateId.HasValue && dto.TemplateId.Value > 0)
+            {
+                content.Template = _templateRepository.Get(dto.TemplateId.Value);
+            }
+
+            var docDef = new DocumentDefinition(dto, contentType);
+
+            var properties = GetPropertyCollection(docSql, new[] { docDef });
+
+            content.Properties = properties[dto.VersionId];
+
+            //on initial construction we don't want to have dirty properties tracked
+            // http://issues.umbraco.org/issue/U4-1946
+            ((Entity)content).ResetDirtyProperties(false);
+            return content;
+        }
+
+        private string EnsureUniqueNodeName(int parentId, string nodeName, int id = 0)
+        {
+            if (EnsureUniqueNaming == false)
+                return nodeName;
+
+            var names = Database.Fetch<SimilarNodeName>("SELECT id, text AS name FROM umbracoNode WHERE nodeObjectType=@objectType AND parentId=@parentId",
+                new { objectType = NodeObjectTypeId, parentId });
+
+            return SimilarNodeName.GetUniqueName(names, id, nodeName);
+        }
+
+        /// <summary>
+        /// Dispose disposable properties
+        /// </summary>
+        /// <remarks>
+        /// Ensure the unit of work is disposed
+        /// </remarks>
+        protected override void DisposeResources()
+        {
+            _contentTypeRepository.Dispose();
+            _templateRepository.Dispose();
+            _tagRepository.Dispose();
+            _contentPreviewRepository.Dispose();
+            _contentXmlRepository.Dispose();
+        }
+
+        /// <summary>
+        /// A keyed collection for fast lookup when retrieving a separate list of published version data
+        /// </summary>
+        private class DocumentPublishedReadOnlyDtoCollection : KeyedCollection<int, DocumentPublishedReadOnlyDto>
+        {
+            protected override int GetKeyForItem(DocumentPublishedReadOnlyDto item)
+            {
+                return item.NodeId;
+            }
+
+            public bool TryGetValue(int key, out DocumentPublishedReadOnlyDto val)
+            {
+                if (Dictionary == null)
+                {
+                    val = null;
+                    return false;
+                }
+                return Dictionary.TryGetValue(key, out val);
+            }
+        }
+    }
+}

From 67f680a675e6f6bd2637e6b5aed94b8dcda3567c Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Fri, 19 Jul 2019 11:24:01 +0200
Subject: [PATCH 172/776] Revert
 "https://github.com/umbraco/Umbraco-CMS/issues/5921 - AB#1794 - Remove
 trashed nodes from sql when building xml for previews"

This reverts commit 47c3e3a7
---
 src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
index a0b211b6b2..f559b91ba5 100644
--- a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
@@ -851,7 +851,6 @@ order by umbracoNode.{2}, umbracoNode.parentID, umbracoNode.sortOrder",
             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
-where umbracoNode.trashed = 0
 order by umbracoNode.{2}, umbracoNode.parentID, umbracoNode.sortOrder",
                 SqlSyntax.GetQuotedColumnName("xml"),
                 SqlSyntax.GetQuotedColumnName("level"),
@@ -1185,7 +1184,7 @@ order by umbracoNode.{2}, umbracoNode.parentID, umbracoNode.sortOrder",
             //order by update date DESC, if there is corrupted published flags we only want the latest!
             var publishedSql = new Sql(@"SELECT cmsDocument.nodeId, cmsDocument.published, cmsDocument.versionId, cmsDocument.updateDate, cmsDocument.newest
 FROM cmsDocument INNER JOIN cmsContentVersion ON cmsContentVersion.VersionId = cmsDocument.versionId
-WHERE cmsDocument.published = 1 AND cmsDocument.nodeId IN
+WHERE cmsDocument.published = 1 AND cmsDocument.nodeId IN 
 (" + parsedOriginalSql + @")
 ORDER BY cmsContentVersion.id DESC
 ", sqlFull.Arguments);

From cd27bb210f24f1b37cbca34547a52d1aa46031cb Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Fri, 19 Jul 2019 11:25:33 +0200
Subject: [PATCH 173/776] https://github.com/umbraco/Umbraco-CMS/issues/5921 -
 AB#1794 - Remove trashed nodes from sql when building xml for previews

---
 src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
index f559b91ba5..a0b211b6b2 100644
--- a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
@@ -851,6 +851,7 @@ order by umbracoNode.{2}, umbracoNode.parentID, umbracoNode.sortOrder",
             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
+where umbracoNode.trashed = 0
 order by umbracoNode.{2}, umbracoNode.parentID, umbracoNode.sortOrder",
                 SqlSyntax.GetQuotedColumnName("xml"),
                 SqlSyntax.GetQuotedColumnName("level"),
@@ -1184,7 +1185,7 @@ order by umbracoNode.{2}, umbracoNode.parentID, umbracoNode.sortOrder",
             //order by update date DESC, if there is corrupted published flags we only want the latest!
             var publishedSql = new Sql(@"SELECT cmsDocument.nodeId, cmsDocument.published, cmsDocument.versionId, cmsDocument.updateDate, cmsDocument.newest
 FROM cmsDocument INNER JOIN cmsContentVersion ON cmsContentVersion.VersionId = cmsDocument.versionId
-WHERE cmsDocument.published = 1 AND cmsDocument.nodeId IN 
+WHERE cmsDocument.published = 1 AND cmsDocument.nodeId IN
 (" + parsedOriginalSql + @")
 ORDER BY cmsContentVersion.id DESC
 ", sqlFull.Arguments);

From 968463912ab548808ff87bc58760b2b2bc7bb45e Mon Sep 17 00:00:00 2001
From: Steve Megson <steve@megson.org>
Date: Sun, 21 Jul 2019 14:47:37 +0100
Subject: [PATCH 174/776] Include CheckBoxList in ValueListPreValueMigrator

---
 .../Upgrade/V_8_0_0/DataTypes/ValueListPreValueMigrator.cs       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/ValueListPreValueMigrator.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/ValueListPreValueMigrator.cs
index 7249ebd6ec..07fefc8e85 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/ValueListPreValueMigrator.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/ValueListPreValueMigrator.cs
@@ -9,6 +9,7 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0.DataTypes
         private readonly string[] _editors =
         {
             "Umbraco.RadioButtonList",
+            "Umbraco.CheckBoxList",
             "Umbraco.DropDown",
             "Umbraco.DropdownlistPublishingKeys",
             "Umbraco.DropDownMultiple",

From 0320a56cb56606bd468cdda87c24358c6e332834 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 22 Jul 2019 13:27:51 +1000
Subject: [PATCH 175/776] Fixes up dataTypeId var declarations

---
 .../common/dialogs/linkpicker.controller.js   |  6 +-
 .../linkpicker/linkpicker.controller.js       |  9 +-
 .../mediaPicker/mediapicker.controller.js     | 14 +---
 .../treepicker/treepicker.controller.js       |  6 +-
 .../contentpicker/contentpicker.controller.js | 84 +++++++++----------
 .../grid/editors/media.controller.js          | 14 ++--
 .../grid/editors/rte.controller.js            | 13 +--
 .../mediapicker/mediapicker.controller.js     |  8 +-
 .../multiurlpicker.controller.js              |  7 +-
 .../relatedlinks/relatedlinks.controller.js   | 14 +---
 .../propertyeditors/rte/rte.controller.js     | 14 +---
 11 files changed, 66 insertions(+), 123 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
index 876a9f9426..8cf7f937a3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
@@ -8,17 +8,13 @@ angular.module("umbraco").controller("Umbraco.Dialogs.LinkPickerController",
 			searchText = value + "...";
 		});
 
-        var dataTypeId = null;
-        if($scope.model && $scope.model.dataTypeId) {
-            dataTypeId = $scope.model.dataTypeId;
-        }
 		$scope.dialogTreeEventHandler = $({});
 		$scope.target = {};
 		$scope.searchInfo = {
 			searchFromId: null,
 			searchFromName: null,
 			showSearch: false,
-            dataTypeId: dataTypeId,
+            dataTypeId: ($scope.model && $scope.model.dataTypeId) ? $scope.model.dataTypeId : null,
 			results: [],
 			selectedSearchResults: []
 		}
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
index 0c5641ba0a..f1241c1976 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
@@ -17,7 +17,6 @@ angular.module("umbraco").controller("Umbraco.Overlays.LinkPickerController",
             dataTypeId = dialogOptions.dataTypeId;
         }
 
-
         $scope.dialogTreeEventHandler = $({});
         $scope.model.target = {};
         $scope.searchInfo = {
@@ -28,7 +27,7 @@ angular.module("umbraco").controller("Umbraco.Overlays.LinkPickerController",
             results: [],
             selectedSearchResults: []
         };
-        $scope.customTreeParams = dialogOptions.dataTypeId ? "dataTypeId=" + dialogOptions.dataTypeId : "";
+        $scope.customTreeParams = dataTypeId !== null ? "dataTypeId=" + dataTypeId : "";
         $scope.showTarget = $scope.model.hideTarget !== true;
 
         if (dialogOptions.currentTarget) {
@@ -121,11 +120,7 @@ angular.module("umbraco").controller("Umbraco.Overlays.LinkPickerController",
                     startNodeId = -1;
                     startNodeIsVirtual = true;
                 }
-                var dataTypeId = null;
-                if(dialogOptions && dialogOptions.dataTypeId){
-                    dataTypeId = dialogOptions.dataTypeId;
-                }
-
+                
                 $scope.mediaPickerOverlay = {
                     view: "mediapicker",
                     startNodeId: startNodeId,
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
index 61f9619a52..bae4882a3e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
@@ -54,7 +54,7 @@ angular.module("umbraco")
                 totalItems: 0,
                 totalPages: 0,
                 filter: '',
-                dataTypeId: dataTypeId
+                dataTypeId: dataTypeId,
             };
 
             //preload selected item
@@ -161,11 +161,7 @@ angular.module("umbraco")
                 }
 
                 if (folder.id > 0) {
-                    var dataTypeId = null;
-                    if($scope.model && $scope.model.dataTypeId) {
-                        dataTypeId = $scope.model.dataTypeId;
-                    }
-
+                    
                     entityResource.getAncestors(folder.id, "media", { dataTypeId: dataTypeId })
                         .then(function (anc) {
                             $scope.path = _.filter(anc,
@@ -318,11 +314,7 @@ angular.module("umbraco")
                     if ($scope.searchOptions.filter) {
                         searchMedia();
                     } else {
-                        var dataTypeId = null;
-                        if($scope.model && $scope.model.dataTypeId) {
-                            dataTypeId = $scope.model.dataTypeId;
-                        }
-
+                        
                         // reset pagination
                         $scope.searchOptions = {
                             pageNumber: 1,
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
index 851d270789..2d5fb132b7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
@@ -5,10 +5,6 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController",
         var tree = null;
         var dialogOptions = $scope.model;
 
-        var dataTypeId = null;
-        if(dialogOptions && dialogOptions.dataTypeId){
-            dataTypeId = dialogOptions.dataTypeId;
-        }
         $scope.treeReady = false;
         $scope.dialogTreeEventHandler = $({});
         $scope.section = dialogOptions.section;
@@ -21,7 +17,7 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController",
             searchFromId: dialogOptions.startNodeId,
             searchFromName: null,
             showSearch: false,
-            dataTypeId: dataTypeId,
+            dataTypeId: (dialogOptions && dialogOptions.dataTypeId) ? dialogOptions.dataTypeId : null,
             results: [],
             selectedSearchResults: []
         }
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
index 37a372a5b1..61e841d1af 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
@@ -68,11 +68,11 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
         showPathOnHover: false,
         dataTypeId: null,
         maxNumber: 1,
-        minNumber : 0,
+        minNumber: 0,
         startNode: {
             query: "",
             type: "content",
-	        id: $scope.model.config.startNodeId ? $scope.model.config.startNodeId : -1 // get start node for simple Content Picker
+            id: $scope.model.config.startNodeId ? $scope.model.config.startNodeId : -1 // get start node for simple Content Picker
         }
     };
 
@@ -104,8 +104,8 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
     var entityType = $scope.model.config.startNode.type === "member"
         ? "Member"
         : $scope.model.config.startNode.type === "media"
-        ? "Media"
-        : "Document";
+            ? "Media"
+            : "Document";
     $scope.allowOpenButton = entityType === "Document";
     $scope.allowEditButton = entityType === "Document";
     $scope.allowRemoveButton = true;
@@ -144,7 +144,7 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
         dialogOptions.filterCssClass = "not-allowed";
         var currFilter = dialogOptions.filter;
         //now change the filter to be a method
-        dialogOptions.filter = function(i) {
+        dialogOptions.filter = function (i) {
             //filter out the list view nodes
             if (i.metaData.isContainer) {
                 return true;
@@ -179,34 +179,30 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
     }
 
     //dialog
-    $scope.openContentPicker = function() {
-        var dataTypeId = null;
-        if($scope.model && $scope.model.dataTypeId) {
-            dataTypeId = $scope.model.dataTypeId;
+    $scope.openContentPicker = function () {
+        
+        $scope.contentPickerOverlay = dialogOptions;
+        $scope.contentPickerOverlay.view = "treepicker";
+        $scope.contentPickerOverlay.show = true;
+        $scope.contentPickerOverlay.dataTypeId = ($scope.model && $scope.model.dataTypeId) ? $scope.model.dataTypeId : null;
+
+        $scope.contentPickerOverlay.submit = function (model) {
+
+            if (angular.isArray(model.selection)) {
+                _.each(model.selection, function (item, i) {
+                    $scope.add(item);
+                });
+                angularHelper.getCurrentForm($scope).$setDirty();
+            }
+
+            $scope.contentPickerOverlay.show = false;
+            $scope.contentPickerOverlay = null;
         }
 
-      $scope.contentPickerOverlay = dialogOptions;
-      $scope.contentPickerOverlay.view = "treepicker";
-      $scope.contentPickerOverlay.show = true;
-      $scope.contentPickerOverlay.dataTypeId = dataTypeId;
-
-      $scope.contentPickerOverlay.submit = function(model) {
-
-          if (angular.isArray(model.selection)) {
-             _.each(model.selection, function (item, i) {
-                  $scope.add(item);
-              });
-              angularHelper.getCurrentForm($scope).$setDirty();
-          }
-
-          $scope.contentPickerOverlay.show = false;
-          $scope.contentPickerOverlay = null;
-      }
-
-      $scope.contentPickerOverlay.close = function(oldModel) {
-          $scope.contentPickerOverlay.show = false;
-          $scope.contentPickerOverlay = null;
-      }
+        $scope.contentPickerOverlay.close = function (oldModel) {
+            $scope.contentPickerOverlay.show = false;
+            $scope.contentPickerOverlay = null;
+        }
 
     };
 
@@ -246,13 +242,13 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
         $scope.renderModel = [];
     };
 
-    $scope.openMiniEditor = function(node) {
-        miniEditorHelper.launchMiniEditor(node).then(function(updatedNode){
+    $scope.openMiniEditor = function (node) {
+        miniEditorHelper.launchMiniEditor(node).then(function (updatedNode) {
             // update the node
             node.name = updatedNode.name;
             node.published = updatedNode.hasPublishedVersion;
-            if(entityType !== "Member") {
-                entityResource.getUrl(updatedNode.id, entityType).then(function(data){
+            if (entityType !== "Member") {
+                entityResource.getUrl(updatedNode.id, entityType).then(function (data) {
                     node.url = data;
                 });
             }
@@ -261,7 +257,7 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
 
     //when the scope is destroyed we need to unsubscribe
     $scope.$on('$destroy', function () {
-        if(unsubscribe) {
+        if (unsubscribe) {
             unsubscribe();
         }
     });
@@ -270,12 +266,12 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
 
     //load current data if anything selected
     if (modelIds.length > 0) {
-        entityResource.getByIds(modelIds, entityType).then(function(data) {
+        entityResource.getByIds(modelIds, entityType).then(function (data) {
 
             _.each(modelIds,
-                function(id, i) {
+                function (id, i) {
                     var entity = _.find(data,
-                        function(d) {
+                        function (d) {
                             return $scope.model.config.idType === "udi" ? (d.udi == id) : (d.id == id);
                         });
 
@@ -299,10 +295,10 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
     function setEntityUrl(entity) {
 
         // get url for content and media items
-        if(entityType !== "Member") {
-            entityResource.getUrl(entity.id, entityType).then(function(data){
+        if (entityType !== "Member") {
+            entityResource.getUrl(entity.id, entityType).then(function (data) {
                 // update url
-                angular.forEach($scope.renderModel, function(item){
+                angular.forEach($scope.renderModel, function (item) {
                     if (item.id === entity.id) {
                         if (entity.trashed) {
                             item.url = localizationService.dictionary.general_recycleBin;
@@ -324,7 +320,7 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
     function addSelectedItem(item) {
 
         // set icon
-        if(item.icon) {
+        if (item.icon) {
             item.icon = iconHelper.convertFromLegacyIcon(item.icon);
         }
 
@@ -359,7 +355,7 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
 
     function setSortingState(items) {
         // disable sorting if the list only consist of one item
-        if(items.length > 1) {
+        if (items.length > 1) {
             $scope.sortableOptions.disabled = false;
         } else {
             $scope.sortableOptions.disabled = true;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
index e9c095c1b9..3d0d568866 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
@@ -16,17 +16,13 @@ angular.module("umbraco")
         }
 
         $scope.setImage = function(){
-            var dataTypeId = null;
-            if($scope.model && $scope.model.dataTypeId) {
-                dataTypeId = $scope.model.dataTypeId;
-            }
-
+            
             $scope.mediaPickerOverlay = {};
             $scope.mediaPickerOverlay.view = "mediapicker";
-            $scope.mediaPickerOverlay.startNodeId = $scope.model.config && $scope.model.config.startNodeId ? $scope.model.config.startNodeId : undefined;
-            $scope.mediaPickerOverlay.startNodeIsVirtual = $scope.mediaPickerOverlay.startNodeId ? $scope.model.config.startNodeIsVirtual : undefined;
-            $scope.mediaPickerOverlay.dataTypeId = dataTypeId;
-            $scope.mediaPickerOverlay.cropSize = $scope.control.editor.config && $scope.control.editor.config.size ? $scope.control.editor.config.size : undefined;
+            $scope.mediaPickerOverlay.startNodeId = $scope.model.config && $scope.model.config.startNodeId ? $scope.model.config.startNodeId : null;
+            $scope.mediaPickerOverlay.startNodeIsVirtual = $scope.mediaPickerOverlay.startNodeId ? $scope.model.config.startNodeIsVirtual : null;
+            $scope.mediaPickerOverlay.dataTypeId = ($scope.model && $scope.model.dataTypeId) ? $scope.model.dataTypeId : null;
+            $scope.mediaPickerOverlay.cropSize = $scope.control.editor.config && $scope.control.editor.config.size ? $scope.control.editor.config.size : null;
             $scope.mediaPickerOverlay.showDetails = true;
             $scope.mediaPickerOverlay.disableFolderSelect = true;
             $scope.mediaPickerOverlay.onlyImages = true;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js
index 580d231de8..94f2c83cbf 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js
@@ -10,14 +10,12 @@
         vm.openMacroPicker = openMacroPicker;
         vm.openEmbed = openEmbed;
 
+        const dataTypeId = ($scope.model && $scope.model.dataTypeId) ? $scope.model.dataTypeId : null;
+
         function openLinkPicker(editor, currentTarget, anchorElement) {
 
             entityResource.getAnchors(JSON.stringify($scope.model.value)).then(function(anchorValues) {
-                var dataTypeId = null;
-                if($scope.model && $scope.model.dataTypeId) {
-                    dataTypeId = $scope.model.dataTypeId;
-                }
-
+                
                 vm.linkPickerOverlay = {
                     view: "linkpicker",
                     currentTarget: currentTarget,
@@ -45,11 +43,6 @@
                 startNodeIsVirtual = true;
             }
 
-            var dataTypeId = null;
-            if($scope.model && $scope.model.dataTypeId) {
-                dataTypeId = $scope.model.dataTypeId;
-            }
-
             vm.mediaPickerOverlay = {
                 currentTarget: currentTarget,
                 onlyImages: true,
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
index 63beddb49c..8aafba8ca1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
@@ -107,17 +107,13 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
         };
 
        $scope.add = function() {
-           var dataTypeId = null;
-           if($scope.model && $scope.model.dataTypeId) {
-               dataTypeId = $scope.model.dataTypeId;
-           }
-
+           
            $scope.mediaPickerOverlay = {
                view: "mediapicker",
                title: "Select media",
                startNodeId: $scope.model.config.startNodeId,
                startNodeIsVirtual: $scope.model.config.startNodeIsVirtual,
-               dataTypeId:  dataTypeId,
+               dataTypeId: ($scope.model && $scope.model.dataTypeId) ? $scope.model.dataTypeId : null,
                multiPicker: multiPicker,
                onlyImages: onlyImages,
                disableFolderSelect: disableFolderSelect,
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
index cab124ad23..a5fc5c50d2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
@@ -68,15 +68,10 @@ function multiUrlPickerController($scope, angularHelper, localizationService, en
             target: link.target
         } : null;
 
-        var dataTypeId = null;
-        if($scope.model && $scope.model.dataTypeId) {
-            dataTypeId = $scope.model.dataTypeId;
-        }
-
         $scope.linkPickerOverlay = {
             view: "linkpicker",
             currentTarget: target,
-            dataTypeId: dataTypeId,
+            dataTypeId: ($scope.model && $scope.model.dataTypeId) ? $scope.model.dataTypeId : null,
             ignoreUserStartNodes : $scope.model.config.ignoreUserStartNodes,
             show: true,
             submit: function (model) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
index fa92442eac..78adf2fee5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
@@ -18,12 +18,10 @@
             $scope.currentEditLink = null;
             $scope.hasError = false;
 
-            $scope.internal = function($event) {
-                var dataTypeId = null;
-                if($scope.model && $scope.model.dataTypeId) {
-                    dataTypeId = $scope.model.dataTypeId;
-                }
+            const dataTypeId = ($scope.model && $scope.model.dataTypeId) ? $scope.model.dataTypeId : null;
 
+            $scope.internal = function($event) {
+                
                $scope.currentEditLink = null;
 
                $scope.contentPickerOverlay = {};
@@ -50,11 +48,7 @@
             };
 
             $scope.selectInternal = function ($event, link) {
-                var dataTypeId = null;
-                if($scope.model && $scope.model.dataTypeId) {
-                    dataTypeId = $scope.model.dataTypeId;
-                }
-
+                
                $scope.currentEditLink = link;
 
                $scope.contentPickerOverlay = {};
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
index 2b3ee930d9..d92319a3fc 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
@@ -52,6 +52,8 @@ angular.module("umbraco")
                 editorConfig.maxImageSize = tinyMceService.defaultPrevalues().maxImageSize;
             }
 
+            const dataTypeId = ($scope.model && $scope.model.dataTypeId) ? $scope.model.dataTypeId : null;
+
             //queue file loading
             if (typeof tinymce === "undefined") { // Don't reload tinymce if already loaded
                 await.push(assetsService.loadJs("lib/tinymce/tinymce.min.js", $scope));
@@ -272,11 +274,7 @@ angular.module("umbraco")
                     tinyMceService.createLinkPicker(editor, $scope, function(currentTarget, anchorElement) {
 
                         entityResource.getAnchors($scope.model.value).then(function(anchorValues){
-                            var dataTypeId = null;
-                            if($scope.model && $scope.model.dataTypeId) {
-                                dataTypeId = $scope.model.dataTypeId;
-                            }
-
+                            
                             $scope.linkPickerOverlay = {
                                 view: "linkpicker",
                                 currentTarget: currentTarget,
@@ -305,11 +303,7 @@ angular.module("umbraco")
                             startNodeId = -1;
                             startNodeIsVirtual = true;
                         }
-                        var dataTypeId = null;
-                        if($scope.model && $scope.model.dataTypeId) {
-                            dataTypeId = $scope.model.dataTypeId;
-                        }
-
+                        
                         $scope.mediaPickerOverlay = {
                             currentTarget: currentTarget,
                             onlyImages: true,

From 6148ce4e52e66ca7e4edbba8228b067cd09ff112 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 22 Jul 2019 13:41:26 +1000
Subject: [PATCH 176/776] oops no es6 support in 7.x

---
 .../views/common/overlays/mediaPicker/mediapicker.controller.js | 2 +-
 .../src/views/propertyeditors/grid/editors/rte.controller.js    | 2 +-
 .../propertyeditors/relatedlinks/relatedlinks.controller.js     | 2 +-
 .../src/views/propertyeditors/rte/rte.controller.js             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
index bae4882a3e..5f76528f5d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
@@ -54,7 +54,7 @@ angular.module("umbraco")
                 totalItems: 0,
                 totalPages: 0,
                 filter: '',
-                dataTypeId: dataTypeId,
+                dataTypeId: dataTypeId
             };
 
             //preload selected item
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js
index 94f2c83cbf..e36e398024 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js
@@ -10,7 +10,7 @@
         vm.openMacroPicker = openMacroPicker;
         vm.openEmbed = openEmbed;
 
-        const dataTypeId = ($scope.model && $scope.model.dataTypeId) ? $scope.model.dataTypeId : null;
+        var dataTypeId = ($scope.model && $scope.model.dataTypeId) ? $scope.model.dataTypeId : null;
 
         function openLinkPicker(editor, currentTarget, anchorElement) {
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
index 78adf2fee5..392e0dc0cd 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
@@ -18,7 +18,7 @@
             $scope.currentEditLink = null;
             $scope.hasError = false;
 
-            const dataTypeId = ($scope.model && $scope.model.dataTypeId) ? $scope.model.dataTypeId : null;
+            var dataTypeId = ($scope.model && $scope.model.dataTypeId) ? $scope.model.dataTypeId : null;
 
             $scope.internal = function($event) {
                 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
index d92319a3fc..109aa37fbb 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
@@ -52,7 +52,7 @@ angular.module("umbraco")
                 editorConfig.maxImageSize = tinyMceService.defaultPrevalues().maxImageSize;
             }
 
-            const dataTypeId = ($scope.model && $scope.model.dataTypeId) ? $scope.model.dataTypeId : null;
+            var dataTypeId = ($scope.model && $scope.model.dataTypeId) ? $scope.model.dataTypeId : null;
 
             //queue file loading
             if (typeof tinymce === "undefined") { // Don't reload tinymce if already loaded

From 5126521d37fcc1050a5da44f667560e29752d412 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 12 Jul 2019 13:15:41 +1000
Subject: [PATCH 177/776] Fixes #5789

---
 src/Umbraco.Web/IPublishedContentQuery.cs |  8 ++++----
 src/Umbraco.Web/PublishedContentQuery.cs  | 25 +++++++++++++++--------
 src/Umbraco.Web/UmbracoContextFactory.cs  |  8 ++++++++
 3 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/src/Umbraco.Web/IPublishedContentQuery.cs b/src/Umbraco.Web/IPublishedContentQuery.cs
index 76e7be5e97..35db121a60 100644
--- a/src/Umbraco.Web/IPublishedContentQuery.cs
+++ b/src/Umbraco.Web/IPublishedContentQuery.cs
@@ -39,10 +39,10 @@ namespace Umbraco.Web
         /// <param name="culture">Optional culture.</param>
         /// <param name="indexName">Optional index name.</param>
         /// <remarks>
-        /// <para>When the <paramref name="culture"/> is not specified, all cultures are searched.</para>
+        /// <para>When the <paramref name="culture"/> is not specified or is *, all cultures are searched. To search only invariant use null.</para>
         /// <para>While enumerating results, the ambient culture is changed to be the searched culture.</para>
         /// </remarks>
-        IEnumerable<PublishedSearchResult> Search(string term, string culture = null, string indexName = null);
+        IEnumerable<PublishedSearchResult> Search(string term, string culture = "*", string indexName = null);
 
         /// <summary>
         /// Searches content.
@@ -54,10 +54,10 @@ namespace Umbraco.Web
         /// <param name="culture">Optional culture.</param>
         /// <param name="indexName">Optional index name.</param>
         /// <remarks>
-        /// <para>When the <paramref name="culture"/> is not specified, all cultures are searched.</para>
+        /// <para>When the <paramref name="culture"/> is not specified or is *, all cultures are searched. To search only invariant use null.</para>
         /// <para>While enumerating results, the ambient culture is changed to be the searched culture.</para>
         /// </remarks>
-        IEnumerable<PublishedSearchResult> Search(string term, int skip, int take, out long totalRecords, string culture = null, string indexName = null);
+        IEnumerable<PublishedSearchResult> Search(string term, int skip, int take, out long totalRecords, string culture = "*", string indexName = null);
 
         /// <summary>
         /// Executes the query and converts the results to PublishedSearchResult.
diff --git a/src/Umbraco.Web/PublishedContentQuery.cs b/src/Umbraco.Web/PublishedContentQuery.cs
index 61180580cb..2772cc94f6 100644
--- a/src/Umbraco.Web/PublishedContentQuery.cs
+++ b/src/Umbraco.Web/PublishedContentQuery.cs
@@ -175,13 +175,13 @@ namespace Umbraco.Web
         #region Search
 
         /// <inheritdoc />
-        public IEnumerable<PublishedSearchResult> Search(string term, string culture = null, string indexName = null)
+        public IEnumerable<PublishedSearchResult> Search(string term, string culture = "*", string indexName = null)
         {
             return Search(term, 0, 0, out _, culture, indexName);
         }
 
         /// <inheritdoc />
-        public IEnumerable<PublishedSearchResult> Search(string term, int skip, int take, out long totalRecords, string culture = null, string indexName = null)
+        public IEnumerable<PublishedSearchResult> Search(string term, int skip, int take, out long totalRecords, string culture = "*", string indexName = null)
         {
             indexName = string.IsNullOrEmpty(indexName)
                 ? Constants.UmbracoIndexes.ExternalIndexName
@@ -195,20 +195,29 @@ namespace Umbraco.Web
             // default to max 500 results
             var count = skip == 0 && take == 0 ? 500 : skip + take;
 
-            //set this to the specific culture or to the culture in the request
-            culture = culture ?? _variationContextAccessor.VariationContext.Culture;
-
             ISearchResults results;
-            if (culture.IsNullOrWhiteSpace())
+            if (culture == "*")
             {
+                //search everything
+
                 results = searcher.Search(term, count);
             }
+            else if (culture.IsNullOrWhiteSpace())
+            {
+                //only search invariant
+
+                var qry = searcher.CreateQuery().Field(UmbracoContentIndex.VariesByCultureFieldName, "n"); //must not vary by culture
+                qry = qry.And().ManagedQuery(term);
+                results = qry.Execute(count);
+            }
             else
             {
+                //search only the specified culture
+
                 //get all index fields suffixed with the culture name supplied
-                var cultureFields = umbIndex.GetCultureFields(culture);
+                var cultureFields = umbIndex.GetCultureFields(culture).ToArray();
                 var qry = searcher.CreateQuery().Field(UmbracoContentIndex.VariesByCultureFieldName, "y"); //must vary by culture
-                qry = qry.And().ManagedQuery(term, cultureFields.ToArray());
+                qry = qry.And().ManagedQuery(term, cultureFields);
                 results = qry.Execute(count);
             }
 
diff --git a/src/Umbraco.Web/UmbracoContextFactory.cs b/src/Umbraco.Web/UmbracoContextFactory.cs
index 2a812036bf..11d8952fa6 100644
--- a/src/Umbraco.Web/UmbracoContextFactory.cs
+++ b/src/Umbraco.Web/UmbracoContextFactory.cs
@@ -53,7 +53,15 @@ namespace Umbraco.Web
         {
             // make sure we have a variation context
             if (_variationContextAccessor.VariationContext == null)
+            {
+                // TODO: By using _defaultCultureAccessor.DefaultCulture this means that the VariationContext will always return a variant culture, it will never
+                // return an empty string signifying that the culture is invariant. But does this matter? Are we actually expecting this to return an empty string
+                // for invariant routes? From what i can tell throughout the codebase is that whenever we are checking against the VariationContext.Culture we are
+                // also checking if the content type varies by culture or not. This is fine, however the code in the ctor of VariationContext is then misleading
+                // since it's assuming that the Culture can be empty (invariant) when in reality of a website this will never be empty since a real culture is always set here.
                 _variationContextAccessor.VariationContext = new VariationContext(_defaultCultureAccessor.DefaultCulture);
+            }
+                
 
             var webSecurity = new WebSecurity(httpContext, _userService, _globalSettings);
 

From dc371c1979e5d3df409da4e4fae229d52944ae72 Mon Sep 17 00:00:00 2001
From: Steve Megson <steve@megson.org>
Date: Sun, 21 Jul 2019 15:47:37 +0200
Subject: [PATCH 178/776] Include CheckBoxList in ValueListPreValueMigrator

---
 .../Upgrade/V_8_0_0/DataTypes/ValueListPreValueMigrator.cs       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/ValueListPreValueMigrator.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/ValueListPreValueMigrator.cs
index 7249ebd6ec..07fefc8e85 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/ValueListPreValueMigrator.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/ValueListPreValueMigrator.cs
@@ -9,6 +9,7 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0.DataTypes
         private readonly string[] _editors =
         {
             "Umbraco.RadioButtonList",
+            "Umbraco.CheckBoxList",
             "Umbraco.DropDown",
             "Umbraco.DropdownlistPublishingKeys",
             "Umbraco.DropDownMultiple",

From 1c6bf55e5d3a65dd63ba5dcbd05bffc69a89f537 Mon Sep 17 00:00:00 2001
From: Frans de Jong <Frans@webwonders.nl>
Date: Fri, 19 Jul 2019 14:42:44 +0200
Subject: [PATCH 179/776] GetCurrentLoginStatus()

In the summary of MembershipHelper.GetCurrentLoginStatus() it states that null will be returned when no member is logged in but that isn't the case (anymore?).
---
 src/Umbraco.Web/Security/MembershipHelper.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Security/MembershipHelper.cs b/src/Umbraco.Web/Security/MembershipHelper.cs
index cdf696c520..f74897d565 100644
--- a/src/Umbraco.Web/Security/MembershipHelper.cs
+++ b/src/Umbraco.Web/Security/MembershipHelper.cs
@@ -542,7 +542,7 @@ namespace Umbraco.Web.Security
         }
 
         /// <summary>
-        /// Returns the login status model of the currently logged in member, if no member is logged in it returns null;
+        /// Returns the login status model of the currently logged in member.
         /// </summary>
         /// <returns></returns>
         public virtual LoginStatusModel GetCurrentLoginStatus()

From a8ed7f2c17512f36ef883a9805603488df6c5b42 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 23 Jul 2019 22:11:02 +1000
Subject: [PATCH 180/776] adds new method

---
 src/Umbraco.Examine/ExamineExtensions.cs | 25 ++++++++++++++++++++++++
 src/Umbraco.Web/PublishedContentQuery.cs |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Examine/ExamineExtensions.cs b/src/Umbraco.Examine/ExamineExtensions.cs
index 1b8033c458..d97278f31c 100644
--- a/src/Umbraco.Examine/ExamineExtensions.cs
+++ b/src/Umbraco.Examine/ExamineExtensions.cs
@@ -48,6 +48,31 @@ namespace Umbraco.Examine
             }
         }
 
+        /// <summary>
+        /// Returns all index fields that are culture specific (suffixed) or invariant
+        /// </summary>
+        /// <param name="index"></param>
+        /// <param name="culture"></param>
+        /// <returns></returns>
+        public static IEnumerable<string> GetCultureAndInvariantFields(this IUmbracoIndex index, string culture)
+        {
+            var allFields = index.GetFields();
+            // ReSharper disable once LoopCanBeConvertedToQuery
+            foreach (var field in allFields)
+            {
+                var match = CultureIsoCodeFieldNameMatchExpression.Match(field);
+                if (match.Success && match.Groups.Count == 3 && culture.InvariantEquals(match.Groups[2].Value))
+                {
+                    yield return field; //matches this culture field
+                }
+                else if (!match.Success)
+                {
+                    yield return field; //matches no culture field (invariant)
+                }
+                    
+            }
+        }
+
         internal static bool TryParseLuceneQuery(string query)
         {
             // TODO: I'd assume there would be a more strict way to parse the query but not that i can find yet, for now we'll
diff --git a/src/Umbraco.Web/PublishedContentQuery.cs b/src/Umbraco.Web/PublishedContentQuery.cs
index 2772cc94f6..19e303602d 100644
--- a/src/Umbraco.Web/PublishedContentQuery.cs
+++ b/src/Umbraco.Web/PublishedContentQuery.cs
@@ -215,7 +215,7 @@ namespace Umbraco.Web
                 //search only the specified culture
 
                 //get all index fields suffixed with the culture name supplied
-                var cultureFields = umbIndex.GetCultureFields(culture).ToArray();
+                var cultureFields = umbIndex.GetCultureAndInvariantFields(culture).ToArray();
                 var qry = searcher.CreateQuery().Field(UmbracoContentIndex.VariesByCultureFieldName, "y"); //must vary by culture
                 qry = qry.And().ManagedQuery(term, cultureFields);
                 results = qry.Execute(count);

From 2f8979bbc3975dea34d1cfd8c60a0ebb90b0896b Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Wed, 24 Jul 2019 17:29:00 +1000
Subject: [PATCH 181/776] Update src/Umbraco.Web/PublishedContentQuery.cs

Co-Authored-By: Bjarke Berg <mail@bergmania.dk>
---
 src/Umbraco.Web/PublishedContentQuery.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/PublishedContentQuery.cs b/src/Umbraco.Web/PublishedContentQuery.cs
index 19e303602d..5af5837495 100644
--- a/src/Umbraco.Web/PublishedContentQuery.cs
+++ b/src/Umbraco.Web/PublishedContentQuery.cs
@@ -216,7 +216,7 @@ namespace Umbraco.Web
 
                 //get all index fields suffixed with the culture name supplied
                 var cultureFields = umbIndex.GetCultureAndInvariantFields(culture).ToArray();
-                var qry = searcher.CreateQuery().Field(UmbracoContentIndex.VariesByCultureFieldName, "y"); //must vary by culture
+                var qry = searcher.CreateQuery();
                 qry = qry.And().ManagedQuery(term, cultureFields);
                 results = qry.Execute(count);
             }

From beb8c7ac7c1076eabc132e3eb824e8ea8c6cd667 Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Wed, 24 Jul 2019 17:30:29 +1000
Subject: [PATCH 182/776] Update src/Umbraco.Web/PublishedContentQuery.cs

Co-Authored-By: Bjarke Berg <mail@bergmania.dk>
---
 src/Umbraco.Web/PublishedContentQuery.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/PublishedContentQuery.cs b/src/Umbraco.Web/PublishedContentQuery.cs
index 5af5837495..cfdd31f138 100644
--- a/src/Umbraco.Web/PublishedContentQuery.cs
+++ b/src/Umbraco.Web/PublishedContentQuery.cs
@@ -217,7 +217,7 @@ namespace Umbraco.Web
                 //get all index fields suffixed with the culture name supplied
                 var cultureFields = umbIndex.GetCultureAndInvariantFields(culture).ToArray();
                 var qry = searcher.CreateQuery();
-                qry = qry.And().ManagedQuery(term, cultureFields);
+                qry = qry.ManagedQuery(term, cultureFields);
                 results = qry.Execute(count);
             }
 

From 210e43fcb084c977a514e92f0f4376442ea85bb3 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 24 Jul 2019 09:53:51 +0200
Subject: [PATCH 183/776] Fix for build

---
 src/Umbraco.Web/PublishedContentQuery.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web/PublishedContentQuery.cs b/src/Umbraco.Web/PublishedContentQuery.cs
index cfdd31f138..887368a3e9 100644
--- a/src/Umbraco.Web/PublishedContentQuery.cs
+++ b/src/Umbraco.Web/PublishedContentQuery.cs
@@ -216,8 +216,7 @@ namespace Umbraco.Web
 
                 //get all index fields suffixed with the culture name supplied
                 var cultureFields = umbIndex.GetCultureAndInvariantFields(culture).ToArray();
-                var qry = searcher.CreateQuery();
-                qry = qry.ManagedQuery(term, cultureFields);
+                var qry = searcher.CreateQuery().ManagedQuery(term, cultureFields);
                 results = qry.Execute(count);
             }
 
@@ -313,7 +312,7 @@ namespace Umbraco.Web
             }
         }
 
-        
+
 
 
         #endregion

From 8a43e3a87ec28b997878e2433e464b07680bf5e2 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Fri, 12 Jul 2019 19:20:15 +0200
Subject: [PATCH 184/776] Make sure save options are up to date with the
 content state

---
 .../common/directives/components/content/edit.controller.js   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
index a548820138..58a22ac74e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
@@ -94,6 +94,10 @@
                 content.apps[0].active = true;
                 $scope.appChanged(content.apps[0]);
             }
+            // otherwise make sure the save options are up to date with the current content state
+            else {
+                createButtons($scope.content);
+            }
 
             editorState.set(content);
 

From 2c795662d2d5493039eda2a85120c2e3d39b3758 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 24 Jul 2019 18:46:14 +1000
Subject: [PATCH 185/776] Adds tests for PublishedContentQuery search

---
 .../TestHelpers/RandomIdRamDirectory.cs       |  22 +++
 src/Umbraco.Tests/Umbraco.Tests.csproj        |   2 +
 .../Web/PublishedContentQueryTests.cs         | 157 ++++++++++++++++++
 src/Umbraco.Tests/Web/UmbracoHelperTests.cs   |  10 +-
 src/Umbraco.Web/IPublishedContentQuery.cs     |  12 +-
 src/Umbraco.Web/PublishedContentQuery.cs      |  17 +-
 6 files changed, 210 insertions(+), 10 deletions(-)
 create mode 100644 src/Umbraco.Tests/TestHelpers/RandomIdRamDirectory.cs
 create mode 100644 src/Umbraco.Tests/Web/PublishedContentQueryTests.cs

diff --git a/src/Umbraco.Tests/TestHelpers/RandomIdRamDirectory.cs b/src/Umbraco.Tests/TestHelpers/RandomIdRamDirectory.cs
new file mode 100644
index 0000000000..34904db1ae
--- /dev/null
+++ b/src/Umbraco.Tests/TestHelpers/RandomIdRamDirectory.cs
@@ -0,0 +1,22 @@
+using Lucene.Net.Store;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Umbraco.Tests.TestHelpers
+{
+
+    /// <summary>
+    /// Used for tests with Lucene so that each RAM directory is unique
+    /// </summary>
+    public class RandomIdRAMDirectory : RAMDirectory
+    {
+        private readonly string _lockId = Guid.NewGuid().ToString();
+        public override string GetLockId()
+        {
+            return _lockId;
+        }
+    }
+}
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index f41ff1dd07..717006b702 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -157,6 +157,7 @@
     <Compile Include="Services\MemberGroupServiceTests.cs" />
     <Compile Include="Services\MediaTypeServiceTests.cs" />
     <Compile Include="Services\PropertyValidationServiceTests.cs" />
+    <Compile Include="TestHelpers\RandomIdRamDirectory.cs" />
     <Compile Include="Testing\Objects\TestDataSource.cs" />
     <Compile Include="Published\PublishedSnapshotTestObjects.cs" />
     <Compile Include="Published\ModelTypeTests.cs" />
@@ -268,6 +269,7 @@
     <Compile Include="Strings\StylesheetHelperTests.cs" />
     <Compile Include="Strings\StringValidationTests.cs" />
     <Compile Include="Web\Mvc\ValidateUmbracoFormRouteStringAttributeTests.cs" />
+    <Compile Include="Web\PublishedContentQueryTests.cs" />
     <Compile Include="Web\UmbracoHelperTests.cs" />
     <Compile Include="Membership\MembershipProviderBaseTests.cs" />
     <Compile Include="Membership\UmbracoServiceMembershipProviderTests.cs" />
diff --git a/src/Umbraco.Tests/Web/PublishedContentQueryTests.cs b/src/Umbraco.Tests/Web/PublishedContentQueryTests.cs
new file mode 100644
index 0000000000..b2a2741bcf
--- /dev/null
+++ b/src/Umbraco.Tests/Web/PublishedContentQueryTests.cs
@@ -0,0 +1,157 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Examine;
+using Examine.LuceneEngine.Providers;
+using Lucene.Net.Store;
+using Moq;
+using NUnit.Framework;
+using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Examine;
+using Umbraco.Tests.TestHelpers;
+using Umbraco.Web;
+using Umbraco.Web.PublishedCache;
+
+namespace Umbraco.Tests.Web
+{
+    [TestFixture]
+    public class PublishedContentQueryTests
+    {
+
+        private class TestIndex : LuceneIndex, IUmbracoIndex
+        {
+            private readonly string[] _fieldNames;
+
+            public TestIndex(string name, Directory luceneDirectory, string[] fieldNames)
+                : base(name, luceneDirectory, null, null, null, null)
+            {
+                _fieldNames = fieldNames;
+            }
+            public bool EnableDefaultEventHandler => throw new NotImplementedException();
+            public bool PublishedValuesOnly => throw new NotImplementedException();
+            public IEnumerable<string> GetFields() => _fieldNames;
+        }
+
+        private TestIndex CreateTestIndex(Directory luceneDirectory, string[] fieldNames)
+        {
+            var indexer = new TestIndex("TestIndex", luceneDirectory, fieldNames);
+
+            //populate with some test data
+            indexer.IndexItem(new ValueSet("1", "content", new Dictionary<string, object>
+            {
+                [fieldNames[0]] = "Hello world, there are products here",
+                [UmbracoContentIndex.VariesByCultureFieldName] = "n"
+            }));
+            indexer.IndexItem(new ValueSet("2", "content", new Dictionary<string, object>
+            {
+                [fieldNames[1]] = "Hello world, there are products here",
+                [UmbracoContentIndex.VariesByCultureFieldName] = "y"
+            }));
+            indexer.IndexItem(new ValueSet("3", "content", new Dictionary<string, object>
+            {
+                [fieldNames[2]] = "Hello world, there are products here",
+                [UmbracoContentIndex.VariesByCultureFieldName] = "y"
+            }));
+            return indexer;
+        }
+
+        private PublishedContentQuery CreatePublishedContentQuery(IIndex indexer)
+        {
+            var examineManager = new Mock<IExamineManager>();
+            IIndex outarg = indexer;
+            examineManager.Setup(x => x.TryGetIndex("TestIndex", out outarg)).Returns(true);
+
+            var contentCache = new Mock<IPublishedContentCache>();
+            contentCache.Setup(x => x.GetById(It.IsAny<int>())).Returns((int intId) => Mock.Of<IPublishedContent>(x => x.Id == intId));
+            var snapshot = Mock.Of<IPublishedSnapshot>(x => x.Content == contentCache.Object);
+            var variationContext = new VariationContext();
+            var variationContextAccessor = Mock.Of<IVariationContextAccessor>(x => x.VariationContext == variationContext);
+
+            return new PublishedContentQuery(snapshot, variationContextAccessor, examineManager.Object);
+        }
+
+        [Test]
+        public void Search_Wildcard()
+        {
+            using (var luceneDir = new RandomIdRAMDirectory())
+            {
+                var fieldNames = new[] { "title", "title_en-us", "title_fr-fr" };
+                using (var indexer = CreateTestIndex(luceneDir, fieldNames))
+                {
+                    var pcq = CreatePublishedContentQuery(indexer);
+
+                    var results = pcq.Search("Products", "*", "TestIndex");
+
+                    var ids = results.Select(x => x.Content.Id).ToList();
+                    Assert.AreEqual(3, ids.Count);
+
+                    //returns results for all fields and document types
+                    Assert.IsTrue(ids.Contains(1) && ids.Contains(2) && ids.Contains(3));
+                }
+            }
+        }
+
+        [Test]
+        public void Search_Invariant()
+        {
+            using (var luceneDir = new RandomIdRAMDirectory())
+            {
+                var fieldNames = new[] { "title", "title_en-us", "title_fr-fr" };
+                using (var indexer = CreateTestIndex(luceneDir, fieldNames))
+                {
+                    var pcq = CreatePublishedContentQuery(indexer);
+
+                    var results = pcq.Search("Products", null, "TestIndex");
+
+                    var ids = results.Select(x => x.Content.Id).ToList();
+                    Assert.AreEqual(1, ids.Count);
+
+                    //returns results for only invariant fields and invariant documents
+                    Assert.IsTrue(ids.Contains(1) && !ids.Contains(2) && !ids.Contains(3));
+                }
+            }
+        }
+
+        [Test]
+        public void Search_Culture1()
+        {
+            using (var luceneDir = new RandomIdRAMDirectory())
+            {
+                var fieldNames = new[] { "title", "title_en-us", "title_fr-fr" };
+                using (var indexer = CreateTestIndex(luceneDir, fieldNames))
+                {
+                    var pcq = CreatePublishedContentQuery(indexer);
+
+                    var results = pcq.Search("Products", "en-us", "TestIndex");
+
+                    var ids = results.Select(x => x.Content.Id).ToList();
+                    Assert.AreEqual(2, ids.Count);
+
+                    //returns results for en-us fields and invariant fields for all document types
+                    Assert.IsTrue(ids.Contains(1) && ids.Contains(2) && !ids.Contains(3));
+                }
+            }
+        }
+
+        [Test]
+        public void Search_Culture2()
+        {
+            using (var luceneDir = new RandomIdRAMDirectory())
+            {
+                var fieldNames = new[] { "title", "title_en-us", "title_fr-fr" };
+                using (var indexer = CreateTestIndex(luceneDir, fieldNames))
+                {
+                    var pcq = CreatePublishedContentQuery(indexer);
+
+                    var results = pcq.Search("Products", "fr-fr", "TestIndex");
+
+                    var ids = results.Select(x => x.Content.Id).ToList();
+                    Assert.AreEqual(2, ids.Count);
+
+                    //returns results for fr-fr fields and invariant fields for all document types
+                    Assert.IsTrue(ids.Contains(1) && !ids.Contains(2) && ids.Contains(3));
+                }
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Tests/Web/UmbracoHelperTests.cs b/src/Umbraco.Tests/Web/UmbracoHelperTests.cs
index b23b5bd6b7..26d85f60cf 100644
--- a/src/Umbraco.Tests/Web/UmbracoHelperTests.cs
+++ b/src/Umbraco.Tests/Web/UmbracoHelperTests.cs
@@ -1,5 +1,8 @@
 using System;
 using System.Text;
+using Examine.LuceneEngine;
+using Lucene.Net.Analysis;
+using Lucene.Net.Analysis.Standard;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Core;
@@ -13,18 +16,19 @@ using Umbraco.Web;
 
 namespace Umbraco.Tests.Web
 {
+
     [TestFixture]
     public class UmbracoHelperTests
-    {   
+    {
 
         [TearDown]
         public void TearDown()
         {
             Current.Reset();
         }
-        
 
-        
+
+
         // ------- Int32 conversion tests
         [Test]
         public static void Converting_Boxed_34_To_An_Int_Returns_34()
diff --git a/src/Umbraco.Web/IPublishedContentQuery.cs b/src/Umbraco.Web/IPublishedContentQuery.cs
index 35db121a60..8a8d678aba 100644
--- a/src/Umbraco.Web/IPublishedContentQuery.cs
+++ b/src/Umbraco.Web/IPublishedContentQuery.cs
@@ -39,7 +39,11 @@ namespace Umbraco.Web
         /// <param name="culture">Optional culture.</param>
         /// <param name="indexName">Optional index name.</param>
         /// <remarks>
-        /// <para>When the <paramref name="culture"/> is not specified or is *, all cultures are searched. To search only invariant use null.</para>
+        /// <para>
+        /// When the <paramref name="culture"/> is not specified or is *, all cultures are searched.
+        /// To search for only invariant documents and fields use null.
+        /// When searching on a specific culture, all culture specific fields are searched for the provided culture and all invariant fields for all documents.
+        /// </para>
         /// <para>While enumerating results, the ambient culture is changed to be the searched culture.</para>
         /// </remarks>
         IEnumerable<PublishedSearchResult> Search(string term, string culture = "*", string indexName = null);
@@ -54,7 +58,11 @@ namespace Umbraco.Web
         /// <param name="culture">Optional culture.</param>
         /// <param name="indexName">Optional index name.</param>
         /// <remarks>
-        /// <para>When the <paramref name="culture"/> is not specified or is *, all cultures are searched. To search only invariant use null.</para>
+        /// <para>
+        /// When the <paramref name="culture"/> is not specified or is *, all cultures are searched.
+        /// To search for only invariant documents and fields use null.
+        /// When searching on a specific culture, all culture specific fields are searched for the provided culture and all invariant fields for all documents.
+        /// </para>
         /// <para>While enumerating results, the ambient culture is changed to be the searched culture.</para>
         /// </remarks>
         IEnumerable<PublishedSearchResult> Search(string term, int skip, int take, out long totalRecords, string culture = "*", string indexName = null);
diff --git a/src/Umbraco.Web/PublishedContentQuery.cs b/src/Umbraco.Web/PublishedContentQuery.cs
index cfdd31f138..2dbe4de4c5 100644
--- a/src/Umbraco.Web/PublishedContentQuery.cs
+++ b/src/Umbraco.Web/PublishedContentQuery.cs
@@ -20,14 +20,22 @@ namespace Umbraco.Web
     {
         private readonly IPublishedSnapshot _publishedSnapshot;
         private readonly IVariationContextAccessor _variationContextAccessor;
+        private readonly IExamineManager _examineManager;
+
+        [Obsolete("Use the constructor with all parameters instead")]
+        public PublishedContentQuery(IPublishedSnapshot publishedSnapshot, IVariationContextAccessor variationContextAccessor)
+            : this (publishedSnapshot, variationContextAccessor, ExamineManager.Instance)
+        {
+        }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="PublishedContentQuery"/> class.
         /// </summary>
-        public PublishedContentQuery(IPublishedSnapshot publishedSnapshot, IVariationContextAccessor variationContextAccessor)
+        public PublishedContentQuery(IPublishedSnapshot publishedSnapshot, IVariationContextAccessor variationContextAccessor, IExamineManager examineManager)
         {
             _publishedSnapshot = publishedSnapshot ?? throw new ArgumentNullException(nameof(publishedSnapshot));
             _variationContextAccessor = variationContextAccessor ?? throw new ArgumentNullException(nameof(variationContextAccessor));
+            _examineManager = examineManager ?? throw new ArgumentNullException(nameof(examineManager));
         }
 
         #region Content
@@ -187,7 +195,7 @@ namespace Umbraco.Web
                 ? Constants.UmbracoIndexes.ExternalIndexName
                 : indexName;
 
-            if (!ExamineManager.Instance.TryGetIndex(indexName, out var index) || !(index is IUmbracoIndex umbIndex))
+            if (!_examineManager.TryGetIndex(indexName, out var index) || !(index is IUmbracoIndex umbIndex))
                 throw new InvalidOperationException($"No index found by name {indexName} or is not of type {typeof(IUmbracoIndex)}");
 
             var searcher = umbIndex.GetSearcher();
@@ -216,8 +224,7 @@ namespace Umbraco.Web
 
                 //get all index fields suffixed with the culture name supplied
                 var cultureFields = umbIndex.GetCultureAndInvariantFields(culture).ToArray();
-                var qry = searcher.CreateQuery();
-                qry = qry.ManagedQuery(term, cultureFields);
+                var qry = searcher.CreateQuery().ManagedQuery(term, cultureFields);
                 results = qry.Execute(count);
             }
 
@@ -313,7 +320,7 @@ namespace Umbraco.Web
             }
         }
 
-        
+
 
 
         #endregion

From 342b2087e999f508adcfdcbf4000504dbdf0f0f4 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Fri, 12 Jul 2019 19:20:15 +0200
Subject: [PATCH 186/776] Make sure save options are up to date with the
 content state

(cherry picked from commit 8a43e3a87ec28b997878e2433e464b07680bf5e2)
---
 .../common/directives/components/content/edit.controller.js   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
index a548820138..58a22ac74e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
@@ -94,6 +94,10 @@
                 content.apps[0].active = true;
                 $scope.appChanged(content.apps[0]);
             }
+            // otherwise make sure the save options are up to date with the current content state
+            else {
+                createButtons($scope.content);
+            }
 
             editorState.set(content);
 

From 308f929f7b5ba1bfd6b8fc373427a426929db2a2 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 24 Jul 2019 11:13:21 +0200
Subject: [PATCH 187/776] Refactored tests to avoid duplicate code

---
 .../Web/PublishedContentQueryTests.cs         | 78 ++-----------------
 1 file changed, 8 insertions(+), 70 deletions(-)

diff --git a/src/Umbraco.Tests/Web/PublishedContentQueryTests.cs b/src/Umbraco.Tests/Web/PublishedContentQueryTests.cs
index b2a2741bcf..2cff946372 100644
--- a/src/Umbraco.Tests/Web/PublishedContentQueryTests.cs
+++ b/src/Umbraco.Tests/Web/PublishedContentQueryTests.cs
@@ -70,8 +70,11 @@ namespace Umbraco.Tests.Web
             return new PublishedContentQuery(snapshot, variationContextAccessor, examineManager.Object);
         }
 
-        [Test]
-        public void Search_Wildcard()
+        [TestCase("fr-fr", ExpectedResult = "1, 3", TestName = "Search Culture: fr-fr. Must return both fr-fr and invariant results")]
+        [TestCase("en-us", ExpectedResult = "1, 2", TestName = "Search Culture: en-us. Must return both en-us and invariant results")]
+        [TestCase("*", ExpectedResult = "1, 2, 3", TestName = "Search Culture: *. Must return all cultures and all invariant results")]
+        [TestCase(null, ExpectedResult = "1", TestName = "Search Culture: null. Must return only invariant results")]
+        public string Search(string culture)
         {
             using (var luceneDir = new RandomIdRAMDirectory())
             {
@@ -80,76 +83,11 @@ namespace Umbraco.Tests.Web
                 {
                     var pcq = CreatePublishedContentQuery(indexer);
 
-                    var results = pcq.Search("Products", "*", "TestIndex");
+                    var results = pcq.Search("Products", culture, "TestIndex");
 
-                    var ids = results.Select(x => x.Content.Id).ToList();
-                    Assert.AreEqual(3, ids.Count);
+                    var ids = results.Select(x => x.Content.Id).ToArray();
 
-                    //returns results for all fields and document types
-                    Assert.IsTrue(ids.Contains(1) && ids.Contains(2) && ids.Contains(3));
-                }
-            }
-        }
-
-        [Test]
-        public void Search_Invariant()
-        {
-            using (var luceneDir = new RandomIdRAMDirectory())
-            {
-                var fieldNames = new[] { "title", "title_en-us", "title_fr-fr" };
-                using (var indexer = CreateTestIndex(luceneDir, fieldNames))
-                {
-                    var pcq = CreatePublishedContentQuery(indexer);
-
-                    var results = pcq.Search("Products", null, "TestIndex");
-
-                    var ids = results.Select(x => x.Content.Id).ToList();
-                    Assert.AreEqual(1, ids.Count);
-
-                    //returns results for only invariant fields and invariant documents
-                    Assert.IsTrue(ids.Contains(1) && !ids.Contains(2) && !ids.Contains(3));
-                }
-            }
-        }
-
-        [Test]
-        public void Search_Culture1()
-        {
-            using (var luceneDir = new RandomIdRAMDirectory())
-            {
-                var fieldNames = new[] { "title", "title_en-us", "title_fr-fr" };
-                using (var indexer = CreateTestIndex(luceneDir, fieldNames))
-                {
-                    var pcq = CreatePublishedContentQuery(indexer);
-
-                    var results = pcq.Search("Products", "en-us", "TestIndex");
-
-                    var ids = results.Select(x => x.Content.Id).ToList();
-                    Assert.AreEqual(2, ids.Count);
-
-                    //returns results for en-us fields and invariant fields for all document types
-                    Assert.IsTrue(ids.Contains(1) && ids.Contains(2) && !ids.Contains(3));
-                }
-            }
-        }
-
-        [Test]
-        public void Search_Culture2()
-        {
-            using (var luceneDir = new RandomIdRAMDirectory())
-            {
-                var fieldNames = new[] { "title", "title_en-us", "title_fr-fr" };
-                using (var indexer = CreateTestIndex(luceneDir, fieldNames))
-                {
-                    var pcq = CreatePublishedContentQuery(indexer);
-
-                    var results = pcq.Search("Products", "fr-fr", "TestIndex");
-
-                    var ids = results.Select(x => x.Content.Id).ToList();
-                    Assert.AreEqual(2, ids.Count);
-
-                    //returns results for fr-fr fields and invariant fields for all document types
-                    Assert.IsTrue(ids.Contains(1) && !ids.Contains(2) && ids.Contains(3));
+                    return string.Join(", ", ids);
                 }
             }
         }

From a97604d6c405c7ebf6372f69807193e8cbbc7a50 Mon Sep 17 00:00:00 2001
From: Steve Megson <steve@megson.org>
Date: Sun, 21 Jul 2019 15:19:17 +0100
Subject: [PATCH 188/776] Handle CSV values in TagsPropertyEditor

---
 .../PropertyEditors/TagsPropertyEditor.cs         | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
index 90527a8b8d..b7101aa764 100644
--- a/src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using Newtonsoft.Json.Linq;
@@ -38,9 +39,15 @@ namespace Umbraco.Web.PropertyEditors
             /// <inheritdoc />
             public override object FromEditor(ContentPropertyData editorValue, object currentValue)
             {
-                return editorValue.Value is JArray json
-                    ? json.Select(x => x.Value<string>())
-                    : null;
+                if (editorValue.Value is JArray json)
+                {
+                    return json.Select(x => x.Value<string>());
+                }
+                else if ( editorValue.Value is string stringValue && !String.IsNullOrWhiteSpace(stringValue))
+                {
+                    return stringValue.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries);
+                }
+                return null;
             }
 
             /// <inheritdoc />

From 186460ac08de66428a54357857c630093b8c9674 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 24 Jul 2019 19:23:05 +1000
Subject: [PATCH 189/776] removes refs from old packages.umbraco.org

---
 src/Umbraco.Web/Properties/Settings.settings  |    3 -
 .../Properties/Settings1.Designer.cs          |   12 +-
 src/Umbraco.Web/Umbraco.Web.csproj            |   22 -
 .../org.umbraco.our/Reference.cs              | 1046 -----------------
 .../org.umbraco.our/Reference.map             |    7 -
 .../org.umbraco.our/repository.disco          |    6 -
 .../org.umbraco.our/repository.wsdl           |  995 ----------------
 7 files changed, 1 insertion(+), 2090 deletions(-)
 delete mode 100644 src/Umbraco.Web/Web References/org.umbraco.our/Reference.cs
 delete mode 100644 src/Umbraco.Web/Web References/org.umbraco.our/Reference.map
 delete mode 100644 src/Umbraco.Web/Web References/org.umbraco.our/repository.disco
 delete mode 100644 src/Umbraco.Web/Web References/org.umbraco.our/repository.wsdl

diff --git a/src/Umbraco.Web/Properties/Settings.settings b/src/Umbraco.Web/Properties/Settings.settings
index da9e6f69c0..a7b911ae3b 100644
--- a/src/Umbraco.Web/Properties/Settings.settings
+++ b/src/Umbraco.Web/Properties/Settings.settings
@@ -11,8 +11,5 @@
     <Setting Name="test" Type="System.String" Scope="Application">
       <Value Profile="(Default)">Somthing</Value>
     </Setting>
-    <Setting Name="umbraco_org_umbraco_our_Repository" Type="(Web Service URL)" Scope="Application">
-      <Value Profile="(Default)">https://our.umbraco.com/umbraco/webservices/api/repository.asmx</Value>
-    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/src/Umbraco.Web/Properties/Settings1.Designer.cs b/src/Umbraco.Web/Properties/Settings1.Designer.cs
index e7028f28df..3847901f20 100644
--- a/src/Umbraco.Web/Properties/Settings1.Designer.cs
+++ b/src/Umbraco.Web/Properties/Settings1.Designer.cs
@@ -12,7 +12,7 @@ namespace Umbraco.Web.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.8.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.2.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -50,15 +50,5 @@ namespace Umbraco.Web.Properties {
                 return ((string)(this["test"]));
             }
         }
-        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.WebServiceUrl)]
-        [global::System.Configuration.DefaultSettingValueAttribute("https://our.umbraco.com/umbraco/webservices/api/repository.asmx")]
-        public string umbraco_org_umbraco_our_Repository {
-            get {
-                return ((string)(this["umbraco_org_umbraco_our_Repository"]));
-            }
-        }
     }
 }
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 167c99b9b9..5705f6b7eb 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -812,11 +812,6 @@
     <Compile Include="umbraco.presentation\umbraco\Trees\loadPackager.cs" />
     <Compile Include="PublishedCache\XmlPublishedCache\XmlCacheFilePersister.cs" />
     <Compile Include="UmbracoComponentRenderer.cs" />
-    <Compile Include="Web References\org.umbraco.our\Reference.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Reference.map</DependentUpon>
-    </Compile>
     <Compile Include="WebApi\AngularJsonMediaTypeFormatter.cs" />
     <Compile Include="WebApi\AngularJsonOnlyConfigurationAttribute.cs" />
     <Compile Include="WebApi\Binders\BlueprintItemBinder.cs" />
@@ -1828,11 +1823,6 @@
       <Link>Mvc\web.config</Link>
     </None>
     <None Include="packages.config" />
-    <None Include="Web References\org.umbraco.our\Reference.map">
-      <Generator>MSDiscoCodeGenerator</Generator>
-      <LastGenOutput>Reference.cs</LastGenOutput>
-    </None>
-    <None Include="Web References\org.umbraco.our\repository.disco" />
     <EmbeddedResource Include="UI\JavaScript\Main.js" />
     <EmbeddedResource Include="UI\JavaScript\JsInitialize.js" />
     <EmbeddedResource Include="UI\JavaScript\ServerVariables.js" />
@@ -1883,7 +1873,6 @@
     <Content Include="umbraco.presentation\umbraco\members\ViewMembers.aspx" />
     <Content Include="umbraco.presentation\umbraco\plugins\tinymce3\tinymce3tinymceCompress.aspx" />
     <None Include="app.config" />
-    <None Include="Web References\org.umbraco.our\repository.wsdl" />
     <None Include="Web References\org.umbraco.update\UpgradeResult.datasource">
       <DependentUpon>Reference.map</DependentUpon>
     </None>
@@ -1977,17 +1966,6 @@
     <WebReferences Include="Web References\" />
   </ItemGroup>
   <ItemGroup>
-    <WebReferenceUrl Include="https://our.umbraco.com/umbraco/webservices/api/repository.asmx">
-      <UrlBehavior>Dynamic</UrlBehavior>
-      <RelPath>Web References\org.umbraco.our\</RelPath>
-      <UpdateFromURL>https://our.umbraco.com/umbraco/webservices/api/repository.asmx</UpdateFromURL>
-      <ServiceLocationURL>
-      </ServiceLocationURL>
-      <CachedDynamicPropName>
-      </CachedDynamicPropName>
-      <CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
-      <CachedSettingsPropName>umbraco_org_umbraco_our_Repository</CachedSettingsPropName>
-    </WebReferenceUrl>
     <WebReferenceUrl Include="http://update.umbraco.org/checkforupgrade.asmx">
       <UrlBehavior>Dynamic</UrlBehavior>
       <RelPath>Web References\org.umbraco.update\</RelPath>
diff --git a/src/Umbraco.Web/Web References/org.umbraco.our/Reference.cs b/src/Umbraco.Web/Web References/org.umbraco.our/Reference.cs
deleted file mode 100644
index d0c8990660..0000000000
--- a/src/Umbraco.Web/Web References/org.umbraco.our/Reference.cs	
+++ /dev/null
@@ -1,1046 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-// 
-// This source code was auto-generated by Microsoft.VSDesigner, Version 4.0.30319.42000.
-// 
-#pragma warning disable 1591
-
-namespace Umbraco.Web.org.umbraco.our {
-    using System;
-    using System.Web.Services;
-    using System.Diagnostics;
-    using System.Web.Services.Protocols;
-    using System.Xml.Serialization;
-    using System.ComponentModel;
-    
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Web.Services.WebServiceBindingAttribute(Name="RepositorySoap", Namespace="http://packages.umbraco.org/webservices/")]
-    public partial class Repository : System.Web.Services.Protocols.SoapHttpClientProtocol {
-        
-        private System.Threading.SendOrPostCallback CategoriesOperationCompleted;
-        
-        private System.Threading.SendOrPostCallback ModulesOperationCompleted;
-        
-        private System.Threading.SendOrPostCallback ModulesCategorizedOperationCompleted;
-        
-        private System.Threading.SendOrPostCallback NitrosOperationCompleted;
-        
-        private System.Threading.SendOrPostCallback NitrosCategorizedOperationCompleted;
-        
-        private System.Threading.SendOrPostCallback authenticateOperationCompleted;
-        
-        private System.Threading.SendOrPostCallback fetchPackageOperationCompleted;
-        
-        private System.Threading.SendOrPostCallback fetchPackageByVersionOperationCompleted;
-        
-        private System.Threading.SendOrPostCallback fetchProtectedPackageOperationCompleted;
-        
-        private System.Threading.SendOrPostCallback SubmitPackageOperationCompleted;
-        
-        private System.Threading.SendOrPostCallback PackageByGuidOperationCompleted;
-        
-        private bool useDefaultCredentialsSetExplicitly;
-        
-        /// <remarks/>
-        public Repository() {
-            this.Url = global::Umbraco.Web.Properties.Settings.Default.umbraco_org_umbraco_our_Repository;
-            if ((this.IsLocalFileSystemWebService(this.Url) == true)) {
-                this.UseDefaultCredentials = true;
-                this.useDefaultCredentialsSetExplicitly = false;
-            }
-            else {
-                this.useDefaultCredentialsSetExplicitly = true;
-            }
-        }
-        
-        public new string Url {
-            get {
-                return base.Url;
-            }
-            set {
-                if ((((this.IsLocalFileSystemWebService(base.Url) == true) 
-                            && (this.useDefaultCredentialsSetExplicitly == false)) 
-                            && (this.IsLocalFileSystemWebService(value) == false))) {
-                    base.UseDefaultCredentials = false;
-                }
-                base.Url = value;
-            }
-        }
-        
-        public new bool UseDefaultCredentials {
-            get {
-                return base.UseDefaultCredentials;
-            }
-            set {
-                base.UseDefaultCredentials = value;
-                this.useDefaultCredentialsSetExplicitly = true;
-            }
-        }
-        
-        /// <remarks/>
-        public event CategoriesCompletedEventHandler CategoriesCompleted;
-        
-        /// <remarks/>
-        public event ModulesCompletedEventHandler ModulesCompleted;
-        
-        /// <remarks/>
-        public event ModulesCategorizedCompletedEventHandler ModulesCategorizedCompleted;
-        
-        /// <remarks/>
-        public event NitrosCompletedEventHandler NitrosCompleted;
-        
-        /// <remarks/>
-        public event NitrosCategorizedCompletedEventHandler NitrosCategorizedCompleted;
-        
-        /// <remarks/>
-        public event authenticateCompletedEventHandler authenticateCompleted;
-        
-        /// <remarks/>
-        public event fetchPackageCompletedEventHandler fetchPackageCompleted;
-        
-        /// <remarks/>
-        public event fetchPackageByVersionCompletedEventHandler fetchPackageByVersionCompleted;
-        
-        /// <remarks/>
-        public event fetchProtectedPackageCompletedEventHandler fetchProtectedPackageCompleted;
-        
-        /// <remarks/>
-        public event SubmitPackageCompletedEventHandler SubmitPackageCompleted;
-        
-        /// <remarks/>
-        public event PackageByGuidCompletedEventHandler PackageByGuidCompleted;
-        
-        /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://packages.umbraco.org/webservices/Categories", RequestNamespace="http://packages.umbraco.org/webservices/", ResponseNamespace="http://packages.umbraco.org/webservices/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public Category[] Categories(string repositoryGuid) {
-            object[] results = this.Invoke("Categories", new object[] {
-                        repositoryGuid});
-            return ((Category[])(results[0]));
-        }
-        
-        /// <remarks/>
-        public void CategoriesAsync(string repositoryGuid) {
-            this.CategoriesAsync(repositoryGuid, null);
-        }
-        
-        /// <remarks/>
-        public void CategoriesAsync(string repositoryGuid, object userState) {
-            if ((this.CategoriesOperationCompleted == null)) {
-                this.CategoriesOperationCompleted = new System.Threading.SendOrPostCallback(this.OnCategoriesOperationCompleted);
-            }
-            this.InvokeAsync("Categories", new object[] {
-                        repositoryGuid}, this.CategoriesOperationCompleted, userState);
-        }
-        
-        private void OnCategoriesOperationCompleted(object arg) {
-            if ((this.CategoriesCompleted != null)) {
-                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
-                this.CategoriesCompleted(this, new CategoriesCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
-            }
-        }
-        
-        /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://packages.umbraco.org/webservices/Modules", RequestNamespace="http://packages.umbraco.org/webservices/", ResponseNamespace="http://packages.umbraco.org/webservices/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public Package[] Modules() {
-            object[] results = this.Invoke("Modules", new object[0]);
-            return ((Package[])(results[0]));
-        }
-        
-        /// <remarks/>
-        public void ModulesAsync() {
-            this.ModulesAsync(null);
-        }
-        
-        /// <remarks/>
-        public void ModulesAsync(object userState) {
-            if ((this.ModulesOperationCompleted == null)) {
-                this.ModulesOperationCompleted = new System.Threading.SendOrPostCallback(this.OnModulesOperationCompleted);
-            }
-            this.InvokeAsync("Modules", new object[0], this.ModulesOperationCompleted, userState);
-        }
-        
-        private void OnModulesOperationCompleted(object arg) {
-            if ((this.ModulesCompleted != null)) {
-                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
-                this.ModulesCompleted(this, new ModulesCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
-            }
-        }
-        
-        /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://packages.umbraco.org/webservices/ModulesCategorized", RequestNamespace="http://packages.umbraco.org/webservices/", ResponseNamespace="http://packages.umbraco.org/webservices/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public Category[] ModulesCategorized() {
-            object[] results = this.Invoke("ModulesCategorized", new object[0]);
-            return ((Category[])(results[0]));
-        }
-        
-        /// <remarks/>
-        public void ModulesCategorizedAsync() {
-            this.ModulesCategorizedAsync(null);
-        }
-        
-        /// <remarks/>
-        public void ModulesCategorizedAsync(object userState) {
-            if ((this.ModulesCategorizedOperationCompleted == null)) {
-                this.ModulesCategorizedOperationCompleted = new System.Threading.SendOrPostCallback(this.OnModulesCategorizedOperationCompleted);
-            }
-            this.InvokeAsync("ModulesCategorized", new object[0], this.ModulesCategorizedOperationCompleted, userState);
-        }
-        
-        private void OnModulesCategorizedOperationCompleted(object arg) {
-            if ((this.ModulesCategorizedCompleted != null)) {
-                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
-                this.ModulesCategorizedCompleted(this, new ModulesCategorizedCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
-            }
-        }
-        
-        /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://packages.umbraco.org/webservices/Nitros", RequestNamespace="http://packages.umbraco.org/webservices/", ResponseNamespace="http://packages.umbraco.org/webservices/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public Package[] Nitros() {
-            object[] results = this.Invoke("Nitros", new object[0]);
-            return ((Package[])(results[0]));
-        }
-        
-        /// <remarks/>
-        public void NitrosAsync() {
-            this.NitrosAsync(null);
-        }
-        
-        /// <remarks/>
-        public void NitrosAsync(object userState) {
-            if ((this.NitrosOperationCompleted == null)) {
-                this.NitrosOperationCompleted = new System.Threading.SendOrPostCallback(this.OnNitrosOperationCompleted);
-            }
-            this.InvokeAsync("Nitros", new object[0], this.NitrosOperationCompleted, userState);
-        }
-        
-        private void OnNitrosOperationCompleted(object arg) {
-            if ((this.NitrosCompleted != null)) {
-                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
-                this.NitrosCompleted(this, new NitrosCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
-            }
-        }
-        
-        /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://packages.umbraco.org/webservices/NitrosCategorized", RequestNamespace="http://packages.umbraco.org/webservices/", ResponseNamespace="http://packages.umbraco.org/webservices/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public Category[] NitrosCategorized() {
-            object[] results = this.Invoke("NitrosCategorized", new object[0]);
-            return ((Category[])(results[0]));
-        }
-        
-        /// <remarks/>
-        public void NitrosCategorizedAsync() {
-            this.NitrosCategorizedAsync(null);
-        }
-        
-        /// <remarks/>
-        public void NitrosCategorizedAsync(object userState) {
-            if ((this.NitrosCategorizedOperationCompleted == null)) {
-                this.NitrosCategorizedOperationCompleted = new System.Threading.SendOrPostCallback(this.OnNitrosCategorizedOperationCompleted);
-            }
-            this.InvokeAsync("NitrosCategorized", new object[0], this.NitrosCategorizedOperationCompleted, userState);
-        }
-        
-        private void OnNitrosCategorizedOperationCompleted(object arg) {
-            if ((this.NitrosCategorizedCompleted != null)) {
-                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
-                this.NitrosCategorizedCompleted(this, new NitrosCategorizedCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
-            }
-        }
-        
-        /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://packages.umbraco.org/webservices/authenticate", RequestNamespace="http://packages.umbraco.org/webservices/", ResponseNamespace="http://packages.umbraco.org/webservices/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public string authenticate(string email, string md5Password) {
-            object[] results = this.Invoke("authenticate", new object[] {
-                        email,
-                        md5Password});
-            return ((string)(results[0]));
-        }
-        
-        /// <remarks/>
-        public void authenticateAsync(string email, string md5Password) {
-            this.authenticateAsync(email, md5Password, null);
-        }
-        
-        /// <remarks/>
-        public void authenticateAsync(string email, string md5Password, object userState) {
-            if ((this.authenticateOperationCompleted == null)) {
-                this.authenticateOperationCompleted = new System.Threading.SendOrPostCallback(this.OnauthenticateOperationCompleted);
-            }
-            this.InvokeAsync("authenticate", new object[] {
-                        email,
-                        md5Password}, this.authenticateOperationCompleted, userState);
-        }
-        
-        private void OnauthenticateOperationCompleted(object arg) {
-            if ((this.authenticateCompleted != null)) {
-                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
-                this.authenticateCompleted(this, new authenticateCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
-            }
-        }
-        
-        /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://packages.umbraco.org/webservices/fetchPackage", RequestNamespace="http://packages.umbraco.org/webservices/", ResponseNamespace="http://packages.umbraco.org/webservices/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        [return: System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")]
-        public byte[] fetchPackage(string packageGuid) {
-            object[] results = this.Invoke("fetchPackage", new object[] {
-                        packageGuid});
-            return ((byte[])(results[0]));
-        }
-        
-        /// <remarks/>
-        public void fetchPackageAsync(string packageGuid) {
-            this.fetchPackageAsync(packageGuid, null);
-        }
-        
-        /// <remarks/>
-        public void fetchPackageAsync(string packageGuid, object userState) {
-            if ((this.fetchPackageOperationCompleted == null)) {
-                this.fetchPackageOperationCompleted = new System.Threading.SendOrPostCallback(this.OnfetchPackageOperationCompleted);
-            }
-            this.InvokeAsync("fetchPackage", new object[] {
-                        packageGuid}, this.fetchPackageOperationCompleted, userState);
-        }
-        
-        private void OnfetchPackageOperationCompleted(object arg) {
-            if ((this.fetchPackageCompleted != null)) {
-                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
-                this.fetchPackageCompleted(this, new fetchPackageCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
-            }
-        }
-        
-        /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://packages.umbraco.org/webservices/fetchPackageByVersion", RequestNamespace="http://packages.umbraco.org/webservices/", ResponseNamespace="http://packages.umbraco.org/webservices/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        [return: System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")]
-        public byte[] fetchPackageByVersion(string packageGuid, string repoVersion) {
-            object[] results = this.Invoke("fetchPackageByVersion", new object[] {
-                        packageGuid,
-                        repoVersion});
-            return ((byte[])(results[0]));
-        }
-        
-        /// <remarks/>
-        public void fetchPackageByVersionAsync(string packageGuid, string repoVersion) {
-            this.fetchPackageByVersionAsync(packageGuid, repoVersion, null);
-        }
-        
-        /// <remarks/>
-        public void fetchPackageByVersionAsync(string packageGuid, string repoVersion, object userState) {
-            if ((this.fetchPackageByVersionOperationCompleted == null)) {
-                this.fetchPackageByVersionOperationCompleted = new System.Threading.SendOrPostCallback(this.OnfetchPackageByVersionOperationCompleted);
-            }
-            this.InvokeAsync("fetchPackageByVersion", new object[] {
-                        packageGuid,
-                        repoVersion}, this.fetchPackageByVersionOperationCompleted, userState);
-        }
-        
-        private void OnfetchPackageByVersionOperationCompleted(object arg) {
-            if ((this.fetchPackageByVersionCompleted != null)) {
-                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
-                this.fetchPackageByVersionCompleted(this, new fetchPackageByVersionCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
-            }
-        }
-        
-        /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://packages.umbraco.org/webservices/fetchProtectedPackage", RequestNamespace="http://packages.umbraco.org/webservices/", ResponseNamespace="http://packages.umbraco.org/webservices/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        [return: System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")]
-        public byte[] fetchProtectedPackage(string packageGuid, string memberKey) {
-            object[] results = this.Invoke("fetchProtectedPackage", new object[] {
-                        packageGuid,
-                        memberKey});
-            return ((byte[])(results[0]));
-        }
-        
-        /// <remarks/>
-        public void fetchProtectedPackageAsync(string packageGuid, string memberKey) {
-            this.fetchProtectedPackageAsync(packageGuid, memberKey, null);
-        }
-        
-        /// <remarks/>
-        public void fetchProtectedPackageAsync(string packageGuid, string memberKey, object userState) {
-            if ((this.fetchProtectedPackageOperationCompleted == null)) {
-                this.fetchProtectedPackageOperationCompleted = new System.Threading.SendOrPostCallback(this.OnfetchProtectedPackageOperationCompleted);
-            }
-            this.InvokeAsync("fetchProtectedPackage", new object[] {
-                        packageGuid,
-                        memberKey}, this.fetchProtectedPackageOperationCompleted, userState);
-        }
-        
-        private void OnfetchProtectedPackageOperationCompleted(object arg) {
-            if ((this.fetchProtectedPackageCompleted != null)) {
-                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
-                this.fetchProtectedPackageCompleted(this, new fetchProtectedPackageCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
-            }
-        }
-        
-        /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://packages.umbraco.org/webservices/SubmitPackage", RequestNamespace="http://packages.umbraco.org/webservices/", ResponseNamespace="http://packages.umbraco.org/webservices/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public SubmitStatus SubmitPackage(string repositoryGuid, string authorGuid, string packageGuid, [System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")] byte[] packageFile, [System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")] byte[] packageDoc, [System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")] byte[] packageThumbnail, string name, string author, string authorUrl, string description) {
-            object[] results = this.Invoke("SubmitPackage", new object[] {
-                        repositoryGuid,
-                        authorGuid,
-                        packageGuid,
-                        packageFile,
-                        packageDoc,
-                        packageThumbnail,
-                        name,
-                        author,
-                        authorUrl,
-                        description});
-            return ((SubmitStatus)(results[0]));
-        }
-        
-        /// <remarks/>
-        public void SubmitPackageAsync(string repositoryGuid, string authorGuid, string packageGuid, byte[] packageFile, byte[] packageDoc, byte[] packageThumbnail, string name, string author, string authorUrl, string description) {
-            this.SubmitPackageAsync(repositoryGuid, authorGuid, packageGuid, packageFile, packageDoc, packageThumbnail, name, author, authorUrl, description, null);
-        }
-        
-        /// <remarks/>
-        public void SubmitPackageAsync(string repositoryGuid, string authorGuid, string packageGuid, byte[] packageFile, byte[] packageDoc, byte[] packageThumbnail, string name, string author, string authorUrl, string description, object userState) {
-            if ((this.SubmitPackageOperationCompleted == null)) {
-                this.SubmitPackageOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSubmitPackageOperationCompleted);
-            }
-            this.InvokeAsync("SubmitPackage", new object[] {
-                        repositoryGuid,
-                        authorGuid,
-                        packageGuid,
-                        packageFile,
-                        packageDoc,
-                        packageThumbnail,
-                        name,
-                        author,
-                        authorUrl,
-                        description}, this.SubmitPackageOperationCompleted, userState);
-        }
-        
-        private void OnSubmitPackageOperationCompleted(object arg) {
-            if ((this.SubmitPackageCompleted != null)) {
-                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
-                this.SubmitPackageCompleted(this, new SubmitPackageCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
-            }
-        }
-        
-        /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://packages.umbraco.org/webservices/PackageByGuid", RequestNamespace="http://packages.umbraco.org/webservices/", ResponseNamespace="http://packages.umbraco.org/webservices/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public Package PackageByGuid(string packageGuid) {
-            object[] results = this.Invoke("PackageByGuid", new object[] {
-                        packageGuid});
-            return ((Package)(results[0]));
-        }
-        
-        /// <remarks/>
-        public void PackageByGuidAsync(string packageGuid) {
-            this.PackageByGuidAsync(packageGuid, null);
-        }
-        
-        /// <remarks/>
-        public void PackageByGuidAsync(string packageGuid, object userState) {
-            if ((this.PackageByGuidOperationCompleted == null)) {
-                this.PackageByGuidOperationCompleted = new System.Threading.SendOrPostCallback(this.OnPackageByGuidOperationCompleted);
-            }
-            this.InvokeAsync("PackageByGuid", new object[] {
-                        packageGuid}, this.PackageByGuidOperationCompleted, userState);
-        }
-        
-        private void OnPackageByGuidOperationCompleted(object arg) {
-            if ((this.PackageByGuidCompleted != null)) {
-                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
-                this.PackageByGuidCompleted(this, new PackageByGuidCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
-            }
-        }
-        
-        /// <remarks/>
-        public new void CancelAsync(object userState) {
-            base.CancelAsync(userState);
-        }
-        
-        private bool IsLocalFileSystemWebService(string url) {
-            if (((url == null) 
-                        || (url == string.Empty))) {
-                return false;
-            }
-            System.Uri wsUri = new System.Uri(url);
-            if (((wsUri.Port >= 1024) 
-                        && (string.Compare(wsUri.Host, "localHost", System.StringComparison.OrdinalIgnoreCase) == 0))) {
-                return true;
-            }
-            return false;
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.3056.0")]
-    [System.SerializableAttribute()]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://packages.umbraco.org/webservices/")]
-    public partial class Category {
-        
-        private string textField;
-        
-        private string descriptionField;
-        
-        private string urlField;
-        
-        private int idField;
-        
-        private Package[] packagesField;
-        
-        /// <remarks/>
-        public string Text {
-            get {
-                return this.textField;
-            }
-            set {
-                this.textField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public string Description {
-            get {
-                return this.descriptionField;
-            }
-            set {
-                this.descriptionField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public string Url {
-            get {
-                return this.urlField;
-            }
-            set {
-                this.urlField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public int Id {
-            get {
-                return this.idField;
-            }
-            set {
-                this.idField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public Package[] Packages {
-            get {
-                return this.packagesField;
-            }
-            set {
-                this.packagesField = value;
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.3056.0")]
-    [System.SerializableAttribute()]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://packages.umbraco.org/webservices/")]
-    public partial class Package {
-        
-        private System.Guid repoGuidField;
-        
-        private string textField;
-        
-        private string descriptionField;
-        
-        private string iconField;
-        
-        private string thumbnailField;
-        
-        private string documentationField;
-        
-        private string demoField;
-        
-        private bool acceptedField;
-        
-        private bool isModuleField;
-        
-        private bool editorsPickField;
-        
-        private bool protectedField;
-        
-        private bool hasUpgradeField;
-        
-        private string upgradeVersionField;
-        
-        private string upgradeReadMeField;
-        
-        private string urlField;
-        
-        /// <remarks/>
-        public System.Guid RepoGuid {
-            get {
-                return this.repoGuidField;
-            }
-            set {
-                this.repoGuidField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public string Text {
-            get {
-                return this.textField;
-            }
-            set {
-                this.textField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public string Description {
-            get {
-                return this.descriptionField;
-            }
-            set {
-                this.descriptionField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public string Icon {
-            get {
-                return this.iconField;
-            }
-            set {
-                this.iconField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public string Thumbnail {
-            get {
-                return this.thumbnailField;
-            }
-            set {
-                this.thumbnailField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public string Documentation {
-            get {
-                return this.documentationField;
-            }
-            set {
-                this.documentationField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public string Demo {
-            get {
-                return this.demoField;
-            }
-            set {
-                this.demoField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public bool Accepted {
-            get {
-                return this.acceptedField;
-            }
-            set {
-                this.acceptedField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public bool IsModule {
-            get {
-                return this.isModuleField;
-            }
-            set {
-                this.isModuleField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public bool EditorsPick {
-            get {
-                return this.editorsPickField;
-            }
-            set {
-                this.editorsPickField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public bool Protected {
-            get {
-                return this.protectedField;
-            }
-            set {
-                this.protectedField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public bool HasUpgrade {
-            get {
-                return this.hasUpgradeField;
-            }
-            set {
-                this.hasUpgradeField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public string UpgradeVersion {
-            get {
-                return this.upgradeVersionField;
-            }
-            set {
-                this.upgradeVersionField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public string UpgradeReadMe {
-            get {
-                return this.upgradeReadMeField;
-            }
-            set {
-                this.upgradeReadMeField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public string Url {
-            get {
-                return this.urlField;
-            }
-            set {
-                this.urlField = value;
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.3056.0")]
-    [System.SerializableAttribute()]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://packages.umbraco.org/webservices/")]
-    public enum SubmitStatus {
-        
-        /// <remarks/>
-        Complete,
-        
-        /// <remarks/>
-        Exists,
-        
-        /// <remarks/>
-        NoAccess,
-        
-        /// <remarks/>
-        Error,
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
-    public delegate void CategoriesCompletedEventHandler(object sender, CategoriesCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class CategoriesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal CategoriesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public Category[] Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((Category[])(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
-    public delegate void ModulesCompletedEventHandler(object sender, ModulesCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class ModulesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal ModulesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public Package[] Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((Package[])(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
-    public delegate void ModulesCategorizedCompletedEventHandler(object sender, ModulesCategorizedCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class ModulesCategorizedCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal ModulesCategorizedCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public Category[] Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((Category[])(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
-    public delegate void NitrosCompletedEventHandler(object sender, NitrosCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class NitrosCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal NitrosCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public Package[] Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((Package[])(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
-    public delegate void NitrosCategorizedCompletedEventHandler(object sender, NitrosCategorizedCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class NitrosCategorizedCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal NitrosCategorizedCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public Category[] Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((Category[])(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
-    public delegate void authenticateCompletedEventHandler(object sender, authenticateCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class authenticateCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal authenticateCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public string Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((string)(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
-    public delegate void fetchPackageCompletedEventHandler(object sender, fetchPackageCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class fetchPackageCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal fetchPackageCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public byte[] Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((byte[])(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
-    public delegate void fetchPackageByVersionCompletedEventHandler(object sender, fetchPackageByVersionCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class fetchPackageByVersionCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal fetchPackageByVersionCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public byte[] Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((byte[])(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
-    public delegate void fetchProtectedPackageCompletedEventHandler(object sender, fetchProtectedPackageCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class fetchProtectedPackageCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal fetchProtectedPackageCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public byte[] Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((byte[])(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
-    public delegate void SubmitPackageCompletedEventHandler(object sender, SubmitPackageCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class SubmitPackageCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal SubmitPackageCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public SubmitStatus Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((SubmitStatus)(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
-    public delegate void PackageByGuidCompletedEventHandler(object sender, PackageByGuidCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class PackageByGuidCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal PackageByGuidCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public Package Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((Package)(this.results[0]));
-            }
-        }
-    }
-}
-
-#pragma warning restore 1591
\ No newline at end of file
diff --git a/src/Umbraco.Web/Web References/org.umbraco.our/Reference.map b/src/Umbraco.Web/Web References/org.umbraco.our/Reference.map
deleted file mode 100644
index cd819c5591..0000000000
--- a/src/Umbraco.Web/Web References/org.umbraco.our/Reference.map	
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<DiscoveryClientResultsFile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Results>
-    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="https://our.umbraco.com/umbraco/webservices/api/repository.asmx?wsdl" filename="repository.wsdl" />
-    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="https://our.umbraco.com/umbraco/webservices/api/repository.asmx?disco" filename="repository.disco" />
-  </Results>
-</DiscoveryClientResultsFile>
\ No newline at end of file
diff --git a/src/Umbraco.Web/Web References/org.umbraco.our/repository.disco b/src/Umbraco.Web/Web References/org.umbraco.our/repository.disco
deleted file mode 100644
index fcc65dea0c..0000000000
--- a/src/Umbraco.Web/Web References/org.umbraco.our/repository.disco	
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<discovery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/disco/">
-  <contractRef ref="https://our.umbraco.com/umbraco/webservices/api/repository.asmx?wsdl" docRef="https://our.umbraco.com/umbraco/webservices/api/repository.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
-  <soap address="https://our.umbraco.com/umbraco/webservices/api/repository.asmx" xmlns:q1="http://packages.umbraco.org/webservices/" binding="q1:RepositorySoap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
-  <soap address="https://our.umbraco.com/umbraco/webservices/api/repository.asmx" xmlns:q2="http://packages.umbraco.org/webservices/" binding="q2:RepositorySoap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
-</discovery>
\ No newline at end of file
diff --git a/src/Umbraco.Web/Web References/org.umbraco.our/repository.wsdl b/src/Umbraco.Web/Web References/org.umbraco.our/repository.wsdl
deleted file mode 100644
index 17d24e9c54..0000000000
--- a/src/Umbraco.Web/Web References/org.umbraco.our/repository.wsdl	
+++ /dev/null
@@ -1,995 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:tns="http://packages.umbraco.org/webservices/" xmlns:s1="http://microsoft.com/wsdl/types/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:s2="http://packages.umbraco.org/webservices/AbstractTypes" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://packages.umbraco.org/webservices/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-    <s:schema elementFormDefault="qualified" targetNamespace="http://packages.umbraco.org/webservices/">
-      <s:import namespace="http://microsoft.com/wsdl/types/" />
-      <s:element name="Categories">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="repositoryGuid" type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="CategoriesResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="CategoriesResult" type="tns:ArrayOfCategory" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:complexType name="ArrayOfCategory">
-        <s:sequence>
-          <s:element minOccurs="0" maxOccurs="unbounded" name="Category" nillable="true" type="tns:Category" />
-        </s:sequence>
-      </s:complexType>
-      <s:complexType name="Category">
-        <s:sequence>
-          <s:element minOccurs="0" maxOccurs="1" name="Text" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="Description" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="Url" type="s:string" />
-          <s:element minOccurs="1" maxOccurs="1" name="Id" type="s:int" />
-          <s:element minOccurs="0" maxOccurs="1" name="Packages" type="tns:ArrayOfPackage" />
-        </s:sequence>
-      </s:complexType>
-      <s:complexType name="ArrayOfPackage">
-        <s:sequence>
-          <s:element minOccurs="0" maxOccurs="unbounded" name="Package" nillable="true" type="tns:Package" />
-        </s:sequence>
-      </s:complexType>
-      <s:complexType name="Package">
-        <s:sequence>
-          <s:element minOccurs="1" maxOccurs="1" name="RepoGuid" type="s1:guid" />
-          <s:element minOccurs="0" maxOccurs="1" name="Text" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="Description" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="Icon" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="Thumbnail" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="Documentation" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="Demo" type="s:string" />
-          <s:element minOccurs="1" maxOccurs="1" name="Accepted" type="s:boolean" />
-          <s:element minOccurs="1" maxOccurs="1" name="IsModule" type="s:boolean" />
-          <s:element minOccurs="1" maxOccurs="1" name="EditorsPick" type="s:boolean" />
-          <s:element minOccurs="1" maxOccurs="1" name="Protected" type="s:boolean" />
-          <s:element minOccurs="1" maxOccurs="1" name="HasUpgrade" type="s:boolean" />
-          <s:element minOccurs="0" maxOccurs="1" name="UpgradeVersion" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="UpgradeReadMe" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="Url" type="s:string" />
-        </s:sequence>
-      </s:complexType>
-      <s:element name="Modules">
-        <s:complexType />
-      </s:element>
-      <s:element name="ModulesResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="ModulesResult" type="tns:ArrayOfPackage" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="ModulesCategorized">
-        <s:complexType />
-      </s:element>
-      <s:element name="ModulesCategorizedResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="ModulesCategorizedResult" type="tns:ArrayOfCategory" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="Nitros">
-        <s:complexType />
-      </s:element>
-      <s:element name="NitrosResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="NitrosResult" type="tns:ArrayOfPackage" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="NitrosCategorized">
-        <s:complexType />
-      </s:element>
-      <s:element name="NitrosCategorizedResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="NitrosCategorizedResult" type="tns:ArrayOfCategory" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="authenticate">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="email" type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="md5Password" type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="authenticateResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="authenticateResult" type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="fetchPackage">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="packageGuid" type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="fetchPackageResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="fetchPackageResult" type="s:base64Binary" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="fetchPackageByVersion">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="packageGuid" type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="repoVersion" type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="fetchPackageByVersionResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="fetchPackageByVersionResult" type="s:base64Binary" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="fetchProtectedPackage">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="packageGuid" type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="memberKey" type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="fetchProtectedPackageResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="fetchProtectedPackageResult" type="s:base64Binary" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="SubmitPackage">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="repositoryGuid" type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="authorGuid" type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="packageGuid" type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="packageFile" type="s:base64Binary" />
-            <s:element minOccurs="0" maxOccurs="1" name="packageDoc" type="s:base64Binary" />
-            <s:element minOccurs="0" maxOccurs="1" name="packageThumbnail" type="s:base64Binary" />
-            <s:element minOccurs="0" maxOccurs="1" name="name" type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="author" type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="authorUrl" type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="description" type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="SubmitPackageResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="1" maxOccurs="1" name="SubmitPackageResult" type="tns:SubmitStatus" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:simpleType name="SubmitStatus">
-        <s:restriction base="s:string">
-          <s:enumeration value="Complete" />
-          <s:enumeration value="Exists" />
-          <s:enumeration value="NoAccess" />
-          <s:enumeration value="Error" />
-        </s:restriction>
-      </s:simpleType>
-      <s:element name="PackageByGuid">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="packageGuid" type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="PackageByGuidResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="PackageByGuidResult" type="tns:Package" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="ArrayOfCategory" nillable="true" type="tns:ArrayOfCategory" />
-      <s:element name="ArrayOfPackage" nillable="true" type="tns:ArrayOfPackage" />
-      <s:element name="string" nillable="true" type="s:string" />
-      <s:element name="base64Binary" nillable="true" type="s:base64Binary" />
-      <s:element name="SubmitStatus" type="tns:SubmitStatus" />
-      <s:element name="Package" nillable="true" type="tns:Package" />
-    </s:schema>
-    <s:schema elementFormDefault="qualified" targetNamespace="http://microsoft.com/wsdl/types/">
-      <s:simpleType name="guid">
-        <s:restriction base="s:string">
-          <s:pattern value="[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}" />
-        </s:restriction>
-      </s:simpleType>
-    </s:schema>
-    <s:schema targetNamespace="http://packages.umbraco.org/webservices/AbstractTypes">
-      <s:import namespace="http://schemas.xmlsoap.org/soap/encoding/" />
-      <s:complexType name="StringArray">
-        <s:complexContent mixed="false">
-          <s:restriction base="soapenc:Array">
-            <s:sequence>
-              <s:element minOccurs="0" maxOccurs="unbounded" name="String" type="s:string" />
-            </s:sequence>
-          </s:restriction>
-        </s:complexContent>
-      </s:complexType>
-    </s:schema>
-  </wsdl:types>
-  <wsdl:message name="CategoriesSoapIn">
-    <wsdl:part name="parameters" element="tns:Categories" />
-  </wsdl:message>
-  <wsdl:message name="CategoriesSoapOut">
-    <wsdl:part name="parameters" element="tns:CategoriesResponse" />
-  </wsdl:message>
-  <wsdl:message name="ModulesSoapIn">
-    <wsdl:part name="parameters" element="tns:Modules" />
-  </wsdl:message>
-  <wsdl:message name="ModulesSoapOut">
-    <wsdl:part name="parameters" element="tns:ModulesResponse" />
-  </wsdl:message>
-  <wsdl:message name="ModulesCategorizedSoapIn">
-    <wsdl:part name="parameters" element="tns:ModulesCategorized" />
-  </wsdl:message>
-  <wsdl:message name="ModulesCategorizedSoapOut">
-    <wsdl:part name="parameters" element="tns:ModulesCategorizedResponse" />
-  </wsdl:message>
-  <wsdl:message name="NitrosSoapIn">
-    <wsdl:part name="parameters" element="tns:Nitros" />
-  </wsdl:message>
-  <wsdl:message name="NitrosSoapOut">
-    <wsdl:part name="parameters" element="tns:NitrosResponse" />
-  </wsdl:message>
-  <wsdl:message name="NitrosCategorizedSoapIn">
-    <wsdl:part name="parameters" element="tns:NitrosCategorized" />
-  </wsdl:message>
-  <wsdl:message name="NitrosCategorizedSoapOut">
-    <wsdl:part name="parameters" element="tns:NitrosCategorizedResponse" />
-  </wsdl:message>
-  <wsdl:message name="authenticateSoapIn">
-    <wsdl:part name="parameters" element="tns:authenticate" />
-  </wsdl:message>
-  <wsdl:message name="authenticateSoapOut">
-    <wsdl:part name="parameters" element="tns:authenticateResponse" />
-  </wsdl:message>
-  <wsdl:message name="fetchPackageSoapIn">
-    <wsdl:part name="parameters" element="tns:fetchPackage" />
-  </wsdl:message>
-  <wsdl:message name="fetchPackageSoapOut">
-    <wsdl:part name="parameters" element="tns:fetchPackageResponse" />
-  </wsdl:message>
-  <wsdl:message name="fetchPackageByVersionSoapIn">
-    <wsdl:part name="parameters" element="tns:fetchPackageByVersion" />
-  </wsdl:message>
-  <wsdl:message name="fetchPackageByVersionSoapOut">
-    <wsdl:part name="parameters" element="tns:fetchPackageByVersionResponse" />
-  </wsdl:message>
-  <wsdl:message name="fetchProtectedPackageSoapIn">
-    <wsdl:part name="parameters" element="tns:fetchProtectedPackage" />
-  </wsdl:message>
-  <wsdl:message name="fetchProtectedPackageSoapOut">
-    <wsdl:part name="parameters" element="tns:fetchProtectedPackageResponse" />
-  </wsdl:message>
-  <wsdl:message name="SubmitPackageSoapIn">
-    <wsdl:part name="parameters" element="tns:SubmitPackage" />
-  </wsdl:message>
-  <wsdl:message name="SubmitPackageSoapOut">
-    <wsdl:part name="parameters" element="tns:SubmitPackageResponse" />
-  </wsdl:message>
-  <wsdl:message name="PackageByGuidSoapIn">
-    <wsdl:part name="parameters" element="tns:PackageByGuid" />
-  </wsdl:message>
-  <wsdl:message name="PackageByGuidSoapOut">
-    <wsdl:part name="parameters" element="tns:PackageByGuidResponse" />
-  </wsdl:message>
-  <wsdl:message name="CategoriesHttpGetIn">
-    <wsdl:part name="repositoryGuid" type="s:string" />
-  </wsdl:message>
-  <wsdl:message name="CategoriesHttpGetOut">
-    <wsdl:part name="Body" element="tns:ArrayOfCategory" />
-  </wsdl:message>
-  <wsdl:message name="ModulesHttpGetIn" />
-  <wsdl:message name="ModulesHttpGetOut">
-    <wsdl:part name="Body" element="tns:ArrayOfPackage" />
-  </wsdl:message>
-  <wsdl:message name="ModulesCategorizedHttpGetIn" />
-  <wsdl:message name="ModulesCategorizedHttpGetOut">
-    <wsdl:part name="Body" element="tns:ArrayOfCategory" />
-  </wsdl:message>
-  <wsdl:message name="NitrosHttpGetIn" />
-  <wsdl:message name="NitrosHttpGetOut">
-    <wsdl:part name="Body" element="tns:ArrayOfPackage" />
-  </wsdl:message>
-  <wsdl:message name="NitrosCategorizedHttpGetIn" />
-  <wsdl:message name="NitrosCategorizedHttpGetOut">
-    <wsdl:part name="Body" element="tns:ArrayOfCategory" />
-  </wsdl:message>
-  <wsdl:message name="authenticateHttpGetIn">
-    <wsdl:part name="email" type="s:string" />
-    <wsdl:part name="md5Password" type="s:string" />
-  </wsdl:message>
-  <wsdl:message name="authenticateHttpGetOut">
-    <wsdl:part name="Body" element="tns:string" />
-  </wsdl:message>
-  <wsdl:message name="fetchPackageHttpGetIn">
-    <wsdl:part name="packageGuid" type="s:string" />
-  </wsdl:message>
-  <wsdl:message name="fetchPackageHttpGetOut">
-    <wsdl:part name="Body" element="tns:base64Binary" />
-  </wsdl:message>
-  <wsdl:message name="fetchPackageByVersionHttpGetIn">
-    <wsdl:part name="packageGuid" type="s:string" />
-    <wsdl:part name="repoVersion" type="s:string" />
-  </wsdl:message>
-  <wsdl:message name="fetchPackageByVersionHttpGetOut">
-    <wsdl:part name="Body" element="tns:base64Binary" />
-  </wsdl:message>
-  <wsdl:message name="fetchProtectedPackageHttpGetIn">
-    <wsdl:part name="packageGuid" type="s:string" />
-    <wsdl:part name="memberKey" type="s:string" />
-  </wsdl:message>
-  <wsdl:message name="fetchProtectedPackageHttpGetOut">
-    <wsdl:part name="Body" element="tns:base64Binary" />
-  </wsdl:message>
-  <wsdl:message name="SubmitPackageHttpGetIn">
-    <wsdl:part name="repositoryGuid" type="s:string" />
-    <wsdl:part name="authorGuid" type="s:string" />
-    <wsdl:part name="packageGuid" type="s:string" />
-    <wsdl:part name="packageFile" type="s2:StringArray" />
-    <wsdl:part name="packageDoc" type="s2:StringArray" />
-    <wsdl:part name="packageThumbnail" type="s2:StringArray" />
-    <wsdl:part name="name" type="s:string" />
-    <wsdl:part name="author" type="s:string" />
-    <wsdl:part name="authorUrl" type="s:string" />
-    <wsdl:part name="description" type="s:string" />
-  </wsdl:message>
-  <wsdl:message name="SubmitPackageHttpGetOut">
-    <wsdl:part name="Body" element="tns:SubmitStatus" />
-  </wsdl:message>
-  <wsdl:message name="PackageByGuidHttpGetIn">
-    <wsdl:part name="packageGuid" type="s:string" />
-  </wsdl:message>
-  <wsdl:message name="PackageByGuidHttpGetOut">
-    <wsdl:part name="Body" element="tns:Package" />
-  </wsdl:message>
-  <wsdl:message name="CategoriesHttpPostIn">
-    <wsdl:part name="repositoryGuid" type="s:string" />
-  </wsdl:message>
-  <wsdl:message name="CategoriesHttpPostOut">
-    <wsdl:part name="Body" element="tns:ArrayOfCategory" />
-  </wsdl:message>
-  <wsdl:message name="ModulesHttpPostIn" />
-  <wsdl:message name="ModulesHttpPostOut">
-    <wsdl:part name="Body" element="tns:ArrayOfPackage" />
-  </wsdl:message>
-  <wsdl:message name="ModulesCategorizedHttpPostIn" />
-  <wsdl:message name="ModulesCategorizedHttpPostOut">
-    <wsdl:part name="Body" element="tns:ArrayOfCategory" />
-  </wsdl:message>
-  <wsdl:message name="NitrosHttpPostIn" />
-  <wsdl:message name="NitrosHttpPostOut">
-    <wsdl:part name="Body" element="tns:ArrayOfPackage" />
-  </wsdl:message>
-  <wsdl:message name="NitrosCategorizedHttpPostIn" />
-  <wsdl:message name="NitrosCategorizedHttpPostOut">
-    <wsdl:part name="Body" element="tns:ArrayOfCategory" />
-  </wsdl:message>
-  <wsdl:message name="authenticateHttpPostIn">
-    <wsdl:part name="email" type="s:string" />
-    <wsdl:part name="md5Password" type="s:string" />
-  </wsdl:message>
-  <wsdl:message name="authenticateHttpPostOut">
-    <wsdl:part name="Body" element="tns:string" />
-  </wsdl:message>
-  <wsdl:message name="fetchPackageHttpPostIn">
-    <wsdl:part name="packageGuid" type="s:string" />
-  </wsdl:message>
-  <wsdl:message name="fetchPackageHttpPostOut">
-    <wsdl:part name="Body" element="tns:base64Binary" />
-  </wsdl:message>
-  <wsdl:message name="fetchPackageByVersionHttpPostIn">
-    <wsdl:part name="packageGuid" type="s:string" />
-    <wsdl:part name="repoVersion" type="s:string" />
-  </wsdl:message>
-  <wsdl:message name="fetchPackageByVersionHttpPostOut">
-    <wsdl:part name="Body" element="tns:base64Binary" />
-  </wsdl:message>
-  <wsdl:message name="fetchProtectedPackageHttpPostIn">
-    <wsdl:part name="packageGuid" type="s:string" />
-    <wsdl:part name="memberKey" type="s:string" />
-  </wsdl:message>
-  <wsdl:message name="fetchProtectedPackageHttpPostOut">
-    <wsdl:part name="Body" element="tns:base64Binary" />
-  </wsdl:message>
-  <wsdl:message name="SubmitPackageHttpPostIn">
-    <wsdl:part name="repositoryGuid" type="s:string" />
-    <wsdl:part name="authorGuid" type="s:string" />
-    <wsdl:part name="packageGuid" type="s:string" />
-    <wsdl:part name="packageFile" type="s2:StringArray" />
-    <wsdl:part name="packageDoc" type="s2:StringArray" />
-    <wsdl:part name="packageThumbnail" type="s2:StringArray" />
-    <wsdl:part name="name" type="s:string" />
-    <wsdl:part name="author" type="s:string" />
-    <wsdl:part name="authorUrl" type="s:string" />
-    <wsdl:part name="description" type="s:string" />
-  </wsdl:message>
-  <wsdl:message name="SubmitPackageHttpPostOut">
-    <wsdl:part name="Body" element="tns:SubmitStatus" />
-  </wsdl:message>
-  <wsdl:message name="PackageByGuidHttpPostIn">
-    <wsdl:part name="packageGuid" type="s:string" />
-  </wsdl:message>
-  <wsdl:message name="PackageByGuidHttpPostOut">
-    <wsdl:part name="Body" element="tns:Package" />
-  </wsdl:message>
-  <wsdl:portType name="RepositorySoap">
-    <wsdl:operation name="Categories">
-      <wsdl:input message="tns:CategoriesSoapIn" />
-      <wsdl:output message="tns:CategoriesSoapOut" />
-    </wsdl:operation>
-    <wsdl:operation name="Modules">
-      <wsdl:input message="tns:ModulesSoapIn" />
-      <wsdl:output message="tns:ModulesSoapOut" />
-    </wsdl:operation>
-    <wsdl:operation name="ModulesCategorized">
-      <wsdl:input message="tns:ModulesCategorizedSoapIn" />
-      <wsdl:output message="tns:ModulesCategorizedSoapOut" />
-    </wsdl:operation>
-    <wsdl:operation name="Nitros">
-      <wsdl:input message="tns:NitrosSoapIn" />
-      <wsdl:output message="tns:NitrosSoapOut" />
-    </wsdl:operation>
-    <wsdl:operation name="NitrosCategorized">
-      <wsdl:input message="tns:NitrosCategorizedSoapIn" />
-      <wsdl:output message="tns:NitrosCategorizedSoapOut" />
-    </wsdl:operation>
-    <wsdl:operation name="authenticate">
-      <wsdl:input message="tns:authenticateSoapIn" />
-      <wsdl:output message="tns:authenticateSoapOut" />
-    </wsdl:operation>
-    <wsdl:operation name="fetchPackage">
-      <wsdl:input message="tns:fetchPackageSoapIn" />
-      <wsdl:output message="tns:fetchPackageSoapOut" />
-    </wsdl:operation>
-    <wsdl:operation name="fetchPackageByVersion">
-      <wsdl:input message="tns:fetchPackageByVersionSoapIn" />
-      <wsdl:output message="tns:fetchPackageByVersionSoapOut" />
-    </wsdl:operation>
-    <wsdl:operation name="fetchProtectedPackage">
-      <wsdl:input message="tns:fetchProtectedPackageSoapIn" />
-      <wsdl:output message="tns:fetchProtectedPackageSoapOut" />
-    </wsdl:operation>
-    <wsdl:operation name="SubmitPackage">
-      <wsdl:input message="tns:SubmitPackageSoapIn" />
-      <wsdl:output message="tns:SubmitPackageSoapOut" />
-    </wsdl:operation>
-    <wsdl:operation name="PackageByGuid">
-      <wsdl:input message="tns:PackageByGuidSoapIn" />
-      <wsdl:output message="tns:PackageByGuidSoapOut" />
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:portType name="RepositoryHttpGet">
-    <wsdl:operation name="Categories">
-      <wsdl:input message="tns:CategoriesHttpGetIn" />
-      <wsdl:output message="tns:CategoriesHttpGetOut" />
-    </wsdl:operation>
-    <wsdl:operation name="Modules">
-      <wsdl:input message="tns:ModulesHttpGetIn" />
-      <wsdl:output message="tns:ModulesHttpGetOut" />
-    </wsdl:operation>
-    <wsdl:operation name="ModulesCategorized">
-      <wsdl:input message="tns:ModulesCategorizedHttpGetIn" />
-      <wsdl:output message="tns:ModulesCategorizedHttpGetOut" />
-    </wsdl:operation>
-    <wsdl:operation name="Nitros">
-      <wsdl:input message="tns:NitrosHttpGetIn" />
-      <wsdl:output message="tns:NitrosHttpGetOut" />
-    </wsdl:operation>
-    <wsdl:operation name="NitrosCategorized">
-      <wsdl:input message="tns:NitrosCategorizedHttpGetIn" />
-      <wsdl:output message="tns:NitrosCategorizedHttpGetOut" />
-    </wsdl:operation>
-    <wsdl:operation name="authenticate">
-      <wsdl:input message="tns:authenticateHttpGetIn" />
-      <wsdl:output message="tns:authenticateHttpGetOut" />
-    </wsdl:operation>
-    <wsdl:operation name="fetchPackage">
-      <wsdl:input message="tns:fetchPackageHttpGetIn" />
-      <wsdl:output message="tns:fetchPackageHttpGetOut" />
-    </wsdl:operation>
-    <wsdl:operation name="fetchPackageByVersion">
-      <wsdl:input message="tns:fetchPackageByVersionHttpGetIn" />
-      <wsdl:output message="tns:fetchPackageByVersionHttpGetOut" />
-    </wsdl:operation>
-    <wsdl:operation name="fetchProtectedPackage">
-      <wsdl:input message="tns:fetchProtectedPackageHttpGetIn" />
-      <wsdl:output message="tns:fetchProtectedPackageHttpGetOut" />
-    </wsdl:operation>
-    <wsdl:operation name="SubmitPackage">
-      <wsdl:input message="tns:SubmitPackageHttpGetIn" />
-      <wsdl:output message="tns:SubmitPackageHttpGetOut" />
-    </wsdl:operation>
-    <wsdl:operation name="PackageByGuid">
-      <wsdl:input message="tns:PackageByGuidHttpGetIn" />
-      <wsdl:output message="tns:PackageByGuidHttpGetOut" />
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:portType name="RepositoryHttpPost">
-    <wsdl:operation name="Categories">
-      <wsdl:input message="tns:CategoriesHttpPostIn" />
-      <wsdl:output message="tns:CategoriesHttpPostOut" />
-    </wsdl:operation>
-    <wsdl:operation name="Modules">
-      <wsdl:input message="tns:ModulesHttpPostIn" />
-      <wsdl:output message="tns:ModulesHttpPostOut" />
-    </wsdl:operation>
-    <wsdl:operation name="ModulesCategorized">
-      <wsdl:input message="tns:ModulesCategorizedHttpPostIn" />
-      <wsdl:output message="tns:ModulesCategorizedHttpPostOut" />
-    </wsdl:operation>
-    <wsdl:operation name="Nitros">
-      <wsdl:input message="tns:NitrosHttpPostIn" />
-      <wsdl:output message="tns:NitrosHttpPostOut" />
-    </wsdl:operation>
-    <wsdl:operation name="NitrosCategorized">
-      <wsdl:input message="tns:NitrosCategorizedHttpPostIn" />
-      <wsdl:output message="tns:NitrosCategorizedHttpPostOut" />
-    </wsdl:operation>
-    <wsdl:operation name="authenticate">
-      <wsdl:input message="tns:authenticateHttpPostIn" />
-      <wsdl:output message="tns:authenticateHttpPostOut" />
-    </wsdl:operation>
-    <wsdl:operation name="fetchPackage">
-      <wsdl:input message="tns:fetchPackageHttpPostIn" />
-      <wsdl:output message="tns:fetchPackageHttpPostOut" />
-    </wsdl:operation>
-    <wsdl:operation name="fetchPackageByVersion">
-      <wsdl:input message="tns:fetchPackageByVersionHttpPostIn" />
-      <wsdl:output message="tns:fetchPackageByVersionHttpPostOut" />
-    </wsdl:operation>
-    <wsdl:operation name="fetchProtectedPackage">
-      <wsdl:input message="tns:fetchProtectedPackageHttpPostIn" />
-      <wsdl:output message="tns:fetchProtectedPackageHttpPostOut" />
-    </wsdl:operation>
-    <wsdl:operation name="SubmitPackage">
-      <wsdl:input message="tns:SubmitPackageHttpPostIn" />
-      <wsdl:output message="tns:SubmitPackageHttpPostOut" />
-    </wsdl:operation>
-    <wsdl:operation name="PackageByGuid">
-      <wsdl:input message="tns:PackageByGuidHttpPostIn" />
-      <wsdl:output message="tns:PackageByGuidHttpPostOut" />
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="RepositorySoap" type="tns:RepositorySoap">
-    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" />
-    <wsdl:operation name="Categories">
-      <soap:operation soapAction="http://packages.umbraco.org/webservices/Categories" style="document" />
-      <wsdl:input>
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="Modules">
-      <soap:operation soapAction="http://packages.umbraco.org/webservices/Modules" style="document" />
-      <wsdl:input>
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="ModulesCategorized">
-      <soap:operation soapAction="http://packages.umbraco.org/webservices/ModulesCategorized" style="document" />
-      <wsdl:input>
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="Nitros">
-      <soap:operation soapAction="http://packages.umbraco.org/webservices/Nitros" style="document" />
-      <wsdl:input>
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="NitrosCategorized">
-      <soap:operation soapAction="http://packages.umbraco.org/webservices/NitrosCategorized" style="document" />
-      <wsdl:input>
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="authenticate">
-      <soap:operation soapAction="http://packages.umbraco.org/webservices/authenticate" style="document" />
-      <wsdl:input>
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="fetchPackage">
-      <soap:operation soapAction="http://packages.umbraco.org/webservices/fetchPackage" style="document" />
-      <wsdl:input>
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="fetchPackageByVersion">
-      <soap:operation soapAction="http://packages.umbraco.org/webservices/fetchPackageByVersion" style="document" />
-      <wsdl:input>
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="fetchProtectedPackage">
-      <soap:operation soapAction="http://packages.umbraco.org/webservices/fetchProtectedPackage" style="document" />
-      <wsdl:input>
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="SubmitPackage">
-      <soap:operation soapAction="http://packages.umbraco.org/webservices/SubmitPackage" style="document" />
-      <wsdl:input>
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="PackageByGuid">
-      <soap:operation soapAction="http://packages.umbraco.org/webservices/PackageByGuid" style="document" />
-      <wsdl:input>
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:binding name="RepositorySoap12" type="tns:RepositorySoap">
-    <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" />
-    <wsdl:operation name="Categories">
-      <soap12:operation soapAction="http://packages.umbraco.org/webservices/Categories" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="Modules">
-      <soap12:operation soapAction="http://packages.umbraco.org/webservices/Modules" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="ModulesCategorized">
-      <soap12:operation soapAction="http://packages.umbraco.org/webservices/ModulesCategorized" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="Nitros">
-      <soap12:operation soapAction="http://packages.umbraco.org/webservices/Nitros" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="NitrosCategorized">
-      <soap12:operation soapAction="http://packages.umbraco.org/webservices/NitrosCategorized" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="authenticate">
-      <soap12:operation soapAction="http://packages.umbraco.org/webservices/authenticate" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="fetchPackage">
-      <soap12:operation soapAction="http://packages.umbraco.org/webservices/fetchPackage" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="fetchPackageByVersion">
-      <soap12:operation soapAction="http://packages.umbraco.org/webservices/fetchPackageByVersion" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="fetchProtectedPackage">
-      <soap12:operation soapAction="http://packages.umbraco.org/webservices/fetchProtectedPackage" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="SubmitPackage">
-      <soap12:operation soapAction="http://packages.umbraco.org/webservices/SubmitPackage" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="PackageByGuid">
-      <soap12:operation soapAction="http://packages.umbraco.org/webservices/PackageByGuid" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:binding name="RepositoryHttpGet" type="tns:RepositoryHttpGet">
-    <http:binding verb="GET" />
-    <wsdl:operation name="Categories">
-      <http:operation location="/Categories" />
-      <wsdl:input>
-        <http:urlEncoded />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="Modules">
-      <http:operation location="/Modules" />
-      <wsdl:input>
-        <http:urlEncoded />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="ModulesCategorized">
-      <http:operation location="/ModulesCategorized" />
-      <wsdl:input>
-        <http:urlEncoded />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="Nitros">
-      <http:operation location="/Nitros" />
-      <wsdl:input>
-        <http:urlEncoded />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="NitrosCategorized">
-      <http:operation location="/NitrosCategorized" />
-      <wsdl:input>
-        <http:urlEncoded />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="authenticate">
-      <http:operation location="/authenticate" />
-      <wsdl:input>
-        <http:urlEncoded />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="fetchPackage">
-      <http:operation location="/fetchPackage" />
-      <wsdl:input>
-        <http:urlEncoded />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="fetchPackageByVersion">
-      <http:operation location="/fetchPackageByVersion" />
-      <wsdl:input>
-        <http:urlEncoded />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="fetchProtectedPackage">
-      <http:operation location="/fetchProtectedPackage" />
-      <wsdl:input>
-        <http:urlEncoded />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="SubmitPackage">
-      <http:operation location="/SubmitPackage" />
-      <wsdl:input>
-        <http:urlEncoded />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="PackageByGuid">
-      <http:operation location="/PackageByGuid" />
-      <wsdl:input>
-        <http:urlEncoded />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:binding name="RepositoryHttpPost" type="tns:RepositoryHttpPost">
-    <http:binding verb="POST" />
-    <wsdl:operation name="Categories">
-      <http:operation location="/Categories" />
-      <wsdl:input>
-        <mime:content type="application/x-www-form-urlencoded" />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="Modules">
-      <http:operation location="/Modules" />
-      <wsdl:input>
-        <mime:content type="application/x-www-form-urlencoded" />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="ModulesCategorized">
-      <http:operation location="/ModulesCategorized" />
-      <wsdl:input>
-        <mime:content type="application/x-www-form-urlencoded" />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="Nitros">
-      <http:operation location="/Nitros" />
-      <wsdl:input>
-        <mime:content type="application/x-www-form-urlencoded" />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="NitrosCategorized">
-      <http:operation location="/NitrosCategorized" />
-      <wsdl:input>
-        <mime:content type="application/x-www-form-urlencoded" />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="authenticate">
-      <http:operation location="/authenticate" />
-      <wsdl:input>
-        <mime:content type="application/x-www-form-urlencoded" />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="fetchPackage">
-      <http:operation location="/fetchPackage" />
-      <wsdl:input>
-        <mime:content type="application/x-www-form-urlencoded" />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="fetchPackageByVersion">
-      <http:operation location="/fetchPackageByVersion" />
-      <wsdl:input>
-        <mime:content type="application/x-www-form-urlencoded" />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="fetchProtectedPackage">
-      <http:operation location="/fetchProtectedPackage" />
-      <wsdl:input>
-        <mime:content type="application/x-www-form-urlencoded" />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="SubmitPackage">
-      <http:operation location="/SubmitPackage" />
-      <wsdl:input>
-        <mime:content type="application/x-www-form-urlencoded" />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="PackageByGuid">
-      <http:operation location="/PackageByGuid" />
-      <wsdl:input>
-        <mime:content type="application/x-www-form-urlencoded" />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="Repository">
-    <wsdl:port name="RepositorySoap" binding="tns:RepositorySoap">
-      <soap:address location="https://our.umbraco.com/umbraco/webservices/api/repository.asmx" />
-    </wsdl:port>
-    <wsdl:port name="RepositorySoap12" binding="tns:RepositorySoap12">
-      <soap12:address location="https://our.umbraco.com/umbraco/webservices/api/repository.asmx" />
-    </wsdl:port>
-    <wsdl:port name="RepositoryHttpGet" binding="tns:RepositoryHttpGet">
-      <http:address location="https://our.umbraco.com/umbraco/webservices/api/repository.asmx" />
-    </wsdl:port>
-    <wsdl:port name="RepositoryHttpPost" binding="tns:RepositoryHttpPost">
-      <http:address location="https://our.umbraco.com/umbraco/webservices/api/repository.asmx" />
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>
\ No newline at end of file

From 28a80271795e2b2d149b8fa815271a5994394baf Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 24 Jul 2019 19:25:32 +1000
Subject: [PATCH 190/776] removes reference to old packages.umbraco.org

---
 .../Properties/Settings.Designer.cs           |   12 +-
 src/Umbraco.Web/Properties/Settings.settings  |    3 -
 src/Umbraco.Web/Umbraco.Web.csproj            |   22 -
 .../org.umbraco.our/Reference.cs              | 1046 -----------------
 .../org.umbraco.our/Reference.map             |    7 -
 .../org.umbraco.our/repository.disco          |    6 -
 .../org.umbraco.our/repository.wsdl           |  995 ----------------
 7 files changed, 1 insertion(+), 2090 deletions(-)
 delete mode 100644 src/Umbraco.Web/Web References/org.umbraco.our/Reference.cs
 delete mode 100644 src/Umbraco.Web/Web References/org.umbraco.our/Reference.map
 delete mode 100644 src/Umbraco.Web/Web References/org.umbraco.our/repository.disco
 delete mode 100644 src/Umbraco.Web/Web References/org.umbraco.our/repository.wsdl

diff --git a/src/Umbraco.Web/Properties/Settings.Designer.cs b/src/Umbraco.Web/Properties/Settings.Designer.cs
index 5a5a863f4f..5f7ccbd7e1 100644
--- a/src/Umbraco.Web/Properties/Settings.Designer.cs
+++ b/src/Umbraco.Web/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace Umbraco.Web.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.2.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -50,15 +50,5 @@ namespace Umbraco.Web.Properties {
                 return ((string)(this["test"]));
             }
         }
-        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.WebServiceUrl)]
-        [global::System.Configuration.DefaultSettingValueAttribute("https://our.umbraco.com/umbraco/webservices/api/repository.asmx")]
-        public string umbraco_org_umbraco_our_Repository {
-            get {
-                return ((string)(this["umbraco_org_umbraco_our_Repository"]));
-            }
-        }
     }
 }
diff --git a/src/Umbraco.Web/Properties/Settings.settings b/src/Umbraco.Web/Properties/Settings.settings
index 757b363da2..3a6f68023e 100644
--- a/src/Umbraco.Web/Properties/Settings.settings
+++ b/src/Umbraco.Web/Properties/Settings.settings
@@ -11,8 +11,5 @@
     <Setting Name="test" Type="System.String" Scope="Application">
       <Value Profile="(Default)">Something</Value>
     </Setting>
-    <Setting Name="umbraco_org_umbraco_our_Repository" Type="(Web Service URL)" Scope="Application">
-      <Value Profile="(Default)">https://our.umbraco.com/umbraco/webservices/api/repository.asmx</Value>
-    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index dcaa3494fd..730a321a16 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -906,11 +906,6 @@
     <Compile Include="JavaScript\CssInitialization.cs" />
     <Compile Include="JavaScript\DependencyPathRenderer.cs" />
     <Compile Include="UmbracoComponentRenderer.cs" />
-    <Compile Include="Web References\org.umbraco.our\Reference.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Reference.map</DependentUpon>
-    </Compile>
     <Compile Include="WebApi\AngularJsonMediaTypeFormatter.cs" />
     <Compile Include="WebApi\AngularJsonOnlyConfigurationAttribute.cs" />
     <Compile Include="Editors\Binders\MemberBinder.cs" />
@@ -1220,12 +1215,6 @@
     <None Include="..\Umbraco.Web.UI\Views\web.config">
       <Link>Mvc\web.config</Link>
     </None>
-    <None Include="Web References\org.umbraco.our\Reference.map">
-      <Generator>MSDiscoCodeGenerator</Generator>
-      <LastGenOutput>Reference.cs</LastGenOutput>
-    </None>
-    <None Include="Web References\org.umbraco.our\repository.disco" />
-    <None Include="Web References\org.umbraco.our\repository.wsdl" />
     <None Include="Web References\org.umbraco.update\UpgradeResult.datasource">
       <DependentUpon>Reference.map</DependentUpon>
     </None>
@@ -1238,17 +1227,6 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <WebReferenceUrl Include="http://our.umbraco.org/umbraco/webservices/api/repository.asmx">
-      <UrlBehavior>Dynamic</UrlBehavior>
-      <RelPath>Web References\org.umbraco.our\</RelPath>
-      <UpdateFromURL>http://our.umbraco.org/umbraco/webservices/api/repository.asmx</UpdateFromURL>
-      <ServiceLocationURL>
-      </ServiceLocationURL>
-      <CachedDynamicPropName>
-      </CachedDynamicPropName>
-      <CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
-      <CachedSettingsPropName>umbraco_org_umbraco_our_Repository</CachedSettingsPropName>
-    </WebReferenceUrl>
     <WebReferenceUrl Include="http://update.umbraco.org/checkforupgrade.asmx">
       <UrlBehavior>Dynamic</UrlBehavior>
       <RelPath>Web References\org.umbraco.update\</RelPath>
diff --git a/src/Umbraco.Web/Web References/org.umbraco.our/Reference.cs b/src/Umbraco.Web/Web References/org.umbraco.our/Reference.cs
deleted file mode 100644
index caa2887797..0000000000
--- a/src/Umbraco.Web/Web References/org.umbraco.our/Reference.cs	
+++ /dev/null
@@ -1,1046 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-// 
-// This source code was auto-generated by Microsoft.VSDesigner, Version 4.0.30319.42000.
-// 
-#pragma warning disable 1591
-
-namespace Umbraco.Web.org.umbraco.our {
-    using System;
-    using System.Web.Services;
-    using System.Diagnostics;
-    using System.Web.Services.Protocols;
-    using System.Xml.Serialization;
-    using System.ComponentModel;
-    
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3062.0")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Web.Services.WebServiceBindingAttribute(Name="RepositorySoap", Namespace="http://packages.umbraco.org/webservices/")]
-    public partial class Repository : System.Web.Services.Protocols.SoapHttpClientProtocol {
-        
-        private System.Threading.SendOrPostCallback CategoriesOperationCompleted;
-        
-        private System.Threading.SendOrPostCallback ModulesOperationCompleted;
-        
-        private System.Threading.SendOrPostCallback ModulesCategorizedOperationCompleted;
-        
-        private System.Threading.SendOrPostCallback NitrosOperationCompleted;
-        
-        private System.Threading.SendOrPostCallback NitrosCategorizedOperationCompleted;
-        
-        private System.Threading.SendOrPostCallback authenticateOperationCompleted;
-        
-        private System.Threading.SendOrPostCallback fetchPackageOperationCompleted;
-        
-        private System.Threading.SendOrPostCallback fetchPackageByVersionOperationCompleted;
-        
-        private System.Threading.SendOrPostCallback fetchProtectedPackageOperationCompleted;
-        
-        private System.Threading.SendOrPostCallback SubmitPackageOperationCompleted;
-        
-        private System.Threading.SendOrPostCallback PackageByGuidOperationCompleted;
-        
-        private bool useDefaultCredentialsSetExplicitly;
-        
-        /// <remarks/>
-        public Repository() {
-            this.Url = "http://our.umbraco.org/umbraco/webservices/api/repository.asmx";
-            if ((this.IsLocalFileSystemWebService(this.Url) == true)) {
-                this.UseDefaultCredentials = true;
-                this.useDefaultCredentialsSetExplicitly = false;
-            }
-            else {
-                this.useDefaultCredentialsSetExplicitly = true;
-            }
-        }
-        
-        public new string Url {
-            get {
-                return base.Url;
-            }
-            set {
-                if ((((this.IsLocalFileSystemWebService(base.Url) == true) 
-                            && (this.useDefaultCredentialsSetExplicitly == false)) 
-                            && (this.IsLocalFileSystemWebService(value) == false))) {
-                    base.UseDefaultCredentials = false;
-                }
-                base.Url = value;
-            }
-        }
-        
-        public new bool UseDefaultCredentials {
-            get {
-                return base.UseDefaultCredentials;
-            }
-            set {
-                base.UseDefaultCredentials = value;
-                this.useDefaultCredentialsSetExplicitly = true;
-            }
-        }
-        
-        /// <remarks/>
-        public event CategoriesCompletedEventHandler CategoriesCompleted;
-        
-        /// <remarks/>
-        public event ModulesCompletedEventHandler ModulesCompleted;
-        
-        /// <remarks/>
-        public event ModulesCategorizedCompletedEventHandler ModulesCategorizedCompleted;
-        
-        /// <remarks/>
-        public event NitrosCompletedEventHandler NitrosCompleted;
-        
-        /// <remarks/>
-        public event NitrosCategorizedCompletedEventHandler NitrosCategorizedCompleted;
-        
-        /// <remarks/>
-        public event authenticateCompletedEventHandler authenticateCompleted;
-        
-        /// <remarks/>
-        public event fetchPackageCompletedEventHandler fetchPackageCompleted;
-        
-        /// <remarks/>
-        public event fetchPackageByVersionCompletedEventHandler fetchPackageByVersionCompleted;
-        
-        /// <remarks/>
-        public event fetchProtectedPackageCompletedEventHandler fetchProtectedPackageCompleted;
-        
-        /// <remarks/>
-        public event SubmitPackageCompletedEventHandler SubmitPackageCompleted;
-        
-        /// <remarks/>
-        public event PackageByGuidCompletedEventHandler PackageByGuidCompleted;
-        
-        /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://packages.umbraco.org/webservices/Categories", RequestNamespace="http://packages.umbraco.org/webservices/", ResponseNamespace="http://packages.umbraco.org/webservices/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public Category[] Categories(string repositoryGuid) {
-            object[] results = this.Invoke("Categories", new object[] {
-                        repositoryGuid});
-            return ((Category[])(results[0]));
-        }
-        
-        /// <remarks/>
-        public void CategoriesAsync(string repositoryGuid) {
-            this.CategoriesAsync(repositoryGuid, null);
-        }
-        
-        /// <remarks/>
-        public void CategoriesAsync(string repositoryGuid, object userState) {
-            if ((this.CategoriesOperationCompleted == null)) {
-                this.CategoriesOperationCompleted = new System.Threading.SendOrPostCallback(this.OnCategoriesOperationCompleted);
-            }
-            this.InvokeAsync("Categories", new object[] {
-                        repositoryGuid}, this.CategoriesOperationCompleted, userState);
-        }
-        
-        private void OnCategoriesOperationCompleted(object arg) {
-            if ((this.CategoriesCompleted != null)) {
-                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
-                this.CategoriesCompleted(this, new CategoriesCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
-            }
-        }
-        
-        /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://packages.umbraco.org/webservices/Modules", RequestNamespace="http://packages.umbraco.org/webservices/", ResponseNamespace="http://packages.umbraco.org/webservices/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public Package[] Modules() {
-            object[] results = this.Invoke("Modules", new object[0]);
-            return ((Package[])(results[0]));
-        }
-        
-        /// <remarks/>
-        public void ModulesAsync() {
-            this.ModulesAsync(null);
-        }
-        
-        /// <remarks/>
-        public void ModulesAsync(object userState) {
-            if ((this.ModulesOperationCompleted == null)) {
-                this.ModulesOperationCompleted = new System.Threading.SendOrPostCallback(this.OnModulesOperationCompleted);
-            }
-            this.InvokeAsync("Modules", new object[0], this.ModulesOperationCompleted, userState);
-        }
-        
-        private void OnModulesOperationCompleted(object arg) {
-            if ((this.ModulesCompleted != null)) {
-                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
-                this.ModulesCompleted(this, new ModulesCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
-            }
-        }
-        
-        /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://packages.umbraco.org/webservices/ModulesCategorized", RequestNamespace="http://packages.umbraco.org/webservices/", ResponseNamespace="http://packages.umbraco.org/webservices/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public Category[] ModulesCategorized() {
-            object[] results = this.Invoke("ModulesCategorized", new object[0]);
-            return ((Category[])(results[0]));
-        }
-        
-        /// <remarks/>
-        public void ModulesCategorizedAsync() {
-            this.ModulesCategorizedAsync(null);
-        }
-        
-        /// <remarks/>
-        public void ModulesCategorizedAsync(object userState) {
-            if ((this.ModulesCategorizedOperationCompleted == null)) {
-                this.ModulesCategorizedOperationCompleted = new System.Threading.SendOrPostCallback(this.OnModulesCategorizedOperationCompleted);
-            }
-            this.InvokeAsync("ModulesCategorized", new object[0], this.ModulesCategorizedOperationCompleted, userState);
-        }
-        
-        private void OnModulesCategorizedOperationCompleted(object arg) {
-            if ((this.ModulesCategorizedCompleted != null)) {
-                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
-                this.ModulesCategorizedCompleted(this, new ModulesCategorizedCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
-            }
-        }
-        
-        /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://packages.umbraco.org/webservices/Nitros", RequestNamespace="http://packages.umbraco.org/webservices/", ResponseNamespace="http://packages.umbraco.org/webservices/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public Package[] Nitros() {
-            object[] results = this.Invoke("Nitros", new object[0]);
-            return ((Package[])(results[0]));
-        }
-        
-        /// <remarks/>
-        public void NitrosAsync() {
-            this.NitrosAsync(null);
-        }
-        
-        /// <remarks/>
-        public void NitrosAsync(object userState) {
-            if ((this.NitrosOperationCompleted == null)) {
-                this.NitrosOperationCompleted = new System.Threading.SendOrPostCallback(this.OnNitrosOperationCompleted);
-            }
-            this.InvokeAsync("Nitros", new object[0], this.NitrosOperationCompleted, userState);
-        }
-        
-        private void OnNitrosOperationCompleted(object arg) {
-            if ((this.NitrosCompleted != null)) {
-                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
-                this.NitrosCompleted(this, new NitrosCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
-            }
-        }
-        
-        /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://packages.umbraco.org/webservices/NitrosCategorized", RequestNamespace="http://packages.umbraco.org/webservices/", ResponseNamespace="http://packages.umbraco.org/webservices/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public Category[] NitrosCategorized() {
-            object[] results = this.Invoke("NitrosCategorized", new object[0]);
-            return ((Category[])(results[0]));
-        }
-        
-        /// <remarks/>
-        public void NitrosCategorizedAsync() {
-            this.NitrosCategorizedAsync(null);
-        }
-        
-        /// <remarks/>
-        public void NitrosCategorizedAsync(object userState) {
-            if ((this.NitrosCategorizedOperationCompleted == null)) {
-                this.NitrosCategorizedOperationCompleted = new System.Threading.SendOrPostCallback(this.OnNitrosCategorizedOperationCompleted);
-            }
-            this.InvokeAsync("NitrosCategorized", new object[0], this.NitrosCategorizedOperationCompleted, userState);
-        }
-        
-        private void OnNitrosCategorizedOperationCompleted(object arg) {
-            if ((this.NitrosCategorizedCompleted != null)) {
-                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
-                this.NitrosCategorizedCompleted(this, new NitrosCategorizedCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
-            }
-        }
-        
-        /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://packages.umbraco.org/webservices/authenticate", RequestNamespace="http://packages.umbraco.org/webservices/", ResponseNamespace="http://packages.umbraco.org/webservices/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public string authenticate(string email, string md5Password) {
-            object[] results = this.Invoke("authenticate", new object[] {
-                        email,
-                        md5Password});
-            return ((string)(results[0]));
-        }
-        
-        /// <remarks/>
-        public void authenticateAsync(string email, string md5Password) {
-            this.authenticateAsync(email, md5Password, null);
-        }
-        
-        /// <remarks/>
-        public void authenticateAsync(string email, string md5Password, object userState) {
-            if ((this.authenticateOperationCompleted == null)) {
-                this.authenticateOperationCompleted = new System.Threading.SendOrPostCallback(this.OnauthenticateOperationCompleted);
-            }
-            this.InvokeAsync("authenticate", new object[] {
-                        email,
-                        md5Password}, this.authenticateOperationCompleted, userState);
-        }
-        
-        private void OnauthenticateOperationCompleted(object arg) {
-            if ((this.authenticateCompleted != null)) {
-                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
-                this.authenticateCompleted(this, new authenticateCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
-            }
-        }
-        
-        /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://packages.umbraco.org/webservices/fetchPackage", RequestNamespace="http://packages.umbraco.org/webservices/", ResponseNamespace="http://packages.umbraco.org/webservices/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        [return: System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")]
-        public byte[] fetchPackage(string packageGuid) {
-            object[] results = this.Invoke("fetchPackage", new object[] {
-                        packageGuid});
-            return ((byte[])(results[0]));
-        }
-        
-        /// <remarks/>
-        public void fetchPackageAsync(string packageGuid) {
-            this.fetchPackageAsync(packageGuid, null);
-        }
-        
-        /// <remarks/>
-        public void fetchPackageAsync(string packageGuid, object userState) {
-            if ((this.fetchPackageOperationCompleted == null)) {
-                this.fetchPackageOperationCompleted = new System.Threading.SendOrPostCallback(this.OnfetchPackageOperationCompleted);
-            }
-            this.InvokeAsync("fetchPackage", new object[] {
-                        packageGuid}, this.fetchPackageOperationCompleted, userState);
-        }
-        
-        private void OnfetchPackageOperationCompleted(object arg) {
-            if ((this.fetchPackageCompleted != null)) {
-                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
-                this.fetchPackageCompleted(this, new fetchPackageCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
-            }
-        }
-        
-        /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://packages.umbraco.org/webservices/fetchPackageByVersion", RequestNamespace="http://packages.umbraco.org/webservices/", ResponseNamespace="http://packages.umbraco.org/webservices/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        [return: System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")]
-        public byte[] fetchPackageByVersion(string packageGuid, string repoVersion) {
-            object[] results = this.Invoke("fetchPackageByVersion", new object[] {
-                        packageGuid,
-                        repoVersion});
-            return ((byte[])(results[0]));
-        }
-        
-        /// <remarks/>
-        public void fetchPackageByVersionAsync(string packageGuid, string repoVersion) {
-            this.fetchPackageByVersionAsync(packageGuid, repoVersion, null);
-        }
-        
-        /// <remarks/>
-        public void fetchPackageByVersionAsync(string packageGuid, string repoVersion, object userState) {
-            if ((this.fetchPackageByVersionOperationCompleted == null)) {
-                this.fetchPackageByVersionOperationCompleted = new System.Threading.SendOrPostCallback(this.OnfetchPackageByVersionOperationCompleted);
-            }
-            this.InvokeAsync("fetchPackageByVersion", new object[] {
-                        packageGuid,
-                        repoVersion}, this.fetchPackageByVersionOperationCompleted, userState);
-        }
-        
-        private void OnfetchPackageByVersionOperationCompleted(object arg) {
-            if ((this.fetchPackageByVersionCompleted != null)) {
-                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
-                this.fetchPackageByVersionCompleted(this, new fetchPackageByVersionCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
-            }
-        }
-        
-        /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://packages.umbraco.org/webservices/fetchProtectedPackage", RequestNamespace="http://packages.umbraco.org/webservices/", ResponseNamespace="http://packages.umbraco.org/webservices/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        [return: System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")]
-        public byte[] fetchProtectedPackage(string packageGuid, string memberKey) {
-            object[] results = this.Invoke("fetchProtectedPackage", new object[] {
-                        packageGuid,
-                        memberKey});
-            return ((byte[])(results[0]));
-        }
-        
-        /// <remarks/>
-        public void fetchProtectedPackageAsync(string packageGuid, string memberKey) {
-            this.fetchProtectedPackageAsync(packageGuid, memberKey, null);
-        }
-        
-        /// <remarks/>
-        public void fetchProtectedPackageAsync(string packageGuid, string memberKey, object userState) {
-            if ((this.fetchProtectedPackageOperationCompleted == null)) {
-                this.fetchProtectedPackageOperationCompleted = new System.Threading.SendOrPostCallback(this.OnfetchProtectedPackageOperationCompleted);
-            }
-            this.InvokeAsync("fetchProtectedPackage", new object[] {
-                        packageGuid,
-                        memberKey}, this.fetchProtectedPackageOperationCompleted, userState);
-        }
-        
-        private void OnfetchProtectedPackageOperationCompleted(object arg) {
-            if ((this.fetchProtectedPackageCompleted != null)) {
-                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
-                this.fetchProtectedPackageCompleted(this, new fetchProtectedPackageCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
-            }
-        }
-        
-        /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://packages.umbraco.org/webservices/SubmitPackage", RequestNamespace="http://packages.umbraco.org/webservices/", ResponseNamespace="http://packages.umbraco.org/webservices/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public SubmitStatus SubmitPackage(string repositoryGuid, string authorGuid, string packageGuid, [System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")] byte[] packageFile, [System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")] byte[] packageDoc, [System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")] byte[] packageThumbnail, string name, string author, string authorUrl, string description) {
-            object[] results = this.Invoke("SubmitPackage", new object[] {
-                        repositoryGuid,
-                        authorGuid,
-                        packageGuid,
-                        packageFile,
-                        packageDoc,
-                        packageThumbnail,
-                        name,
-                        author,
-                        authorUrl,
-                        description});
-            return ((SubmitStatus)(results[0]));
-        }
-        
-        /// <remarks/>
-        public void SubmitPackageAsync(string repositoryGuid, string authorGuid, string packageGuid, byte[] packageFile, byte[] packageDoc, byte[] packageThumbnail, string name, string author, string authorUrl, string description) {
-            this.SubmitPackageAsync(repositoryGuid, authorGuid, packageGuid, packageFile, packageDoc, packageThumbnail, name, author, authorUrl, description, null);
-        }
-        
-        /// <remarks/>
-        public void SubmitPackageAsync(string repositoryGuid, string authorGuid, string packageGuid, byte[] packageFile, byte[] packageDoc, byte[] packageThumbnail, string name, string author, string authorUrl, string description, object userState) {
-            if ((this.SubmitPackageOperationCompleted == null)) {
-                this.SubmitPackageOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSubmitPackageOperationCompleted);
-            }
-            this.InvokeAsync("SubmitPackage", new object[] {
-                        repositoryGuid,
-                        authorGuid,
-                        packageGuid,
-                        packageFile,
-                        packageDoc,
-                        packageThumbnail,
-                        name,
-                        author,
-                        authorUrl,
-                        description}, this.SubmitPackageOperationCompleted, userState);
-        }
-        
-        private void OnSubmitPackageOperationCompleted(object arg) {
-            if ((this.SubmitPackageCompleted != null)) {
-                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
-                this.SubmitPackageCompleted(this, new SubmitPackageCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
-            }
-        }
-        
-        /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://packages.umbraco.org/webservices/PackageByGuid", RequestNamespace="http://packages.umbraco.org/webservices/", ResponseNamespace="http://packages.umbraco.org/webservices/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public Package PackageByGuid(string packageGuid) {
-            object[] results = this.Invoke("PackageByGuid", new object[] {
-                        packageGuid});
-            return ((Package)(results[0]));
-        }
-        
-        /// <remarks/>
-        public void PackageByGuidAsync(string packageGuid) {
-            this.PackageByGuidAsync(packageGuid, null);
-        }
-        
-        /// <remarks/>
-        public void PackageByGuidAsync(string packageGuid, object userState) {
-            if ((this.PackageByGuidOperationCompleted == null)) {
-                this.PackageByGuidOperationCompleted = new System.Threading.SendOrPostCallback(this.OnPackageByGuidOperationCompleted);
-            }
-            this.InvokeAsync("PackageByGuid", new object[] {
-                        packageGuid}, this.PackageByGuidOperationCompleted, userState);
-        }
-        
-        private void OnPackageByGuidOperationCompleted(object arg) {
-            if ((this.PackageByGuidCompleted != null)) {
-                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
-                this.PackageByGuidCompleted(this, new PackageByGuidCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
-            }
-        }
-        
-        /// <remarks/>
-        public new void CancelAsync(object userState) {
-            base.CancelAsync(userState);
-        }
-        
-        private bool IsLocalFileSystemWebService(string url) {
-            if (((url == null) 
-                        || (url == string.Empty))) {
-                return false;
-            }
-            System.Uri wsUri = new System.Uri(url);
-            if (((wsUri.Port >= 1024) 
-                        && (string.Compare(wsUri.Host, "localHost", System.StringComparison.OrdinalIgnoreCase) == 0))) {
-                return true;
-            }
-            return false;
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.3062.0")]
-    [System.SerializableAttribute()]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://packages.umbraco.org/webservices/")]
-    public partial class Category {
-        
-        private string textField;
-        
-        private string descriptionField;
-        
-        private string urlField;
-        
-        private int idField;
-        
-        private Package[] packagesField;
-        
-        /// <remarks/>
-        public string Text {
-            get {
-                return this.textField;
-            }
-            set {
-                this.textField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public string Description {
-            get {
-                return this.descriptionField;
-            }
-            set {
-                this.descriptionField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public string Url {
-            get {
-                return this.urlField;
-            }
-            set {
-                this.urlField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public int Id {
-            get {
-                return this.idField;
-            }
-            set {
-                this.idField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public Package[] Packages {
-            get {
-                return this.packagesField;
-            }
-            set {
-                this.packagesField = value;
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.3062.0")]
-    [System.SerializableAttribute()]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://packages.umbraco.org/webservices/")]
-    public partial class Package {
-        
-        private System.Guid repoGuidField;
-        
-        private string textField;
-        
-        private string descriptionField;
-        
-        private string iconField;
-        
-        private string thumbnailField;
-        
-        private string documentationField;
-        
-        private string demoField;
-        
-        private bool acceptedField;
-        
-        private bool isModuleField;
-        
-        private bool editorsPickField;
-        
-        private bool protectedField;
-        
-        private bool hasUpgradeField;
-        
-        private string upgradeVersionField;
-        
-        private string upgradeReadMeField;
-        
-        private string urlField;
-        
-        /// <remarks/>
-        public System.Guid RepoGuid {
-            get {
-                return this.repoGuidField;
-            }
-            set {
-                this.repoGuidField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public string Text {
-            get {
-                return this.textField;
-            }
-            set {
-                this.textField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public string Description {
-            get {
-                return this.descriptionField;
-            }
-            set {
-                this.descriptionField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public string Icon {
-            get {
-                return this.iconField;
-            }
-            set {
-                this.iconField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public string Thumbnail {
-            get {
-                return this.thumbnailField;
-            }
-            set {
-                this.thumbnailField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public string Documentation {
-            get {
-                return this.documentationField;
-            }
-            set {
-                this.documentationField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public string Demo {
-            get {
-                return this.demoField;
-            }
-            set {
-                this.demoField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public bool Accepted {
-            get {
-                return this.acceptedField;
-            }
-            set {
-                this.acceptedField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public bool IsModule {
-            get {
-                return this.isModuleField;
-            }
-            set {
-                this.isModuleField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public bool EditorsPick {
-            get {
-                return this.editorsPickField;
-            }
-            set {
-                this.editorsPickField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public bool Protected {
-            get {
-                return this.protectedField;
-            }
-            set {
-                this.protectedField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public bool HasUpgrade {
-            get {
-                return this.hasUpgradeField;
-            }
-            set {
-                this.hasUpgradeField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public string UpgradeVersion {
-            get {
-                return this.upgradeVersionField;
-            }
-            set {
-                this.upgradeVersionField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public string UpgradeReadMe {
-            get {
-                return this.upgradeReadMeField;
-            }
-            set {
-                this.upgradeReadMeField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public string Url {
-            get {
-                return this.urlField;
-            }
-            set {
-                this.urlField = value;
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.3062.0")]
-    [System.SerializableAttribute()]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://packages.umbraco.org/webservices/")]
-    public enum SubmitStatus {
-        
-        /// <remarks/>
-        Complete,
-        
-        /// <remarks/>
-        Exists,
-        
-        /// <remarks/>
-        NoAccess,
-        
-        /// <remarks/>
-        Error,
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3062.0")]
-    public delegate void CategoriesCompletedEventHandler(object sender, CategoriesCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3062.0")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class CategoriesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal CategoriesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public Category[] Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((Category[])(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3062.0")]
-    public delegate void ModulesCompletedEventHandler(object sender, ModulesCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3062.0")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class ModulesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal ModulesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public Package[] Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((Package[])(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3062.0")]
-    public delegate void ModulesCategorizedCompletedEventHandler(object sender, ModulesCategorizedCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3062.0")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class ModulesCategorizedCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal ModulesCategorizedCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public Category[] Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((Category[])(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3062.0")]
-    public delegate void NitrosCompletedEventHandler(object sender, NitrosCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3062.0")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class NitrosCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal NitrosCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public Package[] Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((Package[])(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3062.0")]
-    public delegate void NitrosCategorizedCompletedEventHandler(object sender, NitrosCategorizedCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3062.0")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class NitrosCategorizedCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal NitrosCategorizedCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public Category[] Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((Category[])(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3062.0")]
-    public delegate void authenticateCompletedEventHandler(object sender, authenticateCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3062.0")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class authenticateCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal authenticateCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public string Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((string)(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3062.0")]
-    public delegate void fetchPackageCompletedEventHandler(object sender, fetchPackageCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3062.0")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class fetchPackageCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal fetchPackageCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public byte[] Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((byte[])(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3062.0")]
-    public delegate void fetchPackageByVersionCompletedEventHandler(object sender, fetchPackageByVersionCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3062.0")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class fetchPackageByVersionCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal fetchPackageByVersionCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public byte[] Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((byte[])(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3062.0")]
-    public delegate void fetchProtectedPackageCompletedEventHandler(object sender, fetchProtectedPackageCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3062.0")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class fetchProtectedPackageCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal fetchProtectedPackageCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public byte[] Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((byte[])(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3062.0")]
-    public delegate void SubmitPackageCompletedEventHandler(object sender, SubmitPackageCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3062.0")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class SubmitPackageCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal SubmitPackageCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public SubmitStatus Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((SubmitStatus)(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3062.0")]
-    public delegate void PackageByGuidCompletedEventHandler(object sender, PackageByGuidCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3062.0")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class PackageByGuidCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal PackageByGuidCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public Package Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((Package)(this.results[0]));
-            }
-        }
-    }
-}
-
-#pragma warning restore 1591
\ No newline at end of file
diff --git a/src/Umbraco.Web/Web References/org.umbraco.our/Reference.map b/src/Umbraco.Web/Web References/org.umbraco.our/Reference.map
deleted file mode 100644
index 8d133063a5..0000000000
--- a/src/Umbraco.Web/Web References/org.umbraco.our/Reference.map	
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<DiscoveryClientResultsFile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Results>
-    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="https://our.umbraco.com/umbraco/webservices/api/repository.asmx?wsdl" filename="repository.wsdl" />
-    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="https://our.umbraco.com/umbraco/webservices/api/repository.asmx?disco" filename="repository.disco" />
-  </Results>
-</DiscoveryClientResultsFile>
\ No newline at end of file
diff --git a/src/Umbraco.Web/Web References/org.umbraco.our/repository.disco b/src/Umbraco.Web/Web References/org.umbraco.our/repository.disco
deleted file mode 100644
index 4bf1a61fca..0000000000
--- a/src/Umbraco.Web/Web References/org.umbraco.our/repository.disco	
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<discovery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/disco/">
-  <contractRef ref="https://our.umbraco.com/umbraco/webservices/api/repository.asmx?wsdl" docRef="https://our.umbraco.com/umbraco/webservices/api/repository.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
-  <soap address="https://our.umbraco.com/umbraco/webservices/api/repository.asmx" xmlns:q1="http://packages.umbraco.org/webservices/" binding="q1:RepositorySoap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
-  <soap address="https://our.umbraco.com/umbraco/webservices/api/repository.asmx" xmlns:q2="http://packages.umbraco.org/webservices/" binding="q2:RepositorySoap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
-</discovery>
\ No newline at end of file
diff --git a/src/Umbraco.Web/Web References/org.umbraco.our/repository.wsdl b/src/Umbraco.Web/Web References/org.umbraco.our/repository.wsdl
deleted file mode 100644
index 2a3f3502db..0000000000
--- a/src/Umbraco.Web/Web References/org.umbraco.our/repository.wsdl	
+++ /dev/null
@@ -1,995 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:tns="http://packages.umbraco.org/webservices/" xmlns:s1="http://microsoft.com/wsdl/types/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:s2="http://packages.umbraco.org/webservices/AbstractTypes" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://packages.umbraco.org/webservices/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-    <s:schema elementFormDefault="qualified" targetNamespace="http://packages.umbraco.org/webservices/">
-      <s:import namespace="http://microsoft.com/wsdl/types/" />
-      <s:element name="Categories">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="repositoryGuid" type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="CategoriesResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="CategoriesResult" type="tns:ArrayOfCategory" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:complexType name="ArrayOfCategory">
-        <s:sequence>
-          <s:element minOccurs="0" maxOccurs="unbounded" name="Category" nillable="true" type="tns:Category" />
-        </s:sequence>
-      </s:complexType>
-      <s:complexType name="Category">
-        <s:sequence>
-          <s:element minOccurs="0" maxOccurs="1" name="Text" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="Description" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="Url" type="s:string" />
-          <s:element minOccurs="1" maxOccurs="1" name="Id" type="s:int" />
-          <s:element minOccurs="0" maxOccurs="1" name="Packages" type="tns:ArrayOfPackage" />
-        </s:sequence>
-      </s:complexType>
-      <s:complexType name="ArrayOfPackage">
-        <s:sequence>
-          <s:element minOccurs="0" maxOccurs="unbounded" name="Package" nillable="true" type="tns:Package" />
-        </s:sequence>
-      </s:complexType>
-      <s:complexType name="Package">
-        <s:sequence>
-          <s:element minOccurs="1" maxOccurs="1" name="RepoGuid" type="s1:guid" />
-          <s:element minOccurs="0" maxOccurs="1" name="Text" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="Description" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="Icon" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="Thumbnail" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="Documentation" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="Demo" type="s:string" />
-          <s:element minOccurs="1" maxOccurs="1" name="Accepted" type="s:boolean" />
-          <s:element minOccurs="1" maxOccurs="1" name="IsModule" type="s:boolean" />
-          <s:element minOccurs="1" maxOccurs="1" name="EditorsPick" type="s:boolean" />
-          <s:element minOccurs="1" maxOccurs="1" name="Protected" type="s:boolean" />
-          <s:element minOccurs="1" maxOccurs="1" name="HasUpgrade" type="s:boolean" />
-          <s:element minOccurs="0" maxOccurs="1" name="UpgradeVersion" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="UpgradeReadMe" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="Url" type="s:string" />
-        </s:sequence>
-      </s:complexType>
-      <s:element name="Modules">
-        <s:complexType />
-      </s:element>
-      <s:element name="ModulesResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="ModulesResult" type="tns:ArrayOfPackage" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="ModulesCategorized">
-        <s:complexType />
-      </s:element>
-      <s:element name="ModulesCategorizedResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="ModulesCategorizedResult" type="tns:ArrayOfCategory" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="Nitros">
-        <s:complexType />
-      </s:element>
-      <s:element name="NitrosResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="NitrosResult" type="tns:ArrayOfPackage" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="NitrosCategorized">
-        <s:complexType />
-      </s:element>
-      <s:element name="NitrosCategorizedResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="NitrosCategorizedResult" type="tns:ArrayOfCategory" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="authenticate">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="email" type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="md5Password" type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="authenticateResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="authenticateResult" type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="fetchPackage">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="packageGuid" type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="fetchPackageResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="fetchPackageResult" type="s:base64Binary" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="fetchPackageByVersion">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="packageGuid" type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="repoVersion" type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="fetchPackageByVersionResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="fetchPackageByVersionResult" type="s:base64Binary" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="fetchProtectedPackage">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="packageGuid" type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="memberKey" type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="fetchProtectedPackageResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="fetchProtectedPackageResult" type="s:base64Binary" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="SubmitPackage">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="repositoryGuid" type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="authorGuid" type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="packageGuid" type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="packageFile" type="s:base64Binary" />
-            <s:element minOccurs="0" maxOccurs="1" name="packageDoc" type="s:base64Binary" />
-            <s:element minOccurs="0" maxOccurs="1" name="packageThumbnail" type="s:base64Binary" />
-            <s:element minOccurs="0" maxOccurs="1" name="name" type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="author" type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="authorUrl" type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="description" type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="SubmitPackageResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="1" maxOccurs="1" name="SubmitPackageResult" type="tns:SubmitStatus" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:simpleType name="SubmitStatus">
-        <s:restriction base="s:string">
-          <s:enumeration value="Complete" />
-          <s:enumeration value="Exists" />
-          <s:enumeration value="NoAccess" />
-          <s:enumeration value="Error" />
-        </s:restriction>
-      </s:simpleType>
-      <s:element name="PackageByGuid">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="packageGuid" type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="PackageByGuidResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="PackageByGuidResult" type="tns:Package" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="ArrayOfCategory" nillable="true" type="tns:ArrayOfCategory" />
-      <s:element name="ArrayOfPackage" nillable="true" type="tns:ArrayOfPackage" />
-      <s:element name="string" nillable="true" type="s:string" />
-      <s:element name="base64Binary" nillable="true" type="s:base64Binary" />
-      <s:element name="SubmitStatus" type="tns:SubmitStatus" />
-      <s:element name="Package" nillable="true" type="tns:Package" />
-    </s:schema>
-    <s:schema elementFormDefault="qualified" targetNamespace="http://microsoft.com/wsdl/types/">
-      <s:simpleType name="guid">
-        <s:restriction base="s:string">
-          <s:pattern value="[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}" />
-        </s:restriction>
-      </s:simpleType>
-    </s:schema>
-    <s:schema targetNamespace="http://packages.umbraco.org/webservices/AbstractTypes">
-      <s:import namespace="http://schemas.xmlsoap.org/soap/encoding/" />
-      <s:complexType name="StringArray">
-        <s:complexContent mixed="false">
-          <s:restriction base="soapenc:Array">
-            <s:sequence>
-              <s:element minOccurs="0" maxOccurs="unbounded" name="String" type="s:string" />
-            </s:sequence>
-          </s:restriction>
-        </s:complexContent>
-      </s:complexType>
-    </s:schema>
-  </wsdl:types>
-  <wsdl:message name="CategoriesSoapIn">
-    <wsdl:part name="parameters" element="tns:Categories" />
-  </wsdl:message>
-  <wsdl:message name="CategoriesSoapOut">
-    <wsdl:part name="parameters" element="tns:CategoriesResponse" />
-  </wsdl:message>
-  <wsdl:message name="ModulesSoapIn">
-    <wsdl:part name="parameters" element="tns:Modules" />
-  </wsdl:message>
-  <wsdl:message name="ModulesSoapOut">
-    <wsdl:part name="parameters" element="tns:ModulesResponse" />
-  </wsdl:message>
-  <wsdl:message name="ModulesCategorizedSoapIn">
-    <wsdl:part name="parameters" element="tns:ModulesCategorized" />
-  </wsdl:message>
-  <wsdl:message name="ModulesCategorizedSoapOut">
-    <wsdl:part name="parameters" element="tns:ModulesCategorizedResponse" />
-  </wsdl:message>
-  <wsdl:message name="NitrosSoapIn">
-    <wsdl:part name="parameters" element="tns:Nitros" />
-  </wsdl:message>
-  <wsdl:message name="NitrosSoapOut">
-    <wsdl:part name="parameters" element="tns:NitrosResponse" />
-  </wsdl:message>
-  <wsdl:message name="NitrosCategorizedSoapIn">
-    <wsdl:part name="parameters" element="tns:NitrosCategorized" />
-  </wsdl:message>
-  <wsdl:message name="NitrosCategorizedSoapOut">
-    <wsdl:part name="parameters" element="tns:NitrosCategorizedResponse" />
-  </wsdl:message>
-  <wsdl:message name="authenticateSoapIn">
-    <wsdl:part name="parameters" element="tns:authenticate" />
-  </wsdl:message>
-  <wsdl:message name="authenticateSoapOut">
-    <wsdl:part name="parameters" element="tns:authenticateResponse" />
-  </wsdl:message>
-  <wsdl:message name="fetchPackageSoapIn">
-    <wsdl:part name="parameters" element="tns:fetchPackage" />
-  </wsdl:message>
-  <wsdl:message name="fetchPackageSoapOut">
-    <wsdl:part name="parameters" element="tns:fetchPackageResponse" />
-  </wsdl:message>
-  <wsdl:message name="fetchPackageByVersionSoapIn">
-    <wsdl:part name="parameters" element="tns:fetchPackageByVersion" />
-  </wsdl:message>
-  <wsdl:message name="fetchPackageByVersionSoapOut">
-    <wsdl:part name="parameters" element="tns:fetchPackageByVersionResponse" />
-  </wsdl:message>
-  <wsdl:message name="fetchProtectedPackageSoapIn">
-    <wsdl:part name="parameters" element="tns:fetchProtectedPackage" />
-  </wsdl:message>
-  <wsdl:message name="fetchProtectedPackageSoapOut">
-    <wsdl:part name="parameters" element="tns:fetchProtectedPackageResponse" />
-  </wsdl:message>
-  <wsdl:message name="SubmitPackageSoapIn">
-    <wsdl:part name="parameters" element="tns:SubmitPackage" />
-  </wsdl:message>
-  <wsdl:message name="SubmitPackageSoapOut">
-    <wsdl:part name="parameters" element="tns:SubmitPackageResponse" />
-  </wsdl:message>
-  <wsdl:message name="PackageByGuidSoapIn">
-    <wsdl:part name="parameters" element="tns:PackageByGuid" />
-  </wsdl:message>
-  <wsdl:message name="PackageByGuidSoapOut">
-    <wsdl:part name="parameters" element="tns:PackageByGuidResponse" />
-  </wsdl:message>
-  <wsdl:message name="CategoriesHttpGetIn">
-    <wsdl:part name="repositoryGuid" type="s:string" />
-  </wsdl:message>
-  <wsdl:message name="CategoriesHttpGetOut">
-    <wsdl:part name="Body" element="tns:ArrayOfCategory" />
-  </wsdl:message>
-  <wsdl:message name="ModulesHttpGetIn" />
-  <wsdl:message name="ModulesHttpGetOut">
-    <wsdl:part name="Body" element="tns:ArrayOfPackage" />
-  </wsdl:message>
-  <wsdl:message name="ModulesCategorizedHttpGetIn" />
-  <wsdl:message name="ModulesCategorizedHttpGetOut">
-    <wsdl:part name="Body" element="tns:ArrayOfCategory" />
-  </wsdl:message>
-  <wsdl:message name="NitrosHttpGetIn" />
-  <wsdl:message name="NitrosHttpGetOut">
-    <wsdl:part name="Body" element="tns:ArrayOfPackage" />
-  </wsdl:message>
-  <wsdl:message name="NitrosCategorizedHttpGetIn" />
-  <wsdl:message name="NitrosCategorizedHttpGetOut">
-    <wsdl:part name="Body" element="tns:ArrayOfCategory" />
-  </wsdl:message>
-  <wsdl:message name="authenticateHttpGetIn">
-    <wsdl:part name="email" type="s:string" />
-    <wsdl:part name="md5Password" type="s:string" />
-  </wsdl:message>
-  <wsdl:message name="authenticateHttpGetOut">
-    <wsdl:part name="Body" element="tns:string" />
-  </wsdl:message>
-  <wsdl:message name="fetchPackageHttpGetIn">
-    <wsdl:part name="packageGuid" type="s:string" />
-  </wsdl:message>
-  <wsdl:message name="fetchPackageHttpGetOut">
-    <wsdl:part name="Body" element="tns:base64Binary" />
-  </wsdl:message>
-  <wsdl:message name="fetchPackageByVersionHttpGetIn">
-    <wsdl:part name="packageGuid" type="s:string" />
-    <wsdl:part name="repoVersion" type="s:string" />
-  </wsdl:message>
-  <wsdl:message name="fetchPackageByVersionHttpGetOut">
-    <wsdl:part name="Body" element="tns:base64Binary" />
-  </wsdl:message>
-  <wsdl:message name="fetchProtectedPackageHttpGetIn">
-    <wsdl:part name="packageGuid" type="s:string" />
-    <wsdl:part name="memberKey" type="s:string" />
-  </wsdl:message>
-  <wsdl:message name="fetchProtectedPackageHttpGetOut">
-    <wsdl:part name="Body" element="tns:base64Binary" />
-  </wsdl:message>
-  <wsdl:message name="SubmitPackageHttpGetIn">
-    <wsdl:part name="repositoryGuid" type="s:string" />
-    <wsdl:part name="authorGuid" type="s:string" />
-    <wsdl:part name="packageGuid" type="s:string" />
-    <wsdl:part name="packageFile" type="s2:StringArray" />
-    <wsdl:part name="packageDoc" type="s2:StringArray" />
-    <wsdl:part name="packageThumbnail" type="s2:StringArray" />
-    <wsdl:part name="name" type="s:string" />
-    <wsdl:part name="author" type="s:string" />
-    <wsdl:part name="authorUrl" type="s:string" />
-    <wsdl:part name="description" type="s:string" />
-  </wsdl:message>
-  <wsdl:message name="SubmitPackageHttpGetOut">
-    <wsdl:part name="Body" element="tns:SubmitStatus" />
-  </wsdl:message>
-  <wsdl:message name="PackageByGuidHttpGetIn">
-    <wsdl:part name="packageGuid" type="s:string" />
-  </wsdl:message>
-  <wsdl:message name="PackageByGuidHttpGetOut">
-    <wsdl:part name="Body" element="tns:Package" />
-  </wsdl:message>
-  <wsdl:message name="CategoriesHttpPostIn">
-    <wsdl:part name="repositoryGuid" type="s:string" />
-  </wsdl:message>
-  <wsdl:message name="CategoriesHttpPostOut">
-    <wsdl:part name="Body" element="tns:ArrayOfCategory" />
-  </wsdl:message>
-  <wsdl:message name="ModulesHttpPostIn" />
-  <wsdl:message name="ModulesHttpPostOut">
-    <wsdl:part name="Body" element="tns:ArrayOfPackage" />
-  </wsdl:message>
-  <wsdl:message name="ModulesCategorizedHttpPostIn" />
-  <wsdl:message name="ModulesCategorizedHttpPostOut">
-    <wsdl:part name="Body" element="tns:ArrayOfCategory" />
-  </wsdl:message>
-  <wsdl:message name="NitrosHttpPostIn" />
-  <wsdl:message name="NitrosHttpPostOut">
-    <wsdl:part name="Body" element="tns:ArrayOfPackage" />
-  </wsdl:message>
-  <wsdl:message name="NitrosCategorizedHttpPostIn" />
-  <wsdl:message name="NitrosCategorizedHttpPostOut">
-    <wsdl:part name="Body" element="tns:ArrayOfCategory" />
-  </wsdl:message>
-  <wsdl:message name="authenticateHttpPostIn">
-    <wsdl:part name="email" type="s:string" />
-    <wsdl:part name="md5Password" type="s:string" />
-  </wsdl:message>
-  <wsdl:message name="authenticateHttpPostOut">
-    <wsdl:part name="Body" element="tns:string" />
-  </wsdl:message>
-  <wsdl:message name="fetchPackageHttpPostIn">
-    <wsdl:part name="packageGuid" type="s:string" />
-  </wsdl:message>
-  <wsdl:message name="fetchPackageHttpPostOut">
-    <wsdl:part name="Body" element="tns:base64Binary" />
-  </wsdl:message>
-  <wsdl:message name="fetchPackageByVersionHttpPostIn">
-    <wsdl:part name="packageGuid" type="s:string" />
-    <wsdl:part name="repoVersion" type="s:string" />
-  </wsdl:message>
-  <wsdl:message name="fetchPackageByVersionHttpPostOut">
-    <wsdl:part name="Body" element="tns:base64Binary" />
-  </wsdl:message>
-  <wsdl:message name="fetchProtectedPackageHttpPostIn">
-    <wsdl:part name="packageGuid" type="s:string" />
-    <wsdl:part name="memberKey" type="s:string" />
-  </wsdl:message>
-  <wsdl:message name="fetchProtectedPackageHttpPostOut">
-    <wsdl:part name="Body" element="tns:base64Binary" />
-  </wsdl:message>
-  <wsdl:message name="SubmitPackageHttpPostIn">
-    <wsdl:part name="repositoryGuid" type="s:string" />
-    <wsdl:part name="authorGuid" type="s:string" />
-    <wsdl:part name="packageGuid" type="s:string" />
-    <wsdl:part name="packageFile" type="s2:StringArray" />
-    <wsdl:part name="packageDoc" type="s2:StringArray" />
-    <wsdl:part name="packageThumbnail" type="s2:StringArray" />
-    <wsdl:part name="name" type="s:string" />
-    <wsdl:part name="author" type="s:string" />
-    <wsdl:part name="authorUrl" type="s:string" />
-    <wsdl:part name="description" type="s:string" />
-  </wsdl:message>
-  <wsdl:message name="SubmitPackageHttpPostOut">
-    <wsdl:part name="Body" element="tns:SubmitStatus" />
-  </wsdl:message>
-  <wsdl:message name="PackageByGuidHttpPostIn">
-    <wsdl:part name="packageGuid" type="s:string" />
-  </wsdl:message>
-  <wsdl:message name="PackageByGuidHttpPostOut">
-    <wsdl:part name="Body" element="tns:Package" />
-  </wsdl:message>
-  <wsdl:portType name="RepositorySoap">
-    <wsdl:operation name="Categories">
-      <wsdl:input message="tns:CategoriesSoapIn" />
-      <wsdl:output message="tns:CategoriesSoapOut" />
-    </wsdl:operation>
-    <wsdl:operation name="Modules">
-      <wsdl:input message="tns:ModulesSoapIn" />
-      <wsdl:output message="tns:ModulesSoapOut" />
-    </wsdl:operation>
-    <wsdl:operation name="ModulesCategorized">
-      <wsdl:input message="tns:ModulesCategorizedSoapIn" />
-      <wsdl:output message="tns:ModulesCategorizedSoapOut" />
-    </wsdl:operation>
-    <wsdl:operation name="Nitros">
-      <wsdl:input message="tns:NitrosSoapIn" />
-      <wsdl:output message="tns:NitrosSoapOut" />
-    </wsdl:operation>
-    <wsdl:operation name="NitrosCategorized">
-      <wsdl:input message="tns:NitrosCategorizedSoapIn" />
-      <wsdl:output message="tns:NitrosCategorizedSoapOut" />
-    </wsdl:operation>
-    <wsdl:operation name="authenticate">
-      <wsdl:input message="tns:authenticateSoapIn" />
-      <wsdl:output message="tns:authenticateSoapOut" />
-    </wsdl:operation>
-    <wsdl:operation name="fetchPackage">
-      <wsdl:input message="tns:fetchPackageSoapIn" />
-      <wsdl:output message="tns:fetchPackageSoapOut" />
-    </wsdl:operation>
-    <wsdl:operation name="fetchPackageByVersion">
-      <wsdl:input message="tns:fetchPackageByVersionSoapIn" />
-      <wsdl:output message="tns:fetchPackageByVersionSoapOut" />
-    </wsdl:operation>
-    <wsdl:operation name="fetchProtectedPackage">
-      <wsdl:input message="tns:fetchProtectedPackageSoapIn" />
-      <wsdl:output message="tns:fetchProtectedPackageSoapOut" />
-    </wsdl:operation>
-    <wsdl:operation name="SubmitPackage">
-      <wsdl:input message="tns:SubmitPackageSoapIn" />
-      <wsdl:output message="tns:SubmitPackageSoapOut" />
-    </wsdl:operation>
-    <wsdl:operation name="PackageByGuid">
-      <wsdl:input message="tns:PackageByGuidSoapIn" />
-      <wsdl:output message="tns:PackageByGuidSoapOut" />
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:portType name="RepositoryHttpGet">
-    <wsdl:operation name="Categories">
-      <wsdl:input message="tns:CategoriesHttpGetIn" />
-      <wsdl:output message="tns:CategoriesHttpGetOut" />
-    </wsdl:operation>
-    <wsdl:operation name="Modules">
-      <wsdl:input message="tns:ModulesHttpGetIn" />
-      <wsdl:output message="tns:ModulesHttpGetOut" />
-    </wsdl:operation>
-    <wsdl:operation name="ModulesCategorized">
-      <wsdl:input message="tns:ModulesCategorizedHttpGetIn" />
-      <wsdl:output message="tns:ModulesCategorizedHttpGetOut" />
-    </wsdl:operation>
-    <wsdl:operation name="Nitros">
-      <wsdl:input message="tns:NitrosHttpGetIn" />
-      <wsdl:output message="tns:NitrosHttpGetOut" />
-    </wsdl:operation>
-    <wsdl:operation name="NitrosCategorized">
-      <wsdl:input message="tns:NitrosCategorizedHttpGetIn" />
-      <wsdl:output message="tns:NitrosCategorizedHttpGetOut" />
-    </wsdl:operation>
-    <wsdl:operation name="authenticate">
-      <wsdl:input message="tns:authenticateHttpGetIn" />
-      <wsdl:output message="tns:authenticateHttpGetOut" />
-    </wsdl:operation>
-    <wsdl:operation name="fetchPackage">
-      <wsdl:input message="tns:fetchPackageHttpGetIn" />
-      <wsdl:output message="tns:fetchPackageHttpGetOut" />
-    </wsdl:operation>
-    <wsdl:operation name="fetchPackageByVersion">
-      <wsdl:input message="tns:fetchPackageByVersionHttpGetIn" />
-      <wsdl:output message="tns:fetchPackageByVersionHttpGetOut" />
-    </wsdl:operation>
-    <wsdl:operation name="fetchProtectedPackage">
-      <wsdl:input message="tns:fetchProtectedPackageHttpGetIn" />
-      <wsdl:output message="tns:fetchProtectedPackageHttpGetOut" />
-    </wsdl:operation>
-    <wsdl:operation name="SubmitPackage">
-      <wsdl:input message="tns:SubmitPackageHttpGetIn" />
-      <wsdl:output message="tns:SubmitPackageHttpGetOut" />
-    </wsdl:operation>
-    <wsdl:operation name="PackageByGuid">
-      <wsdl:input message="tns:PackageByGuidHttpGetIn" />
-      <wsdl:output message="tns:PackageByGuidHttpGetOut" />
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:portType name="RepositoryHttpPost">
-    <wsdl:operation name="Categories">
-      <wsdl:input message="tns:CategoriesHttpPostIn" />
-      <wsdl:output message="tns:CategoriesHttpPostOut" />
-    </wsdl:operation>
-    <wsdl:operation name="Modules">
-      <wsdl:input message="tns:ModulesHttpPostIn" />
-      <wsdl:output message="tns:ModulesHttpPostOut" />
-    </wsdl:operation>
-    <wsdl:operation name="ModulesCategorized">
-      <wsdl:input message="tns:ModulesCategorizedHttpPostIn" />
-      <wsdl:output message="tns:ModulesCategorizedHttpPostOut" />
-    </wsdl:operation>
-    <wsdl:operation name="Nitros">
-      <wsdl:input message="tns:NitrosHttpPostIn" />
-      <wsdl:output message="tns:NitrosHttpPostOut" />
-    </wsdl:operation>
-    <wsdl:operation name="NitrosCategorized">
-      <wsdl:input message="tns:NitrosCategorizedHttpPostIn" />
-      <wsdl:output message="tns:NitrosCategorizedHttpPostOut" />
-    </wsdl:operation>
-    <wsdl:operation name="authenticate">
-      <wsdl:input message="tns:authenticateHttpPostIn" />
-      <wsdl:output message="tns:authenticateHttpPostOut" />
-    </wsdl:operation>
-    <wsdl:operation name="fetchPackage">
-      <wsdl:input message="tns:fetchPackageHttpPostIn" />
-      <wsdl:output message="tns:fetchPackageHttpPostOut" />
-    </wsdl:operation>
-    <wsdl:operation name="fetchPackageByVersion">
-      <wsdl:input message="tns:fetchPackageByVersionHttpPostIn" />
-      <wsdl:output message="tns:fetchPackageByVersionHttpPostOut" />
-    </wsdl:operation>
-    <wsdl:operation name="fetchProtectedPackage">
-      <wsdl:input message="tns:fetchProtectedPackageHttpPostIn" />
-      <wsdl:output message="tns:fetchProtectedPackageHttpPostOut" />
-    </wsdl:operation>
-    <wsdl:operation name="SubmitPackage">
-      <wsdl:input message="tns:SubmitPackageHttpPostIn" />
-      <wsdl:output message="tns:SubmitPackageHttpPostOut" />
-    </wsdl:operation>
-    <wsdl:operation name="PackageByGuid">
-      <wsdl:input message="tns:PackageByGuidHttpPostIn" />
-      <wsdl:output message="tns:PackageByGuidHttpPostOut" />
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="RepositorySoap" type="tns:RepositorySoap">
-    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" />
-    <wsdl:operation name="Categories">
-      <soap:operation soapAction="http://packages.umbraco.org/webservices/Categories" style="document" />
-      <wsdl:input>
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="Modules">
-      <soap:operation soapAction="http://packages.umbraco.org/webservices/Modules" style="document" />
-      <wsdl:input>
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="ModulesCategorized">
-      <soap:operation soapAction="http://packages.umbraco.org/webservices/ModulesCategorized" style="document" />
-      <wsdl:input>
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="Nitros">
-      <soap:operation soapAction="http://packages.umbraco.org/webservices/Nitros" style="document" />
-      <wsdl:input>
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="NitrosCategorized">
-      <soap:operation soapAction="http://packages.umbraco.org/webservices/NitrosCategorized" style="document" />
-      <wsdl:input>
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="authenticate">
-      <soap:operation soapAction="http://packages.umbraco.org/webservices/authenticate" style="document" />
-      <wsdl:input>
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="fetchPackage">
-      <soap:operation soapAction="http://packages.umbraco.org/webservices/fetchPackage" style="document" />
-      <wsdl:input>
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="fetchPackageByVersion">
-      <soap:operation soapAction="http://packages.umbraco.org/webservices/fetchPackageByVersion" style="document" />
-      <wsdl:input>
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="fetchProtectedPackage">
-      <soap:operation soapAction="http://packages.umbraco.org/webservices/fetchProtectedPackage" style="document" />
-      <wsdl:input>
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="SubmitPackage">
-      <soap:operation soapAction="http://packages.umbraco.org/webservices/SubmitPackage" style="document" />
-      <wsdl:input>
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="PackageByGuid">
-      <soap:operation soapAction="http://packages.umbraco.org/webservices/PackageByGuid" style="document" />
-      <wsdl:input>
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:binding name="RepositorySoap12" type="tns:RepositorySoap">
-    <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" />
-    <wsdl:operation name="Categories">
-      <soap12:operation soapAction="http://packages.umbraco.org/webservices/Categories" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="Modules">
-      <soap12:operation soapAction="http://packages.umbraco.org/webservices/Modules" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="ModulesCategorized">
-      <soap12:operation soapAction="http://packages.umbraco.org/webservices/ModulesCategorized" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="Nitros">
-      <soap12:operation soapAction="http://packages.umbraco.org/webservices/Nitros" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="NitrosCategorized">
-      <soap12:operation soapAction="http://packages.umbraco.org/webservices/NitrosCategorized" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="authenticate">
-      <soap12:operation soapAction="http://packages.umbraco.org/webservices/authenticate" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="fetchPackage">
-      <soap12:operation soapAction="http://packages.umbraco.org/webservices/fetchPackage" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="fetchPackageByVersion">
-      <soap12:operation soapAction="http://packages.umbraco.org/webservices/fetchPackageByVersion" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="fetchProtectedPackage">
-      <soap12:operation soapAction="http://packages.umbraco.org/webservices/fetchProtectedPackage" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="SubmitPackage">
-      <soap12:operation soapAction="http://packages.umbraco.org/webservices/SubmitPackage" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="PackageByGuid">
-      <soap12:operation soapAction="http://packages.umbraco.org/webservices/PackageByGuid" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:binding name="RepositoryHttpGet" type="tns:RepositoryHttpGet">
-    <http:binding verb="GET" />
-    <wsdl:operation name="Categories">
-      <http:operation location="/Categories" />
-      <wsdl:input>
-        <http:urlEncoded />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="Modules">
-      <http:operation location="/Modules" />
-      <wsdl:input>
-        <http:urlEncoded />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="ModulesCategorized">
-      <http:operation location="/ModulesCategorized" />
-      <wsdl:input>
-        <http:urlEncoded />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="Nitros">
-      <http:operation location="/Nitros" />
-      <wsdl:input>
-        <http:urlEncoded />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="NitrosCategorized">
-      <http:operation location="/NitrosCategorized" />
-      <wsdl:input>
-        <http:urlEncoded />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="authenticate">
-      <http:operation location="/authenticate" />
-      <wsdl:input>
-        <http:urlEncoded />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="fetchPackage">
-      <http:operation location="/fetchPackage" />
-      <wsdl:input>
-        <http:urlEncoded />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="fetchPackageByVersion">
-      <http:operation location="/fetchPackageByVersion" />
-      <wsdl:input>
-        <http:urlEncoded />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="fetchProtectedPackage">
-      <http:operation location="/fetchProtectedPackage" />
-      <wsdl:input>
-        <http:urlEncoded />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="SubmitPackage">
-      <http:operation location="/SubmitPackage" />
-      <wsdl:input>
-        <http:urlEncoded />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="PackageByGuid">
-      <http:operation location="/PackageByGuid" />
-      <wsdl:input>
-        <http:urlEncoded />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:binding name="RepositoryHttpPost" type="tns:RepositoryHttpPost">
-    <http:binding verb="POST" />
-    <wsdl:operation name="Categories">
-      <http:operation location="/Categories" />
-      <wsdl:input>
-        <mime:content type="application/x-www-form-urlencoded" />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="Modules">
-      <http:operation location="/Modules" />
-      <wsdl:input>
-        <mime:content type="application/x-www-form-urlencoded" />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="ModulesCategorized">
-      <http:operation location="/ModulesCategorized" />
-      <wsdl:input>
-        <mime:content type="application/x-www-form-urlencoded" />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="Nitros">
-      <http:operation location="/Nitros" />
-      <wsdl:input>
-        <mime:content type="application/x-www-form-urlencoded" />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="NitrosCategorized">
-      <http:operation location="/NitrosCategorized" />
-      <wsdl:input>
-        <mime:content type="application/x-www-form-urlencoded" />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="authenticate">
-      <http:operation location="/authenticate" />
-      <wsdl:input>
-        <mime:content type="application/x-www-form-urlencoded" />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="fetchPackage">
-      <http:operation location="/fetchPackage" />
-      <wsdl:input>
-        <mime:content type="application/x-www-form-urlencoded" />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="fetchPackageByVersion">
-      <http:operation location="/fetchPackageByVersion" />
-      <wsdl:input>
-        <mime:content type="application/x-www-form-urlencoded" />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="fetchProtectedPackage">
-      <http:operation location="/fetchProtectedPackage" />
-      <wsdl:input>
-        <mime:content type="application/x-www-form-urlencoded" />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="SubmitPackage">
-      <http:operation location="/SubmitPackage" />
-      <wsdl:input>
-        <mime:content type="application/x-www-form-urlencoded" />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="PackageByGuid">
-      <http:operation location="/PackageByGuid" />
-      <wsdl:input>
-        <mime:content type="application/x-www-form-urlencoded" />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="Repository">
-    <wsdl:port name="RepositorySoap" binding="tns:RepositorySoap">
-      <soap:address location="https://our.umbraco.com/umbraco/webservices/api/repository.asmx" />
-    </wsdl:port>
-    <wsdl:port name="RepositorySoap12" binding="tns:RepositorySoap12">
-      <soap12:address location="https://our.umbraco.com/umbraco/webservices/api/repository.asmx" />
-    </wsdl:port>
-    <wsdl:port name="RepositoryHttpGet" binding="tns:RepositoryHttpGet">
-      <http:address location="https://our.umbraco.com/umbraco/webservices/api/repository.asmx" />
-    </wsdl:port>
-    <wsdl:port name="RepositoryHttpPost" binding="tns:RepositoryHttpPost">
-      <http:address location="https://our.umbraco.com/umbraco/webservices/api/repository.asmx" />
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>
\ No newline at end of file

From ca75a258029bf076ed1c00bbeb7e7456da2f10cd Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Wed, 24 Jul 2019 11:32:18 +0200
Subject: [PATCH 191/776] Makes checks a little more robust

---
 .../PropertyEditors/TagsPropertyEditor.cs           | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
index b7101aa764..578b6fcd00 100644
--- a/src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
@@ -39,14 +39,23 @@ namespace Umbraco.Web.PropertyEditors
             /// <inheritdoc />
             public override object FromEditor(ContentPropertyData editorValue, object currentValue)
             {
+                var value = editorValue?.Value?.ToString();
+
+                if (string.IsNullOrEmpty(value))
+                {
+                    return null;
+                }
+
                 if (editorValue.Value is JArray json)
                 {
                     return json.Select(x => x.Value<string>());
                 }
-                else if ( editorValue.Value is string stringValue && !String.IsNullOrWhiteSpace(stringValue))
+
+                if (string.IsNullOrWhiteSpace(value) == false)
                 {
-                    return stringValue.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries);
+                    return value.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries);
                 }
+
                 return null;
             }
 

From 361557dc39969299edb0f57d89b47d0e76d31369 Mon Sep 17 00:00:00 2001
From: Steve Megson <steve@megson.org>
Date: Sun, 21 Jul 2019 15:19:17 +0100
Subject: [PATCH 192/776] Handle CSV values in TagsPropertyEditor

(cherry picked from commit a97604d6c405c7ebf6372f69807193e8cbbc7a50)
---
 .../PropertyEditors/TagsPropertyEditor.cs         | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
index 90527a8b8d..b7101aa764 100644
--- a/src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using Newtonsoft.Json.Linq;
@@ -38,9 +39,15 @@ namespace Umbraco.Web.PropertyEditors
             /// <inheritdoc />
             public override object FromEditor(ContentPropertyData editorValue, object currentValue)
             {
-                return editorValue.Value is JArray json
-                    ? json.Select(x => x.Value<string>())
-                    : null;
+                if (editorValue.Value is JArray json)
+                {
+                    return json.Select(x => x.Value<string>());
+                }
+                else if ( editorValue.Value is string stringValue && !String.IsNullOrWhiteSpace(stringValue))
+                {
+                    return stringValue.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries);
+                }
+                return null;
             }
 
             /// <inheritdoc />

From 17527c99ebbf80de6ec2d5e75a044eca717a5be9 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Wed, 24 Jul 2019 11:32:18 +0200
Subject: [PATCH 193/776] Makes checks a little more robust

(cherry picked from commit ca75a258029bf076ed1c00bbeb7e7456da2f10cd)
---
 .../PropertyEditors/TagsPropertyEditor.cs           | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
index b7101aa764..578b6fcd00 100644
--- a/src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
@@ -39,14 +39,23 @@ namespace Umbraco.Web.PropertyEditors
             /// <inheritdoc />
             public override object FromEditor(ContentPropertyData editorValue, object currentValue)
             {
+                var value = editorValue?.Value?.ToString();
+
+                if (string.IsNullOrEmpty(value))
+                {
+                    return null;
+                }
+
                 if (editorValue.Value is JArray json)
                 {
                     return json.Select(x => x.Value<string>());
                 }
-                else if ( editorValue.Value is string stringValue && !String.IsNullOrWhiteSpace(stringValue))
+
+                if (string.IsNullOrWhiteSpace(value) == false)
                 {
-                    return stringValue.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries);
+                    return value.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries);
                 }
+
                 return null;
             }
 

From efd6bd82bd9f31c32d2b507cb79e140ff070129e Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 12 Jul 2019 11:23:36 +1000
Subject: [PATCH 194/776] Revert "V8: Don't show multiple open menus (take two)
 (#5609)"

This reverts commit 9ce996cbba49199423f4e79e223497d5c3c8cd4f.

(cherry picked from commit 1d49c8626ec40519a19764959b18efb2868d8f61)
---
 .../components/events/events.directive.js      | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/events/events.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/events/events.directive.js
index 47e6818466..15e74bbd90 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/events/events.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/events/events.directive.js
@@ -101,14 +101,14 @@ angular.module('umbraco.directives')
             var eventBindings = [];
 
             function oneTimeClick(event) {
-                // ignore clicks on button groups toggles (i.e. the save and publish button)
-                var parents = $(event.target).closest("[data-element='button-group-toggle']");
-                if (parents.length > 0) {
-                    return;
-                }
+                var el = event.target.nodeName;
+
+                //ignore link and button clicks
+                var els = ["INPUT", "A", "BUTTON"];
+                if (els.indexOf(el) >= 0) { return; }
 
                 // ignore clicks on new overlay
-                parents = $(event.target).parents(".umb-overlay,.umb-tour");
+                var parents = $(event.target).parents("a,button,.umb-overlay,.umb-tour");
                 if (parents.length > 0) {
                     return;
                 }
@@ -131,12 +131,6 @@ angular.module('umbraco.directives')
                     return;
                 }
 
-                // ignore clicks on dialog actions
-                var actions = $(event.target).parents(".umb-action");
-                if (actions.length === 1) {
-                    return;
-                }
-
                 //ignore clicks inside this element
                 if ($(element).has($(event.target)).length > 0) {
                     return;

From 7bc7dba86d4d7bd3d45f8b73c53006cc7f3ef61f Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 24 Jul 2019 21:46:19 +1000
Subject: [PATCH 195/776] fixes timing issue

---
 .../Web/PublishedContentQueryTests.cs         | 36 ++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/Umbraco.Tests/Web/PublishedContentQueryTests.cs b/src/Umbraco.Tests/Web/PublishedContentQueryTests.cs
index 2cff946372..a3505aeb0e 100644
--- a/src/Umbraco.Tests/Web/PublishedContentQueryTests.cs
+++ b/src/Umbraco.Tests/Web/PublishedContentQueryTests.cs
@@ -36,22 +36,26 @@ namespace Umbraco.Tests.Web
         {
             var indexer = new TestIndex("TestIndex", luceneDirectory, fieldNames);
 
-            //populate with some test data
-            indexer.IndexItem(new ValueSet("1", "content", new Dictionary<string, object>
+            using (indexer.ProcessNonAsync())
             {
-                [fieldNames[0]] = "Hello world, there are products here",
-                [UmbracoContentIndex.VariesByCultureFieldName] = "n"
-            }));
-            indexer.IndexItem(new ValueSet("2", "content", new Dictionary<string, object>
-            {
-                [fieldNames[1]] = "Hello world, there are products here",
-                [UmbracoContentIndex.VariesByCultureFieldName] = "y"
-            }));
-            indexer.IndexItem(new ValueSet("3", "content", new Dictionary<string, object>
-            {
-                [fieldNames[2]] = "Hello world, there are products here",
-                [UmbracoContentIndex.VariesByCultureFieldName] = "y"
-            }));
+                //populate with some test data
+                indexer.IndexItem(new ValueSet("1", "content", new Dictionary<string, object>
+                {
+                    [fieldNames[0]] = "Hello world, there are products here",
+                    [UmbracoContentIndex.VariesByCultureFieldName] = "n"
+                }));
+                indexer.IndexItem(new ValueSet("2", "content", new Dictionary<string, object>
+                {
+                    [fieldNames[1]] = "Hello world, there are products here",
+                    [UmbracoContentIndex.VariesByCultureFieldName] = "y"
+                }));
+                indexer.IndexItem(new ValueSet("3", "content", new Dictionary<string, object>
+                {
+                    [fieldNames[2]] = "Hello world, there are products here",
+                    [UmbracoContentIndex.VariesByCultureFieldName] = "y"
+                }));
+            }
+            
             return indexer;
         }
 
@@ -80,7 +84,7 @@ namespace Umbraco.Tests.Web
             {
                 var fieldNames = new[] { "title", "title_en-us", "title_fr-fr" };
                 using (var indexer = CreateTestIndex(luceneDir, fieldNames))
-                {
+                {   
                     var pcq = CreatePublishedContentQuery(indexer);
 
                     var results = pcq.Search("Products", culture, "TestIndex");

From 0ab84fc44357928e580329f19a6ede5da9ce365a Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Thu, 25 Jul 2019 10:28:16 +0200
Subject: [PATCH 196/776] Allow removing user start nodes

---
 .../src/views/users/views/user/details.html                     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html b/src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
index 793f404f0c..881d7a9c0d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
@@ -90,6 +90,7 @@
                                       ng-repeat="node in model.user.startContentIds"
                                       icon="node.icon"
                                       name="node.name"
+                                      allow-remove="true"
                                       on-remove="model.removeSelectedItem($index, model.user.startContentIds)">
                     </umb-node-preview>
 
@@ -114,6 +115,7 @@
                                       ng-repeat="node in model.user.startMediaIds"
                                       icon="node.icon"
                                       name="node.name"
+                                      allow-remove="true"
                                       on-remove="model.removeSelectedItem($index, model.user.startMediaIds)">
                     </umb-node-preview>
 

From 4a24064783efb45f7eed1db9833ca1f8b9012f3d Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Sat, 27 Jul 2019 20:41:15 +0100
Subject: [PATCH 197/776] Value Set builder shouldn't stop indexing when one
 field is empty in value sets

---
 src/Umbraco.Examine/BaseValueSetBuilder.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Examine/BaseValueSetBuilder.cs b/src/Umbraco.Examine/BaseValueSetBuilder.cs
index 22d379d148..93cee88231 100644
--- a/src/Umbraco.Examine/BaseValueSetBuilder.cs
+++ b/src/Umbraco.Examine/BaseValueSetBuilder.cs
@@ -45,7 +45,7 @@ namespace Umbraco.Examine
                             continue;
                         case string strVal:
                             {
-                                if (strVal.IsNullOrWhiteSpace()) return;
+                                if (strVal.IsNullOrWhiteSpace()) continue;
                                 var key = $"{keyVal.Key}{cultureSuffix}";
                                 if (values.TryGetValue(key, out var v))
                                     values[key] = new List<object>(v) { val }.ToArray();

From 41093e5b8b59ecd7a71dae7ec3fddb5e672e9a2d Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 29 Jul 2019 15:38:08 +1000
Subject: [PATCH 198/776] Value Set builder shouldn't stop indexing when one
 field is empty in value sets

---
 src/Umbraco.Examine/BaseValueSetBuilder.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Examine/BaseValueSetBuilder.cs b/src/Umbraco.Examine/BaseValueSetBuilder.cs
index 22d379d148..93cee88231 100644
--- a/src/Umbraco.Examine/BaseValueSetBuilder.cs
+++ b/src/Umbraco.Examine/BaseValueSetBuilder.cs
@@ -45,7 +45,7 @@ namespace Umbraco.Examine
                             continue;
                         case string strVal:
                             {
-                                if (strVal.IsNullOrWhiteSpace()) return;
+                                if (strVal.IsNullOrWhiteSpace()) continue;
                                 var key = $"{keyVal.Key}{cultureSuffix}";
                                 if (values.TryGetValue(key, out var v))
                                     values[key] = new List<object>(v) { val }.ToArray();

From 4612c036576468ad6f24240686b823034cf7254f Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 29 Jul 2019 15:43:03 +1000
Subject: [PATCH 199/776] Fixes #5789 - PublishedContentQuery Search always
 searches on culture

---
 src/Umbraco.Examine/ExamineExtensions.cs      | 25 +++++
 .../TestHelpers/RandomIdRamDirectory.cs       | 22 +++++
 src/Umbraco.Tests/Umbraco.Tests.csproj        |  2 +
 .../Web/PublishedContentQueryTests.cs         | 99 +++++++++++++++++++
 src/Umbraco.Tests/Web/UmbracoHelperTests.cs   | 10 +-
 src/Umbraco.Web/IPublishedContentQuery.cs     | 16 ++-
 src/Umbraco.Web/PublishedContentQuery.cs      | 40 +++++---
 src/Umbraco.Web/UmbracoContextFactory.cs      |  8 ++
 8 files changed, 203 insertions(+), 19 deletions(-)
 create mode 100644 src/Umbraco.Tests/TestHelpers/RandomIdRamDirectory.cs
 create mode 100644 src/Umbraco.Tests/Web/PublishedContentQueryTests.cs

diff --git a/src/Umbraco.Examine/ExamineExtensions.cs b/src/Umbraco.Examine/ExamineExtensions.cs
index 43a3ccc196..376950c95e 100644
--- a/src/Umbraco.Examine/ExamineExtensions.cs
+++ b/src/Umbraco.Examine/ExamineExtensions.cs
@@ -48,6 +48,31 @@ namespace Umbraco.Examine
             }
         }
 
+        /// <summary>
+        /// Returns all index fields that are culture specific (suffixed) or invariant
+        /// </summary>
+        /// <param name="index"></param>
+        /// <param name="culture"></param>
+        /// <returns></returns>
+        public static IEnumerable<string> GetCultureAndInvariantFields(this IUmbracoIndex index, string culture)
+        {
+            var allFields = index.GetFields();
+            // ReSharper disable once LoopCanBeConvertedToQuery
+            foreach (var field in allFields)
+            {
+                var match = CultureIsoCodeFieldNameMatchExpression.Match(field);
+                if (match.Success && match.Groups.Count == 3 && culture.InvariantEquals(match.Groups[2].Value))
+                {
+                    yield return field; //matches this culture field
+                }
+                else if (!match.Success)
+                {
+                    yield return field; //matches no culture field (invariant)
+                }
+                    
+            }
+        }
+
         internal static bool TryParseLuceneQuery(string query)
         {
             // TODO: I'd assume there would be a more strict way to parse the query but not that i can find yet, for now we'll
diff --git a/src/Umbraco.Tests/TestHelpers/RandomIdRamDirectory.cs b/src/Umbraco.Tests/TestHelpers/RandomIdRamDirectory.cs
new file mode 100644
index 0000000000..34904db1ae
--- /dev/null
+++ b/src/Umbraco.Tests/TestHelpers/RandomIdRamDirectory.cs
@@ -0,0 +1,22 @@
+using Lucene.Net.Store;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Umbraco.Tests.TestHelpers
+{
+
+    /// <summary>
+    /// Used for tests with Lucene so that each RAM directory is unique
+    /// </summary>
+    public class RandomIdRAMDirectory : RAMDirectory
+    {
+        private readonly string _lockId = Guid.NewGuid().ToString();
+        public override string GetLockId()
+        {
+            return _lockId;
+        }
+    }
+}
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index f41ff1dd07..717006b702 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -157,6 +157,7 @@
     <Compile Include="Services\MemberGroupServiceTests.cs" />
     <Compile Include="Services\MediaTypeServiceTests.cs" />
     <Compile Include="Services\PropertyValidationServiceTests.cs" />
+    <Compile Include="TestHelpers\RandomIdRamDirectory.cs" />
     <Compile Include="Testing\Objects\TestDataSource.cs" />
     <Compile Include="Published\PublishedSnapshotTestObjects.cs" />
     <Compile Include="Published\ModelTypeTests.cs" />
@@ -268,6 +269,7 @@
     <Compile Include="Strings\StylesheetHelperTests.cs" />
     <Compile Include="Strings\StringValidationTests.cs" />
     <Compile Include="Web\Mvc\ValidateUmbracoFormRouteStringAttributeTests.cs" />
+    <Compile Include="Web\PublishedContentQueryTests.cs" />
     <Compile Include="Web\UmbracoHelperTests.cs" />
     <Compile Include="Membership\MembershipProviderBaseTests.cs" />
     <Compile Include="Membership\UmbracoServiceMembershipProviderTests.cs" />
diff --git a/src/Umbraco.Tests/Web/PublishedContentQueryTests.cs b/src/Umbraco.Tests/Web/PublishedContentQueryTests.cs
new file mode 100644
index 0000000000..a3505aeb0e
--- /dev/null
+++ b/src/Umbraco.Tests/Web/PublishedContentQueryTests.cs
@@ -0,0 +1,99 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Examine;
+using Examine.LuceneEngine.Providers;
+using Lucene.Net.Store;
+using Moq;
+using NUnit.Framework;
+using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Examine;
+using Umbraco.Tests.TestHelpers;
+using Umbraco.Web;
+using Umbraco.Web.PublishedCache;
+
+namespace Umbraco.Tests.Web
+{
+    [TestFixture]
+    public class PublishedContentQueryTests
+    {
+
+        private class TestIndex : LuceneIndex, IUmbracoIndex
+        {
+            private readonly string[] _fieldNames;
+
+            public TestIndex(string name, Directory luceneDirectory, string[] fieldNames)
+                : base(name, luceneDirectory, null, null, null, null)
+            {
+                _fieldNames = fieldNames;
+            }
+            public bool EnableDefaultEventHandler => throw new NotImplementedException();
+            public bool PublishedValuesOnly => throw new NotImplementedException();
+            public IEnumerable<string> GetFields() => _fieldNames;
+        }
+
+        private TestIndex CreateTestIndex(Directory luceneDirectory, string[] fieldNames)
+        {
+            var indexer = new TestIndex("TestIndex", luceneDirectory, fieldNames);
+
+            using (indexer.ProcessNonAsync())
+            {
+                //populate with some test data
+                indexer.IndexItem(new ValueSet("1", "content", new Dictionary<string, object>
+                {
+                    [fieldNames[0]] = "Hello world, there are products here",
+                    [UmbracoContentIndex.VariesByCultureFieldName] = "n"
+                }));
+                indexer.IndexItem(new ValueSet("2", "content", new Dictionary<string, object>
+                {
+                    [fieldNames[1]] = "Hello world, there are products here",
+                    [UmbracoContentIndex.VariesByCultureFieldName] = "y"
+                }));
+                indexer.IndexItem(new ValueSet("3", "content", new Dictionary<string, object>
+                {
+                    [fieldNames[2]] = "Hello world, there are products here",
+                    [UmbracoContentIndex.VariesByCultureFieldName] = "y"
+                }));
+            }
+            
+            return indexer;
+        }
+
+        private PublishedContentQuery CreatePublishedContentQuery(IIndex indexer)
+        {
+            var examineManager = new Mock<IExamineManager>();
+            IIndex outarg = indexer;
+            examineManager.Setup(x => x.TryGetIndex("TestIndex", out outarg)).Returns(true);
+
+            var contentCache = new Mock<IPublishedContentCache>();
+            contentCache.Setup(x => x.GetById(It.IsAny<int>())).Returns((int intId) => Mock.Of<IPublishedContent>(x => x.Id == intId));
+            var snapshot = Mock.Of<IPublishedSnapshot>(x => x.Content == contentCache.Object);
+            var variationContext = new VariationContext();
+            var variationContextAccessor = Mock.Of<IVariationContextAccessor>(x => x.VariationContext == variationContext);
+
+            return new PublishedContentQuery(snapshot, variationContextAccessor, examineManager.Object);
+        }
+
+        [TestCase("fr-fr", ExpectedResult = "1, 3", TestName = "Search Culture: fr-fr. Must return both fr-fr and invariant results")]
+        [TestCase("en-us", ExpectedResult = "1, 2", TestName = "Search Culture: en-us. Must return both en-us and invariant results")]
+        [TestCase("*", ExpectedResult = "1, 2, 3", TestName = "Search Culture: *. Must return all cultures and all invariant results")]
+        [TestCase(null, ExpectedResult = "1", TestName = "Search Culture: null. Must return only invariant results")]
+        public string Search(string culture)
+        {
+            using (var luceneDir = new RandomIdRAMDirectory())
+            {
+                var fieldNames = new[] { "title", "title_en-us", "title_fr-fr" };
+                using (var indexer = CreateTestIndex(luceneDir, fieldNames))
+                {   
+                    var pcq = CreatePublishedContentQuery(indexer);
+
+                    var results = pcq.Search("Products", culture, "TestIndex");
+
+                    var ids = results.Select(x => x.Content.Id).ToArray();
+
+                    return string.Join(", ", ids);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Tests/Web/UmbracoHelperTests.cs b/src/Umbraco.Tests/Web/UmbracoHelperTests.cs
index b23b5bd6b7..26d85f60cf 100644
--- a/src/Umbraco.Tests/Web/UmbracoHelperTests.cs
+++ b/src/Umbraco.Tests/Web/UmbracoHelperTests.cs
@@ -1,5 +1,8 @@
 using System;
 using System.Text;
+using Examine.LuceneEngine;
+using Lucene.Net.Analysis;
+using Lucene.Net.Analysis.Standard;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Core;
@@ -13,18 +16,19 @@ using Umbraco.Web;
 
 namespace Umbraco.Tests.Web
 {
+
     [TestFixture]
     public class UmbracoHelperTests
-    {   
+    {
 
         [TearDown]
         public void TearDown()
         {
             Current.Reset();
         }
-        
 
-        
+
+
         // ------- Int32 conversion tests
         [Test]
         public static void Converting_Boxed_34_To_An_Int_Returns_34()
diff --git a/src/Umbraco.Web/IPublishedContentQuery.cs b/src/Umbraco.Web/IPublishedContentQuery.cs
index 76e7be5e97..8a8d678aba 100644
--- a/src/Umbraco.Web/IPublishedContentQuery.cs
+++ b/src/Umbraco.Web/IPublishedContentQuery.cs
@@ -39,10 +39,14 @@ namespace Umbraco.Web
         /// <param name="culture">Optional culture.</param>
         /// <param name="indexName">Optional index name.</param>
         /// <remarks>
-        /// <para>When the <paramref name="culture"/> is not specified, all cultures are searched.</para>
+        /// <para>
+        /// When the <paramref name="culture"/> is not specified or is *, all cultures are searched.
+        /// To search for only invariant documents and fields use null.
+        /// When searching on a specific culture, all culture specific fields are searched for the provided culture and all invariant fields for all documents.
+        /// </para>
         /// <para>While enumerating results, the ambient culture is changed to be the searched culture.</para>
         /// </remarks>
-        IEnumerable<PublishedSearchResult> Search(string term, string culture = null, string indexName = null);
+        IEnumerable<PublishedSearchResult> Search(string term, string culture = "*", string indexName = null);
 
         /// <summary>
         /// Searches content.
@@ -54,10 +58,14 @@ namespace Umbraco.Web
         /// <param name="culture">Optional culture.</param>
         /// <param name="indexName">Optional index name.</param>
         /// <remarks>
-        /// <para>When the <paramref name="culture"/> is not specified, all cultures are searched.</para>
+        /// <para>
+        /// When the <paramref name="culture"/> is not specified or is *, all cultures are searched.
+        /// To search for only invariant documents and fields use null.
+        /// When searching on a specific culture, all culture specific fields are searched for the provided culture and all invariant fields for all documents.
+        /// </para>
         /// <para>While enumerating results, the ambient culture is changed to be the searched culture.</para>
         /// </remarks>
-        IEnumerable<PublishedSearchResult> Search(string term, int skip, int take, out long totalRecords, string culture = null, string indexName = null);
+        IEnumerable<PublishedSearchResult> Search(string term, int skip, int take, out long totalRecords, string culture = "*", string indexName = null);
 
         /// <summary>
         /// Executes the query and converts the results to PublishedSearchResult.
diff --git a/src/Umbraco.Web/PublishedContentQuery.cs b/src/Umbraco.Web/PublishedContentQuery.cs
index 61180580cb..2dbe4de4c5 100644
--- a/src/Umbraco.Web/PublishedContentQuery.cs
+++ b/src/Umbraco.Web/PublishedContentQuery.cs
@@ -20,14 +20,22 @@ namespace Umbraco.Web
     {
         private readonly IPublishedSnapshot _publishedSnapshot;
         private readonly IVariationContextAccessor _variationContextAccessor;
+        private readonly IExamineManager _examineManager;
+
+        [Obsolete("Use the constructor with all parameters instead")]
+        public PublishedContentQuery(IPublishedSnapshot publishedSnapshot, IVariationContextAccessor variationContextAccessor)
+            : this (publishedSnapshot, variationContextAccessor, ExamineManager.Instance)
+        {
+        }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="PublishedContentQuery"/> class.
         /// </summary>
-        public PublishedContentQuery(IPublishedSnapshot publishedSnapshot, IVariationContextAccessor variationContextAccessor)
+        public PublishedContentQuery(IPublishedSnapshot publishedSnapshot, IVariationContextAccessor variationContextAccessor, IExamineManager examineManager)
         {
             _publishedSnapshot = publishedSnapshot ?? throw new ArgumentNullException(nameof(publishedSnapshot));
             _variationContextAccessor = variationContextAccessor ?? throw new ArgumentNullException(nameof(variationContextAccessor));
+            _examineManager = examineManager ?? throw new ArgumentNullException(nameof(examineManager));
         }
 
         #region Content
@@ -175,19 +183,19 @@ namespace Umbraco.Web
         #region Search
 
         /// <inheritdoc />
-        public IEnumerable<PublishedSearchResult> Search(string term, string culture = null, string indexName = null)
+        public IEnumerable<PublishedSearchResult> Search(string term, string culture = "*", string indexName = null)
         {
             return Search(term, 0, 0, out _, culture, indexName);
         }
 
         /// <inheritdoc />
-        public IEnumerable<PublishedSearchResult> Search(string term, int skip, int take, out long totalRecords, string culture = null, string indexName = null)
+        public IEnumerable<PublishedSearchResult> Search(string term, int skip, int take, out long totalRecords, string culture = "*", string indexName = null)
         {
             indexName = string.IsNullOrEmpty(indexName)
                 ? Constants.UmbracoIndexes.ExternalIndexName
                 : indexName;
 
-            if (!ExamineManager.Instance.TryGetIndex(indexName, out var index) || !(index is IUmbracoIndex umbIndex))
+            if (!_examineManager.TryGetIndex(indexName, out var index) || !(index is IUmbracoIndex umbIndex))
                 throw new InvalidOperationException($"No index found by name {indexName} or is not of type {typeof(IUmbracoIndex)}");
 
             var searcher = umbIndex.GetSearcher();
@@ -195,20 +203,28 @@ namespace Umbraco.Web
             // default to max 500 results
             var count = skip == 0 && take == 0 ? 500 : skip + take;
 
-            //set this to the specific culture or to the culture in the request
-            culture = culture ?? _variationContextAccessor.VariationContext.Culture;
-
             ISearchResults results;
-            if (culture.IsNullOrWhiteSpace())
+            if (culture == "*")
             {
+                //search everything
+
                 results = searcher.Search(term, count);
             }
+            else if (culture.IsNullOrWhiteSpace())
+            {
+                //only search invariant
+
+                var qry = searcher.CreateQuery().Field(UmbracoContentIndex.VariesByCultureFieldName, "n"); //must not vary by culture
+                qry = qry.And().ManagedQuery(term);
+                results = qry.Execute(count);
+            }
             else
             {
+                //search only the specified culture
+
                 //get all index fields suffixed with the culture name supplied
-                var cultureFields = umbIndex.GetCultureFields(culture);
-                var qry = searcher.CreateQuery().Field(UmbracoContentIndex.VariesByCultureFieldName, "y"); //must vary by culture
-                qry = qry.And().ManagedQuery(term, cultureFields.ToArray());
+                var cultureFields = umbIndex.GetCultureAndInvariantFields(culture).ToArray();
+                var qry = searcher.CreateQuery().ManagedQuery(term, cultureFields);
                 results = qry.Execute(count);
             }
 
@@ -304,7 +320,7 @@ namespace Umbraco.Web
             }
         }
 
-        
+
 
 
         #endregion
diff --git a/src/Umbraco.Web/UmbracoContextFactory.cs b/src/Umbraco.Web/UmbracoContextFactory.cs
index 2a812036bf..11d8952fa6 100644
--- a/src/Umbraco.Web/UmbracoContextFactory.cs
+++ b/src/Umbraco.Web/UmbracoContextFactory.cs
@@ -53,7 +53,15 @@ namespace Umbraco.Web
         {
             // make sure we have a variation context
             if (_variationContextAccessor.VariationContext == null)
+            {
+                // TODO: By using _defaultCultureAccessor.DefaultCulture this means that the VariationContext will always return a variant culture, it will never
+                // return an empty string signifying that the culture is invariant. But does this matter? Are we actually expecting this to return an empty string
+                // for invariant routes? From what i can tell throughout the codebase is that whenever we are checking against the VariationContext.Culture we are
+                // also checking if the content type varies by culture or not. This is fine, however the code in the ctor of VariationContext is then misleading
+                // since it's assuming that the Culture can be empty (invariant) when in reality of a website this will never be empty since a real culture is always set here.
                 _variationContextAccessor.VariationContext = new VariationContext(_defaultCultureAccessor.DefaultCulture);
+            }
+                
 
             var webSecurity = new WebSecurity(httpContext, _userService, _globalSettings);
 

From 49b3351c72cf5e53f67f583d996d60b88ca52c22 Mon Sep 17 00:00:00 2001
From: Rasmus John Pedersen <mail@rjp.dk>
Date: Mon, 29 Jul 2019 12:59:29 +0200
Subject: [PATCH 200/776] Fix exception when stored media url is already
 absolute

---
 src/Umbraco.Tests/Routing/MediaUrlProviderTests.cs | 13 +++++++++++++
 src/Umbraco.Web/Routing/DefaultMediaUrlProvider.cs |  4 ++++
 2 files changed, 17 insertions(+)

diff --git a/src/Umbraco.Tests/Routing/MediaUrlProviderTests.cs b/src/Umbraco.Tests/Routing/MediaUrlProviderTests.cs
index 5af48e64b1..6489417dc7 100644
--- a/src/Umbraco.Tests/Routing/MediaUrlProviderTests.cs
+++ b/src/Umbraco.Tests/Routing/MediaUrlProviderTests.cs
@@ -81,6 +81,19 @@ namespace Umbraco.Tests.Routing
             Assert.AreEqual(expected, resolvedUrl);
         }
 
+        [Test]
+        public void Get_Media_Url_Returns_Absolute_Url_If_Stored_Url_Is_Absolute()
+        {
+            const string expected = "http://localhost/media/rfeiw584/test.jpg";
+
+            var umbracoContext = GetUmbracoContext("http://localhost", mediaUrlProviders: new[] { _mediaUrlProvider });
+            var publishedContent = CreatePublishedContent(Constants.PropertyEditors.Aliases.UploadField, expected, null);
+
+            var resolvedUrl = umbracoContext.UrlProvider.GetMediaUrl(publishedContent, UrlMode.Relative);
+
+            Assert.AreEqual(expected, resolvedUrl);
+        }
+
         [Test]
         public void Get_Media_Url_Returns_Empty_String_When_PropertyType_Is_Not_Supported()
         {
diff --git a/src/Umbraco.Web/Routing/DefaultMediaUrlProvider.cs b/src/Umbraco.Web/Routing/DefaultMediaUrlProvider.cs
index 18d10e577d..02dc4ebf29 100644
--- a/src/Umbraco.Web/Routing/DefaultMediaUrlProvider.cs
+++ b/src/Umbraco.Web/Routing/DefaultMediaUrlProvider.cs
@@ -45,6 +45,10 @@ namespace Umbraco.Web.Routing
             if (string.IsNullOrEmpty(path))
                 return null;
 
+            // the stored path is absolute so we just return it as is
+            if(Uri.IsWellFormedUriString(path, UriKind.Absolute))
+                return new Uri(path);
+
             Uri uri;
 
             if (current == null)

From ca56655d07f86d5b21abb2f6d5560e98be2d05e5 Mon Sep 17 00:00:00 2001
From: Rasmus John Pedersen <mail@rjp.dk>
Date: Mon, 29 Jul 2019 12:59:29 +0200
Subject: [PATCH 201/776] Fix exception when stored media url is already
 absolute

(cherry picked from commit 49b3351c72cf5e53f67f583d996d60b88ca52c22)
---
 src/Umbraco.Tests/Routing/MediaUrlProviderTests.cs | 13 +++++++++++++
 src/Umbraco.Web/Routing/DefaultMediaUrlProvider.cs |  4 ++++
 2 files changed, 17 insertions(+)

diff --git a/src/Umbraco.Tests/Routing/MediaUrlProviderTests.cs b/src/Umbraco.Tests/Routing/MediaUrlProviderTests.cs
index 5af48e64b1..6489417dc7 100644
--- a/src/Umbraco.Tests/Routing/MediaUrlProviderTests.cs
+++ b/src/Umbraco.Tests/Routing/MediaUrlProviderTests.cs
@@ -81,6 +81,19 @@ namespace Umbraco.Tests.Routing
             Assert.AreEqual(expected, resolvedUrl);
         }
 
+        [Test]
+        public void Get_Media_Url_Returns_Absolute_Url_If_Stored_Url_Is_Absolute()
+        {
+            const string expected = "http://localhost/media/rfeiw584/test.jpg";
+
+            var umbracoContext = GetUmbracoContext("http://localhost", mediaUrlProviders: new[] { _mediaUrlProvider });
+            var publishedContent = CreatePublishedContent(Constants.PropertyEditors.Aliases.UploadField, expected, null);
+
+            var resolvedUrl = umbracoContext.UrlProvider.GetMediaUrl(publishedContent, UrlMode.Relative);
+
+            Assert.AreEqual(expected, resolvedUrl);
+        }
+
         [Test]
         public void Get_Media_Url_Returns_Empty_String_When_PropertyType_Is_Not_Supported()
         {
diff --git a/src/Umbraco.Web/Routing/DefaultMediaUrlProvider.cs b/src/Umbraco.Web/Routing/DefaultMediaUrlProvider.cs
index 18d10e577d..02dc4ebf29 100644
--- a/src/Umbraco.Web/Routing/DefaultMediaUrlProvider.cs
+++ b/src/Umbraco.Web/Routing/DefaultMediaUrlProvider.cs
@@ -45,6 +45,10 @@ namespace Umbraco.Web.Routing
             if (string.IsNullOrEmpty(path))
                 return null;
 
+            // the stored path is absolute so we just return it as is
+            if(Uri.IsWellFormedUriString(path, UriKind.Absolute))
+                return new Uri(path);
+
             Uri uri;
 
             if (current == null)

From 365ad2981d7cfcf7bfd01fa620bb53f1208e94db Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 30 Jul 2019 19:02:03 +1000
Subject: [PATCH 202/776] Fixing issue when changing a property type from
 invariant to variant and back again and the document always reporting pending
 changes.

---
 .../Persistence/Factories/PropertyFactory.cs  | 43 ++++++++++++-------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Factories/PropertyFactory.cs b/src/Umbraco.Core/Persistence/Factories/PropertyFactory.cs
index f1473b5888..f0937a3781 100644
--- a/src/Umbraco.Core/Persistence/Factories/PropertyFactory.cs
+++ b/src/Umbraco.Core/Persistence/Factories/PropertyFactory.cs
@@ -12,7 +12,7 @@ namespace Umbraco.Core.Persistence.Factories
         public static IEnumerable<Property> BuildEntities(PropertyType[] propertyTypes, IReadOnlyCollection<PropertyDataDto> dtos, int publishedVersionId, ILanguageRepository languageRepository)
         {
             var properties = new List<Property>();
-            var xdtos = dtos.GroupBy(x => x.PropertyTypeId).ToDictionary(x => x.Key, x => (IEnumerable<PropertyDataDto>) x);
+            var xdtos = dtos.GroupBy(x => x.PropertyTypeId).ToDictionary(x => x.Key, x => (IEnumerable<PropertyDataDto>)x);
 
             foreach (var propertyType in propertyTypes)
             {
@@ -130,6 +130,9 @@ namespace Umbraco.Core.Persistence.Factories
                     // publishing = deal with edit and published values
                     foreach (var propertyValue in property.Values)
                     {
+                        var isInvariantValue = propertyValue.Culture == null;
+                        var isCultureValue = propertyValue.Culture != null && propertyValue.Segment == null;
+
                         // deal with published value
                         if (propertyValue.PublishedValue != null && publishedVersionId > 0)
                             propertyDataDtos.Add(BuildDto(publishedVersionId, property, languageRepository.GetIdByIsoCode(propertyValue.Culture), propertyValue.Segment, propertyValue.PublishedValue));
@@ -138,26 +141,34 @@ namespace Umbraco.Core.Persistence.Factories
                         if (propertyValue.EditedValue != null)
                             propertyDataDtos.Add(BuildDto(currentVersionId, property, languageRepository.GetIdByIsoCode(propertyValue.Culture), propertyValue.Segment, propertyValue.EditedValue));
 
+                        // property.Values will contain ALL of it's values, both variant and invariant which will be populated if the administrator has previously
+                        // changed the property type to be variant vs invariant.
+                        // We need to check for this scenario here because otherwise the editedCultures and edited flags
+                        // will end up incorrectly so here we need to only process edited cultures based on the
+                        // current value type and how the property varies.
+
+                        if (property.PropertyType.VariesByCulture() && isInvariantValue) continue;
+                        if (!property.PropertyType.VariesByCulture() && isCultureValue) continue;
+
                         // use explicit equals here, else object comparison fails at comparing eg strings
                         var sameValues = propertyValue.PublishedValue == null ? propertyValue.EditedValue == null : propertyValue.PublishedValue.Equals(propertyValue.EditedValue);
+
                         edited |= !sameValues;
 
-                        if (entityVariesByCulture // cultures can be edited, ie CultureNeutral is supported
-                            && propertyValue.Culture != null && propertyValue.Segment == null // and value is CultureNeutral
-                            && !sameValues) // and edited and published are different
+                        if (entityVariesByCulture && !sameValues)
                         {
-                            editedCultures.Add(propertyValue.Culture); // report culture as edited
-                        }
+                            if (isCultureValue) 
+                            {
+                                editedCultures.Add(propertyValue.Culture); // report culture as edited
+                            }
+                            else if (isInvariantValue)
+                            {
+                                // flag culture as edited if it contains an edited invariant property
+                                if (defaultCulture == null)
+                                    defaultCulture = languageRepository.GetDefaultIsoCode();
 
-                        // flag culture as edited if it contains an edited invariant property
-                        if (propertyValue.Culture == null //invariant property
-                            && !sameValues // and edited and published are different
-                            && entityVariesByCulture) //only when the entity is variant
-                        {
-                            if (defaultCulture == null)
-                                defaultCulture = languageRepository.GetDefaultIsoCode();
-
-                            editedCultures.Add(defaultCulture);
+                                editedCultures.Add(defaultCulture);
+                            }
                         }
                     }
                 }
@@ -167,7 +178,7 @@ namespace Umbraco.Core.Persistence.Factories
                     {
                         // not publishing = only deal with edit values
                         if (propertyValue.EditedValue != null)
-                            propertyDataDtos.Add(BuildDto(currentVersionId, property,  languageRepository.GetIdByIsoCode(propertyValue.Culture), propertyValue.Segment, propertyValue.EditedValue));
+                            propertyDataDtos.Add(BuildDto(currentVersionId, property, languageRepository.GetIdByIsoCode(propertyValue.Culture), propertyValue.Segment, propertyValue.EditedValue));
                     }
                     edited = true;
                 }

From 3930ae244c7c07f4d245c4f6c58d3ce767a9be90 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 24 Jul 2019 19:40:51 +1000
Subject: [PATCH 203/776] Created unit test to show the problem.

---
 .../Services/ContentServiceTests.cs           | 55 +++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs
index 222f40aeed..a719e04b2a 100644
--- a/src/Umbraco.Tests/Services/ContentServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs
@@ -761,6 +761,61 @@ namespace Umbraco.Tests.Services
 
         }
 
+        [Test]
+        public void Unpublish_All_Cultures_Has_Unpublished_State()
+        {
+            // Arrange
+
+            var langUk = new Language("en-GB") { IsDefault = true };
+            var langFr = new Language("fr-FR");
+
+            ServiceContext.LocalizationService.Save(langFr);
+            ServiceContext.LocalizationService.Save(langUk);
+
+            var contentType = MockedContentTypes.CreateBasicContentType();
+            contentType.Variations = ContentVariation.Culture;
+            ServiceContext.ContentTypeService.Save(contentType);
+
+            IContent content = new Content("content", Constants.System.Root, contentType);
+            content.SetCultureName("content-fr", langFr.IsoCode);
+            content.SetCultureName("content-en", langUk.IsoCode);
+            
+            var published = ServiceContext.ContentService.SaveAndPublish(content, new[] { langFr.IsoCode, langUk.IsoCode });
+            Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode));
+            Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
+            Assert.IsTrue(published.Success);
+            Assert.AreEqual(PublishedState.Published, content.PublishedState);
+
+            //re-get
+            content = ServiceContext.ContentService.GetById(content.Id);
+            Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode));
+            Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
+            Assert.AreEqual(PublishedState.Published, content.PublishedState);
+
+            var unpublished = ServiceContext.ContentService.Unpublish(content, langFr.IsoCode);
+            Assert.IsTrue(unpublished.Success);
+            Assert.AreEqual(PublishResultType.SuccessUnpublishCulture, unpublished.Result);
+            Assert.IsFalse(content.IsCulturePublished(langFr.IsoCode));
+            Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
+            Assert.AreEqual(PublishedState.Published, content.PublishedState); //still published
+
+            //re-get
+            content = ServiceContext.ContentService.GetById(content.Id);
+            Assert.IsFalse(content.IsCulturePublished(langFr.IsoCode));
+            Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
+
+            unpublished = ServiceContext.ContentService.Unpublish(content, langUk.IsoCode);
+            Assert.IsTrue(unpublished.Success);
+            Assert.AreEqual(PublishResultType.SuccessUnpublishCulture, unpublished.Result);
+            Assert.IsFalse(content.IsCulturePublished(langFr.IsoCode));
+            Assert.IsFalse(content.IsCulturePublished(langUk.IsoCode));
+            Assert.AreEqual(PublishedState.Unpublished, content.PublishedState); //the last culture was unpublished so the document should also reflect this
+
+            //re-get
+            content = ServiceContext.ContentService.GetById(content.Id);
+            Assert.AreEqual(PublishedState.Unpublished, content.PublishedState); //just double checking
+        }
+
         [Test]
         public void Pending_Invariant_Property_Changes_Affect_Default_Language_Edited_State()
         {

From 1bfcc9053ebbe5f35321f89194b08e75d5837a31 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 24 Jul 2019 23:59:31 +1000
Subject: [PATCH 204/776] Fixes issues: we never properly used
 SuccessUnpublishMandatoryCulture, fixed issue of unpublishing last culture
 with a new status

---
 src/Umbraco.Core/Exceptions/PanicException.cs |  28 +++
 .../Services/Implement/ContentService.cs      | 172 +++++++++++++-----
 .../Services/PublishResultType.cs             |   7 +-
 src/Umbraco.Core/Umbraco.Core.csproj          |   1 +
 .../Services/ContentServiceTests.cs           |  38 +++-
 5 files changed, 199 insertions(+), 47 deletions(-)
 create mode 100644 src/Umbraco.Core/Exceptions/PanicException.cs

diff --git a/src/Umbraco.Core/Exceptions/PanicException.cs b/src/Umbraco.Core/Exceptions/PanicException.cs
new file mode 100644
index 0000000000..4d41cafc65
--- /dev/null
+++ b/src/Umbraco.Core/Exceptions/PanicException.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Runtime.Serialization;
+
+namespace Umbraco.Core.Exceptions
+{
+    /// <summary>
+    /// Internal exception that in theory should never ben thrown, it is only thrown in circumstances that should never happen
+    /// </summary>
+    [Serializable]
+    internal class PanicException : Exception
+    {
+        public PanicException()
+        {
+        }
+
+        public PanicException(string message) : base(message)
+        {
+        }
+
+        public PanicException(string message, Exception innerException) : base(message, innerException)
+        {
+        }
+
+        protected PanicException(SerializationInfo info, StreamingContext context) : base(info, context)
+        {
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs
index e49dcf4a12..b4e5f26de5 100644
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -886,6 +886,8 @@ namespace Umbraco.Core.Services.Implement
             {
                 scope.WriteLock(Constants.Locks.ContentTree);
 
+                var allLangs = _languageRepository.GetMany().ToList();
+
                 var saveEventArgs = new ContentSavingEventArgs(content, evtMsgs);
                 if (raiseEvents && scope.Events.DispatchCancelable(Saving, this, saveEventArgs, nameof(Saving)))
                     return new PublishResult(PublishResultType.FailedPublishCancelledByEvent, evtMsgs, content);
@@ -894,13 +896,13 @@ namespace Umbraco.Core.Services.Implement
                 // if culture is '*', then publish them all (including variants)
 
                 //this will create the correct culture impact even if culture is * or null
-                var impact = CultureImpact.Create(culture, _languageRepository.IsDefault(culture), content);
+                var impact = CultureImpact.Create(culture, IsDefaultCulture(allLangs, culture), content);
 
                 // publish the culture(s)
                 // we don't care about the response here, this response will be rechecked below but we need to set the culture info values now.
                 content.PublishCulture(impact);
 
-                var result = CommitDocumentChangesInternal(scope, content, saveEventArgs, userId, raiseEvents);
+                var result = CommitDocumentChangesInternal(scope, content, saveEventArgs, allLangs, userId, raiseEvents);
                 scope.Complete();
                 return result;
             }
@@ -921,6 +923,8 @@ namespace Umbraco.Core.Services.Implement
             {
                 scope.WriteLock(Constants.Locks.ContentTree);
 
+                var allLangs = _languageRepository.GetMany().ToList();
+
                 var evtMsgs = EventMessagesFactory.Get();
                 var saveEventArgs = new ContentSavingEventArgs(content, evtMsgs);
                 if (raiseEvents && scope.Events.DispatchCancelable(Saving, this, saveEventArgs, nameof(Saving)))
@@ -939,14 +943,14 @@ namespace Umbraco.Core.Services.Implement
                 if (cultures.Any(x => x == null || x == "*"))
                     throw new InvalidOperationException("Only valid cultures are allowed to be used in this method, wildcards or nulls are not allowed");
 
-                var impacts = cultures.Select(x => CultureImpact.Explicit(x, _languageRepository.IsDefault(x)));
+                var impacts = cultures.Select(x => CultureImpact.Explicit(x, IsDefaultCulture(allLangs, x)));
 
                 // publish the culture(s)
                 // we don't care about the response here, this response will be rechecked below but we need to set the culture info values now.
                 foreach (var impact in impacts)
                     content.PublishCulture(impact);
 
-                var result = CommitDocumentChangesInternal(scope, content, saveEventArgs, userId, raiseEvents);
+                var result = CommitDocumentChangesInternal(scope, content, saveEventArgs, allLangs, userId, raiseEvents);
                 scope.Complete();
                 return result;
             }
@@ -986,6 +990,8 @@ namespace Umbraco.Core.Services.Implement
             {
                 scope.WriteLock(Constants.Locks.ContentTree);
 
+                var allLangs = _languageRepository.GetMany().ToList();
+
                 var saveEventArgs = new ContentSavingEventArgs(content, evtMsgs);
                 if (scope.Events.DispatchCancelable(Saving, this, saveEventArgs, nameof(Saving)))
                     return new PublishResult(PublishResultType.FailedPublishCancelledByEvent, evtMsgs, content);
@@ -993,22 +999,39 @@ namespace Umbraco.Core.Services.Implement
                 // all cultures = unpublish whole
                 if (culture == "*" || (!content.ContentType.VariesByCulture() && culture == null))
                 {
+                    // It's important to understand that when the document varies by culture but the "*" is used,
+                    // we are just unpublishing the whole document but leaving all of the culture's as-is. This is expected
+                    // because we don't want to actually unpublish every culture and then the document, we just want everything
+                    // to be non-routable so that when it's re-published all variants were as they were.
+
                     content.PublishedState = PublishedState.Unpublishing;
                 }
                 else
                 {
-                    // If the culture we want to unpublish was already unpublished, nothing to do.
-                    // To check for that we need to lookup the persisted content item
-                    var persisted = content.HasIdentity ? GetById(content.Id) : null;
-
-                    if (persisted != null && !persisted.IsCulturePublished(culture))
-                        return new PublishResult(PublishResultType.SuccessUnpublishAlready, evtMsgs, content);
-
-                    // unpublish the culture
+                    // unpublish the culture, this will change the document state to Publishing! ... which is expected because this will
+                    // essentially be re-publishing the document with the requested culture removed.
+                    // The call to CommitDocumentChangesInternal will perform all the checks like if this is a mandatory culture or the last culture being unpublished
+                    // and will then unpublish the document accordingly.
                     content.UnpublishCulture(culture);
+
+
+                    //TODO: Move this logic into CommitDocumentChangesInternal, we are already looking up the item there
+
+                    //// We are unpublishing a culture but there's a chance that the user might be trying
+                    //// to unpublish a culture that is already unpublished so we need to lookup the current
+                    //// persisted item and check since it would be quicker to do that than continue and re-publish everything.                    
+                    //var persisted = content.HasIdentity ? GetById(content.Id) : null;
+
+                    //if (persisted != null && !persisted.IsCulturePublished(culture))
+                    //{
+                    //    //it was already unpublished
+                    //    //TODO: We then need to check if all cultures are unpublished
+                    //    return new PublishResult(PublishResultType.SuccessUnpublishAlready, evtMsgs, content);
+                    //}
+
                 }
 
-                var result = CommitDocumentChangesInternal(scope, content, saveEventArgs, userId);
+                var result = CommitDocumentChangesInternal(scope, content, saveEventArgs, allLangs, userId);
                 scope.Complete();
                 return result;
             }
@@ -1047,15 +1070,35 @@ namespace Umbraco.Core.Services.Implement
                 if (raiseEvents && scope.Events.DispatchCancelable(Saving, this, saveEventArgs, nameof(Saving)))
                     return new PublishResult(PublishResultType.FailedPublishCancelledByEvent, evtMsgs, content);
 
-                var result = CommitDocumentChangesInternal(scope, content, saveEventArgs, userId, raiseEvents);
+                var allLangs = _languageRepository.GetMany().ToList();
+
+                var result = CommitDocumentChangesInternal(scope, content, saveEventArgs, allLangs, userId, raiseEvents);
                 scope.Complete();
                 return result;
             }
         }
 
+        /// <summary>
+        /// Handles a lot of business logic cases for how the document should be persisted
+        /// </summary>
+        /// <param name="scope"></param>
+        /// <param name="content"></param>
+        /// <param name="saveEventArgs"></param>
+        /// <param name="userId"></param>
+        /// <param name="raiseEvents"></param>
+        /// <param name="branchOne"></param>
+        /// <param name="branchRoot"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// <para>
+        /// Business logic cases such: as unpublishing a mandatory culture, or unpublishing the last culture, checking for pending scheduled publishing, etc... is dealt with in this method.
+        /// There is quite a lot of cases to take into account along with logic that needs to deal with scheduled saving/publishing, branch saving/publishing, etc...       
+        /// </para>
+        /// </remarks>
         private PublishResult CommitDocumentChangesInternal(IScope scope, IContent content,
-            ContentSavingEventArgs saveEventArgs,
-            int userId = Constants.Security.SuperUserId, bool raiseEvents = true, bool branchOne = false, bool branchRoot = false)
+            ContentSavingEventArgs saveEventArgs, IReadOnlyCollection<ILanguage> allLangs,
+            int userId = Constants.Security.SuperUserId,
+            bool raiseEvents = true, bool branchOne = false, bool branchRoot = false)
         {
             if (scope == null) throw new ArgumentNullException(nameof(scope));
             if (content == null) throw new ArgumentNullException(nameof(content));
@@ -1070,8 +1113,8 @@ namespace Umbraco.Core.Services.Implement
             if (content.PublishedState != PublishedState.Publishing && content.PublishedState != PublishedState.Unpublishing)
                 content.PublishedState = PublishedState.Publishing;
 
-            // state here is either Publishing or Unpublishing
-            // (even though, Publishing to unpublish a culture may end up unpublishing everything)
+            // State here is either Publishing or Unpublishing
+            // Publishing to unpublish a culture may end up unpublishing everything so these flags can be flipped later
             var publishing = content.PublishedState == PublishedState.Publishing;
             var unpublishing = content.PublishedState == PublishedState.Unpublishing;
 
@@ -1090,6 +1133,9 @@ namespace Umbraco.Core.Services.Implement
 
             if (publishing)
             {
+                //TODO: Check if it's a culture being unpublished and that's why we are publishing the document. In that case
+                // we should check if the culture is already unpublished since it might be the user is trying to unpublish an already unpublished culture?
+
                 //determine cultures publishing/unpublishing which will be based on previous calls to content.PublishCulture and ClearPublishInfo
                 culturesUnpublishing = content.GetCulturesUnpublishing();
                 culturesPublishing = variesByCulture
@@ -1097,11 +1143,21 @@ namespace Umbraco.Core.Services.Implement
                         : null;
 
                 // ensure that the document can be published, and publish handling events, business rules, etc
-                publishResult = StrategyCanPublish(scope, content, /*checkPath:*/ (!branchOne || branchRoot), culturesPublishing, culturesUnpublishing, evtMsgs, saveEventArgs);
+                publishResult = StrategyCanPublish(scope, content, /*checkPath:*/ (!branchOne || branchRoot), culturesPublishing, culturesUnpublishing, evtMsgs, saveEventArgs, allLangs);
                 if (publishResult.Success)
                 {
                     // note: StrategyPublish flips the PublishedState to Publishing!
                     publishResult = StrategyPublish(content, culturesPublishing, culturesUnpublishing, evtMsgs);
+
+                    //check if a culture has been unpublished and if there are no cultures left, and then unpublish document as a whole
+                    if (publishResult.Result == PublishResultType.SuccessUnpublishCulture && content.PublishCultureInfos.Count == 0)
+                    {
+                        publishing = false;
+                        unpublishing = content.Published; // if not published yet, nothing to do
+
+                        // we may end up in a state where we won't publish nor unpublish
+                        // keep going, though, as we want to save anyways
+                    }
                 }
                 else
                 {
@@ -1186,17 +1242,34 @@ namespace Umbraco.Core.Services.Implement
 
                     if (culturesUnpublishing != null)
                     {
-                        //If we are here, it means we tried unpublishing a culture but it was mandatory so now everything is unpublished
-                        var langs = string.Join(", ", _languageRepository.GetMany()
+                        // This will mean that that we unpublished a mandatory culture or we unpublished the last culture.
+                        
+                        var langs = string.Join(", ", allLangs
                                     .Where(x => culturesUnpublishing.InvariantContains(x.IsoCode))
                                     .Select(x => x.CultureName));
                         Audit(AuditType.UnpublishVariant, userId, content.Id, $"Unpublished languages: {langs}", langs);
-                        //log that the whole content item has been unpublished due to mandatory culture unpublished
-                        Audit(AuditType.Unpublish, userId, content.Id, "Unpublished (mandatory language unpublished)");
-                    }
-                    else
-                        Audit(AuditType.Unpublish, userId, content.Id);
 
+                        if (publishResult == null)
+                            throw new PanicException("publishResult == null - should not happen");
+
+                        switch(publishResult.Result)
+                        {
+                            case PublishResultType.FailedPublishMandatoryCultureMissing:
+                                //occurs when a mandatory culture was unpublished (which means we tried publishing the document without a mandatory culture)
+
+                                //log that the whole content item has been unpublished due to mandatory culture unpublished
+                                Audit(AuditType.Unpublish, userId, content.Id, "Unpublished (mandatory language unpublished)");
+                                return new PublishResult(PublishResultType.SuccessUnpublishMandatoryCulture, evtMsgs, content);
+                            case PublishResultType.SuccessUnpublishCulture:
+                                //occurs when the last culture is unpublished
+
+                                Audit(AuditType.Unpublish, userId, content.Id, "Unpublished (last language unpublished)");
+                                return new PublishResult(PublishResultType.SuccessUnpublishLastCulture, evtMsgs, content);
+                        }
+                        
+                    }
+
+                    Audit(AuditType.Unpublish, userId, content.Id);
                     return new PublishResult(PublishResultType.SuccessUnpublish, evtMsgs, content);
                 }
 
@@ -1236,7 +1309,7 @@ namespace Umbraco.Core.Services.Implement
                         case PublishResultType.SuccessPublishCulture:
                             if (culturesPublishing != null)
                             {
-                                var langs = string.Join(", ", _languageRepository.GetMany()
+                                var langs = string.Join(", ", allLangs
                                     .Where(x => culturesPublishing.InvariantContains(x.IsoCode))
                                     .Select(x => x.CultureName));
                                 Audit(AuditType.PublishVariant, userId, content.Id, $"Published languages: {langs}", langs);
@@ -1245,7 +1318,7 @@ namespace Umbraco.Core.Services.Implement
                         case PublishResultType.SuccessUnpublishCulture:
                             if (culturesUnpublishing != null)
                             {
-                                var langs = string.Join(", ", _languageRepository.GetMany()
+                                var langs = string.Join(", ", allLangs
                                    .Where(x => culturesUnpublishing.InvariantContains(x.IsoCode))
                                    .Select(x => x.CultureName));
                                 Audit(AuditType.UnpublishVariant, userId, content.Id, $"Unpublished languages: {langs}", langs);
@@ -1259,14 +1332,14 @@ namespace Umbraco.Core.Services.Implement
 
             // should not happen
             if (branchOne && !branchRoot)
-                throw new Exception("panic");
+                throw new PanicException("branchOne && !branchRoot - should not happen");
 
             //if publishing didn't happen or if it has failed, we still need to log which cultures were saved
             if (!branchOne && (publishResult == null || !publishResult.Success))
             {
                 if (culturesChanging != null)
                 {
-                    var langs = string.Join(", ", _languageRepository.GetMany()
+                    var langs = string.Join(", ", allLangs
                         .Where(x => culturesChanging.InvariantContains(x.IsoCode))
                         .Select(x => x.CultureName));
                     Audit(AuditType.SaveVariant, userId, content.Id, $"Saved languages: {langs}", langs);
@@ -1297,6 +1370,8 @@ namespace Umbraco.Core.Services.Implement
             {
                 scope.WriteLock(Constants.Locks.ContentTree);
 
+                var allLangs = _languageRepository.GetMany().ToList();
+
                 foreach (var d in _documentRepository.GetContentForRelease(date))
                 {
                     PublishResult result;
@@ -1325,7 +1400,7 @@ namespace Umbraco.Core.Services.Implement
 
                             //publish the culture values and validate the property values, if validation fails, log the invalid properties so the develeper has an idea of what has failed
                             Property[] invalidProperties = null;
-                            var impact = CultureImpact.Explicit(culture, _languageRepository.IsDefault(culture));
+                            var impact = CultureImpact.Explicit(culture, IsDefaultCulture(allLangs, culture));
                             var tryPublish = d.PublishCulture(impact) && _propertyValidationService.Value.IsPropertyDataValid(d, out invalidProperties, impact);
                             if (invalidProperties != null && invalidProperties.Length > 0)
                                 Logger.Warn<ContentService>("Scheduled publishing will fail for document {DocumentId} and culture {Culture} because of invalid properties {InvalidProperties}",
@@ -1340,7 +1415,7 @@ namespace Umbraco.Core.Services.Implement
                         else if (!publishing)
                             result = new PublishResult(PublishResultType.FailedPublishContentInvalid, evtMsgs, d);
                         else
-                            result = CommitDocumentChangesInternal(scope, d, saveEventArgs, d.WriterId);
+                            result = CommitDocumentChangesInternal(scope, d, saveEventArgs, allLangs, d.WriterId);
 
 
                         if (result.Success == false)
@@ -1390,7 +1465,7 @@ namespace Umbraco.Core.Services.Implement
                             d.UnpublishCulture(c);
                         }
 
-                        result = CommitDocumentChangesInternal(scope, d, saveEventArgs, d.WriterId);
+                        result = CommitDocumentChangesInternal(scope, d, saveEventArgs, allLangs, d.WriterId);
                         if (result.Success == false)
                             Logger.Error<ContentService>(null, "Failed to publish document id={DocumentId}, reason={Reason}.", d.Id, result.Result);
                         yield return result;
@@ -1416,7 +1491,7 @@ namespace Umbraco.Core.Services.Implement
         }
 
         // utility 'PublishCultures' func used by SaveAndPublishBranch
-        private bool SaveAndPublishBranch_PublishCultures(IContent content, HashSet<string> culturesToPublish)
+        private bool SaveAndPublishBranch_PublishCultures(IContent content, HashSet<string> culturesToPublish, IReadOnlyCollection<ILanguage> allLangs)
         {
             //TODO: This does not support being able to return invalid property details to bubble up to the UI
 
@@ -1426,7 +1501,7 @@ namespace Umbraco.Core.Services.Implement
             {
                 return culturesToPublish.All(culture =>
                 {
-                    var impact = CultureImpact.Create(culture, _languageRepository.IsDefault(culture), content);
+                    var impact = CultureImpact.Create(culture, IsDefaultCulture(allLangs, culture), content);
                     return content.PublishCulture(impact) && _propertyValidationService.Value.IsPropertyDataValid(content, out _, impact);
                 });
             }
@@ -1535,7 +1610,7 @@ namespace Umbraco.Core.Services.Implement
 
         internal IEnumerable<PublishResult> SaveAndPublishBranch(IContent document, bool force,
             Func<IContent, HashSet<string>> shouldPublish,
-            Func<IContent, HashSet<string>, bool> publishCultures,
+            Func<IContent, HashSet<string>, IReadOnlyCollection<ILanguage>, bool> publishCultures,
             int userId = Constants.Security.SuperUserId)
         {
             if (shouldPublish == null) throw new ArgumentNullException(nameof(shouldPublish));
@@ -1549,6 +1624,8 @@ namespace Umbraco.Core.Services.Implement
             {
                 scope.WriteLock(Constants.Locks.ContentTree);
 
+                var allLangs = _languageRepository.GetMany().ToList();
+
                 if (!document.HasIdentity)
                     throw new InvalidOperationException("Cannot not branch-publish a new document.");
 
@@ -1557,7 +1634,7 @@ namespace Umbraco.Core.Services.Implement
                     throw new InvalidOperationException("Cannot mix PublishCulture and SaveAndPublishBranch.");
 
                 // deal with the branch root - if it fails, abort
-                var result = SaveAndPublishBranchItem(scope, document, shouldPublish, publishCultures, true, publishedDocuments, evtMsgs, userId);
+                var result = SaveAndPublishBranchItem(scope, document, shouldPublish, publishCultures, true, publishedDocuments, evtMsgs, userId, allLangs);
                 if (result != null)
                 {
                     results.Add(result);
@@ -1588,7 +1665,7 @@ namespace Umbraco.Core.Services.Implement
                         }
 
                         // no need to check path here, parent has to be published here
-                        result = SaveAndPublishBranchItem(scope, d, shouldPublish, publishCultures, false, publishedDocuments, evtMsgs, userId);
+                        result = SaveAndPublishBranchItem(scope, d, shouldPublish, publishCultures, false, publishedDocuments, evtMsgs, userId, allLangs);
                         if (result != null)
                         {
                             results.Add(result);
@@ -1620,10 +1697,10 @@ namespace Umbraco.Core.Services.Implement
         // publishValues: a function publishing values (using the appropriate PublishCulture calls)
         private PublishResult SaveAndPublishBranchItem(IScope scope, IContent document,
             Func<IContent, HashSet<string>> shouldPublish,
-            Func<IContent, HashSet<string>, bool> publishCultures,
+            Func<IContent, HashSet<string>, IReadOnlyCollection<ILanguage>, bool> publishCultures,
             bool isRoot,
             ICollection<IContent> publishedDocuments,
-            EventMessages evtMsgs, int userId)
+            EventMessages evtMsgs, int userId, IReadOnlyCollection<ILanguage> allLangs)
         {
             var culturesToPublish = shouldPublish(document);
             if (culturesToPublish == null) // null = do not include
@@ -1636,13 +1713,13 @@ namespace Umbraco.Core.Services.Implement
                 return new PublishResult(PublishResultType.FailedPublishCancelledByEvent, evtMsgs, document);
 
             // publish & check if values are valid
-            if (!publishCultures(document, culturesToPublish))
+            if (!publishCultures(document, culturesToPublish, allLangs))
             {
                 //TODO: Based on this callback behavior there is no way to know which properties may have been invalid if this failed, see other results of FailedPublishContentInvalid
                 return new PublishResult(PublishResultType.FailedPublishContentInvalid, evtMsgs, document);
             }
 
-            var result = CommitDocumentChangesInternal(scope, document, saveEventArgs, userId, branchOne: true, branchRoot: isRoot);
+            var result = CommitDocumentChangesInternal(scope, document, saveEventArgs, allLangs, userId, branchOne: true, branchRoot: isRoot);
             if (result.Success)
                 publishedDocuments.Add(document);
             return result;
@@ -2343,6 +2420,9 @@ namespace Umbraco.Core.Services.Implement
             _auditRepository.Save(new AuditItem(objectId, type, userId, ObjectTypes.GetName(UmbracoObjectTypes.Document), message, parameters));
         }
 
+        private bool IsDefaultCulture(IReadOnlyCollection<ILanguage> langs, string culture) => langs.Any(x => x.IsDefault && x.IsoCode.InvariantEquals(culture));
+        private bool IsMandatoryCulture(IReadOnlyCollection<ILanguage> langs, string culture) => langs.Any(x => x.IsMandatory && x.IsoCode.InvariantEquals(culture));
+
         #endregion
 
         #region Event Handlers
@@ -2497,7 +2577,9 @@ namespace Umbraco.Core.Services.Implement
         /// <param name="culturesPublishing"></param>
         /// <param name="savingEventArgs"></param>
         /// <returns></returns>
-        private PublishResult StrategyCanPublish(IScope scope, IContent content, bool checkPath, IReadOnlyList<string> culturesPublishing, IReadOnlyCollection<string> culturesUnpublishing, EventMessages evtMsgs, ContentSavingEventArgs savingEventArgs)
+        private PublishResult StrategyCanPublish(IScope scope, IContent content, bool checkPath, IReadOnlyList<string> culturesPublishing,
+            IReadOnlyCollection<string> culturesUnpublishing, EventMessages evtMsgs, ContentSavingEventArgs savingEventArgs,
+            IReadOnlyCollection<ILanguage> allLangs)
         {
             // raise Publishing event
             if (scope.Events.DispatchCancelable(Publishing, this, savingEventArgs.ToContentPublishingEventArgs()))
@@ -2510,7 +2592,7 @@ namespace Umbraco.Core.Services.Implement
 
             var impactsToPublish = culturesPublishing == null
                 ? new[] {CultureImpact.Invariant} //if it's null it's invariant
-                : culturesPublishing.Select(x => CultureImpact.Explicit(x, _languageRepository.IsDefault(x))).ToArray();
+                : culturesPublishing.Select(x => CultureImpact.Explicit(x, allLangs.Any(lang => lang.IsoCode.InvariantEquals(x) && lang.IsMandatory))).ToArray();
 
             // publish the culture(s)
             if (!impactsToPublish.All(content.PublishCulture))
@@ -2535,7 +2617,7 @@ namespace Umbraco.Core.Services.Implement
                     return new PublishResult(PublishResultType.FailedPublishNothingToPublish, evtMsgs, content);
 
                 // missing mandatory culture = cannot be published
-                var mandatoryCultures = _languageRepository.GetMany().Where(x => x.IsMandatory).Select(x => x.IsoCode);
+                var mandatoryCultures = allLangs.Where(x => x.IsMandatory).Select(x => x.IsoCode);
                 var mandatoryMissing = mandatoryCultures.Any(x => !content.PublishedCultures.Contains(x, StringComparer.OrdinalIgnoreCase));
                 if (mandatoryMissing)
                     return new PublishResult(PublishResultType.FailedPublishMandatoryCultureMissing, evtMsgs, content);
diff --git a/src/Umbraco.Core/Services/PublishResultType.cs b/src/Umbraco.Core/Services/PublishResultType.cs
index 1a2b52f9c9..66514a26fb 100644
--- a/src/Umbraco.Core/Services/PublishResultType.cs
+++ b/src/Umbraco.Core/Services/PublishResultType.cs
@@ -49,6 +49,11 @@
         /// </summary>
         SuccessUnpublishMandatoryCulture = 6,
 
+        /// <summary>
+        /// The specified document culture was unpublished, and was the last published culture in the document, therefore the document itself was unpublished.
+        /// </summary>
+        SuccessUnpublishLastCulture = 8,
+
         #endregion
 
         #region Success - Mixed
@@ -115,7 +120,7 @@
         /// <summary>
         /// The document could not be published because it has no publishing flags or values.
         /// </summary>
-        FailedPublishNothingToPublish = FailedPublish | 9, // TODO: in ContentService.StrategyCanPublish - weird
+        FailedPublishNothingToPublish = FailedPublish | 9, // TODO: in ContentService.StrategyCanPublish - weird - do we have a test for that case?
 
         /// <summary>
         /// The document could not be published because some mandatory cultures are missing.
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index ca9b7d4034..74af58b94f 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -204,6 +204,7 @@
     <Compile Include="CompositionExtensions_Essentials.cs" />
     <Compile Include="CompositionExtensions_FileSystems.cs" />
     <Compile Include="CompositionExtensions_Uniques.cs" />
+    <Compile Include="Exceptions\PanicException.cs" />
     <Compile Include="FactoryExtensions.cs" />
     <Compile Include="Composing\RegisterFactory.cs" />
     <Compile Include="Composing\Current.cs" />
diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs
index a719e04b2a..07f4cdb661 100644
--- a/src/Umbraco.Tests/Services/ContentServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs
@@ -806,7 +806,7 @@ namespace Umbraco.Tests.Services
 
             unpublished = ServiceContext.ContentService.Unpublish(content, langUk.IsoCode);
             Assert.IsTrue(unpublished.Success);
-            Assert.AreEqual(PublishResultType.SuccessUnpublishCulture, unpublished.Result);
+            Assert.AreEqual(PublishResultType.SuccessUnpublishLastCulture, unpublished.Result);
             Assert.IsFalse(content.IsCulturePublished(langFr.IsoCode));
             Assert.IsFalse(content.IsCulturePublished(langUk.IsoCode));
             Assert.AreEqual(PublishedState.Unpublished, content.PublishedState); //the last culture was unpublished so the document should also reflect this
@@ -816,6 +816,42 @@ namespace Umbraco.Tests.Services
             Assert.AreEqual(PublishedState.Unpublished, content.PublishedState); //just double checking
         }
 
+        [Test]
+        public void Unpublishing_Mandatory_Language_Unpublishes_Document()
+        {
+            // Arrange
+
+            var langUk = new Language("en-GB") { IsDefault = true, IsMandatory = true };
+            var langFr = new Language("fr-FR");
+
+            ServiceContext.LocalizationService.Save(langFr);
+            ServiceContext.LocalizationService.Save(langUk);
+
+            var contentType = MockedContentTypes.CreateBasicContentType();
+            contentType.Variations = ContentVariation.Culture;
+            ServiceContext.ContentTypeService.Save(contentType);
+
+            IContent content = new Content("content", Constants.System.Root, contentType);
+            content.SetCultureName("content-fr", langFr.IsoCode);
+            content.SetCultureName("content-en", langUk.IsoCode);
+
+            var published = ServiceContext.ContentService.SaveAndPublish(content, new[] { langFr.IsoCode, langUk.IsoCode });
+            Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode));
+            Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
+            Assert.IsTrue(published.Success);
+            Assert.AreEqual(PublishedState.Published, content.PublishedState);
+
+            //re-get
+            content = ServiceContext.ContentService.GetById(content.Id);
+            
+            var unpublished = ServiceContext.ContentService.Unpublish(content, langUk.IsoCode); //unpublish mandatory lang
+            Assert.IsTrue(unpublished.Success);
+            Assert.AreEqual(PublishResultType.SuccessUnpublishMandatoryCulture, unpublished.Result);            
+            Assert.IsFalse(content.IsCulturePublished(langUk.IsoCode));
+            Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode)); //remains published
+            Assert.AreEqual(PublishedState.Unpublished, content.PublishedState); 
+        }
+
         [Test]
         public void Pending_Invariant_Property_Changes_Affect_Default_Language_Edited_State()
         {

From 5a9ca8d09f30f396cdeed8fdebd961d93469b4ef Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 29 Jul 2019 11:37:11 +1000
Subject: [PATCH 205/776] wip added more tests and notes

---
 .../Models/ContentRepositoryExtensions.cs     | 56 ++++++++++++++-----
 .../Services/Implement/ContentService.cs      | 12 +++-
 .../Services/ContentServiceTests.cs           | 42 ++++++++++++++
 3 files changed, 95 insertions(+), 15 deletions(-)

diff --git a/src/Umbraco.Core/Models/ContentRepositoryExtensions.cs b/src/Umbraco.Core/Models/ContentRepositoryExtensions.cs
index bf7228ca47..f9efc60142 100644
--- a/src/Umbraco.Core/Models/ContentRepositoryExtensions.cs
+++ b/src/Umbraco.Core/Models/ContentRepositoryExtensions.cs
@@ -222,7 +222,13 @@ namespace Umbraco.Core.Models
             return true;
         }
 
-        public static void UnpublishCulture(this IContent content, string culture = "*")
+        /// <summary>
+        /// Returns false if the culture is already unpublished
+        /// </summary>
+        /// <param name="content"></param>
+        /// <param name="culture"></param>
+        /// <returns></returns>
+        public static bool UnpublishCulture(this IContent content, string culture = "*")
         {
             culture = culture.NullOrWhiteSpaceAsNull();
 
@@ -230,16 +236,31 @@ namespace Umbraco.Core.Models
             if (!content.ContentType.SupportsPropertyVariation(culture, "*", true))
                 throw new NotSupportedException($"Culture \"{culture}\" is not supported by content type \"{content.ContentType.Alias}\" with variation \"{content.ContentType.Variations}\".");
 
-            if (culture == "*") // all cultures
+
+            var keepProcessing = true;
+
+            if (culture == "*")
+            {
+                // all cultures
                 content.ClearPublishInfos();
-            else // one single culture
-                content.ClearPublishInfo(culture);
+            }
+            else
+            {
+                // one single culture
+                keepProcessing = content.ClearPublishInfo(culture);
+            }
+            
 
-            // property.PublishValues only publishes what is valid, variation-wise
-            foreach (var property in content.Properties)
-                property.UnpublishValues(culture);
+            if (keepProcessing)
+            {
+                // property.PublishValues only publishes what is valid, variation-wise
+                foreach (var property in content.Properties)
+                    property.UnpublishValues(culture);
 
-            content.PublishedState = PublishedState.Publishing;
+                content.PublishedState = PublishedState.Publishing;
+            }
+
+            return keepProcessing;
         }
 
         public static void ClearPublishInfos(this IContent content)
@@ -247,15 +268,24 @@ namespace Umbraco.Core.Models
             content.PublishCultureInfos = null;
         }
 
-        public static void ClearPublishInfo(this IContent content, string culture)
+        /// <summary>
+        /// Returns false if the culture is already unpublished
+        /// </summary>
+        /// <param name="content"></param>
+        /// <param name="culture"></param>
+        /// <returns></returns>
+        public static bool ClearPublishInfo(this IContent content, string culture)
         {
             if (culture.IsNullOrWhiteSpace())
                 throw new ArgumentNullOrEmptyException(nameof(culture));
 
-            content.PublishCultureInfos.Remove(culture);
-
-            // set the culture to be dirty - it's been modified
-            content.TouchCulture(culture);
+            var removed = content.PublishCultureInfos.Remove(culture);
+            if (removed)
+            {
+                // set the culture to be dirty - it's been modified
+                content.TouchCulture(culture);
+            }
+            return removed;
         }
 
         /// <summary>
diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs
index b4e5f26de5..91c26701b3 100644
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -1012,7 +1012,9 @@ namespace Umbraco.Core.Services.Implement
                     // essentially be re-publishing the document with the requested culture removed.
                     // The call to CommitDocumentChangesInternal will perform all the checks like if this is a mandatory culture or the last culture being unpublished
                     // and will then unpublish the document accordingly.
-                    content.UnpublishCulture(culture);
+                    var removed = content.UnpublishCulture(culture);
+
+                    //TODO: if !removed then there is really nothing to process and we should exit here with SuccessUnpublishAlready.
 
 
                     //TODO: Move this logic into CommitDocumentChangesInternal, we are already looking up the item there
@@ -2613,8 +2615,14 @@ namespace Umbraco.Core.Services.Implement
                 if (culturesPublishing == null)
                     throw new InvalidOperationException("Internal error, variesByCulture but culturesPublishing is null.");
 
-                if (content.Published && culturesPublishing.Count == 0 && culturesUnpublishing.Count == 0) // no published cultures = cannot be published
+                if (content.Published && culturesPublishing.Count == 0 && culturesUnpublishing.Count == 0)
+                {
+                    // no published cultures = cannot be published
+                    // This will occur if for example, a culture that is already unpublished is sent to be unpublished again, or vice versa, in that case
+                    // there will be nothing to publish/unpublish.
                     return new PublishResult(PublishResultType.FailedPublishNothingToPublish, evtMsgs, content);
+                }
+                
 
                 // missing mandatory culture = cannot be published
                 var mandatoryCultures = allLangs.Where(x => x.IsMandatory).Select(x => x.IsoCode);
diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs
index 07f4cdb661..a903bcedb0 100644
--- a/src/Umbraco.Tests/Services/ContentServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs
@@ -852,6 +852,48 @@ namespace Umbraco.Tests.Services
             Assert.AreEqual(PublishedState.Unpublished, content.PublishedState); 
         }
 
+        [Test]
+        public void Unpublishing_Already_Unpublished_Culture()
+        {
+            // Arrange
+
+            var langUk = new Language("en-GB") { IsDefault = true };
+            var langFr = new Language("fr-FR");
+
+            ServiceContext.LocalizationService.Save(langFr);
+            ServiceContext.LocalizationService.Save(langUk);
+
+            var contentType = MockedContentTypes.CreateBasicContentType();
+            contentType.Variations = ContentVariation.Culture;
+            ServiceContext.ContentTypeService.Save(contentType);
+
+            IContent content = new Content("content", Constants.System.Root, contentType);
+            content.SetCultureName("content-fr", langFr.IsoCode);
+            content.SetCultureName("content-en", langUk.IsoCode);
+
+            var published = ServiceContext.ContentService.SaveAndPublish(content, new[] { langFr.IsoCode, langUk.IsoCode });
+            Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode));
+            Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
+            Assert.IsTrue(published.Success);
+            Assert.AreEqual(PublishedState.Published, content.PublishedState);
+
+            //re-get
+            content = ServiceContext.ContentService.GetById(content.Id);
+
+            var unpublished = ServiceContext.ContentService.Unpublish(content, langUk.IsoCode); 
+            Assert.IsTrue(unpublished.Success);
+            Assert.AreEqual(PublishResultType.SuccessUnpublishCulture, unpublished.Result);
+            Assert.IsFalse(content.IsCulturePublished(langUk.IsoCode));
+
+            content = ServiceContext.ContentService.GetById(content.Id);
+
+            unpublished = ServiceContext.ContentService.Unpublish(content, langUk.IsoCode); //unpublish again
+            Assert.IsTrue(unpublished.Success);
+            Assert.AreEqual(PublishResultType.SuccessUnpublishAlready, unpublished.Result);
+            Assert.IsFalse(content.IsCulturePublished(langUk.IsoCode));
+
+        }
+
         [Test]
         public void Pending_Invariant_Property_Changes_Affect_Default_Language_Edited_State()
         {

From 40a55cb9dfe9978d7dfbab5067f932e2c400803f Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 29 Jul 2019 15:28:50 +1000
Subject: [PATCH 206/776] Fixes issue/tests

---
 .../Services/Implement/ContentService.cs      | 35 ++++++++-----------
 .../Services/PublishResultType.cs             |  4 +--
 .../Services/ContentServiceTests.cs           |  8 +++++
 3 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs
index 91c26701b3..a8b40b1bb1 100644
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -937,6 +937,7 @@ namespace Umbraco.Core.Services.Implement
                     //no cultures specified and doesn't vary, so publish it, else nothing to publish
                     return !varies
                         ? SaveAndPublish(content, userId: userId, raiseEvents: raiseEvents)
+                        //TODO: Though we may not have cultures to publish, shouldn't we continue to Save in this case??
                         : new PublishResult(PublishResultType.FailedPublishNothingToPublish, evtMsgs, content);
                 }
 
@@ -1005,39 +1006,33 @@ namespace Umbraco.Core.Services.Implement
                     // to be non-routable so that when it's re-published all variants were as they were.
 
                     content.PublishedState = PublishedState.Unpublishing;
+                    var result = CommitDocumentChangesInternal(scope, content, saveEventArgs, allLangs, userId);
+                    scope.Complete();
+                    return result;
                 }
                 else
                 {
-                    // unpublish the culture, this will change the document state to Publishing! ... which is expected because this will
+                    // Unpublish the culture, this will change the document state to Publishing! ... which is expected because this will
                     // essentially be re-publishing the document with the requested culture removed.
                     // The call to CommitDocumentChangesInternal will perform all the checks like if this is a mandatory culture or the last culture being unpublished
                     // and will then unpublish the document accordingly.
+                    // If the result of this is false it means there was no culture to unpublish (i.e. it was already unpublished or it did not exist)
                     var removed = content.UnpublishCulture(culture);
 
-                    //TODO: if !removed then there is really nothing to process and we should exit here with SuccessUnpublishAlready.
+                    //save and publish any changes
+                    var result = CommitDocumentChangesInternal(scope, content, saveEventArgs, allLangs, userId);
 
+                    scope.Complete();
 
-                    //TODO: Move this logic into CommitDocumentChangesInternal, we are already looking up the item there
-
-                    //// We are unpublishing a culture but there's a chance that the user might be trying
-                    //// to unpublish a culture that is already unpublished so we need to lookup the current
-                    //// persisted item and check since it would be quicker to do that than continue and re-publish everything.                    
-                    //var persisted = content.HasIdentity ? GetById(content.Id) : null;
-
-                    //if (persisted != null && !persisted.IsCulturePublished(culture))
-                    //{
-                    //    //it was already unpublished
-                    //    //TODO: We then need to check if all cultures are unpublished
-                    //    return new PublishResult(PublishResultType.SuccessUnpublishAlready, evtMsgs, content);
-                    //}
+                    // In one case the result will be PublishStatusType.FailedPublishNothingToPublish which means that no cultures
+                    // were specified to be published which will be the case when removed is false. In that case
+                    // we want to swap the result type to PublishResultType.SuccessUnpublishAlready (that was the expectation before).
+                    if (result.Result == PublishResultType.FailedPublishNothingToPublish && !removed)
+                        return new PublishResult(PublishResultType.SuccessUnpublishAlready, evtMsgs, content);
 
+                    return result;
                 }
-
-                var result = CommitDocumentChangesInternal(scope, content, saveEventArgs, allLangs, userId);
-                scope.Complete();
-                return result;
             }
-
         }
 
         /// <summary>
diff --git a/src/Umbraco.Core/Services/PublishResultType.cs b/src/Umbraco.Core/Services/PublishResultType.cs
index 66514a26fb..66c1e38267 100644
--- a/src/Umbraco.Core/Services/PublishResultType.cs
+++ b/src/Umbraco.Core/Services/PublishResultType.cs
@@ -118,9 +118,9 @@
         FailedPublishContentInvalid = FailedPublish | 8,
 
         /// <summary>
-        /// The document could not be published because it has no publishing flags or values.
+        /// The document could not be published because it has no publishing flags or values or if its a variant document, no cultures were specified to be published.
         /// </summary>
-        FailedPublishNothingToPublish = FailedPublish | 9, // TODO: in ContentService.StrategyCanPublish - weird - do we have a test for that case?
+        FailedPublishNothingToPublish = FailedPublish | 9, 
 
         /// <summary>
         /// The document could not be published because some mandatory cultures are missing.
diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs
index a903bcedb0..44b2eec66d 100644
--- a/src/Umbraco.Tests/Services/ContentServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs
@@ -887,11 +887,19 @@ namespace Umbraco.Tests.Services
 
             content = ServiceContext.ContentService.GetById(content.Id);
 
+            //Change some data since Unpublish should always Save
+            content.SetCultureName("content-en-updated", langUk.IsoCode);
+            //var saveResult = ServiceContext.ContentService.Save(content);
+            //content = ServiceContext.ContentService.GetById(content.Id);
+
             unpublished = ServiceContext.ContentService.Unpublish(content, langUk.IsoCode); //unpublish again
             Assert.IsTrue(unpublished.Success);
             Assert.AreEqual(PublishResultType.SuccessUnpublishAlready, unpublished.Result);
             Assert.IsFalse(content.IsCulturePublished(langUk.IsoCode));
 
+            content = ServiceContext.ContentService.GetById(content.Id);
+            //ensure that even though the culture was already unpublished that the data was still persisted
+            Assert.AreEqual("content-en-updated", content.GetCultureName(langUk.IsoCode));
         }
 
         [Test]

From 415916c527a93944196ed93136a950b607c9d42b Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 29 Jul 2019 16:09:45 +1000
Subject: [PATCH 207/776] Fixes an issue with the content service + test

---
 .../Services/Implement/ContentService.cs      |  7 +--
 .../Services/ContentServiceTests.cs           | 43 ++++++++++++++++++-
 2 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs
index a8b40b1bb1..b1aa92c4c8 100644
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -932,13 +932,10 @@ namespace Umbraco.Core.Services.Implement
 
                 var varies = content.ContentType.VariesByCulture();
 
-                if (cultures.Length == 0)
+                if (cultures.Length == 0 && !varies)
                 {
                     //no cultures specified and doesn't vary, so publish it, else nothing to publish
-                    return !varies
-                        ? SaveAndPublish(content, userId: userId, raiseEvents: raiseEvents)
-                        //TODO: Though we may not have cultures to publish, shouldn't we continue to Save in this case??
-                        : new PublishResult(PublishResultType.FailedPublishNothingToPublish, evtMsgs, content);
+                    return SaveAndPublish(content, userId: userId, raiseEvents: raiseEvents);
                 }
 
                 if (cultures.Any(x => x == null || x == "*"))
diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs
index 44b2eec66d..b8ed0e1f41 100644
--- a/src/Umbraco.Tests/Services/ContentServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs
@@ -889,8 +889,6 @@ namespace Umbraco.Tests.Services
 
             //Change some data since Unpublish should always Save
             content.SetCultureName("content-en-updated", langUk.IsoCode);
-            //var saveResult = ServiceContext.ContentService.Save(content);
-            //content = ServiceContext.ContentService.GetById(content.Id);
 
             unpublished = ServiceContext.ContentService.Unpublish(content, langUk.IsoCode); //unpublish again
             Assert.IsTrue(unpublished.Success);
@@ -902,6 +900,47 @@ namespace Umbraco.Tests.Services
             Assert.AreEqual("content-en-updated", content.GetCultureName(langUk.IsoCode));
         }
 
+        [Test]
+        public void Publishing_No_Cultures_Still_Saves()
+        {
+            // Arrange
+
+            var langUk = new Language("en-GB") { IsDefault = true };
+            var langFr = new Language("fr-FR");
+
+            ServiceContext.LocalizationService.Save(langFr);
+            ServiceContext.LocalizationService.Save(langUk);
+
+            var contentType = MockedContentTypes.CreateBasicContentType();
+            contentType.Variations = ContentVariation.Culture;
+            ServiceContext.ContentTypeService.Save(contentType);
+
+            IContent content = new Content("content", Constants.System.Root, contentType);
+            content.SetCultureName("content-fr", langFr.IsoCode);
+            content.SetCultureName("content-en", langUk.IsoCode);
+
+            var published = ServiceContext.ContentService.SaveAndPublish(content, new[] { langFr.IsoCode, langUk.IsoCode });
+            Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode));
+            Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
+            Assert.IsTrue(published.Success);
+            Assert.AreEqual(PublishedState.Published, content.PublishedState);
+
+            //re-get
+            content = ServiceContext.ContentService.GetById(content.Id);
+
+            //Change some data since SaveAndPublish should always Save
+            content.SetCultureName("content-en-updated", langUk.IsoCode);
+
+            var saved = ServiceContext.ContentService.SaveAndPublish(content, new string [] { }); //save without cultures            
+            Assert.AreEqual(PublishResultType.FailedPublishNothingToPublish, saved.Result);
+
+            //re-get
+            content = ServiceContext.ContentService.GetById(content.Id);
+            //ensure that even though nothing was published that the data was still persisted
+            Assert.AreEqual("content-en-updated", content.GetCultureName(langUk.IsoCode));
+        }
+
+
         [Test]
         public void Pending_Invariant_Property_Changes_Affect_Default_Language_Edited_State()
         {

From a2ba0f6a4c9a91c0a183b6f60d2be78ad989fd93 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 29 Jul 2019 17:06:09 +1000
Subject: [PATCH 208/776] more tests - failing that need fixing

---
 .../Services/ContentServiceTests.cs           | 151 +++++++++---------
 1 file changed, 75 insertions(+), 76 deletions(-)

diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs
index b8ed0e1f41..7954f0f024 100644
--- a/src/Umbraco.Tests/Services/ContentServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs
@@ -717,21 +717,8 @@ namespace Umbraco.Tests.Services
         [Test]
         public void Can_Unpublish_Content_Variation()
         {
-            // Arrange
+            var content = CreateEnglishAndFrenchDocument(out var langUk, out var langFr, out var contentType);
 
-            var langUk = new Language("en-GB") { IsDefault = true };
-            var langFr = new Language("fr-FR");
-
-            ServiceContext.LocalizationService.Save(langFr);
-            ServiceContext.LocalizationService.Save(langUk);
-
-            var contentType = MockedContentTypes.CreateBasicContentType();
-            contentType.Variations = ContentVariation.Culture;
-            ServiceContext.ContentTypeService.Save(contentType);
-
-            IContent content = new Content("content", Constants.System.Root, contentType);
-            content.SetCultureName("content-fr", langFr.IsoCode);
-            content.SetCultureName("content-en", langUk.IsoCode);
             content.PublishCulture(CultureImpact.Explicit(langFr.IsoCode, langFr.IsDefault));
             content.PublishCulture(CultureImpact.Explicit(langUk.IsoCode, langUk.IsDefault));
             Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode));
@@ -761,25 +748,52 @@ namespace Umbraco.Tests.Services
 
         }
 
+        [Test]
+        public void Can_Publish_Culture_After_Last_Culture_Unpublished()
+        {
+            var content = CreateEnglishAndFrenchDocument(out var langUk, out var langFr, out var contentType);
+
+            var published = ServiceContext.ContentService.SaveAndPublish(content, new[] { langFr.IsoCode, langUk.IsoCode });
+            Assert.AreEqual(PublishedState.Published, content.PublishedState);
+
+            //re-get
+            content = ServiceContext.ContentService.GetById(content.Id);
+
+            var unpublished = ServiceContext.ContentService.Unpublish(content, langUk.IsoCode); //first culture
+            Assert.IsTrue(unpublished.Success);
+            Assert.AreEqual(PublishResultType.SuccessUnpublishCulture, unpublished.Result);
+            Assert.IsFalse(content.IsCulturePublished(langUk.IsoCode));
+            Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode));
+
+            content = ServiceContext.ContentService.GetById(content.Id);
+
+            unpublished = ServiceContext.ContentService.Unpublish(content, langFr.IsoCode); //last culture
+            Assert.IsTrue(unpublished.Success);
+            Assert.AreEqual(PublishResultType.SuccessUnpublishLastCulture, unpublished.Result);
+            Assert.IsFalse(content.IsCulturePublished(langFr.IsoCode));
+            Assert.IsFalse(content.IsCulturePublished(langUk.IsoCode));
+
+            content = ServiceContext.ContentService.GetById(content.Id);
+
+            published = ServiceContext.ContentService.SaveAndPublish(content, langUk.IsoCode);
+            Assert.AreEqual(PublishedState.Published, content.PublishedState);
+            Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
+            Assert.IsFalse(content.IsCulturePublished(langFr.IsoCode));
+            
+            content = ServiceContext.ContentService.GetById(content.Id); //reget
+            Assert.AreEqual(PublishedState.Published, content.PublishedState);
+            Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
+            Assert.IsFalse(content.IsCulturePublished(langFr.IsoCode));
+            
+        }
+
+        
+
         [Test]
         public void Unpublish_All_Cultures_Has_Unpublished_State()
         {
-            // Arrange
+            var content = CreateEnglishAndFrenchDocument(out var langUk, out var langFr, out var contentType);
 
-            var langUk = new Language("en-GB") { IsDefault = true };
-            var langFr = new Language("fr-FR");
-
-            ServiceContext.LocalizationService.Save(langFr);
-            ServiceContext.LocalizationService.Save(langUk);
-
-            var contentType = MockedContentTypes.CreateBasicContentType();
-            contentType.Variations = ContentVariation.Culture;
-            ServiceContext.ContentTypeService.Save(contentType);
-
-            IContent content = new Content("content", Constants.System.Root, contentType);
-            content.SetCultureName("content-fr", langFr.IsoCode);
-            content.SetCultureName("content-en", langUk.IsoCode);
-            
             var published = ServiceContext.ContentService.SaveAndPublish(content, new[] { langFr.IsoCode, langUk.IsoCode });
             Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode));
             Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
@@ -792,7 +806,7 @@ namespace Umbraco.Tests.Services
             Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
             Assert.AreEqual(PublishedState.Published, content.PublishedState);
 
-            var unpublished = ServiceContext.ContentService.Unpublish(content, langFr.IsoCode);
+            var unpublished = ServiceContext.ContentService.Unpublish(content, langFr.IsoCode); //first culture
             Assert.IsTrue(unpublished.Success);
             Assert.AreEqual(PublishResultType.SuccessUnpublishCulture, unpublished.Result);
             Assert.IsFalse(content.IsCulturePublished(langFr.IsoCode));
@@ -804,7 +818,7 @@ namespace Umbraco.Tests.Services
             Assert.IsFalse(content.IsCulturePublished(langFr.IsoCode));
             Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
 
-            unpublished = ServiceContext.ContentService.Unpublish(content, langUk.IsoCode);
+            unpublished = ServiceContext.ContentService.Unpublish(content, langUk.IsoCode); //last culture
             Assert.IsTrue(unpublished.Success);
             Assert.AreEqual(PublishResultType.SuccessUnpublishLastCulture, unpublished.Result);
             Assert.IsFalse(content.IsCulturePublished(langFr.IsoCode));
@@ -814,13 +828,13 @@ namespace Umbraco.Tests.Services
             //re-get
             content = ServiceContext.ContentService.GetById(content.Id);
             Assert.AreEqual(PublishedState.Unpublished, content.PublishedState); //just double checking
+            Assert.IsFalse(content.IsCulturePublished(langFr.IsoCode));
+            Assert.IsFalse(content.IsCulturePublished(langUk.IsoCode));
         }
 
         [Test]
         public void Unpublishing_Mandatory_Language_Unpublishes_Document()
         {
-            // Arrange
-
             var langUk = new Language("en-GB") { IsDefault = true, IsMandatory = true };
             var langFr = new Language("fr-FR");
 
@@ -855,21 +869,7 @@ namespace Umbraco.Tests.Services
         [Test]
         public void Unpublishing_Already_Unpublished_Culture()
         {
-            // Arrange
-
-            var langUk = new Language("en-GB") { IsDefault = true };
-            var langFr = new Language("fr-FR");
-
-            ServiceContext.LocalizationService.Save(langFr);
-            ServiceContext.LocalizationService.Save(langUk);
-
-            var contentType = MockedContentTypes.CreateBasicContentType();
-            contentType.Variations = ContentVariation.Culture;
-            ServiceContext.ContentTypeService.Save(contentType);
-
-            IContent content = new Content("content", Constants.System.Root, contentType);
-            content.SetCultureName("content-fr", langFr.IsoCode);
-            content.SetCultureName("content-en", langUk.IsoCode);
+            var content = CreateEnglishAndFrenchDocument(out var langUk, out var langFr, out var contentType);
 
             var published = ServiceContext.ContentService.SaveAndPublish(content, new[] { langFr.IsoCode, langUk.IsoCode });
             Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode));
@@ -903,21 +903,7 @@ namespace Umbraco.Tests.Services
         [Test]
         public void Publishing_No_Cultures_Still_Saves()
         {
-            // Arrange
-
-            var langUk = new Language("en-GB") { IsDefault = true };
-            var langFr = new Language("fr-FR");
-
-            ServiceContext.LocalizationService.Save(langFr);
-            ServiceContext.LocalizationService.Save(langUk);
-
-            var contentType = MockedContentTypes.CreateBasicContentType();
-            contentType.Variations = ContentVariation.Culture;
-            ServiceContext.ContentTypeService.Save(contentType);
-
-            IContent content = new Content("content", Constants.System.Root, contentType);
-            content.SetCultureName("content-fr", langFr.IsoCode);
-            content.SetCultureName("content-en", langUk.IsoCode);
+            var content = CreateEnglishAndFrenchDocument(out var langUk, out var langFr, out var contentType);
 
             var published = ServiceContext.ContentService.SaveAndPublish(content, new[] { langFr.IsoCode, langUk.IsoCode });
             Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode));
@@ -991,17 +977,7 @@ namespace Umbraco.Tests.Services
         [Test]
         public void Can_Publish_Content_Variation_And_Detect_Changed_Cultures()
         {
-            // Arrange
-
-            var langGB = new Language("en-GB") { IsDefault = true };
-            var langFr = new Language("fr-FR");
-
-            ServiceContext.LocalizationService.Save(langFr);
-            ServiceContext.LocalizationService.Save(langGB);
-
-            var contentType = MockedContentTypes.CreateBasicContentType();
-            contentType.Variations = ContentVariation.Culture;
-            ServiceContext.ContentTypeService.Save(contentType);
+            CreateEnglishAndFrenchDocumentType(out var langUk, out var langFr, out var contentType);
 
             IContent content = new Content("content", Constants.System.Root, contentType);
             content.SetCultureName("content-fr", langFr.IsoCode);
@@ -1012,8 +988,8 @@ namespace Umbraco.Tests.Services
 
             //re-get
             content = ServiceContext.ContentService.GetById(content.Id);
-            content.SetCultureName("content-en", langGB.IsoCode);
-            published = ServiceContext.ContentService.SaveAndPublish(content, langGB.IsoCode);
+            content.SetCultureName("content-en", langUk.IsoCode);
+            published = ServiceContext.ContentService.SaveAndPublish(content, langUk.IsoCode);
             //audit log will only show that english was published
             lastLog = ServiceContext.AuditService.GetLogs(content.Id).Last();
             Assert.AreEqual($"Published languages: English (United Kingdom)", lastLog.Comment);
@@ -3193,5 +3169,28 @@ namespace Umbraco.Tests.Services
             var repository = new DocumentRepository(accessor, AppCaches.Disabled, Logger, contentTypeRepository, templateRepository, tagRepository, languageRepository);
             return repository;
         }
+
+        private void CreateEnglishAndFrenchDocumentType(out Language langUk, out Language langFr, out ContentType contentType)
+        {
+            langUk = new Language("en-GB") { IsDefault = true };
+            langFr = new Language("fr-FR");
+            ServiceContext.LocalizationService.Save(langFr);
+            ServiceContext.LocalizationService.Save(langUk);
+
+            contentType = MockedContentTypes.CreateBasicContentType();
+            contentType.Variations = ContentVariation.Culture;
+            ServiceContext.ContentTypeService.Save(contentType);
+        }
+
+        private IContent CreateEnglishAndFrenchDocument(out Language langUk, out Language langFr, out ContentType contentType)
+        {
+            CreateEnglishAndFrenchDocumentType(out langUk, out langFr, out contentType);
+
+            IContent content = new Content("content", Constants.System.Root, contentType);
+            content.SetCultureName("content-fr", langFr.IsoCode);
+            content.SetCultureName("content-en", langUk.IsoCode);
+
+            return content;
+        }
     }
 }

From 45227357fd38b1498f4d53dbabb88de8520a6d6b Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 29 Jul 2019 17:41:37 +1000
Subject: [PATCH 209/776] adds notes on why this is failing

---
 src/Umbraco.Tests/Services/ContentServiceTests.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs
index 7954f0f024..01eb9a0e27 100644
--- a/src/Umbraco.Tests/Services/ContentServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs
@@ -829,6 +829,13 @@ namespace Umbraco.Tests.Services
             content = ServiceContext.ContentService.GetById(content.Id);
             Assert.AreEqual(PublishedState.Unpublished, content.PublishedState); //just double checking
             Assert.IsFalse(content.IsCulturePublished(langFr.IsoCode));
+            //TODO: This fails!? Why? Because in the ContentService.CommitDocumentChangesInternal method when we detect it's the last lang being unpublished,
+            // we swap the unpublishing flag to true which means we end up setting the property content.PublishedState = PublishedState.Unpublishing, because of this
+            // inside of the DocumentRepository we treat many things differently including not publishing the removed culture.
+            // So how do we fix that? Well when we unpublish the last culture we want to both save the unpublishing of the culture AND unpublish the document, the easy
+            // way to do this will be to perform a double save operation, though that's not the prettiest way to do it. Ideally we take care of this all in one process
+            // in the DocumentRepository but that might require another transitory status like PublishedState.UnpublishingLastCulture ... though that's not pretty either.
+            // It might be possible in some other magicaly way, i'm just leaving these notes here mostly for myself :)
             Assert.IsFalse(content.IsCulturePublished(langUk.IsoCode));
         }
 

From b5b4ee79b406ade86d78a6ea0578683ee426c260 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 30 Jul 2019 16:00:42 +1000
Subject: [PATCH 210/776] Adds notes, fixes logic with a double save

---
 .../TagsPropertyEditorAttribute.cs            |  1 +
 .../Services/Implement/ContentService.cs      | 34 +++++++++++++------
 .../Services/ContentServiceTests.cs           |  4 +++
 3 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/Umbraco.Core/PropertyEditors/TagsPropertyEditorAttribute.cs b/src/Umbraco.Core/PropertyEditors/TagsPropertyEditorAttribute.cs
index 2439c7c02e..6549f1a233 100644
--- a/src/Umbraco.Core/PropertyEditors/TagsPropertyEditorAttribute.cs
+++ b/src/Umbraco.Core/PropertyEditors/TagsPropertyEditorAttribute.cs
@@ -55,6 +55,7 @@ namespace Umbraco.Core.PropertyEditors
         /// <summary>
         /// Gets the type of the dynamic configuration provider.
         /// </summary>
+        //TODO: This is not used and should be implemented in a nicer way, see https://github.com/umbraco/Umbraco-CMS/issues/6017#issuecomment-516253562
         public Type TagsConfigurationProviderType { get; }
     }
 }
diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs
index b1aa92c4c8..7b003d0a26 100644
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -1125,6 +1125,18 @@ namespace Umbraco.Core.Services.Implement
             var changeType = isNew ? TreeChangeTypes.RefreshNode : TreeChangeTypes.RefreshBranch;
             var previouslyPublished = content.HasIdentity && content.Published;
 
+            //inline method to persist the document with the documentRepository since this logic could be called a couple times below
+            void SaveDocument(IContent c)
+            {
+                // save, always
+                if (c.HasIdentity == false)
+                    c.CreatorId = userId;
+                c.WriterId = userId;
+
+                // saving does NOT change the published version, unless PublishedState is Publishing or Unpublishing
+                _documentRepository.Save(c);
+            }
+
             if (publishing)
             {
                 //TODO: Check if it's a culture being unpublished and that's why we are publishing the document. In that case
@@ -1146,11 +1158,15 @@ namespace Umbraco.Core.Services.Implement
                     //check if a culture has been unpublished and if there are no cultures left, and then unpublish document as a whole
                     if (publishResult.Result == PublishResultType.SuccessUnpublishCulture && content.PublishCultureInfos.Count == 0)
                     {
-                        publishing = false;
-                        unpublishing = content.Published; // if not published yet, nothing to do
+                        // This is a special case! We are unpublishing the last culture and to persist that we need to re-publish without any cultures
+                        // so the state needs to remain Publishing to do that. However, we then also need to unpublish the document and to do that
+                        // the state needs to be Unpublishing and it cannot be both. This state is used within the documentRepository to know how to
+                        // persist certain things. So before proceeding below, we need to save the Publishing state to publish no cultures, then we can
+                        // mark the document for Unpublishing.
+                        SaveDocument(content);
 
-                        // we may end up in a state where we won't publish nor unpublish
-                        // keep going, though, as we want to save anyways
+                        //set the flag to unpublish and continue
+                        unpublishing = content.Published; // if not published yet, nothing to do
                     }
                 }
                 else
@@ -1212,13 +1228,8 @@ namespace Umbraco.Core.Services.Implement
                 }
             }
 
-            // save, always
-            if (content.HasIdentity == false)
-                content.CreatorId = userId;
-            content.WriterId = userId;
-
-            // saving does NOT change the published version, unless PublishedState is Publishing or Unpublishing
-            _documentRepository.Save(content);
+            //Persist the document
+            SaveDocument(content);
 
             // raise the Saved event, always
             if (raiseEvents)
@@ -2758,6 +2769,7 @@ namespace Umbraco.Core.Services.Implement
         {
             var attempt = new PublishResult(PublishResultType.SuccessUnpublish, evtMsgs, content);
 
+            //TODO: What is this check?? we just created this attempt and of course it is Success?!
             if (attempt.Success == false)
                 return attempt;
 
diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs
index 01eb9a0e27..10bb63211b 100644
--- a/src/Umbraco.Tests/Services/ContentServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs
@@ -836,6 +836,10 @@ namespace Umbraco.Tests.Services
             // way to do this will be to perform a double save operation, though that's not the prettiest way to do it. Ideally we take care of this all in one process
             // in the DocumentRepository but that might require another transitory status like PublishedState.UnpublishingLastCulture ... though that's not pretty either.
             // It might be possible in some other magicaly way, i'm just leaving these notes here mostly for myself :)
+            // UPDATE - ok, i 'think' instead of doing a check inside of CommitDocumentChangesInternal for the last culture being unpublished, we could actually do this check
+            // directly inside of the DocumentRepository
+            // UPDATE 2 - ok that won't work because there is some business logic that needs to occur in CommitDocumentChangesInternal when it needs to be unpublished, this will
+            // be tricky without doing a double save, hrm.
             Assert.IsFalse(content.IsCulturePublished(langUk.IsoCode));
         }
 

From 27bc309c557f9b0adeca9f587feed9a199f80e36 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 30 Jul 2019 18:49:48 +1000
Subject: [PATCH 211/776] Removes unused code

---
 .../Implement/ContentRepositoryBase.cs        | 35 ++++++++++---------
 .../Services/Implement/ContentService.cs      |  3 --
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs
index aeb4c3774f..60beaca018 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs
@@ -512,20 +512,21 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             foreach (var a in allPropertyDataDtos)
                 a.PropertyTypeDto = indexedPropertyTypeDtos[a.PropertyTypeId];
 
-            // prefetch configuration for tag properties
-            var tagEditors = new Dictionary<string, TagConfiguration>();
-            foreach (var propertyTypeDto in indexedPropertyTypeDtos.Values)
-            {
-                var editorAlias = propertyTypeDto.DataTypeDto.EditorAlias;
-                var editorAttribute = PropertyEditors[editorAlias].GetTagAttribute();
-                if (editorAttribute == null) continue;
-                var tagConfigurationSource = propertyTypeDto.DataTypeDto.Configuration;
-                var tagConfiguration = string.IsNullOrWhiteSpace(tagConfigurationSource)
-                    ? new TagConfiguration()
-                    : JsonConvert.DeserializeObject<TagConfiguration>(tagConfigurationSource);
-                if (tagConfiguration.Delimiter == default) tagConfiguration.Delimiter = editorAttribute.Delimiter;
-                tagEditors[editorAlias] = tagConfiguration;
-            }
+            //TODO: This logic was here but then we never used the data being passed to GetPropertyCollections, this will save a bit of CPU without it!
+            //// prefetch configuration for tag properties
+            //var tagEditors = new Dictionary<string, TagConfiguration>();
+            //foreach (var propertyTypeDto in indexedPropertyTypeDtos.Values)
+            //{
+            //    var editorAlias = propertyTypeDto.DataTypeDto.EditorAlias;
+            //    var editorAttribute = PropertyEditors[editorAlias].GetTagAttribute();
+            //    if (editorAttribute == null) continue;
+            //    var tagConfigurationSource = propertyTypeDto.DataTypeDto.Configuration;
+            //    var tagConfiguration = string.IsNullOrWhiteSpace(tagConfigurationSource)
+            //        ? new TagConfiguration()
+            //        : JsonConvert.DeserializeObject<TagConfiguration>(tagConfigurationSource);
+            //    if (tagConfiguration.Delimiter == default) tagConfiguration.Delimiter = editorAttribute.Delimiter;
+            //    tagEditors[editorAlias] = tagConfiguration;
+            //}
 
             // now we have
             // - the definitions
@@ -533,10 +534,12 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             // - tag editors
             // and we need to build the proper property collections
 
-            return GetPropertyCollections(temps, allPropertyDataDtos, tagEditors);
+            return GetPropertyCollections(temps, allPropertyDataDtos
+                /*, tagEditors*/);
         }
 
-        private IDictionary<int, PropertyCollection> GetPropertyCollections<T>(List<TempContent<T>> temps, IEnumerable<PropertyDataDto> allPropertyDataDtos, Dictionary<string, TagConfiguration> tagConfigurations)
+        private IDictionary<int, PropertyCollection> GetPropertyCollections<T>(List<TempContent<T>> temps, IEnumerable<PropertyDataDto> allPropertyDataDtos
+            /*, Dictionary<string, TagConfiguration> tagConfigurations*/)
             where T : class, IContentBase
         {
             var result = new Dictionary<int, PropertyCollection>();
diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs
index 7b003d0a26..5492f97409 100644
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -1139,9 +1139,6 @@ namespace Umbraco.Core.Services.Implement
 
             if (publishing)
             {
-                //TODO: Check if it's a culture being unpublished and that's why we are publishing the document. In that case
-                // we should check if the culture is already unpublished since it might be the user is trying to unpublish an already unpublished culture?
-
                 //determine cultures publishing/unpublishing which will be based on previous calls to content.PublishCulture and ClearPublishInfo
                 culturesUnpublishing = content.GetCulturesUnpublishing();
                 culturesPublishing = variesByCulture

From 20d28ea2159f90b833ea14f8317f644763fbb3ea Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 30 Jul 2019 19:08:37 +1000
Subject: [PATCH 212/776] removes commented out code

---
 .../Implement/ContentRepositoryBase.cs        | 24 +++----------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs
index 60beaca018..7ab73f3f2d 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs
@@ -512,34 +512,16 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             foreach (var a in allPropertyDataDtos)
                 a.PropertyTypeDto = indexedPropertyTypeDtos[a.PropertyTypeId];
 
-            //TODO: This logic was here but then we never used the data being passed to GetPropertyCollections, this will save a bit of CPU without it!
-            //// prefetch configuration for tag properties
-            //var tagEditors = new Dictionary<string, TagConfiguration>();
-            //foreach (var propertyTypeDto in indexedPropertyTypeDtos.Values)
-            //{
-            //    var editorAlias = propertyTypeDto.DataTypeDto.EditorAlias;
-            //    var editorAttribute = PropertyEditors[editorAlias].GetTagAttribute();
-            //    if (editorAttribute == null) continue;
-            //    var tagConfigurationSource = propertyTypeDto.DataTypeDto.Configuration;
-            //    var tagConfiguration = string.IsNullOrWhiteSpace(tagConfigurationSource)
-            //        ? new TagConfiguration()
-            //        : JsonConvert.DeserializeObject<TagConfiguration>(tagConfigurationSource);
-            //    if (tagConfiguration.Delimiter == default) tagConfiguration.Delimiter = editorAttribute.Delimiter;
-            //    tagEditors[editorAlias] = tagConfiguration;
-            //}
-
             // now we have
             // - the definitions
             // - all property data dtos
-            // - tag editors
+            // - tag editors (Actually ... no we don't since i removed that code, but we don't need them anyways it seems)
             // and we need to build the proper property collections
 
-            return GetPropertyCollections(temps, allPropertyDataDtos
-                /*, tagEditors*/);
+            return GetPropertyCollections(temps, allPropertyDataDtos);
         }
 
-        private IDictionary<int, PropertyCollection> GetPropertyCollections<T>(List<TempContent<T>> temps, IEnumerable<PropertyDataDto> allPropertyDataDtos
-            /*, Dictionary<string, TagConfiguration> tagConfigurations*/)
+        private IDictionary<int, PropertyCollection> GetPropertyCollections<T>(List<TempContent<T>> temps, IEnumerable<PropertyDataDto> allPropertyDataDtos)
             where T : class, IContentBase
         {
             var result = new Dictionary<int, PropertyCollection>();

From 108416638c837ad25a52dab9a142db909d789d46 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 30 Jul 2019 22:28:06 +1000
Subject: [PATCH 213/776] removes commented out code

---
 src/Umbraco.Tests/Services/ContentServiceTests.cs | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs
index 10bb63211b..39bebbe90b 100644
--- a/src/Umbraco.Tests/Services/ContentServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs
@@ -828,18 +828,7 @@ namespace Umbraco.Tests.Services
             //re-get
             content = ServiceContext.ContentService.GetById(content.Id);
             Assert.AreEqual(PublishedState.Unpublished, content.PublishedState); //just double checking
-            Assert.IsFalse(content.IsCulturePublished(langFr.IsoCode));
-            //TODO: This fails!? Why? Because in the ContentService.CommitDocumentChangesInternal method when we detect it's the last lang being unpublished,
-            // we swap the unpublishing flag to true which means we end up setting the property content.PublishedState = PublishedState.Unpublishing, because of this
-            // inside of the DocumentRepository we treat many things differently including not publishing the removed culture.
-            // So how do we fix that? Well when we unpublish the last culture we want to both save the unpublishing of the culture AND unpublish the document, the easy
-            // way to do this will be to perform a double save operation, though that's not the prettiest way to do it. Ideally we take care of this all in one process
-            // in the DocumentRepository but that might require another transitory status like PublishedState.UnpublishingLastCulture ... though that's not pretty either.
-            // It might be possible in some other magicaly way, i'm just leaving these notes here mostly for myself :)
-            // UPDATE - ok, i 'think' instead of doing a check inside of CommitDocumentChangesInternal for the last culture being unpublished, we could actually do this check
-            // directly inside of the DocumentRepository
-            // UPDATE 2 - ok that won't work because there is some business logic that needs to occur in CommitDocumentChangesInternal when it needs to be unpublished, this will
-            // be tricky without doing a double save, hrm.
+            Assert.IsFalse(content.IsCulturePublished(langFr.IsoCode));          
             Assert.IsFalse(content.IsCulturePublished(langUk.IsoCode));
         }
 

From 16d8f8846e1656ffb799c65a9404ffece60dc851 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 30 Jul 2019 22:40:15 +1000
Subject: [PATCH 214/776] Adds PanicException with details instead of throwing
 "panic" strings

---
 src/Umbraco.Core/Exceptions/PanicException.cs | 28 +++++++++++++++++++
 src/Umbraco.Core/Mapping/UmbracoMapper.cs     |  5 ++--
 .../DataTypes/RenamingPreValueMigrator.cs     |  3 +-
 .../Models/PublishedContent/ModelType.cs      |  4 +--
 .../Implement/ContentTypeCommonRepository.cs  |  3 +-
 .../Implement/ContentTypeRepository.cs        |  3 +-
 .../Implement/MediaTypeRepository.cs          |  3 +-
 .../Implement/MemberTypeRepository.cs         |  3 +-
 src/Umbraco.Core/Umbraco.Core.csproj          |  1 +
 .../Testing/TestOptionAttributeBase.cs        |  5 ++--
 .../Mapping/ContentTypeMapDefinition.cs       |  3 +-
 .../MultipleTextStringPropertyEditor.cs       |  3 +-
 .../PublishedCache/NuCache/ContentStore.cs    |  3 +-
 .../PublishedCache/NuCache/SnapDictionary.cs  |  3 +-
 14 files changed, 55 insertions(+), 15 deletions(-)
 create mode 100644 src/Umbraco.Core/Exceptions/PanicException.cs

diff --git a/src/Umbraco.Core/Exceptions/PanicException.cs b/src/Umbraco.Core/Exceptions/PanicException.cs
new file mode 100644
index 0000000000..4d41cafc65
--- /dev/null
+++ b/src/Umbraco.Core/Exceptions/PanicException.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Runtime.Serialization;
+
+namespace Umbraco.Core.Exceptions
+{
+    /// <summary>
+    /// Internal exception that in theory should never ben thrown, it is only thrown in circumstances that should never happen
+    /// </summary>
+    [Serializable]
+    internal class PanicException : Exception
+    {
+        public PanicException()
+        {
+        }
+
+        public PanicException(string message) : base(message)
+        {
+        }
+
+        public PanicException(string message, Exception innerException) : base(message, innerException)
+        {
+        }
+
+        protected PanicException(SerializationInfo info, StreamingContext context) : base(info, context)
+        {
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Mapping/UmbracoMapper.cs b/src/Umbraco.Core/Mapping/UmbracoMapper.cs
index 8915ebcf74..976f50b499 100644
--- a/src/Umbraco.Core/Mapping/UmbracoMapper.cs
+++ b/src/Umbraco.Core/Mapping/UmbracoMapper.cs
@@ -3,6 +3,7 @@ using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
+using Umbraco.Core.Exceptions;
 
 namespace Umbraco.Core.Mapping
 {
@@ -259,7 +260,7 @@ namespace Umbraco.Core.Mapping
             if (typeof(TTarget).IsArray)
             {
                 var elementType = typeof(TTarget).GetElementType();
-                if (elementType == null) throw new Exception("panic");
+                if (elementType == null) throw new PanicException("elementType == null which should never occur");
                 var targetArray = Array.CreateInstance(elementType, targetList.Count);
                 targetList.CopyTo(targetArray, 0);
                 target = targetArray;
@@ -382,7 +383,7 @@ namespace Umbraco.Core.Mapping
         {
             if (type.IsArray) return type.GetElementType();
             if (type.IsGenericType) return type.GenericTypeArguments[0];
-            throw new Exception("panic");
+            throw new PanicException($"Could not get enumerable or array type from {type}");
         }
 
         /// <summary>
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/RenamingPreValueMigrator.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/RenamingPreValueMigrator.cs
index c04e7c8fda..89a71fdaf4 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/RenamingPreValueMigrator.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/RenamingPreValueMigrator.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using Umbraco.Core.Exceptions;
 
 namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0.DataTypes
 {
@@ -20,7 +21,7 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0.DataTypes
                 case "Umbraco.NoEdit":
                     return Constants.PropertyEditors.Aliases.Label;
                 default:
-                    throw new Exception("panic");
+                    throw new PanicException($"The alias {editorAlias} is not supported");
             }
         }
     }
diff --git a/src/Umbraco.Core/Models/PublishedContent/ModelType.cs b/src/Umbraco.Core/Models/PublishedContent/ModelType.cs
index 540abda2c5..318ccc916e 100644
--- a/src/Umbraco.Core/Models/PublishedContent/ModelType.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/ModelType.cs
@@ -75,7 +75,7 @@ namespace Umbraco.Core.Models.PublishedContent
                 return type;
             var def = type.GetGenericTypeDefinition();
             if (def == null)
-                throw new InvalidOperationException("panic");
+                throw new PanicException($"The type {type} has not generic type definition");
 
             var args = type.GetGenericArguments().Select(x => Map(x, modelTypes, true)).ToArray();
             return def.MakeGenericType(args);
@@ -114,7 +114,7 @@ namespace Umbraco.Core.Models.PublishedContent
                 return type.FullName;
             var def = type.GetGenericTypeDefinition();
             if (def == null)
-                throw new InvalidOperationException("panic");
+                throw new PanicException($"The type {type} has not generic type definition");
 
             var args = type.GetGenericArguments().Select(x => MapToName(x, map, true)).ToArray();
             var defFullName = def.FullName.Substring(0, def.FullName.IndexOf('`'));
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeCommonRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeCommonRepository.cs
index 6b751eb8ff..4393d365f8 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeCommonRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeCommonRepository.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using NPoco;
 using Umbraco.Core.Cache;
+using Umbraco.Core.Exceptions;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Factories;
@@ -90,7 +91,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
                     contentType = ContentTypeFactory.BuildContentTypeEntity(contentTypeDto);
                 else if (contentTypeDto.NodeDto.NodeObjectType == Constants.ObjectTypes.MemberType)
                     contentType = ContentTypeFactory.BuildMemberTypeEntity(contentTypeDto);
-                else throw new Exception("panic");
+                else throw new PanicException($"The node object type {contentTypeDto.NodeDto.NodeObjectType} is not supported");
                 contentTypes.Add(contentType.Id, contentType);
 
                 // map allowed content types
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepository.cs
index 9d77eb0990..38988657d1 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepository.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using NPoco;
 using Umbraco.Core.Cache;
+using Umbraco.Core.Exceptions;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Entities;
@@ -56,7 +57,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         {
             // the cache policy will always want everything
             // even GetMany(ids) gets everything and filters afterwards
-            if (ids.Any()) throw new Exception("panic");
+            if (ids.Any()) throw new PanicException("There can be no ids specified");
             return CommonRepository.GetAllTypes().OfType<IContentType>();
         }
 
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/MediaTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/MediaTypeRepository.cs
index 1abc75cf3a..604f18cdbd 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/MediaTypeRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/MediaTypeRepository.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using NPoco;
 using Umbraco.Core.Cache;
+using Umbraco.Core.Exceptions;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Entities;
@@ -50,7 +51,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         {
             // the cache policy will always want everything
             // even GetMany(ids) gets everything and filters afterwards
-            if (ids.Any()) throw new Exception("panic");
+            if (ids.Any()) throw new PanicException("There can be no ids specified");
             return CommonRepository.GetAllTypes().OfType<IMediaType>();
         }
 
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/MemberTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberTypeRepository.cs
index d96854743e..395723a9f1 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/MemberTypeRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberTypeRepository.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using NPoco;
 using Umbraco.Core.Cache;
+using Umbraco.Core.Exceptions;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Entities;
@@ -57,7 +58,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         {
             // the cache policy will always want everything
             // even GetMany(ids) gets everything and filters afterwards
-            if (ids.Any()) throw new Exception("panic");
+            if (ids.Any()) throw new PanicException("There can be no ids specified");
             return CommonRepository.GetAllTypes().OfType<IMemberType>();
         }
 
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index ca9b7d4034..74af58b94f 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -204,6 +204,7 @@
     <Compile Include="CompositionExtensions_Essentials.cs" />
     <Compile Include="CompositionExtensions_FileSystems.cs" />
     <Compile Include="CompositionExtensions_Uniques.cs" />
+    <Compile Include="Exceptions\PanicException.cs" />
     <Compile Include="FactoryExtensions.cs" />
     <Compile Include="Composing\RegisterFactory.cs" />
     <Compile Include="Composing\Current.cs" />
diff --git a/src/Umbraco.Tests/Testing/TestOptionAttributeBase.cs b/src/Umbraco.Tests/Testing/TestOptionAttributeBase.cs
index db7dd25152..9f72a022f3 100644
--- a/src/Umbraco.Tests/Testing/TestOptionAttributeBase.cs
+++ b/src/Umbraco.Tests/Testing/TestOptionAttributeBase.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Reflection;
 using NUnit.Framework;
+using Umbraco.Core.Exceptions;
 
 namespace Umbraco.Tests.Testing
 {
@@ -29,7 +30,7 @@ namespace Umbraco.Tests.Testing
             var methodName = test.MethodName;
             var type = Type.GetType(typeName, true);
             if (type == null)
-                throw new Exception("panic"); // makes no sense
+                throw new PanicException($"Could not resolve the type from type name {typeName}"); // makes no sense
             var methodInfo = type.GetMethod(methodName); // what about overloads?
             var options = GetTestOptions<TOptions>(methodInfo);
             return options;
@@ -53,7 +54,7 @@ namespace Umbraco.Tests.Testing
         {
             if (other == null) throw new ArgumentNullException(nameof(other));
             if (!(Merge((TestOptionAttributeBase) other) is TOptions merged))
-                throw new Exception("panic");
+                throw new PanicException("Could not merge test options");
             return merged;
         }
 
diff --git a/src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs
index fc029eabe4..528d5f6de5 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs
@@ -8,6 +8,7 @@ using Umbraco.Core.Models;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Core.Services;
+using Umbraco.Core.Exceptions;
 
 namespace Umbraco.Web.Models.Mapping
 {
@@ -577,7 +578,7 @@ namespace Umbraco.Web.Models.Mapping
                     udiType = Constants.UdiEntityType.DocumentType;
                     break;
                 default:
-                    throw new Exception("panic");
+                    throw new PanicException($"Source is of type {source.GetType()} which isn't supported here");
             }
 
             return Udi.Create(udiType, source.Key);
diff --git a/src/Umbraco.Web/PropertyEditors/MultipleTextStringPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/MultipleTextStringPropertyEditor.cs
index 141bdea7b6..abb4eae13f 100644
--- a/src/Umbraco.Web/PropertyEditors/MultipleTextStringPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MultipleTextStringPropertyEditor.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using Newtonsoft.Json.Linq;
 using Umbraco.Core;
+using Umbraco.Core.Exceptions;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Editors;
@@ -56,7 +57,7 @@ namespace Umbraco.Web.PropertyEditors
                 }
 
                 if (!(editorValue.DataTypeConfiguration is MultipleTextStringConfiguration config))
-                    throw new Exception("panic");
+                    throw new PanicException($"editorValue.DataTypeConfiguration is {editorValue.DataTypeConfiguration.GetType()} but must be {typeof(MultipleTextStringConfiguration)}");
                 var max = config.Maximum;
 
                 //The legacy property editor saved this data as new line delimited! strange but we have to maintain that.
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
index 2d501fa3b5..8e2cf7bc3c 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
@@ -6,6 +6,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using CSharpTest.Net.Collections;
 using Umbraco.Core;
+using Umbraco.Core.Exceptions;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Scoping;
@@ -1044,7 +1045,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     if (_genObj == null)
                         _genObjs.Enqueue(_genObj = new GenObj(snapGen));
                     else if (_genObj.Gen != snapGen)
-                        throw new Exception("panic");
+                        throw new PanicException($"The generation {_genObj.Gen} does not equal the snapshot generation {snapGen}");
                 }
                 else
                 {
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs b/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
index c5b1df1206..9671949ff0 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Umbraco.Core.Exceptions;
 using Umbraco.Core.Scoping;
 using Umbraco.Web.PublishedCache.NuCache.Snap;
 
@@ -371,7 +372,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
                     // if we have one already, ensure it's consistent
                     else if (_genObj.Gen != snapGen)
-                        throw new Exception("panic");
+                        throw new PanicException($"The generation {_genObj.Gen} does not equal the snapshot generation {snapGen}");
                 }
                 else
                 {

From 6482d849e31a949c40deaa8418d9ec6fc8a07321 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 30 Jul 2019 22:59:33 +1000
Subject: [PATCH 215/776] Moves test to different fixture

---
 .../Services/ContentTypeServiceTests.cs       | 355 +----------------
 .../ContentTypeServiceVariantsTests.cs        | 356 ++++++++++++++++++
 2 files changed, 357 insertions(+), 354 deletions(-)

diff --git a/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs b/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs
index a0b5f01a1f..f2a4368ae4 100644
--- a/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs
@@ -53,360 +53,7 @@ namespace Umbraco.Tests.Services
             Assert.IsTrue(contentType.IsElement);
         }
 
-        [Test]
-        public void Change_Content_Type_Variation_Clears_Redirects()
-        {
-            //create content type with a property type that varies by culture
-            var contentType = MockedContentTypes.CreateBasicContentType();
-            contentType.Variations = ContentVariation.Nothing;
-            var contentCollection = new PropertyTypeCollection(true);
-            contentCollection.Add(new PropertyType("test", ValueStorageType.Ntext)
-            {
-                Alias = "title",
-                Name = "Title",
-                Description = "",
-                Mandatory = false,
-                SortOrder = 1,
-                DataTypeId = -88,
-                Variations = ContentVariation.Nothing
-            });
-            contentType.PropertyGroups.Add(new PropertyGroup(contentCollection) { Name = "Content", SortOrder = 1 });
-            ServiceContext.ContentTypeService.Save(contentType);
-            var contentType2 = MockedContentTypes.CreateBasicContentType("test");
-            ServiceContext.ContentTypeService.Save(contentType2);
-
-            //create some content of this content type
-            IContent doc = MockedContent.CreateBasicContent(contentType);
-            doc.Name = "Hello1";
-            ServiceContext.ContentService.Save(doc);
-
-            IContent doc2 = MockedContent.CreateBasicContent(contentType2);
-            ServiceContext.ContentService.Save(doc2);
-
-            ServiceContext.RedirectUrlService.Register("hello/world", doc.Key);
-            ServiceContext.RedirectUrlService.Register("hello2/world2", doc2.Key);
-
-            Assert.AreEqual(1, ServiceContext.RedirectUrlService.GetContentRedirectUrls(doc.Key).Count());
-            Assert.AreEqual(1, ServiceContext.RedirectUrlService.GetContentRedirectUrls(doc2.Key).Count());
-
-            //change variation
-            contentType.Variations = ContentVariation.Culture;
-            ServiceContext.ContentTypeService.Save(contentType);
-
-            Assert.AreEqual(0, ServiceContext.RedirectUrlService.GetContentRedirectUrls(doc.Key).Count());
-            Assert.AreEqual(1, ServiceContext.RedirectUrlService.GetContentRedirectUrls(doc2.Key).Count());
-
-        }
-
-        [Test]
-        public void Change_Content_Type_From_Invariant_Variant()
-        {
-            //create content type with a property type that varies by culture
-            var contentType = MockedContentTypes.CreateBasicContentType();
-            contentType.Variations = ContentVariation.Nothing;
-            var contentCollection = new PropertyTypeCollection(true);
-            contentCollection.Add(new PropertyType("test", ValueStorageType.Ntext)
-            {
-                Alias = "title",
-                Name = "Title",
-                Description = "",
-                Mandatory = false,
-                SortOrder = 1,
-                DataTypeId = -88,
-                Variations = ContentVariation.Nothing
-            });
-            contentType.PropertyGroups.Add(new PropertyGroup(contentCollection) { Name = "Content", SortOrder = 1 });
-            ServiceContext.ContentTypeService.Save(contentType);
-
-            //create some content of this content type
-            IContent doc = MockedContent.CreateBasicContent(contentType);
-            doc.Name = "Hello1";
-            doc.SetValue("title", "hello world");
-            ServiceContext.ContentService.Save(doc);
-
-            Assert.AreEqual("Hello1", doc.Name);
-            Assert.AreEqual("hello world", doc.GetValue("title"));
-
-            //change the content type to be variant, we will also update the name here to detect the copy changes
-            doc.Name = "Hello2";
-            ServiceContext.ContentService.Save(doc);
-            contentType.Variations = ContentVariation.Culture;
-            ServiceContext.ContentTypeService.Save(contentType);
-            doc = ServiceContext.ContentService.GetById(doc.Id); //re-get
-
-            Assert.AreEqual("Hello2", doc.GetCultureName("en-US"));
-            Assert.AreEqual("hello world", doc.GetValue("title")); //We are not checking against en-US here because properties will remain invariant
-
-            //change back property type to be invariant, we will also update the name here to detect the copy changes
-            doc.SetCultureName("Hello3", "en-US");
-            ServiceContext.ContentService.Save(doc);
-            contentType.Variations = ContentVariation.Nothing;
-            ServiceContext.ContentTypeService.Save(contentType);
-            doc = ServiceContext.ContentService.GetById(doc.Id); //re-get
-
-            Assert.AreEqual("Hello3", doc.Name);
-            Assert.AreEqual("hello world", doc.GetValue("title"));
-        }
-
-        [Test]
-        public void Change_Content_Type_From_Variant_Invariant()
-        {
-            //create content type with a property type that varies by culture
-            var contentType = MockedContentTypes.CreateBasicContentType();
-            contentType.Variations = ContentVariation.Culture;
-            var contentCollection = new PropertyTypeCollection(true);
-            contentCollection.Add(new PropertyType("test", ValueStorageType.Ntext)
-            {
-                Alias = "title",
-                Name = "Title",
-                Description = "",
-                Mandatory = false,
-                SortOrder = 1,
-                DataTypeId = -88,
-                Variations = ContentVariation.Culture
-            });
-            contentType.PropertyGroups.Add(new PropertyGroup(contentCollection) { Name = "Content", SortOrder = 1 });
-            ServiceContext.ContentTypeService.Save(contentType);
-
-            //create some content of this content type
-            IContent doc = MockedContent.CreateBasicContent(contentType);
-            doc.SetCultureName("Hello1", "en-US");
-            doc.SetValue("title", "hello world", "en-US");
-            ServiceContext.ContentService.Save(doc);
-
-            Assert.AreEqual("Hello1", doc.GetCultureName("en-US"));
-            Assert.AreEqual("hello world", doc.GetValue("title", "en-US"));
-
-            //change the content type to be invariant, we will also update the name here to detect the copy changes
-            doc.SetCultureName("Hello2", "en-US");
-            ServiceContext.ContentService.Save(doc);
-            contentType.Variations = ContentVariation.Nothing;
-            ServiceContext.ContentTypeService.Save(contentType);
-            doc = ServiceContext.ContentService.GetById(doc.Id); //re-get
-
-            Assert.AreEqual("Hello2", doc.Name);
-            Assert.AreEqual("hello world", doc.GetValue("title"));
-
-            //change back property type to be variant, we will also update the name here to detect the copy changes
-            doc.Name = "Hello3";
-            ServiceContext.ContentService.Save(doc);
-            contentType.Variations = ContentVariation.Culture;
-            ServiceContext.ContentTypeService.Save(contentType);
-            doc = ServiceContext.ContentService.GetById(doc.Id); //re-get
-
-            //at this stage all property types were switched to invariant so even though the variant value
-            //exists it will not be returned because the property type is invariant,
-            //so this check proves that null will be returned
-            Assert.IsNull(doc.GetValue("title", "en-US"));
-
-            //we can now switch the property type to be variant and the value can be returned again
-            contentType.PropertyTypes.First().Variations = ContentVariation.Culture;
-            ServiceContext.ContentTypeService.Save(contentType);
-            doc = ServiceContext.ContentService.GetById(doc.Id); //re-get
-
-            Assert.AreEqual("Hello3", doc.GetCultureName("en-US"));
-            Assert.AreEqual("hello world", doc.GetValue("title", "en-US"));
-
-        }
-
-        [Test]
-        public void Change_Property_Type_From_Invariant_Variant()
-        {
-            //create content type with a property type that varies by culture
-            var contentType = MockedContentTypes.CreateBasicContentType();
-            contentType.Variations = ContentVariation.Nothing;
-            var contentCollection = new PropertyTypeCollection(true);
-            contentCollection.Add(new PropertyType("test", ValueStorageType.Ntext)
-            {
-                Alias = "title",
-                Name = "Title",
-                Description = "",
-                Mandatory = false,
-                SortOrder = 1,
-                DataTypeId = -88,
-                Variations = ContentVariation.Nothing
-            });
-            contentType.PropertyGroups.Add(new PropertyGroup(contentCollection) { Name = "Content", SortOrder = 1 });
-            ServiceContext.ContentTypeService.Save(contentType);
-
-            //create some content of this content type
-            IContent doc = MockedContent.CreateBasicContent(contentType);
-            doc.Name = "Home";
-            doc.SetValue("title", "hello world");
-            ServiceContext.ContentService.Save(doc);
-
-            Assert.AreEqual("hello world", doc.GetValue("title"));
-
-            //change the property type to be variant
-            contentType.PropertyTypes.First().Variations = ContentVariation.Culture;
-            ServiceContext.ContentTypeService.Save(contentType);
-            doc = ServiceContext.ContentService.GetById(doc.Id); //re-get
-
-            Assert.AreEqual("hello world", doc.GetValue("title", "en-US"));
-
-            //change back property type to be invariant
-            contentType.PropertyTypes.First().Variations = ContentVariation.Nothing;
-            ServiceContext.ContentTypeService.Save(contentType);
-            doc = ServiceContext.ContentService.GetById(doc.Id); //re-get
-
-            Assert.AreEqual("hello world", doc.GetValue("title"));
-        }
-
-        [Test]
-        public void Change_Property_Type_From_Variant_Invariant()
-        {
-            //create content type with a property type that varies by culture
-            var contentType = MockedContentTypes.CreateBasicContentType();
-            contentType.Variations = ContentVariation.Culture;
-            var contentCollection = new PropertyTypeCollection(true);
-            contentCollection.Add(new PropertyType("test", ValueStorageType.Ntext)
-            {
-                Alias = "title",
-                Name = "Title",
-                Description = "",
-                Mandatory = false,
-                SortOrder = 1,
-                DataTypeId = -88,
-                Variations = ContentVariation.Culture
-            });
-            contentType.PropertyGroups.Add(new PropertyGroup(contentCollection) { Name = "Content", SortOrder = 1 });
-            ServiceContext.ContentTypeService.Save(contentType);
-
-            //create some content of this content type
-            IContent doc = MockedContent.CreateBasicContent(contentType);
-            doc.SetCultureName("Home", "en-US");
-            doc.SetValue("title", "hello world", "en-US");
-            ServiceContext.ContentService.Save(doc);
-
-            Assert.AreEqual("hello world", doc.GetValue("title", "en-US"));
-
-            //change the property type to be invariant
-            contentType.PropertyTypes.First().Variations = ContentVariation.Nothing;
-            ServiceContext.ContentTypeService.Save(contentType);
-            doc = ServiceContext.ContentService.GetById(doc.Id); //re-get
-
-            Assert.AreEqual("hello world", doc.GetValue("title"));
-
-            //change back property type to be variant
-            contentType.PropertyTypes.First().Variations = ContentVariation.Culture;
-            ServiceContext.ContentTypeService.Save(contentType);
-            doc = ServiceContext.ContentService.GetById(doc.Id); //re-get
-
-            Assert.AreEqual("hello world", doc.GetValue("title", "en-US"));
-        }
-
-        [Test]
-        public void Change_Property_Type_From_Variant_Invariant_On_A_Composition()
-        {
-            //create content type with a property type that varies by culture
-            var contentType = MockedContentTypes.CreateBasicContentType();
-            contentType.Variations = ContentVariation.Culture;
-            var contentCollection = new PropertyTypeCollection(true);
-            contentCollection.Add(new PropertyType("test", ValueStorageType.Ntext)
-            {
-                Alias = "title",
-                Name = "Title",
-                Description = "",
-                Mandatory = false,
-                SortOrder = 1,
-                DataTypeId = -88,
-                Variations = ContentVariation.Culture
-            });
-            contentType.PropertyGroups.Add(new PropertyGroup(contentCollection) { Name = "Content", SortOrder = 1 });
-            ServiceContext.ContentTypeService.Save(contentType);
-
-            //compose this from the other one
-            var contentType2 = MockedContentTypes.CreateBasicContentType("test");
-            contentType2.Variations = ContentVariation.Culture;
-            contentType2.AddContentType(contentType);
-            ServiceContext.ContentTypeService.Save(contentType2);
-
-            //create some content of this content type
-            IContent doc = MockedContent.CreateBasicContent(contentType);
-            doc.SetCultureName("Home", "en-US");
-            doc.SetValue("title", "hello world", "en-US");
-            ServiceContext.ContentService.Save(doc);
-
-            IContent doc2 = MockedContent.CreateBasicContent(contentType2);
-            doc2.SetCultureName("Home", "en-US");
-            doc2.SetValue("title", "hello world", "en-US");
-            ServiceContext.ContentService.Save(doc2);
-
-            //change the property type to be invariant
-            contentType.PropertyTypes.First().Variations = ContentVariation.Nothing;
-            ServiceContext.ContentTypeService.Save(contentType);
-            doc = ServiceContext.ContentService.GetById(doc.Id); //re-get
-            doc2 = ServiceContext.ContentService.GetById(doc2.Id); //re-get
-
-            Assert.AreEqual("hello world", doc.GetValue("title"));
-            Assert.AreEqual("hello world", doc2.GetValue("title"));
-
-            //change back property type to be variant
-            contentType.PropertyTypes.First().Variations = ContentVariation.Culture;
-            ServiceContext.ContentTypeService.Save(contentType);
-            doc = ServiceContext.ContentService.GetById(doc.Id); //re-get
-            doc2 = ServiceContext.ContentService.GetById(doc2.Id); //re-get
-
-            Assert.AreEqual("hello world", doc.GetValue("title", "en-US"));
-            Assert.AreEqual("hello world", doc2.GetValue("title", "en-US"));
-        }
-
-        [Test]
-        public void Change_Content_Type_From_Variant_Invariant_On_A_Composition()
-        {
-            //create content type with a property type that varies by culture
-            var contentType = MockedContentTypes.CreateBasicContentType();
-            contentType.Variations = ContentVariation.Culture;
-            var contentCollection = new PropertyTypeCollection(true);
-            contentCollection.Add(new PropertyType("test", ValueStorageType.Ntext)
-            {
-                Alias = "title",
-                Name = "Title",
-                Description = "",
-                Mandatory = false,
-                SortOrder = 1,
-                DataTypeId = -88,
-                Variations = ContentVariation.Culture
-            });
-            contentType.PropertyGroups.Add(new PropertyGroup(contentCollection) { Name = "Content", SortOrder = 1 });
-            ServiceContext.ContentTypeService.Save(contentType);
-
-            //compose this from the other one
-            var contentType2 = MockedContentTypes.CreateBasicContentType("test");
-            contentType2.Variations = ContentVariation.Culture;
-            contentType2.AddContentType(contentType);
-            ServiceContext.ContentTypeService.Save(contentType2);
-
-            //create some content of this content type
-            IContent doc = MockedContent.CreateBasicContent(contentType);
-            doc.SetCultureName("Home", "en-US");
-            doc.SetValue("title", "hello world", "en-US");
-            ServiceContext.ContentService.Save(doc);
-
-            IContent doc2 = MockedContent.CreateBasicContent(contentType2);
-            doc2.SetCultureName("Home", "en-US");
-            doc2.SetValue("title", "hello world", "en-US");
-            ServiceContext.ContentService.Save(doc2);
-
-            //change the content type to be invariant
-            contentType.Variations = ContentVariation.Nothing;
-            ServiceContext.ContentTypeService.Save(contentType);
-            doc = ServiceContext.ContentService.GetById(doc.Id); //re-get
-            doc2 = ServiceContext.ContentService.GetById(doc2.Id); //re-get
-
-            Assert.AreEqual("hello world", doc.GetValue("title"));
-            Assert.AreEqual("hello world", doc2.GetValue("title"));
-
-            //change back content type to be variant
-            contentType.Variations = ContentVariation.Culture;
-            ServiceContext.ContentTypeService.Save(contentType);
-            doc = ServiceContext.ContentService.GetById(doc.Id); //re-get
-            doc2 = ServiceContext.ContentService.GetById(doc2.Id); //re-get
-
-            //this will be null because the doc type was changed back to variant but it's property types don't get changed back
-            Assert.IsNull(doc.GetValue("title", "en-US"));
-            Assert.IsNull(doc2.GetValue("title", "en-US"));
-        }
+        
 
         [Test]
         public void Deleting_Content_Type_With_Hierarchy_Of_Content_Items_Moves_Orphaned_Content_To_Recycle_Bin()
diff --git a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
index 18ea95cd98..2748502e2c 100644
--- a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
+++ b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
@@ -17,6 +17,7 @@ using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
 using Umbraco.Core.Strings;
 using Umbraco.Core.Sync;
+using Umbraco.Tests.TestHelpers.Entities;
 using Umbraco.Tests.Testing;
 using Umbraco.Web.PublishedCache;
 using Umbraco.Web.PublishedCache.NuCache;
@@ -106,6 +107,361 @@ namespace Umbraco.Tests.Services
             }
         }
 
+        [Test]
+        public void Change_Content_Type_Variation_Clears_Redirects()
+        {
+            //create content type with a property type that varies by culture
+            var contentType = MockedContentTypes.CreateBasicContentType();
+            contentType.Variations = ContentVariation.Nothing;
+            var contentCollection = new PropertyTypeCollection(true);
+            contentCollection.Add(new PropertyType("test", ValueStorageType.Ntext)
+            {
+                Alias = "title",
+                Name = "Title",
+                Description = "",
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88,
+                Variations = ContentVariation.Nothing
+            });
+            contentType.PropertyGroups.Add(new PropertyGroup(contentCollection) { Name = "Content", SortOrder = 1 });
+            ServiceContext.ContentTypeService.Save(contentType);
+            var contentType2 = MockedContentTypes.CreateBasicContentType("test");
+            ServiceContext.ContentTypeService.Save(contentType2);
+
+            //create some content of this content type
+            IContent doc = MockedContent.CreateBasicContent(contentType);
+            doc.Name = "Hello1";
+            ServiceContext.ContentService.Save(doc);
+
+            IContent doc2 = MockedContent.CreateBasicContent(contentType2);
+            ServiceContext.ContentService.Save(doc2);
+
+            ServiceContext.RedirectUrlService.Register("hello/world", doc.Key);
+            ServiceContext.RedirectUrlService.Register("hello2/world2", doc2.Key);
+
+            Assert.AreEqual(1, ServiceContext.RedirectUrlService.GetContentRedirectUrls(doc.Key).Count());
+            Assert.AreEqual(1, ServiceContext.RedirectUrlService.GetContentRedirectUrls(doc2.Key).Count());
+
+            //change variation
+            contentType.Variations = ContentVariation.Culture;
+            ServiceContext.ContentTypeService.Save(contentType);
+
+            Assert.AreEqual(0, ServiceContext.RedirectUrlService.GetContentRedirectUrls(doc.Key).Count());
+            Assert.AreEqual(1, ServiceContext.RedirectUrlService.GetContentRedirectUrls(doc2.Key).Count());
+
+        }
+
+        [Test]
+        public void Change_Content_Type_From_Invariant_Variant()
+        {
+            //create content type with a property type that varies by culture
+            var contentType = MockedContentTypes.CreateBasicContentType();
+            contentType.Variations = ContentVariation.Nothing;
+            var contentCollection = new PropertyTypeCollection(true);
+            contentCollection.Add(new PropertyType("test", ValueStorageType.Ntext)
+            {
+                Alias = "title",
+                Name = "Title",
+                Description = "",
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88,
+                Variations = ContentVariation.Nothing
+            });
+            contentType.PropertyGroups.Add(new PropertyGroup(contentCollection) { Name = "Content", SortOrder = 1 });
+            ServiceContext.ContentTypeService.Save(contentType);
+
+            //create some content of this content type
+            IContent doc = MockedContent.CreateBasicContent(contentType);
+            doc.Name = "Hello1";
+            doc.SetValue("title", "hello world");
+            ServiceContext.ContentService.Save(doc);
+
+            Assert.AreEqual("Hello1", doc.Name);
+            Assert.AreEqual("hello world", doc.GetValue("title"));
+
+            //change the content type to be variant, we will also update the name here to detect the copy changes
+            doc.Name = "Hello2";
+            ServiceContext.ContentService.Save(doc);
+            contentType.Variations = ContentVariation.Culture;
+            ServiceContext.ContentTypeService.Save(contentType);
+            doc = ServiceContext.ContentService.GetById(doc.Id); //re-get
+
+            Assert.AreEqual("Hello2", doc.GetCultureName("en-US"));
+            Assert.AreEqual("hello world", doc.GetValue("title")); //We are not checking against en-US here because properties will remain invariant
+
+            //change back property type to be invariant, we will also update the name here to detect the copy changes
+            doc.SetCultureName("Hello3", "en-US");
+            ServiceContext.ContentService.Save(doc);
+            contentType.Variations = ContentVariation.Nothing;
+            ServiceContext.ContentTypeService.Save(contentType);
+            doc = ServiceContext.ContentService.GetById(doc.Id); //re-get
+
+            Assert.AreEqual("Hello3", doc.Name);
+            Assert.AreEqual("hello world", doc.GetValue("title"));
+        }
+
+        [Test]
+        public void Change_Content_Type_From_Variant_Invariant()
+        {
+            //create content type with a property type that varies by culture
+            var contentType = MockedContentTypes.CreateBasicContentType();
+            contentType.Variations = ContentVariation.Culture;
+            var contentCollection = new PropertyTypeCollection(true);
+            contentCollection.Add(new PropertyType("test", ValueStorageType.Ntext)
+            {
+                Alias = "title",
+                Name = "Title",
+                Description = "",
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88,
+                Variations = ContentVariation.Culture
+            });
+            contentType.PropertyGroups.Add(new PropertyGroup(contentCollection) { Name = "Content", SortOrder = 1 });
+            ServiceContext.ContentTypeService.Save(contentType);
+
+            //create some content of this content type
+            IContent doc = MockedContent.CreateBasicContent(contentType);
+            doc.SetCultureName("Hello1", "en-US");
+            doc.SetValue("title", "hello world", "en-US");
+            ServiceContext.ContentService.Save(doc);
+
+            Assert.AreEqual("Hello1", doc.GetCultureName("en-US"));
+            Assert.AreEqual("hello world", doc.GetValue("title", "en-US"));
+
+            //change the content type to be invariant, we will also update the name here to detect the copy changes
+            doc.SetCultureName("Hello2", "en-US");
+            ServiceContext.ContentService.Save(doc);
+            contentType.Variations = ContentVariation.Nothing;
+            ServiceContext.ContentTypeService.Save(contentType);
+            doc = ServiceContext.ContentService.GetById(doc.Id); //re-get
+
+            Assert.AreEqual("Hello2", doc.Name);
+            Assert.AreEqual("hello world", doc.GetValue("title"));
+
+            //change back property type to be variant, we will also update the name here to detect the copy changes
+            doc.Name = "Hello3";
+            ServiceContext.ContentService.Save(doc);
+            contentType.Variations = ContentVariation.Culture;
+            ServiceContext.ContentTypeService.Save(contentType);
+            doc = ServiceContext.ContentService.GetById(doc.Id); //re-get
+
+            //at this stage all property types were switched to invariant so even though the variant value
+            //exists it will not be returned because the property type is invariant,
+            //so this check proves that null will be returned
+            Assert.IsNull(doc.GetValue("title", "en-US"));
+
+            //we can now switch the property type to be variant and the value can be returned again
+            contentType.PropertyTypes.First().Variations = ContentVariation.Culture;
+            ServiceContext.ContentTypeService.Save(contentType);
+            doc = ServiceContext.ContentService.GetById(doc.Id); //re-get
+
+            Assert.AreEqual("Hello3", doc.GetCultureName("en-US"));
+            Assert.AreEqual("hello world", doc.GetValue("title", "en-US"));
+
+        }
+
+        [Test]
+        public void Change_Property_Type_From_Invariant_Variant()
+        {
+            //create content type with a property type that varies by culture
+            var contentType = MockedContentTypes.CreateBasicContentType();
+            contentType.Variations = ContentVariation.Nothing;
+            var contentCollection = new PropertyTypeCollection(true);
+            contentCollection.Add(new PropertyType("test", ValueStorageType.Ntext)
+            {
+                Alias = "title",
+                Name = "Title",
+                Description = "",
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88,
+                Variations = ContentVariation.Nothing
+            });
+            contentType.PropertyGroups.Add(new PropertyGroup(contentCollection) { Name = "Content", SortOrder = 1 });
+            ServiceContext.ContentTypeService.Save(contentType);
+
+            //create some content of this content type
+            IContent doc = MockedContent.CreateBasicContent(contentType);
+            doc.Name = "Home";
+            doc.SetValue("title", "hello world");
+            ServiceContext.ContentService.Save(doc);
+
+            Assert.AreEqual("hello world", doc.GetValue("title"));
+
+            //change the property type to be variant
+            contentType.PropertyTypes.First().Variations = ContentVariation.Culture;
+            ServiceContext.ContentTypeService.Save(contentType);
+            doc = ServiceContext.ContentService.GetById(doc.Id); //re-get
+
+            Assert.AreEqual("hello world", doc.GetValue("title", "en-US"));
+
+            //change back property type to be invariant
+            contentType.PropertyTypes.First().Variations = ContentVariation.Nothing;
+            ServiceContext.ContentTypeService.Save(contentType);
+            doc = ServiceContext.ContentService.GetById(doc.Id); //re-get
+
+            Assert.AreEqual("hello world", doc.GetValue("title"));
+        }
+
+        [Test]
+        public void Change_Property_Type_From_Variant_Invariant()
+        {
+            //create content type with a property type that varies by culture
+            var contentType = MockedContentTypes.CreateBasicContentType();
+            contentType.Variations = ContentVariation.Culture;
+            var contentCollection = new PropertyTypeCollection(true);
+            contentCollection.Add(new PropertyType("test", ValueStorageType.Ntext)
+            {
+                Alias = "title",
+                Name = "Title",
+                Description = "",
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88,
+                Variations = ContentVariation.Culture
+            });
+            contentType.PropertyGroups.Add(new PropertyGroup(contentCollection) { Name = "Content", SortOrder = 1 });
+            ServiceContext.ContentTypeService.Save(contentType);
+
+            //create some content of this content type
+            IContent doc = MockedContent.CreateBasicContent(contentType);
+            doc.SetCultureName("Home", "en-US");
+            doc.SetValue("title", "hello world", "en-US");
+            ServiceContext.ContentService.Save(doc);
+
+            Assert.AreEqual("hello world", doc.GetValue("title", "en-US"));
+
+            //change the property type to be invariant
+            contentType.PropertyTypes.First().Variations = ContentVariation.Nothing;
+            ServiceContext.ContentTypeService.Save(contentType);
+            doc = ServiceContext.ContentService.GetById(doc.Id); //re-get
+
+            Assert.AreEqual("hello world", doc.GetValue("title"));
+
+            //change back property type to be variant
+            contentType.PropertyTypes.First().Variations = ContentVariation.Culture;
+            ServiceContext.ContentTypeService.Save(contentType);
+            doc = ServiceContext.ContentService.GetById(doc.Id); //re-get
+
+            Assert.AreEqual("hello world", doc.GetValue("title", "en-US"));
+        }
+
+        [Test]
+        public void Change_Property_Type_From_Variant_Invariant_On_A_Composition()
+        {
+            //create content type with a property type that varies by culture
+            var contentType = MockedContentTypes.CreateBasicContentType();
+            contentType.Variations = ContentVariation.Culture;
+            var contentCollection = new PropertyTypeCollection(true);
+            contentCollection.Add(new PropertyType("test", ValueStorageType.Ntext)
+            {
+                Alias = "title",
+                Name = "Title",
+                Description = "",
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88,
+                Variations = ContentVariation.Culture
+            });
+            contentType.PropertyGroups.Add(new PropertyGroup(contentCollection) { Name = "Content", SortOrder = 1 });
+            ServiceContext.ContentTypeService.Save(contentType);
+
+            //compose this from the other one
+            var contentType2 = MockedContentTypes.CreateBasicContentType("test");
+            contentType2.Variations = ContentVariation.Culture;
+            contentType2.AddContentType(contentType);
+            ServiceContext.ContentTypeService.Save(contentType2);
+
+            //create some content of this content type
+            IContent doc = MockedContent.CreateBasicContent(contentType);
+            doc.SetCultureName("Home", "en-US");
+            doc.SetValue("title", "hello world", "en-US");
+            ServiceContext.ContentService.Save(doc);
+
+            IContent doc2 = MockedContent.CreateBasicContent(contentType2);
+            doc2.SetCultureName("Home", "en-US");
+            doc2.SetValue("title", "hello world", "en-US");
+            ServiceContext.ContentService.Save(doc2);
+
+            //change the property type to be invariant
+            contentType.PropertyTypes.First().Variations = ContentVariation.Nothing;
+            ServiceContext.ContentTypeService.Save(contentType);
+            doc = ServiceContext.ContentService.GetById(doc.Id); //re-get
+            doc2 = ServiceContext.ContentService.GetById(doc2.Id); //re-get
+
+            Assert.AreEqual("hello world", doc.GetValue("title"));
+            Assert.AreEqual("hello world", doc2.GetValue("title"));
+
+            //change back property type to be variant
+            contentType.PropertyTypes.First().Variations = ContentVariation.Culture;
+            ServiceContext.ContentTypeService.Save(contentType);
+            doc = ServiceContext.ContentService.GetById(doc.Id); //re-get
+            doc2 = ServiceContext.ContentService.GetById(doc2.Id); //re-get
+
+            Assert.AreEqual("hello world", doc.GetValue("title", "en-US"));
+            Assert.AreEqual("hello world", doc2.GetValue("title", "en-US"));
+        }
+
+        [Test]
+        public void Change_Content_Type_From_Variant_Invariant_On_A_Composition()
+        {
+            //create content type with a property type that varies by culture
+            var contentType = MockedContentTypes.CreateBasicContentType();
+            contentType.Variations = ContentVariation.Culture;
+            var contentCollection = new PropertyTypeCollection(true);
+            contentCollection.Add(new PropertyType("test", ValueStorageType.Ntext)
+            {
+                Alias = "title",
+                Name = "Title",
+                Description = "",
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88,
+                Variations = ContentVariation.Culture
+            });
+            contentType.PropertyGroups.Add(new PropertyGroup(contentCollection) { Name = "Content", SortOrder = 1 });
+            ServiceContext.ContentTypeService.Save(contentType);
+
+            //compose this from the other one
+            var contentType2 = MockedContentTypes.CreateBasicContentType("test");
+            contentType2.Variations = ContentVariation.Culture;
+            contentType2.AddContentType(contentType);
+            ServiceContext.ContentTypeService.Save(contentType2);
+
+            //create some content of this content type
+            IContent doc = MockedContent.CreateBasicContent(contentType);
+            doc.SetCultureName("Home", "en-US");
+            doc.SetValue("title", "hello world", "en-US");
+            ServiceContext.ContentService.Save(doc);
+
+            IContent doc2 = MockedContent.CreateBasicContent(contentType2);
+            doc2.SetCultureName("Home", "en-US");
+            doc2.SetValue("title", "hello world", "en-US");
+            ServiceContext.ContentService.Save(doc2);
+
+            //change the content type to be invariant
+            contentType.Variations = ContentVariation.Nothing;
+            ServiceContext.ContentTypeService.Save(contentType);
+            doc = ServiceContext.ContentService.GetById(doc.Id); //re-get
+            doc2 = ServiceContext.ContentService.GetById(doc2.Id); //re-get
+
+            Assert.AreEqual("hello world", doc.GetValue("title"));
+            Assert.AreEqual("hello world", doc2.GetValue("title"));
+
+            //change back content type to be variant
+            contentType.Variations = ContentVariation.Culture;
+            ServiceContext.ContentTypeService.Save(contentType);
+            doc = ServiceContext.ContentService.GetById(doc.Id); //re-get
+            doc2 = ServiceContext.ContentService.GetById(doc2.Id); //re-get
+
+            //this will be null because the doc type was changed back to variant but it's property types don't get changed back
+            Assert.IsNull(doc.GetValue("title", "en-US"));
+            Assert.IsNull(doc2.GetValue("title", "en-US"));
+        }
+
         [Test]
         public void Change_Variations_SimpleContentType_VariantToInvariantAndBack()
         {

From 5c8cd6027518acf45e2d960b66b28f564952a33b Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 31 Jul 2019 00:13:40 +1000
Subject: [PATCH 216/776] Writes up a test to show the issue with edited
 culture flags, this shows that the current fix works but there's still an
 issue

---
 .../ContentTypeServiceVariantsTests.cs        | 138 +++++++++++++++---
 1 file changed, 121 insertions(+), 17 deletions(-)

diff --git a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
index 2748502e2c..f5fa4e8795 100644
--- a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
+++ b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
@@ -468,10 +468,7 @@ namespace Umbraco.Tests.Services
             // one simple content type, variant, with both variant and invariant properties
             // can change it to invariant and back
 
-            var languageEn = new Language("en") { IsDefault = true };
-            ServiceContext.LocalizationService.Save(languageEn);
-            var languageFr = new Language("fr");
-            ServiceContext.LocalizationService.Save(languageFr);
+            CreateFrenchAndEnglishLangs();
 
             var contentType = new ContentType(-1)
             {
@@ -499,7 +496,7 @@ namespace Umbraco.Tests.Services
             contentType.PropertyGroups.Add(new PropertyGroup(properties) { Name = "Content" });
             ServiceContext.ContentTypeService.Save(contentType);
 
-            var document = (IContent) new Content("document", -1, contentType);
+            var document = (IContent)new Content("document", -1, contentType);
             document.SetCultureName("doc1en", "en");
             document.SetCultureName("doc1fr", "fr");
             document.SetValue("value1", "v1en", "en");
@@ -682,10 +679,7 @@ namespace Umbraco.Tests.Services
             // one simple content type, variant, with both variant and invariant properties
             // can change an invariant property to variant and back
 
-            var languageEn = new Language("en") { IsDefault = true };
-            ServiceContext.LocalizationService.Save(languageEn);
-            var languageFr = new Language("fr");
-            ServiceContext.LocalizationService.Save(languageFr);
+            CreateFrenchAndEnglishLangs();
 
             var contentType = new ContentType(-1)
             {
@@ -785,6 +779,114 @@ namespace Umbraco.Tests.Services
                 "{'properties':{'value1':[{'culture':'en','seg':'','val':'v1en'},{'culture':'fr','seg':'','val':'v1fr'}],'value2':[{'culture':'en','seg':'','val':'v2'}]},'cultureData':");
         }
 
+        [Test]
+        public void Change_Variations_SimpleContentType_VariantPropertyToInvariantAndBack_While_Publishing()
+        {
+            // one simple content type, variant, with both variant and invariant properties
+            // can change an invariant property to variant and back
+
+            CreateFrenchAndEnglishLangs();
+
+            var contentType = new ContentType(-1)
+            {
+                Alias = "contentType",
+                Name = "contentType",
+                Variations = ContentVariation.Culture
+            };
+
+            var properties = new PropertyTypeCollection(true)
+            {
+                new PropertyType("value1", ValueStorageType.Ntext)
+                {
+                    Alias = "value1",
+                    DataTypeId = -88,
+                    Variations = ContentVariation.Culture
+                }
+            };
+
+            contentType.PropertyGroups.Add(new PropertyGroup(properties) { Name = "Content" });
+            ServiceContext.ContentTypeService.Save(contentType);
+
+            var document = (IContent)new Content("document", -1, contentType);
+            document.SetCultureName("doc1en", "en");
+            document.SetCultureName("doc1fr", "fr");
+            document.SetValue("value1", "v1en", "en");
+            document.SetValue("value1", "v1fr", "fr");
+            ServiceContext.ContentService.Save(document);
+
+            //at this stage there will be 4 property values stored in the DB for "value1" against "en" and "fr" for both edited/published versions,
+            //for the published values, these will be null
+
+            document = ServiceContext.ContentService.GetById(document.Id);
+            Assert.AreEqual("doc1en", document.Name);
+            Assert.AreEqual("doc1en", document.GetCultureName("en"));
+            Assert.AreEqual("doc1fr", document.GetCultureName("fr"));
+            Assert.AreEqual("v1en", document.GetValue("value1", "en"));
+            Assert.AreEqual("v1fr", document.GetValue("value1", "fr"));
+            Assert.IsTrue(document.IsCultureEdited("en")); //This will be true because the edited value isn't the same as the published value
+            Assert.IsTrue(document.IsCultureEdited("fr")); //This will be true because the edited value isn't the same as the published value
+            Assert.IsTrue(document.Edited);
+
+            // switch property type to Nothing
+            contentType.PropertyTypes.First(x => x.Alias == "value1").Variations = ContentVariation.Nothing;
+            ServiceContext.ContentTypeService.Save(contentType);
+            
+            document = ServiceContext.ContentService.GetById(document.Id);
+            Assert.IsTrue(document.Edited);
+
+            // publish the document
+            document.SetValue("value1", "v1inv"); //update the invariant value
+            ServiceContext.ContentService.SaveAndPublish(document);
+
+            //at this stage there will be 6 property values stored in the DB for "value1" against "en", "fr" and null for both edited/published versions,
+            //for the published values for the cultures, these will still be null but the invariant edited/published values will both be "v1inv".
+
+            document = ServiceContext.ContentService.GetById(document.Id);
+            Assert.AreEqual("doc1en", document.Name);
+            Assert.AreEqual("doc1en", document.GetCultureName("en"));
+            Assert.AreEqual("doc1fr", document.GetCultureName("fr"));
+            Assert.IsNull(document.GetValue("value1", "en")); //The values are there but the business logic returns null
+            Assert.IsNull(document.GetValue("value1", "fr")); //The values are there but the business logic returns null
+            Assert.AreEqual("v1inv", document.GetValue("value1"));
+            Assert.IsFalse(document.IsCultureEdited("en")); //This returns false, the culture shouldn't be marked as edited because the invariant property value is published
+            Assert.IsFalse(document.IsCultureEdited("fr")); //This returns false, the culture shouldn't be marked as edited because the invariant property value is published
+            Assert.IsFalse(document.Edited);
+
+            // switch property back to Culture
+            contentType.PropertyTypes.First(x => x.Alias == "value1").Variations = ContentVariation.Culture;
+            ServiceContext.ContentTypeService.Save(contentType);
+                        
+            document = ServiceContext.ContentService.GetById(document.Id);
+            Assert.AreEqual("v1inv", document.GetValue("value1", "en")); //The invariant property value gets copied over to the default language
+            Assert.AreEqual("v1fr", document.GetValue("value1", "fr"));
+            Assert.IsFalse(document.IsCultureEdited("en")); //The invariant published AND edited values are copied over to the default language
+            //TODO: This fails - for some reason in the DB, the DocumentCultureVariationDto Edited flag is set to false for the FR culture
+            // I'm assuming this is somehow done during the ContentTypeService.Save method when changing variation. It should not be false but instead
+            // true because the values for it's edited vs published version are different. Perhaps it's false because that is the default boolean value and
+            // this row gets deleted somewhere along the way?
+            Assert.IsTrue(document.IsCultureEdited("fr"));  //The previously existing french values are there and there is no published value
+            Assert.IsTrue(document.Edited);
+
+            // publish again
+            document.SetValue("value1", "v1en2", "en"); //update the value now that it's variant again
+            document.SetValue("value1", "v1fr2", "fr"); //update the value now that it's variant again
+            ServiceContext.ContentService.SaveAndPublish(document);
+
+            //at this stage there will be 4 property values stored in the DB for "value1" against "en", "fr" for both edited/published versions,
+            //with the change back to Culture, it deletes the invariant property values.
+
+            document = ServiceContext.ContentService.GetById(document.Id);
+            Assert.AreEqual("doc1en", document.Name);
+            Assert.AreEqual("doc1en", document.GetCultureName("en"));
+            Assert.AreEqual("doc1fr", document.GetCultureName("fr"));
+            Assert.AreEqual("v1en2", document.GetValue("value1", "en"));
+            Assert.AreEqual("v1fr2", document.GetValue("value1", "fr"));
+            Assert.IsNull(document.GetValue("value1")); //The value is there but the business logic returns null
+            Assert.IsFalse(document.IsCultureEdited("en")); //This returns false, the variant property value has been published
+            Assert.IsFalse(document.IsCultureEdited("fr")); //This returns false, the variant property value has been published
+            Assert.IsFalse(document.Edited);
+        }
+
         [Test]
         public void Change_Variations_ComposedContentType_1()
         {
@@ -793,10 +895,7 @@ namespace Umbraco.Tests.Services
             // can change the composing content type to invariant and back
             // can change the composed content type to invariant and back
 
-            var languageEn = new Language("en") { IsDefault = true };
-            ServiceContext.LocalizationService.Save(languageEn);
-            var languageFr = new Language("fr");
-            ServiceContext.LocalizationService.Save(languageFr);
+            CreateFrenchAndEnglishLangs();
 
             var composing = new ContentType(-1)
             {
@@ -925,10 +1024,7 @@ namespace Umbraco.Tests.Services
             // can change the composing content type to invariant and back
             // can change the variant composed content type to invariant and back
 
-            var languageEn = new Language("en") { IsDefault = true };
-            ServiceContext.LocalizationService.Save(languageEn);
-            var languageFr = new Language("fr");
-            ServiceContext.LocalizationService.Save(languageFr);
+            CreateFrenchAndEnglishLangs();
 
             var composing = new ContentType(-1)
             {
@@ -1110,5 +1206,13 @@ namespace Umbraco.Tests.Services
             AssertJsonStartsWith(document2.Id,
                 "{'properties':{'value11':[{'culture':'','seg':'','val':'v11'}],'value12':[{'culture':'','seg':'','val':'v12'}],'value31':[{'culture':'','seg':'','val':'v31'}],'value32':[{'culture':'','seg':'','val':'v32'}]},'cultureData':");
         }
+
+        private void CreateFrenchAndEnglishLangs()
+        {
+            var languageEn = new Language("en") { IsDefault = true };
+            ServiceContext.LocalizationService.Save(languageEn);
+            var languageFr = new Language("fr");
+            ServiceContext.LocalizationService.Save(languageFr);
+        }
     }
 }

From 87e7cec02eb2d7eb062aaef2c37f226fa5c286b6 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 31 Jul 2019 18:30:34 +1000
Subject: [PATCH 217/776] WIP - commiting what i have. Solved part of the
 problem but there are others.

---
 .../Persistence/Factories/PropertyFactory.cs  |  21 +-
 .../Implement/ContentTypeRepository.cs        |   4 +-
 .../Implement/ContentTypeRepositoryBase.cs    | 263 +++++++++++++++++-
 .../Implement/DocumentRepository.cs           |  25 +-
 .../Implement/MediaTypeRepository.cs          |   4 +-
 .../Implement/MemberTypeRepository.cs         |   4 +-
 .../Repositories/ContentTypeRepositoryTest.cs |   9 +-
 .../Repositories/DocumentRepositoryTest.cs    |   2 +-
 .../Repositories/DomainRepositoryTest.cs      |   2 +-
 .../Repositories/MediaRepositoryTest.cs       |   3 +-
 .../Repositories/MediaTypeRepositoryTest.cs   |   3 +-
 .../Repositories/MemberRepositoryTest.cs      |   3 +-
 .../Repositories/MemberTypeRepositoryTest.cs  |   3 +-
 .../PublicAccessRepositoryTest.cs             |   2 +-
 .../Repositories/TagRepositoryTest.cs         |   5 +-
 .../Repositories/TemplateRepositoryTest.cs    |   2 +-
 .../Repositories/UserRepositoryTest.cs        |   5 +-
 .../Services/ContentServicePerformanceTest.cs |  12 +-
 .../Services/ContentServiceTests.cs           |   2 +-
 .../ContentTypeServiceVariantsTests.cs        |  31 ++-
 20 files changed, 344 insertions(+), 61 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Factories/PropertyFactory.cs b/src/Umbraco.Core/Persistence/Factories/PropertyFactory.cs
index f0937a3781..4e7dc1e982 100644
--- a/src/Umbraco.Core/Persistence/Factories/PropertyFactory.cs
+++ b/src/Umbraco.Core/Persistence/Factories/PropertyFactory.cs
@@ -105,9 +105,14 @@ namespace Umbraco.Core.Persistence.Factories
         /// <param name="languageRepository"></param>
         /// <param name="edited">out parameter indicating that one or more properties have been edited</param>
         /// <param name="editedCultures">out parameter containing a collection of edited cultures when the contentVariation varies by culture</param>
+        /// <param name="persistedEditedCultures">
+        /// out parameter containing a collection of edited cultures that are currently persisted in the database which is used to maintain the edited state
+        /// of each culture value (in cases where variance is being switched)
+        /// </param>
         /// <returns></returns>
         public static IEnumerable<PropertyDataDto> BuildDtos(ContentVariation contentVariation, int currentVersionId, int publishedVersionId, IEnumerable<Property> properties,
-            ILanguageRepository languageRepository, out bool edited, out HashSet<string> editedCultures)
+            ILanguageRepository languageRepository, out bool edited,
+            out HashSet<string> editedCultures)
         {
             var propertyDataDtos = new List<PropertyDataDto>();
             edited = false;
@@ -141,14 +146,14 @@ namespace Umbraco.Core.Persistence.Factories
                         if (propertyValue.EditedValue != null)
                             propertyDataDtos.Add(BuildDto(currentVersionId, property, languageRepository.GetIdByIsoCode(propertyValue.Culture), propertyValue.Segment, propertyValue.EditedValue));
 
-                        // property.Values will contain ALL of it's values, both variant and invariant which will be populated if the administrator has previously
-                        // changed the property type to be variant vs invariant.
-                        // We need to check for this scenario here because otherwise the editedCultures and edited flags
-                        // will end up incorrectly so here we need to only process edited cultures based on the
-                        // current value type and how the property varies.
+                        //// property.Values will contain ALL of it's values, both variant and invariant which will be populated if the administrator has previously
+                        //// changed the property type to be variant vs invariant.
+                        //// We need to check for this scenario here because otherwise the editedCultures and edited flags
+                        //// will end up incorrectly so here we need to only process edited cultures based on the
+                        //// current value type and how the property varies.
 
-                        if (property.PropertyType.VariesByCulture() && isInvariantValue) continue;
-                        if (!property.PropertyType.VariesByCulture() && isCultureValue) continue;
+                        //if (property.PropertyType.VariesByCulture() && isInvariantValue) continue;
+                        //if (!property.PropertyType.VariesByCulture() && isCultureValue) continue;
 
                         // use explicit equals here, else object comparison fails at comparing eg strings
                         var sameValues = propertyValue.PublishedValue == null ? propertyValue.EditedValue == null : propertyValue.PublishedValue.Equals(propertyValue.EditedValue);
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepository.cs
index 9d77eb0990..8b84145027 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepository.cs
@@ -18,8 +18,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
     /// </summary>
     internal class ContentTypeRepository : ContentTypeRepositoryBase<IContentType>, IContentTypeRepository
     {
-        public ContentTypeRepository(IScopeAccessor scopeAccessor, AppCaches cache, ILogger logger, IContentTypeCommonRepository commonRepository)
-            : base(scopeAccessor, cache, logger, commonRepository)
+        public ContentTypeRepository(IScopeAccessor scopeAccessor, AppCaches cache, ILogger logger, IContentTypeCommonRepository commonRepository, ILanguageRepository languageRepository)
+            : base(scopeAccessor, cache, logger, commonRepository, languageRepository)
         { }
 
         protected override bool SupportsPublishing => ContentType.SupportsPublishingConst;
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
index 22c9244d8f..756435692a 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
@@ -15,6 +15,7 @@ using Umbraco.Core.Persistence.Factories;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Scoping;
 using Umbraco.Core.Services;
+using static Umbraco.Core.Persistence.NPocoSqlExtensions.Statics;
 
 namespace Umbraco.Core.Persistence.Repositories.Implement
 {
@@ -26,14 +27,15 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
     internal abstract class ContentTypeRepositoryBase<TEntity> : NPocoRepositoryBase<int, TEntity>, IReadRepository<Guid, TEntity>
         where TEntity : class, IContentTypeComposition
     {
-        protected ContentTypeRepositoryBase(IScopeAccessor scopeAccessor, AppCaches cache, ILogger logger, IContentTypeCommonRepository commonRepository)
+        protected ContentTypeRepositoryBase(IScopeAccessor scopeAccessor, AppCaches cache, ILogger logger, IContentTypeCommonRepository commonRepository, ILanguageRepository languageRepository)
             : base(scopeAccessor, cache, logger)
         {
             CommonRepository = commonRepository;
+            LanguageRepository = languageRepository;
         }
 
         protected IContentTypeCommonRepository CommonRepository { get; }
-
+        protected ILanguageRepository LanguageRepository { get; }
         protected abstract bool SupportsPublishing { get; }
 
         public IEnumerable<MoveEventInfo<TEntity>> Move(TEntity moving, EntityContainer container)
@@ -646,10 +648,16 @@ AND umbracoNode.id <> @id",
                     case ContentVariation.Culture:
                         CopyPropertyData(null, defaultLanguageId, propertyTypeIds, impactedL);
                         CopyTagData(null, defaultLanguageId, propertyTypeIds, impactedL);
+                        RenormalizeDocumentCultureVariations(propertyTypeIds, impactedL);
+                        //TODO: Here we need to normalize the umbracoDocumentCultureVariation table for it's edited flags which are calculated based
+                        //on changed property or name values
                         break;
                     case ContentVariation.Nothing:
                         CopyPropertyData(defaultLanguageId, null, propertyTypeIds, impactedL);
                         CopyTagData(defaultLanguageId, null, propertyTypeIds, impactedL);
+                        RenormalizeDocumentCultureVariations(propertyTypeIds, impactedL);
+                        //TODO: Here we need to normalize the umbracoDocumentCultureVariation table for it's edited flags which are calculated based
+                        //on changed property or name values
                         break;
                     case ContentVariation.CultureAndSegment:
                     case ContentVariation.Segment:
@@ -659,6 +667,55 @@ AND umbracoNode.id <> @id",
             }
         }
 
+        //private HashSet<string> GetEditedCultures(ContentVariation contentVariation, int currentVersionId, int publishedVersionId, IEnumerable<PropertyDataDto> properties)
+        //{
+        //    HashSet<string> editedCultures = null; // don't allocate unless necessary
+        //    string defaultCulture = null; //don't allocate unless necessary
+
+        //    var entityVariesByCulture = contentVariation.VariesByCulture();
+
+        //    // create dtos for each property values, but only for values that do actually exist
+        //    // ie have a non-null value, everything else is just ignored and won't have a db row
+
+        //    foreach (var property in properties)
+        //    {
+        //        if (property.PropertyType.SupportsPublishing)
+        //        {
+        //            //create the resulting hashset if it's not created and the entity varies by culture
+        //            if (entityVariesByCulture && editedCultures == null)
+        //                editedCultures = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+
+        //            // publishing = deal with edit and published values
+        //            foreach (var propertyValue in property.Values)
+        //            {
+        //                var isInvariantValue = propertyValue.Culture == null;
+        //                var isCultureValue = propertyValue.Culture != null && propertyValue.Segment == null;
+
+        //                // use explicit equals here, else object comparison fails at comparing eg strings
+        //                var sameValues = propertyValue.PublishedValue == null ? propertyValue.EditedValue == null : propertyValue.PublishedValue.Equals(propertyValue.EditedValue);
+
+        //                if (entityVariesByCulture && !sameValues)
+        //                {
+        //                    if (isCultureValue)
+        //                    {
+        //                        editedCultures.Add(propertyValue.Culture); // report culture as edited
+        //                    }
+        //                    else if (isInvariantValue)
+        //                    {
+        //                        // flag culture as edited if it contains an edited invariant property
+        //                        if (defaultCulture == null)
+        //                            defaultCulture = languageRepository.GetDefaultIsoCode();
+
+        //                        editedCultures.Add(defaultCulture);
+        //                    }
+        //                }
+        //            }
+        //        }
+        //    }
+
+        //    return editedCultures;
+        //}
+
         /// <summary>
         /// Moves variant data for a content type variation change.
         /// </summary>
@@ -963,6 +1020,208 @@ AND umbracoNode.id <> @id",
 
                 Database.Execute(sqlDelete);
             }
+
+        }
+
+        /// <summary>
+        /// Re-normalizes the edited value in the umbracoDocumentCultureVariation table when property variations are changed
+        /// </summary>
+        /// <param name="propertyTypeIds"></param>
+        /// <param name="contentTypeIds"></param>
+        /// <remarks>
+        /// If this is not done, then in some cases the "edited" value for a particular culture for a document will remain true when it should be false
+        /// if the property was changed to invariant. In order to do this we need to recalculate this value based on the values stored for each
+        /// property, culture and current/published version. The end result is to update the edited value in the umbracoDocumentCultureVariation table so we
+        /// make sure to join this table with the lookups so that only relevant data is returned.
+        /// </remarks>
+        private void RenormalizeDocumentCultureVariations(IReadOnlyCollection<int> propertyTypeIds, IReadOnlyCollection<int> contentTypeIds = null)
+        {
+
+            var defaultLang = LanguageRepository.GetDefaultId();
+
+           //This will build up a query to get the property values of both the current and the published version so that we can check
+           //based on the current variance of each item to see if it's 'edited' value should be true/false.
+
+            var whereInArgsCount = propertyTypeIds.Count + (contentTypeIds?.Count ?? 0);
+            if (whereInArgsCount > 2000)
+                throw new NotSupportedException("Too many property/content types.");
+
+            var propertySql = Sql()
+                .Select<PropertyDataDto>()
+                .AndSelect<ContentVersionDto>(x => x.NodeId, x => x.Current)
+                .AndSelect<DocumentVersionDto>(x => x.Published)
+                .AndSelect<PropertyTypeDto>(x => x.Variations)
+                .From<PropertyDataDto>()
+                .InnerJoin<ContentVersionDto>().On<ContentVersionDto, PropertyDataDto>((left, right) => left.Id == right.VersionId)
+                .InnerJoin<PropertyTypeDto>().On<PropertyTypeDto, PropertyDataDto>((left, right) => left.Id == right.PropertyTypeId);
+
+            if (contentTypeIds != null)
+            {
+                propertySql.InnerJoin<ContentDto>().On<ContentDto, ContentVersionDto>((c, cversion) => c.NodeId == cversion.NodeId);
+            }
+
+            propertySql.LeftJoin<DocumentVersionDto>().On<DocumentVersionDto, ContentVersionDto>((docversion, cversion) => cversion.Id == docversion.Id)
+                .Where<DocumentVersionDto, ContentVersionDto>((docversion, cversion) => cversion.Current || docversion.Published)
+                .WhereIn<PropertyDataDto>(x => x.PropertyTypeId, propertyTypeIds);
+
+            if (contentTypeIds != null)
+            {
+                propertySql.WhereIn<ContentDto>(x => x.ContentTypeId, contentTypeIds);
+            }
+
+            propertySql
+                .OrderBy<ContentVersionDto>(x => x.NodeId)
+                .OrderBy<PropertyDataDto>(x => x.PropertyTypeId, x => x.LanguageId, x => x.VersionId);
+
+            //keep track of this node/lang to mark or unmark as edited
+            var editedVersions = new Dictionary<(int nodeId, int? langId), bool>();
+
+            var nodeId = -1;
+            var propertyTypeId = -1;
+            PropertyValueVersionDto pubRow = null;
+
+            //This is a QUERY we are not fetching this all into memory so we cannot make any changes during this iteration, we are just collecting data.
+            //Published data will always come before Current data based on the version id sort.
+            //There will only be one published row (max) and one current row per property.
+            foreach (var row in Database.Query<PropertyValueVersionDto>(propertySql))
+            {
+                //make sure to reset on each node/property change
+                if (nodeId != row.NodeId || propertyTypeId != row.PropertyTypeId)
+                {                    
+                    nodeId = row.NodeId;
+                    propertyTypeId = row.PropertyTypeId;
+                    pubRow = null;
+                }
+
+                if (row.Published)
+                    pubRow = row;
+
+                if (row.Current)
+                {
+                    var propVariations = (ContentVariation)row.Variations;
+
+                    //if this prop doesn't vary but the row has a lang assigned or vice versa, flag this as not edited
+                    if (!propVariations.VariesByCulture() && row.LanguageId.HasValue
+                        || propVariations.VariesByCulture() && !row.LanguageId.HasValue)
+                    {
+                        //Flag this as not edited for this node/lang if the key doesn't exist
+                        if (!editedVersions.TryGetValue((row.NodeId, row.LanguageId), out _))
+                            editedVersions.Add((row.NodeId, row.LanguageId), false);
+                    }
+                    else if (pubRow == null)
+                    {
+                        //this would mean that that this property is 'edited' since there is no published version
+                        editedVersions.Add((row.NodeId, row.LanguageId), true);
+                    }
+                    //compare the property values, if they differ from versions then flag the current version as edited
+                    else if (IsPropertyValueChanged(pubRow, row))
+                    {
+                        //Here we would check if the property is invariant, in which case the edited language should be indicated by the default lang
+                        editedVersions[(row.NodeId, !propVariations.VariesByCulture() ? defaultLang : row.LanguageId)] = true;
+                    }
+
+                    //reset
+                    pubRow = null;
+                }
+            }
+
+            //lookup all matching rows in umbracoDocumentCultureVariation
+            var docCultureVariationsToUpdate = Database.Fetch<DocumentCultureVariationDto>(
+                Sql().Select<DocumentCultureVariationDto>().From<DocumentCultureVariationDto>()
+                .WhereIn<DocumentCultureVariationDto>(x => x.LanguageId, editedVersions.Keys.Select(x => x.langId).ToList())
+                .WhereIn<DocumentCultureVariationDto>(x => x.NodeId, editedVersions.Keys.Select(x => x.nodeId)))
+                //convert to dictionary with the same key type
+                .ToDictionary(x => (x.NodeId, (int?)x.LanguageId), x => x);
+
+            foreach (var ev in editedVersions)
+            {
+                if (docCultureVariationsToUpdate.TryGetValue(ev.Key, out var docVariations))
+                {
+                    //check if it needs updating
+                    if (docVariations.Edited != ev.Value)
+                    {
+                        docVariations.Edited = ev.Value;
+                        Database.Update(docVariations);
+                    }
+                }
+                else
+                {
+                    //the row doesn't exist but needs creating
+                    //TODO: Does this ever happen?? Need to see if we can test this
+                }
+            }
+
+            ////Generate SQL to lookup the current name vs the publish name for each language
+            //var nameSql = Sql()
+            //    .Select<ContentVersionDto>("cv1", x => x.NodeId, x => Alias(x.Id, "currentVersion"))
+            //    .AndSelect<ContentVersionCultureVariationDto>("cvcv1", x => x.LanguageId, x => Alias(x.Name, "currentName"))
+            //    .AndSelect<ContentVersionCultureVariationDto>("cvcv2", x => Alias(x.Name, "publishedName"))
+            //    .AndSelect<DocumentVersionDto>("dv", x => Alias(x.Id, "publishedVersion"))
+            //    .AndSelect<DocumentCultureVariationDto>("dcv", x => x.Id, x => x.Edited)
+            //    .From<ContentVersionCultureVariationDto>("cvcv1")
+            //    .InnerJoin<ContentVersionDto>("cv1")
+            //        .On<ContentVersionDto, ContentVersionCultureVariationDto>((left, right) => left.Id == right.VersionId, "cv1", "cvcv1")
+            //    .InnerJoin<DocumentCultureVariationDto>("dcv")
+            //        .On<DocumentCultureVariationDto, ContentVersionDto, ContentVersionCultureVariationDto>((left, right, other) => left.NodeId == right.NodeId && left.LanguageId == other.LanguageId, "dcv", "cv1", "cvcv1")
+            //    .LeftJoin<ContentVersionDto>(nested =>
+            //        nested.InnerJoin<DocumentVersionDto>("dv")
+            //                .On<ContentVersionDto, DocumentVersionDto>((left, right) => left.Id == right.Id && right.Published, "cv2", "dv"), "cv2")
+            //        .On<ContentVersionDto, ContentVersionDto>((left, right) => left.NodeId == right.NodeId, "cv1", "cv2")
+            //    .LeftJoin<ContentVersionCultureVariationDto>("cvcv2")
+            //        .On<ContentVersionCultureVariationDto, ContentVersionDto, ContentVersionCultureVariationDto>((left, right, other) => left.VersionId == right.Id && left.LanguageId == other.LanguageId, "cvcv2", "cv2", "cvcv1")
+            //    .Where<ContentVersionDto>(x => x.Current, "cv1")
+            //    .OrderBy("cv1.nodeId, cvcv1.versionId, cvcv1.languageId");
+
+            //var names = Database.Fetch<NameCompareDto>(nameSql);
+
+        }
+
+        private static bool IsPropertyValueChanged(PropertyValueVersionDto pubRow, PropertyValueVersionDto row)
+        {
+            return !pubRow.TextValue.IsNullOrWhiteSpace() && pubRow.TextValue != row.TextValue
+                                    || !pubRow.VarcharValue.IsNullOrWhiteSpace() && pubRow.VarcharValue != row.VarcharValue
+                                    || pubRow.DateValue.HasValue && pubRow.DateValue != row.DateValue
+                                    || pubRow.DecimalValue.HasValue && pubRow.DecimalValue != row.DecimalValue
+                                    || pubRow.IntValue.HasValue && pubRow.IntValue != row.IntValue;
+        }
+
+        private class NameCompareDto
+        {
+            public int NodeId { get; set; }
+            public int CurrentVersion { get; set; }
+            public int LanguageId { get; set; }
+            public string CurrentName { get; set; }
+            public string PublishedName { get; set; }
+            public int? PublishedVersion { get; set; }
+            public int Id { get; set; } // the Id of the DocumentCultureVariationDto
+            public bool Edited { get; set; }
+        }
+
+        private class PropertyValueVersionDto
+        {   
+            public int VersionId { get; set; }
+            public int PropertyTypeId { get; set; }
+            public int? LanguageId { get; set; }
+            public string Segment { get; set; }
+            public int? IntValue { get; set; }
+
+            private decimal? _decimalValue;
+            [Column("decimalValue")]
+            public decimal? DecimalValue
+            {
+                get => _decimalValue;
+                set => _decimalValue = value?.Normalize();
+            }
+
+            public DateTime? DateValue { get; set; }
+            public string VarcharValue { get; set; }
+            public string TextValue { get; set; }
+
+            public int NodeId { get; set; }
+            public bool Current { get; set; }
+            public bool Published { get; set; }
+
+            public byte Variations { get; set; }
         }
 
         private void DeletePropertyType(int contentTypeId, int propertyTypeId)
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
index 30a2927cc8..0dbfc61b8c 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
@@ -386,7 +386,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
                 Database.BulkInsertRecords(GetContentVariationDtos(entity, publishing));
 
                 // insert document variations
-                Database.BulkInsertRecords(GetDocumentVariationDtos(entity, publishing, editedCultures));
+                Database.BulkInsertRecords(GetDocumentVariationDtos(entity, editedCultures));
             }
 
             // refresh content
@@ -571,7 +571,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
                 Database.BulkInsertRecords(GetContentVariationDtos(entity, publishing));
 
                 // insert document variations
-                Database.BulkInsertRecords(GetDocumentVariationDtos(entity, publishing, editedCultures));
+                Database.BulkInsertRecords(GetDocumentVariationDtos(entity, editedCultures));
             }
 
             // refresh content
@@ -1297,25 +1297,30 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
                 };
         }
 
-        private IEnumerable<DocumentCultureVariationDto> GetDocumentVariationDtos(IContent content, bool publishing, HashSet<string> editedCultures)
+        private IEnumerable<DocumentCultureVariationDto> GetDocumentVariationDtos(IContent content, HashSet<string> editedCultures)
         {
             var allCultures = content.AvailableCultures.Union(content.PublishedCultures); // union = distinct
             foreach (var culture in allCultures)
-                yield return new DocumentCultureVariationDto
+            {
+                var dto = new DocumentCultureVariationDto
                 {
                     NodeId = content.Id,
                     LanguageId = LanguageRepository.GetIdByIsoCode(culture) ?? throw new InvalidOperationException("Not a valid culture."),
                     Culture = culture,
 
                     Name = content.GetCultureName(culture) ?? content.GetPublishName(culture),
-
-                    // note: can't use IsCultureEdited at that point - hasn't been updated yet - see PersistUpdatedItem
-
                     Available = content.IsCultureAvailable(culture),
-                    Published = content.IsCulturePublished(culture),
-                    Edited = content.IsCultureAvailable(culture) &&
-                             (!content.IsCulturePublished(culture) || (editedCultures != null && editedCultures.Contains(culture)))
+                    Published = content.IsCulturePublished(culture)
                 };
+
+                // note: can't use IsCultureEdited at that point - hasn't been updated yet - see PersistUpdatedItem
+
+                dto.Edited = content.IsCultureAvailable(culture) &&
+                             (!content.IsCulturePublished(culture) || (editedCultures != null && editedCultures.Contains(culture)));
+
+                yield return dto;
+            }
+                
         }
 
         private class ContentVariation
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/MediaTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/MediaTypeRepository.cs
index 1abc75cf3a..a2c7cc3f44 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/MediaTypeRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/MediaTypeRepository.cs
@@ -17,8 +17,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
     /// </summary>
     internal class MediaTypeRepository : ContentTypeRepositoryBase<IMediaType>, IMediaTypeRepository
     {
-        public MediaTypeRepository(IScopeAccessor scopeAccessor, AppCaches cache, ILogger logger, IContentTypeCommonRepository commonRepository)
-            : base(scopeAccessor, cache, logger, commonRepository)
+        public MediaTypeRepository(IScopeAccessor scopeAccessor, AppCaches cache, ILogger logger, IContentTypeCommonRepository commonRepository, ILanguageRepository languageRepository)
+            : base(scopeAccessor, cache, logger, commonRepository, languageRepository)
         { }
 
         protected override bool SupportsPublishing => MediaType.SupportsPublishingConst;
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/MemberTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberTypeRepository.cs
index d96854743e..b4d6033b9b 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/MemberTypeRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberTypeRepository.cs
@@ -18,8 +18,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
     /// </summary>
     internal class MemberTypeRepository : ContentTypeRepositoryBase<IMemberType>, IMemberTypeRepository
     {
-        public MemberTypeRepository(IScopeAccessor scopeAccessor, AppCaches cache, ILogger logger, IContentTypeCommonRepository commonRepository)
-            : base(scopeAccessor, cache, logger, commonRepository)
+        public MemberTypeRepository(IScopeAccessor scopeAccessor, AppCaches cache, ILogger logger, IContentTypeCommonRepository commonRepository, ILanguageRepository languageRepository)
+            : base(scopeAccessor, cache, logger, commonRepository, languageRepository)
         { }
 
         protected override bool SupportsPublishing => MemberType.SupportsPublishingConst;
diff --git a/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
index 53f150f140..f953b9cce6 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
@@ -29,10 +29,11 @@ namespace Umbraco.Tests.Persistence.Repositories
 
         private DocumentRepository CreateRepository(IScopeAccessor scopeAccessor, out ContentTypeRepository contentTypeRepository)
         {
+            var langRepository = new LanguageRepository(scopeAccessor, AppCaches.Disabled, Logger);
             var templateRepository = new TemplateRepository(scopeAccessor, AppCaches.Disabled, Logger, TestObjects.GetFileSystemsMock());
             var tagRepository = new TagRepository(scopeAccessor, AppCaches.Disabled, Logger);
             var commonRepository = new ContentTypeCommonRepository(scopeAccessor, templateRepository, AppCaches.Disabled);
-            contentTypeRepository = new ContentTypeRepository(scopeAccessor, AppCaches.Disabled, Logger, commonRepository);
+            contentTypeRepository = new ContentTypeRepository(scopeAccessor, AppCaches.Disabled, Logger, commonRepository, langRepository);
             var languageRepository = new LanguageRepository(scopeAccessor, AppCaches.Disabled, Logger);
             var repository = new DocumentRepository(scopeAccessor, AppCaches.Disabled, Logger, contentTypeRepository, templateRepository, tagRepository, languageRepository);
             return repository;
@@ -40,9 +41,10 @@ namespace Umbraco.Tests.Persistence.Repositories
 
         private ContentTypeRepository CreateRepository(IScopeAccessor scopeAccessor)
         {
+            var langRepository = new LanguageRepository(scopeAccessor, AppCaches.Disabled, Logger);
             var templateRepository = new TemplateRepository(scopeAccessor, AppCaches.Disabled, Logger, TestObjects.GetFileSystemsMock());
             var commonRepository = new ContentTypeCommonRepository(scopeAccessor, templateRepository, AppCaches.Disabled);
-            var contentTypeRepository = new ContentTypeRepository(scopeAccessor, AppCaches.Disabled, Logger, commonRepository);
+            var contentTypeRepository = new ContentTypeRepository(scopeAccessor, AppCaches.Disabled, Logger, commonRepository, langRepository);
             return contentTypeRepository;
         }
 
@@ -50,7 +52,8 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             var templateRepository = new TemplateRepository(scopeAccessor, AppCaches.Disabled, Logger, TestObjects.GetFileSystemsMock());
             var commonRepository = new ContentTypeCommonRepository(scopeAccessor, templateRepository, AppCaches.Disabled);
-            var contentTypeRepository = new MediaTypeRepository(scopeAccessor, AppCaches.Disabled, Logger, commonRepository);
+            var langRepository = new LanguageRepository(scopeAccessor, AppCaches.Disabled, Logger);
+            var contentTypeRepository = new MediaTypeRepository(scopeAccessor, AppCaches.Disabled, Logger, commonRepository, langRepository);
             return contentTypeRepository;
         }
 
diff --git a/src/Umbraco.Tests/Persistence/Repositories/DocumentRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/DocumentRepositoryTest.cs
index fd797662c0..4d62ec8301 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/DocumentRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/DocumentRepositoryTest.cs
@@ -67,8 +67,8 @@ namespace Umbraco.Tests.Persistence.Repositories
             templateRepository = new TemplateRepository(scopeAccessor, appCaches, Logger, TestObjects.GetFileSystemsMock());
             var tagRepository = new TagRepository(scopeAccessor, appCaches, Logger);
             var commonRepository = new ContentTypeCommonRepository(scopeAccessor, templateRepository, appCaches);
-            contentTypeRepository = new ContentTypeRepository(scopeAccessor, appCaches, Logger, commonRepository);
             var languageRepository = new LanguageRepository(scopeAccessor, appCaches, Logger);
+            contentTypeRepository = new ContentTypeRepository(scopeAccessor, appCaches, Logger, commonRepository, languageRepository);
             var repository = new DocumentRepository(scopeAccessor, appCaches, Logger, contentTypeRepository, templateRepository, tagRepository, languageRepository);
             return repository;
         }
diff --git a/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs
index f00b2fd046..628f8d75a7 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs
@@ -23,8 +23,8 @@ namespace Umbraco.Tests.Persistence.Repositories
             var templateRepository = new TemplateRepository(accessor, Core.Cache.AppCaches.Disabled, Logger, TestObjects.GetFileSystemsMock());
             var tagRepository = new TagRepository(accessor, Core.Cache.AppCaches.Disabled, Logger);
             var commonRepository = new ContentTypeCommonRepository(accessor, templateRepository, AppCaches);
-            contentTypeRepository = new ContentTypeRepository(accessor, Core.Cache.AppCaches.Disabled, Logger, commonRepository);
             languageRepository = new LanguageRepository(accessor, Core.Cache.AppCaches.Disabled, Logger);
+            contentTypeRepository = new ContentTypeRepository(accessor, Core.Cache.AppCaches.Disabled, Logger, commonRepository, languageRepository);
             documentRepository = new DocumentRepository(accessor, Core.Cache.AppCaches.Disabled, Logger, contentTypeRepository, templateRepository, tagRepository, languageRepository);
             var domainRepository = new DomainRepository(accessor, Core.Cache.AppCaches.Disabled, Logger);
             return domainRepository;
diff --git a/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
index 1d9cf6d022..e2123df9e3 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
@@ -38,7 +38,8 @@ namespace Umbraco.Tests.Persistence.Repositories
 
             var templateRepository = new TemplateRepository(scopeAccessor, appCaches, Logger, TestObjects.GetFileSystemsMock());
             var commonRepository = new ContentTypeCommonRepository(scopeAccessor, templateRepository, appCaches);
-            mediaTypeRepository = new MediaTypeRepository(scopeAccessor, appCaches, Logger, commonRepository);
+            var languageRepository = new LanguageRepository(scopeAccessor, appCaches, Logger);
+            mediaTypeRepository = new MediaTypeRepository(scopeAccessor, appCaches, Logger, commonRepository, languageRepository);
             var tagRepository = new TagRepository(scopeAccessor, appCaches, Logger);
             var repository = new MediaRepository(scopeAccessor, appCaches, Logger, mediaTypeRepository, tagRepository, Mock.Of<ILanguageRepository>());
             return repository;
diff --git a/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs
index f302d1d992..bb3286daed 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs
@@ -23,7 +23,8 @@ namespace Umbraco.Tests.Persistence.Repositories
             var cacheHelper = AppCaches.Disabled;
             var templateRepository = new TemplateRepository((IScopeAccessor)provider, cacheHelper, Logger, TestObjects.GetFileSystemsMock());
             var commonRepository = new ContentTypeCommonRepository((IScopeAccessor)provider, templateRepository, AppCaches);
-            return new MediaTypeRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, commonRepository);
+            var languageRepository = new LanguageRepository((IScopeAccessor)provider, AppCaches, Logger);
+            return new MediaTypeRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, commonRepository, languageRepository);
         }
 
         private EntityContainerRepository CreateContainerRepository(IScopeProvider provider)
diff --git a/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
index a5f7f08f22..17b16ad7ab 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
@@ -31,7 +31,8 @@ namespace Umbraco.Tests.Persistence.Repositories
             var accessor = (IScopeAccessor) provider;
             var templateRepository = Mock.Of<ITemplateRepository>();
             var commonRepository = new ContentTypeCommonRepository(accessor, templateRepository, AppCaches);
-            memberTypeRepository = new MemberTypeRepository(accessor, AppCaches.Disabled, Logger, commonRepository);
+            var languageRepository = new LanguageRepository(accessor, AppCaches.Disabled, Logger);
+            memberTypeRepository = new MemberTypeRepository(accessor, AppCaches.Disabled, Logger, commonRepository, languageRepository);
             memberGroupRepository = new MemberGroupRepository(accessor, AppCaches.Disabled, Logger);
             var tagRepo = new TagRepository(accessor, AppCaches.Disabled, Logger);
             var repository = new MemberRepository(accessor, AppCaches.Disabled, Logger, memberTypeRepository, memberGroupRepository, tagRepo, Mock.Of<ILanguageRepository>());
diff --git a/src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs
index 79e8e43804..4b9f3096ce 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs
@@ -24,7 +24,8 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             var templateRepository = Mock.Of<ITemplateRepository>();
             var commonRepository = new ContentTypeCommonRepository((IScopeAccessor)provider, templateRepository, AppCaches);
-            return new MemberTypeRepository((IScopeAccessor) provider, AppCaches.Disabled, Mock.Of<ILogger>(), commonRepository);
+            var languageRepository = new LanguageRepository((IScopeAccessor)provider, AppCaches.Disabled, Mock.Of<ILogger>());
+            return new MemberTypeRepository((IScopeAccessor) provider, AppCaches.Disabled, Mock.Of<ILogger>(), commonRepository, languageRepository);
         }
 
         [Test]
diff --git a/src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs
index 803eff25af..56041c24aa 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs
@@ -308,8 +308,8 @@ namespace Umbraco.Tests.Persistence.Repositories
             var templateRepository = new TemplateRepository(accessor, AppCaches, Logger, TestObjects.GetFileSystemsMock());
             var tagRepository = new TagRepository(accessor, AppCaches, Logger);
             var commonRepository = new ContentTypeCommonRepository(accessor, templateRepository, AppCaches);
-            contentTypeRepository = new ContentTypeRepository(accessor, AppCaches, Logger, commonRepository);
             var languageRepository = new LanguageRepository(accessor, AppCaches, Logger);
+            contentTypeRepository = new ContentTypeRepository(accessor, AppCaches, Logger, commonRepository, languageRepository);
             var repository = new DocumentRepository(accessor, AppCaches, Logger, contentTypeRepository, templateRepository, tagRepository, languageRepository);
             return repository;
         }
diff --git a/src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs
index b6cc4dc50d..e3de2c2892 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs
@@ -956,8 +956,8 @@ namespace Umbraco.Tests.Persistence.Repositories
             var templateRepository = new TemplateRepository(accessor, AppCaches.Disabled, Logger, TestObjects.GetFileSystemsMock());
             var tagRepository = new TagRepository(accessor, AppCaches.Disabled, Logger);
             var commonRepository = new ContentTypeCommonRepository(accessor, templateRepository, AppCaches.Disabled);
-            contentTypeRepository = new ContentTypeRepository(accessor, AppCaches.Disabled, Logger, commonRepository);
             var languageRepository = new LanguageRepository(accessor, AppCaches.Disabled, Logger);
+            contentTypeRepository = new ContentTypeRepository(accessor, AppCaches.Disabled, Logger, commonRepository, languageRepository);
             var repository = new DocumentRepository(accessor, AppCaches.Disabled, Logger, contentTypeRepository, templateRepository, tagRepository, languageRepository);
             return repository;
         }
@@ -968,7 +968,8 @@ namespace Umbraco.Tests.Persistence.Repositories
             var templateRepository = new TemplateRepository(accessor, AppCaches.Disabled, Logger, TestObjects.GetFileSystemsMock());
             var tagRepository = new TagRepository(accessor, AppCaches.Disabled, Logger);
             var commonRepository = new ContentTypeCommonRepository(accessor, templateRepository, AppCaches.Disabled);
-            mediaTypeRepository = new MediaTypeRepository(accessor, AppCaches.Disabled, Logger, commonRepository);
+            var languageRepository = new LanguageRepository(accessor, AppCaches.Disabled, Logger);
+            mediaTypeRepository = new MediaTypeRepository(accessor, AppCaches.Disabled, Logger, commonRepository, languageRepository);
             var repository = new MediaRepository(accessor, AppCaches.Disabled, Logger, mediaTypeRepository, tagRepository, Mock.Of<ILanguageRepository>());
             return repository;
         }
diff --git a/src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs
index 13cbd463fb..b0f9a5335b 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs
@@ -239,8 +239,8 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 var tagRepository = new TagRepository((IScopeAccessor) ScopeProvider, AppCaches.Disabled, Logger);
                 var commonRepository = new ContentTypeCommonRepository(ScopeProvider, templateRepository, AppCaches);
-                var contentTypeRepository = new ContentTypeRepository((IScopeAccessor) ScopeProvider, AppCaches.Disabled, Logger, commonRepository);
                 var languageRepository = new LanguageRepository((IScopeAccessor) ScopeProvider, AppCaches.Disabled, Logger);
+                var contentTypeRepository = new ContentTypeRepository((IScopeAccessor) ScopeProvider, AppCaches.Disabled, Logger, commonRepository, languageRepository);
                 var contentRepo = new DocumentRepository((IScopeAccessor) ScopeProvider, AppCaches.Disabled, Logger, contentTypeRepository, templateRepository, tagRepository, languageRepository);
 
                 var contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage2", "Textpage");
diff --git a/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
index b550091591..3e5919d7f3 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
@@ -26,7 +26,8 @@ namespace Umbraco.Tests.Persistence.Repositories
             var accessor = (IScopeAccessor) provider;
             var templateRepository = new TemplateRepository(accessor, AppCaches.Disabled, Logger, TestObjects.GetFileSystemsMock());
             var commonRepository = new ContentTypeCommonRepository(accessor, templateRepository, AppCaches);
-            mediaTypeRepository = new MediaTypeRepository(accessor, AppCaches, Mock.Of<ILogger>(), commonRepository);
+            var languageRepository = new LanguageRepository(accessor, AppCaches, Logger);
+            mediaTypeRepository = new MediaTypeRepository(accessor, AppCaches, Mock.Of<ILogger>(), commonRepository, languageRepository);
             var tagRepository = new TagRepository(accessor, AppCaches, Mock.Of<ILogger>());
             var repository = new MediaRepository(accessor, AppCaches, Mock.Of<ILogger>(), mediaTypeRepository, tagRepository, Mock.Of<ILanguageRepository>());
             return repository;
@@ -44,8 +45,8 @@ namespace Umbraco.Tests.Persistence.Repositories
             templateRepository = new TemplateRepository(accessor, AppCaches, Logger, TestObjects.GetFileSystemsMock());
             var tagRepository = new TagRepository(accessor, AppCaches, Logger);
             var commonRepository = new ContentTypeCommonRepository(accessor, templateRepository, AppCaches);
-            contentTypeRepository = new ContentTypeRepository(accessor, AppCaches, Logger, commonRepository);
             var languageRepository = new LanguageRepository(accessor, AppCaches, Logger);
+            contentTypeRepository = new ContentTypeRepository(accessor, AppCaches, Logger, commonRepository, languageRepository);
             var repository = new DocumentRepository(accessor, AppCaches, Logger, contentTypeRepository, templateRepository, tagRepository, languageRepository);
             return repository;
         }
diff --git a/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs b/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs
index ed5e6073ac..ef80672baf 100644
--- a/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs
+++ b/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs
@@ -166,8 +166,8 @@ namespace Umbraco.Tests.Services
                 var tRepository = new TemplateRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, TestObjects.GetFileSystemsMock());
                 var tagRepo = new TagRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger);
                 var commonRepository = new ContentTypeCommonRepository((IScopeAccessor)provider, tRepository, AppCaches);
-                var ctRepository = new ContentTypeRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, commonRepository);
                 var languageRepository = new LanguageRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger);
+                var ctRepository = new ContentTypeRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, commonRepository, languageRepository);
                 var repository = new DocumentRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, ctRepository, tRepository, tagRepo, languageRepository);
 
                 // Act
@@ -200,8 +200,8 @@ namespace Umbraco.Tests.Services
                 var tRepository = new TemplateRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, TestObjects.GetFileSystemsMock());
                 var tagRepo = new TagRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger);
                 var commonRepository = new ContentTypeCommonRepository((IScopeAccessor)provider, tRepository, AppCaches);
-                var ctRepository = new ContentTypeRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, commonRepository);
                 var languageRepository = new LanguageRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger);
+                var ctRepository = new ContentTypeRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, commonRepository, languageRepository);
                 var repository = new DocumentRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, ctRepository, tRepository, tagRepo, languageRepository);
 
                 // Act
@@ -232,8 +232,8 @@ namespace Umbraco.Tests.Services
                 var tRepository = new TemplateRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, TestObjects.GetFileSystemsMock());
                 var tagRepo = new TagRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger);
                 var commonRepository = new ContentTypeCommonRepository((IScopeAccessor) provider, tRepository, AppCaches);
-                var ctRepository = new ContentTypeRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, commonRepository);
-                var languageRepository = new LanguageRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger);
+                var languageRepository = new LanguageRepository((IScopeAccessor)provider, AppCaches.Disabled, Logger);
+                var ctRepository = new ContentTypeRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, commonRepository, languageRepository);
                 var repository = new DocumentRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, ctRepository, tRepository, tagRepo, languageRepository);
 
                 // Act
@@ -267,8 +267,8 @@ namespace Umbraco.Tests.Services
                 var tRepository = new TemplateRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, TestObjects.GetFileSystemsMock());
                 var tagRepo = new TagRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger);
                 var commonRepository = new ContentTypeCommonRepository((IScopeAccessor)provider, tRepository, AppCaches);
-                var ctRepository = new ContentTypeRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, commonRepository);
-                var languageRepository = new LanguageRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger);
+                var languageRepository = new LanguageRepository((IScopeAccessor)provider, AppCaches.Disabled, Logger);
+                var ctRepository = new ContentTypeRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, commonRepository, languageRepository);  
                 var repository = new DocumentRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, ctRepository, tRepository, tagRepo, languageRepository);
 
                 // Act
diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs
index 222f40aeed..7acfd994d3 100644
--- a/src/Umbraco.Tests/Services/ContentServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs
@@ -3008,8 +3008,8 @@ namespace Umbraco.Tests.Services
             var templateRepository = new TemplateRepository(accessor, AppCaches.Disabled, Logger, TestObjects.GetFileSystemsMock());
             var tagRepository = new TagRepository(accessor, AppCaches.Disabled, Logger);
             var commonRepository = new ContentTypeCommonRepository(accessor, templateRepository, AppCaches);
-            contentTypeRepository = new ContentTypeRepository(accessor, AppCaches.Disabled, Logger, commonRepository);
             var languageRepository = new LanguageRepository(accessor, AppCaches.Disabled, Logger);
+            contentTypeRepository = new ContentTypeRepository(accessor, AppCaches.Disabled, Logger, commonRepository, languageRepository);
             var repository = new DocumentRepository(accessor, AppCaches.Disabled, Logger, contentTypeRepository, templateRepository, tagRepository, languageRepository);
             return repository;
         }
diff --git a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
index f5fa4e8795..53a39ffe40 100644
--- a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
+++ b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
@@ -810,12 +810,18 @@ namespace Umbraco.Tests.Services
             var document = (IContent)new Content("document", -1, contentType);
             document.SetCultureName("doc1en", "en");
             document.SetCultureName("doc1fr", "fr");
-            document.SetValue("value1", "v1en", "en");
-            document.SetValue("value1", "v1fr", "fr");
-            ServiceContext.ContentService.Save(document);
+            document.SetValue("value1", "v1en-init", "en");
+            document.SetValue("value1", "v1fr-init", "fr");
+            ServiceContext.ContentService.SaveAndPublish(document); //all values are published which means the document is not 'edited'
 
-            //at this stage there will be 4 property values stored in the DB for "value1" against "en" and "fr" for both edited/published versions,
-            //for the published values, these will be null
+            document = ServiceContext.ContentService.GetById(document.Id);
+            Assert.IsFalse(document.IsCultureEdited("en"));
+            Assert.IsFalse(document.IsCultureEdited("fr"));
+            Assert.IsFalse(document.Edited);
+
+            document.SetValue("value1", "v1en", "en"); //change the property culture value, so now this culture will be edited
+            document.SetValue("value1", "v1fr", "fr"); //change the property culture value, so now this culture will be edited
+            ServiceContext.ContentService.Save(document);
 
             document = ServiceContext.ContentService.GetById(document.Id);
             Assert.AreEqual("doc1en", document.Name);
@@ -829,18 +835,17 @@ namespace Umbraco.Tests.Services
 
             // switch property type to Nothing
             contentType.PropertyTypes.First(x => x.Alias == "value1").Variations = ContentVariation.Nothing;
-            ServiceContext.ContentTypeService.Save(contentType);
+            ServiceContext.ContentTypeService.Save(contentType); //This is going to have to re-normalize the "Edited" flag
             
             document = ServiceContext.ContentService.GetById(document.Id);
+            Assert.IsTrue(document.IsCultureEdited("en")); //This will remain true because there is now a pending change for the invariant property data which is flagged under the default lang
+            Assert.IsFalse(document.IsCultureEdited("fr")); //This will be false because nothing has changed for this culture and the property no longer reflects variant changes
             Assert.IsTrue(document.Edited);
 
-            // publish the document
-            document.SetValue("value1", "v1inv"); //update the invariant value
+            //update the invariant value and publish
+            document.SetValue("value1", "v1inv"); 
             ServiceContext.ContentService.SaveAndPublish(document);
 
-            //at this stage there will be 6 property values stored in the DB for "value1" against "en", "fr" and null for both edited/published versions,
-            //for the published values for the cultures, these will still be null but the invariant edited/published values will both be "v1inv".
-
             document = ServiceContext.ContentService.GetById(document.Id);
             Assert.AreEqual("doc1en", document.Name);
             Assert.AreEqual("doc1en", document.GetCultureName("en"));
@@ -848,8 +853,8 @@ namespace Umbraco.Tests.Services
             Assert.IsNull(document.GetValue("value1", "en")); //The values are there but the business logic returns null
             Assert.IsNull(document.GetValue("value1", "fr")); //The values are there but the business logic returns null
             Assert.AreEqual("v1inv", document.GetValue("value1"));
-            Assert.IsFalse(document.IsCultureEdited("en")); //This returns false, the culture shouldn't be marked as edited because the invariant property value is published
-            Assert.IsFalse(document.IsCultureEdited("fr")); //This returns false, the culture shouldn't be marked as edited because the invariant property value is published
+            Assert.IsFalse(document.IsCultureEdited("en")); //This returns false, everything is published - however in the DB this is not the case for the "en" version of the property
+            Assert.IsFalse(document.IsCultureEdited("fr")); //This returns false, everything is published
             Assert.IsFalse(document.Edited);
 
             // switch property back to Culture

From ff952a6df169bbbe11d8dad29c653c7433fcbf05 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 1 Aug 2019 15:54:44 +1000
Subject: [PATCH 218/776] Passes test! Now to add more tests/assertions and
 then the logic to renormalize based on name changes.

---
 .../Persistence/Factories/PropertyFactory.cs  |  23 ++--
 .../Implement/ContentTypeRepositoryBase.cs    | 112 +++++++++++-------
 .../Implement/DocumentRepository.cs           |   2 +-
 .../ContentTypeServiceVariantsTests.cs        |  21 ++--
 4 files changed, 95 insertions(+), 63 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Factories/PropertyFactory.cs b/src/Umbraco.Core/Persistence/Factories/PropertyFactory.cs
index 4e7dc1e982..33dabe1b24 100644
--- a/src/Umbraco.Core/Persistence/Factories/PropertyFactory.cs
+++ b/src/Umbraco.Core/Persistence/Factories/PropertyFactory.cs
@@ -104,10 +104,9 @@ namespace Umbraco.Core.Persistence.Factories
         /// <param name="properties">The properties to map</param>
         /// <param name="languageRepository"></param>
         /// <param name="edited">out parameter indicating that one or more properties have been edited</param>
-        /// <param name="editedCultures">out parameter containing a collection of edited cultures when the contentVariation varies by culture</param>
-        /// <param name="persistedEditedCultures">
-        /// out parameter containing a collection of edited cultures that are currently persisted in the database which is used to maintain the edited state
-        /// of each culture value (in cases where variance is being switched)
+        /// <param name="editedCultures">
+        /// Out parameter containing a collection of edited cultures when the contentVariation varies by culture.
+        /// The value of this will be used to populate the edited cultures in the umbracoDocumentCultureVariation table.
         /// </param>
         /// <returns></returns>
         public static IEnumerable<PropertyDataDto> BuildDtos(ContentVariation contentVariation, int currentVersionId, int publishedVersionId, IEnumerable<Property> properties,
@@ -146,14 +145,16 @@ namespace Umbraco.Core.Persistence.Factories
                         if (propertyValue.EditedValue != null)
                             propertyDataDtos.Add(BuildDto(currentVersionId, property, languageRepository.GetIdByIsoCode(propertyValue.Culture), propertyValue.Segment, propertyValue.EditedValue));
 
-                        //// property.Values will contain ALL of it's values, both variant and invariant which will be populated if the administrator has previously
-                        //// changed the property type to be variant vs invariant.
-                        //// We need to check for this scenario here because otherwise the editedCultures and edited flags
-                        //// will end up incorrectly so here we need to only process edited cultures based on the
-                        //// current value type and how the property varies.
+                        // property.Values will contain ALL of it's values, both variant and invariant which will be populated if the
+                        // administrator has previously changed the property type to be variant vs invariant.
+                        // We need to check for this scenario here because otherwise the editedCultures and edited flags
+                        // will end up incorrectly set in the umbracoDocumentCultureVariation table so here we need to
+                        // only process edited cultures based on the current value type and how the property varies.
+                        // The above logic will still persist the currently saved property value for each culture in case the admin
+                        // decides to swap the property's variance again, in which case the edited flag will be recalculated.
 
-                        //if (property.PropertyType.VariesByCulture() && isInvariantValue) continue;
-                        //if (!property.PropertyType.VariesByCulture() && isCultureValue) continue;
+                        if (property.PropertyType.VariesByCulture() && isInvariantValue || !property.PropertyType.VariesByCulture() && isCultureValue)
+                            continue;
 
                         // use explicit equals here, else object comparison fails at comparing eg strings
                         var sameValues = propertyValue.PublishedValue == null ? propertyValue.EditedValue == null : propertyValue.PublishedValue.Equals(propertyValue.EditedValue);
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
index 756435692a..b29565a35e 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
@@ -648,14 +648,14 @@ AND umbracoNode.id <> @id",
                     case ContentVariation.Culture:
                         CopyPropertyData(null, defaultLanguageId, propertyTypeIds, impactedL);
                         CopyTagData(null, defaultLanguageId, propertyTypeIds, impactedL);
-                        RenormalizeDocumentCultureVariations(propertyTypeIds, impactedL);
+                        RenormalizeDocumentEditedFlags(propertyTypeIds, impactedL);
                         //TODO: Here we need to normalize the umbracoDocumentCultureVariation table for it's edited flags which are calculated based
                         //on changed property or name values
                         break;
                     case ContentVariation.Nothing:
                         CopyPropertyData(defaultLanguageId, null, propertyTypeIds, impactedL);
                         CopyTagData(defaultLanguageId, null, propertyTypeIds, impactedL);
-                        RenormalizeDocumentCultureVariations(propertyTypeIds, impactedL);
+                        RenormalizeDocumentEditedFlags(propertyTypeIds, impactedL);
                         //TODO: Here we need to normalize the umbracoDocumentCultureVariation table for it's edited flags which are calculated based
                         //on changed property or name values
                         break;
@@ -1024,19 +1024,17 @@ AND umbracoNode.id <> @id",
         }
 
         /// <summary>
-        /// Re-normalizes the edited value in the umbracoDocumentCultureVariation table when property variations are changed
+        /// Re-normalizes the edited value in the umbracoDocumentCultureVariation and umbracoDocument table when variations are changed
         /// </summary>
         /// <param name="propertyTypeIds"></param>
         /// <param name="contentTypeIds"></param>
         /// <remarks>
         /// If this is not done, then in some cases the "edited" value for a particular culture for a document will remain true when it should be false
         /// if the property was changed to invariant. In order to do this we need to recalculate this value based on the values stored for each
-        /// property, culture and current/published version. The end result is to update the edited value in the umbracoDocumentCultureVariation table so we
-        /// make sure to join this table with the lookups so that only relevant data is returned.
+        /// property, culture and current/published version.
         /// </remarks>
-        private void RenormalizeDocumentCultureVariations(IReadOnlyCollection<int> propertyTypeIds, IReadOnlyCollection<int> contentTypeIds = null)
+        private void RenormalizeDocumentEditedFlags(IReadOnlyCollection<int> propertyTypeIds, IReadOnlyCollection<int> contentTypeIds = null)
         {
-
             var defaultLang = LanguageRepository.GetDefaultId();
 
            //This will build up a query to get the property values of both the current and the published version so that we can check
@@ -1073,14 +1071,16 @@ AND umbracoNode.id <> @id",
                 .OrderBy<ContentVersionDto>(x => x.NodeId)
                 .OrderBy<PropertyDataDto>(x => x.PropertyTypeId, x => x.LanguageId, x => x.VersionId);
 
-            //keep track of this node/lang to mark or unmark as edited
-            var editedVersions = new Dictionary<(int nodeId, int? langId), bool>();
-
+            //keep track of this node/lang to mark or unmark a culture as edited
+            var editedLanguageVersions = new Dictionary<(int nodeId, int? langId), bool>();
+            //keep track of which node to mark or unmark as edited 
+            var editedDocument = new Dictionary<int, bool>();
             var nodeId = -1;
             var propertyTypeId = -1;
+            
             PropertyValueVersionDto pubRow = null;
 
-            //This is a QUERY we are not fetching this all into memory so we cannot make any changes during this iteration, we are just collecting data.
+            //This is a reader (Query), we are not fetching this all into memory so we cannot make any changes during this iteration, we are just collecting data.
             //Published data will always come before Current data based on the version id sort.
             //There will only be one published row (max) and one current row per property.
             foreach (var row in Database.Query<PropertyValueVersionDto>(propertySql))
@@ -1105,19 +1105,24 @@ AND umbracoNode.id <> @id",
                         || propVariations.VariesByCulture() && !row.LanguageId.HasValue)
                     {
                         //Flag this as not edited for this node/lang if the key doesn't exist
-                        if (!editedVersions.TryGetValue((row.NodeId, row.LanguageId), out _))
-                            editedVersions.Add((row.NodeId, row.LanguageId), false);
+                        if (!editedLanguageVersions.TryGetValue((row.NodeId, row.LanguageId), out _))
+                            editedLanguageVersions.Add((row.NodeId, row.LanguageId), false);
+
+                        //mark as false if the item doesn't exist, else coerce to true
+                        editedDocument[row.NodeId] = editedDocument.TryGetValue(row.NodeId, out var edited) ? (edited |= false) : false;
                     }
                     else if (pubRow == null)
                     {
                         //this would mean that that this property is 'edited' since there is no published version
-                        editedVersions.Add((row.NodeId, row.LanguageId), true);
+                        editedLanguageVersions.Add((row.NodeId, row.LanguageId), true);
+                        editedDocument[row.NodeId] = true;
                     }
                     //compare the property values, if they differ from versions then flag the current version as edited
                     else if (IsPropertyValueChanged(pubRow, row))
                     {
                         //Here we would check if the property is invariant, in which case the edited language should be indicated by the default lang
-                        editedVersions[(row.NodeId, !propVariations.VariesByCulture() ? defaultLang : row.LanguageId)] = true;
+                        editedLanguageVersions[(row.NodeId, !propVariations.VariesByCulture() ? defaultLang : row.LanguageId)] = true;
+                        editedDocument[row.NodeId] = true;
                     }
 
                     //reset
@@ -1125,32 +1130,6 @@ AND umbracoNode.id <> @id",
                 }
             }
 
-            //lookup all matching rows in umbracoDocumentCultureVariation
-            var docCultureVariationsToUpdate = Database.Fetch<DocumentCultureVariationDto>(
-                Sql().Select<DocumentCultureVariationDto>().From<DocumentCultureVariationDto>()
-                .WhereIn<DocumentCultureVariationDto>(x => x.LanguageId, editedVersions.Keys.Select(x => x.langId).ToList())
-                .WhereIn<DocumentCultureVariationDto>(x => x.NodeId, editedVersions.Keys.Select(x => x.nodeId)))
-                //convert to dictionary with the same key type
-                .ToDictionary(x => (x.NodeId, (int?)x.LanguageId), x => x);
-
-            foreach (var ev in editedVersions)
-            {
-                if (docCultureVariationsToUpdate.TryGetValue(ev.Key, out var docVariations))
-                {
-                    //check if it needs updating
-                    if (docVariations.Edited != ev.Value)
-                    {
-                        docVariations.Edited = ev.Value;
-                        Database.Update(docVariations);
-                    }
-                }
-                else
-                {
-                    //the row doesn't exist but needs creating
-                    //TODO: Does this ever happen?? Need to see if we can test this
-                }
-            }
-
             ////Generate SQL to lookup the current name vs the publish name for each language
             //var nameSql = Sql()
             //    .Select<ContentVersionDto>("cv1", x => x.NodeId, x => Alias(x.Id, "currentVersion"))
@@ -1172,8 +1151,57 @@ AND umbracoNode.id <> @id",
             //    .Where<ContentVersionDto>(x => x.Current, "cv1")
             //    .OrderBy("cv1.nodeId, cvcv1.versionId, cvcv1.languageId");
 
-            //var names = Database.Fetch<NameCompareDto>(nameSql);
+            ////This is a reader (Query), we are not fetching this all into memory so we cannot make any changes during this iteration, we are just collecting data.
+            //foreach (var name in Database.Query<NameCompareDto>(nameSql))
+            //{
+            //    if (name.CurrentName != name.PublishedName)
+            //    {
 
+            //    }
+            //}
+
+            //lookup all matching rows in umbracoDocumentCultureVariation
+            var docCultureVariationsToUpdate = editedLanguageVersions.InGroupsOf(2000)
+                .SelectMany(_ => Database.Fetch<DocumentCultureVariationDto>(
+                    Sql().Select<DocumentCultureVariationDto>().From<DocumentCultureVariationDto>()
+                            .WhereIn<DocumentCultureVariationDto>(x => x.LanguageId, editedLanguageVersions.Keys.Select(x => x.langId).ToList())
+                            .WhereIn<DocumentCultureVariationDto>(x => x.NodeId, editedLanguageVersions.Keys.Select(x => x.nodeId))))
+                //convert to dictionary with the same key type
+                .ToDictionary(x => (x.NodeId, (int?)x.LanguageId), x => x);
+
+            var toUpdate = new List<DocumentCultureVariationDto>();
+            foreach (var ev in editedLanguageVersions)
+            {
+                if (docCultureVariationsToUpdate.TryGetValue(ev.Key, out var docVariations))
+                {
+                    //check if it needs updating
+                    if (docVariations.Edited != ev.Value)
+                    {
+                        docVariations.Edited = ev.Value;
+                        toUpdate.Add(docVariations);
+                    }
+                }
+                else
+                {
+                    //the row doesn't exist but needs creating
+                    //TODO: Does this ever happen?? Need to see if we can test this
+                    throw new PanicException($"The existing DocumentCultureVariationDto was not found for node {ev.Key.nodeId} and language {ev.Key.langId}");
+                }
+            }
+
+            //Now bulk update the table DocumentCultureVariationDto, once for edited = true, another for edited = false
+            foreach (var editValue in toUpdate.GroupBy(x => x.Edited))
+            {
+                Database.Execute(Sql().Update<DocumentCultureVariationDto>(u => u.Set(x => x.Edited, editValue.Key))
+                    .WhereIn<DocumentCultureVariationDto>(x => x.Id, editValue.Select(x => x.Id)));
+            }
+
+            //Now bulk update the umbracoDocument table
+            foreach(var editValue in editedDocument.GroupBy(x => x.Value))
+            {
+                Database.Execute(Sql().Update<DocumentDto>(u => u.Set(x => x.Edited, editValue.Key))
+                    .WhereIn<DocumentDto>(x => x.NodeId, editValue.Select(x => x.Key)));
+            }
         }
 
         private static bool IsPropertyValueChanged(PropertyValueVersionDto pubRow, PropertyValueVersionDto row)
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
index 0dbfc61b8c..c18921b59e 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
@@ -511,7 +511,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
                 entity.VersionId = documentVersionDto.Id = contentVersionDto.Id; // get the new id
 
                 documentVersionDto.Published = false; // non-published version
-                Database.Insert(documentVersionDto);
+                Database.Insert(documentVersionDto); 
             }
 
             // replace the property data (rather than updating)
diff --git a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
index 53a39ffe40..2fed37c389 100644
--- a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
+++ b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
@@ -828,12 +828,14 @@ namespace Umbraco.Tests.Services
             Assert.AreEqual("doc1en", document.GetCultureName("en"));
             Assert.AreEqual("doc1fr", document.GetCultureName("fr"));
             Assert.AreEqual("v1en", document.GetValue("value1", "en"));
+            Assert.AreEqual("v1en-init", document.GetValue("value1", "en", published: true));
             Assert.AreEqual("v1fr", document.GetValue("value1", "fr"));
+            Assert.AreEqual("v1fr-init", document.GetValue("value1", "fr", published: true));
             Assert.IsTrue(document.IsCultureEdited("en")); //This will be true because the edited value isn't the same as the published value
             Assert.IsTrue(document.IsCultureEdited("fr")); //This will be true because the edited value isn't the same as the published value
             Assert.IsTrue(document.Edited);
 
-            // switch property type to Nothing
+            // switch property type to Invariant
             contentType.PropertyTypes.First(x => x.Alias == "value1").Variations = ContentVariation.Nothing;
             ServiceContext.ContentTypeService.Save(contentType); //This is going to have to re-normalize the "Edited" flag
             
@@ -852,9 +854,12 @@ namespace Umbraco.Tests.Services
             Assert.AreEqual("doc1fr", document.GetCultureName("fr"));
             Assert.IsNull(document.GetValue("value1", "en")); //The values are there but the business logic returns null
             Assert.IsNull(document.GetValue("value1", "fr")); //The values are there but the business logic returns null
+            Assert.IsNull(document.GetValue("value1", "en", published: true)); //The values are there but the business logic returns null
+            Assert.IsNull(document.GetValue("value1", "fr", published: true)); //The values are there but the business logic returns null
             Assert.AreEqual("v1inv", document.GetValue("value1"));
-            Assert.IsFalse(document.IsCultureEdited("en")); //This returns false, everything is published - however in the DB this is not the case for the "en" version of the property
-            Assert.IsFalse(document.IsCultureEdited("fr")); //This returns false, everything is published
+            Assert.AreEqual("v1inv", document.GetValue("value1", published: true));
+            Assert.IsFalse(document.IsCultureEdited("en")); //This returns false, everything is published
+            Assert.IsFalse(document.IsCultureEdited("fr")); //This will be false because nothing has changed for this culture and the property no longer reflects variant changes
             Assert.IsFalse(document.Edited);
 
             // switch property back to Culture
@@ -863,14 +868,12 @@ namespace Umbraco.Tests.Services
                         
             document = ServiceContext.ContentService.GetById(document.Id);
             Assert.AreEqual("v1inv", document.GetValue("value1", "en")); //The invariant property value gets copied over to the default language
-            Assert.AreEqual("v1fr", document.GetValue("value1", "fr"));
+            Assert.AreEqual("v1inv", document.GetValue("value1", "en", published: true));
+            Assert.AreEqual("v1fr", document.GetValue("value1", "fr")); //values are still retained
+            Assert.AreEqual("v1fr-init", document.GetValue("value1", "fr", published: true)); //values are still retained
             Assert.IsFalse(document.IsCultureEdited("en")); //The invariant published AND edited values are copied over to the default language
-            //TODO: This fails - for some reason in the DB, the DocumentCultureVariationDto Edited flag is set to false for the FR culture
-            // I'm assuming this is somehow done during the ContentTypeService.Save method when changing variation. It should not be false but instead
-            // true because the values for it's edited vs published version are different. Perhaps it's false because that is the default boolean value and
-            // this row gets deleted somewhere along the way?
             Assert.IsTrue(document.IsCultureEdited("fr"));  //The previously existing french values are there and there is no published value
-            Assert.IsTrue(document.Edited);
+            Assert.IsTrue(document.Edited); //Will be flagged edited again because the french culture had pending changes
 
             // publish again
             document.SetValue("value1", "v1en2", "en"); //update the value now that it's variant again

From 10958158781737e970ceca2d6a845a8d9110333e Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 1 Aug 2019 16:09:52 +1000
Subject: [PATCH 219/776] removes notes

---
 src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
index 2fed37c389..0c54cf5975 100644
--- a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
+++ b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
@@ -880,9 +880,6 @@ namespace Umbraco.Tests.Services
             document.SetValue("value1", "v1fr2", "fr"); //update the value now that it's variant again
             ServiceContext.ContentService.SaveAndPublish(document);
 
-            //at this stage there will be 4 property values stored in the DB for "value1" against "en", "fr" for both edited/published versions,
-            //with the change back to Culture, it deletes the invariant property values.
-
             document = ServiceContext.ContentService.GetById(document.Id);
             Assert.AreEqual("doc1en", document.Name);
             Assert.AreEqual("doc1en", document.GetCultureName("en"));

From 9538981730d71698e90a00aba92fea700b587eef Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 1 Aug 2019 18:49:05 +1000
Subject: [PATCH 220/776] Adds more assertions and tests and validates
 variations

---
 src/Umbraco.Core/Models/IContentTypeBase.cs   |   2 +-
 .../Implement/ContentTypeRepositoryBase.cs    |  68 ++--
 .../Implement/DocumentRepository.cs           |  10 +-
 .../ContentTypeServiceVariantsTests.cs        | 290 ++++++------------
 4 files changed, 133 insertions(+), 237 deletions(-)

diff --git a/src/Umbraco.Core/Models/IContentTypeBase.cs b/src/Umbraco.Core/Models/IContentTypeBase.cs
index 5f1fe6ed49..ed87c5f320 100644
--- a/src/Umbraco.Core/Models/IContentTypeBase.cs
+++ b/src/Umbraco.Core/Models/IContentTypeBase.cs
@@ -101,7 +101,7 @@ namespace Umbraco.Core.Models
         PropertyGroupCollection PropertyGroups { get; set; }
 
         /// <summary>
-        /// Gets all local property types belonging to a group, across all local property groups.
+        /// Gets all local property types all local property groups or ungrouped.
         /// </summary>
         IEnumerable<PropertyType> PropertyTypes { get; }
 
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
index b29565a35e..8f88c71bf0 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
@@ -100,6 +100,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         protected void PersistNewBaseContentType(IContentTypeComposition entity)
         {
+            ValidateVariations(entity);
+
             var dto = ContentTypeFactory.BuildContentTypeDto(entity);
 
             //Cannot add a duplicate content type
@@ -165,11 +167,11 @@ AND umbracoNode.nodeObjectType = @objectType",
             foreach (var allowedContentType in entity.AllowedContentTypes)
             {
                 Database.Insert(new ContentTypeAllowedContentTypeDto
-                                    {
-                                        Id = entity.Id,
-                                        AllowedId = allowedContentType.Id.Value,
-                                        SortOrder = allowedContentType.SortOrder
-                                    });
+                {
+                    Id = entity.Id,
+                    AllowedId = allowedContentType.Id.Value,
+                    SortOrder = allowedContentType.SortOrder
+                });
             }
 
 
@@ -216,6 +218,8 @@ AND umbracoNode.nodeObjectType = @objectType",
 
         protected void PersistUpdatedBaseContentType(IContentTypeComposition entity)
         {
+            ValidateVariations(entity);
+
             var dto = ContentTypeFactory.BuildContentTypeDto(entity);
 
             // ensure the alias is not used already
@@ -372,7 +376,7 @@ AND umbracoNode.id <> @id",
             foreach (var propertyGroup in entity.PropertyGroups)
             {
                 // insert or update group
-                var groupDto = PropertyGroupFactory.BuildGroupDto(propertyGroup,entity.Id);
+                var groupDto = PropertyGroupFactory.BuildGroupDto(propertyGroup, entity.Id);
                 var groupId = propertyGroup.HasIdentity
                     ? Database.Update(groupDto)
                     : Convert.ToInt32(Database.Insert(groupDto));
@@ -390,7 +394,7 @@ AND umbracoNode.id <> @id",
 
             //check if the content type variation has been changed
             var contentTypeVariationDirty = entity.IsPropertyDirty("Variations");
-            var oldContentTypeVariation = (ContentVariation) dtoPk.Variations;
+            var oldContentTypeVariation = (ContentVariation)dtoPk.Variations;
             var newContentTypeVariation = entity.Variations;
             var contentTypeVariationChanging = contentTypeVariationDirty && oldContentTypeVariation != newContentTypeVariation;
             if (contentTypeVariationChanging)
@@ -451,7 +455,7 @@ AND umbracoNode.id <> @id",
                 // via composition, with their original variations (ie not filtered by this
                 // content type variations - we need this true value to make decisions.
 
-                foreach (var propertyType in ((ContentTypeCompositionBase) entity).RawComposedPropertyTypes)
+                foreach (var propertyType in ((ContentTypeCompositionBase)entity).RawComposedPropertyTypes)
                 {
                     if (propertyType.VariesBySegment() || newContentTypeVariation.VariesBySegment())
                         throw new NotSupportedException(); // TODO: support this
@@ -520,6 +524,19 @@ AND umbracoNode.id <> @id",
             CommonRepository.ClearCache(); // always
         }
 
+        /// <summary>
+        /// Ensures that no property types are flagged for a variance that is not supported by the content type itself
+        /// </summary>
+        /// <param name="entity"></param>
+        private void ValidateVariations(IContentTypeComposition entity)
+        {
+            //if the entity does not vary at all, then the property cannot have a variance value greater than it
+            if (entity.Variations == ContentVariation.Nothing)
+                foreach (var prop in entity.PropertyTypes)
+                    if (prop.Variations > entity.Variations)
+                        throw new InvalidOperationException($"The property {prop.Alias} cannot have variations of {prop.Variations} with the content type variations of {entity.Variations}");
+        }
+
         private IEnumerable<IContentTypeComposition> GetImpactedContentTypes(IContentTypeComposition contentType, IEnumerable<IContentTypeComposition> all)
         {
             var impact = new List<IContentTypeComposition>();
@@ -527,12 +544,12 @@ AND umbracoNode.id <> @id",
 
             var tree = new Dictionary<int, List<IContentTypeComposition>>();
             foreach (var x in all)
-            foreach (var y in x.ContentTypeComposition)
-            {
-                if (!tree.TryGetValue(y.Id, out var list))
-                    list = tree[y.Id] = new List<IContentTypeComposition>();
-                list.Add(x);
-            }
+                foreach (var y in x.ContentTypeComposition)
+                {
+                    if (!tree.TryGetValue(y.Id, out var list))
+                        list = tree[y.Id] = new List<IContentTypeComposition>();
+                    list.Add(x);
+                }
 
             var nset = new List<IContentTypeComposition>();
             do
@@ -574,7 +591,7 @@ AND umbracoNode.id <> @id",
                 // new property type, ignore
                 if (!oldVariations.TryGetValue(propertyType.Id, out var oldVariationB))
                     continue;
-                var oldVariation = (ContentVariation) oldVariationB; // NPoco cannot fetch directly
+                var oldVariation = (ContentVariation)oldVariationB; // NPoco cannot fetch directly
 
                 // only those property types that *actually* changed
                 var newVariation = propertyType.Variations;
@@ -638,7 +655,7 @@ AND umbracoNode.id <> @id",
             var impactedL = impacted.Select(x => x.Id).ToList();
 
             //Group by the "To" variation so we can bulk update in the correct batches
-            foreach(var grouping in propertyTypeChanges.GroupBy(x => x.Value.ToVariation))
+            foreach (var grouping in propertyTypeChanges.GroupBy(x => x.Value.ToVariation))
             {
                 var propertyTypeIds = grouping.Select(x => x.Key).ToList();
                 var toVariation = grouping.Key;
@@ -1037,8 +1054,8 @@ AND umbracoNode.id <> @id",
         {
             var defaultLang = LanguageRepository.GetDefaultId();
 
-           //This will build up a query to get the property values of both the current and the published version so that we can check
-           //based on the current variance of each item to see if it's 'edited' value should be true/false.
+            //This will build up a query to get the property values of both the current and the published version so that we can check
+            //based on the current variance of each item to see if it's 'edited' value should be true/false.
 
             var whereInArgsCount = propertyTypeIds.Count + (contentTypeIds?.Count ?? 0);
             if (whereInArgsCount > 2000)
@@ -1077,7 +1094,7 @@ AND umbracoNode.id <> @id",
             var editedDocument = new Dictionary<int, bool>();
             var nodeId = -1;
             var propertyTypeId = -1;
-            
+
             PropertyValueVersionDto pubRow = null;
 
             //This is a reader (Query), we are not fetching this all into memory so we cannot make any changes during this iteration, we are just collecting data.
@@ -1087,7 +1104,7 @@ AND umbracoNode.id <> @id",
             {
                 //make sure to reset on each node/property change
                 if (nodeId != row.NodeId || propertyTypeId != row.PropertyTypeId)
-                {                    
+                {
                     nodeId = row.NodeId;
                     propertyTypeId = row.PropertyTypeId;
                     pubRow = null;
@@ -1114,7 +1131,7 @@ AND umbracoNode.id <> @id",
                     else if (pubRow == null)
                     {
                         //this would mean that that this property is 'edited' since there is no published version
-                        editedLanguageVersions.Add((row.NodeId, row.LanguageId), true);
+                        editedLanguageVersions[(row.NodeId, row.LanguageId)] = true;
                         editedDocument[row.NodeId] = true;
                     }
                     //compare the property values, if they differ from versions then flag the current version as edited
@@ -1181,10 +1198,9 @@ AND umbracoNode.id <> @id",
                         toUpdate.Add(docVariations);
                     }
                 }
-                else
+                else if (ev.Key.langId.HasValue)
                 {
-                    //the row doesn't exist but needs creating
-                    //TODO: Does this ever happen?? Need to see if we can test this
+                    //This should never happen! If a property culture is flagged as edited then the culture must exist at the document level
                     throw new PanicException($"The existing DocumentCultureVariationDto was not found for node {ev.Key.nodeId} and language {ev.Key.langId}");
                 }
             }
@@ -1197,7 +1213,7 @@ AND umbracoNode.id <> @id",
             }
 
             //Now bulk update the umbracoDocument table
-            foreach(var editValue in editedDocument.GroupBy(x => x.Value))
+            foreach (var editValue in editedDocument.GroupBy(x => x.Value))
             {
                 Database.Execute(Sql().Update<DocumentDto>(u => u.Set(x => x.Edited, editValue.Key))
                     .WhereIn<DocumentDto>(x => x.NodeId, editValue.Select(x => x.Key)));
@@ -1226,7 +1242,7 @@ AND umbracoNode.id <> @id",
         }
 
         private class PropertyValueVersionDto
-        {   
+        {
             public int VersionId { get; set; }
             public int PropertyTypeId { get; set; }
             public int? LanguageId { get; set; }
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
index c18921b59e..344557d815 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
@@ -1310,14 +1310,12 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
                     Name = content.GetCultureName(culture) ?? content.GetPublishName(culture),
                     Available = content.IsCultureAvailable(culture),
-                    Published = content.IsCulturePublished(culture)
+                    Published = content.IsCulturePublished(culture),
+                    // note: can't use IsCultureEdited at that point - hasn't been updated yet - see PersistUpdatedItem
+                    Edited = content.IsCultureAvailable(culture) &&
+                             (!content.IsCulturePublished(culture) || (editedCultures != null && editedCultures.Contains(culture)))
                 };
 
-                // note: can't use IsCultureEdited at that point - hasn't been updated yet - see PersistUpdatedItem
-
-                dto.Edited = content.IsCultureAvailable(culture) &&
-                             (!content.IsCulturePublished(culture) || (editedCultures != null && editedCultures.Contains(culture)));
-
                 yield return dto;
             }
                 
diff --git a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
index 0c54cf5975..4b8262d4a5 100644
--- a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
+++ b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
@@ -110,7 +110,6 @@ namespace Umbraco.Tests.Services
         [Test]
         public void Change_Content_Type_Variation_Clears_Redirects()
         {
-            //create content type with a property type that varies by culture
             var contentType = MockedContentTypes.CreateBasicContentType();
             contentType.Variations = ContentVariation.Nothing;
             var contentCollection = new PropertyTypeCollection(true);
@@ -154,8 +153,7 @@ namespace Umbraco.Tests.Services
 
         [Test]
         public void Change_Content_Type_From_Invariant_Variant()
-        {
-            //create content type with a property type that varies by culture
+        {            
             var contentType = MockedContentTypes.CreateBasicContentType();
             contentType.Variations = ContentVariation.Nothing;
             var contentCollection = new PropertyTypeCollection(true);
@@ -205,7 +203,6 @@ namespace Umbraco.Tests.Services
         [Test]
         public void Change_Content_Type_From_Variant_Invariant()
         {
-            //create content type with a property type that varies by culture
             var contentType = MockedContentTypes.CreateBasicContentType();
             contentType.Variations = ContentVariation.Culture;
             var contentCollection = new PropertyTypeCollection(true);
@@ -264,39 +261,49 @@ namespace Umbraco.Tests.Services
         }
 
         [Test]
-        public void Change_Property_Type_From_Invariant_Variant()
+        public void Change_Property_Type_From_To_Variant_On_Invariant_Content_Type()
         {
-            //create content type with a property type that varies by culture
             var contentType = MockedContentTypes.CreateBasicContentType();
             contentType.Variations = ContentVariation.Nothing;
-            var contentCollection = new PropertyTypeCollection(true);
-            contentCollection.Add(new PropertyType("test", ValueStorageType.Ntext)
-            {
-                Alias = "title",
-                Name = "Title",
-                Description = "",
-                Mandatory = false,
-                SortOrder = 1,
-                DataTypeId = -88,
-                Variations = ContentVariation.Nothing
-            });
-            contentType.PropertyGroups.Add(new PropertyGroup(contentCollection) { Name = "Content", SortOrder = 1 });
+            var properties = CreatePropertyCollection(("title", ContentVariation.Nothing));
+            contentType.PropertyGroups.Add(new PropertyGroup(properties) { Name = "Content" });
+            ServiceContext.ContentTypeService.Save(contentType);
+
+            //change the property type to be variant
+            contentType.PropertyTypes.First().Variations = ContentVariation.Culture;
+
+            //Cannot change a property type to be variant if the content type itself is not variant
+            Assert.Throws<InvalidOperationException>(() => ServiceContext.ContentTypeService.Save(contentType));
+        }
+
+        [Test]
+        public void Change_Property_Type_From_Invariant_Variant()
+        {
+            var contentType = MockedContentTypes.CreateBasicContentType();
+            contentType.Variations = ContentVariation.Culture;
+            var properties = CreatePropertyCollection(("title", ContentVariation.Nothing));
+            contentType.PropertyGroups.Add(new PropertyGroup(properties) { Name = "Content" });
             ServiceContext.ContentTypeService.Save(contentType);
 
             //create some content of this content type
             IContent doc = MockedContent.CreateBasicContent(contentType);
-            doc.Name = "Home";
+            doc.SetCultureName("Home", "en-US");
             doc.SetValue("title", "hello world");
             ServiceContext.ContentService.Save(doc);
 
+            doc = ServiceContext.ContentService.GetById(doc.Id); //re-get
             Assert.AreEqual("hello world", doc.GetValue("title"));
-
+            Assert.IsTrue(doc.IsCultureEdited("en-US")); //invariant prop changes show up on default lang
+            Assert.IsTrue(doc.Edited);
+            
             //change the property type to be variant
             contentType.PropertyTypes.First().Variations = ContentVariation.Culture;
             ServiceContext.ContentTypeService.Save(contentType);
             doc = ServiceContext.ContentService.GetById(doc.Id); //re-get
 
             Assert.AreEqual("hello world", doc.GetValue("title", "en-US"));
+            Assert.IsTrue(doc.IsCultureEdited("en-US"));
+            Assert.IsTrue(doc.Edited);
 
             //change back property type to be invariant
             contentType.PropertyTypes.First().Variations = ContentVariation.Nothing;
@@ -304,6 +311,8 @@ namespace Umbraco.Tests.Services
             doc = ServiceContext.ContentService.GetById(doc.Id); //re-get
 
             Assert.AreEqual("hello world", doc.GetValue("title"));
+            Assert.IsTrue(doc.IsCultureEdited("en-US"));  //invariant prop changes show up on default lang
+            Assert.IsTrue(doc.Edited);
         }
 
         [Test]
@@ -470,28 +479,11 @@ namespace Umbraco.Tests.Services
 
             CreateFrenchAndEnglishLangs();
 
-            var contentType = new ContentType(-1)
-            {
-                Alias = "contentType",
-                Name = "contentType",
-                Variations = ContentVariation.Culture
-            };
+            var contentType = CreateContentType(ContentVariation.Culture);
 
-            var properties = new PropertyTypeCollection(true)
-            {
-                new PropertyType("value1", ValueStorageType.Ntext)
-                {
-                    Alias = "value1",
-                    DataTypeId = -88,
-                    Variations = ContentVariation.Culture
-                },
-                new PropertyType("value2", ValueStorageType.Ntext)
-                {
-                    Alias = "value2",
-                    DataTypeId = -88,
-                    Variations = ContentVariation.Nothing
-                }
-            };
+            var properties = CreatePropertyCollection(
+                ("value1", ContentVariation.Culture),
+                ("value2", ContentVariation.Nothing));
 
             contentType.PropertyGroups.Add(new PropertyGroup(properties) { Name = "Content" });
             ServiceContext.ContentTypeService.Save(contentType);
@@ -579,28 +571,11 @@ namespace Umbraco.Tests.Services
             var languageFr = new Language("fr");
             ServiceContext.LocalizationService.Save(languageFr);
 
-            var contentType = new ContentType(-1)
-            {
-                Alias = "contentType",
-                Name = "contentType",
-                Variations = ContentVariation.Nothing
-            };
+            var contentType = CreateContentType(ContentVariation.Nothing);
 
-            var properties = new PropertyTypeCollection(true)
-            {
-                new PropertyType("value1", ValueStorageType.Ntext)
-                {
-                    Alias = "value1",
-                    DataTypeId = -88,
-                    Variations = ContentVariation.Nothing
-                },
-                new PropertyType("value2", ValueStorageType.Ntext)
-                {
-                    Alias = "value2",
-                    DataTypeId = -88,
-                    Variations = ContentVariation.Nothing
-                }
-            };
+            var properties = CreatePropertyCollection(
+                ("value1", ContentVariation.Nothing),
+                ("value2", ContentVariation.Nothing));
 
             contentType.PropertyGroups.Add(new PropertyGroup(properties) { Name = "Content" });
             ServiceContext.ContentTypeService.Save(contentType);
@@ -681,28 +656,11 @@ namespace Umbraco.Tests.Services
 
             CreateFrenchAndEnglishLangs();
 
-            var contentType = new ContentType(-1)
-            {
-                Alias = "contentType",
-                Name = "contentType",
-                Variations = ContentVariation.Culture
-            };
+            var contentType = CreateContentType(ContentVariation.Culture);
 
-            var properties = new PropertyTypeCollection(true)
-            {
-                new PropertyType("value1", ValueStorageType.Ntext)
-                {
-                    Alias = "value1",
-                    DataTypeId = -88,
-                    Variations = ContentVariation.Culture
-                },
-                new PropertyType("value2", ValueStorageType.Ntext)
-                {
-                    Alias = "value2",
-                    DataTypeId = -88,
-                    Variations = ContentVariation.Nothing
-                }
-            };
+            var properties = CreatePropertyCollection(
+                ("value1", ContentVariation.Culture),
+                ("value2", ContentVariation.Nothing));
 
             contentType.PropertyGroups.Add(new PropertyGroup(properties) { Name = "Content" });
             ServiceContext.ContentTypeService.Save(contentType);
@@ -780,29 +738,16 @@ namespace Umbraco.Tests.Services
         }
 
         [Test]
-        public void Change_Variations_SimpleContentType_VariantPropertyToInvariantAndBack_While_Publishing()
+        public void Change_Property_Variations_From_Variant_To_Invariant_And_Ensure_Edited_Values_Are_Renormalized()
         {
             // one simple content type, variant, with both variant and invariant properties
             // can change an invariant property to variant and back
 
             CreateFrenchAndEnglishLangs();
 
-            var contentType = new ContentType(-1)
-            {
-                Alias = "contentType",
-                Name = "contentType",
-                Variations = ContentVariation.Culture
-            };
+            var contentType = CreateContentType(ContentVariation.Culture);
 
-            var properties = new PropertyTypeCollection(true)
-            {
-                new PropertyType("value1", ValueStorageType.Ntext)
-                {
-                    Alias = "value1",
-                    DataTypeId = -88,
-                    Variations = ContentVariation.Culture
-                }
-            };
+            var properties = CreatePropertyCollection(("value1", ContentVariation.Culture));
 
             contentType.PropertyGroups.Add(new PropertyGroup(properties) { Name = "Content" });
             ServiceContext.ContentTypeService.Save(contentType);
@@ -902,54 +847,20 @@ namespace Umbraco.Tests.Services
 
             CreateFrenchAndEnglishLangs();
 
-            var composing = new ContentType(-1)
-            {
-                Alias = "composing",
-                Name = "composing",
-                Variations = ContentVariation.Culture
-            };
+            var composing = CreateContentType(ContentVariation.Culture, "composing");
 
-            var properties1 = new PropertyTypeCollection(true)
-            {
-                new PropertyType("value11", ValueStorageType.Ntext)
-                {
-                    Alias = "value11",
-                    DataTypeId = -88,
-                    Variations = ContentVariation.Culture
-                },
-                new PropertyType("value12", ValueStorageType.Ntext)
-                {
-                    Alias = "value12",
-                    DataTypeId = -88,
-                    Variations = ContentVariation.Nothing
-                }
-            };
+            var properties1 = CreatePropertyCollection(
+                ("value11", ContentVariation.Culture),
+                ("value12", ContentVariation.Nothing));
 
             composing.PropertyGroups.Add(new PropertyGroup(properties1) { Name = "Content" });
             ServiceContext.ContentTypeService.Save(composing);
 
-            var composed = new ContentType(-1)
-            {
-                Alias = "composed",
-                Name = "composed",
-                Variations = ContentVariation.Culture
-            };
+            var composed = CreateContentType(ContentVariation.Culture, "composed");
 
-            var properties2 = new PropertyTypeCollection(true)
-            {
-                new PropertyType("value21", ValueStorageType.Ntext)
-                {
-                    Alias = "value21",
-                    DataTypeId = -88,
-                    Variations = ContentVariation.Culture
-                },
-                new PropertyType("value22", ValueStorageType.Ntext)
-                {
-                    Alias = "value22",
-                    DataTypeId = -88,
-                    Variations = ContentVariation.Nothing
-                }
-            };
+            var properties2 = CreatePropertyCollection(
+                ("value21", ContentVariation.Culture),
+                ("value22", ContentVariation.Nothing));
 
             composed.PropertyGroups.Add(new PropertyGroup(properties2) { Name = "Content" });
             composed.AddContentType(composing);
@@ -1031,81 +942,30 @@ namespace Umbraco.Tests.Services
 
             CreateFrenchAndEnglishLangs();
 
-            var composing = new ContentType(-1)
-            {
-                Alias = "composing",
-                Name = "composing",
-                Variations = ContentVariation.Culture
-            };
+            var composing = CreateContentType(ContentVariation.Culture, "composing");
 
-            var properties1 = new PropertyTypeCollection(true)
-            {
-                new PropertyType("value11", ValueStorageType.Ntext)
-                {
-                    Alias = "value11",
-                    DataTypeId = -88,
-                    Variations = ContentVariation.Culture
-                },
-                new PropertyType("value12", ValueStorageType.Ntext)
-                {
-                    Alias = "value12",
-                    DataTypeId = -88,
-                    Variations = ContentVariation.Nothing
-                }
-            };
+            var properties1 = CreatePropertyCollection(
+                ("value11", ContentVariation.Culture),
+                ("value12", ContentVariation.Nothing));
 
             composing.PropertyGroups.Add(new PropertyGroup(properties1) { Name = "Content" });
             ServiceContext.ContentTypeService.Save(composing);
 
-            var composed1 = new ContentType(-1)
-            {
-                Alias = "composed1",
-                Name = "composed1",
-                Variations = ContentVariation.Culture
-            };
+            var composed1 = CreateContentType(ContentVariation.Culture, "composed1");
 
-            var properties2 = new PropertyTypeCollection(true)
-            {
-                new PropertyType("value21", ValueStorageType.Ntext)
-                {
-                    Alias = "value21",
-                    DataTypeId = -88,
-                    Variations = ContentVariation.Culture
-                },
-                new PropertyType("value22", ValueStorageType.Ntext)
-                {
-                    Alias = "value22",
-                    DataTypeId = -88,
-                    Variations = ContentVariation.Nothing
-                }
-            };
+            var properties2 = CreatePropertyCollection(
+                ("value21", ContentVariation.Culture),
+                ("value22", ContentVariation.Nothing));
 
             composed1.PropertyGroups.Add(new PropertyGroup(properties2) { Name = "Content" });
             composed1.AddContentType(composing);
             ServiceContext.ContentTypeService.Save(composed1);
 
-            var composed2 = new ContentType(-1)
-            {
-                Alias = "composed2",
-                Name = "composed2",
-                Variations = ContentVariation.Nothing
-            };
+            var composed2 = CreateContentType(ContentVariation.Nothing, "composed2");
 
-            var properties3 = new PropertyTypeCollection(true)
-            {
-                new PropertyType("value31", ValueStorageType.Ntext)
-                {
-                    Alias = "value31",
-                    DataTypeId = -88,
-                    Variations = ContentVariation.Nothing
-                },
-                new PropertyType("value32", ValueStorageType.Ntext)
-                {
-                    Alias = "value32",
-                    DataTypeId = -88,
-                    Variations = ContentVariation.Nothing
-                }
-            };
+            var properties3 = CreatePropertyCollection(
+                ("value31", ContentVariation.Nothing),
+                ("value32", ContentVariation.Nothing));
 
             composed2.PropertyGroups.Add(new PropertyGroup(properties3) { Name = "Content" });
             composed2.AddContentType(composing);
@@ -1219,5 +1079,27 @@ namespace Umbraco.Tests.Services
             var languageFr = new Language("fr");
             ServiceContext.LocalizationService.Save(languageFr);
         }
+
+        private IContentType CreateContentType(ContentVariation variance, string alias = "contentType") => new ContentType(-1)
+        {
+            Alias = alias,
+            Name = alias,
+            Variations = variance
+        };
+
+        private PropertyTypeCollection CreatePropertyCollection(params (string alias, ContentVariation variance)[] props)
+        {
+            var propertyCollection = new PropertyTypeCollection(true);
+
+            foreach (var (alias, variance) in props)
+                propertyCollection.Add(new PropertyType(alias, ValueStorageType.Ntext)
+                {
+                    Alias = alias,
+                    DataTypeId = -88,
+                    Variations = variance
+                });
+
+            return propertyCollection;
+        }
     }
 }

From 2e83ac9282384dbcd621582d8316b61a2af19880 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 1 Aug 2019 18:54:19 +1000
Subject: [PATCH 221/776] Cleans up some tests

---
 .../ContentTypeServiceVariantsTests.cs        | 84 +++----------------
 1 file changed, 12 insertions(+), 72 deletions(-)

diff --git a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
index 4b8262d4a5..39d71feee9 100644
--- a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
+++ b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
@@ -112,18 +112,8 @@ namespace Umbraco.Tests.Services
         {
             var contentType = MockedContentTypes.CreateBasicContentType();
             contentType.Variations = ContentVariation.Nothing;
-            var contentCollection = new PropertyTypeCollection(true);
-            contentCollection.Add(new PropertyType("test", ValueStorageType.Ntext)
-            {
-                Alias = "title",
-                Name = "Title",
-                Description = "",
-                Mandatory = false,
-                SortOrder = 1,
-                DataTypeId = -88,
-                Variations = ContentVariation.Nothing
-            });
-            contentType.PropertyGroups.Add(new PropertyGroup(contentCollection) { Name = "Content", SortOrder = 1 });
+            var properties = CreatePropertyCollection(("title", ContentVariation.Nothing));
+            contentType.PropertyGroups.Add(new PropertyGroup(properties) { Name = "Content" });
             ServiceContext.ContentTypeService.Save(contentType);
             var contentType2 = MockedContentTypes.CreateBasicContentType("test");
             ServiceContext.ContentTypeService.Save(contentType2);
@@ -156,18 +146,8 @@ namespace Umbraco.Tests.Services
         {            
             var contentType = MockedContentTypes.CreateBasicContentType();
             contentType.Variations = ContentVariation.Nothing;
-            var contentCollection = new PropertyTypeCollection(true);
-            contentCollection.Add(new PropertyType("test", ValueStorageType.Ntext)
-            {
-                Alias = "title",
-                Name = "Title",
-                Description = "",
-                Mandatory = false,
-                SortOrder = 1,
-                DataTypeId = -88,
-                Variations = ContentVariation.Nothing
-            });
-            contentType.PropertyGroups.Add(new PropertyGroup(contentCollection) { Name = "Content", SortOrder = 1 });
+            var properties = CreatePropertyCollection(("title", ContentVariation.Nothing));
+            contentType.PropertyGroups.Add(new PropertyGroup(properties) { Name = "Content" });
             ServiceContext.ContentTypeService.Save(contentType);
 
             //create some content of this content type
@@ -205,18 +185,8 @@ namespace Umbraco.Tests.Services
         {
             var contentType = MockedContentTypes.CreateBasicContentType();
             contentType.Variations = ContentVariation.Culture;
-            var contentCollection = new PropertyTypeCollection(true);
-            contentCollection.Add(new PropertyType("test", ValueStorageType.Ntext)
-            {
-                Alias = "title",
-                Name = "Title",
-                Description = "",
-                Mandatory = false,
-                SortOrder = 1,
-                DataTypeId = -88,
-                Variations = ContentVariation.Culture
-            });
-            contentType.PropertyGroups.Add(new PropertyGroup(contentCollection) { Name = "Content", SortOrder = 1 });
+            var properties = CreatePropertyCollection(("title", ContentVariation.Culture));
+            contentType.PropertyGroups.Add(new PropertyGroup(properties) { Name = "Content" });
             ServiceContext.ContentTypeService.Save(contentType);
 
             //create some content of this content type
@@ -321,18 +291,8 @@ namespace Umbraco.Tests.Services
             //create content type with a property type that varies by culture
             var contentType = MockedContentTypes.CreateBasicContentType();
             contentType.Variations = ContentVariation.Culture;
-            var contentCollection = new PropertyTypeCollection(true);
-            contentCollection.Add(new PropertyType("test", ValueStorageType.Ntext)
-            {
-                Alias = "title",
-                Name = "Title",
-                Description = "",
-                Mandatory = false,
-                SortOrder = 1,
-                DataTypeId = -88,
-                Variations = ContentVariation.Culture
-            });
-            contentType.PropertyGroups.Add(new PropertyGroup(contentCollection) { Name = "Content", SortOrder = 1 });
+            var properties = CreatePropertyCollection(("title", ContentVariation.Culture));
+            contentType.PropertyGroups.Add(new PropertyGroup(properties) { Name = "Content" });
             ServiceContext.ContentTypeService.Save(contentType);
 
             //create some content of this content type
@@ -364,18 +324,8 @@ namespace Umbraco.Tests.Services
             //create content type with a property type that varies by culture
             var contentType = MockedContentTypes.CreateBasicContentType();
             contentType.Variations = ContentVariation.Culture;
-            var contentCollection = new PropertyTypeCollection(true);
-            contentCollection.Add(new PropertyType("test", ValueStorageType.Ntext)
-            {
-                Alias = "title",
-                Name = "Title",
-                Description = "",
-                Mandatory = false,
-                SortOrder = 1,
-                DataTypeId = -88,
-                Variations = ContentVariation.Culture
-            });
-            contentType.PropertyGroups.Add(new PropertyGroup(contentCollection) { Name = "Content", SortOrder = 1 });
+            var properties = CreatePropertyCollection(("title", ContentVariation.Culture));
+            contentType.PropertyGroups.Add(new PropertyGroup(properties) { Name = "Content" });
             ServiceContext.ContentTypeService.Save(contentType);
 
             //compose this from the other one
@@ -420,18 +370,8 @@ namespace Umbraco.Tests.Services
             //create content type with a property type that varies by culture
             var contentType = MockedContentTypes.CreateBasicContentType();
             contentType.Variations = ContentVariation.Culture;
-            var contentCollection = new PropertyTypeCollection(true);
-            contentCollection.Add(new PropertyType("test", ValueStorageType.Ntext)
-            {
-                Alias = "title",
-                Name = "Title",
-                Description = "",
-                Mandatory = false,
-                SortOrder = 1,
-                DataTypeId = -88,
-                Variations = ContentVariation.Culture
-            });
-            contentType.PropertyGroups.Add(new PropertyGroup(contentCollection) { Name = "Content", SortOrder = 1 });
+            var properties = CreatePropertyCollection(("title", ContentVariation.Culture));
+            contentType.PropertyGroups.Add(new PropertyGroup(properties) { Name = "Content" });
             ServiceContext.ContentTypeService.Save(contentType);
 
             //compose this from the other one

From ded1a22e45e2d2e168f76f388358382d032bc3a6 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 1 Aug 2019 19:01:41 +1000
Subject: [PATCH 222/776] fixes validation check

---
 .../Repositories/Implement/ContentTypeRepositoryBase.cs   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
index 8f88c71bf0..2705bab39b 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
@@ -532,9 +532,15 @@ AND umbracoNode.id <> @id",
         {
             //if the entity does not vary at all, then the property cannot have a variance value greater than it
             if (entity.Variations == ContentVariation.Nothing)
+            {
                 foreach (var prop in entity.PropertyTypes)
-                    if (prop.Variations > entity.Variations)
+                {
+                    if (prop.IsPropertyDirty(nameof(prop.Variations)) && prop.Variations > entity.Variations)
                         throw new InvalidOperationException($"The property {prop.Alias} cannot have variations of {prop.Variations} with the content type variations of {entity.Variations}");
+                }
+                    
+            }
+                
         }
 
         private IEnumerable<IContentTypeComposition> GetImpactedContentTypes(IContentTypeComposition contentType, IEnumerable<IContentTypeComposition> all)

From 9efec9244b51250f85a9ae3eaeb7192356ea5707 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 1 Aug 2019 19:09:19 +1000
Subject: [PATCH 223/776] removes commented out code

---
 .../Implement/ContentTypeRepositoryBase.cs    | 87 +------------------
 1 file changed, 2 insertions(+), 85 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
index 2705bab39b..f2efb03ba4 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
@@ -671,16 +671,12 @@ AND umbracoNode.id <> @id",
                     case ContentVariation.Culture:
                         CopyPropertyData(null, defaultLanguageId, propertyTypeIds, impactedL);
                         CopyTagData(null, defaultLanguageId, propertyTypeIds, impactedL);
-                        RenormalizeDocumentEditedFlags(propertyTypeIds, impactedL);
-                        //TODO: Here we need to normalize the umbracoDocumentCultureVariation table for it's edited flags which are calculated based
-                        //on changed property or name values
+                        RenormalizeDocumentEditedFlags(propertyTypeIds, impactedL);                        
                         break;
                     case ContentVariation.Nothing:
                         CopyPropertyData(defaultLanguageId, null, propertyTypeIds, impactedL);
                         CopyTagData(defaultLanguageId, null, propertyTypeIds, impactedL);
-                        RenormalizeDocumentEditedFlags(propertyTypeIds, impactedL);
-                        //TODO: Here we need to normalize the umbracoDocumentCultureVariation table for it's edited flags which are calculated based
-                        //on changed property or name values
+                        RenormalizeDocumentEditedFlags(propertyTypeIds, impactedL);                        
                         break;
                     case ContentVariation.CultureAndSegment:
                     case ContentVariation.Segment:
@@ -690,55 +686,6 @@ AND umbracoNode.id <> @id",
             }
         }
 
-        //private HashSet<string> GetEditedCultures(ContentVariation contentVariation, int currentVersionId, int publishedVersionId, IEnumerable<PropertyDataDto> properties)
-        //{
-        //    HashSet<string> editedCultures = null; // don't allocate unless necessary
-        //    string defaultCulture = null; //don't allocate unless necessary
-
-        //    var entityVariesByCulture = contentVariation.VariesByCulture();
-
-        //    // create dtos for each property values, but only for values that do actually exist
-        //    // ie have a non-null value, everything else is just ignored and won't have a db row
-
-        //    foreach (var property in properties)
-        //    {
-        //        if (property.PropertyType.SupportsPublishing)
-        //        {
-        //            //create the resulting hashset if it's not created and the entity varies by culture
-        //            if (entityVariesByCulture && editedCultures == null)
-        //                editedCultures = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
-
-        //            // publishing = deal with edit and published values
-        //            foreach (var propertyValue in property.Values)
-        //            {
-        //                var isInvariantValue = propertyValue.Culture == null;
-        //                var isCultureValue = propertyValue.Culture != null && propertyValue.Segment == null;
-
-        //                // use explicit equals here, else object comparison fails at comparing eg strings
-        //                var sameValues = propertyValue.PublishedValue == null ? propertyValue.EditedValue == null : propertyValue.PublishedValue.Equals(propertyValue.EditedValue);
-
-        //                if (entityVariesByCulture && !sameValues)
-        //                {
-        //                    if (isCultureValue)
-        //                    {
-        //                        editedCultures.Add(propertyValue.Culture); // report culture as edited
-        //                    }
-        //                    else if (isInvariantValue)
-        //                    {
-        //                        // flag culture as edited if it contains an edited invariant property
-        //                        if (defaultCulture == null)
-        //                            defaultCulture = languageRepository.GetDefaultIsoCode();
-
-        //                        editedCultures.Add(defaultCulture);
-        //                    }
-        //                }
-        //            }
-        //        }
-        //    }
-
-        //    return editedCultures;
-        //}
-
         /// <summary>
         /// Moves variant data for a content type variation change.
         /// </summary>
@@ -1153,36 +1100,6 @@ AND umbracoNode.id <> @id",
                 }
             }
 
-            ////Generate SQL to lookup the current name vs the publish name for each language
-            //var nameSql = Sql()
-            //    .Select<ContentVersionDto>("cv1", x => x.NodeId, x => Alias(x.Id, "currentVersion"))
-            //    .AndSelect<ContentVersionCultureVariationDto>("cvcv1", x => x.LanguageId, x => Alias(x.Name, "currentName"))
-            //    .AndSelect<ContentVersionCultureVariationDto>("cvcv2", x => Alias(x.Name, "publishedName"))
-            //    .AndSelect<DocumentVersionDto>("dv", x => Alias(x.Id, "publishedVersion"))
-            //    .AndSelect<DocumentCultureVariationDto>("dcv", x => x.Id, x => x.Edited)
-            //    .From<ContentVersionCultureVariationDto>("cvcv1")
-            //    .InnerJoin<ContentVersionDto>("cv1")
-            //        .On<ContentVersionDto, ContentVersionCultureVariationDto>((left, right) => left.Id == right.VersionId, "cv1", "cvcv1")
-            //    .InnerJoin<DocumentCultureVariationDto>("dcv")
-            //        .On<DocumentCultureVariationDto, ContentVersionDto, ContentVersionCultureVariationDto>((left, right, other) => left.NodeId == right.NodeId && left.LanguageId == other.LanguageId, "dcv", "cv1", "cvcv1")
-            //    .LeftJoin<ContentVersionDto>(nested =>
-            //        nested.InnerJoin<DocumentVersionDto>("dv")
-            //                .On<ContentVersionDto, DocumentVersionDto>((left, right) => left.Id == right.Id && right.Published, "cv2", "dv"), "cv2")
-            //        .On<ContentVersionDto, ContentVersionDto>((left, right) => left.NodeId == right.NodeId, "cv1", "cv2")
-            //    .LeftJoin<ContentVersionCultureVariationDto>("cvcv2")
-            //        .On<ContentVersionCultureVariationDto, ContentVersionDto, ContentVersionCultureVariationDto>((left, right, other) => left.VersionId == right.Id && left.LanguageId == other.LanguageId, "cvcv2", "cv2", "cvcv1")
-            //    .Where<ContentVersionDto>(x => x.Current, "cv1")
-            //    .OrderBy("cv1.nodeId, cvcv1.versionId, cvcv1.languageId");
-
-            ////This is a reader (Query), we are not fetching this all into memory so we cannot make any changes during this iteration, we are just collecting data.
-            //foreach (var name in Database.Query<NameCompareDto>(nameSql))
-            //{
-            //    if (name.CurrentName != name.PublishedName)
-            //    {
-
-            //    }
-            //}
-
             //lookup all matching rows in umbracoDocumentCultureVariation
             var docCultureVariationsToUpdate = editedLanguageVersions.InGroupsOf(2000)
                 .SelectMany(_ => Database.Fetch<DocumentCultureVariationDto>(

From 600a29514f17d8917e751ec87f8540da1803d89a Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 1 Aug 2019 21:27:31 +1000
Subject: [PATCH 224/776] more asserts

---
 .../ContentTypeServiceVariantsTests.cs         | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
index 39d71feee9..381261173b 100644
--- a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
+++ b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
@@ -156,8 +156,12 @@ namespace Umbraco.Tests.Services
             doc.SetValue("title", "hello world");
             ServiceContext.ContentService.Save(doc);
 
+            doc = ServiceContext.ContentService.GetById(doc.Id); //re-get
+
             Assert.AreEqual("Hello1", doc.Name);
             Assert.AreEqual("hello world", doc.GetValue("title"));
+            Assert.IsTrue(doc.Edited);
+            Assert.IsFalse (doc.IsCultureEdited("en-US"));
 
             //change the content type to be variant, we will also update the name here to detect the copy changes
             doc.Name = "Hello2";
@@ -168,6 +172,8 @@ namespace Umbraco.Tests.Services
 
             Assert.AreEqual("Hello2", doc.GetCultureName("en-US"));
             Assert.AreEqual("hello world", doc.GetValue("title")); //We are not checking against en-US here because properties will remain invariant
+            Assert.IsTrue(doc.Edited);
+            Assert.IsTrue(doc.IsCultureEdited("en-US"));
 
             //change back property type to be invariant, we will also update the name here to detect the copy changes
             doc.SetCultureName("Hello3", "en-US");
@@ -178,6 +184,8 @@ namespace Umbraco.Tests.Services
 
             Assert.AreEqual("Hello3", doc.Name);
             Assert.AreEqual("hello world", doc.GetValue("title"));
+            Assert.IsTrue(doc.Edited);
+            Assert.IsFalse(doc.IsCultureEdited("en-US"));
         }
 
         [Test]
@@ -195,8 +203,11 @@ namespace Umbraco.Tests.Services
             doc.SetValue("title", "hello world", "en-US");
             ServiceContext.ContentService.Save(doc);
 
+            doc = ServiceContext.ContentService.GetById(doc.Id); //re-get
             Assert.AreEqual("Hello1", doc.GetCultureName("en-US"));
             Assert.AreEqual("hello world", doc.GetValue("title", "en-US"));
+            Assert.IsTrue(doc.Edited);
+            Assert.IsTrue(doc.IsCultureEdited("en-US"));
 
             //change the content type to be invariant, we will also update the name here to detect the copy changes
             doc.SetCultureName("Hello2", "en-US");
@@ -207,6 +218,8 @@ namespace Umbraco.Tests.Services
 
             Assert.AreEqual("Hello2", doc.Name);
             Assert.AreEqual("hello world", doc.GetValue("title"));
+            Assert.IsTrue(doc.Edited);
+            Assert.IsFalse(doc.IsCultureEdited("en-US"));
 
             //change back property type to be variant, we will also update the name here to detect the copy changes
             doc.Name = "Hello3";
@@ -219,6 +232,8 @@ namespace Umbraco.Tests.Services
             //exists it will not be returned because the property type is invariant,
             //so this check proves that null will be returned
             Assert.IsNull(doc.GetValue("title", "en-US"));
+            Assert.IsTrue(doc.Edited);
+            Assert.IsTrue(doc.IsCultureEdited("en-US")); // this is true because the name change is copied to the default language
 
             //we can now switch the property type to be variant and the value can be returned again
             contentType.PropertyTypes.First().Variations = ContentVariation.Culture;
@@ -227,9 +242,12 @@ namespace Umbraco.Tests.Services
 
             Assert.AreEqual("Hello3", doc.GetCultureName("en-US"));
             Assert.AreEqual("hello world", doc.GetValue("title", "en-US"));
+            Assert.IsTrue(doc.Edited);
+            Assert.IsTrue(doc.IsCultureEdited("en-US"));
 
         }
 
+
         [Test]
         public void Change_Property_Type_From_To_Variant_On_Invariant_Content_Type()
         {

From be30bb0ad0706d9a146afd85498d22aa01b055a0 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 1 Aug 2019 21:41:43 +1000
Subject: [PATCH 225/776] adds test

---
 .../ContentTypeServiceVariantsTests.cs        | 79 +++++++++++++++++++
 1 file changed, 79 insertions(+)

diff --git a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
index 381261173b..956de186be 100644
--- a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
+++ b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
@@ -795,6 +795,85 @@ namespace Umbraco.Tests.Services
             Assert.IsFalse(document.Edited);
         }
 
+        [Test]
+        public void Change_Property_Variations_From_Invariant_To_Variant_And_Ensure_Edited_Values_Are_Renormalized()
+        {
+            // one simple content type, variant, with both variant and invariant properties
+            // can change an invariant property to variant and back
+
+            CreateFrenchAndEnglishLangs();
+
+            var contentType = CreateContentType(ContentVariation.Culture);
+
+            var properties = CreatePropertyCollection(("value1", ContentVariation.Nothing));
+
+            contentType.PropertyGroups.Add(new PropertyGroup(properties) { Name = "Content" });
+            ServiceContext.ContentTypeService.Save(contentType);
+
+            var document = (IContent)new Content("document", -1, contentType);
+            document.SetCultureName("doc1en", "en");
+            document.SetCultureName("doc1fr", "fr");
+            document.SetValue("value1", "v1en-init");
+            ServiceContext.ContentService.SaveAndPublish(document); //all values are published which means the document is not 'edited'
+
+            document = ServiceContext.ContentService.GetById(document.Id);
+            Assert.IsFalse(document.IsCultureEdited("en"));
+            Assert.IsFalse(document.IsCultureEdited("fr"));
+            Assert.IsFalse(document.Edited);
+
+            document.SetValue("value1", "v1en"); //change the property value, so now the invariant (default) culture will be edited
+            ServiceContext.ContentService.Save(document);
+
+            document = ServiceContext.ContentService.GetById(document.Id);
+            Assert.AreEqual("doc1en", document.Name);
+            Assert.AreEqual("doc1en", document.GetCultureName("en"));
+            Assert.AreEqual("doc1fr", document.GetCultureName("fr"));
+            Assert.AreEqual("v1en", document.GetValue("value1"));
+            Assert.AreEqual("v1en-init", document.GetValue("value1", published: true));            
+            Assert.IsTrue(document.IsCultureEdited("en")); //This is true because the invariant property reflects changes on the default lang
+            Assert.IsFalse(document.IsCultureEdited("fr")); 
+            Assert.IsTrue(document.Edited);
+
+            // switch property type to Culture
+            contentType.PropertyTypes.First(x => x.Alias == "value1").Variations = ContentVariation.Culture;
+            ServiceContext.ContentTypeService.Save(contentType); //This is going to have to re-normalize the "Edited" flag
+
+            document = ServiceContext.ContentService.GetById(document.Id);
+            Assert.IsTrue(document.IsCultureEdited("en")); //Remains true 
+            Assert.IsFalse(document.IsCultureEdited("fr")); //False because no french property has ever been edited
+            Assert.IsTrue(document.Edited);
+
+            //update the culture value and publish
+            document.SetValue("value1", "v1en2", "en");
+            ServiceContext.ContentService.SaveAndPublish(document);
+
+            document = ServiceContext.ContentService.GetById(document.Id);
+            Assert.AreEqual("doc1en", document.Name);
+            Assert.AreEqual("doc1en", document.GetCultureName("en"));
+            Assert.AreEqual("doc1fr", document.GetCultureName("fr"));
+            Assert.IsNull(document.GetValue("value1")); //The values are there but the business logic returns null
+            Assert.IsNull(document.GetValue("value1", published: true)); //The values are there but the business logic returns null
+            Assert.AreEqual("v1en2", document.GetValue("value1", "en"));
+            Assert.AreEqual("v1en2", document.GetValue("value1", "en", published: true));
+            Assert.IsFalse(document.IsCultureEdited("en")); //This returns false, everything is published
+            Assert.IsFalse(document.IsCultureEdited("fr")); //False because no french property has ever been edited
+            Assert.IsFalse(document.Edited);
+
+            // switch property back to Invariant
+            contentType.PropertyTypes.First(x => x.Alias == "value1").Variations = ContentVariation.Nothing;
+            ServiceContext.ContentTypeService.Save(contentType);
+
+            document = ServiceContext.ContentService.GetById(document.Id);
+            Assert.AreEqual("v1en2", document.GetValue("value1")); //The variant property value gets copied over to the invariant
+            Assert.AreEqual("v1en2", document.GetValue("value1", published: true));
+            Assert.IsNull(document.GetValue("value1", "fr"));  //The values are there but the business logic returns null
+            Assert.IsNull(document.GetValue("value1", "fr", published: true));  //The values are there but the business logic returns null
+            Assert.IsFalse(document.IsCultureEdited("en")); //The variant published AND edited values are copied over to the invariant
+            Assert.IsFalse(document.IsCultureEdited("fr"));  
+            Assert.IsFalse(document.Edited);
+
+        }
+
         [Test]
         public void Change_Variations_ComposedContentType_1()
         {

From 9f6a7dec2e474854adc52151078ac4f8de770835 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 2 Aug 2019 00:28:48 +1000
Subject: [PATCH 226/776] Fixes how examine starts up to make it easier for
 custom index developers

---
 src/Umbraco.Web/Search/ExamineComponent.cs    | 134 ++--------------
 src/Umbraco.Web/Search/ExamineComposer.cs     |   1 +
 .../Search/ExamineFinalComponent.cs           | 151 ++++++++++++++++++
 .../Search/ExamineFinalComposer.cs            |  11 ++
 .../Search/ExamineUserComponent.cs            |  29 ++++
 src/Umbraco.Web/Umbraco.Web.csproj            |   3 +
 6 files changed, 210 insertions(+), 119 deletions(-)
 create mode 100644 src/Umbraco.Web/Search/ExamineFinalComponent.cs
 create mode 100644 src/Umbraco.Web/Search/ExamineFinalComposer.cs
 create mode 100644 src/Umbraco.Web/Search/ExamineUserComponent.cs

diff --git a/src/Umbraco.Web/Search/ExamineComponent.cs b/src/Umbraco.Web/Search/ExamineComponent.cs
index 3583e5b7f9..b468963380 100644
--- a/src/Umbraco.Web/Search/ExamineComponent.cs
+++ b/src/Umbraco.Web/Search/ExamineComponent.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Threading;
 using Examine;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
@@ -15,13 +14,12 @@ using Umbraco.Core.Sync;
 using Umbraco.Web.Cache;
 using Umbraco.Examine;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
-using Umbraco.Web.Scheduling;
-using System.Threading.Tasks;
 using Examine.LuceneEngine.Directories;
 using Umbraco.Core.Composing;
 
 namespace Umbraco.Web.Search
 {
+
     public sealed class ExamineComponent : IComponent
     {
         private readonly IExamineManager _examineManager;
@@ -30,26 +28,31 @@ namespace Umbraco.Web.Search
         private readonly IValueSetBuilder<IMedia> _mediaValueSetBuilder;
         private readonly IValueSetBuilder<IMember> _memberValueSetBuilder;
         private static bool _disableExamineIndexing = false;
-        private static volatile bool _isConfigured = false;
-        private static readonly object IsConfiguredLocker = new object();
         private readonly IScopeProvider _scopeProvider;
-        private readonly ServiceContext _services;
-        private static BackgroundTaskRunner<IBackgroundTask> _rebuildOnStartupRunner;
-        private static readonly object RebuildLocker = new object();
+        private readonly ServiceContext _services;        
         private readonly IMainDom _mainDom;
         private readonly IProfilingLogger _logger;
         private readonly IUmbracoIndexesCreator _indexCreator;
-        private readonly IndexRebuilder _indexRebuilder;
+        
 
         // the default enlist priority is 100
         // enlist with a lower priority to ensure that anything "default" runs after us
         // but greater that SafeXmlReaderWriter priority which is 60
         private const int EnlistPriority = 80;
 
+        /// <summary>
+        /// Returns true if Examine is enabled for this AppDomain
+        /// </summary>
+        /// <remarks>
+        /// This flag should be used by custom Examine index implementors to determine if they should
+        /// execute. This value is true if this component successfully registered with <see cref="IMainDom"/>
+        /// </remarks>
+        public static bool ExamineEnabled => !_disableExamineIndexing;
+
         public ExamineComponent(IMainDom mainDom,
             IExamineManager examineManager, IProfilingLogger profilingLogger,
             IScopeProvider scopeProvider, IUmbracoIndexesCreator indexCreator,
-            IndexRebuilder indexRebuilder, ServiceContext services,
+            ServiceContext services,
             IContentValueSetBuilder contentValueSetBuilder,
             IPublishedContentValueSetBuilder publishedContentValueSetBuilder,
             IValueSetBuilder<IMedia> mediaValueSetBuilder,
@@ -66,7 +69,6 @@ namespace Umbraco.Web.Search
             _mainDom = mainDom;
             _logger = profilingLogger;
             _indexCreator = indexCreator;
-            _indexRebuilder = indexRebuilder;
         }
 
         public void Initialize()
@@ -119,11 +121,6 @@ namespace Umbraco.Web.Search
             ContentTypeCacheRefresher.CacheUpdated += ContentTypeCacheRefresherUpdated; ;
             MediaCacheRefresher.CacheUpdated += MediaCacheRefresherUpdated;
             MemberCacheRefresher.CacheUpdated += MemberCacheRefresherUpdated;
-
-            EnsureUnlocked(_logger, _examineManager);
-
-            // TODO: Instead of waiting 5000 ms, we could add an event handler on to fulfilling the first request, then start?
-            RebuildIndexes(_indexRebuilder, _logger, true, 5000);
         }
 
         public void Terminate()
@@ -136,51 +133,7 @@ namespace Umbraco.Web.Search
         /// <param name="logger"></param>
         /// <param name="onlyEmptyIndexes"></param>
         /// <param name="waitMilliseconds"></param>
-        public static void RebuildIndexes(IndexRebuilder indexRebuilder, ILogger logger, bool onlyEmptyIndexes, int waitMilliseconds = 0)
-        {
-            // TODO: need a way to disable rebuilding on startup
-
-            lock(RebuildLocker)
-            {
-                if (_rebuildOnStartupRunner != null && _rebuildOnStartupRunner.IsRunning)
-                {
-                    logger.Warn<ExamineComponent>("Call was made to RebuildIndexes but the task runner for rebuilding is already running");
-                    return;
-                }
-
-                logger.Info<ExamineComponent>("Starting initialize async background thread.");
-                //do the rebuild on a managed background thread
-                var task = new RebuildOnStartupTask(indexRebuilder, logger, onlyEmptyIndexes, waitMilliseconds);
-
-                _rebuildOnStartupRunner = new BackgroundTaskRunner<IBackgroundTask>(
-                    "RebuildIndexesOnStartup",
-                    logger);
-
-                _rebuildOnStartupRunner.TryAdd(task);
-            }
-        }
-
-        /// <summary>
-        /// Must be called to each index is unlocked before any indexing occurs
-        /// </summary>
-        /// <remarks>
-        /// Indexing rebuilding can occur on a normal boot if the indexes are empty or on a cold boot by the database server messenger. Before
-        /// either of these happens, we need to configure the indexes.
-        /// </remarks>
-        private static void EnsureUnlocked(ILogger logger, IExamineManager examineManager)
-        {
-            if (_disableExamineIndexing) return;
-            if (_isConfigured) return;
-
-            lock (IsConfiguredLocker)
-            {
-                //double check
-                if (_isConfigured) return;
-
-                _isConfigured = true;
-                examineManager.UnlockLuceneIndexes(logger);
-            }
-        }
+        public static void RebuildIndexes(IndexRebuilder indexRebuilder, ILogger logger, bool onlyEmptyIndexes, int waitMilliseconds = 0) => ExamineFinalComponent.RebuildIndexes(indexRebuilder, logger, onlyEmptyIndexes, waitMilliseconds);
 
         #region Cache refresher updated event handlers
 
@@ -746,63 +699,6 @@ namespace Umbraco.Web.Search
         }
         #endregion
 
-        /// <summary>
-        /// Background task used to rebuild empty indexes on startup
-        /// </summary>
-        private class RebuildOnStartupTask : IBackgroundTask
-        {
-            private readonly IndexRebuilder _indexRebuilder;
-            private readonly ILogger _logger;
-            private readonly bool _onlyEmptyIndexes;
-            private readonly int _waitMilliseconds;
-
-            public RebuildOnStartupTask(IndexRebuilder indexRebuilder, ILogger logger, bool onlyEmptyIndexes, int waitMilliseconds = 0)
-            {
-                _indexRebuilder = indexRebuilder ?? throw new ArgumentNullException(nameof(indexRebuilder));
-                _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-                _onlyEmptyIndexes = onlyEmptyIndexes;
-                _waitMilliseconds = waitMilliseconds;
-            }
-
-            public bool IsAsync => false;
-
-            public void Dispose()
-            {
-            }
-
-            public void Run()
-            {
-                try
-                {
-                    // rebuilds indexes
-                    RebuildIndexes();
-                }
-                catch (Exception ex)
-                {
-                    _logger.Error<ExamineComponent>(ex, "Failed to rebuild empty indexes.");
-                }
-            }
-
-            public Task RunAsync(CancellationToken token)
-            {
-                throw new NotImplementedException();
-            }
-
-            /// <summary>
-            /// Used to rebuild indexes on startup or cold boot
-            /// </summary>
-            private void RebuildIndexes()
-            {
-                //do not attempt to do this if this has been disabled since we are not the main dom.
-                //this can be called during a cold boot
-                if (_disableExamineIndexing) return;
-
-                if (_waitMilliseconds > 0)
-                    Thread.Sleep(_waitMilliseconds);
-
-                EnsureUnlocked(_logger, _indexRebuilder.ExamineManager);
-                _indexRebuilder.RebuildIndexes(_onlyEmptyIndexes);
-            }
-        }
+        
     }
 }
diff --git a/src/Umbraco.Web/Search/ExamineComposer.cs b/src/Umbraco.Web/Search/ExamineComposer.cs
index 6e74f0e89d..de33afe1cb 100644
--- a/src/Umbraco.Web/Search/ExamineComposer.cs
+++ b/src/Umbraco.Web/Search/ExamineComposer.cs
@@ -10,6 +10,7 @@ using Umbraco.Examine;
 
 namespace Umbraco.Web.Search
 {
+
     /// <summary>
     /// Configures and installs Examine.
     /// </summary>
diff --git a/src/Umbraco.Web/Search/ExamineFinalComponent.cs b/src/Umbraco.Web/Search/ExamineFinalComponent.cs
new file mode 100644
index 0000000000..5a13185cdc
--- /dev/null
+++ b/src/Umbraco.Web/Search/ExamineFinalComponent.cs
@@ -0,0 +1,151 @@
+using System;
+using System.Threading;
+using Examine;
+using Umbraco.Core.Logging;
+using Umbraco.Examine;
+using Umbraco.Web.Scheduling;
+using System.Threading.Tasks;
+using Umbraco.Core.Composing;
+
+namespace Umbraco.Web.Search
+{
+    /// <summary>
+    /// Executes after all other examine components have executed
+    /// </summary>
+    public sealed class ExamineFinalComponent : IComponent
+    {
+        private static volatile bool _isConfigured = false;
+        private static readonly object IsConfiguredLocker = new object();
+        private readonly IProfilingLogger _logger;
+        private readonly IExamineManager _examineManager;
+        private static readonly object RebuildLocker = new object();
+        private readonly IndexRebuilder _indexRebuilder;
+        private static BackgroundTaskRunner<IBackgroundTask> _rebuildOnStartupRunner;
+
+        public void Initialize()
+        {
+            if (!ExamineComponent.ExamineEnabled) return;
+
+            EnsureUnlocked(_logger, _examineManager);
+
+            // TODO: Instead of waiting 5000 ms, we could add an event handler on to fulfilling the first request, then start?
+            ExamineComponent.RebuildIndexes(_indexRebuilder, _logger, true, 5000);
+        }
+
+        public void Terminate()
+        {
+        }
+
+        /// <summary>
+        /// Called to rebuild empty indexes on startup
+        /// </summary>
+        /// <param name="indexRebuilder"></param>
+        /// <param name="logger"></param>
+        /// <param name="onlyEmptyIndexes"></param>
+        /// <param name="waitMilliseconds"></param>
+        internal static void RebuildIndexes(IndexRebuilder indexRebuilder, ILogger logger, bool onlyEmptyIndexes, int waitMilliseconds = 0)
+        {
+            // TODO: need a way to disable rebuilding on startup
+
+            lock (RebuildLocker)
+            {
+                if (_rebuildOnStartupRunner != null && _rebuildOnStartupRunner.IsRunning)
+                {
+                    logger.Warn<ExamineComponent>("Call was made to RebuildIndexes but the task runner for rebuilding is already running");
+                    return;
+                }
+
+                logger.Info<ExamineComponent>("Starting initialize async background thread.");
+                //do the rebuild on a managed background thread
+                var task = new RebuildOnStartupTask(indexRebuilder, logger, onlyEmptyIndexes, waitMilliseconds);
+
+                _rebuildOnStartupRunner = new BackgroundTaskRunner<IBackgroundTask>(
+                    "RebuildIndexesOnStartup",
+                    logger);
+
+                _rebuildOnStartupRunner.TryAdd(task);
+            }
+        }
+
+        /// <summary>
+        /// Must be called to each index is unlocked before any indexing occurs
+        /// </summary>
+        /// <remarks>
+        /// Indexing rebuilding can occur on a normal boot if the indexes are empty or on a cold boot by the database server messenger. Before
+        /// either of these happens, we need to configure the indexes.
+        /// </remarks>
+        internal static void EnsureUnlocked(ILogger logger, IExamineManager examineManager)
+        {
+            if (!ExamineComponent.ExamineEnabled) return;
+            if (_isConfigured) return;
+
+            lock (IsConfiguredLocker)
+            {
+                //double check
+                if (_isConfigured) return;
+
+                _isConfigured = true;
+                examineManager.UnlockLuceneIndexes(logger);
+            }
+        }
+
+        /// <summary>
+        /// Background task used to rebuild empty indexes on startup
+        /// </summary>
+        private class RebuildOnStartupTask : IBackgroundTask
+        {
+            private readonly IndexRebuilder _indexRebuilder;
+            private readonly ILogger _logger;
+            private readonly bool _onlyEmptyIndexes;
+            private readonly int _waitMilliseconds;
+
+            public RebuildOnStartupTask(IndexRebuilder indexRebuilder, ILogger logger, bool onlyEmptyIndexes, int waitMilliseconds = 0)
+            {
+                _indexRebuilder = indexRebuilder ?? throw new ArgumentNullException(nameof(indexRebuilder));
+                _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+                _onlyEmptyIndexes = onlyEmptyIndexes;
+                _waitMilliseconds = waitMilliseconds;
+            }
+
+            public bool IsAsync => false;
+
+            public void Dispose()
+            {
+            }
+
+            public void Run()
+            {
+                try
+                {
+                    // rebuilds indexes
+                    RebuildIndexes();
+                }
+                catch (Exception ex)
+                {
+                    _logger.Error<ExamineComponent>(ex, "Failed to rebuild empty indexes.");
+                }
+            }
+
+            public Task RunAsync(CancellationToken token)
+            {
+                throw new NotImplementedException();
+            }
+
+            /// <summary>
+            /// Used to rebuild indexes on startup or cold boot
+            /// </summary>
+            private void RebuildIndexes()
+            {
+                //do not attempt to do this if this has been disabled since we are not the main dom.
+                //this can be called during a cold boot
+                if (!ExamineComponent.ExamineEnabled) return;
+
+                if (_waitMilliseconds > 0)
+                    Thread.Sleep(_waitMilliseconds);
+
+                EnsureUnlocked(_logger, _indexRebuilder.ExamineManager);
+                _indexRebuilder.RebuildIndexes(_onlyEmptyIndexes);
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Search/ExamineFinalComposer.cs b/src/Umbraco.Web/Search/ExamineFinalComposer.cs
new file mode 100644
index 0000000000..6b33459159
--- /dev/null
+++ b/src/Umbraco.Web/Search/ExamineFinalComposer.cs
@@ -0,0 +1,11 @@
+using Umbraco.Core.Composing;
+
+namespace Umbraco.Web.Search
+{
+    // examine's final composer composes after all user composers
+    // and *also* after ICoreComposer (in case IUserComposer is disabled)
+    [ComposeAfter(typeof(IUserComposer))]
+    [ComposeAfter(typeof(ICoreComposer))]
+    public class ExamineFinalComposer : ComponentComposer<ExamineFinalComponent>
+    { }
+}
diff --git a/src/Umbraco.Web/Search/ExamineUserComponent.cs b/src/Umbraco.Web/Search/ExamineUserComponent.cs
new file mode 100644
index 0000000000..ddee07543c
--- /dev/null
+++ b/src/Umbraco.Web/Search/ExamineUserComponent.cs
@@ -0,0 +1,29 @@
+using Umbraco.Core.Composing;
+
+namespace Umbraco.Web.Search
+{
+    /// <summary>
+    /// An abstract class for custom index authors to inherit from
+    /// </summary>
+    public abstract class ExamineUserComponent : IComponent
+    {
+        /// <summary>
+        /// Initialize the component, eagerly exits if ExamineComponent.ExamineEnabled == false
+        /// </summary>
+        public void Initialize()
+        {
+            if (!ExamineComponent.ExamineEnabled) return;
+
+            InitializeComponent();
+        }
+
+        /// <summary>
+        /// Abstract method which executes to initialize this component if ExamineComponent.ExamineEnabled == true
+        /// </summary>
+        protected abstract void InitializeComponent();
+
+        public virtual void Terminate()
+        {
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index dcaa3494fd..c9c9a4412a 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -233,6 +233,9 @@
     <Compile Include="Routing\IPublishedRouter.cs" />
     <Compile Include="Routing\MediaUrlProviderCollection.cs" />
     <Compile Include="Routing\MediaUrlProviderCollectionBuilder.cs" />
+    <Compile Include="Search\ExamineFinalComponent.cs" />
+    <Compile Include="Search\ExamineFinalComposer.cs" />
+    <Compile Include="Search\ExamineUserComponent.cs" />
     <Compile Include="Services\DashboardService.cs" />
     <Compile Include="Services\IDashboardService.cs" />
     <Compile Include="Models\Link.cs" />

From 366058581a8fc11697f92636a3961fa7d4cbb2d5 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 2 Aug 2019 01:15:08 +1000
Subject: [PATCH 227/776] Adds LuceneIndexDiagnostics to make it easier for
 devs and custom indexes

---
 src/Umbraco.Examine/LuceneIndexDiagnostics.cs | 80 +++++++++++++++++++
 src/Umbraco.Examine/Umbraco.Examine.csproj    |  1 +
 .../UmbracoExamineIndexDiagnostics.cs         | 62 ++------------
 src/Umbraco.Web/Search/ExamineComponent.cs    |  2 +-
 .../Search/GenericIndexDiagnostics.cs         |  1 +
 src/Umbraco.Web/Suspendable.cs                |  2 +
 6 files changed, 91 insertions(+), 57 deletions(-)
 create mode 100644 src/Umbraco.Examine/LuceneIndexDiagnostics.cs

diff --git a/src/Umbraco.Examine/LuceneIndexDiagnostics.cs b/src/Umbraco.Examine/LuceneIndexDiagnostics.cs
new file mode 100644
index 0000000000..03e5018a79
--- /dev/null
+++ b/src/Umbraco.Examine/LuceneIndexDiagnostics.cs
@@ -0,0 +1,80 @@
+using System.Collections.Generic;
+using Examine.LuceneEngine.Providers;
+using Umbraco.Core;
+using Umbraco.Core.Logging;
+using Lucene.Net.Store;
+using Umbraco.Core.IO;
+
+namespace Umbraco.Examine
+{
+    public class LuceneIndexDiagnostics : IIndexDiagnostics
+    {
+        public LuceneIndexDiagnostics(LuceneIndex index, ILogger logger)
+        {
+            Index = index;
+            Logger = logger;
+        }
+
+        public LuceneIndex Index { get; }
+        public ILogger Logger { get; }
+
+        public int DocumentCount
+        {
+            get
+            {
+                try
+                {
+                    return Index.GetIndexDocumentCount();
+                }
+                catch (AlreadyClosedException)
+                {
+                    Logger.Warn(typeof(UmbracoContentIndex), "Cannot get GetIndexDocumentCount, the writer is already closed");
+                    return 0;
+                }
+            }
+        }
+
+        public int FieldCount
+        {
+            get
+            {
+                try
+                {
+                    return Index.GetIndexFieldCount();
+                }
+                catch (AlreadyClosedException)
+                {
+                    Logger.Warn(typeof(UmbracoContentIndex), "Cannot get GetIndexFieldCount, the writer is already closed");
+                    return 0;
+                }
+            }
+        }
+
+        public Attempt<string> IsHealthy()
+        {
+            var isHealthy = Index.IsHealthy(out var indexError);
+            return isHealthy ? Attempt<string>.Succeed() : Attempt.Fail(indexError.Message);
+        }
+
+        public virtual IReadOnlyDictionary<string, object> Metadata
+        {
+            get
+            {
+                var d = new Dictionary<string, object>
+                {
+                    [nameof(UmbracoExamineIndex.CommitCount)] = Index.CommitCount,
+                    [nameof(UmbracoExamineIndex.DefaultAnalyzer)] = Index.DefaultAnalyzer.GetType().Name,
+                    ["LuceneDirectory"] = Index.GetLuceneDirectory().GetType().Name,
+                    [nameof(UmbracoExamineIndex.LuceneIndexFolder)] =
+                        Index.LuceneIndexFolder == null
+                            ? string.Empty
+                            : Index.LuceneIndexFolder.ToString().ToLowerInvariant().TrimStart(IOHelper.MapPath(SystemDirectories.Root).ToLowerInvariant()).Replace("\\", "/").EnsureStartsWith('/'),
+                };
+
+                return d;
+            }
+        }
+
+        
+    }
+}
diff --git a/src/Umbraco.Examine/Umbraco.Examine.csproj b/src/Umbraco.Examine/Umbraco.Examine.csproj
index 95690c17e4..e28a8e674e 100644
--- a/src/Umbraco.Examine/Umbraco.Examine.csproj
+++ b/src/Umbraco.Examine/Umbraco.Examine.csproj
@@ -72,6 +72,7 @@
     <Compile Include="IPublishedContentValueSetBuilder.cs" />
     <Compile Include="IUmbracoIndex.cs" />
     <Compile Include="IValueSetBuilder.cs" />
+    <Compile Include="LuceneIndexDiagnostics.cs" />
     <Compile Include="MediaIndexPopulator.cs" />
     <Compile Include="MediaValueSetBuilder.cs" />
     <Compile Include="MemberIndexPopulator.cs" />
diff --git a/src/Umbraco.Examine/UmbracoExamineIndexDiagnostics.cs b/src/Umbraco.Examine/UmbracoExamineIndexDiagnostics.cs
index fed5b9bae7..8be46869ac 100644
--- a/src/Umbraco.Examine/UmbracoExamineIndexDiagnostics.cs
+++ b/src/Umbraco.Examine/UmbracoExamineIndexDiagnostics.cs
@@ -7,73 +7,23 @@ using Umbraco.Core.Logging;
 
 namespace Umbraco.Examine
 {
-    public class UmbracoExamineIndexDiagnostics : IIndexDiagnostics
+    public class UmbracoExamineIndexDiagnostics : LuceneIndexDiagnostics
     {
         private readonly UmbracoExamineIndex _index;
-        private readonly ILogger _logger;
 
         public UmbracoExamineIndexDiagnostics(UmbracoExamineIndex index, ILogger logger)
+            : base(index, logger)
         {
-            _index = index;
-            _logger = logger;
         }
 
-        public int DocumentCount
+        public override IReadOnlyDictionary<string, object> Metadata
         {
             get
             {
-                try
-                {
-                    return _index.GetIndexDocumentCount();
-                }
-                catch (AlreadyClosedException)
-                {
-                    _logger.Warn(typeof(UmbracoContentIndex), "Cannot get GetIndexDocumentCount, the writer is already closed");
-                    return 0;
-                }
-            }
-        }
+                var d = base.Metadata.ToDictionary(x => x.Key, x => x.Value);
 
-        public int FieldCount
-        {
-            get
-            {
-                try
-                {
-                    return _index.GetIndexFieldCount();
-                }
-                catch (AlreadyClosedException)
-                {
-                    _logger.Warn(typeof(UmbracoContentIndex), "Cannot get GetIndexFieldCount, the writer is already closed");
-                    return 0;
-                }
-            }
-        }
-
-        public Attempt<string> IsHealthy()
-        {
-            var isHealthy = _index.IsHealthy(out var indexError);
-            return isHealthy ? Attempt<string>.Succeed() : Attempt.Fail(indexError.Message);
-        }
-
-        public virtual IReadOnlyDictionary<string, object> Metadata
-        {
-            get
-            {
-                var d = new Dictionary<string, object>
-                {
-                    [nameof(UmbracoExamineIndex.CommitCount)] = _index.CommitCount,
-                    [nameof(UmbracoExamineIndex.DefaultAnalyzer)] = _index.DefaultAnalyzer.GetType().Name,
-                    ["LuceneDirectory"] = _index.GetLuceneDirectory().GetType().Name,
-                    [nameof(UmbracoExamineIndex.EnableDefaultEventHandler)] = _index.EnableDefaultEventHandler,
-                    [nameof(UmbracoExamineIndex.LuceneIndexFolder)] =
-                        _index.LuceneIndexFolder == null
-                            ? string.Empty
-                            : _index.LuceneIndexFolder.ToString().ToLowerInvariant().TrimStart(IOHelper.MapPath(SystemDirectories.Root).ToLowerInvariant()).Replace("\\", "/").EnsureStartsWith('/'),
-                    [nameof(UmbracoExamineIndex.PublishedValuesOnly)] = _index.PublishedValuesOnly,
-                    //There's too much info here
-                    //[nameof(UmbracoExamineIndexer.FieldDefinitionCollection)] = _index.FieldDefinitionCollection,
-                };
+                d[nameof(UmbracoExamineIndex.EnableDefaultEventHandler)] = _index.EnableDefaultEventHandler;
+                d[nameof(UmbracoExamineIndex.PublishedValuesOnly)] = _index.PublishedValuesOnly;
 
                 if (_index.ValueSetValidator is ValueSetValidator vsv)
                 {
diff --git a/src/Umbraco.Web/Search/ExamineComponent.cs b/src/Umbraco.Web/Search/ExamineComponent.cs
index b468963380..5d33bfb169 100644
--- a/src/Umbraco.Web/Search/ExamineComponent.cs
+++ b/src/Umbraco.Web/Search/ExamineComponent.cs
@@ -118,7 +118,7 @@ namespace Umbraco.Web.Search
             // bind to distributed cache events - this ensures that this logic occurs on ALL servers
             // that are taking part in a load balanced environment.
             ContentCacheRefresher.CacheUpdated += ContentCacheRefresherUpdated;
-            ContentTypeCacheRefresher.CacheUpdated += ContentTypeCacheRefresherUpdated; ;
+            ContentTypeCacheRefresher.CacheUpdated += ContentTypeCacheRefresherUpdated;
             MediaCacheRefresher.CacheUpdated += MediaCacheRefresherUpdated;
             MemberCacheRefresher.CacheUpdated += MemberCacheRefresherUpdated;
         }
diff --git a/src/Umbraco.Web/Search/GenericIndexDiagnostics.cs b/src/Umbraco.Web/Search/GenericIndexDiagnostics.cs
index 560fb19f09..cb25e1242a 100644
--- a/src/Umbraco.Web/Search/GenericIndexDiagnostics.cs
+++ b/src/Umbraco.Web/Search/GenericIndexDiagnostics.cs
@@ -8,6 +8,7 @@ using Umbraco.Examine;
 
 namespace Umbraco.Web.Search
 {
+
     /// <summary>
     /// Used to return diagnostic data for any index
     /// </summary>
diff --git a/src/Umbraco.Web/Suspendable.cs b/src/Umbraco.Web/Suspendable.cs
index 86c83120ea..cfe4d28e8b 100644
--- a/src/Umbraco.Web/Suspendable.cs
+++ b/src/Umbraco.Web/Suspendable.cs
@@ -50,6 +50,8 @@ namespace Umbraco.Web
             }
         }
 
+        //This is really needed at all since the only place this is used is in ExamineComponent and that already maintains a flag of whether it suspsended or not
+        // AHH... but Deploy probably uses this?
         public static class ExamineEvents
         {
             private static bool _tried, _suspended;

From 14915e9da788570a1626a0fe8c1a2de7b29c49de Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 2 Aug 2019 01:16:37 +1000
Subject: [PATCH 228/776] oops

---
 src/Umbraco.Examine/UmbracoExamineIndexDiagnostics.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Examine/UmbracoExamineIndexDiagnostics.cs b/src/Umbraco.Examine/UmbracoExamineIndexDiagnostics.cs
index 8be46869ac..4a926deebe 100644
--- a/src/Umbraco.Examine/UmbracoExamineIndexDiagnostics.cs
+++ b/src/Umbraco.Examine/UmbracoExamineIndexDiagnostics.cs
@@ -14,6 +14,7 @@ namespace Umbraco.Examine
         public UmbracoExamineIndexDiagnostics(UmbracoExamineIndex index, ILogger logger)
             : base(index, logger)
         {
+            _index = index;
         }
 
         public override IReadOnlyDictionary<string, object> Metadata

From 86a97c30d193d92c67c9fe917c17e2a783449d51 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 2 Aug 2019 12:40:45 +1000
Subject: [PATCH 229/776] fixes up LuceneIndexDiagnostics

---
 src/Umbraco.Examine/LuceneIndexDiagnostics.cs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Examine/LuceneIndexDiagnostics.cs b/src/Umbraco.Examine/LuceneIndexDiagnostics.cs
index 03e5018a79..96363904b4 100644
--- a/src/Umbraco.Examine/LuceneIndexDiagnostics.cs
+++ b/src/Umbraco.Examine/LuceneIndexDiagnostics.cs
@@ -4,6 +4,7 @@ using Umbraco.Core;
 using Umbraco.Core.Logging;
 using Lucene.Net.Store;
 using Umbraco.Core.IO;
+using System.Linq;
 
 namespace Umbraco.Examine
 {
@@ -60,17 +61,19 @@ namespace Umbraco.Examine
         {
             get
             {
+                var luceneDir = Index.GetLuceneDirectory();
                 var d = new Dictionary<string, object>
                 {
                     [nameof(UmbracoExamineIndex.CommitCount)] = Index.CommitCount,
                     [nameof(UmbracoExamineIndex.DefaultAnalyzer)] = Index.DefaultAnalyzer.GetType().Name,
-                    ["LuceneDirectory"] = Index.GetLuceneDirectory().GetType().Name,
-                    [nameof(UmbracoExamineIndex.LuceneIndexFolder)] =
-                        Index.LuceneIndexFolder == null
-                            ? string.Empty
-                            : Index.LuceneIndexFolder.ToString().ToLowerInvariant().TrimStart(IOHelper.MapPath(SystemDirectories.Root).ToLowerInvariant()).Replace("\\", "/").EnsureStartsWith('/'),
+                    ["LuceneDirectory"] = luceneDir.GetType().Name                    
                 };
 
+                if (luceneDir is FSDirectory fsDir)
+                {
+                    d[nameof(UmbracoExamineIndex.LuceneIndexFolder)] = fsDir.Directory.ToString().ToLowerInvariant().TrimStart(IOHelper.MapPath(SystemDirectories.Root).ToLowerInvariant()).Replace("\\", "/").EnsureStartsWith('/');
+                }
+
                 return d;
             }
         }

From 345e6091d2d09f3c83d9d26044e0ace9f22cd5d4 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 2 Aug 2019 13:01:02 +1000
Subject: [PATCH 230/776] fixes null check, was on the wrong element

---
 src/Umbraco.Examine/ContentValueSetBuilder.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Examine/ContentValueSetBuilder.cs b/src/Umbraco.Examine/ContentValueSetBuilder.cs
index 44cef08813..9cbc311639 100644
--- a/src/Umbraco.Examine/ContentValueSetBuilder.cs
+++ b/src/Umbraco.Examine/ContentValueSetBuilder.cs
@@ -54,7 +54,7 @@ namespace Umbraco.Examine
                     {"updateDate", new object[] {c.UpdateDate}},    //Always add invariant updateDate
                     {"nodeName", (PublishedValuesOnly               //Always add invariant nodeName
                         ? c.PublishName?.Yield()
-                        : c?.Name.Yield()) ?? Enumerable.Empty<string>()},
+                        : c.Name?.Yield()) ?? Enumerable.Empty<string>()},
                     {"urlName", urlValue?.Yield() ?? Enumerable.Empty<string>()},                  //Always add invariant urlName
                     {"path", c.Path?.Yield() ?? Enumerable.Empty<string>()},
                     {"nodeType", c.ContentType.Id.ToString().Yield() ?? Enumerable.Empty<string>()},

From 6d3faf91d8bc06f0378c816f92b2b2fc517ee168 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 5 Aug 2019 13:50:50 +1000
Subject: [PATCH 231/776] fixes spacing with ext login providers

---
 .../src/views/common/overlays/user/user.html     | 16 ++++++++--------
 .../views/components/application/umb-login.html  |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
index 4af8c83983..60477ae9b8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
@@ -53,14 +53,14 @@
 			<form ng-if="login.linkedProviderKey == undefined" method="POST" name="externalLoginForm"
 				  action="{{externalLinkLoginFormAction}}" id="oauthloginform" name="oauthloginform">
 				<input type="hidden" name="provider" value="{{login.authType}}" />
-				<button class="btn btn-block btn-social"
-						ng-class="login.properties.SocialStyle"
-						id="{{login.authType}}"
-						onclick="document.forms.oauthloginform.submit();">
+                <button class="btn btn-block btn-social"
+                        ng-class="login.properties.SocialStyle"
+                        id="{{login.authType}}"
+                        onclick="document.forms.oauthloginform.submit();">
 
-					<i class="fa" ng-class="login.properties.SocialIcon"></i>
-					<localize key="defaultdialogs_linkYour">Link your</localize> {{login.caption}} <localize key="defaultdialogs_account">account</localize>
-				</button>
+                    <i class="fa" ng-class="login.properties.SocialIcon"></i>
+                    <localize key="defaultdialogs_linkYour">Link your</localize>&nbsp;{{login.caption}}&nbsp;<localize key="defaultdialogs_account">account</localize>
+                </button>
 			</form>
 
             <button ng-if="login.linkedProviderKey != undefined"
@@ -71,7 +71,7 @@
                     name="provider"
                     value="{{login.authType}}">
                 <i class="fa" ng-class="login.properties.SocialIcon"></i>
-                <localize key="defaultdialogs_unLinkYour">Un-link your</localize> {{login.caption}} <localize key="defaultdialogs_account">account</localize>
+                <localize key="defaultdialogs_unLinkYour">Un-link your</localize>&nbsp;{{login.caption}}&nbsp;<localize key="defaultdialogs_account">account</localize>
             </button>
         </div>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
index e7513617b7..bc27196466 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
@@ -138,7 +138,7 @@
                                         id="{{login.authType}}" name="provider" value="{{login.authType}}"
                                         title="Log in using your {{login.caption}} account">
                                     <i class="fa" ng-class="login.properties.SocialIcon"></i>
-                                    <localize key="login_signInWith">Sign in with</localize> {{login.caption}}
+                                    <localize key="login_signInWith">Sign in with</localize>&nbsp;{{login.caption}}
                                 </button>
 
                             </div>

From 89429bd65a3377b8b86ffd284b44ac2483693a64 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 5 Aug 2019 16:28:23 +1000
Subject: [PATCH 232/776] fixes ctor

---
 src/Umbraco.Web/Search/ExamineFinalComponent.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Umbraco.Web/Search/ExamineFinalComponent.cs b/src/Umbraco.Web/Search/ExamineFinalComponent.cs
index 5a13185cdc..4213efac34 100644
--- a/src/Umbraco.Web/Search/ExamineFinalComponent.cs
+++ b/src/Umbraco.Web/Search/ExamineFinalComponent.cs
@@ -14,6 +14,7 @@ namespace Umbraco.Web.Search
     /// </summary>
     public sealed class ExamineFinalComponent : IComponent
     {
+
         private static volatile bool _isConfigured = false;
         private static readonly object IsConfiguredLocker = new object();
         private readonly IProfilingLogger _logger;
@@ -22,6 +23,13 @@ namespace Umbraco.Web.Search
         private readonly IndexRebuilder _indexRebuilder;
         private static BackgroundTaskRunner<IBackgroundTask> _rebuildOnStartupRunner;
 
+        public ExamineFinalComponent(IProfilingLogger logger, IExamineManager examineManager, IndexRebuilder indexRebuilder)
+        {
+            _logger = logger;
+            _examineManager = examineManager;
+            _indexRebuilder = indexRebuilder;
+        }
+
         public void Initialize()
         {
             if (!ExamineComponent.ExamineEnabled) return;

From be4536cf164dd5a27c2046603319409b8a7b9eb3 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 5 Aug 2019 17:14:29 +1000
Subject: [PATCH 233/776] Refactors ugly statics and nested classes

---
 src/Umbraco.Examine/ExamineExtensions.cs      |  25 ++++
 src/Umbraco.Examine/IndexRebuilder.cs         |   3 +-
 .../Search/BackgroundIndexRebuilder.cs        | 123 +++++++++++++++
 src/Umbraco.Web/Search/ExamineComponent.cs    |  28 +---
 src/Umbraco.Web/Search/ExamineComposer.cs     |   1 +
 .../Search/ExamineFinalComponent.cs           | 141 ++----------------
 .../Search/ExamineUserComponent.cs            |  12 +-
 src/Umbraco.Web/Umbraco.Web.csproj            |   1 +
 8 files changed, 180 insertions(+), 154 deletions(-)
 create mode 100644 src/Umbraco.Web/Search/BackgroundIndexRebuilder.cs

diff --git a/src/Umbraco.Examine/ExamineExtensions.cs b/src/Umbraco.Examine/ExamineExtensions.cs
index 376950c95e..ae6913f4ee 100644
--- a/src/Umbraco.Examine/ExamineExtensions.cs
+++ b/src/Umbraco.Examine/ExamineExtensions.cs
@@ -28,6 +28,31 @@ namespace Umbraco.Examine
         /// </remarks>
         internal static readonly Regex CultureIsoCodeFieldNameMatchExpression = new Regex("^([_\\w]+)_([a-z]{2}-[a-z0-9]{2,4})$", RegexOptions.Compiled);
 
+        private static volatile bool _isUnlocked = false;
+        private static readonly object IsUnlockedLocker = new object();
+
+        /// <summary>
+        /// Unlocks all Lucene based indexes registered with the <see cref="IExamineManager"/>
+        /// </summary>
+        /// <remarks>
+        /// Indexing rebuilding can occur on a normal boot if the indexes are empty or on a cold boot by the database server messenger. Before
+        /// either of these happens, we need to configure the indexes.
+        /// </remarks>
+        internal static void EnsureUnlocked(this IExamineManager examineManager, IMainDom mainDom, ILogger logger)
+        {
+            if (!mainDom.IsMainDom) return;
+            if (_isUnlocked) return;
+
+            lock (IsUnlockedLocker)
+            {
+                //double check
+                if (_isUnlocked) return;
+
+                _isUnlocked = true;
+                examineManager.UnlockLuceneIndexes(logger);
+            }
+        }
+
         //TODO: We need a public method here to just match a field name against CultureIsoCodeFieldNameMatchExpression
 
         /// <summary>
diff --git a/src/Umbraco.Examine/IndexRebuilder.cs b/src/Umbraco.Examine/IndexRebuilder.cs
index 43c309b9c5..786aecac71 100644
--- a/src/Umbraco.Examine/IndexRebuilder.cs
+++ b/src/Umbraco.Examine/IndexRebuilder.cs
@@ -5,7 +5,8 @@ using System.Threading.Tasks;
 using Examine;
 
 namespace Umbraco.Examine
-{
+{   
+
     /// <summary>
     /// Utility to rebuild all indexes ensuring minimal data queries
     /// </summary>
diff --git a/src/Umbraco.Web/Search/BackgroundIndexRebuilder.cs b/src/Umbraco.Web/Search/BackgroundIndexRebuilder.cs
new file mode 100644
index 0000000000..d747d8d9e4
--- /dev/null
+++ b/src/Umbraco.Web/Search/BackgroundIndexRebuilder.cs
@@ -0,0 +1,123 @@
+using System;
+using System.Threading;
+using Umbraco.Core.Logging;
+using Umbraco.Examine;
+using System.Threading.Tasks;
+using Umbraco.Core;
+using Umbraco.Web.Scheduling;
+
+namespace Umbraco.Web.Search
+{
+    /// <summary>
+    /// Utility to rebuild all indexes on a background thread
+    /// </summary>
+    public sealed class BackgroundIndexRebuilder
+    {
+        private static readonly object RebuildLocker = new object();
+        private readonly IndexRebuilder _indexRebuilder;
+        private readonly IMainDom _mainDom;
+        private readonly IProfilingLogger _logger;
+        private static BackgroundTaskRunner<IBackgroundTask> _rebuildOnStartupRunner;
+
+        public BackgroundIndexRebuilder(IMainDom mainDom, IProfilingLogger logger, IndexRebuilder indexRebuilder)
+        {
+            _mainDom = mainDom;
+            _logger = logger;
+            _indexRebuilder = indexRebuilder;
+        }
+
+        /// <summary>
+        /// Called to rebuild empty indexes on startup
+        /// </summary>
+        /// <param name="indexRebuilder"></param>
+        /// <param name="logger"></param>
+        /// <param name="onlyEmptyIndexes"></param>
+        /// <param name="waitMilliseconds"></param>
+        public void RebuildIndexes(bool onlyEmptyIndexes, int waitMilliseconds = 0)
+        {
+            // TODO: need a way to disable rebuilding on startup
+
+            lock (RebuildLocker)
+            {
+                if (_rebuildOnStartupRunner != null && _rebuildOnStartupRunner.IsRunning)
+                {
+                    _logger.Warn<BackgroundIndexRebuilder>("Call was made to RebuildIndexes but the task runner for rebuilding is already running");
+                    return;
+                }
+
+                _logger.Info<BackgroundIndexRebuilder>("Starting initialize async background thread.");
+                //do the rebuild on a managed background thread
+                var task = new RebuildOnStartupTask(_mainDom, _indexRebuilder, _logger, onlyEmptyIndexes, waitMilliseconds);
+
+                _rebuildOnStartupRunner = new BackgroundTaskRunner<IBackgroundTask>(
+                    "RebuildIndexesOnStartup",
+                    _logger);
+
+                _rebuildOnStartupRunner.TryAdd(task);
+            }
+        }
+
+        /// <summary>
+        /// Background task used to rebuild empty indexes on startup
+        /// </summary>
+        private class RebuildOnStartupTask : IBackgroundTask
+        {
+            private readonly IMainDom _mainDom;
+
+            private readonly IndexRebuilder _indexRebuilder;
+            private readonly ILogger _logger;
+            private readonly bool _onlyEmptyIndexes;
+            private readonly int _waitMilliseconds;
+
+            public RebuildOnStartupTask(IMainDom mainDom,
+                IndexRebuilder indexRebuilder, ILogger logger, bool onlyEmptyIndexes, int waitMilliseconds = 0)
+            {
+                _mainDom = mainDom;
+                _indexRebuilder = indexRebuilder ?? throw new ArgumentNullException(nameof(indexRebuilder));
+                _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+                _onlyEmptyIndexes = onlyEmptyIndexes;
+                _waitMilliseconds = waitMilliseconds;
+            }
+
+            public bool IsAsync => false;
+
+            public void Dispose()
+            {
+            }
+
+            public void Run()
+            {
+                try
+                {
+                    // rebuilds indexes
+                    RebuildIndexes();
+                }
+                catch (Exception ex)
+                {
+                    _logger.Error<RebuildOnStartupTask>(ex, "Failed to rebuild empty indexes.");
+                }
+            }
+
+            public Task RunAsync(CancellationToken token)
+            {
+                throw new NotImplementedException();
+            }
+
+            /// <summary>
+            /// Used to rebuild indexes on startup or cold boot
+            /// </summary>
+            private void RebuildIndexes()
+            {
+                //do not attempt to do this if this has been disabled since we are not the main dom.
+                //this can be called during a cold boot
+                if (!_mainDom.IsMainDom) return;
+
+                if (_waitMilliseconds > 0)
+                    Thread.Sleep(_waitMilliseconds);
+
+                _indexRebuilder.ExamineManager.EnsureUnlocked(_mainDom, _logger);
+                _indexRebuilder.RebuildIndexes(_onlyEmptyIndexes);
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Search/ExamineComponent.cs b/src/Umbraco.Web/Search/ExamineComponent.cs
index 5d33bfb169..fd1eee8f96 100644
--- a/src/Umbraco.Web/Search/ExamineComponent.cs
+++ b/src/Umbraco.Web/Search/ExamineComponent.cs
@@ -16,18 +16,17 @@ using Umbraco.Examine;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Examine.LuceneEngine.Directories;
 using Umbraco.Core.Composing;
+using System.ComponentModel;
 
 namespace Umbraco.Web.Search
 {
-
-    public sealed class ExamineComponent : IComponent
+    public sealed class ExamineComponent : Umbraco.Core.Composing.IComponent
     {
         private readonly IExamineManager _examineManager;
         private readonly IContentValueSetBuilder _contentValueSetBuilder;
         private readonly IPublishedContentValueSetBuilder _publishedContentValueSetBuilder;
         private readonly IValueSetBuilder<IMedia> _mediaValueSetBuilder;
         private readonly IValueSetBuilder<IMember> _memberValueSetBuilder;
-        private static bool _disableExamineIndexing = false;
         private readonly IScopeProvider _scopeProvider;
         private readonly ServiceContext _services;        
         private readonly IMainDom _mainDom;
@@ -39,16 +38,7 @@ namespace Umbraco.Web.Search
         // enlist with a lower priority to ensure that anything "default" runs after us
         // but greater that SafeXmlReaderWriter priority which is 60
         private const int EnlistPriority = 80;
-
-        /// <summary>
-        /// Returns true if Examine is enabled for this AppDomain
-        /// </summary>
-        /// <remarks>
-        /// This flag should be used by custom Examine index implementors to determine if they should
-        /// execute. This value is true if this component successfully registered with <see cref="IMainDom"/>
-        /// </remarks>
-        public static bool ExamineEnabled => !_disableExamineIndexing;
-
+        
         public ExamineComponent(IMainDom mainDom,
             IExamineManager examineManager, IProfilingLogger profilingLogger,
             IScopeProvider scopeProvider, IUmbracoIndexesCreator indexCreator,
@@ -97,7 +87,6 @@ namespace Umbraco.Web.Search
 
                 //if we could not register the shutdown examine ourselves, it means we are not maindom! in this case all of examine should be disabled!
                 Suspendable.ExamineEvents.SuspendIndexers(_logger);
-                _disableExamineIndexing = true;
                 return; //exit, do not continue
             }
 
@@ -126,14 +115,9 @@ namespace Umbraco.Web.Search
         public void Terminate()
         { }
 
-        /// <summary>
-        /// Called to rebuild empty indexes on startup
-        /// </summary>
-        /// <param name="indexRebuilder"></param>
-        /// <param name="logger"></param>
-        /// <param name="onlyEmptyIndexes"></param>
-        /// <param name="waitMilliseconds"></param>
-        public static void RebuildIndexes(IndexRebuilder indexRebuilder, ILogger logger, bool onlyEmptyIndexes, int waitMilliseconds = 0) => ExamineFinalComponent.RebuildIndexes(indexRebuilder, logger, onlyEmptyIndexes, waitMilliseconds);
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [Obsolete("This method should not be used and will be removed in future versions, rebuilding indexes can be done with the IndexRebuilder or the BackgroundIndexRebuilder")]
+        public static void RebuildIndexes(IndexRebuilder indexRebuilder, ILogger logger, bool onlyEmptyIndexes, int waitMilliseconds = 0) => Current.Factory.GetInstance<BackgroundIndexRebuilder>().RebuildIndexes(onlyEmptyIndexes, waitMilliseconds);
 
         #region Cache refresher updated event handlers
 
diff --git a/src/Umbraco.Web/Search/ExamineComposer.cs b/src/Umbraco.Web/Search/ExamineComposer.cs
index de33afe1cb..0ade432d70 100644
--- a/src/Umbraco.Web/Search/ExamineComposer.cs
+++ b/src/Umbraco.Web/Search/ExamineComposer.cs
@@ -44,6 +44,7 @@ namespace Umbraco.Web.Search
                     false));
             composition.RegisterUnique<IValueSetBuilder<IMedia>, MediaValueSetBuilder>();
             composition.RegisterUnique<IValueSetBuilder<IMember>, MemberValueSetBuilder>();
+            composition.RegisterUnique<BackgroundIndexRebuilder>();
 
             //We want to manage Examine's AppDomain shutdown sequence ourselves so first we'll disable Examine's default behavior
             //and then we'll use MainDom to control Examine's shutdown - this MUST be done in Compose ie before ExamineManager
diff --git a/src/Umbraco.Web/Search/ExamineFinalComponent.cs b/src/Umbraco.Web/Search/ExamineFinalComponent.cs
index 4213efac34..4514a78faa 100644
--- a/src/Umbraco.Web/Search/ExamineFinalComponent.cs
+++ b/src/Umbraco.Web/Search/ExamineFinalComponent.cs
@@ -1,159 +1,42 @@
-using System;
-using System.Threading;
-using Examine;
+using Examine;
 using Umbraco.Core.Logging;
 using Umbraco.Examine;
-using Umbraco.Web.Scheduling;
-using System.Threading.Tasks;
 using Umbraco.Core.Composing;
+using Umbraco.Core;
 
 namespace Umbraco.Web.Search
 {
+
     /// <summary>
     /// Executes after all other examine components have executed
     /// </summary>
     public sealed class ExamineFinalComponent : IComponent
-    {
-
-        private static volatile bool _isConfigured = false;
-        private static readonly object IsConfiguredLocker = new object();
+    {   
         private readonly IProfilingLogger _logger;
         private readonly IExamineManager _examineManager;
-        private static readonly object RebuildLocker = new object();
-        private readonly IndexRebuilder _indexRebuilder;
-        private static BackgroundTaskRunner<IBackgroundTask> _rebuildOnStartupRunner;
-
-        public ExamineFinalComponent(IProfilingLogger logger, IExamineManager examineManager, IndexRebuilder indexRebuilder)
+        BackgroundIndexRebuilder _indexRebuilder;
+        private readonly IMainDom _mainDom;
+        
+        public ExamineFinalComponent(IProfilingLogger logger, IExamineManager examineManager, BackgroundIndexRebuilder indexRebuilder, IMainDom mainDom)
         {
             _logger = logger;
             _examineManager = examineManager;
             _indexRebuilder = indexRebuilder;
+            _mainDom = mainDom;
         }
 
         public void Initialize()
         {
-            if (!ExamineComponent.ExamineEnabled) return;
+            if (!_mainDom.IsMainDom) return;
 
-            EnsureUnlocked(_logger, _examineManager);
+            _examineManager.EnsureUnlocked(_mainDom, _logger);
 
             // TODO: Instead of waiting 5000 ms, we could add an event handler on to fulfilling the first request, then start?
-            ExamineComponent.RebuildIndexes(_indexRebuilder, _logger, true, 5000);
+            _indexRebuilder.RebuildIndexes(true, 5000);
         }
 
         public void Terminate()
         {
         }
-
-        /// <summary>
-        /// Called to rebuild empty indexes on startup
-        /// </summary>
-        /// <param name="indexRebuilder"></param>
-        /// <param name="logger"></param>
-        /// <param name="onlyEmptyIndexes"></param>
-        /// <param name="waitMilliseconds"></param>
-        internal static void RebuildIndexes(IndexRebuilder indexRebuilder, ILogger logger, bool onlyEmptyIndexes, int waitMilliseconds = 0)
-        {
-            // TODO: need a way to disable rebuilding on startup
-
-            lock (RebuildLocker)
-            {
-                if (_rebuildOnStartupRunner != null && _rebuildOnStartupRunner.IsRunning)
-                {
-                    logger.Warn<ExamineComponent>("Call was made to RebuildIndexes but the task runner for rebuilding is already running");
-                    return;
-                }
-
-                logger.Info<ExamineComponent>("Starting initialize async background thread.");
-                //do the rebuild on a managed background thread
-                var task = new RebuildOnStartupTask(indexRebuilder, logger, onlyEmptyIndexes, waitMilliseconds);
-
-                _rebuildOnStartupRunner = new BackgroundTaskRunner<IBackgroundTask>(
-                    "RebuildIndexesOnStartup",
-                    logger);
-
-                _rebuildOnStartupRunner.TryAdd(task);
-            }
-        }
-
-        /// <summary>
-        /// Must be called to each index is unlocked before any indexing occurs
-        /// </summary>
-        /// <remarks>
-        /// Indexing rebuilding can occur on a normal boot if the indexes are empty or on a cold boot by the database server messenger. Before
-        /// either of these happens, we need to configure the indexes.
-        /// </remarks>
-        internal static void EnsureUnlocked(ILogger logger, IExamineManager examineManager)
-        {
-            if (!ExamineComponent.ExamineEnabled) return;
-            if (_isConfigured) return;
-
-            lock (IsConfiguredLocker)
-            {
-                //double check
-                if (_isConfigured) return;
-
-                _isConfigured = true;
-                examineManager.UnlockLuceneIndexes(logger);
-            }
-        }
-
-        /// <summary>
-        /// Background task used to rebuild empty indexes on startup
-        /// </summary>
-        private class RebuildOnStartupTask : IBackgroundTask
-        {
-            private readonly IndexRebuilder _indexRebuilder;
-            private readonly ILogger _logger;
-            private readonly bool _onlyEmptyIndexes;
-            private readonly int _waitMilliseconds;
-
-            public RebuildOnStartupTask(IndexRebuilder indexRebuilder, ILogger logger, bool onlyEmptyIndexes, int waitMilliseconds = 0)
-            {
-                _indexRebuilder = indexRebuilder ?? throw new ArgumentNullException(nameof(indexRebuilder));
-                _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-                _onlyEmptyIndexes = onlyEmptyIndexes;
-                _waitMilliseconds = waitMilliseconds;
-            }
-
-            public bool IsAsync => false;
-
-            public void Dispose()
-            {
-            }
-
-            public void Run()
-            {
-                try
-                {
-                    // rebuilds indexes
-                    RebuildIndexes();
-                }
-                catch (Exception ex)
-                {
-                    _logger.Error<ExamineComponent>(ex, "Failed to rebuild empty indexes.");
-                }
-            }
-
-            public Task RunAsync(CancellationToken token)
-            {
-                throw new NotImplementedException();
-            }
-
-            /// <summary>
-            /// Used to rebuild indexes on startup or cold boot
-            /// </summary>
-            private void RebuildIndexes()
-            {
-                //do not attempt to do this if this has been disabled since we are not the main dom.
-                //this can be called during a cold boot
-                if (!ExamineComponent.ExamineEnabled) return;
-
-                if (_waitMilliseconds > 0)
-                    Thread.Sleep(_waitMilliseconds);
-
-                EnsureUnlocked(_logger, _indexRebuilder.ExamineManager);
-                _indexRebuilder.RebuildIndexes(_onlyEmptyIndexes);
-            }
-        }
     }
 }
diff --git a/src/Umbraco.Web/Search/ExamineUserComponent.cs b/src/Umbraco.Web/Search/ExamineUserComponent.cs
index ddee07543c..35bc3f59ea 100644
--- a/src/Umbraco.Web/Search/ExamineUserComponent.cs
+++ b/src/Umbraco.Web/Search/ExamineUserComponent.cs
@@ -1,4 +1,5 @@
-using Umbraco.Core.Composing;
+using Umbraco.Core;
+using Umbraco.Core.Composing;
 
 namespace Umbraco.Web.Search
 {
@@ -7,12 +8,19 @@ namespace Umbraco.Web.Search
     /// </summary>
     public abstract class ExamineUserComponent : IComponent
     {
+        private readonly IMainDom _mainDom;
+
+        public ExamineUserComponent(IMainDom mainDom)
+        {
+            _mainDom = mainDom;
+        }
+
         /// <summary>
         /// Initialize the component, eagerly exits if ExamineComponent.ExamineEnabled == false
         /// </summary>
         public void Initialize()
         {
-            if (!ExamineComponent.ExamineEnabled) return;
+            if (!_mainDom.IsMainDom) return;
 
             InitializeComponent();
         }
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index c9c9a4412a..2365017504 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -233,6 +233,7 @@
     <Compile Include="Routing\IPublishedRouter.cs" />
     <Compile Include="Routing\MediaUrlProviderCollection.cs" />
     <Compile Include="Routing\MediaUrlProviderCollectionBuilder.cs" />
+    <Compile Include="Search\BackgroundIndexRebuilder.cs" />
     <Compile Include="Search\ExamineFinalComponent.cs" />
     <Compile Include="Search\ExamineFinalComposer.cs" />
     <Compile Include="Search\ExamineUserComponent.cs" />

From e4f346620ee051a17357da7ece6ba65500620505 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 5 Aug 2019 10:38:35 +0200
Subject: [PATCH 234/776] Added runtime level to ExamineFinalComposer

---
 src/Umbraco.Web/Search/ExamineFinalComposer.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Search/ExamineFinalComposer.cs b/src/Umbraco.Web/Search/ExamineFinalComposer.cs
index 6b33459159..5b6334f1f6 100644
--- a/src/Umbraco.Web/Search/ExamineFinalComposer.cs
+++ b/src/Umbraco.Web/Search/ExamineFinalComposer.cs
@@ -1,4 +1,5 @@
-using Umbraco.Core.Composing;
+using Umbraco.Core;
+using Umbraco.Core.Composing;
 
 namespace Umbraco.Web.Search
 {
@@ -6,6 +7,7 @@ namespace Umbraco.Web.Search
     // and *also* after ICoreComposer (in case IUserComposer is disabled)
     [ComposeAfter(typeof(IUserComposer))]
     [ComposeAfter(typeof(ICoreComposer))]
+    [RuntimeLevel(MinLevel = RuntimeLevel.Run)]
     public class ExamineFinalComposer : ComponentComposer<ExamineFinalComponent>
     { }
 }

From 467cf8d76235fb421876db66086a33fd7c3cf4e6 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 7 Aug 2019 15:40:27 +1000
Subject: [PATCH 235/776] Adds comments/notes

---
 src/Umbraco.Core/Composing/Lifetime.cs | 67 +++++++++++++++++++-------
 1 file changed, 49 insertions(+), 18 deletions(-)

diff --git a/src/Umbraco.Core/Composing/Lifetime.cs b/src/Umbraco.Core/Composing/Lifetime.cs
index 1a2cc3119a..012555be5e 100644
--- a/src/Umbraco.Core/Composing/Lifetime.cs
+++ b/src/Umbraco.Core/Composing/Lifetime.cs
@@ -12,31 +12,62 @@
         /// or MS.DI, PerDependency in Autofac.</remarks>
         Transient,
 
+        // TODO: We need to fix this up, currently LightInject is the only one that behaves differently from all other containers.
+        //  ... the simple fix would be to map this to PerScopeLifetime in LI but need to wait on a response here https://github.com/seesharper/LightInject/issues/494#issuecomment-518942625
+        //
+        // we use it for controllers, httpContextBase and other request scoped objects: MembershpHelper, TagQuery, UmbracoTreeSearcher and ISearchableTree
+        // - so that they are automatically disposed at the end of the scope (ie request)
+        // - not sure they should not be simply 'scoped'?
+        
         /// <summary>
         /// One unique instance per request.
         /// </summary>
-        // TODO: review lifetimes for LightInject vs other containers
-        // currently, corresponds to 'Request' in LightInject which is 'Transient + disposed by Scope'
-        // but NOT (in LightInject) a per-web-request lifetime, more a TransientScoped
-        //
-        // we use it for controllers, httpContextBase and umbracoContext
-        // - so that they are automatically disposed at the end of the scope (ie request)
-        // - not sure they should not be simply 'scoped'?
-        //
-        // Castle has an extra PerWebRequest something, and others use scope
-        // what about Request before first request ie during application startup?
-        // see http://blog.ploeh.dk/2009/11/17/UsingCastleWindsor'sPerWebRequestlifestylewithASP.NETMVConIIS7/
-        // Castle ends up requiring a special scope manager too
-        // see https://groups.google.com/forum/#!topic/castle-project-users/1E2W9LVIYR4
-        //
-        // but maybe also - why are we requiring scoped services at startup?
+        /// <remarks>
+        /// <para>
+        /// Any instance created with this lifetime will be disposed at the end of a request.
+        /// </para>
+        /// Corresponds to
+        /// <para>
+        /// PerRequestLifeTime in LightInject - means transient but disposed at the end of the current web request.
+        /// see: https://github.com/seesharper/LightInject/issues/494#issuecomment-518493262
+        /// </para>
+        /// <para>
+        /// Scoped in MS.DI - means one per web request.
+        /// see https://docs.microsoft.com/en-us/aspnet/core/fundamentals/dependency-injection?view=aspnetcore-2.2#service-lifetimes</para>
+        /// <para>
+        /// InstancePerRequest in Autofac - means one per web request.
+        /// see https://autofaccn.readthedocs.io/en/latest/lifetime/instance-scope.html#instance-per-request
+        /// But "Behind the scenes, though, it’s still just instance per matching lifetime scope."
+        /// </para>
+        /// <para>
+        /// LifestylePerWebRequest in Castle Windsor - means one per web request.
+        /// see https://github.com/castleproject/Windsor/blob/master/docs/mvc-tutorial-part-7-lifestyles.md#the-perwebrequest-lifestyle
+        /// </para>
+        /// </remarks>        
         Request,
 
         /// <summary>
-        /// One unique instance per container scope.
+        /// One unique instance per scope.
         /// </summary>
-        /// <remarks>Corresponds to Scope in LightInject, Scoped in MS.DI
-        /// or Castle Windsor, PerLifetimeScope in Autofac.</remarks>
+        /// <remarks>
+        /// <para>
+        /// Any instance created with this lifetime will be disposed at the end of the current scope.
+        /// </para>
+        /// Corresponds to
+        /// <para>PerScopeLifetime in LightInject (when in a request, means one per web request)</para>
+        /// <para>
+        /// Scoped in MS.DI (when in a request, means one per web request)
+        /// see https://docs.microsoft.com/en-us/aspnet/core/fundamentals/dependency-injection?view=aspnetcore-2.2#service-lifetimes</para>
+        /// <para>
+        /// InstancePerLifetimeScope in Autofac (when in a request, means one per web request)
+        /// see https://autofaccn.readthedocs.io/en/latest/lifetime/instance-scope.html#instance-per-lifetime-scope
+        /// Also note that Autofac's InstancePerRequest is the same as this, see https://autofaccn.readthedocs.io/en/latest/lifetime/instance-scope.html#instance-per-request
+        /// it says "Behind the scenes, though, it’s still just instance per matching lifetime scope."
+        /// </para>
+        /// <para>
+        /// LifestyleScoped in Castle Windsor
+        /// </para>
+        /// </remarks>
         Scope,
 
         /// <summary>

From 0517f2913438638ace044e063facc74d12fb670f Mon Sep 17 00:00:00 2001
From: Linus Elander <linus@perlin.nu>
Date: Wed, 19 Jun 2019 21:41:47 +0200
Subject: [PATCH 236/776] Adjusts conditions for which indexes should be
 affected when a node is unpublished

(cherry picked from commit 7557c584d8331482ffb7157dcf2c4d083c5e226d)
---
 src/Umbraco.Web/Search/ExamineComponent.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Search/ExamineComponent.cs b/src/Umbraco.Web/Search/ExamineComponent.cs
index fd1eee8f96..d2eaa7aa0c 100644
--- a/src/Umbraco.Web/Search/ExamineComponent.cs
+++ b/src/Umbraco.Web/Search/ExamineComponent.cs
@@ -674,7 +674,7 @@ namespace Umbraco.Web.Search
             {
                 var strId = id.ToString(CultureInfo.InvariantCulture);
                 foreach (var index in examineComponent._examineManager.Indexes.OfType<IUmbracoIndex>()
-                    .Where(x => (keepIfUnpublished && !x.PublishedValuesOnly) || !keepIfUnpublished)
+                    .Where(x => x.PublishedValuesOnly || !keepIfUnpublished)
                     .Where(x => x.EnableDefaultEventHandler))
                 {
                     index.DeleteFromIndex(strId);

From e495faf83c2e927578092f64560d0f6179474bae Mon Sep 17 00:00:00 2001
From: Benjamin Carleski <benjamin@proworks.com>
Date: Wed, 7 Aug 2019 10:31:08 -0700
Subject: [PATCH 237/776] Fix FIPS compliance, add FIPS tests (#5978)

---
 .../ControllerTesting/TestRunner.cs           |  10 +-
 src/Umbraco.Tests/Umbraco.Tests.csproj        |   1 +
 .../AuthenticationControllerTests.cs          | 139 ++++++++++++++++++
 .../Web/Controllers/UsersControllerTests.cs   |  97 +++++++++++-
 .../Models/Mapping/UserMapDefinition.cs       |   2 +-
 5 files changed, 243 insertions(+), 6 deletions(-)
 create mode 100644 src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs

diff --git a/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestRunner.cs b/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestRunner.cs
index 8c598281dd..9f9f933d72 100644
--- a/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestRunner.cs
+++ b/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestRunner.cs
@@ -25,19 +25,23 @@ namespace Umbraco.Tests.TestHelpers.ControllerTesting
         public async Task<Tuple<HttpResponseMessage, string>> Execute(string controllerName, string actionName, HttpMethod method,
             HttpContent content = null,
             MediaTypeWithQualityHeaderValue mediaTypeHeader = null,
-            bool assertOkResponse = true)
+            bool assertOkResponse = true, object routeDefaults = null, string url = null)
         {
             if (mediaTypeHeader == null)
             {
                 mediaTypeHeader = new MediaTypeWithQualityHeaderValue("application/json");
             }
+            if (routeDefaults == null)
+            {
+                routeDefaults = new { controller = controllerName, action = actionName, id = RouteParameter.Optional };
+            }
 
             var startup = new TestStartup(
                 configuration =>
                 {
                     configuration.Routes.MapHttpRoute("Default",
                         routeTemplate: "{controller}/{action}/{id}",
-                        defaults: new { controller = controllerName, action = actionName, id = RouteParameter.Optional });
+                        defaults: routeDefaults);
                 },
                 _controllerFactory);
 
@@ -45,7 +49,7 @@ namespace Umbraco.Tests.TestHelpers.ControllerTesting
             {
                 var request = new HttpRequestMessage
                 {
-                    RequestUri = new Uri("https://testserver/"),
+                    RequestUri = new Uri("https://testserver/" + (url ?? "")),
                     Method = method
                 };
 
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 717006b702..f788168ddc 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -243,6 +243,7 @@
     <Compile Include="Cache\FullDataSetCachePolicyTests.cs" />
     <Compile Include="Cache\SingleItemsOnlyCachePolicyTests.cs" />
     <Compile Include="Collections\DeepCloneableListTests.cs" />
+    <Compile Include="Web\Controllers\AuthenticationControllerTests.cs" />
     <Compile Include="Web\Controllers\BackOfficeControllerUnitTests.cs" />
     <Compile Include="CoreThings\DelegateExtensionsTests.cs" />
     <Compile Include="Web\Controllers\ContentControllerTests.cs" />
diff --git a/src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs b/src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs
new file mode 100644
index 0000000000..3d264663b5
--- /dev/null
+++ b/src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs
@@ -0,0 +1,139 @@
+using System;
+using System.Collections.Concurrent;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+using System.Reflection;
+using System.Security.Cryptography;
+using System.Threading;
+using System.Web;
+using System.Web.Hosting;
+using System.Web.Http;
+using Moq;
+using Newtonsoft.Json;
+using NUnit.Framework;
+using Umbraco.Core;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Persistence.Mappers;
+using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Persistence.SqlSyntax;
+using Umbraco.Core.Services;
+using Umbraco.Tests.TestHelpers;
+using Umbraco.Tests.TestHelpers.ControllerTesting;
+using Umbraco.Tests.Testing;
+using Umbraco.Web;
+using Umbraco.Web.Editors;
+using Umbraco.Web.Features;
+using Umbraco.Web.Models.ContentEditing;
+using IUser = Umbraco.Core.Models.Membership.IUser;
+
+namespace Umbraco.Tests.Web.Controllers
+{
+    [TestFixture]
+    [UmbracoTest(Database = UmbracoTestOptions.Database.None)]
+    public class AuthenticationControllerTests : TestWithDatabaseBase
+    {
+        protected override void ComposeApplication(bool withApplication)
+        {
+            base.ComposeApplication(withApplication);
+            //if (!withApplication) return;
+
+            // replace the true IUserService implementation with a mock
+            // so that each test can configure the service to their liking
+            Composition.RegisterUnique(f => Mock.Of<IUserService>());
+
+            // kill the true IEntityService too
+            Composition.RegisterUnique(f => Mock.Of<IEntityService>());
+
+            Composition.RegisterUnique<UmbracoFeatures>();
+        }
+
+
+        [Test]
+        public async System.Threading.Tasks.Task GetCurrentUser_Fips()
+        {
+            ApiController CtrlFactory(HttpRequestMessage message, IUmbracoContextAccessor umbracoContextAccessor, UmbracoHelper helper)
+            {
+                //setup some mocks
+                var userServiceMock = Mock.Get(Current.Services.UserService);
+                userServiceMock.Setup(service => service.GetUserById(It.IsAny<int>()))
+                    .Returns(() => null);
+
+                if (Thread.GetDomain().GetData(".appPath") != null)
+                {
+                    HttpContext.Current = new HttpContext(new SimpleWorkerRequest("", "", new StringWriter()));
+                }
+                else
+                {
+                    var baseDir = IOHelper.MapPath("", false).TrimEnd(IOHelper.DirSepChar);
+                    HttpContext.Current = new HttpContext(new SimpleWorkerRequest("/", baseDir, "", "", new StringWriter()));
+                }
+                IOHelper.ForceNotHosted = true;
+                var usersController = new AuthenticationController(
+                    Factory.GetInstance<IGlobalSettings>(),
+                    umbracoContextAccessor,
+                    Factory.GetInstance<ISqlContext>(),
+                    Factory.GetInstance<ServiceContext>(),
+                    Factory.GetInstance<AppCaches>(),
+                    Factory.GetInstance<IProfilingLogger>(),
+                    Factory.GetInstance<IRuntimeState>(),
+                    helper);
+                return usersController;
+            }
+
+            Mock.Get(Current.SqlContext)
+                .Setup(x => x.Query<IUser>())
+                .Returns(new Query<IUser>(Current.SqlContext));
+
+            var syntax = new SqlCeSyntaxProvider();
+
+            Mock.Get(Current.SqlContext)
+                .Setup(x => x.SqlSyntax)
+                .Returns(syntax);
+
+            var mappers = new MapperCollection(new[]
+            {
+                new UserMapper(new Lazy<ISqlContext>(() => Current.SqlContext), new ConcurrentDictionary<Type, ConcurrentDictionary<string, string>>())
+            });
+
+            Mock.Get(Current.SqlContext)
+                .Setup(x => x.Mappers)
+                .Returns(mappers);
+
+            // Testing what happens if the system were configured to only use FIPS-compliant algorithms
+            var typ = typeof(CryptoConfig);
+            var flds = typ.GetFields(BindingFlags.Static | BindingFlags.NonPublic);
+            var haveFld = flds.FirstOrDefault(f => f.Name == "s_haveFipsAlgorithmPolicy");
+            var isFld = flds.FirstOrDefault(f => f.Name == "s_fipsAlgorithmPolicy");
+            var originalFipsValue = CryptoConfig.AllowOnlyFipsAlgorithms;
+
+            try
+            {
+                if (!originalFipsValue)
+                {
+                    haveFld.SetValue(null, true);
+                    isFld.SetValue(null, true);
+                }
+
+                var runner = new TestRunner(CtrlFactory);
+                var response = await runner.Execute("Authentication", "GetCurrentUser", HttpMethod.Get);
+
+                var obj = JsonConvert.DeserializeObject<UserDetail>(response.Item2);
+                Assert.AreEqual(-1, obj.UserId);
+            }
+            finally
+            {
+                if (!originalFipsValue)
+                {
+                    haveFld.SetValue(null, false);
+                    isFld.SetValue(null, false);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs b/src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs
index a4c3078b8f..85dd303432 100644
--- a/src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs
+++ b/src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs
@@ -4,6 +4,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
 using System.Net.Http.Formatting;
+using System.Reflection;
+using System.Security.Cryptography;
 using System.Web.Http;
 using Moq;
 using Newtonsoft.Json;
@@ -155,7 +157,7 @@ namespace Umbraco.Tests.Web.Controllers
             var runner = new TestRunner(CtrlFactory);
             var response = await runner.Execute("Users", "GetPagedUsers", HttpMethod.Get);
 
-            var obj = JsonConvert.DeserializeObject<PagedResult<UserDisplay>>(response.Item2);
+            var obj = JsonConvert.DeserializeObject<PagedResult<UserBasic>>(response.Item2);
             Assert.AreEqual(0, obj.TotalItems);
         }
 
@@ -190,9 +192,100 @@ namespace Umbraco.Tests.Web.Controllers
             var runner = new TestRunner(CtrlFactory);
             var response = await runner.Execute("Users", "GetPagedUsers", HttpMethod.Get);
 
-            var obj = JsonConvert.DeserializeObject<PagedResult<UserDisplay>>(response.Item2);
+            var obj = JsonConvert.DeserializeObject<PagedResult<UserBasic>>(response.Item2);
             Assert.AreEqual(10, obj.TotalItems);
             Assert.AreEqual(10, obj.Items.Count());
         }
+
+        [Test]
+        public async System.Threading.Tasks.Task GetPagedUsers_Fips()
+        {
+            await RunFipsTest("GetPagedUsers", mock =>
+            {
+                var users = MockedUser.CreateMulipleUsers(10);
+                long outVal = 10;
+                mock.Setup(service => service.GetAll(
+                        It.IsAny<long>(), It.IsAny<int>(), out outVal, It.IsAny<string>(), It.IsAny<Direction>(),
+                        It.IsAny<UserState[]>(), It.IsAny<string[]>(), It.IsAny<string[]>(), It.IsAny<IQuery<IUser>>()))
+                    .Returns(() => users);
+            }, response =>
+            {
+                var obj = JsonConvert.DeserializeObject<PagedResult<UserBasic>>(response.Item2);
+                Assert.AreEqual(10, obj.TotalItems);
+                Assert.AreEqual(10, obj.Items.Count());
+            });
+        }
+
+        [Test]
+        public async System.Threading.Tasks.Task GetById_Fips()
+        {
+            const int mockUserId = 1234;
+            var user = MockedUser.CreateUser();
+
+            await RunFipsTest("GetById", mock =>
+            {
+                mock.Setup(service => service.GetUserById(1234))
+                    .Returns((int i) => i == mockUserId ? user : null);
+            }, response =>
+            {
+                var obj = JsonConvert.DeserializeObject<UserDisplay>(response.Item2);
+                Assert.AreEqual(user.Username, obj.Username);
+                Assert.AreEqual(user.Email, obj.Email);
+            }, new { controller = "Users", action = "GetById" }, $"Users/GetById/{mockUserId}");
+        }
+
+
+        private async System.Threading.Tasks.Task RunFipsTest(string action, Action<Mock<IUserService>> userServiceSetup,
+            Action<Tuple<HttpResponseMessage, string>> verification,
+            object routeDefaults = null, string url = null)
+        {
+            ApiController CtrlFactory(HttpRequestMessage message, IUmbracoContextAccessor umbracoContextAccessor, UmbracoHelper helper)
+            {
+                //setup some mocks
+                var userServiceMock = Mock.Get(Current.Services.UserService);
+                userServiceSetup(userServiceMock);
+
+                var usersController = new UsersController(
+                    Factory.GetInstance<IGlobalSettings>(),
+                    umbracoContextAccessor,
+                    Factory.GetInstance<ISqlContext>(),
+                    Factory.GetInstance<ServiceContext>(),
+                    Factory.GetInstance<AppCaches>(),
+                    Factory.GetInstance<IProfilingLogger>(),
+                    Factory.GetInstance<IRuntimeState>(),
+                    helper);
+                return usersController;
+            }
+
+            // Testing what happens if the system were configured to only use FIPS-compliant algorithms
+            var typ = typeof(CryptoConfig);
+            var flds = typ.GetFields(BindingFlags.Static | BindingFlags.NonPublic);
+            var haveFld = flds.FirstOrDefault(f => f.Name == "s_haveFipsAlgorithmPolicy");
+            var isFld = flds.FirstOrDefault(f => f.Name == "s_fipsAlgorithmPolicy");
+            var originalFipsValue = CryptoConfig.AllowOnlyFipsAlgorithms;
+
+            try
+            {
+                if (!originalFipsValue)
+                {
+                    haveFld.SetValue(null, true);
+                    isFld.SetValue(null, true);
+                }
+
+                MockForGetPagedUsers();
+
+                var runner = new TestRunner(CtrlFactory);
+                var response = await runner.Execute("Users", action, HttpMethod.Get, routeDefaults: routeDefaults, url: url);
+                verification(response);
+            }
+            finally
+            {
+                if (!originalFipsValue)
+                {
+                    haveFld.SetValue(null, false);
+                    isFld.SetValue(null, false);
+                }
+            }
+        }
     }
 }
diff --git a/src/Umbraco.Web/Models/Mapping/UserMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/UserMapDefinition.cs
index 3860d5d525..4acda1e552 100644
--- a/src/Umbraco.Web/Models/Mapping/UserMapDefinition.cs
+++ b/src/Umbraco.Web/Models/Mapping/UserMapDefinition.cs
@@ -301,7 +301,7 @@ namespace Umbraco.Web.Models.Mapping
             target.Avatars = source.GetUserAvatarUrls(_appCaches.RuntimeCache);
             target.Culture = source.GetUserCulture(_textService, _globalSettings).ToString();
             target.Email = source.Email;
-            target.EmailHash = source.Email.ToLowerInvariant().Trim().ToMd5();
+            target.EmailHash = source.Email.ToLowerInvariant().Trim().GenerateHash();
             target.Id = source.Id;
             target.Key = source.Key;
             target.LastLoginDate = source.LastLoginDate == default ? null : (DateTime?) source.LastLoginDate;

From 289d50d170e90e7c2ba7193bae12e08790e86f3f Mon Sep 17 00:00:00 2001
From: Benjamin Carleski <benjamin@proworks.com>
Date: Wed, 7 Aug 2019 10:31:08 -0700
Subject: [PATCH 238/776] Fix FIPS compliance, add FIPS tests (#5978)

(cherry picked from commit e495faf83c2e927578092f64560d0f6179474bae)
---
 .../ControllerTesting/TestRunner.cs           |  10 +-
 src/Umbraco.Tests/Umbraco.Tests.csproj        |   1 +
 .../AuthenticationControllerTests.cs          | 139 ++++++++++++++++++
 .../Web/Controllers/UsersControllerTests.cs   |  97 +++++++++++-
 .../Models/Mapping/UserMapDefinition.cs       |   2 +-
 5 files changed, 243 insertions(+), 6 deletions(-)
 create mode 100644 src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs

diff --git a/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestRunner.cs b/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestRunner.cs
index 8c598281dd..9f9f933d72 100644
--- a/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestRunner.cs
+++ b/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestRunner.cs
@@ -25,19 +25,23 @@ namespace Umbraco.Tests.TestHelpers.ControllerTesting
         public async Task<Tuple<HttpResponseMessage, string>> Execute(string controllerName, string actionName, HttpMethod method,
             HttpContent content = null,
             MediaTypeWithQualityHeaderValue mediaTypeHeader = null,
-            bool assertOkResponse = true)
+            bool assertOkResponse = true, object routeDefaults = null, string url = null)
         {
             if (mediaTypeHeader == null)
             {
                 mediaTypeHeader = new MediaTypeWithQualityHeaderValue("application/json");
             }
+            if (routeDefaults == null)
+            {
+                routeDefaults = new { controller = controllerName, action = actionName, id = RouteParameter.Optional };
+            }
 
             var startup = new TestStartup(
                 configuration =>
                 {
                     configuration.Routes.MapHttpRoute("Default",
                         routeTemplate: "{controller}/{action}/{id}",
-                        defaults: new { controller = controllerName, action = actionName, id = RouteParameter.Optional });
+                        defaults: routeDefaults);
                 },
                 _controllerFactory);
 
@@ -45,7 +49,7 @@ namespace Umbraco.Tests.TestHelpers.ControllerTesting
             {
                 var request = new HttpRequestMessage
                 {
-                    RequestUri = new Uri("https://testserver/"),
+                    RequestUri = new Uri("https://testserver/" + (url ?? "")),
                     Method = method
                 };
 
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 717006b702..f788168ddc 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -243,6 +243,7 @@
     <Compile Include="Cache\FullDataSetCachePolicyTests.cs" />
     <Compile Include="Cache\SingleItemsOnlyCachePolicyTests.cs" />
     <Compile Include="Collections\DeepCloneableListTests.cs" />
+    <Compile Include="Web\Controllers\AuthenticationControllerTests.cs" />
     <Compile Include="Web\Controllers\BackOfficeControllerUnitTests.cs" />
     <Compile Include="CoreThings\DelegateExtensionsTests.cs" />
     <Compile Include="Web\Controllers\ContentControllerTests.cs" />
diff --git a/src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs b/src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs
new file mode 100644
index 0000000000..3d264663b5
--- /dev/null
+++ b/src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs
@@ -0,0 +1,139 @@
+using System;
+using System.Collections.Concurrent;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+using System.Reflection;
+using System.Security.Cryptography;
+using System.Threading;
+using System.Web;
+using System.Web.Hosting;
+using System.Web.Http;
+using Moq;
+using Newtonsoft.Json;
+using NUnit.Framework;
+using Umbraco.Core;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Persistence.Mappers;
+using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Persistence.SqlSyntax;
+using Umbraco.Core.Services;
+using Umbraco.Tests.TestHelpers;
+using Umbraco.Tests.TestHelpers.ControllerTesting;
+using Umbraco.Tests.Testing;
+using Umbraco.Web;
+using Umbraco.Web.Editors;
+using Umbraco.Web.Features;
+using Umbraco.Web.Models.ContentEditing;
+using IUser = Umbraco.Core.Models.Membership.IUser;
+
+namespace Umbraco.Tests.Web.Controllers
+{
+    [TestFixture]
+    [UmbracoTest(Database = UmbracoTestOptions.Database.None)]
+    public class AuthenticationControllerTests : TestWithDatabaseBase
+    {
+        protected override void ComposeApplication(bool withApplication)
+        {
+            base.ComposeApplication(withApplication);
+            //if (!withApplication) return;
+
+            // replace the true IUserService implementation with a mock
+            // so that each test can configure the service to their liking
+            Composition.RegisterUnique(f => Mock.Of<IUserService>());
+
+            // kill the true IEntityService too
+            Composition.RegisterUnique(f => Mock.Of<IEntityService>());
+
+            Composition.RegisterUnique<UmbracoFeatures>();
+        }
+
+
+        [Test]
+        public async System.Threading.Tasks.Task GetCurrentUser_Fips()
+        {
+            ApiController CtrlFactory(HttpRequestMessage message, IUmbracoContextAccessor umbracoContextAccessor, UmbracoHelper helper)
+            {
+                //setup some mocks
+                var userServiceMock = Mock.Get(Current.Services.UserService);
+                userServiceMock.Setup(service => service.GetUserById(It.IsAny<int>()))
+                    .Returns(() => null);
+
+                if (Thread.GetDomain().GetData(".appPath") != null)
+                {
+                    HttpContext.Current = new HttpContext(new SimpleWorkerRequest("", "", new StringWriter()));
+                }
+                else
+                {
+                    var baseDir = IOHelper.MapPath("", false).TrimEnd(IOHelper.DirSepChar);
+                    HttpContext.Current = new HttpContext(new SimpleWorkerRequest("/", baseDir, "", "", new StringWriter()));
+                }
+                IOHelper.ForceNotHosted = true;
+                var usersController = new AuthenticationController(
+                    Factory.GetInstance<IGlobalSettings>(),
+                    umbracoContextAccessor,
+                    Factory.GetInstance<ISqlContext>(),
+                    Factory.GetInstance<ServiceContext>(),
+                    Factory.GetInstance<AppCaches>(),
+                    Factory.GetInstance<IProfilingLogger>(),
+                    Factory.GetInstance<IRuntimeState>(),
+                    helper);
+                return usersController;
+            }
+
+            Mock.Get(Current.SqlContext)
+                .Setup(x => x.Query<IUser>())
+                .Returns(new Query<IUser>(Current.SqlContext));
+
+            var syntax = new SqlCeSyntaxProvider();
+
+            Mock.Get(Current.SqlContext)
+                .Setup(x => x.SqlSyntax)
+                .Returns(syntax);
+
+            var mappers = new MapperCollection(new[]
+            {
+                new UserMapper(new Lazy<ISqlContext>(() => Current.SqlContext), new ConcurrentDictionary<Type, ConcurrentDictionary<string, string>>())
+            });
+
+            Mock.Get(Current.SqlContext)
+                .Setup(x => x.Mappers)
+                .Returns(mappers);
+
+            // Testing what happens if the system were configured to only use FIPS-compliant algorithms
+            var typ = typeof(CryptoConfig);
+            var flds = typ.GetFields(BindingFlags.Static | BindingFlags.NonPublic);
+            var haveFld = flds.FirstOrDefault(f => f.Name == "s_haveFipsAlgorithmPolicy");
+            var isFld = flds.FirstOrDefault(f => f.Name == "s_fipsAlgorithmPolicy");
+            var originalFipsValue = CryptoConfig.AllowOnlyFipsAlgorithms;
+
+            try
+            {
+                if (!originalFipsValue)
+                {
+                    haveFld.SetValue(null, true);
+                    isFld.SetValue(null, true);
+                }
+
+                var runner = new TestRunner(CtrlFactory);
+                var response = await runner.Execute("Authentication", "GetCurrentUser", HttpMethod.Get);
+
+                var obj = JsonConvert.DeserializeObject<UserDetail>(response.Item2);
+                Assert.AreEqual(-1, obj.UserId);
+            }
+            finally
+            {
+                if (!originalFipsValue)
+                {
+                    haveFld.SetValue(null, false);
+                    isFld.SetValue(null, false);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs b/src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs
index a4c3078b8f..85dd303432 100644
--- a/src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs
+++ b/src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs
@@ -4,6 +4,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
 using System.Net.Http.Formatting;
+using System.Reflection;
+using System.Security.Cryptography;
 using System.Web.Http;
 using Moq;
 using Newtonsoft.Json;
@@ -155,7 +157,7 @@ namespace Umbraco.Tests.Web.Controllers
             var runner = new TestRunner(CtrlFactory);
             var response = await runner.Execute("Users", "GetPagedUsers", HttpMethod.Get);
 
-            var obj = JsonConvert.DeserializeObject<PagedResult<UserDisplay>>(response.Item2);
+            var obj = JsonConvert.DeserializeObject<PagedResult<UserBasic>>(response.Item2);
             Assert.AreEqual(0, obj.TotalItems);
         }
 
@@ -190,9 +192,100 @@ namespace Umbraco.Tests.Web.Controllers
             var runner = new TestRunner(CtrlFactory);
             var response = await runner.Execute("Users", "GetPagedUsers", HttpMethod.Get);
 
-            var obj = JsonConvert.DeserializeObject<PagedResult<UserDisplay>>(response.Item2);
+            var obj = JsonConvert.DeserializeObject<PagedResult<UserBasic>>(response.Item2);
             Assert.AreEqual(10, obj.TotalItems);
             Assert.AreEqual(10, obj.Items.Count());
         }
+
+        [Test]
+        public async System.Threading.Tasks.Task GetPagedUsers_Fips()
+        {
+            await RunFipsTest("GetPagedUsers", mock =>
+            {
+                var users = MockedUser.CreateMulipleUsers(10);
+                long outVal = 10;
+                mock.Setup(service => service.GetAll(
+                        It.IsAny<long>(), It.IsAny<int>(), out outVal, It.IsAny<string>(), It.IsAny<Direction>(),
+                        It.IsAny<UserState[]>(), It.IsAny<string[]>(), It.IsAny<string[]>(), It.IsAny<IQuery<IUser>>()))
+                    .Returns(() => users);
+            }, response =>
+            {
+                var obj = JsonConvert.DeserializeObject<PagedResult<UserBasic>>(response.Item2);
+                Assert.AreEqual(10, obj.TotalItems);
+                Assert.AreEqual(10, obj.Items.Count());
+            });
+        }
+
+        [Test]
+        public async System.Threading.Tasks.Task GetById_Fips()
+        {
+            const int mockUserId = 1234;
+            var user = MockedUser.CreateUser();
+
+            await RunFipsTest("GetById", mock =>
+            {
+                mock.Setup(service => service.GetUserById(1234))
+                    .Returns((int i) => i == mockUserId ? user : null);
+            }, response =>
+            {
+                var obj = JsonConvert.DeserializeObject<UserDisplay>(response.Item2);
+                Assert.AreEqual(user.Username, obj.Username);
+                Assert.AreEqual(user.Email, obj.Email);
+            }, new { controller = "Users", action = "GetById" }, $"Users/GetById/{mockUserId}");
+        }
+
+
+        private async System.Threading.Tasks.Task RunFipsTest(string action, Action<Mock<IUserService>> userServiceSetup,
+            Action<Tuple<HttpResponseMessage, string>> verification,
+            object routeDefaults = null, string url = null)
+        {
+            ApiController CtrlFactory(HttpRequestMessage message, IUmbracoContextAccessor umbracoContextAccessor, UmbracoHelper helper)
+            {
+                //setup some mocks
+                var userServiceMock = Mock.Get(Current.Services.UserService);
+                userServiceSetup(userServiceMock);
+
+                var usersController = new UsersController(
+                    Factory.GetInstance<IGlobalSettings>(),
+                    umbracoContextAccessor,
+                    Factory.GetInstance<ISqlContext>(),
+                    Factory.GetInstance<ServiceContext>(),
+                    Factory.GetInstance<AppCaches>(),
+                    Factory.GetInstance<IProfilingLogger>(),
+                    Factory.GetInstance<IRuntimeState>(),
+                    helper);
+                return usersController;
+            }
+
+            // Testing what happens if the system were configured to only use FIPS-compliant algorithms
+            var typ = typeof(CryptoConfig);
+            var flds = typ.GetFields(BindingFlags.Static | BindingFlags.NonPublic);
+            var haveFld = flds.FirstOrDefault(f => f.Name == "s_haveFipsAlgorithmPolicy");
+            var isFld = flds.FirstOrDefault(f => f.Name == "s_fipsAlgorithmPolicy");
+            var originalFipsValue = CryptoConfig.AllowOnlyFipsAlgorithms;
+
+            try
+            {
+                if (!originalFipsValue)
+                {
+                    haveFld.SetValue(null, true);
+                    isFld.SetValue(null, true);
+                }
+
+                MockForGetPagedUsers();
+
+                var runner = new TestRunner(CtrlFactory);
+                var response = await runner.Execute("Users", action, HttpMethod.Get, routeDefaults: routeDefaults, url: url);
+                verification(response);
+            }
+            finally
+            {
+                if (!originalFipsValue)
+                {
+                    haveFld.SetValue(null, false);
+                    isFld.SetValue(null, false);
+                }
+            }
+        }
     }
 }
diff --git a/src/Umbraco.Web/Models/Mapping/UserMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/UserMapDefinition.cs
index 3860d5d525..4acda1e552 100644
--- a/src/Umbraco.Web/Models/Mapping/UserMapDefinition.cs
+++ b/src/Umbraco.Web/Models/Mapping/UserMapDefinition.cs
@@ -301,7 +301,7 @@ namespace Umbraco.Web.Models.Mapping
             target.Avatars = source.GetUserAvatarUrls(_appCaches.RuntimeCache);
             target.Culture = source.GetUserCulture(_textService, _globalSettings).ToString();
             target.Email = source.Email;
-            target.EmailHash = source.Email.ToLowerInvariant().Trim().ToMd5();
+            target.EmailHash = source.Email.ToLowerInvariant().Trim().GenerateHash();
             target.Id = source.Id;
             target.Key = source.Key;
             target.LastLoginDate = source.LastLoginDate == default ? null : (DateTime?) source.LastLoginDate;

From 6c0fb2f849fa9287c4bc1ff218a6aeb9172e8a62 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Wed, 7 Aug 2019 19:56:30 +0200
Subject: [PATCH 239/776] Fix the create context menu overflows introduced with
 405e9a79 (#5754)

---
 .../src/views/contentblueprints/create.html   |  4 ++--
 .../src/views/datatypes/create.html           |  8 ++++----
 .../src/views/documenttypes/create.html       | 16 +++++++--------
 .../src/views/media/create.html               |  4 ++--
 .../src/views/mediatypes/create.html          |  8 ++++----
 .../src/views/member/create.html              |  4 ++--
 .../src/views/membertypes/create.html         |  8 ++++----
 .../src/views/partialviewmacros/create.html   | 20 +++++++++----------
 .../src/views/partialviews/create.html        | 16 +++++++--------
 .../src/views/scripts/create.html             |  8 ++++----
 .../src/views/stylesheets/create.html         | 12 +++++------
 11 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/contentblueprints/create.html b/src/Umbraco.Web.UI.Client/src/views/contentblueprints/create.html
index 24cfe5d0d1..6146c007b1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/contentblueprints/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/contentblueprints/create.html
@@ -11,7 +11,7 @@
 
             <ul class="umb-actions umb-actions-child">
                 <li class="umb-action" ng-repeat="documentType in vm.documentTypes | orderBy:'name':false">
-                    <a href="" class="umb-action-link" ng-click="vm.createBlueprint(documentType)" prevent-default>
+                    <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.createBlueprint(documentType)" prevent-default>
                         <i class="large icon {{documentType.icon}}"></i>
                         <span class="menu-label">
                             {{documentType.name}}
@@ -19,7 +19,7 @@
                                 {{documentType.description}}
                             </small>
                         </span>
-                    </a>
+                    </button>
                 </li>
             </ul>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/datatypes/create.html b/src/Umbraco.Web.UI.Client/src/views/datatypes/create.html
index c359e7bfd1..55039831ac 100644
--- a/src/Umbraco.Web.UI.Client/src/views/datatypes/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/datatypes/create.html
@@ -6,20 +6,20 @@
 
             <ul class="umb-actions umb-actions-child">           
                 <li data-element="action-data-type" class="umb-action">
-                    <a href="" class="umb-action-link" ng-click="createDataType()" umb-auto-focus>
+                    <button href="" class="umb-action-link umb-outline btn-reset" ng-click="createDataType()" umb-auto-focus>
                         <i class="large icon icon-autofill"></i>
                         <span class="menu-label">
                             <localize key="create_newDataType">New data type</localize>
                         </span>
-                    </a>
+                    </button>
                 </li>
                 <li data-element="action-folder" class="umb-action">
-                    <a href="" class="umb-action-link" ng-click="showCreateFolder()">
+                    <button href="" class="umb-action-link umb-outline btn-reset" ng-click="showCreateFolder()">
                         <i class="large icon icon-folder"></i>
                         <span class="menu-label">
                             <localize key="create_newFolder">New folder</localize>...
                         </span>
-                    </a>
+                    </button>
                 </li>
             </ul>
         </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html
index 4085e84ccd..2241f852b5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html
@@ -7,36 +7,36 @@
 
             <ul class="umb-actions umb-actions-child">
                 <li data-element="action-documentType" class="umb-action" ng-hide="model.disableTemplates">
-                    <a href="" ng-click="createDocType()" class="umb-action-link" umb-auto-focus>
+                    <button href="" ng-click="createDocType()" class="umb-action-link umb-outline btn-reset" umb-auto-focus>
                         <i class="large icon icon-item-arrangement"></i>
                         <span class="menu-label">
                             <localize key="content_documentType">Document type</localize>
                         </span>
-                    </a>
+                    </button>
                 </li>
                 <li data-element="action-documentTypeWithoutTemplate" class="umb-action">
-                    <a href="" ng-click="createComponent()" class="umb-action-link">
+                    <button href="" ng-click="createComponent()" class="umb-action-link umb-outline btn-reset">
                         <i class="large icon icon-item-arrangement"></i>
                         <span class="menu-label">
                             <localize ng-if="model.disableTemplates === false" key="create_documentTypeWithoutTemplate"></localize>
                             <localize ng-if="model.disableTemplates === true" key="content_documentType">Document type></localize>
                         </span>
-                    </a>
+                    </button>
                 </li>
                 <li data-element="action-documentTypeCollection" class="umb-action">
-                    <a href="" ng-click="showCreateDocTypeCollection()" class="umb-action-link">
+                    <button href="" ng-click="showCreateDocTypeCollection()" class="umb-action-link umb-outline btn-reset">
                         <i class="large icon icon-thumbnail-list"></i>
                         <span class="menu-label">
                             Document Type Collection...
                             <!--                        <localize key="content_documentType_collection">Document Type Collection</localize>-->
                         </span>
-                    </a>
+                    </button>
                 </li>
                 <li data-element="action-folder" ng-if="model.allowCreateFolder" class="umb-action">
-                    <a href="" ng-click="showCreateFolder()" class="umb-action-link">
+                    <button href="" ng-click="showCreateFolder()" class="umb-action-link umb-outline btn-reset">
                         <i class="large icon icon-folder"></i>
                         <span class="menu-label"><localize key="general_folder"></localize>...</span>
-                    </a>
+                    </button>
                 </li>
             </ul>
         </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/create.html b/src/Umbraco.Web.UI.Client/src/views/media/create.html
index d93d4f0e30..57c8f48eb4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/create.html
@@ -17,13 +17,13 @@
 			<ul class="umb-actions umb-actions-child">
 
 				<li data-element="action-{{docType.alias}}" class="umb-action" ng-repeat="docType in allowedTypes">
-					<a ng-href="" ng-click="createMediaItem(docType)" class="umb-action-link" prevent-default>
+					<button ng-click="createMediaItem(docType)" class="umb-action-link umb-outline btn-reset" prevent-default>
 						<i class="large icon {{docType.icon}}"></i>
 						<span class="menu-label">
 							{{docType.name}}
 							<small>{{docType.description}}</small>
 						</span>
-					</a>
+					</button>
 				</li>
 				<!--
 					<li class="add">
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html b/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html
index 094d1ff8e4..4c0b8bb6ae 100644
--- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html
@@ -7,19 +7,19 @@
 
             <ul class="umb-actions umb-actions-child">           
                 <li class="umb-action">
-                    <a href="" class="umb-action-link" ng-click="createMediaType()" umb-auto-focus>
+                    <button href="" class="umb-action-link umb-outline btn-reset" ng-click="createMediaType()" umb-auto-focus>
                         <i class="large icon icon-item-arrangement"></i>
                         <span class="menu-label">
                             <localize key="general_new">New</localize>
                             <localize key="content_mediatype">Media type</localize>
                         </span>
-                    </a>
+                    </button>
                 </li>
                 <li class="umb-action">
-                    <a href="" class="umb-action-link" ng-click="showCreateFolder()">
+                    <button href="" class="umb-action-link umb-outline btn-reset" ng-click="showCreateFolder()">
                         <i class="large icon icon-folder"></i>
                         <span class="menu-label"><localize key="general_folder"></localize>...</span>
-                    </a>
+                    </button>
                 </li>
             </ul>
         </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/create.html b/src/Umbraco.Web.UI.Client/src/views/member/create.html
index 2292cf18ee..ff7e954c02 100644
--- a/src/Umbraco.Web.UI.Client/src/views/member/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/member/create.html
@@ -6,13 +6,13 @@
             <ul class="umb-actions umb-actions-child">
 
                 <li class="umb-action" ng-repeat="docType in allowedTypes">
-                    <a class="umb-action-link" href="#member/member/edit/{{currentNode.id}}?doctype={{docType.alias}}&create=true" ng-click="hideActions()">
+                    <button class="umb-action-link umb-outline btn-reset" href="#member/member/edit/{{currentNode.id}}?doctype={{docType.alias}}&create=true" ng-click="hideActions()">
                         <i class="large icon {{docType.icon}}"></i>
                         <span class="menu-label">
                             {{docType.name}}
                             <small>{{docType.description}}</small>
                         </span>
-                    </a>
+                    </button>
                 </li>
             </ul>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/membertypes/create.html b/src/Umbraco.Web.UI.Client/src/views/membertypes/create.html
index 00662cb29a..5964bdb75e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/membertypes/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/membertypes/create.html
@@ -5,13 +5,13 @@
 
         <ul class="umb-actions umb-actions-child">
             <li class="umb-action">
-                <a href="" class="umb-action-link" ng-click="showCreateFolder()">
+                <button href="" class="umb-action-link umb-outline btn-reset" ng-click="showCreateFolder()">
                     <i class="large icon icon-folder"></i>
                     <span class="menu-label"><localize key="general_folder"></localize></span>
-                </a>
+                </button>
             </li>
             <li class="umb-action">
-                <a href="" class="umb-action-link" ng-click="createMemberType()">
+                <button href="" class="umb-action-link umb-outline btn-reset" ng-click="createMemberType()">
 
                     <i class="large icon icon-item-arrangement"></i>
 
@@ -20,7 +20,7 @@
                         <localize key="content_memberType">Member type</localize>
                     </span>
 
-                </a>
+                </button>
             </li>
         </ul>
     </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html
index 88ab5b944c..bd91585d4e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html
@@ -11,28 +11,28 @@
 
                 <ul class="umb-actions umb-actions-child">
                     <li class="umb-action">
-                        <a href="" class="umb-action-link" ng-click="vm.createFile()" umb-auto-focus>
+                        <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.createFile()" umb-auto-focus>
                             <i class="large icon-article"></i>
                             <span class="menu-label"><localize key="create_newPartialViewMacro">New partial view macro</localize></span>
-                        </a>
+                        </button>
                     </li>
                     <li class="umb-action">
-                        <a href="" class="umb-action-link" ng-click="vm.createFileWithoutMacro()">
+                        <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.createFileWithoutMacro()">
                             <i class="large icon icon-article"></i>
                             <span class="menu-label"><localize key="create_newPartialViewMacroNoMacro">New partial view macro (without macro)</localize></span>
-                        </a>
+                        </button>
                     </li>
                     <li class="umb-action">
-                        <a href="" class="umb-action-link" ng-click="vm.showCreateFromSnippet()">
+                        <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFromSnippet()">
                             <i class="large icon icon-article"></i>
                             <span class="menu-label"><localize key="create_newPartialViewMacroFromSnippet">>New partial view macro from snippet</localize>...</span>
-                        </a>
+                        </button>
                     </li>
                     <li class="umb-action">
-                        <a href="" class="umb-action-link" ng-click="vm.showCreateFolder()">
+                        <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFolder()">
                             <i class="large icon icon-folder"></i>
                             <span class="menu-label"><localize key="general_folder"></localize>...</span>
-                        </a>
+                        </button>
                     </li>
                 </ul>
             </div>
@@ -44,10 +44,10 @@
 
                 <ul class="umb-actions umb-actions-child">
                     <li class="umb-action" ng-repeat="snippet in vm.snippets">
-                        <a href="" class="umb-action-link" ng-click="vm.createFileFromSnippet(snippet)" style="padding-top: 6px; padding-bottom: 6px;">
+                        <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.createFileFromSnippet(snippet)" style="padding-top: 6px; padding-bottom: 6px;">
                             <i class="icon-article icon" style="font-size: 20px;"></i>
                             <span class="menu-label" style="margin-left: 0; padding-left: 5px;">{{ snippet.name }}</span>
-                        </a>
+                        </button>
                     </li>
                 </ul>
             </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html
index 93c2eeb8ca..661bc615f6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html
@@ -10,22 +10,22 @@
             <div ng-if="!vm.showSnippets">
                 <ul class="umb-actions umb-actions-child">
                     <li class="umb-action">
-                        <a href="" class="umb-action-link" ng-click="vm.createPartialView()" umb-auto-focus>
+                        <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.createPartialView()" umb-auto-focus>
                             <i class="large icon icon-article"></i>
                             <span class="menu-label"><localize key="create_newEmptyPartialView">New empty partial view</localize></span>
-                        </a>
+                        </button>
                     </li>
                     <li class="umb-action">
-                        <a href="" class="umb-action-link" ng-click="vm.showCreateFromSnippet()">
+                        <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFromSnippet()">
                             <i class="large icon icon-article"></i>
                             <span class="menu-label"><localize key="create_newPartialViewFromSnippet">New partial view from snippet</localize>...</span>
-                        </a>
+                        </button>
                     </li>
                     <li class="umb-action">
-                        <a href="" class="umb-action-link" ng-click="vm.showCreateFolder()">
+                        <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFolder()">
                             <i class="large icon icon-folder"></i>
                             <span class="menu-label"><localize key="general_folder"></localize>...</span>
-                        </a>
+                        </button>
                     </li>
                 </ul>
             </div>
@@ -34,10 +34,10 @@
             <div ng-if="vm.showSnippets">
                 <ul class="umb-actions umb-actions-child">
                     <li class="umb-action" ng-repeat="snippet in vm.snippets">
-                        <a href="" class="umb-action-link" ng-click="vm.createPartialView(snippet)" style="padding-top: 6px; padding-bottom: 6px;">
+                        <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.createPartialView(snippet)" style="padding-top: 6px; padding-bottom: 6px;">
                             <i class="icon-article icon" style="font-size: 20px;"></i>
                             <span class="menu-label" style="margin-left: 0; padding-left: 5px;">{{ snippet.name }}</span>
-                        </a>
+                        </button>
                     </li>
                 </ul>
             </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/scripts/create.html b/src/Umbraco.Web.UI.Client/src/views/scripts/create.html
index 2dc1f39ff8..7d2896f606 100644
--- a/src/Umbraco.Web.UI.Client/src/views/scripts/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/scripts/create.html
@@ -7,16 +7,16 @@
 
             <ul class="umb-actions umb-actions-child">
                 <li class="umb-action">
-                    <a href="" class="umb-action-link" umb-auto-focus ng-click="vm.createFile()">
+                    <button href="" class="umb-action-link umb-outline btn-reset" umb-auto-focus ng-click="vm.createFile()">
                         <i class="large icon icon-script"></i>
                         <span class="menu-label"><localize key="create_newJavascriptFile">New javascript file</localize></span>
-                    </a>
+                    </button>
                 </li>
                 <li class="umb-action">
-                    <a href="" class="umb-action-link" ng-click="vm.showCreateFolder()">
+                    <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFolder()">
                         <i class="large icon icon-folder"></i>
                         <span class="menu-label"><localize key="general_folder"></localize>...</span>
-                    </a>
+                    </button>
                 </li>
             </ul>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html b/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html
index 999a17ca77..4c7f62e17f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html
@@ -7,22 +7,22 @@
 
             <ul class="umb-actions umb-actions-child">
                 <li class="umb-action">
-                    <a href="" class="umb-action-link" umb-auto-focus ng-click="vm.createFile()">
+                    <button href="" class="umb-action-link umb-outline btn-reset" umb-auto-focus ng-click="vm.createFile()">
                         <i class="large icon icon-script"></i>
                         <span class="menu-label"><localize key="create_newStyleSheetFile">New style sheet file</localize></span>
-                    </a>
+                    </button>
                 </li>
                 <li class="umb-action">
-                    <a href="" ng-click="vm.createRichtextStyle()" class="umb-action-link">
+                    <button href="" ng-click="vm.createRichtextStyle()" class="umb-action-link umb-outline btn-reset">
                         <i class="large icon icon-script"></i>
                         <span class="menu-label"><localize key="create_newRteStyleSheetFile">New richtext style sheet file</localize></span>
-                    </a>
+                    </button>
                 </li>
                 <li class="umb-action">
-                    <a href="" class="umb-action-link" ng-click="vm.showCreateFolder()">
+                    <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFolder()">
                         <i class="large icon icon-folder"></i>
                         <span class="menu-label"><localize key="general_folder"></localize>...</span>
-                    </a>
+                    </button>
                 </li>
             </ul>
 

From 36eccb472cca07b580d791135d29a3f1a61e9706 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Wed, 7 Aug 2019 19:56:30 +0200
Subject: [PATCH 240/776] Fix the create context menu overflows introduced with
 405e9a79 (#5754)

(cherry picked from commit 6c0fb2f849fa9287c4bc1ff218a6aeb9172e8a62)
---
 .../src/views/contentblueprints/create.html   |  4 ++--
 .../src/views/datatypes/create.html           |  8 ++++----
 .../src/views/documenttypes/create.html       | 16 +++++++--------
 .../src/views/media/create.html               |  4 ++--
 .../src/views/mediatypes/create.html          |  8 ++++----
 .../src/views/member/create.html              |  4 ++--
 .../src/views/membertypes/create.html         |  8 ++++----
 .../src/views/partialviewmacros/create.html   | 20 +++++++++----------
 .../src/views/partialviews/create.html        | 16 +++++++--------
 .../src/views/scripts/create.html             |  8 ++++----
 .../src/views/stylesheets/create.html         | 12 +++++------
 11 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/contentblueprints/create.html b/src/Umbraco.Web.UI.Client/src/views/contentblueprints/create.html
index 24cfe5d0d1..6146c007b1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/contentblueprints/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/contentblueprints/create.html
@@ -11,7 +11,7 @@
 
             <ul class="umb-actions umb-actions-child">
                 <li class="umb-action" ng-repeat="documentType in vm.documentTypes | orderBy:'name':false">
-                    <a href="" class="umb-action-link" ng-click="vm.createBlueprint(documentType)" prevent-default>
+                    <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.createBlueprint(documentType)" prevent-default>
                         <i class="large icon {{documentType.icon}}"></i>
                         <span class="menu-label">
                             {{documentType.name}}
@@ -19,7 +19,7 @@
                                 {{documentType.description}}
                             </small>
                         </span>
-                    </a>
+                    </button>
                 </li>
             </ul>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/datatypes/create.html b/src/Umbraco.Web.UI.Client/src/views/datatypes/create.html
index c359e7bfd1..55039831ac 100644
--- a/src/Umbraco.Web.UI.Client/src/views/datatypes/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/datatypes/create.html
@@ -6,20 +6,20 @@
 
             <ul class="umb-actions umb-actions-child">           
                 <li data-element="action-data-type" class="umb-action">
-                    <a href="" class="umb-action-link" ng-click="createDataType()" umb-auto-focus>
+                    <button href="" class="umb-action-link umb-outline btn-reset" ng-click="createDataType()" umb-auto-focus>
                         <i class="large icon icon-autofill"></i>
                         <span class="menu-label">
                             <localize key="create_newDataType">New data type</localize>
                         </span>
-                    </a>
+                    </button>
                 </li>
                 <li data-element="action-folder" class="umb-action">
-                    <a href="" class="umb-action-link" ng-click="showCreateFolder()">
+                    <button href="" class="umb-action-link umb-outline btn-reset" ng-click="showCreateFolder()">
                         <i class="large icon icon-folder"></i>
                         <span class="menu-label">
                             <localize key="create_newFolder">New folder</localize>...
                         </span>
-                    </a>
+                    </button>
                 </li>
             </ul>
         </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html
index 4085e84ccd..2241f852b5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html
@@ -7,36 +7,36 @@
 
             <ul class="umb-actions umb-actions-child">
                 <li data-element="action-documentType" class="umb-action" ng-hide="model.disableTemplates">
-                    <a href="" ng-click="createDocType()" class="umb-action-link" umb-auto-focus>
+                    <button href="" ng-click="createDocType()" class="umb-action-link umb-outline btn-reset" umb-auto-focus>
                         <i class="large icon icon-item-arrangement"></i>
                         <span class="menu-label">
                             <localize key="content_documentType">Document type</localize>
                         </span>
-                    </a>
+                    </button>
                 </li>
                 <li data-element="action-documentTypeWithoutTemplate" class="umb-action">
-                    <a href="" ng-click="createComponent()" class="umb-action-link">
+                    <button href="" ng-click="createComponent()" class="umb-action-link umb-outline btn-reset">
                         <i class="large icon icon-item-arrangement"></i>
                         <span class="menu-label">
                             <localize ng-if="model.disableTemplates === false" key="create_documentTypeWithoutTemplate"></localize>
                             <localize ng-if="model.disableTemplates === true" key="content_documentType">Document type></localize>
                         </span>
-                    </a>
+                    </button>
                 </li>
                 <li data-element="action-documentTypeCollection" class="umb-action">
-                    <a href="" ng-click="showCreateDocTypeCollection()" class="umb-action-link">
+                    <button href="" ng-click="showCreateDocTypeCollection()" class="umb-action-link umb-outline btn-reset">
                         <i class="large icon icon-thumbnail-list"></i>
                         <span class="menu-label">
                             Document Type Collection...
                             <!--                        <localize key="content_documentType_collection">Document Type Collection</localize>-->
                         </span>
-                    </a>
+                    </button>
                 </li>
                 <li data-element="action-folder" ng-if="model.allowCreateFolder" class="umb-action">
-                    <a href="" ng-click="showCreateFolder()" class="umb-action-link">
+                    <button href="" ng-click="showCreateFolder()" class="umb-action-link umb-outline btn-reset">
                         <i class="large icon icon-folder"></i>
                         <span class="menu-label"><localize key="general_folder"></localize>...</span>
-                    </a>
+                    </button>
                 </li>
             </ul>
         </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/create.html b/src/Umbraco.Web.UI.Client/src/views/media/create.html
index d93d4f0e30..57c8f48eb4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/create.html
@@ -17,13 +17,13 @@
 			<ul class="umb-actions umb-actions-child">
 
 				<li data-element="action-{{docType.alias}}" class="umb-action" ng-repeat="docType in allowedTypes">
-					<a ng-href="" ng-click="createMediaItem(docType)" class="umb-action-link" prevent-default>
+					<button ng-click="createMediaItem(docType)" class="umb-action-link umb-outline btn-reset" prevent-default>
 						<i class="large icon {{docType.icon}}"></i>
 						<span class="menu-label">
 							{{docType.name}}
 							<small>{{docType.description}}</small>
 						</span>
-					</a>
+					</button>
 				</li>
 				<!--
 					<li class="add">
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html b/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html
index 094d1ff8e4..4c0b8bb6ae 100644
--- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html
@@ -7,19 +7,19 @@
 
             <ul class="umb-actions umb-actions-child">           
                 <li class="umb-action">
-                    <a href="" class="umb-action-link" ng-click="createMediaType()" umb-auto-focus>
+                    <button href="" class="umb-action-link umb-outline btn-reset" ng-click="createMediaType()" umb-auto-focus>
                         <i class="large icon icon-item-arrangement"></i>
                         <span class="menu-label">
                             <localize key="general_new">New</localize>
                             <localize key="content_mediatype">Media type</localize>
                         </span>
-                    </a>
+                    </button>
                 </li>
                 <li class="umb-action">
-                    <a href="" class="umb-action-link" ng-click="showCreateFolder()">
+                    <button href="" class="umb-action-link umb-outline btn-reset" ng-click="showCreateFolder()">
                         <i class="large icon icon-folder"></i>
                         <span class="menu-label"><localize key="general_folder"></localize>...</span>
-                    </a>
+                    </button>
                 </li>
             </ul>
         </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/create.html b/src/Umbraco.Web.UI.Client/src/views/member/create.html
index 2292cf18ee..ff7e954c02 100644
--- a/src/Umbraco.Web.UI.Client/src/views/member/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/member/create.html
@@ -6,13 +6,13 @@
             <ul class="umb-actions umb-actions-child">
 
                 <li class="umb-action" ng-repeat="docType in allowedTypes">
-                    <a class="umb-action-link" href="#member/member/edit/{{currentNode.id}}?doctype={{docType.alias}}&create=true" ng-click="hideActions()">
+                    <button class="umb-action-link umb-outline btn-reset" href="#member/member/edit/{{currentNode.id}}?doctype={{docType.alias}}&create=true" ng-click="hideActions()">
                         <i class="large icon {{docType.icon}}"></i>
                         <span class="menu-label">
                             {{docType.name}}
                             <small>{{docType.description}}</small>
                         </span>
-                    </a>
+                    </button>
                 </li>
             </ul>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/membertypes/create.html b/src/Umbraco.Web.UI.Client/src/views/membertypes/create.html
index 00662cb29a..5964bdb75e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/membertypes/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/membertypes/create.html
@@ -5,13 +5,13 @@
 
         <ul class="umb-actions umb-actions-child">
             <li class="umb-action">
-                <a href="" class="umb-action-link" ng-click="showCreateFolder()">
+                <button href="" class="umb-action-link umb-outline btn-reset" ng-click="showCreateFolder()">
                     <i class="large icon icon-folder"></i>
                     <span class="menu-label"><localize key="general_folder"></localize></span>
-                </a>
+                </button>
             </li>
             <li class="umb-action">
-                <a href="" class="umb-action-link" ng-click="createMemberType()">
+                <button href="" class="umb-action-link umb-outline btn-reset" ng-click="createMemberType()">
 
                     <i class="large icon icon-item-arrangement"></i>
 
@@ -20,7 +20,7 @@
                         <localize key="content_memberType">Member type</localize>
                     </span>
 
-                </a>
+                </button>
             </li>
         </ul>
     </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html
index 88ab5b944c..bd91585d4e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html
@@ -11,28 +11,28 @@
 
                 <ul class="umb-actions umb-actions-child">
                     <li class="umb-action">
-                        <a href="" class="umb-action-link" ng-click="vm.createFile()" umb-auto-focus>
+                        <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.createFile()" umb-auto-focus>
                             <i class="large icon-article"></i>
                             <span class="menu-label"><localize key="create_newPartialViewMacro">New partial view macro</localize></span>
-                        </a>
+                        </button>
                     </li>
                     <li class="umb-action">
-                        <a href="" class="umb-action-link" ng-click="vm.createFileWithoutMacro()">
+                        <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.createFileWithoutMacro()">
                             <i class="large icon icon-article"></i>
                             <span class="menu-label"><localize key="create_newPartialViewMacroNoMacro">New partial view macro (without macro)</localize></span>
-                        </a>
+                        </button>
                     </li>
                     <li class="umb-action">
-                        <a href="" class="umb-action-link" ng-click="vm.showCreateFromSnippet()">
+                        <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFromSnippet()">
                             <i class="large icon icon-article"></i>
                             <span class="menu-label"><localize key="create_newPartialViewMacroFromSnippet">>New partial view macro from snippet</localize>...</span>
-                        </a>
+                        </button>
                     </li>
                     <li class="umb-action">
-                        <a href="" class="umb-action-link" ng-click="vm.showCreateFolder()">
+                        <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFolder()">
                             <i class="large icon icon-folder"></i>
                             <span class="menu-label"><localize key="general_folder"></localize>...</span>
-                        </a>
+                        </button>
                     </li>
                 </ul>
             </div>
@@ -44,10 +44,10 @@
 
                 <ul class="umb-actions umb-actions-child">
                     <li class="umb-action" ng-repeat="snippet in vm.snippets">
-                        <a href="" class="umb-action-link" ng-click="vm.createFileFromSnippet(snippet)" style="padding-top: 6px; padding-bottom: 6px;">
+                        <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.createFileFromSnippet(snippet)" style="padding-top: 6px; padding-bottom: 6px;">
                             <i class="icon-article icon" style="font-size: 20px;"></i>
                             <span class="menu-label" style="margin-left: 0; padding-left: 5px;">{{ snippet.name }}</span>
-                        </a>
+                        </button>
                     </li>
                 </ul>
             </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html
index 93c2eeb8ca..661bc615f6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html
@@ -10,22 +10,22 @@
             <div ng-if="!vm.showSnippets">
                 <ul class="umb-actions umb-actions-child">
                     <li class="umb-action">
-                        <a href="" class="umb-action-link" ng-click="vm.createPartialView()" umb-auto-focus>
+                        <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.createPartialView()" umb-auto-focus>
                             <i class="large icon icon-article"></i>
                             <span class="menu-label"><localize key="create_newEmptyPartialView">New empty partial view</localize></span>
-                        </a>
+                        </button>
                     </li>
                     <li class="umb-action">
-                        <a href="" class="umb-action-link" ng-click="vm.showCreateFromSnippet()">
+                        <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFromSnippet()">
                             <i class="large icon icon-article"></i>
                             <span class="menu-label"><localize key="create_newPartialViewFromSnippet">New partial view from snippet</localize>...</span>
-                        </a>
+                        </button>
                     </li>
                     <li class="umb-action">
-                        <a href="" class="umb-action-link" ng-click="vm.showCreateFolder()">
+                        <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFolder()">
                             <i class="large icon icon-folder"></i>
                             <span class="menu-label"><localize key="general_folder"></localize>...</span>
-                        </a>
+                        </button>
                     </li>
                 </ul>
             </div>
@@ -34,10 +34,10 @@
             <div ng-if="vm.showSnippets">
                 <ul class="umb-actions umb-actions-child">
                     <li class="umb-action" ng-repeat="snippet in vm.snippets">
-                        <a href="" class="umb-action-link" ng-click="vm.createPartialView(snippet)" style="padding-top: 6px; padding-bottom: 6px;">
+                        <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.createPartialView(snippet)" style="padding-top: 6px; padding-bottom: 6px;">
                             <i class="icon-article icon" style="font-size: 20px;"></i>
                             <span class="menu-label" style="margin-left: 0; padding-left: 5px;">{{ snippet.name }}</span>
-                        </a>
+                        </button>
                     </li>
                 </ul>
             </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/scripts/create.html b/src/Umbraco.Web.UI.Client/src/views/scripts/create.html
index 2dc1f39ff8..7d2896f606 100644
--- a/src/Umbraco.Web.UI.Client/src/views/scripts/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/scripts/create.html
@@ -7,16 +7,16 @@
 
             <ul class="umb-actions umb-actions-child">
                 <li class="umb-action">
-                    <a href="" class="umb-action-link" umb-auto-focus ng-click="vm.createFile()">
+                    <button href="" class="umb-action-link umb-outline btn-reset" umb-auto-focus ng-click="vm.createFile()">
                         <i class="large icon icon-script"></i>
                         <span class="menu-label"><localize key="create_newJavascriptFile">New javascript file</localize></span>
-                    </a>
+                    </button>
                 </li>
                 <li class="umb-action">
-                    <a href="" class="umb-action-link" ng-click="vm.showCreateFolder()">
+                    <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFolder()">
                         <i class="large icon icon-folder"></i>
                         <span class="menu-label"><localize key="general_folder"></localize>...</span>
-                    </a>
+                    </button>
                 </li>
             </ul>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html b/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html
index 999a17ca77..4c7f62e17f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html
@@ -7,22 +7,22 @@
 
             <ul class="umb-actions umb-actions-child">
                 <li class="umb-action">
-                    <a href="" class="umb-action-link" umb-auto-focus ng-click="vm.createFile()">
+                    <button href="" class="umb-action-link umb-outline btn-reset" umb-auto-focus ng-click="vm.createFile()">
                         <i class="large icon icon-script"></i>
                         <span class="menu-label"><localize key="create_newStyleSheetFile">New style sheet file</localize></span>
-                    </a>
+                    </button>
                 </li>
                 <li class="umb-action">
-                    <a href="" ng-click="vm.createRichtextStyle()" class="umb-action-link">
+                    <button href="" ng-click="vm.createRichtextStyle()" class="umb-action-link umb-outline btn-reset">
                         <i class="large icon icon-script"></i>
                         <span class="menu-label"><localize key="create_newRteStyleSheetFile">New richtext style sheet file</localize></span>
-                    </a>
+                    </button>
                 </li>
                 <li class="umb-action">
-                    <a href="" class="umb-action-link" ng-click="vm.showCreateFolder()">
+                    <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFolder()">
                         <i class="large icon icon-folder"></i>
                         <span class="menu-label"><localize key="general_folder"></localize>...</span>
-                    </a>
+                    </button>
                 </li>
             </ul>
 

From 0138091a6c108284f30f365f3c6f78250aec8598 Mon Sep 17 00:00:00 2001
From: Gopakumar R <gopakumar.r@live.com>
Date: Thu, 8 Aug 2019 04:16:18 +1000
Subject: [PATCH 241/776] Fix for issue #5816 (#5836)

---
 src/Umbraco.Web.UI.Client/gulp/util/processJs.js                | 2 +-
 .../src/views/components/umb-grid-selector.html                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/gulp/util/processJs.js b/src/Umbraco.Web.UI.Client/gulp/util/processJs.js
index 976708e62f..829db2aec7 100644
--- a/src/Umbraco.Web.UI.Client/gulp/util/processJs.js
+++ b/src/Umbraco.Web.UI.Client/gulp/util/processJs.js
@@ -23,7 +23,7 @@ module.exports = function(files, out) {
     // sort files in stream by path or any custom sort comparator
     task = task.pipe(babel())
         .pipe(sort())
-        .pipe(embedTemplates({ basePath: "./src/" }))
+        .pipe(embedTemplates({ basePath: "./src/", minimize:{ loose: true } }))
         .pipe(concat(out))
         .pipe(wrap('(function(){\n%= body %\n})();'))
         .pipe(gulp.dest(config.root + config.targets.js));
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-grid-selector.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-grid-selector.html
index 7eb80bacc3..c2ce93b8be 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-grid-selector.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-grid-selector.html
@@ -32,7 +32,7 @@
     </div>
 
     <div class="text-center" ng-if="(availableItems | compareArrays:selectedItems:'alias').length === 0">
-        <small><localize key="general_all">Akk</localize> {{itemLabel}}s <localize key="grid_areAdded">are added</localize></small>
+        <small><localize key="general_all">All</localize> {{itemLabel}}s <localize key="grid_areAdded">are added</localize></small>
     </div>
 
 </div>

From 62a71f805283482fb43462431c7018bea693fc9b Mon Sep 17 00:00:00 2001
From: Gopakumar R <gopakumar.r@live.com>
Date: Thu, 8 Aug 2019 04:16:18 +1000
Subject: [PATCH 242/776] Fix for issue #5816 (#5836)

(cherry picked from commit 0138091a6c108284f30f365f3c6f78250aec8598)
---
 src/Umbraco.Web.UI.Client/gulp/util/processJs.js                | 2 +-
 .../src/views/components/umb-grid-selector.html                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/gulp/util/processJs.js b/src/Umbraco.Web.UI.Client/gulp/util/processJs.js
index 976708e62f..829db2aec7 100644
--- a/src/Umbraco.Web.UI.Client/gulp/util/processJs.js
+++ b/src/Umbraco.Web.UI.Client/gulp/util/processJs.js
@@ -23,7 +23,7 @@ module.exports = function(files, out) {
     // sort files in stream by path or any custom sort comparator
     task = task.pipe(babel())
         .pipe(sort())
-        .pipe(embedTemplates({ basePath: "./src/" }))
+        .pipe(embedTemplates({ basePath: "./src/", minimize:{ loose: true } }))
         .pipe(concat(out))
         .pipe(wrap('(function(){\n%= body %\n})();'))
         .pipe(gulp.dest(config.root + config.targets.js));
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-grid-selector.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-grid-selector.html
index 7eb80bacc3..c2ce93b8be 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-grid-selector.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-grid-selector.html
@@ -32,7 +32,7 @@
     </div>
 
     <div class="text-center" ng-if="(availableItems | compareArrays:selectedItems:'alias').length === 0">
-        <small><localize key="general_all">Akk</localize> {{itemLabel}}s <localize key="grid_areAdded">are added</localize></small>
+        <small><localize key="general_all">All</localize> {{itemLabel}}s <localize key="grid_areAdded">are added</localize></small>
     </div>
 
 </div>

From a9a5d00916d2ce1129a2963619167eb48eba2a8a Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Wed, 7 Aug 2019 20:19:48 +0200
Subject: [PATCH 243/776] Merge pull request #5999 from
 kjac/v8-fix-allow-remove-user-start-nodes

V8: Allow removing user start nodes
(cherry picked from commit 2cf3a7831cc93bbfac3319b1c68cd8871fb66b05)
---
 .../src/views/users/views/user/details.html                     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html b/src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
index 793f404f0c..881d7a9c0d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
@@ -90,6 +90,7 @@
                                       ng-repeat="node in model.user.startContentIds"
                                       icon="node.icon"
                                       name="node.name"
+                                      allow-remove="true"
                                       on-remove="model.removeSelectedItem($index, model.user.startContentIds)">
                     </umb-node-preview>
 
@@ -114,6 +115,7 @@
                                       ng-repeat="node in model.user.startMediaIds"
                                       icon="node.icon"
                                       name="node.name"
+                                      allow-remove="true"
                                       on-remove="model.removeSelectedItem($index, model.user.startMediaIds)">
                     </umb-node-preview>
 

From a398881fa1e7eebda4ad74d505a592d4178bfa64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Gregersen?= <soreng@gmail.com>
Date: Mon, 5 Aug 2019 14:37:30 +0200
Subject: [PATCH 244/776] fix: spelling error in comment :)

infinie error(s) fixed
---
 src/Umbraco.Web.UI.Client/src/common/services/editor.service.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js b/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
index 72957e1c72..3979eb2fb7 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
@@ -261,7 +261,7 @@ When building a custom infinite editor view you can use the same components as a
             */
             unbindKeyboardShortcuts();
 
-            // set flag so we know when the editor is open in "infinie mode"
+            // set flag so we know when the editor is open in "infinite mode"
             editor.infiniteMode = true;
 
             editors.push(editor);

From b3497011e8d771ce97430a4532671e42db39ff20 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Wed, 7 Aug 2019 20:49:14 +0200
Subject: [PATCH 245/776] Make content types with description look ok in the
 create dialog (#5752)

---
 .../src/less/components/tree/umb-actions.less                    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-actions.less b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-actions.less
index d6e792de73..0c231830de 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-actions.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-actions.less
@@ -94,6 +94,7 @@
         font-size: 14px;
         color: @black;
         margin-left: 10px;
+        text-align: left;
     }
 
     small {

From ce5b3531e09958a06e06e69274a214a89563e29a Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Wed, 7 Aug 2019 20:49:14 +0200
Subject: [PATCH 246/776] Make content types with description look ok in the
 create dialog (#5752)

(cherry picked from commit b3497011e8d771ce97430a4532671e42db39ff20)
---
 .../src/less/components/tree/umb-actions.less                    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-actions.less b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-actions.less
index d6e792de73..0c231830de 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-actions.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-actions.less
@@ -94,6 +94,7 @@
         font-size: 14px;
         color: @black;
         margin-left: 10px;
+        text-align: left;
     }
 
     small {

From 7ffe0398f93e467969a5623d1f35824faa25d7ab Mon Sep 17 00:00:00 2001
From: leekelleher <leekelleher@gmail.com>
Date: Mon, 1 Jul 2019 12:43:35 +0100
Subject: [PATCH 247/776] DocType Editor sorting - vertical direction

In the DocType Editor, when sorting the groups and properties,
the draggable direction is freeform (horizontal, vertical or even
diagonal).

We can restrict the direction, by setting the `axis` property in
the sort options.
---
 .../common/directives/components/umbgroupsbuilder.directive.js  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
index a51afd200c..8dada26960 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
@@ -47,6 +47,7 @@
       function setSortingOptions() {
 
         scope.sortableOptionsGroup = {
+          axis: 'y',
           distance: 10,
           tolerance: "pointer",
           opacity: 0.7,
@@ -65,6 +66,7 @@
         };
 
         scope.sortableOptionsProperty = {
+          axis: 'y',
           distance: 10,
           tolerance: "pointer",
           connectWith: ".umb-group-builder__properties",

From 34e45abcc79cd994aa1b73130e0160cdfdd413ce Mon Sep 17 00:00:00 2001
From: leekelleher <leekelleher@gmail.com>
Date: Fri, 7 Jun 2019 17:59:38 +0100
Subject: [PATCH 248/776] Added constants for Property Editor Groups

---
 src/Umbraco.Core/Constants-PropertyEditors.cs  | 18 ++++++++++++++++++
 src/Umbraco.Core/PropertyEditors/DataEditor.cs |  2 +-
 .../PropertyEditors/DataEditorAttribute.cs     |  2 +-
 .../PropertyEditors/LabelPropertyEditor.cs     |  6 +++++-
 .../CheckBoxListPropertyEditor.cs              |  7 ++++++-
 .../ColorPickerPropertyEditor.cs               |  7 ++++++-
 .../ContentPickerPropertyEditor.cs             |  8 +++++++-
 .../PropertyEditors/DateTimePropertyEditor.cs  |  7 ++++++-
 .../PropertyEditors/DecimalPropertyEditor.cs   |  7 ++++++-
 .../DropDownFlexiblePropertyEditor.cs          |  7 ++++++-
 .../EmailAddressPropertyEditor.cs              |  7 ++++++-
 .../FileUploadPropertyEditor.cs                |  7 ++++++-
 .../PropertyEditors/GridPropertyEditor.cs      |  9 ++++++++-
 .../ImageCropperPropertyEditor.cs              |  9 ++++++++-
 .../PropertyEditors/IntegerPropertyEditor.cs   |  7 ++++++-
 .../PropertyEditors/ListViewPropertyEditor.cs  |  8 +++++++-
 .../MacroContainerPropertyEditor.cs            |  9 ++++++++-
 .../PropertyEditors/MarkdownPropertyEditor.cs  |  8 +++++++-
 .../MediaPickerPropertyEditor.cs               | 10 ++++++++--
 .../MemberGroupPickerPropertyEditor.cs         |  8 +++++++-
 .../MemberPickerPropertyEditor.cs              |  8 +++++++-
 .../MultiNodeTreePickerPropertyEditor.cs       |  8 +++++++-
 .../MultiUrlPickerPropertyEditor.cs            |  9 ++++++++-
 .../MultipleTextStringPropertyEditor.cs        |  8 +++++++-
 .../NestedContentPropertyEditor.cs             |  8 +++++++-
 .../ContentTypeParameterEditor.cs              |  6 +++++-
 .../MultipleContentPickerParameterEditor.cs    |  6 +++++-
 .../MultipleContentTypeParameterEditor.cs      |  6 +++++-
 .../MultiplePropertyGroupParameterEditor.cs    |  6 +++++-
 .../MultiplePropertyTypeParameterEditor.cs     |  6 +++++-
 .../PropertyGroupParameterEditor.cs            |  6 +++++-
 .../PropertyTypeParameterEditor.cs             |  6 +++++-
 .../RadioButtonsPropertyEditor.cs              |  8 +++++++-
 .../PropertyEditors/RichTextPropertyEditor.cs  |  9 ++++++++-
 .../PropertyEditors/SliderPropertyEditor.cs    |  6 +++++-
 .../PropertyEditors/TagsPropertyEditor.cs      |  6 +++++-
 .../PropertyEditors/TextAreaPropertyEditor.cs  |  8 +++++++-
 .../PropertyEditors/TextboxPropertyEditor.cs   |  7 ++++++-
 .../PropertyEditors/TrueFalsePropertyEditor.cs |  9 ++++++++-
 .../UserPickerPropertyEditor.cs                |  8 +++++++-
 40 files changed, 257 insertions(+), 40 deletions(-)

diff --git a/src/Umbraco.Core/Constants-PropertyEditors.cs b/src/Umbraco.Core/Constants-PropertyEditors.cs
index b48286f197..0b5d2873f9 100644
--- a/src/Umbraco.Core/Constants-PropertyEditors.cs
+++ b/src/Umbraco.Core/Constants-PropertyEditors.cs
@@ -203,6 +203,24 @@ namespace Umbraco.Core
                 /// <remarks>Must be a valid <see cref="ValueTypes"/> value.</remarks>
                 public const string DataValueType = "umbracoDataValueType";
             }
+
+            /// <summary>
+            /// Defines Umbraco's built-in property editor groups.
+            /// </summary>
+            public static class Groups
+            {
+                public const string Common = "Common";
+
+                public const string Lists = "Lists";
+
+                public const string Media = "Media";
+
+                public const string People = "People";
+
+                public const string Pickers = "Pickers";
+
+                public const string RichContent = "Rich Content";
+            }
         }
     }
 }
diff --git a/src/Umbraco.Core/PropertyEditors/DataEditor.cs b/src/Umbraco.Core/PropertyEditors/DataEditor.cs
index 43f4b68b99..dbb2fc467e 100644
--- a/src/Umbraco.Core/PropertyEditors/DataEditor.cs
+++ b/src/Umbraco.Core/PropertyEditors/DataEditor.cs
@@ -30,7 +30,7 @@ namespace Umbraco.Core.PropertyEditors
             // defaults
             Type = type;
             Icon = Constants.Icons.PropertyEditor;
-            Group = "common";
+            Group = Constants.PropertyEditors.Groups.Common;
 
             // assign properties based on the attribute, if it is found
             Attribute = GetType().GetCustomAttribute<DataEditorAttribute>(false);
diff --git a/src/Umbraco.Core/PropertyEditors/DataEditorAttribute.cs b/src/Umbraco.Core/PropertyEditors/DataEditorAttribute.cs
index ca08127d51..821f06513e 100644
--- a/src/Umbraco.Core/PropertyEditors/DataEditorAttribute.cs
+++ b/src/Umbraco.Core/PropertyEditors/DataEditorAttribute.cs
@@ -121,7 +121,7 @@ namespace Umbraco.Core.PropertyEditors
         /// Gets or sets an optional group.
         /// </summary>
         /// <remarks>The group can be used for example to group the editors by category.</remarks>
-        public string Group { get; set; } = "common";
+        public string Group { get; set; } = Constants.PropertyEditors.Groups.Common;
 
         /// <summary>
         /// Gets or sets a value indicating whether the value editor is deprecated.
diff --git a/src/Umbraco.Core/PropertyEditors/LabelPropertyEditor.cs b/src/Umbraco.Core/PropertyEditors/LabelPropertyEditor.cs
index d0c40b1e63..60b7d55c01 100644
--- a/src/Umbraco.Core/PropertyEditors/LabelPropertyEditor.cs
+++ b/src/Umbraco.Core/PropertyEditors/LabelPropertyEditor.cs
@@ -5,7 +5,11 @@ namespace Umbraco.Core.PropertyEditors
     /// <summary>
     /// Represents a property editor for label properties.
     /// </summary>
-    [DataEditor(Constants.PropertyEditors.Aliases.Label, "Label", "readonlyvalue", Icon = "icon-readonly")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.Label,
+        "Label",
+        "readonlyvalue",
+        Icon = "icon-readonly")]
     public class LabelPropertyEditor : DataEditor
     {
         /// <summary>
diff --git a/src/Umbraco.Web/PropertyEditors/CheckBoxListPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/CheckBoxListPropertyEditor.cs
index e0f7184dc7..d81b63f2ad 100644
--- a/src/Umbraco.Web/PropertyEditors/CheckBoxListPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/CheckBoxListPropertyEditor.cs
@@ -8,7 +8,12 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// A property editor to allow multiple checkbox selection of pre-defined items.
     /// </summary>
-    [DataEditor(Constants.PropertyEditors.Aliases.CheckBoxList, "Checkbox list", "checkboxlist", Icon="icon-bulleted-list", Group="lists")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.CheckBoxList,
+        "Checkbox list",
+        "checkboxlist",
+        Icon = "icon-bulleted-list",
+        Group = Constants.PropertyEditors.Groups.Lists)]
     public class CheckBoxListPropertyEditor : DataEditor
     {
         private readonly ILocalizedTextService _textService;
diff --git a/src/Umbraco.Web/PropertyEditors/ColorPickerPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/ColorPickerPropertyEditor.cs
index 5da9d2888d..be6bde248f 100644
--- a/src/Umbraco.Web/PropertyEditors/ColorPickerPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/ColorPickerPropertyEditor.cs
@@ -4,7 +4,12 @@ using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.PropertyEditors
 {
-    [DataEditor(Constants.PropertyEditors.Aliases.ColorPicker, "Color Picker", "colorpicker", Icon="icon-colorpicker", Group="Pickers")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.ColorPicker,
+        "Color Picker",
+        "colorpicker",
+        Icon = "icon-colorpicker",
+        Group = Constants.PropertyEditors.Groups.Pickers)]
     public class ColorPickerPropertyEditor : DataEditor
     {
         public ColorPickerPropertyEditor(ILogger logger)
diff --git a/src/Umbraco.Web/PropertyEditors/ContentPickerPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/ContentPickerPropertyEditor.cs
index 391257ca58..c6de91f560 100644
--- a/src/Umbraco.Web/PropertyEditors/ContentPickerPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/ContentPickerPropertyEditor.cs
@@ -8,7 +8,13 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// Content property editor that stores UDI
     /// </summary>
-    [DataEditor(Constants.PropertyEditors.Aliases.ContentPicker, EditorType.PropertyValue | EditorType.MacroParameter, "Content Picker", "contentpicker", ValueType = ValueTypes.String, Group = "Pickers")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.ContentPicker,
+        EditorType.PropertyValue | EditorType.MacroParameter,
+        "Content Picker",
+        "contentpicker",
+        ValueType = ValueTypes.String,
+        Group = Constants.PropertyEditors.Groups.Pickers)]
     public class ContentPickerPropertyEditor : DataEditor
     {
         public ContentPickerPropertyEditor(ILogger logger)
diff --git a/src/Umbraco.Web/PropertyEditors/DateTimePropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/DateTimePropertyEditor.cs
index fa3734e8aa..31fbc9e3f1 100644
--- a/src/Umbraco.Web/PropertyEditors/DateTimePropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/DateTimePropertyEditor.cs
@@ -7,7 +7,12 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// Represents a date and time property editor.
     /// </summary>
-    [DataEditor(Constants.PropertyEditors.Aliases.DateTime, "Date/Time", "datepicker", ValueType = ValueTypes.DateTime, Icon="icon-time")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.DateTime,
+        "Date/Time",
+        "datepicker",
+        ValueType = ValueTypes.DateTime,
+        Icon = "icon-time")]
     public class DateTimePropertyEditor : DataEditor
     {
         /// <summary>
diff --git a/src/Umbraco.Web/PropertyEditors/DecimalPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/DecimalPropertyEditor.cs
index 15b33f28b7..880cf8f204 100644
--- a/src/Umbraco.Web/PropertyEditors/DecimalPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/DecimalPropertyEditor.cs
@@ -8,7 +8,12 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// Represents a decimal property and parameter editor.
     /// </summary>
-    [DataEditor(Constants.PropertyEditors.Aliases.Decimal, EditorType.PropertyValue | EditorType.MacroParameter, "Decimal", "decimal", ValueType = ValueTypes.Decimal)]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.Decimal,
+        EditorType.PropertyValue | EditorType.MacroParameter,
+        "Decimal",
+        "decimal",
+        ValueType = ValueTypes.Decimal)]
     public class DecimalPropertyEditor : DataEditor
     {
         /// <summary>
diff --git a/src/Umbraco.Web/PropertyEditors/DropDownFlexiblePropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/DropDownFlexiblePropertyEditor.cs
index eac692fcdd..98a19f39ad 100644
--- a/src/Umbraco.Web/PropertyEditors/DropDownFlexiblePropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/DropDownFlexiblePropertyEditor.cs
@@ -5,7 +5,12 @@ using Umbraco.Core.Services;
 
 namespace Umbraco.Web.PropertyEditors
 {
-    [DataEditor(Constants.PropertyEditors.Aliases.DropDownListFlexible, "Dropdown", "dropdownFlexible", Group = "lists", Icon = "icon-indent")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.DropDownListFlexible,
+        "Dropdown",
+        "dropdownFlexible",
+        Group = Constants.PropertyEditors.Groups.Lists,
+        Icon = "icon-indent")]
     public class DropDownFlexiblePropertyEditor : DataEditor
     {
         private readonly ILocalizedTextService _textService;
diff --git a/src/Umbraco.Web/PropertyEditors/EmailAddressPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/EmailAddressPropertyEditor.cs
index d55d3327e1..cd3a830c72 100644
--- a/src/Umbraco.Web/PropertyEditors/EmailAddressPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/EmailAddressPropertyEditor.cs
@@ -5,7 +5,12 @@ using Umbraco.Core.PropertyEditors.Validators;
 
 namespace Umbraco.Web.PropertyEditors
 {
-    [DataEditor(Constants.PropertyEditors.Aliases.EmailAddress, EditorType.PropertyValue | EditorType.MacroParameter, "Email address", "email", Icon="icon-message")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.EmailAddress,
+        EditorType.PropertyValue | EditorType.MacroParameter,
+        "Email address",
+        "email",
+        Icon = "icon-message")]
     public class EmailAddressPropertyEditor : DataEditor
     {
         /// <summary>
diff --git a/src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs
index 6d87bfe495..702408788a 100644
--- a/src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs
@@ -12,7 +12,12 @@ using Umbraco.Web.Media;
 
 namespace Umbraco.Web.PropertyEditors
 {
-    [DataEditor(Constants.PropertyEditors.Aliases.UploadField, "File upload", "fileupload", Icon = "icon-download-alt", Group = "media")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.UploadField,
+        "File upload",
+        "fileupload",
+        Group = Constants.PropertyEditors.Groups.Media,
+        Icon = "icon-download-alt")]
     public class FileUploadPropertyEditor : DataEditor
     {
         private readonly IMediaFileSystem _mediaFileSystem;
diff --git a/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
index 99972a27cf..aa7a1f7355 100644
--- a/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
@@ -12,7 +12,14 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// Represents a grid property and parameter editor.
     /// </summary>
-    [DataEditor(Constants.PropertyEditors.Aliases.Grid, "Grid layout", "grid", HideLabel = true, ValueType = ValueTypes.Json, Group="rich content", Icon="icon-layout")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.Grid,
+        "Grid layout",
+        "grid",
+        HideLabel = true,
+        ValueType = ValueTypes.Json,
+        Icon = "icon-layout",
+        Group = Constants.PropertyEditors.Groups.RichContent)]
     public class GridPropertyEditor : DataEditor
     {
         public GridPropertyEditor(ILogger logger)
diff --git a/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs
index 86f3412593..9a8fb7c40b 100644
--- a/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs
@@ -19,7 +19,14 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// Represents an image cropper property editor.
     /// </summary>
-    [DataEditor(Constants.PropertyEditors.Aliases.ImageCropper, "Image Cropper", "imagecropper", ValueType = ValueTypes.Json, HideLabel = false, Group="media", Icon="icon-crop")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.ImageCropper,
+        "Image Cropper",
+        "imagecropper",
+        ValueType = ValueTypes.Json,
+        HideLabel = false,
+        Group = Constants.PropertyEditors.Groups.Media,
+        Icon = "icon-crop")]
     public class ImageCropperPropertyEditor : DataEditor
     {
         private readonly IMediaFileSystem _mediaFileSystem;
diff --git a/src/Umbraco.Web/PropertyEditors/IntegerPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/IntegerPropertyEditor.cs
index 5d6adc018c..7717ced4a5 100644
--- a/src/Umbraco.Web/PropertyEditors/IntegerPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/IntegerPropertyEditor.cs
@@ -8,7 +8,12 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// Represents an integer property and parameter editor.
     /// </summary>
-    [DataEditor(Constants.PropertyEditors.Aliases.Integer, EditorType.PropertyValue | EditorType.MacroParameter, "Numeric", "integer", ValueType = ValueTypes.Integer)]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.Integer,
+        EditorType.PropertyValue | EditorType.MacroParameter,
+        "Numeric",
+        "integer",
+        ValueType = ValueTypes.Integer)]
     public class IntegerPropertyEditor : DataEditor
     {
         public IntegerPropertyEditor(ILogger logger)
diff --git a/src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs
index f170608545..53f9cb94ef 100644
--- a/src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs
@@ -8,7 +8,13 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// Represents a list-view editor.
     /// </summary>
-    [DataEditor(Constants.PropertyEditors.Aliases.ListView, "List view", "listview", HideLabel = true, Group = "lists", Icon = Constants.Icons.ListView)]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.ListView,
+        "List view",
+        "listview",
+        HideLabel = true,
+        Group = Constants.PropertyEditors.Groups.Lists,
+        Icon = Constants.Icons.ListView)]
     public class ListViewPropertyEditor : DataEditor
     {
         /// <summary>
diff --git a/src/Umbraco.Web/PropertyEditors/MacroContainerPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/MacroContainerPropertyEditor.cs
index 99a9f44487..ff2c08bf62 100644
--- a/src/Umbraco.Web/PropertyEditors/MacroContainerPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MacroContainerPropertyEditor.cs
@@ -5,7 +5,14 @@ using Umbraco.Core.PropertyEditors;
 namespace Umbraco.Web.PropertyEditors
 {
     // TODO: MacroContainerPropertyEditor is deprecated, but what's the alternative?
-    [DataEditor(Constants.PropertyEditors.Aliases.MacroContainer, "(Obsolete) Macro Picker", "macrocontainer", ValueType = ValueTypes.Text, Group = "rich content", Icon = Constants.Icons.Macro, IsDeprecated = true)]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.MacroContainer,
+        "(Obsolete) Macro Picker",
+        "macrocontainer",
+        ValueType = ValueTypes.Text,
+        Group = Constants.PropertyEditors.Groups.RichContent,
+        Icon = Constants.Icons.Macro,
+        IsDeprecated = true)]
     public class MacroContainerPropertyEditor : DataEditor
     {
         public MacroContainerPropertyEditor(ILogger logger)
diff --git a/src/Umbraco.Web/PropertyEditors/MarkdownPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/MarkdownPropertyEditor.cs
index 99b68a507b..2d66da5461 100644
--- a/src/Umbraco.Web/PropertyEditors/MarkdownPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MarkdownPropertyEditor.cs
@@ -7,7 +7,13 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// Represents a markdown editor.
     /// </summary>
-    [DataEditor(Constants.PropertyEditors.Aliases.MarkdownEditor, "Markdown editor", "markdowneditor", ValueType = ValueTypes.Text, Icon="icon-code", Group="rich content")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.MarkdownEditor,
+        "Markdown editor",
+        "markdowneditor",
+        ValueType = ValueTypes.Text,
+        Group = Constants.PropertyEditors.Groups.RichContent,
+        Icon = "icon-code")]
     public class MarkdownPropertyEditor : DataEditor
     {
         /// <summary>
diff --git a/src/Umbraco.Web/PropertyEditors/MediaPickerPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/MediaPickerPropertyEditor.cs
index 52e616ffbd..dd755ee0ba 100644
--- a/src/Umbraco.Web/PropertyEditors/MediaPickerPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MediaPickerPropertyEditor.cs
@@ -7,8 +7,14 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// Represents a media picker property editor.
     /// </summary>
-    [DataEditor(Constants.PropertyEditors.Aliases.MediaPicker, EditorType.PropertyValue | EditorType.MacroParameter,
-        "Media Picker", "mediapicker", ValueType = ValueTypes.Text, Group = "media", Icon = Constants.Icons.MediaImage)]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.MediaPicker,
+        EditorType.PropertyValue | EditorType.MacroParameter,
+        "Media Picker",
+        "mediapicker",
+        ValueType = ValueTypes.Text,
+        Group = Constants.PropertyEditors.Groups.Media,
+        Icon = Constants.Icons.MediaImage)]
     public class MediaPickerPropertyEditor : DataEditor
     {
         /// <summary>
diff --git a/src/Umbraco.Web/PropertyEditors/MemberGroupPickerPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/MemberGroupPickerPropertyEditor.cs
index 5d89024692..b8e67c863c 100644
--- a/src/Umbraco.Web/PropertyEditors/MemberGroupPickerPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MemberGroupPickerPropertyEditor.cs
@@ -4,7 +4,13 @@ using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.PropertyEditors
 {
-    [DataEditor(Constants.PropertyEditors.Aliases.MemberGroupPicker, "Member Group Picker", "membergrouppicker", ValueType = ValueTypes.Text, Group = "People", Icon = Constants.Icons.MemberGroup)]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.MemberGroupPicker,
+        "Member Group Picker",
+        "membergrouppicker",
+        ValueType = ValueTypes.Text,
+        Group = Constants.PropertyEditors.Groups.People,
+        Icon = Constants.Icons.MemberGroup)]
     public class MemberGroupPickerPropertyEditor : DataEditor
     {
          public MemberGroupPickerPropertyEditor(ILogger logger)
diff --git a/src/Umbraco.Web/PropertyEditors/MemberPickerPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/MemberPickerPropertyEditor.cs
index 858582ab72..69020ba350 100644
--- a/src/Umbraco.Web/PropertyEditors/MemberPickerPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MemberPickerPropertyEditor.cs
@@ -4,7 +4,13 @@ using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.PropertyEditors
 {
-    [DataEditor(Constants.PropertyEditors.Aliases.MemberPicker, "Member Picker", "memberpicker", ValueType = ValueTypes.String, Group = "People", Icon = Constants.Icons.Member)]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.MemberPicker,
+        "Member Picker",
+        "memberpicker",
+        ValueType = ValueTypes.String,
+        Group = Constants.PropertyEditors.Groups.People,
+        Icon = Constants.Icons.Member)]
     public class MemberPickerPropertyEditor : DataEditor
     {
         public MemberPickerPropertyEditor(ILogger logger)
diff --git a/src/Umbraco.Web/PropertyEditors/MultiNodeTreePickerPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/MultiNodeTreePickerPropertyEditor.cs
index ad75e16717..742acbeca2 100644
--- a/src/Umbraco.Web/PropertyEditors/MultiNodeTreePickerPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MultiNodeTreePickerPropertyEditor.cs
@@ -4,7 +4,13 @@ using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.PropertyEditors
 {
-    [DataEditor(Constants.PropertyEditors.Aliases.MultiNodeTreePicker, "Multinode Treepicker", "contentpicker", ValueType = ValueTypes.Text, Group = "pickers", Icon = "icon-page-add")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.MultiNodeTreePicker,
+        "Multinode Treepicker",
+        "contentpicker",
+        ValueType = ValueTypes.Text,
+        Group = Constants.PropertyEditors.Groups.Pickers,
+        Icon = "icon-page-add")]
     public class MultiNodeTreePickerPropertyEditor : DataEditor
     {
         public MultiNodeTreePickerPropertyEditor(ILogger logger)
diff --git a/src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs
index ea5d7aac8e..95ac809576 100644
--- a/src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs
@@ -7,7 +7,14 @@ using Umbraco.Web.PublishedCache;
 
 namespace Umbraco.Web.PropertyEditors
 {
-    [DataEditor(Constants.PropertyEditors.Aliases.MultiUrlPicker, EditorType.PropertyValue, "Multi Url Picker", "multiurlpicker", ValueType = ValueTypes.Json, Group = "pickers", Icon = "icon-link")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.MultiUrlPicker,
+        EditorType.PropertyValue,
+        "Multi Url Picker",
+        "multiurlpicker",
+        ValueType = ValueTypes.Json,
+        Group = Constants.PropertyEditors.Groups.Pickers,
+        Icon = "icon-link")]
     public class MultiUrlPickerPropertyEditor : DataEditor
     {
         private readonly IEntityService _entityService;
diff --git a/src/Umbraco.Web/PropertyEditors/MultipleTextStringPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/MultipleTextStringPropertyEditor.cs
index 141bdea7b6..1eb895075d 100644
--- a/src/Umbraco.Web/PropertyEditors/MultipleTextStringPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MultipleTextStringPropertyEditor.cs
@@ -13,7 +13,13 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// Represents a multiple text string property editor.
     /// </summary>
-    [DataEditor(Constants.PropertyEditors.Aliases.MultipleTextstring, "Repeatable textstrings", "multipletextbox", ValueType = ValueTypes.Text, Icon="icon-ordered-list", Group="lists")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.MultipleTextstring,
+        "Repeatable textstrings",
+        "multipletextbox",
+        ValueType = ValueTypes.Text,
+        Group = Constants.PropertyEditors.Groups.Lists,
+        Icon = "icon-ordered-list")]
     public class MultipleTextStringPropertyEditor : DataEditor
     {
         /// <summary>
diff --git a/src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
index 6dee2f78b5..7e91a3af79 100644
--- a/src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
@@ -18,7 +18,13 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// Represents a nested content property editor.
     /// </summary>
-    [DataEditor(Constants.PropertyEditors.Aliases.NestedContent, "Nested Content", "nestedcontent", ValueType = "JSON", Group = "lists", Icon = "icon-thumbnail-list")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.NestedContent,
+        "Nested Content",
+        "nestedcontent",
+        ValueType = ValueTypes.Json,
+        Group = Constants.PropertyEditors.Groups.Lists,
+        Icon = "icon-thumbnail-list")]
     public class NestedContentPropertyEditor : DataEditor
     {
         private readonly Lazy<PropertyEditorCollection> _propertyEditors;
diff --git a/src/Umbraco.Web/PropertyEditors/ParameterEditors/ContentTypeParameterEditor.cs b/src/Umbraco.Web/PropertyEditors/ParameterEditors/ContentTypeParameterEditor.cs
index cdab78d119..149243f122 100644
--- a/src/Umbraco.Web/PropertyEditors/ParameterEditors/ContentTypeParameterEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/ParameterEditors/ContentTypeParameterEditor.cs
@@ -6,7 +6,11 @@ namespace Umbraco.Web.PropertyEditors.ParameterEditors
     /// <summary>
     /// Represents a content type parameter editor.
     /// </summary>
-    [DataEditor("contentType", EditorType.MacroParameter, "Content Type Picker", "entitypicker")]
+    [DataEditor(
+        "contentType",
+        EditorType.MacroParameter,
+        "Content Type Picker",
+        "entitypicker")]
     public class ContentTypeParameterEditor : DataEditor
     {
         /// <summary>
diff --git a/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleContentPickerParameterEditor.cs b/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleContentPickerParameterEditor.cs
index 3d0d0eb923..0ca657ac39 100644
--- a/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleContentPickerParameterEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleContentPickerParameterEditor.cs
@@ -7,7 +7,11 @@ namespace Umbraco.Web.PropertyEditors.ParameterEditors
     /// <summary>
     /// Represents a parameter editor of some sort.
     /// </summary>
-    [DataEditor(Constants.PropertyEditors.Aliases.MultiNodeTreePicker, EditorType.MacroParameter, "Multiple Content Picker", "contentpicker")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.MultiNodeTreePicker,
+        EditorType.MacroParameter,
+        "Multiple Content Picker",
+        "contentpicker")]
     public class MultipleContentPickerParameterEditor : DataEditor
     {
         /// <summary>
diff --git a/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleContentTypeParameterEditor.cs b/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleContentTypeParameterEditor.cs
index 74bcafe30f..c8f19f8acd 100644
--- a/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleContentTypeParameterEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleContentTypeParameterEditor.cs
@@ -3,7 +3,11 @@ using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.PropertyEditors.ParameterEditors
 {
-    [DataEditor("contentTypeMultiple", EditorType.MacroParameter, "Multiple Content Type Picker", "entitypicker")]
+    [DataEditor(
+        "contentTypeMultiple",
+        EditorType.MacroParameter,
+        "Multiple Content Type Picker",
+        "entitypicker")]
     public class MultipleContentTypeParameterEditor : DataEditor
     {
         public MultipleContentTypeParameterEditor(ILogger logger)
diff --git a/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultiplePropertyGroupParameterEditor.cs b/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultiplePropertyGroupParameterEditor.cs
index 87ddfb0b54..2a7079d578 100644
--- a/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultiplePropertyGroupParameterEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultiplePropertyGroupParameterEditor.cs
@@ -3,7 +3,11 @@ using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.PropertyEditors.ParameterEditors
 {
-    [DataEditor("tabPickerMultiple", EditorType.MacroParameter, "Multiple Tab Picker", "entitypicker")]
+    [DataEditor(
+        "tabPickerMultiple",
+        EditorType.MacroParameter,
+        "Multiple Tab Picker",
+        "entitypicker")]
     public class MultiplePropertyGroupParameterEditor : DataEditor
     {
         public MultiplePropertyGroupParameterEditor(ILogger logger)
diff --git a/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultiplePropertyTypeParameterEditor.cs b/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultiplePropertyTypeParameterEditor.cs
index 124325dbd7..fe1432a655 100644
--- a/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultiplePropertyTypeParameterEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultiplePropertyTypeParameterEditor.cs
@@ -3,7 +3,11 @@ using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.PropertyEditors.ParameterEditors
 {
-    [DataEditor("propertyTypePickerMultiple", EditorType.MacroParameter, "Multiple Property Type Picker", "entitypicker")]
+    [DataEditor(
+        "propertyTypePickerMultiple",
+        EditorType.MacroParameter,
+        "Multiple Property Type Picker",
+        "entitypicker")]
     public class MultiplePropertyTypeParameterEditor : DataEditor
     {
         public MultiplePropertyTypeParameterEditor(ILogger logger)
diff --git a/src/Umbraco.Web/PropertyEditors/ParameterEditors/PropertyGroupParameterEditor.cs b/src/Umbraco.Web/PropertyEditors/ParameterEditors/PropertyGroupParameterEditor.cs
index 76fa34341d..65ce595852 100644
--- a/src/Umbraco.Web/PropertyEditors/ParameterEditors/PropertyGroupParameterEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/ParameterEditors/PropertyGroupParameterEditor.cs
@@ -3,7 +3,11 @@ using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.PropertyEditors.ParameterEditors
 {
-    [DataEditor("tabPicker", EditorType.MacroParameter, "Tab Picker", "entitypicker")]
+    [DataEditor(
+        "tabPicker",
+        EditorType.MacroParameter,
+        "Tab Picker",
+        "entitypicker")]
     public class PropertyGroupParameterEditor : DataEditor
     {
         public PropertyGroupParameterEditor(ILogger logger)
diff --git a/src/Umbraco.Web/PropertyEditors/ParameterEditors/PropertyTypeParameterEditor.cs b/src/Umbraco.Web/PropertyEditors/ParameterEditors/PropertyTypeParameterEditor.cs
index b84749da27..4ea7c0ebdc 100644
--- a/src/Umbraco.Web/PropertyEditors/ParameterEditors/PropertyTypeParameterEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/ParameterEditors/PropertyTypeParameterEditor.cs
@@ -3,7 +3,11 @@ using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.PropertyEditors.ParameterEditors
 {
-    [DataEditor("propertyTypePicker", EditorType.MacroParameter, "Property Type Picker", "entitypicker")]
+    [DataEditor(
+        "propertyTypePicker",
+        EditorType.MacroParameter,
+        "Property Type Picker",
+        "entitypicker")]
     public class PropertyTypeParameterEditor : DataEditor
     {
         public PropertyTypeParameterEditor(ILogger logger)
diff --git a/src/Umbraco.Web/PropertyEditors/RadioButtonsPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/RadioButtonsPropertyEditor.cs
index 601728189c..f729decd2c 100644
--- a/src/Umbraco.Web/PropertyEditors/RadioButtonsPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/RadioButtonsPropertyEditor.cs
@@ -8,7 +8,13 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// A property editor to allow the individual selection of pre-defined items.
     /// </summary>
-    [DataEditor(Constants.PropertyEditors.Aliases.RadioButtonList, "Radio button list", "radiobuttons", ValueType = ValueTypes.String, Group="lists", Icon="icon-target")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.RadioButtonList,
+        "Radio button list",
+        "radiobuttons",
+        ValueType = ValueTypes.String,
+        Group = Constants.PropertyEditors.Groups.Lists,
+        Icon = "icon-target")]
     public class RadioButtonsPropertyEditor : DataEditor
     {
         private readonly ILocalizedTextService _textService;
diff --git a/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
index 297f9b7fb8..3ced379604 100644
--- a/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
@@ -15,7 +15,14 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// Represents a rich text property editor.
     /// </summary>
-    [DataEditor(Constants.PropertyEditors.Aliases.TinyMce, "Rich Text Editor", "rte", ValueType = ValueTypes.Text,  HideLabel = false, Group="Rich Content", Icon="icon-browser-window")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.TinyMce,
+        "Rich Text Editor",
+        "rte",
+        ValueType = ValueTypes.Text,
+        HideLabel = false,
+        Group = Constants.PropertyEditors.Groups.RichContent,
+        Icon = "icon-browser-window")]
     public class RichTextPropertyEditor : DataEditor
     {
         /// <summary>
diff --git a/src/Umbraco.Web/PropertyEditors/SliderPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/SliderPropertyEditor.cs
index c4a966cf49..8a98f15081 100644
--- a/src/Umbraco.Web/PropertyEditors/SliderPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/SliderPropertyEditor.cs
@@ -7,7 +7,11 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// Represents a slider editor.
     /// </summary>
-    [DataEditor(Constants.PropertyEditors.Aliases.Slider, "Slider", "slider", Icon = "icon-navigation-horizontal")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.Slider,
+        "Slider",
+        "slider",
+        Icon = "icon-navigation-horizontal")]
     public class SliderPropertyEditor : DataEditor
     {
         /// <summary>
diff --git a/src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
index 578b6fcd00..fd7e8694a3 100644
--- a/src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
@@ -15,7 +15,11 @@ namespace Umbraco.Web.PropertyEditors
     /// Represents a tags property editor.
     /// </summary>
     [TagsPropertyEditor]
-    [DataEditor(Constants.PropertyEditors.Aliases.Tags, "Tags", "tags", Icon="icon-tags")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.Tags,
+        "Tags",
+        "tags",
+        Icon = "icon-tags")]
     public class TagsPropertyEditor : DataEditor
     {
         private readonly ManifestValueValidatorCollection _validators;
diff --git a/src/Umbraco.Web/PropertyEditors/TextAreaPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/TextAreaPropertyEditor.cs
index f9ba99fd1e..c7bc2efbda 100644
--- a/src/Umbraco.Web/PropertyEditors/TextAreaPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/TextAreaPropertyEditor.cs
@@ -7,7 +7,13 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// Represents a textarea property and parameter editor.
     /// </summary>
-    [DataEditor(Constants.PropertyEditors.Aliases.TextArea, EditorType.PropertyValue | EditorType.MacroParameter, "Textarea", "textarea", ValueType = ValueTypes.Text, Icon="icon-application-window-alt")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.TextArea,
+        EditorType.PropertyValue | EditorType.MacroParameter,
+        "Textarea",
+        "textarea",
+        ValueType = ValueTypes.Text,
+        Icon = "icon-application-window-alt")]
     public class TextAreaPropertyEditor : DataEditor
     {
         /// <summary>
diff --git a/src/Umbraco.Web/PropertyEditors/TextboxPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/TextboxPropertyEditor.cs
index 4862f6c9aa..18f8155198 100644
--- a/src/Umbraco.Web/PropertyEditors/TextboxPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/TextboxPropertyEditor.cs
@@ -7,7 +7,12 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// Represents a textbox property and parameter editor.
     /// </summary>
-    [DataEditor(Constants.PropertyEditors.Aliases.TextBox, EditorType.PropertyValue | EditorType.MacroParameter, "Textbox", "textbox", Group = "Common")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.TextBox,
+        EditorType.PropertyValue | EditorType.MacroParameter,
+        "Textbox",
+        "textbox",
+        Group = Constants.PropertyEditors.Groups.Common)]
     public class TextboxPropertyEditor : DataEditor
     {
         /// <summary>
diff --git a/src/Umbraco.Web/PropertyEditors/TrueFalsePropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/TrueFalsePropertyEditor.cs
index ccd3bee744..fb2d2b29fe 100644
--- a/src/Umbraco.Web/PropertyEditors/TrueFalsePropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/TrueFalsePropertyEditor.cs
@@ -7,7 +7,14 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// Represents a checkbox property and parameter editor.
     /// </summary>
-    [DataEditor(Constants.PropertyEditors.Aliases.Boolean, EditorType.PropertyValue | EditorType.MacroParameter, "Checkbox", "boolean", ValueType = ValueTypes.Integer, Group = "Common", Icon="icon-checkbox")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.Boolean,
+        EditorType.PropertyValue | EditorType.MacroParameter,
+        "Checkbox",
+        "boolean",
+        ValueType = ValueTypes.Integer,
+        Group = Constants.PropertyEditors.Groups.Common,
+        Icon = "icon-checkbox")]
     public class TrueFalsePropertyEditor : DataEditor
     {
         /// <summary>
diff --git a/src/Umbraco.Web/PropertyEditors/UserPickerPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/UserPickerPropertyEditor.cs
index 1d3ab05e96..daf574719a 100644
--- a/src/Umbraco.Web/PropertyEditors/UserPickerPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/UserPickerPropertyEditor.cs
@@ -6,7 +6,13 @@ using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.PropertyEditors
 {
-    [DataEditor(Constants.PropertyEditors.Aliases.UserPicker, "User picker", "entitypicker", ValueType = ValueTypes.Integer, Group = "People", Icon = Constants.Icons.User)]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.UserPicker,
+        "User picker",
+        "entitypicker",
+        ValueType = ValueTypes.Integer,
+        Group = Constants.PropertyEditors.Groups.People,
+        Icon = Constants.Icons.User)]
     public class UserPickerPropertyEditor : DataEditor
     {
         public UserPickerPropertyEditor(ILogger logger)

From 57e58c6cf75112c738ca08e9398dcc77915b64fb Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Fri, 2 Aug 2019 11:43:22 +0200
Subject: [PATCH 249/776] Fix broken button to open content type from create
 dialog

---
 .../src/views/content/content.create.controller.js           | 5 +++++
 src/Umbraco.Web.UI.Client/src/views/content/create.html      | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.create.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.create.controller.js
index d04c707b25..f906369926 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.create.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.create.controller.js
@@ -94,6 +94,11 @@ function contentCreateController($scope,
         navigationService.hideDialog(showMenu);
     };
 
+    $scope.editContentType = function() {
+        $location.path("/settings/documenttypes/edit/" + $scope.contentTypeId).search("view", "permissions");
+        close();
+    }
+
     $scope.createBlank = createBlank;
     $scope.createOrSelectBlueprintIfAny = createOrSelectBlueprintIfAny;
     $scope.createFromBlueprint = createFromBlueprint;
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/create.html b/src/Umbraco.Web.UI.Client/src/views/content/create.html
index 059b5eaf25..b8303efade 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/create.html
@@ -10,7 +10,7 @@
                 <p class="abstract" ng-if="!hasSettingsAccess"><localize key="create_noDocumentTypesWithNoSettingsAccess"/></p>
                 <div ng-if="hasSettingsAccess">
                     <p class="abstract"><localize key="create_noDocumentTypes" /></p>
-                    <button class="btn umb-outline" href="#settings/documentTypes/edit/{{contentTypeId}}?view=permissions" ng-click="close()">
+                    <button class="btn umb-outline" ng-click="editContentType()">
                         <localize key="create_noDocumentTypesEditPermissions"/>
                     </button>
                 </div>

From beacc5bba8cd34d3c34df102020e04cdc79bcaa6 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Fri, 2 Aug 2019 11:43:22 +0200
Subject: [PATCH 250/776] Fix broken button to open content type from create
 dialog

(cherry picked from commit 57e58c6cf75112c738ca08e9398dcc77915b64fb)
---
 .../src/views/content/content.create.controller.js           | 5 +++++
 src/Umbraco.Web.UI.Client/src/views/content/create.html      | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.create.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.create.controller.js
index d04c707b25..f906369926 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.create.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.create.controller.js
@@ -94,6 +94,11 @@ function contentCreateController($scope,
         navigationService.hideDialog(showMenu);
     };
 
+    $scope.editContentType = function() {
+        $location.path("/settings/documenttypes/edit/" + $scope.contentTypeId).search("view", "permissions");
+        close();
+    }
+
     $scope.createBlank = createBlank;
     $scope.createOrSelectBlueprintIfAny = createOrSelectBlueprintIfAny;
     $scope.createFromBlueprint = createFromBlueprint;
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/create.html b/src/Umbraco.Web.UI.Client/src/views/content/create.html
index 059b5eaf25..b8303efade 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/create.html
@@ -10,7 +10,7 @@
                 <p class="abstract" ng-if="!hasSettingsAccess"><localize key="create_noDocumentTypesWithNoSettingsAccess"/></p>
                 <div ng-if="hasSettingsAccess">
                     <p class="abstract"><localize key="create_noDocumentTypes" /></p>
-                    <button class="btn umb-outline" href="#settings/documentTypes/edit/{{contentTypeId}}?view=permissions" ng-click="close()">
+                    <button class="btn umb-outline" ng-click="editContentType()">
                         <localize key="create_noDocumentTypesEditPermissions"/>
                     </button>
                 </div>

From 3245c82ea6a3ae9220e1f3cd5082ce087f610bb6 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 16 Jul 2019 13:43:10 +0200
Subject: [PATCH 251/776] Missing file in project file

(cherry picked from commit 3062f40ef5dd8ccc50dfee7c6edd5401690da71a)
---
 src/Umbraco.Core/Umbraco.Core.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 74af58b94f..bdbe384b05 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -242,6 +242,7 @@
     <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\DefaultPreValueMigrator.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\RenamingPreValueMigrator.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\RichTextPreValueMigrator.cs" />
+    <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\DropDownFlexiblePreValueMigrator.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\MergeDateAndDateTimePropertyEditor.cs" />
     <Compile Include="Models\Entities\EntityExtensions.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\PreValueMigratorBase.cs" />

From aabe6defb27c6c374a1bdf0a0904898d8936c4f9 Mon Sep 17 00:00:00 2001
From: Steve Megson <steve@megson.org>
Date: Sun, 14 Jul 2019 16:48:33 +0100
Subject: [PATCH 252/776] Fixes #5864 - migrate prevalues for
 Umbraco.DropDown.Flexible

(cherry picked from commit 4e0dd728a82a20a25b6500a6e450d0e4ecac376d)
---
 .../DropDownFlexiblePreValueMigrator.cs       | 32 +++++++++++++++++++
 .../DataTypes/PreValueMigratorComposer.cs     |  1 +
 2 files changed, 33 insertions(+)
 create mode 100644 src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/DropDownFlexiblePreValueMigrator.cs

diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/DropDownFlexiblePreValueMigrator.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/DropDownFlexiblePreValueMigrator.cs
new file mode 100644
index 0000000000..35ca574bab
--- /dev/null
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/DropDownFlexiblePreValueMigrator.cs
@@ -0,0 +1,32 @@
+using System.Collections.Generic;
+using System.Linq;
+using Umbraco.Core.PropertyEditors;
+
+namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0.DataTypes
+{
+    class DropDownFlexiblePreValueMigrator : IPreValueMigrator
+    {
+        public bool CanMigrate(string editorAlias)
+            => editorAlias == "Umbraco.DropDown.Flexible";
+
+        public virtual string GetNewAlias(string editorAlias)
+            => null;
+
+        public object GetConfiguration(int dataTypeId, string editorAlias, Dictionary<string, PreValueDto> preValues)
+        {
+            var config = new DropDownFlexibleConfiguration();
+            foreach (var preValue in preValues.Values)
+            {
+                if (preValue.Alias == "multiple")
+                {
+                    config.Multiple = (preValue.Value == "1");
+                }
+                else
+                {
+                    config.Items.Add(new ValueListConfiguration.ValueListItem { Id = preValue.Id, Value = preValue.Value });
+                }
+            }
+            return config;
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/PreValueMigratorComposer.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/PreValueMigratorComposer.cs
index 4c3f8534e7..8dfa464508 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/PreValueMigratorComposer.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/PreValueMigratorComposer.cs
@@ -19,6 +19,7 @@ public class PreValueMigratorComposer : ICoreComposer
             .Append<NestedContentPreValueMigrator>()
             .Append<DecimalPreValueMigrator>()
             .Append<ListViewPreValueMigrator>()
+            .Append<DropDownFlexiblePreValueMigrator>()
             .Append<ValueListPreValueMigrator>();
     }
 }

From 046ed8ec851cc18119d5f3f6a496fcc1d5e88c39 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 8 Aug 2019 12:23:57 +0200
Subject: [PATCH 253/776] Bump version to 8.1.2

---
 src/SolutionInfo.cs                      | 4 ++--
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index 841e054aee..5feffc0b57 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -18,5 +18,5 @@ using System.Resources;
 [assembly: AssemblyVersion("8.0.0")]
 
 // these are FYI and changed automatically
-[assembly: AssemblyFileVersion("8.1.1")]
-[assembly: AssemblyInformationalVersion("8.1.1")]
+[assembly: AssemblyFileVersion("8.1.2")]
+[assembly: AssemblyInformationalVersion("8.1.2")]
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index e58f44e1ae..b5d908f32e 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -345,9 +345,9 @@
         <WebProjectProperties>
           <UseIIS>False</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>8110</DevelopmentServerPort>
+          <DevelopmentServerPort>8120</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:8110</IISUrl>
+          <IISUrl>http://localhost:8120</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

From 44c966bd4479198a94fdcfa0fdb9cf99c8a05289 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Thu, 8 Aug 2019 11:37:18 +0100
Subject: [PATCH 254/776] Moves our Umbraco angular loader component to only
 hide itself once the tinymce editor has initialized

---
 .../src/views/propertyeditors/rte/rte.controller.js       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
index 3ed5f49b92..52b105201e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
@@ -57,7 +57,10 @@ angular.module("umbraco")
                 var baseLineConfigObj = {
                     maxImageSize: editorConfig.maxImageSize,
                     width: width,
-                    height: height
+                    height: height,
+                    init_instance_callback: function(editor){
+                        $scope.isLoading = false;
+                    }
                 };
 
                 angular.extend(baseLineConfigObj, standardConfig);
@@ -84,9 +87,6 @@ angular.module("umbraco")
                     $timeout(function () {
                         tinymce.DOM.events.domLoaded = true;
                         tinymce.init(baseLineConfigObj);
-
-                        $scope.isLoading = false;
-
                     }, 200);
                 }
 

From c6671f7f8eac714901953083dfbf1aad91b1450c Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Thu, 8 Aug 2019 12:35:39 +0100
Subject: [PATCH 255/776] Apply same loading bar UI to Grid RTE & use editor
 INIT to hide/remove it

---
 .../common/directives/components/grid/grid.rte.directive.js | 6 ++++++
 .../src/views/components/grid/grid-rte.html                 | 5 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
index cd1f011018..af82199d55 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
@@ -14,6 +14,8 @@ angular.module("umbraco.directives")
 
                 // TODO: A lot of the code below should be shared between the grid rte and the normal rte
 
+                scope.isLoading = true;
+
                 var promises = [];
                 
                 //To id the html textarea we need to use the datetime ticks because we can have multiple rte's per a single property alias
@@ -91,6 +93,10 @@ angular.module("umbraco.directives")
                         //custom initialization for this editor within the grid
                         editor.on('init', function (e) {
 
+                            // Used this init event - as opposed to property init_instance_callback
+                            // to turn off the loader
+                            scope.isLoading = false;
+
                             //force overflow to hidden to prevent no needed scroll
                             editor.getBody().style.overflow = "hidden";
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/grid/grid-rte.html b/src/Umbraco.Web.UI.Client/src/views/components/grid/grid-rte.html
index 519c11f76b..b5531f477a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/grid/grid-rte.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/grid/grid-rte.html
@@ -1,3 +1,4 @@
-<div class="umb-rte"
-     id="{{textAreaHtmlId}}">
+<div>
+    <umb-load-indicator ng-if="isLoading"></umb-load-indicator>
+    <div class="umb-rte" id="{{textAreaHtmlId}}" ng-style="{ visibility :  isLoading ? 'hidden' : 'visible' }"></div>
 </div>

From ed5effd19043711e28cdd18e3e88fa42db2a9722 Mon Sep 17 00:00:00 2001
From: Steve Megson <steve@honestjohn.co.uk>
Date: Thu, 8 Aug 2019 14:17:32 +0100
Subject: [PATCH 256/776] Sorting of images in multiple media picker

---
 .../views/propertyeditors/mediapicker/mediapicker.controller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
index f7e88bef36..120407ab10 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
@@ -229,7 +229,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
 
 
         $scope.sortableOptions = {
-            disabled: !$scope.isMultiPicker,
+            disabled: !multiPicker,
             items: "li:not(.add-wrapper)",
             cancel: ".unsortable",
             update: function (e, ui) {

From 88349c6b6613d16592d7d5f79d59f4b0dede800c Mon Sep 17 00:00:00 2001
From: Steve Megson <steve@honestjohn.co.uk>
Date: Thu, 8 Aug 2019 14:17:32 +0100
Subject: [PATCH 257/776] Sorting of images in multiple media picker

(cherry picked from commit ed5effd19043711e28cdd18e3e88fa42db2a9722)
---
 .../views/propertyeditors/mediapicker/mediapicker.controller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
index f7e88bef36..120407ab10 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
@@ -229,7 +229,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
 
 
         $scope.sortableOptions = {
-            disabled: !$scope.isMultiPicker,
+            disabled: !multiPicker,
             items: "li:not(.add-wrapper)",
             cancel: ".unsortable",
             update: function (e, ui) {

From 296d7964ae894956d338d90218904e5f9a30c157 Mon Sep 17 00:00:00 2001
From: amitch17 <alan@isfluent.com>
Date: Wed, 7 Aug 2019 21:34:48 +0100
Subject: [PATCH 258/776] Corrected comments to change usage examples

Corrected usage examples for entityResource.js

My first Umbraco commit! yay!
---
 .../src/common/resources/entity.resource.js                   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
index a910629f4a..7852180dfa 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
@@ -133,7 +133,7 @@ function entityResource($q, $http, umbRequestHelper) {
          * ##usage
          * <pre>
          * //get media by id
-         * entityResource.getEntityById(0, "Media")
+         * entityResource.getById(0, "Media")
          *    .then(function(ent) {
          *        var myDoc = ent;
          *        alert('its here!');
@@ -204,7 +204,7 @@ function entityResource($q, $http, umbRequestHelper) {
          * ##usage
          * <pre>
          * //Get templates for ids
-         * entityResource.getEntitiesByIds( [1234,2526,28262], "Template")
+         * entityResource.getByIds( [1234,2526,28262], "Template")
          *    .then(function(templateArray) {
          *        var myDoc = contentArray;
          *        alert('they are here!');

From 01a895bbf75006d442a590e5386a9f0de18a42f2 Mon Sep 17 00:00:00 2001
From: Peter Keating <peter@moov2.com>
Date: Thu, 28 Feb 2019 16:43:22 +0000
Subject: [PATCH 259/776] Fix notifications not sending when user has multiple
 of same type

When a user has multiple notifications of the same type, the user may
not receive the notification depending on the order which the
notification was setup. To fix this the notification logic has changed
from looping over users to looping over notifications.

Fixes #4713.
---
 .../Services/NotificationService.cs           | 78 +++++++++++--------
 1 file changed, 45 insertions(+), 33 deletions(-)

diff --git a/src/Umbraco.Core/Services/NotificationService.cs b/src/Umbraco.Core/Services/NotificationService.cs
index 07d6e4e9e5..ccf9b9da00 100644
--- a/src/Umbraco.Core/Services/NotificationService.cs
+++ b/src/Umbraco.Core/Services/NotificationService.cs
@@ -124,40 +124,52 @@ namespace Umbraco.Core.Services
                 var notifications = GetUsersNotifications(users.Select(x => x.Id), action, Enumerable.Empty<int>(), Constants.ObjectTypes.DocumentGuid).ToList();
                 if (notifications.Count == 0) break;
 
-                var i = 0;
-                foreach (var user in users)
-                {
-                    // continue if there's no notification for this user
-                    if (notifications[i].UserId != user.Id) continue; // next user
-
-                    for (var j = 0; j < entitiesL.Count; j++)
-                    {
-                        var content = entitiesL[j];
-                        var path = paths[j];
-                        
-                        // test if the notification applies to the path ie to this entity
-                        if (path.Contains(notifications[i].EntityId) == false) continue; // next entity
-                        
-                        if (prevVersionDictionary.ContainsKey(content.Id) == false)
-                        {
-                            prevVersionDictionary[content.Id] = GetPreviousVersion(content.Id);
-                        }
-                        
-                        // queue notification
-                        var req = CreateNotificationRequest(operatingUser, user, content, prevVersionDictionary[content.Id], actionName, http, createSubject, createBody);
-                        Enqueue(req);
-                    }
-
-                    // skip other notifications for this user, essentially this means moving i to the next index of notifications
-                    // for the next user.
-                    do
-                    {
-                        i++;
-                    } while (i < notifications.Count && notifications[i].UserId == user.Id);
-                    
-                    if (i >= notifications.Count) break; // break if no more notifications
-                }
+                while (notifications.Count > 0)
+                {
+                    var notification = notifications[0];
+                    var isMatched = false;
 
+                    // grab user whose associated to the notification
+                    var user = users.Where(x => x.Id == notification.UserId).FirstOrDefault();
+
+                    if (user == null)
+                    {
+                        notifications.RemoveAll(x => x.UserId == notification.UserId);
+                    }
+
+                    for (var j = 0; j < entitiesL.Count; j++)
+                    {
+                        var content = entitiesL[j];
+                        var path = paths[j];
+
+                        // test if the notification applies to the path ie to this entity
+                        if (path.Contains(notification.EntityId) == false) continue; // next entity
+
+                        isMatched = true;
+
+                        if (prevVersionDictionary.ContainsKey(content.Id) == false)
+                        {
+                            prevVersionDictionary[content.Id] = GetPreviousVersion(content.Id);
+                        }
+
+                        // queue notification
+                        var req = CreateNotificationRequest(operatingUser, user, content, prevVersionDictionary[content.Id], actionName, http, createSubject, createBody);
+                        Enqueue(req);
+
+                        // don't process any further entities as a notification has been sent
+                        break;
+                    }
+
+                    // when a match has been found, skip other notifications for user.
+                    if (isMatched)
+                    {
+                        notifications.RemoveAll(x => x.UserId == notification.UserId);
+                        continue;
+                    }
+
+                    notifications.Remove(notification);
+                }
+                
                 // load more users if any
                 id = users.Count == pagesz ? users.Last().Id + 1 : -1;
 

From ff595df7caa656664246d92fc13fab55491b3142 Mon Sep 17 00:00:00 2001
From: Peter Keating <peter@moov2.com>
Date: Thu, 28 Feb 2019 16:43:22 +0000
Subject: [PATCH 260/776] Fix notifications not sending when user has multiple
 of same type

When a user has multiple notifications of the same type, the user may
not receive the notification depending on the order which the
notification was setup. To fix this the notification logic has changed
from looping over users to looping over notifications.

Fixes #4713.

(cherry picked from commit 01a895bbf75006d442a590e5386a9f0de18a42f2)
---
 .../Services/NotificationService.cs           | 78 +++++++++++--------
 1 file changed, 45 insertions(+), 33 deletions(-)

diff --git a/src/Umbraco.Core/Services/NotificationService.cs b/src/Umbraco.Core/Services/NotificationService.cs
index 07d6e4e9e5..ccf9b9da00 100644
--- a/src/Umbraco.Core/Services/NotificationService.cs
+++ b/src/Umbraco.Core/Services/NotificationService.cs
@@ -124,40 +124,52 @@ namespace Umbraco.Core.Services
                 var notifications = GetUsersNotifications(users.Select(x => x.Id), action, Enumerable.Empty<int>(), Constants.ObjectTypes.DocumentGuid).ToList();
                 if (notifications.Count == 0) break;
 
-                var i = 0;
-                foreach (var user in users)
-                {
-                    // continue if there's no notification for this user
-                    if (notifications[i].UserId != user.Id) continue; // next user
-
-                    for (var j = 0; j < entitiesL.Count; j++)
-                    {
-                        var content = entitiesL[j];
-                        var path = paths[j];
-                        
-                        // test if the notification applies to the path ie to this entity
-                        if (path.Contains(notifications[i].EntityId) == false) continue; // next entity
-                        
-                        if (prevVersionDictionary.ContainsKey(content.Id) == false)
-                        {
-                            prevVersionDictionary[content.Id] = GetPreviousVersion(content.Id);
-                        }
-                        
-                        // queue notification
-                        var req = CreateNotificationRequest(operatingUser, user, content, prevVersionDictionary[content.Id], actionName, http, createSubject, createBody);
-                        Enqueue(req);
-                    }
-
-                    // skip other notifications for this user, essentially this means moving i to the next index of notifications
-                    // for the next user.
-                    do
-                    {
-                        i++;
-                    } while (i < notifications.Count && notifications[i].UserId == user.Id);
-                    
-                    if (i >= notifications.Count) break; // break if no more notifications
-                }
+                while (notifications.Count > 0)
+                {
+                    var notification = notifications[0];
+                    var isMatched = false;
 
+                    // grab user whose associated to the notification
+                    var user = users.Where(x => x.Id == notification.UserId).FirstOrDefault();
+
+                    if (user == null)
+                    {
+                        notifications.RemoveAll(x => x.UserId == notification.UserId);
+                    }
+
+                    for (var j = 0; j < entitiesL.Count; j++)
+                    {
+                        var content = entitiesL[j];
+                        var path = paths[j];
+
+                        // test if the notification applies to the path ie to this entity
+                        if (path.Contains(notification.EntityId) == false) continue; // next entity
+
+                        isMatched = true;
+
+                        if (prevVersionDictionary.ContainsKey(content.Id) == false)
+                        {
+                            prevVersionDictionary[content.Id] = GetPreviousVersion(content.Id);
+                        }
+
+                        // queue notification
+                        var req = CreateNotificationRequest(operatingUser, user, content, prevVersionDictionary[content.Id], actionName, http, createSubject, createBody);
+                        Enqueue(req);
+
+                        // don't process any further entities as a notification has been sent
+                        break;
+                    }
+
+                    // when a match has been found, skip other notifications for user.
+                    if (isMatched)
+                    {
+                        notifications.RemoveAll(x => x.UserId == notification.UserId);
+                        continue;
+                    }
+
+                    notifications.Remove(notification);
+                }
+                
                 // load more users if any
                 id = users.Count == pagesz ? users.Last().Id + 1 : -1;
 

From 8a3b2e038c993dcf419c67684cf8745d72ff4350 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 9 Aug 2019 15:54:21 +1000
Subject: [PATCH 261/776] adds note

---
 .../src/views/propertyeditors/grid/config/grid.default.config.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/config/grid.default.config.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/config/grid.default.config.js
index 466429ad9f..a2b1ca4097 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/config/grid.default.config.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/config/grid.default.config.js
@@ -1,3 +1,4 @@
+//TODO: What is this file? Is it used?? I don't think so
 var uSkyGridConfig = [
 {
 

From fbb19cba0b5844dfa386c67c1705fd0dc1357933 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 9 Aug 2019 16:02:05 +1000
Subject: [PATCH 262/776] Updates the build so we can be more flexible with
 where we put angular file types in the solution

---
 src/Umbraco.Web.UI.Client/gulp/config.js | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/gulp/config.js b/src/Umbraco.Web.UI.Client/gulp/config.js
index 4dae0dac08..449247b9b9 100755
--- a/src/Umbraco.Web.UI.Client/gulp/config.js
+++ b/src/Umbraco.Web.UI.Client/gulp/config.js
@@ -16,13 +16,26 @@ module.exports = {
         //processed in the js task
         js: {
             preview: { files: ["./src/preview/**/*.js"], out: "umbraco.preview.js" },
-            installer: { files: ["./src/installer/**/*.js"], out: "umbraco.installer.js" },
-            controllers: { files: ["./src/{views,controllers}/**/*.controller.js"], out: "umbraco.controllers.js" },
-            directives: { files: ["./src/common/directives/**/*.js"], out: "umbraco.directives.js" },
+            installer: { files: ["./src/installer/**/*.js"], out: "umbraco.installer.js" },            
             filters: { files: ["./src/common/filters/**/*.js"], out: "umbraco.filters.js" },
             resources: { files: ["./src/common/resources/**/*.js"], out: "umbraco.resources.js" },
             services: { files: ["./src/common/services/**/*.js"], out: "umbraco.services.js" },
-            security: { files: ["./src/common/interceptors/**/*.js"], out: "umbraco.interceptors.js" }
+            security: { files: ["./src/common/interceptors/**/*.js"], out: "umbraco.interceptors.js" },
+
+            //the controllers for views
+            controllers: { files: ["./src/{views,controllers}/**/*.controller.js"], out: "umbraco.controllers.js" },
+
+            //directives/components 
+            // - any JS file found in common / directives or common/ components
+            // - any JS file found inside views that has the suffix .directive.js or .component.js
+            directives: {
+                files: [
+                    "./src/common/directives/_module.js",
+                    "./src/{common/directives,common/components}/**/*.js",
+                    "./src/{views}/**/*.{directive,component}.js"
+                ],
+                out: "umbraco.directives.js"
+            },
         },
 
         //selectors for copying all views into the build
@@ -34,7 +47,7 @@ module.exports = {
 
         //globs for file-watching
         globs:{
-            views: "./src/views/**/*.html",
+            views: ["./src/views/**/*.html", "./src/common/directives/**/*.html", "./src/common/components/**/*.html" ],
             less: "./src/less/**/*.less",
             js: "./src/*.js",
             lib: "./lib/**/*",

From 44b6738b0d5492eb5f8a9af2e36441f91ee3b122 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 9 Aug 2019 16:36:10 +1000
Subject: [PATCH 263/776] Moves main/navigation controllers to root - no more
 'controller' folder

---
 src/Umbraco.Web.UI.Client/gulp/config.js      |   7 +-
 .../src/{controllers => }/main.controller.js  |   0
 .../navigation.controller.js                  |   0
 .../Umbraco/js/main.controller.js             | 209 +++++++
 .../Umbraco/js/navigation.controller.js       | 517 ++++++++++++++++++
 5 files changed, 732 insertions(+), 1 deletion(-)
 rename src/Umbraco.Web.UI.Client/src/{controllers => }/main.controller.js (100%)
 rename src/Umbraco.Web.UI.Client/src/{controllers => }/navigation.controller.js (100%)
 create mode 100644 src/Umbraco.Web.UI/Umbraco/js/main.controller.js
 create mode 100644 src/Umbraco.Web.UI/Umbraco/js/navigation.controller.js

diff --git a/src/Umbraco.Web.UI.Client/gulp/config.js b/src/Umbraco.Web.UI.Client/gulp/config.js
index 449247b9b9..0d15765347 100755
--- a/src/Umbraco.Web.UI.Client/gulp/config.js
+++ b/src/Umbraco.Web.UI.Client/gulp/config.js
@@ -23,7 +23,12 @@ module.exports = {
             security: { files: ["./src/common/interceptors/**/*.js"], out: "umbraco.interceptors.js" },
 
             //the controllers for views
-            controllers: { files: ["./src/{views,controllers}/**/*.controller.js"], out: "umbraco.controllers.js" },
+            controllers: {
+                files: [
+                    "./src/*.controller.js",
+                    "./src/{views}/**/*.controller.js"
+                ], out: "umbraco.controllers.js"
+            },
 
             //directives/components 
             // - any JS file found in common / directives or common/ components
diff --git a/src/Umbraco.Web.UI.Client/src/controllers/main.controller.js b/src/Umbraco.Web.UI.Client/src/main.controller.js
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/controllers/main.controller.js
rename to src/Umbraco.Web.UI.Client/src/main.controller.js
diff --git a/src/Umbraco.Web.UI.Client/src/controllers/navigation.controller.js b/src/Umbraco.Web.UI.Client/src/navigation.controller.js
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/controllers/navigation.controller.js
rename to src/Umbraco.Web.UI.Client/src/navigation.controller.js
diff --git a/src/Umbraco.Web.UI/Umbraco/js/main.controller.js b/src/Umbraco.Web.UI/Umbraco/js/main.controller.js
new file mode 100644
index 0000000000..654bbb1d03
--- /dev/null
+++ b/src/Umbraco.Web.UI/Umbraco/js/main.controller.js
@@ -0,0 +1,209 @@
+
+/**
+ * @ngdoc controller
+ * @name Umbraco.MainController
+ * @function
+ * 
+ * @description
+ * The main application controller
+ * 
+ */
+function MainController($scope, $location, appState, treeService, notificationsService, 
+    userService, historyService, updateChecker, navigationService, eventsService, 
+    tmhDynamicLocale, localStorageService, editorService, overlayService) {
+
+    //the null is important because we do an explicit bool check on this in the view
+    $scope.authenticated = null;
+    $scope.touchDevice = appState.getGlobalState("touchDevice");
+    $scope.infiniteMode = false;
+    $scope.overlay = {};
+    $scope.drawer = {};
+    $scope.search = {};
+    $scope.login = {};
+    $scope.tabbingActive = false;
+    
+    // There are a number of ways to detect when a focus state should be shown when using the tab key and this seems to be the simplest solution. 
+    // For more information about this approach, see https://hackernoon.com/removing-that-ugly-focus-ring-and-keeping-it-too-6c8727fefcd2
+    function handleFirstTab(evt) {
+        if (evt.keyCode === 9) {
+            $scope.tabbingActive = true;
+            $scope.$digest();
+            window.removeEventListener('keydown', handleFirstTab);
+            window.addEventListener('mousedown', disableTabbingActive);
+        }
+    }
+    
+    function disableTabbingActive(evt) {
+        $scope.tabbingActive = false;
+        $scope.$digest();
+        window.removeEventListener('mousedown', disableTabbingActive);
+        window.addEventListener("keydown", handleFirstTab);
+    }
+
+    window.addEventListener("keydown", handleFirstTab);
+
+
+    $scope.removeNotification = function (index) {
+        notificationsService.remove(index);
+    };
+
+    $scope.closeSearch = function() {
+        appState.setSearchState("show", false);
+    };
+
+    $scope.showLoginScreen = function(isTimedOut) {
+        $scope.login.isTimedOut = isTimedOut;
+        $scope.login.show = true;
+    };
+
+    $scope.hideLoginScreen = function() {
+        $scope.login.show = false;
+    };
+
+    var evts = [];
+    
+    //when a user logs out or timesout
+    evts.push(eventsService.on("app.notAuthenticated", function (evt, data) {
+        $scope.authenticated = null;
+        $scope.user = null;
+        const isTimedOut = data && data.isTimedOut ? true : false;
+        $scope.showLoginScreen(isTimedOut);
+    }));
+
+    evts.push(eventsService.on("app.userRefresh", function(evt) {
+        userService.refreshCurrentUser().then(function(data) {
+            $scope.user = data;
+
+            //Load locale file
+            if ($scope.user.locale) {
+                tmhDynamicLocale.set($scope.user.locale);
+            }
+        });
+    }));
+
+    //when the app is ready/user is logged in, setup the data
+    evts.push(eventsService.on("app.ready", function (evt, data) {
+
+        $scope.authenticated = data.authenticated;
+        $scope.user = data.user;
+
+        updateChecker.check().then(function (update) {
+            if (update && update !== "null") {
+                if (update.type !== "None") {
+                    var notification = {
+                        headline: "Update available",
+                        message: "Click to download",
+                        sticky: true,
+                        type: "info",
+                        url: update.url
+                    };
+                    notificationsService.add(notification);
+                }
+            }
+        });
+
+        //if the user has changed we need to redirect to the root so they don't try to continue editing the
+        //last item in the URL (NOTE: the user id can equal zero, so we cannot just do !data.lastUserId since that will resolve to true)
+        if (data.lastUserId !== undefined && data.lastUserId !== null && data.lastUserId !== data.user.id) {
+
+            var section = appState.getSectionState("currentSection");
+            if (section) {
+                //if there's a section already assigned, reload it so the tree is cleared
+                navigationService.reloadSection(section);
+            }
+
+            $location.path("/").search("");
+            historyService.removeAll();
+            treeService.clearCache();
+            editorService.closeAll();
+            overlayService.close();
+
+            //if the user changed, clearout local storage too - could contain sensitive data
+            localStorageService.clearAll();
+        }
+
+        //if this is a new login (i.e. the user entered credentials), then clear out local storage - could contain sensitive data
+        if (data.loginType === "credentials") {
+            localStorageService.clearAll();
+        }
+
+        //Load locale file
+        if ($scope.user.locale) {
+            tmhDynamicLocale.set($scope.user.locale);
+        }
+
+    }));
+
+    // events for search
+    evts.push(eventsService.on("appState.searchState.changed", function (e, args) {
+        if (args.key === "show") {
+            $scope.search.show = args.value;
+        }
+    }));
+
+    // events for drawer
+    // manage the help dialog by subscribing to the showHelp appState
+    evts.push(eventsService.on("appState.drawerState.changed", function (e, args) {
+        // set view
+        if (args.key === "view") {
+            $scope.drawer.view = args.value;
+        }
+        // set custom model
+        if (args.key === "model") {
+            $scope.drawer.model = args.value;
+        }
+        // show / hide drawer
+        if (args.key === "showDrawer") {
+            $scope.drawer.show = args.value;
+        }
+    }));
+
+    // events for overlays
+    evts.push(eventsService.on("appState.overlay", function (name, args) {
+        $scope.overlay = args;
+    }));
+    
+    // events for tours
+    evts.push(eventsService.on("appState.tour.start", function (name, args) {
+        $scope.tour = args;
+        $scope.tour.show = true;
+    }));
+
+    evts.push(eventsService.on("appState.tour.end", function () {
+        $scope.tour = null;
+    }));
+
+    evts.push(eventsService.on("appState.tour.complete", function () {
+        $scope.tour = null;
+    }));
+
+    // events for backdrop
+    evts.push(eventsService.on("appState.backdrop", function (name, args) {
+        $scope.backdrop = args;
+    }));
+
+    // event for infinite editors
+    evts.push(eventsService.on("appState.editors.open", function (name, args) {
+        $scope.infiniteMode = args && args.editors.length > 0 ? true : false;
+    }));
+
+    evts.push(eventsService.on("appState.editors.close", function (name, args) {
+        $scope.infiniteMode = args && args.editors.length > 0 ? true : false;
+    }));
+
+    //ensure to unregister from all events!
+    $scope.$on('$destroy', function () {
+        for (var e in evts) {
+            eventsService.unsubscribe(evts[e]);
+        }
+    });
+
+}
+
+
+//register it
+angular.module('umbraco').controller("Umbraco.MainController", MainController).
+    config(function (tmhDynamicLocaleProvider) {
+        //Set url for locale files
+        tmhDynamicLocaleProvider.localeLocationPattern('lib/angular-i18n/angular-locale_{{locale}}.js');
+    });
diff --git a/src/Umbraco.Web.UI/Umbraco/js/navigation.controller.js b/src/Umbraco.Web.UI/Umbraco/js/navigation.controller.js
new file mode 100644
index 0000000000..e4c94f3c66
--- /dev/null
+++ b/src/Umbraco.Web.UI/Umbraco/js/navigation.controller.js
@@ -0,0 +1,517 @@
+
+/**
+ * @ngdoc controller
+ * @name Umbraco.NavigationController
+ * @function
+ *
+ * @description
+ * Handles the section area of the app
+ *
+ * @param {navigationService} navigationService A reference to the navigationService
+ */
+function NavigationController($scope, $rootScope, $location, $log, $q, $routeParams, $timeout, $cookies, treeService, appState, navigationService, keyboardService, historyService, eventsService, angularHelper, languageResource, contentResource, editorState) {
+
+    //this is used to trigger the tree to start loading once everything is ready
+    var treeInitPromise = $q.defer();
+
+    $scope.treeApi = {};
+
+    //Bind to the main tree events
+    $scope.onTreeInit = function () {
+
+        $scope.treeApi.callbacks.treeNodeExpanded(nodeExpandedHandler);
+
+        //when a tree is loaded into a section, we need to put it into appState
+        $scope.treeApi.callbacks.treeLoaded(function (args) {
+            appState.setTreeState("currentRootNode", args.tree);
+        });
+
+        //when a tree node is synced this event will fire, this allows us to set the currentNode
+        $scope.treeApi.callbacks.treeSynced(function (args) {
+
+            if (args.activate === undefined || args.activate === true) {
+                //set the current selected node
+                appState.setTreeState("selectedNode", args.node);
+                //when a node is activated, this is the same as clicking it and we need to set the
+                //current menu item to be this node as well.
+                //appState.setMenuState("currentNode", args.node);// Niels: No, we are setting it from the dialog.
+            }
+        });
+
+        //this reacts to the options item in the tree
+        $scope.treeApi.callbacks.treeOptionsClick(function (args) {
+            args.event.stopPropagation();
+            args.event.preventDefault();
+
+            //Set the current action node (this is not the same as the current selected node!)
+            //appState.setMenuState("currentNode", args.node);// Niels: No, we are setting it from the dialog.
+
+            if (args.event && args.event.altKey) {
+                args.skipDefault = true;
+            }
+
+            navigationService.showMenu(args);
+        });
+
+        $scope.treeApi.callbacks.treeNodeAltSelect(function (args) {
+            args.event.stopPropagation();
+            args.event.preventDefault();
+
+            args.skipDefault = true;
+            navigationService.showMenu(args);
+        });
+
+        //this reacts to tree items themselves being clicked
+        //the tree directive should not contain any handling, simply just bubble events
+        $scope.treeApi.callbacks.treeNodeSelect(function (args) {
+            var n = args.node;
+            args.event.stopPropagation();
+            args.event.preventDefault();
+
+            if (n.metaData && n.metaData["jsClickCallback"] && angular.isString(n.metaData["jsClickCallback"]) && n.metaData["jsClickCallback"] !== "") {
+                //this is a legacy tree node!
+                var jsPrefix = "javascript:";
+                var js;
+                if (n.metaData["jsClickCallback"].startsWith(jsPrefix)) {
+                    js = n.metaData["jsClickCallback"].substr(jsPrefix.length);
+                }
+                else {
+                    js = n.metaData["jsClickCallback"];
+                }
+                try {
+                    var func = eval(js);
+                    //this is normally not necessary since the eval above should execute the method and will return nothing.
+                    if (func != null && (typeof func === "function")) {
+                        func.call();
+                    }
+                }
+                catch (ex) {
+                    $log.error("Error evaluating js callback from legacy tree node: " + ex);
+                }
+            }
+            else if (n.routePath) {
+                //add action to the history service
+                historyService.add({ name: n.name, link: n.routePath, icon: n.icon });
+
+                //put this node into the tree state
+                appState.setTreeState("selectedNode", args.node);
+                //when a node is clicked we also need to set the active menu node to this node
+                //appState.setMenuState("currentNode", args.node);
+
+                //not legacy, lets just set the route value and clear the query string if there is one.
+                $location.path(n.routePath);
+                navigationService.clearSearch();
+            }
+            else if (n.section) {
+                $location.path(n.section);
+                navigationService.clearSearch();
+            }
+
+            navigationService.hideNavigation();
+        });
+
+        return treeInitPromise.promise;
+    }
+
+    //set up our scope vars
+    $scope.showContextMenuDialog = false;
+    $scope.showContextMenu = false;
+    $scope.showSearchResults = false;
+    $scope.menuDialogTitle = null;
+    $scope.menuActions = [];
+    $scope.menuNode = null;
+    $scope.languages = [];
+    $scope.selectedLanguage = {};
+    $scope.page = {};
+    $scope.page.languageSelectorIsOpen = false;
+
+    $scope.currentSection = null;
+    $scope.customTreeParams = null;
+    $scope.treeCacheKey = "_";
+    $scope.showNavigation = appState.getGlobalState("showNavigation");
+    // tracks all expanded paths so when the language is switched we can resync it with the already loaded paths
+    var expandedPaths = [];
+
+    //trigger search with a hotkey:
+    keyboardService.bind("ctrl+shift+s", function () {
+        navigationService.showSearch();
+    });
+
+    //// TODO: remove this it's not a thing
+    //$scope.selectedId = navigationService.currentId;
+
+    var isInit = false;
+    var evts = [];
+    
+    //Listen for global state changes
+    evts.push(eventsService.on("appState.globalState.changed", function (e, args) {
+        if (args.key === "showNavigation") {
+            $scope.showNavigation = args.value;
+        }
+    }));
+
+    //Listen for menu state changes
+    evts.push(eventsService.on("appState.menuState.changed", function (e, args) {
+        if (args.key === "showMenuDialog") {
+            $scope.showContextMenuDialog = args.value;
+        }
+        if (args.key === "dialogTemplateUrl") {
+            $scope.dialogTemplateUrl = args.value;
+        }
+        if (args.key === "showMenu") {
+            $scope.showContextMenu = args.value;
+        }
+        if (args.key === "dialogTitle") {
+            $scope.menuDialogTitle = args.value;
+        }
+        if (args.key === "menuActions") {
+            $scope.menuActions = args.value;
+        }
+        if (args.key === "currentNode") {
+            $scope.menuNode = args.value;
+        }
+    }));
+
+    //Listen for tree state changes
+    evts.push(eventsService.on("appState.treeState.changed", function (e, args) {
+        if (args.key === "currentRootNode") {
+
+            //if the changed state is the currentRootNode, determine if this is a full screen app
+            if (args.value.root && args.value.root.containsTrees === false) {
+                $rootScope.emptySection = true;
+            }
+            else {
+                $rootScope.emptySection = false;
+            }
+        }
+
+    }));
+
+    //Listen for section state changes
+    evts.push(eventsService.on("appState.sectionState.changed", function (e, args) {
+
+        //section changed
+        if (args.key === "currentSection" && $scope.currentSection != args.value) {
+            //before loading the main tree we need to ensure that the nav is ready
+            navigationService.waitForNavReady().then(() => {
+                $scope.currentSection = args.value;
+                //load the tree
+                configureTreeAndLanguages();
+                $scope.treeApi.load({ section: $scope.currentSection, customTreeParams: $scope.customTreeParams, cacheKey: $scope.treeCacheKey });
+            });
+        }
+        
+        //show/hide search results
+        if (args.key === "showSearchResults") {
+            $scope.showSearchResults = args.value;
+        }
+
+    }));
+
+    // Listen for language updates
+    evts.push(eventsService.on("editors.languages.languageDeleted", function (e, args) {
+        loadLanguages().then(function (languages) {
+            $scope.languages = languages;
+        });
+    }));
+
+    //Emitted when a language is created or an existing one saved/edited
+    evts.push(eventsService.on("editors.languages.languageSaved", function (e, args) {
+        if(args.isNew){
+            //A new language has been created - reload languages for tree
+            loadLanguages().then(function (languages) {
+                $scope.languages = languages;
+            });
+        }
+        else if(args.language.isDefault){
+            //A language was saved and was set to be the new default (refresh the tree, so its at the top)
+            loadLanguages().then(function (languages) {
+                $scope.languages = languages;
+            });
+        }
+    }));
+
+    //when a user logs out or timesout
+    evts.push(eventsService.on("app.notAuthenticated", function () {
+        $scope.authenticated = false;
+    }));
+
+    //when the application is ready and the user is authorized, setup the data
+    //this will occur anytime a new user logs in!
+    evts.push(eventsService.on("app.ready", function (evt, data) {
+        $scope.authenticated = true;
+        ensureInit();
+    }));
+
+    // event for infinite editors
+    evts.push(eventsService.on("appState.editors.open", function (name, args) {
+        $scope.infiniteMode = args && args.editors.length > 0 ? true : false;
+    }));
+
+    evts.push(eventsService.on("appState.editors.close", function (name, args) {
+        $scope.infiniteMode = args && args.editors.length > 0 ? true : false;
+    }));
+
+    evts.push(eventsService.on("treeService.removeNode", function (e, args) {
+        //check to see if the current page has been removed
+
+        var currentEditorState = editorState.getCurrent()
+        if (currentEditorState && currentEditorState.id.toString() === args.node.id.toString()) {
+            //current page is loaded, so navigate to root
+            var section = appState.getSectionState("currentSection");
+            $location.path("/" + section);
+        }
+    }));
+
+
+    
+
+    /**
+     * Based on the current state of the application, this configures the scope variables that control the main tree and language drop down
+     */
+    function configureTreeAndLanguages() {
+
+        //create the custom query string param for this tree, this is currently only relevant for content
+        if ($scope.currentSection === "content") {
+
+            //must use $location here because $routeParams isn't available until after the route change
+            var mainCulture = $location.search().mculture;
+            //select the current language if set in the query string
+            if (mainCulture && $scope.languages && $scope.languages.length > 1) {
+                var found = _.find($scope.languages, function (l) {
+                    return l.culture.toLowerCase() === mainCulture.toLowerCase();
+                });
+                if (found) {
+                    //set the route param
+                    found.active = true;
+                    $scope.selectedLanguage = found;
+                }
+            }
+
+            var queryParams = {};
+            if ($scope.selectedLanguage && $scope.selectedLanguage.culture) {
+                queryParams["culture"] = $scope.selectedLanguage.culture;
+            }
+            var queryString = $.param(queryParams); //create the query string from the params object
+        }
+
+        if (queryString) {
+            $scope.customTreeParams = queryString;
+            $scope.treeCacheKey = queryString; // this tree uses caching but we need to change it's cache key per lang
+        }
+        else {
+            $scope.treeCacheKey = "_"; // this tree uses caching, there's no lang selected so use the default
+        }
+
+    }
+
+    /**
+     * Called when the app is ready and sets up the navigation (should only be called once)
+     */
+    function ensureInit() {
+
+        //only run once ever!
+        if (isInit) {
+            return;
+        }
+
+        isInit = true;
+
+        var navInit = false;
+
+        //$routeParams will be populated after $routeChangeSuccess since this controller is used outside ng-view,
+        //* we listen for the first route change with a section to setup the navigation.
+        //* we listen for all route changes to track the current section.
+        $rootScope.$on('$routeChangeSuccess', function () {
+
+            //only continue if there's a section available
+            if ($routeParams.section) {
+
+                if (!navInit) {
+                    navInit = true;
+                    initNav();
+                }
+
+                //keep track of the current section when it changes
+                if ($scope.currentSection != $routeParams.section) {
+                    appState.setSectionState("currentSection", $routeParams.section);
+                }
+
+            }
+        });
+    }
+
+    /**
+     * This loads the language data, if the are no variant content types configured this will return no languages
+     */
+    function loadLanguages() {
+
+        return contentResource.allowsCultureVariation().then(function (b) {
+            if (b === true) {
+                return languageResource.getAll()
+            } else {
+                return $q.when([]); //resolve an empty collection
+            }
+        });
+    }
+
+    /**
+     * Called once during init to initialize the navigation/tree/languages
+     */
+    function initNav() {
+        // load languages
+        loadLanguages().then(function (languages) {
+
+            $scope.languages = languages;
+
+            if ($scope.languages.length > 1) {
+                //if there's already one set, check if it exists
+                var currCulture = null;
+                var mainCulture = $location.search().mculture;
+                if (mainCulture) {
+                    currCulture = _.find($scope.languages, function (l) {
+                        return l.culture.toLowerCase() === mainCulture.toLowerCase();
+                    });
+                }
+                if (!currCulture) {
+                    // no culture in the request, let's look for one in the cookie that's set when changing language
+                    var defaultCulture = $cookies.get("UMB_MCULTURE");
+                    if (!defaultCulture || !_.find($scope.languages, function (l) {
+                            return l.culture.toLowerCase() === defaultCulture.toLowerCase();
+                        })) {
+                        // no luck either, look for the default language
+                        var defaultLang = _.find($scope.languages, function (l) {
+                            return l.isDefault;
+                        });
+                        if (defaultLang) {
+                            defaultCulture = defaultLang.culture;
+                        }
+                    }
+                    $location.search("mculture", defaultCulture ? defaultCulture : null);
+                }
+            }
+
+            $scope.currentSection = $routeParams.section;
+
+            configureTreeAndLanguages();
+
+            //resolve the tree promise, set it's property values for loading the tree which will make the tree load
+            treeInitPromise.resolve({
+                section: $scope.currentSection,
+                customTreeParams: $scope.customTreeParams,
+                cacheKey: $scope.treeCacheKey,
+
+                //because angular doesn't return a promise for the resolve method, we need to resort to some hackery, else
+                //like normal JS promises we could do resolve(...).then()
+                onLoaded: function () {
+
+                    //the nav is ready, let the app know
+                    eventsService.emit("app.navigationReady", { treeApi: $scope.treeApi });
+                    
+                }
+            });
+        });
+    }
+    function nodeExpandedHandler(args) {
+        //store the reference to the expanded node path
+        if (args.node) {
+            treeService._trackExpandedPaths(args.node, expandedPaths);
+        }
+    }
+
+    $scope.selectLanguage = function (language) {
+
+        $location.search("mculture", language.culture);
+        // add the selected culture to a cookie so the user will log back into the same culture later on (cookie lifetime = one year)
+        var expireDate = new Date();
+        expireDate.setDate(expireDate.getDate() + 365);
+        $cookies.put("UMB_MCULTURE", language.culture, {path: "/", expires: expireDate});
+
+        // close the language selector
+        $scope.page.languageSelectorIsOpen = false;
+
+        configureTreeAndLanguages(); //re-bind language to the query string and update the tree params
+
+        //reload the tree with it's updated querystring args
+        $scope.treeApi.load({ section: $scope.currentSection, customTreeParams: $scope.customTreeParams, cacheKey: $scope.treeCacheKey }).then(function () {
+
+            //re-sync to currently edited node
+            var currNode = appState.getTreeState("selectedNode");
+            //create the list of promises
+            var promises = [];
+            //starting with syncing to the currently selected node if there is one
+            if (currNode) {
+                var path = treeService.getPath(currNode);
+                promises.push($scope.treeApi.syncTree({ path: path, activate: true }));
+            }
+            // TODO: If we want to keep all paths expanded ... but we need more testing since we need to deal with unexpanding
+            //for (var i = 0; i < expandedPaths.length; i++) {
+            //    promises.push($scope.treeApi.syncTree({ path: expandedPaths[i], activate: false, forceReload: true }));
+            //}
+            //execute them sequentially
+
+            // set selected language to active
+            angular.forEach($scope.languages, function(language){
+                language.active = false;
+            });
+            language.active = true;
+
+            angularHelper.executeSequentialPromises(promises);
+        });
+
+    };
+
+    //this reacts to the options item in the tree
+    // TODO: migrate to nav service
+    // TODO: is this used?
+    $scope.searchShowMenu = function (ev, args) {
+        //always skip default
+        args.skipDefault = true;
+        navigationService.showMenu(args);
+    };
+
+    // TODO: migrate to nav service
+    // TODO: is this used?
+    $scope.searchHide = function () {
+        navigationService.hideSearch();
+    };
+
+    //the below assists with hiding/showing the tree
+    var treeActive = false;
+
+    //Sets a service variable as soon as the user hovers the navigation with the mouse
+    //used by the leaveTree method to delay hiding
+    $scope.enterTree = function (event) {
+        treeActive = true;
+    };
+
+    // Hides navigation tree, with a short delay, is cancelled if the user moves the mouse over the tree again
+    $scope.leaveTree = function (event) {
+        //this is a hack to handle IE touch events which freaks out due to no mouse events so the tree instantly shuts down
+        if (!event) {
+            return;
+        }
+        if (!appState.getGlobalState("touchDevice")) {
+            treeActive = false;
+            $timeout(function () {
+                if (!treeActive) {
+                    navigationService.hideTree();
+                }
+            }, 300);
+        }
+    };
+
+    $scope.toggleLanguageSelector = function () {
+        $scope.page.languageSelectorIsOpen = !$scope.page.languageSelectorIsOpen;
+    };
+
+    //ensure to unregister from all events!
+    $scope.$on('$destroy', function () {
+        for (var e in evts) {
+            eventsService.unsubscribe(evts[e]);
+        }
+    });
+}
+
+//register it
+angular.module('umbraco').controller("Umbraco.NavigationController", NavigationController);

From 7f02bc7d1d12f0303078665d53c360da1e121b11 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 9 Aug 2019 16:55:58 +1000
Subject: [PATCH 264/776] fix controller glob

---
 src/Umbraco.Web.UI.Client/gulp/config.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/gulp/config.js b/src/Umbraco.Web.UI.Client/gulp/config.js
index 0d15765347..cf0407b71d 100755
--- a/src/Umbraco.Web.UI.Client/gulp/config.js
+++ b/src/Umbraco.Web.UI.Client/gulp/config.js
@@ -24,9 +24,9 @@ module.exports = {
 
             //the controllers for views
             controllers: {
-                files: [
-                    "./src/*.controller.js",
-                    "./src/{views}/**/*.controller.js"
+                files: [                    
+                    "./src/views/**/*.controller.js",
+                    "./src/*.controller.js"
                 ], out: "umbraco.controllers.js"
             },
 

From e10ce234dbf3ed347183f1e719e8ab1372ca8ea4 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Thu, 8 Aug 2019 23:09:34 +0200
Subject: [PATCH 265/776] Fix "infinityMode" typo

---
 .../directives/components/editor/umbeditors.directive.js      | 4 +---
 .../src/less/components/editor/umb-editor.less                | 2 +-
 .../src/views/components/editor/umb-editors.html              | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditors.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditors.directive.js
index 4104a663d3..9bdef41225 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditors.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditors.directive.js
@@ -16,9 +16,7 @@
                 editor.moveRight = true;
                 editor.level = 0;
                 editor.styleIndex = 0;
-                
-                editor.infinityMode = true;
-                
+                                
                 // push the new editor to the dom
                 scope.editors.push(editor);
                 
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor.less b/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor.less
index a9d879ab7f..3665f7d8fd 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor.less
@@ -17,7 +17,7 @@
     z-index: @zIndexEditor;
 }
 
-.umb-editor--infinityMode {
+.umb-editor--infiniteMode {
     transform: none;
     will-change: transform;
     transition: transform 400ms ease-in-out;
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editors.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editors.html
index 99f9e96765..84d0712327 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editors.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editors.html
@@ -5,7 +5,7 @@
         ng-class="{'umb-editor--small': model.size === 'small',
         'umb-editor--animating': model.animating,
         '--notInFront': model.inFront !== true,
-        'umb-editor--infinityMode': model.infinityMode,
+        'umb-editor--infiniteMode': model.infiniteMode,
         'moveRight': model.moveRight,
         'umb-editor--n0': model.styleIndex === 0,
         'umb-editor--n1': model.styleIndex === 1,

From a0cd542ba30a1c93022cd8f55ff2c3917900f103 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Thu, 8 Aug 2019 23:09:34 +0200
Subject: [PATCH 266/776] Fix "infinityMode" typo

(cherry picked from commit e10ce234dbf3ed347183f1e719e8ab1372ca8ea4)
---
 .../directives/components/editor/umbeditors.directive.js      | 4 +---
 .../src/less/components/editor/umb-editor.less                | 2 +-
 .../src/views/components/editor/umb-editors.html              | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditors.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditors.directive.js
index 4104a663d3..9bdef41225 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditors.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditors.directive.js
@@ -16,9 +16,7 @@
                 editor.moveRight = true;
                 editor.level = 0;
                 editor.styleIndex = 0;
-                
-                editor.infinityMode = true;
-                
+                                
                 // push the new editor to the dom
                 scope.editors.push(editor);
                 
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor.less b/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor.less
index a9d879ab7f..3665f7d8fd 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor.less
@@ -17,7 +17,7 @@
     z-index: @zIndexEditor;
 }
 
-.umb-editor--infinityMode {
+.umb-editor--infiniteMode {
     transform: none;
     will-change: transform;
     transition: transform 400ms ease-in-out;
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editors.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editors.html
index 99f9e96765..84d0712327 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editors.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editors.html
@@ -5,7 +5,7 @@
         ng-class="{'umb-editor--small': model.size === 'small',
         'umb-editor--animating': model.animating,
         '--notInFront': model.inFront !== true,
-        'umb-editor--infinityMode': model.infinityMode,
+        'umb-editor--infiniteMode': model.infiniteMode,
         'moveRight': model.moveRight,
         'umb-editor--n0': model.styleIndex === 0,
         'umb-editor--n1': model.styleIndex === 1,

From ab3202b56042c7ed65478fbbc18b9a83b4d74302 Mon Sep 17 00:00:00 2001
From: Rachel Breeze <RachBreeze@users.noreply.github.com>
Date: Fri, 9 Aug 2019 15:25:51 +0100
Subject: [PATCH 267/776] V8: Accessibility improvements for page name entry
 (#5760)

---
 .../umbeditorcontentheader.directive.js       | 21 +++++++++-
 .../editor/umb-editor-content-header.html     | 38 +++++++++++--------
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml |  3 ++
 .../Umbraco/config/lang/en_us.xml             |  3 ++
 4 files changed, 47 insertions(+), 18 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js
index 75fa0469bb..c82ca1481c 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js
@@ -1,7 +1,7 @@
 (function () {
     'use strict';
 
-    function EditorContentHeader(serverValidationManager) {
+    function EditorContentHeader(serverValidationManager, localizationService, editorState) {
 
         function link(scope, el, attr, ctrl) {
             
@@ -13,7 +13,24 @@
             if (!scope.serverValidationAliasField) {
                 scope.serverValidationAliasField = "Alias";
             }
-            
+
+            scope.isNew = scope.content.state == "NotCreated";
+
+            localizationService.localizeMany([
+                    scope.isNew ? "placeholders_a11yCreateItem" : "placeholders_a11yEdit",
+                    "placeholders_a11yName"]
+            ).then(function (data) {
+                scope.a11yMessage = data[0];
+                scope.a11yName = data[1];
+                if (!scope.isNew) {
+                    scope.a11yMessage += " " + scope.content.name;
+
+                } else {
+                    var name = editorState.current.contentTypeName;
+                    scope.a11yMessage += " " + name;
+                    scope.a11yName = name + " " + scope.a11yName;
+                }
+            });
             scope.vm = {};
             scope.vm.dropdownOpen = false;
             scope.vm.currentVariant = "";
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
index 37f363f50d..ba6714987c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
@@ -11,24 +11,30 @@
         <div class="flex items-center" style="flex: 1;">
 
             <div id="nameField" class="umb-editor-header__name-and-description" style="flex: 1 1 auto;">
+                <div>
+                    <p tabindex="0" class="sr-only">
+                        {{a11yMessage}}
+                    </p>
+                </div>
                 <div class="umb-editor-header__name-wrapper">
+                    <label for="headerName" class="sr-only">{{a11yName}}</label>
                     <ng-form name="headerNameForm">
-                        <input
-                            data-element="editor-name-field"
-                            type="text"
-                            class="umb-editor-header__name-input"
-                            localize="placeholder"
-                            placeholder="@placeholders_entername"
-                            name="headerName"
-                            ng-model="name"
-                            ng-class="{'name-is-empty': $parent.name===null || $parent.name===''}"
-                            ng-disabled="nameDisabled"
-                            umb-auto-focus
-                            val-server-field="{{serverValidationNameField}}"
-                            required
-                            aria-required="true"
-                            aria-invalid="{{contentForm.headerNameForm.headerName.$invalid ? true : false}}"
-                            autocomplete="off" maxlength="255" />
+                        <input data-element="editor-name-field"
+                               type="text"
+                               class="umb-editor-header__name-input"
+                               localize="placeholder"
+                               placeholder="@placeholders_entername"
+                               name="headerName"
+                               id="headerName"
+                               ng-model="name"
+                               ng-class="{'name-is-empty': $parent.name===null || $parent.name===''}"
+                               ng-disabled="nameDisabled"
+                               umb-auto-focus
+                               val-server-field="{{serverValidationNameField}}"
+                               required
+                               aria-required="true"
+                               aria-invalid="{{contentForm.headerNameForm.headerName.$invalid ? true : false}}"
+                               autocomplete="off" maxlength="255" />
                     </ng-form>
 
                     <a ng-if="content.variants.length > 0 && hideChangeVariant !== true" class="umb-variant-switcher__toggle" href="" ng-click="vm.dropdownOpen = !vm.dropdownOpen" ng-class="{'--error': vm.errorsOnOtherVariants}">
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 175146aafd..f3e8ba135b 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -527,6 +527,9 @@
     <key alias="anchor">#value or ?key=value</key>
         <key alias="enterAlias">Enter alias...</key>
         <key alias="generatingAlias">Generating alias...</key>
+        <key alias="a11yCreateItem">Create item</key>
+        <key alias="a11yEdit">Edit</key>
+        <key alias="a11yName">Name</key>
   </area>
   <area alias="editcontenttype">
     <key alias="createListView" version="7.2">Create custom list view</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index 6aa6054992..a171d00d32 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -530,6 +530,9 @@
     <key alias="anchor">#value or ?key=value</key>
     <key alias="enterAlias">Enter alias...</key>
     <key alias="generatingAlias">Generating alias...</key>
+    <key alias="a11yCreateItem">Create item</key>
+    <key alias="a11yEdit">Edit</key>
+    <key alias="a11yName">Name</key>
   </area>
   <area alias="editcontenttype">
     <key alias="createListView" version="7.2">Create custom list view</key>

From 9cab7894256507ec30a43f4d48fafb72cab5bddb Mon Sep 17 00:00:00 2001
From: Rachel Breeze <RachBreeze@users.noreply.github.com>
Date: Fri, 9 Aug 2019 15:25:51 +0100
Subject: [PATCH 268/776] V8: Accessibility improvements for page name entry
 (#5760)

(cherry picked from commit ab3202b56042c7ed65478fbbc18b9a83b4d74302)
---
 .../umbeditorcontentheader.directive.js       | 21 +++++++++-
 .../editor/umb-editor-content-header.html     | 38 +++++++++++--------
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml |  3 ++
 .../Umbraco/config/lang/en_us.xml             |  3 ++
 4 files changed, 47 insertions(+), 18 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js
index 75fa0469bb..c82ca1481c 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js
@@ -1,7 +1,7 @@
 (function () {
     'use strict';
 
-    function EditorContentHeader(serverValidationManager) {
+    function EditorContentHeader(serverValidationManager, localizationService, editorState) {
 
         function link(scope, el, attr, ctrl) {
             
@@ -13,7 +13,24 @@
             if (!scope.serverValidationAliasField) {
                 scope.serverValidationAliasField = "Alias";
             }
-            
+
+            scope.isNew = scope.content.state == "NotCreated";
+
+            localizationService.localizeMany([
+                    scope.isNew ? "placeholders_a11yCreateItem" : "placeholders_a11yEdit",
+                    "placeholders_a11yName"]
+            ).then(function (data) {
+                scope.a11yMessage = data[0];
+                scope.a11yName = data[1];
+                if (!scope.isNew) {
+                    scope.a11yMessage += " " + scope.content.name;
+
+                } else {
+                    var name = editorState.current.contentTypeName;
+                    scope.a11yMessage += " " + name;
+                    scope.a11yName = name + " " + scope.a11yName;
+                }
+            });
             scope.vm = {};
             scope.vm.dropdownOpen = false;
             scope.vm.currentVariant = "";
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
index 37f363f50d..ba6714987c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
@@ -11,24 +11,30 @@
         <div class="flex items-center" style="flex: 1;">
 
             <div id="nameField" class="umb-editor-header__name-and-description" style="flex: 1 1 auto;">
+                <div>
+                    <p tabindex="0" class="sr-only">
+                        {{a11yMessage}}
+                    </p>
+                </div>
                 <div class="umb-editor-header__name-wrapper">
+                    <label for="headerName" class="sr-only">{{a11yName}}</label>
                     <ng-form name="headerNameForm">
-                        <input
-                            data-element="editor-name-field"
-                            type="text"
-                            class="umb-editor-header__name-input"
-                            localize="placeholder"
-                            placeholder="@placeholders_entername"
-                            name="headerName"
-                            ng-model="name"
-                            ng-class="{'name-is-empty': $parent.name===null || $parent.name===''}"
-                            ng-disabled="nameDisabled"
-                            umb-auto-focus
-                            val-server-field="{{serverValidationNameField}}"
-                            required
-                            aria-required="true"
-                            aria-invalid="{{contentForm.headerNameForm.headerName.$invalid ? true : false}}"
-                            autocomplete="off" maxlength="255" />
+                        <input data-element="editor-name-field"
+                               type="text"
+                               class="umb-editor-header__name-input"
+                               localize="placeholder"
+                               placeholder="@placeholders_entername"
+                               name="headerName"
+                               id="headerName"
+                               ng-model="name"
+                               ng-class="{'name-is-empty': $parent.name===null || $parent.name===''}"
+                               ng-disabled="nameDisabled"
+                               umb-auto-focus
+                               val-server-field="{{serverValidationNameField}}"
+                               required
+                               aria-required="true"
+                               aria-invalid="{{contentForm.headerNameForm.headerName.$invalid ? true : false}}"
+                               autocomplete="off" maxlength="255" />
                     </ng-form>
 
                     <a ng-if="content.variants.length > 0 && hideChangeVariant !== true" class="umb-variant-switcher__toggle" href="" ng-click="vm.dropdownOpen = !vm.dropdownOpen" ng-class="{'--error': vm.errorsOnOtherVariants}">
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 175146aafd..f3e8ba135b 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -527,6 +527,9 @@
     <key alias="anchor">#value or ?key=value</key>
         <key alias="enterAlias">Enter alias...</key>
         <key alias="generatingAlias">Generating alias...</key>
+        <key alias="a11yCreateItem">Create item</key>
+        <key alias="a11yEdit">Edit</key>
+        <key alias="a11yName">Name</key>
   </area>
   <area alias="editcontenttype">
     <key alias="createListView" version="7.2">Create custom list view</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index 6aa6054992..a171d00d32 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -530,6 +530,9 @@
     <key alias="anchor">#value or ?key=value</key>
     <key alias="enterAlias">Enter alias...</key>
     <key alias="generatingAlias">Generating alias...</key>
+    <key alias="a11yCreateItem">Create item</key>
+    <key alias="a11yEdit">Edit</key>
+    <key alias="a11yName">Name</key>
   </area>
   <area alias="editcontenttype">
     <key alias="createListView" version="7.2">Create custom list view</key>

From feb55676219f689ce1799547844eb741c144dd4d Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Fri, 9 Aug 2019 16:36:38 +0200
Subject: [PATCH 269/776] Fix the disabled upload button in media picker
 (#6082)

---
 .../infiniteeditors/mediapicker/mediapicker.controller.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
index 5efc25fa10..47182bfbee 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
@@ -268,7 +268,7 @@ angular.module("umbraco")
 
                 // also make sure the node is not trashed
                 if (nodePath.indexOf($scope.startNodeId.toString()) !== -1 && node.trashed === false) {
-                    $scope.gotoFolder({ id: $scope.lastOpenedNode, name: "Media", icon: "icon-folder" });
+                    $scope.gotoFolder({ id: $scope.lastOpenedNode, name: "Media", icon: "icon-folder", path: node.path });
                     return true;
                 } else {
                     $scope.gotoFolder({ id: $scope.startNodeId, name: "Media", icon: "icon-folder" });

From 79c4d7797cc67ddc70f195e62961addd7613ef2b Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Thu, 8 Aug 2019 22:06:59 +0200
Subject: [PATCH 270/776] Fix the disabled upload button in media picker

---
 .../views/common/overlays/mediaPicker/mediapicker.controller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
index 5f76528f5d..fc62c0ce67 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
@@ -267,7 +267,7 @@ angular.module("umbraco")
 
                 // also make sure the node is not trashed
                 if (nodePath.indexOf($scope.startNodeId.toString()) !== -1 && node.trashed === false) {
-                    $scope.gotoFolder({ id: $scope.lastOpenedNode, name: "Media", icon: "icon-folder" });
+                    $scope.gotoFolder({ id: $scope.lastOpenedNode, name: "Media", icon: "icon-folder", path: node.path });
                     return true;
                 } else {
                     $scope.gotoFolder({ id: $scope.startNodeId, name: "Media", icon: "icon-folder" });

From dc44a7a3a7a3790a7c6cae3da76432dd4de3f188 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Thu, 8 Aug 2019 22:06:59 +0200
Subject: [PATCH 271/776] Fix the disabled upload button in media picker

(cherry picked from commit 79c4d7797cc67ddc70f195e62961addd7613ef2b)
---
 .../views/common/overlays/mediaPicker/mediapicker.controller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
index 5f76528f5d..fc62c0ce67 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
@@ -267,7 +267,7 @@ angular.module("umbraco")
 
                 // also make sure the node is not trashed
                 if (nodePath.indexOf($scope.startNodeId.toString()) !== -1 && node.trashed === false) {
-                    $scope.gotoFolder({ id: $scope.lastOpenedNode, name: "Media", icon: "icon-folder" });
+                    $scope.gotoFolder({ id: $scope.lastOpenedNode, name: "Media", icon: "icon-folder", path: node.path });
                     return true;
                 } else {
                     $scope.gotoFolder({ id: $scope.startNodeId, name: "Media", icon: "icon-folder" });

From c87a22f3475bc14f51a42690dc91afa0fabcb63b Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Fri, 9 Aug 2019 16:36:38 +0200
Subject: [PATCH 272/776] Fix the disabled upload button in media picker
 (#6082)

(cherry picked from commit feb55676219f689ce1799547844eb741c144dd4d)
---
 .../infiniteeditors/mediapicker/mediapicker.controller.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
index 5efc25fa10..47182bfbee 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
@@ -268,7 +268,7 @@ angular.module("umbraco")
 
                 // also make sure the node is not trashed
                 if (nodePath.indexOf($scope.startNodeId.toString()) !== -1 && node.trashed === false) {
-                    $scope.gotoFolder({ id: $scope.lastOpenedNode, name: "Media", icon: "icon-folder" });
+                    $scope.gotoFolder({ id: $scope.lastOpenedNode, name: "Media", icon: "icon-folder", path: node.path });
                     return true;
                 } else {
                     $scope.gotoFolder({ id: $scope.startNodeId, name: "Media", icon: "icon-folder" });

From 7393d9c3725d91016e7dedfb1159f74f0c6b54d5 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Fri, 9 Aug 2019 16:44:43 +0200
Subject: [PATCH 273/776] =?UTF-8?q?V7:=20Change=20the=20priority=20of=20th?=
 =?UTF-8?q?e=20tree=20node=20annotations=20for=20contai=E2=80=A6=20(#6083)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Umbraco.Web.UI.Client/src/less/tree.less | 44 ++++++++++----------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/tree.less b/src/Umbraco.Web.UI.Client/src/less/tree.less
index fae99ced3e..a75054453b 100644
--- a/src/Umbraco.Web.UI.Client/src/less/tree.less
+++ b/src/Umbraco.Web.UI.Client/src/less/tree.less
@@ -327,27 +327,6 @@ li.root > div > a.umb-options {
 div.not-published > i.icon,div.not-published > a{
 	opacity: 0.6;
 }
-div.protected:before{
-	content:"\e256";
-	font-family: 'icomoon';
-	color: @red;
-	position: absolute;
-	font-size: 20px;
-	padding-left: 7px;
-	padding-top: 7px;
-	bottom: 0;
-}
-
-div.has-unpublished-version:before{
-	content:"\e25a";
-	font-family: 'icomoon';
-	color: @green;
-	position: absolute;
-	font-size: 20px;
-	padding-left: 7px;
-	padding-top: 7px;
-	bottom: 0;
-}
 
 div.not-allowed > i.icon,div.not-allowed > a{
 	cursor: not-allowed;
@@ -380,6 +359,29 @@ div.locked:before{
 	bottom: 0;
 }
 
+
+div.has-unpublished-version:before {
+    content: "\e25a";
+    font-family: 'icomoon';
+    color: @green;
+    position: absolute;
+    font-size: 20px;
+    padding-left: 7px;
+    padding-top: 7px;
+    bottom: 0;
+}
+
+div.protected:before {
+    content: "\e256";
+    font-family: 'icomoon';
+    color: @red;
+    position: absolute;
+    font-size: 20px;
+    padding-left: 7px;
+    padding-top: 7px;
+    bottom: 0;
+}
+
 .umb-tree li div.no-access .umb-tree-icon,
 .umb-tree li div.no-access .root-link,
 .umb-tree li div.no-access .umb-tree-item__label {

From 9865596dcce3735ad2573d9fc596ff16ed4f9a90 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Fri, 9 Aug 2019 16:44:43 +0200
Subject: [PATCH 274/776] =?UTF-8?q?V7:=20Change=20the=20priority=20of=20th?=
 =?UTF-8?q?e=20tree=20node=20annotations=20for=20contai=E2=80=A6=20(#6083)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 7393d9c3725d91016e7dedfb1159f74f0c6b54d5)
---
 src/Umbraco.Web.UI.Client/src/less/tree.less | 44 ++++++++++----------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/tree.less b/src/Umbraco.Web.UI.Client/src/less/tree.less
index fae99ced3e..a75054453b 100644
--- a/src/Umbraco.Web.UI.Client/src/less/tree.less
+++ b/src/Umbraco.Web.UI.Client/src/less/tree.less
@@ -327,27 +327,6 @@ li.root > div > a.umb-options {
 div.not-published > i.icon,div.not-published > a{
 	opacity: 0.6;
 }
-div.protected:before{
-	content:"\e256";
-	font-family: 'icomoon';
-	color: @red;
-	position: absolute;
-	font-size: 20px;
-	padding-left: 7px;
-	padding-top: 7px;
-	bottom: 0;
-}
-
-div.has-unpublished-version:before{
-	content:"\e25a";
-	font-family: 'icomoon';
-	color: @green;
-	position: absolute;
-	font-size: 20px;
-	padding-left: 7px;
-	padding-top: 7px;
-	bottom: 0;
-}
 
 div.not-allowed > i.icon,div.not-allowed > a{
 	cursor: not-allowed;
@@ -380,6 +359,29 @@ div.locked:before{
 	bottom: 0;
 }
 
+
+div.has-unpublished-version:before {
+    content: "\e25a";
+    font-family: 'icomoon';
+    color: @green;
+    position: absolute;
+    font-size: 20px;
+    padding-left: 7px;
+    padding-top: 7px;
+    bottom: 0;
+}
+
+div.protected:before {
+    content: "\e256";
+    font-family: 'icomoon';
+    color: @red;
+    position: absolute;
+    font-size: 20px;
+    padding-left: 7px;
+    padding-top: 7px;
+    bottom: 0;
+}
+
 .umb-tree li div.no-access .umb-tree-icon,
 .umb-tree li div.no-access .root-link,
 .umb-tree li div.no-access .umb-tree-item__label {

From 7e1f90fb3b8d1af89853a6d76da8f3b400f1dc16 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Mon, 29 Jul 2019 08:31:49 +0200
Subject: [PATCH 275/776] Clear the content type "common" cache when deleting
 templates

---
 src/Umbraco.Web/Cache/TemplateCacheRefresher.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Cache/TemplateCacheRefresher.cs b/src/Umbraco.Web/Cache/TemplateCacheRefresher.cs
index eda3b6eef4..2c93a6f754 100644
--- a/src/Umbraco.Web/Cache/TemplateCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/TemplateCacheRefresher.cs
@@ -1,6 +1,7 @@
 using System;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Models;
+using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Services;
 
 namespace Umbraco.Web.Cache
@@ -8,11 +9,13 @@ namespace Umbraco.Web.Cache
     public sealed class TemplateCacheRefresher : CacheRefresherBase<TemplateCacheRefresher>
     {
         private readonly IdkMap _idkMap;
+        private readonly IContentTypeCommonRepository _contentTypeCommonRepository;
 
-        public TemplateCacheRefresher(AppCaches appCaches, IdkMap idkMap)
+        public TemplateCacheRefresher(AppCaches appCaches, IdkMap idkMap, IContentTypeCommonRepository contentTypeCommonRepository)
             : base(appCaches)
         {
             _idkMap = idkMap;
+            _contentTypeCommonRepository = contentTypeCommonRepository;
         }
 
         #region Define
@@ -45,6 +48,7 @@ namespace Umbraco.Web.Cache
             // it has an associated template.
             ClearAllIsolatedCacheByEntityType<IContent>();
             ClearAllIsolatedCacheByEntityType<IContentType>();
+            _contentTypeCommonRepository.ClearCache();
 
             base.Remove(id);
         }

From 12a30d3ffd0c0faef5f300ebcdf43e2efd5df0f4 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sat, 27 Jul 2019 20:57:42 +0200
Subject: [PATCH 276/776] Always open the selected content template in infinite
 editing

---
 .../content/umbcontentnodeinfo.directive.js          | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
index e2f5f71781..a1df6c2914 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
@@ -1,7 +1,7 @@
 (function () {
     'use strict';
 
-    function ContentNodeInfoDirective($timeout, logResource, eventsService, userService, localizationService, dateHelper, editorService, redirectUrlsResource, overlayService) {
+    function ContentNodeInfoDirective($timeout, logResource, eventsService, userService, localizationService, dateHelper, editorService, redirectUrlsResource, overlayService, entityResource) {
 
         function link(scope) {
 
@@ -16,8 +16,12 @@
             scope.disableTemplates = Umbraco.Sys.ServerVariables.features.disabledFeatures.disableTemplates;
             scope.allowChangeDocumentType = false;
             scope.allowChangeTemplate = false;
+            scope.allTemplates = [];
 
             function onInit() {
+                entityResource.getAll("Template").then(function (templates) {
+                    scope.allTemplates = templates;
+                });
 
                 // set currentVariant
                 scope.currentVariant = _.find(scope.node.variants, (v) => v.active);
@@ -158,8 +162,12 @@
             }
 
             scope.openTemplate = function () {
+                var template = _.findWhere(scope.allTemplates, {alias: scope.node.template})
+                if (!template) {
+                    return;
+                }
                 var templateEditor = {
-                    id: scope.node.templateId,
+                    id: template.id,
                     submit: function (model) {
                         editorService.close();
                     },

From 2f84e769528c4d38e4cbf9eba769943378f260d6 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Tue, 30 Jul 2019 20:25:11 +0200
Subject: [PATCH 277/776] Use mculture in content editor for multilingual
 content

---
 .../src/views/content/content.edit.controller.js                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
index 5cbf25ba7d..44babcec19 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
@@ -24,7 +24,7 @@ function ContentEditController($scope, $routeParams, contentResource) {
     $scope.page = $routeParams.page;
     $scope.isNew = infiniteMode ? $scope.model.create : $routeParams.create;
     //load the default culture selected in the main tree if any
-    $scope.culture = $routeParams.cculture ? $routeParams.cculture : ($routeParams.mculture === "true");
+    $scope.culture = $routeParams.cculture ? $routeParams.cculture : $routeParams.mculture;
 
     //Bind to $routeUpdate which will execute anytime a location changes but the route is not triggered.
     //This is so we can listen to changes on the cculture parameter since that will not cause a route change

From 7c93b8f157c12762aea0bcdc335b4c40c357adb1 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Tue, 30 Jul 2019 20:25:11 +0200
Subject: [PATCH 278/776] Use mculture in content editor for multilingual
 content

(cherry picked from commit 2f84e769528c4d38e4cbf9eba769943378f260d6)
---
 .../src/views/content/content.edit.controller.js                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
index 5cbf25ba7d..44babcec19 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
@@ -24,7 +24,7 @@ function ContentEditController($scope, $routeParams, contentResource) {
     $scope.page = $routeParams.page;
     $scope.isNew = infiniteMode ? $scope.model.create : $routeParams.create;
     //load the default culture selected in the main tree if any
-    $scope.culture = $routeParams.cculture ? $routeParams.cculture : ($routeParams.mculture === "true");
+    $scope.culture = $routeParams.cculture ? $routeParams.cculture : $routeParams.mculture;
 
     //Bind to $routeUpdate which will execute anytime a location changes but the route is not triggered.
     //This is so we can listen to changes on the cculture parameter since that will not cause a route change

From eb46b16800f7d489bd8ad109dd18c29f48ae9be9 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 12 Aug 2019 16:18:49 +1000
Subject: [PATCH 279/776] subtle mistake in gulp change

---
 src/Umbraco.Web.UI.Client/gulp/config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/gulp/config.js b/src/Umbraco.Web.UI.Client/gulp/config.js
index cf0407b71d..705074a18f 100755
--- a/src/Umbraco.Web.UI.Client/gulp/config.js
+++ b/src/Umbraco.Web.UI.Client/gulp/config.js
@@ -37,7 +37,7 @@ module.exports = {
                 files: [
                     "./src/common/directives/_module.js",
                     "./src/{common/directives,common/components}/**/*.js",
-                    "./src/{views}/**/*.{directive,component}.js"
+                    "./src/views/**/*.{directive,component}.js"
                 ],
                 out: "umbraco.directives.js"
             },

From fdcfc48e060cbaa5d82de32aa06b20b3e057516d Mon Sep 17 00:00:00 2001
From: Tobias Klika <cee@live.at>
Date: Sun, 11 Aug 2019 22:45:43 +0200
Subject: [PATCH 280/776] use modifiable media path in file system composition

---
 src/Umbraco.Core/Composing/CompositionExtensions/FileSystems.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Composing/CompositionExtensions/FileSystems.cs b/src/Umbraco.Core/Composing/CompositionExtensions/FileSystems.cs
index 078a505be9..8518d907b5 100644
--- a/src/Umbraco.Core/Composing/CompositionExtensions/FileSystems.cs
+++ b/src/Umbraco.Core/Composing/CompositionExtensions/FileSystems.cs
@@ -90,7 +90,7 @@ namespace Umbraco.Core.Composing.CompositionExtensions
             // register the IFileSystem supporting the IMediaFileSystem
             // THIS IS THE ONLY THING THAT NEEDS TO CHANGE, IN ORDER TO REPLACE THE UNDERLYING FILESYSTEM
             // and, SupportingFileSystem.For<IMediaFileSystem>() returns the underlying filesystem
-            composition.SetMediaFileSystem(() => new PhysicalFileSystem("~/media"));
+            composition.SetMediaFileSystem(() => new PhysicalFileSystem(SystemDirectories.Media));
 
             return composition;
         }

From 600be987a7b38bb4502d9394a495ee49089b8068 Mon Sep 17 00:00:00 2001
From: Tobias Klika <cee@live.at>
Date: Sun, 11 Aug 2019 22:45:43 +0200
Subject: [PATCH 281/776] use modifiable media path in file system composition

(cherry picked from commit fdcfc48e060cbaa5d82de32aa06b20b3e057516d)
---
 src/Umbraco.Core/Composing/CompositionExtensions/FileSystems.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Composing/CompositionExtensions/FileSystems.cs b/src/Umbraco.Core/Composing/CompositionExtensions/FileSystems.cs
index 078a505be9..8518d907b5 100644
--- a/src/Umbraco.Core/Composing/CompositionExtensions/FileSystems.cs
+++ b/src/Umbraco.Core/Composing/CompositionExtensions/FileSystems.cs
@@ -90,7 +90,7 @@ namespace Umbraco.Core.Composing.CompositionExtensions
             // register the IFileSystem supporting the IMediaFileSystem
             // THIS IS THE ONLY THING THAT NEEDS TO CHANGE, IN ORDER TO REPLACE THE UNDERLYING FILESYSTEM
             // and, SupportingFileSystem.For<IMediaFileSystem>() returns the underlying filesystem
-            composition.SetMediaFileSystem(() => new PhysicalFileSystem("~/media"));
+            composition.SetMediaFileSystem(() => new PhysicalFileSystem(SystemDirectories.Media));
 
             return composition;
         }

From 31d67161ab88df3b5e3a18a6a3afba5554131f41 Mon Sep 17 00:00:00 2001
From: Peter Gregory <peter@littlewebempire.com>
Date: Tue, 13 Aug 2019 16:07:53 +1000
Subject: [PATCH 282/776] =?UTF-8?q?V8:=20Implementation=20of=20Create=20me?=
 =?UTF-8?q?thod=20for=20infinite=20editing=20edtior=E2=80=A6=20(#6031)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Umbraco.Web.UI.Client/package-lock.json   | 364 +++++++++++++-----
 .../components/content/edit.controller.js     |  11 +
 .../services/contenteditinghelper.service.js  |  11 +-
 .../src/common/services/editor.service.js     |   8 +-
 .../views/content/content.edit.controller.js  |   5 +-
 src/umbraco.sln                               |   2 -
 6 files changed, 308 insertions(+), 93 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json
index 3e8f053bc6..b14c415dfb 100644
--- a/src/Umbraco.Web.UI.Client/package-lock.json
+++ b/src/Umbraco.Web.UI.Client/package-lock.json
@@ -1104,6 +1104,7 @@
       "resolved": "https://registry.npmjs.org/archive-type/-/archive-type-3.2.0.tgz",
       "integrity": "sha1-nNnABpV+vpX62tW9YJiUKoE3N/Y=",
       "dev": true,
+      "optional": true,
       "requires": {
         "file-type": "^3.1.0"
       },
@@ -1112,7 +1113,8 @@
           "version": "3.9.0",
           "resolved": "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
           "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -1538,6 +1540,7 @@
       "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
       "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==",
       "dev": true,
+      "optional": true,
       "requires": {
         "readable-stream": "^2.3.5",
         "safe-buffer": "^5.1.1"
@@ -1547,13 +1550,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -1566,9 +1571,10 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -1740,7 +1746,7 @@
     "buffer-alloc": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
-      "integrity": "sha1-iQ3ZDZI6hz4I4Q5f1RpX5bfM4Ow=",
+      "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
       "dev": true,
       "requires": {
         "buffer-alloc-unsafe": "^1.1.0",
@@ -1750,14 +1756,15 @@
     "buffer-alloc-unsafe": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
-      "integrity": "sha1-vX3CauKXLQ7aJTvgYdupkjScGfA=",
+      "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==",
       "dev": true
     },
     "buffer-crc32": {
       "version": "0.2.13",
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
       "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "buffer-fill": {
       "version": "1.0.0",
@@ -1776,6 +1783,7 @@
       "resolved": "https://registry.npmjs.org/buffer-to-vinyl/-/buffer-to-vinyl-1.1.0.tgz",
       "integrity": "sha1-APFfruOreh3aLN5tkSG//dB7ImI=",
       "dev": true,
+      "optional": true,
       "requires": {
         "file-type": "^3.1.0",
         "readable-stream": "^2.0.2",
@@ -1787,19 +1795,22 @@
           "version": "3.9.0",
           "resolved": "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
           "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "isarray": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -1815,6 +1826,7 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -1823,13 +1835,15 @@
           "version": "2.0.3",
           "resolved": "http://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
           "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "vinyl": {
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
+          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -1950,7 +1964,8 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz",
       "integrity": "sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "caseless": {
       "version": "0.12.0",
@@ -1963,6 +1978,7 @@
       "resolved": "https://registry.npmjs.org/caw/-/caw-1.2.0.tgz",
       "integrity": "sha1-/7Im/n78VHKI3GLuPpcHPCEtEDQ=",
       "dev": true,
+      "optional": true,
       "requires": {
         "get-proxy": "^1.0.1",
         "is-obj": "^1.0.0",
@@ -1974,7 +1990,8 @@
           "version": "0.4.3",
           "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
           "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -2249,7 +2266,8 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/co/-/co-3.1.0.tgz",
       "integrity": "sha1-TqVOpaCJOBUxheFSEMaNkJK8G3g=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "coa": {
       "version": "2.0.1",
@@ -2373,6 +2391,7 @@
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
       "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
       "dev": true,
+      "optional": true,
       "requires": {
         "graceful-readlink": ">= 1.0.0"
       }
@@ -2585,6 +2604,7 @@
       "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
       "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
       "dev": true,
+      "optional": true,
       "requires": {
         "capture-stack-trace": "^1.0.0"
       }
@@ -2839,6 +2859,7 @@
       "resolved": "https://registry.npmjs.org/decompress/-/decompress-3.0.0.tgz",
       "integrity": "sha1-rx3VDQbjv8QyRh033hGzjA2ZG+0=",
       "dev": true,
+      "optional": true,
       "requires": {
         "buffer-to-vinyl": "^1.0.0",
         "concat-stream": "^1.4.6",
@@ -2856,6 +2877,7 @@
           "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
           "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
           "dev": true,
+          "optional": true,
           "requires": {
             "arr-flatten": "^1.0.1"
           }
@@ -2864,13 +2886,15 @@
           "version": "0.2.1",
           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
           "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "braces": {
           "version": "1.8.5",
           "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
           "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
           "dev": true,
+          "optional": true,
           "requires": {
             "expand-range": "^1.8.1",
             "preserve": "^0.2.0",
@@ -2882,6 +2906,7 @@
           "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
           "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-posix-bracket": "^0.1.0"
           }
@@ -2891,6 +2916,7 @@
           "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
           "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -2900,6 +2926,7 @@
           "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
           "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
           "dev": true,
+          "optional": true,
           "requires": {
             "inflight": "^1.0.4",
             "inherits": "2",
@@ -2913,6 +2940,7 @@
           "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz",
           "integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=",
           "dev": true,
+          "optional": true,
           "requires": {
             "extend": "^3.0.0",
             "glob": "^5.0.3",
@@ -2928,13 +2956,15 @@
               "version": "0.0.1",
               "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
               "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "readable-stream": {
               "version": "1.0.34",
               "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
               "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
               "dev": true,
+              "optional": true,
               "requires": {
                 "core-util-is": "~1.0.0",
                 "inherits": "~2.0.1",
@@ -2946,13 +2976,15 @@
               "version": "0.10.31",
               "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
               "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "through2": {
               "version": "0.6.5",
               "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
               "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
               "dev": true,
+              "optional": true,
               "requires": {
                 "readable-stream": ">=1.0.33-1 <1.1.0-0",
                 "xtend": ">=4.0.0 <4.1.0-0"
@@ -2964,19 +2996,22 @@
           "version": "4.1.15",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
           "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "is-extglob": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
           "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "is-glob": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
           "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -2985,13 +3020,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -3001,6 +3038,7 @@
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
           "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
           "dev": true,
+          "optional": true,
           "requires": {
             "arr-diff": "^2.0.0",
             "array-unique": "^0.2.1",
@@ -3021,13 +3059,15 @@
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ordered-read-streams": {
           "version": "0.3.0",
           "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz",
           "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-stream": "^1.0.1",
             "readable-stream": "^2.0.1"
@@ -3038,6 +3078,7 @@
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -3053,6 +3094,7 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -3062,6 +3104,7 @@
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
           "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-utf8": "^0.2.0"
           }
@@ -3071,6 +3114,7 @@
           "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz",
           "integrity": "sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=",
           "dev": true,
+          "optional": true,
           "requires": {
             "first-chunk-stream": "^1.0.0",
             "strip-bom": "^2.0.0"
@@ -3081,6 +3125,7 @@
           "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
           "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
           "dev": true,
+          "optional": true,
           "requires": {
             "json-stable-stringify-without-jsonify": "^1.0.1",
             "through2-filter": "^3.0.0"
@@ -3091,6 +3136,7 @@
               "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
               "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
               "dev": true,
+              "optional": true,
               "requires": {
                 "through2": "~2.0.0",
                 "xtend": "~4.0.0"
@@ -3103,6 +3149,7 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
+          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -3114,6 +3161,7 @@
           "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz",
           "integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=",
           "dev": true,
+          "optional": true,
           "requires": {
             "duplexify": "^3.2.0",
             "glob-stream": "^5.3.2",
@@ -3141,6 +3189,7 @@
       "resolved": "https://registry.npmjs.org/decompress-tar/-/decompress-tar-3.1.0.tgz",
       "integrity": "sha1-IXx4n5uURQ76rcXF5TeXj8MzxGY=",
       "dev": true,
+      "optional": true,
       "requires": {
         "is-tar": "^1.0.0",
         "object-assign": "^2.0.0",
@@ -3154,19 +3203,22 @@
           "version": "0.2.0",
           "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
           "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
           "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "1.0.34",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.1",
@@ -3179,6 +3231,7 @@
           "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
           "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
           "dev": true,
+          "optional": true,
           "requires": {
             "readable-stream": ">=1.0.33-1 <1.1.0-0",
             "xtend": ">=4.0.0 <4.1.0-0"
@@ -3189,6 +3242,7 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
           "dev": true,
+          "optional": true,
           "requires": {
             "clone": "^0.2.0",
             "clone-stats": "^0.0.1"
@@ -3201,6 +3255,7 @@
       "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-3.1.0.tgz",
       "integrity": "sha1-iyOTVoE1X58YnYclag+L3ZbZZm0=",
       "dev": true,
+      "optional": true,
       "requires": {
         "is-bzip2": "^1.0.0",
         "object-assign": "^2.0.0",
@@ -3215,19 +3270,22 @@
           "version": "0.2.0",
           "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
           "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
           "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "1.0.34",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.1",
@@ -3240,6 +3298,7 @@
           "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
           "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
           "dev": true,
+          "optional": true,
           "requires": {
             "readable-stream": ">=1.0.33-1 <1.1.0-0",
             "xtend": ">=4.0.0 <4.1.0-0"
@@ -3250,6 +3309,7 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
           "dev": true,
+          "optional": true,
           "requires": {
             "clone": "^0.2.0",
             "clone-stats": "^0.0.1"
@@ -3262,6 +3322,7 @@
       "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-3.1.0.tgz",
       "integrity": "sha1-ssE9+YFmJomRtxXWRH9kLpaW9aA=",
       "dev": true,
+      "optional": true,
       "requires": {
         "is-gzip": "^1.0.0",
         "object-assign": "^2.0.0",
@@ -3275,19 +3336,22 @@
           "version": "0.2.0",
           "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
           "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
           "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "1.0.34",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.1",
@@ -3300,6 +3364,7 @@
           "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
           "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
           "dev": true,
+          "optional": true,
           "requires": {
             "readable-stream": ">=1.0.33-1 <1.1.0-0",
             "xtend": ">=4.0.0 <4.1.0-0"
@@ -3310,6 +3375,7 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
           "dev": true,
+          "optional": true,
           "requires": {
             "clone": "^0.2.0",
             "clone-stats": "^0.0.1"
@@ -3322,6 +3388,7 @@
       "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-3.4.0.tgz",
       "integrity": "sha1-YUdbQVIGa74/7hL51inRX+ZHjus=",
       "dev": true,
+      "optional": true,
       "requires": {
         "is-zip": "^1.0.0",
         "read-all-stream": "^3.0.0",
@@ -3337,6 +3404,7 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
+          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -3349,7 +3417,8 @@
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
       "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "deep-is": {
       "version": "0.1.3",
@@ -3568,6 +3637,7 @@
       "resolved": "https://registry.npmjs.org/download/-/download-4.4.3.tgz",
       "integrity": "sha1-qlX9rTktldS2jowr4D4MKqIbqaw=",
       "dev": true,
+      "optional": true,
       "requires": {
         "caw": "^1.0.1",
         "concat-stream": "^1.4.7",
@@ -3591,6 +3661,7 @@
           "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
           "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
           "dev": true,
+          "optional": true,
           "requires": {
             "arr-flatten": "^1.0.1"
           }
@@ -3599,13 +3670,15 @@
           "version": "0.2.1",
           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
           "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "braces": {
           "version": "1.8.5",
           "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
           "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
           "dev": true,
+          "optional": true,
           "requires": {
             "expand-range": "^1.8.1",
             "preserve": "^0.2.0",
@@ -3617,6 +3690,7 @@
           "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
           "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-posix-bracket": "^0.1.0"
           }
@@ -3626,6 +3700,7 @@
           "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
           "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -3635,6 +3710,7 @@
           "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
           "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
           "dev": true,
+          "optional": true,
           "requires": {
             "inflight": "^1.0.4",
             "inherits": "2",
@@ -3648,6 +3724,7 @@
           "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz",
           "integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=",
           "dev": true,
+          "optional": true,
           "requires": {
             "extend": "^3.0.0",
             "glob": "^5.0.3",
@@ -3663,13 +3740,15 @@
               "version": "0.0.1",
               "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
               "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "readable-stream": {
               "version": "1.0.34",
               "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
               "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
               "dev": true,
+              "optional": true,
               "requires": {
                 "core-util-is": "~1.0.0",
                 "inherits": "~2.0.1",
@@ -3681,13 +3760,15 @@
               "version": "0.10.31",
               "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
               "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "through2": {
               "version": "0.6.5",
               "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
               "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
               "dev": true,
+              "optional": true,
               "requires": {
                 "readable-stream": ">=1.0.33-1 <1.1.0-0",
                 "xtend": ">=4.0.0 <4.1.0-0"
@@ -3699,19 +3780,22 @@
           "version": "4.1.15",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
           "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "is-extglob": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
           "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "is-glob": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
           "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -3720,13 +3804,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -3736,6 +3822,7 @@
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
           "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
           "dev": true,
+          "optional": true,
           "requires": {
             "arr-diff": "^2.0.0",
             "array-unique": "^0.2.1",
@@ -3756,13 +3843,15 @@
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ordered-read-streams": {
           "version": "0.3.0",
           "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz",
           "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-stream": "^1.0.1",
             "readable-stream": "^2.0.1"
@@ -3773,6 +3862,7 @@
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -3788,6 +3878,7 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -3797,6 +3888,7 @@
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
           "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-utf8": "^0.2.0"
           }
@@ -3806,6 +3898,7 @@
           "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz",
           "integrity": "sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=",
           "dev": true,
+          "optional": true,
           "requires": {
             "first-chunk-stream": "^1.0.0",
             "strip-bom": "^2.0.0"
@@ -3816,6 +3909,7 @@
           "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
           "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
           "dev": true,
+          "optional": true,
           "requires": {
             "json-stable-stringify-without-jsonify": "^1.0.1",
             "through2-filter": "^3.0.0"
@@ -3826,6 +3920,7 @@
               "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
               "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
               "dev": true,
+              "optional": true,
               "requires": {
                 "through2": "~2.0.0",
                 "xtend": "~4.0.0"
@@ -3838,6 +3933,7 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
+          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -3849,6 +3945,7 @@
           "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz",
           "integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=",
           "dev": true,
+          "optional": true,
           "requires": {
             "duplexify": "^3.2.0",
             "glob-stream": "^5.3.2",
@@ -3891,6 +3988,7 @@
       "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.1.tgz",
       "integrity": "sha512-vM58DwdnKmty+FSPzT14K9JXb90H+j5emaR4KYbr2KTIz00WHGbWOe5ghQTx233ZCLZtrGDALzKwcjEtSt35mA==",
       "dev": true,
+      "optional": true,
       "requires": {
         "end-of-stream": "^1.0.0",
         "inherits": "^2.0.1",
@@ -3903,6 +4001,7 @@
           "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
           "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
           "dev": true,
+          "optional": true,
           "requires": {
             "once": "^1.4.0"
           }
@@ -3911,13 +4010,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "once": {
           "version": "1.4.0",
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -3927,6 +4028,7 @@
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -3942,6 +4044,7 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -3953,6 +4056,7 @@
       "resolved": "https://registry.npmjs.org/each-async/-/each-async-1.1.1.tgz",
       "integrity": "sha1-3uUim98KtrogEqOV4bhpq/iBNHM=",
       "dev": true,
+      "optional": true,
       "requires": {
         "onetime": "^1.0.0",
         "set-immediate-shim": "^1.0.0"
@@ -3962,7 +4066,8 @@
           "version": "1.1.0",
           "resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
           "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -4061,7 +4166,7 @@
     },
     "engine.io-client": {
       "version": "3.2.1",
-      "resolved": "http://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz",
       "integrity": "sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==",
       "dev": true,
       "requires": {
@@ -4482,7 +4587,7 @@
     "exec-buffer": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/exec-buffer/-/exec-buffer-3.2.0.tgz",
-      "integrity": "sha1-sWhtvZBMfPmC5lLB9aebHlVzCCs=",
+      "integrity": "sha512-wsiD+2Tp6BWHoVv3B+5Dcx6E7u5zky+hUwOHjuH2hKSLR3dvRmX8fk8UD8uqQixHs4Wk6eDmiegVrMPjKj7wpA==",
       "dev": true,
       "optional": true,
       "requires": {
@@ -4945,6 +5050,7 @@
       "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
       "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
       "dev": true,
+      "optional": true,
       "requires": {
         "pend": "~1.2.0"
       }
@@ -4992,13 +5098,15 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-1.0.0.tgz",
       "integrity": "sha1-5hz4BfDeHJhFZ9A4bcXfUO5a9+Q=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "filenamify": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-1.2.1.tgz",
       "integrity": "sha1-qfL/0RxQO+0wABUCknI3jx8TZaU=",
       "dev": true,
+      "optional": true,
       "requires": {
         "filename-reserved-regex": "^1.0.0",
         "strip-outer": "^1.0.0",
@@ -5244,8 +5352,9 @@
     "fs-constants": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-      "integrity": "sha1-a+Dem+mYzhavivwkSXue6bfM2a0=",
-      "dev": true
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
+      "dev": true,
+      "optional": true
     },
     "fs-extra": {
       "version": "1.0.0",
@@ -5869,6 +5978,7 @@
       "resolved": "https://registry.npmjs.org/get-proxy/-/get-proxy-1.1.0.tgz",
       "integrity": "sha1-iUhUSRvFkbDxR9euVw9cZ4tyVus=",
       "dev": true,
+      "optional": true,
       "requires": {
         "rc": "^1.1.2"
       }
@@ -6175,6 +6285,7 @@
       "resolved": "http://registry.npmjs.org/got/-/got-5.7.1.tgz",
       "integrity": "sha1-X4FjWmHkplifGAVp6k44FoClHzU=",
       "dev": true,
+      "optional": true,
       "requires": {
         "create-error-class": "^3.0.1",
         "duplexer2": "^0.1.4",
@@ -6198,6 +6309,7 @@
           "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
           "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
           "dev": true,
+          "optional": true,
           "requires": {
             "readable-stream": "^2.0.2"
           }
@@ -6206,19 +6318,22 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "parse-json": {
           "version": "2.2.0",
           "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
           "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
           "dev": true,
+          "optional": true,
           "requires": {
             "error-ex": "^1.2.0"
           }
@@ -6228,6 +6343,7 @@
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -6243,6 +6359,7 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -6262,7 +6379,8 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
       "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "growly": {
       "version": "1.3.0",
@@ -6579,6 +6697,7 @@
       "resolved": "https://registry.npmjs.org/gulp-decompress/-/gulp-decompress-1.2.0.tgz",
       "integrity": "sha1-jutlpeAV+O2FMsr+KEVJYGJvDcc=",
       "dev": true,
+      "optional": true,
       "requires": {
         "archive-type": "^3.0.0",
         "decompress": "^3.0.0",
@@ -6590,13 +6709,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -6612,6 +6733,7 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -7229,6 +7351,7 @@
       "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz",
       "integrity": "sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=",
       "dev": true,
+      "optional": true,
       "requires": {
         "convert-source-map": "^1.1.1",
         "graceful-fs": "^4.1.2",
@@ -7241,13 +7364,15 @@
           "version": "4.1.15",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
           "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "strip-bom": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
           "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-utf8": "^0.2.0"
           }
@@ -7257,6 +7382,7 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
+          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -8139,7 +8265,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-bzip2/-/is-bzip2-1.0.0.tgz",
       "integrity": "sha1-XuWOqlounIDiFAe+3yOuWsCRs/w=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-callable": {
       "version": "1.1.4",
@@ -8274,7 +8401,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-gzip/-/is-gzip-1.0.0.tgz",
       "integrity": "sha1-bKiwe5nHeZgCWQDlVc7Y7YCHmoM=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-jpg": {
       "version": "1.0.1",
@@ -8287,7 +8415,8 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-2.1.1.tgz",
       "integrity": "sha1-fUxXKDd+84bD4ZSpkRv1fG3DNec=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-number": {
       "version": "3.0.0",
@@ -8353,7 +8482,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
       "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-regex": {
       "version": "1.0.4",
@@ -8383,7 +8513,8 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
       "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-stream": {
       "version": "1.1.0",
@@ -8413,7 +8544,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-tar/-/is-tar-1.0.0.tgz",
       "integrity": "sha1-L2suF5LB9bs2UZrKqdZcDSb+hT0=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-typedarray": {
       "version": "1.0.0",
@@ -8434,7 +8566,8 @@
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz",
       "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-utf8": {
       "version": "0.2.1",
@@ -8446,7 +8579,8 @@
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz",
       "integrity": "sha1-1LVcafUYhvm2XHDWwmItN+KfSP4=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-windows": {
       "version": "1.0.2",
@@ -8464,7 +8598,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-zip/-/is-zip-1.0.0.tgz",
       "integrity": "sha1-R7Co/004p2QxzP2ZqOFaTIa6IyU=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "isarray": {
       "version": "0.0.1",
@@ -8804,6 +8939,7 @@
       "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
       "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
       "dev": true,
+      "optional": true,
       "requires": {
         "readable-stream": "^2.0.5"
       },
@@ -8812,13 +8948,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -8834,6 +8972,7 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -9139,7 +9278,8 @@
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
       "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "lodash.isobject": {
       "version": "2.4.1",
@@ -9335,8 +9475,9 @@
     "lowercase-keys": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
-      "integrity": "sha1-b54wtHCE2XGnyCD/FabFFnt0wm8=",
-      "dev": true
+      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
+      "dev": true,
+      "optional": true
     },
     "lpad-align": {
       "version": "1.1.2",
@@ -9369,7 +9510,7 @@
     "make-dir": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
-      "integrity": "sha1-ecEDO4BRW9bSTsmTPoYMp17ifww=",
+      "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
       "dev": true,
       "requires": {
         "pify": "^3.0.0"
@@ -9772,7 +9913,8 @@
       "version": "1.0.0",
       "resolved": "http://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz",
       "integrity": "sha1-WuVUHQJGRdMqWPzdyc7s6nrjrC8=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "node.extend": {
       "version": "1.1.8",
@@ -12735,7 +12877,7 @@
       "dependencies": {
         "minimist": {
           "version": "0.0.10",
-          "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
           "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
           "dev": true
         },
@@ -12822,7 +12964,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
       "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "p-pipe": {
       "version": "1.2.0",
@@ -13533,7 +13676,8 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
       "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "preserve": {
       "version": "0.2.0",
@@ -13665,6 +13809,7 @@
       "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
       "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
       "dev": true,
+      "optional": true,
       "requires": {
         "deep-extend": "^0.6.0",
         "ini": "~1.3.0",
@@ -13677,6 +13822,7 @@
       "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz",
       "integrity": "sha1-NcPhd/IHjveJ7kv6+kNzB06u9Po=",
       "dev": true,
+      "optional": true,
       "requires": {
         "pinkie-promise": "^2.0.0",
         "readable-stream": "^2.0.0"
@@ -13686,13 +13832,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -13708,6 +13856,7 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -14324,6 +14473,7 @@
       "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz",
       "integrity": "sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=",
       "dev": true,
+      "optional": true,
       "requires": {
         "commander": "~2.8.1"
       }
@@ -14469,7 +14619,8 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
       "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "set-value": {
       "version": "2.0.0",
@@ -14775,7 +14926,7 @@
     },
     "socket.io-parser": {
       "version": "3.2.0",
-      "resolved": "http://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz",
       "integrity": "sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==",
       "dev": true,
       "requires": {
@@ -14920,7 +15071,7 @@
         },
         "chalk": {
           "version": "1.1.3",
-          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "optional": true,
@@ -14974,7 +15125,8 @@
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-0.2.2.tgz",
       "integrity": "sha1-5sgLYjEj19gM8TLOU480YokHJQI=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "static-extend": {
       "version": "0.1.2",
@@ -15018,6 +15170,7 @@
       "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz",
       "integrity": "sha1-+02KFCDqNidk4hrUeAOXvry0HL4=",
       "dev": true,
+      "optional": true,
       "requires": {
         "duplexer2": "~0.1.0",
         "readable-stream": "^2.0.2"
@@ -15028,6 +15181,7 @@
           "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
           "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
           "dev": true,
+          "optional": true,
           "requires": {
             "readable-stream": "^2.0.2"
           }
@@ -15036,13 +15190,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -15058,6 +15214,7 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -15074,7 +15231,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
       "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "streamroller": {
       "version": "0.7.0",
@@ -15252,6 +15410,7 @@
       "resolved": "http://registry.npmjs.org/strip-dirs/-/strip-dirs-1.1.1.tgz",
       "integrity": "sha1-lgu9EoeETzl1pFWKoQOoJV4kVqA=",
       "dev": true,
+      "optional": true,
       "requires": {
         "chalk": "^1.0.0",
         "get-stdin": "^4.0.1",
@@ -15265,13 +15424,15 @@
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "chalk": {
           "version": "1.1.3",
           "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-styles": "^2.2.1",
             "escape-string-regexp": "^1.0.2",
@@ -15285,6 +15446,7 @@
           "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz",
           "integrity": "sha1-hHSREZ/MtftDYhfMc39/qtUPYD8=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-relative": "^0.1.0"
           }
@@ -15293,13 +15455,15 @@
           "version": "0.1.3",
           "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz",
           "integrity": "sha1-kF/uiuhvRbPsYUvDwVyGnfCHboI=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "supports-color": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
           "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -15328,8 +15492,9 @@
     "strip-outer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz",
-      "integrity": "sha1-sv0qv2YEudHmATBXGV34Nrip1jE=",
+      "integrity": "sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==",
       "dev": true,
+      "optional": true,
       "requires": {
         "escape-string-regexp": "^1.0.2"
       }
@@ -15363,6 +15528,7 @@
       "resolved": "https://registry.npmjs.org/sum-up/-/sum-up-1.0.3.tgz",
       "integrity": "sha1-HGYfZnBX9jvLeHWqFDi8FiUlFW4=",
       "dev": true,
+      "optional": true,
       "requires": {
         "chalk": "^1.0.0"
       },
@@ -15371,13 +15537,15 @@
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "chalk": {
           "version": "1.1.3",
           "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-styles": "^2.2.1",
             "escape-string-regexp": "^1.0.2",
@@ -15390,7 +15558,8 @@
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
           "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -15452,6 +15621,7 @@
       "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz",
       "integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==",
       "dev": true,
+      "optional": true,
       "requires": {
         "bl": "^1.0.0",
         "buffer-alloc": "^1.2.0",
@@ -15467,6 +15637,7 @@
           "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
           "integrity": "sha1-7SljTRm6ukY7bOa4CjchPqtx7EM=",
           "dev": true,
+          "optional": true,
           "requires": {
             "once": "^1.4.0"
           }
@@ -15475,22 +15646,25 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "once": {
           "version": "1.4.0",
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -15506,6 +15680,7 @@
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -15610,6 +15785,7 @@
       "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz",
       "integrity": "sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=",
       "dev": true,
+      "optional": true,
       "requires": {
         "through2": "~2.0.0",
         "xtend": "~4.0.0"
@@ -15634,7 +15810,8 @@
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz",
       "integrity": "sha1-lYYL/MXHbCd/j4Mm/Q9bLiDrohc=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "timers-ext": {
       "version": "0.1.7",
@@ -15707,6 +15884,7 @@
       "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz",
       "integrity": "sha1-HN+kcqnvUMI57maZm2YsoOs5k38=",
       "dev": true,
+      "optional": true,
       "requires": {
         "extend-shallow": "^2.0.1"
       },
@@ -15716,6 +15894,7 @@
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-extendable": "^0.1.0"
           }
@@ -15731,8 +15910,9 @@
     "to-buffer": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz",
-      "integrity": "sha1-STvUj2LXxD/N7TE6A9ytsuEhOoA=",
-      "dev": true
+      "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==",
+      "dev": true,
+      "optional": true
     },
     "to-fast-properties": {
       "version": "2.0.0",
@@ -15811,6 +15991,7 @@
       "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz",
       "integrity": "sha1-42RqLqTokTEr9+rObPsFOAvAHCE=",
       "dev": true,
+      "optional": true,
       "requires": {
         "escape-string-regexp": "^1.0.2"
       }
@@ -16059,7 +16240,8 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz",
       "integrity": "sha1-uYTwh3/AqJwsdzzB73tbIytbBv4=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "upath": {
       "version": "1.1.0",
@@ -16087,6 +16269,7 @@
       "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
       "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
       "dev": true,
+      "optional": true,
       "requires": {
         "prepend-http": "^1.0.1"
       }
@@ -16172,7 +16355,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz",
       "integrity": "sha1-G5BKWWCfsyjvB4E4Qgk09rhnCaY=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "validate-npm-package-license": {
       "version": "3.0.4",
@@ -16217,6 +16401,7 @@
       "resolved": "https://registry.npmjs.org/vinyl-assign/-/vinyl-assign-1.2.1.tgz",
       "integrity": "sha1-TRmIkbVRWRHXcajNnFSApGoHSkU=",
       "dev": true,
+      "optional": true,
       "requires": {
         "object-assign": "^4.0.1",
         "readable-stream": "^2.0.0"
@@ -16226,19 +16411,22 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -16254,6 +16442,7 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -16393,6 +16582,7 @@
       "resolved": "https://registry.npmjs.org/ware/-/ware-1.3.0.tgz",
       "integrity": "sha1-0bFPOdLiy0q4xAmPdW/ksWTkc9Q=",
       "dev": true,
+      "optional": true,
       "requires": {
         "wrap-fn": "^0.1.0"
       }
@@ -16483,6 +16673,7 @@
       "resolved": "https://registry.npmjs.org/wrap-fn/-/wrap-fn-0.1.5.tgz",
       "integrity": "sha1-8htuQQFv9KfjFyDbxjoJAWvfmEU=",
       "dev": true,
+      "optional": true,
       "requires": {
         "co": "3.1.0"
       }
@@ -16586,6 +16777,7 @@
       "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
       "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
       "dev": true,
+      "optional": true,
       "requires": {
         "buffer-crc32": "~0.2.3",
         "fd-slicer": "~1.1.0"
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
index 58a22ac74e..c6b821bf0a 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
@@ -21,6 +21,12 @@
         $scope.page.menu.currentSection = appState.getSectionState("currentSection");
         $scope.page.listViewPath = null;
         $scope.page.isNew = $scope.isNew ? true : false;
+
+        if (infiniteMode) {
+            $scope.page.allowInfinitePublishAndClose = $scope.infiniteModel.allowPublishAndClose;
+            $scope.page.allowInfiniteSaveAndClose = $scope.infiniteModel.allowSaveAndClose;
+        }
+
         $scope.page.buttonGroupState = "init";
         $scope.page.hideActionsMenu = infiniteMode ? true : false;
         $scope.page.hideChangeVariant = false;
@@ -369,12 +375,17 @@
                 saveMethod: args.saveMethod,
                 scope: $scope,
                 content: $scope.content,
+                create: $scope.page.isNew,
                 action: args.action,
                 showNotifications: args.showNotifications,
                 softRedirect: true
             }).then(function (data) {
                 //success
                 init();
+
+                //needs to be manually set for infinite editing mode
+                $scope.page.isNew = false;
+
                 syncTreeNode($scope.content, data.path);
 
                 eventsService.emit("content.saved", { content: $scope.content, action: args.action });
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
index 732f682082..3525310e48 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
@@ -1,4 +1,4 @@
-
+
 /**
 * @ngdoc service
 * @name umbraco.services.contentEditingHelper
@@ -53,6 +53,12 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, editorSt
             }
             if (args.showNotifications === undefined) {
                 args.showNotifications = true;
+            }
+			// needed for infinite editing to create new items
+			if (args.create === undefined) {
+                if ($routeParams.create) {
+                    args.create = true;
+                }
             }
             if (args.softRedirect === undefined) {
                 //when true, the url will change but it won't actually re-route
@@ -61,6 +67,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, editorSt
                 args.softRedirect = false; 
             }
 
+
             var self = this;
 
             //we will use the default one for content if not specified
@@ -68,7 +75,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, editorSt
 
             if (formHelper.submitForm({ scope: args.scope, action: args.action })) {
 
-                return args.saveMethod(args.content, $routeParams.create, fileManager.getFiles(), args.showNotifications)
+                return args.saveMethod(args.content, args.create, fileManager.getFiles(), args.showNotifications)
                     .then(function (data) {
 
                         formHelper.resetForm({ scope: args.scope });
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js b/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
index 3979eb2fb7..ad565412d9 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
@@ -331,13 +331,17 @@ When building a custom infinite editor view you can use the same components as a
          * @methodOf umbraco.services.editorService
          *
          * @description
-         * Opens a media editor in infinite editing, the submit callback returns the updated content item
+         * Opens a content editor in infinite editing, the submit callback returns the updated content item
          * @param {Object} editor rendering options
          * @param {String} editor.id The id of the content item
          * @param {Boolean} editor.create Create new content item
          * @param {Function} editor.submit Callback function when the publish and close button is clicked. Returns the editor model object
          * @param {Function} editor.close Callback function when the close button is clicked.
-         *
+         * @param {String} editor.parentId If editor.create is true, provide parentId for the creation of the content item
+         * @param {String} editor.documentTypeAlias If editor.create is true, provide document type alias for the creation of the content item
+         * @param {Boolean} editor.allowSaveAndClose If editor is being used in infinite editing allows the editor to close when the save action is performed
+         * @param {Boolean} editor.allowPublishAndClose If editor is being used in infinite editing allows the editor to close when the publish action is performed
+         * 
          * @returns {Object} editor object
          */
         function contentEditor(editor) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
index 44babcec19..ad79bf01d1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
@@ -13,6 +13,9 @@ function ContentEditController($scope, $routeParams, contentResource) {
     function scaffoldEmpty() {
         return contentResource.getScaffold($routeParams.id, $routeParams.doctype);
     }
+    function scaffoldInfiniteEmpty() {
+        return contentResource.getScaffold($scope.model.parentId, $scope.model.documentTypeAlias);
+    }
     function scaffoldBlueprint() {
         return contentResource.getBlueprintScaffold($routeParams.id, $routeParams.blueprintId);
     }
@@ -20,7 +23,7 @@ function ContentEditController($scope, $routeParams, contentResource) {
     $scope.contentId = infiniteMode ? $scope.model.id : $routeParams.id;
     $scope.saveMethod = contentResource.save;
     $scope.getMethod = contentResource.getById;
-    $scope.getScaffoldMethod = $routeParams.blueprintId ? scaffoldBlueprint : scaffoldEmpty;
+    $scope.getScaffoldMethod = $routeParams.blueprintId ? scaffoldBlueprint : infiniteMode ? scaffoldInfiniteEmpty : scaffoldEmpty;
     $scope.page = $routeParams.page;
     $scope.isNew = infiniteMode ? $scope.model.create : $routeParams.create;
     //load the default culture selected in the main tree if any
diff --git a/src/umbraco.sln b/src/umbraco.sln
index 39b757f88c..0522b56c0d 100644
--- a/src/umbraco.sln
+++ b/src/umbraco.sln
@@ -123,7 +123,6 @@ Global
 		{31785BC3-256C-4613-B2F5-A1B0BDDED8C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{31785BC3-256C-4613-B2F5-A1B0BDDED8C1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5D3B8245-ADA6-453F-A008-50ED04BFE770}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5D3B8245-ADA6-453F-A008-50ED04BFE770}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5D3B8245-ADA6-453F-A008-50ED04BFE770}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5D3B8245-ADA6-453F-A008-50ED04BFE770}.Release|Any CPU.Build.0 = Release|Any CPU
 		{07FBC26B-2927-4A22-8D96-D644C667FECC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -131,7 +130,6 @@ Global
 		{07FBC26B-2927-4A22-8D96-D644C667FECC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{07FBC26B-2927-4A22-8D96-D644C667FECC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3A33ADC9-C6C0-4DB1-A613-A9AF0210DF3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3A33ADC9-C6C0-4DB1-A613-A9AF0210DF3D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3A33ADC9-C6C0-4DB1-A613-A9AF0210DF3D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3A33ADC9-C6C0-4DB1-A613-A9AF0210DF3D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection

From afca2e70bd44ae0c6a812fdfdd7ff0df4d68822c Mon Sep 17 00:00:00 2001
From: elitsa <elm@umbraco.dk>
Date: Tue, 13 Aug 2019 14:17:14 +0200
Subject: [PATCH 283/776] Removing the MiniProfiler routes if solution is not
 in debug mode.

---
 .../Profiling/WebProfilerProvider.cs           | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Profiling/WebProfilerProvider.cs b/src/Umbraco.Web/Profiling/WebProfilerProvider.cs
index ffd1871ecc..68e1555884 100644
--- a/src/Umbraco.Web/Profiling/WebProfilerProvider.cs
+++ b/src/Umbraco.Web/Profiling/WebProfilerProvider.cs
@@ -1,7 +1,10 @@
 using System;
+using System.Linq;
 using System.Threading;
 using System.Web;
+using System.Web.Routing;
 using StackExchange.Profiling;
+using Umbraco.Core.Configuration;
 
 namespace Umbraco.Web.Profiling
 {
@@ -24,6 +27,19 @@ namespace Umbraco.Web.Profiling
         {
             // booting...
             _bootPhase = BootPhase.Boot;
+
+            // Remove Mini Profiler routes when not in debug mode
+            if (GlobalSettings.DebugMode == false)
+            {
+                var prefix = MiniProfiler.Settings.RouteBasePath.Replace("~/", string.Empty);
+
+                using (RouteTable.Routes.GetWriteLock())
+                {
+                    var routes = RouteTable.Routes.Where(x => x is Route r && r.Url.StartsWith(prefix)).ToList();
+                    foreach(var r in routes)
+                        RouteTable.Routes.Remove(r);
+                }
+            }
         }
 
         /// <summary>
@@ -118,4 +134,4 @@ namespace Umbraco.Web.Profiling
             }
         }
     }
-}
\ No newline at end of file
+}

From 405538544f9a778a4f0ddd625280abfa6f2a7d4c Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Tue, 13 Aug 2019 20:26:22 +0200
Subject: [PATCH 284/776] =?UTF-8?q?V8:=20Allow=20localization=20of=20the?=
 =?UTF-8?q?=20backoffice=20using=20parent=20cultures=E2=80=A6=20(#6090)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Implement/LanguageRepository.cs           |  1 -
 .../Repositories/LanguageRepositoryTest.cs    | 33 -------------------
 .../Dictionary/UmbracoCultureDictionary.cs    | 15 ++++++++-
 3 files changed, 14 insertions(+), 35 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/LanguageRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/LanguageRepository.cs
index 8429532b01..8597bbf19f 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/LanguageRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/LanguageRepository.cs
@@ -250,7 +250,6 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             lock (_codeIdMap)
             {
                 if (_codeIdMap.TryGetValue(isoCode, out var id)) return id;
-                if (isoCode.Contains('-') && _codeIdMap.TryGetValue(isoCode.Split('-').First(), out var invariantId)) return invariantId;
             }
             if (throwOnNotFound)
                 throw new ArgumentException($"Code {isoCode} does not correspond to an existing language.", nameof(isoCode));
diff --git a/src/Umbraco.Tests/Persistence/Repositories/LanguageRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/LanguageRepositoryTest.cs
index 39f6e3e114..03c1713268 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/LanguageRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/LanguageRepositoryTest.cs
@@ -79,39 +79,6 @@ namespace Umbraco.Tests.Persistence.Repositories
             }
         }
 
-        [Test]
-        public void Can_Perform_Get_By_Invariant_Code_On_LanguageRepository()
-        {
-            var provider = TestObjects.GetScopeProvider(Logger);
-            using (var scope = provider.CreateScope())
-            {
-                var repository = CreateRepository(provider);
-
-                var es = new CultureInfo("es");
-                var esSpecific = new CultureInfo("es-ES");
-
-                var language = (ILanguage)new Language(es.Name)
-                {
-                    CultureName = es.DisplayName,
-                    FallbackLanguageId = 1
-                };
-                repository.Save(language);
-
-                language = repository.GetByIsoCode(es.Name);
-                var languageSpecific = repository.GetByIsoCode(esSpecific.Name);
-                
-                // Assert
-                Assert.That(language, Is.Not.Null);
-                Assert.That(language.HasIdentity, Is.True);
-                Assert.That(language.IsoCode, Is.EqualTo(es.Name));
-
-                Assert.That(languageSpecific, Is.Not.Null);
-                Assert.That(languageSpecific.HasIdentity, Is.True);
-                Assert.That(languageSpecific.Id, Is.EqualTo(language.Id));
-                Assert.That(language.IsoCode, Is.EqualTo(language.IsoCode));
-            }
-        }
-        
         [Test]
         public void Get_When_Id_Doesnt_Exist_Returns_Null()
         {
diff --git a/src/Umbraco.Web/Dictionary/UmbracoCultureDictionary.cs b/src/Umbraco.Web/Dictionary/UmbracoCultureDictionary.cs
index 6e1c35352a..92c1412638 100644
--- a/src/Umbraco.Web/Dictionary/UmbracoCultureDictionary.cs
+++ b/src/Umbraco.Web/Dictionary/UmbracoCultureDictionary.cs
@@ -122,7 +122,20 @@ namespace Umbraco.Web.Dictionary
                 //ensure it's stored/retrieved from request cache
                 //NOTE: This is no longer necessary since these are cached at the runtime level, but we can leave it here for now.
                 return _requestCache.GetCacheItem<ILanguage>(typeof (DefaultCultureDictionary).Name + "Culture" + Culture.Name,
-                    () => _localizationService.GetLanguageByIsoCode(Culture.Name));
+                    () => {
+                        // find a language that matches the current culture or any of its parent cultures
+                        var culture = Culture;
+                        while(culture != CultureInfo.InvariantCulture)
+                        {
+                            var language = _localizationService.GetLanguageByIsoCode(culture.Name);
+                            if(language != null)
+                            {
+                                return language;
+                            }
+                            culture = culture.Parent;
+                        }
+                        return null;
+                    });
             }
         }
     }

From 87845ee907c65a5ba09c62803b98c34649fde6ba Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Tue, 13 Aug 2019 20:26:22 +0200
Subject: [PATCH 285/776] =?UTF-8?q?V8:=20Allow=20localization=20of=20the?=
 =?UTF-8?q?=20backoffice=20using=20parent=20cultures=E2=80=A6=20(#6090)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 405538544f9a778a4f0ddd625280abfa6f2a7d4c)
---
 .../Implement/LanguageRepository.cs           |  1 -
 .../Repositories/LanguageRepositoryTest.cs    | 33 -------------------
 .../Dictionary/UmbracoCultureDictionary.cs    | 15 ++++++++-
 3 files changed, 14 insertions(+), 35 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/LanguageRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/LanguageRepository.cs
index 8429532b01..8597bbf19f 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/LanguageRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/LanguageRepository.cs
@@ -250,7 +250,6 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             lock (_codeIdMap)
             {
                 if (_codeIdMap.TryGetValue(isoCode, out var id)) return id;
-                if (isoCode.Contains('-') && _codeIdMap.TryGetValue(isoCode.Split('-').First(), out var invariantId)) return invariantId;
             }
             if (throwOnNotFound)
                 throw new ArgumentException($"Code {isoCode} does not correspond to an existing language.", nameof(isoCode));
diff --git a/src/Umbraco.Tests/Persistence/Repositories/LanguageRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/LanguageRepositoryTest.cs
index 39f6e3e114..03c1713268 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/LanguageRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/LanguageRepositoryTest.cs
@@ -79,39 +79,6 @@ namespace Umbraco.Tests.Persistence.Repositories
             }
         }
 
-        [Test]
-        public void Can_Perform_Get_By_Invariant_Code_On_LanguageRepository()
-        {
-            var provider = TestObjects.GetScopeProvider(Logger);
-            using (var scope = provider.CreateScope())
-            {
-                var repository = CreateRepository(provider);
-
-                var es = new CultureInfo("es");
-                var esSpecific = new CultureInfo("es-ES");
-
-                var language = (ILanguage)new Language(es.Name)
-                {
-                    CultureName = es.DisplayName,
-                    FallbackLanguageId = 1
-                };
-                repository.Save(language);
-
-                language = repository.GetByIsoCode(es.Name);
-                var languageSpecific = repository.GetByIsoCode(esSpecific.Name);
-                
-                // Assert
-                Assert.That(language, Is.Not.Null);
-                Assert.That(language.HasIdentity, Is.True);
-                Assert.That(language.IsoCode, Is.EqualTo(es.Name));
-
-                Assert.That(languageSpecific, Is.Not.Null);
-                Assert.That(languageSpecific.HasIdentity, Is.True);
-                Assert.That(languageSpecific.Id, Is.EqualTo(language.Id));
-                Assert.That(language.IsoCode, Is.EqualTo(language.IsoCode));
-            }
-        }
-        
         [Test]
         public void Get_When_Id_Doesnt_Exist_Returns_Null()
         {
diff --git a/src/Umbraco.Web/Dictionary/UmbracoCultureDictionary.cs b/src/Umbraco.Web/Dictionary/UmbracoCultureDictionary.cs
index 6e1c35352a..92c1412638 100644
--- a/src/Umbraco.Web/Dictionary/UmbracoCultureDictionary.cs
+++ b/src/Umbraco.Web/Dictionary/UmbracoCultureDictionary.cs
@@ -122,7 +122,20 @@ namespace Umbraco.Web.Dictionary
                 //ensure it's stored/retrieved from request cache
                 //NOTE: This is no longer necessary since these are cached at the runtime level, but we can leave it here for now.
                 return _requestCache.GetCacheItem<ILanguage>(typeof (DefaultCultureDictionary).Name + "Culture" + Culture.Name,
-                    () => _localizationService.GetLanguageByIsoCode(Culture.Name));
+                    () => {
+                        // find a language that matches the current culture or any of its parent cultures
+                        var culture = Culture;
+                        while(culture != CultureInfo.InvariantCulture)
+                        {
+                            var language = _localizationService.GetLanguageByIsoCode(culture.Name);
+                            if(language != null)
+                            {
+                                return language;
+                            }
+                            culture = culture.Parent;
+                        }
+                        return null;
+                    });
             }
         }
     }

From 87e60ef26b3a1352daefcaf58fa5d89ae94d86f9 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Tue, 13 Aug 2019 21:56:11 +0200
Subject: [PATCH 286/776] V8: Support hexa in hexBgColor (#6091)

---
 .../forms/hexbackgroundcolor.directive.js     | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/hexbackgroundcolor.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/hexbackgroundcolor.directive.js
index eb64439e0b..6780ad8e58 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/hexbackgroundcolor.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/hexbackgroundcolor.directive.js
@@ -11,6 +11,11 @@ function hexBgColor() {
         restrict: "A",
         link: function (scope, element, attr, formCtrl) {
 
+            function setBackgroundColor(color) {
+                // note: can't use element.css(), it doesn't support hexa background colors
+                angular.element(element)[0].style.backgroundColor = "#" + color;
+            }
+
             // Only add inline hex background color if defined and not "true".
             if (attr.hexBgInline === undefined || (attr.hexBgInline !== undefined && attr.hexBgInline === "true")) {
 
@@ -26,18 +31,21 @@ function hexBgColor() {
                             // Get the orig color before changing it.
                             origColor = element.css("border-color");
                         }
-                        // Validate it - test with and without the leading hash.
-                        if (/^([0-9a-f]{3}|[0-9a-f]{6})$/i.test(newVal)) {
-                            element.css("background-color", "#" + newVal);
+                        // Is it a regular hex value - (#)AABBCC ?
+                        var match = newVal.match(/^#?([0-9a-f]{3}|[0-9a-f]{6})$/i);
+                        if (match && match.length) {
+                            setBackgroundColor(match[1]);
                             return;
                         }
-                        if (/^#([0-9a-f]{3}|[0-9a-f]{6})$/i.test(newVal)) {
-                            element.css("background-color", newVal);
+                        // Is it a hexa value - (#)AABBCCDD ?
+                        match = newVal.match(/^#?([0-9a-f]{4}|[0-9a-f]{8})$/i);
+                        if (match && match.length) {
+                            setBackgroundColor(match[1]);
                             return;
                         }
                     }
 
-                    element.css("background-color", origColor);
+                    setBackgroundColor(origColor);
                 });
             }
         }

From 02c1e88da23af574405ae59b0ca8ed153096a7b1 Mon Sep 17 00:00:00 2001
From: Nathan Woulfe <nathan@nathanw.com.au>
Date: Wed, 14 Aug 2019 06:07:05 +1000
Subject: [PATCH 287/776] V8: Display current log level in log viewer sidebar
 (#6059)

---
 src/Umbraco.Core/Logging/Viewer/ILogViewer.cs |  6 ++
 .../Logging/Viewer/LogViewerSourceBase.cs     | 13 +++
 .../common/resources/logviewer.resource.js    | 90 +++++++------------
 .../src/less/components/umb-box.less          | 22 ++++-
 .../views/logviewer/overview.controller.js    | 10 ++-
 .../src/views/logviewer/overview.html         | 26 ++++--
 .../Editors/LogViewerController.cs            |  6 ++
 7 files changed, 101 insertions(+), 72 deletions(-)

diff --git a/src/Umbraco.Core/Logging/Viewer/ILogViewer.cs b/src/Umbraco.Core/Logging/Viewer/ILogViewer.cs
index b39a3f38df..dbdd7842ba 100644
--- a/src/Umbraco.Core/Logging/Viewer/ILogViewer.cs
+++ b/src/Umbraco.Core/Logging/Viewer/ILogViewer.cs
@@ -42,6 +42,12 @@ namespace Umbraco.Core.Logging.Viewer
 
         bool CheckCanOpenLogs(LogTimePeriod logTimePeriod);
 
+        /// <summary>
+        /// Gets the current Serilog minimum log level
+        /// </summary>
+        /// <returns></returns>
+        string GetLogLevel();
+
         /// <summary>
         /// Returns the collection of logs
         /// </summary>
diff --git a/src/Umbraco.Core/Logging/Viewer/LogViewerSourceBase.cs b/src/Umbraco.Core/Logging/Viewer/LogViewerSourceBase.cs
index acb2f5dbf9..607c20e601 100644
--- a/src/Umbraco.Core/Logging/Viewer/LogViewerSourceBase.cs
+++ b/src/Umbraco.Core/Logging/Viewer/LogViewerSourceBase.cs
@@ -1,11 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Xml;
 using Newtonsoft.Json;
+using Serilog;
 using Serilog.Events;
 using Umbraco.Core.IO;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
+using Formatting = Newtonsoft.Json.Formatting;
 
 namespace Umbraco.Core.Logging.Viewer
 {
@@ -89,6 +92,16 @@ namespace Umbraco.Core.Logging.Viewer
             return errorCounter.Count;
         }
 
+        /// <summary>
+        /// Get the Serilog minimum-level value from the config file. 
+        /// </summary>
+        /// <returns></returns>
+        public string GetLogLevel()
+        {
+            var logLevel = Enum.GetValues(typeof(LogEventLevel)).Cast<LogEventLevel>().Where(Log.Logger.IsEnabled)?.Min() ?? null;
+            return logLevel?.ToString() ?? "";
+        }
+
         public LogLevelCounts GetLogLevelCounts(LogTimePeriod logTimePeriod)
         {
             var counter = new CountingFilter();
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/logviewer.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/logviewer.resource.js
index b52021ed38..d2d008640d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/logviewer.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/logviewer.resource.js
@@ -7,64 +7,44 @@
  **/
 function logViewerResource($q, $http, umbRequestHelper) {
 
+    /**
+     * verb => 'get', 'post',
+     * method => API method to call
+     * params => additional data to send
+     * error => error message when things go wrong...
+     */
+    const request = (verb, method, params, error) =>
+        umbRequestHelper.resourcePromise(
+            (verb === 'GET' ?
+            $http.get(umbRequestHelper.getApiUrl("logViewerApiBaseUrl", method) + (params ? params : '')) : 
+            $http.post(umbRequestHelper.getApiUrl("logViewerApiBaseUrl", method), params)),
+        error); 
+
     //the factory object returned
     return {
 
-        getNumberOfErrors: function (startDate, endDate) {
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "logViewerApiBaseUrl",
-                        "GetNumberOfErrors")+ '?startDate='+startDate+ '&endDate='+  endDate ),
-                'Failed to retrieve number of errors in logs');
-        },
+        getNumberOfErrors: (startDate, endDate) => 
+            request('GET', 'GetNumberOfErrors', '?startDate=' + startDate + '&endDate=' + endDate, 'Failed to retrieve number of errors in logs'),    
 
-        getLogLevelCounts: function (startDate, endDate) {
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "logViewerApiBaseUrl",
-                        "GetLogLevelCounts")+ '?startDate='+startDate+ '&endDate='+  endDate ),
-                'Failed to retrieve log level counts');
-        },
+        getLogLevel: () =>
+            request('GET', 'GetLogLevel', null, 'Failed to retrieve log level'),        
 
-        getMessageTemplates: function (startDate, endDate) {
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "logViewerApiBaseUrl",
-                        "GetMessageTemplates")+ '?startDate='+startDate+ '&endDate='+  endDate ),
-                'Failed to retrieve log templates');
-        },
+        getLogLevelCounts: (startDate, endDate) =>
+            request('GET', 'GetLogLevelCounts', '?startDate=' + startDate + '&endDate=' + endDate, 'Failed to retrieve log level counts'),  
 
-        getSavedSearches: function () {
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "logViewerApiBaseUrl",
-                        "GetSavedSearches")),
-                'Failed to retrieve saved searches');
-        },
+        getMessageTemplates: (startDate, endDate) => 
+            request('GET', 'GetMessageTemplates', '?startDate=' + startDate + '&endDate=' + endDate, 'Failed to retrieve log templates'), 
 
-        postSavedSearch: function (name, query) {
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "logViewerApiBaseUrl",
-                        "PostSavedSearch"), { 'name': name, 'query': query }),
-                'Failed to add new saved search');
-        },
+        getSavedSearches: () =>
+            request('GET', 'GetSavedSearches', null, 'Failed to retrieve saved searches'),      
 
-        deleteSavedSearch: function (name, query) {
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "logViewerApiBaseUrl",
-                        "DeleteSavedSearch"), { 'name': name, 'query': query }),
-                'Failed to delete saved search');
-        },
+        postSavedSearch: (name, query) =>
+            request('POST', 'PostSavedSearch', { 'name': name, 'query': query }, 'Failed to add new saved search'),
 
-        getLogs: function (options) {
+        deleteSavedSearch: (name, query) =>
+            request('POST', 'DeleteSavedSearch', { 'name': name, 'query': query }, 'Failed to delete saved search'),
+
+        getLogs: options => {
 
             var defaults = {
                 pageSize: 100,
@@ -83,7 +63,6 @@ function logViewerResource($q, $http, umbRequestHelper) {
             //now copy back to the options we will use
             options = defaults;
 
-
             return umbRequestHelper.resourcePromise(
                 $http.get(
                     umbRequestHelper.getApiUrl(
@@ -93,15 +72,8 @@ function logViewerResource($q, $http, umbRequestHelper) {
                 'Failed to retrieve common log messages');
         },
 
-        canViewLogs: function (startDate, endDate) {
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "logViewerApiBaseUrl",
-                        "GetCanViewLogs") + '?startDate='+startDate+ '&endDate='+  endDate ),
-                'Failed to retrieve state if logs can be viewed');
-        }
-
+        canViewLogs: (startDate, endDate) => 
+            request('GET', 'GetCanViewLogs', '?startDate=' + startDate + '&endDate=' + endDate, 'Failed to retrieve state if logs can be viewed')    
     };
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-box.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-box.less
index c0e91e28c2..1fe59ab9dd 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-box.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-box.less
@@ -1,12 +1,14 @@
+@boxUnit: 10px;
+
 .umb-box {
     background: @white;
     border-radius: 3px;
-    margin-bottom: 20px;
+    margin-bottom: @boxUnit * 2;
     box-shadow: 0 1px 1px 0 rgba(0,0,0,.16);
 }
 
 .umb-box-header {
-    padding: 10px 20px;
+    padding: @boxUnit @boxUnit * 2;
     border-bottom: 1px solid @gray-9;
     display: flex;
     align-items: center;
@@ -27,5 +29,19 @@
 }
 
 .umb-box-content {
-    padding: 20px;
+    padding: @boxUnit * 2;
 }
+
+// allow side-by-side boxes
+.umb-box-row {
+    margin-left:-@boxUnit;
+    margin-right:-@boxUnit;
+    display:flex;
+    justify-content: space-around;
+    
+    .umb-box {
+        margin-left:@boxUnit;
+        margin-right:@boxUnit;
+        flex:1;
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.controller.js b/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.controller.js
index 00fcbc0cea..690d7e0829 100644
--- a/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.controller.js
@@ -22,7 +22,7 @@
                 position: 'left'
             }
         };
-
+        
         let querystring = $location.search();
         if (querystring.startDate) {
             vm.startDate = querystring.startDate;
@@ -122,9 +122,15 @@
             var commonMsgs = logViewerResource.getMessageTemplates(vm.startDate, vm.endDate).then(function (data) {
                 vm.commonLogMessages = data;
             });
+            
+            var logLevel = logViewerResource.getLogLevel().then(function(data) {
+                vm.logLevel = data; 
+                const index = vm.logTypeLabels.findIndex(x => vm.logLevel.startsWith(x));
+                vm.logLevelColor = index > -1 ? vm.logTypeColors[index] : '#000';
+            });
 
             //Set loading indicator to false when these 3 queries complete
-            $q.all([savedSearches, numOfErrors, logCounts, commonMsgs]).then(function () {
+            $q.all([savedSearches, numOfErrors, logCounts, commonMsgs, logLevel]).then(function () {
                 vm.loading = false;
             });
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html b/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html
index 9e6936ad47..533659e808 100644
--- a/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html
@@ -82,13 +82,22 @@
                     </umb-box>
 
                     <div ng-show=" vm.canLoadLogs">
-                        <!-- No of Errors -->
-                        <umb-box ng-click="vm.searchErrors()" style="cursor:pointer;">
-                            <umb-box-header title="Number of Errors"></umb-box-header>
-                            <umb-box-content class="block-form" style="font-size: 40px; font-weight:900; text-align:center; color:#fe6561;">
-                                {{ vm.numberOfErrors }}
-                            </umb-box-content>
-                        </umb-box>
+                        <div class="umb-box-row">
+                        <!-- No of Errors -->                        
+                            <umb-box ng-click="vm.searchErrors()" style="cursor:pointer;">
+                                <umb-box-header title="Number of Errors"></umb-box-header>
+                                <umb-box-content class="block-form" style="font-size: 40px; font-weight:900; text-align:center; color:#fe6561;">
+                                    {{ vm.numberOfErrors }}
+                                </umb-box-content>
+                            </umb-box>     
+                            
+                            <umb-box>
+                                <umb-box-header title="Log level"></umb-box-header>
+                                <umb-box-content class="block-form" style="font-weight:900; text-align:center; color: {{ vm.logLevelColor }}">
+                                    {{ vm.logLevel }}
+                                </umb-box-content>
+                            </umb-box>                                                                            
+                        </div>
 
                         <!-- Chart of diff log types -->
                         <umb-box>
@@ -103,7 +112,8 @@
                                 </canvas>
 
                             </umb-box-content>
-                        </umb-box>
+                        </umb-box>                        
+                      
                     </div>
                 </div>
             </div>
diff --git a/src/Umbraco.Web/Editors/LogViewerController.cs b/src/Umbraco.Web/Editors/LogViewerController.cs
index d9fcfd108a..d48de8a00a 100644
--- a/src/Umbraco.Web/Editors/LogViewerController.cs
+++ b/src/Umbraco.Web/Editors/LogViewerController.cs
@@ -130,5 +130,11 @@ namespace Umbraco.Web.Editors
         {
             return _logViewer.DeleteSavedSearch(item.Name, item.Query);
         }
+
+        [HttpGet]
+        public string GetLogLevel()
+        {
+            return _logViewer.GetLogLevel();
+        }
     }
 }

From 3fa77dbf3d134567b022a32ee656f7a53bcb08af Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Tue, 13 Aug 2019 13:37:35 +0100
Subject: [PATCH 288/776] Change z-index

---
 .../src/less/components/notifications/umb-notifications.less    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/notifications/umb-notifications.less b/src/Umbraco.Web.UI.Client/src/less/components/notifications/umb-notifications.less
index 77dc6c6995..b79f5e5bb2 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/notifications/umb-notifications.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/notifications/umb-notifications.less
@@ -1,5 +1,5 @@
 .umb-notifications {
-   z-index: 1000;
+   z-index: 1100;
    position: absolute;
    bottom: 52px;
    left: 0;

From 12ad9dd36b802e5785672a9a8eb35576f549a723 Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Tue, 13 Aug 2019 13:37:35 +0100
Subject: [PATCH 289/776] Change z-index

(cherry picked from commit 3fa77dbf3d134567b022a32ee656f7a53bcb08af)
---
 .../src/less/components/notifications/umb-notifications.less    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/notifications/umb-notifications.less b/src/Umbraco.Web.UI.Client/src/less/components/notifications/umb-notifications.less
index 77dc6c6995..b79f5e5bb2 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/notifications/umb-notifications.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/notifications/umb-notifications.less
@@ -1,5 +1,5 @@
 .umb-notifications {
-   z-index: 1000;
+   z-index: 1100;
    position: absolute;
    bottom: 52px;
    left: 0;

From 6123c0d4752f97d2c1ee912b6fad6919f6b11ca7 Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Tue, 13 Aug 2019 13:37:35 +0100
Subject: [PATCH 290/776] Change z-index

(cherry picked from commit 3fa77dbf3d134567b022a32ee656f7a53bcb08af)
(cherry picked from commit 12ad9dd36b802e5785672a9a8eb35576f549a723)

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/less/components/notifications/umb-notifications.less
---
 .../src/less/components/notifications/umb-notifications.less    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/notifications/umb-notifications.less b/src/Umbraco.Web.UI.Client/src/less/components/notifications/umb-notifications.less
index 7f04fef9a9..5d78bed2a3 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/notifications/umb-notifications.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/notifications/umb-notifications.less
@@ -1,5 +1,5 @@
 .umb-notifications {
-    z-index: 1000;
+   z-index: 1100;
     position: absolute;
     bottom: @editorFooterHeight;
     left: 0;

From 28dd9aa081a93e4d65e9ebc15ee890ebcb2974f4 Mon Sep 17 00:00:00 2001
From: Tom Pipe <tom@tompipe.co.uk>
Date: Fri, 2 Aug 2019 13:32:19 +0100
Subject: [PATCH 291/776] Ensure a media type correctly inherits it's selected
 parent

---
 src/Umbraco.Web/Editors/MediaTypeController.cs | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/Editors/MediaTypeController.cs b/src/Umbraco.Web/Editors/MediaTypeController.cs
index a258c987f2..830d25f5c6 100644
--- a/src/Umbraco.Web/Editors/MediaTypeController.cs
+++ b/src/Umbraco.Web/Editors/MediaTypeController.cs
@@ -145,9 +145,18 @@ namespace Umbraco.Web.Editors
         }
         public MediaTypeDisplay GetEmpty(int parentId)
         {
-            var ct = new MediaType(parentId) {Icon = "icon-picture"};
+            IMediaType mt;
+            if (parentId != Constants.System.Root)
+            {
+                var parent = Services.ContentTypeService.GetMediaType(parentId);
+                mt = parent != null ? new MediaType(parent, string.Empty) : new MediaType(parentId);
+            }
+            else
+                mt = new MediaType(parentId);
 
-            var dto = Mapper.Map<IMediaType, MediaTypeDisplay>(ct);
+            mt.Icon = "icon-picture";
+
+            var dto = Mapper.Map<IMediaType, MediaTypeDisplay>(mt);
             return dto;
         }
 

From f829ac4e6cfc9c20af70f0ce90e6c7a44e0111e8 Mon Sep 17 00:00:00 2001
From: Tom Pipe <tom@tompipe.co.uk>
Date: Fri, 2 Aug 2019 13:32:19 +0100
Subject: [PATCH 292/776] Ensure a media type correctly inherits it's selected
 parent

(cherry picked from commit 28dd9aa081a93e4d65e9ebc15ee890ebcb2974f4)
---
 src/Umbraco.Web/Editors/MediaTypeController.cs | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/Editors/MediaTypeController.cs b/src/Umbraco.Web/Editors/MediaTypeController.cs
index a258c987f2..830d25f5c6 100644
--- a/src/Umbraco.Web/Editors/MediaTypeController.cs
+++ b/src/Umbraco.Web/Editors/MediaTypeController.cs
@@ -145,9 +145,18 @@ namespace Umbraco.Web.Editors
         }
         public MediaTypeDisplay GetEmpty(int parentId)
         {
-            var ct = new MediaType(parentId) {Icon = "icon-picture"};
+            IMediaType mt;
+            if (parentId != Constants.System.Root)
+            {
+                var parent = Services.ContentTypeService.GetMediaType(parentId);
+                mt = parent != null ? new MediaType(parent, string.Empty) : new MediaType(parentId);
+            }
+            else
+                mt = new MediaType(parentId);
 
-            var dto = Mapper.Map<IMediaType, MediaTypeDisplay>(ct);
+            mt.Icon = "icon-picture";
+
+            var dto = Mapper.Map<IMediaType, MediaTypeDisplay>(mt);
             return dto;
         }
 

From ab63d2664c14b72e8d19b31d0963964dbc92dd50 Mon Sep 17 00:00:00 2001
From: Tom Pipe <tom@tompipe.co.uk>
Date: Fri, 2 Aug 2019 15:08:46 +0100
Subject: [PATCH 293/776] Ensure a media type correctly inherits it's selected
 parent

---
 src/Umbraco.Web/Editors/MediaTypeController.cs | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web/Editors/MediaTypeController.cs b/src/Umbraco.Web/Editors/MediaTypeController.cs
index c55f07d559..24d8f696b6 100644
--- a/src/Umbraco.Web/Editors/MediaTypeController.cs
+++ b/src/Umbraco.Web/Editors/MediaTypeController.cs
@@ -19,6 +19,7 @@ using Umbraco.Core.Dictionary;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence;
 using Umbraco.Web.Composing;
+using IMediaType = Umbraco.Core.Models.IMediaType;
 
 namespace Umbraco.Web.Editors
 {
@@ -135,12 +136,18 @@ namespace Umbraco.Web.Editors
         }
         public MediaTypeDisplay GetEmpty(int parentId)
         {
-            var ct = new MediaType(parentId)
+            IMediaType mt;
+            if (parentId != Constants.System.Root)
             {
-                Icon = Constants.Icons.MediaImage
-            };
+                var parent = Services.MediaTypeService.Get(parentId);
+                mt = parent != null ? new MediaType(parent, string.Empty) : new MediaType(parentId);
+            }
+            else
+                mt = new MediaType(parentId);
 
-            var dto = Mapper.Map<IMediaType, MediaTypeDisplay>(ct);
+            mt.Icon = Constants.Icons.MediaImage;
+
+            var dto = Mapper.Map<IMediaType, MediaTypeDisplay>(mt);
             return dto;
         }
 

From ece7178ef544cd5f359d9f9c695c675616776dc3 Mon Sep 17 00:00:00 2001
From: Tom Pipe <tom@tompipe.co.uk>
Date: Fri, 2 Aug 2019 15:08:46 +0100
Subject: [PATCH 294/776] Ensure a media type correctly inherits it's selected
 parent

(cherry picked from commit ab63d2664c14b72e8d19b31d0963964dbc92dd50)
---
 src/Umbraco.Web/Editors/MediaTypeController.cs | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web/Editors/MediaTypeController.cs b/src/Umbraco.Web/Editors/MediaTypeController.cs
index c55f07d559..24d8f696b6 100644
--- a/src/Umbraco.Web/Editors/MediaTypeController.cs
+++ b/src/Umbraco.Web/Editors/MediaTypeController.cs
@@ -19,6 +19,7 @@ using Umbraco.Core.Dictionary;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence;
 using Umbraco.Web.Composing;
+using IMediaType = Umbraco.Core.Models.IMediaType;
 
 namespace Umbraco.Web.Editors
 {
@@ -135,12 +136,18 @@ namespace Umbraco.Web.Editors
         }
         public MediaTypeDisplay GetEmpty(int parentId)
         {
-            var ct = new MediaType(parentId)
+            IMediaType mt;
+            if (parentId != Constants.System.Root)
             {
-                Icon = Constants.Icons.MediaImage
-            };
+                var parent = Services.MediaTypeService.Get(parentId);
+                mt = parent != null ? new MediaType(parent, string.Empty) : new MediaType(parentId);
+            }
+            else
+                mt = new MediaType(parentId);
 
-            var dto = Mapper.Map<IMediaType, MediaTypeDisplay>(ct);
+            mt.Icon = Constants.Icons.MediaImage;
+
+            var dto = Mapper.Map<IMediaType, MediaTypeDisplay>(mt);
             return dto;
         }
 

From 2d56879d9217b571bc347ff2ced682a85f56d559 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bf@oerskov.dk>
Date: Sun, 11 Aug 2019 20:01:49 +0200
Subject: [PATCH 295/776] Allow tree item label to shrink

---
 .../src/less/components/tree/umb-tree-item.less      | 12 +++++++-----
 .../src/less/components/tree/umb-tree.less           |  4 +---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less
index 8f0b55f9ed..a969f876a4 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less
@@ -57,19 +57,20 @@
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
-        flex: 1 0 auto;
+        flex: 1 1 auto;
     }
 }
 
 // active is equivilant to selected, its the item that is begin affected by the actions performed in the right-click-dialog.
 .umb-tree-item.active > .umb-tree-item__inner {
+    border-color: @ui-selected-border;
+    box-shadow: 0 0 2px 0 fade(@ui-selected-border, 80%);
     color: @ui-selected-type;
+
     a {
         color: @ui-selected-type;
     }
-    
-    border-color: @ui-selected-border;
-    box-shadow: 0 0 2px 0 fade(@ui-selected-border, 80%);
+
     &::before {
         content: "";
         position: absolute;
@@ -79,8 +80,10 @@
         bottom: 0;
         border: 2px solid fade(white, 80%);
     }
+
     &:hover {
         color: @ui-selected-type-hover;
+
         a {
             color: @ui-selected-type-hover;
         }
@@ -88,7 +91,6 @@
 }
 
 .umb-tree-item.current > .umb-tree-item__inner {
-
     background: @ui-active;
     color:@ui-active-type;
     
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
index 5c54232200..7a70046de2 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
@@ -72,8 +72,7 @@ body.touch .umb-tree {
     overflow: hidden;
     display: flex;
     flex-wrap: nowrap;
-    align-items: center;
-    
+    align-items: center;  
     border:2px solid transparent;
     
     color: @ui-option-type;
@@ -183,7 +182,6 @@ body.touch .umb-tree {
     &:hover {
         background: @btnBackgroundHighlight;
     }
-
     // NOTE - We're having to repeat ourselves here due to an .sr-only class appearing in umbraco/lib/font-awesome/css/font-awesome.min.css
     &.sr-only--hoverable:hover,
     &.sr-only--focusable:focus {

From d5d213cd44a264606e3139bc5bc3df7af92cb429 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bf@oerskov.dk>
Date: Sun, 11 Aug 2019 20:01:49 +0200
Subject: [PATCH 296/776] Allow tree item label to shrink

(cherry picked from commit 2d56879d9217b571bc347ff2ced682a85f56d559)
---
 .../src/less/components/tree/umb-tree-item.less      | 12 +++++++-----
 .../src/less/components/tree/umb-tree.less           |  4 +---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less
index 8f0b55f9ed..a969f876a4 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less
@@ -57,19 +57,20 @@
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
-        flex: 1 0 auto;
+        flex: 1 1 auto;
     }
 }
 
 // active is equivilant to selected, its the item that is begin affected by the actions performed in the right-click-dialog.
 .umb-tree-item.active > .umb-tree-item__inner {
+    border-color: @ui-selected-border;
+    box-shadow: 0 0 2px 0 fade(@ui-selected-border, 80%);
     color: @ui-selected-type;
+
     a {
         color: @ui-selected-type;
     }
-    
-    border-color: @ui-selected-border;
-    box-shadow: 0 0 2px 0 fade(@ui-selected-border, 80%);
+
     &::before {
         content: "";
         position: absolute;
@@ -79,8 +80,10 @@
         bottom: 0;
         border: 2px solid fade(white, 80%);
     }
+
     &:hover {
         color: @ui-selected-type-hover;
+
         a {
             color: @ui-selected-type-hover;
         }
@@ -88,7 +91,6 @@
 }
 
 .umb-tree-item.current > .umb-tree-item__inner {
-
     background: @ui-active;
     color:@ui-active-type;
     
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
index 5c54232200..7a70046de2 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
@@ -72,8 +72,7 @@ body.touch .umb-tree {
     overflow: hidden;
     display: flex;
     flex-wrap: nowrap;
-    align-items: center;
-    
+    align-items: center;  
     border:2px solid transparent;
     
     color: @ui-option-type;
@@ -183,7 +182,6 @@ body.touch .umb-tree {
     &:hover {
         background: @btnBackgroundHighlight;
     }
-
     // NOTE - We're having to repeat ourselves here due to an .sr-only class appearing in umbraco/lib/font-awesome/css/font-awesome.min.css
     &.sr-only--hoverable:hover,
     &.sr-only--focusable:focus {

From b0b05cf785b0bb47788640fc103872bc6bc0f719 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Tue, 13 Aug 2019 22:54:19 +0200
Subject: [PATCH 297/776] Fix user group deletion (#5912)

---
 .../src/views/users/views/groups/groups.controller.js           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.controller.js
index 35b6ef62b4..9c476103a5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.controller.js
@@ -101,7 +101,7 @@
                         var confirmResponse = confirm(value);
 
                         if (confirmResponse === true) {
-                            userGroupsResource.deleteUserGroups(vm.selection).then(function (data) {
+                            userGroupsResource.deleteUserGroups(_.pluck(vm.selection, "id")).then(function (data) {
                                 clearSelection();
                                 onInit();
                             }, angular.noop);

From 3b60815e5304d39cc8fa5dc686fcd0656b68b5ca Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Tue, 13 Aug 2019 22:54:19 +0200
Subject: [PATCH 298/776] Fix user group deletion (#5912)

(cherry picked from commit b0b05cf785b0bb47788640fc103872bc6bc0f719)
---
 .../src/views/users/views/groups/groups.controller.js           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.controller.js
index 35b6ef62b4..9c476103a5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.controller.js
@@ -101,7 +101,7 @@
                         var confirmResponse = confirm(value);
 
                         if (confirmResponse === true) {
-                            userGroupsResource.deleteUserGroups(vm.selection).then(function (data) {
+                            userGroupsResource.deleteUserGroups(_.pluck(vm.selection, "id")).then(function (data) {
                                 clearSelection();
                                 onInit();
                             }, angular.noop);

From d005af2b11195f7ae07fc724feb17156340440d7 Mon Sep 17 00:00:00 2001
From: BatJan <jaskov@gmail.com>
Date: Thu, 18 Jul 2019 18:00:52 +0200
Subject: [PATCH 299/776] Remove unused visuallyhidden class

---
 src/Umbraco.Web.UI.Client/src/less/main.less | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/main.less b/src/Umbraco.Web.UI.Client/src/less/main.less
index 9f9bbce310..c10f846ca5 100644
--- a/src/Umbraco.Web.UI.Client/src/less/main.less
+++ b/src/Umbraco.Web.UI.Client/src/less/main.less
@@ -592,13 +592,3 @@ input[type=checkbox]:checked + .input-label--small {
   background-color: @green-l3;
   text-decoration: none;
 }
-
-.visuallyhidden{
-    position: absolute !important;
-	clip: rect(1px, 1px, 1px, 1px);
-	padding:0 !important;
-	border:0 !important;
-	height: 1px !important;
-	width: 1px !important;
-	overflow: hidden;
-}

From f3fc83fae6f13b906df466904a32ac4003a4169b Mon Sep 17 00:00:00 2001
From: Matt Brailsford <me@mattbrailsford.com>
Date: Thu, 18 Jul 2019 11:04:06 +0100
Subject: [PATCH 300/776] Fixes #5932, showing "Return to ListView" for new
 content

---
 .../common/directives/components/content/edit.controller.js   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
index 5bcab56f48..01e9b12c99 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
@@ -184,6 +184,10 @@
 
           $scope.content = data;
 
+          if (data.isChildOfListView && data.trashed === false) {
+              $scope.page.listViewPath = $routeParams.page ? '/content/content/edit/' + data.parentId + '?page=' + $routeParams.page : '/content/content/edit/' + data.parentId;
+          }
+          
           init($scope.content);
 
           resetLastListPageNumber($scope.content);

From ea591c87a257d0b80c18d5d20336baaa79106f1f Mon Sep 17 00:00:00 2001
From: Matt Brailsford <me@mattbrailsford.com>
Date: Thu, 18 Jul 2019 11:04:06 +0100
Subject: [PATCH 301/776] Fixes #5932, showing "Return to ListView" for new
 content

(cherry picked from commit f3fc83fae6f13b906df466904a32ac4003a4169b)
---
 .../common/directives/components/content/edit.controller.js   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
index 5bcab56f48..01e9b12c99 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
@@ -184,6 +184,10 @@
 
           $scope.content = data;
 
+          if (data.isChildOfListView && data.trashed === false) {
+              $scope.page.listViewPath = $routeParams.page ? '/content/content/edit/' + data.parentId + '?page=' + $routeParams.page : '/content/content/edit/' + data.parentId;
+          }
+          
           init($scope.content);
 
           resetLastListPageNumber($scope.content);

From 249126a2b5202e64c04b212a34fcea91b2260010 Mon Sep 17 00:00:00 2001
From: Matt Brailsford <me@mattbrailsford.com>
Date: Thu, 18 Jul 2019 11:01:46 +0100
Subject: [PATCH 302/776] Fixes #5931, show breadcrumb for new content

Could probably do with adding "Untitled" to translation file
---
 .../components/content/edit.controller.js       | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
index 01e9b12c99..db25399135 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
@@ -27,13 +27,18 @@
       editorState.set($scope.content);
 
       //We fetch all ancestors of the node to generate the footer breadcrumb navigation
-      if (!$scope.page.isNew) {
-        if (content.parentId && content.parentId !== -1) {
-          entityResource.getAncestors(content.id, "document")
-            .then(function (anc) {
-              $scope.ancestors = anc;
-            });
+      if (content.parentId && content.parentId !== -1) {
+        var ancestorIds = content.path.split(',');
+        ancestorIds.shift(); // Remove -1   
+        if ($scope.page.isNew) {
+            ancestorIds.pop(); // Remove 0
         }
+        entityResource.getByIds(ancestorIds, 'document').then(function (anc) {
+            $scope.ancestors = anc;
+            if ($scope.page.isNew) {
+                $scope.ancestors.push({ name: "Untitled" })
+            }
+        });
       }
 
       evts.push(eventsService.on("editors.content.changePublishDate", function (event, args) {

From 802e6d7979b521b2f6fc9ed78090fc1f348b4e31 Mon Sep 17 00:00:00 2001
From: Matt Brailsford <me@mattbrailsford.com>
Date: Thu, 18 Jul 2019 11:01:46 +0100
Subject: [PATCH 303/776] Fixes #5931, show breadcrumb for new content

Could probably do with adding "Untitled" to translation file

(cherry picked from commit 249126a2b5202e64c04b212a34fcea91b2260010)
---
 .../components/content/edit.controller.js       | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
index 01e9b12c99..db25399135 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
@@ -27,13 +27,18 @@
       editorState.set($scope.content);
 
       //We fetch all ancestors of the node to generate the footer breadcrumb navigation
-      if (!$scope.page.isNew) {
-        if (content.parentId && content.parentId !== -1) {
-          entityResource.getAncestors(content.id, "document")
-            .then(function (anc) {
-              $scope.ancestors = anc;
-            });
+      if (content.parentId && content.parentId !== -1) {
+        var ancestorIds = content.path.split(',');
+        ancestorIds.shift(); // Remove -1   
+        if ($scope.page.isNew) {
+            ancestorIds.pop(); // Remove 0
         }
+        entityResource.getByIds(ancestorIds, 'document').then(function (anc) {
+            $scope.ancestors = anc;
+            if ($scope.page.isNew) {
+                $scope.ancestors.push({ name: "Untitled" })
+            }
+        });
       }
 
       evts.push(eventsService.on("editors.content.changePublishDate", function (event, args) {

From f60b91110f76f808ebaf008879ea752d379f716c Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 14 Aug 2019 10:56:08 +1000
Subject: [PATCH 304/776] Fixes merge

---
 src/Umbraco.Examine/ExamineExtensions.cs      | 33 +++++++++----------
 .../Search/BackgroundIndexRebuilder.cs        |  2 +-
 .../Search/ExamineFinalComponent.cs           |  2 +-
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/Umbraco.Examine/ExamineExtensions.cs b/src/Umbraco.Examine/ExamineExtensions.cs
index 0e451b298c..d231a86f69 100644
--- a/src/Umbraco.Examine/ExamineExtensions.cs
+++ b/src/Umbraco.Examine/ExamineExtensions.cs
@@ -12,6 +12,7 @@ using Lucene.Net.Store;
 using Umbraco.Core;
 using Version = Lucene.Net.Util.Version;
 using Umbraco.Core.Logging;
+using System.Threading;
 
 namespace Umbraco.Examine
 {
@@ -28,29 +29,27 @@ namespace Umbraco.Examine
         /// </remarks>
         internal static readonly Regex CultureIsoCodeFieldNameMatchExpression = new Regex("^([_\\w]+)_([a-z]{2}-[a-z0-9]{2,4})$", RegexOptions.Compiled);
 
-        private static volatile bool _isUnlocked = false;
-        private static readonly object IsUnlockedLocker = new object();
+        private static bool _isConfigured = false;
+        private static object _configuredInit = null;
+        private static object _isConfiguredLocker = new object();
 
         /// <summary>
-        /// Unlocks all Lucene based indexes registered with the <see cref="IExamineManager"/>
+        /// Called on startup to configure each index.
         /// </summary>
         /// <remarks>
-        /// Indexing rebuilding can occur on a normal boot if the indexes are empty or on a cold boot by the database server messenger. Before
-        /// either of these happens, we need to configure the indexes.
+        /// Configures and unlocks all Lucene based indexes registered with the <see cref="IExamineManager"/>.
         /// </remarks>
-        internal static void EnsureUnlocked(this IExamineManager examineManager, IMainDom mainDom, ILogger logger)
+        internal static void ConfigureIndexes(this IExamineManager examineManager, IMainDom mainDom, ILogger logger)
         {
-            if (!mainDom.IsMainDom) return;
-            if (_isUnlocked) return;
-
-            lock (IsUnlockedLocker)
-            {
-                //double check
-                if (_isUnlocked) return;
-
-                _isUnlocked = true;
-                examineManager.UnlockLuceneIndexes(logger);
-            }
+            LazyInitializer.EnsureInitialized(
+                ref _configuredInit,
+                ref _isConfigured,
+                ref _isConfiguredLocker,
+                () =>
+                {
+                    examineManager.ConfigureLuceneIndexes(logger, !mainDom.IsMainDom);
+                    return null;
+                });
         }
 
         //TODO: We need a public method here to just match a field name against CultureIsoCodeFieldNameMatchExpression
diff --git a/src/Umbraco.Web/Search/BackgroundIndexRebuilder.cs b/src/Umbraco.Web/Search/BackgroundIndexRebuilder.cs
index d747d8d9e4..0ae5ceade9 100644
--- a/src/Umbraco.Web/Search/BackgroundIndexRebuilder.cs
+++ b/src/Umbraco.Web/Search/BackgroundIndexRebuilder.cs
@@ -115,7 +115,7 @@ namespace Umbraco.Web.Search
                 if (_waitMilliseconds > 0)
                     Thread.Sleep(_waitMilliseconds);
 
-                _indexRebuilder.ExamineManager.EnsureUnlocked(_mainDom, _logger);
+                _indexRebuilder.ExamineManager.ConfigureIndexes(_mainDom, _logger);
                 _indexRebuilder.RebuildIndexes(_onlyEmptyIndexes);
             }
         }
diff --git a/src/Umbraco.Web/Search/ExamineFinalComponent.cs b/src/Umbraco.Web/Search/ExamineFinalComponent.cs
index 4514a78faa..95000b2b46 100644
--- a/src/Umbraco.Web/Search/ExamineFinalComponent.cs
+++ b/src/Umbraco.Web/Search/ExamineFinalComponent.cs
@@ -29,7 +29,7 @@ namespace Umbraco.Web.Search
         {
             if (!_mainDom.IsMainDom) return;
 
-            _examineManager.EnsureUnlocked(_mainDom, _logger);
+            _examineManager.ConfigureIndexes(_mainDom, _logger);
 
             // TODO: Instead of waiting 5000 ms, we could add an event handler on to fulfilling the first request, then start?
             _indexRebuilder.RebuildIndexes(true, 5000);

From 9ed1101f273baecfe9e75138e6802533a75cbee0 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 14 Aug 2019 11:16:24 +1000
Subject: [PATCH 305/776] whitespace changes

---
 .../users/changepassword.directive.js         | 298 +++++++++---------
 .../components/users/change-password.html     |  10 +-
 2 files changed, 154 insertions(+), 154 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/users/changepassword.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/users/changepassword.directive.js
index f8dbefa5d7..8919a26dcb 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/users/changepassword.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/users/changepassword.directive.js
@@ -1,167 +1,167 @@
 (function () {
-  'use strict';
+    'use strict';
 
-  function ChangePasswordController($scope) {
+    function ChangePasswordController($scope) {
 
-    function resetModel(isNew) {
-      //the model config will contain an object, if it does not we'll create defaults
-      //NOTE: We will not support doing the password regex on the client side because the regex on the server side
-      //based on the membership provider cannot always be ported to js from .net directly.        
-      /*
-      {
-          hasPassword: true/false,
-          requiresQuestionAnswer: true/false,
-          enableReset: true/false,
-          enablePasswordRetrieval: true/false,
-          minPasswordLength: 10
-      }
-      */
+        function resetModel(isNew) {
+            //the model config will contain an object, if it does not we'll create defaults
+            //NOTE: We will not support doing the password regex on the client side because the regex on the server side
+            //based on the membership provider cannot always be ported to js from .net directly.        
+            /*
+            {
+                hasPassword: true/false,
+                requiresQuestionAnswer: true/false,
+                enableReset: true/false,
+                enablePasswordRetrieval: true/false,
+                minPasswordLength: 10
+            }
+            */
 
-      $scope.showReset = false;
+            $scope.showReset = false;
 
-      //set defaults if they are not available
-      if ($scope.config.disableToggle === undefined) {
-        $scope.config.disableToggle = false;
-      }
-      if ($scope.config.hasPassword === undefined) {
-        $scope.config.hasPassword = false;
-      }
-      if ($scope.config.enablePasswordRetrieval === undefined) {
-        $scope.config.enablePasswordRetrieval = true;
-      }
-      if ($scope.config.requiresQuestionAnswer === undefined) {
-        $scope.config.requiresQuestionAnswer = false;
-      }
-      //don't enable reset if it is new - that doesn't make sense
-      if (isNew === "true") {
-          $scope.config.enableReset = false;
-      }
-      else if ($scope.config.enableReset === undefined) {
-        $scope.config.enableReset = true;
-      }      
-        
-      if ($scope.config.minPasswordLength === undefined) {
-        $scope.config.minPasswordLength = 0;
-      }
-        
-      //set the model defaults
-      if (!angular.isObject($scope.passwordValues)) {
-        //if it's not an object then just create a new one
-        $scope.passwordValues = {
-          newPassword: null,
-          oldPassword: null, 
-          reset: null,
-          answer: null
-        };
-      }
-      else {
-        //just reset the values
+            //set defaults if they are not available
+            if ($scope.config.disableToggle === undefined) {
+                $scope.config.disableToggle = false;
+            }
+            if ($scope.config.hasPassword === undefined) {
+                $scope.config.hasPassword = false;
+            }
+            if ($scope.config.enablePasswordRetrieval === undefined) {
+                $scope.config.enablePasswordRetrieval = true;
+            }
+            if ($scope.config.requiresQuestionAnswer === undefined) {
+                $scope.config.requiresQuestionAnswer = false;
+            }
+            //don't enable reset if it is new - that doesn't make sense
+            if (isNew === "true") {
+                $scope.config.enableReset = false;
+            }
+            else if ($scope.config.enableReset === undefined) {
+                $scope.config.enableReset = true;
+            }
+
+            if ($scope.config.minPasswordLength === undefined) {
+                $scope.config.minPasswordLength = 0;
+            }
+
+            //set the model defaults
+            if (!angular.isObject($scope.passwordValues)) {
+                //if it's not an object then just create a new one
+                $scope.passwordValues = {
+                    newPassword: null,
+                    oldPassword: null,
+                    reset: null,
+                    answer: null
+                };
+            }
+            else {
+                //just reset the values
+
+                if (!isNew) {
+                    //if it is new, then leave the generated pass displayed
+                    $scope.passwordValues.newPassword = null;
+                    $scope.passwordValues.oldPassword = null;
+                }
+                $scope.passwordValues.reset = null;
+                $scope.passwordValues.answer = null;
+            }
+
+            //the value to compare to match passwords
+            if (!isNew) {
+                $scope.passwordValues.confirm = "";
+            }
+            else if ($scope.passwordValues.newPassword && $scope.passwordValues.newPassword.length > 0) {
+                //if it is new and a new password has been set, then set the confirm password too
+                $scope.passwordValues.confirm = $scope.passwordValues.newPassword;
+            }
 
-        if (!isNew) {
-          //if it is new, then leave the generated pass displayed
-          $scope.passwordValues.newPassword = null;
-          $scope.passwordValues.oldPassword = null;
         }
-        $scope.passwordValues.reset = null;
-        $scope.passwordValues.answer = null;
-      }
 
-      //the value to compare to match passwords
-      if (!isNew) {
-          $scope.passwordValues.confirm = "";
-      }
-      else if ($scope.passwordValues.newPassword && $scope.passwordValues.newPassword.length > 0) {
-        //if it is new and a new password has been set, then set the confirm password too
-          $scope.passwordValues.confirm = $scope.passwordValues.newPassword;
-      }
+        resetModel($scope.isNew);
+
+        //if there is no password saved for this entity , it must be new so we do not allow toggling of the change password, it is always there
+        //with validators turned on.
+        $scope.changing = $scope.config.disableToggle === true || !$scope.config.hasPassword;
+
+        //we're not currently changing so set the model to null
+        if (!$scope.changing) {
+            $scope.passwordValues = null;
+        }
+
+        $scope.doChange = function () {
+            resetModel();
+            $scope.changing = true;
+            //if there was a previously generated password displaying, clear it
+            $scope.passwordValues.generatedPassword = null;
+            $scope.passwordValues.confirm = null;
+        };
+
+        $scope.cancelChange = function () {
+            $scope.changing = false;
+            //set model to null
+            $scope.passwordValues = null;
+        };
+
+        var unsubscribe = [];
+
+        //listen for the saved event, when that occurs we'll 
+        //change to changing = false;
+        unsubscribe.push($scope.$on("formSubmitted", function () {
+            if ($scope.config.disableToggle === false) {
+                $scope.changing = false;
+            }
+        }));
+        unsubscribe.push($scope.$on("formSubmitting", function () {
+            //if there was a previously generated password displaying, clear it
+            if ($scope.changing && $scope.passwordValues) {
+                $scope.passwordValues.generatedPassword = null;
+            }
+            else if (!$scope.changing) {
+                //we are not changing, so the model needs to be null
+                $scope.passwordValues = null;
+            }
+        }));
+
+        //when the scope is destroyed we need to unsubscribe
+        $scope.$on('$destroy', function () {
+            for (var u in unsubscribe) {
+                unsubscribe[u]();
+            }
+        });
+
+        $scope.showOldPass = function () {
+            return $scope.config.hasPassword &&
+                !$scope.config.allowManuallyChangingPassword &&
+                !$scope.config.enablePasswordRetrieval && !$scope.showReset;
+        };
+
+        // TODO: I don't think we need this or the cancel button, this can be up to the editor rendering this directive
+        $scope.showCancelBtn = function () {
+            return $scope.config.disableToggle !== true && $scope.config.hasPassword;
+        };
 
     }
 
-    resetModel($scope.isNew);
+    function ChangePasswordDirective() {
 
-    //if there is no password saved for this entity , it must be new so we do not allow toggling of the change password, it is always there
-    //with validators turned on.
-    $scope.changing = $scope.config.disableToggle === true || !$scope.config.hasPassword;
+        var directive = {
+            restrict: 'E',
+            replace: true,
+            templateUrl: 'views/components/users/change-password.html',
+            controller: 'Umbraco.Editors.Users.ChangePasswordDirectiveController',
+            scope: {
+                isNew: "=?",
+                passwordValues: "=",
+                config: "="
+            }
+        };
+
+        return directive;
 
-    //we're not currently changing so set the model to null
-    if (!$scope.changing) {
-      $scope.passwordValues = null;
     }
 
-    $scope.doChange = function () {
-      resetModel();
-      $scope.changing = true;
-      //if there was a previously generated password displaying, clear it
-      $scope.passwordValues.generatedPassword = null;
-      $scope.passwordValues.confirm = null;
-    };
-
-    $scope.cancelChange = function () {
-      $scope.changing = false;
-      //set model to null
-      $scope.passwordValues = null;
-    };
-
-    var unsubscribe = [];
-
-    //listen for the saved event, when that occurs we'll 
-    //change to changing = false;
-    unsubscribe.push($scope.$on("formSubmitted", function () {
-      if ($scope.config.disableToggle === false) {
-        $scope.changing = false;
-      }
-    }));
-    unsubscribe.push($scope.$on("formSubmitting", function () {
-      //if there was a previously generated password displaying, clear it
-      if ($scope.changing && $scope.passwordValues) {
-        $scope.passwordValues.generatedPassword = null;
-      }
-      else if (!$scope.changing) {
-        //we are not changing, so the model needs to be null
-        $scope.passwordValues = null;
-      }
-    }));
-
-    //when the scope is destroyed we need to unsubscribe
-    $scope.$on('$destroy', function () {
-      for (var u in unsubscribe) {
-        unsubscribe[u]();
-      }
-    });
-      
-    $scope.showOldPass = function () {
-      return $scope.config.hasPassword &&
-        !$scope.config.allowManuallyChangingPassword &&
-        !$scope.config.enablePasswordRetrieval && !$scope.showReset;
-    };
-      
-    // TODO: I don't think we need this or the cancel button, this can be up to the editor rendering this directive
-    $scope.showCancelBtn = function () {
-      return $scope.config.disableToggle !== true && $scope.config.hasPassword;
-    };
-
-  }
-
-  function ChangePasswordDirective() {
-
-    var directive = {
-      restrict: 'E',
-      replace: true,
-      templateUrl: 'views/components/users/change-password.html',
-      controller: 'Umbraco.Editors.Users.ChangePasswordDirectiveController',
-      scope: {
-        isNew: "=?",
-        passwordValues: "=",
-        config: "="        
-      }
-    };
-
-    return directive;
-
-  }
-
-  angular.module('umbraco.directives').controller('Umbraco.Editors.Users.ChangePasswordDirectiveController', ChangePasswordController);
-  angular.module('umbraco.directives').directive('changePassword', ChangePasswordDirective);
+    angular.module('umbraco.directives').controller('Umbraco.Editors.Users.ChangePasswordDirectiveController', ChangePasswordController);
+    angular.module('umbraco.directives').directive('changePassword', ChangePasswordDirective);
 
 
 })();
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html b/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
index 7b6c7ca0e1..150fbf892b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
@@ -19,10 +19,10 @@
                            val-server-field="resetPassword"
                            no-dirty-check
                            ng-change="showReset = !showReset" />
-                    <span ng-messages="passwordForm.resetPassword.$error" show-validation-on-submit >
+                    <span ng-messages="passwordForm.resetPassword.$error" show-validation-on-submit>
                         <span class="help-inline" ng-message="valServerField">{{passwordForm.resetPassword.errorMsg}}</span>
                     </span>
-                    
+
                 </umb-control-group>
 
                 <!-- we need to show the old pass field when the provider cannot retrieve the password -->
@@ -32,7 +32,7 @@
                            required
                            val-server-field="oldPassword"
                            no-dirty-check />
-                    <span ng-messages="passwordForm.oldPassword.$error" show-validation-on-submit >
+                    <span ng-messages="passwordForm.oldPassword.$error" show-validation-on-submit>
                         <span class="help-inline" ng-message="required">Required</span>
                         <span class="help-inline" ng-message="valServerField">{{passwordForm.oldPassword.errorMsg}}</span>
                     </span>
@@ -45,7 +45,7 @@
                            val-server-field="password"
                            ng-minlength="{{config.minPasswordLength}}"
                            no-dirty-check />
-                    <span ng-messages="passwordForm.password.$error" show-validation-on-submit >
+                    <span ng-messages="passwordForm.password.$error" show-validation-on-submit>
                         <span class="help-inline" ng-message="required">Required</span>
                         <span class="help-inline" ng-message="minlength">Minimum {{config.minPasswordLength}} characters</span>
                         <span class="help-inline" ng-message="valServerField">{{passwordForm.password.errorMsg}}</span>
@@ -57,7 +57,7 @@
                            class="input-block-level umb-textstring textstring"
                            val-compare="password"
                            no-dirty-check />
-                    <span ng-messages="passwordForm.confirmpassword.$error" show-validation-on-submit >
+                    <span ng-messages="passwordForm.confirmpassword.$error" show-validation-on-submit>
                         <span class="help-inline" ng-message="valCompare"><localize key="user_passwordMismatch">The confirmed password doesn't match the new password!</localize></span>
                     </span>
                 </umb-control-group>

From d2be30a228af13e34967e89fe11010749b1bad1b Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 14 Aug 2019 12:26:49 +1000
Subject: [PATCH 306/776] converting to component

---
 .../users/changepassword.directive.js         | 191 +++++++++---------
 .../components/users/change-password.html     |  55 ++---
 2 files changed, 128 insertions(+), 118 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/users/changepassword.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/users/changepassword.directive.js
index 8919a26dcb..97eb2bf708 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/users/changepassword.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/users/changepassword.directive.js
@@ -3,6 +3,17 @@
 
     function ChangePasswordController($scope) {
 
+        var vm = this;
+
+        vm.$onInit = onInit;
+        vm.$onDestroy = onDestroy;
+        vm.doChange = doChange;
+        vm.cancelChange = cancelChange;
+        vm.showOldPass = showOldPass;
+        vm.showCancelBtn = showCancelBtn;
+
+        var unsubscribe = [];
+
         function resetModel(isNew) {
             //the model config will contain an object, if it does not we'll create defaults
             //NOTE: We will not support doing the password regex on the client side because the regex on the server side
@@ -17,37 +28,37 @@
             }
             */
 
-            $scope.showReset = false;
+            vm.showReset = false;
 
             //set defaults if they are not available
-            if ($scope.config.disableToggle === undefined) {
-                $scope.config.disableToggle = false;
+            if (vm.config.disableToggle === undefined) {
+                vm.config.disableToggle = false;
             }
-            if ($scope.config.hasPassword === undefined) {
-                $scope.config.hasPassword = false;
+            if (vm.config.hasPassword === undefined) {
+                vm.config.hasPassword = false;
             }
-            if ($scope.config.enablePasswordRetrieval === undefined) {
-                $scope.config.enablePasswordRetrieval = true;
+            if (vm.config.enablePasswordRetrieval === undefined) {
+                vm.config.enablePasswordRetrieval = true;
             }
-            if ($scope.config.requiresQuestionAnswer === undefined) {
-                $scope.config.requiresQuestionAnswer = false;
+            if (vm.config.requiresQuestionAnswer === undefined) {
+                vm.config.requiresQuestionAnswer = false;
             }
             //don't enable reset if it is new - that doesn't make sense
             if (isNew === "true") {
-                $scope.config.enableReset = false;
+                vm.config.enableReset = false;
             }
-            else if ($scope.config.enableReset === undefined) {
-                $scope.config.enableReset = true;
+            else if (vm.config.enableReset === undefined) {
+                vm.config.enableReset = true;
             }
 
-            if ($scope.config.minPasswordLength === undefined) {
-                $scope.config.minPasswordLength = 0;
+            if (vm.config.minPasswordLength === undefined) {
+                vm.config.minPasswordLength = 0;
             }
 
             //set the model defaults
-            if (!angular.isObject($scope.passwordValues)) {
+            if (!angular.isObject(vm.passwordValues)) {
                 //if it's not an object then just create a new one
-                $scope.passwordValues = {
+                vm.passwordValues = {
                     newPassword: null,
                     oldPassword: null,
                     reset: null,
@@ -59,109 +70,103 @@
 
                 if (!isNew) {
                     //if it is new, then leave the generated pass displayed
-                    $scope.passwordValues.newPassword = null;
-                    $scope.passwordValues.oldPassword = null;
+                    vm.passwordValues.newPassword = null;
+                    vm.passwordValues.oldPassword = null;
                 }
-                $scope.passwordValues.reset = null;
-                $scope.passwordValues.answer = null;
+                vm.passwordValues.reset = null;
+                vm.passwordValues.answer = null;
             }
 
             //the value to compare to match passwords
             if (!isNew) {
-                $scope.passwordValues.confirm = "";
+                vm.passwordValues.confirm = "";
             }
-            else if ($scope.passwordValues.newPassword && $scope.passwordValues.newPassword.length > 0) {
+            else if (vm.passwordValues.newPassword && vm.passwordValues.newPassword.length > 0) {
                 //if it is new and a new password has been set, then set the confirm password too
-                $scope.passwordValues.confirm = $scope.passwordValues.newPassword;
+                vm.passwordValues.confirm = vm.passwordValues.newPassword;
             }
 
         }
 
-        resetModel($scope.isNew);
-
-        //if there is no password saved for this entity , it must be new so we do not allow toggling of the change password, it is always there
-        //with validators turned on.
-        $scope.changing = $scope.config.disableToggle === true || !$scope.config.hasPassword;
-
-        //we're not currently changing so set the model to null
-        if (!$scope.changing) {
-            $scope.passwordValues = null;
-        }
-
-        $scope.doChange = function () {
-            resetModel();
-            $scope.changing = true;
-            //if there was a previously generated password displaying, clear it
-            $scope.passwordValues.generatedPassword = null;
-            $scope.passwordValues.confirm = null;
-        };
-
-        $scope.cancelChange = function () {
-            $scope.changing = false;
-            //set model to null
-            $scope.passwordValues = null;
-        };
-
-        var unsubscribe = [];
-
-        //listen for the saved event, when that occurs we'll 
-        //change to changing = false;
-        unsubscribe.push($scope.$on("formSubmitted", function () {
-            if ($scope.config.disableToggle === false) {
-                $scope.changing = false;
-            }
-        }));
-        unsubscribe.push($scope.$on("formSubmitting", function () {
-            //if there was a previously generated password displaying, clear it
-            if ($scope.changing && $scope.passwordValues) {
-                $scope.passwordValues.generatedPassword = null;
-            }
-            else if (!$scope.changing) {
-                //we are not changing, so the model needs to be null
-                $scope.passwordValues = null;
-            }
-        }));
-
         //when the scope is destroyed we need to unsubscribe
-        $scope.$on('$destroy', function () {
+        function onDestroy() {
             for (var u in unsubscribe) {
                 unsubscribe[u]();
             }
-        });
+        }
 
-        $scope.showOldPass = function () {
-            return $scope.config.hasPassword &&
-                !$scope.config.allowManuallyChangingPassword &&
-                !$scope.config.enablePasswordRetrieval && !$scope.showReset;
-        };
+        function onInit() {
+            //listen for the saved event, when that occurs we'll 
+            //change to changing = false;
+            unsubscribe.push($scope.$on("formSubmitted", function () {
+                if (vm.config.disableToggle === false) {
+                    vm.changing = false;
+                }
+            }));
 
-        // TODO: I don't think we need this or the cancel button, this can be up to the editor rendering this directive
-        $scope.showCancelBtn = function () {
-            return $scope.config.disableToggle !== true && $scope.config.hasPassword;
-        };
+            unsubscribe.push($scope.$on("formSubmitting", function () {
+                //if there was a previously generated password displaying, clear it
+                if (vm.changing && vm.passwordValues) {
+                    vm.passwordValues.generatedPassword = null;
+                }
+                else if (!vm.changing) {
+                    //we are not changing, so the model needs to be null
+                    vm.passwordValues = null;
+                }
+            }));
 
-    }
+            resetModel(vm.isNew);
 
-    function ChangePasswordDirective() {
+            //if there is no password saved for this entity , it must be new so we do not allow toggling of the change password, it is always there
+            //with validators turned on.
+            vm.changing = vm.config.disableToggle === true || !vm.config.hasPassword;
 
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/users/change-password.html',
-            controller: 'Umbraco.Editors.Users.ChangePasswordDirectiveController',
-            scope: {
-                isNew: "=?",
-                passwordValues: "=",
-                config: "="
+            //we're not currently changing so set the model to null
+            if (!vm.changing) {
+                vm.passwordValues = null;
             }
+        }
+
+        function doChange() {
+            resetModel();
+            vm.changing = true;
+            //if there was a previously generated password displaying, clear it
+            vm.passwordValues.generatedPassword = null;
+            vm.passwordValues.confirm = null;
         };
 
-        return directive;
+        function cancelChange() {
+            vm.changing = false;
+            //set model to null
+            vm.passwordValues = null;
+        };
+
+        function showOldPass() {
+            return vm.config.hasPassword &&
+                !vm.config.allowManuallyChangingPassword &&
+                !vm.config.enablePasswordRetrieval && !vm.showReset;
+        };
+
+        // TODO: I don't think we need this or the cancel button, this can be up to the editor rendering this component
+        function showCancelBtn() {
+            return vm.config.disableToggle !== true && vm.config.hasPassword;
+        };
 
     }
 
-    angular.module('umbraco.directives').controller('Umbraco.Editors.Users.ChangePasswordDirectiveController', ChangePasswordController);
-    angular.module('umbraco.directives').directive('changePassword', ChangePasswordDirective);
+    var component = {
+        templateUrl: 'views/components/users/change-password.html',
+        controller: ChangePasswordController,
+        controllerAs: 'vm',
+        bindings: {
+            isNew: "<",
+            passwordValues: "=", //TODO: Do we need bi-directional vals?
+            config: "=" //TODO: Do we need bi-directional vals?
+            //TODO: Do we need callbacks?
+        }
+    };
+
+    angular.module('umbraco.directives').component('changePassword', component);
 
 
 })();
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html b/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
index 150fbf892b..026918231e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
@@ -1,68 +1,73 @@
 <div>
-    <div class="alert alert-success text-center" ng-hide="!passwordValues.generatedPassword">
+    <div class="alert alert-success text-center" ng-hide="!vm.passwordValues.generatedPassword">
         <small>Password has been reset to:</small>
         <br />
-        <strong>{{passwordValues.generatedPassword}}</strong>
+        <strong>{{vm.passwordValues.generatedPassword}}</strong>
     </div>
-    <div ng-switch="changing">
+    <div ng-switch="vm.changing">
         <div ng-switch-when="false">
-            <a href="" ng-click="doChange()" class="btn btn-small">
+            <a href="" ng-click="vm.doChange()" class="btn btn-small">
                 <localize key="general_changePassword">Change password</localize>
             </a>
         </div>
         <div ng-switch-when="true">
-            <ng-form name="passwordForm">
-                <umb-control-group alias="resetPassword" label="@user_resetPassword" ng-show="config.enableReset">
-                    <input type="checkbox" ng-model="passwordValues.reset"
+
+            <pre><code>Hello</code></pre>
+            <pre><code>{{vm.showReset}}</code></pre>
+            <pre><code>{{vm.passwordValues | json}}</code></pre>
+
+            <ng-form name="vm.passwordForm">
+                <umb-control-group alias="resetPassword" label="@user_resetPassword" ng-show="vm.config.enableReset">
+                    <input type="checkbox" ng-model="vm.passwordValues.reset"
                            id="Checkbox1"
                            name="resetPassword"
                            val-server-field="resetPassword"
                            no-dirty-check
-                           ng-change="showReset = !showReset" />
-                    <span ng-messages="passwordForm.resetPassword.$error" show-validation-on-submit>
-                        <span class="help-inline" ng-message="valServerField">{{passwordForm.resetPassword.errorMsg}}</span>
+                           ng-change="vm.showReset = !vm.showReset" />
+                    <span ng-messages="vm.passwordForm.resetPassword.$error" show-validation-on-submit>
+                        <span class="help-inline" ng-message="valServerField">{{vm.passwordForm.resetPassword.errorMsg}}</span>
                     </span>
 
-                </umb-control-group>
+                </umb-control-group> 
 
                 <!-- we need to show the old pass field when the provider cannot retrieve the password -->
-                <umb-control-group alias="oldPassword" label="@user_oldPassword" ng-if="showOldPass()" required="true">
-                    <input type="password" name="oldPassword" ng-model="passwordValues.oldPassword"
+                <umb-control-group alias="oldPassword" label="@user_oldPassword" ng-if="vm.showOldPass()" required="true">
+                    <input type="password" name="oldPassword" ng-model="vm.passwordValues.oldPassword"
                            class="input-block-level umb-textstring textstring"
                            required
                            val-server-field="oldPassword"
                            no-dirty-check />
-                    <span ng-messages="passwordForm.oldPassword.$error" show-validation-on-submit>
+                    <span ng-messages="vm.passwordForm.oldPassword.$error" show-validation-on-submit>
                         <span class="help-inline" ng-message="required">Required</span>
-                        <span class="help-inline" ng-message="valServerField">{{passwordForm.oldPassword.errorMsg}}</span>
+                        <span class="help-inline" ng-message="valServerField">{{vm.passwordForm.oldPassword.errorMsg}}</span>
                     </span>
                 </umb-control-group>
 
-                <umb-control-group alias="password" label="@user_newPassword" ng-if="!showReset" required="true">
-                    <input type="password" name="password" ng-model="passwordValues.newPassword"
+                <umb-control-group alias="password" label="@user_newPassword" ng-if="!vm.showReset" required="true">
+                    <input type="password" name="password" ng-model="vm.passwordValues.newPassword"
                            class="input-block-level umb-textstring textstring"
                            required
                            val-server-field="password"
-                           ng-minlength="{{config.minPasswordLength}}"
+                           ng-minlength="{{vm.config.minPasswordLength}}"
                            no-dirty-check />
-                    <span ng-messages="passwordForm.password.$error" show-validation-on-submit>
+                    <span ng-messages="vm.passwordForm.password.$error" show-validation-on-submit>
                         <span class="help-inline" ng-message="required">Required</span>
-                        <span class="help-inline" ng-message="minlength">Minimum {{config.minPasswordLength}} characters</span>
-                        <span class="help-inline" ng-message="valServerField">{{passwordForm.password.errorMsg}}</span>
+                        <span class="help-inline" ng-message="minlength">Minimum {{vm.config.minPasswordLength}} characters</span>
+                        <span class="help-inline" ng-message="valServerField">{{vm.passwordForm.password.errorMsg}}</span>
                     </span>
                 </umb-control-group>
 
-                <umb-control-group alias="confirmpassword" label="@user_confirmNewPassword" ng-if="!showReset" required="true">
-                    <input type="password" name="confirmpassword" ng-model="passwordValues.confirm"
+                <umb-control-group alias="confirmpassword" label="@user_confirmNewPassword" ng-if="!vm.showReset" required="true">
+                    <input type="password" name="confirmpassword" ng-model="vm.passwordValues.confirm"
                            class="input-block-level umb-textstring textstring"
                            val-compare="password"
                            no-dirty-check />
-                    <span ng-messages="passwordForm.confirmpassword.$error" show-validation-on-submit>
+                    <span ng-messages="vm.passwordForm.confirmpassword.$error" show-validation-on-submit>
                         <span class="help-inline" ng-message="valCompare"><localize key="user_passwordMismatch">The confirmed password doesn't match the new password!</localize></span>
                     </span>
                 </umb-control-group>
 
-                <a href="" ng-click="cancelChange()" ng-show="showCancelBtn()" class="btn btn-small">
+                <a href="" ng-click="vm.cancelChange()" ng-show="vm.showCancelBtn()" class="btn btn-small">
                     <localize key="general_cancel">Cancel</localize>
                 </a>
 

From 9d77114d5038b6403f78d67202f5f8f60c383afa Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 14 Aug 2019 12:28:28 +1000
Subject: [PATCH 307/776] fixes gulp build for dev purposes - no fastdev since
 there's no need for it, removes inlining templates when not in prod

---
 src/Umbraco.Web.UI.Client/gulp/tasks/dev.js   |  5 ++-
 .../gulp/tasks/fastdev.js                     | 13 -------
 .../gulp/util/processJs.js                    | 34 ++++++++++---------
 .../gulp/util/processLess.js                  | 13 +++----
 4 files changed, 26 insertions(+), 39 deletions(-)
 delete mode 100644 src/Umbraco.Web.UI.Client/gulp/tasks/fastdev.js

diff --git a/src/Umbraco.Web.UI.Client/gulp/tasks/dev.js b/src/Umbraco.Web.UI.Client/gulp/tasks/dev.js
index bca4da8c43..8b07f5156e 100644
--- a/src/Umbraco.Web.UI.Client/gulp/tasks/dev.js
+++ b/src/Umbraco.Web.UI.Client/gulp/tasks/dev.js
@@ -5,6 +5,9 @@ var gulp = require('gulp');
 var runSequence = require('run-sequence');
 
 // Dev - build the files ready for development and start watchers
-gulp.task('dev', function(cb) {
+gulp.task('dev', function (cb) {
+
+    global.isProd = false;
+
     runSequence(["dependencies", "js", "less", "views"], "watch", cb);
 });
diff --git a/src/Umbraco.Web.UI.Client/gulp/tasks/fastdev.js b/src/Umbraco.Web.UI.Client/gulp/tasks/fastdev.js
deleted file mode 100644
index 888ed38fec..0000000000
--- a/src/Umbraco.Web.UI.Client/gulp/tasks/fastdev.js
+++ /dev/null
@@ -1,13 +0,0 @@
-'use strict';
-
-var config = require('../config');
-var gulp = require('gulp');
-var runSequence = require('run-sequence');
-
-// Dev - build the files ready for development and start watchers
-gulp.task('fastdev', function(cb) {
-    
-    global.isProd = false;
-    
-    runSequence(["dependencies", "js", "less", "views"], "watch", cb);
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/gulp/util/processJs.js b/src/Umbraco.Web.UI.Client/gulp/util/processJs.js
index 829db2aec7..9d69840a38 100644
--- a/src/Umbraco.Web.UI.Client/gulp/util/processJs.js
+++ b/src/Umbraco.Web.UI.Client/gulp/util/processJs.js
@@ -9,26 +9,28 @@ var concat = require('gulp-concat');
 var wrap = require("gulp-wrap-js");
 var embedTemplates = require('gulp-angular-embed-templates');
 
-module.exports = function(files, out) {
-    
+module.exports = function (files, out) {
+
     var task = gulp.src(files);
-    
-    if (global.isProd === true) {
-        // check for js errors
-        task = task.pipe(eslint());
-        // outputs the lint results to the console
-        task = task.pipe(eslint.format());
-    }
-    
+
+    // check for js errors
+    task = task.pipe(eslint());
+    // outputs the lint results to the console
+    task = task.pipe(eslint.format());
+
     // sort files in stream by path or any custom sort comparator
     task = task.pipe(babel())
-        .pipe(sort())
-        .pipe(embedTemplates({ basePath: "./src/", minimize:{ loose: true } }))
-        .pipe(concat(out))
+        .pipe(sort());
+
+    if (global.isProd === true) {
+        //in production, embed the templates
+        task = task.pipe(embedTemplates({ basePath: "./src/", minimize: { loose: true } }))
+    }
+    task = task.pipe(concat(out))
         .pipe(wrap('(function(){\n%= body %\n})();'))
         .pipe(gulp.dest(config.root + config.targets.js));
-    
-    
+
+
     return task;
-    
+
 };
diff --git a/src/Umbraco.Web.UI.Client/gulp/util/processLess.js b/src/Umbraco.Web.UI.Client/gulp/util/processLess.js
index 26f69865d9..b866815f34 100644
--- a/src/Umbraco.Web.UI.Client/gulp/util/processLess.js
+++ b/src/Umbraco.Web.UI.Client/gulp/util/processLess.js
@@ -17,17 +17,12 @@ module.exports = function(files, out) {
     ];
 
     var task = gulp.src(files)
-        .pipe(less());
-    
-    
-    if (global.isProd === true) {
-        task = task.pipe(cleanCss());
-    }
-    
-    task = task.pipe(postcss(processors))
+        .pipe(less())
+        .pipe(cleanCss())
+        .pipe(postcss(processors))
         .pipe(rename(out))
         .pipe(gulp.dest(config.root + config.targets.css));
     
     return task;
     
-};
\ No newline at end of file
+};

From df391c86f379f6a7d514ac3a9238e4e0632f2613 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 14 Aug 2019 12:45:39 +1000
Subject: [PATCH 308/776] Fixes re-syncing member and media data after saving

---
 .../src/common/services/contenteditinghelper.service.js       | 4 ++--
 .../src/views/components/users/change-password.html           | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
index 732f682082..a1c1bdcae4 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
@@ -484,7 +484,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, editorSt
             var savedVariants = [];
             if (origContent.variants) {
                 isContent = true;
-                //it's contnet so assign the variants as they exist
+                //it's content so assign the variants as they exist
                 origVariants = origContent.variants;
                 savedVariants = savedContent.variants;
             }
@@ -510,7 +510,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, editorSt
 
                 //special case for content, don't sync this variant if it wasn't tagged
                 //for saving in the first place
-                if (!origVariant.save) {
+                if (isContent && !origVariant.save) {
                     continue;
                 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html b/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
index 026918231e..ef5f7a4159 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
@@ -12,10 +12,6 @@
         </div>
         <div ng-switch-when="true">
 
-            <pre><code>Hello</code></pre>
-            <pre><code>{{vm.showReset}}</code></pre>
-            <pre><code>{{vm.passwordValues | json}}</code></pre>
-
             <ng-form name="vm.passwordForm">
                 <umb-control-group alias="resetPassword" label="@user_resetPassword" ng-show="vm.config.enableReset">
                     <input type="checkbox" ng-model="vm.passwordValues.reset"

From dfed93a4ab1da5689bb11784841d93315a13034b Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 14 Aug 2019 14:49:05 +1000
Subject: [PATCH 309/776] Fixes dropping unique constraint indexes and oddly
 named FKs

---
 .../DeleteKeysAndIndexesBuilder.cs            | 44 +++++++++++++++----
 1 file changed, 36 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Core/Migrations/Expressions/Delete/KeysAndIndexes/DeleteKeysAndIndexesBuilder.cs b/src/Umbraco.Core/Migrations/Expressions/Delete/KeysAndIndexes/DeleteKeysAndIndexesBuilder.cs
index 9b13457b76..df74bf7c87 100644
--- a/src/Umbraco.Core/Migrations/Expressions/Delete/KeysAndIndexes/DeleteKeysAndIndexesBuilder.cs
+++ b/src/Umbraco.Core/Migrations/Expressions/Delete/KeysAndIndexes/DeleteKeysAndIndexesBuilder.cs
@@ -1,5 +1,7 @@
-using System.Linq;
+using System.Collections.Generic;
+using System.Linq;
 using NPoco;
+using Umbraco.Core;
 using Umbraco.Core.Migrations.Expressions.Common;
 using Umbraco.Core.Persistence.SqlSyntax;
 
@@ -27,31 +29,57 @@ namespace Umbraco.Core.Migrations.Expressions.Delete.KeysAndIndexes
         {
             _context.BuildingExpression = false;
 
+            //get a list of all constraints - this will include all PK, FK and unique constraints
+            var tableConstraints = _context.SqlContext.SqlSyntax.GetConstraintsPerTable(_context.Database).DistinctBy(x => x.Item2).ToList();
+
+            //get a list of defined indexes - this will include all indexes, unique indexes and unique constraint indexes
+            var indexes = _context.SqlContext.SqlSyntax.GetDefinedIndexesDefinitions(_context.Database).DistinctBy(x => x.IndexName).ToList();
+
+            var uniqueConstraintNames = tableConstraints.Where(x => !x.Item2.InvariantStartsWith("PK_") && !x.Item2.InvariantStartsWith("FK_")).Select(x => x.Item2);
+            var indexNames = indexes.Select(x => x.IndexName).ToList();
+
             // drop keys
             if (DeleteLocal || DeleteForeign)
             {
                 // table, constraint
-                var tableKeys = _context.SqlContext.SqlSyntax.GetConstraintsPerTable(_context.Database).DistinctBy(x => x.Item2).ToList();
+                
                 if (DeleteForeign)
                 {
-                    foreach (var key in tableKeys.Where(x => x.Item1 == TableName && x.Item2.StartsWith("FK_")))
+                    //In some cases not all FK's are prefixed with "FK" :/ mostly with old upgraded databases so we need to check if it's either:
+                    // * starts with FK OR
+                    // * doesn't start with PK_ and doesn't exist in the list of indexes
+
+                    foreach (var key in tableConstraints.Where(x => x.Item1 == TableName
+                        && (x.Item2.InvariantStartsWith("FK_") || (!x.Item2.InvariantStartsWith("PK_") && !indexNames.InvariantContains(x.Item2)))))
+                    {
                         Delete.ForeignKey(key.Item2).OnTable(key.Item1).Do();
+                    }
+                        
                 }
                 if (DeleteLocal)
                 {
-                    foreach (var key in tableKeys.Where(x => x.Item1 == TableName && x.Item2.StartsWith("PK_")))
+                    foreach (var key in tableConstraints.Where(x => x.Item1 == TableName && x.Item2.InvariantStartsWith("PK_")))
                         Delete.PrimaryKey(key.Item2).FromTable(key.Item1).Do();
 
-                    // note: we do *not* delete the DEFAULT constraints
+                    // note: we do *not* delete the DEFAULT constraints and if we wanted to we'd have to deal with that in interesting ways
+                    // since SQL server has a specific way to handle that, see SqlServerSyntaxProvider.GetDefaultConstraintsPerColumn
                 }
             }
 
             // drop indexes
             if (DeleteLocal)
-            {
-                var indexes = _context.SqlContext.SqlSyntax.GetDefinedIndexesDefinitions(_context.Database).DistinctBy(x => x.IndexName).ToList();
+            {   
                 foreach (var index in indexes.Where(x => x.TableName == TableName))
-                    Delete.Index(index.IndexName).OnTable(index.TableName).Do();
+                {
+                    //if this is a unique constraint we need to drop the constraint, else drop the index
+                    //to figure this out, the index must be tagged as unique and it must exist in the tableConstraints
+
+                    if (index.IsUnique && uniqueConstraintNames.InvariantContains(index.IndexName))
+                        Delete.UniqueConstraint(index.IndexName).FromTable(index.TableName).Do();
+                    else
+                        Delete.Index(index.IndexName).OnTable(index.TableName).Do();
+                }
+                    
             }
         }
 

From ee2068de568255145be396dd32f3e1094537cbb6 Mon Sep 17 00:00:00 2001
From: elitsa <elm@umbraco.dk>
Date: Wed, 14 Aug 2019 14:03:32 +0200
Subject: [PATCH 310/776] Removing legacy service

---
 .../umbraco/webservices/legacyAjaxCalls.asmx.cs    | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs
index 1929477181..a29e44a92b 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs
@@ -36,19 +36,7 @@ namespace umbraco.presentation.webservices
     public class legacyAjaxCalls : UmbracoAuthorizedWebService
     {
         private User _currentUser;
-
-        [WebMethod]
-        public bool ValidateUser(string username, string password)
-        {
-            if (ValidateCredentials(username, password))
-            {
-                var u = new BusinessLogic.User(username);
-                BasePage.doLogin(u);
-                return true;
-            }
-            return false;
-        }
-
+       
         /// <summary>
         /// method to accept a string value for the node id. Used for tree's such as python
         /// and xslt since the file names are the node IDs

From 8bdd694a12083b9c408d495d96b1f0dab1b4e481 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Wed, 14 Aug 2019 16:55:32 +0200
Subject: [PATCH 311/776] V8: Make sure to mark the current form as dirty when
 altering content types (#6108)

---
 .../components/umbgroupsbuilder.directive.js         |  6 ++++++
 .../src/views/documenttypes/edit.controller.js       |  4 ++++
 .../src/views/mediatypes/edit.controller.js          |  4 ++++
 .../src/views/membertypes/edit.controller.js         | 12 +++++++++++-
 4 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
index 8dada26960..c1f34e64ae 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
@@ -532,6 +532,7 @@
               // push new init tab to the scope
               addInitGroup(scope.model.groups);
 
+              notifyChanged();
             },
             close: function() {
               if(_.isEqual(oldPropertyModel, propertyModel) === false) {
@@ -588,8 +589,13 @@
 
         }
 
+        notifyChanged();
       };
 
+      function notifyChanged() {
+        eventsService.emit("editors.groupsBuilder.changed");
+      }
+
       function addInitProperty(group) {
 
         var addInitPropertyBool = true;
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
index 5ceb5f01f2..adc12c137b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
@@ -506,6 +506,10 @@
             }
         }));
 
+        evts.push(eventsService.on("editors.groupsBuilder.changed", function(name, args) {
+            angularHelper.getCurrentForm($scope).$setDirty();
+        }));
+
         //ensure to unregister from all events!
         $scope.$on('$destroy', function () {
             for (var e in evts) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js
index 0acb87f42e..6a9571c486 100644
--- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js
@@ -431,6 +431,10 @@
             loadMediaType();
         }));
 
+        evts.push(eventsService.on("editors.groupsBuilder.changed", function(name, args) {
+            angularHelper.getCurrentForm($scope).$setDirty();
+        }));
+
         //ensure to unregister from all events!
         $scope.$on('$destroy', function () {
             for (var e in evts) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.controller.js
index dff5c65308..58825da6cb 100644
--- a/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.controller.js
@@ -9,8 +9,9 @@
 (function () {
     "use strict";
 
-    function MemberTypesEditController($scope, $rootScope, $routeParams, $log, $filter, memberTypeResource, dataTypeResource, editorState, iconHelper, formHelper, navigationService, contentEditingHelper, notificationsService, $q, localizationService, overlayHelper, contentTypeHelper) {
+    function MemberTypesEditController($scope, $rootScope, $routeParams, $log, $filter, memberTypeResource, dataTypeResource, editorState, iconHelper, formHelper, navigationService, contentEditingHelper, notificationsService, $q, localizationService, overlayHelper, contentTypeHelper, angularHelper, eventsService) {
 
+        var evts = [];
         var vm = this;
 
         vm.save = save;
@@ -304,7 +305,16 @@
 
         }
 
+        evts.push(eventsService.on("editors.groupsBuilder.changed", function(name, args) {
+            angularHelper.getCurrentForm($scope).$setDirty();
+        }));
 
+        //ensure to unregister from all events!
+        $scope.$on('$destroy', function () {
+            for (var e in evts) {
+                eventsService.unsubscribe(evts[e]);
+            }
+        });
     }
 
     angular.module("umbraco").controller("Umbraco.Editors.MemberTypes.EditController", MemberTypesEditController);

From 5997e0ce8ca827039f14289feb6213873ed55c58 Mon Sep 17 00:00:00 2001
From: Jan Skovgaard <jaskov@gmail.com>
Date: Wed, 14 Aug 2019 17:11:02 +0200
Subject: [PATCH 312/776] =?UTF-8?q?Accessibility:=20Ensure=20"cancel"=20is?=
 =?UTF-8?q?=20clickable=20from=20move/restore=20d=E2=80=A6=20(#5942)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Umbraco.Web.UI.Client/src/views/content/move.html       | 4 ++--
 src/Umbraco.Web.UI.Client/src/views/content/restore.html    | 6 +++---
 src/Umbraco.Web.UI.Client/src/views/datatypes/move.html     | 4 ++--
 src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.html | 4 ++--
 src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html | 4 ++--
 src/Umbraco.Web.UI.Client/src/views/media/move.html         | 2 +-
 src/Umbraco.Web.UI.Client/src/views/media/restore.html      | 4 ++--
 src/Umbraco.Web.UI.Client/src/views/mediatypes/copy.html    | 4 ++--
 src/Umbraco.Web.UI.Client/src/views/mediatypes/move.html    | 4 ++--
 9 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/move.html b/src/Umbraco.Web.UI.Client/src/views/content/move.html
index fb72c38974..fd154f438a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/move.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/move.html
@@ -76,9 +76,9 @@
 
 
     <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="success">
-        <a class="btn btn-link" ng-click="close()" ng-show="!busy">
+        <button type="button" class="btn btn-link" ng-click="close()" ng-show="!busy">
             <localize key="general_cancel">Cancel</localize>
-        </a>
+        </button>
         <button class="btn btn-primary" ng-click="move()" ng-disabled="busy || !target">
             <localize key="actions_move">Move</localize>
         </button>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/restore.html b/src/Umbraco.Web.UI.Client/src/views/content/restore.html
index ead6ed91ab..2f7bacca82 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/restore.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/restore.html
@@ -39,7 +39,7 @@
                 </div>
 
                 <div ng-hide="miniListView">
-                    <umb-tree-search-box 
+                    <umb-tree-search-box
                         hide-search-callback="hideSearch"
                         search-callback="onSearchResults"
                         show-search="{{searchInfo.showSearch}}"
@@ -82,12 +82,12 @@
 	</div>
 
     <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="loading || moving || success">
-        <a class="btn btn-link" ng-click="close()"><localize key="general_cancel">Cancel</localize></a>
+        <button type="button" class="btn btn-link" ng-click="close()"><localize key="general_cancel">Cancel</localize></button>
         <button class="btn btn-primary" ng-click="restore()" ng-show="error == null"><localize key="actions_restore">Restore</localize></button>
     </div>
 
     <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="loading || !moving || success">
-        <a class="btn btn-link" ng-click="close()"><localize key="general_cancel">Cancel</localize></a>
+        <button type="button" class="btn btn-link" ng-click="close()"><localize key="general_cancel">Cancel</localize></button>
         <button class="btn btn-primary" ng-click="restore()" ng-show="error == null" ng-disabled="!target"><localize key="actions_move">Move</localize></button>
     </div>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/datatypes/move.html b/src/Umbraco.Web.UI.Client/src/views/datatypes/move.html
index 2723dd305d..a5cf6b1a41 100644
--- a/src/Umbraco.Web.UI.Client/src/views/datatypes/move.html
+++ b/src/Umbraco.Web.UI.Client/src/views/datatypes/move.html
@@ -45,9 +45,9 @@
     </div>
 
     <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="success">
-        <a class="btn btn-link" ng-click="close()" ng-show="!busy">
+        <button type="button" class="btn btn-link" ng-click="close()" ng-show="!busy">
             <localize key="general_cancel">Cancel</localize>
-        </a>
+        </button>
         <button class="btn btn-primary" ng-click="move()" ng-disabled="busy || !target">
             <localize key="actions_move">Move</localize>
         </button>
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.html
index 4b90c244e8..03b090fc54 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.html
@@ -45,9 +45,9 @@
     </div>
 
     <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="success">
-        <a class="btn btn-link" ng-click="close()" ng-show="!busy">
+        <button type="button" class="btn btn-link" ng-click="close()" ng-show="!busy">
             <localize key="general_cancel">Cancel</localize>
-        </a>
+        </button>
         <button class="btn btn-primary" ng-click="copy()" ng-disabled="busy || !target">
             <localize key="actions_copy">Copy</localize>
         </button>
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html
index 6b81c15bc5..46626d924b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html
@@ -45,9 +45,9 @@
     </div>
 
     <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="success">
-        <a class="btn btn-link" ng-click="close()" ng-show="!busy">
+        <button type="button" class="btn btn-link" ng-click="close()" ng-show="!busy">
             <localize key="general_cancel">Cancel</localize>
-        </a>
+        </button>
         <button class="btn btn-primary" ng-click="move()" ng-disabled="busy || !target">
             <localize key="actions_move">Move</localize>
         </button>
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/move.html b/src/Umbraco.Web.UI.Client/src/views/media/move.html
index 2aebda195c..d601b34832 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/move.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/move.html
@@ -71,7 +71,7 @@
     </div>
 
     <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="success">
-	    <a class="btn btn-link" ng-click="close()" ng-show="!busy"><localize key="general_cancel">Cancel</localize></a>
+	    <button type="button" class="btn btn-link" ng-click="close()" ng-show="!busy"><localize key="general_cancel">Cancel</localize></button>
 	    <button class="btn btn-primary" ng-click="move()" ng-disabled="busy || !target"><localize key="actions_move">Move</localize></button>
     </div>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/restore.html b/src/Umbraco.Web.UI.Client/src/views/media/restore.html
index 6022caa251..ef53777c2b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/restore.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/restore.html
@@ -76,12 +76,12 @@
     </div>
 
     <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="loading || moving || success">
-        <a class="btn btn-link" ng-click="close()"><localize key="general_cancel">Cancel</localize></a>
+        <button type="button" class="btn btn-link" ng-click="close()"><localize key="general_cancel">Cancel</localize></button>
         <button class="btn btn-primary" ng-click="restore()" ng-show="error == null"><localize key="actions_restore">Restore</localize></button>
     </div>
 
     <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="loading || !moving || success">
-        <a class="btn btn-link" ng-click="close()"><localize key="general_cancel">Cancel</localize></a>
+        <button type="button" class="btn btn-link" ng-click="close()"><localize key="general_cancel">Cancel</localize></button>
         <button class="btn btn-primary" ng-click="restore()" ng-show="error == null" ng-disabled="!target"><localize key="actions_move">Move</localize></button>
     </div>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/copy.html b/src/Umbraco.Web.UI.Client/src/views/mediatypes/copy.html
index 05075ecbec..5e7b9c6669 100644
--- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/copy.html
+++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/copy.html
@@ -45,9 +45,9 @@
     </div>
 
     <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="success">
-        <a class="btn btn-link" ng-click="close()" ng-show="!busy">
+        <button type="button" class="btn btn-link" ng-click="close()" ng-show="!busy">
             <localize key="general_cancel">Cancel</localize>
-        </a>
+        </button>
         <button class="btn btn-primary" ng-click="copy()" ng-disabled="busy || !target">
             <localize key="actions_copy">Copy</localize>
         </button>
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/move.html b/src/Umbraco.Web.UI.Client/src/views/mediatypes/move.html
index 01d5ade7b1..0e02c7ad0e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/move.html
+++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/move.html
@@ -45,9 +45,9 @@
     </div>
 
     <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="success">
-        <a class="btn btn-link" ng-click="close()" ng-show="!busy">
+        <button type="button" class="btn btn-link" ng-click="close()" ng-show="!busy">
             <localize key="general_cancel">Cancel</localize>
-        </a>
+        </button>
         <button class="btn btn-primary" ng-click="move()" ng-disabled="busy || !target">
             <localize key="actions_move">Move</localize>
         </button>

From 8d0df6cec39bda3ae4d8d440132a86a60c8d4303 Mon Sep 17 00:00:00 2001
From: Jan Skovgaard <jaskov@gmail.com>
Date: Wed, 14 Aug 2019 17:21:56 +0200
Subject: [PATCH 313/776] =?UTF-8?q?Accessibility:=20Open=20User=20Details?=
 =?UTF-8?q?=20-=20Back=20icon=20arrow=20is=20identifie=E2=80=A6=20(#5970)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Umbraco.Web.UI.Client/src/less/components/editor.less  | 7 +++++--
 .../views/components/editor/umb-editor-content-header.html | 5 +++--
 .../src/views/components/editor/umb-editor-header.html     | 5 +++--
 src/Umbraco.Web.UI/Umbraco/config/lang/da.xml              | 3 +++
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml              | 5 ++++-
 src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml           | 3 +++
 6 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor.less b/src/Umbraco.Web.UI.Client/src/less/components/editor.less
index 52dd7ea678..2a1d047ca1 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/editor.less
@@ -74,8 +74,11 @@
 }
 
 .umb-editor-header__back {
-	color: @gray-6;
-    margin-bottom: 1px;
+    background: transparent;
+    border: 0;
+    color: @gray-6;
+    margin: 0 0 1px 0;
+    padding: 0;
 	transition: color 0.1s ease-in-out;
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
index ba6714987c..6856daf42b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
@@ -3,9 +3,10 @@
     <div class="flex items-center" style="height: 100%;">
 
         <div ng-if="showBackButton === true && splitViewOpen !== true" style="margin-right: 15px;">
-            <a class="umb-editor-header__back" href="#" ng-click="goBack()" prevent-default>
+            <button type="button" class="umb-editor-header__back" ng-click="goBack()" prevent-default>
                 <i class="fa fa-arrow-left" aria-hidden="true"></i>
-            </a>
+                <span class="sr-only"><localize key="visuallyHiddenTexts_goBack">Go back</localize></span>
+            </button>
         </div>
 
         <div class="flex items-center" style="flex: 1;">
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
index cc2ef0f2fa..aca27da7be 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
@@ -3,9 +3,10 @@
     <div class="flex items-center" style="height: 100%;">
 
         <div ng-if="showBackButton === true && splitViewOpen !== true" style="margin-right: 15px;">
-            <a class="umb-editor-header__back" href="#" ng-click="goBack()" prevent-default>
+            <button type="button" class="umb-editor-header__back" ng-click="goBack()" prevent-default>
                 <i class="fa fa-arrow-left" aria-hidden="true"></i>
-            </a>
+                <span class="sr-only"><localize key="visuallyHiddenTexts_goBack">Go back</localize></span>
+            </button>
         </div>
 
         <div class="flex items-center" style="flex: 1;">
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index c200f1f35e..614e5f8e8e 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -1610,4 +1610,7 @@ Mange hilsner fra Umbraco robotten
     <key alias="memberIntro">Kom godt i gang</key>
     <key alias="formsInstall">Installer Umbraco Forms</key>
   </area>
+  <area alias="visuallyHiddenTexts">
+    <key alias="goBack">Gå tilbage</key>
+  </area>
 </language>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index f3e8ba135b..b9351e324f 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -2127,5 +2127,8 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="settingsProfiler">Profiling</key>
     <key alias="memberIntro">Getting Started</key>
     <key alias="formsInstall">Install Umbraco Forms</key>
-  </area>>
+  </area>
+  <area alias="visuallyHiddenTexts">
+    <key alias="goBack">Go back</key>
+  </area>
 </language>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index a171d00d32..5f2b1eccf3 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -2142,4 +2142,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="memberIntro">Getting Started</key>
     <key alias="formsInstall">Install Umbraco Forms</key>
   </area>
+  <area alias="visuallyHiddenTexts">
+    <key alias="goBack">Go back</key>
+  </area>
 </language>

From 6bd647f8c6e0cec64281d53b2d7fe4610475bca0 Mon Sep 17 00:00:00 2001
From: Jan Skovgaard <jaskov@gmail.com>
Date: Wed, 14 Aug 2019 17:29:26 +0200
Subject: [PATCH 314/776] =?UTF-8?q?Accessibility:=20Unable=20to=20navigate?=
 =?UTF-8?q?=20to=20close=20'X'=20icon=20with=20keyboa=E2=80=A6=20(#5964)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/application/umb-tour.html      | 22 ++++++++++---------
 .../application/umbtour/umb-tour-step.html    |  8 +++++--
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-tour.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-tour.html
index b756d23b50..5410d453c4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-tour.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-tour.html
@@ -4,22 +4,22 @@
     <div class="umb-tour__pulse"></div>
 
     <div class="umb-tour__popover shadow-depth-2" ng-class="{'umb-tour__popover--l': model.currentStep.type === 'intro' || model.currentStepIndex === model.steps.length}">
-        
+
         <div ng-if="!configuredView && !elementNotFound">
 
             <!-- Regular steps -->
             <umb-tour-step ng-if="model.currentStepIndex < model.steps.length" on-close="model.endTour()">
-                    
+
                 <umb-tour-step-header
                     title="model.currentStep.title">
                 </umb-tour-step-header>
-    
+
                 <umb-tour-step-content
                     content="model.currentStep.content">
                 </umb-tour-step-content>
-    
+
                 <umb-tour-step-footer>
-                    
+
                     <div class="flex justify-between items-center">
 
                         <div>
@@ -27,9 +27,11 @@
                                 current-step="model.currentStepIndex + 1"
                                 total-steps="model.steps.length">
                             </umb-tour-step-counter>
-                            <div ng-if="model.allowDisable && model.currentStep.type === 'intro'" style="font-size: 13px;"><a href="" class="underline" ng-click="model.disableTour()">Don't show this tour again</a></div>
+                            <div ng-if="model.allowDisable && model.currentStep.type === 'intro'">
+                                <button type="button" class="underline" ng-click="model.disableTour()" style="font-size: 13px; background: transparent; border: none; padding: 0;" prevent-default>Don't show this tour again</button>
+                            </div>
                         </div>
-                        
+
                         <div ng-if="model.currentStep.type !== 'intro'">
                             <umb-button size="xs" ng-if="!model.currentStep.event" button-style="action" type="button" action="model.nextStep()" label="Next"></umb-button>
                         </div>
@@ -40,7 +42,7 @@
                     </div>
 
                 </umb-tour-step-footer>
-        
+
             </umb-tour-step>
 
             <!-- Outro step -->
@@ -64,7 +66,7 @@
 
         <!-- Custom step view -->
         <div ng-if="configuredView && !loadingStep && !elementNotFound" ng-include="configuredView"></div>
-        
+
         <!-- Dom element not found error -->
         <div ng-if="elementNotFound && !loadingStep">
             <umb-tour-step class="tc">
@@ -83,4 +85,4 @@
 
     </div>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umbtour/umb-tour-step.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umbtour/umb-tour-step.html
index 4180477c04..a2caff4ff2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umbtour/umb-tour-step.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umbtour/umb-tour-step.html
@@ -2,9 +2,13 @@
 
 
     <div ng-if="hideClose !== true">
-        <button class="icon-wrong umb-tour-step__close" ng-click="close()"></button>
+        <button class="icon-wrong umb-tour-step__close" ng-click="close()">
+            <span class="sr-only">
+                <localize key="general_close">Close</localize>
+            </span>
+        </button>
     </div>
 
     <div ng-transclude></div>
 
-</div>
\ No newline at end of file
+</div>

From fe6df58e664599aa7b47cffa16dc6f9c799585fb Mon Sep 17 00:00:00 2001
From: Jan Skovgaard <jaskov@gmail.com>
Date: Wed, 14 Aug 2019 17:40:52 +0200
Subject: [PATCH 315/776] =?UTF-8?q?Accessibility:=20Media=20uploader=20wid?=
 =?UTF-8?q?get=20can't=20be=20accessed=20via=20keyb=E2=80=A6=20(#5944)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/less/components/umb-file-dropzone.less     |  9 ++++++++-
 .../views/components/upload/umb-file-dropzone.html | 14 +++++++++-----
 src/Umbraco.Web.UI/Umbraco/config/lang/da.xml      |  1 +
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml      |  1 +
 src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml   |  1 +
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-file-dropzone.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-file-dropzone.less
index 5071091fcc..b5d8c3cced 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-file-dropzone.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-file-dropzone.less
@@ -14,15 +14,18 @@
     margin: 0 0 20px 0;
     position: relative;
     transition: height 0.8s;
+
     .illustration {
       width: 300px;
     }
+
     &.is-small {
       height: 100px;
       .illustration {
         width: 200px;
       }
     }
+    
     &.drag-over {
       border: 1px dashed @gray-1;
     }
@@ -35,15 +38,19 @@
     top: 50%;
     left: 50%;
     transform: translate(-50%,-50%);
+    display: flex;
+    flex-direction: column;
   }
 
 
   // file select link
   .file-select {
+    background: transparent;
+    border: 0;
+    padding: 0;
     font-size: 15px;
     color: @ui-action-discreet-type;
     cursor: pointer;
-
     margin-top: 10px;
 
     &:hover {
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html b/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html
index a379a05829..1a0086e836 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html
@@ -17,13 +17,17 @@
 
 
         <div class="content" >
-
+            <p>
+                <localize key="media_dragAndDropYourFilesIntoTheArea">Drag and drop your file(s) into the area</localize>
+            </p>
             <!-- Drag and drop illustration -->
             <img class="illustration" src="assets/img/uploader/upload-illustration.svg" alt="" draggable="false" />
 
 
             <!-- Select files -->
-            <div 
+            <button
+                 type="button"
+                 prevent-default
                  data-element="button-uploadMedia"
                  class="file-select"
                  ngf-select
@@ -32,8 +36,8 @@
                  ngf-multiple="true"
                  ngf-pattern="{{ accept }}"
                  ngf-max-size="{{ maxFileSize }}">
-                - <localize key="media_orClickHereToUpload">or click here to choose files</localize>
-            </div>
+                 -&nbsp;<localize key="media_orClickHereToUpload">or click here to choose files</localize>
+            </button>
         </div>
     </div>
 
@@ -104,7 +108,7 @@
 		ng-if="mediatypepickerOverlay.show"
 		model="mediatypepickerOverlay"
         view="mediatypepickerOverlay.view"
-		position="right">        
+		position="right">
 </umb-overlay>
 
 </div>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index 614e5f8e8e..1946965c69 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -308,6 +308,7 @@
     <key alias="copyFailed">Kopiering af mediet fejlede</key>
     <key alias="createFolderFailed">Oprettelse af mappen under parent med id %0% fejlede</key>
     <key alias="renameFolderFailed">Omdøbning af mappen med id %0% fejlede</key>
+    <key alias="dragAndDropYourFilesIntoTheArea">Træk og slip dine filer ind i dropzonen</key>
   </area>
   <area alias="member">
     <key alias="createNewMember">Opret et nyt medlem</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index b9351e324f..2e40958e92 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -317,6 +317,7 @@
     <key alias="copyFailed">Failed to copy media</key>
     <key alias="createFolderFailed">Failed to create a folder under parent id %0%</key>
     <key alias="renameFolderFailed">Failed to rename the folder with id %0%</key>
+    <key alias="dragAndDropYourFilesIntoTheArea">Drag and drop your file(s) into the area</key>
   </area>
   <area alias="member">
     <key alias="createNewMember">Create a new member</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index 5f2b1eccf3..043ca2fb7e 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -322,6 +322,7 @@
     <key alias="copyFailed">Failed to copy media</key>
     <key alias="createFolderFailed">Failed to create a folder under parent id %0%</key>
     <key alias="renameFolderFailed">Failed to rename the folder with id %0%</key>
+    <key alias="dragAndDropYourFilesIntoTheArea">Drag and drop your file(s) into the area</key>
   </area>
   <area alias="member">
     <key alias="createNewMember">Create a new member</key>

From 617fd9ab17c9b18794aa1f293b22548869da7939 Mon Sep 17 00:00:00 2001
From: Jan Skovgaard <jaskov@gmail.com>
Date: Wed, 14 Aug 2019 17:47:13 +0200
Subject: [PATCH 316/776] =?UTF-8?q?Accessibility:=20Open=20Package=20-=20I?=
 =?UTF-8?q?dentifies=20back=20button=20as=20"Left=20h=E2=80=A6=20(#5930)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/less/components/umb-packages.less              |  8 ++++++--
 .../views/dashboard/settings/examinemanagement.html    |  4 ++--
 .../src/views/packages/views/install-local.html        | 10 +++++-----
 .../src/views/packages/views/installed.html            |  2 +-
 .../src/views/packages/views/repo.html                 |  6 +++---
 .../src/views/users/views/users/users.html             |  6 +++---
 6 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less
index f704dd48e2..16457787a3 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less
@@ -264,12 +264,16 @@
     flex-flow: row wrap;
 }
 
-a.umb-package-details__back-link {
+.umb-package-details__back-action {
     font-weight: bold;
     color: @black;
+    padding: 0;
+    border: 0;
+    background-color: transparent;
 }
 
-.umb-package-details__back-link:hover {
+.umb-package-details__back-action:focus,
+.umb-package-details__back-action:hover {
     color: @gray-4;
     text-decoration: none;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.html
index 6a7e65f7ae..6b7e3f4519 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.html
@@ -89,7 +89,7 @@
 
             <umb-editor-sub-header>
                 <umb-editor-sub-header-content-left>
-                    <a class="umb-panel-back-link" href="" ng-click="vm.setViewState('list');">&larr; Back to overview</a>
+                        <button type="button" class="umb-package-details__back-action" ng-click="vm.setViewState('list');"><span aria-hidden="true">&larr;</span> <localize key="general_backToOverview">Back to overview</localize></button>
                 </umb-editor-sub-header-content-left>
             </umb-editor-sub-header>
 
@@ -198,7 +198,7 @@
 
             <umb-editor-sub-header>
                 <umb-editor-sub-header-content-left>
-                    <a class="umb-panel-back-link" href="" ng-click="vm.setViewState('list');">&larr; <localize key="general_backToOverview">Back to overview</localize></a>
+                    <button type="button" class="umb-package-details__back-action" ng-click="vm.setViewState('list');"><span aria-hidden="true">&larr;</span> <localize key="general_backToOverview">Back to overview</localize></button>
                 </umb-editor-sub-header-content-left>
             </umb-editor-sub-header>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/views/install-local.html b/src/Umbraco.Web.UI.Client/src/views/packages/views/install-local.html
index dae57467c6..e22cfd14ab 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packages/views/install-local.html
+++ b/src/Umbraco.Web.UI.Client/src/views/packages/views/install-local.html
@@ -36,9 +36,9 @@
                              ngf-max-size="{{ maxFileSize }}">
                             - <localize key="packager_orClickHereToUpload">or click here to choose files</localize>
                         </div>
-                        
+
                     </div>
-                    
+
                 </div>
 
                 <h3><strong><localize key="packager_uploadPackage">Upload package</localize></strong></h3>
@@ -54,7 +54,7 @@
 
         <umb-editor-sub-header>
             <umb-editor-sub-header-content-left>
-                <a class="umb-package-details__back-link" href="" ng-click="vm.state = 'upload'">&larr; <localize key="packager_uploadAnother">Upload another package</localize></a>
+                <button type="button" class="umb-package-details__back-action" ng-click="vm.state = 'upload'" prevent-default><span aria-hidden="true">&larr;</span> <localize key="packager_uploadAnother">Upload another package</localize></button>
             </umb-editor-sub-header-content-left>
         </umb-editor-sub-header>
 
@@ -76,7 +76,7 @@
                         <div class="umb-info-local-item text-error mt3" ng-if="vm.zipFile.uploadStatus === 'error'">
                             {{ vm.zipFile.serverErrorMessage }}
                         </div>
-                        
+
                     </div>
                 </div>
             </div>
@@ -89,7 +89,7 @@
 
         <umb-editor-sub-header>
             <umb-editor-sub-header-content-left>
-                <a class="umb-package-details__back-link" href="" ng-click="vm.state = 'upload'">&larr; <localize key="packager_cancelAndUploadAnother">Cancel and upload another package</localize></a>
+                <button type="button" class="umb-package-details__back-action" href="" ng-click="vm.state = 'upload'" prevent-default><span aria-hidden="true">&larr;</span> <localize key="packager_cancelAndUploadAnother">Cancel and upload another package</localize></button>
             </umb-editor-sub-header-content-left>
         </umb-editor-sub-header>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/views/installed.html b/src/Umbraco.Web.UI.Client/src/views/packages/views/installed.html
index 1c87eb469a..3668c7f0df 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packages/views/installed.html
+++ b/src/Umbraco.Web.UI.Client/src/views/packages/views/installed.html
@@ -58,7 +58,7 @@
 
         <umb-editor-sub-header>
             <umb-editor-sub-header-content-left>
-                <a class="umb-package-details__back-link" href="" ng-click="vm.state = 'list'">&larr; <localize key="general_back">Back</localize></a>
+                <button type="button" class="umb-package-details__back-action" ng-click="vm.state = 'list'" prevent-default><span aria-hidden="true">&larr;</span> <localize key="general_back">Back</localize></button>
             </umb-editor-sub-header-content-left>
         </umb-editor-sub-header>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html b/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html
index 4767f6fdcc..d0c0c3744c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html
+++ b/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html
@@ -119,7 +119,7 @@
 
         <umb-editor-sub-header>
             <umb-editor-sub-header-content-left>
-                <a class="umb-package-details__back-link" href="" ng-click="vm.setPackageViewState('packageList');">&larr; <localize key="general_back">Back</localize></a>
+                <button type="button" class="umb-package-details__back-action" ng-click="vm.setPackageViewState('packageList');" prevent-default><span aria-hidden="true">&larr;</span> <localize key="general_back">Back</localize></button>
             </umb-editor-sub-header-content-left>
         </umb-editor-sub-header>
 
@@ -185,7 +185,7 @@
                                     img-src="{{ 'https://our.umbraco.org' + vm.package.ownerInfo.ownerAvatar }}">
                                 </umb-avatar>
                                 </div>
-    
+
                                 <div>
                                     <div class="umb-package-details__owner-profile-name">{{ vm.package.ownerInfo.owner }}</div>
                                     <div class="umb-package-details__owner-profile-karma">
@@ -287,7 +287,7 @@
     <div ng-if="vm.packageViewState === 'packageInstall' && vm.loading === false">
         <umb-editor-sub-header>
             <umb-editor-sub-header-content-left>
-                <a class="umb-package-details__back-link" href="" ng-click="vm.setPackageViewState('packageDetails');">&larr; <localize key="general_back">Back</localize></a>
+                <button type="button" class="umb-package-details__back-action" ng-click="vm.setPackageViewState('packageDetails');" prevent-default><span aria-hidden="true">&larr;</span> <localize key="general_back">Back</localize></button>
             </umb-editor-sub-header-content-left>
         </umb-editor-sub-header>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
index 4cab09da60..71df45c28f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
@@ -285,7 +285,7 @@
 
         <umb-editor-sub-header>
             <umb-editor-sub-header-content-left>
-                <a class="umb-package-details__back-link" href="" ng-click="vm.setUsersViewState('overview');">&larr; <localize key="user_backToUsers">Back to users</localize></a>
+                <button type="button" class="umb-package-details__back-action" ng-click="vm.setUsersViewState('overview');"><span aria-hidden="true">&larr;</span> <localize key="user_backToUsers">Back to users</localize></button>
             </umb-editor-sub-header-content-left>
         </umb-editor-sub-header>
 
@@ -408,7 +408,7 @@
 
         <umb-editor-sub-header>
             <umb-editor-sub-header-content-left>
-                <a class="umb-package-details__back-link" href="" ng-click="vm.setUsersViewState('overview');">&larr; <localize key="user_backToUsers">Back to users</localize></a>
+                <button type="button" class="umb-package-details__back-action" ng-click="vm.setUsersViewState('overview');"><span aria-hidden="true">&larr;</span> <localize key="user_backToUsers">Back to users</localize></button>
             </umb-editor-sub-header-content-left>
         </umb-editor-sub-header>
 
@@ -490,7 +490,7 @@
     <div ng-if="vm.usersViewState === 'inviteUserSuccess'">
         <umb-editor-sub-header>
             <umb-editor-sub-header-content-left>
-                <a class="umb-package-details__back-link" href="" ng-click="vm.setUsersViewState('overview');">&larr; <localize key="user_backToUsers">Back to users</localize></a>
+                <button type="button" class="umb-package-details__back-action" ng-click="vm.setUsersViewState('overview');"><span aria-hidden="true">&larr;</span> <localize key="user_backToUsers">Back to users</localize></button>
             </umb-editor-sub-header-content-left>
         </umb-editor-sub-header>
 

From 806d835a9008641c4ee418fdf2ed75a84c17532e Mon Sep 17 00:00:00 2001
From: Steve Megson <steve@megson.org>
Date: Wed, 14 Aug 2019 21:14:48 +0100
Subject: [PATCH 317/776] Handle null and missing grid values in migration

---
 .../V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs      | 4 ++--
 .../PropertyEditors/GridPropertyIndexValueFactory.cs          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs
index 1b6597a660..b68aa23d78 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs
@@ -50,10 +50,10 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_1_0
                         var obj = JsonConvert.DeserializeObject<JObject>(value);
                         var allControls = obj.SelectTokens("$.sections..rows..areas..controls");
 
-                        foreach (var control in allControls.SelectMany(c => c))
+                        foreach (var control in allControls.SelectMany(c => c).OfType<JObject>())
                         {
                             var controlValue = control["value"];
-                            if (controlValue.Type == JTokenType.String)
+                            if (controlValue?.Type == JTokenType.String)
                             {
                                 control["value"] = UpdateMediaUrls(mediaLinkPattern, controlValue.Value<string>());
                             }
diff --git a/src/Umbraco.Web/PropertyEditors/GridPropertyIndexValueFactory.cs b/src/Umbraco.Web/PropertyEditors/GridPropertyIndexValueFactory.cs
index 085d66f3c6..7e47d0dcd6 100644
--- a/src/Umbraco.Web/PropertyEditors/GridPropertyIndexValueFactory.cs
+++ b/src/Umbraco.Web/PropertyEditors/GridPropertyIndexValueFactory.cs
@@ -43,7 +43,7 @@ namespace Umbraco.Web.PropertyEditors
 
                             // TODO: If it's not a string, then it's a json formatted value -
                             // we cannot really index this in a smart way since it could be 'anything'
-                            if (controlVal.Type == JTokenType.String)
+                            if (controlVal?.Type == JTokenType.String)
                             {
                                 var str = controlVal.Value<string>();
                                 str = XmlHelper.CouldItBeXml(str) ? str.StripHtml() : str;

From e9d4b607bb5cd68b2a41adb55a2f411d431b538a Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 15 Aug 2019 19:05:43 +1000
Subject: [PATCH 318/776] Adds POC for fast building of in-memory nucache from
 persisted files

---
 .../PublishedContent/NuCacheChildrenTests.cs  |   2 +-
 .../PublishedContent/NuCacheTests.cs          |   2 +-
 .../Scoping/ScopedNuCacheTests.cs             |   2 +-
 .../ContentTypeServiceVariantsTests.cs        |   2 +-
 .../PublishedCache/NuCache/ContentStore.cs    | 146 +++++++++++++-----
 .../NuCache/PublishedSnapshotService.cs       | 119 ++++++--------
 .../PublishedCache/NuCache/Snap/LinkedNode.cs |   6 +
 7 files changed, 167 insertions(+), 112 deletions(-)

diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
index eb6e7725c0..2eb3c280b2 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
@@ -133,7 +133,7 @@ namespace Umbraco.Tests.PublishedContent
                 null,
                 _snapshotAccessor,
                 _variationAccesor,
-                Mock.Of<ILogger>(),
+                Mock.Of<IProfilingLogger>(),
                 scopeProvider,
                 Mock.Of<IDocumentRepository>(),
                 Mock.Of<IMediaRepository>(),
diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
index 399b0c1342..9f20f42993 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
@@ -178,7 +178,7 @@ namespace Umbraco.Tests.PublishedContent
                 null,
                 new TestPublishedSnapshotAccessor(),
                 _variationAccesor,
-                Mock.Of<ILogger>(),
+                Mock.Of<IProfilingLogger>(),
                 scopeProvider,
                 Mock.Of<IDocumentRepository>(),
                 Mock.Of<IMediaRepository>(),
diff --git a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
index c974fed99e..8c14ce8219 100644
--- a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
@@ -92,7 +92,7 @@ namespace Umbraco.Tests.Scoping
                 null,
                 publishedSnapshotAccessor,
                 Mock.Of<IVariationContextAccessor>(),
-                Logger,
+                ProfilingLogger,
                 ScopeProvider,
                 documentRepository, mediaRepository, memberRepository,
                 DefaultCultureAccessor,
diff --git a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
index 956de186be..a9e7a86bf7 100644
--- a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
+++ b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
@@ -64,7 +64,7 @@ namespace Umbraco.Tests.Services
                 null,
                 publishedSnapshotAccessor,
                 Mock.Of<IVariationContextAccessor>(),
-                Logger,
+                ProfilingLogger,
                 ScopeProvider,
                 documentRepository, mediaRepository, memberRepository,
                 DefaultCultureAccessor,
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
index 8e2cf7bc3c..ec8614f074 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
@@ -392,7 +392,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 var visited = new List<int>();
                 foreach (var kit in kits.Where(x =>
                     refreshedIdsA.Contains(x.ContentTypeId) &&
-                    BuildKit(x)))
+                    BuildKit(x, out _)))
                 {
                     // replacing the node: must preserve the parents
                     var node = GetHead(_contentNodes, kit.Node.Id)?.Value;
@@ -466,10 +466,11 @@ namespace Umbraco.Web.PublishedCache.NuCache
             }
         }
 
-        private bool BuildKit(ContentNodeKit kit)
+        private bool BuildKit(ContentNodeKit kit, out LinkedNode<ContentNode> parent)
         {
             // make sure parent exists
-            if (!ParentExistsLocked(kit))
+            parent = GetParentLink(kit.Node);
+            if (parent == null)
             {
                 _logger.Warn<ContentStore>($"Skip item id={kit.Node.Id}, could not find parent id={kit.Node.ParentContentId}.");
                 return false;
@@ -531,7 +532,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 _contentNodes.TryGetValue(kit.Node.Id, out var link);
                 var existing = link?.Value;
 
-                if (!BuildKit(kit))
+                if (!BuildKit(kit, out var parent))
                     return false;
 
                 // moving?
@@ -549,7 +550,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 if (existing == null)
                 {
                     // new, add to parent
-                    AddNodeLocked(kit.Node);
+                    AddNodeLocked(kit.Node, parent);
                 }
                 else if (moving || existing.SortOrder != kit.Node.SortOrder)
                 {
@@ -581,7 +582,74 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 _root.Value.FirstChildContentId = -1;
         }
 
-        // IMPORTANT kits must be sorted out by LEVEL
+        /// <summary>
+        /// Builds all kits without any sorting or generation checks
+        /// </summary>
+        /// <param name="kits"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// This requires that the collection is sorted by Level + Sort Order.
+        /// This should be used only on a site startup as the first generations.
+        /// </remarks>
+        internal bool SetAllFastSorted(IEnumerable<ContentNodeKit> kits)
+        {
+            var lockInfo = new WriteLockInfo();
+            var ok = true;
+            try
+            {
+                Lock(lockInfo);
+
+                ClearLocked(_contentNodes);
+                ClearRootLocked();
+
+                //these are ordered by level + sort order
+
+                // The name of the game here is to populate each kit's
+                //  FirstChildContentId
+                //  NextSiblingContentId
+
+                ContentNode prev = null;
+                var currLevel = 0;
+
+                foreach (var kit in kits)
+                {
+                    if (currLevel != kit.Node.Level)
+                    {
+                        prev = null; //reset since we're on a new level
+                        currLevel = kit.Node.Level;
+                    }   
+
+                    if (!BuildKit(kit, out var parentLink)) 
+                    {
+                        ok = false;
+                        continue; // skip that one
+                    }
+
+                    _logger.Debug<ContentStore>($"Set {kit.Node.Id} with parent {kit.Node.ParentContentId}");
+                    SetValueLocked(_contentNodes, kit.Node.Id, kit.Node);
+
+                    //if the parent's FirstChildContentId isn't set, then it must be the current one
+                    if (parentLink.Value.FirstChildContentId < 0)
+                        parentLink.Value.FirstChildContentId = kit.Node.Id;
+
+                    //if there is a previous one on the same level then set it's next sibling id to the current oen
+                    if (prev != null)
+                        prev.NextSiblingContentId = kit.Node.Id;
+
+                    //store the prev
+                    prev = kit.Node;
+
+                    _xmap[kit.Node.Uid] = kit.Node.Id;
+                }
+            }
+            finally
+            {
+                Release(lockInfo);
+            }
+
+            return ok;
+        }
+
         public bool SetAll(IEnumerable<ContentNodeKit> kits, bool fromLocalDb = false)
         {
             var lockInfo = new WriteLockInfo();
@@ -599,7 +667,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
                 foreach (var kit in kits)
                 {
-                    if (!BuildKit(kit))
+                    if (!BuildKit(kit, out var parent))
                     {
                         ok = false;
                         continue; // skip that one
@@ -609,7 +677,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
                     // don't refresh _localDb if we are reading from _localDb
                     if (!fromLocalDb && _localDb != null) RegisterChange(kit.Node.Id, kit);
-                    AddNodeLocked(kit.Node);
+                    AddNodeLocked(kit.Node, parent);
 
                     _xmap[kit.Node.Uid] = kit.Node.Id;
                 }
@@ -645,14 +713,14 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 // now add them all back
                 foreach (var kit in kits)
                 {
-                    if (!BuildKit(kit))
+                    if (!BuildKit(kit, out var parent))
                     {
                         ok = false;
                         continue; // skip that one
                     }
                     SetValueLocked(_contentNodes, kit.Node.Id, kit.Node);
                     if (_localDb != null) RegisterChange(kit.Node.Id, kit);
-                    AddNodeLocked(kit.Node);
+                    AddNodeLocked(kit.Node, parent);
 
                     _xmap[kit.Node.Uid] = kit.Node.Id;
                 }
@@ -712,35 +780,49 @@ namespace Umbraco.Web.PublishedCache.NuCache
             var id = content.FirstChildContentId;
             while (id > 0)
             {
-                var link = GetLinkedNode(id, "child");
+                var link = GetRequiredLinkedNode(id, "child");
                 ClearBranchLocked(link.Value);
                 id = link.Value.NextSiblingContentId;
             }
         }
 
-        // gets the link node
-        // throws (panic) if not found, or no value
-        private LinkedNode<ContentNode> GetLinkedNode(int id, string description)
+        /// <summary>
+        /// Gets the link node and if it doesn't exist throw a <see cref="PanicException"/>
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="description"></param>
+        /// <returns></returns>
+        private LinkedNode<ContentNode> GetRequiredLinkedNode(int id, string description)
         {
             if (_contentNodes.TryGetValue(id, out var link) && link.Value != null)
                 return link;
 
-            throw new Exception($"panic: failed to get {description} with id={id}");
+            throw new PanicException($"panic: failed to get {description} with id={id}");
         }
 
         private LinkedNode<ContentNode> GetParentLink(ContentNode content)
         {
-            _contentNodes.TryGetValue(content.ParentContentId, out var link); // else null
-            //if (link == null || link.Value == null)
-            //    throw new Exception("Panic: parent not found.");
+            if (content.ParentContentId < 0) return _root;
+
+            _contentNodes.TryGetValue(content.ParentContentId, out var link);
             return link;
         }
 
+        /// <summary>
+        /// Gets the linked parent node and if it doesn't exist throw a <see cref="PanicException"/>
+        /// </summary>
+        /// <param name="content"></param>
+        /// <returns></returns>
+        private LinkedNode<ContentNode> GetRequiredParentLink(ContentNode content)
+        {
+            return content.ParentContentId < 0 ? _root : GetRequiredLinkedNode(content.ParentContentId, "parent");
+        }
+
         private void RemoveNodeLocked(ContentNode content)
         {
             var parentLink = content.ParentContentId < 0
                 ? _root
-                : GetLinkedNode(content.ParentContentId, "parent");
+                : GetRequiredLinkedNode(content.ParentContentId, "parent");
 
             var parent = parentLink.Value;
 
@@ -757,10 +839,10 @@ namespace Umbraco.Web.PublishedCache.NuCache
             else
             {
                 // iterate children until the previous child
-                var link = GetLinkedNode(parent.FirstChildContentId, "first child");
+                var link = GetRequiredLinkedNode(parent.FirstChildContentId, "first child");
 
                 while (link.Value.NextSiblingContentId != content.Id)
-                    link = GetLinkedNode(link.Value.NextSiblingContentId, "next child");
+                    link = GetRequiredLinkedNode(link.Value.NextSiblingContentId, "next child");
 
                 // clone the previous child and replace next child
                 var prevChild = GenCloneLocked(link);
@@ -768,14 +850,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
             }
         }
 
-        private bool ParentExistsLocked(ContentNodeKit kit)
-        {
-            if (kit.Node.ParentContentId < 0)
-                return true;
-            var link = GetParentLink(kit.Node);
-            return link?.Value != null;
-        }
-
         private bool ParentPublishedLocked(ContentNodeKit kit)
         {
             if (kit.Node.ParentContentId < 0)
@@ -801,11 +875,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
             return node;
         }
 
-        private void AddNodeLocked(ContentNode content)
+        private void AddNodeLocked(ContentNode content, LinkedNode<ContentNode> parentLink = null)
         {
-            var parentLink = content.ParentContentId < 0
-                ? _root
-                : GetLinkedNode(content.ParentContentId, "parent");
+            parentLink = parentLink ?? GetRequiredParentLink(content);
 
             var parent = parentLink.Value;
 
@@ -818,10 +890,11 @@ namespace Umbraco.Web.PublishedCache.NuCache
             }
 
             // get parent's first child
-            var childLink = GetLinkedNode(parent.FirstChildContentId, "first child");
+            var childLink = GetRequiredLinkedNode(parent.FirstChildContentId, "first child");
             var child = childLink.Value;
 
             // if first, clone parent + insert as first child
+            // NOTE: Don't perform this check if loading from local DB since we know it's already sorted
             if (child.SortOrder > content.SortOrder)
             {
                 content.NextSiblingContentId = parent.FirstChildContentId;
@@ -834,10 +907,11 @@ namespace Umbraco.Web.PublishedCache.NuCache
             while (child.NextSiblingContentId > 0)
             {
                 // get next child
-                var nextChildLink = GetLinkedNode(child.NextSiblingContentId, "next child");
+                var nextChildLink = GetRequiredLinkedNode(child.NextSiblingContentId, "next child");
                 var nextChild = nextChildLink.Value;
 
                 // if here, clone previous + append/insert
+                // NOTE: Don't perform this check if loading from local DB since we know it's already sorted
                 if (nextChild.SortOrder > content.SortOrder)
                 {
                     content.NextSiblingContentId = nextChild.Id;
@@ -946,7 +1020,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
             while (id > 0)
             {
-                var link = GetLinkedNode(id, "sibling");
+                var link = GetRequiredLinkedNode(id, "sibling");
                 yield return link.Value;
                 id = link.Value.NextSiblingContentId;
             }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index 6e7916c77f..068d47a004 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -37,7 +37,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
         private readonly IPublishedContentTypeFactory _publishedContentTypeFactory;
         private readonly IScopeProvider _scopeProvider;
         private readonly IDataSource _dataSource;
-        private readonly ILogger _logger;
+        private readonly IProfilingLogger _logger;
         private readonly IDocumentRepository _documentRepository;
         private readonly IMediaRepository _mediaRepository;
         private readonly IMemberRepository _memberRepository;
@@ -71,7 +71,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         public PublishedSnapshotService(PublishedSnapshotServiceOptions options, IMainDom mainDom, IRuntimeState runtime,
             ServiceContext serviceContext, IPublishedContentTypeFactory publishedContentTypeFactory, IdkMap idkMap,
-            IPublishedSnapshotAccessor publishedSnapshotAccessor, IVariationContextAccessor variationContextAccessor, ILogger logger, IScopeProvider scopeProvider,
+            IPublishedSnapshotAccessor publishedSnapshotAccessor, IVariationContextAccessor variationContextAccessor, IProfilingLogger logger, IScopeProvider scopeProvider,
             IDocumentRepository documentRepository, IMediaRepository mediaRepository, IMemberRepository memberRepository,
             IDefaultCultureAccessor defaultCultureAccessor,
             IDataSource dataSource, IGlobalSettings globalSettings,
@@ -314,22 +314,10 @@ namespace Umbraco.Web.PublishedCache.NuCache
         // before I read it? NO! because the WHOLE content tree is read-locked using WithReadLocked.
         // don't panic.
 
-        private void LockAndLoadContent(Action<IScope> action)
-        {
-            // first get a writer, then a scope
-            // if there already is a scope, the writer will attach to it
-            // otherwise, it will only exist here - cheap
-            using (_contentStore.GetScopedWriteLock(_scopeProvider))
-            using (var scope = _scopeProvider.CreateScope())
-            {
-                scope.ReadLock(Constants.Locks.ContentTree);
-                action(scope);
-                scope.Complete();
-            }
-        }
-
         private bool LockAndLoadContent(Func<IScope, bool> action)
         {
+            
+
             // first get a writer, then a scope
             // if there already is a scope, the writer will attach to it
             // otherwise, it will only exist here - cheap
@@ -343,7 +331,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             }
         }
 
-        private void LoadContentFromDatabaseLocked(IScope scope)
+        private bool LoadContentFromDatabaseLocked(IScope scope)
         {
             // locks:
             // contentStore is wlocked (1 thread)
@@ -351,39 +339,38 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
             var contentTypes = _serviceContext.ContentTypeService.GetAll()
                 .Select(x => _publishedContentTypeFactory.CreateContentType(x));
+
             _contentStore.SetAllContentTypes(contentTypes);
 
-            // beware! at that point the cache is inconsistent,
-            // assuming we are going to SetAll content items!
+            using (_logger.TraceDuration<PublishedSnapshotService>("Loading content from database"))
+            {   
+                // beware! at that point the cache is inconsistent,
+                // assuming we are going to SetAll content items!
 
-            _localContentDb?.Clear();
+                _localContentDb?.Clear();
 
-            _logger.Debug<PublishedSnapshotService>("Loading content from database...");
-            var sw = Stopwatch.StartNew();
-            // IMPORTANT GetAllContentSources sorts kits by level
-            var kits = _dataSource.GetAllContentSources(scope);
-            _contentStore.SetAll(kits);
-            sw.Stop();
-            _logger.Debug<PublishedSnapshotService>("Loaded content from database ({Duration}ms)", sw.ElapsedMilliseconds);
+                // IMPORTANT GetAllContentSources sorts kits by level
+                var kits = _dataSource.GetAllContentSources(scope);
+                return _contentStore.SetAll(kits, false);
+            }
         }
 
         private bool LoadContentFromLocalDbLocked(IScope scope)
         {
             var contentTypes = _serviceContext.ContentTypeService.GetAll()
-                .Select(x => _publishedContentTypeFactory.CreateContentType(x));
+                    .Select(x => _publishedContentTypeFactory.CreateContentType(x));
             _contentStore.SetAllContentTypes(contentTypes);
 
-            // beware! at that point the cache is inconsistent,
-            // assuming we are going to SetAll content items!
+            using (_logger.TraceDuration<PublishedSnapshotService>("Loading content from local cache file"))
+            {
+                // beware! at that point the cache is inconsistent,
+                // assuming we are going to SetAll content items!
 
-            _logger.Debug<PublishedSnapshotService>("Loading content from local db...");
-            var sw = Stopwatch.StartNew();
-            var kits = _localContentDb.Select(x => x.Value)
-                .OrderBy(x => x.Node.Level); // IMPORTANT sort by level
-            var ok = _contentStore.SetAll(kits, true);
-            sw.Stop();
-            _logger.Debug<PublishedSnapshotService>("Loaded content from local db ({Duration}ms)", sw.ElapsedMilliseconds);
-            return ok;
+                var kits = _localContentDb.Select(x => x.Value)
+                    .OrderBy(x => x.Node.Level)
+                    .ThenBy(x => x.Node.SortOrder); // IMPORTANT sort by level + order
+                return _contentStore.SetAllFastSorted(kits);
+            }
         }
 
         // keep these around - might be useful
@@ -408,18 +395,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
         //    _contentStore.Set(contentNode);
         //}
 
-        private void LockAndLoadMedia(Action<IScope> action)
-        {
-            // see note in LockAndLoadContent
-            using (_mediaStore.GetScopedWriteLock(_scopeProvider))
-            using (var scope = _scopeProvider.CreateScope())
-            {
-                scope.ReadLock(Constants.Locks.MediaTree);
-                action(scope);
-                scope.Complete();
-            }
-        }
-
         private bool LockAndLoadMedia(Func<IScope, bool> action)
         {
             // see note in LockAndLoadContent
@@ -433,7 +408,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             }
         }
 
-        private void LoadMediaFromDatabaseLocked(IScope scope)
+        private bool LoadMediaFromDatabaseLocked(IScope scope)
         {
             // locks & notes: see content
 
@@ -441,37 +416,37 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 .Select(x => _publishedContentTypeFactory.CreateContentType(x));
             _mediaStore.SetAllContentTypes(mediaTypes);
 
-            // beware! at that point the cache is inconsistent,
-            // assuming we are going to SetAll content items!
+            using (_logger.TraceDuration<PublishedSnapshotService>("Loading media from database"))
+            {
+                // beware! at that point the cache is inconsistent,
+                // assuming we are going to SetAll content items!
 
-            _localMediaDb?.Clear();
+                _localMediaDb?.Clear();
 
-            _logger.Debug<PublishedSnapshotService>("Loading media from database...");
-            var sw = Stopwatch.StartNew();
-            // IMPORTANT GetAllMediaSources sorts kits by level
-            var kits = _dataSource.GetAllMediaSources(scope);
-            _mediaStore.SetAll(kits);
-            sw.Stop();
-            _logger.Debug<PublishedSnapshotService>("Loaded media from database ({Duration}ms)", sw.ElapsedMilliseconds);
+                _logger.Debug<PublishedSnapshotService>("Loading media from database...");
+                // IMPORTANT GetAllMediaSources sorts kits by level
+                var kits = _dataSource.GetAllMediaSources(scope);
+                return _mediaStore.SetAll(kits);
+            }
         }
 
         private bool LoadMediaFromLocalDbLocked(IScope scope)
         {
             var mediaTypes = _serviceContext.MediaTypeService.GetAll()
-                .Select(x => _publishedContentTypeFactory.CreateContentType(x));
+                    .Select(x => _publishedContentTypeFactory.CreateContentType(x));
             _mediaStore.SetAllContentTypes(mediaTypes);
 
-            // beware! at that point the cache is inconsistent,
-            // assuming we are going to SetAll content items!
+            using (_logger.TraceDuration<PublishedSnapshotService>("Loading media from local cache file"))
+            {
+                // beware! at that point the cache is inconsistent,
+                // assuming we are going to SetAll content items!
 
-            _logger.Debug<PublishedSnapshotService>("Loading media from local db...");
-            var sw = Stopwatch.StartNew();
-            var kits = _localMediaDb.Select(x => x.Value)
-                .OrderBy(x => x.Node.Level); // IMPORTANT sort by level
-            var ok = _mediaStore.SetAll(kits, true);
-            sw.Stop();
-            _logger.Debug<PublishedSnapshotService>("Loaded media from local db ({Duration}ms)", sw.ElapsedMilliseconds);
-            return ok;
+                var kits = _localMediaDb.Select(x => x.Value)
+                    .OrderBy(x => x.Node.Level)
+                    .ThenBy(x => x.Node.SortOrder); // IMPORTANT sort by level + order; 
+                return _mediaStore.SetAllFastSorted(kits);
+            }
+             
         }
 
         // keep these around - might be useful
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/Snap/LinkedNode.cs b/src/Umbraco.Web/PublishedCache/NuCache/Snap/LinkedNode.cs
index 78e0ec8d33..d187996df8 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/Snap/LinkedNode.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/Snap/LinkedNode.cs
@@ -1,5 +1,11 @@
 namespace Umbraco.Web.PublishedCache.NuCache.Snap
 {
+    //NOTE: This cannot be struct because it references itself
+
+    /// <summary>
+    /// Used to represent an item in a linked list
+    /// </summary>
+    /// <typeparam name="TValue"></typeparam>
     internal class LinkedNode<TValue>
         where TValue : class
     {

From 3d56e45266c29269f805871aea1bb9ff38f89013 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 15 Aug 2019 19:25:28 +1000
Subject: [PATCH 319/776] Adds notes, cleans up other code

---
 src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs       | 5 ++---
 .../NuCache/DataSource/BTree.ContentNodeKitSerializer.cs     | 3 ++-
 .../PublishedCache/NuCache/PublishedSnapshotService.cs       | 4 +++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
index ec8614f074..dbe354d95b 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
@@ -650,7 +650,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             return ok;
         }
 
-        public bool SetAll(IEnumerable<ContentNodeKit> kits, bool fromLocalDb = false)
+        public bool SetAll(IEnumerable<ContentNodeKit> kits)
         {
             var lockInfo = new WriteLockInfo();
             var ok = true;
@@ -675,8 +675,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     _logger.Debug<ContentStore>($"Set {kit.Node.Id} with parent {kit.Node.ParentContentId}");
                     SetValueLocked(_contentNodes, kit.Node.Id, kit.Node);
 
-                    // don't refresh _localDb if we are reading from _localDb
-                    if (!fromLocalDb && _localDb != null) RegisterChange(kit.Node.Id, kit);
+                    if (_localDb != null) RegisterChange(kit.Node.Id, kit);
                     AddNodeLocked(kit.Node, parent);
 
                     _xmap[kit.Node.Uid] = kit.Node.Id;
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.ContentNodeKitSerializer.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.ContentNodeKitSerializer.cs
index 4303f97d3c..142a2c36db 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.ContentNodeKitSerializer.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.ContentNodeKitSerializer.cs
@@ -41,6 +41,7 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
             PrimitiveSerializer.String.WriteTo(value.Node.Path, stream);
             PrimitiveSerializer.Int32.WriteTo(value.Node.SortOrder, stream);
             PrimitiveSerializer.Int32.WriteTo(value.Node.ParentContentId, stream);
+            //TODO: Why don't we write the FirstChildContentId + NextSiblingContentId? Then we can entirely avoid all overhead when loading on startup?
             PrimitiveSerializer.DateTime.WriteTo(value.Node.CreateDate, stream);
             PrimitiveSerializer.Int32.WriteTo(value.Node.CreatorId, stream);
             PrimitiveSerializer.Int32.WriteTo(value.ContentTypeId, stream);
@@ -54,4 +55,4 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
                 DataSerializer.WriteTo(value.PublishedData, stream);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index 068d47a004..5c6dc3d252 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -350,8 +350,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 _localContentDb?.Clear();
 
                 // IMPORTANT GetAllContentSources sorts kits by level
+                //TODO: We should sort by level + sort order and then we can use SetAllFastSorted
                 var kits = _dataSource.GetAllContentSources(scope);
-                return _contentStore.SetAll(kits, false);
+                return _contentStore.SetAll(kits);
             }
         }
 
@@ -425,6 +426,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
                 _logger.Debug<PublishedSnapshotService>("Loading media from database...");
                 // IMPORTANT GetAllMediaSources sorts kits by level
+                //TODO: We should sort by level + sort order and then we can use SetAllFastSorted
                 var kits = _dataSource.GetAllMediaSources(scope);
                 return _mediaStore.SetAll(kits);
             }

From e7a9ee8142b45de6633a10b923d84e84f0b9d0ef Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Thu, 15 Aug 2019 13:10:17 +0200
Subject: [PATCH 320/776] V8: Support mixed element variance in Nested Content
 (#5952)

---
 .../nestedcontent/nestedcontent.controller.js | 38 +++++++++----------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
index 7ead8974d8..aaf7ed08bb 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -489,32 +489,30 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
             
             node.key = fromNcEntry && fromNcEntry.key ? fromNcEntry.key : String.CreateGuid();
             
-            for (var v = 0; v < node.variants.length; v++) {
-                var variant = node.variants[v];
-                
-                for (var t = 0; t < variant.tabs.length; t++) {
-                    var tab = variant.tabs[t];
+            var variant = node.variants[0];
+
+            for (var t = 0; t < variant.tabs.length; t++) {
+                var tab = variant.tabs[t];
                     
-                    for (var p = 0; p < tab.properties.length; p++) {
-                        var prop = tab.properties[p];
+                for (var p = 0; p < tab.properties.length; p++) {
+                    var prop = tab.properties[p];
                         
-                        prop.propertyAlias = prop.alias;
-                        prop.alias = $scope.model.alias + "___" + prop.alias;
-                        // Force validation to occur server side as this is the
-                        // only way we can have consistency between mandatory and
-                        // regex validation messages. Not ideal, but it works.
-                        prop.validation = {
-                            mandatory: false,
-                            pattern: ""
-                        };
+                    prop.propertyAlias = prop.alias;
+                    prop.alias = $scope.model.alias + "___" + prop.alias;
+                    // Force validation to occur server side as this is the
+                    // only way we can have consistency between mandatory and
+                    // regex validation messages. Not ideal, but it works.
+                    prop.validation = {
+                        mandatory: false,
+                        pattern: ""
+                    };
                         
-                        if (fromNcEntry && fromNcEntry[prop.propertyAlias]) {
-                            prop.value = fromNcEntry[prop.propertyAlias];
-                        }
+                    if (fromNcEntry && fromNcEntry[prop.propertyAlias]) {
+                        prop.value = fromNcEntry[prop.propertyAlias];
                     }
                 }
             }
-            
+
             $scope.nodes.push(node);
 
             return node;

From 7e8364eae48be9bbd3a160c3f3aab03eb374ab1f Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Thu, 15 Aug 2019 13:10:17 +0200
Subject: [PATCH 321/776] V8: Support mixed element variance in Nested Content
 (#5952)

(cherry picked from commit e7a9ee8142b45de6633a10b923d84e84f0b9d0ef)
---
 .../nestedcontent/nestedcontent.controller.js | 38 +++++++++----------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
index 7ead8974d8..aaf7ed08bb 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -489,32 +489,30 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
             
             node.key = fromNcEntry && fromNcEntry.key ? fromNcEntry.key : String.CreateGuid();
             
-            for (var v = 0; v < node.variants.length; v++) {
-                var variant = node.variants[v];
-                
-                for (var t = 0; t < variant.tabs.length; t++) {
-                    var tab = variant.tabs[t];
+            var variant = node.variants[0];
+
+            for (var t = 0; t < variant.tabs.length; t++) {
+                var tab = variant.tabs[t];
                     
-                    for (var p = 0; p < tab.properties.length; p++) {
-                        var prop = tab.properties[p];
+                for (var p = 0; p < tab.properties.length; p++) {
+                    var prop = tab.properties[p];
                         
-                        prop.propertyAlias = prop.alias;
-                        prop.alias = $scope.model.alias + "___" + prop.alias;
-                        // Force validation to occur server side as this is the
-                        // only way we can have consistency between mandatory and
-                        // regex validation messages. Not ideal, but it works.
-                        prop.validation = {
-                            mandatory: false,
-                            pattern: ""
-                        };
+                    prop.propertyAlias = prop.alias;
+                    prop.alias = $scope.model.alias + "___" + prop.alias;
+                    // Force validation to occur server side as this is the
+                    // only way we can have consistency between mandatory and
+                    // regex validation messages. Not ideal, but it works.
+                    prop.validation = {
+                        mandatory: false,
+                        pattern: ""
+                    };
                         
-                        if (fromNcEntry && fromNcEntry[prop.propertyAlias]) {
-                            prop.value = fromNcEntry[prop.propertyAlias];
-                        }
+                    if (fromNcEntry && fromNcEntry[prop.propertyAlias]) {
+                        prop.value = fromNcEntry[prop.propertyAlias];
                     }
                 }
             }
-            
+
             $scope.nodes.push(node);
 
             return node;

From a0af474c757a48d6680ff005aa2e54f4090dadd2 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 15 Aug 2019 13:29:14 +0200
Subject: [PATCH 322/776] Bump version to 8.1.3

---
 src/SolutionInfo.cs                      | 4 ++--
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index 5feffc0b57..2da07d523f 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -18,5 +18,5 @@ using System.Resources;
 [assembly: AssemblyVersion("8.0.0")]
 
 // these are FYI and changed automatically
-[assembly: AssemblyFileVersion("8.1.2")]
-[assembly: AssemblyInformationalVersion("8.1.2")]
+[assembly: AssemblyFileVersion("8.1.3")]
+[assembly: AssemblyInformationalVersion("8.1.3")]
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index b5d908f32e..fada1cf9c4 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -345,9 +345,9 @@
         <WebProjectProperties>
           <UseIIS>False</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>8120</DevelopmentServerPort>
+          <DevelopmentServerPort>8130</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:8120</IISUrl>
+          <IISUrl>http://localhost:8130</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

From 8e2eccb3925f0f6d19322a09d314d87263c31e30 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 15 Aug 2019 13:32:09 +0200
Subject: [PATCH 323/776] Bump version to 7.15.2

---
 src/SolutionInfo.cs                              | 4 ++--
 src/Umbraco.Core/Configuration/UmbracoVersion.cs | 2 +-
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj         | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index 3a85915cf5..ffaec90fa7 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -11,5 +11,5 @@ using System.Resources;
 
 [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyFileVersion("7.15.1")]
-[assembly: AssemblyInformationalVersion("7.15.1")]
+[assembly: AssemblyFileVersion("7.15.2")]
+[assembly: AssemblyInformationalVersion("7.15.2")]
diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
index f23078dbd0..b02e199313 100644
--- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
@@ -6,7 +6,7 @@ namespace Umbraco.Core.Configuration
 {
     public class UmbracoVersion
     {
-        private static readonly Version Version = new Version("7.15.1");
+        private static readonly Version Version = new Version("7.15.2");
 
         /// <summary>
         /// Gets the current version of Umbraco.
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 42f607d64e..4eddca0b8d 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -1028,9 +1028,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
         <WebProjectProperties>
           <UseIIS>True</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>7151</DevelopmentServerPort>
+          <DevelopmentServerPort>7152</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:7151</IISUrl>
+          <IISUrl>http://localhost:7152</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

From bbd6e1150e5b65a4c7a718917225eda437f67705 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 15 Aug 2019 23:59:46 +1000
Subject: [PATCH 324/776] Changes loading from DB to use SetAllFastSorted since
 it's already sorted by level + sort order

---
 .../PublishedCache/NuCache/DataSource/IDataSource.cs |  4 ++--
 .../NuCache/PublishedSnapshotService.cs              | 12 +++++-------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/IDataSource.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/IDataSource.cs
index d4702cf7aa..941c7d0caa 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/IDataSource.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/IDataSource.cs
@@ -9,12 +9,12 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
     internal interface IDataSource
     {
         ContentNodeKit GetContentSource(IScope scope, int id);
-        IEnumerable<ContentNodeKit> GetAllContentSources(IScope scope); // must order by level
+        IEnumerable<ContentNodeKit> GetAllContentSources(IScope scope); // must order by level, sortOrder
         IEnumerable<ContentNodeKit> GetBranchContentSources(IScope scope, int id); // must order by level, sortOrder
         IEnumerable<ContentNodeKit> GetTypeContentSources(IScope scope, IEnumerable<int> ids);
 
         ContentNodeKit GetMediaSource(IScope scope, int id);
-        IEnumerable<ContentNodeKit> GetAllMediaSources(IScope scope); // must order by level
+        IEnumerable<ContentNodeKit> GetAllMediaSources(IScope scope); // must order by level, sortOrder
         IEnumerable<ContentNodeKit> GetBranchMediaSources(IScope scope, int id); // must order by level, sortOrder
         IEnumerable<ContentNodeKit> GetTypeMediaSources(IScope scope, IEnumerable<int> ids);
     }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index 5c6dc3d252..5a7ae9e899 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -349,10 +349,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
                 _localContentDb?.Clear();
 
-                // IMPORTANT GetAllContentSources sorts kits by level
-                //TODO: We should sort by level + sort order and then we can use SetAllFastSorted
+                // IMPORTANT GetAllContentSources sorts kits by level + sortOrder
                 var kits = _dataSource.GetAllContentSources(scope);
-                return _contentStore.SetAll(kits);
+                return _contentStore.SetAllFastSorted(kits);
             }
         }
 
@@ -369,7 +368,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
                 var kits = _localContentDb.Select(x => x.Value)
                     .OrderBy(x => x.Node.Level)
-                    .ThenBy(x => x.Node.SortOrder); // IMPORTANT sort by level + order
+                    .ThenBy(x => x.Node.SortOrder); // IMPORTANT sort by level + sortOrder
                 return _contentStore.SetAllFastSorted(kits);
             }
         }
@@ -425,10 +424,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 _localMediaDb?.Clear();
 
                 _logger.Debug<PublishedSnapshotService>("Loading media from database...");
-                // IMPORTANT GetAllMediaSources sorts kits by level
-                //TODO: We should sort by level + sort order and then we can use SetAllFastSorted
+                // IMPORTANT GetAllMediaSources sorts kits by level + sortOrder
                 var kits = _dataSource.GetAllMediaSources(scope);
-                return _mediaStore.SetAll(kits);
+                return _mediaStore.SetAllFastSorted(kits);
             }
         }
 

From 3087eff147c12c73220515df53f0a264c489fc79 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Wed, 14 Aug 2019 21:25:02 +0200
Subject: [PATCH 325/776] Don't reuse previously used content templates

---
 .../src/views/content/content.create.controller.js           | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.create.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.create.controller.js
index f906369926..1413965a19 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.create.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.create.controller.js
@@ -51,7 +51,10 @@ function contentCreateController($scope,
             .search("create", "true")
             /* when we create a new node we want to make sure it uses the same 
             language as what is selected in the tree */
-            .search("cculture", mainCulture);
+            .search("cculture", mainCulture)
+            /* when we create a new node we must make sure that any previously 
+            used blueprint is reset */
+            .search("blueprintId", null);
         close();
     }
 

From 455395154a569acc7a4c0c1f04d2f8849eae8a67 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Wed, 14 Aug 2019 21:25:02 +0200
Subject: [PATCH 326/776] Don't reuse previously used content templates

(cherry picked from commit 3087eff147c12c73220515df53f0a264c489fc79)
---
 .../src/views/content/content.create.controller.js           | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.create.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.create.controller.js
index f906369926..1413965a19 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.create.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.create.controller.js
@@ -51,7 +51,10 @@ function contentCreateController($scope,
             .search("create", "true")
             /* when we create a new node we want to make sure it uses the same 
             language as what is selected in the tree */
-            .search("cculture", mainCulture);
+            .search("cculture", mainCulture)
+            /* when we create a new node we must make sure that any previously 
+            used blueprint is reset */
+            .search("blueprintId", null);
         close();
     }
 

From f1f9e1742ebf529e18e9f87c22581195c95a4760 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Wed, 14 Aug 2019 08:50:25 +0200
Subject: [PATCH 327/776] Use an Umbraco confirm dialog when deleting groups

---
 .../users/views/groups/groups.controller.js   | 34 ++++++++++++-------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.controller.js
index 9c476103a5..1e51d4585e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.controller.js
@@ -2,7 +2,7 @@
     "use strict";
 
     function UserGroupsController($scope, $timeout, $location, $filter, userService, userGroupsResource, 
-        formHelper, localizationService, listViewHelper) {
+        formHelper, localizationService, listViewHelper, overlayService) {
 
         var vm = this;
 
@@ -95,18 +95,26 @@
 
             if(vm.selection.length > 0) {
 
-                localizationService.localize("defaultdialogs_confirmdelete")
-                    .then(function(value) {
-
-                        var confirmResponse = confirm(value);
-
-                        if (confirmResponse === true) {
-                            userGroupsResource.deleteUserGroups(_.pluck(vm.selection, "id")).then(function (data) {
-                                clearSelection();
-                                onInit();
-                            }, angular.noop);
-                        }
-
+                localizationService.localizeMany(["general_delete", "defaultdialogs_confirmdelete", "general_cancel", "contentTypeEditor_yesDelete"])
+                    .then(function (data) {
+                        const overlay = {
+                            title: data[0],
+                            content: data[1] + "?",
+                            closeButtonLabel: data[2],
+                            submitButtonLabel: data[3],
+                            submitButtonStyle: "danger",
+                            close: function () {
+                                overlayService.close();
+                            },
+                            submit: function () {
+                                userGroupsResource.deleteUserGroups(_.pluck(vm.selection, "id")).then(function (data) {
+                                    clearSelection();
+                                    onInit();
+                                }, angular.noop);
+                                overlayService.close();
+                            }
+                        };
+                        overlayService.open(overlay);
                     });
 
             }

From f8409be50673615f015f63efbe9e1b6962a40328 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Wed, 14 Aug 2019 08:50:25 +0200
Subject: [PATCH 328/776] Use an Umbraco confirm dialog when deleting groups

(cherry picked from commit f1f9e1742ebf529e18e9f87c22581195c95a4760)
---
 .../users/views/groups/groups.controller.js   | 34 ++++++++++++-------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.controller.js
index 9c476103a5..1e51d4585e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.controller.js
@@ -2,7 +2,7 @@
     "use strict";
 
     function UserGroupsController($scope, $timeout, $location, $filter, userService, userGroupsResource, 
-        formHelper, localizationService, listViewHelper) {
+        formHelper, localizationService, listViewHelper, overlayService) {
 
         var vm = this;
 
@@ -95,18 +95,26 @@
 
             if(vm.selection.length > 0) {
 
-                localizationService.localize("defaultdialogs_confirmdelete")
-                    .then(function(value) {
-
-                        var confirmResponse = confirm(value);
-
-                        if (confirmResponse === true) {
-                            userGroupsResource.deleteUserGroups(_.pluck(vm.selection, "id")).then(function (data) {
-                                clearSelection();
-                                onInit();
-                            }, angular.noop);
-                        }
-
+                localizationService.localizeMany(["general_delete", "defaultdialogs_confirmdelete", "general_cancel", "contentTypeEditor_yesDelete"])
+                    .then(function (data) {
+                        const overlay = {
+                            title: data[0],
+                            content: data[1] + "?",
+                            closeButtonLabel: data[2],
+                            submitButtonLabel: data[3],
+                            submitButtonStyle: "danger",
+                            close: function () {
+                                overlayService.close();
+                            },
+                            submit: function () {
+                                userGroupsResource.deleteUserGroups(_.pluck(vm.selection, "id")).then(function (data) {
+                                    clearSelection();
+                                    onInit();
+                                }, angular.noop);
+                                overlayService.close();
+                            }
+                        };
+                        overlayService.open(overlay);
                     });
 
             }

From 4743fc0e1d4b76cbf19aa1af3f858ad2bb65e61b Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Tue, 13 Aug 2019 21:14:28 +0200
Subject: [PATCH 329/776] Don't change parent protection when editing child
 protection

---
 src/Umbraco.Web/Editors/ContentController.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs
index 4e420206d3..9d5af028e3 100644
--- a/src/Umbraco.Web/Editors/ContentController.cs
+++ b/src/Umbraco.Web/Editors/ContentController.cs
@@ -2297,7 +2297,7 @@ namespace Umbraco.Web.Editors
             }
 
             var entry = Services.PublicAccessService.GetEntryForContent(content);
-            if (entry == null)
+            if (entry == null || entry.ProtectedNodeId != content.Id)
             {
                 return Request.CreateResponse(HttpStatusCode.OK);
             }
@@ -2379,7 +2379,7 @@ namespace Umbraco.Web.Editors
 
             var entry = Services.PublicAccessService.GetEntryForContent(content);
 
-            if (entry == null)
+            if (entry == null || entry.ProtectedNodeId != content.Id)
             {
                 entry = new PublicAccessEntry(content, loginPage, errorPage, new List<PublicAccessRule>());
 

From 16ac2c5589dabf65747b95e7122e58b9a82858d3 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Tue, 13 Aug 2019 21:14:28 +0200
Subject: [PATCH 330/776] Don't change parent protection when editing child
 protection

(cherry picked from commit 4743fc0e1d4b76cbf19aa1af3f858ad2bb65e61b)
---
 src/Umbraco.Web/Editors/ContentController.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs
index 4e420206d3..9d5af028e3 100644
--- a/src/Umbraco.Web/Editors/ContentController.cs
+++ b/src/Umbraco.Web/Editors/ContentController.cs
@@ -2297,7 +2297,7 @@ namespace Umbraco.Web.Editors
             }
 
             var entry = Services.PublicAccessService.GetEntryForContent(content);
-            if (entry == null)
+            if (entry == null || entry.ProtectedNodeId != content.Id)
             {
                 return Request.CreateResponse(HttpStatusCode.OK);
             }
@@ -2379,7 +2379,7 @@ namespace Umbraco.Web.Editors
 
             var entry = Services.PublicAccessService.GetEntryForContent(content);
 
-            if (entry == null)
+            if (entry == null || entry.ProtectedNodeId != content.Id)
             {
                 entry = new PublicAccessEntry(content, loginPage, errorPage, new List<PublicAccessRule>());
 

From 0baf5eab0ac52c32c1c9900beeaad29cb6462d8c Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Thu, 15 Aug 2019 21:09:58 +0200
Subject: [PATCH 331/776] v8: Rename datetime picker component (#6110)

---
 ...tive.js => umbdatetimepicker.directive.js} | 27 ++++++++++---------
 src/Umbraco.Web.UI.Client/src/less/belle.less |  2 +-
 ...atpickr.less => umb-date-time-picker.less} |  2 +-
 .../querybuilder/querybuilder.html            |  4 +--
 .../src/views/content/overlays/schedule.html  | 16 +++++------
 .../src/views/logviewer/overview.html         |  4 +--
 .../datepicker/datepicker.html                |  4 +--
 7 files changed, 30 insertions(+), 29 deletions(-)
 rename src/Umbraco.Web.UI.Client/src/common/directives/components/{umbflatpickr.directive.js => umbdatetimepicker.directive.js} (93%)
 rename src/Umbraco.Web.UI.Client/src/less/components/{umb-flatpickr.less => umb-date-time-picker.less} (90%)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbflatpickr.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbdatetimepicker.directive.js
similarity index 93%
rename from src/Umbraco.Web.UI.Client/src/common/directives/components/umbflatpickr.directive.js
rename to src/Umbraco.Web.UI.Client/src/common/directives/components/umbdatetimepicker.directive.js
index 79b29b407b..899b8f3c23 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbflatpickr.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbdatetimepicker.directive.js
@@ -1,13 +1,13 @@
 /**
 @ngdoc directive
-@name umbraco.directives.directive:umbFlatpickr
+@name umbraco.directives.directive:umbDateTimePicker
 @restrict E
 @scope
 
 @description
 <b>Added in Umbraco version 8.0</b>
 This directive is a wrapper of the flatpickr library. Use it to render a date time picker.
-For extra details about options and events take a look here: https://flatpickr.js.org/
+For extra details about options and events take a look here: https://flatpickr.js.org
 
 Use this directive to render a date time picker
 
@@ -15,11 +15,11 @@ Use this directive to render a date time picker
 <pre>
 	<div ng-controller="My.Controller as vm">
 
-		<umb-flatpickr
+		<umb-date-time-picker
 			ng-model="vm.date"
             options="vm.config"
             on-change="vm.datePickerChange(selectedDates, dateStr, instance)">
-        </umb-flatpickr>
+        </umb-date-time-picker>
 
 	</div>
 </pre>
@@ -70,12 +70,12 @@ Use this directive to render a date time picker
 (function() {
 	'use strict';
 
-	var umbFlatpickr = {
+	var umbDateTimePicker = {
 		template: '<ng-transclude>' +
 			'<input type="text" ng-if="!$ctrl.options.inline" ng-model="$ctrl.ngModel" placeholder="Select Date.."></input>' +
 			'<div ng-if="$ctrl.options.inline"></div>' +
 		'</ng-transclude>',
-		controller: umbFlatpickrCtrl,
+		controller: umbDateTimePickerCtrl,
 		transclude: true,
 		bindings: {
 			ngModel: '<',
@@ -92,9 +92,9 @@ Use this directive to render a date time picker
 		}
     };
     
-	function umbFlatpickrCtrl($element, $timeout, $scope, assetsService, userService) {
+    function umbDateTimePickerCtrl($element, $timeout, $scope, assetsService, userService) {
+
         var ctrl = this;
-        var loaded = false;
         var userLocale = null;
 
 		ctrl.$onInit = function() {
@@ -102,14 +102,14 @@ Use this directive to render a date time picker
             // load css file for the date picker
             assetsService.loadCss('lib/flatpickr/flatpickr.css', $scope).then(function () {
                 userService.getCurrentUser().then(function (user) {
+
                     // init date picker
                     userLocale = user.locale;
                     if (userLocale.indexOf('-') > -1) {
                         userLocale = userLocale.split('-')[0];
                     }
-                    loaded = true;
-                    grabElementAndRunFlatpickr();
 
+                    grabElementAndRunFlatpickr();
                 });
             });
 
@@ -234,7 +234,8 @@ Use this directive to render a date time picker
 
 		}
     }
-    
-    angular.module('umbraco.directives').component('umbFlatpickr', umbFlatpickr);
-    
+
+    // umbFlatpickr (umb-flatpickr) is deprecated, but we keep it for backwards compatibility
+    angular.module('umbraco.directives').component('umbFlatpickr', umbDateTimePicker);
+    angular.module('umbraco.directives').component('umbDateTimePicker', umbDateTimePicker);
 })();
diff --git a/src/Umbraco.Web.UI.Client/src/less/belle.less b/src/Umbraco.Web.UI.Client/src/less/belle.less
index bd1cdd5b4f..8ee842d6b5 100644
--- a/src/Umbraco.Web.UI.Client/src/less/belle.less
+++ b/src/Umbraco.Web.UI.Client/src/less/belle.less
@@ -112,7 +112,7 @@
 @import "components/umb-editor-navigation-item.less";
 @import "components/umb-editor-sub-views.less";
 @import "components/editor/subheader/umb-editor-sub-header.less";
-@import "components/umb-flatpickr.less";
+@import "components/umb-date-time-picker.less";
 @import "components/umb-grid-selector.less";
 @import "components/umb-child-selector.less";
 @import "components/umb-group-builder.less";
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-flatpickr.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-date-time-picker.less
similarity index 90%
rename from src/Umbraco.Web.UI.Client/src/less/components/umb-flatpickr.less
rename to src/Umbraco.Web.UI.Client/src/less/components/umb-date-time-picker.less
index 8cdcc8b877..2df0cc5fd8 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-flatpickr.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-date-time-picker.less
@@ -1,4 +1,4 @@
-.flatpickr-calendar.flatpickr-calendar {
+.flatpickr-calendar {
     border-radius: @baseBorderRadius;
     box-shadow: 0 5px 10px 0 rgba(0,0,0,0.16);
 }
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.html
index 8376f50713..779ca739d2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.html
@@ -109,10 +109,10 @@
 									<input type="number" ng-switch-when="int" style="width:90px; margin-bottom: 0;" ng-model="filter.constraintValue" ng-change="vm.changeConstraintValue()" />
 
 									<span ng-switch-when="datetime">
-										<umb-flatpickr
+										<umb-date-time-picker
 											options="vm.datePickerConfig"
 											on-change="vm.datePickerChange(dateStr, filter)">
-										</umb-flatpickr>
+										</umb-date-time-picker>
 									</span>
 
 								</span>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html
index b573acaf52..a0fe7baec2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html
@@ -15,7 +15,7 @@
 
                 <div class="btn-group flex" style="font-size: 15px;">
 
-                    <umb-flatpickr ng-model="vm.variants[0].releaseDate"
+                    <umb-date-time-picker ng-model="vm.variants[0].releaseDate"
                                    options="vm.variants[0].datePickerConfig"
                                    on-setup="vm.datePickerSetup(vm.variants[0], 'publish', fpItem)"
                                    on-change="vm.datePickerChange(vm.variants[0], dateStr, 'publish')"
@@ -32,7 +32,7 @@
                             </a>
                         </div>
 
-                    </umb-flatpickr>
+                    </umb-date-time-picker>
 
                     <a ng-show="vm.variants[0].releaseDate" ng-click="vm.clearPublishDate(vm.variants[0])" class="btn umb-button--xs dropdown-toggle umb-button-group__toggle" style="margin-left: -2px;">
                         <span class="icon icon-wrong"></span>
@@ -47,7 +47,7 @@
                 </label>
 
                 <div class="btn-group flex" style="font-size: 15px;">
-                    <umb-flatpickr ng-model="vm.variants[0].expireDate"
+                    <umb-date-time-picker ng-model="vm.variants[0].expireDate"
                                    options="vm.variants[0].datePickerConfig"
                                    on-setup="vm.datePickerSetup(vm.variants[0], 'unpublish', fpItem)"
                                    on-change="vm.datePickerChange(vm.variants[0], dateStr, 'unpublish')"
@@ -64,7 +64,7 @@
                             </a>
                         </div>
 
-                    </umb-flatpickr>
+                    </umb-date-time-picker>
 
                     <a ng-show="vm.variants[0].expireDate" ng-click="vm.clearUnpublishDate(vm.variants[0])" class="btn umb-button--xs dropdown-toggle umb-button-group__toggle" style="margin-left: -2px;">
                         <span class="icon icon-wrong"></span>
@@ -112,7 +112,7 @@
                                     <div style="font-size: 13px; margin-right: 5px;">Publish:<em ng-show="!variant.save">&nbsp;&nbsp;{{variant.releaseDateFormatted}}</em></div>
 
                                     <div class="btn-group flex" style="font-size: 14px; margin-right: 10px;" ng-if="variant.save">
-                                        <umb-flatpickr ng-model="variant.releaseDate"
+                                        <umb-date-time-picker ng-model="variant.releaseDate"
                                                        options="variant.datePickerConfig"
                                                        on-setup="vm.datePickerSetup(variant, 'publish', fpItem)"
                                                        on-change="vm.datePickerChange(variant, dateStr, 'publish')"
@@ -127,7 +127,7 @@
                                                     <localize key="content_setDate">Set date</localize>
                                                 </a>
                                             </div>
-                                        </umb-flatpickr>
+                                        </umb-date-time-picker>
                                         <a ng-show="variant.releaseDate" ng-click="vm.clearPublishDate(variant)" class="btn umb-button--xxs dropdown-toggle umb-button-group__toggle" style="margin-left: -2px;">
                                             <span class="icon icon-wrong"></span>
                                         </a>
@@ -138,7 +138,7 @@
                                     <div style="font-size: 13px; margin-right: 5px;">Unpublish:<em ng-show="!variant.save">&nbsp;&nbsp;{{variant.expireDateFormatted}}</em></div>
 
                                     <div class="btn-group flex" style="font-size: 14px;" ng-if="variant.save">
-                                        <umb-flatpickr ng-model="variant.expireDate"
+                                        <umb-date-time-picker ng-model="variant.expireDate"
                                                        options="variant.datePickerConfig"
                                                        on-setup="vm.datePickerSetup(variant, 'unpublish', fpItem)"
                                                        on-change="vm.datePickerChange(variant, dateStr, 'unpublish')"
@@ -153,7 +153,7 @@
                                                     <localize key="content_setDate">Set date</localize>
                                                 </a>
                                             </div>
-                                        </umb-flatpickr>
+                                        </umb-date-time-picker>
                                         <a ng-show="variant.expireDate" ng-click="vm.clearUnpublishDate(variant)" class="btn umb-button--xxs dropdown-toggle umb-button-group__toggle" style="margin-left: -2px;">
                                             <span class="icon icon-wrong"></span>
                                         </a>
diff --git a/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html b/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html
index 533659e808..300c824329 100644
--- a/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html
@@ -74,11 +74,11 @@
                     <umb-box>
                         <umb-box-header title="Time Period"></umb-box-header>
 
-                        <umb-flatpickr class="datepicker"
+                        <umb-date-time-picker class="datepicker"
                                        ng-model="vm.period"
                                        options="vm.config"
                                        on-close="vm.dateRangeChange(selectedDates, dateStr, instance)">
-                        </umb-flatpickr>
+                        </umb-date-time-picker>
                     </umb-box>
 
                     <div ng-show=" vm.canLoadLogs">
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html
index 99961110aa..101f3254ab 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html
@@ -4,7 +4,7 @@
 
         <div id="datepicker{{model.alias}}">
 
-            <umb-flatpickr
+            <umb-date-time-picker
                 ng-model="model.value"
                 options="datePickerConfig"
                 on-setup="datePickerSetup(fpItem)"
@@ -28,7 +28,7 @@
                     </span>
                 </div>
 
-            </umb-flatpickr>
+            </umb-date-time-picker>
 
         </div>
 

From 2b7154622ef99771cefa7e87b52513ea159c0a05 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Thu, 8 Aug 2019 23:35:58 +0200
Subject: [PATCH 332/776] Set media picker dirty when the value changes

---
 .../mediapicker/mediapicker.controller.js                | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
index 120407ab10..e59e2bb26a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
@@ -1,7 +1,7 @@
 //this controller simply tells the dialogs service to open a mediaPicker window
 //with a specified callback, this callback will receive an object with a selection on it
 angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerController",
-    function ($scope, entityResource, mediaHelper, $timeout, userService, localizationService, editorService) {
+    function ($scope, entityResource, mediaHelper, $timeout, userService, localizationService, editorService, angularHelper) {
 
         var vm = {
             labels: {
@@ -92,6 +92,10 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
             $scope.model.value = $scope.ids.join();
         };
 
+        function setDirty() {
+            angularHelper.getCurrentForm($scope).$setDirty();
+        }
+
         function reloadUpdatedMediaItems(updatedMediaNodes) {
             // because the images can be edited through the media picker we need to 
             // reload. We only reload the images that is already picked but has been updated.
@@ -152,6 +156,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
             $scope.mediaItems.splice(index, 1);
             $scope.ids.splice(index, 1);
             sync();
+            setDirty();
         };
 
         $scope.editItem = function (item) {
@@ -215,6 +220,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
                     });
                     sync();
                     reloadUpdatedMediaItems(model.updatedMediaNodes);
+                    setDirty();
                 },
                 close: function (model) {
                     editorService.close();
@@ -233,6 +239,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
             items: "li:not(.add-wrapper)",
             cancel: ".unsortable",
             update: function (e, ui) {
+                setDirty();
                 var r = [];
                 // TODO: Instead of doing this with a half second delay would be better to use a watch like we do in the
                 // content picker. Then we don't have to worry about setting ids, render models, models, we just set one and let the

From 65b2d08997a44b6d10cff62b710e4257bdd92e3b Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Thu, 8 Aug 2019 23:35:58 +0200
Subject: [PATCH 333/776] Set media picker dirty when the value changes

(cherry picked from commit 2b7154622ef99771cefa7e87b52513ea159c0a05)
---
 .../mediapicker/mediapicker.controller.js                | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
index 120407ab10..e59e2bb26a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
@@ -1,7 +1,7 @@
 //this controller simply tells the dialogs service to open a mediaPicker window
 //with a specified callback, this callback will receive an object with a selection on it
 angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerController",
-    function ($scope, entityResource, mediaHelper, $timeout, userService, localizationService, editorService) {
+    function ($scope, entityResource, mediaHelper, $timeout, userService, localizationService, editorService, angularHelper) {
 
         var vm = {
             labels: {
@@ -92,6 +92,10 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
             $scope.model.value = $scope.ids.join();
         };
 
+        function setDirty() {
+            angularHelper.getCurrentForm($scope).$setDirty();
+        }
+
         function reloadUpdatedMediaItems(updatedMediaNodes) {
             // because the images can be edited through the media picker we need to 
             // reload. We only reload the images that is already picked but has been updated.
@@ -152,6 +156,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
             $scope.mediaItems.splice(index, 1);
             $scope.ids.splice(index, 1);
             sync();
+            setDirty();
         };
 
         $scope.editItem = function (item) {
@@ -215,6 +220,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
                     });
                     sync();
                     reloadUpdatedMediaItems(model.updatedMediaNodes);
+                    setDirty();
                 },
                 close: function (model) {
                     editorService.close();
@@ -233,6 +239,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
             items: "li:not(.add-wrapper)",
             cancel: ".unsortable",
             update: function (e, ui) {
+                setDirty();
                 var r = [];
                 // TODO: Instead of doing this with a half second delay would be better to use a watch like we do in the
                 // content picker. Then we don't have to worry about setting ids, render models, models, we just set one and let the

From 0d63b13bf0e29381bdc18d24d9944a034fc0260b Mon Sep 17 00:00:00 2001
From: skttl <sk@ecreo.dk>
Date: Thu, 8 Aug 2019 09:32:23 +0200
Subject: [PATCH 334/776] Changes mode of styleselect to All

---
 src/Umbraco.Web.UI/config/tinyMceConfig.Release.config | 4 ++--
 src/Umbraco.Web.UI/config/tinyMceConfig.config         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI/config/tinyMceConfig.Release.config b/src/Umbraco.Web.UI/config/tinyMceConfig.Release.config
index 40630b7eb6..f6a26ee89a 100644
--- a/src/Umbraco.Web.UI/config/tinyMceConfig.Release.config
+++ b/src/Umbraco.Web.UI/config/tinyMceConfig.Release.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <tinymceConfig>
     <commands>
         <command alias="ace" name="Source code editor" mode="Insert" />
@@ -8,7 +8,7 @@
         <command alias="cut" name="Cut" mode="Selection"/>
         <command alias="copy" name="Copy" mode="Selection"/>
         <command alias="paste" name="Paste" mode="All" />
-        <command alias="styleselect" name="Style select" mode="Insert" />
+        <command alias="styleselect" name="Style select" mode="All" />
         <command alias="bold" name="Bold" mode="Selection" />
         <command alias="italic" name="Italic" mode="Selection" />
         <command alias="underline" name="Underline" mode="Selection" />
diff --git a/src/Umbraco.Web.UI/config/tinyMceConfig.config b/src/Umbraco.Web.UI/config/tinyMceConfig.config
index a686021cbf..7f7cb657e6 100644
--- a/src/Umbraco.Web.UI/config/tinyMceConfig.config
+++ b/src/Umbraco.Web.UI/config/tinyMceConfig.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <tinymceConfig>
     <commands>
         <command alias="ace" name="Source code editor" mode="Insert" />
@@ -8,7 +8,7 @@
         <command alias="cut" name="Cut" mode="Selection"/>
         <command alias="copy" name="Copy" mode="Selection"/>
         <command alias="paste" name="Paste" mode="All" />
-        <command alias="styleselect" name="Style select" mode="Insert" />
+        <command alias="styleselect" name="Style select" mode="All" />
         <command alias="bold" name="Bold" mode="Selection" />
         <command alias="italic" name="Italic" mode="Selection" />
         <command alias="underline" name="Underline" mode="Selection" />

From 53c52abde5dbac3c61d2f7481340d28bd48b1780 Mon Sep 17 00:00:00 2001
From: Marc Goodson <marc@snowmoon.co.uk>
Date: Fri, 2 Aug 2019 21:34:22 +0100
Subject: [PATCH 335/776] Update GetPagedResultsByQuery to return id of the
 node the audit item relates to instead of table PK

This was fixed previously in v7 - see https://github.com/umbraco/Umbraco-CMS/pull/3759
---
 .../Persistence/Repositories/Implement/AuditRepository.cs       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/AuditRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/AuditRepository.cs
index c25328b10c..0788594e3a 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/AuditRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/AuditRepository.cs
@@ -174,7 +174,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             totalRecords = page.TotalItems;
 
             var items = page.Items.Select(
-                dto => new AuditItem(dto.Id, Enum<AuditType>.ParseOrNull(dto.Header) ?? AuditType.Custom, dto.UserId ?? Constants.Security.UnknownUserId, dto.EntityType, dto.Comment, dto.Parameters)).ToList();
+                dto => new AuditItem(dto.NodeId, Enum<AuditType>.ParseOrNull(dto.Header) ?? AuditType.Custom, dto.UserId ?? Constants.Security.UnknownUserId, dto.EntityType, dto.Comment, dto.Parameters)).ToList();
 
             // map the DateStamp
             for (var i = 0; i < items.Count; i++)

From cec4376d199e617546292d726829c0a456c75655 Mon Sep 17 00:00:00 2001
From: Marc Goodson <marc@snowmoon.co.uk>
Date: Fri, 2 Aug 2019 21:34:22 +0100
Subject: [PATCH 336/776] Update GetPagedResultsByQuery to return id of the
 node the audit item relates to instead of table PK

This was fixed previously in v7 - see https://github.com/umbraco/Umbraco-CMS/pull/3759

(cherry picked from commit 53c52abde5dbac3c61d2f7481340d28bd48b1780)
---
 .../Persistence/Repositories/Implement/AuditRepository.cs       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/AuditRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/AuditRepository.cs
index c25328b10c..0788594e3a 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/AuditRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/AuditRepository.cs
@@ -174,7 +174,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             totalRecords = page.TotalItems;
 
             var items = page.Items.Select(
-                dto => new AuditItem(dto.Id, Enum<AuditType>.ParseOrNull(dto.Header) ?? AuditType.Custom, dto.UserId ?? Constants.Security.UnknownUserId, dto.EntityType, dto.Comment, dto.Parameters)).ToList();
+                dto => new AuditItem(dto.NodeId, Enum<AuditType>.ParseOrNull(dto.Header) ?? AuditType.Custom, dto.UserId ?? Constants.Security.UnknownUserId, dto.EntityType, dto.Comment, dto.Parameters)).ToList();
 
             // map the DateStamp
             for (var i = 0; i < items.Count; i++)

From 5452ebaf6d95611dfa62cecacce112c2935b8cfb Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland@zonedigital.com>
Date: Fri, 2 Aug 2019 14:54:01 +0100
Subject: [PATCH 337/776] Import and export of document type and property
 variations setting in packages

---
 .../Packaging/PackageDataInstallation.cs      | 19 +++++++++++++------
 .../Services/Implement/EntityXmlSerializer.cs |  6 ++++--
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Core/Packaging/PackageDataInstallation.cs b/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
index c811f484bc..2f6b91edee 100644
--- a/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
+++ b/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Text.RegularExpressions;
 using System.Web;
 using System.Xml.Linq;
 using System.Xml.XPath;
@@ -575,12 +574,11 @@ namespace Umbraco.Core.Packaging
             contentType.Thumbnail = infoElement.Element("Thumbnail").Value;
             contentType.Description = infoElement.Element("Description").Value;
 
-            //NOTE AllowAtRoot is a new property in the package xml so we need to verify it exists before using it.
+            //NOTE AllowAtRoot, IsListView, IsElement and Variations are new properties in the package xml so we need to verify it exists before using it.
             var allowAtRoot = infoElement.Element("AllowAtRoot");
             if (allowAtRoot != null)
                 contentType.AllowedAsRoot = allowAtRoot.Value.InvariantEquals("true");
 
-            //NOTE IsListView is a new property in the package xml so we need to verify it exists before using it.
             var isListView = infoElement.Element("IsListView");
             if (isListView != null)
                 contentType.IsContainer = isListView.Value.InvariantEquals("true");
@@ -589,6 +587,10 @@ namespace Umbraco.Core.Packaging
             if (isElement != null)
                 contentType.IsElement = isElement.Value.InvariantEquals("true");
 
+            var variationsElement = infoElement.Element("Variations");
+            if (variationsElement != null)
+                contentType.Variations = (ContentVariation)Enum.Parse(typeof(ContentVariation), variationsElement.Value);
+
             //Name of the master corresponds to the parent and we need to ensure that the Parent Id is set
             var masterElement = infoElement.Element("Master");
             if (masterElement != null)
@@ -614,7 +616,7 @@ namespace Umbraco.Core.Packaging
                         var compositionContentType = importedContentTypes.ContainsKey(compositionAlias)
                             ? importedContentTypes[compositionAlias]
                             : _contentTypeService.Get(compositionAlias);
-                        var added = contentType.AddContentType(compositionContentType);
+                        contentType.AddContentType(compositionContentType);
                     }
                 }
             }
@@ -748,9 +750,14 @@ namespace Umbraco.Core.Packaging
                 {
                     Name = property.Element("Name").Value,
                     Description = (string)property.Element("Description"),
-                    Mandatory = property.Element("Mandatory") != null ? property.Element("Mandatory").Value.ToLowerInvariant().Equals("true") : false,
+                    Mandatory = property.Element("Mandatory") != null
+                        ? property.Element("Mandatory").Value.ToLowerInvariant().Equals("true")
+                        : false,
                     ValidationRegExp = (string)property.Element("Validation"),
-                    SortOrder = sortOrder
+                    SortOrder = sortOrder,
+                    Variations = property.Element("Variations") != null
+                        ? (ContentVariation)Enum.Parse(typeof(ContentVariation), property.Element("Variations").Value)
+                        : ContentVariation.Nothing
                 };
 
                 var tab = (string)property.Element("Tab");
diff --git a/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs b/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs
index 863ecc0b1b..ace740a831 100644
--- a/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs
+++ b/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs
@@ -437,7 +437,8 @@ namespace Umbraco.Core.Services.Implement
                                     new XElement("Description", contentType.Description),
                                     new XElement("AllowAtRoot", contentType.AllowedAsRoot.ToString()),
                                     new XElement("IsListView", contentType.IsContainer.ToString()),
-                                    new XElement("IsElement", contentType.IsElement.ToString()));
+                                    new XElement("IsElement", contentType.IsElement.ToString()),
+                                    new XElement("Variations", contentType.Variations.ToString()));
 
             var masterContentType = contentType.ContentTypeComposition.FirstOrDefault(x => x.Id == contentType.ParentId);
             if(masterContentType != null)
@@ -487,7 +488,8 @@ namespace Umbraco.Core.Services.Implement
                                                    new XElement("SortOrder", propertyType.SortOrder),
                                                    new XElement("Mandatory", propertyType.Mandatory.ToString()),
                                                    propertyType.ValidationRegExp != null ? new XElement("Validation", propertyType.ValidationRegExp) : null,
-                                                   propertyType.Description != null ? new XElement("Description", new XCData(propertyType.Description)) : null);
+                                                   propertyType.Description != null ? new XElement("Description", new XCData(propertyType.Description)) : null,
+                                                   new XElement("Variations", propertyType.Variations.ToString()));
 
                 genericProperties.Add(genericProperty);
             }

From cd355910b390b1200e2037154ea19525476519a5 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 16 Aug 2019 15:34:49 +1000
Subject: [PATCH 338/776] strangely i need the fully qualified name here else i
 get an error, otherwise works great.

---
 src/Umbraco.Web/Profiling/WebProfilerProvider.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Profiling/WebProfilerProvider.cs b/src/Umbraco.Web/Profiling/WebProfilerProvider.cs
index 68e1555884..e0dcfcf9b1 100644
--- a/src/Umbraco.Web/Profiling/WebProfilerProvider.cs
+++ b/src/Umbraco.Web/Profiling/WebProfilerProvider.cs
@@ -31,7 +31,8 @@ namespace Umbraco.Web.Profiling
             // Remove Mini Profiler routes when not in debug mode
             if (GlobalSettings.DebugMode == false)
             {
-                var prefix = MiniProfiler.Settings.RouteBasePath.Replace("~/", string.Empty);
+                //NOTE: Keep the global fully qualified name, for some reason without it I was getting null refs
+                var prefix = global::StackExchange.Profiling.MiniProfiler.Settings.RouteBasePath.Replace("~/", string.Empty);
 
                 using (RouteTable.Routes.GetWriteLock())
                 {

From 505b5410405bee415ea57cc9abf3e3a94f551e6c Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 16 Aug 2019 15:39:46 +1000
Subject: [PATCH 339/776] Removing the MiniProfiler routes if solution is not
 in debug mode.

---
 .../Profiling/WebProfilerProvider.cs          | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Profiling/WebProfilerProvider.cs b/src/Umbraco.Web/Profiling/WebProfilerProvider.cs
index ffd1871ecc..e0dcfcf9b1 100644
--- a/src/Umbraco.Web/Profiling/WebProfilerProvider.cs
+++ b/src/Umbraco.Web/Profiling/WebProfilerProvider.cs
@@ -1,7 +1,10 @@
 using System;
+using System.Linq;
 using System.Threading;
 using System.Web;
+using System.Web.Routing;
 using StackExchange.Profiling;
+using Umbraco.Core.Configuration;
 
 namespace Umbraco.Web.Profiling
 {
@@ -24,6 +27,20 @@ namespace Umbraco.Web.Profiling
         {
             // booting...
             _bootPhase = BootPhase.Boot;
+
+            // Remove Mini Profiler routes when not in debug mode
+            if (GlobalSettings.DebugMode == false)
+            {
+                //NOTE: Keep the global fully qualified name, for some reason without it I was getting null refs
+                var prefix = global::StackExchange.Profiling.MiniProfiler.Settings.RouteBasePath.Replace("~/", string.Empty);
+
+                using (RouteTable.Routes.GetWriteLock())
+                {
+                    var routes = RouteTable.Routes.Where(x => x is Route r && r.Url.StartsWith(prefix)).ToList();
+                    foreach(var r in routes)
+                        RouteTable.Routes.Remove(r);
+                }
+            }
         }
 
         /// <summary>
@@ -118,4 +135,4 @@ namespace Umbraco.Web.Profiling
             }
         }
     }
-}
\ No newline at end of file
+}

From 6e1314ae304a63b605ca62e87d74fdd3281eb1bb Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 16 Aug 2019 15:58:13 +1000
Subject: [PATCH 340/776] Removing legacy service

---
 .../umbraco/webservices/legacyAjaxCalls.asmx.cs    | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs
index 1929477181..a29e44a92b 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs
@@ -36,19 +36,7 @@ namespace umbraco.presentation.webservices
     public class legacyAjaxCalls : UmbracoAuthorizedWebService
     {
         private User _currentUser;
-
-        [WebMethod]
-        public bool ValidateUser(string username, string password)
-        {
-            if (ValidateCredentials(username, password))
-            {
-                var u = new BusinessLogic.User(username);
-                BasePage.doLogin(u);
-                return true;
-            }
-            return false;
-        }
-
+       
         /// <summary>
         /// method to accept a string value for the node id. Used for tree's such as python
         /// and xslt since the file names are the node IDs

From e9717ee86ae1c8edcb4f0a03419d22e96802d092 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 16 Aug 2019 16:18:58 +1000
Subject: [PATCH 341/776] changes to PanicException

---
 src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs   | 4 ++--
 .../PublishedCache/NuCache/PublishedContent.cs           | 9 +++++----
 src/Umbraco.Web/UmbracoInjectedModule.cs                 | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
index dbe354d95b..86fc69c302 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
@@ -796,7 +796,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             if (_contentNodes.TryGetValue(id, out var link) && link.Value != null)
                 return link;
 
-            throw new PanicException($"panic: failed to get {description} with id={id}");
+            throw new PanicException($"failed to get {description} with id={id}");
         }
 
         private LinkedNode<ContentNode> GetParentLink(ContentNode content)
@@ -827,7 +827,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
             // must have children
             if (parent.FirstChildContentId < 0)
-                throw new Exception("panic: no children");
+                throw new PanicException("no children");
 
             // if first, clone parent + remove first child
             if (parent.FirstChildContentId == content.Id)
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
index cb7acdc164..8fc2dc1006 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
+using Umbraco.Core.Exceptions;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Web.Composing;
 using Umbraco.Web.Models;
@@ -119,7 +120,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 case PublishedItemType.Media:
                     return GetMediaByIdFunc;
                 default:
-                    throw new Exception("panic: invalid item type");
+                    throw new PanicException("invalid item type");
             }
         }
 
@@ -194,7 +195,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     };
 
                 if (ContentData.CultureInfos == null)
-                    throw new Exception("panic: _contentDate.CultureInfos is null.");
+                    throw new PanicException("_contentDate.CultureInfos is null.");
 
                 return _cultures = ContentData.CultureInfos
                     .ToDictionary(x => x.Key, x => new PublishedCultureInfo(x.Key, x.Value.Name, x.Value.UrlSegment, x.Value.Date), StringComparer.OrdinalIgnoreCase);
@@ -286,13 +287,13 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     {
                         // but if IsPreviewing is true, we should have a child
                         if (IsPreviewing)
-                            throw new Exception($"panic: failed to get content with id={id}");
+                            throw new PanicException($"failed to get content with id={id}");
 
                         // if IsPreviewing is false, get the unpublished child nevertheless
                         // we need it to keep enumerating children! but we don't return it
                         content = getById(publishedSnapshot, true, id);
                         if (content == null)
-                            throw new Exception($"panic: failed to get content with id={id}");
+                            throw new PanicException($"failed to get content with id={id}");
                     }
 
                     id = UnwrapIPublishedContent(content)._contentNode.NextSiblingContentId;
diff --git a/src/Umbraco.Web/UmbracoInjectedModule.cs b/src/Umbraco.Web/UmbracoInjectedModule.cs
index c973fafa81..db5372efa2 100644
--- a/src/Umbraco.Web/UmbracoInjectedModule.cs
+++ b/src/Umbraco.Web/UmbracoInjectedModule.cs
@@ -264,7 +264,7 @@ namespace Umbraco.Web
                 case RuntimeLevel.Unknown:
                 case RuntimeLevel.Boot:
                 case RuntimeLevel.BootFailed:
-                    throw new Exception($"panic: Unexpected runtime level: {level}.");
+                    throw new PanicException($"Unexpected runtime level: {level}.");
 
                 case RuntimeLevel.Run:
                     // ok

From 438133ae1fdcaec26df913848ebdebe0fc6e123c Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Mon, 12 Aug 2019 21:52:00 +0200
Subject: [PATCH 342/776] Make sure treepicker URLs are displayed for the
 current editor culture

---
 .../src/common/resources/entity.resource.js              | 9 +++++++--
 src/Umbraco.Web/Editors/EntityController.cs              | 7 +++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
index 7852180dfa..9cf1181cfa 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
@@ -104,21 +104,26 @@ function entityResource($q, $http, umbRequestHelper) {
          *
          * @param {Int} id Id of node to return the public url to
          * @param {string} type Object type name
+         * @param {string} culture Culture
          * @returns {Promise} resourcePromise object containing the url.
          *
          */
-        getUrl: function (id, type) {
+        getUrl: function (id, type, culture) {
 
             if (id === -1 || id === "-1") {
                 return "";
             }
 
+            if (!culture) {
+                culture = "";
+            }
+
             return umbRequestHelper.resourcePromise(
                $http.get(
                    umbRequestHelper.getApiUrl(
                        "entityApiBaseUrl",
                        "GetUrl",
-                       [{ id: id }, {type: type }])),
+                       [{ id: id }, {type: type }, {culture: culture }])),
                'Failed to retrieve url for id:' + id);
         },
 
diff --git a/src/Umbraco.Web/Editors/EntityController.cs b/src/Umbraco.Web/Editors/EntityController.cs
index 5e094534d2..0513017b70 100644
--- a/src/Umbraco.Web/Editors/EntityController.cs
+++ b/src/Umbraco.Web/Editors/EntityController.cs
@@ -211,17 +211,20 @@ namespace Umbraco.Web.Editors
         /// </summary>
         /// <param name="id">Int id of the entity to fetch URL for</param>
         /// <param name="type">The type of entity such as Document, Media, Member</param>
+        /// <param name="culture">The culture to fetch the URL for</param>
         /// <returns>The URL or path to the item</returns>
         /// <remarks>
         /// We are not restricting this with security because there is no sensitive data
         /// </remarks>
-        public HttpResponseMessage GetUrl(int id, UmbracoEntityTypes type)
+        public HttpResponseMessage GetUrl(int id, UmbracoEntityTypes type, string culture = null)
         {
+            culture = culture ?? ClientCulture();
+
             var returnUrl = string.Empty;
 
             if (type == UmbracoEntityTypes.Document)
             {
-                var foundUrl = UmbracoContext.Url(id);
+                var foundUrl = UmbracoContext.Url(id, culture);
                 if (string.IsNullOrEmpty(foundUrl) == false && foundUrl != "#")
                 {
                     returnUrl = foundUrl;

From 0e565ddbf83811138712e38614caf208bd2f452c Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Mon, 12 Aug 2019 21:52:00 +0200
Subject: [PATCH 343/776] Make sure treepicker URLs are displayed for the
 current editor culture

(cherry picked from commit 438133ae1fdcaec26df913848ebdebe0fc6e123c)
---
 .../src/common/resources/entity.resource.js              | 9 +++++++--
 src/Umbraco.Web/Editors/EntityController.cs              | 7 +++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
index 234ed588c5..e8bdb9efb3 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
@@ -104,21 +104,26 @@ function entityResource($q, $http, umbRequestHelper) {
          *
          * @param {Int} id Id of node to return the public url to
          * @param {string} type Object type name
+         * @param {string} culture Culture
          * @returns {Promise} resourcePromise object containing the url.
          *
          */
-        getUrl: function (id, type) {
+        getUrl: function (id, type, culture) {
 
             if (id === -1 || id === "-1") {
                 return "";
             }
 
+            if (!culture) {
+                culture = "";
+            }
+
             return umbRequestHelper.resourcePromise(
                $http.get(
                    umbRequestHelper.getApiUrl(
                        "entityApiBaseUrl",
                        "GetUrl",
-                       [{ id: id }, {type: type }])),
+                       [{ id: id }, {type: type }, {culture: culture }])),
                'Failed to retrieve url for id:' + id);
         },
 
diff --git a/src/Umbraco.Web/Editors/EntityController.cs b/src/Umbraco.Web/Editors/EntityController.cs
index b3edb308a2..f53251fb23 100644
--- a/src/Umbraco.Web/Editors/EntityController.cs
+++ b/src/Umbraco.Web/Editors/EntityController.cs
@@ -210,17 +210,20 @@ namespace Umbraco.Web.Editors
         /// </summary>
         /// <param name="id">Int id of the entity to fetch URL for</param>
         /// <param name="type">The type of entity such as Document, Media, Member</param>
+        /// <param name="culture">The culture to fetch the URL for</param>
         /// <returns>The URL or path to the item</returns>
         /// <remarks>
         /// We are not restricting this with security because there is no sensitive data
         /// </remarks>
-        public HttpResponseMessage GetUrl(int id, UmbracoEntityTypes type)
+        public HttpResponseMessage GetUrl(int id, UmbracoEntityTypes type, string culture = null)
         {
+            culture = culture ?? ClientCulture();
+
             var returnUrl = string.Empty;
 
             if (type == UmbracoEntityTypes.Document)
             {
-                var foundUrl = UmbracoContext.Url(id);
+                var foundUrl = UmbracoContext.Url(id, culture);
                 if (string.IsNullOrEmpty(foundUrl) == false && foundUrl != "#")
                 {
                     returnUrl = foundUrl;

From e4f19f71926ff1c0db427d6604798795fbe88f8c Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Fri, 16 Aug 2019 11:52:34 +0200
Subject: [PATCH 344/776] v8: Add umbLoader directive (#4987)

---
 .../components/umbloader.directive.js         | 75 +++++++++++++++++++
 .../components/umbloadindicator.directive.js  |  2 +-
 src/Umbraco.Web.UI.Client/src/less/belle.less |  1 +
 .../less/components/application/umb-tour.less | 12 ++-
 .../src/less/components/umb-loader.less       | 42 +++++++++++
 src/Umbraco.Web.UI.Client/src/less/main.less  | 36 ---------
 .../components/application/umb-tour.html      |  3 +-
 .../src/views/components/umb-loader.html      |  3 +
 .../src/views/content/copy.html               |  4 +-
 .../src/views/content/emptyrecyclebin.html    |  5 +-
 .../src/views/content/move.html               |  4 +-
 .../src/views/datatypes/move.html             |  4 +-
 .../src/views/documenttypes/copy.html         |  4 +-
 .../src/views/documenttypes/move.html         |  4 +-
 .../src/views/media/emptyrecyclebin.html      |  5 +-
 .../src/views/mediatypes/copy.html            |  4 +-
 .../src/views/mediatypes/move.html            |  4 +-
 .../propertyeditors/listview/listview.html    |  5 +-
 18 files changed, 145 insertions(+), 72 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/common/directives/components/umbloader.directive.js
 create mode 100644 src/Umbraco.Web.UI.Client/src/less/components/umb-loader.less
 create mode 100644 src/Umbraco.Web.UI.Client/src/views/components/umb-loader.html

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbloader.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbloader.directive.js
new file mode 100644
index 0000000000..e70f7b3cac
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbloader.directive.js
@@ -0,0 +1,75 @@
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbLoader
+@restrict E
+
+@description
+Use this directive to generate a loading indicator.
+
+<h3>Markup example</h3>
+<pre>
+    <div ng-controller="My.Controller as vm">
+
+        <umb-loader
+            ng-if="vm.loading">
+        </umb-loader>
+
+        <div class="content" ng-if="!vm.loading">
+            <p>{{content}}</p>
+        </div>
+
+    </div>
+</pre>
+
+<h3>Controller example</h3>
+<pre>
+    (function () {
+        "use strict";
+
+        function Controller(myService) {
+
+            var vm = this;
+
+            vm.content = "";
+            vm.loading = true;
+
+            myService.getContent().then(function(content){
+                vm.content = content;
+                vm.loading = false;
+            });
+
+        }
+
+        angular.module("umbraco").controller("My.Controller", Controller);
+    })();
+</pre>
+
+@param {string=} position The loader position ("top", "bottom").
+
+**/
+
+(function() {
+  'use strict';
+
+  function UmbLoaderDirective() {
+
+    function link(scope, el, attr, ctrl) {
+        
+    }
+
+    var directive = {
+        restrict: 'E',
+        replace: true,
+        templateUrl: 'views/components/umb-loader.html',
+        scope: {
+            position: "@?"
+        },
+        link: link
+    };
+
+    return directive;
+  }
+  
+  angular.module('umbraco.directives').directive('umbLoader', UmbLoaderDirective);
+
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbloadindicator.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbloadindicator.directive.js
index 0671770796..c45b8f3f47 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbloadindicator.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbloadindicator.directive.js
@@ -39,7 +39,7 @@ Use this directive to generate a loading indicator.
             });
 
         }
-½
+
         angular.module("umbraco").controller("My.Controller", Controller);
     })();
 </pre>
diff --git a/src/Umbraco.Web.UI.Client/src/less/belle.less b/src/Umbraco.Web.UI.Client/src/less/belle.less
index 8ee842d6b5..b0b7e80762 100644
--- a/src/Umbraco.Web.UI.Client/src/less/belle.less
+++ b/src/Umbraco.Web.UI.Client/src/less/belle.less
@@ -124,6 +124,7 @@
 @import "components/umb-form-check.less";
 @import "components/umb-locked-field.less";
 @import "components/umb-tabs.less";
+@import "components/umb-loader.less";
 @import "components/umb-load-indicator.less";
 @import "components/umb-breadcrumbs.less";
 @import "components/umb-media-grid.less";
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-tour.less b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-tour.less
index 315cd91dbd..33a723a3f7 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-tour.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-tour.less
@@ -1,8 +1,12 @@
-.umb-tour__loader {
-    background: @white;
-    z-index: @zindexTourModal;
+.umb-loader-wrapper.umb-tour__loader {
+    margin: 0;
     position: fixed;
-    height: 5px;
+    z-index: @zindexTourModal;
+
+    .umb-loader {
+        background-color: @white;
+        height: 5px;
+    }
 }
 
 .umb-tour__pulse {
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-loader.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-loader.less
new file mode 100644
index 0000000000..260710ce72
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-loader.less
@@ -0,0 +1,42 @@
+// Loading Animation
+// ------------------------
+
+.umb-loader {
+    background-color: @blue;
+    margin-top: 0;
+    margin-left: -100%;
+    animation-name: bounce_loadingProgressG;
+    animation-duration: 1s;
+    animation-iteration-count: infinite;
+    animation-timing-function: linear;
+    width: 100%;
+    height: 2px;
+}
+
+@keyframes bounce_loadingProgressG {
+    0% {
+        margin-left: -100%;
+    }
+
+    100% {
+        margin-left: 100%;
+    }
+}
+
+.umb-loader-wrapper {
+    position: absolute;
+    right: 0;
+    left: 0;
+    margin: 10px 0;
+    overflow: hidden;
+}
+
+.umb-loader-wrapper.-top {
+    top: 0;
+    bottom: auto;
+}
+
+.umb-loader-wrapper.-bottom {
+    top: auto;
+    bottom: 0;
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/main.less b/src/Umbraco.Web.UI.Client/src/less/main.less
index c10f846ca5..920fcdb1eb 100644
--- a/src/Umbraco.Web.UI.Client/src/less/main.less
+++ b/src/Umbraco.Web.UI.Client/src/less/main.less
@@ -486,42 +486,6 @@ table thead a {
     color:@green;
 }
 
-// Loading Animation
-// ------------------------
-
-.umb-loader{
-    background-color: @blue;
-    margin-top:0;
-    margin-left:-100%;
-    animation-name:bounce_loadingProgressG;
-    animation-duration:1s;
-    animation-iteration-count:infinite;
-    animation-timing-function:linear;
-    width:100%;
-    height:2px;
-}
-
-@keyframes bounce_loadingProgressG{
-    0%{
-        margin-left:-100%;
-    }
-    100%{
-        margin-left:100%;
-    }
-}
-
-.umb-loader-wrapper {
-    position: absolute;
-    right: 0;
-    left: 0;
-    margin: 10px 0;
-    overflow: hidden;
-}
-
-.umb-loader-wrapper.-bottom {
-	bottom: 0;
-}
-
 // Helpers
 
 .strong {
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-tour.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-tour.html
index 5410d453c4..9a2fe96289 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-tour.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-tour.html
@@ -1,6 +1,7 @@
 <div class="umb-tour">
 
-    <div class="umb-loader umb-tour__loader" ng-if="loadingStep"></div>
+    <umb-loader class="umb-tour__loader" ng-if="loadingStep"></umb-loader>
+
     <div class="umb-tour__pulse"></div>
 
     <div class="umb-tour__popover shadow-depth-2" ng-class="{'umb-tour__popover--l': model.currentStep.type === 'intro' || model.currentStepIndex === model.steps.length}">
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-loader.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-loader.html
new file mode 100644
index 0000000000..07aeb7fdfa
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-loader.html
@@ -0,0 +1,3 @@
+<div class="umb-loader-wrapper" ng-class="{ '-top': position === 'top', '-bottom': position === 'bottom' }">
+    <div class="umb-loader"></div>
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/copy.html b/src/Umbraco.Web.UI.Client/src/views/content/copy.html
index 0ebe577ed8..111dacd7cb 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/copy.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/copy.html
@@ -24,9 +24,7 @@
                 <localize key="actions_toInTheTreeStructureBelow">to in the tree structure below</localize>
             </p>
 
-            <div class="umb-loader-wrapper" ng-show="busy">
-                <div class="umb-loader"></div>
-            </div>
+            <umb-loader ng-show="busy"></umb-loader>
 
             <div ng-hide="success">
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/emptyrecyclebin.html b/src/Umbraco.Web.UI.Client/src/views/content/emptyrecyclebin.html
index 524bb06354..9ac7ef10fc 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/emptyrecyclebin.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/emptyrecyclebin.html
@@ -1,9 +1,8 @@
 <div class="umb-dialog" ng-controller="Umbraco.Editors.Content.EmptyRecycleBinController">
     <div class="umb-dialog-body">
         <umb-pane>
-            <div class="umb-loader-wrapper" ng-show="busy">
-                <div class="umb-loader"></div>
-            </div>
+
+            <umb-loader ng-show="busy"></umb-loader>
 
             <p class="abstract">
                 <localize key="defaultdialogs_recycleBinWarning">When items are deleted from the recycle bin, they will be gone forever</localize>.
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/move.html b/src/Umbraco.Web.UI.Client/src/views/content/move.html
index fd154f438a..3c073ba404 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/move.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/move.html
@@ -24,9 +24,7 @@
                 <localize key="actions_toInTheTreeStructureBelow">to in the tree structure below</localize>
             </p>
 
-            <div class="umb-loader-wrapper" ng-show="busy">
-                <div class="umb-loader"></div>
-            </div>
+            <umb-loader ng-show="busy"></umb-loader>
 
             <div ng-hide="success">
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/datatypes/move.html b/src/Umbraco.Web.UI.Client/src/views/datatypes/move.html
index a5cf6b1a41..7e7e70d650 100644
--- a/src/Umbraco.Web.UI.Client/src/views/datatypes/move.html
+++ b/src/Umbraco.Web.UI.Client/src/views/datatypes/move.html
@@ -7,9 +7,7 @@
                 <localize key="editdatatype_selectFolder">Select the folder to move</localize> <strong>{{source.name}}</strong>&nbsp;<localize key="editdatatype_inTheTree">to in the tree structure below</localize>
             </p>
 
-            <div class="umb-loader-wrapper" ng-show="busy">
-                <div class="umb-loader"></div>
-            </div>
+            <umb-loader ng-show="busy"></umb-loader>
 
             <div ng-show="error">
                 <div class="alert alert-error">
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.html
index 03b090fc54..8b81462ad5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.html
@@ -7,9 +7,7 @@
                 <localize key="contentTypeEditor_folderToCopy">Select the folder to copy</localize> <strong>{{source.name}}</strong>&nbsp;<localize key="contentTypeEditor_structureBelow">to in the tree structure below</localize>
             </p>
 
-            <div class="umb-loader-wrapper" ng-show="busy">
-                <div class="umb-loader"></div>
-            </div>
+            <umb-loader ng-show="busy"></umb-loader>
 
             <div ng-show="error">
                 <div class="alert alert-error">
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html
index 46626d924b..fe0bde7f1f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html
@@ -7,9 +7,7 @@
                 <localize key="contentTypeEditor_folderToMove">Select the folder to move</localize> <strong>{{source.name}}</strong>&nbsp;<localize key="contentTypeEditor_structureBelow">to in the tree structure below</localize>
             </p>
 
-            <div class="umb-loader-wrapper" ng-show="busy">
-                <div class="umb-loader"></div>
-            </div>
+            <umb-loader ng-show="busy"></umb-loader>
 
             <div ng-show="error">
                 <div class="alert alert-error">
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/emptyrecyclebin.html b/src/Umbraco.Web.UI.Client/src/views/media/emptyrecyclebin.html
index 9d1b28edc9..33681f9269 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/emptyrecyclebin.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/emptyrecyclebin.html
@@ -2,9 +2,8 @@
     <div class="umb-dialog-body">
         
         <umb-pane>
-            <div class="umb-loader-wrapper" ng-show="busy">
-                <div class="umb-loader"></div>
-            </div>
+
+            <umb-loader ng-show="busy"></umb-loader>
 
             <p class="abstract">
                 <localize key="defaultdialogs_recycleBinWarning">When items are deleted from the recycle bin, they will be gone forever</localize>.
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/copy.html b/src/Umbraco.Web.UI.Client/src/views/mediatypes/copy.html
index 5e7b9c6669..9c21f623b5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/copy.html
+++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/copy.html
@@ -7,9 +7,7 @@
                 <localize key="contentTypeEditor_folderToCopy">Select the folder to copy</localize> <strong>{{source.name}}</strong>&nbsp;<localize key="contentTypeEditor_structureBelow">to in the tree structure below</localize>
             </p>
 
-            <div class="umb-loader-wrapper" ng-show="busy">
-                <div class="umb-loader"></div>
-            </div>
+            <umb-loader ng-show="busy"></umb-loader>
 
             <div ng-show="error">
                 <div class="alert alert-error">
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/move.html b/src/Umbraco.Web.UI.Client/src/views/mediatypes/move.html
index 0e02c7ad0e..5225a41a0d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/move.html
+++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/move.html
@@ -7,9 +7,7 @@
                     <localize key="contentTypeEditor_folderToMove">Select the folder to move</localize> <strong>{{source.name}}</strong>&nbsp;<localize key="contentTypeEditor_structureBelow">to in the tree structure below</localize>
             </p>
 
-            <div class="umb-loader-wrapper" ng-show="busy">
-                <div class="umb-loader"></div>
-            </div>
+            <umb-loader ng-show="busy"></umb-loader>
 
             <div ng-show="error">
                 <div class="alert alert-error">
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
index 2c70ba5730..2d61e18a79 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
@@ -95,9 +95,8 @@
                    <strong ng-show="!actionInProgress">{{ selectedItemsCount() }} <localize key="general_of">of</localize> {{ listViewResultSet.items.length }} <localize key="general_selected">selected</localize></strong>
                    <strong ng-show="actionInProgress" ng-bind="bulkStatus"></strong>
 
-                   <div class="umb-loader-wrapper -bottom" ng-show="actionInProgress">
-                       <div class="umb-loader"></div>
-                   </div>
+                   <umb-loader position="bottom" ng-show="actionInProgress"></umb-loader>
+
                </umb-editor-sub-header-section>
 
            </umb-editor-sub-header-content-left>

From defcb727f94301faa0b08496f88852bf75657791 Mon Sep 17 00:00:00 2001
From: elitsa <elm@umbraco.dk>
Date: Fri, 16 Aug 2019 13:34:25 +0200
Subject: [PATCH 345/776] Add special checks and preview for svg files media
 files.

---
 .../media/umbmedianodeinfo.directive.js       | 35 +++++++++++++++----
 .../components/media/umb-media-node-info.html | 10 ++++--
 2 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js
index efdeceb78f..677dccf3bb 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js
@@ -1,25 +1,29 @@
 (function () {
     'use strict';
 
-    function MediaNodeInfoDirective($timeout, $location, eventsService, userService, dateHelper) {
+    function MediaNodeInfoDirective($timeout, $location, eventsService, userService, dateHelper, mediaHelper) {
 
         function link(scope, element, attrs, ctrl) {
 
             var evts = [];
-
+            
             function onInit() {
                 // If logged in user has access to the settings section
                 // show the open anchors - if the user doesn't have 
                 // access, contentType is null, see MediaModelMapper
                 scope.allowOpen = scope.node.contentType !== null;
-                
+
                 // get document type details
                 scope.mediaType = scope.node.contentType;
 
                 // set the media link initially
                 setMediaLink();
+
                 // make sure dates are formatted to the user's locale
                 formatDatesToLocal();
+
+                // set media file extension initially
+                setMediaExtension();
             }
 
             function formatDatesToLocal() {
@@ -30,26 +34,43 @@
                 });
             }
 
-            function setMediaLink(){
+            function setMediaLink() {
                 scope.nodeUrl = scope.node.mediaLink;
             }
 
+            function setMediaExtension() {
+                scope.node.extension = mediaHelper.getFileExtension(scope.nodeUrl);
+            }
+
             scope.openMediaType = function (mediaType) {
                 // remove first "#" from url if it is prefixed else the path won't work
                 var url = "/settings/mediaTypes/edit/" + mediaType.id;
                 $location.path(url);
             };
 
+            scope.openSVG = function () {
+                var popup = window.open('', '_blank');
+                var html = '<!DOCTYPE html><body><img src="' + scope.nodeUrl + '"/>' +
+                    '<script>history.pushState(null, null,"' + $location.$$absUrl + '");</script></body>';
+
+                popup.document.open();
+                popup.document.write(html);
+                popup.document.close();
+            }
+
             // watch for content updates - reload content when node is saved, published etc.
-            scope.$watch('node.updateDate', function(newValue, oldValue){
-                if(!newValue) { return; }
-                if(newValue === oldValue) { return; }
+            scope.$watch('node.updateDate', function (newValue, oldValue) {
+                if (!newValue) { return; }
+                if (newValue === oldValue) { return; }
 
                 // Update the media link
                 setMediaLink();
 
                 // Update the create and update dates
                 formatDatesToLocal();
+
+                //Update the media file format
+                setMediaExtension();
             });
 
             //ensure to unregister from all events!
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html b/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
index 7cfcb835a5..5ee68e5cff 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
@@ -12,9 +12,15 @@
 
                 <ul ng-if="nodeUrl" class="nav nav-stacked" style="margin-bottom: 0;">
                     <li>
-                        <a href="{{nodeUrl}}" target="_blank">
+                        <ng-conainer ng-if="node.extension != 'svg'">
+                            <a href="{{nodeUrl}}" target="_blank">
+                                <i class="icon icon-window-popin"></i>
+                                <span>{{nodeUrl}}</span>
+                            </a>
+                        </ng-conainer>
+                        <a ng-if="node.extension == 'svg'">
                             <i class="icon icon-window-popin"></i>
-                            <span>{{nodeUrl}}</span>
+                            <span ng-click="openSVG()">{{nodeUrl}}</span>
                         </a>
                     </li>
                 </ul>

From 7a7adfb61fd6e008fd5a0b402d90ea983d1001a1 Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
Date: Sat, 17 Aug 2019 23:54:49 +0200
Subject: [PATCH 346/776] Fixed typo in "ng-container"

---
 .../src/views/components/media/umb-media-node-info.html       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html b/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
index 5ee68e5cff..3f71ae2d18 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
@@ -12,12 +12,12 @@
 
                 <ul ng-if="nodeUrl" class="nav nav-stacked" style="margin-bottom: 0;">
                     <li>
-                        <ng-conainer ng-if="node.extension != 'svg'">
+                        <ng-container ng-if="node.extension != 'svg'">
                             <a href="{{nodeUrl}}" target="_blank">
                                 <i class="icon icon-window-popin"></i>
                                 <span>{{nodeUrl}}</span>
                             </a>
-                        </ng-conainer>
+                        </ng-container>
                         <a ng-if="node.extension == 'svg'">
                             <i class="icon icon-window-popin"></i>
                             <span ng-click="openSVG()">{{nodeUrl}}</span>

From 890309bc11e42e885134b3b1fde8c6bb6c68341e Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 19 Aug 2019 17:18:45 +1000
Subject: [PATCH 347/776] Fixes SetAllFastSorted and sort orders

---
 .../Testing/Objects/TestDataSource.cs         |  9 ++-
 .../PublishedCache/NuCache/ContentStore.cs    | 13 ++--
 .../NuCache/DataSource/DatabaseDataSource.cs  | 16 ++---
 .../NuCache/DataSource/IDataSource.cs         | 62 ++++++++++++++++++-
 .../NuCache/PublishedSnapshotService.cs       | 10 +--
 5 files changed, 87 insertions(+), 23 deletions(-)

diff --git a/src/Umbraco.Tests/Testing/Objects/TestDataSource.cs b/src/Umbraco.Tests/Testing/Objects/TestDataSource.cs
index 72fb89ab82..2d3b058421 100644
--- a/src/Umbraco.Tests/Testing/Objects/TestDataSource.cs
+++ b/src/Umbraco.Tests/Testing/Objects/TestDataSource.cs
@@ -29,17 +29,24 @@ namespace Umbraco.Tests.Testing.Objects
         public IEnumerable<ContentNodeKit> GetAllContentSources(IScope scope)
             => Kits.Values
                 .OrderBy(x => x.Node.Level)
+                .ThenBy(x => x.Node.ParentContentId)
+                .ThenBy(x => x.Node.SortOrder)
                 .Select(x => x.Clone());
 
         public IEnumerable<ContentNodeKit> GetBranchContentSources(IScope scope, int id)
             => Kits.Values
                 .Where(x => x.Node.Path.EndsWith("," + id) || x.Node.Path.Contains("," + id + ","))
-                .OrderBy(x => x.Node.Level).ThenBy(x => x.Node.SortOrder)
+                .OrderBy(x => x.Node.Level)
+                .ThenBy(x => x.Node.ParentContentId)
+                .ThenBy(x => x.Node.SortOrder)
                 .Select(x => x.Clone());
 
         public IEnumerable<ContentNodeKit> GetTypeContentSources(IScope scope, IEnumerable<int> ids)
             => Kits.Values
                 .Where(x => ids.Contains(x.ContentTypeId))
+                .OrderBy(x => x.Node.Level)
+                .ThenBy(x => x.Node.ParentContentId)
+                .ThenBy(x => x.Node.SortOrder)
                 .Select(x => x.Clone());
 
         public ContentNodeKit GetMediaSource(IScope scope, int id)
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
index 86fc69c302..d07602dd29 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
@@ -609,22 +609,21 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 //  NextSiblingContentId
 
                 ContentNode prev = null;
-                var currLevel = 0;
+                ContentNode currParent = null;
 
                 foreach (var kit in kits)
                 {
-                    if (currLevel != kit.Node.Level)
-                    {
-                        prev = null; //reset since we're on a new level
-                        currLevel = kit.Node.Level;
-                    }   
-
                     if (!BuildKit(kit, out var parentLink)) 
                     {
                         ok = false;
                         continue; // skip that one
                     }
 
+                    if (currParent != null && currParent.Id != parentLink.Value.Id)
+                        prev = null; //changed parent
+
+                    currParent = parentLink.Value;
+
                     _logger.Debug<ContentStore>($"Set {kit.Node.Id} with parent {kit.Node.ParentContentId}");
                     SetValueLocked(_contentNodes, kit.Node.Id, kit.Node);
 
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
index 3b66bd52d0..f07ea7db6b 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
@@ -67,7 +67,7 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
         {
             var sql = ContentSourcesSelect(scope)
                 .Where<NodeDto>(x => x.NodeObjectType == Constants.ObjectTypes.Document && x.NodeId == id && !x.Trashed)
-                .OrderBy<NodeDto>(x => x.Level, x => x.SortOrder);
+                .OrderBy<NodeDto>(x => x.Level, x => x.ParentId, x => x.SortOrder);
 
             var dto = scope.Database.Fetch<ContentSourceDto>(sql).FirstOrDefault();
             return dto == null ? new ContentNodeKit() : CreateContentNodeKit(dto);
@@ -77,7 +77,7 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
         {
             var sql = ContentSourcesSelect(scope)
                 .Where<NodeDto>(x => x.NodeObjectType == Constants.ObjectTypes.Document && !x.Trashed)
-                .OrderBy<NodeDto>(x => x.Level, x => x.SortOrder);
+                .OrderBy<NodeDto>(x => x.Level, x => x.ParentId, x => x.SortOrder);
 
             return scope.Database.Query<ContentSourceDto>(sql).Select(CreateContentNodeKit);
         }
@@ -91,7 +91,7 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
 
                 .Where<NodeDto>(x => x.NodeObjectType == Constants.ObjectTypes.Document && !x.Trashed)
                 .Where<NodeDto>(x => x.NodeId == id, "x")
-                .OrderBy<NodeDto>(x => x.Level, x => x.SortOrder);
+                .OrderBy<NodeDto>(x => x.Level, x => x.ParentId, x => x.SortOrder);
 
             return scope.Database.Query<ContentSourceDto>(sql).Select(CreateContentNodeKit);
         }
@@ -103,7 +103,7 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
             var sql = ContentSourcesSelect(scope)
                 .Where<NodeDto>(x => x.NodeObjectType == Constants.ObjectTypes.Document && !x.Trashed)
                 .WhereIn<ContentDto>(x => x.ContentTypeId, ids)
-                .OrderBy<NodeDto>(x => x.Level, x => x.SortOrder);
+                .OrderBy<NodeDto>(x => x.Level, x => x.ParentId, x => x.SortOrder);
 
             return scope.Database.Query<ContentSourceDto>(sql).Select(CreateContentNodeKit);
         }
@@ -140,7 +140,7 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
         {
             var sql = MediaSourcesSelect(scope)
                 .Where<NodeDto>(x => x.NodeObjectType == Constants.ObjectTypes.Media && x.NodeId == id && !x.Trashed)
-                .OrderBy<NodeDto>(x => x.Level, x => x.SortOrder);
+                .OrderBy<NodeDto>(x => x.Level, x => x.ParentId, x => x.SortOrder);
 
             var dto = scope.Database.Fetch<ContentSourceDto>(sql).FirstOrDefault();
             return dto == null ? new ContentNodeKit() : CreateMediaNodeKit(dto);
@@ -150,7 +150,7 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
         {
             var sql = MediaSourcesSelect(scope)
                 .Where<NodeDto>(x => x.NodeObjectType == Constants.ObjectTypes.Media && !x.Trashed)
-                .OrderBy<NodeDto>(x => x.Level, x => x.SortOrder);
+                .OrderBy<NodeDto>(x => x.Level, x => x.ParentId, x => x.SortOrder);
 
             return scope.Database.Query<ContentSourceDto>(sql).Select(CreateMediaNodeKit);
         }
@@ -164,7 +164,7 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
 
                 .Where<NodeDto>(x => x.NodeObjectType == Constants.ObjectTypes.Media && !x.Trashed)
                 .Where<NodeDto>(x => x.NodeId == id, "x")
-                .OrderBy<NodeDto>(x => x.Level, x => x.SortOrder);
+                .OrderBy<NodeDto>(x => x.Level, x => x.ParentId, x => x.SortOrder);
 
             return scope.Database.Query<ContentSourceDto>(sql).Select(CreateMediaNodeKit);
         }
@@ -176,7 +176,7 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
             var sql = MediaSourcesSelect(scope)
                     .Where<NodeDto>(x => x.NodeObjectType == Constants.ObjectTypes.Media && !x.Trashed)
                     .WhereIn<ContentDto>(x => x.ContentTypeId, ids)
-                    .OrderBy<NodeDto>(x => x.Level, x => x.SortOrder);
+                    .OrderBy<NodeDto>(x => x.Level, x => x.ParentId, x => x.SortOrder);
 
             return scope.Database.Query<ContentSourceDto>(sql).Select(CreateMediaNodeKit);
         }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/IDataSource.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/IDataSource.cs
index 941c7d0caa..ec3ab38e84 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/IDataSource.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/IDataSource.cs
@@ -8,14 +8,70 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
     /// </summary>
     internal interface IDataSource
     {
+        //TODO: For these required sort orders, would sorting on Path 'just work'?
+
         ContentNodeKit GetContentSource(IScope scope, int id);
-        IEnumerable<ContentNodeKit> GetAllContentSources(IScope scope); // must order by level, sortOrder
-        IEnumerable<ContentNodeKit> GetBranchContentSources(IScope scope, int id); // must order by level, sortOrder
+
+        /// <summary>
+        /// Returns all content ordered by level + sortOrder
+        /// </summary>
+        /// <param name="scope"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// MUST be ordered by level + parentId + sortOrder!
+        /// </remarks>
+        IEnumerable<ContentNodeKit> GetAllContentSources(IScope scope);
+
+        /// <summary>
+        /// Returns branch for content ordered by level + sortOrder
+        /// </summary>
+        /// <param name="scope"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// MUST be ordered by level + parentId + sortOrder!
+        /// </remarks>
+        IEnumerable<ContentNodeKit> GetBranchContentSources(IScope scope, int id);
+
+        /// <summary>
+        /// Returns content by Ids ordered by level + sortOrder
+        /// </summary>
+        /// <param name="scope"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// MUST be ordered by level + parentId + sortOrder!
+        /// </remarks>
         IEnumerable<ContentNodeKit> GetTypeContentSources(IScope scope, IEnumerable<int> ids);
 
         ContentNodeKit GetMediaSource(IScope scope, int id);
-        IEnumerable<ContentNodeKit> GetAllMediaSources(IScope scope); // must order by level, sortOrder
+
+        /// <summary>
+        /// Returns all media ordered by level + sortOrder
+        /// </summary>
+        /// <param name="scope"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// MUST be ordered by level + parentId + sortOrder!
+        /// </remarks>
+        IEnumerable<ContentNodeKit> GetAllMediaSources(IScope scope);
+
+        /// <summary>
+        /// Returns branch for media ordered by level + sortOrder
+        /// </summary>
+        /// <param name="scope"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// MUST be ordered by level + parentId + sortOrder!
+        /// </remarks>
         IEnumerable<ContentNodeKit> GetBranchMediaSources(IScope scope, int id); // must order by level, sortOrder
+
+        /// <summary>
+        /// Returns media by Ids ordered by level + sortOrder
+        /// </summary>
+        /// <param name="scope"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// MUST be ordered by level + parentId + sortOrder!
+        /// </remarks>
         IEnumerable<ContentNodeKit> GetTypeMediaSources(IScope scope, IEnumerable<int> ids);
     }
 }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index 5a7ae9e899..f1141da376 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -349,7 +349,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
                 _localContentDb?.Clear();
 
-                // IMPORTANT GetAllContentSources sorts kits by level + sortOrder
+                // IMPORTANT GetAllContentSources sorts kits by level + parentId + sortOrder
                 var kits = _dataSource.GetAllContentSources(scope);
                 return _contentStore.SetAllFastSorted(kits);
             }
@@ -368,7 +368,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
                 var kits = _localContentDb.Select(x => x.Value)
                     .OrderBy(x => x.Node.Level)
-                    .ThenBy(x => x.Node.SortOrder); // IMPORTANT sort by level + sortOrder
+                    .ThenBy(x => x.Node.ParentContentId)
+                    .ThenBy(x => x.Node.SortOrder); // IMPORTANT sort by level + parentId + sortOrder
                 return _contentStore.SetAllFastSorted(kits);
             }
         }
@@ -424,7 +425,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 _localMediaDb?.Clear();
 
                 _logger.Debug<PublishedSnapshotService>("Loading media from database...");
-                // IMPORTANT GetAllMediaSources sorts kits by level + sortOrder
+                // IMPORTANT GetAllMediaSources sorts kits by level + parentId + sortOrder
                 var kits = _dataSource.GetAllMediaSources(scope);
                 return _mediaStore.SetAllFastSorted(kits);
             }
@@ -443,7 +444,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
                 var kits = _localMediaDb.Select(x => x.Value)
                     .OrderBy(x => x.Node.Level)
-                    .ThenBy(x => x.Node.SortOrder); // IMPORTANT sort by level + order; 
+                    .ThenBy(x => x.Node.ParentContentId)
+                    .ThenBy(x => x.Node.SortOrder); // IMPORTANT sort by level + parentId + sortOrder
                 return _mediaStore.SetAllFastSorted(kits);
             }
              

From f2a22e984390f5445d13fc02981eed8c53d87ced Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 19 Aug 2019 22:07:22 +1000
Subject: [PATCH 348/776] Ensure we throw an exception when a fatal Exception
 is caught instead of swallowing

---
 .../PublishedContent/NuCacheChildrenTests.cs  | 20 ++++++++++++-------
 .../Testing/Objects/TestDataSource.cs         |  8 ++++----
 .../PublishedCache/NuCache/ContentStore.cs    |  2 +-
 .../NuCache/PublishedSnapshotService.cs       | 14 +++++++------
 4 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
index 2eb3c280b2..47572a63ee 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
@@ -79,12 +79,16 @@ namespace Umbraco.Tests.PublishedContent
                 _contentTypeVariant
             };
 
-            var contentTypeService = Mock.Of<IContentTypeService>();
-            Mock.Get(contentTypeService).Setup(x => x.GetAll()).Returns(contentTypes);
-            Mock.Get(contentTypeService).Setup(x => x.GetAll(It.IsAny<int[]>())).Returns(contentTypes);
+            var contentTypeService = new Mock<IContentTypeService>();
+            contentTypeService.Setup(x => x.GetAll()).Returns(contentTypes);
+            contentTypeService.Setup(x => x.GetAll(It.IsAny<int[]>())).Returns(contentTypes);
 
-            var contentTypeServiceBaseFactory = Mock.Of<IContentTypeBaseServiceProvider>();
-            Mock.Get(contentTypeServiceBaseFactory).Setup(x => x.For(It.IsAny<IContentBase>())).Returns(contentTypeService);
+            var mediaTypeService = new Mock<IMediaTypeService>();
+            mediaTypeService.Setup(x => x.GetAll()).Returns(Enumerable.Empty<IMediaType>());
+            mediaTypeService.Setup(x => x.GetAll(It.IsAny<int[]>())).Returns(Enumerable.Empty<IMediaType>());
+
+            var contentTypeServiceBaseFactory = new Mock<IContentTypeBaseServiceProvider>();
+            contentTypeServiceBaseFactory.Setup(x => x.For(It.IsAny<IContentBase>())).Returns(contentTypeService.Object);
 
             var dataTypeService = Mock.Of<IDataTypeService>();
             Mock.Get(dataTypeService).Setup(x => x.GetAll()).Returns(dataTypes);
@@ -94,8 +98,10 @@ namespace Umbraco.Tests.PublishedContent
                 dataTypeService: dataTypeService,
                 memberTypeService: Mock.Of<IMemberTypeService>(),
                 memberService: Mock.Of<IMemberService>(),
-                contentTypeService: contentTypeService,
-                localizationService: Mock.Of<ILocalizationService>()
+                contentTypeService: contentTypeService.Object,
+                mediaTypeService: mediaTypeService.Object,
+                localizationService: Mock.Of<ILocalizationService>(),
+                domainService: Mock.Of<IDomainService>()
             );
 
             // create a scope provider
diff --git a/src/Umbraco.Tests/Testing/Objects/TestDataSource.cs b/src/Umbraco.Tests/Testing/Objects/TestDataSource.cs
index 2d3b058421..0291715e46 100644
--- a/src/Umbraco.Tests/Testing/Objects/TestDataSource.cs
+++ b/src/Umbraco.Tests/Testing/Objects/TestDataSource.cs
@@ -51,22 +51,22 @@ namespace Umbraco.Tests.Testing.Objects
 
         public ContentNodeKit GetMediaSource(IScope scope, int id)
         {
-            throw new NotImplementedException();
+            return default;
         }
 
         public IEnumerable<ContentNodeKit> GetAllMediaSources(IScope scope)
         {
-            throw new NotImplementedException();
+            return Enumerable.Empty<ContentNodeKit>();
         }
 
         public IEnumerable<ContentNodeKit> GetBranchMediaSources(IScope scope, int id)
         {
-            throw new NotImplementedException();
+            return Enumerable.Empty<ContentNodeKit>();
         }
 
         public IEnumerable<ContentNodeKit> GetTypeMediaSources(IScope scope, IEnumerable<int> ids)
         {
-            throw new NotImplementedException();
+            return Enumerable.Empty<ContentNodeKit>();
         }
     }
 }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
index d07602dd29..b9d1e0edf7 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
@@ -588,7 +588,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
         /// <param name="kits"></param>
         /// <returns></returns>
         /// <remarks>
-        /// This requires that the collection is sorted by Level + Sort Order.
+        /// This requires that the collection is sorted by Level + ParentId + Sort Order. 
         /// This should be used only on a site startup as the first generations.
         /// </remarks>
         internal bool SetAllFastSorted(IEnumerable<ContentNodeKit> kits)
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index f1141da376..6f60ed86ab 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -178,11 +178,12 @@ namespace Umbraco.Web.PublishedCache.NuCache
             {
                 // populate the stores
 
+
+                var okContent = false;
+                var okMedia = false;
+
                 try
                 {
-                    var okContent = false;
-                    var okMedia = false;
-
                     if (_localDbExists)
                     {
                         okContent = LockAndLoadContent(LoadContentFromLocalDbLocked);
@@ -204,6 +205,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 catch (Exception ex)
                 {
                     _logger.Fatal<PublishedSnapshotService>(ex, "Panic, exception while loading cache data.");
+                    throw;
                 }
 
                 // finally, cache is ready!
@@ -316,7 +318,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         private bool LockAndLoadContent(Func<IScope, bool> action)
         {
-            
+
 
             // first get a writer, then a scope
             // if there already is a scope, the writer will attach to it
@@ -343,7 +345,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             _contentStore.SetAllContentTypes(contentTypes);
 
             using (_logger.TraceDuration<PublishedSnapshotService>("Loading content from database"))
-            {   
+            {
                 // beware! at that point the cache is inconsistent,
                 // assuming we are going to SetAll content items!
 
@@ -448,7 +450,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     .ThenBy(x => x.Node.SortOrder); // IMPORTANT sort by level + parentId + sortOrder
                 return _mediaStore.SetAllFastSorted(kits);
             }
-             
+
         }
 
         // keep these around - might be useful

From e18f73e74cdafdc4d4196eb2d976b344bda3eefb Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 19 Aug 2019 22:07:46 +1000
Subject: [PATCH 349/776] removes todo

---
 .../NuCache/DataSource/BTree.ContentNodeKitSerializer.cs         | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.ContentNodeKitSerializer.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.ContentNodeKitSerializer.cs
index 142a2c36db..f799869850 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.ContentNodeKitSerializer.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.ContentNodeKitSerializer.cs
@@ -41,7 +41,6 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
             PrimitiveSerializer.String.WriteTo(value.Node.Path, stream);
             PrimitiveSerializer.Int32.WriteTo(value.Node.SortOrder, stream);
             PrimitiveSerializer.Int32.WriteTo(value.Node.ParentContentId, stream);
-            //TODO: Why don't we write the FirstChildContentId + NextSiblingContentId? Then we can entirely avoid all overhead when loading on startup?
             PrimitiveSerializer.DateTime.WriteTo(value.Node.CreateDate, stream);
             PrimitiveSerializer.Int32.WriteTo(value.Node.CreatorId, stream);
             PrimitiveSerializer.Int32.WriteTo(value.ContentTypeId, stream);

From fb38d9afe17a7f1b5c447f3922dbd1d9e25b57b4 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 19 Aug 2019 23:22:27 +1000
Subject: [PATCH 350/776] Merges - double linked list for children performance
 + updates

---
 .../PublishedCache/NuCache/ContentNode.cs     |   8 ++
 .../PublishedCache/NuCache/ContentStore.cs    | 136 +++++++++++++-----
 .../NuCache/PublishedSnapshotService.cs       |  32 ++---
 3 files changed, 125 insertions(+), 51 deletions(-)

diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs
index 1e8d5ddfc9..7379277be4 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs
@@ -12,7 +12,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
         public ContentNode()
         {
             FirstChildContentId = -1;
+            LastChildContentId = -1;
             NextSiblingContentId = -1;
+            PreviousSiblingContentId = -1;
         }
 
         // special ctor with no content data - for members
@@ -58,7 +60,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
             SortOrder = sortOrder;
             ParentContentId = parentContentId;
             FirstChildContentId = -1;
+            LastChildContentId = -1;
             NextSiblingContentId = -1;
+            PreviousSiblingContentId = -1;
             CreateDate = createDate;
             CreatorId = creatorId;
         }
@@ -95,7 +99,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
             SortOrder = origin.SortOrder;
             ParentContentId = origin.ParentContentId;
             FirstChildContentId = origin.FirstChildContentId;
+            LastChildContentId = origin.LastChildContentId;
             NextSiblingContentId = origin.NextSiblingContentId;
+            PreviousSiblingContentId = origin.PreviousSiblingContentId;
             CreateDate = origin.CreateDate;
             CreatorId = origin.CreatorId;
 
@@ -119,7 +125,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
         public readonly int SortOrder;
         public readonly int ParentContentId;
         public int FirstChildContentId;
+        public int LastChildContentId;
         public int NextSiblingContentId;
+        public int PreviousSiblingContentId;
         public readonly DateTime CreateDate;
         public readonly int CreatorId;
 
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
index b9d1e0edf7..d6631b779d 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
@@ -128,7 +128,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 Monitor.Enter(_rlocko, ref rtaken);
 
                 // see SnapDictionary
-                try { } finally
+                try { }
+                finally
                 {
                     _wlocked++;
                     lockInfo.Count = true;
@@ -277,8 +278,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         public void UpdateContentTypes(IEnumerable<IPublishedContentType> types)
         {
-            //nothing to do if this is empty, no need to lock/allocate/iterate/etc...            
-            if (!types.Any()) return; 
+            //nothing to do if this is empty, no need to lock/allocate/iterate/etc...
+            if (!types.Any()) return;
 
             var lockInfo = new WriteLockInfo();
             try
@@ -550,13 +551,13 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 if (existing == null)
                 {
                     // new, add to parent
-                    AddNodeLocked(kit.Node, parent);
+                    AddTreeNodeLocked(kit.Node, parent);
                 }
                 else if (moving || existing.SortOrder != kit.Node.SortOrder)
                 {
                     // moved, remove existing from its parent, add content to its parent
-                    RemoveNodeLocked(existing);
-                    AddNodeLocked(kit.Node);
+                    RemoveTreeNodeLocked(existing);
+                    AddTreeNodeLocked(kit.Node);
                 }
                 else
                 {
@@ -583,13 +584,16 @@ namespace Umbraco.Web.PublishedCache.NuCache
         }
 
         /// <summary>
-        /// Builds all kits without any sorting or generation checks
+        /// Builds all kits on startup using a fast forward only cursor
         /// </summary>
-        /// <param name="kits"></param>
+        /// <param name="kits">
+        /// All kits sorted by Level + Parent Id + Sort order
+        /// </param>
         /// <returns></returns>
         /// <remarks>
         /// This requires that the collection is sorted by Level + ParentId + Sort Order. 
         /// This should be used only on a site startup as the first generations.
+        /// This CANNOT be used after startup since it bypasses all checks for Generations.
         /// </remarks>
         internal bool SetAllFastSorted(IEnumerable<ContentNodeKit> kits)
         {
@@ -602,11 +606,11 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 ClearLocked(_contentNodes);
                 ClearRootLocked();
 
-                //these are ordered by level + sort order
-
                 // The name of the game here is to populate each kit's
                 //  FirstChildContentId
+                //  LastChildContentId
                 //  NextSiblingContentId
+                //  PreviousSiblingContentId
 
                 ContentNode prev = null;
                 ContentNode currParent = null;
@@ -620,20 +624,28 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     }
 
                     if (currParent != null && currParent.Id != parentLink.Value.Id)
-                        prev = null; //changed parent
-
+                    {
+                        //the parent is changing so that means the prev tracked one is the last child
+                        currParent.LastChildContentId = prev.Id;
+                        //changed parent, reset prev
+                        prev = null; 
+                    }
+                    
                     currParent = parentLink.Value;
 
                     _logger.Debug<ContentStore>($"Set {kit.Node.Id} with parent {kit.Node.ParentContentId}");
                     SetValueLocked(_contentNodes, kit.Node.Id, kit.Node);
 
                     //if the parent's FirstChildContentId isn't set, then it must be the current one
-                    if (parentLink.Value.FirstChildContentId < 0)
-                        parentLink.Value.FirstChildContentId = kit.Node.Id;
+                    if (currParent.FirstChildContentId < 0)
+                        currParent.FirstChildContentId = kit.Node.Id;
 
                     //if there is a previous one on the same level then set it's next sibling id to the current oen
                     if (prev != null)
+                    {
                         prev.NextSiblingContentId = kit.Node.Id;
+                        kit.Node.PreviousSiblingContentId = prev.Id;
+                    }   
 
                     //store the prev
                     prev = kit.Node;
@@ -675,7 +687,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     SetValueLocked(_contentNodes, kit.Node.Id, kit.Node);
 
                     if (_localDb != null) RegisterChange(kit.Node.Id, kit);
-                    AddNodeLocked(kit.Node, parent);
+                    AddTreeNodeLocked(kit.Node, parent);
 
                     _xmap[kit.Node.Uid] = kit.Node.Id;
                 }
@@ -705,7 +717,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 if (existing != null)
                 {
                     ClearBranchLocked(existing);
-                    RemoveNodeLocked(existing);
+                    RemoveTreeNodeLocked(existing);
                 }
 
                 // now add them all back
@@ -718,7 +730,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     }
                     SetValueLocked(_contentNodes, kit.Node.Id, kit.Node);
                     if (_localDb != null) RegisterChange(kit.Node.Id, kit);
-                    AddNodeLocked(kit.Node, parent);
+                    AddTreeNodeLocked(kit.Node, parent);
 
                     _xmap[kit.Node.Uid] = kit.Node.Id;
                 }
@@ -750,7 +762,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 ClearBranchLocked(content);
 
                 // manage the tree
-                RemoveNodeLocked(content);
+                RemoveTreeNodeLocked(content);
 
                 return true;
             }
@@ -798,6 +810,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
             throw new PanicException($"failed to get {description} with id={id}");
         }
 
+        /// <summary>
+        /// Gets the parent link node, may be null or root if ParentContentId is less than 0
+        /// </summary>
         private LinkedNode<ContentNode> GetParentLink(ContentNode content)
         {
             if (content.ParentContentId < 0) return _root;
@@ -816,7 +831,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             return content.ParentContentId < 0 ? _root : GetRequiredLinkedNode(content.ParentContentId, "parent");
         }
 
-        private void RemoveNodeLocked(ContentNode content)
+        private void RemoveTreeNodeLocked(ContentNode content)
         {
             var parentLink = content.ParentContentId < 0
                 ? _root
@@ -828,24 +843,38 @@ namespace Umbraco.Web.PublishedCache.NuCache
             if (parent.FirstChildContentId < 0)
                 throw new PanicException("no children");
 
-            // if first, clone parent + remove first child
             if (parent.FirstChildContentId == content.Id)
             {
+                // if first, clone parent + remove first child
                 parent = GenCloneLocked(parentLink);
                 parent.FirstChildContentId = content.NextSiblingContentId;
             }
-            else
+
+            if (parent.LastChildContentId == content.Id)
             {
-                // iterate children until the previous child
-                var link = GetRequiredLinkedNode(parent.FirstChildContentId, "first child");
-
-                while (link.Value.NextSiblingContentId != content.Id)
-                    link = GetRequiredLinkedNode(link.Value.NextSiblingContentId, "next child");
-
-                // clone the previous child and replace next child
-                var prevChild = GenCloneLocked(link);
-                prevChild.NextSiblingContentId = content.NextSiblingContentId;
+                // if last, clone parent + remove last child
+                parent = GenCloneLocked(parentLink);
+                parent.LastChildContentId = content.PreviousSiblingContentId;
             }
+
+            // maintain linked list
+
+            if (content.NextSiblingContentId > 0)
+            {
+                var nextLink = GetRequiredLinkedNode(content.NextSiblingContentId, "next sibling");
+                var next = GenCloneLocked(nextLink);
+                next.PreviousSiblingContentId = content.PreviousSiblingContentId;
+            }
+
+            if (content.PreviousSiblingContentId > 0)
+            {
+                var prevLink = GetRequiredLinkedNode(content.PreviousSiblingContentId, "previous sibling");
+                var prev = GenCloneLocked(prevLink);
+                prev.NextSiblingContentId = content.NextSiblingContentId;
+            }
+
+            content.NextSiblingContentId = -1;
+            content.PreviousSiblingContentId = -1;
         }
 
         private bool ParentPublishedLocked(ContentNodeKit kit)
@@ -873,7 +902,10 @@ namespace Umbraco.Web.PublishedCache.NuCache
             return node;
         }
 
-        private void AddNodeLocked(ContentNode content, LinkedNode<ContentNode> parentLink = null)
+        /// <summary>
+        /// Adds a node to the tree structure.
+        /// </summary>
+        private void AddTreeNodeLocked(ContentNode content, LinkedNode<ContentNode> parentLink = null)
         {
             parentLink = parentLink ?? GetRequiredParentLink(content);
 
@@ -884,6 +916,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             {
                 parent = GenCloneLocked(parentLink);
                 parent.FirstChildContentId = content.Id;
+                parent.LastChildContentId = content.Id;
                 return;
             }
 
@@ -896,12 +929,40 @@ namespace Umbraco.Web.PublishedCache.NuCache
             if (child.SortOrder > content.SortOrder)
             {
                 content.NextSiblingContentId = parent.FirstChildContentId;
+                content.PreviousSiblingContentId = -1;
+
                 parent = GenCloneLocked(parentLink);
                 parent.FirstChildContentId = content.Id;
+
+                child = GenCloneLocked(childLink);
+                child.PreviousSiblingContentId = content.Id;
+
                 return;
             }
 
-            // else lookup position
+            // get parent's last child
+            var lastChildLink = GetRequiredLinkedNode(parent.LastChildContentId, "last child");
+            var lastChild = lastChildLink.Value;
+
+            // if last, clone parent + append as last child
+            if (lastChild.SortOrder <= content.SortOrder)
+            {
+                content.PreviousSiblingContentId = parent.LastChildContentId;
+                content.NextSiblingContentId = -1;
+
+                parent = GenCloneLocked(parentLink);
+                parent.LastChildContentId = content.Id;
+
+                lastChild = GenCloneLocked(lastChildLink);
+                lastChild.NextSiblingContentId = content.Id;
+
+                return;
+            }
+
+            // else it's going somewhere in the middle,
+            // and this is bad, perfs-wise - we only do it when moving
+            // inserting in linked list is slow, optimizing would require trees
+            // but... that should not happen very often - and not on large amount of data
             while (child.NextSiblingContentId > 0)
             {
                 // get next child
@@ -913,8 +974,14 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 if (nextChild.SortOrder > content.SortOrder)
                 {
                     content.NextSiblingContentId = nextChild.Id;
+                    content.PreviousSiblingContentId = nextChild.PreviousSiblingContentId;
+
                     child = GenCloneLocked(childLink);
                     child.NextSiblingContentId = content.Id;
+
+                    var nnext = GenCloneLocked(nextChildLink);
+                    nnext.PreviousSiblingContentId = content.Id;
+
                     return;
                 }
 
@@ -922,9 +989,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 child = nextChild;
             }
 
-            // if last, clone previous + append
-            child = GenCloneLocked(childLink);
-            child.NextSiblingContentId = content.Id;
+            // should never get here
+            throw new Exception("panic: no more children.");
         }
 
         // replaces the root node
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index 6f60ed86ab..15e6574b40 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -160,7 +160,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
             _domainStore = new SnapDictionary<int, Domain>();
 
-            publishedModelFactory.WithSafeLiveFactory(LoadCaches);
+            publishedModelFactory.WithSafeLiveFactory(LoadCachesOnStartup);
 
             Guid GetUid(ContentStore store, int id) => store.LiveSnapshot.Get(id)?.Uid ?? default;
             int GetId(ContentStore store, Guid uid) => store.LiveSnapshot.Get(uid)?.Id ?? default;
@@ -172,7 +172,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             }
         }
 
-        private void LoadCaches()
+        private void LoadCachesOnStartup()
         {
             lock (_storesLock)
             {
@@ -186,19 +186,19 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 {
                     if (_localDbExists)
                     {
-                        okContent = LockAndLoadContent(LoadContentFromLocalDbLocked);
+                        okContent = LockAndLoadContent(scope => LoadContentFromLocalDbLocked(true));
                         if (!okContent)
                             _logger.Warn<PublishedSnapshotService>("Loading content from local db raised warnings, will reload from database.");
-                        okMedia = LockAndLoadMedia(LoadMediaFromLocalDbLocked);
+                        okMedia = LockAndLoadMedia(scope => LoadMediaFromLocalDbLocked(true));
                         if (!okMedia)
                             _logger.Warn<PublishedSnapshotService>("Loading media from local db raised warnings, will reload from database.");
                     }
 
                     if (!okContent)
-                        LockAndLoadContent(LoadContentFromDatabaseLocked);
+                        LockAndLoadContent(scope => LoadContentFromDatabaseLocked(scope, true));
 
                     if (!okMedia)
-                        LockAndLoadMedia(LoadMediaFromDatabaseLocked);
+                        LockAndLoadMedia(scope => LoadMediaFromDatabaseLocked(scope, true));
 
                     LockAndLoadDomains();
                 }
@@ -333,7 +333,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             }
         }
 
-        private bool LoadContentFromDatabaseLocked(IScope scope)
+        private bool LoadContentFromDatabaseLocked(IScope scope, bool onStartup)
         {
             // locks:
             // contentStore is wlocked (1 thread)
@@ -353,11 +353,11 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
                 // IMPORTANT GetAllContentSources sorts kits by level + parentId + sortOrder
                 var kits = _dataSource.GetAllContentSources(scope);
-                return _contentStore.SetAllFastSorted(kits);
+                return onStartup ? _contentStore.SetAllFastSorted(kits) : _contentStore.SetAll(kits);
             }
         }
 
-        private bool LoadContentFromLocalDbLocked(IScope scope)
+        private bool LoadContentFromLocalDbLocked(bool onStartup)
         {
             var contentTypes = _serviceContext.ContentTypeService.GetAll()
                     .Select(x => _publishedContentTypeFactory.CreateContentType(x));
@@ -372,7 +372,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     .OrderBy(x => x.Node.Level)
                     .ThenBy(x => x.Node.ParentContentId)
                     .ThenBy(x => x.Node.SortOrder); // IMPORTANT sort by level + parentId + sortOrder
-                return _contentStore.SetAllFastSorted(kits);
+                return onStartup ? _contentStore.SetAllFastSorted(kits) : _contentStore.SetAll(kits);
             }
         }
 
@@ -411,7 +411,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             }
         }
 
-        private bool LoadMediaFromDatabaseLocked(IScope scope)
+        private bool LoadMediaFromDatabaseLocked(IScope scope, bool onStartup)
         {
             // locks & notes: see content
 
@@ -429,11 +429,11 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 _logger.Debug<PublishedSnapshotService>("Loading media from database...");
                 // IMPORTANT GetAllMediaSources sorts kits by level + parentId + sortOrder
                 var kits = _dataSource.GetAllMediaSources(scope);
-                return _mediaStore.SetAllFastSorted(kits);
+                return onStartup ? _mediaStore.SetAllFastSorted(kits) : _mediaStore.SetAll(kits);
             }
         }
 
-        private bool LoadMediaFromLocalDbLocked(IScope scope)
+        private bool LoadMediaFromLocalDbLocked(bool onStartup)
         {
             var mediaTypes = _serviceContext.MediaTypeService.GetAll()
                     .Select(x => _publishedContentTypeFactory.CreateContentType(x));
@@ -448,7 +448,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     .OrderBy(x => x.Node.Level)
                     .ThenBy(x => x.Node.ParentContentId)
                     .ThenBy(x => x.Node.SortOrder); // IMPORTANT sort by level + parentId + sortOrder
-                return _mediaStore.SetAllFastSorted(kits);
+                return onStartup ? _mediaStore.SetAllFastSorted(kits) : _mediaStore.SetAll(kits);
             }
 
         }
@@ -628,7 +628,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     using (var scope = _scopeProvider.CreateScope())
                     {
                         scope.ReadLock(Constants.Locks.ContentTree);
-                        LoadContentFromDatabaseLocked(scope);
+                        LoadContentFromDatabaseLocked(scope, false);
                         scope.Complete();
                     }
                     draftChanged = publishedChanged = true;
@@ -721,7 +721,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     using (var scope = _scopeProvider.CreateScope())
                     {
                         scope.ReadLock(Constants.Locks.MediaTree);
-                        LoadMediaFromDatabaseLocked(scope);
+                        LoadMediaFromDatabaseLocked(scope, false);
                         scope.Complete();
                     }
                     anythingChanged = true;

From f4acb86ac7adec7d94efbaf13a93e88a1c5f4e12 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 19 Aug 2019 23:32:52 +1000
Subject: [PATCH 351/776] fixes tests

---
 .../PublishedContent/NuCacheTests.cs          | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
index 9f20f42993..44df5c20cb 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Linq;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Core;
@@ -128,12 +129,16 @@ namespace Umbraco.Tests.PublishedContent
                 _contentType
             };
 
-            var contentTypeService = Mock.Of<IContentTypeService>();
-            Mock.Get(contentTypeService).Setup(x => x.GetAll()).Returns(contentTypes);
-            Mock.Get(contentTypeService).Setup(x => x.GetAll(It.IsAny<int[]>())).Returns(contentTypes);
+            var contentTypeService = new Mock<IContentTypeService>();
+            contentTypeService.Setup(x => x.GetAll()).Returns(contentTypes);
+            contentTypeService.Setup(x => x.GetAll(It.IsAny<int[]>())).Returns(contentTypes);
 
-            var contentTypeServiceBaseFactory = Mock.Of<IContentTypeBaseServiceProvider>();
-            Mock.Get(contentTypeServiceBaseFactory).Setup(x => x.For(It.IsAny<IContentBase>())).Returns(contentTypeService);
+            var mediaTypeService = new Mock<IMediaTypeService>();
+            mediaTypeService.Setup(x => x.GetAll()).Returns(Enumerable.Empty<IMediaType>());
+            mediaTypeService.Setup(x => x.GetAll(It.IsAny<int[]>())).Returns(Enumerable.Empty<IMediaType>());
+
+            var contentTypeServiceBaseFactory = new Mock<IContentTypeBaseServiceProvider>();
+            contentTypeServiceBaseFactory.Setup(x => x.For(It.IsAny<IContentBase>())).Returns(contentTypeService.Object);
 
             var dataTypeService = Mock.Of<IDataTypeService>();
             Mock.Get(dataTypeService).Setup(x => x.GetAll()).Returns(dataTypes);
@@ -143,8 +148,10 @@ namespace Umbraco.Tests.PublishedContent
                 dataTypeService: dataTypeService,
                 memberTypeService: Mock.Of<IMemberTypeService>(),
                 memberService: Mock.Of<IMemberService>(),
-                contentTypeService: contentTypeService,
-                localizationService: Mock.Of<ILocalizationService>()
+                contentTypeService: contentTypeService.Object,
+                mediaTypeService: mediaTypeService.Object,
+                localizationService: Mock.Of<ILocalizationService>(),
+                domainService: Mock.Of<IDomainService>()
             );
 
             // create a scope provider

From b9b4721295125ca16a481e2a2bfd83ff906887d6 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Mon, 19 Aug 2019 14:36:56 +0100
Subject: [PATCH 352/776] * Adds TinyMCE JS assets into init page load via
 script in default.cshtml view for Umbraco backoffice ng-app * Add TinyMCE JS
 assets array via NG app.value & uses assetsService to load (if not loaded in
 time by main init script above)

---
 .../propertyeditors/rte/rte.controller.js     |  8 ++---
 .../Umbraco/Views/Default.cshtml              |  3 ++
 .../Editors/BackOfficeController.cs           | 23 ++++++++++++++
 .../HtmlHelperBackOfficeExtensions.cs         | 16 ++++++++++
 .../JavaScript/JsInitialization.cs            | 31 +++++++++++++++++++
 .../JavaScript/Resources.Designer.cs          | 12 +++++++
 src/Umbraco.Web/JavaScript/Resources.resx     |  5 ++-
 .../JavaScript/TinyMceInitialize.js           | 19 ++++++++++++
 src/Umbraco.Web/Umbraco.Web.csproj            |  1 +
 9 files changed, 113 insertions(+), 5 deletions(-)
 create mode 100644 src/Umbraco.Web/JavaScript/TinyMceInitialize.js

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
index 52b105201e..48170fb4b7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
@@ -1,6 +1,6 @@
 angular.module("umbraco")
     .controller("Umbraco.PropertyEditors.RTEController",
-        function ($scope, $q, assetsService, $timeout, tinyMceService, angularHelper) {
+        function ($scope, $q, assetsService, $timeout, tinyMceService, angularHelper, tinyMceAssets) {
 
             // TODO: A lot of the code below should be shared between the grid rte and the normal rte
 
@@ -30,9 +30,9 @@ angular.module("umbraco")
             var promises = [];
 
             //queue file loading
-            if (typeof tinymce === "undefined") { // Don't reload tinymce if already loaded
-                promises.push(assetsService.loadJs("lib/tinymce/tinymce.min.js", $scope));
-            }
+            tinyMceAssets.forEach(function (tinyJsAsset) {
+                promises.push(assetsService.loadJs(tinyJsAsset, $scope));
+            });
 
             //stores a reference to the editor
             var tinyMceEditor = null;
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
index 3574d5d175..00ab8e0166 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
@@ -119,6 +119,8 @@
         document.angularReady = function(app) {
             @Html.AngularValueExternalLoginInfoScript(ViewData.GetExternalSignInError())
             @Html.AngularValueResetPasswordCodeInfoScript(ViewData["PasswordResetCode"])
+            @Html.AngularValueTinyMceAssets()
+
             //required for the noscript trick
             document.getElementById("mainwrapper").style.display = "inherit";
         }
@@ -126,6 +128,7 @@
 
     <script src="lib/lazyload-js/lazyload.min.js"></script>
     <script src="@Url.GetUrlWithCacheBust("Application", "BackOffice")"></script>
+    <script src="@Url.Action("TinyMceEditor", "BackOffice")" async defer></script>
 
     @if (isDebug)
     {
diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
index 34022f8f9f..72a9d6f6b1 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -28,6 +28,7 @@ using Umbraco.Web.JavaScript;
 using Umbraco.Web.Security;
 using Constants = Umbraco.Core.Constants;
 using JArray = Newtonsoft.Json.Linq.JArray;
+using System.Text;
 
 namespace Umbraco.Web.Editors
 {
@@ -210,6 +211,28 @@ namespace Umbraco.Web.Editors
             return JavaScript(result);
         }
 
+        [MinifyJavaScriptResult(Order = 0)]
+        [OutputCache(Order = 1, VaryByParam = "none", Location = OutputCacheLocation.Server, Duration = 5000)]
+        public JavaScriptResult TinyMceEditor()
+        {
+            var files = JsInitialization.OptimizeTinyMceScriptFiles(HttpContext);
+
+            var rawJS = new StringBuilder();
+            rawJS.AppendLine("LazyLoad.js([");
+            var first = true;
+            foreach (var file in files)
+            {
+                if (first) first = false;
+                else rawJS.AppendLine(",");
+                rawJS.Append("\"");
+                rawJS.Append(file);
+                rawJS.Append("\"");
+
+            }
+            rawJS.Append("]);");
+            return JavaScript(rawJS.ToString());
+        }
+
         /// <summary>
         /// Returns a js array of all of the manifest assets
         /// </summary>
diff --git a/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs b/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
index 26a1d97f67..1d518fa1d3 100644
--- a/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
+++ b/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
@@ -13,6 +13,7 @@ using Umbraco.Web.Models;
 namespace Umbraco.Web
 {
     using Core.Configuration;
+    using Umbraco.Web.JavaScript;
 
     /// <summary>
     /// HtmlHelper extensions for the back office
@@ -118,6 +119,21 @@ namespace Umbraco.Web
             sb.AppendLine(JsonConvert.SerializeObject(resetCodeModel));
             sb.AppendLine(@"});");
 
+            return html.Raw(sb.ToString());
+        }
+
+        public static IHtmlString AngularValueTinyMceAssets(this HtmlHelper html)
+        {
+            var ctx = new HttpContextWrapper(HttpContext.Current);
+            var files = JsInitialization.OptimizeTinyMceScriptFiles(ctx);
+
+            var sb = new StringBuilder();
+
+            sb.AppendLine(@"app.value(""tinyMceAssets"",");
+            sb.AppendLine(JsonConvert.SerializeObject(files));
+            sb.AppendLine(@");");
+
+
             return html.Raw(sb.ToString());
         }
     }
diff --git a/src/Umbraco.Web/JavaScript/JsInitialization.cs b/src/Umbraco.Web/JavaScript/JsInitialization.cs
index 638b1bf5b4..b8726e73c3 100644
--- a/src/Umbraco.Web/JavaScript/JsInitialization.cs
+++ b/src/Umbraco.Web/JavaScript/JsInitialization.cs
@@ -60,6 +60,26 @@ namespace Umbraco.Web.JavaScript
             return WriteScript(jarray.ToString(), IOHelper.ResolveUrl(SystemDirectories.Umbraco), angularModule);
         }
 
+        public static string GetTinyJavascriptInitialization(HttpContextBase httpContext, IEnumerable<string> scripts)
+        {
+            var rawJs = new StringBuilder();
+            rawJs.AppendLine("LazyLoad.js([");
+
+            var first = true;
+            foreach (var file in scripts)
+            {
+                if (first) first = false;
+                else rawJs.AppendLine(",");
+                rawJs.Append("\"");
+                rawJs.Append(file);
+                rawJs.Append("\"");
+
+            }
+            rawJs.Append("]);");
+
+            return rawJs.ToString();
+        }
+
         /// <summary>
         /// Returns a list of optimized script paths for the back office
         /// </summary>
@@ -131,6 +151,17 @@ namespace Umbraco.Web.JavaScript
             return resources.Where(x => x.Type == JTokenType.String).Select(x => x.ToString());
         }
 
+        internal static IEnumerable<string> GetTinyMceInitialization()
+        {
+            var resources = JsonConvert.DeserializeObject<JArray>(Resources.TinyMceInitialize);
+            return resources.Where(x => x.Type == JTokenType.String).Select(x => x.ToString());
+        }
+
+        internal static IEnumerable<string> OptimizeTinyMceScriptFiles(HttpContextBase httpContext)
+        {
+            return OptimizeScriptFiles(httpContext, GetTinyMceInitialization());
+        }
+
         /// <summary>
         /// Parses the JsResources.Main and replaces the replacement tokens accordingly.
         /// </summary>
diff --git a/src/Umbraco.Web/JavaScript/Resources.Designer.cs b/src/Umbraco.Web/JavaScript/Resources.Designer.cs
index ca571b1186..f11839f6ca 100644
--- a/src/Umbraco.Web/JavaScript/Resources.Designer.cs
+++ b/src/Umbraco.Web/JavaScript/Resources.Designer.cs
@@ -146,5 +146,17 @@ namespace Umbraco.Web.JavaScript {
                 return ResourceManager.GetString("ServerVariables", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to [
+        ///    &apos;../lib/tinymce/tinymce.min.js&apos;,
+        ///]
+        ///.
+        /// </summary>
+        internal static string TinyMceInitialize {
+            get {
+                return ResourceManager.GetString("TinyMceInitialize", resourceCulture);
+            }
+        }
     }
 }
diff --git a/src/Umbraco.Web/JavaScript/Resources.resx b/src/Umbraco.Web/JavaScript/Resources.resx
index 95526f51e7..1adcaeeb4a 100644
--- a/src/Umbraco.Web/JavaScript/Resources.resx
+++ b/src/Umbraco.Web/JavaScript/Resources.resx
@@ -130,4 +130,7 @@
   <data name="ServerVariables" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>servervariables.js;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
-</root>
+  <data name="TinyMceInitialize" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>TinyMceInitialize.js;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Umbraco.Web/JavaScript/TinyMceInitialize.js b/src/Umbraco.Web/JavaScript/TinyMceInitialize.js
new file mode 100644
index 0000000000..1ffcce4a59
--- /dev/null
+++ b/src/Umbraco.Web/JavaScript/TinyMceInitialize.js
@@ -0,0 +1,19 @@
+[
+    'lib/tinymce/tinymce.min.js',
+
+    'lib/tinymce/langs/en_us.js',
+
+    'lib/tinymce/plugins/paste/plugin.min.js',
+    'lib/tinymce/plugins/anchor/plugin.min.js',
+    'lib/tinymce/plugins/charmap/plugin.min.js',
+    'lib/tinymce/plugins/table/plugin.min.js',
+    'lib/tinymce/plugins/lists/plugin.min.js',
+    'lib/tinymce/plugins/advlist/plugin.min.js',
+    'lib/tinymce/plugins/hr/plugin.min.js',
+    'lib/tinymce/plugins/autolink/plugin.min.js',
+    'lib/tinymce/plugins/directionality/plugin.min.js',
+    'lib/tinymce/plugins/tabfocus/plugin.min.js',
+    'lib/tinymce/plugins/searchreplace/plugin.min.js',
+    'lib/tinymce/plugins/fullscreen/plugin.min.js',
+    'lib/tinymce/plugins/noneditable/plugin.min.js'
+]
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index dc06222209..36712a198c 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -1205,6 +1205,7 @@
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="JavaScript\PreviewInitialize.js" />
+    <None Include="JavaScript\TinyMceInitialize.js" />
     <!--<Content Include="umbraco.presentation\umbraco\users\PermissionEditor.aspx" />-->
     <Content Include="PublishedCache\NuCache\notes.txt" />
   </ItemGroup>

From 1f2c4e38acac5d06a50c1b4a03e897be1314aca5 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Mon, 19 Aug 2019 16:01:03 +0200
Subject: [PATCH 353/776] Fix #5335 - Multiple Media Picker not available as
 macro parameter

---
 src/Umbraco.Core/Constants-PropertyEditors.cs |  5 ++++
 .../MultipleMediaPickerParameterEditor.cs     | 27 +++++++++++++++++++
 src/Umbraco.Web/Umbraco.Web.csproj            |  1 +
 3 files changed, 33 insertions(+)
 create mode 100644 src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleMediaPickerParameterEditor.cs

diff --git a/src/Umbraco.Core/Constants-PropertyEditors.cs b/src/Umbraco.Core/Constants-PropertyEditors.cs
index 0b5d2873f9..b55dc0ca18 100644
--- a/src/Umbraco.Core/Constants-PropertyEditors.cs
+++ b/src/Umbraco.Core/Constants-PropertyEditors.cs
@@ -96,6 +96,11 @@ namespace Umbraco.Core
                 /// </summary>
                 public const string MediaPicker = "Umbraco.MediaPicker";
 
+                /// <summary>
+                /// Multiple Media Picker.
+                /// </summary>
+                public const string MultipleMediaPicker = "Umbraco.MultipleMediaPicker";
+
                 /// <summary>
                 /// Member Picker.
                 /// </summary>
diff --git a/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleMediaPickerParameterEditor.cs b/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleMediaPickerParameterEditor.cs
new file mode 100644
index 0000000000..1208a5eecc
--- /dev/null
+++ b/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleMediaPickerParameterEditor.cs
@@ -0,0 +1,27 @@
+using Umbraco.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+
+namespace Umbraco.Web.PropertyEditors.ParameterEditors
+{
+    /// <summary>
+    /// Represents a multiple media picker macro parameter editor.
+    /// </summary>
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.MultipleMediaPicker,
+        EditorType.MacroParameter,
+        "Multiple Media Picker",
+        "mediapicker",
+        ValueType = ValueTypes.Text)]
+    public class MultipleMediaPickerParameterEditor : DataEditor
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MultipleMediaPickerParameterEditor"/> class.
+        /// </summary>
+        public MultipleMediaPickerParameterEditor(ILogger logger)
+            : base(logger)
+        {
+            DefaultConfiguration.Add("multiPicker", "1");
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index dc06222209..3892f90994 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -224,6 +224,7 @@
     <Compile Include="Mvc\SurfaceControllerTypeCollectionBuilder.cs" />
     <Compile Include="Mvc\ValidateUmbracoFormRouteStringAttribute.cs" />
     <Compile Include="Profiling\WebProfilingController.cs" />
+    <Compile Include="PropertyEditors\ParameterEditors\MultipleMediaPickerParameterEditor.cs" />
     <Compile Include="PublishedCache\NuCache\PublishedSnapshotServiceOptions.cs" />
     <Compile Include="PublishedCache\NuCache\Snap\GenObj.cs" />
     <Compile Include="PublishedCache\NuCache\Snap\GenRef.cs" />

From 7956ddb15a14acd7a644d6b8c32b937af8427007 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 20 Aug 2019 10:24:07 +1000
Subject: [PATCH 354/776] fixes tests

---
 src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
index a9e7a86bf7..d618bcf1ad 100644
--- a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
+++ b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
@@ -48,12 +48,10 @@ namespace Umbraco.Tests.Services
             var runtimeStateMock = new Mock<IRuntimeState>();
             runtimeStateMock.Setup(x => x.Level).Returns(() => RuntimeLevel.Run);
 
-            var contentTypeFactory = new PublishedContentTypeFactory(Mock.Of<IPublishedModelFactory>(), new PropertyValueConverterCollection(Array.Empty<IPropertyValueConverter>()), Mock.Of<IDataTypeService>());
-            //var documentRepository = Mock.Of<IDocumentRepository>();
+            var contentTypeFactory = Factory.GetInstance<IPublishedContentTypeFactory>();            
             var documentRepository = Factory.GetInstance<IDocumentRepository>();
             var mediaRepository = Mock.Of<IMediaRepository>();
             var memberRepository = Mock.Of<IMemberRepository>();
-            var contentTypeServiceBaseFactory = Current.Services.ContentTypeBaseServices;
 
             return new PublishedSnapshotService(
                 options,

From 6f4b8dc3819a38c0bde532300f3202d69ade129c Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 20 Aug 2019 10:26:01 +1000
Subject: [PATCH 355/776] fixes tests

---
 src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
index 8c14ce8219..c7c403b260 100644
--- a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
@@ -77,11 +77,10 @@ namespace Umbraco.Tests.Scoping
             var runtimeStateMock = new Mock<IRuntimeState>();
             runtimeStateMock.Setup(x => x.Level).Returns(() => RuntimeLevel.Run);
 
-            var contentTypeFactory = new PublishedContentTypeFactory(Mock.Of<IPublishedModelFactory>(), new PropertyValueConverterCollection(Array.Empty<IPropertyValueConverter>()), Mock.Of<IDataTypeService>());
+            var contentTypeFactory = Factory.GetInstance<IPublishedContentTypeFactory>();
             var documentRepository = Mock.Of<IDocumentRepository>();
             var mediaRepository = Mock.Of<IMediaRepository>();
             var memberRepository = Mock.Of<IMemberRepository>();
-            var contentTypeServiceBaseFactory = Current.Services.ContentTypeBaseServices;
 
             return new PublishedSnapshotService(
                 options,

From 0daa80efa4a18314f30613bd5945d7c1379be016 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Tue, 20 Aug 2019 11:01:45 +0100
Subject: [PATCH 356/776] Undo some of the changes as we will load it via
 assetService in the angular main controller & fixes the double load issue

---
 .../Umbraco/Views/Default.cshtml              |  1 -
 .../Editors/BackOfficeController.cs           | 22 -------------------
 .../JavaScript/JsInitialization.cs            | 20 -----------------
 3 files changed, 43 deletions(-)

diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
index 00ab8e0166..056d2b6f51 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
@@ -128,7 +128,6 @@
 
     <script src="lib/lazyload-js/lazyload.min.js"></script>
     <script src="@Url.GetUrlWithCacheBust("Application", "BackOffice")"></script>
-    <script src="@Url.Action("TinyMceEditor", "BackOffice")" async defer></script>
 
     @if (isDebug)
     {
diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
index 72a9d6f6b1..ca17f534c4 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -211,28 +211,6 @@ namespace Umbraco.Web.Editors
             return JavaScript(result);
         }
 
-        [MinifyJavaScriptResult(Order = 0)]
-        [OutputCache(Order = 1, VaryByParam = "none", Location = OutputCacheLocation.Server, Duration = 5000)]
-        public JavaScriptResult TinyMceEditor()
-        {
-            var files = JsInitialization.OptimizeTinyMceScriptFiles(HttpContext);
-
-            var rawJS = new StringBuilder();
-            rawJS.AppendLine("LazyLoad.js([");
-            var first = true;
-            foreach (var file in files)
-            {
-                if (first) first = false;
-                else rawJS.AppendLine(",");
-                rawJS.Append("\"");
-                rawJS.Append(file);
-                rawJS.Append("\"");
-
-            }
-            rawJS.Append("]);");
-            return JavaScript(rawJS.ToString());
-        }
-
         /// <summary>
         /// Returns a js array of all of the manifest assets
         /// </summary>
diff --git a/src/Umbraco.Web/JavaScript/JsInitialization.cs b/src/Umbraco.Web/JavaScript/JsInitialization.cs
index b8726e73c3..17e4f7b094 100644
--- a/src/Umbraco.Web/JavaScript/JsInitialization.cs
+++ b/src/Umbraco.Web/JavaScript/JsInitialization.cs
@@ -60,26 +60,6 @@ namespace Umbraco.Web.JavaScript
             return WriteScript(jarray.ToString(), IOHelper.ResolveUrl(SystemDirectories.Umbraco), angularModule);
         }
 
-        public static string GetTinyJavascriptInitialization(HttpContextBase httpContext, IEnumerable<string> scripts)
-        {
-            var rawJs = new StringBuilder();
-            rawJs.AppendLine("LazyLoad.js([");
-
-            var first = true;
-            foreach (var file in scripts)
-            {
-                if (first) first = false;
-                else rawJs.AppendLine(",");
-                rawJs.Append("\"");
-                rawJs.Append(file);
-                rawJs.Append("\"");
-
-            }
-            rawJs.Append("]);");
-
-            return rawJs.ToString();
-        }
-
         /// <summary>
         /// Returns a list of optimized script paths for the back office
         /// </summary>

From 6873c12f0491b3274306e2047e1d8272ac5527ad Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Tue, 20 Aug 2019 11:11:29 +0100
Subject: [PATCH 357/776] Update to main controller to load in the TinyMCE
 assets - assetsService deals with de-duping already loaded assets

---
 src/Umbraco.Web.UI.Client/src/main.controller.js | 9 ++++++++-
 src/Umbraco.Web.UI/Umbraco/js/main.controller.js | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/main.controller.js b/src/Umbraco.Web.UI.Client/src/main.controller.js
index 654bbb1d03..f4bac95767 100644
--- a/src/Umbraco.Web.UI.Client/src/main.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/main.controller.js
@@ -10,7 +10,7 @@
  */
 function MainController($scope, $location, appState, treeService, notificationsService, 
     userService, historyService, updateChecker, navigationService, eventsService, 
-    tmhDynamicLocale, localStorageService, editorService, overlayService) {
+    tmhDynamicLocale, localStorageService, editorService, overlayService, assetsService, tinyMceAssets) {
 
     //the null is important because we do an explicit bool check on this in the view
     $scope.authenticated = null;
@@ -21,6 +21,13 @@ function MainController($scope, $location, appState, treeService, notificationsS
     $scope.search = {};
     $scope.login = {};
     $scope.tabbingActive = false;
+
+    // Load TinyMCE Assets ahead of time in the background for the user
+    // To help woth first load of the RTE
+    tinyMceAssets.forEach(function (tinyJsAsset) {
+        assetsService.loadJs(tinyJsAsset, $scope);
+    });
+
     
     // There are a number of ways to detect when a focus state should be shown when using the tab key and this seems to be the simplest solution. 
     // For more information about this approach, see https://hackernoon.com/removing-that-ugly-focus-ring-and-keeping-it-too-6c8727fefcd2
diff --git a/src/Umbraco.Web.UI/Umbraco/js/main.controller.js b/src/Umbraco.Web.UI/Umbraco/js/main.controller.js
index 654bbb1d03..f4bac95767 100644
--- a/src/Umbraco.Web.UI/Umbraco/js/main.controller.js
+++ b/src/Umbraco.Web.UI/Umbraco/js/main.controller.js
@@ -10,7 +10,7 @@
  */
 function MainController($scope, $location, appState, treeService, notificationsService, 
     userService, historyService, updateChecker, navigationService, eventsService, 
-    tmhDynamicLocale, localStorageService, editorService, overlayService) {
+    tmhDynamicLocale, localStorageService, editorService, overlayService, assetsService, tinyMceAssets) {
 
     //the null is important because we do an explicit bool check on this in the view
     $scope.authenticated = null;
@@ -21,6 +21,13 @@ function MainController($scope, $location, appState, treeService, notificationsS
     $scope.search = {};
     $scope.login = {};
     $scope.tabbingActive = false;
+
+    // Load TinyMCE Assets ahead of time in the background for the user
+    // To help woth first load of the RTE
+    tinyMceAssets.forEach(function (tinyJsAsset) {
+        assetsService.loadJs(tinyJsAsset, $scope);
+    });
+
     
     // There are a number of ways to detect when a focus state should be shown when using the tab key and this seems to be the simplest solution. 
     // For more information about this approach, see https://hackernoon.com/removing-that-ugly-focus-ring-and-keeping-it-too-6c8727fefcd2

From a95360036ddb14202dbe21fb14678fd6a578bb32 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Tue, 20 Aug 2019 11:12:20 +0100
Subject: [PATCH 358/776] Pre-loading this lang JS file does not seem to help
 Tiny as it does not check its already loaded & it reloads itself anyway (But
 the plugins work all fine & are checked by Tiny to see if they have been
 loaded)

---
 src/Umbraco.Web/JavaScript/TinyMceInitialize.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Umbraco.Web/JavaScript/TinyMceInitialize.js b/src/Umbraco.Web/JavaScript/TinyMceInitialize.js
index 1ffcce4a59..6cb9cf6277 100644
--- a/src/Umbraco.Web/JavaScript/TinyMceInitialize.js
+++ b/src/Umbraco.Web/JavaScript/TinyMceInitialize.js
@@ -1,8 +1,6 @@
 [
     'lib/tinymce/tinymce.min.js',
 
-    'lib/tinymce/langs/en_us.js',
-
     'lib/tinymce/plugins/paste/plugin.min.js',
     'lib/tinymce/plugins/anchor/plugin.min.js',
     'lib/tinymce/plugins/charmap/plugin.min.js',

From 4fc265275bba0e9a6f792a40ba207a91a782cbc2 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Tue, 20 Aug 2019 11:28:02 +0100
Subject: [PATCH 359/776] Fix up unit test for RTE, it was failing as I added
 the Angular app.value for tinyMceAssets - this ensures we add an empty array
 of tinymce assets

---
 .../test/unit/app/propertyeditors/rte-controller.spec.js   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/test/unit/app/propertyeditors/rte-controller.spec.js b/src/Umbraco.Web.UI.Client/test/unit/app/propertyeditors/rte-controller.spec.js
index 9668a03580..274d256a64 100644
--- a/src/Umbraco.Web.UI.Client/test/unit/app/propertyeditors/rte-controller.spec.js
+++ b/src/Umbraco.Web.UI.Client/test/unit/app/propertyeditors/rte-controller.spec.js
@@ -1,7 +1,9 @@
 describe('RTE controller tests', function () {
     var scope, controllerFactory;
     
-    beforeEach(module('umbraco'));
+    beforeEach(module('umbraco', function ($provide) {
+        $provide.value('tinyMceAssets', []);
+    }));
 
     beforeEach(inject(function ($rootScope, $controller) {
         controllerFactory = $controller;
@@ -20,4 +22,5 @@ describe('RTE controller tests', function () {
         });
         
     });
-});
\ No newline at end of file
+});
+

From bec54a04674215cc26afbd6b5813fb252437c5d8 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Tue, 20 Aug 2019 11:28:29 +0100
Subject: [PATCH 360/776] Remove unecessary change

---
 src/Umbraco.Web/Editors/BackOfficeController.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
index ca17f534c4..34022f8f9f 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -28,7 +28,6 @@ using Umbraco.Web.JavaScript;
 using Umbraco.Web.Security;
 using Constants = Umbraco.Core.Constants;
 using JArray = Newtonsoft.Json.Linq.JArray;
-using System.Text;
 
 namespace Umbraco.Web.Editors
 {

From 6f83d3c865198b2b2c979102f51655c9bc3879ee Mon Sep 17 00:00:00 2001
From: elitsa <elm@umbraco.dk>
Date: Fri, 16 Aug 2019 13:34:25 +0200
Subject: [PATCH 361/776] Add special checks and preview for svg files media
 files.

(cherry picked from commit defcb727f94301faa0b08496f88852bf75657791)
---
 .../media/umbmedianodeinfo.directive.js       | 35 +++++++++++++++----
 .../components/media/umb-media-node-info.html | 10 ++++--
 2 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js
index efdeceb78f..677dccf3bb 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js
@@ -1,25 +1,29 @@
 (function () {
     'use strict';
 
-    function MediaNodeInfoDirective($timeout, $location, eventsService, userService, dateHelper) {
+    function MediaNodeInfoDirective($timeout, $location, eventsService, userService, dateHelper, mediaHelper) {
 
         function link(scope, element, attrs, ctrl) {
 
             var evts = [];
-
+            
             function onInit() {
                 // If logged in user has access to the settings section
                 // show the open anchors - if the user doesn't have 
                 // access, contentType is null, see MediaModelMapper
                 scope.allowOpen = scope.node.contentType !== null;
-                
+
                 // get document type details
                 scope.mediaType = scope.node.contentType;
 
                 // set the media link initially
                 setMediaLink();
+
                 // make sure dates are formatted to the user's locale
                 formatDatesToLocal();
+
+                // set media file extension initially
+                setMediaExtension();
             }
 
             function formatDatesToLocal() {
@@ -30,26 +34,43 @@
                 });
             }
 
-            function setMediaLink(){
+            function setMediaLink() {
                 scope.nodeUrl = scope.node.mediaLink;
             }
 
+            function setMediaExtension() {
+                scope.node.extension = mediaHelper.getFileExtension(scope.nodeUrl);
+            }
+
             scope.openMediaType = function (mediaType) {
                 // remove first "#" from url if it is prefixed else the path won't work
                 var url = "/settings/mediaTypes/edit/" + mediaType.id;
                 $location.path(url);
             };
 
+            scope.openSVG = function () {
+                var popup = window.open('', '_blank');
+                var html = '<!DOCTYPE html><body><img src="' + scope.nodeUrl + '"/>' +
+                    '<script>history.pushState(null, null,"' + $location.$$absUrl + '");</script></body>';
+
+                popup.document.open();
+                popup.document.write(html);
+                popup.document.close();
+            }
+
             // watch for content updates - reload content when node is saved, published etc.
-            scope.$watch('node.updateDate', function(newValue, oldValue){
-                if(!newValue) { return; }
-                if(newValue === oldValue) { return; }
+            scope.$watch('node.updateDate', function (newValue, oldValue) {
+                if (!newValue) { return; }
+                if (newValue === oldValue) { return; }
 
                 // Update the media link
                 setMediaLink();
 
                 // Update the create and update dates
                 formatDatesToLocal();
+
+                //Update the media file format
+                setMediaExtension();
             });
 
             //ensure to unregister from all events!
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html b/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
index 7cfcb835a5..5ee68e5cff 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
@@ -12,9 +12,15 @@
 
                 <ul ng-if="nodeUrl" class="nav nav-stacked" style="margin-bottom: 0;">
                     <li>
-                        <a href="{{nodeUrl}}" target="_blank">
+                        <ng-conainer ng-if="node.extension != 'svg'">
+                            <a href="{{nodeUrl}}" target="_blank">
+                                <i class="icon icon-window-popin"></i>
+                                <span>{{nodeUrl}}</span>
+                            </a>
+                        </ng-conainer>
+                        <a ng-if="node.extension == 'svg'">
                             <i class="icon icon-window-popin"></i>
-                            <span>{{nodeUrl}}</span>
+                            <span ng-click="openSVG()">{{nodeUrl}}</span>
                         </a>
                     </li>
                 </ul>

From 2cc5256c00da40af6afe84ad5d1fc2517cef86a7 Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
Date: Sat, 17 Aug 2019 23:54:49 +0200
Subject: [PATCH 362/776] Fixed typo in "ng-container"

(cherry picked from commit 7a7adfb61fd6e008fd5a0b402d90ea983d1001a1)
---
 .../src/views/components/media/umb-media-node-info.html       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html b/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
index 5ee68e5cff..3f71ae2d18 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
@@ -12,12 +12,12 @@
 
                 <ul ng-if="nodeUrl" class="nav nav-stacked" style="margin-bottom: 0;">
                     <li>
-                        <ng-conainer ng-if="node.extension != 'svg'">
+                        <ng-container ng-if="node.extension != 'svg'">
                             <a href="{{nodeUrl}}" target="_blank">
                                 <i class="icon icon-window-popin"></i>
                                 <span>{{nodeUrl}}</span>
                             </a>
-                        </ng-conainer>
+                        </ng-container>
                         <a ng-if="node.extension == 'svg'">
                             <i class="icon icon-window-popin"></i>
                             <span ng-click="openSVG()">{{nodeUrl}}</span>

From 82e11d7e0a62e22cf1b139155f6ea1e6c2f6ea71 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Wed, 21 Aug 2019 12:45:06 +0200
Subject: [PATCH 363/776] Fix unit tests

---
 src/Umbraco.Tests/Composing/TypeLoaderTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Tests/Composing/TypeLoaderTests.cs b/src/Umbraco.Tests/Composing/TypeLoaderTests.cs
index 7459ae848b..9cd4f39c17 100644
--- a/src/Umbraco.Tests/Composing/TypeLoaderTests.cs
+++ b/src/Umbraco.Tests/Composing/TypeLoaderTests.cs
@@ -268,7 +268,7 @@ AnotherContentFinder
         public void GetDataEditors()
         {
             var types = _typeLoader.GetDataEditors();
-            Assert.AreEqual(38, types.Count());
+            Assert.AreEqual(39, types.Count());
         }
 
         /// <summary>

From ccc2a0e811717c334343ef52c0cb9c81f119f434 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Mon, 19 Aug 2019 16:01:03 +0200
Subject: [PATCH 364/776] Fix #5335 - Multiple Media Picker not available as
 macro parameter

(cherry picked from commit 1f2c4e38acac5d06a50c1b4a03e897be1314aca5)
---
 src/Umbraco.Core/Constants-PropertyEditors.cs |  5 ++++
 .../MultipleMediaPickerParameterEditor.cs     | 27 +++++++++++++++++++
 src/Umbraco.Web/Umbraco.Web.csproj            |  1 +
 3 files changed, 33 insertions(+)
 create mode 100644 src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleMediaPickerParameterEditor.cs

diff --git a/src/Umbraco.Core/Constants-PropertyEditors.cs b/src/Umbraco.Core/Constants-PropertyEditors.cs
index b48286f197..b96c651f1c 100644
--- a/src/Umbraco.Core/Constants-PropertyEditors.cs
+++ b/src/Umbraco.Core/Constants-PropertyEditors.cs
@@ -96,6 +96,11 @@ namespace Umbraco.Core
                 /// </summary>
                 public const string MediaPicker = "Umbraco.MediaPicker";
 
+                /// <summary>
+                /// Multiple Media Picker.
+                /// </summary>
+                public const string MultipleMediaPicker = "Umbraco.MultipleMediaPicker";
+
                 /// <summary>
                 /// Member Picker.
                 /// </summary>
diff --git a/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleMediaPickerParameterEditor.cs b/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleMediaPickerParameterEditor.cs
new file mode 100644
index 0000000000..1208a5eecc
--- /dev/null
+++ b/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleMediaPickerParameterEditor.cs
@@ -0,0 +1,27 @@
+using Umbraco.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+
+namespace Umbraco.Web.PropertyEditors.ParameterEditors
+{
+    /// <summary>
+    /// Represents a multiple media picker macro parameter editor.
+    /// </summary>
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.MultipleMediaPicker,
+        EditorType.MacroParameter,
+        "Multiple Media Picker",
+        "mediapicker",
+        ValueType = ValueTypes.Text)]
+    public class MultipleMediaPickerParameterEditor : DataEditor
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MultipleMediaPickerParameterEditor"/> class.
+        /// </summary>
+        public MultipleMediaPickerParameterEditor(ILogger logger)
+            : base(logger)
+        {
+            DefaultConfiguration.Add("multiPicker", "1");
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 2365017504..1769218f05 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -224,6 +224,7 @@
     <Compile Include="Mvc\SurfaceControllerTypeCollectionBuilder.cs" />
     <Compile Include="Mvc\ValidateUmbracoFormRouteStringAttribute.cs" />
     <Compile Include="Profiling\WebProfilingController.cs" />
+    <Compile Include="PropertyEditors\ParameterEditors\MultipleMediaPickerParameterEditor.cs" />
     <Compile Include="PublishedCache\NuCache\PublishedSnapshotServiceOptions.cs" />
     <Compile Include="PublishedCache\NuCache\Snap\GenObj.cs" />
     <Compile Include="PublishedCache\NuCache\Snap\GenRef.cs" />

From 08c3b6bff56e2239dd78cc45d18b585aa375342b Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Wed, 21 Aug 2019 12:45:06 +0200
Subject: [PATCH 365/776] Fix unit tests

(cherry picked from commit 82e11d7e0a62e22cf1b139155f6ea1e6c2f6ea71)
---
 src/Umbraco.Tests/Composing/TypeLoaderTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Tests/Composing/TypeLoaderTests.cs b/src/Umbraco.Tests/Composing/TypeLoaderTests.cs
index 7459ae848b..9cd4f39c17 100644
--- a/src/Umbraco.Tests/Composing/TypeLoaderTests.cs
+++ b/src/Umbraco.Tests/Composing/TypeLoaderTests.cs
@@ -268,7 +268,7 @@ AnotherContentFinder
         public void GetDataEditors()
         {
             var types = _typeLoader.GetDataEditors();
-            Assert.AreEqual(38, types.Count());
+            Assert.AreEqual(39, types.Count());
         }
 
         /// <summary>

From 5b1f2ef95d4eb2ca883bbe70d2c123fd58509cee Mon Sep 17 00:00:00 2001
From: Lars-Erik Aabech <lars-erik.aabech@markedspartner.no>
Date: Wed, 21 Aug 2019 15:21:31 +0200
Subject: [PATCH 366/776] =?UTF-8?q?V7:=20Fixes=20#6132,=20=20dates=20being?=
 =?UTF-8?q?=20blanked=20out=20on=20save/publish=20when=20user=20locale=20(?=
 =?UTF-8?q?momen=E2=80=A6=20(#6138)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Umbraco.Core/DateTimeExtensions.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/DateTimeExtensions.cs b/src/Umbraco.Core/DateTimeExtensions.cs
index 8332fb9356..cb19e28f75 100644
--- a/src/Umbraco.Core/DateTimeExtensions.cs
+++ b/src/Umbraco.Core/DateTimeExtensions.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Text;
 
@@ -15,7 +16,7 @@ namespace Umbraco.Core
         /// <returns></returns>
         public static string ToIsoString(this DateTime dt)
         {
-            return dt.ToString("yyyy-MM-dd HH:mm:ss");
+            return dt.ToString("yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture);
         }
 
         public static DateTime TruncateTo(this DateTime dt, DateTruncate truncateTo)

From 2428af3c40ac80592f0ec2095efd121bb975a9a0 Mon Sep 17 00:00:00 2001
From: Tobias Klika <cee@live.at>
Date: Thu, 22 Aug 2019 10:46:28 +0200
Subject: [PATCH 367/776] Ability to distinguish document types with same name
 in Nested Content config (#6092)

---
 .../nestedcontent/nestedcontent.controller.js      | 14 ++++++++++++++
 .../nestedcontent/nestedcontent.doctypepicker.html | 10 +++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
index aaf7ed08bb..011a7b9033 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -15,6 +15,10 @@
             });
         }
 
+        $scope.canAdd = function () {
+            return !$scope.model.docTypes || !$scope.model.value || $scope.model.value.length < $scope.model.docTypes.length;
+        }
+
         $scope.remove = function (index) {
             $scope.model.value.splice(index, 1);
         }
@@ -57,10 +61,20 @@
 
         ncResources.getContentTypes().then(function (docTypes) {
             $scope.model.docTypes = docTypes;
+
+            // Count doctype name occurrences
+            var docTypeNameOccurrences = _.countBy(docTypes, 'name');
             
             // Populate document type tab dictionary
+            // And append alias to name if multiple doctypes have the same name
             docTypes.forEach(function (value) {
                 $scope.docTypeTabs[value.alias] = value.tabs;
+
+                value.displayName = value.name;
+
+                if (docTypeNameOccurrences[value.name] > 1) {
+                    value.displayName += " (" + value.alias + ")";
+                }
             });
         });
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.doctypepicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.doctypepicker.html
index 6aa1d8f12d..516c23daad 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.doctypepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.doctypepicker.html
@@ -23,7 +23,7 @@
                     </td>
                     <td>
                         <select id="{{model.alias}}_doctype_select"
-                            ng-options="dt.alias as dt.name for dt in selectableDocTypesFor(config) | orderBy: 'name'"
+                            ng-options="dt.alias as dt.displayName for dt in selectableDocTypesFor(config) | orderBy: 'name'"
                             ng-model="config.ncAlias" required></select>
                     </td>
                     <td>
@@ -35,17 +35,17 @@
                         <input type="text" ng-model="config.nameTemplate" />
                     </td>
                     <td>
-                        <a class="btn btn-danger" ng-click="remove($index)">
+                        <button type="button" class="btn btn-danger" ng-click="remove($index)">
                             <localize key="general_delete">Delete</localize>
-                        </a>
+                        </button>
                     </td>
                 </tr>
             </tbody>
         </table>
         <div>
-            <a class="btn" ng-click="add()">
+            <button type="button" class="btn" ng-click="add()" ng-disabled="!canAdd()">
                 <localize key="general_add">Add</localize>
-            </a>
+            </button>
             <i class="icon icon-help-alt medium umb-nested-content__help-icon" ng-click="showHelpText = !showHelpText"></i>
         </div>
     </div>

From 1089b4b9bb25e18140fc319e2cc0cfc228bf60ec Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Thu, 22 Aug 2019 20:36:26 +0200
Subject: [PATCH 368/776] Don't crash the linkpicker if only an anchor has been
 entered

---
 .../common/infiniteeditors/linkpicker/linkpicker.controller.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
index 5da14fc6d3..b5043293e5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
@@ -93,7 +93,7 @@ angular.module("umbraco").controller("Umbraco.Editors.LinkPickerController",
                     });
 
                 }
-            } else if ($scope.model.target.url.length) {
+            } else if ($scope.model.target.url && $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(/(#|\?)/);

From a2899b21b66b1bca9be193a03644596d6c94dc90 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Thu, 22 Aug 2019 20:36:26 +0200
Subject: [PATCH 369/776] Don't crash the linkpicker if only an anchor has been
 entered

(cherry picked from commit 1089b4b9bb25e18140fc319e2cc0cfc228bf60ec)
---
 .../common/infiniteeditors/linkpicker/linkpicker.controller.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
index 5a0ab51fd0..ece95593b0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
@@ -93,7 +93,7 @@ angular.module("umbraco").controller("Umbraco.Editors.LinkPickerController",
                     });
 
                 }
-            } else if ($scope.model.target.url.length) {
+            } else if ($scope.model.target.url && $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(/(#|\?)/);

From d57ebf021cad88b218935654edd423d399500454 Mon Sep 17 00:00:00 2001
From: Nik <nik.rimington@gmail.com>
Date: Thu, 22 Aug 2019 09:43:41 +0100
Subject: [PATCH 370/776] Added trck by $index to handle duplicate names in
 blueprints

---
 src/Umbraco.Web.UI.Client/src/views/content/create.html         | 2 +-
 .../src/views/propertyeditors/listview/listview.html            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/create.html b/src/Umbraco.Web.UI.Client/src/views/content/create.html
index 5bad56988d..e19ae32e6e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/create.html
@@ -25,7 +25,7 @@
         </ul>
         <ul class="umb-actions umb-actions-child" ng-show="selectBlueprint">
 
-            <li ng-repeat="(key, value) in docType.blueprints | orderBy:'name':false">
+            <li ng-repeat="(key, value) in docType.blueprints | orderBy:'name':false track by $index">
                 <a ng-click="createFromBlueprint(key)">
                     <i class="large {{docType.icon}}"></i>
                     <span class="menu-label">
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
index a0e4c5fda7..5399b48c2c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
@@ -27,7 +27,7 @@
                        </a>
 
                        <ul class="dropdown-menu">
-                           <li ng-repeat="(key, value) in listViewAllowedTypes[0].blueprints">
+                           <li ng-repeat="(key, value) in listViewAllowedTypes[0].blueprints track by $index">
                                <a ng-click="createFromBlueprint(entityType, listViewAllowedTypes[0].blueprints.alias, key)">
                                    <i class="{{listViewAllowedTypes[0].icon}}"></i>
                                    {{value}}

From 55d0ca25571f819e51caee1242483d8f9d511551 Mon Sep 17 00:00:00 2001
From: Nik <nik.rimington@gmail.com>
Date: Thu, 22 Aug 2019 09:43:41 +0100
Subject: [PATCH 371/776] Added trck by $index to handle duplicate names in
 blueprints

(cherry picked from commit d57ebf021cad88b218935654edd423d399500454)
---
 src/Umbraco.Web.UI.Client/src/views/content/create.html         | 2 +-
 .../src/views/propertyeditors/listview/listview.html            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/create.html b/src/Umbraco.Web.UI.Client/src/views/content/create.html
index 5bad56988d..e19ae32e6e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/create.html
@@ -25,7 +25,7 @@
         </ul>
         <ul class="umb-actions umb-actions-child" ng-show="selectBlueprint">
 
-            <li ng-repeat="(key, value) in docType.blueprints | orderBy:'name':false">
+            <li ng-repeat="(key, value) in docType.blueprints | orderBy:'name':false track by $index">
                 <a ng-click="createFromBlueprint(key)">
                     <i class="large {{docType.icon}}"></i>
                     <span class="menu-label">
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
index a0e4c5fda7..5399b48c2c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
@@ -27,7 +27,7 @@
                        </a>
 
                        <ul class="dropdown-menu">
-                           <li ng-repeat="(key, value) in listViewAllowedTypes[0].blueprints">
+                           <li ng-repeat="(key, value) in listViewAllowedTypes[0].blueprints track by $index">
                                <a ng-click="createFromBlueprint(entityType, listViewAllowedTypes[0].blueprints.alias, key)">
                                    <i class="{{listViewAllowedTypes[0].icon}}"></i>
                                    {{value}}

From b396cc340cfdf0b1ea90ab3729a35758f435642c Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 22 Aug 2019 22:06:57 +0200
Subject: [PATCH 372/776] Cherry pick - Added trck by $index to handle
 duplicate names in blueprints

---
 src/Umbraco.Web.UI.Client/src/views/content/create.html         | 2 +-
 .../src/views/propertyeditors/listview/listview.html            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/create.html b/src/Umbraco.Web.UI.Client/src/views/content/create.html
index b8303efade..cbedabba79 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/create.html
@@ -42,7 +42,7 @@
             </ul>
             <ul class="umb-actions umb-actions-child" ng-if="selectBlueprint">
 
-                <li class="umb-action" ng-repeat="blueprint in selectableBlueprints | orderBy:'name':false">
+                <li class="umb-action" ng-repeat="blueprint in selectableBlueprints | orderBy:'name':false track by $index">
                     <button class="umb-action-link umb-outline btn-reset" ng-click="createFromBlueprint(blueprint.id)">
                         <i class="large icon {{docType.icon}}"></i>
                         <span class="menu-label">
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
index 2c70ba5730..e971897f2a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
@@ -27,7 +27,7 @@
                        </a>
 
                        <umb-dropdown ng-if="page.createDropdownOpen" on-close="page.createDropdownOpen = false">
-                           <umb-dropdown-item ng-repeat="blueprint in listViewAllowedTypes[0].blueprints | orderBy:'name':false">
+                           <umb-dropdown-item ng-repeat="blueprint in listViewAllowedTypes[0].blueprints | orderBy:'name':false track by $index">
                                <a ng-click="createFromBlueprint(entityType, listViewAllowedTypes[0].alias, blueprint.id)">
                                    <i class="{{::listViewAllowedTypes[0].icon}}"></i>
                                    {{::blueprint.name}}

From a21c9420b18b604e985152e7cf06a9acb9b106c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Brynj=C3=B3lfur=20Gunnarsson?= <dentadesign@gmail.com>
Date: Mon, 19 Aug 2019 14:19:15 +0000
Subject: [PATCH 373/776] added data element to nestedcontent.editor.html,
 tested it and it works"

---
 .../propertyeditors/nestedcontent/nestedcontent.editor.html   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html
index 5d89da51b6..480ae14dd4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html
@@ -1,7 +1,7 @@
 <div class="umb-pane">
   <div ng-repeat="property in tab.properties" style="position: relative;">
 
-    <umb-property property="property" ng-class="{'umb-nested-content--not-supported': property.notSupported}">
+    <umb-property property="property" ng-class="{'umb-nested-content--not-supported': property.notSupported}" data-element="{{property.alias}}">
       <umb-editor model="property"></umb-editor>
     </umb-property>
 
@@ -10,4 +10,4 @@
     <p ng-if="property.notSupported">{{property.notSupportedMessage}}</p>
 
   </div>
-</div>
\ No newline at end of file
+</div>

From 0aaf284f7f56f31ccee96e440f14925fd91f7b9f Mon Sep 17 00:00:00 2001
From: "B. Gunnarsson" <dentadesign@gmail.com>
Date: Mon, 19 Aug 2019 15:20:20 +0000
Subject: [PATCH 374/776] Update nestedcontent.editor.html

forgot the "property-" prefix.
---
 .../propertyeditors/nestedcontent/nestedcontent.editor.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html
index 480ae14dd4..f254c9f276 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html
@@ -1,7 +1,7 @@
 <div class="umb-pane">
   <div ng-repeat="property in tab.properties" style="position: relative;">
 
-    <umb-property property="property" ng-class="{'umb-nested-content--not-supported': property.notSupported}" data-element="{{property.alias}}">
+    <umb-property property="property" ng-class="{'umb-nested-content--not-supported': property.notSupported}" data-element="property-{{property.alias}}">
       <umb-editor model="property"></umb-editor>
     </umb-property>
 

From d2649e935489bb0a6a0395323c3254082f786c25 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 22 Aug 2019 22:31:36 +0200
Subject: [PATCH 375/776] Update nestedcontent.editor.html

forgot the "property-" prefix.

(cherry picked from commit 0aaf284f7f56f31ccee96e440f14925fd91f7b9f)
---
 .../propertyeditors/nestedcontent/nestedcontent.editor.html   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html
index 5d89da51b6..f254c9f276 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html
@@ -1,7 +1,7 @@
 <div class="umb-pane">
   <div ng-repeat="property in tab.properties" style="position: relative;">
 
-    <umb-property property="property" ng-class="{'umb-nested-content--not-supported': property.notSupported}">
+    <umb-property property="property" ng-class="{'umb-nested-content--not-supported': property.notSupported}" data-element="property-{{property.alias}}">
       <umb-editor model="property"></umb-editor>
     </umb-property>
 
@@ -10,4 +10,4 @@
     <p ng-if="property.notSupported">{{property.notSupportedMessage}}</p>
 
   </div>
-</div>
\ No newline at end of file
+</div>

From ac6e3998474ae4c92dbf3a7732982fee53d287b5 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 22 Aug 2019 22:31:36 +0200
Subject: [PATCH 376/776] Update nestedcontent.editor.html

forgot the "property-" prefix.

(cherry picked from commit 0aaf284f7f56f31ccee96e440f14925fd91f7b9f)
(cherry picked from commit d2649e935489bb0a6a0395323c3254082f786c25)

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html
---
 .../propertyeditors/nestedcontent/nestedcontent.editor.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html
index 0cf67022c6..db0e9a016e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html
@@ -1,7 +1,7 @@
 <div class="umb-pane">
   <div ng-repeat="property in tab.properties" class="umb-nested-content-property-container">
 
-    <umb-property property="property" ng-class="{'umb-nested-content--not-supported': property.notSupported}">
+    <umb-property property="property" ng-class="{'umb-nested-content--not-supported': property.notSupported}" data-element="property-{{property.alias}}">
       <umb-property-editor model="property"></umb-property-editor>
     </umb-property>
 

From 88145d70fc1cd919cebd0245ecc8ed0b0e1d967f Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 22 Aug 2019 22:31:36 +0200
Subject: [PATCH 377/776] Update nestedcontent.editor.html

forgot the "property-" prefix.

(cherry picked from commit 0aaf284f7f56f31ccee96e440f14925fd91f7b9f)
(cherry picked from commit d2649e935489bb0a6a0395323c3254082f786c25)

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html
(cherry picked from commit ac6e3998474ae4c92dbf3a7732982fee53d287b5)
---
 .../propertyeditors/nestedcontent/nestedcontent.editor.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html
index 0cf67022c6..db0e9a016e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html
@@ -1,7 +1,7 @@
 <div class="umb-pane">
   <div ng-repeat="property in tab.properties" class="umb-nested-content-property-container">
 
-    <umb-property property="property" ng-class="{'umb-nested-content--not-supported': property.notSupported}">
+    <umb-property property="property" ng-class="{'umb-nested-content--not-supported': property.notSupported}" data-element="property-{{property.alias}}">
       <umb-property-editor model="property"></umb-property-editor>
     </umb-property>
 

From 9b212121e3c4f3d617fb0ba097c94e98681f4fd2 Mon Sep 17 00:00:00 2001
From: stevemegson <steve@megson.org>
Date: Thu, 22 Aug 2019 22:34:33 +0100
Subject: [PATCH 378/776] V8: Fix caching of macro results in RTE (#6010)

---
 .../ValueConverters/RteMacroRenderingValueConverter.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs
index cb6ce6dd6d..d5e1f841ea 100644
--- a/src/Umbraco.Web/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs
+++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs
@@ -11,6 +11,7 @@ using Umbraco.Core.Cache;
 using Umbraco.Core.Services;
 using Umbraco.Web.Composing;
 using Umbraco.Web.Macros;
+using System.Web;
 
 namespace Umbraco.Web.PropertyEditors.ValueConverters
 {
@@ -63,7 +64,14 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
             }
         }
 
-        public override object ConvertSourceToIntermediate(IPublishedElement owner, IPublishedPropertyType propertyType, object source, bool preview)
+        public override object ConvertIntermediateToObject(IPublishedElement owner, IPublishedPropertyType propertyType, PropertyCacheLevel referenceCacheLevel, object inter, bool preview)
+        {
+            var converted = Convert(inter, preview);
+
+            return new HtmlString(converted == null ? string.Empty : converted);
+        }
+
+        private string Convert(object source, bool preview)
         {
             if (source == null)
             {

From 703092c12c979a8902afe7676c18beade4005f99 Mon Sep 17 00:00:00 2001
From: stevemegson <steve@megson.org>
Date: Thu, 22 Aug 2019 22:34:33 +0100
Subject: [PATCH 379/776] V8: Fix caching of macro results in RTE (#6010)

(cherry picked from commit 9b212121e3c4f3d617fb0ba097c94e98681f4fd2)
---
 .../ValueConverters/RteMacroRenderingValueConverter.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs
index cb6ce6dd6d..d5e1f841ea 100644
--- a/src/Umbraco.Web/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs
+++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs
@@ -11,6 +11,7 @@ using Umbraco.Core.Cache;
 using Umbraco.Core.Services;
 using Umbraco.Web.Composing;
 using Umbraco.Web.Macros;
+using System.Web;
 
 namespace Umbraco.Web.PropertyEditors.ValueConverters
 {
@@ -63,7 +64,14 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
             }
         }
 
-        public override object ConvertSourceToIntermediate(IPublishedElement owner, IPublishedPropertyType propertyType, object source, bool preview)
+        public override object ConvertIntermediateToObject(IPublishedElement owner, IPublishedPropertyType propertyType, PropertyCacheLevel referenceCacheLevel, object inter, bool preview)
+        {
+            var converted = Convert(inter, preview);
+
+            return new HtmlString(converted == null ? string.Empty : converted);
+        }
+
+        private string Convert(object source, bool preview)
         {
             if (source == null)
             {

From d8355c368f2cacc1f292769bd6c544cc73d89be4 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 22 Aug 2019 23:40:24 +0200
Subject: [PATCH 380/776] Too many weird versions

---
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 696d33cf0a..4141b60a3d 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -347,13 +347,7 @@
           <AutoAssignPort>True</AutoAssignPort>
           <DevelopmentServerPort>8200</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:8200</IISUrl>
-          <DevelopmentServerPort>8120</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:8120</IISUrl>
-          <DevelopmentServerPort>7152</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:7152</IISUrl>
+          <IISUrl>http://localhost:8200/</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

From d09be604d99be75892be6b31d45a3994f3faeca5 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Tue, 20 Aug 2019 10:58:35 +0200
Subject: [PATCH 381/776] Allow plugin "Lang" folders to reside in nested
 directories

---
 src/Umbraco.Core/Composing/CompositionExtensions/Services.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Composing/CompositionExtensions/Services.cs b/src/Umbraco.Core/Composing/CompositionExtensions/Services.cs
index 0baefe104b..d252c58730 100644
--- a/src/Umbraco.Core/Composing/CompositionExtensions/Services.cs
+++ b/src/Umbraco.Core/Composing/CompositionExtensions/Services.cs
@@ -96,7 +96,7 @@ namespace Umbraco.Core.Composing.CompositionExtensions
             var pluginLangFolders = appPlugins.Exists == false
                 ? Enumerable.Empty<LocalizedTextServiceSupplementaryFileSource>()
                 : appPlugins.GetDirectories()
-                    .SelectMany(x => x.GetDirectories("Lang"))
+                    .SelectMany(x => x.GetDirectories("Lang", SearchOption.AllDirectories))
                     .SelectMany(x => x.GetFiles("*.xml", SearchOption.TopDirectoryOnly))
                     .Select(x => new LocalizedTextServiceSupplementaryFileSource(x, false));
 

From 11f28554428390cf1e518c298e9959bd767020b5 Mon Sep 17 00:00:00 2001
From: Steve Megson <steve@megson.org>
Date: Thu, 8 Aug 2019 08:56:08 +0100
Subject: [PATCH 382/776] Move CreateRoutes from WebFinalComponent to
 WebInitialComponent

---
 .../Routing/RenderRouteHandlerTests.cs        |   2 +-
 src/Umbraco.Web/Runtime/WebFinalComponent.cs  | 110 +-----------------
 .../Runtime/WebInitialComponent.cs            | 102 +++++++++++++++-
 3 files changed, 103 insertions(+), 111 deletions(-)

diff --git a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
index 935417c510..135172460d 100644
--- a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
+++ b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
@@ -40,7 +40,7 @@ namespace Umbraco.Tests.Routing
         {
             base.SetUp();
 
-            WebFinalComponent.CreateRoutes(
+            WebInitialComponent.CreateRoutes(
                 new TestUmbracoContextAccessor(),
                 TestObjects.GetGlobalSettings(),
                 new SurfaceControllerTypeCollection(Enumerable.Empty<Type>()),
diff --git a/src/Umbraco.Web/Runtime/WebFinalComponent.cs b/src/Umbraco.Web/Runtime/WebFinalComponent.cs
index 6177d9b868..2ba78b2080 100644
--- a/src/Umbraco.Web/Runtime/WebFinalComponent.cs
+++ b/src/Umbraco.Web/Runtime/WebFinalComponent.cs
@@ -1,39 +1,18 @@
 using System;
-using System.Linq;
-using System.Web.Helpers;
 using System.Web.Http;
-using System.Web.Mvc;
-using System.Web.Routing;
-using Umbraco.Core;
 using Umbraco.Core.Composing;
-using Umbraco.Core.Configuration;
-using Umbraco.Web.Install;
-using Umbraco.Web.Mvc;
-using Umbraco.Web.Security;
-using Umbraco.Web.WebApi;
 
 namespace Umbraco.Web.Runtime
 {
     public class WebFinalComponent : IComponent
     {
-        private readonly IUmbracoContextAccessor _umbracoContextAccessor;
-        private readonly SurfaceControllerTypeCollection _surfaceControllerTypes;
-        private readonly UmbracoApiControllerTypeCollection _apiControllerTypes;
-        private readonly IGlobalSettings _globalSettings;
 
-        public WebFinalComponent(IUmbracoContextAccessor umbracoContextAccessor, SurfaceControllerTypeCollection surfaceControllerTypes, UmbracoApiControllerTypeCollection apiControllerTypes, IGlobalSettings globalSettings)
+        public WebFinalComponent()
         {
-            _umbracoContextAccessor = umbracoContextAccessor;
-            _surfaceControllerTypes = surfaceControllerTypes;
-            _apiControllerTypes = apiControllerTypes;
-            _globalSettings = globalSettings;
         }
 
         public void Initialize()
         {
-            // set routes
-            CreateRoutes(_umbracoContextAccessor, _globalSettings, _surfaceControllerTypes, _apiControllerTypes);
-
             // ensure WebAPI is initialized, after everything
             GlobalConfiguration.Configuration.EnsureInitialized();
         }
@@ -41,92 +20,5 @@ namespace Umbraco.Web.Runtime
         public void Terminate()
         { }
 
-        // internal for tests
-        internal static void CreateRoutes(
-            IUmbracoContextAccessor umbracoContextAccessor,
-            IGlobalSettings globalSettings,
-            SurfaceControllerTypeCollection surfaceControllerTypes,
-            UmbracoApiControllerTypeCollection apiControllerTypes)
-        {
-            var umbracoPath = globalSettings.GetUmbracoMvcArea();
-
-            // create the front-end route
-            var defaultRoute = RouteTable.Routes.MapRoute(
-                "Umbraco_default",
-                umbracoPath + "/RenderMvc/{action}/{id}",
-                new { controller = "RenderMvc", action = "Index", id = UrlParameter.Optional }
-            );
-            defaultRoute.RouteHandler = new RenderRouteHandler(umbracoContextAccessor, ControllerBuilder.Current.GetControllerFactory());
-
-            // register install routes
-            RouteTable.Routes.RegisterArea<UmbracoInstallArea>();
-
-            // register all back office routes
-            RouteTable.Routes.RegisterArea(new BackOfficeArea(globalSettings));
-
-            // plugin controllers must come first because the next route will catch many things
-            RoutePluginControllers(globalSettings, surfaceControllerTypes, apiControllerTypes);
-        }
-
-        private static void RoutePluginControllers(
-            IGlobalSettings globalSettings,
-            SurfaceControllerTypeCollection surfaceControllerTypes,
-            UmbracoApiControllerTypeCollection apiControllerTypes)
-        {
-            var umbracoPath = globalSettings.GetUmbracoMvcArea();
-
-            // need to find the plugin controllers and route them
-            var pluginControllers = surfaceControllerTypes.Concat(apiControllerTypes).ToArray();
-
-            // local controllers do not contain the attribute
-            var localControllers = pluginControllers.Where(x => PluginController.GetMetadata(x).AreaName.IsNullOrWhiteSpace());
-            foreach (var s in localControllers)
-            {
-                if (TypeHelper.IsTypeAssignableFrom<SurfaceController>(s))
-                    RouteLocalSurfaceController(s, umbracoPath);
-                else if (TypeHelper.IsTypeAssignableFrom<UmbracoApiController>(s))
-                    RouteLocalApiController(s, umbracoPath);
-            }
-
-            // get the plugin controllers that are unique to each area (group by)
-            var pluginSurfaceControlleres = pluginControllers.Where(x => PluginController.GetMetadata(x).AreaName.IsNullOrWhiteSpace() == false);
-            var groupedAreas = pluginSurfaceControlleres.GroupBy(controller => PluginController.GetMetadata(controller).AreaName);
-            // loop through each area defined amongst the controllers
-            foreach (var g in groupedAreas)
-            {
-                // create & register an area for the controllers (this will throw an exception if all controllers are not in the same area)
-                var pluginControllerArea = new PluginControllerArea(globalSettings, g.Select(PluginController.GetMetadata));
-                RouteTable.Routes.RegisterArea(pluginControllerArea);
-            }
-        }
-
-        private static void RouteLocalApiController(Type controller, string umbracoPath)
-        {
-            var meta = PluginController.GetMetadata(controller);
-            var url = umbracoPath + (meta.IsBackOffice ? "/BackOffice" : "") + "/Api/" + meta.ControllerName + "/{action}/{id}";
-            var route = RouteTable.Routes.MapHttpRoute(
-                $"umbraco-api-{meta.ControllerName}",
-                url, // url to match
-                new { controller = meta.ControllerName, id = UrlParameter.Optional },
-                new[] { meta.ControllerNamespace });
-            if (route.DataTokens == null) // web api routes don't set the data tokens object
-                route.DataTokens = new RouteValueDictionary();
-            route.DataTokens.Add(Core.Constants.Web.UmbracoDataToken, "api"); //ensure the umbraco token is set
-        }
-
-        private static void RouteLocalSurfaceController(Type controller, string umbracoPath)
-        {
-            var meta = PluginController.GetMetadata(controller);
-            var url = umbracoPath + "/Surface/" + meta.ControllerName + "/{action}/{id}";
-            var route = RouteTable.Routes.MapRoute(
-                $"umbraco-surface-{meta.ControllerName}",
-                url, // url to match
-                new { controller = meta.ControllerName, action = "Index", id = UrlParameter.Optional },
-                new[] { meta.ControllerNamespace }); // look in this namespace to create the controller
-            route.DataTokens.Add(Core.Constants.Web.UmbracoDataToken, "surface"); // ensure the umbraco token is set
-            route.DataTokens.Add("UseNamespaceFallback", false); // don't look anywhere else except this namespace!
-            // make it use our custom/special SurfaceMvcHandler
-            route.RouteHandler = new SurfaceRouteHandler();
-        }
     }
 }
diff --git a/src/Umbraco.Web/Runtime/WebInitialComponent.cs b/src/Umbraco.Web/Runtime/WebInitialComponent.cs
index e1e0f4d80a..ac813d7196 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComponent.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComponent.cs
@@ -8,12 +8,14 @@ using System.Web.Configuration;
 using System.Web.Http;
 using System.Web.Http.Dispatcher;
 using System.Web.Mvc;
+using System.Web.Routing;
 using ClientDependency.Core.CompositeFiles.Providers;
 using ClientDependency.Core.Config;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
+using Umbraco.Web.Install;
 using Umbraco.Web.JavaScript;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.WebApi;
@@ -24,10 +26,16 @@ namespace Umbraco.Web.Runtime
 {
     public sealed class WebInitialComponent : IComponent
     {
+        private readonly IUmbracoContextAccessor _umbracoContextAccessor;
+        private readonly SurfaceControllerTypeCollection _surfaceControllerTypes;
+        private readonly UmbracoApiControllerTypeCollection _apiControllerTypes;
         private readonly IGlobalSettings _globalSettings;
 
-        public WebInitialComponent(IGlobalSettings globalSettings)
+        public WebInitialComponent(IUmbracoContextAccessor umbracoContextAccessor, SurfaceControllerTypeCollection surfaceControllerTypes, UmbracoApiControllerTypeCollection apiControllerTypes, IGlobalSettings globalSettings)
         {
+            _umbracoContextAccessor = umbracoContextAccessor;
+            _surfaceControllerTypes = surfaceControllerTypes;
+            _apiControllerTypes = apiControllerTypes;
             _globalSettings = globalSettings;
         }
 
@@ -51,6 +59,9 @@ namespace Umbraco.Web.Runtime
 
             // add global filters
             ConfigureGlobalFilters();
+
+            // set routes
+            CreateRoutes(_umbracoContextAccessor, _globalSettings, _surfaceControllerTypes, _apiControllerTypes);
         }
 
         public void Terminate()
@@ -131,5 +142,94 @@ namespace Umbraco.Web.Runtime
 
             ClientDependencySettings.Instance.MvcRendererCollection.Add(renderer);
         }
+
+        // internal for tests
+        internal static void CreateRoutes(
+            IUmbracoContextAccessor umbracoContextAccessor,
+            IGlobalSettings globalSettings,
+            SurfaceControllerTypeCollection surfaceControllerTypes,
+            UmbracoApiControllerTypeCollection apiControllerTypes)
+        {
+            var umbracoPath = globalSettings.GetUmbracoMvcArea();
+
+            // create the front-end route
+            var defaultRoute = RouteTable.Routes.MapRoute(
+                "Umbraco_default",
+                umbracoPath + "/RenderMvc/{action}/{id}",
+                new { controller = "RenderMvc", action = "Index", id = UrlParameter.Optional }
+            );
+            defaultRoute.RouteHandler = new RenderRouteHandler(umbracoContextAccessor, ControllerBuilder.Current.GetControllerFactory());
+
+            // register install routes
+            RouteTable.Routes.RegisterArea<UmbracoInstallArea>();
+
+            // register all back office routes
+            RouteTable.Routes.RegisterArea(new BackOfficeArea(globalSettings));
+
+            // plugin controllers must come first because the next route will catch many things
+            RoutePluginControllers(globalSettings, surfaceControllerTypes, apiControllerTypes);
+        }
+
+        private static void RoutePluginControllers(
+            IGlobalSettings globalSettings,
+            SurfaceControllerTypeCollection surfaceControllerTypes,
+            UmbracoApiControllerTypeCollection apiControllerTypes)
+        {
+            var umbracoPath = globalSettings.GetUmbracoMvcArea();
+
+            // need to find the plugin controllers and route them
+            var pluginControllers = surfaceControllerTypes.Concat(apiControllerTypes).ToArray();
+
+            // local controllers do not contain the attribute
+            var localControllers = pluginControllers.Where(x => PluginController.GetMetadata(x).AreaName.IsNullOrWhiteSpace());
+            foreach (var s in localControllers)
+            {
+                if (TypeHelper.IsTypeAssignableFrom<SurfaceController>(s))
+                    RouteLocalSurfaceController(s, umbracoPath);
+                else if (TypeHelper.IsTypeAssignableFrom<UmbracoApiController>(s))
+                    RouteLocalApiController(s, umbracoPath);
+            }
+
+            // get the plugin controllers that are unique to each area (group by)
+            var pluginSurfaceControlleres = pluginControllers.Where(x => PluginController.GetMetadata(x).AreaName.IsNullOrWhiteSpace() == false);
+            var groupedAreas = pluginSurfaceControlleres.GroupBy(controller => PluginController.GetMetadata(controller).AreaName);
+            // loop through each area defined amongst the controllers
+            foreach (var g in groupedAreas)
+            {
+                // create & register an area for the controllers (this will throw an exception if all controllers are not in the same area)
+                var pluginControllerArea = new PluginControllerArea(globalSettings, g.Select(PluginController.GetMetadata));
+                RouteTable.Routes.RegisterArea(pluginControllerArea);
+            }
+        }
+
+        private static void RouteLocalApiController(Type controller, string umbracoPath)
+        {
+            var meta = PluginController.GetMetadata(controller);
+            var url = umbracoPath + (meta.IsBackOffice ? "/BackOffice" : "") + "/Api/" + meta.ControllerName + "/{action}/{id}";
+            var route = RouteTable.Routes.MapHttpRoute(
+                $"umbraco-api-{meta.ControllerName}",
+                url, // url to match
+                new { controller = meta.ControllerName, id = UrlParameter.Optional },
+                new[] { meta.ControllerNamespace });
+            if (route.DataTokens == null) // web api routes don't set the data tokens object
+                route.DataTokens = new RouteValueDictionary();
+            route.DataTokens.Add(Core.Constants.Web.UmbracoDataToken, "api"); //ensure the umbraco token is set
+        }
+
+        private static void RouteLocalSurfaceController(Type controller, string umbracoPath)
+        {
+            var meta = PluginController.GetMetadata(controller);
+            var url = umbracoPath + "/Surface/" + meta.ControllerName + "/{action}/{id}";
+            var route = RouteTable.Routes.MapRoute(
+                $"umbraco-surface-{meta.ControllerName}",
+                url, // url to match
+                new { controller = meta.ControllerName, action = "Index", id = UrlParameter.Optional },
+                new[] { meta.ControllerNamespace }); // look in this namespace to create the controller
+            route.DataTokens.Add(Core.Constants.Web.UmbracoDataToken, "surface"); // ensure the umbraco token is set
+            route.DataTokens.Add("UseNamespaceFallback", false); // don't look anywhere else except this namespace!
+            // make it use our custom/special SurfaceMvcHandler
+            route.RouteHandler = new SurfaceRouteHandler();
+        }
+
     }
 }

From ac4128d89e34750ae9e26317bb7286b3a8adf6df Mon Sep 17 00:00:00 2001
From: elitsa <elm@umbraco.dk>
Date: Fri, 23 Aug 2019 10:42:00 +0200
Subject: [PATCH 383/776] Add special checks and preview for svg files media
 files for v8

---
 .../media/umbmedianodeinfo.directive.js       | 22 ++++++++++++++++++-
 .../components/media/umb-media-node-info.html | 12 +++++++---
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js
index 577ffe0176..4993b013c7 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js
@@ -1,7 +1,7 @@
 (function () {
     'use strict';
 
-    function MediaNodeInfoDirective($timeout, $location, eventsService, userService, dateHelper, editorService) {
+    function MediaNodeInfoDirective($timeout, $location, eventsService, userService, dateHelper, editorService, mediaHelper) {
 
         function link(scope, element, attrs, ctrl) {
 
@@ -28,6 +28,9 @@
 
                 // make sure dates are formatted to the user's locale
                 formatDatesToLocal();
+
+                // set media file extension initially
+                setMediaExtension();
             }
 
             function formatDatesToLocal() {
@@ -49,6 +52,10 @@
                 }
             }
 
+            function setMediaExtension() {
+                scope.node.extension = mediaHelper.getFileExtension(scope.nodeUrl);
+            }
+
             scope.openMediaType = function (mediaType) {
                 var editor = {
                     id: mediaType.id,
@@ -62,6 +69,16 @@
                 editorService.mediaTypeEditor(editor);
             };
 
+            scope.openSVG = function () {
+                var popup = window.open('', '_blank');
+                var html = '<!DOCTYPE html><body><img src="' + scope.nodeUrl + '"/>' +
+                    '<script>history.pushState(null, null,"' + $location.$$absUrl + '");</script></body>';
+                
+                popup.document.open();
+                popup.document.write(html);
+                popup.document.close();
+            }
+
             // watch for content updates - reload content when node is saved, published etc.
             scope.$watch('node.updateDate', function(newValue, oldValue){
                 if(!newValue) { return; }
@@ -72,6 +89,9 @@
 
                 // Update the create and update dates
                 formatDatesToLocal();
+
+                //Update the media file format
+                setMediaExtension();
             });
 
             //ensure to unregister from all events!
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html b/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
index f411437b1d..ee175c36f2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
@@ -12,9 +12,15 @@
 
                 <ul ng-if="nodeUrl" class="nav nav-stacked" style="margin-bottom: 0;">
                     <li>
-                        <a href="{{nodeUrl}}" target="_blank">
-                            <i class="icon icon-out"></i>
-                            <span>{{nodeFileName}}</span>
+                        <ng-container ng-if="node.extension != 'svg'">
+                            <a href="{{nodeUrl}}" target="_blank">
+                                <i class="icon icon-out"></i>
+                                <span>{{nodeFileName}}</span>
+                            </a>
+                        </ng-container>
+                        <a ng-if="node.extension == 'svg'">
+                            <i class="icon icon-window-popin"></i>
+                            <span ng-click="openSVG()">{{nodeFileName}}</span>
                         </a>
                     </li>
                 </ul>

From 8625c8da439332d57d2d57c49263b0949104198d Mon Sep 17 00:00:00 2001
From: elitsa <elm@umbraco.dk>
Date: Fri, 23 Aug 2019 10:42:00 +0200
Subject: [PATCH 384/776] Add special checks and preview for svg files media
 files for v8

(cherry picked from commit ac4128d89e34750ae9e26317bb7286b3a8adf6df)
---
 .../media/umbmedianodeinfo.directive.js       | 22 ++++++++++++++++++-
 .../components/media/umb-media-node-info.html | 12 +++++++---
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js
index 577ffe0176..4993b013c7 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js
@@ -1,7 +1,7 @@
 (function () {
     'use strict';
 
-    function MediaNodeInfoDirective($timeout, $location, eventsService, userService, dateHelper, editorService) {
+    function MediaNodeInfoDirective($timeout, $location, eventsService, userService, dateHelper, editorService, mediaHelper) {
 
         function link(scope, element, attrs, ctrl) {
 
@@ -28,6 +28,9 @@
 
                 // make sure dates are formatted to the user's locale
                 formatDatesToLocal();
+
+                // set media file extension initially
+                setMediaExtension();
             }
 
             function formatDatesToLocal() {
@@ -49,6 +52,10 @@
                 }
             }
 
+            function setMediaExtension() {
+                scope.node.extension = mediaHelper.getFileExtension(scope.nodeUrl);
+            }
+
             scope.openMediaType = function (mediaType) {
                 var editor = {
                     id: mediaType.id,
@@ -62,6 +69,16 @@
                 editorService.mediaTypeEditor(editor);
             };
 
+            scope.openSVG = function () {
+                var popup = window.open('', '_blank');
+                var html = '<!DOCTYPE html><body><img src="' + scope.nodeUrl + '"/>' +
+                    '<script>history.pushState(null, null,"' + $location.$$absUrl + '");</script></body>';
+                
+                popup.document.open();
+                popup.document.write(html);
+                popup.document.close();
+            }
+
             // watch for content updates - reload content when node is saved, published etc.
             scope.$watch('node.updateDate', function(newValue, oldValue){
                 if(!newValue) { return; }
@@ -72,6 +89,9 @@
 
                 // Update the create and update dates
                 formatDatesToLocal();
+
+                //Update the media file format
+                setMediaExtension();
             });
 
             //ensure to unregister from all events!
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html b/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
index f411437b1d..ee175c36f2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
@@ -12,9 +12,15 @@
 
                 <ul ng-if="nodeUrl" class="nav nav-stacked" style="margin-bottom: 0;">
                     <li>
-                        <a href="{{nodeUrl}}" target="_blank">
-                            <i class="icon icon-out"></i>
-                            <span>{{nodeFileName}}</span>
+                        <ng-container ng-if="node.extension != 'svg'">
+                            <a href="{{nodeUrl}}" target="_blank">
+                                <i class="icon icon-out"></i>
+                                <span>{{nodeFileName}}</span>
+                            </a>
+                        </ng-container>
+                        <a ng-if="node.extension == 'svg'">
+                            <i class="icon icon-window-popin"></i>
+                            <span ng-click="openSVG()">{{nodeFileName}}</span>
                         </a>
                     </li>
                 </ul>

From c3e99205de17671f872f16d74f929983e1ba042d Mon Sep 17 00:00:00 2001
From: Claus <claus@umbraco.com>
Date: Mon, 26 Aug 2019 13:29:54 +0200
Subject: [PATCH 385/776] fixed typo.

---
 src/Umbraco.Web.UI.Client/src/main.controller.js | 5 ++---
 src/Umbraco.Web.UI/Umbraco/js/main.controller.js | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/main.controller.js b/src/Umbraco.Web.UI.Client/src/main.controller.js
index f4bac95767..93870f8a56 100644
--- a/src/Umbraco.Web.UI.Client/src/main.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/main.controller.js
@@ -22,13 +22,12 @@ function MainController($scope, $location, appState, treeService, notificationsS
     $scope.login = {};
     $scope.tabbingActive = false;
 
-    // Load TinyMCE Assets ahead of time in the background for the user
-    // To help woth first load of the RTE
+    // Load TinyMCE assets ahead of time in the background for the user
+    // To help with first load of the RTE
     tinyMceAssets.forEach(function (tinyJsAsset) {
         assetsService.loadJs(tinyJsAsset, $scope);
     });
 
-    
     // There are a number of ways to detect when a focus state should be shown when using the tab key and this seems to be the simplest solution. 
     // For more information about this approach, see https://hackernoon.com/removing-that-ugly-focus-ring-and-keeping-it-too-6c8727fefcd2
     function handleFirstTab(evt) {
diff --git a/src/Umbraco.Web.UI/Umbraco/js/main.controller.js b/src/Umbraco.Web.UI/Umbraco/js/main.controller.js
index f4bac95767..93870f8a56 100644
--- a/src/Umbraco.Web.UI/Umbraco/js/main.controller.js
+++ b/src/Umbraco.Web.UI/Umbraco/js/main.controller.js
@@ -22,13 +22,12 @@ function MainController($scope, $location, appState, treeService, notificationsS
     $scope.login = {};
     $scope.tabbingActive = false;
 
-    // Load TinyMCE Assets ahead of time in the background for the user
-    // To help woth first load of the RTE
+    // Load TinyMCE assets ahead of time in the background for the user
+    // To help with first load of the RTE
     tinyMceAssets.forEach(function (tinyJsAsset) {
         assetsService.loadJs(tinyJsAsset, $scope);
     });
 
-    
     // There are a number of ways to detect when a focus state should be shown when using the tab key and this seems to be the simplest solution. 
     // For more information about this approach, see https://hackernoon.com/removing-that-ugly-focus-ring-and-keeping-it-too-6c8727fefcd2
     function handleFirstTab(evt) {

From 50ad337755c1a664b7c3faffb421a9218713dbf7 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Tue, 27 Aug 2019 14:31:52 +0000
Subject: [PATCH 386/776] Merge pull request #6130 from
 stevemegson/v8/temp-6060

V8: Handle missing grid values in migration from 7.15
(cherry picked from commit b205f19f405ed5cbdd2e1620be7d45221c8920f7)
---
 .../V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs      | 4 ++--
 .../PropertyEditors/GridPropertyIndexValueFactory.cs          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs
index 1b6597a660..b68aa23d78 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs
@@ -50,10 +50,10 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_1_0
                         var obj = JsonConvert.DeserializeObject<JObject>(value);
                         var allControls = obj.SelectTokens("$.sections..rows..areas..controls");
 
-                        foreach (var control in allControls.SelectMany(c => c))
+                        foreach (var control in allControls.SelectMany(c => c).OfType<JObject>())
                         {
                             var controlValue = control["value"];
-                            if (controlValue.Type == JTokenType.String)
+                            if (controlValue?.Type == JTokenType.String)
                             {
                                 control["value"] = UpdateMediaUrls(mediaLinkPattern, controlValue.Value<string>());
                             }
diff --git a/src/Umbraco.Web/PropertyEditors/GridPropertyIndexValueFactory.cs b/src/Umbraco.Web/PropertyEditors/GridPropertyIndexValueFactory.cs
index 085d66f3c6..7e47d0dcd6 100644
--- a/src/Umbraco.Web/PropertyEditors/GridPropertyIndexValueFactory.cs
+++ b/src/Umbraco.Web/PropertyEditors/GridPropertyIndexValueFactory.cs
@@ -43,7 +43,7 @@ namespace Umbraco.Web.PropertyEditors
 
                             // TODO: If it's not a string, then it's a json formatted value -
                             // we cannot really index this in a smart way since it could be 'anything'
-                            if (controlVal.Type == JTokenType.String)
+                            if (controlVal?.Type == JTokenType.String)
                             {
                                 var str = controlVal.Value<string>();
                                 str = XmlHelper.CouldItBeXml(str) ? str.StripHtml() : str;

From 30e4eda0d2634014c8b41b6285c32220b79716ff Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Wed, 28 Aug 2019 09:47:15 +0100
Subject: [PATCH 387/776] The paste plugin was already enabled as it comes from
 the legacy XML config/tinymceconfig.config file So we only needed the extra
 property of paste_data_images to get this to work

---
 .../src/common/services/tinymce.service.js                 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index e61bd38bc0..5578c7a609 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -233,17 +233,22 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
 
                     //this would be for a theme other than inlite
                     toolbar: args.toolbar.join(" "),
+
                     //these are for the inlite theme to work
                     insert_toolbar: toolbars.insertToolbar,
                     selection_toolbar: toolbars.selectionToolbar,
 
                     body_class: 'umb-rte',
+
                     //see http://archive.tinymce.com/wiki.php/Configuration:cache_suffix
                     cache_suffix: "?umb__rnd=" + Umbraco.Sys.ServerVariables.application.cacheBuster,
 
                     //this is used to style the inline macro bits, sorry hard coding this form now since we don't have a standalone
                     //stylesheet to load in for this with only these styles (the color is @pinkLight)
-                    content_style: ".mce-content-body .umb-macro-holder { border: 3px dotted #f5c1bc; padding: 7px; display: block; margin: 3px; } .umb-rte .mce-content-body .umb-macro-holder.loading {background: url(assets/img/loader.gif) right no-repeat; background-size: 18px; background-position-x: 99%;}"
+                    content_style: ".mce-content-body .umb-macro-holder { border: 3px dotted #f5c1bc; padding: 7px; display: block; margin: 3px; } .umb-rte .mce-content-body .umb-macro-holder.loading {background: url(assets/img/loader.gif) right no-repeat; background-size: 18px; background-position-x: 99%;}",
+
+                    // This allows images to be pasted in & stored as Base64 until they get uploaded to server
+                    paste_data_images: true
                 };
 
                 if (tinyMceConfig.customConfig) {

From a43b981feb4b210b5f5ab929d5a72811523aa3c6 Mon Sep 17 00:00:00 2001
From: Patrick <mooij@d-tt.nl>
Date: Wed, 28 Aug 2019 21:21:23 +0200
Subject: [PATCH 388/776] Temp-5724: Unable to add multiple property groups in
 membertype/doctype editor

---
 .../components/umbgroupsbuilder.directive.js           | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
index c1f34e64ae..2d4b0aaca5 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
@@ -381,6 +381,8 @@
         // activate group
         scope.activateGroup(group);
 
+        // push new init tab to the scope
+        addInitGroup(scope.model.groups);
       };
 
       scope.activateGroup = function(selectedGroup) {
@@ -399,7 +401,6 @@
 
       scope.removeGroup = function(groupIndex) {
         scope.model.groups.splice(groupIndex, 1);
-        addInitGroup(scope.model.groups);
       };
 
       scope.updateGroupTitle = function(group) {
@@ -528,9 +529,6 @@
               // set focus on init property
               var numberOfProperties = group.properties.length;
               group.properties[numberOfProperties - 1].focus = true;
-  
-              // push new init tab to the scope
-              addInitGroup(scope.model.groups);
 
               notifyChanged();
             },
@@ -582,10 +580,10 @@
         if(tab.properties.length === 1 && tab.properties[0].propertyState === "init") {
 
           angular.forEach(scope.model.groups, function(group, index, groups){
-            if(group.tabState === 'init') {
+            if(group === tab) {
               groups.splice(index, 1);
             }
-          });
+            });
 
         }
 

From e85905ad6537555e15ef89c87f72c6afc49c4511 Mon Sep 17 00:00:00 2001
From: Patrick <mooij@d-tt.nl>
Date: Wed, 28 Aug 2019 21:31:50 +0200
Subject: [PATCH 389/776] temp-5724: Removed the placeholder code, because
 there should always be an inital group now

---
 .../components/umbgroupsbuilder.directive.js          | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
index 2d4b0aaca5..3129e720e4 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
@@ -576,17 +576,6 @@
         // remove property
         tab.properties.splice(propertyIndex, 1);
 
-        // if the last property in group is an placeholder - remove add new tab placeholder
-        if(tab.properties.length === 1 && tab.properties[0].propertyState === "init") {
-
-          angular.forEach(scope.model.groups, function(group, index, groups){
-            if(group === tab) {
-              groups.splice(index, 1);
-            }
-            });
-
-        }
-
         notifyChanged();
       };
 

From 3dc0bbeff32b57d743fb7ab36b87c6cfaabe7c60 Mon Sep 17 00:00:00 2001
From: Steve Megson <steve@megson.org>
Date: Tue, 27 Aug 2019 08:30:22 +0100
Subject: [PATCH 390/776] Multi Url Picker fix

---
 .../propertyeditors/multiurlpicker/multiurlpicker.controller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
index a5fc5c50d2..dcfeb4b1fa 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
@@ -72,7 +72,7 @@ function multiUrlPickerController($scope, angularHelper, localizationService, en
             view: "linkpicker",
             currentTarget: target,
             dataTypeId: ($scope.model && $scope.model.dataTypeId) ? $scope.model.dataTypeId : null,
-            ignoreUserStartNodes : $scope.model.config.ignoreUserStartNodes,
+            ignoreUserStartNodes: ($scope.model.config && $scope.model.config.ignoreUserStartNodes) ? $scope.model.config.ignoreUserStartNodes : "1",
             show: true,
             submit: function (model) {
                 if (model.target.url || model.target.anchor) {

From 4ef55aa7d09be28f10758ffb289974b59387ec98 Mon Sep 17 00:00:00 2001
From: Steve Megson <steve@megson.org>
Date: Tue, 27 Aug 2019 08:30:22 +0100
Subject: [PATCH 391/776] Multi Url Picker fix

(cherry picked from commit 3dc0bbeff32b57d743fb7ab36b87c6cfaabe7c60)
---
 .../propertyeditors/multiurlpicker/multiurlpicker.controller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
index a5fc5c50d2..dcfeb4b1fa 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
@@ -72,7 +72,7 @@ function multiUrlPickerController($scope, angularHelper, localizationService, en
             view: "linkpicker",
             currentTarget: target,
             dataTypeId: ($scope.model && $scope.model.dataTypeId) ? $scope.model.dataTypeId : null,
-            ignoreUserStartNodes : $scope.model.config.ignoreUserStartNodes,
+            ignoreUserStartNodes: ($scope.model.config && $scope.model.config.ignoreUserStartNodes) ? $scope.model.config.ignoreUserStartNodes : "1",
             show: true,
             submit: function (model) {
                 if (model.target.url || model.target.anchor) {

From 3c7580ff7bfc87755295ece629757ae6746956ef Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 29 Aug 2019 11:55:43 +0200
Subject: [PATCH 392/776] Default for ignoreUserStartNodes should be false

---
 .../propertyeditors/multiurlpicker/multiurlpicker.controller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
index dcfeb4b1fa..0b8f783517 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
@@ -72,7 +72,7 @@ function multiUrlPickerController($scope, angularHelper, localizationService, en
             view: "linkpicker",
             currentTarget: target,
             dataTypeId: ($scope.model && $scope.model.dataTypeId) ? $scope.model.dataTypeId : null,
-            ignoreUserStartNodes: ($scope.model.config && $scope.model.config.ignoreUserStartNodes) ? $scope.model.config.ignoreUserStartNodes : "1",
+            ignoreUserStartNodes: ($scope.model.config && $scope.model.config.ignoreUserStartNodes) ? $scope.model.config.ignoreUserStartNodes : "0",
             show: true,
             submit: function (model) {
                 if (model.target.url || model.target.anchor) {

From 979190796e503c446fb6cb17e37ad1a3eed183dd Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 29 Aug 2019 11:59:03 +0200
Subject: [PATCH 393/776] Multi Url Picker fix

(cherry picked from commit b3834c296b2b288c3f73620616dcc795e32c26eb)
---
 .../propertyeditors/multiurlpicker/multiurlpicker.controller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
index 69bcc6b41a..b2bb47b58c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
@@ -78,7 +78,7 @@ function multiUrlPickerController($scope, angularHelper, localizationService, en
         var linkPicker = {
             currentTarget: target,
             dataTypeKey: $scope.model.dataTypeKey,
-            ignoreUserStartNodes : $scope.model.config.ignoreUserStartNodes,
+            ignoreUserStartNodes : ($scope.model.config && $scope.model.config.ignoreUserStartNodes) ? $scope.model.config.ignoreUserStartNodes : "0",
             submit: function (model) {
                 if (model.target.url || model.target.anchor) {
                     // if an anchor exists, check that it is appropriately prefixed

From 2cdeb38521337f1321a9bd6a2153472afe90db53 Mon Sep 17 00:00:00 2001
From: Cody Boucher <cboucher@unionhomemortgage.com>
Date: Mon, 26 Aug 2019 11:02:31 -0400
Subject: [PATCH 394/776] use SystemDirectories.Media instead of hardcoded
 string media

---
 src/Umbraco.Core/Persistence/Factories/MediaFactory.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Persistence/Factories/MediaFactory.cs b/src/Umbraco.Core/Persistence/Factories/MediaFactory.cs
index 080a358657..f3300ba424 100644
--- a/src/Umbraco.Core/Persistence/Factories/MediaFactory.cs
+++ b/src/Umbraco.Core/Persistence/Factories/MediaFactory.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Globalization;
 using System.Text.RegularExpressions;
+using Umbraco.Core.IO;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Rdbms;
 
@@ -130,7 +131,7 @@ namespace Umbraco.Core.Persistence.Factories
             return nodeDto;
         }
 
-        private static readonly Regex MediaPathPattern = new Regex(@"(/media/.+?)(?:['""]|$)", RegexOptions.Compiled);
+        private static readonly Regex MediaPathPattern = new Regex($@"({SystemDirectories.Media.TrimStart("~")}/.+?)(?:['""]|$)", RegexOptions.Compiled);
 
         /// <summary>
         /// Try getting a media path out of the string being stored for media

From f5a445101d88c632965c17d1e8b0b68e181696ed Mon Sep 17 00:00:00 2001
From: Cody Boucher <cboucher@unionhomemortgage.com>
Date: Mon, 26 Aug 2019 11:02:31 -0400
Subject: [PATCH 395/776] use SystemDirectories.Media instead of hardcoded
 string media

(cherry picked from commit 2cdeb38521337f1321a9bd6a2153472afe90db53)
---
 src/Umbraco.Core/Persistence/Factories/MediaFactory.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Persistence/Factories/MediaFactory.cs b/src/Umbraco.Core/Persistence/Factories/MediaFactory.cs
index 080a358657..f3300ba424 100644
--- a/src/Umbraco.Core/Persistence/Factories/MediaFactory.cs
+++ b/src/Umbraco.Core/Persistence/Factories/MediaFactory.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Globalization;
 using System.Text.RegularExpressions;
+using Umbraco.Core.IO;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Rdbms;
 
@@ -130,7 +131,7 @@ namespace Umbraco.Core.Persistence.Factories
             return nodeDto;
         }
 
-        private static readonly Regex MediaPathPattern = new Regex(@"(/media/.+?)(?:['""]|$)", RegexOptions.Compiled);
+        private static readonly Regex MediaPathPattern = new Regex($@"({SystemDirectories.Media.TrimStart("~")}/.+?)(?:['""]|$)", RegexOptions.Compiled);
 
         /// <summary>
         /// Try getting a media path out of the string being stored for media

From 851a2a3de8dc94d99b5a1b3d1d232b70a722aa96 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Wed, 21 Aug 2019 10:07:08 +0000
Subject: [PATCH 396/776] Simplify svg check and make it a proper a href again.

---
 .../views/components/media/umb-media-node-info.html    | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html b/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
index 3f71ae2d18..36fd86175f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
@@ -12,15 +12,9 @@
 
                 <ul ng-if="nodeUrl" class="nav nav-stacked" style="margin-bottom: 0;">
                     <li>
-                        <ng-container ng-if="node.extension != 'svg'">
-                            <a href="{{nodeUrl}}" target="_blank">
-                                <i class="icon icon-window-popin"></i>
-                                <span>{{nodeUrl}}</span>
-                            </a>
-                        </ng-container>
-                        <a ng-if="node.extension == 'svg'">
+                        <a ng-attr-href="{{node.extension !== 'svg' ? nodeUrl : undefined}}" ng-click="node.extension === 'svg' && openSVG()" target="_blank">
                             <i class="icon icon-window-popin"></i>
-                            <span ng-click="openSVG()">{{nodeUrl}}</span>
+                            <span>{{nodeUrl}}</span>
                         </a>
                     </li>
                 </ul>

From 5d9e1087f4081595efa4db5e86a5fe773d9da5c4 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 29 Aug 2019 13:03:48 +0200
Subject: [PATCH 397/776] Cherry pick 851a2a3de8dc94d99b5a1b3d1d232b70a722aa96

---
 .../src/views/components/media/umb-media-node-info.html  | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html b/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
index ee175c36f2..4f7141559c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
@@ -12,15 +12,10 @@
 
                 <ul ng-if="nodeUrl" class="nav nav-stacked" style="margin-bottom: 0;">
                     <li>
-                        <ng-container ng-if="node.extension != 'svg'">
-                            <a href="{{nodeUrl}}" target="_blank">
+                        <a ng-attr-href="{{node.extension !== 'svg' ? nodeUrl : undefined}}" ng-click="node.extension === 'svg' && openSVG()" target="_blank">
                                 <i class="icon icon-out"></i>
                                 <span>{{nodeFileName}}</span>
-                            </a>
-                        </ng-container>
-                        <a ng-if="node.extension == 'svg'">
-                            <i class="icon icon-window-popin"></i>
-                            <span ng-click="openSVG()">{{nodeFileName}}</span>
+
                         </a>
                     </li>
                 </ul>

From 55613e3a02ccee30761bc3bb6eeb36f12a829598 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 29 Aug 2019 13:03:48 +0200
Subject: [PATCH 398/776] Cherry pick 851a2a3de8dc94d99b5a1b3d1d232b70a722aa96

(cherry picked from commit 5d9e1087f4081595efa4db5e86a5fe773d9da5c4)
---
 .../src/views/components/media/umb-media-node-info.html  | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html b/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
index ee175c36f2..4f7141559c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
@@ -12,15 +12,10 @@
 
                 <ul ng-if="nodeUrl" class="nav nav-stacked" style="margin-bottom: 0;">
                     <li>
-                        <ng-container ng-if="node.extension != 'svg'">
-                            <a href="{{nodeUrl}}" target="_blank">
+                        <a ng-attr-href="{{node.extension !== 'svg' ? nodeUrl : undefined}}" ng-click="node.extension === 'svg' && openSVG()" target="_blank">
                                 <i class="icon icon-out"></i>
                                 <span>{{nodeFileName}}</span>
-                            </a>
-                        </ng-container>
-                        <a ng-if="node.extension == 'svg'">
-                            <i class="icon icon-window-popin"></i>
-                            <span ng-click="openSVG()">{{nodeFileName}}</span>
+
                         </a>
                     </li>
                 </ul>

From 93bb75511bd61351df100ccbdcc10e930a048ba6 Mon Sep 17 00:00:00 2001
From: Matt Brailsford <me@mattbrailsford.com>
Date: Thu, 18 Jul 2019 13:09:12 +0100
Subject: [PATCH 399/776] Fixed #5907 by reloading content on bulk publish /
 unpublish

Fixes #5907
---
 .../listview/listview.controller.js                | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
index df7a574c49..9b4c01f4f9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
@@ -405,7 +405,7 @@ function listViewController($rootScope, $scope, $routeParams, $injector, $cookie
     };
 
    $scope.publish = function () {
-        applySelected(
+       var attempt = applySelected(
                 function (selected, index) { return contentResource.publishById(getIdCallback(selected[index])); },
                 function (count, total) {
                     var key = (total === 1 ? "bulk_publishedItemOfItem" : "bulk_publishedItemOfItems");
@@ -415,10 +415,15 @@ function listViewController($rootScope, $scope, $routeParams, $injector, $cookie
                     var key = (total === 1 ? "bulk_publishedItem" : "bulk_publishedItems");
                     return localizationService.localize(key, [total]);
                 });
+        if (attempt) {
+            attempt.then(function () {
+                $scope.getContent();
+            });
+        }
    };
 
     $scope.unpublish = function() {
-        applySelected(
+        var attempt = applySelected(
             function(selected, index) { return contentResource.unPublish(getIdCallback(selected[index])); },
             function(count, total) {
                 var key = (total === 1 ? "bulk_unpublishedItemOfItem" : "bulk_unpublishedItemOfItems");
@@ -428,6 +433,11 @@ function listViewController($rootScope, $scope, $routeParams, $injector, $cookie
                 var key = (total === 1 ? "bulk_unpublishedItem" : "bulk_unpublishedItems");
                 return localizationService.localize(key, [total]);
             });
+        if (attempt) {
+            attempt.then(function () {
+                $scope.getContent();
+            });
+        }
     };
 
     $scope.move = function() {

From e92631c623aac925ce3b4571ee7f964b6f6f5ace Mon Sep 17 00:00:00 2001
From: Matt Brailsford <me@mattbrailsford.com>
Date: Thu, 18 Jul 2019 13:09:12 +0100
Subject: [PATCH 400/776] Fixed #5907 by reloading content on bulk publish /
 unpublish

Fixes #5907

(cherry picked from commit 93bb75511bd61351df100ccbdcc10e930a048ba6)
---
 .../listview/listview.controller.js                | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
index df7a574c49..9b4c01f4f9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
@@ -405,7 +405,7 @@ function listViewController($rootScope, $scope, $routeParams, $injector, $cookie
     };
 
    $scope.publish = function () {
-        applySelected(
+       var attempt = applySelected(
                 function (selected, index) { return contentResource.publishById(getIdCallback(selected[index])); },
                 function (count, total) {
                     var key = (total === 1 ? "bulk_publishedItemOfItem" : "bulk_publishedItemOfItems");
@@ -415,10 +415,15 @@ function listViewController($rootScope, $scope, $routeParams, $injector, $cookie
                     var key = (total === 1 ? "bulk_publishedItem" : "bulk_publishedItems");
                     return localizationService.localize(key, [total]);
                 });
+        if (attempt) {
+            attempt.then(function () {
+                $scope.getContent();
+            });
+        }
    };
 
     $scope.unpublish = function() {
-        applySelected(
+        var attempt = applySelected(
             function(selected, index) { return contentResource.unPublish(getIdCallback(selected[index])); },
             function(count, total) {
                 var key = (total === 1 ? "bulk_unpublishedItemOfItem" : "bulk_unpublishedItemOfItems");
@@ -428,6 +433,11 @@ function listViewController($rootScope, $scope, $routeParams, $injector, $cookie
                 var key = (total === 1 ? "bulk_unpublishedItem" : "bulk_unpublishedItems");
                 return localizationService.localize(key, [total]);
             });
+        if (attempt) {
+            attempt.then(function () {
+                $scope.getContent();
+            });
+        }
     };
 
     $scope.move = function() {

From e9eecb2031bc50f58d1d971ae58f2b12aad38ff8 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sat, 6 Jul 2019 08:32:04 +0200
Subject: [PATCH 401/776] Ensure correct icon for file types in search results

---
 src/Umbraco.Web/Search/UmbracoTreeSearcher.cs | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs b/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
index 9cfa29985b..543499d054 100644
--- a/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
+++ b/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
@@ -301,19 +301,7 @@ namespace Umbraco.Web.Search
         /// <param name="results"></param>
         /// <returns></returns>
         private IEnumerable<SearchResultItem> MediaFromSearchResults(IEnumerable<SearchResult> results)
-        {
-            var mapped = Mapper.Map<IEnumerable<SearchResultItem>>(results).ToArray();
-            //add additional data
-            foreach (var m in mapped)
-            {
-                //if no icon could be mapped, it will be set to document, so change it to picture
-                if (m.Icon == "icon-document")
-                {
-                    m.Icon = "icon-picture";
-                }
-            }
-            return mapped;
-        }
+            => Mapper.Map<IEnumerable<SearchResultItem>>(results).ToArray();
 
         /// <summary>
         /// Returns a collection of entities for content based on search results

From 531dee1e75c2f19bc77e309a5a4de1da063a3bc8 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sat, 6 Jul 2019 08:26:08 +0200
Subject: [PATCH 402/776] Ensure correct icon for file types in search results

---
 src/Umbraco.Web/Search/UmbracoTreeSearcher.cs | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs b/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
index 729b2c0a9d..c3c3dc75ce 100644
--- a/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
+++ b/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
@@ -384,19 +384,7 @@ namespace Umbraco.Web.Search
         /// <param name="results"></param>
         /// <returns></returns>
         private IEnumerable<SearchResultEntity> MediaFromSearchResults(IEnumerable<ISearchResult> results)
-        {
-            //add additional data
-            foreach (var result in results)
-            {
-                var m = _mapper.Map<SearchResultEntity>(result);
-                //if no icon could be mapped, it will be set to document, so change it to picture
-                if (m.Icon == Constants.Icons.DefaultIcon)
-                {
-                    m.Icon = Constants.Icons.MediaImage;
-                }
-                yield return m;
-            }
-        }
+            => _mapper.Map<IEnumerable<SearchResultEntity>>(results);
 
         /// <summary>
         /// Returns a collection of entities for content based on search results

From 18c02987204f0d14c9a93029ef3a96e34369dbc4 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sat, 6 Jul 2019 08:26:08 +0200
Subject: [PATCH 403/776] Ensure correct icon for file types in search results

(cherry picked from commit 531dee1e75c2f19bc77e309a5a4de1da063a3bc8)
---
 src/Umbraco.Web/Search/UmbracoTreeSearcher.cs | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs b/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
index 729b2c0a9d..c3c3dc75ce 100644
--- a/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
+++ b/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
@@ -384,19 +384,7 @@ namespace Umbraco.Web.Search
         /// <param name="results"></param>
         /// <returns></returns>
         private IEnumerable<SearchResultEntity> MediaFromSearchResults(IEnumerable<ISearchResult> results)
-        {
-            //add additional data
-            foreach (var result in results)
-            {
-                var m = _mapper.Map<SearchResultEntity>(result);
-                //if no icon could be mapped, it will be set to document, so change it to picture
-                if (m.Icon == Constants.Icons.DefaultIcon)
-                {
-                    m.Icon = Constants.Icons.MediaImage;
-                }
-                yield return m;
-            }
-        }
+            => _mapper.Map<IEnumerable<SearchResultEntity>>(results);
 
         /// <summary>
         /// Returns a collection of entities for content based on search results

From d152cf076fa8138b706367a14f9dd58c9c33bea6 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sat, 6 Jul 2019 08:32:04 +0200
Subject: [PATCH 404/776] Ensure correct icon for file types in search results

(cherry picked from commit e9eecb2031bc50f58d1d971ae58f2b12aad38ff8)
---
 src/Umbraco.Web/Search/UmbracoTreeSearcher.cs | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs b/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
index 9cfa29985b..543499d054 100644
--- a/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
+++ b/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
@@ -301,19 +301,7 @@ namespace Umbraco.Web.Search
         /// <param name="results"></param>
         /// <returns></returns>
         private IEnumerable<SearchResultItem> MediaFromSearchResults(IEnumerable<SearchResult> results)
-        {
-            var mapped = Mapper.Map<IEnumerable<SearchResultItem>>(results).ToArray();
-            //add additional data
-            foreach (var m in mapped)
-            {
-                //if no icon could be mapped, it will be set to document, so change it to picture
-                if (m.Icon == "icon-document")
-                {
-                    m.Icon = "icon-picture";
-                }
-            }
-            return mapped;
-        }
+            => Mapper.Map<IEnumerable<SearchResultItem>>(results).ToArray();
 
         /// <summary>
         /// Returns a collection of entities for content based on search results

From 204a9c9d5386a9230e321504bf2e519fd26eee55 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Wed, 3 Jul 2019 12:33:03 +0200
Subject: [PATCH 405/776] Make sure Nested Content blueprints are listed in
 defined sort order

---
 .../common/overlays/itempicker/itempicker.controller.js      | 5 +++++
 .../src/views/common/overlays/itempicker/itempicker.html     | 2 +-
 .../nestedcontent/nestedcontent.controller.js                | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js
index a848c0ae90..aa6fa8d42c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js
@@ -4,6 +4,11 @@ function ItemPickerOverlay($scope, localizationService) {
         $scope.model.title = localizationService.localize("defaultdialogs_selectItem");
     }
 
+    
+    if (!$scope.model.orderBy) {
+        $scope.model.orderBy = "name";
+    }
+
     $scope.model.hideSubmitButton = true;
 
     $scope.selectItem = function(item) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
index aac4830d52..328344ea84 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
@@ -12,7 +12,7 @@
     </div>
 
     <ul class="umb-card-grid">
-        <li ng-repeat="availableItem in model.availableItems | compareArrays:model.selectedItems:'alias' | orderBy:'name' | filter:searchTerm"
+        <li ng-repeat="availableItem in model.availableItems | compareArrays:model.selectedItems:'alias' | orderBy:model.orderBy | filter:searchTerm"
             ng-click="selectItem(availableItem)"
             class="-three-in-row">
             <a class="umb-card-grid-item" href="" title="{{ availableItem.name }}">
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
index 0dcfc99238..51df8d3b56 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -142,6 +142,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
                 show: false,
                 style: {},
                 filter: $scope.scaffolds.length > 15 ? true : false,
+                orderBy: "$index",
                 view: "itempicker",
                 event: $event,
                 submit: function(model) {                    

From 4c5365de1c60178f44bf132872cd54d883fb8c50 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Wed, 3 Jul 2019 12:33:03 +0200
Subject: [PATCH 406/776] Make sure Nested Content blueprints are listed in
 defined sort order

(cherry picked from commit 204a9c9d5386a9230e321504bf2e519fd26eee55)
---
 .../common/overlays/itempicker/itempicker.controller.js      | 5 +++++
 .../src/views/common/overlays/itempicker/itempicker.html     | 2 +-
 .../nestedcontent/nestedcontent.controller.js                | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js
index a848c0ae90..aa6fa8d42c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js
@@ -4,6 +4,11 @@ function ItemPickerOverlay($scope, localizationService) {
         $scope.model.title = localizationService.localize("defaultdialogs_selectItem");
     }
 
+    
+    if (!$scope.model.orderBy) {
+        $scope.model.orderBy = "name";
+    }
+
     $scope.model.hideSubmitButton = true;
 
     $scope.selectItem = function(item) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
index aac4830d52..328344ea84 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
@@ -12,7 +12,7 @@
     </div>
 
     <ul class="umb-card-grid">
-        <li ng-repeat="availableItem in model.availableItems | compareArrays:model.selectedItems:'alias' | orderBy:'name' | filter:searchTerm"
+        <li ng-repeat="availableItem in model.availableItems | compareArrays:model.selectedItems:'alias' | orderBy:model.orderBy | filter:searchTerm"
             ng-click="selectItem(availableItem)"
             class="-three-in-row">
             <a class="umb-card-grid-item" href="" title="{{ availableItem.name }}">
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
index 0dcfc99238..51df8d3b56 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -142,6 +142,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
                 show: false,
                 style: {},
                 filter: $scope.scaffolds.length > 15 ? true : false,
+                orderBy: "$index",
                 view: "itempicker",
                 event: $event,
                 submit: function(model) {                    

From 3f8dffee3fa22a0e36506724165cf02790f2fee0 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Thu, 29 Aug 2019 13:41:34 +0200
Subject: [PATCH 407/776] V7: Add confirmation when deleting content and media
 (#6004)

---
 .../content/content.delete.controller.js      |  2 +-
 .../src/views/content/delete.html             | 22 ++++++++++++++-----
 .../src/views/media/delete.html               | 21 +++++++++++++-----
 .../views/media/media.delete.controller.js    |  3 +--
 src/Umbraco.Web.UI/umbraco/config/lang/da.xml |  1 +
 src/Umbraco.Web.UI/umbraco/config/lang/en.xml |  1 +
 .../umbraco/config/lang/en_us.xml             |  1 +
 7 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js
index 917e4c024a..b12d809aaa 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js
@@ -50,7 +50,7 @@ function ContentDeleteController($scope, contentResource, treeService, navigatio
                 $location.path(location);
             }
 
-            navigationService.hideMenu();
+            $scope.success = true;
         }, function(err) {
 
             $scope.currentNode.loading = false;
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/delete.html b/src/Umbraco.Web.UI.Client/src/views/content/delete.html
index f3bdb0d121..1eb0363c34 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/delete.html
@@ -1,12 +1,22 @@
 <div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.Content.DeleteController">
     <div class="umb-dialog-body" auto-scale="90">
-        
-        <p class="umb-abstract">
-            <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong> ?
-        </p>
 
-        <umb-confirm on-confirm="performDelete" on-cancel="cancel">    
-        </umb-confirm>
+        <div ng-show="success">
+            <div class="alert alert-success">
+                <strong>{{currentNode.name}}</strong>
+                <localize key="actions_wasDeleted">was deleted</localize>
+            </div>
+            <button class="btn btn-primary" ng-click="nav.hideDialog()">Ok</button>
+        </div>
+
+        <div ng-hide="success">
+            <p class="umb-abstract">
+                <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong> ?
+            </p>
+
+            <umb-confirm on-confirm="performDelete" on-cancel="cancel">    
+            </umb-confirm>
+        </div>
 
     </div>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/delete.html b/src/Umbraco.Web.UI.Client/src/views/media/delete.html
index 3c9716eb3f..9fca0c9222 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/delete.html
@@ -1,10 +1,21 @@
 <div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.Media.DeleteController">
     <div class="umb-dialog-body" auto-scale="90">
-        
-        <p class="umb-abstract">
-            <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong> ?
-        </p>
 
-        <umb-confirm on-confirm="performDelete" on-cancel="cancel"></umb-confirm>
+        <div ng-show="success">
+            <div class="alert alert-success">
+                <strong>{{currentNode.name}}</strong>
+                <localize key="actions_wasDeleted">was deleted</localize>
+            </div>
+            <button class="btn btn-primary" ng-click="nav.hideDialog()">Ok</button>
+        </div>
+
+        <div ng-hide="success">
+            <p class="umb-abstract">
+                <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong> ?
+            </p>
+
+            <umb-confirm on-confirm="performDelete" on-cancel="cancel"></umb-confirm>
+        </div>
+
     </div>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.delete.controller.js
index 6ff35ab9cb..c3b3e0c116 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/media.delete.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/media/media.delete.controller.js
@@ -50,8 +50,7 @@ function MediaDeleteController($scope, mediaResource, treeService, navigationSer
                 $location.path(location);
             }
 
-            navigationService.hideMenu();
-
+            $scope.success = true;
         }, function (err) {
 
             $scope.currentNode.loading = false;
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
index 3223478dd7..b0b8dc67e1 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
@@ -37,6 +37,7 @@
     <key alias="toInTheTreeStructureBelow">til i træstrukturen nedenfor</key>
     <key alias="wasMovedTo">blev flyttet til</key>
     <key alias="wasCopiedTo">blev kopieret til</key>
+    <key alias="wasDeleted">blev slettet</key>
     <key alias="rights">Rettigheder</key>
     <key alias="rollback">Fortryd ændringer</key>
     <key alias="sendtopublish">Send til udgivelse</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index 53a58bd7b1..a3f098d20f 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -38,6 +38,7 @@
         <key alias="toInTheTreeStructureBelow">to in the tree structure below</key>
         <key alias="wasMovedTo">was moved to</key>
         <key alias="wasCopiedTo">was copied to</key>
+        <key alias="wasDeleted">was deleted</key>
         <key alias="rights">Permissions</key>
         <key alias="rollback">Rollback</key>
         <key alias="sendtopublish">Send To Publish</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
index a2b7e6d040..3e947f3589 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
@@ -38,6 +38,7 @@
         <key alias="toInTheTreeStructureBelow">to in the tree structure below</key>
         <key alias="wasMovedTo">was moved to</key>
         <key alias="wasCopiedTo">was copied to</key>
+        <key alias="wasDeleted">was deleted</key>
         <key alias="rights">Permissions</key>
         <key alias="rollback">Rollback</key>
         <key alias="sendtopublish">Send To Publish</key>

From c6e32019c618df66b7760478f2977b913fbca383 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Thu, 29 Aug 2019 13:41:34 +0200
Subject: [PATCH 408/776] V7: Add confirmation when deleting content and media
 (#6004)

(cherry picked from commit 3f8dffee3fa22a0e36506724165cf02790f2fee0)
---
 .../content/content.delete.controller.js      |  2 +-
 .../src/views/content/delete.html             | 22 ++++++++++++++-----
 .../src/views/media/delete.html               | 21 +++++++++++++-----
 .../views/media/media.delete.controller.js    |  3 +--
 src/Umbraco.Web.UI/umbraco/config/lang/da.xml |  1 +
 src/Umbraco.Web.UI/umbraco/config/lang/en.xml |  1 +
 .../umbraco/config/lang/en_us.xml             |  1 +
 7 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js
index 917e4c024a..b12d809aaa 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js
@@ -50,7 +50,7 @@ function ContentDeleteController($scope, contentResource, treeService, navigatio
                 $location.path(location);
             }
 
-            navigationService.hideMenu();
+            $scope.success = true;
         }, function(err) {
 
             $scope.currentNode.loading = false;
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/delete.html b/src/Umbraco.Web.UI.Client/src/views/content/delete.html
index f3bdb0d121..1eb0363c34 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/delete.html
@@ -1,12 +1,22 @@
 <div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.Content.DeleteController">
     <div class="umb-dialog-body" auto-scale="90">
-        
-        <p class="umb-abstract">
-            <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong> ?
-        </p>
 
-        <umb-confirm on-confirm="performDelete" on-cancel="cancel">    
-        </umb-confirm>
+        <div ng-show="success">
+            <div class="alert alert-success">
+                <strong>{{currentNode.name}}</strong>
+                <localize key="actions_wasDeleted">was deleted</localize>
+            </div>
+            <button class="btn btn-primary" ng-click="nav.hideDialog()">Ok</button>
+        </div>
+
+        <div ng-hide="success">
+            <p class="umb-abstract">
+                <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong> ?
+            </p>
+
+            <umb-confirm on-confirm="performDelete" on-cancel="cancel">    
+            </umb-confirm>
+        </div>
 
     </div>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/delete.html b/src/Umbraco.Web.UI.Client/src/views/media/delete.html
index 3c9716eb3f..9fca0c9222 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/delete.html
@@ -1,10 +1,21 @@
 <div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.Media.DeleteController">
     <div class="umb-dialog-body" auto-scale="90">
-        
-        <p class="umb-abstract">
-            <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong> ?
-        </p>
 
-        <umb-confirm on-confirm="performDelete" on-cancel="cancel"></umb-confirm>
+        <div ng-show="success">
+            <div class="alert alert-success">
+                <strong>{{currentNode.name}}</strong>
+                <localize key="actions_wasDeleted">was deleted</localize>
+            </div>
+            <button class="btn btn-primary" ng-click="nav.hideDialog()">Ok</button>
+        </div>
+
+        <div ng-hide="success">
+            <p class="umb-abstract">
+                <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong> ?
+            </p>
+
+            <umb-confirm on-confirm="performDelete" on-cancel="cancel"></umb-confirm>
+        </div>
+
     </div>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.delete.controller.js
index 6ff35ab9cb..c3b3e0c116 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/media.delete.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/media/media.delete.controller.js
@@ -50,8 +50,7 @@ function MediaDeleteController($scope, mediaResource, treeService, navigationSer
                 $location.path(location);
             }
 
-            navigationService.hideMenu();
-
+            $scope.success = true;
         }, function (err) {
 
             $scope.currentNode.loading = false;
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
index 3223478dd7..b0b8dc67e1 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
@@ -37,6 +37,7 @@
     <key alias="toInTheTreeStructureBelow">til i træstrukturen nedenfor</key>
     <key alias="wasMovedTo">blev flyttet til</key>
     <key alias="wasCopiedTo">blev kopieret til</key>
+    <key alias="wasDeleted">blev slettet</key>
     <key alias="rights">Rettigheder</key>
     <key alias="rollback">Fortryd ændringer</key>
     <key alias="sendtopublish">Send til udgivelse</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index 53a58bd7b1..a3f098d20f 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -38,6 +38,7 @@
         <key alias="toInTheTreeStructureBelow">to in the tree structure below</key>
         <key alias="wasMovedTo">was moved to</key>
         <key alias="wasCopiedTo">was copied to</key>
+        <key alias="wasDeleted">was deleted</key>
         <key alias="rights">Permissions</key>
         <key alias="rollback">Rollback</key>
         <key alias="sendtopublish">Send To Publish</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
index a2b7e6d040..3e947f3589 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
@@ -38,6 +38,7 @@
         <key alias="toInTheTreeStructureBelow">to in the tree structure below</key>
         <key alias="wasMovedTo">was moved to</key>
         <key alias="wasCopiedTo">was copied to</key>
+        <key alias="wasDeleted">was deleted</key>
         <key alias="rights">Permissions</key>
         <key alias="rollback">Rollback</key>
         <key alias="sendtopublish">Send To Publish</key>

From 16ab7b70cfcbea4406bc0f8be7dd0f1eef0e8234 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Thu, 29 Aug 2019 13:44:38 +0200
Subject: [PATCH 409/776] V8: Add confirmation when deleting content and media
 (#6005)

---
 .../content/content.delete.controller.js      |  8 +++++--
 .../src/views/content/delete.html             | 24 +++++++++++++------
 .../src/views/media/delete.html               | 21 ++++++++++++----
 .../views/media/media.delete.controller.js    |  5 ++--
 src/Umbraco.Web.UI/Umbraco/config/lang/da.xml |  1 +
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml |  1 +
 .../Umbraco/config/lang/en_us.xml             |  1 +
 7 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js
index 56ce67a0dc..855afc2bd2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js
@@ -58,7 +58,7 @@ function ContentDeleteController($scope, $timeout, contentResource, treeService,
                 $location.path(location);
             }
 
-            navigationService.hideMenu();
+            $scope.success = true;
         }, function(err) {
 
             toggleDeleting(false);
@@ -74,7 +74,11 @@ function ContentDeleteController($scope, $timeout, contentResource, treeService,
 
     $scope.cancel = function() {
         toggleDeleting(false);
-        navigationService.hideDialog();        
+        $scope.close();
+    };
+
+    $scope.close = function () {
+        navigationService.hideDialog();
     };
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/delete.html b/src/Umbraco.Web.UI.Client/src/views/content/delete.html
index 28c162854c..52e5d02178 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/delete.html
@@ -1,15 +1,25 @@
 <div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.Content.DeleteController">
     <div class="umb-dialog-body" auto-scale="90">
 
-        <p class="abstract">
-            <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong>?
-        </p>
-
-        <div class="umb-alert umb-alert--warning">
-            <localize key="defaultdialogs_variantdeletewarning">This will delete the node and all its languages. If you only want to delete one language go and unpublish it instead.</localize>
+        <div ng-show="success">
+            <div class="alert alert-success">
+                <strong>{{currentNode.name}}</strong>
+                <localize key="actions_wasDeleted">was deleted</localize>
+            </div>
+            <button class="btn btn-primary" ng-click="close()">Ok</button>
         </div>
 
-        <umb-confirm on-confirm="performDelete" confirm-button-style="danger" on-cancel="cancel"></umb-confirm>
+        <div ng-hide="success">
+            <p class="abstract">
+                <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong>?
+            </p>
+
+            <div class="umb-alert umb-alert--warning">
+                <localize key="defaultdialogs_variantdeletewarning">This will delete the node and all its languages. If you only want to delete one language go and unpublish it instead.</localize>
+            </div>
+
+            <umb-confirm on-confirm="performDelete" confirm-button-style="danger" on-cancel="cancel"></umb-confirm>
+        </div>
 
     </div>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/delete.html b/src/Umbraco.Web.UI.Client/src/views/media/delete.html
index af33574f55..d4f16ce71c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/delete.html
@@ -1,10 +1,21 @@
 <div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.Media.DeleteController">
     <div class="umb-dialog-body" auto-scale="90">
-        
-        <p class="abstract">
-            <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong>?
-        </p>
 
-        <umb-confirm on-confirm="performDelete" on-cancel="cancel"></umb-confirm>
+        <div ng-show="success">
+            <div class="alert alert-success">
+                <strong>{{currentNode.name}}</strong>
+                <localize key="actions_wasDeleted">was deleted</localize>
+            </div>
+            <button class="btn btn-primary" ng-click="close()">Ok</button>
+        </div>
+
+        <div ng-hide="success">
+            <p class="abstract">
+                <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong>?
+            </p>
+
+            <umb-confirm on-confirm="performDelete" on-cancel="close"></umb-confirm>
+        </div>
+
     </div>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.delete.controller.js
index ab057f87a4..8792571377 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/media.delete.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/media/media.delete.controller.js
@@ -50,8 +50,7 @@ function MediaDeleteController($scope, mediaResource, treeService, navigationSer
                 $location.path(location);
             }
 
-            navigationService.hideMenu();
-
+            $scope.success = true;
         }, function (err) {
 
             $scope.currentNode.loading = false;
@@ -66,7 +65,7 @@ function MediaDeleteController($scope, mediaResource, treeService, navigationSer
         });
     };
 
-    $scope.cancel = function() {
+    $scope.close = function() {
         navigationService.hideDialog();
     };
 }
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index 1946965c69..8d4226fe36 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -37,6 +37,7 @@
     <key alias="toInTheTreeStructureBelow">til i træstrukturen nedenfor</key>
     <key alias="wasMovedTo">blev flyttet til</key>
     <key alias="wasCopiedTo">blev kopieret til</key>
+    <key alias="wasDeleted">blev slettet</key>
     <key alias="rights">Rettigheder</key>
     <key alias="rollback">Fortryd ændringer</key>
     <key alias="sendtopublish">Send til udgivelse</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 2e40958e92..a8114faf93 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -38,6 +38,7 @@
     <key alias="toInTheTreeStructureBelow">to in the tree structure below</key>
     <key alias="wasMovedTo">was moved to</key>
     <key alias="wasCopiedTo">was copied to</key>
+    <key alias="wasDeleted">was deleted</key>
     <key alias="rights">Permissions</key>
     <key alias="rollback">Rollback</key>
     <key alias="sendtopublish">Send To Publish</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index 043ca2fb7e..a933b8507d 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -38,6 +38,7 @@
     <key alias="toInTheTreeStructureBelow">to in the tree structure below</key>
     <key alias="wasMovedTo">was moved to</key>
     <key alias="wasCopiedTo">was copied to</key>
+    <key alias="wasDeleted">was deleted</key>
     <key alias="rights">Permissions</key>
     <key alias="rollback">Rollback</key>
     <key alias="sendtopublish">Send To Publish</key>

From c7cb3f81f4da891898cf009c6bf00ea08fedd562 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Thu, 29 Aug 2019 13:44:38 +0200
Subject: [PATCH 410/776] V8: Add confirmation when deleting content and media
 (#6005)

(cherry picked from commit 16ab7b70cfcbea4406bc0f8be7dd0f1eef0e8234)
---
 .../content/content.delete.controller.js      |  8 +++++--
 .../src/views/content/delete.html             | 24 +++++++++++++------
 .../src/views/media/delete.html               | 21 ++++++++++++----
 .../views/media/media.delete.controller.js    |  5 ++--
 src/Umbraco.Web.UI/Umbraco/config/lang/da.xml |  1 +
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml |  1 +
 .../Umbraco/config/lang/en_us.xml             |  1 +
 7 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js
index 56ce67a0dc..855afc2bd2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js
@@ -58,7 +58,7 @@ function ContentDeleteController($scope, $timeout, contentResource, treeService,
                 $location.path(location);
             }
 
-            navigationService.hideMenu();
+            $scope.success = true;
         }, function(err) {
 
             toggleDeleting(false);
@@ -74,7 +74,11 @@ function ContentDeleteController($scope, $timeout, contentResource, treeService,
 
     $scope.cancel = function() {
         toggleDeleting(false);
-        navigationService.hideDialog();        
+        $scope.close();
+    };
+
+    $scope.close = function () {
+        navigationService.hideDialog();
     };
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/delete.html b/src/Umbraco.Web.UI.Client/src/views/content/delete.html
index 28c162854c..52e5d02178 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/delete.html
@@ -1,15 +1,25 @@
 <div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.Content.DeleteController">
     <div class="umb-dialog-body" auto-scale="90">
 
-        <p class="abstract">
-            <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong>?
-        </p>
-
-        <div class="umb-alert umb-alert--warning">
-            <localize key="defaultdialogs_variantdeletewarning">This will delete the node and all its languages. If you only want to delete one language go and unpublish it instead.</localize>
+        <div ng-show="success">
+            <div class="alert alert-success">
+                <strong>{{currentNode.name}}</strong>
+                <localize key="actions_wasDeleted">was deleted</localize>
+            </div>
+            <button class="btn btn-primary" ng-click="close()">Ok</button>
         </div>
 
-        <umb-confirm on-confirm="performDelete" confirm-button-style="danger" on-cancel="cancel"></umb-confirm>
+        <div ng-hide="success">
+            <p class="abstract">
+                <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong>?
+            </p>
+
+            <div class="umb-alert umb-alert--warning">
+                <localize key="defaultdialogs_variantdeletewarning">This will delete the node and all its languages. If you only want to delete one language go and unpublish it instead.</localize>
+            </div>
+
+            <umb-confirm on-confirm="performDelete" confirm-button-style="danger" on-cancel="cancel"></umb-confirm>
+        </div>
 
     </div>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/delete.html b/src/Umbraco.Web.UI.Client/src/views/media/delete.html
index af33574f55..d4f16ce71c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/delete.html
@@ -1,10 +1,21 @@
 <div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.Media.DeleteController">
     <div class="umb-dialog-body" auto-scale="90">
-        
-        <p class="abstract">
-            <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong>?
-        </p>
 
-        <umb-confirm on-confirm="performDelete" on-cancel="cancel"></umb-confirm>
+        <div ng-show="success">
+            <div class="alert alert-success">
+                <strong>{{currentNode.name}}</strong>
+                <localize key="actions_wasDeleted">was deleted</localize>
+            </div>
+            <button class="btn btn-primary" ng-click="close()">Ok</button>
+        </div>
+
+        <div ng-hide="success">
+            <p class="abstract">
+                <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong>?
+            </p>
+
+            <umb-confirm on-confirm="performDelete" on-cancel="close"></umb-confirm>
+        </div>
+
     </div>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.delete.controller.js
index ab057f87a4..8792571377 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/media.delete.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/media/media.delete.controller.js
@@ -50,8 +50,7 @@ function MediaDeleteController($scope, mediaResource, treeService, navigationSer
                 $location.path(location);
             }
 
-            navigationService.hideMenu();
-
+            $scope.success = true;
         }, function (err) {
 
             $scope.currentNode.loading = false;
@@ -66,7 +65,7 @@ function MediaDeleteController($scope, mediaResource, treeService, navigationSer
         });
     };
 
-    $scope.cancel = function() {
+    $scope.close = function() {
         navigationService.hideDialog();
     };
 }
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index c200f1f35e..5ae084bc06 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -37,6 +37,7 @@
     <key alias="toInTheTreeStructureBelow">til i træstrukturen nedenfor</key>
     <key alias="wasMovedTo">blev flyttet til</key>
     <key alias="wasCopiedTo">blev kopieret til</key>
+    <key alias="wasDeleted">blev slettet</key>
     <key alias="rights">Rettigheder</key>
     <key alias="rollback">Fortryd ændringer</key>
     <key alias="sendtopublish">Send til udgivelse</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index f3e8ba135b..fc8a6cf213 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -38,6 +38,7 @@
     <key alias="toInTheTreeStructureBelow">to in the tree structure below</key>
     <key alias="wasMovedTo">was moved to</key>
     <key alias="wasCopiedTo">was copied to</key>
+    <key alias="wasDeleted">was deleted</key>
     <key alias="rights">Permissions</key>
     <key alias="rollback">Rollback</key>
     <key alias="sendtopublish">Send To Publish</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index a171d00d32..13ec6f8135 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -38,6 +38,7 @@
     <key alias="toInTheTreeStructureBelow">to in the tree structure below</key>
     <key alias="wasMovedTo">was moved to</key>
     <key alias="wasCopiedTo">was copied to</key>
+    <key alias="wasDeleted">was deleted</key>
     <key alias="rights">Permissions</key>
     <key alias="rollback">Rollback</key>
     <key alias="sendtopublish">Send To Publish</key>

From 981519eac0938ddbe8f4422d7c64705996b67c59 Mon Sep 17 00:00:00 2001
From: Poornima Nayar <poornimakrishnav@gmail.com>
Date: Thu, 29 Aug 2019 12:49:26 +0100
Subject: [PATCH 411/776] Added contribution guidelines file

which was otherwise leading to a 404 from the Contributing.md file (#6197)
---
 .github/CONTRIBUTION_GUIDELINES.md | 35 ++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 .github/CONTRIBUTION_GUIDELINES.md

diff --git a/.github/CONTRIBUTION_GUIDELINES.md b/.github/CONTRIBUTION_GUIDELINES.md
new file mode 100644
index 0000000000..7d2afb46bf
--- /dev/null
+++ b/.github/CONTRIBUTION_GUIDELINES.md
@@ -0,0 +1,35 @@
+# Contributing to Umbraco CMS
+
+When you’re considering creating a pull request for Umbraco CMS, we will categorize them in two different sizes, small and large.
+
+The process for both sizes is very similar, as [explained in the contribution document](CONTRIBUTING.md#how-do-i-begin).
+
+## Small PRs
+Bug fixes and small improvements - can be recognized by seeing a small number of changes and possibly a small number of new files.
+
+We’re usually able to handle small PRs pretty quickly. A community volunteer will do the initial review and flag it for Umbraco HQ as “community tested”. If everything looks good, it will be merged pretty quickly [as per the described process](REVIEW_PROCESS.md).
+
+### Up for grabs
+
+Umbraco HQ will regularly mark newly created issues on the issue tracker with the `Up for grabs` tag. This means that the proposed changes are wanted in Umbraco but the HQ does not have the time to make them at this time. We encourage anyone to pick them up and help out.
+
+If you do start working on something, make sure leave a small comment on the issue saying something like: "I'm working on this". That way other people stumbling upon the issue know they don't need to pick it up, someone already has.
+
+## Large PRs
+New features and large refactorings - can be recognized by seeing a large number of changes, plenty of new files, updates to package manager files (NuGet’s packages.config, NPM’s packages.json, etc.).  
+
+We would love to follow the same process for larger PRs but this is not always possible due to time limitations and priorities that need to be aligned. We don’t want to put up any barriers, but this document should set the correct expectations.  
+
+Please make sure to describe your idea in an issue, it helps to put in mockup screenshots or videos.  
+
+If the change makes sense for HQ to include in Umbraco CMS we will leave you some feedback on how we’d like to see it being implemented. 
+
+If a larger pull request is encouraged by Umbraco HQ, the process will be similar to what is described in the [small PRs process](#small-prs) above, we strive to feedback within 14 days. Finalizing and merging the PR might take longer though as it will likely need to be picked up by the development team to make sure everything is in order. We’ll keep you posted on the progress.
+
+It is highly recommended that you speak to the HQ before making large, complex changes. 
+
+### Pull request or package?
+
+If it doesn’t fit in CMS right now, we will likely encourage you to make it into a package instead. A package is a great way to check out popularity of a feature, learn how people use it, validate good usability and to fix bugs.  
+
+Eventually, a package could "graduate" to be included in the CMS.  

From dfe96dccdefc3760d610c9b08e67e8adcb3da663 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Tue, 27 Aug 2019 22:37:23 +0200
Subject: [PATCH 412/776] Use a pointer cursor for selectable items in mini
 listviews

---
 .../src/less/components/umb-table.less                      | 6 +++++-
 .../src/views/components/umb-mini-list-view.html            | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less
index f387b6540b..27b64f85fb 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less
@@ -295,7 +295,11 @@ input.umb-table__input {
 .umb-table__row-expand {
     font-size: 12px;
     text-decoration: none;
-    color: @black;
+    color: @gray-4;
+
+    &:hover {
+        color: @black;
+    }
 }
 
 .umb-table__row-expand--hidden {
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html
index 55d7bd0744..f11df6042e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html
@@ -60,7 +60,7 @@
                 </div>
 
                 <!-- Items -->
-                <div class="umb-table-row"
+                <div class="umb-table-row cursor-pointer"
                     ng-repeat="child in miniListView.children"
                     ng-click="selectNode(child)"
                     ng-class="{'-selected':child.selected, 'not-allowed':!child.allowed}">

From ad978c60df6087def5264323b2b3336ee36cc29e Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Thu, 29 Aug 2019 13:51:55 +0200
Subject: [PATCH 413/776] V8: Use a standard confirm dialog when removing
 content type compositions (#6213)

---
 .../src/less/components/editor.less           | 11 --------
 .../compositions/compositions.controller.js   | 26 +++++++++++++++----
 .../compositions/compositions.html            | 10 -------
 .../compositions/overlays/confirmremove.html  |  6 +++++
 4 files changed, 27 insertions(+), 26 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/overlays/confirmremove.html

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor.less b/src/Umbraco.Web.UI.Client/src/less/components/editor.less
index 2a1d047ca1..85fcc249f9 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/editor.less
@@ -376,14 +376,3 @@ a.umb-variant-switcher__toggle {
 	margin-right: auto;
 	padding-right: 10px;
 }
-
-/* Confirm */
-.umb-editor-confirm {
-	background-color: @white;
-	padding: 20px;
-	position: absolute;
-	left: 0;
-	bottom: 0;
-	z-index: 10;
-	box-shadow: 0 -3px 12px 0px rgba(0,0,0,0.16);
-}
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.controller.js
index 75bf414099..c9d2e43a98 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.controller.js
@@ -1,7 +1,7 @@
 (function () {
     "use strict";
 
-    function CompositionsController($scope, $location, $filter) {
+    function CompositionsController($scope, $location, $filter, overlayService) {
 
         var vm = this;
         var oldModel = null;
@@ -56,19 +56,35 @@
             if ($scope.model && $scope.model.submit) {
 
                 // check if any compositions has been removed
-                vm.compositionRemoved = false;
+                var compositionRemoved = false;
                 for (var i = 0; oldModel.compositeContentTypes.length > i; i++) {
                     var oldComposition = oldModel.compositeContentTypes[i];
                     if (_.contains($scope.model.compositeContentTypes, oldComposition) === false) {
-                        vm.compositionRemoved = true;
+                        compositionRemoved = true;
                     }
                 }
 
                 /* submit the form if there havne't been removed any composition
                 or the confirm checkbox has been checked */
-                if (!vm.compositionRemoved || vm.allowSubmit) {
-                    $scope.model.submit($scope.model);
+                if (compositionRemoved) {
+                    vm.allowSubmit = false;
+                    const dialog = {
+                        view: "views/common/infiniteeditors/compositions/overlays/confirmremove.html",
+                        submitButtonLabelKey: "general_ok",
+                        closeButtonLabelKey: "general_cancel",
+                        submit: function (model) {
+                            $scope.model.submit($scope.model);
+                            overlayService.close();
+                        },
+                        close: function () {
+                            overlayService.close();
+                        }
+                    };
+                    overlayService.open(dialog);
+                    return;
                 }
+
+                $scope.model.submit($scope.model);
             }
         }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.html
index bf74431d96..bb0804e2bf 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.html
@@ -92,16 +92,6 @@
 
                 </umb-box-content>
             </umb-box>
-
-            <div ng-if="vm.compositionRemoved" class="umb-editor-confirm">
-                <h5 class="red"><i class="icon-alert"></i>Warning</h5>
-                <p>Removing a composition will delete all the associated property data. Once you save the document type there's no way back, are you sure?</p>
-                <label class="checkbox no-indent">
-                    <input type="checkbox" ng-model="vm.allowSubmit" />
-                    <strong>I know what I'm doing</strong>
-                </label>
-            </div>
-
         </umb-editor-container>
 
         <umb-editor-footer>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/overlays/confirmremove.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/overlays/confirmremove.html
new file mode 100644
index 0000000000..dd5e244ba5
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/overlays/confirmremove.html
@@ -0,0 +1,6 @@
+<div>
+
+    <h5 class="red"><i class="icon-alert"></i>Warning</h5>
+    <p>Removing a composition will delete all the associated property data. Once you save the document type there's no way back, are you sure?</p>
+
+</div>

From 3afcdbbb257aac5a8face7d9dd0e48a904a960f2 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Tue, 27 Aug 2019 22:37:23 +0200
Subject: [PATCH 414/776] Use a pointer cursor for selectable items in mini
 listviews

(cherry picked from commit dfe96dccdefc3760d610c9b08e67e8adcb3da663)
---
 .../src/less/components/umb-table.less                      | 6 +++++-
 .../src/views/components/umb-mini-list-view.html            | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less
index f387b6540b..27b64f85fb 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less
@@ -295,7 +295,11 @@ input.umb-table__input {
 .umb-table__row-expand {
     font-size: 12px;
     text-decoration: none;
-    color: @black;
+    color: @gray-4;
+
+    &:hover {
+        color: @black;
+    }
 }
 
 .umb-table__row-expand--hidden {
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html
index 55d7bd0744..f11df6042e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html
@@ -60,7 +60,7 @@
                 </div>
 
                 <!-- Items -->
-                <div class="umb-table-row"
+                <div class="umb-table-row cursor-pointer"
                     ng-repeat="child in miniListView.children"
                     ng-click="selectNode(child)"
                     ng-class="{'-selected':child.selected, 'not-allowed':!child.allowed}">

From 87a0350d44cd7e76d9534e0f84ab800bd27e1ecc Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Thu, 29 Aug 2019 13:51:55 +0200
Subject: [PATCH 415/776] V8: Use a standard confirm dialog when removing
 content type compositions (#6213)

(cherry picked from commit ad978c60df6087def5264323b2b3336ee36cc29e)
---
 .../src/less/components/editor.less           | 11 --------
 .../compositions/compositions.controller.js   | 26 +++++++++++++++----
 .../compositions/compositions.html            | 10 -------
 .../compositions/overlays/confirmremove.html  |  6 +++++
 4 files changed, 27 insertions(+), 26 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/overlays/confirmremove.html

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor.less b/src/Umbraco.Web.UI.Client/src/less/components/editor.less
index 52dd7ea678..31dd2d3dca 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/editor.less
@@ -373,14 +373,3 @@ a.umb-variant-switcher__toggle {
 	margin-right: auto;
 	padding-right: 10px;
 }
-
-/* Confirm */
-.umb-editor-confirm {
-	background-color: @white;
-	padding: 20px;
-	position: absolute;
-	left: 0;
-	bottom: 0;
-	z-index: 10;
-	box-shadow: 0 -3px 12px 0px rgba(0,0,0,0.16);
-}
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.controller.js
index 75bf414099..c9d2e43a98 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.controller.js
@@ -1,7 +1,7 @@
 (function () {
     "use strict";
 
-    function CompositionsController($scope, $location, $filter) {
+    function CompositionsController($scope, $location, $filter, overlayService) {
 
         var vm = this;
         var oldModel = null;
@@ -56,19 +56,35 @@
             if ($scope.model && $scope.model.submit) {
 
                 // check if any compositions has been removed
-                vm.compositionRemoved = false;
+                var compositionRemoved = false;
                 for (var i = 0; oldModel.compositeContentTypes.length > i; i++) {
                     var oldComposition = oldModel.compositeContentTypes[i];
                     if (_.contains($scope.model.compositeContentTypes, oldComposition) === false) {
-                        vm.compositionRemoved = true;
+                        compositionRemoved = true;
                     }
                 }
 
                 /* submit the form if there havne't been removed any composition
                 or the confirm checkbox has been checked */
-                if (!vm.compositionRemoved || vm.allowSubmit) {
-                    $scope.model.submit($scope.model);
+                if (compositionRemoved) {
+                    vm.allowSubmit = false;
+                    const dialog = {
+                        view: "views/common/infiniteeditors/compositions/overlays/confirmremove.html",
+                        submitButtonLabelKey: "general_ok",
+                        closeButtonLabelKey: "general_cancel",
+                        submit: function (model) {
+                            $scope.model.submit($scope.model);
+                            overlayService.close();
+                        },
+                        close: function () {
+                            overlayService.close();
+                        }
+                    };
+                    overlayService.open(dialog);
+                    return;
                 }
+
+                $scope.model.submit($scope.model);
             }
         }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.html
index bf74431d96..bb0804e2bf 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.html
@@ -92,16 +92,6 @@
 
                 </umb-box-content>
             </umb-box>
-
-            <div ng-if="vm.compositionRemoved" class="umb-editor-confirm">
-                <h5 class="red"><i class="icon-alert"></i>Warning</h5>
-                <p>Removing a composition will delete all the associated property data. Once you save the document type there's no way back, are you sure?</p>
-                <label class="checkbox no-indent">
-                    <input type="checkbox" ng-model="vm.allowSubmit" />
-                    <strong>I know what I'm doing</strong>
-                </label>
-            </div>
-
         </umb-editor-container>
 
         <umb-editor-footer>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/overlays/confirmremove.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/overlays/confirmremove.html
new file mode 100644
index 0000000000..dd5e244ba5
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/overlays/confirmremove.html
@@ -0,0 +1,6 @@
+<div>
+
+    <h5 class="red"><i class="icon-alert"></i>Warning</h5>
+    <p>Removing a composition will delete all the associated property data. Once you save the document type there's no way back, are you sure?</p>
+
+</div>

From 9e1424fb2480952feb389f42e25d42593efa18d0 Mon Sep 17 00:00:00 2001
From: Steve Megson <steve@megson.org>
Date: Tue, 27 Aug 2019 20:36:11 +0100
Subject: [PATCH 416/776] RefactorMacroColumns

---
 .../Upgrade/V_8_0_0/RefactorMacroColumns.cs    | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RefactorMacroColumns.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RefactorMacroColumns.cs
index bd08b53877..58ec0e30c2 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RefactorMacroColumns.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RefactorMacroColumns.cs
@@ -15,21 +15,17 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
             {
                 //special trick to add the column without constraints and return the sql to add them later
                 AddColumn<MacroDto>("macroType", out var sqls1);
-                //now we need to update the new column with some values because this column doesn't allow NULL values
-                Update.Table(Constants.DatabaseSchema.Tables.Macro).Set(new { macroType = (int)MacroTypes.Unknown}).AllRows().Do();
-                //now apply constraints (NOT NULL) to new table
-                foreach (var sql in sqls1) Execute.Sql(sql).Do();
-
-                //special trick to add the column without constraints and return the sql to add them later
                 AddColumn<MacroDto>("macroSource", out var sqls2);
 
-                //populate the new macroSource column with legacy data
-                Execute.Sql($"UPDATE {Constants.DatabaseSchema.Tables.Macro} SET macroSource = macroXSLT, macroType = {(int)MacroTypes.Unknown} WHERE macroXSLT IS NOT NULL").Do();
-                Execute.Sql($"UPDATE {Constants.DatabaseSchema.Tables.Macro} SET macroSource = macroScriptAssembly, macroType = {(int)MacroTypes.Unknown} WHERE macroScriptAssembly IS NOT NULL").Do();
-                Execute.Sql($"UPDATE {Constants.DatabaseSchema.Tables.Macro} SET macroSource = macroScriptType, macroType = {(int)MacroTypes.Unknown} WHERE macroScriptType IS NOT NULL").Do();
-                Execute.Sql($"UPDATE {Constants.DatabaseSchema.Tables.Macro} SET macroSource = macroPython, macroType = {(int)MacroTypes.PartialView} WHERE macroPython IS NOT NULL").Do();
+                //populate the new columns with legacy data
+                Execute.Sql($"UPDATE {Constants.DatabaseSchema.Tables.Macro} SET macroSource = '', macroType = {(int)MacroTypes.Unknown}").Do();
+                Execute.Sql($"UPDATE {Constants.DatabaseSchema.Tables.Macro} SET macroSource = macroXSLT, macroType = {(int)MacroTypes.Unknown} WHERE macroXSLT != '' AND macroXSLT IS NOT NULL").Do();
+                Execute.Sql($"UPDATE {Constants.DatabaseSchema.Tables.Macro} SET macroSource = macroScriptAssembly, macroType = {(int)MacroTypes.Unknown} WHERE macroScriptAssembly != '' AND macroScriptAssembly IS NOT NULL").Do();
+                Execute.Sql($"UPDATE {Constants.DatabaseSchema.Tables.Macro} SET macroSource = macroScriptType, macroType = {(int)MacroTypes.Unknown} WHERE macroScriptType != '' AND macroScriptType IS NOT NULL").Do();
+                Execute.Sql($"UPDATE {Constants.DatabaseSchema.Tables.Macro} SET macroSource = macroPython, macroType = {(int)MacroTypes.PartialView} WHERE macroPython != '' AND macroPython IS NOT NULL").Do();
 
                 //now apply constraints (NOT NULL) to new table
+                foreach (var sql in sqls1) Execute.Sql(sql).Do();
                 foreach (var sql in sqls2) Execute.Sql(sql).Do();
 
                 //now remove these old columns

From 507c82f12237daa01f1c52ed04961e5f89673e76 Mon Sep 17 00:00:00 2001
From: Steve Megson <steve@megson.org>
Date: Tue, 27 Aug 2019 20:36:11 +0100
Subject: [PATCH 417/776] RefactorMacroColumns

(cherry picked from commit 9e1424fb2480952feb389f42e25d42593efa18d0)
---
 .../Upgrade/V_8_0_0/RefactorMacroColumns.cs    | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RefactorMacroColumns.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RefactorMacroColumns.cs
index bd08b53877..58ec0e30c2 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RefactorMacroColumns.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RefactorMacroColumns.cs
@@ -15,21 +15,17 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
             {
                 //special trick to add the column without constraints and return the sql to add them later
                 AddColumn<MacroDto>("macroType", out var sqls1);
-                //now we need to update the new column with some values because this column doesn't allow NULL values
-                Update.Table(Constants.DatabaseSchema.Tables.Macro).Set(new { macroType = (int)MacroTypes.Unknown}).AllRows().Do();
-                //now apply constraints (NOT NULL) to new table
-                foreach (var sql in sqls1) Execute.Sql(sql).Do();
-
-                //special trick to add the column without constraints and return the sql to add them later
                 AddColumn<MacroDto>("macroSource", out var sqls2);
 
-                //populate the new macroSource column with legacy data
-                Execute.Sql($"UPDATE {Constants.DatabaseSchema.Tables.Macro} SET macroSource = macroXSLT, macroType = {(int)MacroTypes.Unknown} WHERE macroXSLT IS NOT NULL").Do();
-                Execute.Sql($"UPDATE {Constants.DatabaseSchema.Tables.Macro} SET macroSource = macroScriptAssembly, macroType = {(int)MacroTypes.Unknown} WHERE macroScriptAssembly IS NOT NULL").Do();
-                Execute.Sql($"UPDATE {Constants.DatabaseSchema.Tables.Macro} SET macroSource = macroScriptType, macroType = {(int)MacroTypes.Unknown} WHERE macroScriptType IS NOT NULL").Do();
-                Execute.Sql($"UPDATE {Constants.DatabaseSchema.Tables.Macro} SET macroSource = macroPython, macroType = {(int)MacroTypes.PartialView} WHERE macroPython IS NOT NULL").Do();
+                //populate the new columns with legacy data
+                Execute.Sql($"UPDATE {Constants.DatabaseSchema.Tables.Macro} SET macroSource = '', macroType = {(int)MacroTypes.Unknown}").Do();
+                Execute.Sql($"UPDATE {Constants.DatabaseSchema.Tables.Macro} SET macroSource = macroXSLT, macroType = {(int)MacroTypes.Unknown} WHERE macroXSLT != '' AND macroXSLT IS NOT NULL").Do();
+                Execute.Sql($"UPDATE {Constants.DatabaseSchema.Tables.Macro} SET macroSource = macroScriptAssembly, macroType = {(int)MacroTypes.Unknown} WHERE macroScriptAssembly != '' AND macroScriptAssembly IS NOT NULL").Do();
+                Execute.Sql($"UPDATE {Constants.DatabaseSchema.Tables.Macro} SET macroSource = macroScriptType, macroType = {(int)MacroTypes.Unknown} WHERE macroScriptType != '' AND macroScriptType IS NOT NULL").Do();
+                Execute.Sql($"UPDATE {Constants.DatabaseSchema.Tables.Macro} SET macroSource = macroPython, macroType = {(int)MacroTypes.PartialView} WHERE macroPython != '' AND macroPython IS NOT NULL").Do();
 
                 //now apply constraints (NOT NULL) to new table
+                foreach (var sql in sqls1) Execute.Sql(sql).Do();
                 foreach (var sql in sqls2) Execute.Sql(sql).Do();
 
                 //now remove these old columns

From 4dad427a643885a138b16c708fb1bba16085f90e Mon Sep 17 00:00:00 2001
From: jmayntzhusen <36075913+jmayntzhusen@users.noreply.github.com>
Date: Thu, 29 Aug 2019 14:01:30 +0200
Subject: [PATCH 418/776] Improve error messages (#6154)

---
 src/Umbraco.Core/Services/Implement/ContentService.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs
index 5492f97409..faf4744c76 100644
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -757,11 +757,11 @@ namespace Umbraco.Core.Services.Implement
         {
             var publishedState = content.PublishedState;
             if (publishedState != PublishedState.Published && publishedState != PublishedState.Unpublished)
-                throw new InvalidOperationException("Cannot save (un)publishing content, use the dedicated SavePublished method.");
+                throw new InvalidOperationException($"Cannot save (un)publishing content with name: {content.Name} - and state: {content.PublishedState}, use the dedicated SavePublished method.");
 
             if (content.Name != null && content.Name.Length > 255)
             {
-                throw new InvalidOperationException("Name cannot be more than 255 characters in length.");
+                throw new InvalidOperationException($"Content with the name {content.Name} cannot be more than 255 characters in length.");
             }
 
             var evtMsgs = EventMessagesFactory.Get();

From 650663de0ca37dfad7baa22d3c6c2d9e18e9e8cb Mon Sep 17 00:00:00 2001
From: jmayntzhusen <36075913+jmayntzhusen@users.noreply.github.com>
Date: Thu, 29 Aug 2019 14:01:30 +0200
Subject: [PATCH 419/776] Improve error messages (#6154)

(cherry picked from commit 4dad427a643885a138b16c708fb1bba16085f90e)
---
 src/Umbraco.Core/Services/Implement/ContentService.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs
index 5492f97409..faf4744c76 100644
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -757,11 +757,11 @@ namespace Umbraco.Core.Services.Implement
         {
             var publishedState = content.PublishedState;
             if (publishedState != PublishedState.Published && publishedState != PublishedState.Unpublished)
-                throw new InvalidOperationException("Cannot save (un)publishing content, use the dedicated SavePublished method.");
+                throw new InvalidOperationException($"Cannot save (un)publishing content with name: {content.Name} - and state: {content.PublishedState}, use the dedicated SavePublished method.");
 
             if (content.Name != null && content.Name.Length > 255)
             {
-                throw new InvalidOperationException("Name cannot be more than 255 characters in length.");
+                throw new InvalidOperationException($"Content with the name {content.Name} cannot be more than 255 characters in length.");
             }
 
             var evtMsgs = EventMessagesFactory.Get();

From b254b4fcdaad4a1ce57c06e022737348a3c57472 Mon Sep 17 00:00:00 2001
From: stevemegson <steve@megson.org>
Date: Thu, 29 Aug 2019 13:06:59 +0100
Subject: [PATCH 420/776] V8: Indexing of grid values containing JSON (#6201)

---
 .../GridPropertyIndexValueFactory.cs             | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web/PropertyEditors/GridPropertyIndexValueFactory.cs b/src/Umbraco.Web/PropertyEditors/GridPropertyIndexValueFactory.cs
index 7e47d0dcd6..0cf36122d7 100644
--- a/src/Umbraco.Web/PropertyEditors/GridPropertyIndexValueFactory.cs
+++ b/src/Umbraco.Web/PropertyEditors/GridPropertyIndexValueFactory.cs
@@ -41,8 +41,6 @@ namespace Umbraco.Web.PropertyEditors
                         {
                             var controlVal = control.Value;
 
-                            // TODO: If it's not a string, then it's a json formatted value -
-                            // we cannot really index this in a smart way since it could be 'anything'
                             if (controlVal?.Type == JTokenType.String)
                             {
                                 var str = controlVal.Value<string>();
@@ -53,14 +51,22 @@ namespace Umbraco.Web.PropertyEditors
                                 //add the row name as an individual field
                                 result.Add(new KeyValuePair<string, IEnumerable<object>>($"{property.Alias}.{rowName}", new[] { str }));
                             }
+                            else if (controlVal is JContainer jc)
+                            {
+                                foreach (var s in jc.Descendants().Where(t => t.Type == JTokenType.String))
+                                {
+                                    sb.Append(s.Value<string>());
+                                    sb.Append(" ");
+                                }
+                            }
                         }
                     }
 
+                    //First save the raw value to a raw field
+                    result.Add(new KeyValuePair<string, IEnumerable<object>>($"{UmbracoExamineIndex.RawFieldPrefix}{property.Alias}", new[] { rawVal }));
+
                     if (sb.Length > 0)
                     {
-                        //First save the raw value to a raw field
-                        result.Add(new KeyValuePair<string, IEnumerable<object>>($"{UmbracoExamineIndex.RawFieldPrefix}{property.Alias}", new[] { rawVal }));
-
                         //index the property with the combined/cleaned value
                         result.Add(new KeyValuePair<string, IEnumerable<object>>(property.Alias, new[] { sb.ToString() }));
                     }

From 742105594e274d913f9254a7d01daa946006e376 Mon Sep 17 00:00:00 2001
From: stevemegson <steve@megson.org>
Date: Thu, 29 Aug 2019 13:06:59 +0100
Subject: [PATCH 421/776] V8: Indexing of grid values containing JSON (#6201)

(cherry picked from commit b254b4fcdaad4a1ce57c06e022737348a3c57472)
---
 .../GridPropertyIndexValueFactory.cs             | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web/PropertyEditors/GridPropertyIndexValueFactory.cs b/src/Umbraco.Web/PropertyEditors/GridPropertyIndexValueFactory.cs
index 7e47d0dcd6..0cf36122d7 100644
--- a/src/Umbraco.Web/PropertyEditors/GridPropertyIndexValueFactory.cs
+++ b/src/Umbraco.Web/PropertyEditors/GridPropertyIndexValueFactory.cs
@@ -41,8 +41,6 @@ namespace Umbraco.Web.PropertyEditors
                         {
                             var controlVal = control.Value;
 
-                            // TODO: If it's not a string, then it's a json formatted value -
-                            // we cannot really index this in a smart way since it could be 'anything'
                             if (controlVal?.Type == JTokenType.String)
                             {
                                 var str = controlVal.Value<string>();
@@ -53,14 +51,22 @@ namespace Umbraco.Web.PropertyEditors
                                 //add the row name as an individual field
                                 result.Add(new KeyValuePair<string, IEnumerable<object>>($"{property.Alias}.{rowName}", new[] { str }));
                             }
+                            else if (controlVal is JContainer jc)
+                            {
+                                foreach (var s in jc.Descendants().Where(t => t.Type == JTokenType.String))
+                                {
+                                    sb.Append(s.Value<string>());
+                                    sb.Append(" ");
+                                }
+                            }
                         }
                     }
 
+                    //First save the raw value to a raw field
+                    result.Add(new KeyValuePair<string, IEnumerable<object>>($"{UmbracoExamineIndex.RawFieldPrefix}{property.Alias}", new[] { rawVal }));
+
                     if (sb.Length > 0)
                     {
-                        //First save the raw value to a raw field
-                        result.Add(new KeyValuePair<string, IEnumerable<object>>($"{UmbracoExamineIndex.RawFieldPrefix}{property.Alias}", new[] { rawVal }));
-
                         //index the property with the combined/cleaned value
                         result.Add(new KeyValuePair<string, IEnumerable<object>>(property.Alias, new[] { sb.ToString() }));
                     }

From 934e2066a078d559c60a42ad43c594cdde909962 Mon Sep 17 00:00:00 2001
From: Steve Megson <steve@honestjohn.co.uk>
Date: Sat, 24 Aug 2019 17:29:37 +0100
Subject: [PATCH 422/776] #6158 - missing media folders after migration

---
 .../Persistence/Repositories/Implement/EntityRepository.cs      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs
index 4a32e373c1..b6d39fe54f 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs
@@ -404,7 +404,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             if (isMedia)
             {
                 sql
-                    .InnerJoin<MediaVersionDto>().On<ContentVersionDto, MediaVersionDto>((left, right) => left.Id == right.Id);
+                    .LeftJoin<MediaVersionDto>().On<ContentVersionDto, MediaVersionDto>((left, right) => left.Id == right.Id);
             }
 
             //Any LeftJoin statements need to come last

From 9413427797d2836ae9f4ea17cf4b6b7c926ff994 Mon Sep 17 00:00:00 2001
From: Steve Megson <steve@honestjohn.co.uk>
Date: Sat, 24 Aug 2019 17:29:37 +0100
Subject: [PATCH 423/776] #6158 - missing media folders after migration

(cherry picked from commit 934e2066a078d559c60a42ad43c594cdde909962)
---
 .../Persistence/Repositories/Implement/EntityRepository.cs      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs
index 4a32e373c1..b6d39fe54f 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs
@@ -404,7 +404,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             if (isMedia)
             {
                 sql
-                    .InnerJoin<MediaVersionDto>().On<ContentVersionDto, MediaVersionDto>((left, right) => left.Id == right.Id);
+                    .LeftJoin<MediaVersionDto>().On<ContentVersionDto, MediaVersionDto>((left, right) => left.Id == right.Id);
             }
 
             //Any LeftJoin statements need to come last

From 09def9f3526a35f56276ac640babb55d7fe16568 Mon Sep 17 00:00:00 2001
From: Steve Megson <steve@megson.org>
Date: Mon, 26 Aug 2019 12:45:35 +0100
Subject: [PATCH 424/776] Migration of MarkdownEditor prevalues

---
 .../MarkdownEditorPreValueMigrator.cs         | 19 +++++++++++++++++++
 .../DataTypes/PreValueMigratorComposer.cs     |  3 ++-
 src/Umbraco.Core/Umbraco.Core.csproj          |  1 +
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/MarkdownEditorPreValueMigrator.cs

diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/MarkdownEditorPreValueMigrator.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/MarkdownEditorPreValueMigrator.cs
new file mode 100644
index 0000000000..87a1fd6504
--- /dev/null
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/MarkdownEditorPreValueMigrator.cs
@@ -0,0 +1,19 @@
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0.DataTypes
+{
+    class MarkdownEditorPreValueMigrator : DefaultPreValueMigrator //PreValueMigratorBase
+    {
+        public override bool CanMigrate(string editorAlias)
+            => editorAlias == Constants.PropertyEditors.Aliases.MarkdownEditor;
+        
+        protected override object GetPreValueValue(PreValueDto preValue)
+        {
+            if (preValue.Alias == "preview")
+                return preValue.Value == "1";
+
+            return base.GetPreValueValue(preValue);
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/PreValueMigratorComposer.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/PreValueMigratorComposer.cs
index 8dfa464508..db9021d653 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/PreValueMigratorComposer.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/PreValueMigratorComposer.cs
@@ -20,7 +20,8 @@ public class PreValueMigratorComposer : ICoreComposer
             .Append<DecimalPreValueMigrator>()
             .Append<ListViewPreValueMigrator>()
             .Append<DropDownFlexiblePreValueMigrator>()
-            .Append<ValueListPreValueMigrator>();
+            .Append<ValueListPreValueMigrator>()
+            .Append<MarkdownEditorPreValueMigrator>();
     }
 }
 }
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index bdbe384b05..c19722433f 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -235,6 +235,7 @@
     <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\IPreValueMigrator.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\ListViewPreValueMigrator.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\MediaPickerPreValueMigrator.cs" />
+    <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\MarkdownEditorPreValueMigrator.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\NestedContentPreValueMigrator.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\PreValueMigratorCollection.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\PreValueMigratorCollectionBuilder.cs" />

From 71aad30f8ea63662606b42bd5abb540fd3ffd559 Mon Sep 17 00:00:00 2001
From: Steve Megson <steve@megson.org>
Date: Mon, 26 Aug 2019 12:45:35 +0100
Subject: [PATCH 425/776] Migration of MarkdownEditor prevalues

(cherry picked from commit 09def9f3526a35f56276ac640babb55d7fe16568)
---
 .../MarkdownEditorPreValueMigrator.cs         | 19 +++++++++++++++++++
 .../DataTypes/PreValueMigratorComposer.cs     |  3 ++-
 src/Umbraco.Core/Umbraco.Core.csproj          |  1 +
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/MarkdownEditorPreValueMigrator.cs

diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/MarkdownEditorPreValueMigrator.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/MarkdownEditorPreValueMigrator.cs
new file mode 100644
index 0000000000..87a1fd6504
--- /dev/null
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/MarkdownEditorPreValueMigrator.cs
@@ -0,0 +1,19 @@
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0.DataTypes
+{
+    class MarkdownEditorPreValueMigrator : DefaultPreValueMigrator //PreValueMigratorBase
+    {
+        public override bool CanMigrate(string editorAlias)
+            => editorAlias == Constants.PropertyEditors.Aliases.MarkdownEditor;
+        
+        protected override object GetPreValueValue(PreValueDto preValue)
+        {
+            if (preValue.Alias == "preview")
+                return preValue.Value == "1";
+
+            return base.GetPreValueValue(preValue);
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/PreValueMigratorComposer.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/PreValueMigratorComposer.cs
index 8dfa464508..db9021d653 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/PreValueMigratorComposer.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/PreValueMigratorComposer.cs
@@ -20,7 +20,8 @@ public class PreValueMigratorComposer : ICoreComposer
             .Append<DecimalPreValueMigrator>()
             .Append<ListViewPreValueMigrator>()
             .Append<DropDownFlexiblePreValueMigrator>()
-            .Append<ValueListPreValueMigrator>();
+            .Append<ValueListPreValueMigrator>()
+            .Append<MarkdownEditorPreValueMigrator>();
     }
 }
 }
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index bdbe384b05..c19722433f 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -235,6 +235,7 @@
     <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\IPreValueMigrator.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\ListViewPreValueMigrator.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\MediaPickerPreValueMigrator.cs" />
+    <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\MarkdownEditorPreValueMigrator.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\NestedContentPreValueMigrator.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\PreValueMigratorCollection.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\PreValueMigratorCollectionBuilder.cs" />

From bfc87922cbd174ad4670ea7c523e722c5d82effa Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sun, 25 Aug 2019 13:25:46 +0200
Subject: [PATCH 426/776] Make sure the empty search result is visible for list
 views

---
 src/Umbraco.Web.UI.Client/src/less/property-editors.less | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
index 92351d09ca..435b64ad34 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -5,7 +5,6 @@
 // --------------------------------------------------
 .umb-property-editor {
     width: 100%;
-    position:relative;
 }
 
 .umb-property-editor-tiny {

From 529792227cdfee52a4b092b301ccadb18d339422 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sun, 25 Aug 2019 13:25:46 +0200
Subject: [PATCH 427/776] Make sure the empty search result is visible for list
 views

(cherry picked from commit bfc87922cbd174ad4670ea7c523e722c5d82effa)
---
 src/Umbraco.Web.UI.Client/src/less/property-editors.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
index 9e8dd37ab9..0327d5139d 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -3,7 +3,7 @@
 //
 // Container styles
 // --------------------------------------------------
-.umb-property-editor {
+.umb-property-editor { 
     width: 100%;
 }
 

From 3457018fb4d42460161fbd77d8d716358c19ebbf Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Wed, 31 Jul 2019 21:30:41 +0200
Subject: [PATCH 428/776] Don't use a hardcoded "image" type in media picker
 value conversion

---
 .../MediaPickerValueConverter.cs              | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/MediaPickerValueConverter.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/MediaPickerValueConverter.cs
index d2272a25b5..a56630d7c5 100644
--- a/src/Umbraco.Web/PropertyEditors/ValueConverters/MediaPickerValueConverter.cs
+++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/MediaPickerValueConverter.cs
@@ -37,14 +37,8 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
         public override Type GetPropertyValueType(IPublishedPropertyType propertyType)
         {
             var isMultiple = IsMultipleDataType(propertyType.DataType);
-            var isOnlyImages = IsOnlyImagesDataType(propertyType.DataType);
-
             return isMultiple
-                ? isOnlyImages
-                    ? typeof(IEnumerable<>).MakeGenericType(ModelType.For(ImageTypeAlias))
-                    : typeof(IEnumerable<IPublishedContent>)
-                : isOnlyImages
-                    ? ModelType.For(ImageTypeAlias)
+                    ? typeof(IEnumerable<IPublishedContent>)
                     : typeof(IPublishedContent);
         }
 
@@ -57,12 +51,6 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
             return config.Multiple;
         }
 
-        private bool IsOnlyImagesDataType(PublishedDataType dataType)
-        {
-            var config = ConfigurationEditor.ConfigurationAs<MediaPickerConfiguration>(dataType.Configuration);
-            return config.OnlyImages;
-        }
-
         public override object ConvertSourceToIntermediate(IPublishedElement owner, IPublishedPropertyType propertyType,
             object source, bool preview)
         {
@@ -79,12 +67,9 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
             PropertyCacheLevel cacheLevel, object source, bool preview)
         {
             var isMultiple = IsMultipleDataType(propertyType.DataType);
-            var isOnlyImages = IsOnlyImagesDataType(propertyType.DataType);
 
             var udis = (Udi[]) source;
-            var mediaItems = isOnlyImages
-                ? _publishedModelFactory.CreateModelList(ImageTypeAlias)
-                : new List<IPublishedContent>();
+            var mediaItems = new List<IPublishedContent>();
 
             if (source == null) return isMultiple ? mediaItems : null;
 

From 27c8c7abf18202a5f97a0b39a63433ffad69d872 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Wed, 31 Jul 2019 21:30:41 +0200
Subject: [PATCH 429/776] Don't use a hardcoded "image" type in media picker
 value conversion

(cherry picked from commit 3457018fb4d42460161fbd77d8d716358c19ebbf)
---
 .../MediaPickerValueConverter.cs              | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/MediaPickerValueConverter.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/MediaPickerValueConverter.cs
index d2272a25b5..a56630d7c5 100644
--- a/src/Umbraco.Web/PropertyEditors/ValueConverters/MediaPickerValueConverter.cs
+++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/MediaPickerValueConverter.cs
@@ -37,14 +37,8 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
         public override Type GetPropertyValueType(IPublishedPropertyType propertyType)
         {
             var isMultiple = IsMultipleDataType(propertyType.DataType);
-            var isOnlyImages = IsOnlyImagesDataType(propertyType.DataType);
-
             return isMultiple
-                ? isOnlyImages
-                    ? typeof(IEnumerable<>).MakeGenericType(ModelType.For(ImageTypeAlias))
-                    : typeof(IEnumerable<IPublishedContent>)
-                : isOnlyImages
-                    ? ModelType.For(ImageTypeAlias)
+                    ? typeof(IEnumerable<IPublishedContent>)
                     : typeof(IPublishedContent);
         }
 
@@ -57,12 +51,6 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
             return config.Multiple;
         }
 
-        private bool IsOnlyImagesDataType(PublishedDataType dataType)
-        {
-            var config = ConfigurationEditor.ConfigurationAs<MediaPickerConfiguration>(dataType.Configuration);
-            return config.OnlyImages;
-        }
-
         public override object ConvertSourceToIntermediate(IPublishedElement owner, IPublishedPropertyType propertyType,
             object source, bool preview)
         {
@@ -79,12 +67,9 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
             PropertyCacheLevel cacheLevel, object source, bool preview)
         {
             var isMultiple = IsMultipleDataType(propertyType.DataType);
-            var isOnlyImages = IsOnlyImagesDataType(propertyType.DataType);
 
             var udis = (Udi[]) source;
-            var mediaItems = isOnlyImages
-                ? _publishedModelFactory.CreateModelList(ImageTypeAlias)
-                : new List<IPublishedContent>();
+            var mediaItems = new List<IPublishedContent>();
 
             if (source == null) return isMultiple ? mediaItems : null;
 

From a24e5bd10cddf93f2d6a40321164e3f7f3bb2ef4 Mon Sep 17 00:00:00 2001
From: Callum Whyte <hey@callumwhyte.com>
Date: Thu, 29 Aug 2019 14:22:21 +0200
Subject: [PATCH 430/776] Correcting ASCII art in README (#6156)

---
 build/NuSpecs/tools/Readme.txt        | 14 +++++++-------
 build/NuSpecs/tools/ReadmeUpgrade.txt | 15 ++++++++-------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/build/NuSpecs/tools/Readme.txt b/build/NuSpecs/tools/Readme.txt
index e40b0dbc7e..b0583a2b4d 100644
--- a/build/NuSpecs/tools/Readme.txt
+++ b/build/NuSpecs/tools/Readme.txt
@@ -1,11 +1,11 @@
 
-                       888                                         
-                       888                                         
-888  888 88888b.d88b.  88888b.  888d888  8888b.   .d8888b  .d88b.  
-888  888 888 "888 "88b 888 "88b 888P"       "88b d88P"    d88""88b 
-888  888 888  888  888 888  888 888     .d888888 888      888  888 
-Y88b 888 888  888  888 888 d88P 888     888  888 Y88b.    Y88..88P 
- "Y88888 888  888  888 88888P"  888     "Y888888  "Y8888P  "Y88P"  
+                        888                                         
+                        888                                         
+888   888 88888b.d88b.  88888b.  888d888 8888b.   .d8888b  .d88b. 
+888   888 888 "888 "88b 888 "88b 888P"      "88b d88P"    d88""88b
+888   888 888  888  888 888  888 888    .d888888 888      888  888
+Y88   88Y 888  888  888 888 d88P 888    888  888 Y88b.    Y88..88P
+ "Y888P"  888  888  888 88888P"  888    "Y888888  "Y8888P  "Y88P" 
 
 ------------------------------------------------------------------
 
diff --git a/build/NuSpecs/tools/ReadmeUpgrade.txt b/build/NuSpecs/tools/ReadmeUpgrade.txt
index df364c64ed..2f52d03776 100644
--- a/build/NuSpecs/tools/ReadmeUpgrade.txt
+++ b/build/NuSpecs/tools/ReadmeUpgrade.txt
@@ -1,12 +1,13 @@
 
-  _    _ __  __ ____  _____           _____ ____
- | |  | |  \/  |  _ \|  __ \    /\   / ____/ __ \
- | |  | | \  / | |_) | |__) |  /  \ | |   | |  | |
- | |  | | |\/| |  _ <|  _  /  / /\ \| |   | |  | |
- | |__| | |  | | |_) | | \ \ / ____ | |___| |__| |
-  \____/|_|  |_|____/|_|  \_/_/    \_\_____\____/
+                        888                                         
+                        888                                         
+888   888 88888b.d88b.  88888b.  888d888 8888b.   .d8888b  .d88b. 
+888   888 888 "888 "88b 888 "88b 888P"      "88b d88P"    d88""88b
+888   888 888  888  888 888  888 888    .d888888 888      888  888
+Y88   88Y 888  888  888 888 d88P 888    888  888 Y88b.    Y88..88P
+ "Y888P"  888  888  888 88888P"  888    "Y888888  "Y8888P  "Y88P" 
 
-----------------------------------------------------
+------------------------------------------------------------------
 
 Don't forget to build!
 

From 563a352953871cc5c170692186ac5608d180b932 Mon Sep 17 00:00:00 2001
From: Callum Whyte <hey@callumwhyte.com>
Date: Thu, 29 Aug 2019 14:22:21 +0200
Subject: [PATCH 431/776] Correcting ASCII art in README (#6156)

(cherry picked from commit a24e5bd10cddf93f2d6a40321164e3f7f3bb2ef4)
---
 build/NuSpecs/tools/Readme.txt        | 14 +++++++-------
 build/NuSpecs/tools/ReadmeUpgrade.txt | 15 ++++++++-------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/build/NuSpecs/tools/Readme.txt b/build/NuSpecs/tools/Readme.txt
index e40b0dbc7e..b0583a2b4d 100644
--- a/build/NuSpecs/tools/Readme.txt
+++ b/build/NuSpecs/tools/Readme.txt
@@ -1,11 +1,11 @@
 
-                       888                                         
-                       888                                         
-888  888 88888b.d88b.  88888b.  888d888  8888b.   .d8888b  .d88b.  
-888  888 888 "888 "88b 888 "88b 888P"       "88b d88P"    d88""88b 
-888  888 888  888  888 888  888 888     .d888888 888      888  888 
-Y88b 888 888  888  888 888 d88P 888     888  888 Y88b.    Y88..88P 
- "Y88888 888  888  888 88888P"  888     "Y888888  "Y8888P  "Y88P"  
+                        888                                         
+                        888                                         
+888   888 88888b.d88b.  88888b.  888d888 8888b.   .d8888b  .d88b. 
+888   888 888 "888 "88b 888 "88b 888P"      "88b d88P"    d88""88b
+888   888 888  888  888 888  888 888    .d888888 888      888  888
+Y88   88Y 888  888  888 888 d88P 888    888  888 Y88b.    Y88..88P
+ "Y888P"  888  888  888 88888P"  888    "Y888888  "Y8888P  "Y88P" 
 
 ------------------------------------------------------------------
 
diff --git a/build/NuSpecs/tools/ReadmeUpgrade.txt b/build/NuSpecs/tools/ReadmeUpgrade.txt
index df364c64ed..2f52d03776 100644
--- a/build/NuSpecs/tools/ReadmeUpgrade.txt
+++ b/build/NuSpecs/tools/ReadmeUpgrade.txt
@@ -1,12 +1,13 @@
 
-  _    _ __  __ ____  _____           _____ ____
- | |  | |  \/  |  _ \|  __ \    /\   / ____/ __ \
- | |  | | \  / | |_) | |__) |  /  \ | |   | |  | |
- | |  | | |\/| |  _ <|  _  /  / /\ \| |   | |  | |
- | |__| | |  | | |_) | | \ \ / ____ | |___| |__| |
-  \____/|_|  |_|____/|_|  \_/_/    \_\_____\____/
+                        888                                         
+                        888                                         
+888   888 88888b.d88b.  88888b.  888d888 8888b.   .d8888b  .d88b. 
+888   888 888 "888 "88b 888 "88b 888P"      "88b d88P"    d88""88b
+888   888 888  888  888 888  888 888    .d888888 888      888  888
+Y88   88Y 888  888  888 888 d88P 888    888  888 Y88b.    Y88..88P
+ "Y888P"  888  888  888 88888P"  888    "Y888888  "Y8888P  "Y88P" 
 
-----------------------------------------------------
+------------------------------------------------------------------
 
 Don't forget to build!
 

From 915b24e4e42a1b8827710da3ef24f5666ad875f8 Mon Sep 17 00:00:00 2001
From: Sean McLemon <sean.mclemon@logex.nl>
Date: Wed, 21 Aug 2019 15:31:43 +0200
Subject: [PATCH 432/776] When deciding whether to use SSL,
 ApplicationUrlHelper.GetApplicationUrlFromCurrentRequest() has an expression
 `port == "443"` which is always false. The variable `port` is set to to
 either `""` or `":" + request.ServerVariables["SERVER_PORT"]`, so it might
 sometimes be ":443" but it will never be just "443". This code has been this
 way for at least a year, and I don't know if the situation it tried to handle
 makes any sense (using port 443 over plain HTTP, for some reason??) so I've
 just removed it.

---
 src/Umbraco.Core/Sync/ApplicationUrlHelper.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/Sync/ApplicationUrlHelper.cs b/src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
index 9cd4a58c65..2a558f85aa 100644
--- a/src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
+++ b/src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
@@ -97,8 +97,7 @@ namespace Umbraco.Core.Sync
                 ? ":" + request.ServerVariables["SERVER_PORT"]
                 : "";
 
-            var useSsl = globalSettings.UseHttps || port == "443";
-            var ssl = useSsl ? "s" : ""; // force, whatever the first request
+            var ssl = globalSettings.UseHttps ? "s" : ""; // force, whatever the first request
             var url = "http" + ssl + "://" + request.ServerVariables["SERVER_NAME"] + port + IOHelper.ResolveUrl(SystemDirectories.Umbraco);
 
             return url.TrimEnd('/');

From 0dc840a4ed8668a8c8df17aa1a157f795e003d8f Mon Sep 17 00:00:00 2001
From: Sean McLemon <sean.mclemon@logex.nl>
Date: Wed, 21 Aug 2019 15:31:43 +0200
Subject: [PATCH 433/776] When deciding whether to use SSL,
 ApplicationUrlHelper.GetApplicationUrlFromCurrentRequest() has an expression
 `port == "443"` which is always false. The variable `port` is set to to
 either `""` or `":" + request.ServerVariables["SERVER_PORT"]`, so it might
 sometimes be ":443" but it will never be just "443". This code has been this
 way for at least a year, and I don't know if the situation it tried to handle
 makes any sense (using port 443 over plain HTTP, for some reason??) so I've
 just removed it.

(cherry picked from commit 915b24e4e42a1b8827710da3ef24f5666ad875f8)
---
 src/Umbraco.Core/Sync/ApplicationUrlHelper.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/Sync/ApplicationUrlHelper.cs b/src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
index 9cd4a58c65..2a558f85aa 100644
--- a/src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
+++ b/src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
@@ -97,8 +97,7 @@ namespace Umbraco.Core.Sync
                 ? ":" + request.ServerVariables["SERVER_PORT"]
                 : "";
 
-            var useSsl = globalSettings.UseHttps || port == "443";
-            var ssl = useSsl ? "s" : ""; // force, whatever the first request
+            var ssl = globalSettings.UseHttps ? "s" : ""; // force, whatever the first request
             var url = "http" + ssl + "://" + request.ServerVariables["SERVER_NAME"] + port + IOHelper.ResolveUrl(SystemDirectories.Umbraco);
 
             return url.TrimEnd('/');

From 8fdc14f3604d5a3aa1b7accc82c429e933e63e08 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland@zonedigital.com>
Date: Mon, 19 Aug 2019 16:30:13 +0200
Subject: [PATCH 434/776] Added metadata indicating if document published for
 content picker display

---
 src/Umbraco.Web/Models/Mapping/EntityMapDefinition.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/Umbraco.Web/Models/Mapping/EntityMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/EntityMapDefinition.cs
index 38ec557fdb..eb474e4cbe 100644
--- a/src/Umbraco.Web/Models/Mapping/EntityMapDefinition.cs
+++ b/src/Umbraco.Web/Models/Mapping/EntityMapDefinition.cs
@@ -46,10 +46,19 @@ namespace Umbraco.Web.Models.Mapping
                 target.Icon = Constants.Icons.Member;
 
             if (source is IContentEntitySlim contentSlim)
+            {
                 source.AdditionalData["ContentTypeAlias"] = contentSlim.ContentTypeAlias;
+            }
+
+            if (source is IDocumentEntitySlim documentSlim)
+            {
+                source.AdditionalData["IsPublished"] = documentSlim.Published;
+            }
 
             if (source is IMediaEntitySlim mediaSlim)
+            {
                 source.AdditionalData["MediaPath"] = mediaSlim.MediaPath;
+            }
 
             // NOTE: we're mapping the objects in AdditionalData by object reference here.
             // it works fine for now, but it's something to keep in mind in the future

From d77559d52b90f33da7a209176d7c72b46fdc3e38 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland@zonedigital.com>
Date: Mon, 19 Aug 2019 16:30:13 +0200
Subject: [PATCH 435/776] Added metadata indicating if document published for
 content picker display

---
 src/Umbraco.Web/Models/Mapping/EntityMapDefinition.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/Umbraco.Web/Models/Mapping/EntityMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/EntityMapDefinition.cs
index 38ec557fdb..eb474e4cbe 100644
--- a/src/Umbraco.Web/Models/Mapping/EntityMapDefinition.cs
+++ b/src/Umbraco.Web/Models/Mapping/EntityMapDefinition.cs
@@ -46,10 +46,19 @@ namespace Umbraco.Web.Models.Mapping
                 target.Icon = Constants.Icons.Member;
 
             if (source is IContentEntitySlim contentSlim)
+            {
                 source.AdditionalData["ContentTypeAlias"] = contentSlim.ContentTypeAlias;
+            }
+
+            if (source is IDocumentEntitySlim documentSlim)
+            {
+                source.AdditionalData["IsPublished"] = documentSlim.Published;
+            }
 
             if (source is IMediaEntitySlim mediaSlim)
+            {
                 source.AdditionalData["MediaPath"] = mediaSlim.MediaPath;
+            }
 
             // NOTE: we're mapping the objects in AdditionalData by object reference here.
             // it works fine for now, but it's something to keep in mind in the future

From d0e7344e2d3da1eeb6acf35b976804bfec5dd95a Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sun, 18 Aug 2019 21:40:27 +0200
Subject: [PATCH 436/776] Prevent double click errors when editing compositions

---
 .../common/directives/components/umbgroupsbuilder.directive.js | 3 +++
 .../src/views/components/umb-groups-builder.html               | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
index c1f34e64ae..05c3ae43e7 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
@@ -17,6 +17,7 @@
       scope.sortableOptionsGroup = {};
       scope.sortableOptionsProperty = {};
       scope.sortingButtonKey = "general_reorder";
+      scope.compositionsButtonState = "init";
 
       function activate() {
 
@@ -337,6 +338,7 @@
         })), function(f) {
             return f !== null && f !== undefined;
         });
+        scope.compositionsButtonState = "busy";
         $q.all([
             //get available composite types
             availableContentTypeResource(scope.model.id, [], propAliasesExisting).then(function (result) {
@@ -356,6 +358,7 @@
         ]).then(function() {
             //resolves when both other promises are done, now show it
             editorService.open(scope.compositionsDialogModel);
+            scope.compositionsButtonState = "init";
         });
 
       };
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
index 026b0637c7..e8e47f6ae6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
@@ -14,7 +14,8 @@
                 icon="icon-merge"
                 action="openCompositionsDialog()"
                 size="xs"
-                add-ellipsis="true">
+                add-ellipsis="true"
+                state="compositionsButtonState">
             </umb-button>
 
             <umb-button

From ea9498b90dd08dd4a11dd14dbae9073d3e7de8b8 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sun, 18 Aug 2019 21:40:27 +0200
Subject: [PATCH 437/776] Prevent double click errors when editing compositions

(cherry picked from commit d0e7344e2d3da1eeb6acf35b976804bfec5dd95a)
---
 .../common/directives/components/umbgroupsbuilder.directive.js | 3 +++
 .../src/views/components/umb-groups-builder.html               | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
index 8dada26960..c60d6aebdd 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
@@ -17,6 +17,7 @@
       scope.sortableOptionsGroup = {};
       scope.sortableOptionsProperty = {};
       scope.sortingButtonKey = "general_reorder";
+      scope.compositionsButtonState = "init";
 
       function activate() {
 
@@ -337,6 +338,7 @@
         })), function(f) {
             return f !== null && f !== undefined;
         });
+        scope.compositionsButtonState = "busy";
         $q.all([
             //get available composite types
             availableContentTypeResource(scope.model.id, [], propAliasesExisting).then(function (result) {
@@ -356,6 +358,7 @@
         ]).then(function() {
             //resolves when both other promises are done, now show it
             editorService.open(scope.compositionsDialogModel);
+            scope.compositionsButtonState = "init";
         });
 
       };
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
index 026b0637c7..e8e47f6ae6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
@@ -14,7 +14,8 @@
                 icon="icon-merge"
                 action="openCompositionsDialog()"
                 size="xs"
-                add-ellipsis="true">
+                add-ellipsis="true"
+                state="compositionsButtonState">
             </umb-button>
 
             <umb-button

From 7cb0886b3567e762d1d3ee64fc528637bdc268da Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Tue, 30 Jul 2019 21:21:10 +0200
Subject: [PATCH 438/776] Prevent markdown editor from stealing input focus on
 enter

---
 src/Umbraco.Web.UI.Client/lib/markdown/markdown.editor.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/lib/markdown/markdown.editor.js b/src/Umbraco.Web.UI.Client/lib/markdown/markdown.editor.js
index e1617d8365..a75a7f1f3c 100644
--- a/src/Umbraco.Web.UI.Client/lib/markdown/markdown.editor.js
+++ b/src/Umbraco.Web.UI.Client/lib/markdown/markdown.editor.js
@@ -1239,6 +1239,11 @@
         // Perform the button's action.
         function doClick(button) {
 
+            // don't do anything if the editor input or button bar isn't the currently active element
+            if (document.activeElement !== panels.input && !panels.buttonBar.contains(document.activeElement)) {
+                return;
+            }
+
             inputBox.focus();
 
             if (button.textOp) {

From 7d0711e129c9cca1db657d410478b51d1f946184 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Tue, 30 Jul 2019 21:21:10 +0200
Subject: [PATCH 439/776] Prevent markdown editor from stealing input focus on
 enter

(cherry picked from commit 7cb0886b3567e762d1d3ee64fc528637bdc268da)
---
 src/Umbraco.Web.UI.Client/lib/markdown/markdown.editor.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/lib/markdown/markdown.editor.js b/src/Umbraco.Web.UI.Client/lib/markdown/markdown.editor.js
index e1617d8365..a75a7f1f3c 100644
--- a/src/Umbraco.Web.UI.Client/lib/markdown/markdown.editor.js
+++ b/src/Umbraco.Web.UI.Client/lib/markdown/markdown.editor.js
@@ -1239,6 +1239,11 @@
         // Perform the button's action.
         function doClick(button) {
 
+            // don't do anything if the editor input or button bar isn't the currently active element
+            if (document.activeElement !== panels.input && !panels.buttonBar.contains(document.activeElement)) {
+                return;
+            }
+
             inputBox.focus();
 
             if (button.textOp) {

From 413b2663351c24eaef1643e0135c5bd26ce378d4 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Thu, 29 Aug 2019 14:36:51 +0200
Subject: [PATCH 440/776] v8: Replace tree loader with umbLoader component
 (#6169)

---
 .../less/components/tree/umb-tree-item.less   | 11 +----
 .../src/less/components/tree/umb-tree.less    |  6 ---
 .../src/less/installer.less                   | 45 +++++--------------
 .../views/components/tree/umb-tree-item.html  |  3 +-
 .../Umbraco/Install/Views/Index.cshtml        | 10 +++--
 5 files changed, 20 insertions(+), 55 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less
index a969f876a4..8945d15ec6 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less
@@ -39,17 +39,10 @@
     
     // Loading Animation
     // ------------------------
-    .l {
+    .umb-tree-item__loader {
         width: 100%;
-        height: 2px;
-        overflow: hidden;
         position: absolute;
-        left: 0;
-        bottom: -1px;
-
-        div { 
-            .umb-loader;
-        }
+        margin: 0;
     }
 
     .umb-tree-item__label {
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
index 7a70046de2..93850656f0 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
@@ -33,12 +33,6 @@
             display: none;
         }
     }
-    
-    //loader defaults
-    .umb-loader {
-        height: 10px;
-        margin: 10px 10px 10px 10px;
-    }
 
     .search-subtitle {
         color: @gray-7;
diff --git a/src/Umbraco.Web.UI.Client/src/less/installer.less b/src/Umbraco.Web.UI.Client/src/less/installer.less
index 798252c394..8090b971fc 100644
--- a/src/Umbraco.Web.UI.Client/src/less/installer.less
+++ b/src/Umbraco.Web.UI.Client/src/less/installer.less
@@ -13,6 +13,9 @@
 @import "../../lib/bootstrap/less/thumbnails.less";
 @import "../../lib/bootstrap/less/media.less";
 
+// Umbraco Components
+@import "components/umb-loader.less";
+
 
 [ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak {
   display: none !important;
@@ -165,45 +168,17 @@ input.ng-dirty.ng-invalid{border-color: #b94a48; color: #b94a48;}
     opacity:1;
 }
 
+.umb-installer-loader {
+    margin: 0;
+    width: 0;
+    z-index: 777;
 
-.umb-loader{
-    background-color: @white;
-    margin-top:0;
-    margin-left:-100%;
-    animation-name:bounce_loadingProgressG;
-    animation-duration:1s;
-    animation-iteration-count:infinite;
-    animation-timing-function:linear;
-    width:100%;
-    height: 5px;
-}
-
-@keyframes bounce_loadingProgressG{
-    0%{
-        margin-left:-100%;
-    }
-    100%{
-        margin-left:100%;
+    .umb-loader {
+        background-color: @white;
+        height: 5px;
     }
 }
 
-//loader defaults
-.umb-loader-container, .umb-loader-done{
-	height: 3px;
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  overflow: hidden;
-  width: 0%;
-  z-index: 777;
-}
-
-.umb-loader-done{
-   right: 0%;
-   background: @white;
-}
-
-
 .permissions-report {
     overflow:auto;
     height:320px;
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-item.html b/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-item.html
index d777b3db78..af0a3ba097 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-item.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-item.html
@@ -15,7 +15,8 @@
 
         <!-- NOTE: These are the 'option' elipses -->
         <button data-element="tree-item-options" class="umb-options btn-reset sr-only sr-only--focusable sr-only--hoverable" ng-click="options(node, $event)" ng-if="::node.menuUrl"><i></i><i></i><i></i></button>
-        <div ng-show="node.loading" class="l"><div></div></div>
+
+        <umb-loader ng-show="node.loading" position="bottom" class="umb-tree-item__loader"></umb-loader>
     </div>
 
     <ul ng-class="{collapsed: !node.expanded}">
diff --git a/src/Umbraco.Web.UI/Umbraco/Install/Views/Index.cshtml b/src/Umbraco.Web.UI/Umbraco/Install/Views/Index.cshtml
index e74dbea217..6941fe0367 100644
--- a/src/Umbraco.Web.UI/Umbraco/Install/Views/Index.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Install/Views/Index.cshtml
@@ -19,11 +19,13 @@
 
     <img src="assets/img/application/logo_white.png" id="logo" />
 
-    <div class="umb-loader-container" ng-style="{'width': installer.progress}">
-        <div class="umb-loader" id="loader" ng-if="installer.loading"></div>
-    </div>
+    <umb-loader position="bottom"
+                class="umb-installer-loader"
+                ng-if="installer.loading"
+                ng-style="{'width': installer.progress}">
+    </umb-loader>
 
-    <div id="overlay"  ng-cloak ng-animate="'fade'" ng-show="installer.done"></div>
+    <div id="overlay" ng-cloak ng-animate="'fade'" ng-show="installer.done"></div>
 
     <div id="installer" class="absolute-center clearfix"
          ng-cloak

From 538b434c75b70b08ec15bb63e5621b35e80bb6db Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Thu, 29 Aug 2019 14:36:51 +0200
Subject: [PATCH 441/776] v8: Replace tree loader with umbLoader component
 (#6169)

---
 .../less/components/tree/umb-tree-item.less   | 11 +----
 .../src/less/components/tree/umb-tree.less    |  6 ---
 .../src/less/installer.less                   | 45 +++++--------------
 .../views/components/tree/umb-tree-item.html  |  3 +-
 .../Umbraco/Install/Views/Index.cshtml        | 10 +++--
 5 files changed, 20 insertions(+), 55 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less
index a969f876a4..8945d15ec6 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less
@@ -39,17 +39,10 @@
     
     // Loading Animation
     // ------------------------
-    .l {
+    .umb-tree-item__loader {
         width: 100%;
-        height: 2px;
-        overflow: hidden;
         position: absolute;
-        left: 0;
-        bottom: -1px;
-
-        div { 
-            .umb-loader;
-        }
+        margin: 0;
     }
 
     .umb-tree-item__label {
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
index 7a70046de2..93850656f0 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
@@ -33,12 +33,6 @@
             display: none;
         }
     }
-    
-    //loader defaults
-    .umb-loader {
-        height: 10px;
-        margin: 10px 10px 10px 10px;
-    }
 
     .search-subtitle {
         color: @gray-7;
diff --git a/src/Umbraco.Web.UI.Client/src/less/installer.less b/src/Umbraco.Web.UI.Client/src/less/installer.less
index 798252c394..8090b971fc 100644
--- a/src/Umbraco.Web.UI.Client/src/less/installer.less
+++ b/src/Umbraco.Web.UI.Client/src/less/installer.less
@@ -13,6 +13,9 @@
 @import "../../lib/bootstrap/less/thumbnails.less";
 @import "../../lib/bootstrap/less/media.less";
 
+// Umbraco Components
+@import "components/umb-loader.less";
+
 
 [ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak {
   display: none !important;
@@ -165,45 +168,17 @@ input.ng-dirty.ng-invalid{border-color: #b94a48; color: #b94a48;}
     opacity:1;
 }
 
+.umb-installer-loader {
+    margin: 0;
+    width: 0;
+    z-index: 777;
 
-.umb-loader{
-    background-color: @white;
-    margin-top:0;
-    margin-left:-100%;
-    animation-name:bounce_loadingProgressG;
-    animation-duration:1s;
-    animation-iteration-count:infinite;
-    animation-timing-function:linear;
-    width:100%;
-    height: 5px;
-}
-
-@keyframes bounce_loadingProgressG{
-    0%{
-        margin-left:-100%;
-    }
-    100%{
-        margin-left:100%;
+    .umb-loader {
+        background-color: @white;
+        height: 5px;
     }
 }
 
-//loader defaults
-.umb-loader-container, .umb-loader-done{
-	height: 3px;
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  overflow: hidden;
-  width: 0%;
-  z-index: 777;
-}
-
-.umb-loader-done{
-   right: 0%;
-   background: @white;
-}
-
-
 .permissions-report {
     overflow:auto;
     height:320px;
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-item.html b/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-item.html
index d777b3db78..af0a3ba097 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-item.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-item.html
@@ -15,7 +15,8 @@
 
         <!-- NOTE: These are the 'option' elipses -->
         <button data-element="tree-item-options" class="umb-options btn-reset sr-only sr-only--focusable sr-only--hoverable" ng-click="options(node, $event)" ng-if="::node.menuUrl"><i></i><i></i><i></i></button>
-        <div ng-show="node.loading" class="l"><div></div></div>
+
+        <umb-loader ng-show="node.loading" position="bottom" class="umb-tree-item__loader"></umb-loader>
     </div>
 
     <ul ng-class="{collapsed: !node.expanded}">
diff --git a/src/Umbraco.Web.UI/Umbraco/Install/Views/Index.cshtml b/src/Umbraco.Web.UI/Umbraco/Install/Views/Index.cshtml
index e74dbea217..6941fe0367 100644
--- a/src/Umbraco.Web.UI/Umbraco/Install/Views/Index.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Install/Views/Index.cshtml
@@ -19,11 +19,13 @@
 
     <img src="assets/img/application/logo_white.png" id="logo" />
 
-    <div class="umb-loader-container" ng-style="{'width': installer.progress}">
-        <div class="umb-loader" id="loader" ng-if="installer.loading"></div>
-    </div>
+    <umb-loader position="bottom"
+                class="umb-installer-loader"
+                ng-if="installer.loading"
+                ng-style="{'width': installer.progress}">
+    </umb-loader>
 
-    <div id="overlay"  ng-cloak ng-animate="'fade'" ng-show="installer.done"></div>
+    <div id="overlay" ng-cloak ng-animate="'fade'" ng-show="installer.done"></div>
 
     <div id="installer" class="absolute-center clearfix"
          ng-cloak

From e9bd0d9266827baed9e9dfd3958a58cd6559b2f5 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 29 Aug 2019 14:58:58 +0200
Subject: [PATCH 442/776] Bump version to 8.1.4

---
 src/SolutionInfo.cs                      | 4 ++--
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index 2da07d523f..73fb2a1448 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -18,5 +18,5 @@ using System.Resources;
 [assembly: AssemblyVersion("8.0.0")]
 
 // these are FYI and changed automatically
-[assembly: AssemblyFileVersion("8.1.3")]
-[assembly: AssemblyInformationalVersion("8.1.3")]
+[assembly: AssemblyFileVersion("8.1.4")]
+[assembly: AssemblyInformationalVersion("8.1.4")]
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index fada1cf9c4..40f3e3afbd 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -345,9 +345,9 @@
         <WebProjectProperties>
           <UseIIS>False</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>8130</DevelopmentServerPort>
+          <DevelopmentServerPort>8140</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:8130</IISUrl>
+          <IISUrl>http://localhost:8140</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

From 90c99eda17b4783947552e7baefc7bc4e4e2149c Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 29 Aug 2019 15:00:32 +0200
Subject: [PATCH 443/776] Bump version to 7.15.3

---
 src/SolutionInfo.cs                              | 4 ++--
 src/Umbraco.Core/Configuration/UmbracoVersion.cs | 2 +-
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj         | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index ffaec90fa7..97ebd98e8c 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -11,5 +11,5 @@ using System.Resources;
 
 [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyFileVersion("7.15.2")]
-[assembly: AssemblyInformationalVersion("7.15.2")]
+[assembly: AssemblyFileVersion("7.15.3")]
+[assembly: AssemblyInformationalVersion("7.15.3")]
diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
index b02e199313..8c8755577a 100644
--- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
@@ -6,7 +6,7 @@ namespace Umbraco.Core.Configuration
 {
     public class UmbracoVersion
     {
-        private static readonly Version Version = new Version("7.15.2");
+        private static readonly Version Version = new Version("7.15.3");
 
         /// <summary>
         /// Gets the current version of Umbraco.
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 4eddca0b8d..76d2765672 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -1028,9 +1028,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
         <WebProjectProperties>
           <UseIIS>True</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>7152</DevelopmentServerPort>
+          <DevelopmentServerPort>7153</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:7152</IISUrl>
+          <IISUrl>http://localhost:7153</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

From 1ec88a664786bc470725cfc63d60b47b509d0251 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Thu, 29 Aug 2019 14:06:29 +0100
Subject: [PATCH 444/776] Add new API controller for uploading images
 dragged/pasted into a TinyMCE editor

---
 .../src/common/services/tinymce.service.js    |  68 +++++++++--
 .../Editors/BackOfficeServerVariables.cs      |   6 +-
 src/Umbraco.Web/Editors/TinyMceController.cs  | 107 ++++++++++++++++++
 src/Umbraco.Web/Umbraco.Web.csproj            |   1 +
 4 files changed, 174 insertions(+), 8 deletions(-)
 create mode 100644 src/Umbraco.Web/Editors/TinyMceController.cs

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index e61bd38bc0..9ac2635489 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -156,6 +156,55 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
         }
     }
 
+    function uploadImageHandler(blobInfo, success, failure, progress){
+
+        //TODO: Worth refactoring to Angular $http calls
+        //Rather than XHR??
+
+        let xhr, formData;
+
+        xhr = new XMLHttpRequest();
+        xhr.open('POST', Umbraco.Sys.ServerVariables.umbracoUrls.tinyMceApiBaseUrl + 'UploadImage');
+
+        xhr.upload.onprogress = function (e) {
+            progress(e.loaded / e.total * 100);
+        };
+
+        xhr.onerror = function () {
+            failure('Image upload failed due to a XHR Transport error. Code: ' + xhr.status);
+        };
+
+        xhr.onload = function () {
+            let json;
+
+            if (xhr.status < 200 || xhr.status >= 300) {
+                failure('HTTP Error: ' + xhr.status);
+                return;
+            }
+
+            json = JSON.parse(xhr.responseText);
+
+            if (!json || typeof json.location !== 'string') {
+                failure('Invalid JSON: ' + xhr.responseText);
+                return;
+            }
+
+            // TODO: The JSON contains location & udi
+            // Need to add UDI as attr
+
+            success(json.location);
+        };
+
+        formData = new FormData();
+        formData.append('file', blobInfo.blob(), blobInfo.blob().name);
+
+        //TODO: Send Media Parent ID from config
+        //TODO: How will each RTE pass in this value to this function?!
+        formData.append('mediaParent', -1);
+
+        xhr.send(formData);
+    }
+
     return {
 
         /**
@@ -237,13 +286,19 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                     insert_toolbar: toolbars.insertToolbar,
                     selection_toolbar: toolbars.selectionToolbar,
 
-                    body_class: 'umb-rte',
+                    body_class: "umb-rte",
                     //see http://archive.tinymce.com/wiki.php/Configuration:cache_suffix
                     cache_suffix: "?umb__rnd=" + Umbraco.Sys.ServerVariables.application.cacheBuster,
 
                     //this is used to style the inline macro bits, sorry hard coding this form now since we don't have a standalone
                     //stylesheet to load in for this with only these styles (the color is @pinkLight)
                     content_style: ".mce-content-body .umb-macro-holder { border: 3px dotted #f5c1bc; padding: 7px; display: block; margin: 3px; } .umb-rte .mce-content-body .umb-macro-holder.loading {background: url(assets/img/loader.gif) right no-repeat; background-size: 18px; background-position-x: 99%;}"
+                    
+                    // This allows images to be pasted in & stored as Base64 until they get uploaded to server
+                    paste_data_images: true
+
+                    images_upload_handler: uploadImageHandler,
+                    automatic_uploads: false,
                 };
 
                 if (tinyMceConfig.customConfig) {
@@ -281,7 +336,6 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                     angular.extend(config, tinyMceConfig.customConfig);
                 }
 
-
                 return $q.when(config);
 
             });
@@ -428,7 +482,7 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                     id: '__mcenew',
                     'data-udi': img.udi
                 };
-                
+
                 editor.selection.setContent(editor.dom.createHTML('img', data));
 
                 $timeout(function () {
@@ -447,9 +501,9 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                         }
                     }
 				    editor.dom.setAttrib(imgElm, 'id', null);
-                    
+
                     editor.fire('Change');
-                    
+
                 }, 500);
             }
         },
@@ -521,7 +575,7 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                 onPostRender: function () {
 
                     let ctrl = this;
-                    
+
 					/**
 					 * Check if the macro is currently selected and toggle the menu button
 					 */
@@ -1134,7 +1188,7 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                     };
                     editorService.linkPicker(linkPicker);
                 });
-             
+
             });
 
             //Create the insert media plugin
diff --git a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
index 58f49f4261..dc46a97df4 100644
--- a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
@@ -309,7 +309,11 @@ namespace Umbraco.Web.Editors
                         {
                             "webProfilingBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl<WebProfilingController>(
                                 controller => controller.GetStatus())
-                        }
+                        },
+                        {
+                            "tinyMceApiBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl<TinyMceController>(
+                                controller => controller.UploadImage())
+                        },
                     }
                 },
                 {
diff --git a/src/Umbraco.Web/Editors/TinyMceController.cs b/src/Umbraco.Web/Editors/TinyMceController.cs
new file mode 100644
index 0000000000..06b827568a
--- /dev/null
+++ b/src/Umbraco.Web/Editors/TinyMceController.cs
@@ -0,0 +1,107 @@
+using System.Net;
+using System.Net.Http;
+using System.Web;
+using System.Web.Http;
+using Umbraco.Core.Services;
+using Umbraco.Web.WebApi;
+using Constants = Umbraco.Core.Constants;
+using Umbraco.Core;
+using Umbraco.Web.Mvc;
+using Umbraco.Core.IO;
+using System.IO;
+using System.Threading.Tasks;
+using Umbraco.Web.Composing;
+using Umbraco.Core.Configuration.UmbracoSettings;
+using System.Linq;
+using System;
+using Umbraco.Core.Models.PublishedContent;
+
+namespace Umbraco.Web.Editors
+{
+    [PluginController("UmbracoApi")]
+    public class TinyMceController : UmbracoAuthorizedApiController
+    {
+        private IMediaService _mediaService;
+        private IContentTypeBaseServiceProvider _contentTypeBaseServiceProvider;
+
+        public TinyMceController(IMediaService mediaService, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider)
+        {
+            _mediaService = mediaService;
+            _contentTypeBaseServiceProvider = contentTypeBaseServiceProvider;
+        }
+
+        [HttpPost]
+        public async Task<HttpResponseMessage> UploadImage()
+        {
+
+            if (Request.Content.IsMimeMultipartContent() == false)
+            {
+                throw new HttpResponseException(HttpStatusCode.UnsupportedMediaType);
+            }
+
+            var root = IOHelper.MapPath(SystemDirectories.TempFileUploads);
+
+            // Ensure it exists
+            Directory.CreateDirectory(root);
+            var provider = new MultipartFormDataStreamProvider(root);
+
+            var result = await Request.Content.ReadAsMultipartAsync(provider);
+
+            // Must have a file
+            if (result.FileData.Count == 0)
+            {
+                return Request.CreateResponse(HttpStatusCode.NotFound);
+            }
+
+            // Should only have one file
+            if (result.FileData.Count > 1)
+            {
+                return Request.CreateErrorResponse(HttpStatusCode.BadRequest, "Only one file can be uploaded at a time");
+            }
+
+            // Check we have mediaParent as posted data
+            if (string.IsNullOrEmpty(result.FormData["mediaParent"]))
+            {
+                return Request.CreateErrorResponse(HttpStatusCode.BadRequest, "Missing the Media Parent folder to save this image");
+            }
+
+            // Really we should only have one file per request to this endpoint
+            var file = result.FileData[0];
+
+            var parentFolder = Convert.ToInt32(result.FormData["mediaParent"]);
+
+            var fileName = file.Headers.ContentDisposition.FileName.Trim(new[] { '\"' }).TrimEnd();
+            var safeFileName = fileName.ToSafeFileName();
+            var ext = safeFileName.Substring(safeFileName.LastIndexOf('.') + 1).ToLower();
+
+            if (Current.Configs.Settings().Content.IsFileAllowedForUpload(ext) == false || Current.Configs.Settings().Content.ImageFileTypes.Contains(ext) == false)
+            {
+                // Throw some error - to say can't upload this IMG type
+                return Request.CreateErrorResponse(HttpStatusCode.BadRequest, "This is not an image filetype extension that is approved");
+            }
+
+            var mediaItemName = fileName.ToFriendlyName();
+            var f = _mediaService.CreateMedia(mediaItemName, parentFolder, Constants.Conventions.MediaTypes.Image, Security.CurrentUser.Id);
+            var fileInfo = new FileInfo(file.LocalFileName);
+            var fs = fileInfo.OpenReadWithRetry();
+            if (fs == null) throw new InvalidOperationException("Could not acquire file stream");
+            using (fs)
+            {
+                f.SetValue(Services.ContentTypeBaseServices, Constants.Conventions.Media.File, fileName, fs);
+            }
+
+            _mediaService.Save(f, Security.CurrentUser.Id);
+
+            // Need to get URL to the media item and its UDI
+            var udi = f.GetUdi();
+
+
+            // TODO: Check this is the BEST way to get the URL
+            // Ensuring if they use some CDN & blob storage?!
+            var mediaTyped = Umbraco.Media(f.Id);
+            var location = mediaTyped.Url;
+
+            return Request.CreateResponse(HttpStatusCode.OK, new { location = location, udi = udi });
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 222d58d4dc..f696178a86 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -148,6 +148,7 @@
     <Compile Include="Editors\KeepAliveController.cs" />
     <Compile Include="Editors\MacrosController.cs" />
     <Compile Include="Editors\RelationTypeController.cs" />
+    <Compile Include="Editors\TinyMceController.cs" />
     <Compile Include="IUmbracoContextFactory.cs" />
     <Compile Include="Install\ChangesMonitor.cs" />
     <Compile Include="Logging\WebProfiler.cs" />

From 303d709a7398014050824ea5c245d9a5fb796556 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 29 Aug 2019 16:44:18 +0200
Subject: [PATCH 445/776] Fixes #6229 - Upgrading to 8.1.3 adds an extra
 dependentAssembly to web.config

---
 build/NuSpecs/tools/Web.config.install.xdt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/NuSpecs/tools/Web.config.install.xdt b/build/NuSpecs/tools/Web.config.install.xdt
index 14778e0f10..f0bfb01585 100644
--- a/build/NuSpecs/tools/Web.config.install.xdt
+++ b/build/NuSpecs/tools/Web.config.install.xdt
@@ -128,6 +128,7 @@
       <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Data.SqlServerCe')" xdt:Transform="Remove" />
       <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.ValueTuple')" xdt:Transform="Remove" />
       <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Net.Http.Formatting')" xdt:Transform="Remove" />
+      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Collections.Immutable')" xdt:Transform="Remove" />
     </assemblyBinding>
   </runtime>
 

From 13e704e36c42e7268b52136de4fd96c07b0bddf5 Mon Sep 17 00:00:00 2001
From: Poornima Nayar <poornimakrishnav@gmail.com>
Date: Thu, 29 Aug 2019 23:00:37 +0100
Subject: [PATCH 446/776] Fix- Unable to create members in the members section
 using the create option in the overlay

---
 src/Umbraco.Web.UI.Client/src/views/member/create.html       | 2 +-
 .../src/views/member/member.create.controller.js             | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/member/create.html b/src/Umbraco.Web.UI.Client/src/views/member/create.html
index ff7e954c02..5f4ad77f04 100644
--- a/src/Umbraco.Web.UI.Client/src/views/member/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/member/create.html
@@ -6,7 +6,7 @@
             <ul class="umb-actions umb-actions-child">
 
                 <li class="umb-action" ng-repeat="docType in allowedTypes">
-                    <button class="umb-action-link umb-outline btn-reset" href="#member/member/edit/{{currentNode.id}}?doctype={{docType.alias}}&create=true" ng-click="hideActions()">
+                    <button class="umb-action-link umb-outline btn-reset" ng-click="createMemberType(docType)">
                         <i class="large icon {{docType.icon}}"></i>
                         <span class="menu-label">
                             {{docType.name}}
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/member.create.controller.js b/src/Umbraco.Web.UI.Client/src/views/member/member.create.controller.js
index 14197448b2..e0cf6cf914 100644
--- a/src/Umbraco.Web.UI.Client/src/views/member/member.create.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/member/member.create.controller.js
@@ -6,7 +6,7 @@
  * @description
  * The controller for the member creation dialog
  */
-function memberCreateController($scope, memberTypeResource, iconHelper, navigationService) {
+function memberCreateController($scope, memberTypeResource, iconHelper, navigationService, $location) {
     
     memberTypeResource.getTypes($scope.currentNode.id).then(function (data) {
         $scope.allowedTypes = iconHelper.formatContentTypeIcons(data);
@@ -17,7 +17,8 @@ function memberCreateController($scope, memberTypeResource, iconHelper, navigati
         navigationService.hideDialog(showMenu);
     };
 
-    $scope.hideActions = function () {
+    $scope.createMemberType = function (memberType) {        
+        $location.path("/member/member/edit/" + $scope.currentNode.id).search("doctype", memberType.alias).search("create", "true");
         navigationService.hideNavigation();
     };
 }

From f9319079c7fbb0f99cdc59c5cf670dd36a950922 Mon Sep 17 00:00:00 2001
From: Poornima Nayar <poornimakrishnav@gmail.com>
Date: Thu, 29 Aug 2019 23:00:37 +0100
Subject: [PATCH 447/776] Fix- Unable to create members in the members section
 using the create option in the overlay

(cherry picked from commit 13e704e36c42e7268b52136de4fd96c07b0bddf5)
---
 src/Umbraco.Web.UI.Client/src/views/member/create.html       | 2 +-
 .../src/views/member/member.create.controller.js             | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/member/create.html b/src/Umbraco.Web.UI.Client/src/views/member/create.html
index ff7e954c02..5f4ad77f04 100644
--- a/src/Umbraco.Web.UI.Client/src/views/member/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/member/create.html
@@ -6,7 +6,7 @@
             <ul class="umb-actions umb-actions-child">
 
                 <li class="umb-action" ng-repeat="docType in allowedTypes">
-                    <button class="umb-action-link umb-outline btn-reset" href="#member/member/edit/{{currentNode.id}}?doctype={{docType.alias}}&create=true" ng-click="hideActions()">
+                    <button class="umb-action-link umb-outline btn-reset" ng-click="createMemberType(docType)">
                         <i class="large icon {{docType.icon}}"></i>
                         <span class="menu-label">
                             {{docType.name}}
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/member.create.controller.js b/src/Umbraco.Web.UI.Client/src/views/member/member.create.controller.js
index 14197448b2..e0cf6cf914 100644
--- a/src/Umbraco.Web.UI.Client/src/views/member/member.create.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/member/member.create.controller.js
@@ -6,7 +6,7 @@
  * @description
  * The controller for the member creation dialog
  */
-function memberCreateController($scope, memberTypeResource, iconHelper, navigationService) {
+function memberCreateController($scope, memberTypeResource, iconHelper, navigationService, $location) {
     
     memberTypeResource.getTypes($scope.currentNode.id).then(function (data) {
         $scope.allowedTypes = iconHelper.formatContentTypeIcons(data);
@@ -17,7 +17,8 @@ function memberCreateController($scope, memberTypeResource, iconHelper, navigati
         navigationService.hideDialog(showMenu);
     };
 
-    $scope.hideActions = function () {
+    $scope.createMemberType = function (memberType) {        
+        $location.path("/member/member/edit/" + $scope.currentNode.id).search("doctype", memberType.alias).search("create", "true");
         navigationService.hideNavigation();
     };
 }

From 55c0a5f7c2000928a6f2e08f5cac63d81724f33e Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Fri, 30 Aug 2019 11:58:22 +0100
Subject: [PATCH 448/776] Uses browser localStorage to store the UDI from the
 API response & updates the IMG element when we put them in the editor

---
 .../src/common/services/tinymce.service.js    | 51 +++++++++++++++++--
 1 file changed, 46 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 9ac2635489..776acae892 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -189,8 +189,8 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                 return;
             }
 
-            // TODO: The JSON contains location & udi
-            // Need to add UDI as attr
+            // Put UDI into localstorage (used to update the img with data-udi later on)
+            localStorage.setItem(`tinymce__${json.location}`, json.udi);
 
             success(json.location);
         };
@@ -205,6 +205,46 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
         xhr.send(formData);
     }
 
+    function initEvents(editor){
+
+        editor.on('SetContent', function (e) {
+            console.log('setcontent', e);
+
+            var content = e.content;
+
+            // Upload BLOB images (dragged/pasted ones)
+            if(content.indexOf('<img src="blob:') > -1){
+                console.log('found img');
+
+                editor.uploadImages(function(data) {
+                    console.log("data", data);
+
+                    data.forEach(function(item) {
+                        console.log("item", item);
+
+                        //Select img element
+                        var img = item.element;
+
+                        //Get img src
+                        var imgSrc = img.getAttribute("src");
+                        console.log('img src', imgSrc);
+
+                        //Try & find in localstorage
+                        var udi = localStorage.getItem(`tinymce__${imgSrc}`);
+                        console.log('imgsrc key', `tinymce__${imgSrc}`)
+                        console.log('UDI', udi);
+
+                        //Select the img & update is attr
+                        tinymce.activeEditor.$(img).attr({ "data-udi": udi });
+
+                        //Remove key
+                        localStorage.removeItem(`tinymce__${imgSrc}`);
+                    });
+                });
+            }
+        });
+    }
+
     return {
 
         /**
@@ -292,13 +332,14 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
 
                     //this is used to style the inline macro bits, sorry hard coding this form now since we don't have a standalone
                     //stylesheet to load in for this with only these styles (the color is @pinkLight)
-                    content_style: ".mce-content-body .umb-macro-holder { border: 3px dotted #f5c1bc; padding: 7px; display: block; margin: 3px; } .umb-rte .mce-content-body .umb-macro-holder.loading {background: url(assets/img/loader.gif) right no-repeat; background-size: 18px; background-position-x: 99%;}"
-                    
+                    content_style: ".mce-content-body .umb-macro-holder { border: 3px dotted #f5c1bc; padding: 7px; display: block; margin: 3px; } .umb-rte .mce-content-body .umb-macro-holder.loading {background: url(assets/img/loader.gif) right no-repeat; background-size: 18px; background-position-x: 99%;}",
+
                     // This allows images to be pasted in & stored as Base64 until they get uploaded to server
-                    paste_data_images: true
+                    paste_data_images: true,
 
                     images_upload_handler: uploadImageHandler,
                     automatic_uploads: false,
+                    init_instance_callback: initEvents
                 };
 
                 if (tinyMceConfig.customConfig) {

From db37f847f9b513da865f03d4ab4a54c400cb9dcc Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Fri, 30 Aug 2019 12:34:46 +0100
Subject: [PATCH 449/776] Remove the console.log debug messages

---
 .../src/common/services/tinymce.service.js                | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 776acae892..fcd577df9c 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -214,25 +214,17 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
 
             // Upload BLOB images (dragged/pasted ones)
             if(content.indexOf('<img src="blob:') > -1){
-                console.log('found img');
 
                 editor.uploadImages(function(data) {
-                    console.log("data", data);
-
                     data.forEach(function(item) {
-                        console.log("item", item);
-
                         //Select img element
                         var img = item.element;
 
                         //Get img src
                         var imgSrc = img.getAttribute("src");
-                        console.log('img src', imgSrc);
 
                         //Try & find in localstorage
                         var udi = localStorage.getItem(`tinymce__${imgSrc}`);
-                        console.log('imgsrc key', `tinymce__${imgSrc}`)
-                        console.log('UDI', udi);
 
                         //Select the img & update is attr
                         tinymce.activeEditor.$(img).attr({ "data-udi": udi });

From 4adcd7de9be8918676b9d721b551ec5267622f37 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Fri, 30 Aug 2019 12:46:57 +0100
Subject: [PATCH 450/776] Makes the insert media picker button active only if
 an image has a data-udi attribute set Means images pasted from a webpage that
 have a full absolute URL pasted into tiny does not active this button
 unnecessarily

---
 .../src/common/services/tinymce.service.js                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index fcd577df9c..cbc95fcc4c 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -471,7 +471,7 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
             editor.addButton('umbmediapicker', {
                 icon: 'custom icon-picture',
                 tooltip: 'Media Picker',
-                stateSelector: 'img',
+                stateSelector: 'img[data-udi]',
                 onclick: function () {
 
 

From 1d94c4b9bbf026cc313bb04a561862ffe53fb033 Mon Sep 17 00:00:00 2001
From: christophnz <slimchrissy@gmail.com>
Date: Fri, 30 Aug 2019 14:06:00 +1200
Subject: [PATCH 451/776] Fixed returntype of IPublishedContent.Siblings<T> to
 be IEnumerable<T> rather than IEnumerable<IPublishedContent>

---
 src/Umbraco.Web/PublishedContentExtensions.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/PublishedContentExtensions.cs b/src/Umbraco.Web/PublishedContentExtensions.cs
index d7283a1e90..d15d5817f6 100644
--- a/src/Umbraco.Web/PublishedContentExtensions.cs
+++ b/src/Umbraco.Web/PublishedContentExtensions.cs
@@ -1067,7 +1067,7 @@ namespace Umbraco.Web
         /// <remarks>
         ///   <para>Note that in V7 this method also return the content node self.</para>
         /// </remarks>
-        public static IEnumerable<IPublishedContent> Siblings<T>(this IPublishedContent content, string culture = null)
+        public static IEnumerable<T> Siblings<T>(this IPublishedContent content, string culture = null)
             where T : class, IPublishedContent
         {
             return SiblingsAndSelf<T>(content, culture).Where(x => x.Id != content.Id);

From 4eed413f950b20a6a455d831cd8ea536329c8fdc Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Fri, 30 Aug 2019 13:35:38 +0100
Subject: [PATCH 452/776] Remove a forgotten console.log

---
 .../src/common/services/tinymce.service.js                      | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index cbc95fcc4c..b8a1191175 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -208,8 +208,6 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
     function initEvents(editor){
 
         editor.on('SetContent', function (e) {
-            console.log('setcontent', e);
-
             var content = e.content;
 
             // Upload BLOB images (dragged/pasted ones)

From 1bf85ab1dbfd5824c4a295cf89c21ebe87132208 Mon Sep 17 00:00:00 2001
From: Mads Krohn <sniffdk@gmail.com>
Date: Mon, 2 Sep 2019 08:46:33 +0200
Subject: [PATCH 453/776] Correctly html encode text (#6235)

---
 src/Umbraco.Web/HtmlStringUtilities.cs | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/HtmlStringUtilities.cs b/src/Umbraco.Web/HtmlStringUtilities.cs
index 6cf5092bb0..4606a58a3a 100644
--- a/src/Umbraco.Web/HtmlStringUtilities.cs
+++ b/src/Umbraco.Web/HtmlStringUtilities.cs
@@ -19,10 +19,26 @@ namespace Umbraco.Web
         /// Replaces text line breaks with HTML line breaks
         /// </summary>
         /// <param name="text">The text.</param>
-        /// <returns>The text with text line breaks replaced with HTML line breaks (<br/>)</returns>
+        /// <returns>The text with text line breaks replaced with HTML line breaks (<c>&lt;br /&gt;</c>).
+        [Obsolete("This method doesn't HTML encode the text. Use ReplaceLineBreaks instead.")]
         public HtmlString ReplaceLineBreaksForHtml(string text)
         {
-            return new HtmlString(text.Replace("\r\n", @"<br />").Replace("\n", @"<br />").Replace("\r", @"<br />"));
+            return new HtmlString(text.Replace("\r\n", @"<br />").Replace("\n", @"<br />").Replace("\r", @"<br />"));            
+        }
+        
+        /// <summary>
+        /// HTML encodes the text and replaces text line breaks with HTML line breaks.
+        /// </summary>
+        /// <param name="text">The text.</param>
+        /// <returns>The HTML encoded text with text line breaks replaced with HTML line breaks (<c>&lt;br /&gt;</c>).</returns>
+        public IHtmlString ReplaceLineBreaks(string text)
+        {
+            var value = HttpUtility.HtmlEncode(text)?
+                .Replace("\r\n", "<br />")
+                .Replace("\r", "<br />")
+                .Replace("\n", "<br />");
+
+            return new HtmlString(value);
         }
 
         public HtmlString StripHtmlTags(string html, params string[] tags)

From 0e8b4b8342ceaadf3a669bef2d53d8ea3a2cb116 Mon Sep 17 00:00:00 2001
From: Mads Krohn <sniffdk@gmail.com>
Date: Mon, 2 Sep 2019 08:46:33 +0200
Subject: [PATCH 454/776] Correctly html encode text (#6235)

(cherry picked from commit 1bf85ab1dbfd5824c4a295cf89c21ebe87132208)
---
 src/Umbraco.Web/HtmlStringUtilities.cs | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/HtmlStringUtilities.cs b/src/Umbraco.Web/HtmlStringUtilities.cs
index 6cf5092bb0..4606a58a3a 100644
--- a/src/Umbraco.Web/HtmlStringUtilities.cs
+++ b/src/Umbraco.Web/HtmlStringUtilities.cs
@@ -19,10 +19,26 @@ namespace Umbraco.Web
         /// Replaces text line breaks with HTML line breaks
         /// </summary>
         /// <param name="text">The text.</param>
-        /// <returns>The text with text line breaks replaced with HTML line breaks (<br/>)</returns>
+        /// <returns>The text with text line breaks replaced with HTML line breaks (<c>&lt;br /&gt;</c>).
+        [Obsolete("This method doesn't HTML encode the text. Use ReplaceLineBreaks instead.")]
         public HtmlString ReplaceLineBreaksForHtml(string text)
         {
-            return new HtmlString(text.Replace("\r\n", @"<br />").Replace("\n", @"<br />").Replace("\r", @"<br />"));
+            return new HtmlString(text.Replace("\r\n", @"<br />").Replace("\n", @"<br />").Replace("\r", @"<br />"));            
+        }
+        
+        /// <summary>
+        /// HTML encodes the text and replaces text line breaks with HTML line breaks.
+        /// </summary>
+        /// <param name="text">The text.</param>
+        /// <returns>The HTML encoded text with text line breaks replaced with HTML line breaks (<c>&lt;br /&gt;</c>).</returns>
+        public IHtmlString ReplaceLineBreaks(string text)
+        {
+            var value = HttpUtility.HtmlEncode(text)?
+                .Replace("\r\n", "<br />")
+                .Replace("\r", "<br />")
+                .Replace("\n", "<br />");
+
+            return new HtmlString(value);
         }
 
         public HtmlString StripHtmlTags(string html, params string[] tags)

From 24efa54481f98078740e20a5e84f70f587df2ab6 Mon Sep 17 00:00:00 2001
From: Kasper Christensen <kasper@friischristensen.com>
Date: Mon, 2 Sep 2019 10:00:44 +0200
Subject: [PATCH 455/776] =?UTF-8?q?Loginpage:=20Added=20an=20id=20to=20inp?=
 =?UTF-8?q?ut=20fields=20and=20a=20for=20attr=20on=20the=20la=E2=80=A6=20(?=
 =?UTF-8?q?#6247)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/application/umb-login.html     | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
index bc27196466..676b2efc38 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
@@ -18,11 +18,11 @@
                     </p>
 
                     <div class="control-group" ng-class="{error: vm.setPasswordForm.password.$invalid}">
-                        <label>
+                        <label for="umb-password">
                             <localize key="user_newPassword">New password</localize>
                             <small style="font-size: 13px;">{{vm.invitedUserPasswordModel.passwordPolicyText}}</small>
                         </label>
-                        <input type="password" ng-model="vm.invitedUserPasswordModel.password" name="password" class="-full-width-input" umb-auto-focus required val-server-field="value" ng-minlength="{{vm.invitedUserPasswordModel.passwordPolicies.minPasswordLength}}" />
+                        <input type="password" ng-model="vm.invitedUserPasswordModel.password" name="password" id="umb-password" class="-full-width-input" umb-auto-focus required val-server-field="value" ng-minlength="{{vm.invitedUserPasswordModel.passwordPolicies.minPasswordLength}}" />
                         <span ng-messages="inviteUserPasswordForm.password.$error" show-validation-on-submit >
                             <span class="help-inline" ng-message="required"><localize key="user_passwordIsBlank">Your new password cannot be blank!</localize></span>
                             <span class="help-inline" ng-message="minlength">Minimum {{vm.invitedUserPasswordModel.passwordPolicies.minPasswordLength}} characters</span>
@@ -31,8 +31,8 @@
                     </div>
 
                     <div class="control-group" ng-class="{error: vm.setPasswordForm.confirmPassword.$invalid}">
-                        <label><localize key="user_confirmNewPassword">Confirm new password</localize></label>
-                        <input type="password" ng-model="vm.invitedUserPasswordModel.confirmPassword" name="confirmPassword" class="-full-width-input" required val-compare="password" />
+                        <label for="umb-confirmPassword"><localize key="user_confirmNewPassword">Confirm new password</localize></label>
+                        <input type="password" ng-model="vm.invitedUserPasswordModel.confirmPassword" name="confirmPassword" id="umb-confirmPassword" class="-full-width-input" required val-compare="password" />
                         <span ng-messages="inviteUserPasswordForm.confirmPassword.$error" show-validation-on-submit >
                             <span class="help-inline" ng-message="required"><localize key="general_required">Required</localize></span>
                             <span class="help-inline" ng-message="valCompare"><localize key="user_passwordMismatch">The confirmed password doesn't match the new password!</localize></span>
@@ -152,13 +152,13 @@
                             <p ng-message="auth" class="text-error" role="alert">{{vm.errorMsg}}</p>
                         </div>
                         <div class="control-group" ng-class="{error: vm.loginForm.username.$invalid}">
-                            <label>{{vm.labels.usernameLabel}}</label>
-                            <input type="text" ng-model="vm.login" name="username" class="-full-width-input" placeholder="{{vm.labels.usernamePlaceholder}}" focus-when="{{vm.view === 'login'}}" />
+                            <label for="umb-username">{{vm.labels.usernameLabel}}</label>
+                            <input type="text" ng-model="vm.login" name="username" id="umb-username" class="-full-width-input" placeholder="{{vm.labels.usernamePlaceholder}}" focus-when="{{vm.view === 'login'}}" />
                         </div>
 
                         <div class="control-group" ng-class="{error: vm.loginForm.password.$invalid}">
-                            <label><localize key="general_password">Password</localize></label>
-                            <input type="password" ng-model="vm.password" name="password" class="-full-width-input" localize="placeholder" placeholder="@placeholders_password" />
+                            <label for="umb-password"><localize key="general_password">Password</localize></label>
+                            <input type="password" ng-model="vm.password" name="password" id="umb-password" class="-full-width-input" localize="placeholder" placeholder="@placeholders_password" />
                             <div class="password-toggle">
                                 <a href="#" prevent-default ng-click="vm.togglePassword()">
                                     <span class="password-text show"><localize key="login_showPassword">Show password</localize></span>
@@ -189,8 +189,8 @@
 
                     <form method="POST" name="vm.requestPasswordResetForm" ng-submit="vm.requestPasswordResetSubmit(email)">
                         <div class="control-group" ng-class="{error: requestPasswordResetForm.email.$invalid}">
-                            <label><localize key="general_email">Email</localize></label>
-                            <input type="email" val-email ng-model="email" name="email" class="-full-width-input" localize="placeholder" placeholder="@placeholders_email" focus-when="{{vm.view === 'request-password-reset'}}" />
+                            <label for="umb-email"><localize key="general_email">Email</localize></label>
+                            <input type="email" val-email ng-model="email" name="email" id="umb-email" class="-full-width-input" localize="placeholder" placeholder="@placeholders_email" focus-when="{{vm.view === 'request-password-reset'}}" />
                         </div>
 
                         <div class="control-group" ng-show="requestPasswordResetForm.$invalid">
@@ -220,13 +220,13 @@
                     <form method="POST" name="vm.setPasswordForm" ng-submit="vm.setPasswordSubmit(vm.password, vm.confirmPassword)">
 
                         <div ng-hide="vm.resetComplete" class="control-group" ng-class="{error: vm.setPasswordForm.password.$invalid}">
-                            <label><localize key="user_newPassword">New password</localize></label>
-                            <input type="password" ng-model="vm.password" name="password" class="-full-width-input" localize="placeholder" placeholder="@placeholders_password" focus-when="{{vm.view === 'set-password'}}" />
+                            <label for="umb-password"><localize key="user_newPassword">New password</localize></label>
+                            <input type="password" ng-model="vm.password" name="password" id="umb-password" class="-full-width-input" localize="placeholder" placeholder="@placeholders_password" focus-when="{{vm.view === 'set-password'}}" />
                         </div>
 
                         <div ng-hide="vm.resetComplete" class="control-group" ng-class="{error: vm.setPasswordForm.confirmPassword.$invalid}">
-                            <label><localize key="user_confirmNewPassword">Confirm new password</localize></label>
-                            <input type="password" ng-model="vm.confirmPassword" name="confirmPassword" class="-full-width-input" localize="placeholder" placeholder="@placeholders_confirmPassword" />
+                            <label for="umb-confirmPassword"><localize key="user_confirmNewPassword">Confirm new password</localize></label>
+                            <input type="password" ng-model="vm.confirmPassword" name="confirmPassword" id="umb-confirmPassword" class="-full-width-input" localize="placeholder" placeholder="@placeholders_confirmPassword" />
                         </div>
 
                         <div ng-hide="vm.resetComplete" class="control-group" ng-show="vm.setPasswordForm.$invalid">

From da0ace18e69879471a55472e391aa7b98c96cb4d Mon Sep 17 00:00:00 2001
From: Kasper Christensen <kasper@friischristensen.com>
Date: Mon, 2 Sep 2019 10:00:44 +0200
Subject: [PATCH 456/776] =?UTF-8?q?Loginpage:=20Added=20an=20id=20to=20inp?=
 =?UTF-8?q?ut=20fields=20and=20a=20for=20attr=20on=20the=20la=E2=80=A6=20(?=
 =?UTF-8?q?#6247)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 24efa54481f98078740e20a5e84f70f587df2ab6)
---
 .../components/application/umb-login.html     | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
index bc27196466..676b2efc38 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
@@ -18,11 +18,11 @@
                     </p>
 
                     <div class="control-group" ng-class="{error: vm.setPasswordForm.password.$invalid}">
-                        <label>
+                        <label for="umb-password">
                             <localize key="user_newPassword">New password</localize>
                             <small style="font-size: 13px;">{{vm.invitedUserPasswordModel.passwordPolicyText}}</small>
                         </label>
-                        <input type="password" ng-model="vm.invitedUserPasswordModel.password" name="password" class="-full-width-input" umb-auto-focus required val-server-field="value" ng-minlength="{{vm.invitedUserPasswordModel.passwordPolicies.minPasswordLength}}" />
+                        <input type="password" ng-model="vm.invitedUserPasswordModel.password" name="password" id="umb-password" class="-full-width-input" umb-auto-focus required val-server-field="value" ng-minlength="{{vm.invitedUserPasswordModel.passwordPolicies.minPasswordLength}}" />
                         <span ng-messages="inviteUserPasswordForm.password.$error" show-validation-on-submit >
                             <span class="help-inline" ng-message="required"><localize key="user_passwordIsBlank">Your new password cannot be blank!</localize></span>
                             <span class="help-inline" ng-message="minlength">Minimum {{vm.invitedUserPasswordModel.passwordPolicies.minPasswordLength}} characters</span>
@@ -31,8 +31,8 @@
                     </div>
 
                     <div class="control-group" ng-class="{error: vm.setPasswordForm.confirmPassword.$invalid}">
-                        <label><localize key="user_confirmNewPassword">Confirm new password</localize></label>
-                        <input type="password" ng-model="vm.invitedUserPasswordModel.confirmPassword" name="confirmPassword" class="-full-width-input" required val-compare="password" />
+                        <label for="umb-confirmPassword"><localize key="user_confirmNewPassword">Confirm new password</localize></label>
+                        <input type="password" ng-model="vm.invitedUserPasswordModel.confirmPassword" name="confirmPassword" id="umb-confirmPassword" class="-full-width-input" required val-compare="password" />
                         <span ng-messages="inviteUserPasswordForm.confirmPassword.$error" show-validation-on-submit >
                             <span class="help-inline" ng-message="required"><localize key="general_required">Required</localize></span>
                             <span class="help-inline" ng-message="valCompare"><localize key="user_passwordMismatch">The confirmed password doesn't match the new password!</localize></span>
@@ -152,13 +152,13 @@
                             <p ng-message="auth" class="text-error" role="alert">{{vm.errorMsg}}</p>
                         </div>
                         <div class="control-group" ng-class="{error: vm.loginForm.username.$invalid}">
-                            <label>{{vm.labels.usernameLabel}}</label>
-                            <input type="text" ng-model="vm.login" name="username" class="-full-width-input" placeholder="{{vm.labels.usernamePlaceholder}}" focus-when="{{vm.view === 'login'}}" />
+                            <label for="umb-username">{{vm.labels.usernameLabel}}</label>
+                            <input type="text" ng-model="vm.login" name="username" id="umb-username" class="-full-width-input" placeholder="{{vm.labels.usernamePlaceholder}}" focus-when="{{vm.view === 'login'}}" />
                         </div>
 
                         <div class="control-group" ng-class="{error: vm.loginForm.password.$invalid}">
-                            <label><localize key="general_password">Password</localize></label>
-                            <input type="password" ng-model="vm.password" name="password" class="-full-width-input" localize="placeholder" placeholder="@placeholders_password" />
+                            <label for="umb-password"><localize key="general_password">Password</localize></label>
+                            <input type="password" ng-model="vm.password" name="password" id="umb-password" class="-full-width-input" localize="placeholder" placeholder="@placeholders_password" />
                             <div class="password-toggle">
                                 <a href="#" prevent-default ng-click="vm.togglePassword()">
                                     <span class="password-text show"><localize key="login_showPassword">Show password</localize></span>
@@ -189,8 +189,8 @@
 
                     <form method="POST" name="vm.requestPasswordResetForm" ng-submit="vm.requestPasswordResetSubmit(email)">
                         <div class="control-group" ng-class="{error: requestPasswordResetForm.email.$invalid}">
-                            <label><localize key="general_email">Email</localize></label>
-                            <input type="email" val-email ng-model="email" name="email" class="-full-width-input" localize="placeholder" placeholder="@placeholders_email" focus-when="{{vm.view === 'request-password-reset'}}" />
+                            <label for="umb-email"><localize key="general_email">Email</localize></label>
+                            <input type="email" val-email ng-model="email" name="email" id="umb-email" class="-full-width-input" localize="placeholder" placeholder="@placeholders_email" focus-when="{{vm.view === 'request-password-reset'}}" />
                         </div>
 
                         <div class="control-group" ng-show="requestPasswordResetForm.$invalid">
@@ -220,13 +220,13 @@
                     <form method="POST" name="vm.setPasswordForm" ng-submit="vm.setPasswordSubmit(vm.password, vm.confirmPassword)">
 
                         <div ng-hide="vm.resetComplete" class="control-group" ng-class="{error: vm.setPasswordForm.password.$invalid}">
-                            <label><localize key="user_newPassword">New password</localize></label>
-                            <input type="password" ng-model="vm.password" name="password" class="-full-width-input" localize="placeholder" placeholder="@placeholders_password" focus-when="{{vm.view === 'set-password'}}" />
+                            <label for="umb-password"><localize key="user_newPassword">New password</localize></label>
+                            <input type="password" ng-model="vm.password" name="password" id="umb-password" class="-full-width-input" localize="placeholder" placeholder="@placeholders_password" focus-when="{{vm.view === 'set-password'}}" />
                         </div>
 
                         <div ng-hide="vm.resetComplete" class="control-group" ng-class="{error: vm.setPasswordForm.confirmPassword.$invalid}">
-                            <label><localize key="user_confirmNewPassword">Confirm new password</localize></label>
-                            <input type="password" ng-model="vm.confirmPassword" name="confirmPassword" class="-full-width-input" localize="placeholder" placeholder="@placeholders_confirmPassword" />
+                            <label for="umb-confirmPassword"><localize key="user_confirmNewPassword">Confirm new password</localize></label>
+                            <input type="password" ng-model="vm.confirmPassword" name="confirmPassword" id="umb-confirmPassword" class="-full-width-input" localize="placeholder" placeholder="@placeholders_confirmPassword" />
                         </div>
 
                         <div ng-hide="vm.resetComplete" class="control-group" ng-show="vm.setPasswordForm.$invalid">

From 3d3a836c5281de142d36febe49ced5b845b6b251 Mon Sep 17 00:00:00 2001
From: Poornima Nayar <poornimakrishnav@gmail.com>
Date: Fri, 30 Aug 2019 23:19:54 +0100
Subject: [PATCH 457/776] fix to the documentation link in create packages
 opening in same window

---
 src/Umbraco.Web.UI.Client/src/views/packages/edit.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/edit.html b/src/Umbraco.Web.UI.Client/src/views/packages/edit.html
index 2df95cec0d..7a95fd9214 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packages/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/packages/edit.html
@@ -298,7 +298,7 @@
                             description="Here you can add custom installer / uninstaller events to perform certain tasks during installation and uninstallation.
                             All actions are formed as a xml node, containing data for the action to be performed.">
                             <div>
-                                <a ng-href="https://our.umbraco.com/documentation/Reference/Packaging/">Documentation</a>
+                                <a target="_blank" ng-href="https://our.umbraco.com/documentation/Reference/Packaging/">Documentation</a>
                                 <div>
                                     <textarea class="umb-property-editor" rows="10" ng-model="vm.package.actions"></textarea>
                                 </div>

From 1963dbe6394f3f56a329f3b0288936642fec8897 Mon Sep 17 00:00:00 2001
From: Poornima Nayar <poornimakrishnav@gmail.com>
Date: Fri, 30 Aug 2019 23:19:54 +0100
Subject: [PATCH 458/776] fix to the documentation link in create packages
 opening in same window

(cherry picked from commit 3d3a836c5281de142d36febe49ced5b845b6b251)
---
 src/Umbraco.Web.UI.Client/src/views/packages/edit.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/edit.html b/src/Umbraco.Web.UI.Client/src/views/packages/edit.html
index 2df95cec0d..7a95fd9214 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packages/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/packages/edit.html
@@ -298,7 +298,7 @@
                             description="Here you can add custom installer / uninstaller events to perform certain tasks during installation and uninstallation.
                             All actions are formed as a xml node, containing data for the action to be performed.">
                             <div>
-                                <a ng-href="https://our.umbraco.com/documentation/Reference/Packaging/">Documentation</a>
+                                <a target="_blank" ng-href="https://our.umbraco.com/documentation/Reference/Packaging/">Documentation</a>
                                 <div>
                                     <textarea class="umb-property-editor" rows="10" ng-model="vm.package.actions"></textarea>
                                 </div>

From 157c0a2479b4566901b9bfa2d80f92dab8354fa1 Mon Sep 17 00:00:00 2001
From: Poornima Nayar <poornimakrishnav@gmail.com>
Date: Sat, 31 Aug 2019 21:22:12 +0100
Subject: [PATCH 459/776] Added Review process file

---
 .github/REVIEW_PROCESS.md | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 .github/REVIEW_PROCESS.md

diff --git a/.github/REVIEW_PROCESS.md b/.github/REVIEW_PROCESS.md
new file mode 100644
index 0000000000..917d25b090
--- /dev/null
+++ b/.github/REVIEW_PROCESS.md
@@ -0,0 +1,25 @@
+# Review process
+
+You're an awesome person and have sent us your contribution in the form of a pull request! It's now time to relax for a bit and wait for our response. 
+
+In order to set some expectations, here's what happens next.
+
+## Review process
+
+You will get an initial reply within 48 hours (workdays) to acknowledge that we’ve seen your PR and we’ll pick it up as soon as we can.
+
+You will get feedback within at most 14 days after opening the PR. You’ll most likely get feedback sooner though. Then there are a few possible outcomes:
+
+- Your proposed change is awesome! We merge it in and it will be included in the next minor release of Umbraco
+- If the change is a high priority bug fix, we will cherry-pick it into the next patch release as well so that we can release it as soon as possible
+- Your proposed change is awesome but needs a bit more work, we’ll give you feedback on the changes we’d like to see
+- Your proposed change is awesome but.. not something we’re looking to include at this point. We’ll close your PR and the related issue (we’ll be nice about it!)
+
+## Are you still available?
+
+We understand you have other things to do and can't just drop everything to help us out.   
+So if we’re asking for your help to improve the PR we’ll wait for two weeks to give you a fair chance to make changes. We’ll ask for an update if we don’t hear back from you after that time.  
+
+If we don’t hear back from you for 4 weeks, we’ll close the PR so that it doesn’t just hang around forever. You’re very welcome to re-open it once you have some more time to spend on it.  
+
+There will be times that we really like your proposed changes and we’ll finish the final improvements we’d like to see ourselves. You still get the credits and your commits will live on in the git repository.
\ No newline at end of file

From 087122868557f28d1f5d0b6f2a372eaf52e3ab22 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Fri, 16 Aug 2019 11:52:34 +0200
Subject: [PATCH 460/776] v8: Add umbLoader directive (#4987)

(cherry picked from commit e4f19f71926ff1c0db427d6604798795fbe88f8c)
---
 .../components/umbloader.directive.js         | 75 +++++++++++++++++++
 .../components/umbloadindicator.directive.js  |  2 +-
 src/Umbraco.Web.UI.Client/src/less/belle.less |  1 +
 .../less/components/application/umb-tour.less | 12 ++-
 .../src/less/components/umb-loader.less       | 42 +++++++++++
 src/Umbraco.Web.UI.Client/src/less/main.less  | 36 ---------
 .../components/application/umb-tour.html      |  3 +-
 .../src/views/components/umb-loader.html      |  3 +
 .../src/views/content/copy.html               |  4 +-
 .../src/views/content/emptyrecyclebin.html    |  5 +-
 .../src/views/content/move.html               |  4 +-
 .../src/views/datatypes/move.html             |  4 +-
 .../src/views/documenttypes/copy.html         |  4 +-
 .../src/views/documenttypes/move.html         |  4 +-
 .../src/views/media/emptyrecyclebin.html      |  5 +-
 .../src/views/mediatypes/copy.html            |  4 +-
 .../src/views/mediatypes/move.html            |  4 +-
 .../propertyeditors/listview/listview.html    |  5 +-
 18 files changed, 145 insertions(+), 72 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/common/directives/components/umbloader.directive.js
 create mode 100644 src/Umbraco.Web.UI.Client/src/less/components/umb-loader.less
 create mode 100644 src/Umbraco.Web.UI.Client/src/views/components/umb-loader.html

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbloader.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbloader.directive.js
new file mode 100644
index 0000000000..e70f7b3cac
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbloader.directive.js
@@ -0,0 +1,75 @@
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbLoader
+@restrict E
+
+@description
+Use this directive to generate a loading indicator.
+
+<h3>Markup example</h3>
+<pre>
+    <div ng-controller="My.Controller as vm">
+
+        <umb-loader
+            ng-if="vm.loading">
+        </umb-loader>
+
+        <div class="content" ng-if="!vm.loading">
+            <p>{{content}}</p>
+        </div>
+
+    </div>
+</pre>
+
+<h3>Controller example</h3>
+<pre>
+    (function () {
+        "use strict";
+
+        function Controller(myService) {
+
+            var vm = this;
+
+            vm.content = "";
+            vm.loading = true;
+
+            myService.getContent().then(function(content){
+                vm.content = content;
+                vm.loading = false;
+            });
+
+        }
+
+        angular.module("umbraco").controller("My.Controller", Controller);
+    })();
+</pre>
+
+@param {string=} position The loader position ("top", "bottom").
+
+**/
+
+(function() {
+  'use strict';
+
+  function UmbLoaderDirective() {
+
+    function link(scope, el, attr, ctrl) {
+        
+    }
+
+    var directive = {
+        restrict: 'E',
+        replace: true,
+        templateUrl: 'views/components/umb-loader.html',
+        scope: {
+            position: "@?"
+        },
+        link: link
+    };
+
+    return directive;
+  }
+  
+  angular.module('umbraco.directives').directive('umbLoader', UmbLoaderDirective);
+
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbloadindicator.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbloadindicator.directive.js
index 0671770796..c45b8f3f47 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbloadindicator.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbloadindicator.directive.js
@@ -39,7 +39,7 @@ Use this directive to generate a loading indicator.
             });
 
         }
-½
+
         angular.module("umbraco").controller("My.Controller", Controller);
     })();
 </pre>
diff --git a/src/Umbraco.Web.UI.Client/src/less/belle.less b/src/Umbraco.Web.UI.Client/src/less/belle.less
index bd1cdd5b4f..cf5ccb3d00 100644
--- a/src/Umbraco.Web.UI.Client/src/less/belle.less
+++ b/src/Umbraco.Web.UI.Client/src/less/belle.less
@@ -124,6 +124,7 @@
 @import "components/umb-form-check.less";
 @import "components/umb-locked-field.less";
 @import "components/umb-tabs.less";
+@import "components/umb-loader.less";
 @import "components/umb-load-indicator.less";
 @import "components/umb-breadcrumbs.less";
 @import "components/umb-media-grid.less";
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-tour.less b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-tour.less
index 315cd91dbd..33a723a3f7 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-tour.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-tour.less
@@ -1,8 +1,12 @@
-.umb-tour__loader {
-    background: @white;
-    z-index: @zindexTourModal;
+.umb-loader-wrapper.umb-tour__loader {
+    margin: 0;
     position: fixed;
-    height: 5px;
+    z-index: @zindexTourModal;
+
+    .umb-loader {
+        background-color: @white;
+        height: 5px;
+    }
 }
 
 .umb-tour__pulse {
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-loader.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-loader.less
new file mode 100644
index 0000000000..260710ce72
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-loader.less
@@ -0,0 +1,42 @@
+// Loading Animation
+// ------------------------
+
+.umb-loader {
+    background-color: @blue;
+    margin-top: 0;
+    margin-left: -100%;
+    animation-name: bounce_loadingProgressG;
+    animation-duration: 1s;
+    animation-iteration-count: infinite;
+    animation-timing-function: linear;
+    width: 100%;
+    height: 2px;
+}
+
+@keyframes bounce_loadingProgressG {
+    0% {
+        margin-left: -100%;
+    }
+
+    100% {
+        margin-left: 100%;
+    }
+}
+
+.umb-loader-wrapper {
+    position: absolute;
+    right: 0;
+    left: 0;
+    margin: 10px 0;
+    overflow: hidden;
+}
+
+.umb-loader-wrapper.-top {
+    top: 0;
+    bottom: auto;
+}
+
+.umb-loader-wrapper.-bottom {
+    top: auto;
+    bottom: 0;
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/main.less b/src/Umbraco.Web.UI.Client/src/less/main.less
index 9f9bbce310..2134514b4d 100644
--- a/src/Umbraco.Web.UI.Client/src/less/main.less
+++ b/src/Umbraco.Web.UI.Client/src/less/main.less
@@ -486,42 +486,6 @@ table thead a {
     color:@green;
 }
 
-// Loading Animation
-// ------------------------
-
-.umb-loader{
-    background-color: @blue;
-    margin-top:0;
-    margin-left:-100%;
-    animation-name:bounce_loadingProgressG;
-    animation-duration:1s;
-    animation-iteration-count:infinite;
-    animation-timing-function:linear;
-    width:100%;
-    height:2px;
-}
-
-@keyframes bounce_loadingProgressG{
-    0%{
-        margin-left:-100%;
-    }
-    100%{
-        margin-left:100%;
-    }
-}
-
-.umb-loader-wrapper {
-    position: absolute;
-    right: 0;
-    left: 0;
-    margin: 10px 0;
-    overflow: hidden;
-}
-
-.umb-loader-wrapper.-bottom {
-	bottom: 0;
-}
-
 // Helpers
 
 .strong {
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-tour.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-tour.html
index b756d23b50..2910986048 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-tour.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-tour.html
@@ -1,6 +1,7 @@
 <div class="umb-tour">
 
-    <div class="umb-loader umb-tour__loader" ng-if="loadingStep"></div>
+    <umb-loader class="umb-tour__loader" ng-if="loadingStep"></umb-loader>
+
     <div class="umb-tour__pulse"></div>
 
     <div class="umb-tour__popover shadow-depth-2" ng-class="{'umb-tour__popover--l': model.currentStep.type === 'intro' || model.currentStepIndex === model.steps.length}">
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-loader.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-loader.html
new file mode 100644
index 0000000000..07aeb7fdfa
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-loader.html
@@ -0,0 +1,3 @@
+<div class="umb-loader-wrapper" ng-class="{ '-top': position === 'top', '-bottom': position === 'bottom' }">
+    <div class="umb-loader"></div>
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/copy.html b/src/Umbraco.Web.UI.Client/src/views/content/copy.html
index 0ebe577ed8..111dacd7cb 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/copy.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/copy.html
@@ -24,9 +24,7 @@
                 <localize key="actions_toInTheTreeStructureBelow">to in the tree structure below</localize>
             </p>
 
-            <div class="umb-loader-wrapper" ng-show="busy">
-                <div class="umb-loader"></div>
-            </div>
+            <umb-loader ng-show="busy"></umb-loader>
 
             <div ng-hide="success">
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/emptyrecyclebin.html b/src/Umbraco.Web.UI.Client/src/views/content/emptyrecyclebin.html
index 524bb06354..9ac7ef10fc 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/emptyrecyclebin.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/emptyrecyclebin.html
@@ -1,9 +1,8 @@
 <div class="umb-dialog" ng-controller="Umbraco.Editors.Content.EmptyRecycleBinController">
     <div class="umb-dialog-body">
         <umb-pane>
-            <div class="umb-loader-wrapper" ng-show="busy">
-                <div class="umb-loader"></div>
-            </div>
+
+            <umb-loader ng-show="busy"></umb-loader>
 
             <p class="abstract">
                 <localize key="defaultdialogs_recycleBinWarning">When items are deleted from the recycle bin, they will be gone forever</localize>.
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/move.html b/src/Umbraco.Web.UI.Client/src/views/content/move.html
index fb72c38974..0bc2012ad3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/move.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/move.html
@@ -24,9 +24,7 @@
                 <localize key="actions_toInTheTreeStructureBelow">to in the tree structure below</localize>
             </p>
 
-            <div class="umb-loader-wrapper" ng-show="busy">
-                <div class="umb-loader"></div>
-            </div>
+            <umb-loader ng-show="busy"></umb-loader>
 
             <div ng-hide="success">
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/datatypes/move.html b/src/Umbraco.Web.UI.Client/src/views/datatypes/move.html
index 2723dd305d..dd943bf832 100644
--- a/src/Umbraco.Web.UI.Client/src/views/datatypes/move.html
+++ b/src/Umbraco.Web.UI.Client/src/views/datatypes/move.html
@@ -7,9 +7,7 @@
                 <localize key="editdatatype_selectFolder">Select the folder to move</localize> <strong>{{source.name}}</strong>&nbsp;<localize key="editdatatype_inTheTree">to in the tree structure below</localize>
             </p>
 
-            <div class="umb-loader-wrapper" ng-show="busy">
-                <div class="umb-loader"></div>
-            </div>
+            <umb-loader ng-show="busy"></umb-loader>
 
             <div ng-show="error">
                 <div class="alert alert-error">
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.html
index 4b90c244e8..7ea990e0bf 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.html
@@ -7,9 +7,7 @@
                 <localize key="contentTypeEditor_folderToCopy">Select the folder to copy</localize> <strong>{{source.name}}</strong>&nbsp;<localize key="contentTypeEditor_structureBelow">to in the tree structure below</localize>
             </p>
 
-            <div class="umb-loader-wrapper" ng-show="busy">
-                <div class="umb-loader"></div>
-            </div>
+            <umb-loader ng-show="busy"></umb-loader>
 
             <div ng-show="error">
                 <div class="alert alert-error">
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html
index 6b81c15bc5..49fdae9c92 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html
@@ -7,9 +7,7 @@
                 <localize key="contentTypeEditor_folderToMove">Select the folder to move</localize> <strong>{{source.name}}</strong>&nbsp;<localize key="contentTypeEditor_structureBelow">to in the tree structure below</localize>
             </p>
 
-            <div class="umb-loader-wrapper" ng-show="busy">
-                <div class="umb-loader"></div>
-            </div>
+            <umb-loader ng-show="busy"></umb-loader>
 
             <div ng-show="error">
                 <div class="alert alert-error">
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/emptyrecyclebin.html b/src/Umbraco.Web.UI.Client/src/views/media/emptyrecyclebin.html
index 9d1b28edc9..33681f9269 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/emptyrecyclebin.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/emptyrecyclebin.html
@@ -2,9 +2,8 @@
     <div class="umb-dialog-body">
         
         <umb-pane>
-            <div class="umb-loader-wrapper" ng-show="busy">
-                <div class="umb-loader"></div>
-            </div>
+
+            <umb-loader ng-show="busy"></umb-loader>
 
             <p class="abstract">
                 <localize key="defaultdialogs_recycleBinWarning">When items are deleted from the recycle bin, they will be gone forever</localize>.
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/copy.html b/src/Umbraco.Web.UI.Client/src/views/mediatypes/copy.html
index 05075ecbec..bd54dfe4a1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/copy.html
+++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/copy.html
@@ -7,9 +7,7 @@
                 <localize key="contentTypeEditor_folderToCopy">Select the folder to copy</localize> <strong>{{source.name}}</strong>&nbsp;<localize key="contentTypeEditor_structureBelow">to in the tree structure below</localize>
             </p>
 
-            <div class="umb-loader-wrapper" ng-show="busy">
-                <div class="umb-loader"></div>
-            </div>
+            <umb-loader ng-show="busy"></umb-loader>
 
             <div ng-show="error">
                 <div class="alert alert-error">
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/move.html b/src/Umbraco.Web.UI.Client/src/views/mediatypes/move.html
index 01d5ade7b1..4d4a840850 100644
--- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/move.html
+++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/move.html
@@ -7,9 +7,7 @@
                     <localize key="contentTypeEditor_folderToMove">Select the folder to move</localize> <strong>{{source.name}}</strong>&nbsp;<localize key="contentTypeEditor_structureBelow">to in the tree structure below</localize>
             </p>
 
-            <div class="umb-loader-wrapper" ng-show="busy">
-                <div class="umb-loader"></div>
-            </div>
+            <umb-loader ng-show="busy"></umb-loader>
 
             <div ng-show="error">
                 <div class="alert alert-error">
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
index e971897f2a..0770081aba 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
@@ -95,9 +95,8 @@
                    <strong ng-show="!actionInProgress">{{ selectedItemsCount() }} <localize key="general_of">of</localize> {{ listViewResultSet.items.length }} <localize key="general_selected">selected</localize></strong>
                    <strong ng-show="actionInProgress" ng-bind="bulkStatus"></strong>
 
-                   <div class="umb-loader-wrapper -bottom" ng-show="actionInProgress">
-                       <div class="umb-loader"></div>
-                   </div>
+                   <umb-loader position="bottom" ng-show="actionInProgress"></umb-loader>
+
                </umb-editor-sub-header-section>
 
            </umb-editor-sub-header-content-left>

From 6588fa2e379bf7be38c63595540729cc084cb9d3 Mon Sep 17 00:00:00 2001
From: Liam Laverty <liamlaverty@gmail.com>
Date: Tue, 3 Sep 2019 15:28:08 +0100
Subject: [PATCH 461/776] updated to 700 people

---
 src/Umbraco.Web.UI.Client/src/installer/installer.service.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/installer/installer.service.js b/src/Umbraco.Web.UI.Client/src/installer/installer.service.js
index 50b9f2f3c0..f6f162f04f 100644
--- a/src/Umbraco.Web.UI.Client/src/installer/installer.service.js
+++ b/src/Umbraco.Web.UI.Client/src/installer/installer.service.js
@@ -31,7 +31,7 @@ angular.module("umbraco.install").factory('installerService', function ($rootSco
 					"At least 4 people have the Umbraco logo tattooed on them",
 					"'Umbraco' is the Danish name for an allen key",
 					"Umbraco has been around since 2005, that's a looong time in IT",
-					"More than 600 people from all over the world meet each year in Denmark in May for our annual conference <a target='_blank' href='https://umbra.co/codegarden'>CodeGarden</a>", 
+					"More than 700 people from all over the world meet each year in Denmark in May for our annual conference <a target='_blank' href='https://umbra.co/codegarden'>CodeGarden</a>", 
 					"While you are installing Umbraco someone else on the other side of the planet is probably doing it too",
 					"You can extend Umbraco without modifying the source code using either JavaScript or C#",
 					"Umbraco has been installed in more than 198 countries"

From 8b0a64f8cd37d4268de3aef098a38e0127cda1e7 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Wed, 4 Sep 2019 14:22:57 +0100
Subject: [PATCH 462/776] Use the angular 3rd party lib angular-local-storage
 (which falls back to cookies) instead of native localStorage

---
 .../src/common/services/tinymce.service.js               | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index b8a1191175..23104b99f5 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -6,7 +6,8 @@
  * @description
  * A service containing all logic for all of the Umbraco TinyMCE plugins
  */
-function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, stylesheetResource, macroResource, macroService, $routeParams, umbRequestHelper, angularHelper, userService, editorService, entityResource) {
+function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, stylesheetResource, macroResource, macroService,
+    $routeParams, umbRequestHelper, angularHelper, userService, editorService, entityResource, localStorageService) {
 
     //These are absolutely required in order for the macros to render inline
     //we put these as extended elements because they get merged on top of the normal allowed elements by tiny mce
@@ -190,7 +191,7 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
             }
 
             // Put UDI into localstorage (used to update the img with data-udi later on)
-            localStorage.setItem(`tinymce__${json.location}`, json.udi);
+            localStorageService.set(`tinymce__${json.location}`, json.udi);
 
             success(json.location);
         };
@@ -222,13 +223,13 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                         var imgSrc = img.getAttribute("src");
 
                         //Try & find in localstorage
-                        var udi = localStorage.getItem(`tinymce__${imgSrc}`);
+                        var udi = localStorageService.get(`tinymce__${imgSrc}`);
 
                         //Select the img & update is attr
                         tinymce.activeEditor.$(img).attr({ "data-udi": udi });
 
                         //Remove key
-                        localStorage.removeItem(`tinymce__${imgSrc}`);
+                        localStorageService.remove(`tinymce__${imgSrc}`);
                     });
                 });
             }

From 5bbe1faddabec021d599742744adf3c6ad4c0ebf Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 5 Sep 2019 10:31:08 +0200
Subject: [PATCH 463/776] Fixes #6021 - Error on save and publish for existing
 node after content creation in eventhandler

---
 src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
index 8e2cf7bc3c..1bd58c3878 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
@@ -712,9 +712,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
             var id = content.FirstChildContentId;
             while (id > 0)
             {
-                var link = GetLinkedNode(id, "child");
-                ClearBranchLocked(link.Value);
-                id = link.Value.NextSiblingContentId;
+                var child = GetLinkedNode(id, "child").Value;
+                ClearBranchLocked(child);
+                id = child.NextSiblingContentId;
             }
         }
 

From d3f3c74e10770d839c4c025e329219bf1d3a89e3 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 5 Sep 2019 11:47:13 +0200
Subject: [PATCH 464/776] Fix #6283 Save Member resets password

---
 .../src/views/member/member.edit.controller.js                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
index eb99e46a1f..8d54597791 100644
--- a/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
@@ -133,7 +133,7 @@ function MemberEditController($scope, $routeParams, $location, $q, $window, appS
 
             //anytime a user is changing a member's password without the oldPassword, we are in effect resetting it so we need to set that flag here
             var passwordProp = _.find(contentEditingHelper.getAllProps($scope.content), function (e) { return e.alias === '_umb_password' });
-            if (passwordProp && passwordProp.value && !passwordProp.value.reset) {
+            if (passwordProp && passwordProp.value && (typeof passwordProp.value.reset !== 'undefined') && !passwordProp.value.reset) {
                 //so if the admin is not explicitly resetting the password, flag it for resetting if a new password is being entered
                 passwordProp.value.reset = !passwordProp.value.oldPassword && passwordProp.config.allowManuallyChangingPassword;
             }

From 4b344ac3fdde5801074a1539f83b5e6adfcc51cf Mon Sep 17 00:00:00 2001
From: Jan Skovgaard <jaskov@gmail.com>
Date: Thu, 5 Sep 2019 12:29:25 +0200
Subject: [PATCH 465/776] Accessibility: Grid filter drop down can't be
 accessed via keyboard (#5963)

---
 .../components/events/events.directive.js     | 37 +++++++++++++++++++
 .../components/umblayoutselector.directive.js |  5 +++
 .../less/components/umb-layout-selector.less  |  2 +
 .../views/components/umb-layout-selector.html | 18 ++++++---
 src/Umbraco.Web.UI/Umbraco/config/lang/da.xml |  3 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml |  3 +-
 .../Umbraco/config/lang/en_us.xml             |  3 +-
 7 files changed, 62 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/events/events.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/events/events.directive.js
index 15e74bbd90..53aa7475c4 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/events/events.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/events/events.directive.js
@@ -233,4 +233,41 @@ angular.module('umbraco.directives')
                 });
             }
         };
+    })
+    
+    // A slightly modified version of https://github.com/myplanet/angular-deep-blur/blob/master/angular-deep-blur.js - Kudos to Ufuk Kayserilioglu (paracycle)
+    .directive('deepBlur', function ($timeout) {
+        return {
+
+            restrict: 'A',
+
+            controller: function ($scope, $element, $attrs) {
+                var leaveExpr = $attrs.deepBlur,
+                    dom = $element[0];
+
+                function containsDom(parent, dom) {
+                    while (dom) {
+                        if (dom === parent) {
+                            return true;
+                        }
+                        dom = dom.parentNode;
+                    }
+                    return false;
+                }
+
+                function onBlur(e) {
+                    var targetElement = e.relatedTarget;
+
+                    if (!containsDom(dom, targetElement)) {
+                        $timeout(function () {
+                            $scope.$apply(leaveExpr);
+                        }, 10);
+                    }
+                }
+
+                dom.addEventListener('blur', onBlur, true);
+            }
+        };
     });
+
+    
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umblayoutselector.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umblayoutselector.directive.js
index 58a5e1be0e..7453353018 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umblayoutselector.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umblayoutselector.directive.js
@@ -24,6 +24,7 @@
         vm.showLayoutSelector = true;
         vm.pickLayout = pickLayout;
         vm.toggleLayoutDropdown = toggleLayoutDropdown;
+        vm.leaveLayoutDropdown = leaveLayoutDropdown;
         vm.closeLayoutDropdown = closeLayoutDropdown;
 
         function onInit() {
@@ -38,6 +39,10 @@
             vm.layoutDropDownIsOpen = !vm.layoutDropDownIsOpen;
         }
 
+        function leaveLayoutDropdown() {
+            vm.layoutDropDownIsOpen = false;
+        }
+
         function pickLayout(selectedLayout) {
             if (vm.onLayoutSelect) {
                 vm.onLayoutSelect({ layout: selectedLayout });
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-layout-selector.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-layout-selector.less
index cf407b667f..cdc6cfcb63 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-layout-selector.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-layout-selector.less
@@ -4,6 +4,7 @@
 }
 
 .umb-layout-selector__active-layout {
+   background: transparent;
    box-sizing: border-box;
    border: 1px solid @inputBorder;
    cursor: pointer;
@@ -33,6 +34,7 @@
 }
 
 .umb-layout-selector__dropdown-item {
+   background: transparent;
    padding: 5px;
    margin: 3px 5px;
    display: flex;
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-layout-selector.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-layout-selector.html
index c84e63a359..c6c841f8b1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-layout-selector.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-layout-selector.html
@@ -1,20 +1,26 @@
 <div class="umb-layout-selector" ng-show="vm.showLayoutSelector">
 
-   <div class="umb-layout-selector__active-layout" ng-click="vm.toggleLayoutDropdown()">
-      <i class="{{ vm.activeLayout.icon }}"></i>
-   </div>
+   <button type="button" aria-expanded="{{vm.layoutDropDownIsOpen}}" class="umb-layout-selector__active-layout" ng-click="vm.toggleLayoutDropdown()" prevent-default>
+      <i class="{{ vm.activeLayout.icon }}" aria-hidden="true"></i>
+      <span class="sr-only">
+          <localize key="visuallyHiddenTexts_activeListLayout">Active layout:</localize>&nbsp;
+          {{vm.activeLayout.name}}
+      </span>
+   </button>
 
    <div ng-if="vm.layoutDropDownIsOpen"
         class="umb-layout-selector__dropdown shadow-depth-3 animated -half-second fadeIn"
-        on-outside-click="vm.closeLayoutDropdown()">
+        on-outside-click="vm.closeLayoutDropdown()"
+        deep-blur="vm.leaveLayoutDropdown()">
 
-       <div ng-repeat="layout in vm.layouts | filter:{selected:true} track by $id(layout)"
+       <button type="button" prevent-default ng-repeat="layout in vm.layouts | filter:{selected:true} track by $id(layout)"
             class="umb-layout-selector__dropdown-item"
             ng-click="vm.pickLayout(layout)"
             ng-class="{'-active': layout.active }"
             ng-attr-title="{{layout.name}}">
 
-           <i class="{{ layout.icon }} umb-layout-selector__dropdown-item-icon"></i>
+           <i class="{{ layout.icon }} umb-layout-selector__dropdown-item-icon" aria-hidden="true"></i>
+           <span class="sr-only">{{layout.name}}</span>
        </div>
 
    </div>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index 8d4226fe36..0e43d4217e 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -1613,6 +1613,7 @@ Mange hilsner fra Umbraco robotten
     <key alias="formsInstall">Installer Umbraco Forms</key>
   </area>
   <area alias="visuallyHiddenTexts">
-    <key alias="goBack">Gå tilbage</key>
+    <key alias="goBack">Gå tilbage</key>
+    <key alias="activeListLayout">Aktivt layout:</key>
   </area>
 </language>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index a8114faf93..41c77d0c39 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -2131,6 +2131,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="formsInstall">Install Umbraco Forms</key>
   </area>
   <area alias="visuallyHiddenTexts">
-    <key alias="goBack">Go back</key>
+    <key alias="goBack">Go back</key>
+    <key alias="activeListLayout">Active layout:</key>
   </area>
 </language>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index a933b8507d..d9cea4f14c 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -2145,6 +2145,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="formsInstall">Install Umbraco Forms</key>
   </area>
   <area alias="visuallyHiddenTexts">
-    <key alias="goBack">Go back</key>
+    <key alias="goBack">Go back</key>
+    <key alias="activeListLayout">Active layout:</key>
   </area>
 </language>

From e1a438dfc9183737d502d9d53a9c3979220807ad Mon Sep 17 00:00:00 2001
From: Jan Skovgaard <jaskov@gmail.com>
Date: Thu, 5 Sep 2019 12:29:25 +0200
Subject: [PATCH 466/776] Accessibility: Grid filter drop down can't be
 accessed via keyboard (#5963)

(cherry picked from commit 4b344ac3fdde5801074a1539f83b5e6adfcc51cf)

# Conflicts:
#	src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
---
 .../components/events/events.directive.js     | 37 +++++++++++++++++++
 .../components/umblayoutselector.directive.js |  5 +++
 .../less/components/umb-layout-selector.less  |  2 +
 .../views/components/umb-layout-selector.html | 18 ++++++---
 src/Umbraco.Web.UI/Umbraco/config/lang/da.xml |  6 ++-
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml |  6 ++-
 .../Umbraco/config/lang/en_us.xml             |  6 ++-
 7 files changed, 71 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/events/events.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/events/events.directive.js
index 15e74bbd90..53aa7475c4 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/events/events.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/events/events.directive.js
@@ -233,4 +233,41 @@ angular.module('umbraco.directives')
                 });
             }
         };
+    })
+    
+    // A slightly modified version of https://github.com/myplanet/angular-deep-blur/blob/master/angular-deep-blur.js - Kudos to Ufuk Kayserilioglu (paracycle)
+    .directive('deepBlur', function ($timeout) {
+        return {
+
+            restrict: 'A',
+
+            controller: function ($scope, $element, $attrs) {
+                var leaveExpr = $attrs.deepBlur,
+                    dom = $element[0];
+
+                function containsDom(parent, dom) {
+                    while (dom) {
+                        if (dom === parent) {
+                            return true;
+                        }
+                        dom = dom.parentNode;
+                    }
+                    return false;
+                }
+
+                function onBlur(e) {
+                    var targetElement = e.relatedTarget;
+
+                    if (!containsDom(dom, targetElement)) {
+                        $timeout(function () {
+                            $scope.$apply(leaveExpr);
+                        }, 10);
+                    }
+                }
+
+                dom.addEventListener('blur', onBlur, true);
+            }
+        };
     });
+
+    
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umblayoutselector.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umblayoutselector.directive.js
index 58a5e1be0e..7453353018 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umblayoutselector.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umblayoutselector.directive.js
@@ -24,6 +24,7 @@
         vm.showLayoutSelector = true;
         vm.pickLayout = pickLayout;
         vm.toggleLayoutDropdown = toggleLayoutDropdown;
+        vm.leaveLayoutDropdown = leaveLayoutDropdown;
         vm.closeLayoutDropdown = closeLayoutDropdown;
 
         function onInit() {
@@ -38,6 +39,10 @@
             vm.layoutDropDownIsOpen = !vm.layoutDropDownIsOpen;
         }
 
+        function leaveLayoutDropdown() {
+            vm.layoutDropDownIsOpen = false;
+        }
+
         function pickLayout(selectedLayout) {
             if (vm.onLayoutSelect) {
                 vm.onLayoutSelect({ layout: selectedLayout });
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-layout-selector.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-layout-selector.less
index cf407b667f..cdc6cfcb63 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-layout-selector.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-layout-selector.less
@@ -4,6 +4,7 @@
 }
 
 .umb-layout-selector__active-layout {
+   background: transparent;
    box-sizing: border-box;
    border: 1px solid @inputBorder;
    cursor: pointer;
@@ -33,6 +34,7 @@
 }
 
 .umb-layout-selector__dropdown-item {
+   background: transparent;
    padding: 5px;
    margin: 3px 5px;
    display: flex;
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-layout-selector.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-layout-selector.html
index c84e63a359..c6c841f8b1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-layout-selector.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-layout-selector.html
@@ -1,20 +1,26 @@
 <div class="umb-layout-selector" ng-show="vm.showLayoutSelector">
 
-   <div class="umb-layout-selector__active-layout" ng-click="vm.toggleLayoutDropdown()">
-      <i class="{{ vm.activeLayout.icon }}"></i>
-   </div>
+   <button type="button" aria-expanded="{{vm.layoutDropDownIsOpen}}" class="umb-layout-selector__active-layout" ng-click="vm.toggleLayoutDropdown()" prevent-default>
+      <i class="{{ vm.activeLayout.icon }}" aria-hidden="true"></i>
+      <span class="sr-only">
+          <localize key="visuallyHiddenTexts_activeListLayout">Active layout:</localize>&nbsp;
+          {{vm.activeLayout.name}}
+      </span>
+   </button>
 
    <div ng-if="vm.layoutDropDownIsOpen"
         class="umb-layout-selector__dropdown shadow-depth-3 animated -half-second fadeIn"
-        on-outside-click="vm.closeLayoutDropdown()">
+        on-outside-click="vm.closeLayoutDropdown()"
+        deep-blur="vm.leaveLayoutDropdown()">
 
-       <div ng-repeat="layout in vm.layouts | filter:{selected:true} track by $id(layout)"
+       <button type="button" prevent-default ng-repeat="layout in vm.layouts | filter:{selected:true} track by $id(layout)"
             class="umb-layout-selector__dropdown-item"
             ng-click="vm.pickLayout(layout)"
             ng-class="{'-active': layout.active }"
             ng-attr-title="{{layout.name}}">
 
-           <i class="{{ layout.icon }} umb-layout-selector__dropdown-item-icon"></i>
+           <i class="{{ layout.icon }} umb-layout-selector__dropdown-item-icon" aria-hidden="true"></i>
+           <span class="sr-only">{{layout.name}}</span>
        </div>
 
    </div>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index 5ae084bc06..b16fea3301 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -1610,5 +1610,9 @@ Mange hilsner fra Umbraco robotten
     <key alias="settingsProfiler">Profiling</key>
     <key alias="memberIntro">Kom godt i gang</key>
     <key alias="formsInstall">Installer Umbraco Forms</key>
-  </area>
+  </area>
+  <area alias="visuallyHiddenTexts">
+    <key alias="goBack">Gå tilbage</key>
+    <key alias="activeListLayout">Aktivt layout:</key>
+  </area>  
 </language>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index fc8a6cf213..df23ce9204 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -2128,5 +2128,9 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="settingsProfiler">Profiling</key>
     <key alias="memberIntro">Getting Started</key>
     <key alias="formsInstall">Install Umbraco Forms</key>
-  </area>>
+  </area>
+  <area alias="visuallyHiddenTexts">
+    <key alias="goBack">Go back</key>
+    <key alias="activeListLayout">Active layout:</key>
+  </area>  
 </language>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index 13ec6f8135..c4e07f18ca 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -2142,5 +2142,9 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="settingsProfiler">Profiling</key>
     <key alias="memberIntro">Getting Started</key>
     <key alias="formsInstall">Install Umbraco Forms</key>
-  </area>
+  </area>
+  <area alias="visuallyHiddenTexts">
+    <key alias="goBack">Go back</key>
+    <key alias="activeListLayout">Active layout:</key>
+  </area>  
 </language>

From b94d78e01a88435a1f5b0ecb49f9bf50c05e0d85 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 5 Sep 2019 13:01:05 +0200
Subject: [PATCH 467/776] Revert "Accessibility: Grid filter drop down can't be
 accessed via keyboard (#5963)"

This reverts commit e1a438dfc9183737d502d9d53a9c3979220807ad.

Should not have been picked into a patch release :)
---
 .../components/events/events.directive.js     | 37 -------------------
 .../components/umblayoutselector.directive.js |  5 ---
 .../less/components/umb-layout-selector.less  |  2 -
 .../views/components/umb-layout-selector.html | 18 +++------
 src/Umbraco.Web.UI/Umbraco/config/lang/da.xml |  6 +--
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml |  6 +--
 .../Umbraco/config/lang/en_us.xml             |  6 +--
 7 files changed, 9 insertions(+), 71 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/events/events.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/events/events.directive.js
index 53aa7475c4..15e74bbd90 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/events/events.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/events/events.directive.js
@@ -233,41 +233,4 @@ angular.module('umbraco.directives')
                 });
             }
         };
-    })
-    
-    // A slightly modified version of https://github.com/myplanet/angular-deep-blur/blob/master/angular-deep-blur.js - Kudos to Ufuk Kayserilioglu (paracycle)
-    .directive('deepBlur', function ($timeout) {
-        return {
-
-            restrict: 'A',
-
-            controller: function ($scope, $element, $attrs) {
-                var leaveExpr = $attrs.deepBlur,
-                    dom = $element[0];
-
-                function containsDom(parent, dom) {
-                    while (dom) {
-                        if (dom === parent) {
-                            return true;
-                        }
-                        dom = dom.parentNode;
-                    }
-                    return false;
-                }
-
-                function onBlur(e) {
-                    var targetElement = e.relatedTarget;
-
-                    if (!containsDom(dom, targetElement)) {
-                        $timeout(function () {
-                            $scope.$apply(leaveExpr);
-                        }, 10);
-                    }
-                }
-
-                dom.addEventListener('blur', onBlur, true);
-            }
-        };
     });
-
-    
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umblayoutselector.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umblayoutselector.directive.js
index 7453353018..58a5e1be0e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umblayoutselector.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umblayoutselector.directive.js
@@ -24,7 +24,6 @@
         vm.showLayoutSelector = true;
         vm.pickLayout = pickLayout;
         vm.toggleLayoutDropdown = toggleLayoutDropdown;
-        vm.leaveLayoutDropdown = leaveLayoutDropdown;
         vm.closeLayoutDropdown = closeLayoutDropdown;
 
         function onInit() {
@@ -39,10 +38,6 @@
             vm.layoutDropDownIsOpen = !vm.layoutDropDownIsOpen;
         }
 
-        function leaveLayoutDropdown() {
-            vm.layoutDropDownIsOpen = false;
-        }
-
         function pickLayout(selectedLayout) {
             if (vm.onLayoutSelect) {
                 vm.onLayoutSelect({ layout: selectedLayout });
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-layout-selector.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-layout-selector.less
index cdc6cfcb63..cf407b667f 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-layout-selector.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-layout-selector.less
@@ -4,7 +4,6 @@
 }
 
 .umb-layout-selector__active-layout {
-   background: transparent;
    box-sizing: border-box;
    border: 1px solid @inputBorder;
    cursor: pointer;
@@ -34,7 +33,6 @@
 }
 
 .umb-layout-selector__dropdown-item {
-   background: transparent;
    padding: 5px;
    margin: 3px 5px;
    display: flex;
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-layout-selector.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-layout-selector.html
index c6c841f8b1..c84e63a359 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-layout-selector.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-layout-selector.html
@@ -1,26 +1,20 @@
 <div class="umb-layout-selector" ng-show="vm.showLayoutSelector">
 
-   <button type="button" aria-expanded="{{vm.layoutDropDownIsOpen}}" class="umb-layout-selector__active-layout" ng-click="vm.toggleLayoutDropdown()" prevent-default>
-      <i class="{{ vm.activeLayout.icon }}" aria-hidden="true"></i>
-      <span class="sr-only">
-          <localize key="visuallyHiddenTexts_activeListLayout">Active layout:</localize>&nbsp;
-          {{vm.activeLayout.name}}
-      </span>
-   </button>
+   <div class="umb-layout-selector__active-layout" ng-click="vm.toggleLayoutDropdown()">
+      <i class="{{ vm.activeLayout.icon }}"></i>
+   </div>
 
    <div ng-if="vm.layoutDropDownIsOpen"
         class="umb-layout-selector__dropdown shadow-depth-3 animated -half-second fadeIn"
-        on-outside-click="vm.closeLayoutDropdown()"
-        deep-blur="vm.leaveLayoutDropdown()">
+        on-outside-click="vm.closeLayoutDropdown()">
 
-       <button type="button" prevent-default ng-repeat="layout in vm.layouts | filter:{selected:true} track by $id(layout)"
+       <div ng-repeat="layout in vm.layouts | filter:{selected:true} track by $id(layout)"
             class="umb-layout-selector__dropdown-item"
             ng-click="vm.pickLayout(layout)"
             ng-class="{'-active': layout.active }"
             ng-attr-title="{{layout.name}}">
 
-           <i class="{{ layout.icon }} umb-layout-selector__dropdown-item-icon" aria-hidden="true"></i>
-           <span class="sr-only">{{layout.name}}</span>
+           <i class="{{ layout.icon }} umb-layout-selector__dropdown-item-icon"></i>
        </div>
 
    </div>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index b16fea3301..5ae084bc06 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -1610,9 +1610,5 @@ Mange hilsner fra Umbraco robotten
     <key alias="settingsProfiler">Profiling</key>
     <key alias="memberIntro">Kom godt i gang</key>
     <key alias="formsInstall">Installer Umbraco Forms</key>
-  </area>
-  <area alias="visuallyHiddenTexts">
-    <key alias="goBack">Gå tilbage</key>
-    <key alias="activeListLayout">Aktivt layout:</key>
-  </area>  
+  </area>
 </language>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index df23ce9204..fc8a6cf213 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -2128,9 +2128,5 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="settingsProfiler">Profiling</key>
     <key alias="memberIntro">Getting Started</key>
     <key alias="formsInstall">Install Umbraco Forms</key>
-  </area>
-  <area alias="visuallyHiddenTexts">
-    <key alias="goBack">Go back</key>
-    <key alias="activeListLayout">Active layout:</key>
-  </area>  
+  </area>>
 </language>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index c4e07f18ca..13ec6f8135 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -2142,9 +2142,5 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="settingsProfiler">Profiling</key>
     <key alias="memberIntro">Getting Started</key>
     <key alias="formsInstall">Install Umbraco Forms</key>
-  </area>
-  <area alias="visuallyHiddenTexts">
-    <key alias="goBack">Go back</key>
-    <key alias="activeListLayout">Active layout:</key>
-  </area>  
+  </area>
 </language>

From 428da6ce1331af62353613366a956335d32222a2 Mon Sep 17 00:00:00 2001
From: Jan Skovgaard <jaskov@gmail.com>
Date: Thu, 5 Sep 2019 13:41:21 +0200
Subject: [PATCH 468/776] Accessibility: Create drop down can't be accessed via
 keyboard (#5960)

---
 .../lib/bootstrap/less/dropdowns.less         |  2 +
 .../lib/bootstrap/less/sprites.less           |  4 ++
 .../src/less/canvas-designer.less             | 10 ++-
 .../components/buttons/umb-button-group.less  |  3 +-
 src/Umbraco.Web.UI.Client/src/less/navs.less  | 22 +++++-
 .../listview/listview.controller.js           | 14 +++-
 .../propertyeditors/listview/listview.html    | 72 +++++++++++--------
 7 files changed, 91 insertions(+), 36 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/dropdowns.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/dropdowns.less
index 7707e04feb..94f229a191 100644
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/dropdowns.less
+++ b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/dropdowns.less
@@ -80,6 +80,8 @@
 // -----------
 .dropdown-menu > li > a:hover,
 .dropdown-menu > li > a:focus,
+.dropdown-menu > li > button:hover,
+.dropdown-menu > li > button:focus,
 .dropdown-submenu:hover > a,
 .dropdown-submenu:focus > a {
   text-decoration: none;
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/sprites.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/sprites.less
index d73e23f5ea..dd60f10cee 100644
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/sprites.less
+++ b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/sprites.less
@@ -39,6 +39,10 @@
 .dropdown-menu > li > a:focus > [class^="icon-"],
 .dropdown-menu > li > a:hover > [class*=" icon-"],
 .dropdown-menu > li > a:focus > [class*=" icon-"],
+.dropdown-menu > li > button:hover > [class^="icon-"],
+.dropdown-menu > li > button:focus > [class^="icon-"],
+.dropdown-menu > li > button:hover > [class*=" icon-"],
+.dropdown-menu > li > button:focus > [class*=" icon-"],
 .dropdown-menu > .active > a > [class^="icon-"],
 .dropdown-menu > .active > a > [class*=" icon-"],
 .dropdown-submenu:hover > a > [class^="icon-"],
diff --git a/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less b/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less
index 7440a5723a..4db2e434d2 100644
--- a/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less
+++ b/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less
@@ -163,7 +163,8 @@ a, a:hover{
     background-clip: padding-box;
 }
 
-.dropdown-menu > li > a {
+.dropdown-menu > li > a,
+.dropdown-menu > li > button {
     display: block;
     padding: 3px 20px;
     clear: both;
@@ -174,7 +175,12 @@ a, a:hover{
     cursor:pointer;
 }
 
-.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus, .dropdown-submenu:hover > a, .dropdown-submenu:focus > a {
+.dropdown-menu > li > a:hover, 
+.dropdown-menu > li > a:focus, 
+.dropdown-menu > li > button:hover, 
+.dropdown-menu > li > button:focus, 
+.dropdown-submenu:hover > a, 
+.dropdown-submenu:focus > a {
     color: #000000;
     background: #e4e0dd;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button-group.less b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button-group.less
index e40282cb58..0465881387 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button-group.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button-group.less
@@ -9,6 +9,7 @@
    left: auto;
 }
 
+.umb-button-group__sub-buttons>li>button,
 .umb-button-group__sub-buttons>li>a {
     display: flex;
 }
@@ -20,7 +21,7 @@
     }
 
     .umb-button-group__toggle {
-        border-radius: 0px @baseBorderRadius @baseBorderRadius 0;
+        border-radius: 0 @baseBorderRadius @baseBorderRadius 0;
         border-left: 1px solid rgba(0,0,0,0.09);
         margin-left: -2px;
         padding-left: 10px;
diff --git a/src/Umbraco.Web.UI.Client/src/less/navs.less b/src/Umbraco.Web.UI.Client/src/less/navs.less
index a2710fab6c..5b97464e31 100644
--- a/src/Umbraco.Web.UI.Client/src/less/navs.less
+++ b/src/Umbraco.Web.UI.Client/src/less/navs.less
@@ -237,7 +237,27 @@
     color: @ui-option-type;
 }
 
-.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus, .dropdown-submenu:hover > a, .dropdown-submenu:focus > a {
+.dropdown-menu > li > button {
+  background: transparent;
+  border: 0;
+  padding: 8px 20px;
+  color: @ui-option-type;
+  display: block;
+  clear: both;
+  font-weight: normal;
+  line-height: 20px;
+  white-space: nowrap;
+  cursor:pointer;
+  width: 100%;
+  text-align: left;
+}
+
+.dropdown-menu > li > a:hover, 
+.dropdown-menu > li > a:focus, 
+.dropdown-menu > li > button:hover, 
+.dropdown-menu > li > button:focus, 
+.dropdown-submenu:hover > a, 
+.dropdown-submenu:focus > a {
     color: @ui-option-type-hover;
     background: @ui-option-hover;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
index 2fbd2b0a32..ce0815c640 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
@@ -53,7 +53,9 @@ function listViewController($scope, $routeParams, $injector, $timeout, currentUs
     $scope.actionInProgress = false;
     $scope.selection = [];
     $scope.folders = [];
-    $scope.page = {};
+    $scope.page = {
+        createDropdownOpen: false
+    };
     $scope.listViewResultSet = {
         totalPages: 0,
         items: []
@@ -795,8 +797,18 @@ function listViewController($scope, $routeParams, $injector, $timeout, currentUs
             .search("blueprintId", blueprintId);
     }
 
+    function toggleDropdown () {
+        $scope.page.createDropdownOpen = !$scope.page.createDropdownOpen;
+    }
+
+    function leaveDropdown () {
+        $scope.page.createDropdownOpen = false;
+    }
+
     $scope.createBlank = createBlank;
     $scope.createFromBlueprint = createFromBlueprint;
+    $scope.toggleDropdown = toggleDropdown;
+    $scope.leaveDropdown = leaveDropdown;
 
     //GO!
     initView();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
index 0770081aba..304f3f3fbc 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
@@ -12,57 +12,68 @@
 
                <umb-editor-sub-header-section ng-if="(listViewAllowedTypes && listViewAllowedTypes.length > 0 && (selection.length == 0)) && (currentNodePermissions == null || currentNodePermissions.canCreate)">
 
+                    <!-- Renders when it's only possible to create one specific document type for, which no blueprint exists-->
                    <div class="btn-group" ng-show="createAllowedButtonSingle">
-                       <a class="btn btn-white" ng-click="createBlank(entityType,listViewAllowedTypes[0].alias)">
+                       <button type="button" class="btn btn-white" ng-click="createBlank(entityType,listViewAllowedTypes[0].alias)" prevent-default>
                            <localize key="actions_create">Create</localize> {{listViewAllowedTypes[0].name}}
-                       </a>
+                       </button>
                    </div>
 
-                   <div class="btn-group" ng-show="createAllowedButtonSingleWithBlueprints">
-                       <a class="btn btn-white dropdown-toggle" data-toggle="dropdown" ng-href="">
-                           <span ng-click="createBlank(entityType,listViewAllowedTypes[0].alias)">
+                   <!-- Renders when it's only possible to create one specific document type for which a blueprint exits-->
+                   <div class="btn-group" ng-show="createAllowedButtonSingleWithBlueprints" deep-blur="leaveDropdown()">
+                       <button type="button" class="btn btn-white dropdown-toggle" aria-expanded="{{page.createDropdownOpen}}" data-toggle="dropdown" ng-click="toggleDropdown()" prevent-default>
+                           <span>
                                <localize key="actions_create">Create</localize> {{listViewAllowedTypes[0].name}}
                            </span>
-                           <span class="caret" ng-click="page.createDropdownOpen = !page.createDropdownOpen"></span>
-                       </a>
-
-                       <umb-dropdown ng-if="page.createDropdownOpen" on-close="page.createDropdownOpen = false">
-                           <umb-dropdown-item ng-repeat="blueprint in listViewAllowedTypes[0].blueprints | orderBy:'name':false track by $index">
-                               <a ng-click="createFromBlueprint(entityType, listViewAllowedTypes[0].alias, blueprint.id)">
-                                   <i class="{{::listViewAllowedTypes[0].icon}}"></i>
-                                   {{::blueprint.name}}
-                               </a>
-                           </umb-dropdown-item>
-                       </umb-dropdown>
-                   </div>
-
-                   <div class="btn-group" ng-show="createAllowedButtonMultiWithBlueprints">
-                       <a class="btn btn-white dropdown-toggle" data-toggle="dropdown" ng-href="" ng-click="page.createDropdownOpen = !page.createDropdownOpen">
-                           <localize key="actions_create">Create</localize>
                            <span class="caret"></span>
-                       </a>
+                        </button>
+
 
                        <umb-dropdown ng-if="page.createDropdownOpen" on-close="page.createDropdownOpen = false">
                            <umb-dropdown-item ng-repeat="contentType in listViewAllowedTypes track by contentType.key | orderBy:'name':false">
-                               <a ng-click="createBlank(entityType,contentType.alias)" prevent-default ng-href="">
-                                   <i class="{{::contentType.icon}}"></i>
+                                <button type="button" ng-click="createBlank(entityType,contentType.alias)" prevent-default>
+                                    <i class="{{::contentType.icon}}" aria-hidden="true"></i>
+                                    {{::contentType.name}} <span ng-show="contentType.blueprints" style="text-transform: lowercase;">(<localize key="blueprints_blankBlueprint">blank</localize>)</span>
+                                </button>
+
+                                <button type="button" ng-repeat="blueprint in contentType.blueprints track by blueprint.id | orderBy:'name':false" ng-click="createFromBlueprint(entityType, contentType.alias, blueprint.id)" prevent-default>
+                                    &nbsp;&nbsp;<i class="{{::contentType.icon}}" aria-hidden="true"></i>
+                                    {{::blueprint.name}}
+                                </button>
+                            </umb-dropdown-item>
+                       </umb-dropdown>
+                   </div>
+
+                   <!-- Renders when it's possible to create multiple document types and blueprints for one or more of the document types-->
+                   <div class="btn-group" ng-show="createAllowedButtonMultiWithBlueprints" deep-blur="leaveDropdown()">
+                       <button type="button" class="btn btn-white dropdown-toggle" aria-expanded="{{page.createDropdownOpen === undefined ? false : page.createDropdownOpen}}" data-toggle="dropdown" ng-click="toggleDropdown()">
+                           <localize key="actions_create">Create</localize>
+                           <span class="caret" aria-hidden="true"></span>
+                       </button>
+                       
+                       <umb-dropdown ng-if="page.createDropdownOpen" on-close="page.createDropdownOpen = false">
+                           <umb-dropdown-item ng-repeat="contentType in listViewAllowedTypes track by contentType.key | orderBy:'name':false">
+                               <button type="button" ng-click="createBlank(entityType,contentType.alias)" prevent-default>
+                                   <i class="{{::contentType.icon}}" aria-hidden="true"></i>
                                    {{::contentType.name}} <span ng-show="contentType.blueprints" style="text-transform: lowercase;">(<localize key="blueprints_blankBlueprint">blank</localize>)</span>
-                               </a>
-                               <a href="" ng-repeat="blueprint in contentType.blueprints | orderBy:'name':false" ng-click="createFromBlueprint(entityType, contentType.alias, blueprint.id)" prevent-default>
-                                   &nbsp;&nbsp;<i class="{{::contentType.icon}}"></i>
+                               </button>
+
+
+                               <button type="button" ng-repeat="blueprint in contentType.blueprints track by blueprint.id | orderBy:'name':false" ng-click="createFromBlueprint(entityType, contentType.alias, blueprint.id)" prevent-default>
+                                   &nbsp;&nbsp;<i class="{{::contentType.icon}}" aria-hidden="true"></i>
                                    {{::blueprint.name}}
-                               </a>
+                               </button>
                            </umb-dropdown-item>
                        </umb-dropdown>
                    </div>
 
                    <ul class="umb-actions umb-actions-child">
 
-                       <li ng-repeat="blueprint in docType.blueprints | orderBy:'name':false">
+                       <li ng-repeat="blueprint in docType.blueprints track by blueprint.id | orderBy:'name':false">
                            <a ng-click="createFromBlueprint(blueprint.id)">
                                <i class="large {{docType.icon}}"></i>
                                <span class="menu-label">
-                                   {{blueprint.name}}
+                                   {{blueprint.name}}&nbsp;
                                </span>
                            </a>
                        </li>
@@ -96,7 +107,6 @@
                    <strong ng-show="actionInProgress" ng-bind="bulkStatus"></strong>
 
                    <umb-loader position="bottom" ng-show="actionInProgress"></umb-loader>
-
                </umb-editor-sub-header-section>
 
            </umb-editor-sub-header-content-left>

From 626c6ba8b00d9bd51a1ece4721b760d2e71946dd Mon Sep 17 00:00:00 2001
From: Jan Skovgaard <jaskov@gmail.com>
Date: Thu, 5 Sep 2019 13:45:53 +0200
Subject: [PATCH 469/776] Accessibility: Health Check - unable to navigate to
 additional options via keyboard (#5928)

---
 .../src/less/dashboards/healthcheck.less      |  9 ++-
 .../views/dashboard/settings/healthcheck.html | 64 +++++++++----------
 2 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/dashboards/healthcheck.less b/src/Umbraco.Web.UI.Client/src/less/dashboards/healthcheck.less
index 449cc4066b..b3af476406 100644
--- a/src/Umbraco.Web.UI.Client/src/less/dashboards/healthcheck.less
+++ b/src/Umbraco.Web.UI.Client/src/less/dashboards/healthcheck.less
@@ -22,15 +22,18 @@
 .umb-healthcheck-group {
 	display: flex;
 	flex-wrap: wrap;
-	flex-direction: column;
-	background: @white;
+    flex-direction: column;
+    align-items: center;
+    background: @white;
+    border: 0;
 	border-radius: 3px;
 	padding: 20px;
 	box-sizing: border-box;
 	text-align: center;
 	box-shadow: 0 1px 1px 0 rgba(0,0,0,0.16);
 	height: 100%;
-	box-sizing: border-box;
+    box-sizing: border-box;
+    width: 100%;
 }
 
 .umb-healthcheck-group:hover {
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/healthcheck.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/healthcheck.html
index 1f81bfc6e2..67d8562f7e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/healthcheck.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/healthcheck.html
@@ -1,19 +1,19 @@
 <div ng-controller="Umbraco.Dashboard.HealthCheckController as vm">
 
     <div ng-if="vm.viewState === 'list'">
-        
+
         <umb-box>
             <umb-box-content>
                 <div class="flex justify-between items-center">
                     <h3 class="bold">Health Check</h3>
                     <umb-button
                         type="button"
-                        button-style="success" 
+                        button-style="success"
                         label="Check All Groups"
                         action="vm.checkAllGroups(vm.groups)">
                     </umb-button>
                 </div>
-        
+
                 <div class="umb-healthcheck-help-text">
                     <p>The health checker evaluates various areas of your site for best practice settings, configuration, potential problems, etc. You can easily fix problems by pressing a button.
                     You can add your own health checks, have a look at <a href="https://our.umbraco.com/documentation/Extending/Healthcheck/" target="_blank" class="btn-link -underline">the documentation for more information</a> about custom health checks.</p>
@@ -23,40 +23,40 @@
 
         <div class="umb-healthcheck">
 
-            <div class="umb-air" ng-repeat="group in vm.groups" ng-click="vm.openGroup(group);">
-                <div class="umb-healthcheck-group">
+            <div class="umb-air" ng-repeat="group in vm.groups">
+                <button type="button" class="umb-healthcheck-group" ng-click="vm.openGroup(group);">
 
-                    <div class="umb-healthcheck-title">{{group.name}}</div>
+                        <div class="umb-healthcheck-title">{{group.name}}</div>
 
-                    <div class="umb-healthcheck-group__load-container" ng-if="group.loading">
-                        <umb-load-indicator></umb-load-indicator>
-                    </div>
-
-                    <div class="umb-healthcheck-messages" ng-hide="group.loading || !group.totalSuccess && !group.totalWarning && !group.totalError && !group.totalInfo">
-
-                        <div class="umb-healthcheck-message" ng-if="group.totalSuccess > 0">
-                            <i class="icon-check color-green"></i>
-                            {{ group.totalSuccess }}
+                        <div class="umb-healthcheck-group__load-container" ng-if="group.loading">
+                            <umb-load-indicator></umb-load-indicator>
                         </div>
 
-                        <div class="umb-healthcheck-message" ng-if="group.totalWarning > 0">
-                            <i class="icon-alert color-orange"></i>
-                            {{ group.totalWarning }}
+                        <div class="umb-healthcheck-messages" ng-hide="group.loading || !group.totalSuccess && !group.totalWarning && !group.totalError && !group.totalInfo">
+
+                            <div class="umb-healthcheck-message" ng-if="group.totalSuccess > 0">
+                                <i class="icon-check color-green" aria-hidden="true"></i>
+                                {{ group.totalSuccess }}
+                            </div>
+
+                            <div class="umb-healthcheck-message" ng-if="group.totalWarning > 0">
+                                <i class="icon-alert color-orange" aria-hidden="true"></i>
+                                {{ group.totalWarning }}
+                            </div>
+
+                            <div class="umb-healthcheck-message" ng-if="group.totalError > 0">
+                                <i class="icon-delete color-red" aria-hidden="true"></i>
+                                {{ group.totalError }}
+                            </div>
+
+                            <div class="umb-healthcheck-message" ng-if="group.totalInfo > 0">
+                                <i class="umb-healthcheck-status-icon icon-info" aria-hidden="true"></i>
+                                {{ group.totalInfo }}
+                            </div>
+
                         </div>
 
-                        <div class="umb-healthcheck-message" ng-if="group.totalError > 0">
-                            <i class="icon-delete color-red"></i>
-                            {{ group.totalError }}
-                        </div>
-
-                        <div class="umb-healthcheck-message" ng-if="group.totalInfo > 0">
-                            <i class="umb-healthcheck-status-icon icon-info"></i>
-                            {{ group.totalInfo }}
-                        </div>
-
-                    </div>
-
-                </div>
+                </button>
             </div>
 
         </div>
@@ -79,7 +79,7 @@
                 <div class="umb-panel-group__details-group-title">
                     <div class="umb-panel-group__details-group-name">{{ vm.selectedGroup.name }}</div>
                     <umb-button
-                        type="button" 
+                        type="button"
                         action="vm.checkAllInGroup(vm.selectedGroup, vm.selectedGroup.checks)"
                         label="Check group">
                     </umb-button>

From ce0712e464c323dd8832d00414d36f3f0c24c35d Mon Sep 17 00:00:00 2001
From: Rachel Breeze <Rachel.Breeze@corp.sigmauk>
Date: Sun, 14 Jul 2019 16:49:13 +0100
Subject: [PATCH 470/776] Added support for setting the page title

---
 .../application/umblogin.directive.js         | 31 +++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js
index 7fb75c45e6..19ebe448e0 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js
@@ -13,7 +13,7 @@
             }
         });
 
-    function UmbLoginController($scope, $location, currentUserResource, formHelper, mediaHelper, umbRequestHelper, Upload, localizationService, userService, externalLoginInfo, resetPasswordCodeInfo, $timeout, authResource, $q) {
+    function UmbLoginController($scope, $location, currentUserResource, formHelper, mediaHelper, umbRequestHelper, Upload, localizationService, userService, externalLoginInfo, resetPasswordCodeInfo, $timeout, authResource, $q, $route) {
 
         const vm = this;
 
@@ -60,7 +60,6 @@
         vm.loginSubmit = loginSubmit;
         vm.requestPasswordResetSubmit = requestPasswordResetSubmit;
         vm.setPasswordSubmit = setPasswordSubmit;
-
         vm.labels = {};
         localizationService.localizeMany([
             vm.usernameIsEmail ? "general_email" : "general_username", 
@@ -76,6 +75,8 @@
 
             // Check if it is a new user
             const inviteVal = $location.search().invite;
+
+            vm.baseTitle = $scope.$root.locationTitle;
             //1 = enter password, 2 = password set, 3 = invalid token
             if (inviteVal && (inviteVal === "1" || inviteVal === "2")) {
 
@@ -122,6 +123,7 @@
                 vm.showLogin();
             }
 
+            SetTitle();
         }
 
         function togglePassword() {
@@ -173,6 +175,7 @@
             vm.errorMsg = "";
             resetInputValidation();
             vm.view = "login";
+            SetTitle();
         }
 
         function showRequestPasswordReset() {
@@ -180,12 +183,14 @@
             resetInputValidation();
             vm.view = "request-password-reset";
             vm.showEmailResetConfirmation = false;
+            SetTitle();
         }
 
         function showSetPassword() {
             vm.errorMsg = "";
             resetInputValidation();
             vm.view = "set-password";
+            SetTitle();
         }
 
         function loginSubmit() {
@@ -413,6 +418,7 @@
             }
             vm.twoFactor.view = viewPath;
             vm.view = "2fa-login";
+            SetTitle();
         }
 
         function resetInputValidation() {
@@ -433,7 +439,28 @@
         }
 
 
+        function SetTitle() {
+            var title = null;
+            switch (vm.view.toLowerCase()) {
+                case "login":
+                    title = "Login";
+                    break;
+                case "password-reset-code-expired":
+                case "request-password-reset":
+                    title = "Password Reset";
+                    break;
+                case "set-password":
+                    title = "Change Password";
+                    break;
+                case "2fa-login":
+                    title = "Two Factor Authentication";
+                    break;
+            } 
 
+            if (title != null) {
+                $scope.$root.locationTitle = title + " - " + vm.baseTitle;
+            }
+        }
 
     }
 

From f9dbf8646c53533fc8f869cb284f41ec84a60e64 Mon Sep 17 00:00:00 2001
From: Rachel Breeze <Rachel.Breeze@corp.sigmauk>
Date: Thu, 29 Aug 2019 20:20:12 +0100
Subject: [PATCH 471/776] First pass at set page title for content page

---
 .../components/editor/umbeditorcontentheader.directive.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js
index c82ca1481c..8668d62d4f 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js
@@ -18,18 +18,22 @@
 
             localizationService.localizeMany([
                     scope.isNew ? "placeholders_a11yCreateItem" : "placeholders_a11yEdit",
-                    "placeholders_a11yName"]
+                "placeholders_a11yName",
+                    scope.isNew?"general_new":"general_edit"]
             ).then(function (data) {
                 scope.a11yMessage = data[0];
                 scope.a11yName = data[1];
+                var title = data[2] +":";
                 if (!scope.isNew) {
                     scope.a11yMessage += " " + scope.content.name;
-
+                    title += scope.content.name;
                 } else {
                     var name = editorState.current.contentTypeName;
                     scope.a11yMessage += " " + name;
                     scope.a11yName = name + " " + scope.a11yName;
+                    title += name;
                 }
+                scope.$root.locationTitle = title + " - " + scope.$root.locationTitle ;
             });
             scope.vm = {};
             scope.vm.dropdownOpen = false;

From a68bc34207996f1a347d278955d84a3b69fa234f Mon Sep 17 00:00:00 2001
From: Rachel Breeze <Rachel.Breeze@corp.sigmauk>
Date: Mon, 8 Jul 2019 20:06:36 +0100
Subject: [PATCH 472/776] Reviewed the forgotten password screen to include
 alerts and support for screen readers

---
 .../src/views/components/application/umb-login.html       | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
index 676b2efc38..7a7d7c4dba 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
@@ -183,7 +183,7 @@
                 </div>
 
                 <div ng-show="vm.view == 'request-password-reset'">
-                    <p>
+                    <p tabindex="0">
                         <localize key="login_forgottenPasswordInstruction">An email will be sent to the address specified with a link to reset your password</localize>
                     </p>
 
@@ -198,9 +198,11 @@
                         </div>
 
                         <div class="control-group" ng-show="vm.showEmailResetConfirmation">
-                            <div class="text-info">
+                            <div class="text-info" role="alert">
+                                <p tabindex="0">
                                 <localize key="login_requestPasswordResetConfirmation">An email with password reset instructions will be sent to the specified address if it matched our records</localize>
-                            </div>
+                                    </p>
+                                </div>
                         </div>
 
                         <div class="flex justify-between items-center">

From 5def93fa327015ea05570497bfb7778b93f40005 Mon Sep 17 00:00:00 2001
From: Jan Skovgaard <jaskov@gmail.com>
Date: Thu, 5 Sep 2019 14:16:46 +0200
Subject: [PATCH 473/776] Accessibility: No alt text on any icons (#5905)

---
 .../umb-editor-navigation-item.less           | 37 ++++++++++++++++---
 .../content/umb-tabbed-content.html           |  2 +-
 .../editor/umb-editor-navigation-item.html    | 16 ++++----
 src/Umbraco.Web.UI/Umbraco/config/lang/da.xml |  4 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml |  4 +-
 .../Umbraco/config/lang/en_us.xml             |  4 +-
 6 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less
index e6b3fdbfa9..8a8032ee16 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less
@@ -2,12 +2,16 @@
     position: relative;
     display: block;
 }
+
+.umb-sub-views-nav-item__action,
 .umb-sub-views-nav-item > a {
+  background: transparent;
   text-align: center;
   cursor: pointer;
   display: block;
   padding: 4px 10px 0 10px;
   min-width: 70px;
+  border: 0 none;
   border-right: 1px solid @gray-9;
   box-sizing: border-box;
   display: flex;
@@ -19,6 +23,7 @@
   
   color: @ui-active-type;
   
+  &:focus,
   &:hover {
       color: @ui-active-type-hover !important;
   }
@@ -37,18 +42,23 @@
   }
 }
 
+.umb-sub-views-nav-item__action:focus,
+.umb-sub-views-nav-item__action:active,
 .umb-sub-views-nav-item > a:active {
   .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
 }
+.umb-sub-views-nav-item__action:focus,
 .umb-sub-views-nav-item > a:focus {
   outline: none;
 }
 
+.umb-sub-views-nav-item__action:hover,
+.umb-sub-views-nav-item__action:focus,
 .umb-sub-views-nav-item > a:hover,
 .umb-sub-views-nav-item > a:focus {
   text-decoration: none;
 }
-
+.umb-sub-views-nav-item__action.is-active,
 .umb-sub-views-nav-item > a.is-active {
     
     color: @ui-light-active-type;
@@ -59,6 +69,7 @@
     }
 }
 
+.umb-sub-views-nav-item__action.-has-error,
 .show-validation .umb-sub-views-nav-item > a.-has-error {
   color: @red;
   &::after {
@@ -114,11 +125,19 @@
     // center align horizontal
     left: 50%;
     transform: translateX(-50%);
-    
-    visibility:hidden;
     opacity: 0;
-    transition: visibility 0s 500ms, opacity 250ms 250ms;
+    transition: opacity 250ms 250ms;
 }
+
+// Currently Edge 18 does unfortunately not support :focus-within so for now we will use the "old" behavior - Support is coming with the upcoming release of Edge 76
+// See https://caniuse.com/#search=focus-within
+@supports (-ms-ime-align:auto) { 
+    .umb-sub-views-nav-item__anchor_dropdown {
+        visibility: hidden;
+        transition: visibility 0 500ms, opacity 250ms 250ms;
+    }
+}
+
 .umb-sub-views-nav-item__anchor_dropdown li a {
     border-left: 4px solid transparent;
 }
@@ -126,12 +145,20 @@
     border-left-color: @ui-selected-border;
 }
 
+.umb-sub-views-nav-item:focus-within .umb-sub-views-nav-item__anchor_dropdown,
 .umb-sub-views-nav-item:hover .umb-sub-views-nav-item__anchor_dropdown {
     visibility:visible;
     opacity: 1;
-    transition: visibility 0s 0s, opacity 20ms 0s;
+    transition: opacity 20ms 0;
 }
 
+// Currently Edge 18 does unfortunately not support :focus-within so for now we will use the "old" behavior - Support is coming with the upcoming release of Edge 76
+// See https://caniuse.com/#search=focus-within
+@supports (-ms-ime-align:auto) { 
+    .umb-sub-views-nav-item:hover .umb-sub-views-nav-item__anchor_dropdown {
+        transition: visibility 0 0, opacity 20ms 0;
+    }
+}
 
 
 // --------------------------------
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html
index b76c74149d..9cdafd82b1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html
@@ -3,7 +3,7 @@
         <div class="umb-group-panel" retrive-dom-element="registerPropertyGroup(element[0], attributes.appAnchor)" data-app-anchor="{{group.id}}" data-element="group-{{group.alias}}" ng-repeat="group in content.tabs track by group.label">
 
             <div class="umb-group-panel__header">
-                <div>{{ group.label }}</div>
+                <div id="group-{{group.id}}">{{ group.label }}</div>
             </div>
 
             <div class="umb-group-panel__content">
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation-item.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation-item.html
index 68a3da435b..dda8fa70f4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation-item.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation-item.html
@@ -1,19 +1,19 @@
-<a data-element="sub-view-{{vm.item.alias}}"
-   tabindex="-1"
-   ng-href=""
+<button data-element="sub-view-{{vm.item.alias}}"
+   type="button"
    ng-click="vm.clicked()"
    hotkey="{{::vm.hotkey}}"
    hotkey-when-hidden="true"
-   ng-class="{'is-active': vm.item.active, '-has-error': vm.item.hasError}">
-    <i class="icon {{ vm.item.icon }}"></i>
+   ng-class="{'is-active': vm.item.active, '-has-error': vm.item.hasError}"
+   class="umb-sub-views-nav-item__action">
+    <i class="icon {{ vm.item.icon }}" aria-hidden="true"></i>
     <span class="umb-sub-views-nav-item-text">{{ vm.item.name }}</span>
     <div ng-show="vm.item.badge" class="badge -type-{{vm.item.badge.type}}">{{vm.item.badge.count}}</div>
-</a>
+</button>
 
 <ul class="dropdown-menu umb-sub-views-nav-item__anchor_dropdown" ng-if="vm.item.anchors && vm.item.anchors.length > 1">
     <li ng-repeat="anchor in vm.item.anchors" ng-class="{'is-active': vm.item.active && anchor.active}">
-        <a href="" ng-click="vm.anchorClicked(anchor, $event)">
-            {{anchor.label}}
+        <a href="#group-{{anchor.id}}" ng-click="vm.anchorClicked(anchor, $event)" prevent-default>
+            <span class="sr-only"><localize key="visuallyHiddenTexts_jumpTo">Jump to</localize></span> {{anchor.label}} <span class="sr-only"><localize key="visuallyHiddenTexts_group"> group</localize></span>
         </a>
     </li>
 </ul>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index 0e43d4217e..1d2c94067d 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -1614,6 +1614,8 @@ Mange hilsner fra Umbraco robotten
   </area>
   <area alias="visuallyHiddenTexts">
     <key alias="goBack">Gå tilbage</key>
-    <key alias="activeListLayout">Aktivt layout:</key>
+    <key alias="activeListLayout">Aktivt layout:</key>
+    <key alias="jumpTo">Gå til</key>
+    <key alias="group">gruppe</key>    
   </area>
 </language>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 41c77d0c39..2b7b2f57e9 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -2132,6 +2132,8 @@ To manage your website, simply open the Umbraco back office and start adding con
   </area>
   <area alias="visuallyHiddenTexts">
     <key alias="goBack">Go back</key>
-    <key alias="activeListLayout">Active layout:</key>
+    <key alias="activeListLayout">Active layout:</key>
+    <key alias="jumpTo">Jump to</key>
+    <key alias="group">group</key>    
   </area>
 </language>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index d9cea4f14c..365374f6ea 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -2146,6 +2146,8 @@ To manage your website, simply open the Umbraco back office and start adding con
   </area>
   <area alias="visuallyHiddenTexts">
     <key alias="goBack">Go back</key>
-    <key alias="activeListLayout">Active layout:</key>
+    <key alias="activeListLayout">Active layout:</key>
+    <key alias="jumpTo">Jump to</key>
+    <key alias="group">group</key>    
   </area>
 </language>

From 03790111408eb14b0d11ed8ba690244883f0a94a Mon Sep 17 00:00:00 2001
From: Jan Skovgaard <jaskov@gmail.com>
Date: Thu, 5 Sep 2019 14:39:24 +0200
Subject: [PATCH 474/776] Accessibility: "Save and publish" has a drop down
 that can't be accessed via keyboard (#5884)

---
 .../buttons/umbbuttongroup.directive.js       |  4 ++-
 .../components/buttons/umb-button-group.html  | 33 ++++++++++++-------
 .../src/views/components/content/edit.html    |  4 ++-
 .../views/components/umb-dropdown-item.html   |  2 +-
 .../src/views/components/umb-dropdown.html    |  2 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/da.xml |  1 +
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml |  1 +
 .../Umbraco/config/lang/en_us.xml             |  1 +
 8 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbuttongroup.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbuttongroup.directive.js
index 74f0870f1b..301e542ec3 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbuttongroup.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbuttongroup.directive.js
@@ -127,7 +127,9 @@ Use this directive to render a button with a dropdown of alternative actions.
                 float: "@?",
                 buttonStyle: "@?",
                 size: "@?",
-                icon: "@?"
+                icon: "@?",
+                label: "@?",
+                labelKey: "@?"
             },
             link: link
         };
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button-group.html b/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button-group.html
index 6ae256f4ee..de082fb48e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button-group.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button-group.html
@@ -1,5 +1,5 @@
 <div class="btn-group umb-button-group" ng-class="{'dropup': direction === 'up'}">
-    
+
    <umb-button
       ng-if="defaultButton"
       alias="{{defaultButton.alias ? defaultButton.alias : 'groupPrimary' }}"
@@ -16,21 +16,32 @@
       add-ellipsis={{defaultButton.addEllipsis}}>
    </umb-button>
 
-   <a data-element="button-group-toggle"
-      href="#"
+   <button data-element="button-group-toggle"
+      type="button"
       prevent-default
-      class="btn btn-{{buttonStyle}} dropdown-toggle umb-button-group__toggle umb-button--{{size}}" 
+      class="btn btn-{{buttonStyle}} dropdown-toggle umb-button-group__toggle umb-button--{{size}}"
       ng-if="subButtons.length > 0"
-      ng-click="toggleDropdown()">
-      <span class="caret"></span>
-   </a>
+      ng-click="toggleDropdown()"
+      aria-haspopup="true"
+      aria-expanded="{{dropdown.isOpen}}">
+         <span class="caret">
+            <span class="sr-only">
+               <localize key="{{labelKey}}">{{label}}</localize>
+            </span>
+         </span>
+   </button>
 
    <umb-dropdown ng-show="subButtons.length > 0 && dropdown.isOpen" class="umb-button-group__sub-buttons" on-close="closeDropdown()" ng-class="{'-align-right': float === 'right'}">
       <umb-dropdown-item ng-repeat="subButton in subButtons">
-         <a data-element="{{subButton.alias ? 'button-' + subButton.alias : 'button-group-secondary-' + $index }}" href="#" ng-click="executeMenuItem(subButton)" hotkey="{{subButton.hotKey}}" hotkey-when-hidden="{{subButton.hotKeyWhenHidden}}" prevent-default>
-            <localize key="{{subButton.labelKey}}">{{subButton.labelKey}}</localize>
-            <span ng-if="subButton.addEllipsis === 'true'">...</span>
-         </a>
+         <button
+            data-element="{{subButton.alias ? 'button-' + subButton.alias : 'button-group-secondary-' + $index }}"
+            type="button" ng-click="executeMenuItem(subButton)"
+            hotkey="{{subButton.hotKey}}"
+            hotkey-when-hidden="{{subButton.hotKeyWhenHidden}}"
+            prevent-default>
+               <localize key="{{subButton.labelKey}}">{{subButton.labelKey}}</localize>
+               <span ng-if="subButton.addEllipsis === 'true'" aria-hidden="true">...</span>
+         </button>
       </umb-dropdown-item>
    </umb-dropdown>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html b/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html
index cd2c94c458..32e91b935a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html
@@ -68,7 +68,9 @@
                         sub-buttons="subButtons"
                         state="page.buttonGroupState"
                         direction="up"
-                        float="right">
+                        float="right"
+                        label-key="buttons_morePublishingOptions"
+                        label="More publishing options">
                     </umb-button-group>
 
                     <umb-button
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-dropdown-item.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-dropdown-item.html
index 11fe294919..98f9ece409 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-dropdown-item.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-dropdown-item.html
@@ -1 +1 @@
-<li ng-transclude></li>
\ No newline at end of file
+<li role="menuitem" ng-transclude></li>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-dropdown.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-dropdown.html
index 2f24186597..f2bde04232 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-dropdown.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-dropdown.html
@@ -1 +1 @@
-<ul class="dropdown-menu" on-outside-click="close()" ng-transclude></ul>
+<ul class="dropdown-menu" role="menu" on-outside-click="close()" ng-transclude></ul>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index 1d2c94067d..81e6b6bf12 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -146,6 +146,7 @@
     <key alias="deleteTag">Slet tag</key>
     <key alias="confirmActionCancel">Fortryd</key>
     <key alias="confirmActionConfirm">Bekræft</key>
+	<key alias="morePublishingOptions">Flere publiseringsmuligheder</key>
   </area>
   <area alias="auditTrails">
     <key alias="atViewingFor">For</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 2b7b2f57e9..1afbbd7b8e 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -150,6 +150,7 @@
     <key alias="deleteTag">Delete tag</key>
     <key alias="confirmActionCancel">Cancel</key>
     <key alias="confirmActionConfirm">Confirm</key>
+	<key alias="morePublishingOptions">More publishing options</key>
   </area>
   <area alias="auditTrails">
     <key alias="atViewingFor">Viewing for</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index 365374f6ea..fb4d25c4e5 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -150,6 +150,7 @@
     <key alias="deleteTag">Delete tag</key>
     <key alias="confirmActionCancel">Cancel</key>
     <key alias="confirmActionConfirm">Confirm</key>
+	<key alias="morePublishingOptions">More publishing options</key>
   </area>
   <area alias="auditTrails">
     <key alias="atViewingFor">Viewing for</key>

From adeb8fc1f70abccf2aa2b361eaefd1e07da4183c Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Wed, 4 Sep 2019 14:47:19 +0200
Subject: [PATCH 475/776] Fix mandatory validation clientside for content
 picker and MNTP

---
 .../contentpicker/contentpicker.controller.js               | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
index 6667c3b539..be99ffe8f9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
@@ -117,6 +117,12 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
         }
         //merge the server config on top of the default config, then set the server config to use the result
         $scope.model.config = angular.extend(defaultConfig, $scope.model.config);
+
+        // if the property is mandatory, set the minCount config to 1 (unless of course it is set to something already),
+        // that way the minCount/maxCount validation handles the mandatory as well
+        if ($scope.model.validation && $scope.model.validation.mandatory && !$scope.model.config.minNumber) {
+            $scope.model.config.minNumber = 1;
+        }
     }
 
     //Umbraco persists boolean for prevalues as "0" or "1" so we need to convert that!

From c67b14b83708ae7a7a8a263adefbf15df20e36b3 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Wed, 4 Sep 2019 14:47:19 +0200
Subject: [PATCH 476/776] Fix mandatory validation clientside for content
 picker and MNTP

(cherry picked from commit adeb8fc1f70abccf2aa2b361eaefd1e07da4183c)
---
 .../contentpicker/contentpicker.controller.js               | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
index 6667c3b539..be99ffe8f9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
@@ -117,6 +117,12 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
         }
         //merge the server config on top of the default config, then set the server config to use the result
         $scope.model.config = angular.extend(defaultConfig, $scope.model.config);
+
+        // if the property is mandatory, set the minCount config to 1 (unless of course it is set to something already),
+        // that way the minCount/maxCount validation handles the mandatory as well
+        if ($scope.model.validation && $scope.model.validation.mandatory && !$scope.model.config.minNumber) {
+            $scope.model.config.minNumber = 1;
+        }
     }
 
     //Umbraco persists boolean for prevalues as "0" or "1" so we need to convert that!

From 79bea8b4402dc9ecad20d6a01cc2dfadf8e9af04 Mon Sep 17 00:00:00 2001
From: Steve Megson <steve@honestjohn.co.uk>
Date: Wed, 4 Sep 2019 10:06:14 +0100
Subject: [PATCH 477/776] Update umbracoUser2NodeNotify in SuperZero migration

---
 src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/SuperZero.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/SuperZero.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/SuperZero.cs
index 64ac20d175..9026f15fc1 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/SuperZero.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/SuperZero.cs
@@ -30,6 +30,7 @@
             Database.Execute("set identity_insert umbracoUser off;");
 
             Database.Execute("update umbracoUser2UserGroup set userId=-1 where userId=0;");
+            Database.Execute("update umbracoUser2NodeNotify set userId=-1 where userId=0;");
             Database.Execute("update umbracoNode set nodeUser=-1 where nodeUser=0;");
             Database.Execute("update umbracoUserLogin set userId=-1 where userId=0;");
             Database.Execute($"update {Constants.DatabaseSchema.Tables.ContentVersion} set userId=-1 where userId=0;");

From 7b0b0f94957df059694c237998eb5d063d9bd29b Mon Sep 17 00:00:00 2001
From: Steve Megson <steve@honestjohn.co.uk>
Date: Wed, 4 Sep 2019 10:06:14 +0100
Subject: [PATCH 478/776] Update umbracoUser2NodeNotify in SuperZero migration

(cherry picked from commit 79bea8b4402dc9ecad20d6a01cc2dfadf8e9af04)
---
 src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/SuperZero.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/SuperZero.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/SuperZero.cs
index 64ac20d175..9026f15fc1 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/SuperZero.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/SuperZero.cs
@@ -30,6 +30,7 @@
             Database.Execute("set identity_insert umbracoUser off;");
 
             Database.Execute("update umbracoUser2UserGroup set userId=-1 where userId=0;");
+            Database.Execute("update umbracoUser2NodeNotify set userId=-1 where userId=0;");
             Database.Execute("update umbracoNode set nodeUser=-1 where nodeUser=0;");
             Database.Execute("update umbracoUserLogin set userId=-1 where userId=0;");
             Database.Execute($"update {Constants.DatabaseSchema.Tables.ContentVersion} set userId=-1 where userId=0;");

From a58a2e8aa9b7c13beefbec8c5d00c9649cada6d1 Mon Sep 17 00:00:00 2001
From: Mark Bowser <mark@proworks.com>
Date: Tue, 3 Sep 2019 16:10:01 -0700
Subject: [PATCH 479/776] Apply focus to URL input on embed overlay open. Issue
 #6276

---
 .../src/views/common/overlays/embed/embed.html                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/embed/embed.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/embed/embed.html
index 6a829e6be4..6aadbced7b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/embed/embed.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/embed/embed.html
@@ -1,7 +1,7 @@
 <form ng-controller="Umbraco.Overlays.EmbedOverlay as vm">
 
    <umb-control-group label="@general_url">
-       <input id="url" class="umb-editor input-block-level" type="text" style="margin-bottom: 10px;" ng-model="model.embed.url" ng-keyup="$event.keyCode == 13 ? vm.showPreview() : null" required />
+       <input id="url" class="umb-editor input-block-level" type="text" style="margin-bottom: 10px;" ng-model="model.embed.url" ng-keyup="$event.keyCode == 13 ? vm.showPreview() : null" focus-when="{{true}}" required />
        <input type="button" ng-click="vm.showPreview()" class="btn" value="@general_retrieve" localize="value" />
    </umb-control-group>
 

From 39972049bb7c1c3297f556beaaa9811763bcf1bc Mon Sep 17 00:00:00 2001
From: Mark Bowser <mark@proworks.com>
Date: Tue, 3 Sep 2019 16:10:01 -0700
Subject: [PATCH 480/776] Apply focus to URL input on embed overlay open. Issue
 #6276

(cherry picked from commit a58a2e8aa9b7c13beefbec8c5d00c9649cada6d1)
---
 .../src/views/common/overlays/embed/embed.html                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/embed/embed.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/embed/embed.html
index 6a829e6be4..6aadbced7b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/embed/embed.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/embed/embed.html
@@ -1,7 +1,7 @@
 <form ng-controller="Umbraco.Overlays.EmbedOverlay as vm">
 
    <umb-control-group label="@general_url">
-       <input id="url" class="umb-editor input-block-level" type="text" style="margin-bottom: 10px;" ng-model="model.embed.url" ng-keyup="$event.keyCode == 13 ? vm.showPreview() : null" required />
+       <input id="url" class="umb-editor input-block-level" type="text" style="margin-bottom: 10px;" ng-model="model.embed.url" ng-keyup="$event.keyCode == 13 ? vm.showPreview() : null" focus-when="{{true}}" required />
        <input type="button" ng-click="vm.showPreview()" class="btn" value="@general_retrieve" localize="value" />
    </umb-control-group>
 

From 9de47d1f320110f15b4c2044174955a6b0fd10d4 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 5 Sep 2019 15:10:01 +0200
Subject: [PATCH 481/776] Merge branch 'v7/dev' into v8/dev

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/embed/embed.html

(cherry picked from commit 1278644cbb891b70efa1e13ce119ac6bbbc13e75)
---
 .../src/views/common/infiniteeditors/embed/embed.html           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.html
index e48ec84b25..23559c6123 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.html
@@ -16,7 +16,7 @@
                     <umb-box-content>
 
                         <umb-control-group label="@general_url">
-                            <input id="url" class="umb-property-editor input-block-level" type="text" style="margin-bottom: 10px;" ng-model="model.embed.url" ng-keyup="$event.keyCode == 13 ? vm.showPreview() : null" required />
+                            <input id="url" class="umb-property-editor input-block-level" type="text" style="margin-bottom: 10px;" ng-model="model.embed.url" ng-keyup="$event.keyCode == 13 ? vm.showPreview() : null" focus-when="{{true}}" required />
                             <umb-button
                                 type="button"
                                 action="vm.showPreview()"

From f4f99d7a988ed4a2b2457804c16fd5571edaeb7a Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Thu, 5 Sep 2019 15:27:33 +0200
Subject: [PATCH 482/776] v8: Highlight of old password in change password form
 (#6274)

---
 .../src/views/common/overlays/user/user.html  |  6 ++----
 .../components/users/change-password.html     | 21 +++++++++----------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
index 60477ae9b8..531feef892 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
@@ -26,8 +26,7 @@
             action="togglePasswordFields()"
             button-style="action"
             label="Change password"
-            label-key="general_changePassword"
-            button-style="success">
+            label-key="general_changePassword">
        </umb-button>
 
         <umb-button
@@ -50,8 +49,7 @@
 
         <div ng-repeat="login in externalLoginProviders">
 
-			<form ng-if="login.linkedProviderKey == undefined" method="POST" name="externalLoginForm"
-				  action="{{externalLinkLoginFormAction}}" id="oauthloginform" name="oauthloginform">
+			<form ng-if="login.linkedProviderKey == undefined" method="POST" action="{{externalLinkLoginFormAction}}" id="oauthloginform" name="oauthloginform">
 				<input type="hidden" name="provider" value="{{login.authType}}" />
                 <button class="btn btn-block btn-social"
                         ng-class="login.properties.SocialStyle"
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html b/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
index ef5f7a4159..ef364264ab 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
@@ -12,16 +12,15 @@
         </div>
         <div ng-switch-when="true">
 
-            <ng-form name="vm.passwordForm">
+            <ng-form name="changePasswordForm">
                 <umb-control-group alias="resetPassword" label="@user_resetPassword" ng-show="vm.config.enableReset">
                     <input type="checkbox" ng-model="vm.passwordValues.reset"
-                           id="Checkbox1"
                            name="resetPassword"
                            val-server-field="resetPassword"
                            no-dirty-check
                            ng-change="vm.showReset = !vm.showReset" />
-                    <span ng-messages="vm.passwordForm.resetPassword.$error" show-validation-on-submit>
-                        <span class="help-inline" ng-message="valServerField">{{vm.passwordForm.resetPassword.errorMsg}}</span>
+                    <span ng-messages="changePasswordForm.resetPassword.$error" show-validation-on-submit>
+                        <span class="help-inline" ng-message="valServerField">{{changePasswordForm.resetPassword.errorMsg}}</span>
                     </span>
 
                 </umb-control-group> 
@@ -33,9 +32,9 @@
                            required
                            val-server-field="oldPassword"
                            no-dirty-check />
-                    <span ng-messages="vm.passwordForm.oldPassword.$error" show-validation-on-submit>
+                    <span ng-messages="changePasswordForm.oldPassword.$error" show-validation-on-submit>
                         <span class="help-inline" ng-message="required">Required</span>
-                        <span class="help-inline" ng-message="valServerField">{{vm.passwordForm.oldPassword.errorMsg}}</span>
+                        <span class="help-inline" ng-message="valServerField">{{changePasswordForm.oldPassword.errorMsg}}</span>
                     </span>
                 </umb-control-group>
 
@@ -46,19 +45,19 @@
                            val-server-field="password"
                            ng-minlength="{{vm.config.minPasswordLength}}"
                            no-dirty-check />
-                    <span ng-messages="vm.passwordForm.password.$error" show-validation-on-submit>
+                    <span ng-messages="changePasswordForm.password.$error" show-validation-on-submit>
                         <span class="help-inline" ng-message="required">Required</span>
                         <span class="help-inline" ng-message="minlength">Minimum {{vm.config.minPasswordLength}} characters</span>
-                        <span class="help-inline" ng-message="valServerField">{{vm.passwordForm.password.errorMsg}}</span>
+                        <span class="help-inline" ng-message="valServerField">{{changePasswordForm.password.errorMsg}}</span>
                     </span>
                 </umb-control-group>
 
-                <umb-control-group alias="confirmpassword" label="@user_confirmNewPassword" ng-if="!vm.showReset" required="true">
-                    <input type="password" name="confirmpassword" ng-model="vm.passwordValues.confirm"
+                <umb-control-group alias="confirmPassword" label="@user_confirmNewPassword" ng-if="!vm.showReset" required="true">
+                    <input type="password" name="confirmPassword" ng-model="vm.passwordValues.confirm"
                            class="input-block-level umb-textstring textstring"
                            val-compare="password"
                            no-dirty-check />
-                    <span ng-messages="vm.passwordForm.confirmpassword.$error" show-validation-on-submit>
+                    <span ng-messages="changePasswordForm.confirmPassword.$error" show-validation-on-submit>
                         <span class="help-inline" ng-message="valCompare"><localize key="user_passwordMismatch">The confirmed password doesn't match the new password!</localize></span>
                     </span>
                 </umb-control-group>

From 468cd96846fa3d5eb033148842c524a33448ea56 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Thu, 5 Sep 2019 15:27:33 +0200
Subject: [PATCH 483/776] v8: Highlight of old password in change password form
 (#6274)

(cherry picked from commit f4f99d7a988ed4a2b2457804c16fd5571edaeb7a)
---
 .../src/views/common/overlays/user/user.html  |  6 ++----
 .../components/users/change-password.html     | 21 +++++++++----------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
index 60477ae9b8..531feef892 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
@@ -26,8 +26,7 @@
             action="togglePasswordFields()"
             button-style="action"
             label="Change password"
-            label-key="general_changePassword"
-            button-style="success">
+            label-key="general_changePassword">
        </umb-button>
 
         <umb-button
@@ -50,8 +49,7 @@
 
         <div ng-repeat="login in externalLoginProviders">
 
-			<form ng-if="login.linkedProviderKey == undefined" method="POST" name="externalLoginForm"
-				  action="{{externalLinkLoginFormAction}}" id="oauthloginform" name="oauthloginform">
+			<form ng-if="login.linkedProviderKey == undefined" method="POST" action="{{externalLinkLoginFormAction}}" id="oauthloginform" name="oauthloginform">
 				<input type="hidden" name="provider" value="{{login.authType}}" />
                 <button class="btn btn-block btn-social"
                         ng-class="login.properties.SocialStyle"
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html b/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
index ef5f7a4159..ef364264ab 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
@@ -12,16 +12,15 @@
         </div>
         <div ng-switch-when="true">
 
-            <ng-form name="vm.passwordForm">
+            <ng-form name="changePasswordForm">
                 <umb-control-group alias="resetPassword" label="@user_resetPassword" ng-show="vm.config.enableReset">
                     <input type="checkbox" ng-model="vm.passwordValues.reset"
-                           id="Checkbox1"
                            name="resetPassword"
                            val-server-field="resetPassword"
                            no-dirty-check
                            ng-change="vm.showReset = !vm.showReset" />
-                    <span ng-messages="vm.passwordForm.resetPassword.$error" show-validation-on-submit>
-                        <span class="help-inline" ng-message="valServerField">{{vm.passwordForm.resetPassword.errorMsg}}</span>
+                    <span ng-messages="changePasswordForm.resetPassword.$error" show-validation-on-submit>
+                        <span class="help-inline" ng-message="valServerField">{{changePasswordForm.resetPassword.errorMsg}}</span>
                     </span>
 
                 </umb-control-group> 
@@ -33,9 +32,9 @@
                            required
                            val-server-field="oldPassword"
                            no-dirty-check />
-                    <span ng-messages="vm.passwordForm.oldPassword.$error" show-validation-on-submit>
+                    <span ng-messages="changePasswordForm.oldPassword.$error" show-validation-on-submit>
                         <span class="help-inline" ng-message="required">Required</span>
-                        <span class="help-inline" ng-message="valServerField">{{vm.passwordForm.oldPassword.errorMsg}}</span>
+                        <span class="help-inline" ng-message="valServerField">{{changePasswordForm.oldPassword.errorMsg}}</span>
                     </span>
                 </umb-control-group>
 
@@ -46,19 +45,19 @@
                            val-server-field="password"
                            ng-minlength="{{vm.config.minPasswordLength}}"
                            no-dirty-check />
-                    <span ng-messages="vm.passwordForm.password.$error" show-validation-on-submit>
+                    <span ng-messages="changePasswordForm.password.$error" show-validation-on-submit>
                         <span class="help-inline" ng-message="required">Required</span>
                         <span class="help-inline" ng-message="minlength">Minimum {{vm.config.minPasswordLength}} characters</span>
-                        <span class="help-inline" ng-message="valServerField">{{vm.passwordForm.password.errorMsg}}</span>
+                        <span class="help-inline" ng-message="valServerField">{{changePasswordForm.password.errorMsg}}</span>
                     </span>
                 </umb-control-group>
 
-                <umb-control-group alias="confirmpassword" label="@user_confirmNewPassword" ng-if="!vm.showReset" required="true">
-                    <input type="password" name="confirmpassword" ng-model="vm.passwordValues.confirm"
+                <umb-control-group alias="confirmPassword" label="@user_confirmNewPassword" ng-if="!vm.showReset" required="true">
+                    <input type="password" name="confirmPassword" ng-model="vm.passwordValues.confirm"
                            class="input-block-level umb-textstring textstring"
                            val-compare="password"
                            no-dirty-check />
-                    <span ng-messages="vm.passwordForm.confirmpassword.$error" show-validation-on-submit>
+                    <span ng-messages="changePasswordForm.confirmPassword.$error" show-validation-on-submit>
                         <span class="help-inline" ng-message="valCompare"><localize key="user_passwordMismatch">The confirmed password doesn't match the new password!</localize></span>
                     </span>
                 </umb-control-group>

From c1cf6612a43b8b43d666613d3e774d04eca2a986 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bf@oerskov.dk>
Date: Tue, 3 Sep 2019 00:00:53 +0200
Subject: [PATCH 484/776] Fix missing checkmark selection in section picker

---
 .../src/less/utilities/_flexbox.less                      | 2 --
 .../infiniteeditors/sectionpicker/sectionpicker.html      | 8 ++++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/utilities/_flexbox.less b/src/Umbraco.Web.UI.Client/src/less/utilities/_flexbox.less
index c0815fa8ac..a3427074cd 100644
--- a/src/Umbraco.Web.UI.Client/src/less/utilities/_flexbox.less
+++ b/src/Umbraco.Web.UI.Client/src/less/utilities/_flexbox.less
@@ -1,7 +1,5 @@
 /*
-
     Flexbox
-
 */
 
 .flex { display: flex; }
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/sectionpicker/sectionpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/sectionpicker/sectionpicker.html
index 2e88bf709c..33906dcd75 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/sectionpicker/sectionpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/sectionpicker/sectionpicker.html
@@ -19,10 +19,10 @@
             <umb-box ng-if="!vm.loading">
                 <umb-box-content>
                     <ul class="umb-tree">
-                        <li ng-repeat="section in vm.sections" class="umb-tree-item">
-                            <div style="padding: 5px 10px;" ng-class="{'umb-tree-node-checked': section.selected }">
-                                <a href="" ng-click="vm.selectSection(section)">
-                                    <i class="icon umb-tree-icon {{section.icon}}"></i>
+                        <li ng-repeat="section in vm.sections" class="umb-tree-item" ng-class="{'umb-tree-node-checked': section.selected }">
+                            <div class="umb-tree-item__inner cursor-pointer" ng-click="vm.selectSection(section)" style="padding: 5px 10px;">
+                                <i class="icon umb-tree-icon {{section.icon}}"></i>
+                                <a class="flex-auto" href="" prevent-default>
                                     <span>{{ section.name }}</span>
                                 </a>
                             </div>

From 252ea8674f53a9ebcb47e207e4cdc113a3ade020 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bf@oerskov.dk>
Date: Tue, 3 Sep 2019 00:00:53 +0200
Subject: [PATCH 485/776] Fix missing checkmark selection in section picker

(cherry picked from commit c1cf6612a43b8b43d666613d3e774d04eca2a986)
---
 .../src/less/utilities/_flexbox.less                      | 2 --
 .../infiniteeditors/sectionpicker/sectionpicker.html      | 8 ++++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/utilities/_flexbox.less b/src/Umbraco.Web.UI.Client/src/less/utilities/_flexbox.less
index c0815fa8ac..a3427074cd 100644
--- a/src/Umbraco.Web.UI.Client/src/less/utilities/_flexbox.less
+++ b/src/Umbraco.Web.UI.Client/src/less/utilities/_flexbox.less
@@ -1,7 +1,5 @@
 /*
-
     Flexbox
-
 */
 
 .flex { display: flex; }
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/sectionpicker/sectionpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/sectionpicker/sectionpicker.html
index 2e88bf709c..33906dcd75 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/sectionpicker/sectionpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/sectionpicker/sectionpicker.html
@@ -19,10 +19,10 @@
             <umb-box ng-if="!vm.loading">
                 <umb-box-content>
                     <ul class="umb-tree">
-                        <li ng-repeat="section in vm.sections" class="umb-tree-item">
-                            <div style="padding: 5px 10px;" ng-class="{'umb-tree-node-checked': section.selected }">
-                                <a href="" ng-click="vm.selectSection(section)">
-                                    <i class="icon umb-tree-icon {{section.icon}}"></i>
+                        <li ng-repeat="section in vm.sections" class="umb-tree-item" ng-class="{'umb-tree-node-checked': section.selected }">
+                            <div class="umb-tree-item__inner cursor-pointer" ng-click="vm.selectSection(section)" style="padding: 5px 10px;">
+                                <i class="icon umb-tree-icon {{section.icon}}"></i>
+                                <a class="flex-auto" href="" prevent-default>
                                     <span>{{ section.name }}</span>
                                 </a>
                             </div>

From c271113da517cce6c8305946b960a5d28901aa12 Mon Sep 17 00:00:00 2001
From: Poornima Nayar <poornimakrishnav@gmail.com>
Date: Thu, 5 Sep 2019 14:33:36 +0100
Subject: [PATCH 486/776] Improve consistency around some buttons in the
 backoffice (#6265)

---
 .../src/views/common/drawers/help/help.html                   | 4 ++--
 .../src/views/packages/views/created.html                     | 3 +--
 .../src/views/packages/views/installed.html                   | 1 -
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html b/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html
index 56db1fd88a..a0413ce1a6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html
@@ -38,8 +38,8 @@
                                         <span ng-class="{'strike': tour.completed}" class="umb-help-list-item__title">{{ tour.name }}</span>
                                     </div>
                                     <div>
-                                        <umb-button ng-if="!tour.completed && vm.showTourButton($index, tourGroup)" button-style="primary" size="xxs" type="button" label="Start" action="vm.startTour(tour)"></umb-button>
-                                        <umb-button ng-if="tour.completed" size="xxs" type="button" label="Rerun" action="vm.startTour(tour)"></umb-button>
+                                        <umb-button ng-if="!tour.completed && vm.showTourButton($index, tourGroup)" button-style="primary" type="button" label="Start" action="vm.startTour(tour)"></umb-button>
+                                        <umb-button ng-if="tour.completed" type="button" label="Rerun" action="vm.startTour(tour)"></umb-button>
                                     </div>
                                 </div>
                             </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/views/created.html b/src/Umbraco.Web.UI.Client/src/views/packages/views/created.html
index f52ecf1c3d..05fc9d11ad 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packages/views/created.html
+++ b/src/Umbraco.Web.UI.Client/src/views/packages/views/created.html
@@ -32,7 +32,6 @@
                 <td style="text-align: right;">
                     <umb-button
                         type="button"
-                        size="xxs"
                         button-style="danger"
                         state="createdPackage.deleteButtonState"
                         label-key="general_delete"
@@ -49,4 +48,4 @@
         <localize key="packager_noPackagesCreated">No packages have been created yet</localize>
     </umb-empty-state>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/views/installed.html b/src/Umbraco.Web.UI.Client/src/views/packages/views/installed.html
index 3668c7f0df..faf45afaae 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packages/views/installed.html
+++ b/src/Umbraco.Web.UI.Client/src/views/packages/views/installed.html
@@ -33,7 +33,6 @@
 
                             <umb-button type="button"
                                         button-style="danger"
-                                        size="xxs"
                                         label-key="packager_packageUninstallHeader"
                                         action="vm.confirmUninstall(installedPackage)">
                             </umb-button>

From ff72a341b267308d482d490c438cb489ef2e4be1 Mon Sep 17 00:00:00 2001
From: leekelleher <leekelleher@gmail.com>
Date: Mon, 2 Sep 2019 15:18:38 +0100
Subject: [PATCH 487/776] Added method to add to a list of ConfigurationFields

---
 .../ConfigurationFieldsExtensions.cs          | 34 +++++++++++++++++++
 src/Umbraco.Core/Umbraco.Core.csproj          |  1 +
 2 files changed, 35 insertions(+)
 create mode 100644 src/Umbraco.Core/PropertyEditors/ConfigurationFieldsExtensions.cs

diff --git a/src/Umbraco.Core/PropertyEditors/ConfigurationFieldsExtensions.cs b/src/Umbraco.Core/PropertyEditors/ConfigurationFieldsExtensions.cs
new file mode 100644
index 0000000000..25fba622d5
--- /dev/null
+++ b/src/Umbraco.Core/PropertyEditors/ConfigurationFieldsExtensions.cs
@@ -0,0 +1,34 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Core.PropertyEditors
+{
+    public static partial class ConfigurationFieldsExtensions
+    {
+        /// <summary>
+        /// Adds a configuration field.
+        /// </summary>
+        /// <param name="fields">The list of configuration fields.</param>
+        /// <param name="key">The key (alias) of the field.</param>
+        /// <param name="name">The name (label) of the field.</param>
+        /// <param name="description">The description for the field.</param>
+        /// <param name="view">The path to the editor view to be used for the field.</param>
+        /// <param name="config">Optional configuration used for field's editor.</param>
+        public static void Add(
+            this List<ConfigurationField> fields,
+            string key,
+            string name,
+            string description,
+            string view,
+            IDictionary<string, object> config = null)
+        {
+            fields.Add(new ConfigurationField
+            {
+                Key = key,
+                Name = name,
+                Description = description,
+                View = view,
+                Config = config,
+            });
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index c19722433f..a0d0fad6d9 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -267,6 +267,7 @@
     <Compile Include="Models\PublishedContent\ILivePublishedModelFactory.cs" />
     <Compile Include="Models\PublishedContent\IPublishedContentType.cs" />
     <Compile Include="Models\PublishedContent\IPublishedPropertyType.cs" />
+    <Compile Include="PropertyEditors\ConfigurationFieldsExtensions.cs" />
     <Compile Include="PropertyEditors\IIgnoreUserStartNodesConfig.cs" />
     <Compile Include="PublishedContentExtensions.cs" />
     <Compile Include="Models\PublishedContent\UrlMode.cs" />

From 83588b2dc880dfed85de15b087e5a30057d6f03e Mon Sep 17 00:00:00 2001
From: leekelleher <leekelleher@gmail.com>
Date: Mon, 2 Sep 2019 14:54:51 +0100
Subject: [PATCH 488/776] ContentTypeService GetAllElementTypes method

Added an extension method to get all the Element Types from
the ContentTypeService.

Refactored NestedContent's controller accordingly.
---
 .../Services/ContentTypeServiceExtensions.cs      | 15 +++++++++++++++
 .../PropertyEditors/NestedContentController.cs    |  5 +++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/Services/ContentTypeServiceExtensions.cs b/src/Umbraco.Core/Services/ContentTypeServiceExtensions.cs
index f643039dca..fd475c558a 100644
--- a/src/Umbraco.Core/Services/ContentTypeServiceExtensions.cs
+++ b/src/Umbraco.Core/Services/ContentTypeServiceExtensions.cs
@@ -7,6 +7,21 @@ namespace Umbraco.Core.Services
 {
     public static class ContentTypeServiceExtensions
     {
+        /// <summary>
+        /// Gets all of the element types (e.g. content types that have been marked as an element type).
+        /// </summary>
+        /// <param name="contentTypeService">The content type service.</param>
+        /// <returns>Returns all the element types.</returns>
+        public static IEnumerable<IContentType> GetAllElementTypes(this IContentTypeService contentTypeService)
+        {
+            if (contentTypeService == null)
+            {
+                return Enumerable.Empty<IContentType>();
+            }
+
+            return contentTypeService.GetAll().Where(x => x.IsElement);
+        }
+
         /// <summary>
         /// Returns the available composite content types for a given content type
         /// </summary>
diff --git a/src/Umbraco.Web/PropertyEditors/NestedContentController.cs b/src/Umbraco.Web/PropertyEditors/NestedContentController.cs
index 8d144c5904..590a286c5d 100644
--- a/src/Umbraco.Web/PropertyEditors/NestedContentController.cs
+++ b/src/Umbraco.Web/PropertyEditors/NestedContentController.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using Umbraco.Core.Services;
 using Umbraco.Web.Editors;
 using Umbraco.Web.Mvc;
 
@@ -11,8 +12,8 @@ namespace Umbraco.Web.PropertyEditors
         [System.Web.Http.HttpGet]
         public IEnumerable<object> GetContentTypes()
         {
-            return Services.ContentTypeService.GetAll()
-                .Where(x => x.IsElement)
+            return Services.ContentTypeService
+                .GetAllElementTypes()
                 .OrderBy(x => x.SortOrder)
                 .Select(x => new
                 {

From c92eafd8f1ebb54849308cfe79c363e04603e40a Mon Sep 17 00:00:00 2001
From: Matt Brailsford <me@mattbrailsford.com>
Date: Sun, 1 Sep 2019 09:23:48 +0100
Subject: [PATCH 489/776] Fixes #6255

Updated GetCtrs / GetMaps to merge found maps, rather than replacing all for a given type.
---
 src/Umbraco.Core/Mapping/UmbracoMapper.cs | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/Mapping/UmbracoMapper.cs b/src/Umbraco.Core/Mapping/UmbracoMapper.cs
index 976f50b499..90f56f3ec1 100644
--- a/src/Umbraco.Core/Mapping/UmbracoMapper.cs
+++ b/src/Umbraco.Core/Mapping/UmbracoMapper.cs
@@ -343,7 +343,12 @@ namespace Umbraco.Core.Mapping
 
             if (ctor == null) return null;
 
-            _ctors[sourceType] = sourceCtor;
+            if (_ctors.ContainsKey(sourceType))
+                foreach (var c in sourceCtor)
+                    _ctors[sourceType].Add(c.Key, c.Value);
+            else
+                _ctors[sourceType] = sourceCtor;
+            
             return ctor;
         }
 
@@ -368,7 +373,12 @@ namespace Umbraco.Core.Mapping
 
             if (map == null) return null;
 
-            _maps[sourceType] = sourceMap;
+            if (_maps.ContainsKey(sourceType))
+                foreach(var m in sourceMap)
+                    _maps[sourceType].Add(m.Key, m.Value);
+            else
+                _maps[sourceType] = sourceMap;
+            
             return map;
         }
 

From d01a5dcd8ee598281c1b394b0d19d0b1e3eb0415 Mon Sep 17 00:00:00 2001
From: Matt Brailsford <me@mattbrailsford.com>
Date: Sun, 1 Sep 2019 09:23:48 +0100
Subject: [PATCH 490/776] Fixes #6255

Updated GetCtrs / GetMaps to merge found maps, rather than replacing all for a given type.

(cherry picked from commit c92eafd8f1ebb54849308cfe79c363e04603e40a)
---
 src/Umbraco.Core/Mapping/UmbracoMapper.cs | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/Mapping/UmbracoMapper.cs b/src/Umbraco.Core/Mapping/UmbracoMapper.cs
index 976f50b499..90f56f3ec1 100644
--- a/src/Umbraco.Core/Mapping/UmbracoMapper.cs
+++ b/src/Umbraco.Core/Mapping/UmbracoMapper.cs
@@ -343,7 +343,12 @@ namespace Umbraco.Core.Mapping
 
             if (ctor == null) return null;
 
-            _ctors[sourceType] = sourceCtor;
+            if (_ctors.ContainsKey(sourceType))
+                foreach (var c in sourceCtor)
+                    _ctors[sourceType].Add(c.Key, c.Value);
+            else
+                _ctors[sourceType] = sourceCtor;
+            
             return ctor;
         }
 
@@ -368,7 +373,12 @@ namespace Umbraco.Core.Mapping
 
             if (map == null) return null;
 
-            _maps[sourceType] = sourceMap;
+            if (_maps.ContainsKey(sourceType))
+                foreach(var m in sourceMap)
+                    _maps[sourceType].Add(m.Key, m.Value);
+            else
+                _maps[sourceType] = sourceMap;
+            
             return map;
         }
 

From 771a62532dbe998e0895e04794e90dbc17ed1bff Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Thu, 5 Sep 2019 15:51:46 +0200
Subject: [PATCH 491/776] v8: Refactor checkered background (#5821)

---
 .../assets/img/checkered-background-20.png    | Bin 957 -> 0 bytes
 .../src/assets/img/checkered-background.png   | Bin 165 -> 0 bytes
 .../src/less/components/umb-media-grid.less   |  50 ++----------------
 .../src/less/mixins.less                      |  12 ++++-
 .../src/less/property-editors.less            |  36 +++++--------
 .../src/less/variables.less                   |   2 +-
 6 files changed, 27 insertions(+), 73 deletions(-)
 delete mode 100644 src/Umbraco.Web.UI.Client/src/assets/img/checkered-background-20.png
 delete mode 100644 src/Umbraco.Web.UI.Client/src/assets/img/checkered-background.png

diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/checkered-background-20.png b/src/Umbraco.Web.UI.Client/src/assets/img/checkered-background-20.png
deleted file mode 100644
index eb0ca08a6f068bcf073e7e426f258a56017e870a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 957
zcmaJ=O^ee&7!IsRSy&YD;MZZuURKs-^3gO+Y%Fckb_=GIZowWmO{Q(=CKHpXP3z5@
zdKEnR55&6&dhz1LyPgEWs|Ue@2<xQVbUj!DlbLyWpXdF0=5eRp+}Xai%`nVP>%i>N
zJ(sTBdHR2U;q6npT_yECImAOUvm?Y*T|7Xb<=Z3FMYcP?{{fX5W^2#u^-15lt2x-`
z?9_)#{E(s<rd&xv+nFE&25963I{W?2I~I7Z&fb$P-U<yg_6`;iI$X4S&SK)IE?c<+
z%85n^d_-)J_{Tx4B|5w0)#y1jLl!Ju$V6vPlj>U?VBiP=nJeZUzNi32<pfz#3d$`Y
z@`4O`2}*okl(Yh`6-2Q5SQ;&Ihg#QctYXod&W;HQH3(<388?$S9F3r$sw(6~D2jRN
zk&ovAv6Fld?`8}pik-*{iH8G_GTH+?B|1wpJuSfx*R(;rY7=c3OzaQ}9G{kyIa=2L
zU44J;9g{9P%lDteac>?X*hMj(Mh+d^a5oJVYDR=?f}<YB$5|IUV@z;7#vw3_W!J!-
zWjkJw8gDL9mZi0VnAm}XTBgoY9?tVzt=15#ywp$)sVE6TT`uub&1{IpQb{&Trc}?c
zCU&Mi3P^@^&#={v*i;aHNF$pl@*W_!5n&%J3)j5OxhNa?R#<m)E~SlFNRxr-c>fxA
zW}+HOk8APL%Ub>@pqh`UxG#Ts-J}m=zhzc?$>%}&;m?=C)+JsPYu~6$FEY>ekA9z=
kRGwV__~LdGE6lko%#Y`}PhWrCNS`Iss<+KowWCLW0241JYXATM

diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/checkered-background.png b/src/Umbraco.Web.UI.Client/src/assets/img/checkered-background.png
deleted file mode 100644
index c6c66da3d99d7850081b27645fec8d0db673d993..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 165
zcmeAS@N?(olHy`uVBq!ia0vp^93afW3?x5a^xFxfSkfJR9T^zbpD<_bdI{u9mbgZg
z1m~xflqVLYGB~E>C#5QQ<|d}62BjvZR2H60wE-$(3-AeXJ#*&F|Ns9l_llMQMVLy0
z{DS{8Jl$^K1>}i)x;TbZ+)7GdU~*GPIB-}&g`b6ik&S`n1cT!8zL{)5B@CXfelF{r
G5}E)|!7ph5

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
index 68973b4c7c..7588688108 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
@@ -21,15 +21,9 @@
 
     margin: 10px;
     position: relative;
-    //overflow: hidden;
-    
-    user-select: none;
-    
+    user-select: none; 
     cursor: pointer;
-    
     box-shadow: 0 1px 1px 0 rgba(0,0,0,.2);
-    //border: 2px solid transparent;
-    
     transition: box-shadow 150ms ease-in-out;
 }
 
@@ -86,34 +80,27 @@
 }
 
 .umb-media-grid__item-image {
-   //max-width: 100% !important;
-   //height: auto;
    position: relative;
-   
    object-fit: contain;
    height: 100%;
 }
 
 .umb-media-grid__item-image-placeholder {
     width: 100%;
-    //max-width: 100%;
-    //height: auto;
     position: relative;
-    
     object-fit: contain;
     height: 100%;
 }
 
 .umb-media-grid__image-background {
     content: "";
-    background: url("../img/checkered-background.png");
-    background-repeat: repeat;
     opacity: 0.5;
     top: 0;
     left: 0;
     bottom: 0;
     right: 0;
     position: absolute;
+    .checkeredBackground();
 }
 
 .umb-media-grid__item-overlay {
@@ -139,19 +126,6 @@
    }
 }
 
-/*
-.umb-media-grid__item.-file .umb-media-grid__item-overlay {
-    opacity: 1;
-    color: @gray-4;
-    background: @white;
-}
-
-.umb-media-grid__item.-file:hover .umb-media-grid__item-overlay,
-.umb-media-grid__item.-file.-selected .umb-media-grid__item-overlay {
-    color: @white;
-    background: @blueExtraDark;
-}
-*/
 .umb-media-grid__info {
     margin-right: 5px;
 }
@@ -181,25 +155,7 @@
    font-size: 40px !important;
    transform: translate(-50%,-50%);
 }
-/*
-.umb-media-grid__checkmark {
-    position: absolute;
-    z-index: 2;
-    top: 10px;
-    left: 10px;
-    width: 26px;
-    height: 26px;
-    border: 2px solid @white;
-    background: @green;
-    border-radius: 50px;
-    box-sizing: border-box;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    color: @white;
-    transition: background 100ms;
-}
-*/
+
 .umb-media-grid__edit {
     position: absolute;
     opacity: 0;
diff --git a/src/Umbraco.Web.UI.Client/src/less/mixins.less b/src/Umbraco.Web.UI.Client/src/less/mixins.less
index ce35097658..60132edab5 100644
--- a/src/Umbraco.Web.UI.Client/src/less/mixins.less
+++ b/src/Umbraco.Web.UI.Client/src/less/mixins.less
@@ -397,11 +397,19 @@
   }
 }
 
-
+.checkeredBackground(@backgroundColor: #eee, @fillColor: #000, @fillOpacity: 0.25) {
+    background-image: url('data:image/svg+xml;charset=utf-8,\
+                        <svg xmlns="http://www.w3.org/2000/svg" width="100" height="100" viewBox="0 0 100 100" fill="@{fillColor}" fill-opacity="@{fillOpacity}" >\
+                            <rect x="50" width="50" height="50" />\
+                            <rect y="50" width="50" height="50" />\
+                        </svg>');
+    background-color: @backgroundColor;
+    background-size: 10px 10px;
+    background-repeat: repeat;
+}
 
 // COMPONENT MIXINS
 // --------------------------------------------------
-
 // Limit width of specific property editors
 .umb-property-editor--limit-width {
     max-width: 800px;
diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
index e920c0ea69..e15f452cae 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -1,5 +1,3 @@
-@checkered-background: url(../img/checkered-background.png);
-
 //
 // Container styles
 // --------------------------------------------------
@@ -356,7 +354,6 @@
     padding: 5px;
     margin: 5px;
     background: @white;
-    //border: 1px solid @gray-10;
     max-width: 100%;
 }
 .umb-mediapicker {
@@ -367,14 +364,9 @@
     
 }
 
-
-
 .umb-mediapicker .umb-sortable-thumbnails li {
     flex-direction: column;
 }
-/*.umb-mediapicker .umb-sortable-thumbnails li.add-wrapper {
-    padding: 0px;
-}*/
 
 .umb-sortable-thumbnails li:hover a {
     display: flex;
@@ -383,11 +375,11 @@
 }
 
 .umb-sortable-thumbnails li img {
-    max-width:100%;
-    max-height:100%;
-    margin:auto;
-    display:block;
-    background-image: @checkered-background;
+    max-width: 100%;
+    max-height: 100%;
+    margin: auto;
+    display: block;
+    .checkeredBackground();
 }
 
 .umb-sortable-thumbnails li .trashed {
@@ -477,8 +469,6 @@
     align-items: center;
     margin-left: 5px;
     text-decoration: none;
-    
-    //border-color: @inputBorder;
     .box-shadow(0 1px 2px rgba(0,0,0,0.25));
 }
 
@@ -618,7 +608,7 @@
 
         .viewport {
             max-width: 600px;
-            background: @checkered-background;
+            .checkeredBackground();
 
             &:hover {
                 cursor: pointer;
@@ -638,7 +628,7 @@
         }
 
         .viewport img {
-            background: @checkered-background;
+            .checkeredBackground();
         }
     }
 
@@ -757,13 +747,13 @@
 }
 
 .umb-fileupload ul {
-  list-style: none;
-  vertical-align: middle;
-  margin-bottom: 0;
+    list-style: none;
+    vertical-align: middle;
+    margin-bottom: 0;
 
-  img {
-    background: @checkered-background;
-  }
+    img {
+        .checkeredBackground();
+    }
 }
 
 .umb-fileupload label {
diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less
index a1dc0ba187..166640829b 100644
--- a/src/Umbraco.Web.UI.Client/src/less/variables.less
+++ b/src/Umbraco.Web.UI.Client/src/less/variables.less
@@ -517,7 +517,7 @@
 @heroUnitLeadColor:               inherit;
 
 
-// alerts
+// Alerts
 // -------------------------
 @warningText:             @white;
 @warningBackground:       @yellow-d2;

From 495ad4c06b802c085cd6ccd6c12deb20f70b9f7e Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bf@oerskov.dk>
Date: Tue, 9 Jul 2019 20:31:46 +0200
Subject: [PATCH 492/776] Add margin before value in listview grid layout

---
 .../src/less/components/umb-content-grid.less                    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less
index 84cfe04263..f27e1e4ec8 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less
@@ -105,6 +105,7 @@
 .umb-content-grid__details-value {
    display: inline-block;
    word-break: break-word;
+   margin-left: 3px;
 }
 
 .umb-content-grid__checkmark {

From 105dd989de3d3271c38de3174f27cbfb1d3e7655 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bf@oerskov.dk>
Date: Tue, 9 Jul 2019 20:31:46 +0200
Subject: [PATCH 493/776] Add margin before value in listview grid layout

(cherry picked from commit 495ad4c06b802c085cd6ccd6c12deb20f70b9f7e)
---
 .../src/less/components/umb-content-grid.less                    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less
index 84cfe04263..f27e1e4ec8 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less
@@ -105,6 +105,7 @@
 .umb-content-grid__details-value {
    display: inline-block;
    word-break: break-word;
+   margin-left: 3px;
 }
 
 .umb-content-grid__checkmark {

From 7664d2df18a8732751e1d220f0291932c2399c44 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Thu, 5 Sep 2019 16:06:59 +0200
Subject: [PATCH 494/776] v8: Fix SVG image preview (#5883)

---
 .../lib/bootstrap/less/thumbnails.less        |   4 +-
 .../upload/umbpropertyfileupload.directive.js |   5 +
 .../common/services/mediahelper.service.js    |   2 +-
 .../src/less/components/umb-media-grid.less   |  46 +++++---
 .../src/less/property-editors.less            | 107 +++++++++++-------
 .../imaging/umb-image-thumbnail.html          |   2 +-
 .../src/views/components/umb-media-grid.html  |   8 +-
 .../upload/umb-property-file-upload.html      |  12 +-
 .../mediapicker/mediapicker.controller.js     |   9 ++
 .../mediapicker/mediapicker.html              |  19 ++--
 10 files changed, 130 insertions(+), 84 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/thumbnails.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/thumbnails.less
index d86f4ed7a9..6ec4bd4439 100644
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/thumbnails.less
+++ b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/thumbnails.less
@@ -41,8 +41,8 @@ a.thumbnail:hover,
 a.thumbnail:focus,
 a div.thumbnail:hover,
 a div.thumbnail:focus {
-  border-color: @turquoise;
-  .box-shadow(0 1px 4px rgba(0,105,214,.25));
+  border-color: @pinkLight;
+  .box-shadow(0 1px 4px rgba(245, 193, 188, .25));
 }
 
 // Images and captions
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbpropertyfileupload.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbpropertyfileupload.directive.js
index e5bdd3ca78..6360b429b9 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbpropertyfileupload.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbpropertyfileupload.directive.js
@@ -176,6 +176,11 @@
         }
 
         function getThumbnail(file) {
+
+            if (file.extension === 'svg') {
+                return file.fileName;
+            }
+
             if (!file.isImage) {
                 return null;
             }
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
index 9350af1c47..c8acdec353 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
@@ -378,7 +378,7 @@ function mediaHelper(umbRequestHelper, $log) {
         getFileExtension: function (filePath) {
 
             if (!filePath) {
-                return false;
+                return null;
             }
 
             var lowered = filePath.toLowerCase();
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
index 7588688108..8c8e4b101c 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
@@ -63,16 +63,34 @@
     }
 }
 
-.umb-media-grid__item-file-icon > span {
-    color: @white;
-    background: @gray-4;
-    padding: 1px 3px;
-    font-size: 10px;
-    line-height: 130%;
-    display: block;
-    margin-top: -30px;
-    margin-left: -10px;
-    position: relative;
+.umb-media-grid__item-file-icon {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    transform: translate(-50%,-50%);
+    position: absolute;
+    top: 45%;
+    left: 50%;
+
+    .umb-media-grid__item-icon {
+        display: flex;
+        flex-direction: column;
+        align-items: flex-start;
+        color: @gray-4;
+        font-size: 50px !important;
+    }
+
+    > span {
+        color: @white;
+        background: @ui-active;
+        padding: 1px 3px;
+        font-size: 10px;
+        line-height: 130%;
+        display: block;
+        margin-top: -15px;
+        margin-left: 5px;
+        position: relative;
+    }
 }
 
 .umb-media-grid__item:hover {
@@ -147,14 +165,6 @@
    text-overflow: ellipsis;
 }
 
-.umb-media-grid__item-icon {
-   color: @gray-4;
-   position: absolute;
-   top: 45%;
-   left: 50%;
-   font-size: 40px !important;
-   transform: translate(-50%,-50%);
-}
 
 .umb-media-grid__edit {
     position: absolute;
diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
index e15f452cae..8c163044aa 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -393,31 +393,40 @@
 
 .umb-sortable-thumbnails .umb-icon-holder {
     text-align: center;
-}
+    display: flex;
+    flex-direction: column;
+    align-items: center;
 
-.umb-sortable-thumbnails .umb-icon-holder .icon {
-    font-size: 40px;
-    line-height: 50px;
-    color: @gray-3;
-    display: block;
-}
+    .file-icon {
+        display: flex;
+        flex-direction: column;
+        align-items: flex-start;
 
-.umb-sortable-thumbnails .umb-icon-holder .file-icon > span {
-    color: @white;
-    background: @gray-4;
-    padding: 1px 3px;
-    font-size: 10px;
-    line-height: 130%;
-    display: block;
-    margin-top: -30px;
-    width: 2em;
-}
+        > .icon {
+            font-size: 50px;
+            line-height: 50px;
+            color: @gray-4;
+            display: block;
+            text-align: center;
+        }
 
-.umb-sortable-thumbnails .umb-icon-holder .file-icon + small {
-    display: block;
-    margin-top: 1em;
-}
+        > span {
+            color: @white;
+            background: @ui-active;
+            padding: 1px 3px;
+            font-size: 10px;
+            line-height: 130%;
+            display: block;
+            margin-top: -25px;
+            min-width: 2em;
+        }
 
+        & + small {
+            display: block;
+            margin-top: 1em;
+        }
+    }
+}
 
 .umb-sortable-thumbnails .umb-sortable-thumbnails__wrapper {
     width: 124px;
@@ -610,6 +619,12 @@
             max-width: 600px;
             .checkeredBackground();
 
+            img {
+                display: block;
+                margin-left: auto;
+                margin-right: auto;
+            }
+
             &:hover {
                 cursor: pointer;
             }
@@ -772,28 +787,38 @@
   padding-top: 27px;
 }
 
-.umb-fileupload .file-icon {
-  display: inline-block;
-  position: relative;
-  padding: 5px 0;
-
-  > .icon {
-    font-size: 70px;
-    line-height: 110%;
-    color: @gray-4;
+.umb-fileupload .umb-icon-holder {
     text-align: center;
-  }
+    display: flex;
+    flex-direction: column;
+    align-items: center;
 
-  > span {
-    color: @white;
-    background: @gray-4;
-    padding: 1px 3px;
-    font-size: 12px;
-    line-height: 130%;
-    position: absolute;
-    top: 45px;
-    left: 10px;
-  }
+    .file-icon {
+        display: flex;
+        flex-direction: column;
+        align-items: flex-start;
+        position: relative;
+        padding: 15px 0;
+
+        > .icon {
+            display: block;
+            font-size: 70px;
+            line-height: 110%;
+            color: @gray-4;
+            text-align: center;
+        }
+
+        > span {
+            color: @white;
+            background: @ui-active;
+            padding: 1px 3px;
+            font-size: 12px;
+            line-height: 130%;
+            display: block;
+            margin-top: -35px;
+            min-width: 2em;
+        }
+    }
 }
 
 .umb-fileupload input {
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/imaging/umb-image-thumbnail.html b/src/Umbraco.Web.UI.Client/src/views/components/imaging/umb-image-thumbnail.html
index 2f3861ae6c..14d09a1623 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/imaging/umb-image-thumbnail.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/imaging/umb-image-thumbnail.html
@@ -1,5 +1,5 @@
 <div class="umb-crop-thumbnail-container"
 	ng-style="{height: height, width: width, overflow: 'hidden', position: 'relative'}"
 	ng-show="loaded">
-	<img ng-src="{{src}}" alt="{{}}" ng-style="preview" class="noScale" />
+	<img ng-src="{{src}}" alt="" ng-style="preview" class="noScale" />
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html
index a91bc8c876..4cc4c105fc 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html
@@ -10,19 +10,19 @@
             </div>
 
             <!-- Check backgrund -->
-            <div class="umb-media-grid__image-background" ng-if="item.thumbnail || item.extension == 'svg'"></div>
+            <div class="umb-media-grid__image-background" ng-if="item.thumbnail || item.extension === 'svg'"></div>
 
             <!-- Image thumbnail -->
             <img class="umb-media-grid__item-image" width="{{item.width}}" height="{{item.height}}" ng-if="item.thumbnail" ng-src="{{item.thumbnail}}" alt="{{item.name}}" draggable="false" />
 
             <!-- SVG -->
-            <img class="umb-media-grid__item-image" width="{{item.width}}" height="{{item.height}}" ng-if="!item.thumbnail && item.extension == 'svg'" ng-src="{{item.image}}" alt="{{item.name}}" draggable="false" />
+            <img class="umb-media-grid__item-image" width="{{item.width}}" height="{{item.height}}" ng-if="!item.thumbnail && item.extension === 'svg'" ng-src="{{item.image}}" alt="{{item.name}}" draggable="false" />
 
             <!-- Transparent image - fallback - used to keep image proportions on wrapper-->
-            <img class="umb-media-grid__item-image-placeholder" ng-if="!item.thumbnail && item.extension != 'svg'" src="assets/img/transparent.png" alt="{{item.name}}" draggable="false" />
+            <img class="umb-media-grid__item-image-placeholder" ng-if="!item.thumbnail && item.extension !== 'svg'" src="assets/img/transparent.png" alt="{{item.name}}" draggable="false" />
 
             <!-- Icon for files -->
-            <span class="umb-media-grid__item-file-icon" ng-if="!item.thumbnail && item.extension != 'svg'">
+            <span class="umb-media-grid__item-file-icon" ng-if="!item.thumbnail && item.extension !== 'svg'">
                 <i class="umb-media-grid__item-icon {{item.icon}}"></i>
                 <span ng-if="item.extension">.{{item.extension}}</span>
             </span>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-property-file-upload.html b/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-property-file-upload.html
index 6c73122464..5f728f47e4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-property-file-upload.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-property-file-upload.html
@@ -15,7 +15,7 @@
 
                 <div class="umb-fileupload clearfix" ng-repeat="file in vm.files">
 
-                    <div class="" ng-if="file.isImage || file.extension == 'svg'">
+                    <div ng-if="file.isImage || file.extension === 'svg'">
                         <div class="gravity-container">
                             <div class="viewport">
                                 <img ng-if="file.isClientSide" ng-src="{{file.fileSrc}}" style="max-width: 100%; max-height: 100%" alt="{{file.fileName}}"/>
@@ -26,21 +26,21 @@
                         </div>
                     </div>
 
-                    <div ng-if="!file.isImage && file.extension != 'svg'">
+                    <div ng-if="!file.isImage && file.extension !== 'svg'">
                         <a class="span6 thumbnail tc" ng-show="!file.isClientSide" ng-href="{{file.fileName}}" target="_blank">
-                            <span class="file-icon-wrap">
+                            <span class="umb-icon-holder">
                                 <span class="file-icon">
                                     <i class="icon icon-document"></i>
-                                    <span>.{{file.extension}}</span>
+                                    <span ng-if="file.extension">.{{file.extension}}</span>
                                 </span>
                             </span>
                             <div>{{file.fileName}}</div>
                         </a>
                         <div class="span6 thumbnail tc" ng-show="file.isClientSide">
-                            <span class="file-icon-wrap">
+                            <span class="umb-icon-holder">
                                 <span class="file-icon">
                                     <i class="icon icon-document"></i>
-                                    <span>.{{file.extension}}</span>
+                                    <span ng-if="file.extension">.{{file.extension}}</span>
                                 </span>
                             </span>
                             <div>{{file.fileName}}</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
index e59e2bb26a..f6447f8144 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
@@ -69,9 +69,18 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
 
                     _.each(medias,
                         function (media, i) {
+
+                            if (!media.extension && media.id && media.metaData) {
+                                media.extension = mediaHelper.getFileExtension(media.metaData.MediaPath);
+                            }
+
                             // if there is no thumbnail, try getting one if the media is not a placeholder item
                             if (!media.thumbnail && media.id && media.metaData) {
                                 media.thumbnail = mediaHelper.resolveFileFromEntity(media, true);
+
+                                if (!media.thumbnail && media.extension === "svg") {
+                                    media.thumbnail = media.metaData.MediaPath;
+                                }
                             }
 
                             $scope.mediaItems.push(media);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
index d2b923b17c..fb9b5d77b7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
@@ -17,24 +17,21 @@
                 </div>
 
                 <!-- IMAGE -->
-                <img ng-if="media.thumbnail"
+                <img ng-if="media.thumbnail && media.extension !== 'svg'"
                      ng-class="{'trashed': media.trashed}" ng-src="{{media.thumbnail}}"
-                     alt="" title="{{media.trashed ? 'Trashed: ' + media.name : media.name}}" />
+                     alt="{{media.name}}" title="{{media.trashed ? 'Trashed: ' + media.name : media.name}}" />
 
                 <!-- SVG -->
-                <img ng-if="!media.thumbnail && media.metaData.umbracoExtension.Value === 'svg'"
-                     ng-class="{'trashed': media.trashed}" ng-src="{{media.metaData.umbracoFile.Value}}"
-                     alt="" title="{{media.trashed ? 'Trashed: ' + media.name : media.name}}" />
-                <img ng-if="!media.thumbnail && media.metaData.umbracoExtension.Value !== 'svg' && media.extension === 'svg'"
-                     ng-class="{'trashed': media.trashed}" ng-src="{{media.file}}"
-                     alt=""
+                <img ng-if="media.thumbnail && media.extension === 'svg'"
+                     ng-class="{'trashed': media.trashed}" ng-src="{{media.thumbnail}}"
+                     alt="{{media.name}}"
                      title="{{media.trashed ? 'Trashed: ' + media.name : media.name}}" />
 
                 <!-- FILE -->
-                <div ng-class="{'trashed': media.trashed}" class="umb-icon-holder" ng-hide="media.thumbnail || media.metaData.umbracoExtension.Value === 'svg' || media.extension === 'svg'">
+                <div ng-class="{'trashed': media.trashed}" class="umb-icon-holder" ng-hide="media.thumbnail">
                     <span class="file-icon">
-                        <i class="icon {{media.icon}} large"></i>
-                        <span>.{{media.metaData.umbracoExtension.Value}}</span>
+                        <i class="icon {{media.icon}}"></i>
+                        <span ng-if="media.extension">.{{media.extension}}</span>
                     </span>
                     <small>{{media.name}}</small>
                 </div>

From 046516972776fa81a27988a550aa87871796d229 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Thu, 5 Sep 2019 16:06:59 +0200
Subject: [PATCH 495/776] v8: Fix SVG image preview (#5883)

(cherry picked from commit 7664d2df18a8732751e1d220f0291932c2399c44)

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
---
 .../lib/bootstrap/less/thumbnails.less        |   4 +-
 .../upload/umbpropertyfileupload.directive.js |   5 +
 .../common/services/mediahelper.service.js    |   2 +-
 .../src/less/components/umb-media-grid.less   |  66 +++++------
 .../src/less/property-editors.less            | 107 +++++++++++-------
 .../imaging/umb-image-thumbnail.html          |   2 +-
 .../src/views/components/umb-media-grid.html  |   8 +-
 .../upload/umb-property-file-upload.html      |  12 +-
 .../mediapicker/mediapicker.controller.js     |   9 ++
 .../mediapicker/mediapicker.html              |  19 ++--
 10 files changed, 131 insertions(+), 103 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/thumbnails.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/thumbnails.less
index d86f4ed7a9..6ec4bd4439 100644
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/thumbnails.less
+++ b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/thumbnails.less
@@ -41,8 +41,8 @@ a.thumbnail:hover,
 a.thumbnail:focus,
 a div.thumbnail:hover,
 a div.thumbnail:focus {
-  border-color: @turquoise;
-  .box-shadow(0 1px 4px rgba(0,105,214,.25));
+  border-color: @pinkLight;
+  .box-shadow(0 1px 4px rgba(245, 193, 188, .25));
 }
 
 // Images and captions
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbpropertyfileupload.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbpropertyfileupload.directive.js
index e5bdd3ca78..6360b429b9 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbpropertyfileupload.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbpropertyfileupload.directive.js
@@ -176,6 +176,11 @@
         }
 
         function getThumbnail(file) {
+
+            if (file.extension === 'svg') {
+                return file.fileName;
+            }
+
             if (!file.isImage) {
                 return null;
             }
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
index 9350af1c47..c8acdec353 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
@@ -378,7 +378,7 @@ function mediaHelper(umbRequestHelper, $log) {
         getFileExtension: function (filePath) {
 
             if (!filePath) {
-                return false;
+                return null;
             }
 
             var lowered = filePath.toLowerCase();
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
index 68973b4c7c..86fea067e7 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
@@ -69,16 +69,34 @@
     }
 }
 
-.umb-media-grid__item-file-icon > span {
-    color: @white;
-    background: @gray-4;
-    padding: 1px 3px;
-    font-size: 10px;
-    line-height: 130%;
-    display: block;
-    margin-top: -30px;
-    margin-left: -10px;
-    position: relative;
+.umb-media-grid__item-file-icon {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    transform: translate(-50%,-50%);
+    position: absolute;
+    top: 45%;
+    left: 50%;
+
+    .umb-media-grid__item-icon {
+        display: flex;
+        flex-direction: column;
+        align-items: flex-start;
+        color: @gray-4;
+        font-size: 50px !important;
+    }
+
+    > span {
+        color: @white;
+        background: @ui-active;
+        padding: 1px 3px;
+        font-size: 10px;
+        line-height: 130%;
+        display: block;
+        margin-top: -15px;
+        margin-left: 5px;
+        position: relative;
+    }
 }
 
 .umb-media-grid__item:hover {
@@ -173,33 +191,7 @@
    text-overflow: ellipsis;
 }
 
-.umb-media-grid__item-icon {
-   color: @gray-4;
-   position: absolute;
-   top: 45%;
-   left: 50%;
-   font-size: 40px !important;
-   transform: translate(-50%,-50%);
-}
-/*
-.umb-media-grid__checkmark {
-    position: absolute;
-    z-index: 2;
-    top: 10px;
-    left: 10px;
-    width: 26px;
-    height: 26px;
-    border: 2px solid @white;
-    background: @green;
-    border-radius: 50px;
-    box-sizing: border-box;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    color: @white;
-    transition: background 100ms;
-}
-*/
+
 .umb-media-grid__edit {
     position: absolute;
     opacity: 0;
diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
index 0327d5139d..8f9c18f05c 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -403,31 +403,40 @@
 
 .umb-sortable-thumbnails .umb-icon-holder {
     text-align: center;
-}
+    display: flex;
+    flex-direction: column;
+    align-items: center;
 
-.umb-sortable-thumbnails .umb-icon-holder .icon {
-    font-size: 40px;
-    line-height: 50px;
-    color: @gray-3;
-    display: block;
-}
+    .file-icon {
+        display: flex;
+        flex-direction: column;
+        align-items: flex-start;
 
-.umb-sortable-thumbnails .umb-icon-holder .file-icon > span {
-    color: @white;
-    background: @gray-4;
-    padding: 1px 3px;
-    font-size: 10px;
-    line-height: 130%;
-    display: block;
-    margin-top: -30px;
-    width: 2em;
-}
+        > .icon {
+            font-size: 50px;
+            line-height: 50px;
+            color: @gray-4;
+            display: block;
+            text-align: center;
+        }
 
-.umb-sortable-thumbnails .umb-icon-holder .file-icon + small {
-    display: block;
-    margin-top: 1em;
-}
+        > span {
+            color: @white;
+            background: @ui-active;
+            padding: 1px 3px;
+            font-size: 10px;
+            line-height: 130%;
+            display: block;
+            margin-top: -25px;
+            min-width: 2em;
+        }
 
+        & + small {
+            display: block;
+            margin-top: 1em;
+        }
+    }
+}
 
 .umb-sortable-thumbnails .umb-sortable-thumbnails__wrapper {
     width: 124px;
@@ -622,6 +631,12 @@
             max-width: 600px;
             background: @checkered-background;
 
+            img {
+                display: block;
+                margin-left: auto;
+                margin-right: auto;
+            }
+
             &:hover {
                 cursor: pointer;
             }
@@ -784,28 +799,38 @@
   padding-top: 27px;
 }
 
-.umb-fileupload .file-icon {
-  display: inline-block;
-  position: relative;
-  padding: 5px 0;
-
-  > .icon {
-    font-size: 70px;
-    line-height: 110%;
-    color: @gray-4;
+.umb-fileupload .umb-icon-holder {
     text-align: center;
-  }
+    display: flex;
+    flex-direction: column;
+    align-items: center;
 
-  > span {
-    color: @white;
-    background: @gray-4;
-    padding: 1px 3px;
-    font-size: 12px;
-    line-height: 130%;
-    position: absolute;
-    top: 45px;
-    left: 10px;
-  }
+    .file-icon {
+        display: flex;
+        flex-direction: column;
+        align-items: flex-start;
+        position: relative;
+        padding: 15px 0;
+
+        > .icon {
+            display: block;
+            font-size: 70px;
+            line-height: 110%;
+            color: @gray-4;
+            text-align: center;
+        }
+
+        > span {
+            color: @white;
+            background: @ui-active;
+            padding: 1px 3px;
+            font-size: 12px;
+            line-height: 130%;
+            display: block;
+            margin-top: -35px;
+            min-width: 2em;
+        }
+    }
 }
 
 .umb-fileupload input {
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/imaging/umb-image-thumbnail.html b/src/Umbraco.Web.UI.Client/src/views/components/imaging/umb-image-thumbnail.html
index 2f3861ae6c..14d09a1623 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/imaging/umb-image-thumbnail.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/imaging/umb-image-thumbnail.html
@@ -1,5 +1,5 @@
 <div class="umb-crop-thumbnail-container"
 	ng-style="{height: height, width: width, overflow: 'hidden', position: 'relative'}"
 	ng-show="loaded">
-	<img ng-src="{{src}}" alt="{{}}" ng-style="preview" class="noScale" />
+	<img ng-src="{{src}}" alt="" ng-style="preview" class="noScale" />
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html
index a91bc8c876..4cc4c105fc 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html
@@ -10,19 +10,19 @@
             </div>
 
             <!-- Check backgrund -->
-            <div class="umb-media-grid__image-background" ng-if="item.thumbnail || item.extension == 'svg'"></div>
+            <div class="umb-media-grid__image-background" ng-if="item.thumbnail || item.extension === 'svg'"></div>
 
             <!-- Image thumbnail -->
             <img class="umb-media-grid__item-image" width="{{item.width}}" height="{{item.height}}" ng-if="item.thumbnail" ng-src="{{item.thumbnail}}" alt="{{item.name}}" draggable="false" />
 
             <!-- SVG -->
-            <img class="umb-media-grid__item-image" width="{{item.width}}" height="{{item.height}}" ng-if="!item.thumbnail && item.extension == 'svg'" ng-src="{{item.image}}" alt="{{item.name}}" draggable="false" />
+            <img class="umb-media-grid__item-image" width="{{item.width}}" height="{{item.height}}" ng-if="!item.thumbnail && item.extension === 'svg'" ng-src="{{item.image}}" alt="{{item.name}}" draggable="false" />
 
             <!-- Transparent image - fallback - used to keep image proportions on wrapper-->
-            <img class="umb-media-grid__item-image-placeholder" ng-if="!item.thumbnail && item.extension != 'svg'" src="assets/img/transparent.png" alt="{{item.name}}" draggable="false" />
+            <img class="umb-media-grid__item-image-placeholder" ng-if="!item.thumbnail && item.extension !== 'svg'" src="assets/img/transparent.png" alt="{{item.name}}" draggable="false" />
 
             <!-- Icon for files -->
-            <span class="umb-media-grid__item-file-icon" ng-if="!item.thumbnail && item.extension != 'svg'">
+            <span class="umb-media-grid__item-file-icon" ng-if="!item.thumbnail && item.extension !== 'svg'">
                 <i class="umb-media-grid__item-icon {{item.icon}}"></i>
                 <span ng-if="item.extension">.{{item.extension}}</span>
             </span>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-property-file-upload.html b/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-property-file-upload.html
index 6c73122464..5f728f47e4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-property-file-upload.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-property-file-upload.html
@@ -15,7 +15,7 @@
 
                 <div class="umb-fileupload clearfix" ng-repeat="file in vm.files">
 
-                    <div class="" ng-if="file.isImage || file.extension == 'svg'">
+                    <div ng-if="file.isImage || file.extension === 'svg'">
                         <div class="gravity-container">
                             <div class="viewport">
                                 <img ng-if="file.isClientSide" ng-src="{{file.fileSrc}}" style="max-width: 100%; max-height: 100%" alt="{{file.fileName}}"/>
@@ -26,21 +26,21 @@
                         </div>
                     </div>
 
-                    <div ng-if="!file.isImage && file.extension != 'svg'">
+                    <div ng-if="!file.isImage && file.extension !== 'svg'">
                         <a class="span6 thumbnail tc" ng-show="!file.isClientSide" ng-href="{{file.fileName}}" target="_blank">
-                            <span class="file-icon-wrap">
+                            <span class="umb-icon-holder">
                                 <span class="file-icon">
                                     <i class="icon icon-document"></i>
-                                    <span>.{{file.extension}}</span>
+                                    <span ng-if="file.extension">.{{file.extension}}</span>
                                 </span>
                             </span>
                             <div>{{file.fileName}}</div>
                         </a>
                         <div class="span6 thumbnail tc" ng-show="file.isClientSide">
-                            <span class="file-icon-wrap">
+                            <span class="umb-icon-holder">
                                 <span class="file-icon">
                                     <i class="icon icon-document"></i>
-                                    <span>.{{file.extension}}</span>
+                                    <span ng-if="file.extension">.{{file.extension}}</span>
                                 </span>
                             </span>
                             <div>{{file.fileName}}</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
index e59e2bb26a..f6447f8144 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
@@ -69,9 +69,18 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
 
                     _.each(medias,
                         function (media, i) {
+
+                            if (!media.extension && media.id && media.metaData) {
+                                media.extension = mediaHelper.getFileExtension(media.metaData.MediaPath);
+                            }
+
                             // if there is no thumbnail, try getting one if the media is not a placeholder item
                             if (!media.thumbnail && media.id && media.metaData) {
                                 media.thumbnail = mediaHelper.resolveFileFromEntity(media, true);
+
+                                if (!media.thumbnail && media.extension === "svg") {
+                                    media.thumbnail = media.metaData.MediaPath;
+                                }
                             }
 
                             $scope.mediaItems.push(media);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
index d2b923b17c..fb9b5d77b7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
@@ -17,24 +17,21 @@
                 </div>
 
                 <!-- IMAGE -->
-                <img ng-if="media.thumbnail"
+                <img ng-if="media.thumbnail && media.extension !== 'svg'"
                      ng-class="{'trashed': media.trashed}" ng-src="{{media.thumbnail}}"
-                     alt="" title="{{media.trashed ? 'Trashed: ' + media.name : media.name}}" />
+                     alt="{{media.name}}" title="{{media.trashed ? 'Trashed: ' + media.name : media.name}}" />
 
                 <!-- SVG -->
-                <img ng-if="!media.thumbnail && media.metaData.umbracoExtension.Value === 'svg'"
-                     ng-class="{'trashed': media.trashed}" ng-src="{{media.metaData.umbracoFile.Value}}"
-                     alt="" title="{{media.trashed ? 'Trashed: ' + media.name : media.name}}" />
-                <img ng-if="!media.thumbnail && media.metaData.umbracoExtension.Value !== 'svg' && media.extension === 'svg'"
-                     ng-class="{'trashed': media.trashed}" ng-src="{{media.file}}"
-                     alt=""
+                <img ng-if="media.thumbnail && media.extension === 'svg'"
+                     ng-class="{'trashed': media.trashed}" ng-src="{{media.thumbnail}}"
+                     alt="{{media.name}}"
                      title="{{media.trashed ? 'Trashed: ' + media.name : media.name}}" />
 
                 <!-- FILE -->
-                <div ng-class="{'trashed': media.trashed}" class="umb-icon-holder" ng-hide="media.thumbnail || media.metaData.umbracoExtension.Value === 'svg' || media.extension === 'svg'">
+                <div ng-class="{'trashed': media.trashed}" class="umb-icon-holder" ng-hide="media.thumbnail">
                     <span class="file-icon">
-                        <i class="icon {{media.icon}} large"></i>
-                        <span>.{{media.metaData.umbracoExtension.Value}}</span>
+                        <i class="icon {{media.icon}}"></i>
+                        <span ng-if="media.extension">.{{media.extension}}</span>
                     </span>
                     <small>{{media.name}}</small>
                 </div>

From 0e3f324cb0778ad8dc9ae9e8e4d569b9579e15b4 Mon Sep 17 00:00:00 2001
From: Poornima Nayar <poornimakrishnav@gmail.com>
Date: Sat, 31 Aug 2019 00:20:54 +0100
Subject: [PATCH 496/776] fix the left margin which causes a space in the help
 drawer article titles and tour titles

---
 .../src/less/components/application/umb-drawer.less              | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-drawer.less b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-drawer.less
index 8c3b059a94..064ad67438 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-drawer.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-drawer.less
@@ -194,7 +194,6 @@
 .umb-help-list-item__title {
     font-size: 14px;
     display: block;
-    margin-left: 26px;
 }
 
 .umb-help-list-item__description {

From c594377c055054de288345afc5380a0cc8010324 Mon Sep 17 00:00:00 2001
From: Poornima Nayar <poornimakrishnav@gmail.com>
Date: Sat, 31 Aug 2019 00:20:54 +0100
Subject: [PATCH 497/776] fix the left margin which causes a space in the help
 drawer article titles and tour titles

(cherry picked from commit 0e3f324cb0778ad8dc9ae9e8e4d569b9579e15b4)
---
 .../src/less/components/application/umb-drawer.less              | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-drawer.less b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-drawer.less
index 8c3b059a94..064ad67438 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-drawer.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-drawer.less
@@ -194,7 +194,6 @@
 .umb-help-list-item__title {
     font-size: 14px;
     display: block;
-    margin-left: 26px;
 }
 
 .umb-help-list-item__description {

From 088abae3145448ecd61e72b43e04eee620e05bfa Mon Sep 17 00:00:00 2001
From: Poornima Nayar <poornimakrishnav@gmail.com>
Date: Thu, 29 Aug 2019 22:09:25 +0100
Subject: [PATCH 498/776] Maxlength attribute on macro name

---
 src/Umbraco.Web.UI.Client/src/views/macros/create.html |  3 ++-
 src/Umbraco.Web/Editors/MacrosController.cs            | 10 ++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/macros/create.html b/src/Umbraco.Web.UI.Client/src/views/macros/create.html
index 9406c71064..bed989f571 100644
--- a/src/Umbraco.Web.UI.Client/src/views/macros/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/macros/create.html
@@ -19,7 +19,8 @@
                 </div>
 
                 <umb-control-group label="@macro_enterMacroName" hide-label="false">
-                    <input type="text" name="itemKey" ng-model="vm.itemKey" class="umb-textstring textstring input-block-level" umb-auto-focus required />
+                    <input type="text" name="itemKey" ng-model="vm.itemKey" class="umb-textstring textstring input-block-level"
+                           umb-auto-focus required maxlength="255" />
                 </umb-control-group>
 
                 <button type="submit" class="btn btn-primary"><localize key="general_create">Create</localize></button>
diff --git a/src/Umbraco.Web/Editors/MacrosController.cs b/src/Umbraco.Web/Editors/MacrosController.cs
index d7d50236d5..429e8b6190 100644
--- a/src/Umbraco.Web/Editors/MacrosController.cs
+++ b/src/Umbraco.Web/Editors/MacrosController.cs
@@ -62,6 +62,11 @@ namespace Umbraco.Web.Editors
                 return this.ReturnErrorResponse("Macro with this alias already exists");
             }
 
+            if (name == null || name.Length > 255)
+            {
+                return this.ReturnErrorResponse("Name cannnot be more than 255 characters in length.");
+            }
+
             try
             {
                 var macro = new Macro
@@ -149,6 +154,11 @@ namespace Umbraco.Web.Editors
                 return this.ReturnErrorResponse($"No macro data found in request");
             }
 
+            if (macroDisplay.Name == null || macroDisplay.Name.Length > 255)
+            {
+                return this.ReturnErrorResponse("Name cannnot be more than 255 characters in length.");
+            }
+
             var macro = _macroService.GetById(int.Parse(macroDisplay.Id.ToString()));
 
             if (macro == null)

From b7e75daa75e1582de71f43450ac08f03f463bad1 Mon Sep 17 00:00:00 2001
From: Poornima Nayar <poornimakrishnav@gmail.com>
Date: Thu, 29 Aug 2019 22:09:25 +0100
Subject: [PATCH 499/776] Maxlength attribute on macro name

(cherry picked from commit 088abae3145448ecd61e72b43e04eee620e05bfa)
---
 src/Umbraco.Web.UI.Client/src/views/macros/create.html |  3 ++-
 src/Umbraco.Web/Editors/MacrosController.cs            | 10 ++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/macros/create.html b/src/Umbraco.Web.UI.Client/src/views/macros/create.html
index 9406c71064..bed989f571 100644
--- a/src/Umbraco.Web.UI.Client/src/views/macros/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/macros/create.html
@@ -19,7 +19,8 @@
                 </div>
 
                 <umb-control-group label="@macro_enterMacroName" hide-label="false">
-                    <input type="text" name="itemKey" ng-model="vm.itemKey" class="umb-textstring textstring input-block-level" umb-auto-focus required />
+                    <input type="text" name="itemKey" ng-model="vm.itemKey" class="umb-textstring textstring input-block-level"
+                           umb-auto-focus required maxlength="255" />
                 </umb-control-group>
 
                 <button type="submit" class="btn btn-primary"><localize key="general_create">Create</localize></button>
diff --git a/src/Umbraco.Web/Editors/MacrosController.cs b/src/Umbraco.Web/Editors/MacrosController.cs
index d7d50236d5..429e8b6190 100644
--- a/src/Umbraco.Web/Editors/MacrosController.cs
+++ b/src/Umbraco.Web/Editors/MacrosController.cs
@@ -62,6 +62,11 @@ namespace Umbraco.Web.Editors
                 return this.ReturnErrorResponse("Macro with this alias already exists");
             }
 
+            if (name == null || name.Length > 255)
+            {
+                return this.ReturnErrorResponse("Name cannnot be more than 255 characters in length.");
+            }
+
             try
             {
                 var macro = new Macro
@@ -149,6 +154,11 @@ namespace Umbraco.Web.Editors
                 return this.ReturnErrorResponse($"No macro data found in request");
             }
 
+            if (macroDisplay.Name == null || macroDisplay.Name.Length > 255)
+            {
+                return this.ReturnErrorResponse("Name cannnot be more than 255 characters in length.");
+            }
+
             var macro = _macroService.GetById(int.Parse(macroDisplay.Id.ToString()));
 
             if (macro == null)

From 79f8dc200a3d4f3262316de03783b8d286499fac Mon Sep 17 00:00:00 2001
From: Poornima Nayar <poornimakrishnav@gmail.com>
Date: Thu, 29 Aug 2019 17:04:42 +0100
Subject: [PATCH 500/776] Friendly exception message when datatype with name
 more than 255 characters is saved

---
 src/Umbraco.Core/Services/Implement/DataTypeService.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Umbraco.Core/Services/Implement/DataTypeService.cs b/src/Umbraco.Core/Services/Implement/DataTypeService.cs
index 3552b2d8fc..dc998b18dd 100644
--- a/src/Umbraco.Core/Services/Implement/DataTypeService.cs
+++ b/src/Umbraco.Core/Services/Implement/DataTypeService.cs
@@ -349,6 +349,11 @@ namespace Umbraco.Core.Services.Implement
                     throw new ArgumentException("Cannot save datatype with empty name.");
                 }
 
+                if (dataType.Name != null && dataType.Name.Length > 255)
+                {
+                    throw new InvalidOperationException("Name cannot be more than 255 characters in length.");
+                }
+
                 _dataTypeRepository.Save(dataType);
 
                 saveEventArgs.CanCancel = false;

From d2efcc822d7361fd915833cf7d09f6f4eb8c7a45 Mon Sep 17 00:00:00 2001
From: Poornima Nayar <poornimakrishnav@gmail.com>
Date: Thu, 29 Aug 2019 17:22:23 +0100
Subject: [PATCH 501/776] Better exception message on media type save

---
 .../ContentTypeServiceBaseOfTRepositoryTItemTService.cs      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs b/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs
index 1f1f0d9ac3..6ac8e1404a 100644
--- a/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs
@@ -390,6 +390,11 @@ namespace Umbraco.Core.Services.Implement
                 if (string.IsNullOrWhiteSpace(item.Name))
                     throw new ArgumentException("Cannot save item with empty name.");
 
+                if (item.Name != null && item.Name.Length > 255)
+                {
+                    throw new InvalidOperationException("Name cannot be more than 255 characters in length.");
+                }
+
                 scope.WriteLock(WriteLockIds);
 
                 // validate the DAG transform, within the lock

From 7d3655c78c99c5ef6f235f0d092b6c08853e11ff Mon Sep 17 00:00:00 2001
From: Poornima Nayar <poornimakrishnav@gmail.com>
Date: Thu, 29 Aug 2019 17:41:55 +0100
Subject: [PATCH 502/776] better exception message on content type save

---
 src/Umbraco.Core/Services/Implement/FileService.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Umbraco.Core/Services/Implement/FileService.cs b/src/Umbraco.Core/Services/Implement/FileService.cs
index 79d5b35775..26a24e9b98 100644
--- a/src/Umbraco.Core/Services/Implement/FileService.cs
+++ b/src/Umbraco.Core/Services/Implement/FileService.cs
@@ -358,6 +358,11 @@ namespace Umbraco.Core.Services.Implement
                 { "ContentTypeAlias", contentTypeAlias },
             };
 
+            if (contentTypeAlias != null && contentTypeAlias.Length > 255)
+            {
+                throw new InvalidOperationException("Name cannot be more than 255 characters in length.");
+            }
+
             // check that the template hasn't been created on disk before creating the content type
             // if it exists, set the new template content to the existing file content
             string content = GetViewContent(contentTypeAlias);
@@ -365,7 +370,10 @@ namespace Umbraco.Core.Services.Implement
             {
                 template.Content = content;
             }
+
             
+
+
             using (var scope = ScopeProvider.CreateScope())
             {
                 var saveEventArgs = new SaveEventArgs<ITemplate>(template, true, evtMsgs, additionalData);

From 2024681a2634d5e70e8fcaa1d63663b37bfde546 Mon Sep 17 00:00:00 2001
From: Poornima Nayar <poornimakrishnav@gmail.com>
Date: Thu, 29 Aug 2019 17:04:42 +0100
Subject: [PATCH 503/776] Friendly exception message when datatype with name
 more than 255 characters is saved

(cherry picked from commit 79f8dc200a3d4f3262316de03783b8d286499fac)
---
 src/Umbraco.Core/Services/Implement/DataTypeService.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Umbraco.Core/Services/Implement/DataTypeService.cs b/src/Umbraco.Core/Services/Implement/DataTypeService.cs
index 3552b2d8fc..dc998b18dd 100644
--- a/src/Umbraco.Core/Services/Implement/DataTypeService.cs
+++ b/src/Umbraco.Core/Services/Implement/DataTypeService.cs
@@ -349,6 +349,11 @@ namespace Umbraco.Core.Services.Implement
                     throw new ArgumentException("Cannot save datatype with empty name.");
                 }
 
+                if (dataType.Name != null && dataType.Name.Length > 255)
+                {
+                    throw new InvalidOperationException("Name cannot be more than 255 characters in length.");
+                }
+
                 _dataTypeRepository.Save(dataType);
 
                 saveEventArgs.CanCancel = false;

From cafd07fd010090713d76763ef63a2f56e1c6d712 Mon Sep 17 00:00:00 2001
From: Poornima Nayar <poornimakrishnav@gmail.com>
Date: Thu, 29 Aug 2019 17:22:23 +0100
Subject: [PATCH 504/776] Better exception message on media type save

(cherry picked from commit d2efcc822d7361fd915833cf7d09f6f4eb8c7a45)
---
 .../ContentTypeServiceBaseOfTRepositoryTItemTService.cs      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs b/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs
index 1f1f0d9ac3..6ac8e1404a 100644
--- a/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs
@@ -390,6 +390,11 @@ namespace Umbraco.Core.Services.Implement
                 if (string.IsNullOrWhiteSpace(item.Name))
                     throw new ArgumentException("Cannot save item with empty name.");
 
+                if (item.Name != null && item.Name.Length > 255)
+                {
+                    throw new InvalidOperationException("Name cannot be more than 255 characters in length.");
+                }
+
                 scope.WriteLock(WriteLockIds);
 
                 // validate the DAG transform, within the lock

From 890281b271b4fda844dd078cc15ade48c30e79be Mon Sep 17 00:00:00 2001
From: Poornima Nayar <poornimakrishnav@gmail.com>
Date: Thu, 29 Aug 2019 17:41:55 +0100
Subject: [PATCH 505/776] better exception message on content type save

(cherry picked from commit 7d3655c78c99c5ef6f235f0d092b6c08853e11ff)
---
 src/Umbraco.Core/Services/Implement/FileService.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Umbraco.Core/Services/Implement/FileService.cs b/src/Umbraco.Core/Services/Implement/FileService.cs
index 79d5b35775..26a24e9b98 100644
--- a/src/Umbraco.Core/Services/Implement/FileService.cs
+++ b/src/Umbraco.Core/Services/Implement/FileService.cs
@@ -358,6 +358,11 @@ namespace Umbraco.Core.Services.Implement
                 { "ContentTypeAlias", contentTypeAlias },
             };
 
+            if (contentTypeAlias != null && contentTypeAlias.Length > 255)
+            {
+                throw new InvalidOperationException("Name cannot be more than 255 characters in length.");
+            }
+
             // check that the template hasn't been created on disk before creating the content type
             // if it exists, set the new template content to the existing file content
             string content = GetViewContent(contentTypeAlias);
@@ -365,7 +370,10 @@ namespace Umbraco.Core.Services.Implement
             {
                 template.Content = content;
             }
+
             
+
+
             using (var scope = ScopeProvider.CreateScope())
             {
                 var saveEventArgs = new SaveEventArgs<ITemplate>(template, true, evtMsgs, additionalData);

From e0d4168f3f70351226135904d8d84aea9f028ea4 Mon Sep 17 00:00:00 2001
From: Poornima Nayar <poornimakrishnav@gmail.com>
Date: Thu, 29 Aug 2019 16:32:53 +0100
Subject: [PATCH 506/776] Show a friendly exception message when the media name
 exceeds 255 characters

---
 .../Services/Implement/MediaService.cs        | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Core/Services/Implement/MediaService.cs b/src/Umbraco.Core/Services/Implement/MediaService.cs
index ab075c4ade..e9fdedbf33 100644
--- a/src/Umbraco.Core/Services/Implement/MediaService.cs
+++ b/src/Umbraco.Core/Services/Implement/MediaService.cs
@@ -139,6 +139,10 @@ namespace Umbraco.Core.Services.Implement
             var parent = parentId > 0 ? GetById(parentId) : null;
             if (parentId > 0 && parent == null)
                 throw new ArgumentException("No media with that id.", nameof(parentId));
+            if (name != null && name.Length > 255)
+            {
+                throw new InvalidOperationException("Name cannot be more than 255 characters in length."); throw new InvalidOperationException("Name cannot be more than 255 characters in length.");
+            }
 
             var media = new Models.Media(name, parentId, mediaType);
             using (var scope = ScopeProvider.CreateScope())
@@ -168,6 +172,10 @@ namespace Umbraco.Core.Services.Implement
             var mediaType = GetMediaType(mediaTypeAlias);
             if (mediaType == null)
                 throw new ArgumentException("No media type with that alias.", nameof(mediaTypeAlias));
+            if (name != null && name.Length > 255)
+            {
+                throw new InvalidOperationException("Name cannot be more than 255 characters in length."); throw new InvalidOperationException("Name cannot be more than 255 characters in length.");
+            }
 
             var media = new Models.Media(name, -1, mediaType);
             using (var scope = ScopeProvider.CreateScope())
@@ -202,6 +210,10 @@ namespace Umbraco.Core.Services.Implement
                 var mediaType = GetMediaType(mediaTypeAlias);
                 if (mediaType == null)
                     throw new ArgumentException("No media type with that alias.", nameof(mediaTypeAlias)); // causes rollback
+                if (name != null && name.Length > 255)
+                {
+                    throw new InvalidOperationException("Name cannot be more than 255 characters in length."); throw new InvalidOperationException("Name cannot be more than 255 characters in length.");
+                }
 
                 var media = new Models.Media(name, parent, mediaType);
                 CreateMedia(scope, media, parent, userId, false);
@@ -648,6 +660,11 @@ namespace Umbraco.Core.Services.Implement
                 if (string.IsNullOrWhiteSpace(media.Name))
                     throw new ArgumentException("Media has no name.", nameof(media));
 
+                if (media.Name != null && media.Name.Length > 255)
+                {
+                    throw new InvalidOperationException("Name cannot be more than 255 characters in length."); throw new InvalidOperationException("Name cannot be more than 255 characters in length.");
+                }
+
                 scope.WriteLock(Constants.Locks.MediaTree);
                 if (media.HasIdentity == false)
                     media.CreatorId = userId;
@@ -760,7 +777,7 @@ namespace Umbraco.Core.Services.Implement
             const int pageSize = 500;
             var page = 0;
             var total = long.MaxValue;
-            while(page * pageSize < total)
+            while (page * pageSize < total)
             {
                 //get descendants - ordered from deepest to shallowest
                 var descendants = GetPagedDescendants(media.Id, page, pageSize, out total, ordering: Ordering.By("Path", Direction.Descending));
@@ -945,7 +962,7 @@ namespace Umbraco.Core.Services.Implement
                 // if media was trashed, and since we're not moving to the recycle bin,
                 // indicate that the trashed status should be changed to false, else just
                 // leave it unchanged
-                var trashed = media.Trashed ? false : (bool?) null;
+                var trashed = media.Trashed ? false : (bool?)null;
 
                 PerformMoveLocked(media, parentId, parent, userId, moves, trashed);
                 scope.Events.Dispatch(TreeChanged, this, new TreeChange<IMedia>(media, TreeChangeTypes.RefreshBranch).ToEventArgs());
@@ -1009,7 +1026,7 @@ namespace Umbraco.Core.Services.Implement
 
         private void PerformMoveMediaLocked(IMedia media, int userId, bool? trash)
         {
-            if (trash.HasValue) ((ContentBase) media).Trashed = trash.Value;
+            if (trash.HasValue) ((ContentBase)media).Trashed = trash.Value;
             _mediaRepository.Save(media);
         }
 

From d044dd07c3ab92b3606d924ff7e6534866406c6d Mon Sep 17 00:00:00 2001
From: Poornima Nayar <poornimakrishnav@gmail.com>
Date: Thu, 29 Aug 2019 16:32:53 +0100
Subject: [PATCH 507/776] Show a friendly exception message when the media name
 exceeds 255 characters

(cherry picked from commit e0d4168f3f70351226135904d8d84aea9f028ea4)
---
 .../Services/Implement/MediaService.cs        | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Core/Services/Implement/MediaService.cs b/src/Umbraco.Core/Services/Implement/MediaService.cs
index ab075c4ade..e9fdedbf33 100644
--- a/src/Umbraco.Core/Services/Implement/MediaService.cs
+++ b/src/Umbraco.Core/Services/Implement/MediaService.cs
@@ -139,6 +139,10 @@ namespace Umbraco.Core.Services.Implement
             var parent = parentId > 0 ? GetById(parentId) : null;
             if (parentId > 0 && parent == null)
                 throw new ArgumentException("No media with that id.", nameof(parentId));
+            if (name != null && name.Length > 255)
+            {
+                throw new InvalidOperationException("Name cannot be more than 255 characters in length."); throw new InvalidOperationException("Name cannot be more than 255 characters in length.");
+            }
 
             var media = new Models.Media(name, parentId, mediaType);
             using (var scope = ScopeProvider.CreateScope())
@@ -168,6 +172,10 @@ namespace Umbraco.Core.Services.Implement
             var mediaType = GetMediaType(mediaTypeAlias);
             if (mediaType == null)
                 throw new ArgumentException("No media type with that alias.", nameof(mediaTypeAlias));
+            if (name != null && name.Length > 255)
+            {
+                throw new InvalidOperationException("Name cannot be more than 255 characters in length."); throw new InvalidOperationException("Name cannot be more than 255 characters in length.");
+            }
 
             var media = new Models.Media(name, -1, mediaType);
             using (var scope = ScopeProvider.CreateScope())
@@ -202,6 +210,10 @@ namespace Umbraco.Core.Services.Implement
                 var mediaType = GetMediaType(mediaTypeAlias);
                 if (mediaType == null)
                     throw new ArgumentException("No media type with that alias.", nameof(mediaTypeAlias)); // causes rollback
+                if (name != null && name.Length > 255)
+                {
+                    throw new InvalidOperationException("Name cannot be more than 255 characters in length."); throw new InvalidOperationException("Name cannot be more than 255 characters in length.");
+                }
 
                 var media = new Models.Media(name, parent, mediaType);
                 CreateMedia(scope, media, parent, userId, false);
@@ -648,6 +660,11 @@ namespace Umbraco.Core.Services.Implement
                 if (string.IsNullOrWhiteSpace(media.Name))
                     throw new ArgumentException("Media has no name.", nameof(media));
 
+                if (media.Name != null && media.Name.Length > 255)
+                {
+                    throw new InvalidOperationException("Name cannot be more than 255 characters in length."); throw new InvalidOperationException("Name cannot be more than 255 characters in length.");
+                }
+
                 scope.WriteLock(Constants.Locks.MediaTree);
                 if (media.HasIdentity == false)
                     media.CreatorId = userId;
@@ -760,7 +777,7 @@ namespace Umbraco.Core.Services.Implement
             const int pageSize = 500;
             var page = 0;
             var total = long.MaxValue;
-            while(page * pageSize < total)
+            while (page * pageSize < total)
             {
                 //get descendants - ordered from deepest to shallowest
                 var descendants = GetPagedDescendants(media.Id, page, pageSize, out total, ordering: Ordering.By("Path", Direction.Descending));
@@ -945,7 +962,7 @@ namespace Umbraco.Core.Services.Implement
                 // if media was trashed, and since we're not moving to the recycle bin,
                 // indicate that the trashed status should be changed to false, else just
                 // leave it unchanged
-                var trashed = media.Trashed ? false : (bool?) null;
+                var trashed = media.Trashed ? false : (bool?)null;
 
                 PerformMoveLocked(media, parentId, parent, userId, moves, trashed);
                 scope.Events.Dispatch(TreeChanged, this, new TreeChange<IMedia>(media, TreeChangeTypes.RefreshBranch).ToEventArgs());
@@ -1009,7 +1026,7 @@ namespace Umbraco.Core.Services.Implement
 
         private void PerformMoveMediaLocked(IMedia media, int userId, bool? trash)
         {
-            if (trash.HasValue) ((ContentBase) media).Trashed = trash.Value;
+            if (trash.HasValue) ((ContentBase)media).Trashed = trash.Value;
             _mediaRepository.Save(media);
         }
 

From 280f4e7cbef8a1c11b8ef92db8e923d0a3ef8903 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Thu, 29 Aug 2019 15:12:53 +0200
Subject: [PATCH 508/776] Fix member properties [#6227]

---
 .../IPublishedContentTypeFactory.cs           | 10 ++++
 .../PublishedContent/PublishedContentType.cs  | 26 ++++----
 .../PublishedContentTypeFactory.cs            |  6 ++
 .../Services/MemberServiceTests.cs            | 60 +++++++++++++++++++
 4 files changed, 89 insertions(+), 13 deletions(-)

diff --git a/src/Umbraco.Core/Models/PublishedContent/IPublishedContentTypeFactory.cs b/src/Umbraco.Core/Models/PublishedContent/IPublishedContentTypeFactory.cs
index 816bfdbb01..89009ac7b8 100644
--- a/src/Umbraco.Core/Models/PublishedContent/IPublishedContentTypeFactory.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/IPublishedContentTypeFactory.cs
@@ -30,6 +30,16 @@
         /// <remarks>Is used by <see cref="PublishedContentType"/> constructor to create special property types.</remarks>
         IPublishedPropertyType CreatePropertyType(IPublishedContentType contentType, string propertyTypeAlias, int dataTypeId, ContentVariation variations);
 
+        /// <summary>
+        /// Creates a core (non-user) published property type.
+        /// </summary>
+        /// <param name="contentType">The published content type owning the property.</param>
+        /// <param name="propertyTypeAlias">The property type alias.</param>
+        /// <param name="dataTypeId">The datatype identifier.</param>
+        /// <param name="variations">The variations.</param>
+        /// <remarks>Is used by <see cref="PublishedContentType"/> constructor to create special property types.</remarks>
+        IPublishedPropertyType CreateCorePropertyType(IPublishedContentType contentType, string propertyTypeAlias, int dataTypeId, ContentVariation variations);
+
         /// <summary>
         /// Gets a published datatype.
         /// </summary>
diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedContentType.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedContentType.cs
index 3b03cfc9ea..b11e991118 100644
--- a/src/Umbraco.Core/Models/PublishedContent/PublishedContentType.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/PublishedContentType.cs
@@ -92,26 +92,26 @@ namespace Umbraco.Core.Models.PublishedContent
         {
             var aliases = new HashSet<string>(propertyTypes.Select(x => x.Alias), StringComparer.OrdinalIgnoreCase);
 
-            foreach ((var alias, (var dataTypeId, var editorAlias)) in BuiltinMemberProperties)
+            foreach (var (alias, dataTypeId) in BuiltinMemberProperties)
             {
                 if (aliases.Contains(alias)) continue;
-                propertyTypes.Add(factory.CreatePropertyType(this, alias, dataTypeId, ContentVariation.Nothing));
+                propertyTypes.Add(factory.CreateCorePropertyType(this, alias, dataTypeId, ContentVariation.Nothing));
             }
         }
 
         // TODO: this list somehow also exists in constants, see memberTypeRepository => remove duplicate!
-        private static readonly Dictionary<string, (int, string)> BuiltinMemberProperties = new Dictionary<string, (int, string)>
+        private static readonly Dictionary<string, int> BuiltinMemberProperties = new Dictionary<string, int>
         {
-            { "Email", (Constants.DataTypes.Textbox, Constants.PropertyEditors.Aliases.TextBox) },
-            { "Username", (Constants.DataTypes.Textbox, Constants.PropertyEditors.Aliases.TextBox) },
-            { "PasswordQuestion", (Constants.DataTypes.Textbox, Constants.PropertyEditors.Aliases.TextBox) },
-            { "Comments", (Constants.DataTypes.Textbox, Constants.PropertyEditors.Aliases.TextBox) },
-            { "IsApproved", (Constants.DataTypes.Boolean, Constants.PropertyEditors.Aliases.Boolean) },
-            { "IsLockedOut", (Constants.DataTypes.Boolean, Constants.PropertyEditors.Aliases.Boolean) },
-            { "LastLockoutDate", (Constants.DataTypes.DateTime, Constants.PropertyEditors.Aliases.DateTime) },
-            { "CreateDate", (Constants.DataTypes.DateTime, Constants.PropertyEditors.Aliases.DateTime) },
-            { "LastLoginDate", (Constants.DataTypes.DateTime, Constants.PropertyEditors.Aliases.DateTime) },
-            { "LastPasswordChangeDate", (Constants.DataTypes.DateTime, Constants.PropertyEditors.Aliases.DateTime) },
+            { "Email", Constants.DataTypes.Textbox },
+            { "Username", Constants.DataTypes.Textbox },
+            { "PasswordQuestion", Constants.DataTypes.Textbox },
+            { "Comments", Constants.DataTypes.Textbox },
+            { "IsApproved", Constants.DataTypes.Boolean },
+            { "IsLockedOut", Constants.DataTypes.Boolean },
+            { "LastLockoutDate", Constants.DataTypes.DateTime },
+            { "CreateDate", Constants.DataTypes.DateTime },
+            { "LastLoginDate", Constants.DataTypes.DateTime },
+            { "LastPasswordChangeDate", Constants.DataTypes.DateTime },
         };
 
         #region Content type
diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedContentTypeFactory.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedContentTypeFactory.cs
index 17a15a2536..34094508c3 100644
--- a/src/Umbraco.Core/Models/PublishedContent/PublishedContentTypeFactory.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/PublishedContentTypeFactory.cs
@@ -61,6 +61,12 @@ namespace Umbraco.Core.Models.PublishedContent
             return new PublishedPropertyType(contentType, propertyTypeAlias, dataTypeId, true, variations, _propertyValueConverters, _publishedModelFactory, this);
         }
 
+        /// <inheritdoc />
+        public IPublishedPropertyType CreateCorePropertyType(IPublishedContentType contentType, string propertyTypeAlias, int dataTypeId, ContentVariation variations = ContentVariation.Nothing)
+        {
+            return new PublishedPropertyType(contentType, propertyTypeAlias, dataTypeId, false, variations, _propertyValueConverters, _publishedModelFactory, this);
+        }
+
         /// <summary>
         /// This method is for tests and is not intended to be used directly from application code.
         /// </summary>
diff --git a/src/Umbraco.Tests/Services/MemberServiceTests.cs b/src/Umbraco.Tests/Services/MemberServiceTests.cs
index cb55a891a7..340ada2519 100644
--- a/src/Umbraco.Tests/Services/MemberServiceTests.cs
+++ b/src/Umbraco.Tests/Services/MemberServiceTests.cs
@@ -11,15 +11,20 @@ using Umbraco.Core.Events;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Models.Membership;
+using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;
 using Umbraco.Tests.LegacyXmlPublishedCache;
 using Umbraco.Tests.TestHelpers.Entities;
 using Umbraco.Tests.Testing;
+using Umbraco.Tests.Testing.Objects.Accessors;
+using Umbraco.Web;
+using Umbraco.Web.PublishedCache.NuCache;
 using Umbraco.Web.Security.Providers;
 
 namespace Umbraco.Tests.Services
@@ -43,6 +48,61 @@ namespace Umbraco.Tests.Services
             ((MemberService)ServiceContext.MemberService).MembershipProvider = provider;
         }
 
+        [Test]
+        public void Can_Create_Member_With_Properties()
+        {
+            var memberType = ServiceContext.MemberTypeService.Get("member");
+            IMember member = new Member("xname", "xemail", "xusername", "xrawpassword", memberType, true);
+            ServiceContext.MemberService.Save(member);
+
+            member = ServiceContext.MemberService.GetById(member.Id);
+            Assert.AreEqual("xemail", member.Email);
+
+            var dataTypeService = ServiceContext.DataTypeService;
+            var contentTypeFactory = new PublishedContentTypeFactory(new NoopPublishedModelFactory(), new PropertyValueConverterCollection(Enumerable.Empty<IPropertyValueConverter>()), dataTypeService);
+            var pmemberType = new PublishedContentType(memberType, contentTypeFactory);
+
+            var publishedSnapshotAccessor = new TestPublishedSnapshotAccessor();
+            var variationContextAccessor = new TestVariationContextAccessor();
+            var pmember = PublishedMember.Create(member, pmemberType, false, publishedSnapshotAccessor, variationContextAccessor);
+
+            // contains the umbracoMember... properties created when installing, on the member type
+            // contains the other properties, that PublishedContentType adds (BuiltinMemberProperties)
+            //
+            // TODO: see TODO in PublishedContentType, this list contains duplicates
+
+            var aliases = new[]
+            {
+                "umbracoMemberPasswordRetrievalQuestion",
+                "umbracoMemberPasswordRetrievalAnswer",
+                "umbracoMemberComments",
+                "umbracoMemberFailedPasswordAttempts",
+                "umbracoMemberApproved",
+                "umbracoMemberLockedOut",
+                "umbracoMemberLastLockoutDate",
+                "umbracoMemberLastLogin",
+                "umbracoMemberLastPasswordChangeDate",
+                "Email",
+                "Username",
+                "PasswordQuestion",
+                "Comments",
+                "IsApproved",
+                "IsLockedOut",
+                "LastLockoutDate",
+                "CreateDate",
+                "LastLoginDate",
+                "LastPasswordChangeDate"
+            };
+
+            var properties = pmember.Properties.ToList();
+
+            for (var i = 0; i < aliases.Length; i++)
+                Assert.AreEqual(properties[i].Alias, aliases[i]);
+
+            var email = properties[aliases.IndexOf("Email")];
+            Assert.AreEqual("xemail", email.GetSourceValue());
+        }
+
         [Test]
         public void Can_Set_Password_On_New_Member()
         {

From c7ea93199f59f3ef64201f17fd347e5ba8434b6f Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 5 Sep 2019 16:45:33 +0200
Subject: [PATCH 509/776] Merge pull request #6222 from
 patrickdemooij9/temp-5724

5724: Unable to add multiple property groups
(cherry picked from commit 3163b5f2fe5b81f716e3330d0662856ae88dba5c)

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
---
 .../components/umbgroupsbuilder.directive.js  | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
index c60d6aebdd..5d654da813 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
@@ -384,6 +384,8 @@
         // activate group
         scope.activateGroup(group);
 
+        // push new init tab to the scope
+        addInitGroup(scope.model.groups);
       };
 
       scope.activateGroup = function(selectedGroup) {
@@ -402,7 +404,6 @@
 
       scope.removeGroup = function(groupIndex) {
         scope.model.groups.splice(groupIndex, 1);
-        addInitGroup(scope.model.groups);
       };
 
       scope.updateGroupTitle = function(group) {
@@ -531,10 +532,8 @@
               // set focus on init property
               var numberOfProperties = group.properties.length;
               group.properties[numberOfProperties - 1].focus = true;
-  
-              // push new init tab to the scope
-              addInitGroup(scope.model.groups);
 
+              notifyChanged();
             },
             close: function() {
               if(_.isEqual(oldPropertyModel, propertyModel) === false) {
@@ -580,17 +579,7 @@
         // remove property
         tab.properties.splice(propertyIndex, 1);
 
-        // if the last property in group is an placeholder - remove add new tab placeholder
-        if(tab.properties.length === 1 && tab.properties[0].propertyState === "init") {
-
-          angular.forEach(scope.model.groups, function(group, index, groups){
-            if(group.tabState === 'init') {
-              groups.splice(index, 1);
-            }
-          });
-
-        }
-
+        notifyChanged();
       };
 
       function addInitProperty(group) {

From 30cf2fd4b2fffc5657d480beab6b32351804190f Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sat, 24 Aug 2019 20:22:53 +0200
Subject: [PATCH 510/776] Include sort and filter in list view back link

---
 .../components/content/edit.controller.js           | 10 ++++++----
 .../propertyeditors/listview/listview.controller.js | 13 ++++++++-----
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
index c6b821bf0a..806d43f92b 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
@@ -62,11 +62,13 @@
         function init() {
 
             var content = $scope.content;
-
             if (content.id && content.isChildOfListView && content.trashed === false) {
-                $scope.page.listViewPath = ($routeParams.page) ?
-                    "/content/content/edit/" + content.parentId + "?page=" + $routeParams.page :
-                    "/content/content/edit/" + content.parentId;
+                $scope.page.listViewPath = "/content/content/edit/" + content.parentId
+                    + "?list=" + $routeParams.list
+                    + "&page=" + $routeParams.page 
+                    + "&filter=" + $routeParams.filter
+                    + "&orderBy=" + $routeParams.orderBy
+                    + "&orderDirection=" + $routeParams.orderDirection;
             }
 
             // we need to check wether an app is present in the current data, if not we will present the default app.
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
index ce0815c640..7e44295ed2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
@@ -44,7 +44,9 @@ function listViewController($scope, $routeParams, $injector, $timeout, currentUs
             return selected.id;
         };
         createEditUrlCallback = function (item) {
-            return "/" + $scope.entityType + "/" + $scope.entityType + "/edit/" + item.id + "?page=" + $scope.options.pageNumber;
+            return "/" + $scope.entityType + "/" + $scope.entityType + "/edit/" + item.id 
+                + "?list=" + $routeParams.id + "&page=" + $scope.options.pageNumber + "&filter=" + $scope.options.filter 
+                + "&orderBy=" + $scope.options.orderBy + "&orderDirection=" + $scope.options.orderDirection;
         };
     }
 
@@ -143,12 +145,13 @@ function listViewController($scope, $routeParams, $injector, $timeout, currentUs
 
     }
 
+    var listParamsForCurrent = $routeParams.id == $routeParams.list;
     $scope.options = {
         pageSize: $scope.model.config.pageSize ? $scope.model.config.pageSize : 10,
-        pageNumber: ($routeParams.page && Number($routeParams.page) != NaN && Number($routeParams.page) > 0) ? $routeParams.page : 1,
-        filter: '',
-        orderBy: ($scope.model.config.orderBy ? $scope.model.config.orderBy : 'VersionDate').trim(),
-        orderDirection: $scope.model.config.orderDirection ? $scope.model.config.orderDirection.trim() : "desc",
+        pageNumber: (listParamsForCurrent && $routeParams.page && Number($routeParams.page) != NaN && Number($routeParams.page) > 0) ? $routeParams.page : 1,
+        filter: (listParamsForCurrent && $routeParams.filter ? $routeParams.filter : '').trim(),
+        orderBy: (listParamsForCurrent && $routeParams.orderBy ? $routeParams.orderBy : $scope.model.config.orderBy ? $scope.model.config.orderBy : 'VersionDate').trim(),
+        orderDirection: (listParamsForCurrent && $routeParams.orderDirection ? $routeParams.orderDirection : $scope.model.config.orderDirection ? $scope.model.config.orderDirection : "desc").trim(),
         orderBySystemField: true,
         includeProperties: $scope.model.config.includeProperties ? $scope.model.config.includeProperties : [
             { alias: 'updateDate', header: 'Last edited', isSystem: 1 },

From 0534dba12bbee3ce11ac02d5b7d6882bf3fb354d Mon Sep 17 00:00:00 2001
From: Nathan Woulfe <nathan@nathanw.com.au>
Date: Fri, 6 Sep 2019 01:13:41 +1000
Subject: [PATCH 511/776] 5732 grid reorder on scroll listview bugfix (#5918)

---
 .../components/umbstickybar.directive.js      | 82 ++++++-------------
 .../subheader/umb-editor-sub-header.less      | 22 ++---
 2 files changed, 34 insertions(+), 70 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbstickybar.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbstickybar.directive.js
index 07e45ff0f7..de6555a05a 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbstickybar.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbstickybar.directive.js
@@ -25,92 +25,64 @@ Use this directive make an element sticky and follow the page when scrolling. `u
 
     function StickyBarDirective() {
 
-        /**
-        On initial load, the intersector fires if the grid editor is in the viewport
-        This flag is used to suppress the setClass behaviour on the initial load
-        **/
-        var initial = true;
+        let headerObserver;
 
         /**
         Toggle `umb-sticky-bar--active` class on the sticky-bar element
         **/
-        function setClass(addClass, current) {
-            if (!initial) {
-                current.classList.toggle('umb-sticky-bar--active', addClass);
-            } else {
-                initial = false;
-            }
-        }
+        const setClass = (addClass, current) => current.classList.toggle('umb-sticky-bar--active', addClass);                    
 
         /**
         Inserts two elements in the umbStickyBar parent element
         These are used by the IntersectionObserve to calculate scroll position
         **/
-        function addSentinels(current) {
-            ['-top', '-bottom'].forEach(s => {
-                const sentinel = document.createElement('div');
-                sentinel.classList.add('umb-sticky-sentinel', s);
-                current.parentElement.appendChild(sentinel);
-            });
-        }
-
-        /**
-        Calls into setClass when the footer sentinel enters/exits the bottom of the container
-        Container is the parent element of the umbStickyBar element
-        **/
-        function observeFooter(current, container) {
-            const observer = new IntersectionObserver((records, observer) => {
-                let [target, rootBounds, intersected] = [records[0].boundingClientRect, records[0].rootBounds, records[0].intersectionRatio === 1];
-
-                if (target.bottom > rootBounds.top && intersected) {
-                    setClass(true, current);
-                }
-                if (target.top < rootBounds.top && target.bottom < rootBounds.bottom) {
-                    setClass(false, current);
-                }
-            }, {
-                threshold: [1],
-                root: container
-            });
-
-            observer.observe(current.parentElement.querySelector('.umb-sticky-sentinel.-bottom'));
-        }
+        const addSentinel = current => {
+            const sentinel = document.createElement('div');
+            sentinel.classList.add('umb-sticky-sentinel', '-top');
+            current.parentElement.prepend(sentinel);
+        };
 
         /**
         Calls into setClass when the header sentinel enters/exits the top of the container
         Container is the parent element of the umbStickyBar element
         **/
-        function observeHeader(current, container) {
-            const observer = new IntersectionObserver((records, observer) => {
+        const observeHeader = (current, container) => {
+            headerObserver = new IntersectionObserver((records, observer) => {
                 let [target, rootBounds] = [records[0].boundingClientRect, records[0].rootBounds];
 
-                if (target.bottom < rootBounds.top) {
-                    setClass(true, current);
-                }
+                if (rootBounds && target) {
+                    if (target.bottom < rootBounds.top) {
+                        setClass(true, current);
+                    }
 
-                if (target.bottom >= rootBounds.top && target.bottom < rootBounds.bottom) {
-                    setClass(false, current);
+                    if (target.bottom >= rootBounds.top && target.bottom < rootBounds.bottom) {
+                        setClass(false, current);
+                    }
                 }
             }, {
                 threshold: [0],
                 root: container
             });
 
-            observer.observe(current.parentElement.querySelector('.umb-sticky-sentinel.-top'));
-        }
+            headerObserver.observe(current.parentElement.querySelector('.umb-sticky-sentinel.-top'));
+        };
 
         function link(scope, el, attr, ctrl) {
 
             let current = el[0];
-            let container = current.closest('[data-element="editor-container"]');
+            let container = current.closest('.umb-editor-container') || current.closest('.umb-dashboard');
 
-            addSentinels(current);
+            if (container) {
+                addSentinel(current);
+                observeHeader(current, container);
+            }
 
-            observeHeader(current, container);
-            observeFooter(current, container);
+            scope.$on('$destroy', () => {
+                headerObserver.disconnect();
+            });
         }
 
-        var directive = {
+        const directive = {
             restrict: 'A',
             link: link
         };
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less b/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less
index 6cf3598638..649aa89055 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less
@@ -1,14 +1,11 @@
 .umb-editor-sub-header {
    padding: 10px 0;
-   margin-bottom: 10px;
    background: @brownGrayLight;
    border-left: 5px solid @brownGrayLight;
    border-right: 5px solid @brownGrayLight;
-   margin-left: -5px;
-   margin-right: -5px;
    display: flex;
    justify-content: space-between;
-   margin-top: -10px;
+   margin: -10px -5px 10px;
    position: relative;
    top: 0;
    box-sizing: border-box;
@@ -34,30 +31,25 @@
 
 [umb-sticky-bar] {
     transition: box-shadow 240ms;
-    margin-top: 0; 
-    margin-bottom: 0;
     position:sticky;
     z-index: 99;
     
     &.umb-sticky-bar--active {
         box-shadow: 0 6px 3px -3px rgba(0,0,0,.16);
     }
+    
+    .umb-dashboard__content & {
+        top:-20px; // umb-dashboard__content has 20px padding - offset here prevents sticky position from firing when page loads
+    }
 }
 
 .umb-sticky-sentinel {
-    position: absolute;
-    left: 0;
-    width: 100%;
     pointer-events: none;
+    z-index: 5050;    
     
     &.-top {
-        top:0px;
         height:1px;
-    }
-    
-    &.-bottom {        
-        bottom:50px;
-        height:10px;
+        transform:translateY(-10px);
     }
 }
 

From 73a61e65de73d9602689ebaf4eff4dede70957bc Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Thu, 5 Sep 2019 17:40:28 +0200
Subject: [PATCH 512/776] v8: Use umbCheckbox in packager (#6258)

---
 .../components/forms/umbcheckbox.directive.js |  13 +-
 .../forms/umbradiobutton.directive.js         |  41 +++--
 .../views/components/forms/umb-checkbox.html  |   4 +-
 .../components/forms/umb-radiobutton.html     |  15 +-
 .../src/views/packages/edit.controller.js     | 150 +++++++++++++++---
 .../src/views/packages/edit.html              |  65 +++-----
 6 files changed, 197 insertions(+), 91 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
index 47381a15c0..f8643ad191 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
@@ -22,14 +22,14 @@
 </pre>
 
 @param {boolean} model Set to <code>true</code> or <code>false</code> to set the checkbox to checked or unchecked.
-@param {string} input-id Set the <code>id</code> of the checkbox.
+@param {string} inputId Set the <code>id</code> of the checkbox.
 @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.
-@param {string} server-validation-field Set the <code>val-server-field</code> of the checkbox.
+@param {string} serverValidationField Set the <code>val-server-field</code> of the checkbox.
 @param {boolean} disabled Set the checkbox to be disabled.
 @param {boolean} required Set the checkbox to be required.
-@param {string} on-change Callback when the value of the checkbox changed by interaction.
+@param {callback} onChange Callback when the value of the checkbox change by interaction.
 
 **/
 
@@ -40,8 +40,8 @@
     function UmbCheckboxController($timeout) {
         
         var vm = this;
-        
-        vm.callOnChange = function() {
+
+        if (vm.onChange) {
             $timeout(function() {
                 vm.onChange({model:vm.model, value:vm.value});
             }, 0);
@@ -49,7 +49,6 @@
         
     }
     
-    
     var component = {
         templateUrl: 'views/components/forms/umb-checkbox.html',
         controller: UmbCheckboxController,
@@ -63,7 +62,7 @@
             serverValidationField: "@",
             disabled: "<",
             required: "<",
-            onChange: "&"
+            onChange: "&?"
         }
     };
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
index 351ba2fee2..933107527b 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
@@ -27,31 +27,40 @@
 @param {string} text Set the text for the radiobutton label.
 @param {boolean} disabled Set the radiobutton to be disabled.
 @param {boolean} required Set the radiobutton to be required.
+@param {callback} onChange Callback when the value of the radiobutton change by interaction.
 
 **/
 
 (function () {
     'use strict';
 
-    function RadiobuttonDirective() {
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/forms/umb-radiobutton.html',
-            scope: {
-                model: "=",
-                value: "@",
-                name: "@",
-                text: "@",
-                disabled: "=",
-                required: "="
-            }
-        };
+    function UmbRadiobuttonController($timeout) {
 
-        return directive;
+        var vm = this;
 
+        if (vm.onChange) {
+            $timeout(function () {
+                vm.onChange({ model: vm.model, value: vm.value });
+            }, 0);
+        }
+        
     }
 
-    angular.module('umbraco.directives').directive('umbRadiobutton', RadiobuttonDirective);
+    var component = {
+        templateUrl: 'views/components/forms/umb-radiobutton.html',
+        controller: UmbRadiobuttonController,
+        controllerAs: 'vm',
+        bindings: {
+            model: "=",
+            value: "@",
+            name: "@",
+            text: "@",
+            disabled: "=",
+            required: "=",
+            onChange: "&?"
+        }
+    };
+
+    angular.module('umbraco.directives').component('umbRadiobutton', component);
 
 })();
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-checkbox.html b/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-checkbox.html
index d40263c6b6..2f90905c7d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-checkbox.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-checkbox.html
@@ -1,4 +1,4 @@
-<label class="checkbox umb-form-check umb-form-check--checkbox" ng-class="{ 'umb-form-check--disabled': disabled }">
+<label class="checkbox umb-form-check umb-form-check--checkbox" ng-class="{ 'umb-form-check--disabled': vm.disabled }">
     <input type="checkbox"
            id="{{vm.inputId}}"
            name="{{vm.name}}"
@@ -8,7 +8,7 @@
            ng-model="vm.model"
            ng-disabled="vm.disabled"
            ng-required="vm.required"
-           ng-change="vm.callOnChange()"/>
+           ng-change="vm.onChange()"/>
 
     <span class="umb-form-check__state" aria-hidden="true">
         <span class="umb-form-check__check">
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-radiobutton.html b/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-radiobutton.html
index 877e55a1c5..4f630409e2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-radiobutton.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-radiobutton.html
@@ -1,13 +1,14 @@
-<label class="radio umb-form-check umb-form-check--radiobutton" ng-class="{ 'umb-form-check--disabled': disabled }">
-    <input type="radio" name="{{name}}"
-        value="{{value}}"
+<label class="radio umb-form-check umb-form-check--radiobutton" ng-class="{ 'umb-form-check--disabled': vm.disabled }">
+    <input type="radio" name="{{vm.name}}"
+        value="{{vm.value}}"
         class="umb-form-check__input"
-        ng-model="model"
-        ng-disabled="disabled"
-        ng-required="required" />
+        ng-model="vm.model"
+        ng-disabled="vm.disabled"
+        ng-required="vm.required"
+        ng-change="vm.onChange()" />
 
     <span class="umb-form-check__state" aria-hidden="true">
         <span class="umb-form-check__check"></span>
     </span>
-    <span class="umb-form-check__text">{{text}}</span>
+    <span class="umb-form-check__text">{{vm.text}}</span>
 </label>
diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/packages/edit.controller.js
index 623621c536..d6bfb38b88 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packages/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/packages/edit.controller.js
@@ -5,6 +5,9 @@
 
         const vm = this;
 
+        const packageId = $routeParams.id;
+        const create = $routeParams.create;
+
         vm.showBackButton = true;
 
         // open all expansion panels
@@ -24,38 +27,48 @@
         vm.downloadFile = downloadFile;
         vm.contributorsEditor = null;
 
-        vm.buttonLabel = "";
+        vm.selectDocumentType = selectDocumentType;
+        vm.selectTemplate = selectTemplate;
+        vm.selectStyleSheet = selectStyleSheet;
+        vm.selectMacro = selectMacro;
+        vm.selectLanguage = selectLanguage;
+        vm.selectDictionaryItem = selectDictionaryItem;
+        vm.selectDataType = selectDataType;
 
-        vm.versionRegex = /^(\d+\.)(\d+\.)(\*|\d+)$/;
+        vm.labels = {};
 
-        const packageId = $routeParams.id;
-        const create = $routeParams.create;
+        vm.versionRegex = /^(\d+\.)(\d+\.)(\*|\d+)$/;  
 
         function onInit() {
 
             if (create) {
-                //pre populate package with some values
+                // Pre populate package with some values
                 packageResource.getEmpty().then(scaffold => {
                     vm.package = scaffold;
 
+                    loadResources();
+
                     buildContributorsEditor(vm.package);
 
                     vm.loading = false;
                 });
 
-                localizationService.localize("general_create").then(function(value) {
-                    vm.buttonLabel = value;
+                localizationService.localize("general_create").then(function (value) {
+                    vm.labels.button = value;
                 });
             } else {
-                // load package
+                // Load package
                 packageResource.getCreatedById(packageId).then(createdPackage => {
                     vm.package = createdPackage;
 
+                    loadResources();
+
                     buildContributorsEditor(vm.package);
 
                     vm.loading = false;
-                    // get render model for content node
-                    if(vm.package.contentNodeId) {
+
+                    // Get render model for content node
+                    if (vm.package.contentNodeId) {
                         entityResource.getById(vm.package.contentNodeId, "Document")
                             .then((entity) => {
                                 vm.contentNodeDisplayModel = entity;
@@ -64,71 +77,86 @@
 
                 });
 
-                localizationService.localize("buttons_save").then(function (value) {
-                    vm.buttonLabel = value;
+                localizationService.localizeMany(["buttons_save", "packager_includeAllChildNodes"]).then(function (values) {
+                    vm.labels.button = values[0];
+                    vm.labels.includeAllChildNodes = values[1];
                 });
-            }
 
-            // get all doc types
+            }
+        }
+
+        function loadResources() {
+
+            // Get all document types
             entityResource.getAll("DocumentType").then(documentTypes => {
                 // a package stores the id as a string so we 
                 // need to convert all ids to string for comparison
                 documentTypes.forEach(documentType => {
                     documentType.id = documentType.id.toString();
+                    documentType.selected = vm.package.documentTypes.indexOf(documentType.id) !== -1;
                 });
                 vm.documentTypes = documentTypes;
             });
 
-            // get all templates
+            // Get all templates
             entityResource.getAll("Template").then(templates => {
                 // a package stores the id as a string so we 
                 // need to convert all ids to string for comparison
                 templates.forEach(template => {
                     template.id = template.id.toString();
+                    template.selected = vm.package.templates.indexOf(template.id) >= 0;
                 });
                 vm.templates = templates;
             });
 
-            // get all stylesheets
+            // Get all stylesheets
             entityResource.getAll("Stylesheet").then(stylesheets => {
+                stylesheets.forEach(stylesheet => {
+                    stylesheet.selected = vm.package.stylesheets.indexOf(stylesheet.name) >= 0;
+                });
                 vm.stylesheets = stylesheets;
             });
 
+            // Get all macros
             entityResource.getAll("Macro").then(macros => {
                 // a package stores the id as a string so we 
                 // need to convert all ids to string for comparison
                 macros.forEach(macro => {
                     macro.id = macro.id.toString();
+                    macro.selected = vm.package.macros.indexOf(macro.id) !== -1;
                 });
                 vm.macros = macros;
             });
 
-            // get all languages
+            // Get all languages
             entityResource.getAll("Language").then(languages => {
                 // a package stores the id as a string so we 
                 // need to convert all ids to string for comparison
                 languages.forEach(language => {
                     language.id = language.id.toString();
+                    language.selected = vm.package.languages.indexOf(language.id) !== -1;
                 });
                 vm.languages = languages;
             });
 
-            // get all dictionary items
+            // Get all dictionary items
             entityResource.getAll("DictionaryItem").then(dictionaryItems => {
                 // a package stores the id as a string so we 
                 // need to convert all ids to string for comparison
                 dictionaryItems.forEach(dictionaryItem => {
                     dictionaryItem.id = dictionaryItem.id.toString();
+                    dictionaryItem.selected = vm.package.dictionaryItems.indexOf(dictionaryItem.id) !== -1;
                 });
                 vm.dictionaryItems = dictionaryItems;
             });
 
-            // get all data types items
+            // Get all data types
             entityResource.getAll("DataType").then(dataTypes => {
                 // a package stores the id as a string so we 
                 // need to convert all ids to string for comparison
                 dataTypes.forEach(dataType => {
                     dataType.id = dataType.id.toString();
+                    dataType.selected = vm.package.dataTypes.indexOf(dataType.id) !== -1;
                 });
                 vm.dataTypes = dataTypes;
             });
@@ -271,6 +299,90 @@
             vm.package.packageView = null;
         }
 
+        function selectDocumentType(doctype) {
+
+            // Check if the document type is already selected.
+            var index = vm.package.documentTypes.indexOf(doctype.id);
+
+            if (index === -1) {
+                vm.package.documentTypes.push(doctype.id);
+            } else {
+                vm.package.documentTypes.splice(index, 1);
+            }
+        }
+
+        function selectTemplate(template) {
+
+            // Check if the template is already selected.
+            var index = vm.package.templates.indexOf(template.id);
+
+            if (index === -1) {
+                vm.package.templates.push(template.id);
+            } else {
+                vm.package.templates.splice(index, 1);
+            }
+        }
+
+        function selectStyleSheet(stylesheet) {
+
+            // Check if the style sheet is already selected.
+            var index = vm.package.stylesheets.indexOf(stylesheet.name);
+
+            if (index === -1) {
+                vm.package.stylesheets.push(stylesheet.name);
+            } else {
+                vm.package.stylesheets.splice(index, 1);
+            }
+        }
+
+        function selectMacro(macro) {
+
+            // Check if the macro is already selected.
+            var index = vm.package.macros.indexOf(macro.id);
+
+            if (index === -1) {
+                vm.package.macros.push(macro.id);
+            } else {
+                vm.package.macros.splice(index, 1);
+            }
+        }
+
+        function selectLanguage(language) {
+
+            // Check if the language is already selected.
+            var index = vm.package.languages.indexOf(language.id);
+
+            if (index === -1) {
+                vm.package.languages.push(language.id);
+            } else {
+                vm.package.languages.splice(index, 1);
+            }
+        }
+
+        function selectDictionaryItem(dictionaryItem) {
+
+            // Check if the dictionary item is already selected.
+            var index = vm.package.dictionaryItems.indexOf(dictionaryItem.id);
+
+            if (index === -1) {
+                vm.package.dictionaryItems.push(dictionaryItem.id);
+            } else {
+                vm.package.dictionaryItems.splice(index, 1);
+            }
+        }
+
+        function selectDataType(dataType) {
+
+            // Check if the dictionary item is already selected.
+            var index = vm.package.dataTypes.indexOf(dataType.id);
+
+            if (index === -1) {
+                vm.package.dataTypes.push(dataType.id);
+            } else {
+                vm.package.dataTypes.splice(index, 1);
+            }
+        }
+
         function buildContributorsEditor(pkg) {
             
             vm.contributorsEditor = {
diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/edit.html b/src/Umbraco.Web.UI.Client/src/views/packages/edit.html
index 7a95fd9214..53a8e58b58 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packages/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/packages/edit.html
@@ -132,21 +132,18 @@
                             </a>
 
                             <label style="padding-left: 0;">
-                                <input type="checkbox" ng-model="vm.package.contentLoadChildNodes" ng-disabled="!vm.package.contentNodeId" />
-                                <localize key="packager_includeAllChildNodes">Include all child nodes</localize>
+                                <umb-checkbox model="vm.package.contentLoadChildNodes"
+                                                disabled="!vm.package.contentNodeId"
+                                                text="{{vm.labels.includeAllChildNodes}}" />
                             </label>
-
                         </umb-control-group>
 
                         <umb-control-group label="@treeHeaders_documentTypes">
                             <div ng-repeat="doctype in ::vm.documentTypes | orderBy:'name'">
                                 <label>
-                                    <input
-                                        type="checkbox"
-                                        ng-model="doctype.selected"
-                                        checklist-model="vm.package.documentTypes"
-                                        checklist-value="doctype.id" />
-                                    {{doctype.name}}
+                                    <umb-checkbox model="doctype.selected"
+                                                  on-change="vm.selectDocumentType(doctype)"
+                                                  text="{{doctype.name}}" />
                                 </label>
                             </div>
                         </umb-control-group>
@@ -154,11 +151,9 @@
                         <umb-control-group label="@treeHeaders_templates">
                             <div ng-repeat="template in ::vm.templates | orderBy:'name'">
                                 <label>
-                                    <input
-                                        type="checkbox"
-                                        checklist-model="vm.package.templates"
-                                        checklist-value="template.id" />
-                                    {{template.name}}
+                                    <umb-checkbox model="template.selected"
+                                                  on-change="vm.selectTemplate(template)"
+                                                  text="{{template.name}}" />
                                 </label>
                             </div>
                         </umb-control-group>
@@ -166,11 +161,9 @@
                         <umb-control-group label="@treeHeaders_stylesheets">
                             <div ng-repeat="stylesheet in ::vm.stylesheets | orderBy:'name'">
                                 <label>
-                                    <input
-                                        type="checkbox"
-                                        checklist-model="vm.package.stylesheets"
-                                        checklist-value="stylesheet.name" />
-                                    {{stylesheet.path}}
+                                    <umb-checkbox model="stylesheet.selected"
+                                                  on-change="vm.selectStyleSheet(stylesheet)"
+                                                  text="{{stylesheet.path}}" />
                                 </label>
                             </div>
                         </umb-control-group>
@@ -178,23 +171,19 @@
                         <umb-control-group label="@treeHeaders_macros">
                             <div ng-repeat="macro in ::vm.macros | orderBy:'name'">
                                 <label>
-                                    <input type="checkbox"
-                                           checklist-model="vm.package.macros"
-                                           checklist-value="macro.id" />
-                                    {{macro.name}}
+                                    <umb-checkbox model="macro.selected"
+                                                  on-change="vm.selectMacro(macro)"
+                                                  text="{{macro.name}}" />
                                 </label>
                             </div>
-
                         </umb-control-group>
 
                         <umb-control-group label="@treeHeaders_languages">
                             <div ng-repeat="language in ::vm.languages | orderBy:'name'">
                                 <label>
-                                    <input
-                                        type="checkbox"
-                                        checklist-model="vm.package.languages"
-                                        checklist-value="language.id" />
-                                    {{language.name}}
+                                    <umb-checkbox model="language.selected"
+                                                  on-change="vm.selectLanguage(language)"
+                                                  text="{{language.name}}" />
                                 </label>
                             </div>
                         </umb-control-group>
@@ -202,11 +191,9 @@
                         <umb-control-group label="@treeHeaders_dictionary">
                             <div ng-repeat="dictionaryItem in ::vm.dictionaryItems | orderBy:'name'">
                                 <label>
-                                    <input
-                                        type="checkbox"
-                                        checklist-model="vm.package.dictionaryItems"
-                                        checklist-value="dictionaryItem.id" />
-                                    {{dictionaryItem.name}}
+                                    <umb-checkbox model="dictionaryItem.selected"
+                                                  on-change="vm.selectDictionaryItem(dictionaryItem)"
+                                                  text="{{dictionaryItem.name}}" />
                                 </label>
                             </div>
                         </umb-control-group>
@@ -214,11 +201,9 @@
                         <umb-control-group label="@treeHeaders_dataTypes">
                             <div ng-repeat="dataType in ::vm.dataTypes | orderBy:'name'">
                                 <label>
-                                    <input
-                                        type="checkbox"
-                                        checklist-model="vm.package.dataTypes"
-                                        checklist-value="dataType.id" />
-                                    {{dataType.name}}
+                                    <umb-checkbox model="dataType.selected"
+                                                  on-change="vm.selectDataType(dataType)"
+                                                  text="{{dataType.name}}" />
                                 </label>
                             </div>
                         </umb-control-group>
@@ -325,7 +310,7 @@
                                 action="vm.createOrUpdatePackage(editPackageForm)"
                                 state="vm.buttonState"
                                 button-style="success"
-                                label="{{vm.buttonLabel}}"
+                                label="{{vm.labels.button}}"
                                 disabled="vm.loading">
                     </umb-button>
 

From 1b0113d3aaad8f98ea215190fb6cd8c415f9b3e2 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Thu, 5 Sep 2019 17:53:04 +0200
Subject: [PATCH 513/776] v8: Edit embed in grid (#4899)

---
 .../src/less/components/umb-grid.less         | 12 ++++
 .../infiniteeditors/embed/embed.controller.js | 36 ++++++++++--
 .../common/infiniteeditors/embed/embed.html   | 39 +++++++------
 .../grid/editors/embed.controller.js          | 55 ++++++++++++-------
 .../propertyeditors/grid/editors/embed.html   | 13 +++--
 src/Umbraco.Web.UI/Umbraco/config/lang/da.xml |  1 +
 6 files changed, 110 insertions(+), 46 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
index 2eafe9b3d7..ba0b32bb0d 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
@@ -408,7 +408,19 @@
     margin-bottom: 10px;
 }
 
+.umb-grid .umb-editor-preview {
+    position: relative;
 
+    .umb-editor-preview-overlay {
+        cursor: pointer;
+        position: absolute;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        z-index: 1;
+    }
+}
 
 // Active states
 // -------------------------
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.controller.js
index 06a5f028ef..f34dc949ab 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.controller.js
@@ -7,6 +7,7 @@
         var origWidth = 500;
         var origHeight = 300;
 
+        vm.loading = false;
         vm.trustedPreview = null;
 
         $scope.model.embed = {
@@ -17,9 +18,16 @@
             preview: "",
             success: false,
             info: "",
-            supportsDimensions: ""
+            supportsDimensions: false
         };
 
+        if ($scope.model.original) {
+            angular.extend($scope.model.embed, $scope.model.original);
+
+            showPreview();
+        }
+
+        vm.toggleConstrain = toggleConstrain;
         vm.showPreview = showPreview;
         vm.changeSize = changeSize;
         vm.submit = submit;
@@ -37,10 +45,10 @@
 
             if ($scope.model.embed.url) {
                 $scope.model.embed.show = true;
-                $scope.model.embed.preview = "<div class=\"umb-loader\" style=\"height: 10px; margin: 10px 0px;\"></div>";
                 $scope.model.embed.info = "";
                 $scope.model.embed.success = false;
 
+                vm.loading = true;
 
                 $http({
                     method: 'GET',
@@ -54,29 +62,41 @@
 
                     $scope.model.embed.preview = "";
 
-
                     switch (response.data.OEmbedStatus) {
                         case 0:
                             //not supported
+                            $scope.model.embed.preview = "";
                             $scope.model.embed.info = "Not supported";
+                            $scope.model.embed.success = false;
+                            $scope.model.embed.supportsDimensions = false;
+                            vm.trustedPreview = null;
                             break;
                         case 1:
                             //error
+                            $scope.model.embed.preview = "";
                             $scope.model.embed.info = "Could not embed media - please ensure the URL is valid";
+                            $scope.model.embed.success = false;
+                            $scope.model.embed.supportsDimensions = false;
+                            vm.trustedPreview = null;
                             break;
                         case 2:
+                            $scope.model.embed.success = true;
+                            $scope.model.embed.supportsDimensions = response.data.SupportsDimensions;
                             $scope.model.embed.preview = response.data.Markup;
                             vm.trustedPreview = $sce.trustAsHtml(response.data.Markup);
-                            $scope.model.embed.supportsDimensions = response.data.SupportsDimensions;
-                            $scope.model.embed.success = true;
                             break;
                     }
+
+                    vm.loading = false;
+
                 }, function() {
+                    $scope.model.embed.success = false;
                     $scope.model.embed.supportsDimensions = false;
                     $scope.model.embed.preview = "";
                     $scope.model.embed.info = "Could not embed media - please ensure the URL is valid";
-                });
 
+                    vm.loading = false;
+                });
             } else {
                 $scope.model.embed.supportsDimensions = false;
                 $scope.model.embed.preview = "";
@@ -105,6 +125,10 @@
 
        }
 
+       function toggleConstrain() {
+           $scope.model.embed.constrain = !$scope.model.embed.constrain;
+       }
+
        function submit() {
             if($scope.model && $scope.model.submit) {
                 $scope.model.submit($scope.model);
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.html
index 23559c6123..19cf9b2278 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.html
@@ -16,7 +16,7 @@
                     <umb-box-content>
 
                         <umb-control-group label="@general_url">
-                            <input id="url" class="umb-property-editor input-block-level" type="text" style="margin-bottom: 10px;" ng-model="model.embed.url" ng-keyup="$event.keyCode == 13 ? vm.showPreview() : null" focus-when="{{true}}" required />
+                            <input type="text" id="url" class="umb-property-editor input-block-level" ng-model="model.embed.url" ng-keyup="$event.keyCode == 13 ? vm.showPreview() : null" focus-when="{{true}}" required />
                             <umb-button
                                 type="button"
                                 action="vm.showPreview()"
@@ -24,24 +24,30 @@
                                 label-key="general_retrieve">
                             </umb-button>
                         </umb-control-group>
-                
-                        <umb-control-group>
-                            <p ng-bind="model.embed.info"></p>
-                            <div ng-bind-html="vm.trustedPreview"></div>
-                        </umb-control-group>
-                
-                        <div ng-show="model.embed.supportsDimensions">
-                            <umb-control-group label="@general_width">
-                                <input type="number" pattern="[0-9]*" min="0" ng-model="model.embed.width" ng-blur="vm.changeSize('width')" />
+
+                        <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
+
+                        <div ng-if="!vm.loading">
+
+                            <umb-control-group>
+                                <p ng-bind="model.embed.info"></p>
+                                <div ng-bind-html="vm.trustedPreview"></div>
                             </umb-control-group>
+                            
+                            <div ng-show="model.embed.supportsDimensions && model.embed.success">
+                                <umb-control-group label="@general_width">
+                                    <input type="number" pattern="[0-9]*" min="0" ng-model="model.embed.width" ng-blur="vm.changeSize('width')" />
+                                </umb-control-group>
                 
-                            <umb-control-group label="@general_height">
-                                <input type="number" pattern="[0-9]*" min="0" ng-model="model.embed.height" ng-blur="vm.changeSize('height')" />
-                            </umb-control-group>
+                                <umb-control-group label="@general_height">
+                                    <input type="number" pattern="[0-9]*" min="0" ng-model="model.embed.height" ng-blur="vm.changeSize('height')" />
+                                </umb-control-group>
                 
-                            <umb-control-group label="@general_constrain">
-                                <input id="constrain" type="checkbox" ng-model="model.embed.constrain" />
-                            </umb-control-group>
+                                <umb-control-group label="@general_constrain">
+                                    <umb-toggle checked="model.embed.constrain" on-click="vm.toggleConstrain()"></umb-toggle>
+                                </umb-control-group>
+                            </div>
+
                         </div>
                         
                     </umb-box-content>
@@ -62,6 +68,7 @@
                         button-style="success"
                         label-key="general_submit"
                         state="vm.saveButtonState"
+                        disabled="!model.embed.url.length || !model.embed.preview.length"
                         action="vm.submit(model)">
                     </umb-button>
                 </umb-editor-footer-content-right>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.controller.js
index a45e569897..0f8a8df895 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.controller.js
@@ -1,26 +1,42 @@
 angular.module("umbraco")
     .controller("Umbraco.PropertyEditors.Grid.EmbedController",
     function ($scope, $timeout, $sce, editorService) {
-        
-        
-        
-    	function getEmbed() {
-            return $sce.trustAsHtml($scope.control.value);
-        }
-        
-        
-        $scope.embedHtml = getEmbed();
-        $scope.$watch('control.value', function(newValue, oldValue) {
-            if(angular.equals(newValue, oldValue)){
-                return; // simply skip that
-            }
+
+        function onInit() {
             
-            $scope.embedHtml = getEmbed();
-        }, false);
-    	$scope.setEmbed = function() {
+            var embedPreview = angular.isObject($scope.control.value) && $scope.control.value.preview ? $scope.control.value.preview : $scope.control.value;
+
+            $scope.trustedValue = embedPreview ? $sce.trustAsHtml(embedPreview) : null;
+
+            if(!$scope.control.value) {
+                $timeout(function(){
+                    if($scope.control.$initializing){
+                        $scope.setEmbed();
+                    }
+                }, 200);
+            }
+        }
+
+        $scope.setEmbed = function () {
+
+            var original = angular.isObject($scope.control.value) ? $scope.control.value : null;
+
             var embed = {
-                submit: function(model) {
-                    $scope.control.value = model.embed.preview;
+                original: original,
+                submit: function (model) {
+
+                    var embed = {
+                        constrain: model.embed.constrain,
+                        height: model.embed.height,
+                        width: model.embed.width,
+                        url: model.embed.url,
+                        info: model.embed.info,
+                        preview: model.embed.preview
+                    };
+
+                    $scope.control.value = embed;
+                    $scope.trustedValue = $sce.trustAsHtml(embed.preview);
+
                     editorService.close();
                 },
                 close: function() {
@@ -29,5 +45,6 @@ angular.module("umbraco")
             };
             editorService.embed(embed);
         };
-        
+
+        onInit();
 });
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html
index 8cfa71f082..de80b05760 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html
@@ -1,10 +1,13 @@
 <div ng-controller="Umbraco.PropertyEditors.Grid.EmbedController">
 
-	<div class="umb-editor-placeholder" ng-click="setEmbed()" ng-if="control.value === null">
-		<i class="icon icon-movie-alt"></i>
-		<div class="help-text"><localize key="grid_clickToEmbed">Click to embed</localize></div>
-	</div>
+    <div class="umb-editor-placeholder" ng-click="setEmbed()" ng-if="trustedValue === null">
+        <i class="icon icon-movie-alt"></i>
+        <div class="help-text"><localize key="grid_clickToEmbed">Click to embed</localize></div>
+    </div>
 
-	<div ng-if="control.value" ng-bind-html="embedHtml"></div>
+    <div class="umb-editor-preview" ng-if="control.value" ng-click="setEmbed()">
+        <div class="umb-editor-preview-overlay"></div>
+        <div ng-bind-html="trustedValue"></div>
+    </div>
 
 </div>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index 81e6b6bf12..c4bffedb28 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -584,6 +584,7 @@
     <key alias="closewindow">Luk vindue</key>
     <key alias="comment">Kommentar</key>
     <key alias="confirm">Bekræft</key>
+    <key alias="constrain">Proportioner</key>
     <key alias="constrainProportions">Behold proportioner</key>
     <key alias="content">Indhold</key>
     <key alias="continue">Fortsæt</key>

From a7f1001c53e5230ece5ea18c73e15f4b5b098dc6 Mon Sep 17 00:00:00 2001
From: Poornima Nayar <poornimakrishnav@gmail.com>
Date: Thu, 29 Aug 2019 00:12:22 +0100
Subject: [PATCH 514/776] Some cleanup to the published status dashboard

---
 .../src/views/dashboard/settings/nucache.html          | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/nucache.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/nucache.html
index 689bcf8fa2..eb012c3d98 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/nucache.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/nucache.html
@@ -4,13 +4,13 @@
         <umb-load-indicator></umb-load-indicator>
     </div>
 
-    <p style="min-height: 120px; background: #f8f8f8; padding: 10px; margin-bottom: 4px;">
+    <p>
         <span ng-show="vm.working">(wait)</span>
         <span ng-show="!vm.working">{{vm.status}}</span>
     </p>
 
     <div>
-        <button type="button" ng-click="vm.verify($event)" class="btn btn-warning">Refresh status</button>
+        <button type="button" ng-click="vm.verify($event)" class="btn btn-danger">Refresh status</button>
     </div>
 
     <h4 class="mt4">Memory Cache</h4>
@@ -24,7 +24,7 @@
     </p>
 
     <div>
-        <button type="button" ng-click="vm.reload($event)" class="btn btn-warning">Reload</button>
+        <button type="button" ng-click="vm.reload($event)" class="btn btn-danger">Reload</button>
     </div>
 
     <h4 class="mt4">Database Cache</h4>
@@ -37,7 +37,7 @@
     </p>
 
     <div>
-        <button type="button" ng-click="vm.rebuild($event)" class="btn btn-warning">Rebuild</button>
+        <button type="button" ng-click="vm.rebuild($event)" class="btn btn-danger">Rebuild</button>
     </div>
 
     <h4 class="mt4">Internals</h4>
@@ -48,7 +48,7 @@
     </p>
 
     <div>
-        <button type="button" ng-click="vm.collect($event)" class="btn btn-warning">Collect</button>
+        <button type="button" ng-click="vm.collect($event)" class="btn btn-danger">Collect</button>
     </div>
 
 </div>

From 604bb6b5260cec15edfffdc7afdeef13753f04ed Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Fri, 16 Aug 2019 13:13:22 +0200
Subject: [PATCH 515/776] Don't allow selecting non-element types when
 composing element types

---
 .../Services/ContentTypeServiceExtensions.cs             | 9 ++++++---
 .../directives/components/umbgroupsbuilder.directive.js  | 4 ++--
 .../src/common/resources/contenttype.resource.js         | 5 +++--
 src/Umbraco.Web/Editors/ContentTypeController.cs         | 2 +-
 src/Umbraco.Web/Editors/ContentTypeControllerBase.cs     | 6 ++++--
 src/Umbraco.Web/Editors/MediaTypeController.cs           | 2 +-
 src/Umbraco.Web/Editors/MemberTypeController.cs          | 2 +-
 .../ContentEditing/GetAvailableCompositionsFilter.cs     | 5 +++++
 8 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/Umbraco.Core/Services/ContentTypeServiceExtensions.cs b/src/Umbraco.Core/Services/ContentTypeServiceExtensions.cs
index fd475c558a..37f1e5127f 100644
--- a/src/Umbraco.Core/Services/ContentTypeServiceExtensions.cs
+++ b/src/Umbraco.Core/Services/ContentTypeServiceExtensions.cs
@@ -37,12 +37,14 @@ namespace Umbraco.Core.Services
         /// This is required because in the case of creating/modifying a content type because new property types being added to it are not yet persisted so cannot
         /// be looked up via the db, they need to be passed in.
         /// </param>
+        /// <param name="isElement">Wether the composite content types should be applicable for an element type</param>
         /// <returns></returns>
         internal static ContentTypeAvailableCompositionsResults GetAvailableCompositeContentTypes(this IContentTypeService ctService,
             IContentTypeComposition source,
             IContentTypeComposition[] allContentTypes,
             string[] filterContentTypes = null,
-            string[] filterPropertyTypes = null)
+            string[] filterPropertyTypes = null,
+            bool isElement = false)
         {
             filterContentTypes = filterContentTypes == null
                 ? Array.Empty<string>()
@@ -61,7 +63,7 @@ namespace Umbraco.Core.Services
                     .Select(c => c.Alias)
                     .Union(filterPropertyTypes)
                     .ToArray();
-
+            
             var sourceId = source?.Id ?? 0;
 
             // find out if any content type uses this content type
@@ -79,8 +81,9 @@ namespace Umbraco.Core.Services
                 x => x.Id));
 
             // usable types are those that are top-level
+            // do not allow element types to be composed by non-element types as this will break the model generation in ModelsBuilder
             var usableContentTypes = allContentTypes
-                .Where(x => x.ContentTypeComposition.Any() == false).ToArray();
+                .Where(x => x.ContentTypeComposition.Any() == false && (isElement == false || x.IsElement)).ToArray();
             foreach (var x in usableContentTypes)
                 list.Add(x);
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
index 7c4af11022..ba479429f1 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
@@ -257,7 +257,7 @@
             view: "views/common/infiniteeditors/compositions/compositions.html",
             size: "small",
             submit: function() {
-              
+
               // make sure that all tabs has an init property
               if (scope.model.groups.length !== 0) {
                 angular.forEach(scope.model.groups, function(group) {
@@ -341,7 +341,7 @@
         scope.compositionsButtonState = "busy";
         $q.all([
             //get available composite types
-            availableContentTypeResource(scope.model.id, [], propAliasesExisting).then(function (result) {
+            availableContentTypeResource(scope.model.id, [], propAliasesExisting, scope.model.isElement).then(function (result) {
                 setupAvailableContentTypesModel(result); 
             }),
                 //get where used document types
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js
index 4e4c8d2eb5..64accc18c1 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js
@@ -16,7 +16,7 @@ function contentTypeResource($q, $http, umbRequestHelper, umbDataFormatter, loca
                 'Failed to retrieve count');
         },
 
-        getAvailableCompositeContentTypes: function (contentTypeId, filterContentTypes, filterPropertyTypes) {
+        getAvailableCompositeContentTypes: function (contentTypeId, filterContentTypes, filterPropertyTypes, isElement) {
             if (!filterContentTypes) {
                 filterContentTypes = [];
             }
@@ -27,7 +27,8 @@ function contentTypeResource($q, $http, umbRequestHelper, umbDataFormatter, loca
             var query = {
                 contentTypeId: contentTypeId,
                 filterContentTypes: filterContentTypes,
-                filterPropertyTypes: filterPropertyTypes
+                filterPropertyTypes: filterPropertyTypes,
+                isElement: isElement
             };
 
             return umbRequestHelper.resourcePromise(
diff --git a/src/Umbraco.Web/Editors/ContentTypeController.cs b/src/Umbraco.Web/Editors/ContentTypeController.cs
index cf8b6c3859..e99cbdca4a 100644
--- a/src/Umbraco.Web/Editors/ContentTypeController.cs
+++ b/src/Umbraco.Web/Editors/ContentTypeController.cs
@@ -132,7 +132,7 @@ namespace Umbraco.Web.Editors
         [HttpPost]
         public HttpResponseMessage GetAvailableCompositeContentTypes(GetAvailableCompositionsFilter filter)
         {
-            var result = PerformGetAvailableCompositeContentTypes(filter.ContentTypeId, UmbracoObjectTypes.DocumentType, filter.FilterContentTypes, filter.FilterPropertyTypes)
+            var result = PerformGetAvailableCompositeContentTypes(filter.ContentTypeId, UmbracoObjectTypes.DocumentType, filter.FilterContentTypes, filter.FilterPropertyTypes, filter.IsElement)
                 .Select(x => new
                 {
                     contentType = x.Item1,
diff --git a/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs b/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs
index 9b8a098e21..2b3990c7a1 100644
--- a/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs
+++ b/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs
@@ -53,11 +53,13 @@ namespace Umbraco.Web.Editors
         /// be looked up via the db, they need to be passed in.
         /// </param>
         /// <param name="contentTypeId"></param>
+        /// <param name="isElement">Wether the composite content types should be applicable for an element type</param>
         /// <returns></returns>
         protected IEnumerable<Tuple<EntityBasic, bool>> PerformGetAvailableCompositeContentTypes(int contentTypeId,
             UmbracoObjectTypes type,
             string[] filterContentTypes,
-            string[] filterPropertyTypes)
+            string[] filterPropertyTypes,
+            bool isElement)
         {
             IContentTypeComposition source = null;
 
@@ -98,7 +100,7 @@ namespace Umbraco.Web.Editors
                     throw new ArgumentOutOfRangeException("The entity type was not a content type");
             }
 
-            var availableCompositions = Services.ContentTypeService.GetAvailableCompositeContentTypes(source, allContentTypes, filterContentTypes, filterPropertyTypes);
+            var availableCompositions = Services.ContentTypeService.GetAvailableCompositeContentTypes(source, allContentTypes, filterContentTypes, filterPropertyTypes, isElement);
 
 
 
diff --git a/src/Umbraco.Web/Editors/MediaTypeController.cs b/src/Umbraco.Web/Editors/MediaTypeController.cs
index 24d8f696b6..43569c77e2 100644
--- a/src/Umbraco.Web/Editors/MediaTypeController.cs
+++ b/src/Umbraco.Web/Editors/MediaTypeController.cs
@@ -110,7 +110,7 @@ namespace Umbraco.Web.Editors
         [HttpPost]
         public HttpResponseMessage GetAvailableCompositeMediaTypes(GetAvailableCompositionsFilter filter)
         {
-            var result = PerformGetAvailableCompositeContentTypes(filter.ContentTypeId, UmbracoObjectTypes.MediaType, filter.FilterContentTypes, filter.FilterPropertyTypes)
+            var result = PerformGetAvailableCompositeContentTypes(filter.ContentTypeId, UmbracoObjectTypes.MediaType, filter.FilterContentTypes, filter.FilterPropertyTypes, filter.IsElement)
                 .Select(x => new
                 {
                     contentType = x.Item1,
diff --git a/src/Umbraco.Web/Editors/MemberTypeController.cs b/src/Umbraco.Web/Editors/MemberTypeController.cs
index f406988ae5..fffead9155 100644
--- a/src/Umbraco.Web/Editors/MemberTypeController.cs
+++ b/src/Umbraco.Web/Editors/MemberTypeController.cs
@@ -89,7 +89,7 @@ namespace Umbraco.Web.Editors
             [FromUri]string[] filterContentTypes,
             [FromUri]string[] filterPropertyTypes)
         {
-            var result = PerformGetAvailableCompositeContentTypes(contentTypeId, UmbracoObjectTypes.MemberType, filterContentTypes, filterPropertyTypes)
+            var result = PerformGetAvailableCompositeContentTypes(contentTypeId, UmbracoObjectTypes.MemberType, filterContentTypes, filterPropertyTypes, false)
                 .Select(x => new
                 {
                     contentType = x.Item1,
diff --git a/src/Umbraco.Web/Models/ContentEditing/GetAvailableCompositionsFilter.cs b/src/Umbraco.Web/Models/ContentEditing/GetAvailableCompositionsFilter.cs
index 38442f6da5..b1528db697 100644
--- a/src/Umbraco.Web/Models/ContentEditing/GetAvailableCompositionsFilter.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/GetAvailableCompositionsFilter.cs
@@ -16,5 +16,10 @@
         /// along with any content types that have matching property types that are included in the filtered content types
         /// </summary>
         public string[] FilterContentTypes { get; set; }
+
+        /// <summary>
+        /// Wether the content type is currently marked as an element type
+        /// </summary>
+        public bool IsElement { get; set; }
     }
 }

From 8aca254ed06a2c5372770a3940285f00bc3513b5 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Thu, 5 Sep 2019 18:01:07 +0200
Subject: [PATCH 516/776] V8: Make the color picker mandatory validation work
 (#5765)

---
 .../colorpicker/colorpicker.controller.js     | 70 +++----------------
 .../colorpicker/colorpicker.html              |  5 +-
 2 files changed, 11 insertions(+), 64 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
index d6fe709962..f37905d2c8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
@@ -1,4 +1,4 @@
-function ColorPickerController($scope) {
+function ColorPickerController($scope, $timeout) {
 
     //setup the default config
     var config = {
@@ -11,32 +11,7 @@ function ColorPickerController($scope) {
 
     //map back to the model
     $scope.model.config = config;
-
-    // TODO: This isn't used
-    function convertArrayToDictionaryArray(model) {
-        //now we need to format the items in the dictionary because we always want to have an array
-        var newItems = [];
-        for (var i = 0; i < model.length; i++) {
-            newItems.push({ id: model[i], sortOrder: 0, value: model[i] });
-        }
-
-        return newItems;
-    }
-
-    // TODO: This isn't used
-    function convertObjectToDictionaryArray(model) {
-        //now we need to format the items in the dictionary because we always want to have an array
-        var newItems = [];
-        var vals = _.values($scope.model.config.items);
-        var keys = _.keys($scope.model.config.items);
-
-        for (var i = 0; i < vals.length; i++) {
-            var label = vals[i].value ? vals[i].value : vals[i];
-            newItems.push({ id: keys[i], sortOrder: vals[i].sortOrder, value: label });
-        }
-
-        return newItems;
-    }
+    
     $scope.isConfigured = $scope.model.config && $scope.model.config.items && _.keys($scope.model.config.items).length > 0;
 
     if ($scope.isConfigured) {
@@ -79,27 +54,13 @@ function ColorPickerController($scope) {
         $scope.model.config.items = items;
     }
 
-    $scope.toggleItem = function (color) {
-
-        var currentColor = ($scope.model.value && $scope.model.value.hasOwnProperty("value"))
-            ? $scope.model.value.value
-            : $scope.model.value;
-
-        var newColor;
-        if (currentColor === color.value) {
-            // deselect
-            $scope.model.value = $scope.model.useLabel ? { value: "", label: "" } : "";
-            newColor = "";
-        }
-        else {
-            // select
-            $scope.model.value = $scope.model.useLabel ? { value: color.value, label: color.label } : color.value;
-            newColor = color.value;
-        }
-
+    $scope.selectColor = function (color) {
         // this is required to re-validate
-        $scope.propertyForm.modelValue.$setViewValue(newColor);
-    };
+        $timeout(function () {
+            var newColor = color ? color.value : null;
+            $scope.propertyForm.selectedColor.$setViewValue(newColor);
+        });
+    }
 
     // Method required by the valPropertyValidator directive (returns true if the property editor has at least one color selected)
     $scope.validateMandatory = function () {
@@ -116,21 +77,6 @@ function ColorPickerController($scope) {
     }
     $scope.isConfigured = $scope.model.config && $scope.model.config.items && _.keys($scope.model.config.items).length > 0;
 
-    // A color is active if it matches the value and label of the model.
-    // If the model doesn't store the label, ignore the label during the comparison.
-    $scope.isActiveColor = function (color) {
-
-        // no value
-        if (!$scope.model.value)
-            return false;
-
-        // Complex color (value and label)?
-        if (!$scope.model.value.hasOwnProperty("value"))
-            return $scope.model.value === color.value;
-
-        return $scope.model.value.value === color.value && $scope.model.value.label === color.label;
-    };
-
     // Finds the color best matching the model's color,
     // and sets the model color to that one. This is useful when
     // either the value or label was changed on the data type.
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
index ef45e99638..9b0bdad661 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
@@ -9,9 +9,10 @@
         colors="model.config.items"
         selected-color="model.value"
         size="m"
-        use-label="model.useLabel">
+        use-label="model.useLabel"
+        on-select="selectColor(color)">
     </umb-color-swatches>
 
-    <input type="hidden" name="modelValue" ng-model="model.value" val-property-validator="validateMandatory" />
+    <input type="hidden" name="selectedColor" ng-model="model.selectedColor" val-property-validator="validateMandatory" />
 
 </div>

From 32941370065fcbea6857ad9c68a16a93c839812a Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Thu, 5 Sep 2019 18:01:07 +0200
Subject: [PATCH 517/776] V8: Make the color picker mandatory validation work
 (#5765)

(cherry picked from commit 8aca254ed06a2c5372770a3940285f00bc3513b5)
---
 .../colorpicker/colorpicker.controller.js     | 70 +++----------------
 .../colorpicker/colorpicker.html              |  5 +-
 2 files changed, 11 insertions(+), 64 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
index d6fe709962..f37905d2c8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
@@ -1,4 +1,4 @@
-function ColorPickerController($scope) {
+function ColorPickerController($scope, $timeout) {
 
     //setup the default config
     var config = {
@@ -11,32 +11,7 @@ function ColorPickerController($scope) {
 
     //map back to the model
     $scope.model.config = config;
-
-    // TODO: This isn't used
-    function convertArrayToDictionaryArray(model) {
-        //now we need to format the items in the dictionary because we always want to have an array
-        var newItems = [];
-        for (var i = 0; i < model.length; i++) {
-            newItems.push({ id: model[i], sortOrder: 0, value: model[i] });
-        }
-
-        return newItems;
-    }
-
-    // TODO: This isn't used
-    function convertObjectToDictionaryArray(model) {
-        //now we need to format the items in the dictionary because we always want to have an array
-        var newItems = [];
-        var vals = _.values($scope.model.config.items);
-        var keys = _.keys($scope.model.config.items);
-
-        for (var i = 0; i < vals.length; i++) {
-            var label = vals[i].value ? vals[i].value : vals[i];
-            newItems.push({ id: keys[i], sortOrder: vals[i].sortOrder, value: label });
-        }
-
-        return newItems;
-    }
+    
     $scope.isConfigured = $scope.model.config && $scope.model.config.items && _.keys($scope.model.config.items).length > 0;
 
     if ($scope.isConfigured) {
@@ -79,27 +54,13 @@ function ColorPickerController($scope) {
         $scope.model.config.items = items;
     }
 
-    $scope.toggleItem = function (color) {
-
-        var currentColor = ($scope.model.value && $scope.model.value.hasOwnProperty("value"))
-            ? $scope.model.value.value
-            : $scope.model.value;
-
-        var newColor;
-        if (currentColor === color.value) {
-            // deselect
-            $scope.model.value = $scope.model.useLabel ? { value: "", label: "" } : "";
-            newColor = "";
-        }
-        else {
-            // select
-            $scope.model.value = $scope.model.useLabel ? { value: color.value, label: color.label } : color.value;
-            newColor = color.value;
-        }
-
+    $scope.selectColor = function (color) {
         // this is required to re-validate
-        $scope.propertyForm.modelValue.$setViewValue(newColor);
-    };
+        $timeout(function () {
+            var newColor = color ? color.value : null;
+            $scope.propertyForm.selectedColor.$setViewValue(newColor);
+        });
+    }
 
     // Method required by the valPropertyValidator directive (returns true if the property editor has at least one color selected)
     $scope.validateMandatory = function () {
@@ -116,21 +77,6 @@ function ColorPickerController($scope) {
     }
     $scope.isConfigured = $scope.model.config && $scope.model.config.items && _.keys($scope.model.config.items).length > 0;
 
-    // A color is active if it matches the value and label of the model.
-    // If the model doesn't store the label, ignore the label during the comparison.
-    $scope.isActiveColor = function (color) {
-
-        // no value
-        if (!$scope.model.value)
-            return false;
-
-        // Complex color (value and label)?
-        if (!$scope.model.value.hasOwnProperty("value"))
-            return $scope.model.value === color.value;
-
-        return $scope.model.value.value === color.value && $scope.model.value.label === color.label;
-    };
-
     // Finds the color best matching the model's color,
     // and sets the model color to that one. This is useful when
     // either the value or label was changed on the data type.
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
index ef45e99638..9b0bdad661 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
@@ -9,9 +9,10 @@
         colors="model.config.items"
         selected-color="model.value"
         size="m"
-        use-label="model.useLabel">
+        use-label="model.useLabel"
+        on-select="selectColor(color)">
     </umb-color-swatches>
 
-    <input type="hidden" name="modelValue" ng-model="model.value" val-property-validator="validateMandatory" />
+    <input type="hidden" name="selectedColor" ng-model="model.selectedColor" val-property-validator="validateMandatory" />
 
 </div>

From 6da0caa9027b5f8f863f38f0ee319792ee27578a Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Thu, 5 Sep 2019 18:08:00 +0200
Subject: [PATCH 518/776] Make sure media picker items are sortable (#6037)

---
 .../mediapicker/mediapicker.controller.js     | 32 +++++++------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
index f6447f8144..d7bf31bbe9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
@@ -149,14 +149,6 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
                         $scope.allowAddMedia = hasAccessToMedia;
 
                         setupViewModel();
-
-                        //When the model value changes sync the view model
-                        $scope.$watch("model.value",
-                            function (newVal, oldVal) {
-                                if (newVal !== oldVal) {
-                                    setupViewModel();
-                                }
-                            });
                     });
                 });
         }
@@ -241,25 +233,25 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
 
         };
 
-
-
         $scope.sortableOptions = {
+            containment: 'parent',
+            cursor: 'move',
+            tolerance: 'pointer',
             disabled: !multiPicker,
             items: "li:not(.add-wrapper)",
             cancel: ".unsortable",
             update: function (e, ui) {
                 setDirty();
-                var r = [];
-                // TODO: Instead of doing this with a half second delay would be better to use a watch like we do in the
-                // content picker. Then we don't have to worry about setting ids, render models, models, we just set one and let the
-                // watch do all the rest.
-                $timeout(function () {
-                    angular.forEach($scope.mediaItems, function (value, key) {
-                        r.push($scope.model.config.idType === "udi" ? value.udi : value.id);
-                    });
-                    $scope.ids = r;
+                $timeout(function() {
+                    // TODO: Instead of doing this with a timeout would be better to use a watch like we do in the
+                    // content picker. Then we don't have to worry about setting ids, render models, models, we just set one and let the
+                    // watch do all the rest.
+                    $scope.ids = _.map($scope.mediaItems,
+                        function (item) {
+                            return $scope.model.config.idType === "udi" ? item.udi : item.id;
+                        });
                     sync();
-                }, 500, false);
+                });
             }
         };
 

From 089e450e09bd5d9e40ead8af2edc88658671e534 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Thu, 5 Sep 2019 18:08:00 +0200
Subject: [PATCH 519/776] Make sure media picker items are sortable (#6037)

(cherry picked from commit 6da0caa9027b5f8f863f38f0ee319792ee27578a)
---
 .../mediapicker/mediapicker.controller.js     | 32 +++++++------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
index f6447f8144..d7bf31bbe9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
@@ -149,14 +149,6 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
                         $scope.allowAddMedia = hasAccessToMedia;
 
                         setupViewModel();
-
-                        //When the model value changes sync the view model
-                        $scope.$watch("model.value",
-                            function (newVal, oldVal) {
-                                if (newVal !== oldVal) {
-                                    setupViewModel();
-                                }
-                            });
                     });
                 });
         }
@@ -241,25 +233,25 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
 
         };
 
-
-
         $scope.sortableOptions = {
+            containment: 'parent',
+            cursor: 'move',
+            tolerance: 'pointer',
             disabled: !multiPicker,
             items: "li:not(.add-wrapper)",
             cancel: ".unsortable",
             update: function (e, ui) {
                 setDirty();
-                var r = [];
-                // TODO: Instead of doing this with a half second delay would be better to use a watch like we do in the
-                // content picker. Then we don't have to worry about setting ids, render models, models, we just set one and let the
-                // watch do all the rest.
-                $timeout(function () {
-                    angular.forEach($scope.mediaItems, function (value, key) {
-                        r.push($scope.model.config.idType === "udi" ? value.udi : value.id);
-                    });
-                    $scope.ids = r;
+                $timeout(function() {
+                    // TODO: Instead of doing this with a timeout would be better to use a watch like we do in the
+                    // content picker. Then we don't have to worry about setting ids, render models, models, we just set one and let the
+                    // watch do all the rest.
+                    $scope.ids = _.map($scope.mediaItems,
+                        function (item) {
+                            return $scope.model.config.idType === "udi" ? item.udi : item.id;
+                        });
                     sync();
-                }, 500, false);
+                });
             }
         };
 

From daadfe6e6cef7ce812445e15bd68465944494ba9 Mon Sep 17 00:00:00 2001
From: Nathan Woulfe <nathan@nathanw.com.au>
Date: Fri, 6 Sep 2019 15:45:17 +1000
Subject: [PATCH 520/776] fix tray colour, add some structure to CSS

---
 .../src/less/sections.less                    | 222 +++++++++---------
 1 file changed, 114 insertions(+), 108 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/sections.less b/src/Umbraco.Web.UI.Client/src/less/sections.less
index ef6c5f5046..5551ba6376 100644
--- a/src/Umbraco.Web.UI.Client/src/less/sections.less
+++ b/src/Umbraco.Web.UI.Client/src/less/sections.less
@@ -2,129 +2,135 @@
 // -------------------------
 
 ul.sections {
-	margin: 0;
-	display: flex;
-	margin-left: -20px;
-}
-
-ul.sections>li {
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	position: relative;
-}
-
-ul.sections>li>a {
-	color: @white;
-	height: @appHeaderHeight;
+    margin: 0;
     display: flex;
-	align-items: center;
-	justify-content: center;
-	position: relative;
-	padding: 0 10px;
-	text-decoration: none;
-	outline: none;
-	cursor: pointer;
-}
+    margin-left: -20px;
 
-ul.sections>li>a .section__name {
-    border-radius: 3px;
-    margin-top:1px;
-    padding: 3px 10px 4px 10px;
-	opacity: 0.8;
-	transition: opacity .1s linear, box-shadow .1s;
-}
+    > li {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        position: relative;
 
-ul.sections>li>a::after {
-	content: "";
-    left: 10px;
-    right: 10px;
-	height: 4px;
-	bottom: 0;
-    transform: translateY(4px);
-	background-color: @pinkLight;
-    position: absolute;
-	border-radius: 3px 3px 0 0;
-	opacity: 0;
-	padding: 0 2px;
-	transition: transform 240ms ease-in-out;
-}
+        > a {
+            color: @white;
+            height: @appHeaderHeight;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            position: relative;
+            padding: 0 10px;
+            text-decoration: none;
+            outline: none;
+            cursor: pointer;
 
-ul.sections>li.current>a {
-    color:@pinkLight;
-}
-ul.sections>li.current>a::after {
-	opacity: 1;
-    transform: translateY(0px);
-}
-ul.sections > li.current > a .section__name,
-ul.sections > li > a:hover .section__name {
-    opacity: 1;
-    -webkit-font-smoothing: subpixel-antialiased;
-}
+            &::after {
+                content: "";
+                left: 10px;
+                right: 10px;
+                height: 4px;
+                bottom: 0;
+                transform: translateY(4px);
+                background-color: @ui-active;
+                position: absolute;
+                border-radius: 3px 3px 0 0;
+                opacity: 0;
+                padding: 0 2px;
+                transition: transform 240ms ease-in-out;
+            }
 
-ul.sections > li > a:focus .section__name {
-    .tabbing-active & {
-        
-        border: 1px solid;
-        border-color: @gray-9;
+            &:focus .section__name {
+                .tabbing-active & {
+                    border: 1px solid;
+                    border-color: @gray-9;
+                }
+            }
+        }
+
+        .section__name {
+            border-radius: 3px;
+            margin-top: 1px;
+            padding: 3px 10px 4px 10px;
+            opacity: 0.8;
+            transition: opacity .1s linear, box-shadow .1s;
+        }
+
+        &.current a {
+            color: @ui-active;
+
+            &::after {
+                opacity: 1;
+                transform: translateY(0px);
+            }
+        }
+
+        &.expand {
+            i {
+                height: 5px;
+                width: 5px;
+                border-radius: 50%;
+                background: @white;
+                display: inline-block;
+                margin: 0 5px 0 0;
+                opacity: 0.6;
+                transition: opacity .1s linear;
+            }
+            
+            &:hover i {
+                opacity:1;
+            }
+        }
+
+        &.current .section__name,
+        a:hover .section__name {
+            opacity: 1;
+            -webkit-font-smoothing: subpixel-antialiased;
+        }
     }
 }
 
-
-
 /* Sections tray */
 
-ul.sections>li.expand i {
-	height: 5px;
-    width: 5px;
-    border-radius: 50%;
-    background: #fff;
-    display: inline-block;
-    margin: 0 5px 0 0;
-    opacity: 0.6;
-}
-
 ul.sections-tray {
-	position: absolute;
-	top: @appHeaderHeight;
-	left: 0;
-	margin: 0;
+    position: absolute;
+    top: @appHeaderHeight;
+    left: 0;
+    margin: 0;
     list-style: none;
-	background: @purple;
-	z-index: 10000;
-	border-radius: 0 0 3px 3px;
-}
+    background: @blueExtraDark;
+    z-index: 10000;
+    border-radius: 0 0 3px 3px;
 
-ul.sections-tray>li>a {
-	padding: 8px 24px;
-	color: @white;
-	text-decoration: none;
-	display: block;
-	position: relative;
-}
+    li {
 
-ul.sections-tray>li>a::after {
-	content: "";
-	width: 4px;
-	height: 100%;
-	background-color: @ui-active;
-	position: absolute;
-	border-radius: 0 3px 3px 0;
-	opacity: 0;
-	transition: all .2s linear;
-	top: 0;
-	left: 0;
-}
+        &.current a {
+            color: @ui-active;
+            opacity: 1;
 
-ul.sections-tray>li.current>a::after {
-	opacity: 1;
-}
+            &::after {
+                opacity: 1;
+            }
+        }
 
-ul.sections-tray>li>a .section__name {
-	opacity: 0.6;
-}
+        a {
+            padding: 8px 24px;
+            color: @white;
+            text-decoration: none;
+            display: block;
+            position: relative;
 
-ul.sections-tray>li>a:hover	.section__name {
-	opacity: 1;
+            &::after {
+                content: "";
+                width: 4px;
+                height: 100%;
+                background-color: @ui-active;
+                position: absolute;
+                border-radius: 0 3px 3px 0;
+                opacity: 0;
+                transition: all .2s linear;
+                top: 0;
+                left: 0;
+            }
+        }
+    }
 }

From 1723c39e009322b737c6195a9462a3484369a4b8 Mon Sep 17 00:00:00 2001
From: Nathan Woulfe <nathan@nathanw.com.au>
Date: Fri, 6 Sep 2019 15:45:17 +1000
Subject: [PATCH 521/776] fix tray colour, add some structure to CSS

(cherry picked from commit daadfe6e6cef7ce812445e15bd68465944494ba9)
---
 .../src/less/sections.less                    | 222 +++++++++---------
 1 file changed, 114 insertions(+), 108 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/sections.less b/src/Umbraco.Web.UI.Client/src/less/sections.less
index ef6c5f5046..5551ba6376 100644
--- a/src/Umbraco.Web.UI.Client/src/less/sections.less
+++ b/src/Umbraco.Web.UI.Client/src/less/sections.less
@@ -2,129 +2,135 @@
 // -------------------------
 
 ul.sections {
-	margin: 0;
-	display: flex;
-	margin-left: -20px;
-}
-
-ul.sections>li {
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	position: relative;
-}
-
-ul.sections>li>a {
-	color: @white;
-	height: @appHeaderHeight;
+    margin: 0;
     display: flex;
-	align-items: center;
-	justify-content: center;
-	position: relative;
-	padding: 0 10px;
-	text-decoration: none;
-	outline: none;
-	cursor: pointer;
-}
+    margin-left: -20px;
 
-ul.sections>li>a .section__name {
-    border-radius: 3px;
-    margin-top:1px;
-    padding: 3px 10px 4px 10px;
-	opacity: 0.8;
-	transition: opacity .1s linear, box-shadow .1s;
-}
+    > li {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        position: relative;
 
-ul.sections>li>a::after {
-	content: "";
-    left: 10px;
-    right: 10px;
-	height: 4px;
-	bottom: 0;
-    transform: translateY(4px);
-	background-color: @pinkLight;
-    position: absolute;
-	border-radius: 3px 3px 0 0;
-	opacity: 0;
-	padding: 0 2px;
-	transition: transform 240ms ease-in-out;
-}
+        > a {
+            color: @white;
+            height: @appHeaderHeight;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            position: relative;
+            padding: 0 10px;
+            text-decoration: none;
+            outline: none;
+            cursor: pointer;
 
-ul.sections>li.current>a {
-    color:@pinkLight;
-}
-ul.sections>li.current>a::after {
-	opacity: 1;
-    transform: translateY(0px);
-}
-ul.sections > li.current > a .section__name,
-ul.sections > li > a:hover .section__name {
-    opacity: 1;
-    -webkit-font-smoothing: subpixel-antialiased;
-}
+            &::after {
+                content: "";
+                left: 10px;
+                right: 10px;
+                height: 4px;
+                bottom: 0;
+                transform: translateY(4px);
+                background-color: @ui-active;
+                position: absolute;
+                border-radius: 3px 3px 0 0;
+                opacity: 0;
+                padding: 0 2px;
+                transition: transform 240ms ease-in-out;
+            }
 
-ul.sections > li > a:focus .section__name {
-    .tabbing-active & {
-        
-        border: 1px solid;
-        border-color: @gray-9;
+            &:focus .section__name {
+                .tabbing-active & {
+                    border: 1px solid;
+                    border-color: @gray-9;
+                }
+            }
+        }
+
+        .section__name {
+            border-radius: 3px;
+            margin-top: 1px;
+            padding: 3px 10px 4px 10px;
+            opacity: 0.8;
+            transition: opacity .1s linear, box-shadow .1s;
+        }
+
+        &.current a {
+            color: @ui-active;
+
+            &::after {
+                opacity: 1;
+                transform: translateY(0px);
+            }
+        }
+
+        &.expand {
+            i {
+                height: 5px;
+                width: 5px;
+                border-radius: 50%;
+                background: @white;
+                display: inline-block;
+                margin: 0 5px 0 0;
+                opacity: 0.6;
+                transition: opacity .1s linear;
+            }
+            
+            &:hover i {
+                opacity:1;
+            }
+        }
+
+        &.current .section__name,
+        a:hover .section__name {
+            opacity: 1;
+            -webkit-font-smoothing: subpixel-antialiased;
+        }
     }
 }
 
-
-
 /* Sections tray */
 
-ul.sections>li.expand i {
-	height: 5px;
-    width: 5px;
-    border-radius: 50%;
-    background: #fff;
-    display: inline-block;
-    margin: 0 5px 0 0;
-    opacity: 0.6;
-}
-
 ul.sections-tray {
-	position: absolute;
-	top: @appHeaderHeight;
-	left: 0;
-	margin: 0;
+    position: absolute;
+    top: @appHeaderHeight;
+    left: 0;
+    margin: 0;
     list-style: none;
-	background: @purple;
-	z-index: 10000;
-	border-radius: 0 0 3px 3px;
-}
+    background: @blueExtraDark;
+    z-index: 10000;
+    border-radius: 0 0 3px 3px;
 
-ul.sections-tray>li>a {
-	padding: 8px 24px;
-	color: @white;
-	text-decoration: none;
-	display: block;
-	position: relative;
-}
+    li {
 
-ul.sections-tray>li>a::after {
-	content: "";
-	width: 4px;
-	height: 100%;
-	background-color: @ui-active;
-	position: absolute;
-	border-radius: 0 3px 3px 0;
-	opacity: 0;
-	transition: all .2s linear;
-	top: 0;
-	left: 0;
-}
+        &.current a {
+            color: @ui-active;
+            opacity: 1;
 
-ul.sections-tray>li.current>a::after {
-	opacity: 1;
-}
+            &::after {
+                opacity: 1;
+            }
+        }
 
-ul.sections-tray>li>a .section__name {
-	opacity: 0.6;
-}
+        a {
+            padding: 8px 24px;
+            color: @white;
+            text-decoration: none;
+            display: block;
+            position: relative;
 
-ul.sections-tray>li>a:hover	.section__name {
-	opacity: 1;
+            &::after {
+                content: "";
+                width: 4px;
+                height: 100%;
+                background-color: @ui-active;
+                position: absolute;
+                border-radius: 0 3px 3px 0;
+                opacity: 0;
+                transition: all .2s linear;
+                top: 0;
+                left: 0;
+            }
+        }
+    }
 }

From 8f32fce7818a556d4879e66851dbe91221c63fdc Mon Sep 17 00:00:00 2001
From: Rasmus John Pedersen <mail@rjp.dk>
Date: Mon, 9 Sep 2019 11:52:48 +0200
Subject: [PATCH 522/776] Update Headless assembly names

---
 src/Umbraco.Core/Properties/AssemblyInfo.cs | 2 +-
 src/Umbraco.Web/Properties/AssemblyInfo.cs  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/Properties/AssemblyInfo.cs b/src/Umbraco.Core/Properties/AssemblyInfo.cs
index 9471285148..afd602cfc9 100644
--- a/src/Umbraco.Core/Properties/AssemblyInfo.cs
+++ b/src/Umbraco.Core/Properties/AssemblyInfo.cs
@@ -32,7 +32,7 @@ using System.Runtime.InteropServices;
 [assembly: InternalsVisibleTo("Umbraco.Forms.Web")]
 
 // Umbraco Headless
-[assembly: InternalsVisibleTo("Umbraco.Headless")]
+[assembly: InternalsVisibleTo("Umbraco.Cloud.Headless")]
 
 // code analysis
 // IDE1006 is broken, wants _value syntax for consts, etc - and it's even confusing ppl at MS, kill it
diff --git a/src/Umbraco.Web/Properties/AssemblyInfo.cs b/src/Umbraco.Web/Properties/AssemblyInfo.cs
index 9a1b248284..9f5abb99b5 100644
--- a/src/Umbraco.Web/Properties/AssemblyInfo.cs
+++ b/src/Umbraco.Web/Properties/AssemblyInfo.cs
@@ -30,7 +30,7 @@ using System.Runtime.InteropServices;
 [assembly: InternalsVisibleTo("Umbraco.Forms.Web")]
 
 // Umbraco Headless
-[assembly: InternalsVisibleTo("Umbraco.Headless")]
+[assembly: InternalsVisibleTo("Umbraco.Cloud.Headless")]
 
 // code analysis
 // IDE1006 is broken, wants _value syntax for consts, etc - and it's even confusing ppl at MS, kill it

From 8fef824dc1b354846129558e47eaef111927804c Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 9 Sep 2019 22:33:18 +1000
Subject: [PATCH 523/776] Moves rebuilding models and cache to background
 thread

---
 .../Cache/BackgroundSafeLiveFactory.cs        | 86 +++++++++++++++++++
 .../Cache/ContentTypeCacheRefresher.cs        | 21 ++---
 .../Cache/DataTypeCacheRefresher.cs           | 21 ++---
 src/Umbraco.Web/Runtime/WebInitialComposer.cs |  4 +-
 src/Umbraco.Web/Umbraco.Web.csproj            |  1 +
 5 files changed, 101 insertions(+), 32 deletions(-)
 create mode 100644 src/Umbraco.Web/Cache/BackgroundSafeLiveFactory.cs

diff --git a/src/Umbraco.Web/Cache/BackgroundSafeLiveFactory.cs b/src/Umbraco.Web/Cache/BackgroundSafeLiveFactory.cs
new file mode 100644
index 0000000000..d45c71d04d
--- /dev/null
+++ b/src/Umbraco.Web/Cache/BackgroundSafeLiveFactory.cs
@@ -0,0 +1,86 @@
+using System.Threading;
+using System.Threading.Tasks;
+using Umbraco.Core;
+using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Core.Logging;
+using Umbraco.Web.PublishedCache;
+using Umbraco.Web.Scheduling;
+
+namespace Umbraco.Web.Cache
+{
+    public sealed class BackgroundSafeLiveFactory
+    {
+        private readonly IPublishedModelFactory _publishedModelFactory;
+        private readonly IPublishedSnapshotService _publishedSnapshotService;
+        private BackgroundTaskRunner<IBackgroundTask> _runner;
+
+        public BackgroundSafeLiveFactory(IPublishedModelFactory publishedModelFactory, IPublishedSnapshotService publishedSnapshotService, ILogger logger)
+        {
+            _publishedModelFactory = publishedModelFactory;
+            _publishedSnapshotService = publishedSnapshotService;
+            _runner = new BackgroundTaskRunner<IBackgroundTask>("RebuildModelsAndCache", logger);
+        }
+
+        public void Execute(ContentTypeCacheRefresher.JsonPayload[] payloads)
+        {
+            _runner.TryAdd(new RebuildModelsAndCacheTask(payloads, _publishedModelFactory, _publishedSnapshotService));
+        }
+
+        public void Execute(DataTypeCacheRefresher.JsonPayload[] payloads)
+        {
+            _runner.TryAdd(new RebuildModelsAndCacheTask(payloads, _publishedModelFactory, _publishedSnapshotService));
+        }
+
+        private class RebuildModelsAndCacheTask : IBackgroundTask
+        {
+            private readonly DataTypeCacheRefresher.JsonPayload[] _dataTypePayloads;
+            private readonly ContentTypeCacheRefresher.JsonPayload[] _contentTypePayloads;
+            private readonly IPublishedModelFactory _publishedModelFactory;
+            private readonly IPublishedSnapshotService _publishedSnapshotService;
+
+            private RebuildModelsAndCacheTask(IPublishedModelFactory publishedModelFactory, IPublishedSnapshotService publishedSnapshotService)
+            {
+                _publishedModelFactory = publishedModelFactory;
+                _publishedSnapshotService = publishedSnapshotService;
+            }
+
+            public RebuildModelsAndCacheTask(DataTypeCacheRefresher.JsonPayload[] payloads, IPublishedModelFactory publishedModelFactory, IPublishedSnapshotService publishedSnapshotService)
+                : this(publishedModelFactory, publishedSnapshotService)
+            {
+                _dataTypePayloads = payloads;
+            }
+
+            public RebuildModelsAndCacheTask(ContentTypeCacheRefresher.JsonPayload[] payloads, IPublishedModelFactory publishedModelFactory, IPublishedSnapshotService publishedSnapshotService)
+                : this(publishedModelFactory, publishedSnapshotService)
+            {
+                _contentTypePayloads = payloads;
+            }
+
+            public void Run()
+            {
+                // we have to refresh models before we notify the published snapshot
+                // service of changes, else factories may try to rebuild models while
+                // we are using the database to load content into caches
+
+                _publishedModelFactory.WithSafeLiveFactory(() =>
+                {
+                    if (_dataTypePayloads != null)
+                        _publishedSnapshotService.Notify(_dataTypePayloads);
+                    if (_contentTypePayloads != null)
+                        _publishedSnapshotService.Notify(_contentTypePayloads);
+                });
+            }
+
+            public Task RunAsync(CancellationToken token)
+            {
+                throw new System.NotImplementedException();
+            }
+
+            public bool IsAsync => false;
+
+            public void Dispose()
+            {
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs b/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs
index 266cddf6d5..490adeb1d9 100644
--- a/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs
@@ -1,30 +1,23 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Models;
-using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Persistence.Repositories;
-using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Changes;
-using Umbraco.Web.PublishedCache;
 
 namespace Umbraco.Web.Cache
 {
     public sealed class ContentTypeCacheRefresher : PayloadCacheRefresherBase<ContentTypeCacheRefresher, ContentTypeCacheRefresher.JsonPayload>
     {
-        private readonly IPublishedSnapshotService _publishedSnapshotService;
-        private readonly IPublishedModelFactory _publishedModelFactory;
+        private readonly BackgroundSafeLiveFactory _backgroundModelFactory;
         private readonly IContentTypeCommonRepository _contentTypeCommonRepository;
         private readonly IdkMap _idkMap;
 
-        public ContentTypeCacheRefresher(AppCaches appCaches, IPublishedSnapshotService publishedSnapshotService, IPublishedModelFactory publishedModelFactory, IdkMap idkMap, IContentTypeCommonRepository contentTypeCommonRepository)
+        public ContentTypeCacheRefresher(AppCaches appCaches, BackgroundSafeLiveFactory backgroundModelFactory, IdkMap idkMap, IContentTypeCommonRepository contentTypeCommonRepository)
             : base(appCaches)
         {
-            _publishedSnapshotService = publishedSnapshotService;
-            _publishedModelFactory = publishedModelFactory;
+            _backgroundModelFactory = backgroundModelFactory;
             _idkMap = idkMap;
             _contentTypeCommonRepository = contentTypeCommonRepository;
         }
@@ -86,12 +79,8 @@ namespace Umbraco.Web.Cache
                 // don't try to be clever - refresh all
                 MemberCacheRefresher.RefreshMemberTypes(AppCaches);
 
-            // we have to refresh models before we notify the published snapshot
-            // service of changes, else factories may try to rebuild models while
-            // we are using the database to load content into caches
-
-            _publishedModelFactory.WithSafeLiveFactory(() =>
-                _publishedSnapshotService.Notify(payloads));
+            // refresh the models and cache
+            _backgroundModelFactory.Execute(payloads);
 
             // now we can trigger the event
             base.Refresh(payloads);
diff --git a/src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs b/src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs
index 1d41c0578b..c777da1971 100644
--- a/src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs
@@ -1,26 +1,21 @@
 using System;
-using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Models;
-using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.PropertyEditors.ValueConverters;
 using Umbraco.Core.Services;
-using Umbraco.Web.PublishedCache;
-
 
 namespace Umbraco.Web.Cache
 {
+
     public sealed class DataTypeCacheRefresher : PayloadCacheRefresherBase<DataTypeCacheRefresher, DataTypeCacheRefresher.JsonPayload>
     {
-        private readonly IPublishedSnapshotService _publishedSnapshotService;
-        private readonly IPublishedModelFactory _publishedModelFactory;
+        private readonly BackgroundSafeLiveFactory _backgroundModelFactory;
         private readonly IdkMap _idkMap;
 
-        public DataTypeCacheRefresher(AppCaches appCaches, IPublishedSnapshotService publishedSnapshotService, IPublishedModelFactory publishedModelFactory, IdkMap idkMap)
+        public DataTypeCacheRefresher(AppCaches appCaches, BackgroundSafeLiveFactory backgroundModelFactory, IdkMap idkMap)
             : base(appCaches)
         {
-            _publishedSnapshotService = publishedSnapshotService;
-            _publishedModelFactory = publishedModelFactory;
+            _backgroundModelFactory = backgroundModelFactory;
             _idkMap = idkMap;
         }
 
@@ -62,12 +57,8 @@ namespace Umbraco.Web.Cache
             TagsValueConverter.ClearCaches();
             SliderValueConverter.ClearCaches();
 
-            // we have to refresh models before we notify the published snapshot
-            // service of changes, else factories may try to rebuild models while
-            // we are using the database to load content into caches
-
-            _publishedModelFactory.WithSafeLiveFactory(() =>
-                _publishedSnapshotService.Notify(payloads));
+            // refresh the models and cache
+            _backgroundModelFactory.Execute(payloads);
 
             base.Refresh(payloads);
         }
diff --git a/src/Umbraco.Web/Runtime/WebInitialComposer.cs b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
index e2b6313ca6..13d2a6b74c 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
@@ -73,7 +73,7 @@ namespace Umbraco.Web.Runtime
             // register accessors for cultures
             composition.RegisterUnique<IDefaultCultureAccessor, DefaultCultureAccessor>();
             composition.RegisterUnique<IVariationContextAccessor, HybridVariationContextAccessor>();
-
+            
             // register the http context and umbraco context accessors
             // we *should* use the HttpContextUmbracoContextAccessor, however there are cases when
             // we have no http context, eg when booting Umbraco or in background threads, so instead
@@ -125,6 +125,8 @@ namespace Umbraco.Web.Runtime
             // register distributed cache
             composition.RegisterUnique(f => new DistributedCache());
 
+            composition.RegisterUnique<BackgroundSafeLiveFactory>();
+
             // replace some services
             composition.RegisterUnique<IEventMessagesFactory, DefaultEventMessagesFactory>();
             composition.RegisterUnique<IEventMessagesAccessor, HybridEventMessagesAccessor>();
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 222d58d4dc..c7a576c94f 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -115,6 +115,7 @@
     <Compile Include="AppBuilderExtensions.cs" />
     <Compile Include="AreaRegistrationContextExtensions.cs" />
     <Compile Include="AspNetHttpContextAccessor.cs" />
+    <Compile Include="Cache\BackgroundSafeLiveFactory.cs" />
     <Compile Include="Cache\DistributedCacheBinder.cs" />
     <Compile Include="Cache\DistributedCacheBinderComposer.cs" />
     <Compile Include="Cache\DistributedCacheBinder_Handlers.cs" />

From fdad3874145f91e35677eb20a17eb60c8d1e72b2 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 9 Sep 2019 23:25:28 +1000
Subject: [PATCH 524/776] renames objects/methods and adds a lock to the
 routing mechanism

---
 .../Routing/UmbracoModuleTests.cs             |  6 ++-
 ...groundPublishedSnapshotServiceNotifier.cs} | 48 +++++++++++++++----
 .../Cache/ContentTypeCacheRefresher.cs        |  6 +--
 .../Cache/DataTypeCacheRefresher.cs           |  6 +--
 ...aseServerRegistrarAndMessengerComponent.cs |  4 --
 src/Umbraco.Web/Runtime/WebInitialComposer.cs |  2 +-
 src/Umbraco.Web/Umbraco.Web.csproj            |  2 +-
 src/Umbraco.Web/UmbracoInjectedModule.cs      | 10 +++-
 8 files changed, 61 insertions(+), 23 deletions(-)
 rename src/Umbraco.Web/Cache/{BackgroundSafeLiveFactory.cs => BackgroundPublishedSnapshotServiceNotifier.cs} (57%)

diff --git a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
index 3e4c4f1ba9..9a3534cfc4 100644
--- a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
+++ b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
@@ -46,7 +46,11 @@ namespace Umbraco.Tests.Routing
                 logger,
                 null, // FIXME: PublishedRouter complexities...
                 Mock.Of<IVariationContextAccessor>(),
-                Mock.Of<IUmbracoContextFactory>()
+                Mock.Of<IUmbracoContextFactory>(),
+                new Umbraco.Web.Cache.BackgroundPublishedSnapshotServiceNotifier(
+                    Factory.GetInstance<IPublishedModelFactory>(),
+                    Factory.GetInstance<IPublishedSnapshotService>(),
+                    Logger)
             );
 
             runtime.Level = RuntimeLevel.Run;
diff --git a/src/Umbraco.Web/Cache/BackgroundSafeLiveFactory.cs b/src/Umbraco.Web/Cache/BackgroundPublishedSnapshotServiceNotifier.cs
similarity index 57%
rename from src/Umbraco.Web/Cache/BackgroundSafeLiveFactory.cs
rename to src/Umbraco.Web/Cache/BackgroundPublishedSnapshotServiceNotifier.cs
index d45c71d04d..725b1389ce 100644
--- a/src/Umbraco.Web/Cache/BackgroundSafeLiveFactory.cs
+++ b/src/Umbraco.Web/Cache/BackgroundPublishedSnapshotServiceNotifier.cs
@@ -8,29 +8,62 @@ using Umbraco.Web.Scheduling;
 
 namespace Umbraco.Web.Cache
 {
-    public sealed class BackgroundSafeLiveFactory
+    /// <summary>
+    /// Used to notify the <see cref="IPublishedSnapshotService"/> of changes using a background thread
+    /// </summary>
+    /// <remarks>
+    /// When in Pure Live mode, the models need to be rebuilt before the IPublishedSnapshotService is notified which can result in performance penalties so
+    /// this performs these actions on a background thread so the user isn't waiting for the rebuilding to occur on a UI thread. 
+    /// </remarks>
+    public sealed class BackgroundPublishedSnapshotServiceNotifier
     {
         private readonly IPublishedModelFactory _publishedModelFactory;
         private readonly IPublishedSnapshotService _publishedSnapshotService;
-        private BackgroundTaskRunner<IBackgroundTask> _runner;
+        private readonly BackgroundTaskRunner<IBackgroundTask> _runner;
 
-        public BackgroundSafeLiveFactory(IPublishedModelFactory publishedModelFactory, IPublishedSnapshotService publishedSnapshotService, ILogger logger)
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="publishedModelFactory"></param>
+        /// <param name="publishedSnapshotService"></param>
+        /// <param name="logger"></param>
+        public BackgroundPublishedSnapshotServiceNotifier(IPublishedModelFactory publishedModelFactory, IPublishedSnapshotService publishedSnapshotService, ILogger logger)
         {
             _publishedModelFactory = publishedModelFactory;
             _publishedSnapshotService = publishedSnapshotService;
+
+            // TODO: We have the option to check if we are in live mode and only run on a background thread if that is the case, else run normally?
+            // IMO I think we should just always run on a background thread, then no matter what state the app is in, it's always doing a consistent operation.
+
             _runner = new BackgroundTaskRunner<IBackgroundTask>("RebuildModelsAndCache", logger);
         }
 
-        public void Execute(ContentTypeCacheRefresher.JsonPayload[] payloads)
+        /// <summary>
+        /// Blocks until the background operation is completed
+        /// </summary>
+        public void Wait() => _runner.StoppedAwaitable.GetAwaiter().GetResult(); //TODO: do we need a try/catch?
+
+        /// <summary>
+        /// Notify the <see cref="IPublishedSnapshotService"/> of content type changes
+        /// </summary>
+        /// <param name="payloads"></param>
+        public void NotifyWithSafeLiveFactory(ContentTypeCacheRefresher.JsonPayload[] payloads)
         {
             _runner.TryAdd(new RebuildModelsAndCacheTask(payloads, _publishedModelFactory, _publishedSnapshotService));
         }
 
-        public void Execute(DataTypeCacheRefresher.JsonPayload[] payloads)
+        /// <summary>
+        /// Notify the <see cref="IPublishedSnapshotService"/> of data type changes
+        /// </summary>
+        /// <param name="payloads"></param>
+        public void NotifyWithSafeLiveFactory(DataTypeCacheRefresher.JsonPayload[] payloads)
         {
             _runner.TryAdd(new RebuildModelsAndCacheTask(payloads, _publishedModelFactory, _publishedSnapshotService));
         }
 
+        /// <summary>
+        /// A simple background task that notifies the <see cref="IPublishedSnapshotService"/> of changes
+        /// </summary>
         private class RebuildModelsAndCacheTask : IBackgroundTask
         {
             private readonly DataTypeCacheRefresher.JsonPayload[] _dataTypePayloads;
@@ -71,10 +104,7 @@ namespace Umbraco.Web.Cache
                 });
             }
 
-            public Task RunAsync(CancellationToken token)
-            {
-                throw new System.NotImplementedException();
-            }
+            public Task RunAsync(CancellationToken token) => throw new System.NotImplementedException();
 
             public bool IsAsync => false;
 
diff --git a/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs b/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs
index 490adeb1d9..8ff82b2644 100644
--- a/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs
@@ -10,11 +10,11 @@ namespace Umbraco.Web.Cache
 {
     public sealed class ContentTypeCacheRefresher : PayloadCacheRefresherBase<ContentTypeCacheRefresher, ContentTypeCacheRefresher.JsonPayload>
     {
-        private readonly BackgroundSafeLiveFactory _backgroundModelFactory;
+        private readonly BackgroundPublishedSnapshotServiceNotifier _backgroundModelFactory;
         private readonly IContentTypeCommonRepository _contentTypeCommonRepository;
         private readonly IdkMap _idkMap;
 
-        public ContentTypeCacheRefresher(AppCaches appCaches, BackgroundSafeLiveFactory backgroundModelFactory, IdkMap idkMap, IContentTypeCommonRepository contentTypeCommonRepository)
+        public ContentTypeCacheRefresher(AppCaches appCaches, BackgroundPublishedSnapshotServiceNotifier backgroundModelFactory, IdkMap idkMap, IContentTypeCommonRepository contentTypeCommonRepository)
             : base(appCaches)
         {
             _backgroundModelFactory = backgroundModelFactory;
@@ -80,7 +80,7 @@ namespace Umbraco.Web.Cache
                 MemberCacheRefresher.RefreshMemberTypes(AppCaches);
 
             // refresh the models and cache
-            _backgroundModelFactory.Execute(payloads);
+            _backgroundModelFactory.NotifyWithSafeLiveFactory(payloads);
 
             // now we can trigger the event
             base.Refresh(payloads);
diff --git a/src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs b/src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs
index c777da1971..5363182a08 100644
--- a/src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs
@@ -9,10 +9,10 @@ namespace Umbraco.Web.Cache
 
     public sealed class DataTypeCacheRefresher : PayloadCacheRefresherBase<DataTypeCacheRefresher, DataTypeCacheRefresher.JsonPayload>
     {
-        private readonly BackgroundSafeLiveFactory _backgroundModelFactory;
+        private readonly BackgroundPublishedSnapshotServiceNotifier _backgroundModelFactory;
         private readonly IdkMap _idkMap;
 
-        public DataTypeCacheRefresher(AppCaches appCaches, BackgroundSafeLiveFactory backgroundModelFactory, IdkMap idkMap)
+        public DataTypeCacheRefresher(AppCaches appCaches, BackgroundPublishedSnapshotServiceNotifier backgroundModelFactory, IdkMap idkMap)
             : base(appCaches)
         {
             _backgroundModelFactory = backgroundModelFactory;
@@ -58,7 +58,7 @@ namespace Umbraco.Web.Cache
             SliderValueConverter.ClearCaches();
 
             // refresh the models and cache
-            _backgroundModelFactory.Execute(payloads);
+            _backgroundModelFactory.NotifyWithSafeLiveFactory(payloads);
 
             base.Refresh(payloads);
         }
diff --git a/src/Umbraco.Web/Compose/DatabaseServerRegistrarAndMessengerComponent.cs b/src/Umbraco.Web/Compose/DatabaseServerRegistrarAndMessengerComponent.cs
index a68e137665..7850125970 100644
--- a/src/Umbraco.Web/Compose/DatabaseServerRegistrarAndMessengerComponent.cs
+++ b/src/Umbraco.Web/Compose/DatabaseServerRegistrarAndMessengerComponent.cs
@@ -1,12 +1,8 @@
 using System;
 using System.Threading;
 using Umbraco.Core;
-using Umbraco.Core.Compose;
 using Umbraco.Core.Composing;
-using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
-using Umbraco.Core.Persistence;
-using Umbraco.Core.Scoping;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Changes;
 using Umbraco.Core.Sync;
diff --git a/src/Umbraco.Web/Runtime/WebInitialComposer.cs b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
index 13d2a6b74c..d59caff63c 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
@@ -125,7 +125,7 @@ namespace Umbraco.Web.Runtime
             // register distributed cache
             composition.RegisterUnique(f => new DistributedCache());
 
-            composition.RegisterUnique<BackgroundSafeLiveFactory>();
+            composition.RegisterUnique<BackgroundPublishedSnapshotServiceNotifier>();
 
             // replace some services
             composition.RegisterUnique<IEventMessagesFactory, DefaultEventMessagesFactory>();
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index c7a576c94f..b5641e8aae 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -115,7 +115,7 @@
     <Compile Include="AppBuilderExtensions.cs" />
     <Compile Include="AreaRegistrationContextExtensions.cs" />
     <Compile Include="AspNetHttpContextAccessor.cs" />
-    <Compile Include="Cache\BackgroundSafeLiveFactory.cs" />
+    <Compile Include="Cache\BackgroundPublishedSnapshotServiceNotifier.cs" />
     <Compile Include="Cache\DistributedCacheBinder.cs" />
     <Compile Include="Cache\DistributedCacheBinderComposer.cs" />
     <Compile Include="Cache\DistributedCacheBinder_Handlers.cs" />
diff --git a/src/Umbraco.Web/UmbracoInjectedModule.cs b/src/Umbraco.Web/UmbracoInjectedModule.cs
index db5372efa2..b16d86a8ba 100644
--- a/src/Umbraco.Web/UmbracoInjectedModule.cs
+++ b/src/Umbraco.Web/UmbracoInjectedModule.cs
@@ -18,6 +18,7 @@ using Umbraco.Core.Security;
 using Umbraco.Core.Services;
 using Umbraco.Web.Composing;
 using Umbraco.Web.PublishedCache;
+using Umbraco.Web.Cache;
 
 namespace Umbraco.Web
 {
@@ -48,6 +49,7 @@ namespace Umbraco.Web
         private readonly IPublishedRouter _publishedRouter;
         private readonly IVariationContextAccessor _variationContextAccessor;
         private readonly IUmbracoContextFactory _umbracoContextFactory;
+        private readonly BackgroundPublishedSnapshotServiceNotifier _backgroundNotifier;
 
         public UmbracoInjectedModule(
             IGlobalSettings globalSettings,
@@ -59,7 +61,8 @@ namespace Umbraco.Web
             ILogger logger,
             IPublishedRouter publishedRouter,
             IVariationContextAccessor variationContextAccessor,
-            IUmbracoContextFactory umbracoContextFactory)
+            IUmbracoContextFactory umbracoContextFactory,
+            BackgroundPublishedSnapshotServiceNotifier backgroundNotifier)
         {
             _combinedRouteCollection = new Lazy<RouteCollection>(CreateRouteCollection);
 
@@ -73,6 +76,7 @@ namespace Umbraco.Web
             _publishedRouter = publishedRouter;
             _variationContextAccessor = variationContextAccessor;
             _umbracoContextFactory = umbracoContextFactory;
+            _backgroundNotifier = backgroundNotifier;
         }
 
         #region HttpModule event handlers
@@ -136,6 +140,10 @@ namespace Umbraco.Web
             // do not process if this request is not a front-end routable page
             var isRoutableAttempt = EnsureUmbracoRoutablePage(umbracoContext, httpContext);
 
+            // If this page is probably front-end routable, block here until the backround notifier isn't busy
+            if (isRoutableAttempt)                
+                _backgroundNotifier.Wait(); 
+
             // raise event here
             UmbracoModule.OnRouteAttempt(this, new RoutableAttemptEventArgs(isRoutableAttempt.Result, umbracoContext, httpContext));
             if (isRoutableAttempt.Success == false) return;

From 7d2c92b65150aebf06d2536ac17c2f6ebda6aa48 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Mon, 9 Sep 2019 15:54:03 +0100
Subject: [PATCH 525/776] A new temp location for RTE uploads

---
 src/Umbraco.Core/IO/SystemDirectories.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Umbraco.Core/IO/SystemDirectories.cs b/src/Umbraco.Core/IO/SystemDirectories.cs
index 2f33d82bdc..d6fb63b0a1 100644
--- a/src/Umbraco.Core/IO/SystemDirectories.cs
+++ b/src/Umbraco.Core/IO/SystemDirectories.cs
@@ -15,6 +15,8 @@ namespace Umbraco.Core.IO
 
         public static string TempFileUploads => TempData + "/FileUploads";
 
+        public static string TempImageUploads => TempFileUploads + "/rte";
+
         public static string Install => "~/install";
 
         public static string AppCode => "~/App_Code";

From 5e394cb62b69ad2dbcd76fba1c2a64ac88fde742 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Mon, 9 Sep 2019 16:04:52 +0100
Subject: [PATCH 526/776] Refactor we do not instantly persist the uploaded
 file to a media item in Umbraco - what if the user undo's or removes it from
 content we will bloat the media section

* Adds a data-tmpimg attribute to the <img> in the markup, which we scan for when persisting to the DB in the RTE PropertyValueEditor to then perist media items
* TODO: Find a way to get TinyMCE to NOT send a base64 down the wire as the saved content/HTML
---
 .../src/common/services/tinymce.service.js    | 36 ++++----
 src/Umbraco.Web/Editors/TinyMceController.cs  | 66 +++++++-------
 .../PropertyEditors/RichTextPropertyEditor.cs | 89 +++++++++++++++++--
 3 files changed, 126 insertions(+), 65 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 23104b99f5..07aa4d57b7 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -158,10 +158,6 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
     }
 
     function uploadImageHandler(blobInfo, success, failure, progress){
-
-        //TODO: Worth refactoring to Angular $http calls
-        //Rather than XHR??
-
         let xhr, formData;
 
         xhr = new XMLHttpRequest();
@@ -185,24 +181,20 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
 
             json = JSON.parse(xhr.responseText);
 
-            if (!json || typeof json.location !== 'string') {
+            if (!json || typeof json.tmpLocation !== 'string') {
                 failure('Invalid JSON: ' + xhr.responseText);
                 return;
             }
 
-            // Put UDI into localstorage (used to update the img with data-udi later on)
-            localStorageService.set(`tinymce__${json.location}`, json.udi);
+            // Put temp location into localstorage (used to update the img with data-tmpimg later on)
+            localStorage.setItem(`tinymce__${blobInfo.blobUri()}`, json.tmpLocation);
 
-            success(json.location);
+            success();
         };
 
         formData = new FormData();
         formData.append('file', blobInfo.blob(), blobInfo.blob().name);
 
-        //TODO: Send Media Parent ID from config
-        //TODO: How will each RTE pass in this value to this function?!
-        formData.append('mediaParent', -1);
-
         xhr.send(formData);
     }
 
@@ -215,21 +207,22 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
             if(content.indexOf('<img src="blob:') > -1){
 
                 editor.uploadImages(function(data) {
+                    // Once all images have been uploaded
                     data.forEach(function(item) {
-                        //Select img element
+                        // Select img element
                         var img = item.element;
 
-                        //Get img src
+                        // Get img src
                         var imgSrc = img.getAttribute("src");
+                        var tmpLocation = localStorage.getItem(`tinymce__${imgSrc}`);
 
-                        //Try & find in localstorage
-                        var udi = localStorageService.get(`tinymce__${imgSrc}`);
+                        // Select the img & add new attr which we can search for
+                        // When its being persisted in RTE property editor
+                        // To create a media item & delete this tmp one etc
+                        tinymce.activeEditor.$(img).attr({ "data-tmpimg": tmpLocation });
 
-                        //Select the img & update is attr
-                        tinymce.activeEditor.$(img).attr({ "data-udi": udi });
-
-                        //Remove key
-                        localStorageService.remove(`tinymce__${imgSrc}`);
+                        // Be a boy scout & cleanup after ourselves
+                        localStorage.removeItem(`tinymce__${imgSrc}`);
                     });
                 });
             }
@@ -330,6 +323,7 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
 
                     images_upload_handler: uploadImageHandler,
                     automatic_uploads: false,
+                    images_replace_blob_uris: false,
                     init_instance_callback: initEvents
                 };
 
diff --git a/src/Umbraco.Web/Editors/TinyMceController.cs b/src/Umbraco.Web/Editors/TinyMceController.cs
index 06b827568a..f3e97d9f9f 100644
--- a/src/Umbraco.Web/Editors/TinyMceController.cs
+++ b/src/Umbraco.Web/Editors/TinyMceController.cs
@@ -1,10 +1,8 @@
 using System.Net;
 using System.Net.Http;
-using System.Web;
 using System.Web.Http;
 using Umbraco.Core.Services;
 using Umbraco.Web.WebApi;
-using Constants = Umbraco.Core.Constants;
 using Umbraco.Core;
 using Umbraco.Web.Mvc;
 using Umbraco.Core.IO;
@@ -14,7 +12,6 @@ using Umbraco.Web.Composing;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using System.Linq;
 using System;
-using Umbraco.Core.Models.PublishedContent;
 
 namespace Umbraco.Web.Editors
 {
@@ -39,12 +36,22 @@ namespace Umbraco.Web.Editors
                 throw new HttpResponseException(HttpStatusCode.UnsupportedMediaType);
             }
 
-            var root = IOHelper.MapPath(SystemDirectories.TempFileUploads);
+            // Backoffice user ID (needed for unique folder path) to help with concurrent users
+            // to avoid filename clash along with UTC current time
+            var userId = Security.CurrentUser.Id;
+            var imageTempPath = IOHelper.MapPath(SystemDirectories.TempImageUploads + "/" + userId + "_" + DateTimeOffset.UtcNow.ToUnixTimeSeconds());
 
-            // Ensure it exists
-            Directory.CreateDirectory(root);
-            var provider = new MultipartFormDataStreamProvider(root);
+            // Temp folderpath (Files come in as bodypart & will need to move/saved into imgTempPath
+            var folderPath = IOHelper.MapPath(SystemDirectories.TempFileUploads);
 
+            // Ensure image temp path exists
+            if(Directory.Exists(imageTempPath) == false)
+            {
+                Directory.CreateDirectory(imageTempPath);
+            }
+
+            // File uploaded will be saved as bodypart into TEMP folder
+            var provider = new MultipartFormDataStreamProvider(folderPath);
             var result = await Request.Content.ReadAsMultipartAsync(provider);
 
             // Must have a file
@@ -59,17 +66,8 @@ namespace Umbraco.Web.Editors
                 return Request.CreateErrorResponse(HttpStatusCode.BadRequest, "Only one file can be uploaded at a time");
             }
 
-            // Check we have mediaParent as posted data
-            if (string.IsNullOrEmpty(result.FormData["mediaParent"]))
-            {
-                return Request.CreateErrorResponse(HttpStatusCode.BadRequest, "Missing the Media Parent folder to save this image");
-            }
-
             // Really we should only have one file per request to this endpoint
             var file = result.FileData[0];
-
-            var parentFolder = Convert.ToInt32(result.FormData["mediaParent"]);
-
             var fileName = file.Headers.ContentDisposition.FileName.Trim(new[] { '\"' }).TrimEnd();
             var safeFileName = fileName.ToSafeFileName();
             var ext = safeFileName.Substring(safeFileName.LastIndexOf('.') + 1).ToLower();
@@ -80,28 +78,26 @@ namespace Umbraco.Web.Editors
                 return Request.CreateErrorResponse(HttpStatusCode.BadRequest, "This is not an image filetype extension that is approved");
             }
 
-            var mediaItemName = fileName.ToFriendlyName();
-            var f = _mediaService.CreateMedia(mediaItemName, parentFolder, Constants.Conventions.MediaTypes.Image, Security.CurrentUser.Id);
-            var fileInfo = new FileInfo(file.LocalFileName);
-            var fs = fileInfo.OpenReadWithRetry();
-            if (fs == null) throw new InvalidOperationException("Could not acquire file stream");
-            using (fs)
+            //var mediaItemName = fileName.ToFriendlyName();
+            var currentFile = file.LocalFileName;
+            var newFilePath = imageTempPath +  IOHelper.DirSepChar + safeFileName;
+            var relativeNewFilePath = IOHelper.GetRelativePath(newFilePath);
+
+            try
             {
-                f.SetValue(Services.ContentTypeBaseServices, Constants.Conventions.Media.File, fileName, fs);
+                // Move the file from bodypart to a real filename
+                // This is what we return from this API so RTE updates img src path
+                // Until we fully persist & save the media item when persisting
+                // If we find <img data-temp-img /> data attribute
+                File.Move(currentFile, newFilePath);
             }
+            catch (Exception ex)
+            {
+                // Could be a file permission ex
+                throw;
+            }            
 
-            _mediaService.Save(f, Security.CurrentUser.Id);
-
-            // Need to get URL to the media item and its UDI
-            var udi = f.GetUdi();
-
-
-            // TODO: Check this is the BEST way to get the URL
-            // Ensuring if they use some CDN & blob storage?!
-            var mediaTyped = Umbraco.Media(f.Id);
-            var location = mediaTyped.Url;
-
-            return Request.CreateResponse(HttpStatusCode.OK, new { location = location, udi = udi });
+            return Request.CreateResponse(HttpStatusCode.OK, new { tmpLocation = relativeNewFilePath });
         }
     }
 }
diff --git a/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
index 3ced379604..911defcd17 100644
--- a/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
@@ -1,12 +1,15 @@
-using System;
+using HtmlAgilityPack;
+using System;
 using System.Collections.Generic;
+using System.IO;
 using Umbraco.Core;
+using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
-using Umbraco.Core.Macros;
 using Umbraco.Core.Models;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
 using Umbraco.Examine;
+using Umbraco.Web.Composing;
 using Umbraco.Web.Macros;
 using Umbraco.Web.Templates;
 
@@ -25,18 +28,23 @@ namespace Umbraco.Web.PropertyEditors
         Icon = "icon-browser-window")]
     public class RichTextPropertyEditor : DataEditor
     {
+        private IMediaService _mediaService;
+        private IContentTypeBaseServiceProvider _contentTypeBaseServiceProvider;
+
         /// <summary>
         /// The constructor will setup the property editor based on the attribute if one is found
         /// </summary>
-        public RichTextPropertyEditor(ILogger logger) : base(logger)
+        public RichTextPropertyEditor(ILogger logger, IMediaService mediaService, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider) : base(logger)
         {
+            _mediaService = mediaService;
+            _contentTypeBaseServiceProvider = contentTypeBaseServiceProvider;
         }
 
         /// <summary>
         /// Create a custom value editor
         /// </summary>
         /// <returns></returns>
-        protected override IDataValueEditor CreateValueEditor() => new RichTextPropertyValueEditor(Attribute);
+        protected override IDataValueEditor CreateValueEditor() => new RichTextPropertyValueEditor(Attribute, _mediaService, _contentTypeBaseServiceProvider);
 
         protected override IConfigurationEditor CreateConfigurationEditor() => new RichTextConfigurationEditor();
 
@@ -47,9 +55,15 @@ namespace Umbraco.Web.PropertyEditors
         /// </summary>
         internal class RichTextPropertyValueEditor : DataValueEditor
         {
-            public RichTextPropertyValueEditor(DataEditorAttribute attribute)
+            private IMediaService _mediaService;
+            private IContentTypeBaseServiceProvider _contentTypeBaseServiceProvider;
+
+            public RichTextPropertyValueEditor(DataEditorAttribute attribute, IMediaService mediaService, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider)
                 : base(attribute)
-            { }
+            {
+                _mediaService = mediaService;
+                _contentTypeBaseServiceProvider = contentTypeBaseServiceProvider;
+            }
 
             /// <inheritdoc />
             public override object Configuration
@@ -71,10 +85,9 @@ namespace Umbraco.Web.PropertyEditors
             /// Format the data for the editor
             /// </summary>
             /// <param name="property"></param>
-            /// <param name="dataTypeService"></param>
+            /// <param name="dataTypeService"></param>Rte
             /// <param name="culture"></param>
-            /// <param name="segment"></param>
-            /// <returns></returns>
+            /// <param name="segment"></param>te
             public override object ToEditor(Property property, IDataTypeService dataTypeService, string culture = null, string segment = null)
             {
                 var val = property.GetValue(culture, segment);
@@ -99,8 +112,66 @@ namespace Umbraco.Web.PropertyEditors
 
                 var editorValueWithMediaUrlsRemoved = TemplateUtilities.RemoveMediaUrlsFromTextString(editorValue.Value.ToString());
                 var parsed = MacroTagParser.FormatRichTextContentForPersistence(editorValueWithMediaUrlsRemoved);
+
+                // HTML content when being persisted may j
+                parsed = FindPastedTempImages(parsed);
+                
                 return parsed;
             }
+
+            private string FindPastedTempImages(string html)
+            {
+                // Find all img's that has data-tmpimg attribute
+                // Use HTML Agility Pack - https://html-agility-pack.net
+                var htmlDoc = new HtmlDocument();
+                htmlDoc.LoadHtml(html);
+
+                var tmpImages = htmlDoc.DocumentNode.SelectNodes("//img[@data-tmpimg]");
+                if (tmpImages == null || tmpImages.Count == 0)
+                    return html;
+
+                var userId = Current.UmbracoContext.Security.CurrentUser.Id;
+
+                foreach (var img in tmpImages)
+                {
+                    // The data attribute contains the path to the tmp img to persist as a media item
+                    var tmpImgPath = img.GetAttributeValue("data-tmpimg", string.Empty);
+
+                    if (string.IsNullOrEmpty(tmpImgPath))
+                        continue;
+
+                    var absTmpImgPath = IOHelper.MapPath(tmpImgPath);
+                    var fileName = Path.GetFileName(absTmpImgPath);
+                    var safeFileName = fileName.ToSafeFileName();
+
+                    // TODO: In future task (get the parent folder from this config) to save the media into
+                    var mediaItemName = safeFileName.ToFriendlyName();
+                    var f = _mediaService.CreateMedia(mediaItemName, -1, Constants.Conventions.MediaTypes.Image, userId);
+                    var fileInfo = new FileInfo(absTmpImgPath);
+
+                    var fs = fileInfo.OpenReadWithRetry();
+                    if (fs == null) throw new InvalidOperationException("Could not acquire file stream");
+                    using (fs)
+                    {
+                        f.SetValue(_contentTypeBaseServiceProvider, Constants.Conventions.Media.File, safeFileName, fs);
+                    }
+
+                    _mediaService.Save(f, userId);
+
+                    // Add the UDI to the img element as new data attribute
+                    var udi = f.GetUdi();
+                    img.SetAttributeValue("data-udi", udi.ToString());
+
+                    //Get the new persisted image url
+                    var mediaTyped = Current.UmbracoHelper.Media(f.Id);
+                    var location = mediaTyped.Url;
+
+                    // Remove the data attribute (so we do not re-process this)
+                    img.Attributes.Remove("data-tmpimg");
+                }
+
+                return htmlDoc.DocumentNode.OuterHtml;
+            }
         }
 
         internal class RichTextPropertyIndexValueFactory : IPropertyIndexValueFactory

From 9d8e4fd66f8ac7a759bbdfeae9a0fe12e686e85a Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Mon, 9 Sep 2019 18:50:49 +0100
Subject: [PATCH 527/776] Fixes the issue with the image being stored as a
 base64 inline image, which can be HUGE & make POST request slow to save the
 content node

---
 .../src/common/services/tinymce.service.js                   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 07aa4d57b7..24139da62d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -189,7 +189,10 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
             // Put temp location into localstorage (used to update the img with data-tmpimg later on)
             localStorage.setItem(`tinymce__${blobInfo.blobUri()}`, json.tmpLocation);
 
-            success();
+            // We set the img src url to be the same as we started
+            // The Blob URI is stored in TinyMce's cache
+            // so the img still shows in the editor
+            success(blobInfo.blobUri());
         };
 
         formData = new FormData();

From 296afb18a46367dcd85d20e30eccd535da9ecb59 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 10 Sep 2019 11:50:09 +1000
Subject: [PATCH 528/776] Renames and puts in temp fix to try to find out why
 we are binding to old models

---
 .../Routing/UmbracoModuleTests.cs             |  2 +-
 ...=> BackgroundPublishedSnapshotNotifier.cs} | 20 +++++++++++++++----
 .../Cache/ContentTypeCacheRefresher.cs        |  4 ++--
 .../Cache/DataTypeCacheRefresher.cs           |  4 ++--
 src/Umbraco.Web/Runtime/WebInitialComposer.cs |  2 +-
 src/Umbraco.Web/Umbraco.Web.csproj            |  2 +-
 src/Umbraco.Web/UmbracoInjectedModule.cs      | 20 +++++++++++++++----
 7 files changed, 39 insertions(+), 15 deletions(-)
 rename src/Umbraco.Web/Cache/{BackgroundPublishedSnapshotServiceNotifier.cs => BackgroundPublishedSnapshotNotifier.cs} (85%)

diff --git a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
index 9a3534cfc4..34ac79a219 100644
--- a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
+++ b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
@@ -47,7 +47,7 @@ namespace Umbraco.Tests.Routing
                 null, // FIXME: PublishedRouter complexities...
                 Mock.Of<IVariationContextAccessor>(),
                 Mock.Of<IUmbracoContextFactory>(),
-                new Umbraco.Web.Cache.BackgroundPublishedSnapshotServiceNotifier(
+                new Umbraco.Web.Cache.BackgroundPublishedSnapshotNotifier(
                     Factory.GetInstance<IPublishedModelFactory>(),
                     Factory.GetInstance<IPublishedSnapshotService>(),
                     Logger)
diff --git a/src/Umbraco.Web/Cache/BackgroundPublishedSnapshotServiceNotifier.cs b/src/Umbraco.Web/Cache/BackgroundPublishedSnapshotNotifier.cs
similarity index 85%
rename from src/Umbraco.Web/Cache/BackgroundPublishedSnapshotServiceNotifier.cs
rename to src/Umbraco.Web/Cache/BackgroundPublishedSnapshotNotifier.cs
index 725b1389ce..f1da2b6375 100644
--- a/src/Umbraco.Web/Cache/BackgroundPublishedSnapshotServiceNotifier.cs
+++ b/src/Umbraco.Web/Cache/BackgroundPublishedSnapshotNotifier.cs
@@ -13,9 +13,11 @@ namespace Umbraco.Web.Cache
     /// </summary>
     /// <remarks>
     /// When in Pure Live mode, the models need to be rebuilt before the IPublishedSnapshotService is notified which can result in performance penalties so
-    /// this performs these actions on a background thread so the user isn't waiting for the rebuilding to occur on a UI thread. 
+    /// this performs these actions on a background thread so the user isn't waiting for the rebuilding to occur on a UI thread.
+    /// When using this, even when not in Pure Live mode, it still means that the cache is notified on a background thread.
+    /// In order to wait for the processing to complete, this class has a Wait() method which will block until the processing is finished.
     /// </remarks>
-    public sealed class BackgroundPublishedSnapshotServiceNotifier
+    public sealed class BackgroundPublishedSnapshotNotifier
     {
         private readonly IPublishedModelFactory _publishedModelFactory;
         private readonly IPublishedSnapshotService _publishedSnapshotService;
@@ -27,7 +29,7 @@ namespace Umbraco.Web.Cache
         /// <param name="publishedModelFactory"></param>
         /// <param name="publishedSnapshotService"></param>
         /// <param name="logger"></param>
-        public BackgroundPublishedSnapshotServiceNotifier(IPublishedModelFactory publishedModelFactory, IPublishedSnapshotService publishedSnapshotService, ILogger logger)
+        public BackgroundPublishedSnapshotNotifier(IPublishedModelFactory publishedModelFactory, IPublishedSnapshotService publishedSnapshotService, ILogger logger)
         {
             _publishedModelFactory = publishedModelFactory;
             _publishedSnapshotService = publishedSnapshotService;
@@ -41,7 +43,13 @@ namespace Umbraco.Web.Cache
         /// <summary>
         /// Blocks until the background operation is completed
         /// </summary>
-        public void Wait() => _runner.StoppedAwaitable.GetAwaiter().GetResult(); //TODO: do we need a try/catch?
+        /// <returns>Returns true if waiting was necessary</returns>
+        public bool Wait()
+        {
+            var running = _runner.IsRunning;
+            _runner.StoppedAwaitable.GetAwaiter().GetResult(); //TODO: do we need a try/catch?
+            return running;
+        }
 
         /// <summary>
         /// Notify the <see cref="IPublishedSnapshotService"/> of content type changes
@@ -101,6 +109,10 @@ namespace Umbraco.Web.Cache
                         _publishedSnapshotService.Notify(_dataTypePayloads);
                     if (_contentTypePayloads != null)
                         _publishedSnapshotService.Notify(_contentTypePayloads);
+
+                    //Thread.Sleep(10000);
+
+                    var asdf = "";
                 });
             }
 
diff --git a/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs b/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs
index 8ff82b2644..0d38f38362 100644
--- a/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs
@@ -10,11 +10,11 @@ namespace Umbraco.Web.Cache
 {
     public sealed class ContentTypeCacheRefresher : PayloadCacheRefresherBase<ContentTypeCacheRefresher, ContentTypeCacheRefresher.JsonPayload>
     {
-        private readonly BackgroundPublishedSnapshotServiceNotifier _backgroundModelFactory;
+        private readonly BackgroundPublishedSnapshotNotifier _backgroundModelFactory;
         private readonly IContentTypeCommonRepository _contentTypeCommonRepository;
         private readonly IdkMap _idkMap;
 
-        public ContentTypeCacheRefresher(AppCaches appCaches, BackgroundPublishedSnapshotServiceNotifier backgroundModelFactory, IdkMap idkMap, IContentTypeCommonRepository contentTypeCommonRepository)
+        public ContentTypeCacheRefresher(AppCaches appCaches, BackgroundPublishedSnapshotNotifier backgroundModelFactory, IdkMap idkMap, IContentTypeCommonRepository contentTypeCommonRepository)
             : base(appCaches)
         {
             _backgroundModelFactory = backgroundModelFactory;
diff --git a/src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs b/src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs
index 5363182a08..97367be495 100644
--- a/src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs
@@ -9,10 +9,10 @@ namespace Umbraco.Web.Cache
 
     public sealed class DataTypeCacheRefresher : PayloadCacheRefresherBase<DataTypeCacheRefresher, DataTypeCacheRefresher.JsonPayload>
     {
-        private readonly BackgroundPublishedSnapshotServiceNotifier _backgroundModelFactory;
+        private readonly BackgroundPublishedSnapshotNotifier _backgroundModelFactory;
         private readonly IdkMap _idkMap;
 
-        public DataTypeCacheRefresher(AppCaches appCaches, BackgroundPublishedSnapshotServiceNotifier backgroundModelFactory, IdkMap idkMap)
+        public DataTypeCacheRefresher(AppCaches appCaches, BackgroundPublishedSnapshotNotifier backgroundModelFactory, IdkMap idkMap)
             : base(appCaches)
         {
             _backgroundModelFactory = backgroundModelFactory;
diff --git a/src/Umbraco.Web/Runtime/WebInitialComposer.cs b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
index d59caff63c..4b4fb488e5 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
@@ -125,7 +125,7 @@ namespace Umbraco.Web.Runtime
             // register distributed cache
             composition.RegisterUnique(f => new DistributedCache());
 
-            composition.RegisterUnique<BackgroundPublishedSnapshotServiceNotifier>();
+            composition.RegisterUnique<BackgroundPublishedSnapshotNotifier>();
 
             // replace some services
             composition.RegisterUnique<IEventMessagesFactory, DefaultEventMessagesFactory>();
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index b5641e8aae..1a23ae7f65 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -115,7 +115,7 @@
     <Compile Include="AppBuilderExtensions.cs" />
     <Compile Include="AreaRegistrationContextExtensions.cs" />
     <Compile Include="AspNetHttpContextAccessor.cs" />
-    <Compile Include="Cache\BackgroundPublishedSnapshotServiceNotifier.cs" />
+    <Compile Include="Cache\BackgroundPublishedSnapshotNotifier.cs" />
     <Compile Include="Cache\DistributedCacheBinder.cs" />
     <Compile Include="Cache\DistributedCacheBinderComposer.cs" />
     <Compile Include="Cache\DistributedCacheBinder_Handlers.cs" />
diff --git a/src/Umbraco.Web/UmbracoInjectedModule.cs b/src/Umbraco.Web/UmbracoInjectedModule.cs
index b16d86a8ba..99d167fbd3 100644
--- a/src/Umbraco.Web/UmbracoInjectedModule.cs
+++ b/src/Umbraco.Web/UmbracoInjectedModule.cs
@@ -19,6 +19,7 @@ using Umbraco.Core.Services;
 using Umbraco.Web.Composing;
 using Umbraco.Web.PublishedCache;
 using Umbraco.Web.Cache;
+using Umbraco.Web.PublishedCache.NuCache;
 
 namespace Umbraco.Web
 {
@@ -49,7 +50,7 @@ namespace Umbraco.Web
         private readonly IPublishedRouter _publishedRouter;
         private readonly IVariationContextAccessor _variationContextAccessor;
         private readonly IUmbracoContextFactory _umbracoContextFactory;
-        private readonly BackgroundPublishedSnapshotServiceNotifier _backgroundNotifier;
+        private readonly BackgroundPublishedSnapshotNotifier _backgroundNotifier;
 
         public UmbracoInjectedModule(
             IGlobalSettings globalSettings,
@@ -62,7 +63,7 @@ namespace Umbraco.Web
             IPublishedRouter publishedRouter,
             IVariationContextAccessor variationContextAccessor,
             IUmbracoContextFactory umbracoContextFactory,
-            BackgroundPublishedSnapshotServiceNotifier backgroundNotifier)
+            BackgroundPublishedSnapshotNotifier backgroundNotifier)
         {
             _combinedRouteCollection = new Lazy<RouteCollection>(CreateRouteCollection);
 
@@ -141,8 +142,19 @@ namespace Umbraco.Web
             var isRoutableAttempt = EnsureUmbracoRoutablePage(umbracoContext, httpContext);
 
             // If this page is probably front-end routable, block here until the backround notifier isn't busy
-            if (isRoutableAttempt)                
-                _backgroundNotifier.Wait(); 
+            if (isRoutableAttempt)
+            {
+                //wait for the notifier to complete if it's in progress
+                if (_backgroundNotifier.Wait())
+                {
+                    // if we were waiting, we need to resync the snapshot
+                    // TODO: This does not belong here! BUT we cannot Resync the snapshot on the background process because there is no snapshot... 
+                    // normally it would do that automatically but on a background thread it is null ... hrm....
+                    ((PublishedSnapshot)_publishedSnapshotService.PublishedSnapshotAccessor.PublishedSnapshot)?.Resync(); 
+                    var done = "done";
+                }
+            }
+                
 
             // raise event here
             UmbracoModule.OnRouteAttempt(this, new RoutableAttemptEventArgs(isRoutableAttempt.Result, umbracoContext, httpContext));

From 596c745a19b604e444e505a09e4c913c7b6eb61f Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 10 Sep 2019 13:35:59 +1000
Subject: [PATCH 529/776] Uses an event on UmbracoContext for when the snapshot
 is created so we can block until the background notifier is completed

---
 .../BackgroundPublishedSnapshotNotifier.cs    |  4 --
 src/Umbraco.Web/UmbracoContext.cs             | 11 +++-
 src/Umbraco.Web/UmbracoInjectedModule.cs      | 55 ++++++-------------
 3 files changed, 28 insertions(+), 42 deletions(-)

diff --git a/src/Umbraco.Web/Cache/BackgroundPublishedSnapshotNotifier.cs b/src/Umbraco.Web/Cache/BackgroundPublishedSnapshotNotifier.cs
index f1da2b6375..5efbf988a4 100644
--- a/src/Umbraco.Web/Cache/BackgroundPublishedSnapshotNotifier.cs
+++ b/src/Umbraco.Web/Cache/BackgroundPublishedSnapshotNotifier.cs
@@ -109,10 +109,6 @@ namespace Umbraco.Web.Cache
                         _publishedSnapshotService.Notify(_dataTypePayloads);
                     if (_contentTypePayloads != null)
                         _publishedSnapshotService.Notify(_contentTypePayloads);
-
-                    //Thread.Sleep(10000);
-
-                    var asdf = "";
                 });
             }
 
diff --git a/src/Umbraco.Web/UmbracoContext.cs b/src/Umbraco.Web/UmbracoContext.cs
index c0306e0a81..e4a921375e 100644
--- a/src/Umbraco.Web/UmbracoContext.cs
+++ b/src/Umbraco.Web/UmbracoContext.cs
@@ -59,7 +59,11 @@ namespace Umbraco.Web
             Security = webSecurity;
 
             // beware - we cannot expect a current user here, so detecting preview mode must be a lazy thing
-            _publishedSnapshot = new Lazy<IPublishedSnapshot>(() => publishedSnapshotService.CreatePublishedSnapshot(PreviewToken));
+            _publishedSnapshot = new Lazy<IPublishedSnapshot>(() =>
+            {
+                CreatingPublishedSnapshot?.Invoke(this, new EventArgs());
+                return publishedSnapshotService.CreatePublishedSnapshot(PreviewToken);
+            });
 
             // set the urls...
             // NOTE: The request will not be available during app startup so we can only set this to an absolute URL of localhost, this
@@ -73,6 +77,11 @@ namespace Umbraco.Web
             UrlProvider = new UrlProvider(this, umbracoSettings.WebRouting, urlProviders, mediaUrlProviders, variationContextAccessor);
         }
 
+        /// <summary>
+        /// Raised when the published snapshot is being created
+        /// </summary>
+        internal event EventHandler CreatingPublishedSnapshot;
+
         /// <summary>
         /// This is used internally for performance calculations, the ObjectCreated DateTime is set as soon as this
         /// object is instantiated which in the web site is created during the BeginRequest phase.
diff --git a/src/Umbraco.Web/UmbracoInjectedModule.cs b/src/Umbraco.Web/UmbracoInjectedModule.cs
index 99d167fbd3..cbeee34444 100644
--- a/src/Umbraco.Web/UmbracoInjectedModule.cs
+++ b/src/Umbraco.Web/UmbracoInjectedModule.cs
@@ -2,7 +2,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
-using System.Text;
 using System.Web;
 using System.Web.Routing;
 using Umbraco.Core;
@@ -10,16 +9,10 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Web.Routing;
-using Umbraco.Web.Security;
 using Umbraco.Core.Exceptions;
-using Umbraco.Core.Models.PublishedContent;
-using Umbraco.Core.Persistence.FaultHandling;
 using Umbraco.Core.Security;
-using Umbraco.Core.Services;
 using Umbraco.Web.Composing;
-using Umbraco.Web.PublishedCache;
 using Umbraco.Web.Cache;
-using Umbraco.Web.PublishedCache.NuCache;
 
 namespace Umbraco.Web
 {
@@ -41,41 +34,26 @@ namespace Umbraco.Web
     public class UmbracoInjectedModule : IHttpModule
     {
         private readonly IGlobalSettings _globalSettings;
-        private readonly IUmbracoContextAccessor _umbracoContextAccessor;
-        private readonly IPublishedSnapshotService _publishedSnapshotService;
-        private readonly IUserService _userService;
-        private readonly UrlProviderCollection _urlProviders;
         private readonly IRuntimeState _runtime;
         private readonly ILogger _logger;
         private readonly IPublishedRouter _publishedRouter;
-        private readonly IVariationContextAccessor _variationContextAccessor;
         private readonly IUmbracoContextFactory _umbracoContextFactory;
         private readonly BackgroundPublishedSnapshotNotifier _backgroundNotifier;
 
         public UmbracoInjectedModule(
             IGlobalSettings globalSettings,
-            IUmbracoContextAccessor umbracoContextAccessor,
-            IPublishedSnapshotService publishedSnapshotService,
-            IUserService userService,
-            UrlProviderCollection urlProviders,
             IRuntimeState runtime,
             ILogger logger,
             IPublishedRouter publishedRouter,
-            IVariationContextAccessor variationContextAccessor,
             IUmbracoContextFactory umbracoContextFactory,
             BackgroundPublishedSnapshotNotifier backgroundNotifier)
         {
             _combinedRouteCollection = new Lazy<RouteCollection>(CreateRouteCollection);
 
             _globalSettings = globalSettings;
-            _umbracoContextAccessor = umbracoContextAccessor;
-            _publishedSnapshotService = publishedSnapshotService;
-            _userService = userService;
-            _urlProviders = urlProviders;
             _runtime = runtime;
             _logger = logger;
             _publishedRouter = publishedRouter;
-            _variationContextAccessor = variationContextAccessor;
             _umbracoContextFactory = umbracoContextFactory;
             _backgroundNotifier = backgroundNotifier;
         }
@@ -104,9 +82,27 @@ namespace Umbraco.Web
             // ensure there's an UmbracoContext registered for the current request
             // registers the context reference so its disposed at end of request
             var umbracoContextReference = _umbracoContextFactory.EnsureUmbracoContext(httpContext);
+            umbracoContextReference.UmbracoContext.CreatingPublishedSnapshot += UmbracoContext_CreatingPublishedSnapshot;
             httpContext.DisposeOnPipelineCompleted(umbracoContextReference);
         }
 
+        /// <summary>
+        /// Event handler for when the UmbracoContext creates the published snapshot
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void UmbracoContext_CreatingPublishedSnapshot(object sender, EventArgs e)
+        {
+            // Wait for the notifier to complete if it's in progress, this is required because
+            // Pure Live models along with content snapshots are updated on a background thread when schema
+            // (doc types, data types) are changed so if that is still processing we need to wait before we access
+            // the content snapshot to make sure it's the latest version.
+            if (_backgroundNotifier.Wait())
+            {
+                _logger.Debug<UmbracoModule>("Request was suspended while waiting for background cache notifications to complete");
+            }
+        }
+
         /// <summary>
         /// Processes the Umbraco Request
         /// </summary>
@@ -141,21 +137,6 @@ namespace Umbraco.Web
             // do not process if this request is not a front-end routable page
             var isRoutableAttempt = EnsureUmbracoRoutablePage(umbracoContext, httpContext);
 
-            // If this page is probably front-end routable, block here until the backround notifier isn't busy
-            if (isRoutableAttempt)
-            {
-                //wait for the notifier to complete if it's in progress
-                if (_backgroundNotifier.Wait())
-                {
-                    // if we were waiting, we need to resync the snapshot
-                    // TODO: This does not belong here! BUT we cannot Resync the snapshot on the background process because there is no snapshot... 
-                    // normally it would do that automatically but on a background thread it is null ... hrm....
-                    ((PublishedSnapshot)_publishedSnapshotService.PublishedSnapshotAccessor.PublishedSnapshot)?.Resync(); 
-                    var done = "done";
-                }
-            }
-                
-
             // raise event here
             UmbracoModule.OnRouteAttempt(this, new RoutableAttemptEventArgs(isRoutableAttempt.Result, umbracoContext, httpContext));
             if (isRoutableAttempt.Success == false) return;

From b997281e1f5b77fd362ac97f8a5295f65fafb702 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 10 Sep 2019 14:10:26 +1000
Subject: [PATCH 530/776] Only waits for background processing to finish if
 it's a front-end request, required caching the check for a front-end request
 which required moving the check to it's own class.

---
 src/Umbraco.Web/RoutableDocumentLookup.cs     | 109 ++++++++++++++++++
 src/Umbraco.Web/Runtime/WebInitialComposer.cs |   1 +
 src/Umbraco.Web/Umbraco.Web.csproj            |   1 +
 src/Umbraco.Web/UmbracoContext.cs             |  24 +++-
 src/Umbraco.Web/UmbracoInjectedModule.cs      | 102 +++-------------
 5 files changed, 148 insertions(+), 89 deletions(-)
 create mode 100644 src/Umbraco.Web/RoutableDocumentLookup.cs

diff --git a/src/Umbraco.Web/RoutableDocumentLookup.cs b/src/Umbraco.Web/RoutableDocumentLookup.cs
new file mode 100644
index 0000000000..bc75798b09
--- /dev/null
+++ b/src/Umbraco.Web/RoutableDocumentLookup.cs
@@ -0,0 +1,109 @@
+using System;
+using System.IO;
+using System.Web;
+using System.Web.Routing;
+using Umbraco.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Configuration;
+
+namespace Umbraco.Web
+{
+    /// <summary>
+    /// Utility class used to check if the current request is for a front-end request
+    /// </summary>
+    /// <remarks>
+    /// There are various checks to determine if this is a front-end request such as checking if the request is part of any reserved paths or existing MVC routes.
+    /// </remarks>
+    public sealed class RoutableDocumentLookup
+    {
+        public RoutableDocumentLookup(ILogger logger, IGlobalSettings globalSettings)
+        {
+            _logger = logger;
+            _globalSettings = globalSettings;
+            _combinedRouteCollection = new Lazy<RouteCollection>(CreateRouteCollection);
+        }
+
+        /// <summary>
+        /// Checks if the request is a document request (i.e. one that the module should handle)
+        /// </summary>
+        /// <param name="httpContext"></param>
+        /// <param name="uri"></param>
+        /// <returns></returns>
+        public bool IsDocumentRequest(HttpContextBase httpContext, Uri uri)
+        {
+            var maybeDoc = true;
+            var lpath = uri.AbsolutePath.ToLowerInvariant();
+
+            // handle directory-urls used for asmx
+            // TODO: legacy - what's the point really?
+            var asmxPos = lpath.IndexOf(".asmx/", StringComparison.OrdinalIgnoreCase);
+            if (asmxPos >= 0)
+            {
+                // use uri.AbsolutePath, not path, 'cos path has been lowercased
+                httpContext.RewritePath(uri.AbsolutePath.Substring(0, asmxPos + 5), // filePath
+                    uri.AbsolutePath.Substring(asmxPos + 5), // pathInfo
+                    uri.Query.TrimStart('?'));
+                maybeDoc = false;
+            }
+
+            // a document request should be
+            // /foo/bar/nil
+            // /foo/bar/nil/
+            // /foo/bar/nil.aspx
+            // where /foo is not a reserved path
+
+            // if the path contains an extension that is not .aspx
+            // then it cannot be a document request
+            var extension = Path.GetExtension(lpath);
+            if (maybeDoc && extension.IsNullOrWhiteSpace() == false && extension != ".aspx")
+                maybeDoc = false;
+
+            // at that point, either we have no extension, or it is .aspx
+
+            // if the path is reserved then it cannot be a document request
+            if (maybeDoc && _globalSettings.IsReservedPathOrUrl(lpath, httpContext, _combinedRouteCollection.Value))
+                maybeDoc = false;
+
+            //NOTE: No need to warn, plus if we do we should log the document, as this message doesn't really tell us anything :)
+            //if (!maybeDoc)
+            //{
+            //    Logger.Warn<UmbracoModule>("Not a document");
+            //}
+            return maybeDoc;
+        }
+
+        /// <summary>
+        /// This is used to be passed into the GlobalSettings.IsReservedPathOrUrl and will include some 'fake' routes
+        /// used to determine if a path is reserved.
+        /// </summary>
+        /// <remarks>
+        /// This is basically used to reserve paths dynamically
+        /// </remarks>
+        private readonly Lazy<RouteCollection> _combinedRouteCollection;
+        private readonly ILogger _logger;
+        private readonly IGlobalSettings _globalSettings;
+
+        private RouteCollection CreateRouteCollection()
+        {
+            var routes = new RouteCollection();
+
+            foreach (var route in RouteTable.Routes)
+                routes.Add(route);
+
+            foreach (var reservedPath in UmbracoModule.ReservedPaths)
+            {
+                try
+                {
+                    routes.Add("_umbreserved_" + reservedPath.ReplaceNonAlphanumericChars(""),
+                        new Route(reservedPath.TrimStart('/'), new StopRoutingHandler()));
+                }
+                catch (Exception ex)
+                {
+                    _logger.Error<UmbracoModule>("Could not add reserved path route", ex);
+                }
+            }
+
+            return routes;
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Runtime/WebInitialComposer.cs b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
index 4b4fb488e5..7c353daa1d 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
@@ -126,6 +126,7 @@ namespace Umbraco.Web.Runtime
             composition.RegisterUnique(f => new DistributedCache());
 
             composition.RegisterUnique<BackgroundPublishedSnapshotNotifier>();
+            composition.RegisterUnique<RoutableDocumentLookup>();
 
             // replace some services
             composition.RegisterUnique<IEventMessagesFactory, DefaultEventMessagesFactory>();
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 1a23ae7f65..2cdff55e2d 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -230,6 +230,7 @@
     <Compile Include="PublishedCache\NuCache\Snap\GenObj.cs" />
     <Compile Include="PublishedCache\NuCache\Snap\GenRef.cs" />
     <Compile Include="PublishedCache\NuCache\Snap\LinkedNode.cs" />
+    <Compile Include="RoutableDocumentLookup.cs" />
     <Compile Include="Routing\DefaultMediaUrlProvider.cs" />
     <Compile Include="Routing\IMediaUrlProvider.cs" />
     <Compile Include="Routing\IPublishedRouter.cs" />
diff --git a/src/Umbraco.Web/UmbracoContext.cs b/src/Umbraco.Web/UmbracoContext.cs
index e4a921375e..95a96be072 100644
--- a/src/Umbraco.Web/UmbracoContext.cs
+++ b/src/Umbraco.Web/UmbracoContext.cs
@@ -1,16 +1,21 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Web;
+using System.Web.Routing;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Events;
 using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Web;
 using Umbraco.Web.PublishedCache;
 using Umbraco.Web.Routing;
 using Umbraco.Web.Security;
 
 namespace Umbraco.Web
 {
+
     /// <summary>
     /// Class that encapsulates Umbraco information of a specific HTTP request
     /// </summary>
@@ -80,7 +85,7 @@ namespace Umbraco.Web
         /// <summary>
         /// Raised when the published snapshot is being created
         /// </summary>
-        internal event EventHandler CreatingPublishedSnapshot;
+        internal event TypedEventHandler<UmbracoContext, EventArgs> CreatingPublishedSnapshot;
 
         /// <summary>
         /// This is used internally for performance calculations, the ObjectCreated DateTime is set as soon as this
@@ -295,6 +300,23 @@ namespace Umbraco.Web
             _previewing = _previewToken.IsNullOrWhiteSpace() == false;
         }
 
+        private bool? _isDocumentRequest;
+
+        /// <summary>
+        /// Checks if the request is a document request (i.e. one that the module should handle)
+        /// </summary>
+        /// <param name="httpContext"></param>
+        /// <param name="uri"></param>
+        /// <returns></returns>
+        internal bool IsDocumentRequest(RoutableDocumentLookup docLookup)
+        {
+            if (_isDocumentRequest.HasValue)
+                return _isDocumentRequest.Value;
+
+            _isDocumentRequest = docLookup.IsDocumentRequest(HttpContext, OriginalRequestUrl);
+            return _isDocumentRequest.Value;
+        }
+
         // say we render a macro or RTE in a give 'preview' mode that might not be the 'current' one,
         // then due to the way it all works at the moment, the 'current' published snapshot need to be in the proper
         // default 'preview' mode - somehow we have to force it. and that could be recursive.
diff --git a/src/Umbraco.Web/UmbracoInjectedModule.cs b/src/Umbraco.Web/UmbracoInjectedModule.cs
index cbeee34444..70d9222dfc 100644
--- a/src/Umbraco.Web/UmbracoInjectedModule.cs
+++ b/src/Umbraco.Web/UmbracoInjectedModule.cs
@@ -39,6 +39,7 @@ namespace Umbraco.Web
         private readonly IPublishedRouter _publishedRouter;
         private readonly IUmbracoContextFactory _umbracoContextFactory;
         private readonly BackgroundPublishedSnapshotNotifier _backgroundNotifier;
+        private readonly RoutableDocumentLookup _routableDocumentLookup;
 
         public UmbracoInjectedModule(
             IGlobalSettings globalSettings,
@@ -46,16 +47,16 @@ namespace Umbraco.Web
             ILogger logger,
             IPublishedRouter publishedRouter,
             IUmbracoContextFactory umbracoContextFactory,
-            BackgroundPublishedSnapshotNotifier backgroundNotifier)
+            BackgroundPublishedSnapshotNotifier backgroundNotifier,
+            RoutableDocumentLookup routableDocumentLookup)
         {
-            _combinedRouteCollection = new Lazy<RouteCollection>(CreateRouteCollection);
-
             _globalSettings = globalSettings;
             _runtime = runtime;
             _logger = logger;
             _publishedRouter = publishedRouter;
             _umbracoContextFactory = umbracoContextFactory;
             _backgroundNotifier = backgroundNotifier;
+            _routableDocumentLookup = routableDocumentLookup;
         }
 
         #region HttpModule event handlers
@@ -91,13 +92,16 @@ namespace Umbraco.Web
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void UmbracoContext_CreatingPublishedSnapshot(object sender, EventArgs e)
+        private void UmbracoContext_CreatingPublishedSnapshot(UmbracoContext sender, EventArgs e)
         {
             // Wait for the notifier to complete if it's in progress, this is required because
             // Pure Live models along with content snapshots are updated on a background thread when schema
             // (doc types, data types) are changed so if that is still processing we need to wait before we access
             // the content snapshot to make sure it's the latest version.
-            if (_backgroundNotifier.Wait())
+            // We only want to wait if this is a front-end request (not a back office request) so need to first check
+            // for that and then wait.
+            
+            if (sender.IsDocumentRequest(_routableDocumentLookup) &&_backgroundNotifier.Wait())
             {
                 _logger.Debug<UmbracoModule>("Request was suspended while waiting for background cache notifications to complete");
             }
@@ -183,18 +187,18 @@ namespace Umbraco.Web
             var reason = EnsureRoutableOutcome.IsRoutable;
 
             // ensure this is a document request
-            if (EnsureDocumentRequest(httpContext, uri) == false)
+            if (!context.IsDocumentRequest(_routableDocumentLookup))
             {
                 reason = EnsureRoutableOutcome.NotDocumentRequest;
             }
             // ensure the runtime is in the proper state
             // and deal with needed redirects, etc
-            else if (EnsureRuntime(httpContext, uri) == false)
+            else if (!EnsureRuntime(httpContext, uri))
             {
                 reason = EnsureRoutableOutcome.NotReady;
             }
             // ensure Umbraco has documents to serve
-            else if (EnsureHasContent(context, httpContext) == false)
+            else if (!EnsureHasContent(context, httpContext))
             {
                 reason = EnsureRoutableOutcome.NoContent;
             }
@@ -202,55 +206,7 @@ namespace Umbraco.Web
             return Attempt.If(reason == EnsureRoutableOutcome.IsRoutable, reason);
         }
 
-        /// <summary>
-        /// Ensures that the request is a document request (i.e. one that the module should handle)
-        /// </summary>
-        /// <param name="httpContext"></param>
-        /// <param name="uri"></param>
-        /// <returns></returns>
-        private bool EnsureDocumentRequest(HttpContextBase httpContext, Uri uri)
-        {
-            var maybeDoc = true;
-            var lpath = uri.AbsolutePath.ToLowerInvariant();
-
-            // handle directory-urls used for asmx
-            // TODO: legacy - what's the point really?
-            var asmxPos = lpath.IndexOf(".asmx/", StringComparison.OrdinalIgnoreCase);
-            if (asmxPos >= 0)
-            {
-                // use uri.AbsolutePath, not path, 'cos path has been lowercased
-                httpContext.RewritePath(uri.AbsolutePath.Substring(0, asmxPos + 5), // filePath
-                    uri.AbsolutePath.Substring(asmxPos + 5), // pathInfo
-                    uri.Query.TrimStart('?'));
-                maybeDoc = false;
-            }
-
-            // a document request should be
-            // /foo/bar/nil
-            // /foo/bar/nil/
-            // /foo/bar/nil.aspx
-            // where /foo is not a reserved path
-
-            // if the path contains an extension that is not .aspx
-            // then it cannot be a document request
-            var extension = Path.GetExtension(lpath);
-            if (maybeDoc && extension.IsNullOrWhiteSpace() == false && extension != ".aspx")
-                maybeDoc = false;
-
-            // at that point, either we have no extension, or it is .aspx
-
-            // if the path is reserved then it cannot be a document request
-            if (maybeDoc && _globalSettings.IsReservedPathOrUrl(lpath, httpContext, _combinedRouteCollection.Value))
-                maybeDoc = false;
-
-            //NOTE: No need to warn, plus if we do we should log the document, as this message doesn't really tell us anything :)
-            //if (!maybeDoc)
-            //{
-            //    Logger.Warn<UmbracoModule>("Not a document");
-            //}
-
-            return maybeDoc;
-        }
+        
 
         private bool EnsureRuntime(HttpContextBase httpContext, Uri uri)
         {
@@ -506,36 +462,6 @@ namespace Umbraco.Web
 
         #endregion
 
-        /// <summary>
-        /// This is used to be passed into the GlobalSettings.IsReservedPathOrUrl and will include some 'fake' routes
-        /// used to determine if a path is reserved.
-        /// </summary>
-        /// <remarks>
-        /// This is basically used to reserve paths dynamically
-        /// </remarks>
-        private readonly Lazy<RouteCollection> _combinedRouteCollection;
-
-        private RouteCollection CreateRouteCollection()
-        {
-            var routes = new RouteCollection();
-
-            foreach (var route in RouteTable.Routes)
-                routes.Add(route);
-
-            foreach (var reservedPath in UmbracoModule.ReservedPaths)
-            {
-                try
-                {
-                    routes.Add("_umbreserved_" + reservedPath.ReplaceNonAlphanumericChars(""),
-                        new Route(reservedPath.TrimStart('/'), new StopRoutingHandler()));
-                }
-                catch (Exception ex)
-                {
-                    _logger.Error<UmbracoModule>("Could not add reserved path route", ex);
-                }
-            }
-
-            return routes;
-        }
+        
     }
 }

From 44fbdb7028df83184f959118f8888acf4f161a3f Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 10 Sep 2019 14:23:42 +1000
Subject: [PATCH 531/776] renames class

---
 .../{RoutableDocumentLookup.cs => RoutableDocumentFilter.cs}  | 4 ++--
 src/Umbraco.Web/Runtime/WebInitialComposer.cs                 | 2 +-
 src/Umbraco.Web/Umbraco.Web.csproj                            | 2 +-
 src/Umbraco.Web/UmbracoContext.cs                             | 2 +-
 src/Umbraco.Web/UmbracoInjectedModule.cs                      | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename src/Umbraco.Web/{RoutableDocumentLookup.cs => RoutableDocumentFilter.cs} (97%)

diff --git a/src/Umbraco.Web/RoutableDocumentLookup.cs b/src/Umbraco.Web/RoutableDocumentFilter.cs
similarity index 97%
rename from src/Umbraco.Web/RoutableDocumentLookup.cs
rename to src/Umbraco.Web/RoutableDocumentFilter.cs
index bc75798b09..3f666edb47 100644
--- a/src/Umbraco.Web/RoutableDocumentLookup.cs
+++ b/src/Umbraco.Web/RoutableDocumentFilter.cs
@@ -14,9 +14,9 @@ namespace Umbraco.Web
     /// <remarks>
     /// There are various checks to determine if this is a front-end request such as checking if the request is part of any reserved paths or existing MVC routes.
     /// </remarks>
-    public sealed class RoutableDocumentLookup
+    public sealed class RoutableDocumentFilter
     {
-        public RoutableDocumentLookup(ILogger logger, IGlobalSettings globalSettings)
+        public RoutableDocumentFilter(ILogger logger, IGlobalSettings globalSettings)
         {
             _logger = logger;
             _globalSettings = globalSettings;
diff --git a/src/Umbraco.Web/Runtime/WebInitialComposer.cs b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
index 7c353daa1d..9e3413ba4d 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
@@ -126,7 +126,7 @@ namespace Umbraco.Web.Runtime
             composition.RegisterUnique(f => new DistributedCache());
 
             composition.RegisterUnique<BackgroundPublishedSnapshotNotifier>();
-            composition.RegisterUnique<RoutableDocumentLookup>();
+            composition.RegisterUnique<RoutableDocumentFilter>();
 
             // replace some services
             composition.RegisterUnique<IEventMessagesFactory, DefaultEventMessagesFactory>();
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 2cdff55e2d..0b1c3c6fe9 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -230,7 +230,7 @@
     <Compile Include="PublishedCache\NuCache\Snap\GenObj.cs" />
     <Compile Include="PublishedCache\NuCache\Snap\GenRef.cs" />
     <Compile Include="PublishedCache\NuCache\Snap\LinkedNode.cs" />
-    <Compile Include="RoutableDocumentLookup.cs" />
+    <Compile Include="RoutableDocumentFilter.cs" />
     <Compile Include="Routing\DefaultMediaUrlProvider.cs" />
     <Compile Include="Routing\IMediaUrlProvider.cs" />
     <Compile Include="Routing\IPublishedRouter.cs" />
diff --git a/src/Umbraco.Web/UmbracoContext.cs b/src/Umbraco.Web/UmbracoContext.cs
index 95a96be072..0f8a9575b4 100644
--- a/src/Umbraco.Web/UmbracoContext.cs
+++ b/src/Umbraco.Web/UmbracoContext.cs
@@ -308,7 +308,7 @@ namespace Umbraco.Web
         /// <param name="httpContext"></param>
         /// <param name="uri"></param>
         /// <returns></returns>
-        internal bool IsDocumentRequest(RoutableDocumentLookup docLookup)
+        internal bool IsDocumentRequest(RoutableDocumentFilter docLookup)
         {
             if (_isDocumentRequest.HasValue)
                 return _isDocumentRequest.Value;
diff --git a/src/Umbraco.Web/UmbracoInjectedModule.cs b/src/Umbraco.Web/UmbracoInjectedModule.cs
index 70d9222dfc..7f10701e36 100644
--- a/src/Umbraco.Web/UmbracoInjectedModule.cs
+++ b/src/Umbraco.Web/UmbracoInjectedModule.cs
@@ -39,7 +39,7 @@ namespace Umbraco.Web
         private readonly IPublishedRouter _publishedRouter;
         private readonly IUmbracoContextFactory _umbracoContextFactory;
         private readonly BackgroundPublishedSnapshotNotifier _backgroundNotifier;
-        private readonly RoutableDocumentLookup _routableDocumentLookup;
+        private readonly RoutableDocumentFilter _routableDocumentLookup;
 
         public UmbracoInjectedModule(
             IGlobalSettings globalSettings,
@@ -48,7 +48,7 @@ namespace Umbraco.Web
             IPublishedRouter publishedRouter,
             IUmbracoContextFactory umbracoContextFactory,
             BackgroundPublishedSnapshotNotifier backgroundNotifier,
-            RoutableDocumentLookup routableDocumentLookup)
+            RoutableDocumentFilter routableDocumentLookup)
         {
             _globalSettings = globalSettings;
             _runtime = runtime;

From 0a12f86108000d2584534e7f6f9343a6a636a4f4 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 10 Sep 2019 16:09:09 +1000
Subject: [PATCH 532/776] Moves the reserved path detection to
 RoutableDocumentFilter, adds caching to MVC route detection

---
 .../Configuration/GlobalSettings.cs           |   1 -
 .../Configuration/GlobalSettingsExtensions.cs | 104 +------------
 src/Umbraco.Web/RoutableDocumentFilter.cs     | 147 ++++++++++++++----
 .../AuthenticationOptionsExtensions.cs        |   4 +-
 src/Umbraco.Web/UmbracoModule.cs              |   5 -
 5 files changed, 126 insertions(+), 135 deletions(-)

diff --git a/src/Umbraco.Core/Configuration/GlobalSettings.cs b/src/Umbraco.Core/Configuration/GlobalSettings.cs
index 49f4481a59..a888e3c42b 100644
--- a/src/Umbraco.Core/Configuration/GlobalSettings.cs
+++ b/src/Umbraco.Core/Configuration/GlobalSettings.cs
@@ -33,7 +33,6 @@ namespace Umbraco.Core.Configuration
         /// </summary>
         private static void ResetInternal()
         {
-            GlobalSettingsExtensions.Reset();
             _reservedPaths = null;
             _reservedUrls = null;
             HasSmtpServer = null;
diff --git a/src/Umbraco.Core/Configuration/GlobalSettingsExtensions.cs b/src/Umbraco.Core/Configuration/GlobalSettingsExtensions.cs
index 6bfb7ea904..fd4b57bf1a 100644
--- a/src/Umbraco.Core/Configuration/GlobalSettingsExtensions.cs
+++ b/src/Umbraco.Core/Configuration/GlobalSettingsExtensions.cs
@@ -1,6 +1,8 @@
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using System.Web;
 using System.Web.Routing;
 using Umbraco.Core.IO;
@@ -9,21 +11,8 @@ namespace Umbraco.Core.Configuration
 {
     public static class GlobalSettingsExtensions
     {
-        /// <summary>
-        /// Used in unit testing to reset all config items, this is automatically called by GlobalSettings.Reset()
-        /// </summary>
-        internal static void Reset()
-        {
-            _reservedUrlsCache = null;
-            _mvcArea = null;
-        }
-
-        private static readonly object Locker = new object();
-        //make this volatile so that we can ensure thread safety with a double check lock
-        private static volatile string _reservedUrlsCache;
-        private static string _reservedPathsCache;
-        private static HashSet<string> _reservedList = new HashSet<string>();
         private static string _mvcArea;
+        
 
         /// <summary>
         /// This returns the string of the MVC Area route.
@@ -51,92 +40,5 @@ namespace Umbraco.Core.Configuration
             _mvcArea = path.TrimStart('~').TrimStart('/').Replace('/', '-').Trim().ToLower();
             return _mvcArea;
         }
-
-        /// <summary>
-        /// Determines whether the specified URL is reserved or is inside a reserved path.
-        /// </summary>
-        /// <param name="globalSettings"></param>
-        /// <param name="url">The URL to check.</param>
-        /// <returns>
-        ///     <c>true</c> if the specified URL is reserved; otherwise, <c>false</c>.
-        /// </returns>
-        internal static bool IsReservedPathOrUrl(this IGlobalSettings globalSettings, string url)
-        {
-            if (_reservedUrlsCache == null)
-            {
-                lock (Locker)
-                {
-                    if (_reservedUrlsCache == null)
-                    {
-                        // store references to strings to determine changes
-                        _reservedPathsCache = globalSettings.ReservedPaths;
-                        _reservedUrlsCache = globalSettings.ReservedUrls;
-
-                        // add URLs and paths to a new list
-                        var newReservedList = new HashSet<string>();
-                        foreach (var reservedUrlTrimmed in _reservedUrlsCache
-                            .Split(new[] {","}, StringSplitOptions.RemoveEmptyEntries)
-                            .Select(x => x.Trim().ToLowerInvariant())
-                            .Where(x => x.IsNullOrWhiteSpace() == false)
-                            .Select(reservedUrl => IOHelper.ResolveUrl(reservedUrl).Trim().EnsureStartsWith("/"))
-                            .Where(reservedUrlTrimmed => reservedUrlTrimmed.IsNullOrWhiteSpace() == false))
-                        {
-                            newReservedList.Add(reservedUrlTrimmed);
-                        }
-
-                        foreach (var reservedPathTrimmed in _reservedPathsCache
-                            .Split(new[] {","}, StringSplitOptions.RemoveEmptyEntries)
-                            .Select(x => x.Trim().ToLowerInvariant())
-                            .Where(x => x.IsNullOrWhiteSpace() == false)
-                            .Select(reservedPath => IOHelper.ResolveUrl(reservedPath).Trim().EnsureStartsWith("/").EnsureEndsWith("/"))
-                            .Where(reservedPathTrimmed => reservedPathTrimmed.IsNullOrWhiteSpace() == false))
-                        {
-                            newReservedList.Add(reservedPathTrimmed);
-                        }
-
-                        // use the new list from now on
-                        _reservedList = newReservedList;
-                    }
-                }
-            }
-
-            //The url should be cleaned up before checking:
-            // * If it doesn't contain an '.' in the path then we assume it is a path based URL, if that is the case we should add an trailing '/' because all of our reservedPaths use a trailing '/'
-            // * We shouldn't be comparing the query at all
-            var pathPart = url.Split(new[] {'?'}, StringSplitOptions.RemoveEmptyEntries)[0].ToLowerInvariant();
-            if (pathPart.Contains(".") == false)
-            {
-                pathPart = pathPart.EnsureEndsWith('/');
-            }
-
-            // return true if url starts with an element of the reserved list
-            return _reservedList.Any(x => pathPart.InvariantStartsWith(x));
-        }
-
-        /// <summary>
-        /// Determines whether the current request is reserved based on the route table and
-        /// whether the specified URL is reserved or is inside a reserved path.
-        /// </summary>
-        /// <param name="globalSettings"></param>
-        /// <param name="url"></param>
-        /// <param name="httpContext"></param>
-        /// <param name="routes">The route collection to lookup the request in</param>
-        /// <returns></returns>
-        internal static bool IsReservedPathOrUrl(this IGlobalSettings globalSettings, string url, HttpContextBase httpContext, RouteCollection routes)
-        {
-            if (httpContext == null) throw new ArgumentNullException(nameof(httpContext));
-            if (routes == null) throw new ArgumentNullException(nameof(routes));
-
-            //check if the current request matches a route, if so then it is reserved.
-            //TODO: This value should be cached! Else this is doing double routing in MVC every request!
-            var route = routes.GetRouteData(httpContext);
-            if (route != null)
-                return true;
-
-            //continue with the standard ignore routine
-            return globalSettings.IsReservedPathOrUrl(url);
-        }
-
-
     }
 }
diff --git a/src/Umbraco.Web/RoutableDocumentFilter.cs b/src/Umbraco.Web/RoutableDocumentFilter.cs
index 3f666edb47..be2c8ad405 100644
--- a/src/Umbraco.Web/RoutableDocumentFilter.cs
+++ b/src/Umbraco.Web/RoutableDocumentFilter.cs
@@ -5,6 +5,12 @@ using System.Web.Routing;
 using Umbraco.Core;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Configuration;
+using System.Threading;
+using System.Collections.Generic;
+using System.Linq;
+using Umbraco.Core.IO;
+using System.Collections.Concurrent;
+using Umbraco.Core.Collections;
 
 namespace Umbraco.Web
 {
@@ -16,13 +22,18 @@ namespace Umbraco.Web
     /// </remarks>
     public sealed class RoutableDocumentFilter
     {
-        public RoutableDocumentFilter(ILogger logger, IGlobalSettings globalSettings)
+        public RoutableDocumentFilter(IGlobalSettings globalSettings)
         {
-            _logger = logger;
             _globalSettings = globalSettings;
-            _combinedRouteCollection = new Lazy<RouteCollection>(CreateRouteCollection);
         }
 
+        private static readonly ConcurrentDictionary<string, bool> _routeChecks = new ConcurrentDictionary<string, bool>();
+        private readonly IGlobalSettings _globalSettings;
+        private object _locker = new object();
+        private bool _isInit = false;
+        private int? _routeCount;
+        private HashSet<string> _reservedList;
+
         /// <summary>
         /// Checks if the request is a document request (i.e. one that the module should handle)
         /// </summary>
@@ -61,7 +72,7 @@ namespace Umbraco.Web
             // at that point, either we have no extension, or it is .aspx
 
             // if the path is reserved then it cannot be a document request
-            if (maybeDoc && _globalSettings.IsReservedPathOrUrl(lpath, httpContext, _combinedRouteCollection.Value))
+            if (maybeDoc && IsReservedPathOrUrl(lpath, httpContext, RouteTable.Routes))
                 maybeDoc = false;
 
             //NOTE: No need to warn, plus if we do we should log the document, as this message doesn't really tell us anything :)
@@ -73,37 +84,121 @@ namespace Umbraco.Web
         }
 
         /// <summary>
-        /// This is used to be passed into the GlobalSettings.IsReservedPathOrUrl and will include some 'fake' routes
-        /// used to determine if a path is reserved.
+        /// Determines whether the specified URL is reserved or is inside a reserved path.
         /// </summary>
-        /// <remarks>
-        /// This is basically used to reserve paths dynamically
-        /// </remarks>
-        private readonly Lazy<RouteCollection> _combinedRouteCollection;
-        private readonly ILogger _logger;
-        private readonly IGlobalSettings _globalSettings;
-
-        private RouteCollection CreateRouteCollection()
+        /// <param name="globalSettings"></param>
+        /// <param name="url">The URL to check.</param>
+        /// <returns>
+        ///     <c>true</c> if the specified URL is reserved; otherwise, <c>false</c>.
+        /// </returns>
+        internal bool IsReservedPathOrUrl(string url)
         {
-            var routes = new RouteCollection();
-
-            foreach (var route in RouteTable.Routes)
-                routes.Add(route);
-
-            foreach (var reservedPath in UmbracoModule.ReservedPaths)
+            LazyInitializer.EnsureInitialized(ref _reservedList, ref _isInit, ref _locker, () =>
             {
-                try
+                // store references to strings to determine changes
+                var reservedPathsCache = _globalSettings.ReservedPaths;
+                var reservedUrlsCache = _globalSettings.ReservedUrls;
+
+                // add URLs and paths to a new list
+                var newReservedList = new HashSet<string>();
+                foreach (var reservedUrlTrimmed in reservedUrlsCache
+                    .Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries)
+                    .Select(x => x.Trim().ToLowerInvariant())
+                    .Where(x => x.IsNullOrWhiteSpace() == false)
+                    .Select(reservedUrl => IOHelper.ResolveUrl(reservedUrl).Trim().EnsureStartsWith("/"))
+                    .Where(reservedUrlTrimmed => reservedUrlTrimmed.IsNullOrWhiteSpace() == false))
                 {
-                    routes.Add("_umbreserved_" + reservedPath.ReplaceNonAlphanumericChars(""),
-                        new Route(reservedPath.TrimStart('/'), new StopRoutingHandler()));
+                    newReservedList.Add(reservedUrlTrimmed);
                 }
-                catch (Exception ex)
+
+                foreach (var reservedPathTrimmed in NormalizePaths(reservedPathsCache.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries)))
                 {
-                    _logger.Error<UmbracoModule>("Could not add reserved path route", ex);
+                    newReservedList.Add(reservedPathTrimmed);
+                }
+
+                foreach (var reservedPathTrimmed in NormalizePaths(ReservedPaths))
+                {
+                    newReservedList.Add(reservedPathTrimmed);
+                }
+
+                // use the new list from now on
+                return newReservedList;
+            });
+
+            //The url should be cleaned up before checking:
+            // * If it doesn't contain an '.' in the path then we assume it is a path based URL, if that is the case we should add an trailing '/' because all of our reservedPaths use a trailing '/'
+            // * We shouldn't be comparing the query at all
+            var pathPart = url.Split(new[] { '?' }, StringSplitOptions.RemoveEmptyEntries)[0].ToLowerInvariant();
+            if (pathPart.Contains(".") == false)
+            {
+                pathPart = pathPart.EnsureEndsWith('/');
+            }
+
+            // return true if url starts with an element of the reserved list
+            return _reservedList.Any(x => pathPart.InvariantStartsWith(x));
+        }
+
+        private IEnumerable<string> NormalizePaths(IEnumerable<string> paths)
+        {
+            return paths
+                .Select(x => x.Trim().ToLowerInvariant())
+                .Where(x => x.IsNullOrWhiteSpace() == false)
+                .Select(reservedPath => IOHelper.ResolveUrl(reservedPath).Trim().EnsureStartsWith("/").EnsureEndsWith("/"))
+                .Where(reservedPathTrimmed => reservedPathTrimmed.IsNullOrWhiteSpace() == false);
+        }
+
+        /// <summary>
+        /// Determines whether the current request is reserved based on the route table and
+        /// whether the specified URL is reserved or is inside a reserved path.
+        /// </summary>
+        /// <param name="globalSettings"></param>
+        /// <param name="url"></param>
+        /// <param name="httpContext"></param>
+        /// <param name="routes">The route collection to lookup the request in</param>
+        /// <returns></returns>
+        internal bool IsReservedPathOrUrl(string url, HttpContextBase httpContext, RouteCollection routes)
+        {
+            if (httpContext == null) throw new ArgumentNullException(nameof(httpContext));
+            if (routes == null) throw new ArgumentNullException(nameof(routes));
+
+            //This is some rudimentary code to check if the route table has changed at runtime, we're basically just keeping a count
+            //of the routes. This isn't fail safe but there's no way to monitor changes to the route table. Else we need to create a hash
+            //of all routes and then recompare but that will be annoying to do on each request and then we might as well just do the whole MVC
+            //route on each request like we were doing before instead of caching the result of GetRouteData.
+            var changed = false;
+            using (routes.GetReadLock())
+            {
+                if (!_routeCount.HasValue || _routeCount.Value != routes.Count)
+                {
+                    //the counts are not set or have changed, need to reset
+                    changed = true;
+                }   
+            }
+            if (changed)
+            {
+                using (routes.GetWriteLock())
+                {
+                    _routeCount = routes.Count;
+
+                    //try clearing each entry
+                    foreach(var r in _routeChecks.Keys.ToList())
+                        _routeChecks.TryRemove(r, out _);
                 }
             }
 
-            return routes;
+            //check if the current request matches a route, if so then it is reserved.
+            var hasRoute = _routeChecks.GetOrAdd(httpContext.Request.Url.AbsolutePath, x => routes.GetRouteData(httpContext) != null);
+            if (hasRoute)
+                return true;
+
+            //continue with the standard ignore routine
+            return IsReservedPathOrUrl(url);
         }
+
+        /// <summary>
+        /// This is used internally to track any registered callback paths for Identity providers. If the request path matches
+        /// any of the registered paths, then the module will let the request keep executing
+        /// </summary>
+        internal static readonly ConcurrentHashSet<string> ReservedPaths = new ConcurrentHashSet<string>();
     }
 }
diff --git a/src/Umbraco.Web/Security/AuthenticationOptionsExtensions.cs b/src/Umbraco.Web/Security/AuthenticationOptionsExtensions.cs
index 33aabbaf94..b1b2755f4c 100644
--- a/src/Umbraco.Web/Security/AuthenticationOptionsExtensions.cs
+++ b/src/Umbraco.Web/Security/AuthenticationOptionsExtensions.cs
@@ -101,7 +101,7 @@ namespace Umbraco.Web.Security
                         var path = (PathString) prop.GetValue(options);
                         if (path.HasValue)
                         {
-                            UmbracoModule.ReservedPaths.TryAdd(path.ToString());
+                            RoutableDocumentFilter.ReservedPaths.TryAdd(path.ToString());
                         }
                     }
                 }
@@ -112,7 +112,7 @@ namespace Umbraco.Web.Security
             }
             else
             {
-                UmbracoModule.ReservedPaths.TryAdd(callbackPath);
+                RoutableDocumentFilter.ReservedPaths.TryAdd(callbackPath);
             }
         }
     }
diff --git a/src/Umbraco.Web/UmbracoModule.cs b/src/Umbraco.Web/UmbracoModule.cs
index 048e521969..9065341ab9 100644
--- a/src/Umbraco.Web/UmbracoModule.cs
+++ b/src/Umbraco.Web/UmbracoModule.cs
@@ -103,10 +103,5 @@ namespace Umbraco.Web
             return end;
         }
 
-        /// <summary>
-        /// This is used internally to track any registered callback paths for Identity providers. If the request path matches
-        /// any of the registered paths, then the module will let the request keep executing
-        /// </summary>
-        internal static readonly ConcurrentHashSet<string> ReservedPaths = new ConcurrentHashSet<string>();
     }
 }

From 81d9ecc111babd04030d7a31ec805cd99239c5ca Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 10 Sep 2019 16:58:19 +1000
Subject: [PATCH 533/776] fixing tests

---
 .../Configurations/GlobalSettingsTests.cs     | 66 +--------------
 .../Routing/RoutableDocumentFilterTests.cs    | 80 +++++++++++++++++++
 .../Routing/UmbracoModuleTests.cs             |  8 +-
 src/Umbraco.Tests/Umbraco.Tests.csproj        |  3 +-
 4 files changed, 88 insertions(+), 69 deletions(-)
 create mode 100644 src/Umbraco.Tests/Routing/RoutableDocumentFilterTests.cs

diff --git a/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs b/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs
index 54080f05de..a9dc94d239 100644
--- a/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs
+++ b/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs
@@ -1,6 +1,4 @@
-using System.Web.Mvc;
-using System.Web.Routing;
-using Moq;
+using Moq;
 using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
@@ -10,6 +8,7 @@ using Umbraco.Tests.TestHelpers;
 
 namespace Umbraco.Tests.Configurations
 {
+
     [TestFixture]
     public class GlobalSettingsTests : BaseWebTest
     {
@@ -54,66 +53,9 @@ namespace Umbraco.Tests.Configurations
             Assert.AreEqual(outcome, Current.Configs.Global().GetUmbracoMvcArea());
         }
 
-        [TestCase("/umbraco/editContent.aspx")]
-        [TestCase("/install/default.aspx")]
-        [TestCase("/install/")]
-        [TestCase("/install")]
-        [TestCase("/install/?installStep=asdf")]
-        [TestCase("/install/test.aspx")]
-        public void Is_Reserved_Path_Or_Url(string url)
-        {
-            var globalSettings = TestObjects.GetGlobalSettings();
-            Assert.IsTrue(globalSettings.IsReservedPathOrUrl(url));
-        }
-
-        [TestCase("/base/somebasehandler")]
-        [TestCase("/")]
-        [TestCase("/home.aspx")]
-        [TestCase("/umbraco-test")]
-        [TestCase("/install-test")]
-        [TestCase("/install.aspx")]
-        public void Is_Not_Reserved_Path_Or_Url(string url)
-        {
-            var globalSettings = TestObjects.GetGlobalSettings();
-            Assert.IsFalse(globalSettings.IsReservedPathOrUrl(url));
-        }
+        
 
 
-        [TestCase("/Do/Not/match", false)]
-        [TestCase("/Umbraco/RenderMvcs", false)]
-        [TestCase("/Umbraco/RenderMvc", true)]
-        [TestCase("/Umbraco/RenderMvc/Index", true)]
-        [TestCase("/Umbraco/RenderMvc/Index/1234", true)]
-        [TestCase("/Umbraco/RenderMvc/Index/1234/9876", false)]
-        [TestCase("/api", true)]
-        [TestCase("/api/WebApiTest", true)]
-        [TestCase("/api/WebApiTest/1234", true)]
-        [TestCase("/api/WebApiTest/Index/1234", false)]
-        public void Is_Reserved_By_Route(string url, bool shouldMatch)
-        {
-            //reset the app config, we only want to test routes not the hard coded paths
-            var globalSettingsMock = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
-            globalSettingsMock.Setup(x => x.ReservedPaths).Returns("");
-            globalSettingsMock.Setup(x => x.ReservedUrls).Returns("");
-
-            var routes = new RouteCollection();
-
-            routes.MapRoute(
-                "Umbraco_default",
-                "Umbraco/RenderMvc/{action}/{id}",
-                new { controller = "RenderMvc", action = "Index", id = UrlParameter.Optional });
-            routes.MapRoute(
-                "WebAPI",
-                "api/{controller}/{id}",
-                new { controller = "WebApiTestController", action = "Index", id = UrlParameter.Optional });
-
-
-            var context = new FakeHttpContextFactory(url);
-
-
-            Assert.AreEqual(
-                shouldMatch,
-                globalSettingsMock.Object.IsReservedPathOrUrl(url, context.HttpContext, routes));
-        }
+        
     }
 }
diff --git a/src/Umbraco.Tests/Routing/RoutableDocumentFilterTests.cs b/src/Umbraco.Tests/Routing/RoutableDocumentFilterTests.cs
new file mode 100644
index 0000000000..4079ea6c84
--- /dev/null
+++ b/src/Umbraco.Tests/Routing/RoutableDocumentFilterTests.cs
@@ -0,0 +1,80 @@
+using System.Web.Mvc;
+using System.Web.Routing;
+using Moq;
+using NUnit.Framework;
+using Umbraco.Core;
+using Umbraco.Core.Configuration;
+using Umbraco.Tests.TestHelpers;
+using Umbraco.Web;
+
+namespace Umbraco.Tests.Routing
+{
+    [TestFixture]
+    public class RoutableDocumentFilterTests : BaseWebTest
+    {
+        [TestCase("/umbraco/editContent.aspx")]
+        [TestCase("/install/default.aspx")]
+        [TestCase("/install/")]
+        [TestCase("/install")]
+        [TestCase("/install/?installStep=asdf")]
+        [TestCase("/install/test.aspx")]
+        public void Is_Reserved_Path_Or_Url(string url)
+        {
+            var globalSettings = TestObjects.GetGlobalSettings();
+            var routableDocFilter = new RoutableDocumentFilter(globalSettings);
+            Assert.IsTrue(routableDocFilter.IsReservedPathOrUrl(url));
+        }
+
+        [TestCase("/base/somebasehandler")]
+        [TestCase("/")]
+        [TestCase("/home.aspx")]
+        [TestCase("/umbraco-test")]
+        [TestCase("/install-test")]
+        [TestCase("/install.aspx")]
+        public void Is_Not_Reserved_Path_Or_Url(string url)
+        {
+            var globalSettings = TestObjects.GetGlobalSettings();
+            var routableDocFilter = new RoutableDocumentFilter(globalSettings);
+            Assert.IsFalse(routableDocFilter.IsReservedPathOrUrl(url));
+        }
+
+        [TestCase("/Do/Not/match", false)]
+        [TestCase("/Umbraco/RenderMvcs", false)]
+        [TestCase("/Umbraco/RenderMvc", true)]
+        [TestCase("/Umbraco/RenderMvc/Index", true)]
+        [TestCase("/Umbraco/RenderMvc/Index/1234", true)]
+        [TestCase("/Umbraco/RenderMvc/Index/1234/9876", false)]
+        [TestCase("/api", true)]
+        [TestCase("/api/WebApiTest", true)]
+        [TestCase("/api/WebApiTest/1234", true)]
+        [TestCase("/api/WebApiTest/Index/1234", false)]
+        public void Is_Reserved_By_Route(string url, bool shouldMatch)
+        {
+            //reset the app config, we only want to test routes not the hard coded paths
+            var globalSettingsMock = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
+            globalSettingsMock.Setup(x => x.ReservedPaths).Returns("");
+            globalSettingsMock.Setup(x => x.ReservedUrls).Returns("");
+
+            var routableDocFilter = new RoutableDocumentFilter(globalSettingsMock.Object);
+
+            var routes = new RouteCollection();
+
+            routes.MapRoute(
+                "Umbraco_default",
+                "Umbraco/RenderMvc/{action}/{id}",
+                new { controller = "RenderMvc", action = "Index", id = UrlParameter.Optional });
+            routes.MapRoute(
+                "WebAPI",
+                "api/{controller}/{id}",
+                new { controller = "WebApiTestController", action = "Index", id = UrlParameter.Optional });
+
+
+            var context = new FakeHttpContextFactory(url);
+
+
+            Assert.AreEqual(
+                shouldMatch,
+                routableDocFilter.IsReservedPathOrUrl(url, context.HttpContext, routes));
+        }
+    }
+}
diff --git a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
index 34ac79a219..325f6860fd 100644
--- a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
+++ b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
@@ -38,19 +38,15 @@ namespace Umbraco.Tests.Routing
             _module = new UmbracoInjectedModule
             (
                 globalSettings,
-                Mock.Of<IUmbracoContextAccessor>(),
-                Factory.GetInstance<IPublishedSnapshotService>(),
-                Factory.GetInstance<IUserService>(),
-                new UrlProviderCollection(new IUrlProvider[0]),
                 runtime,
                 logger,
                 null, // FIXME: PublishedRouter complexities...
-                Mock.Of<IVariationContextAccessor>(),
                 Mock.Of<IUmbracoContextFactory>(),
                 new Umbraco.Web.Cache.BackgroundPublishedSnapshotNotifier(
                     Factory.GetInstance<IPublishedModelFactory>(),
                     Factory.GetInstance<IPublishedSnapshotService>(),
-                    Logger)
+                    Logger),
+                new RoutableDocumentFilter(globalSettings)
             );
 
             runtime.Level = RuntimeLevel.Run;
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index f788168ddc..fcf73fbffa 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -120,6 +120,7 @@
     <Compile Include="Composing\CompositionTests.cs" />
     <Compile Include="Composing\LightInjectValidation.cs" />
     <Compile Include="Composing\ContainerConformingTests.cs" />
+    <Compile Include="Configurations\GlobalSettingsTests.cs" />
     <Compile Include="CoreThings\CallContextTests.cs" />
     <Compile Include="Components\ComponentTests.cs" />
     <Compile Include="CoreThings\EnumExtensionsTests.cs" />
@@ -145,6 +146,7 @@
     <Compile Include="PublishedContent\SolidPublishedSnapshot.cs" />
     <Compile Include="PublishedContent\NuCacheTests.cs" />
     <Compile Include="Routing\MediaUrlProviderTests.cs" />
+    <Compile Include="Routing\RoutableDocumentFilterTests.cs" />
     <Compile Include="Runtimes\StandaloneTests.cs" />
     <Compile Include="Routing\GetContentUrlsTests.cs" />
     <Compile Include="Services\AmbiguousEventTests.cs" />
@@ -455,7 +457,6 @@
     <Compile Include="Cache\DistributedCache\DistributedCacheTests.cs" />
     <Compile Include="TestHelpers\TestWithDatabaseBase.cs" />
     <Compile Include="TestHelpers\SettingsForTests.cs" />
-    <Compile Include="Configurations\GlobalSettingsTests.cs" />
     <Compile Include="Routing\ContentFinderByAliasTests.cs" />
     <Compile Include="Routing\ContentFinderByIdTests.cs" />
     <Compile Include="Routing\ContentFinderByPageIdQueryTests.cs" />

From de03130256c8dc5180dd15bcb670efc24047e49d Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 10 Sep 2019 17:10:46 +1000
Subject: [PATCH 534/776] Don't fully regenerate models on startup, they will
 be regenerated if they are not there or if the hashes don't match so let MB
 use it's cached models if it can.

---
 .../PublishedCache/NuCache/PublishedSnapshotService.cs          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index 15e6574b40..4239eda9f5 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -160,7 +160,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
             _domainStore = new SnapDictionary<int, Domain>();
 
-            publishedModelFactory.WithSafeLiveFactory(LoadCachesOnStartup);
+            LoadCachesOnStartup();
 
             Guid GetUid(ContentStore store, int id) => store.LiveSnapshot.Get(id)?.Uid ?? default;
             int GetId(ContentStore store, Guid uid) => store.LiveSnapshot.Get(uid)?.Id ?? default;

From c219c21eddec5e87397f0efb34c8933743d70aac Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 10 Sep 2019 17:23:49 +1000
Subject: [PATCH 535/776] ensures tests and benchmark projects are building in
 Debug mode

---
 src/umbraco.sln | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/umbraco.sln b/src/umbraco.sln
index 0522b56c0d..938532beb0 100644
--- a/src/umbraco.sln
+++ b/src/umbraco.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27004.2005
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29209.152
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Web.UI", "Umbraco.Web.UI\Umbraco.Web.UI.csproj", "{4C4C194C-B5E4-4991-8F87-4373E24CC19F}"
 EndProject
@@ -123,6 +123,7 @@ Global
 		{31785BC3-256C-4613-B2F5-A1B0BDDED8C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{31785BC3-256C-4613-B2F5-A1B0BDDED8C1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5D3B8245-ADA6-453F-A008-50ED04BFE770}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5D3B8245-ADA6-453F-A008-50ED04BFE770}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5D3B8245-ADA6-453F-A008-50ED04BFE770}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5D3B8245-ADA6-453F-A008-50ED04BFE770}.Release|Any CPU.Build.0 = Release|Any CPU
 		{07FBC26B-2927-4A22-8D96-D644C667FECC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -130,6 +131,7 @@ Global
 		{07FBC26B-2927-4A22-8D96-D644C667FECC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{07FBC26B-2927-4A22-8D96-D644C667FECC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3A33ADC9-C6C0-4DB1-A613-A9AF0210DF3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3A33ADC9-C6C0-4DB1-A613-A9AF0210DF3D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3A33ADC9-C6C0-4DB1-A613-A9AF0210DF3D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3A33ADC9-C6C0-4DB1-A613-A9AF0210DF3D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection

From 642c06879d561cf6f08b7683590707d64df17874 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 10 Sep 2019 17:24:10 +1000
Subject: [PATCH 536/776] ensure we don't wait on background operations when
 not in PureLive

---
 src/Umbraco.Web/UmbracoInjectedModule.cs | 41 +++++++++++++++---------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/src/Umbraco.Web/UmbracoInjectedModule.cs b/src/Umbraco.Web/UmbracoInjectedModule.cs
index 7f10701e36..f2e9e43a50 100644
--- a/src/Umbraco.Web/UmbracoInjectedModule.cs
+++ b/src/Umbraco.Web/UmbracoInjectedModule.cs
@@ -13,6 +13,7 @@ using Umbraco.Core.Exceptions;
 using Umbraco.Core.Security;
 using Umbraco.Web.Composing;
 using Umbraco.Web.Cache;
+using Umbraco.Core.Models.PublishedContent;
 
 namespace Umbraco.Web
 {
@@ -38,6 +39,7 @@ namespace Umbraco.Web
         private readonly ILogger _logger;
         private readonly IPublishedRouter _publishedRouter;
         private readonly IUmbracoContextFactory _umbracoContextFactory;
+        private readonly IPublishedModelFactory _publishedModelFactory;
         private readonly BackgroundPublishedSnapshotNotifier _backgroundNotifier;
         private readonly RoutableDocumentFilter _routableDocumentLookup;
 
@@ -47,6 +49,7 @@ namespace Umbraco.Web
             ILogger logger,
             IPublishedRouter publishedRouter,
             IUmbracoContextFactory umbracoContextFactory,
+            IPublishedModelFactory publishedModelFactory,
             BackgroundPublishedSnapshotNotifier backgroundNotifier,
             RoutableDocumentFilter routableDocumentLookup)
         {
@@ -55,6 +58,7 @@ namespace Umbraco.Web
             _logger = logger;
             _publishedRouter = publishedRouter;
             _umbracoContextFactory = umbracoContextFactory;
+            _publishedModelFactory = publishedModelFactory;
             _backgroundNotifier = backgroundNotifier;
             _routableDocumentLookup = routableDocumentLookup;
         }
@@ -83,28 +87,35 @@ namespace Umbraco.Web
             // ensure there's an UmbracoContext registered for the current request
             // registers the context reference so its disposed at end of request
             var umbracoContextReference = _umbracoContextFactory.EnsureUmbracoContext(httpContext);
-            umbracoContextReference.UmbracoContext.CreatingPublishedSnapshot += UmbracoContext_CreatingPublishedSnapshot;
+            BindCreatingPublishedSnapshot(umbracoContextReference.UmbracoContext);
             httpContext.DisposeOnPipelineCompleted(umbracoContextReference);
         }
 
         /// <summary>
-        /// Event handler for when the UmbracoContext creates the published snapshot
+        /// Bind to the event handler for when the UmbracoContext creates the published snapshot when in PureLive mode
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void UmbracoContext_CreatingPublishedSnapshot(UmbracoContext sender, EventArgs e)
+        /// <param name="umbracoContext"></param>
+        /// <remarks>
+        /// When we are not in PureLive mode it is not necessary to do this so we have to have a special check.
+        /// </remarks>
+        private void BindCreatingPublishedSnapshot(UmbracoContext umbracoContext)
         {
-            // Wait for the notifier to complete if it's in progress, this is required because
-            // Pure Live models along with content snapshots are updated on a background thread when schema
-            // (doc types, data types) are changed so if that is still processing we need to wait before we access
-            // the content snapshot to make sure it's the latest version.
-            // We only want to wait if this is a front-end request (not a back office request) so need to first check
-            // for that and then wait.
-            
-            if (sender.IsDocumentRequest(_routableDocumentLookup) &&_backgroundNotifier.Wait())
+            if (!_publishedModelFactory.IsLiveFactory()) return;
+
+            umbracoContext.CreatingPublishedSnapshot += (UmbracoContext sender, EventArgs e) =>
             {
-                _logger.Debug<UmbracoModule>("Request was suspended while waiting for background cache notifications to complete");
-            }
+                // Wait for the notifier to complete if it's in progress, this is required because
+                // Pure Live models along with content snapshots are updated on a background thread when schema
+                // (doc types, data types) are changed so if that is still processing we need to wait before we access
+                // the content snapshot to make sure it's the latest version.
+                // We only want to wait if this is a front-end request (not a back office request) so need to first check
+                // for that and then wait.
+
+                if (sender.IsDocumentRequest(_routableDocumentLookup) && _backgroundNotifier.Wait())
+                {
+                    _logger.Debug<UmbracoModule>("Request was suspended while waiting for background cache notifications to complete");
+                }
+            };
         }
 
         /// <summary>

From 127c429959f62f11139a7074cb6b78c2c5a7b149 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 10 Sep 2019 17:27:17 +1000
Subject: [PATCH 537/776] fix tests

---
 src/Umbraco.Tests/Routing/UmbracoModuleTests.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
index 325f6860fd..060ce549dd 100644
--- a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
+++ b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
@@ -42,6 +42,7 @@ namespace Umbraco.Tests.Routing
                 logger,
                 null, // FIXME: PublishedRouter complexities...
                 Mock.Of<IUmbracoContextFactory>(),
+                Mock.Of<IPublishedModelFactory>(),
                 new Umbraco.Web.Cache.BackgroundPublishedSnapshotNotifier(
                     Factory.GetInstance<IPublishedModelFactory>(),
                     Factory.GetInstance<IPublishedSnapshotService>(),

From d5331d85af613d3b8a15be452ee38ba5cf50dd20 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Tue, 10 Sep 2019 10:48:28 +0100
Subject: [PATCH 538/776] Removing the localStorage key cleanup - seems to be a
 timing issue if you drag the image into a middle of a word

---
 .../src/common/services/tinymce.service.js                     | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 24139da62d..088d8a3a3e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -223,9 +223,6 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                         // When its being persisted in RTE property editor
                         // To create a media item & delete this tmp one etc
                         tinymce.activeEditor.$(img).attr({ "data-tmpimg": tmpLocation });
-
-                        // Be a boy scout & cleanup after ourselves
-                        localStorage.removeItem(`tinymce__${imgSrc}`);
                     });
                 });
             }

From 6669b54a70e879b855c274318f5856d5c6097531 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Tue, 10 Sep 2019 10:50:36 +0100
Subject: [PATCH 539/776] Move the logic for finding temp images for persisting
 into a shared class so Grid & RTE can both use it

---
 .../PropertyEditors/GridPropertyEditor.cs     | 69 ++++++++++++++++---
 .../PropertyEditors/RichTextPropertyEditor.cs | 59 +---------------
 .../Templates/TemplateUtilities.cs            | 57 ++++++++++++++-
 3 files changed, 119 insertions(+), 66 deletions(-)

diff --git a/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
index aa7a1f7355..98c65175af 100644
--- a/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
@@ -1,14 +1,16 @@
 using System.Linq;
 using Umbraco.Core.Logging;
-using Examine;
-using Lucene.Net.Documents;
 using Umbraco.Core;
 using Umbraco.Core.PropertyEditors;
+using Newtonsoft.Json;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.Editors;
+using Umbraco.Web.Templates;
+using Umbraco.Web.Composing;
+using Umbraco.Core.Services;
 
 namespace Umbraco.Web.PropertyEditors
 {
-    using Examine = global::Examine;
-
     /// <summary>
     /// Represents a grid property and parameter editor.
     /// </summary>
@@ -22,9 +24,15 @@ namespace Umbraco.Web.PropertyEditors
         Group = Constants.PropertyEditors.Groups.RichContent)]
     public class GridPropertyEditor : DataEditor
     {
-        public GridPropertyEditor(ILogger logger)
+        private IMediaService _mediaService;
+        private IContentTypeBaseServiceProvider _contentTypeBaseServiceProvider;
+
+        public GridPropertyEditor(ILogger logger, IMediaService mediaService, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider)
             : base(logger)
-        { }
+        {
+            _mediaService = mediaService;
+            _contentTypeBaseServiceProvider = contentTypeBaseServiceProvider;
+        }
 
         public override IPropertyIndexValueFactory PropertyIndexValueFactory => new GridPropertyIndexValueFactory();
 
@@ -32,15 +40,58 @@ namespace Umbraco.Web.PropertyEditors
         /// Overridden to ensure that the value is validated
         /// </summary>
         /// <returns></returns>
-        protected override IDataValueEditor CreateValueEditor() => new GridPropertyValueEditor(Attribute);
+        protected override IDataValueEditor CreateValueEditor() => new GridPropertyValueEditor(Attribute, _mediaService, _contentTypeBaseServiceProvider);
 
         protected override IConfigurationEditor CreateConfigurationEditor() => new GridConfigurationEditor();
 
         internal class GridPropertyValueEditor : DataValueEditor
         {
-            public GridPropertyValueEditor(DataEditorAttribute attribute)
+            private IMediaService _mediaService;
+            private IContentTypeBaseServiceProvider _contentTypeBaseServiceProvider;
+
+            public GridPropertyValueEditor(DataEditorAttribute attribute, IMediaService mediaService, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider)
                 : base(attribute)
-            { }
+            {
+                _mediaService = mediaService;
+                _contentTypeBaseServiceProvider = contentTypeBaseServiceProvider;
+            }
+
+            /// <summary>
+            /// Format the data for persistence
+            /// This to ensure if a RTE is used in a Grid cell/control that we parse it for tmp stored images
+            /// to persist to the media library when we go to persist this to the DB
+            /// </summary>
+            /// <param name="editorValue"></param>
+            /// <param name="currentValue"></param>
+            /// <returns></returns>
+            public override object FromEditor(ContentPropertyData editorValue, object currentValue)
+            {
+                if (editorValue.Value == null)
+                    return null;
+
+                // editorValue.Value is a JSON string of the grid
+                var rawJson = editorValue.Value.ToString();
+                var grid = JsonConvert.DeserializeObject<GridValue>(rawJson);
+
+                // Find all controls that use the RTE editor
+                var controls = grid.Sections.SelectMany(x => x.Rows.SelectMany(r => r.Areas).SelectMany(a => a.Controls));
+                var rtes = controls.Where(x => x.Editor.Alias.ToLowerInvariant() == "rte");
+
+                foreach(var rte in rtes)
+                {
+                    // Parse the HTML
+                    var html = rte.Value?.ToString();
+                    
+                    var userId = Current.UmbracoContext.Security.CurrentUser.Id;
+
+                    // TODO: In future task(get the parent folder from this config) to save the media into
+                    var parsedHtml = TemplateUtilities.FindAndPersistPastedTempImages(html, -1, userId, _mediaService, _contentTypeBaseServiceProvider);
+                    rte.Value = parsedHtml;
+                }
+
+                // Convert back to raw JSON for persisting
+                return JsonConvert.SerializeObject(grid);
+            }
         }
     }
 }
diff --git a/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
index 911defcd17..f9267315e4 100644
--- a/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
@@ -113,64 +113,11 @@ namespace Umbraco.Web.PropertyEditors
                 var editorValueWithMediaUrlsRemoved = TemplateUtilities.RemoveMediaUrlsFromTextString(editorValue.Value.ToString());
                 var parsed = MacroTagParser.FormatRichTextContentForPersistence(editorValueWithMediaUrlsRemoved);
 
-                // HTML content when being persisted may j
-                parsed = FindPastedTempImages(parsed);
-                
-                return parsed;
-            }
-
-            private string FindPastedTempImages(string html)
-            {
-                // Find all img's that has data-tmpimg attribute
-                // Use HTML Agility Pack - https://html-agility-pack.net
-                var htmlDoc = new HtmlDocument();
-                htmlDoc.LoadHtml(html);
-
-                var tmpImages = htmlDoc.DocumentNode.SelectNodes("//img[@data-tmpimg]");
-                if (tmpImages == null || tmpImages.Count == 0)
-                    return html;
-
                 var userId = Current.UmbracoContext.Security.CurrentUser.Id;
 
-                foreach (var img in tmpImages)
-                {
-                    // The data attribute contains the path to the tmp img to persist as a media item
-                    var tmpImgPath = img.GetAttributeValue("data-tmpimg", string.Empty);
-
-                    if (string.IsNullOrEmpty(tmpImgPath))
-                        continue;
-
-                    var absTmpImgPath = IOHelper.MapPath(tmpImgPath);
-                    var fileName = Path.GetFileName(absTmpImgPath);
-                    var safeFileName = fileName.ToSafeFileName();
-
-                    // TODO: In future task (get the parent folder from this config) to save the media into
-                    var mediaItemName = safeFileName.ToFriendlyName();
-                    var f = _mediaService.CreateMedia(mediaItemName, -1, Constants.Conventions.MediaTypes.Image, userId);
-                    var fileInfo = new FileInfo(absTmpImgPath);
-
-                    var fs = fileInfo.OpenReadWithRetry();
-                    if (fs == null) throw new InvalidOperationException("Could not acquire file stream");
-                    using (fs)
-                    {
-                        f.SetValue(_contentTypeBaseServiceProvider, Constants.Conventions.Media.File, safeFileName, fs);
-                    }
-
-                    _mediaService.Save(f, userId);
-
-                    // Add the UDI to the img element as new data attribute
-                    var udi = f.GetUdi();
-                    img.SetAttributeValue("data-udi", udi.ToString());
-
-                    //Get the new persisted image url
-                    var mediaTyped = Current.UmbracoHelper.Media(f.Id);
-                    var location = mediaTyped.Url;
-
-                    // Remove the data attribute (so we do not re-process this)
-                    img.Attributes.Remove("data-tmpimg");
-                }
-
-                return htmlDoc.DocumentNode.OuterHtml;
+                // TODO: In future task(get the parent folder from this config) to save the media into
+                parsed = TemplateUtilities.FindAndPersistPastedTempImages(parsed, -1, userId, _mediaService, _contentTypeBaseServiceProvider);
+                return parsed;
             }
         }
 
diff --git a/src/Umbraco.Web/Templates/TemplateUtilities.cs b/src/Umbraco.Web/Templates/TemplateUtilities.cs
index b1d9947b9b..5969951072 100644
--- a/src/Umbraco.Web/Templates/TemplateUtilities.cs
+++ b/src/Umbraco.Web/Templates/TemplateUtilities.cs
@@ -1,8 +1,11 @@
-using System;
+using HtmlAgilityPack;
+using System;
+using System.IO;
 using System.Text.RegularExpressions;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
+using Umbraco.Core.Services;
 using Umbraco.Web.Composing;
 using Umbraco.Web.PublishedCache;
 using Umbraco.Web.Routing;
@@ -183,5 +186,57 @@ namespace Umbraco.Web.Templates
         internal static string RemoveMediaUrlsFromTextString(string text)
             // see comment in ResolveMediaFromTextString for group reference
             => ResolveImgPattern.Replace(text, "$1$3$4$5");
+
+        internal static string FindAndPersistPastedTempImages(string html, int mediaParentFolder, int userId, IMediaService mediaService, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider)
+        {
+            // Find all img's that has data-tmpimg attribute
+            // Use HTML Agility Pack - https://html-agility-pack.net
+            var htmlDoc = new HtmlDocument();
+            htmlDoc.LoadHtml(html);
+
+            var tmpImages = htmlDoc.DocumentNode.SelectNodes("//img[@data-tmpimg]");
+            if (tmpImages == null || tmpImages.Count == 0)
+                return html;
+            
+            foreach (var img in tmpImages)
+            {
+                // The data attribute contains the path to the tmp img to persist as a media item
+                var tmpImgPath = img.GetAttributeValue("data-tmpimg", string.Empty);
+
+                if (string.IsNullOrEmpty(tmpImgPath))
+                    continue;
+
+                var absTmpImgPath = IOHelper.MapPath(tmpImgPath);
+                var fileName = Path.GetFileName(absTmpImgPath);
+                var safeFileName = fileName.ToSafeFileName();
+
+                var mediaItemName = safeFileName.ToFriendlyName();
+                var f = mediaService.CreateMedia(mediaItemName, mediaParentFolder, Constants.Conventions.MediaTypes.Image, userId);
+                var fileInfo = new FileInfo(absTmpImgPath);
+
+                var fs = fileInfo.OpenReadWithRetry();
+                if (fs == null) throw new InvalidOperationException("Could not acquire file stream");
+                using (fs)
+                {
+                    f.SetValue(contentTypeBaseServiceProvider, Constants.Conventions.Media.File, safeFileName, fs);
+                }
+
+                mediaService.Save(f, userId);
+
+                // Add the UDI to the img element as new data attribute
+                var udi = f.GetUdi();
+                img.SetAttributeValue("data-udi", udi.ToString());
+
+                //Get the new persisted image url
+                var mediaTyped = Current.UmbracoHelper.Media(f.Id);
+                var location = mediaTyped.Url;
+                img.SetAttributeValue("src", location);
+
+                // Remove the data attribute (so we do not re-process this)
+                img.Attributes.Remove("data-tmpimg");
+            }
+
+            return htmlDoc.DocumentNode.OuterHtml;
+        }
     }
 }

From 83d568dd5a1fb7d0a7e6c29a9e6cd83b41e85cb1 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Tue, 10 Sep 2019 11:32:02 +0100
Subject: [PATCH 540/776] Fix up unit test

---
 .../src/common/services/tinymce.service.js                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 7506086595..3bbcdbf73e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -7,7 +7,7 @@
  * A service containing all logic for all of the Umbraco TinyMCE plugins
  */
 function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, stylesheetResource, macroResource, macroService,
-    $routeParams, umbRequestHelper, angularHelper, userService, editorService, entityResource, localStorageService) {
+    $routeParams, umbRequestHelper, angularHelper, userService, editorService, entityResource) {
 
     //These are absolutely required in order for the macros to render inline
     //we put these as extended elements because they get merged on top of the normal allowed elements by tiny mce

From cfe196a45dbd44638149dcf53f17216ace4f5926 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Tue, 10 Sep 2019 11:47:52 +0100
Subject: [PATCH 541/776] Fix up C# unit tests - VS19 failed to tell me about
 these failing to build :S

---
 .../PublishedContent/PublishedContentTestBase.cs             | 3 ++-
 src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs  | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
index 6907f6936c..46636483b6 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
@@ -9,6 +9,7 @@ using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Web.PropertyEditors;
+using Umbraco.Core.Services;
 
 namespace Umbraco.Tests.PublishedContent
 {
@@ -38,7 +39,7 @@ namespace Umbraco.Tests.PublishedContent
             var converters = Factory.GetInstance<PropertyValueConverterCollection>();
 
             var dataTypeService = new TestObjects.TestDataTypeService(
-                new DataType(new RichTextPropertyEditor(Mock.Of<ILogger>())) { Id = 1 });
+                new DataType(new RichTextPropertyEditor(Mock.Of<ILogger>(), Mock.Of<IMediaService>(), Mock.Of<IContentTypeBaseServiceProvider>())) { Id = 1 });
 
             var publishedContentTypeFactory = new PublishedContentTypeFactory(Mock.Of<IPublishedModelFactory>(), converters, dataTypeService);
 
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
index f54971a197..e98e28c3dd 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
@@ -42,10 +42,13 @@ namespace Umbraco.Tests.PublishedContent
             Composition.RegisterUnique<IPublishedValueFallback, PublishedValueFallback>();
 
             var logger = Mock.Of<ILogger>();
+            var mediaService = Mock.Of<IMediaService>();
+            var contentTypeBaseServiceProvider = Mock.Of<IContentTypeBaseServiceProvider>();
+
             var dataTypeService = new TestObjects.TestDataTypeService(
                 new DataType(new VoidEditor(logger)) { Id = 1 },
                 new DataType(new TrueFalsePropertyEditor(logger)) { Id = 1001 },
-                new DataType(new RichTextPropertyEditor(logger)) { Id = 1002 },
+                new DataType(new RichTextPropertyEditor(logger, mediaService, contentTypeBaseServiceProvider)) { Id = 1002 },
                 new DataType(new IntegerPropertyEditor(logger)) { Id = 1003 },
                 new DataType(new TextboxPropertyEditor(logger)) { Id = 1004 },
                 new DataType(new MediaPickerPropertyEditor(logger)) { Id = 1005 });

From f0fb371b2c6e2048042e884da6b059403aa805c7 Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
Date: Tue, 10 Sep 2019 13:54:35 +0200
Subject: [PATCH 542/776] Revert "V7/bug/6283 save member resets password"

---
 .../src/common/resources/entity.resource.js   |    2 +-
 .../linkpicker/linkpicker.controller.js       |    7 +-
 .../views/member/member.edit.controller.js    |    2 +-
 src/Umbraco.Web/Editors/EntityController.cs   |   11 +-
 src/Umbraco.Web/Properties/Settings.settings  |    3 +
 .../Properties/Settings1.Designer.cs          |   12 +-
 src/Umbraco.Web/Umbraco.Web.csproj            |   22 +
 src/Umbraco.Web/UmbracoHelper.cs              |   33 -
 .../org.umbraco.our/Reference.cs              | 1046 +++++++++++++++++
 .../org.umbraco.our/Reference.map             |    7 +
 .../org.umbraco.our/repository.disco          |    6 +
 .../org.umbraco.our/repository.wsdl           |  995 ++++++++++++++++
 12 files changed, 2097 insertions(+), 49 deletions(-)
 create mode 100644 src/Umbraco.Web/Web References/org.umbraco.our/Reference.cs
 create mode 100644 src/Umbraco.Web/Web References/org.umbraco.our/Reference.map
 create mode 100644 src/Umbraco.Web/Web References/org.umbraco.our/repository.disco
 create mode 100644 src/Umbraco.Web/Web References/org.umbraco.our/repository.wsdl

diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
index 7c1e232383..4e164cacf6 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
@@ -172,7 +172,7 @@ function entityResource($q, $http, umbRequestHelper) {
                     umbRequestHelper.getApiUrl(
                         "entityApiBaseUrl",
                         "GetUrlAndAnchors",
-                        [{ id: id }])),
+                        { id: id })),
                 'Failed to retrieve url and anchors data for id ' + id);
         },
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
index ddf8ac8f98..f1241c1976 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
@@ -33,23 +33,24 @@ angular.module("umbraco").controller("Umbraco.Overlays.LinkPickerController",
         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 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
+                //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
+                        //now sync the tree to this path
                         $scope.dialogTreeEventHandler.syncTree({
                             path: path,
                             tree: "content"
                         });
                     });
 
+
                     entityResource.getUrlAndAnchors(id).then(function(resp){
                         $scope.anchorValues = resp.anchorValues;
                         $scope.model.target.url = resp.url;
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
index 8d54597791..eb99e46a1f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
@@ -133,7 +133,7 @@ function MemberEditController($scope, $routeParams, $location, $q, $window, appS
 
             //anytime a user is changing a member's password without the oldPassword, we are in effect resetting it so we need to set that flag here
             var passwordProp = _.find(contentEditingHelper.getAllProps($scope.content), function (e) { return e.alias === '_umb_password' });
-            if (passwordProp && passwordProp.value && (typeof passwordProp.value.reset !== 'undefined') && !passwordProp.value.reset) {
+            if (passwordProp && passwordProp.value && !passwordProp.value.reset) {
                 //so if the admin is not explicitly resetting the password, flag it for resetting if a new password is being entered
                 passwordProp.value.reset = !passwordProp.value.oldPassword && passwordProp.config.allowManuallyChangingPassword;
             }
diff --git a/src/Umbraco.Web/Editors/EntityController.cs b/src/Umbraco.Web/Editors/EntityController.cs
index ada0206545..85d5b607b6 100644
--- a/src/Umbraco.Web/Editors/EntityController.cs
+++ b/src/Umbraco.Web/Editors/EntityController.cs
@@ -56,7 +56,6 @@ namespace Umbraco.Web.Editors
                     //id is passed in eventually we'll probably want to support GUID + Udi too
                     new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetPagedChildren", "id", typeof(int), typeof(string)),
                     new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetPath", "id", typeof(int), typeof(Guid), typeof(Udi)),
-                    new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetUrlAndAnchors", "id", typeof(int), typeof(Guid), typeof(Udi)),
                     new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetById", "id", typeof(int), typeof(Guid), typeof(Udi)),
                     new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetByIds", "ids", typeof(int[]), typeof(Guid[]), typeof(Udi[]))));
             }
@@ -282,17 +281,9 @@ namespace Umbraco.Web.Editors
                 publishedContentExists: i => Umbraco.TypedContent(i) != null);
         }
 
-        [HttpGet]
-        public UrlAndAnchors GetUrlAndAnchors(Udi id)
-        {
-            var nodeId = Umbraco.GetIdForUdi(id);
-            var url = Umbraco.Url(nodeId);
-            var anchorValues = Services.ContentService.GetAnchorValuesFromRTEs(nodeId);
-            return new UrlAndAnchors(url, anchorValues);
-        }
 
         [HttpGet]
-        public UrlAndAnchors GetUrlAndAnchors(int id)
+        public UrlAndAnchors GetUrlAndAnchors([FromUri]int id)
         {
             var url = Umbraco.Url(id);
             var anchorValues = Services.ContentService.GetAnchorValuesFromRTEs(id);
diff --git a/src/Umbraco.Web/Properties/Settings.settings b/src/Umbraco.Web/Properties/Settings.settings
index a7b911ae3b..da9e6f69c0 100644
--- a/src/Umbraco.Web/Properties/Settings.settings
+++ b/src/Umbraco.Web/Properties/Settings.settings
@@ -11,5 +11,8 @@
     <Setting Name="test" Type="System.String" Scope="Application">
       <Value Profile="(Default)">Somthing</Value>
     </Setting>
+    <Setting Name="umbraco_org_umbraco_our_Repository" Type="(Web Service URL)" Scope="Application">
+      <Value Profile="(Default)">https://our.umbraco.com/umbraco/webservices/api/repository.asmx</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/src/Umbraco.Web/Properties/Settings1.Designer.cs b/src/Umbraco.Web/Properties/Settings1.Designer.cs
index 3847901f20..e7028f28df 100644
--- a/src/Umbraco.Web/Properties/Settings1.Designer.cs
+++ b/src/Umbraco.Web/Properties/Settings1.Designer.cs
@@ -12,7 +12,7 @@ namespace Umbraco.Web.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.2.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.8.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -50,5 +50,15 @@ namespace Umbraco.Web.Properties {
                 return ((string)(this["test"]));
             }
         }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.WebServiceUrl)]
+        [global::System.Configuration.DefaultSettingValueAttribute("https://our.umbraco.com/umbraco/webservices/api/repository.asmx")]
+        public string umbraco_org_umbraco_our_Repository {
+            get {
+                return ((string)(this["umbraco_org_umbraco_our_Repository"]));
+            }
+        }
     }
 }
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 2624959e16..01524e5962 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -814,6 +814,11 @@
     <Compile Include="umbraco.presentation\umbraco\Trees\loadPackager.cs" />
     <Compile Include="PublishedCache\XmlPublishedCache\XmlCacheFilePersister.cs" />
     <Compile Include="UmbracoComponentRenderer.cs" />
+    <Compile Include="Web References\org.umbraco.our\Reference.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Reference.map</DependentUpon>
+    </Compile>
     <Compile Include="WebApi\AngularJsonMediaTypeFormatter.cs" />
     <Compile Include="WebApi\AngularJsonOnlyConfigurationAttribute.cs" />
     <Compile Include="WebApi\Binders\BlueprintItemBinder.cs" />
@@ -1825,6 +1830,11 @@
       <Link>Mvc\web.config</Link>
     </None>
     <None Include="packages.config" />
+    <None Include="Web References\org.umbraco.our\Reference.map">
+      <Generator>MSDiscoCodeGenerator</Generator>
+      <LastGenOutput>Reference.cs</LastGenOutput>
+    </None>
+    <None Include="Web References\org.umbraco.our\repository.disco" />
     <EmbeddedResource Include="UI\JavaScript\Main.js" />
     <EmbeddedResource Include="UI\JavaScript\JsInitialize.js" />
     <EmbeddedResource Include="UI\JavaScript\ServerVariables.js" />
@@ -1875,6 +1885,7 @@
     <Content Include="umbraco.presentation\umbraco\members\ViewMembers.aspx" />
     <Content Include="umbraco.presentation\umbraco\plugins\tinymce3\tinymce3tinymceCompress.aspx" />
     <None Include="app.config" />
+    <None Include="Web References\org.umbraco.our\repository.wsdl" />
     <None Include="Web References\org.umbraco.update\UpgradeResult.datasource">
       <DependentUpon>Reference.map</DependentUpon>
     </None>
@@ -1968,6 +1979,17 @@
     <WebReferences Include="Web References\" />
   </ItemGroup>
   <ItemGroup>
+    <WebReferenceUrl Include="https://our.umbraco.com/umbraco/webservices/api/repository.asmx">
+      <UrlBehavior>Dynamic</UrlBehavior>
+      <RelPath>Web References\org.umbraco.our\</RelPath>
+      <UpdateFromURL>https://our.umbraco.com/umbraco/webservices/api/repository.asmx</UpdateFromURL>
+      <ServiceLocationURL>
+      </ServiceLocationURL>
+      <CachedDynamicPropName>
+      </CachedDynamicPropName>
+      <CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
+      <CachedSettingsPropName>umbraco_org_umbraco_our_Repository</CachedSettingsPropName>
+    </WebReferenceUrl>
     <WebReferenceUrl Include="http://update.umbraco.org/checkforupgrade.asmx">
       <UrlBehavior>Dynamic</UrlBehavior>
       <RelPath>Web References\org.umbraco.update\</RelPath>
diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs
index 199cdd4ef3..5320b6085a 100644
--- a/src/Umbraco.Web/UmbracoHelper.cs
+++ b/src/Umbraco.Web/UmbracoHelper.cs
@@ -492,18 +492,6 @@ namespace Umbraco.Web
             return Url(nodeId);
         }
 
-        /// <summary>
-        /// Returns a string with a friendly url from a node.
-        /// IE.: Instead of having /482 (id) as an url, you can have
-        /// /screenshots/developer/macros (spoken url)
-        /// </summary>
-        /// <param name="guid">Identifier for the node that should be returned</param>
-        /// <returns>String with a friendly url from a node</returns>
-        public string NiceUrl(Guid guid)
-        {
-            return Url(guid);
-        }
-
         /// <summary>
         /// Gets the url of a content identified by its identifier.
         /// </summary>
@@ -514,16 +502,6 @@ namespace Umbraco.Web
             return UrlProvider.GetUrl(contentId);
         }
 
-        /// <summary>
-        /// Gets the url of a content identified by its identifier.
-        /// </summary>
-        /// <param name="contentGuid">The content identifier.</param>
-        /// <returns>The url for the content.</returns>
-        public string Url(Guid contentGuid)
-        {
-            return UrlProvider.GetUrl(contentGuid);
-        }
-
         /// <summary>
         /// Gets the url of a content identified by its identifier, in a specified mode.
         /// </summary>
@@ -535,17 +513,6 @@ namespace Umbraco.Web
             return UrlProvider.GetUrl(contentId, mode);
         }
 
-        /// <summary>
-        /// Gets the url of a content identified by its identifier, in a specified mode.
-        /// </summary>
-        /// <param name="contentGuid">The content identifier.</param>
-        /// <param name="mode">The mode.</param>
-        /// <returns>The url for the content.</returns>
-        public string Url(Guid contentGuid, UrlProviderMode mode)
-        {
-            return UrlProvider.GetUrl(contentGuid, mode);
-        }
-
         /// <summary>
         /// This method will always add the domain to the path if the hostnames are set up correctly.
         /// </summary>
diff --git a/src/Umbraco.Web/Web References/org.umbraco.our/Reference.cs b/src/Umbraco.Web/Web References/org.umbraco.our/Reference.cs
new file mode 100644
index 0000000000..d0c8990660
--- /dev/null
+++ b/src/Umbraco.Web/Web References/org.umbraco.our/Reference.cs	
@@ -0,0 +1,1046 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+// 
+// This source code was auto-generated by Microsoft.VSDesigner, Version 4.0.30319.42000.
+// 
+#pragma warning disable 1591
+
+namespace Umbraco.Web.org.umbraco.our {
+    using System;
+    using System.Web.Services;
+    using System.Diagnostics;
+    using System.Web.Services.Protocols;
+    using System.Xml.Serialization;
+    using System.ComponentModel;
+    
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    [System.Web.Services.WebServiceBindingAttribute(Name="RepositorySoap", Namespace="http://packages.umbraco.org/webservices/")]
+    public partial class Repository : System.Web.Services.Protocols.SoapHttpClientProtocol {
+        
+        private System.Threading.SendOrPostCallback CategoriesOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback ModulesOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback ModulesCategorizedOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback NitrosOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback NitrosCategorizedOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback authenticateOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback fetchPackageOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback fetchPackageByVersionOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback fetchProtectedPackageOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback SubmitPackageOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback PackageByGuidOperationCompleted;
+        
+        private bool useDefaultCredentialsSetExplicitly;
+        
+        /// <remarks/>
+        public Repository() {
+            this.Url = global::Umbraco.Web.Properties.Settings.Default.umbraco_org_umbraco_our_Repository;
+            if ((this.IsLocalFileSystemWebService(this.Url) == true)) {
+                this.UseDefaultCredentials = true;
+                this.useDefaultCredentialsSetExplicitly = false;
+            }
+            else {
+                this.useDefaultCredentialsSetExplicitly = true;
+            }
+        }
+        
+        public new string Url {
+            get {
+                return base.Url;
+            }
+            set {
+                if ((((this.IsLocalFileSystemWebService(base.Url) == true) 
+                            && (this.useDefaultCredentialsSetExplicitly == false)) 
+                            && (this.IsLocalFileSystemWebService(value) == false))) {
+                    base.UseDefaultCredentials = false;
+                }
+                base.Url = value;
+            }
+        }
+        
+        public new bool UseDefaultCredentials {
+            get {
+                return base.UseDefaultCredentials;
+            }
+            set {
+                base.UseDefaultCredentials = value;
+                this.useDefaultCredentialsSetExplicitly = true;
+            }
+        }
+        
+        /// <remarks/>
+        public event CategoriesCompletedEventHandler CategoriesCompleted;
+        
+        /// <remarks/>
+        public event ModulesCompletedEventHandler ModulesCompleted;
+        
+        /// <remarks/>
+        public event ModulesCategorizedCompletedEventHandler ModulesCategorizedCompleted;
+        
+        /// <remarks/>
+        public event NitrosCompletedEventHandler NitrosCompleted;
+        
+        /// <remarks/>
+        public event NitrosCategorizedCompletedEventHandler NitrosCategorizedCompleted;
+        
+        /// <remarks/>
+        public event authenticateCompletedEventHandler authenticateCompleted;
+        
+        /// <remarks/>
+        public event fetchPackageCompletedEventHandler fetchPackageCompleted;
+        
+        /// <remarks/>
+        public event fetchPackageByVersionCompletedEventHandler fetchPackageByVersionCompleted;
+        
+        /// <remarks/>
+        public event fetchProtectedPackageCompletedEventHandler fetchProtectedPackageCompleted;
+        
+        /// <remarks/>
+        public event SubmitPackageCompletedEventHandler SubmitPackageCompleted;
+        
+        /// <remarks/>
+        public event PackageByGuidCompletedEventHandler PackageByGuidCompleted;
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://packages.umbraco.org/webservices/Categories", RequestNamespace="http://packages.umbraco.org/webservices/", ResponseNamespace="http://packages.umbraco.org/webservices/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public Category[] Categories(string repositoryGuid) {
+            object[] results = this.Invoke("Categories", new object[] {
+                        repositoryGuid});
+            return ((Category[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public void CategoriesAsync(string repositoryGuid) {
+            this.CategoriesAsync(repositoryGuid, null);
+        }
+        
+        /// <remarks/>
+        public void CategoriesAsync(string repositoryGuid, object userState) {
+            if ((this.CategoriesOperationCompleted == null)) {
+                this.CategoriesOperationCompleted = new System.Threading.SendOrPostCallback(this.OnCategoriesOperationCompleted);
+            }
+            this.InvokeAsync("Categories", new object[] {
+                        repositoryGuid}, this.CategoriesOperationCompleted, userState);
+        }
+        
+        private void OnCategoriesOperationCompleted(object arg) {
+            if ((this.CategoriesCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.CategoriesCompleted(this, new CategoriesCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://packages.umbraco.org/webservices/Modules", RequestNamespace="http://packages.umbraco.org/webservices/", ResponseNamespace="http://packages.umbraco.org/webservices/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public Package[] Modules() {
+            object[] results = this.Invoke("Modules", new object[0]);
+            return ((Package[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public void ModulesAsync() {
+            this.ModulesAsync(null);
+        }
+        
+        /// <remarks/>
+        public void ModulesAsync(object userState) {
+            if ((this.ModulesOperationCompleted == null)) {
+                this.ModulesOperationCompleted = new System.Threading.SendOrPostCallback(this.OnModulesOperationCompleted);
+            }
+            this.InvokeAsync("Modules", new object[0], this.ModulesOperationCompleted, userState);
+        }
+        
+        private void OnModulesOperationCompleted(object arg) {
+            if ((this.ModulesCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.ModulesCompleted(this, new ModulesCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://packages.umbraco.org/webservices/ModulesCategorized", RequestNamespace="http://packages.umbraco.org/webservices/", ResponseNamespace="http://packages.umbraco.org/webservices/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public Category[] ModulesCategorized() {
+            object[] results = this.Invoke("ModulesCategorized", new object[0]);
+            return ((Category[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public void ModulesCategorizedAsync() {
+            this.ModulesCategorizedAsync(null);
+        }
+        
+        /// <remarks/>
+        public void ModulesCategorizedAsync(object userState) {
+            if ((this.ModulesCategorizedOperationCompleted == null)) {
+                this.ModulesCategorizedOperationCompleted = new System.Threading.SendOrPostCallback(this.OnModulesCategorizedOperationCompleted);
+            }
+            this.InvokeAsync("ModulesCategorized", new object[0], this.ModulesCategorizedOperationCompleted, userState);
+        }
+        
+        private void OnModulesCategorizedOperationCompleted(object arg) {
+            if ((this.ModulesCategorizedCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.ModulesCategorizedCompleted(this, new ModulesCategorizedCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://packages.umbraco.org/webservices/Nitros", RequestNamespace="http://packages.umbraco.org/webservices/", ResponseNamespace="http://packages.umbraco.org/webservices/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public Package[] Nitros() {
+            object[] results = this.Invoke("Nitros", new object[0]);
+            return ((Package[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public void NitrosAsync() {
+            this.NitrosAsync(null);
+        }
+        
+        /// <remarks/>
+        public void NitrosAsync(object userState) {
+            if ((this.NitrosOperationCompleted == null)) {
+                this.NitrosOperationCompleted = new System.Threading.SendOrPostCallback(this.OnNitrosOperationCompleted);
+            }
+            this.InvokeAsync("Nitros", new object[0], this.NitrosOperationCompleted, userState);
+        }
+        
+        private void OnNitrosOperationCompleted(object arg) {
+            if ((this.NitrosCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.NitrosCompleted(this, new NitrosCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://packages.umbraco.org/webservices/NitrosCategorized", RequestNamespace="http://packages.umbraco.org/webservices/", ResponseNamespace="http://packages.umbraco.org/webservices/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public Category[] NitrosCategorized() {
+            object[] results = this.Invoke("NitrosCategorized", new object[0]);
+            return ((Category[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public void NitrosCategorizedAsync() {
+            this.NitrosCategorizedAsync(null);
+        }
+        
+        /// <remarks/>
+        public void NitrosCategorizedAsync(object userState) {
+            if ((this.NitrosCategorizedOperationCompleted == null)) {
+                this.NitrosCategorizedOperationCompleted = new System.Threading.SendOrPostCallback(this.OnNitrosCategorizedOperationCompleted);
+            }
+            this.InvokeAsync("NitrosCategorized", new object[0], this.NitrosCategorizedOperationCompleted, userState);
+        }
+        
+        private void OnNitrosCategorizedOperationCompleted(object arg) {
+            if ((this.NitrosCategorizedCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.NitrosCategorizedCompleted(this, new NitrosCategorizedCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://packages.umbraco.org/webservices/authenticate", RequestNamespace="http://packages.umbraco.org/webservices/", ResponseNamespace="http://packages.umbraco.org/webservices/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public string authenticate(string email, string md5Password) {
+            object[] results = this.Invoke("authenticate", new object[] {
+                        email,
+                        md5Password});
+            return ((string)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void authenticateAsync(string email, string md5Password) {
+            this.authenticateAsync(email, md5Password, null);
+        }
+        
+        /// <remarks/>
+        public void authenticateAsync(string email, string md5Password, object userState) {
+            if ((this.authenticateOperationCompleted == null)) {
+                this.authenticateOperationCompleted = new System.Threading.SendOrPostCallback(this.OnauthenticateOperationCompleted);
+            }
+            this.InvokeAsync("authenticate", new object[] {
+                        email,
+                        md5Password}, this.authenticateOperationCompleted, userState);
+        }
+        
+        private void OnauthenticateOperationCompleted(object arg) {
+            if ((this.authenticateCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.authenticateCompleted(this, new authenticateCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://packages.umbraco.org/webservices/fetchPackage", RequestNamespace="http://packages.umbraco.org/webservices/", ResponseNamespace="http://packages.umbraco.org/webservices/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        [return: System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")]
+        public byte[] fetchPackage(string packageGuid) {
+            object[] results = this.Invoke("fetchPackage", new object[] {
+                        packageGuid});
+            return ((byte[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public void fetchPackageAsync(string packageGuid) {
+            this.fetchPackageAsync(packageGuid, null);
+        }
+        
+        /// <remarks/>
+        public void fetchPackageAsync(string packageGuid, object userState) {
+            if ((this.fetchPackageOperationCompleted == null)) {
+                this.fetchPackageOperationCompleted = new System.Threading.SendOrPostCallback(this.OnfetchPackageOperationCompleted);
+            }
+            this.InvokeAsync("fetchPackage", new object[] {
+                        packageGuid}, this.fetchPackageOperationCompleted, userState);
+        }
+        
+        private void OnfetchPackageOperationCompleted(object arg) {
+            if ((this.fetchPackageCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.fetchPackageCompleted(this, new fetchPackageCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://packages.umbraco.org/webservices/fetchPackageByVersion", RequestNamespace="http://packages.umbraco.org/webservices/", ResponseNamespace="http://packages.umbraco.org/webservices/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        [return: System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")]
+        public byte[] fetchPackageByVersion(string packageGuid, string repoVersion) {
+            object[] results = this.Invoke("fetchPackageByVersion", new object[] {
+                        packageGuid,
+                        repoVersion});
+            return ((byte[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public void fetchPackageByVersionAsync(string packageGuid, string repoVersion) {
+            this.fetchPackageByVersionAsync(packageGuid, repoVersion, null);
+        }
+        
+        /// <remarks/>
+        public void fetchPackageByVersionAsync(string packageGuid, string repoVersion, object userState) {
+            if ((this.fetchPackageByVersionOperationCompleted == null)) {
+                this.fetchPackageByVersionOperationCompleted = new System.Threading.SendOrPostCallback(this.OnfetchPackageByVersionOperationCompleted);
+            }
+            this.InvokeAsync("fetchPackageByVersion", new object[] {
+                        packageGuid,
+                        repoVersion}, this.fetchPackageByVersionOperationCompleted, userState);
+        }
+        
+        private void OnfetchPackageByVersionOperationCompleted(object arg) {
+            if ((this.fetchPackageByVersionCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.fetchPackageByVersionCompleted(this, new fetchPackageByVersionCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://packages.umbraco.org/webservices/fetchProtectedPackage", RequestNamespace="http://packages.umbraco.org/webservices/", ResponseNamespace="http://packages.umbraco.org/webservices/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        [return: System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")]
+        public byte[] fetchProtectedPackage(string packageGuid, string memberKey) {
+            object[] results = this.Invoke("fetchProtectedPackage", new object[] {
+                        packageGuid,
+                        memberKey});
+            return ((byte[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public void fetchProtectedPackageAsync(string packageGuid, string memberKey) {
+            this.fetchProtectedPackageAsync(packageGuid, memberKey, null);
+        }
+        
+        /// <remarks/>
+        public void fetchProtectedPackageAsync(string packageGuid, string memberKey, object userState) {
+            if ((this.fetchProtectedPackageOperationCompleted == null)) {
+                this.fetchProtectedPackageOperationCompleted = new System.Threading.SendOrPostCallback(this.OnfetchProtectedPackageOperationCompleted);
+            }
+            this.InvokeAsync("fetchProtectedPackage", new object[] {
+                        packageGuid,
+                        memberKey}, this.fetchProtectedPackageOperationCompleted, userState);
+        }
+        
+        private void OnfetchProtectedPackageOperationCompleted(object arg) {
+            if ((this.fetchProtectedPackageCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.fetchProtectedPackageCompleted(this, new fetchProtectedPackageCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://packages.umbraco.org/webservices/SubmitPackage", RequestNamespace="http://packages.umbraco.org/webservices/", ResponseNamespace="http://packages.umbraco.org/webservices/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public SubmitStatus SubmitPackage(string repositoryGuid, string authorGuid, string packageGuid, [System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")] byte[] packageFile, [System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")] byte[] packageDoc, [System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")] byte[] packageThumbnail, string name, string author, string authorUrl, string description) {
+            object[] results = this.Invoke("SubmitPackage", new object[] {
+                        repositoryGuid,
+                        authorGuid,
+                        packageGuid,
+                        packageFile,
+                        packageDoc,
+                        packageThumbnail,
+                        name,
+                        author,
+                        authorUrl,
+                        description});
+            return ((SubmitStatus)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void SubmitPackageAsync(string repositoryGuid, string authorGuid, string packageGuid, byte[] packageFile, byte[] packageDoc, byte[] packageThumbnail, string name, string author, string authorUrl, string description) {
+            this.SubmitPackageAsync(repositoryGuid, authorGuid, packageGuid, packageFile, packageDoc, packageThumbnail, name, author, authorUrl, description, null);
+        }
+        
+        /// <remarks/>
+        public void SubmitPackageAsync(string repositoryGuid, string authorGuid, string packageGuid, byte[] packageFile, byte[] packageDoc, byte[] packageThumbnail, string name, string author, string authorUrl, string description, object userState) {
+            if ((this.SubmitPackageOperationCompleted == null)) {
+                this.SubmitPackageOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSubmitPackageOperationCompleted);
+            }
+            this.InvokeAsync("SubmitPackage", new object[] {
+                        repositoryGuid,
+                        authorGuid,
+                        packageGuid,
+                        packageFile,
+                        packageDoc,
+                        packageThumbnail,
+                        name,
+                        author,
+                        authorUrl,
+                        description}, this.SubmitPackageOperationCompleted, userState);
+        }
+        
+        private void OnSubmitPackageOperationCompleted(object arg) {
+            if ((this.SubmitPackageCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.SubmitPackageCompleted(this, new SubmitPackageCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://packages.umbraco.org/webservices/PackageByGuid", RequestNamespace="http://packages.umbraco.org/webservices/", ResponseNamespace="http://packages.umbraco.org/webservices/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public Package PackageByGuid(string packageGuid) {
+            object[] results = this.Invoke("PackageByGuid", new object[] {
+                        packageGuid});
+            return ((Package)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void PackageByGuidAsync(string packageGuid) {
+            this.PackageByGuidAsync(packageGuid, null);
+        }
+        
+        /// <remarks/>
+        public void PackageByGuidAsync(string packageGuid, object userState) {
+            if ((this.PackageByGuidOperationCompleted == null)) {
+                this.PackageByGuidOperationCompleted = new System.Threading.SendOrPostCallback(this.OnPackageByGuidOperationCompleted);
+            }
+            this.InvokeAsync("PackageByGuid", new object[] {
+                        packageGuid}, this.PackageByGuidOperationCompleted, userState);
+        }
+        
+        private void OnPackageByGuidOperationCompleted(object arg) {
+            if ((this.PackageByGuidCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.PackageByGuidCompleted(this, new PackageByGuidCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        public new void CancelAsync(object userState) {
+            base.CancelAsync(userState);
+        }
+        
+        private bool IsLocalFileSystemWebService(string url) {
+            if (((url == null) 
+                        || (url == string.Empty))) {
+                return false;
+            }
+            System.Uri wsUri = new System.Uri(url);
+            if (((wsUri.Port >= 1024) 
+                        && (string.Compare(wsUri.Host, "localHost", System.StringComparison.OrdinalIgnoreCase) == 0))) {
+                return true;
+            }
+            return false;
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.3056.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://packages.umbraco.org/webservices/")]
+    public partial class Category {
+        
+        private string textField;
+        
+        private string descriptionField;
+        
+        private string urlField;
+        
+        private int idField;
+        
+        private Package[] packagesField;
+        
+        /// <remarks/>
+        public string Text {
+            get {
+                return this.textField;
+            }
+            set {
+                this.textField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public string Description {
+            get {
+                return this.descriptionField;
+            }
+            set {
+                this.descriptionField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public string Url {
+            get {
+                return this.urlField;
+            }
+            set {
+                this.urlField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int Id {
+            get {
+                return this.idField;
+            }
+            set {
+                this.idField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public Package[] Packages {
+            get {
+                return this.packagesField;
+            }
+            set {
+                this.packagesField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.3056.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://packages.umbraco.org/webservices/")]
+    public partial class Package {
+        
+        private System.Guid repoGuidField;
+        
+        private string textField;
+        
+        private string descriptionField;
+        
+        private string iconField;
+        
+        private string thumbnailField;
+        
+        private string documentationField;
+        
+        private string demoField;
+        
+        private bool acceptedField;
+        
+        private bool isModuleField;
+        
+        private bool editorsPickField;
+        
+        private bool protectedField;
+        
+        private bool hasUpgradeField;
+        
+        private string upgradeVersionField;
+        
+        private string upgradeReadMeField;
+        
+        private string urlField;
+        
+        /// <remarks/>
+        public System.Guid RepoGuid {
+            get {
+                return this.repoGuidField;
+            }
+            set {
+                this.repoGuidField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public string Text {
+            get {
+                return this.textField;
+            }
+            set {
+                this.textField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public string Description {
+            get {
+                return this.descriptionField;
+            }
+            set {
+                this.descriptionField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public string Icon {
+            get {
+                return this.iconField;
+            }
+            set {
+                this.iconField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public string Thumbnail {
+            get {
+                return this.thumbnailField;
+            }
+            set {
+                this.thumbnailField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public string Documentation {
+            get {
+                return this.documentationField;
+            }
+            set {
+                this.documentationField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public string Demo {
+            get {
+                return this.demoField;
+            }
+            set {
+                this.demoField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public bool Accepted {
+            get {
+                return this.acceptedField;
+            }
+            set {
+                this.acceptedField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public bool IsModule {
+            get {
+                return this.isModuleField;
+            }
+            set {
+                this.isModuleField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public bool EditorsPick {
+            get {
+                return this.editorsPickField;
+            }
+            set {
+                this.editorsPickField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public bool Protected {
+            get {
+                return this.protectedField;
+            }
+            set {
+                this.protectedField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public bool HasUpgrade {
+            get {
+                return this.hasUpgradeField;
+            }
+            set {
+                this.hasUpgradeField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public string UpgradeVersion {
+            get {
+                return this.upgradeVersionField;
+            }
+            set {
+                this.upgradeVersionField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public string UpgradeReadMe {
+            get {
+                return this.upgradeReadMeField;
+            }
+            set {
+                this.upgradeReadMeField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public string Url {
+            get {
+                return this.urlField;
+            }
+            set {
+                this.urlField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.3056.0")]
+    [System.SerializableAttribute()]
+    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://packages.umbraco.org/webservices/")]
+    public enum SubmitStatus {
+        
+        /// <remarks/>
+        Complete,
+        
+        /// <remarks/>
+        Exists,
+        
+        /// <remarks/>
+        NoAccess,
+        
+        /// <remarks/>
+        Error,
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
+    public delegate void CategoriesCompletedEventHandler(object sender, CategoriesCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class CategoriesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal CategoriesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public Category[] Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((Category[])(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
+    public delegate void ModulesCompletedEventHandler(object sender, ModulesCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class ModulesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal ModulesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public Package[] Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((Package[])(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
+    public delegate void ModulesCategorizedCompletedEventHandler(object sender, ModulesCategorizedCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class ModulesCategorizedCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal ModulesCategorizedCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public Category[] Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((Category[])(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
+    public delegate void NitrosCompletedEventHandler(object sender, NitrosCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class NitrosCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal NitrosCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public Package[] Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((Package[])(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
+    public delegate void NitrosCategorizedCompletedEventHandler(object sender, NitrosCategorizedCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class NitrosCategorizedCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal NitrosCategorizedCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public Category[] Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((Category[])(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
+    public delegate void authenticateCompletedEventHandler(object sender, authenticateCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class authenticateCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal authenticateCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public string Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((string)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
+    public delegate void fetchPackageCompletedEventHandler(object sender, fetchPackageCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class fetchPackageCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal fetchPackageCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public byte[] Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((byte[])(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
+    public delegate void fetchPackageByVersionCompletedEventHandler(object sender, fetchPackageByVersionCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class fetchPackageByVersionCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal fetchPackageByVersionCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public byte[] Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((byte[])(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
+    public delegate void fetchProtectedPackageCompletedEventHandler(object sender, fetchProtectedPackageCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class fetchProtectedPackageCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal fetchProtectedPackageCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public byte[] Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((byte[])(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
+    public delegate void SubmitPackageCompletedEventHandler(object sender, SubmitPackageCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class SubmitPackageCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal SubmitPackageCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public SubmitStatus Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((SubmitStatus)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
+    public delegate void PackageByGuidCompletedEventHandler(object sender, PackageByGuidCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class PackageByGuidCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal PackageByGuidCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public Package Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((Package)(this.results[0]));
+            }
+        }
+    }
+}
+
+#pragma warning restore 1591
\ No newline at end of file
diff --git a/src/Umbraco.Web/Web References/org.umbraco.our/Reference.map b/src/Umbraco.Web/Web References/org.umbraco.our/Reference.map
new file mode 100644
index 0000000000..cd819c5591
--- /dev/null
+++ b/src/Umbraco.Web/Web References/org.umbraco.our/Reference.map	
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<DiscoveryClientResultsFile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Results>
+    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="https://our.umbraco.com/umbraco/webservices/api/repository.asmx?wsdl" filename="repository.wsdl" />
+    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="https://our.umbraco.com/umbraco/webservices/api/repository.asmx?disco" filename="repository.disco" />
+  </Results>
+</DiscoveryClientResultsFile>
\ No newline at end of file
diff --git a/src/Umbraco.Web/Web References/org.umbraco.our/repository.disco b/src/Umbraco.Web/Web References/org.umbraco.our/repository.disco
new file mode 100644
index 0000000000..fcc65dea0c
--- /dev/null
+++ b/src/Umbraco.Web/Web References/org.umbraco.our/repository.disco	
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<discovery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/disco/">
+  <contractRef ref="https://our.umbraco.com/umbraco/webservices/api/repository.asmx?wsdl" docRef="https://our.umbraco.com/umbraco/webservices/api/repository.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
+  <soap address="https://our.umbraco.com/umbraco/webservices/api/repository.asmx" xmlns:q1="http://packages.umbraco.org/webservices/" binding="q1:RepositorySoap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
+  <soap address="https://our.umbraco.com/umbraco/webservices/api/repository.asmx" xmlns:q2="http://packages.umbraco.org/webservices/" binding="q2:RepositorySoap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
+</discovery>
\ No newline at end of file
diff --git a/src/Umbraco.Web/Web References/org.umbraco.our/repository.wsdl b/src/Umbraco.Web/Web References/org.umbraco.our/repository.wsdl
new file mode 100644
index 0000000000..17d24e9c54
--- /dev/null
+++ b/src/Umbraco.Web/Web References/org.umbraco.our/repository.wsdl	
@@ -0,0 +1,995 @@
+<?xml version="1.0" encoding="utf-8"?>
+<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:tns="http://packages.umbraco.org/webservices/" xmlns:s1="http://microsoft.com/wsdl/types/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:s2="http://packages.umbraco.org/webservices/AbstractTypes" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://packages.umbraco.org/webservices/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+  <wsdl:types>
+    <s:schema elementFormDefault="qualified" targetNamespace="http://packages.umbraco.org/webservices/">
+      <s:import namespace="http://microsoft.com/wsdl/types/" />
+      <s:element name="Categories">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="repositoryGuid" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="CategoriesResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="CategoriesResult" type="tns:ArrayOfCategory" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:complexType name="ArrayOfCategory">
+        <s:sequence>
+          <s:element minOccurs="0" maxOccurs="unbounded" name="Category" nillable="true" type="tns:Category" />
+        </s:sequence>
+      </s:complexType>
+      <s:complexType name="Category">
+        <s:sequence>
+          <s:element minOccurs="0" maxOccurs="1" name="Text" type="s:string" />
+          <s:element minOccurs="0" maxOccurs="1" name="Description" type="s:string" />
+          <s:element minOccurs="0" maxOccurs="1" name="Url" type="s:string" />
+          <s:element minOccurs="1" maxOccurs="1" name="Id" type="s:int" />
+          <s:element minOccurs="0" maxOccurs="1" name="Packages" type="tns:ArrayOfPackage" />
+        </s:sequence>
+      </s:complexType>
+      <s:complexType name="ArrayOfPackage">
+        <s:sequence>
+          <s:element minOccurs="0" maxOccurs="unbounded" name="Package" nillable="true" type="tns:Package" />
+        </s:sequence>
+      </s:complexType>
+      <s:complexType name="Package">
+        <s:sequence>
+          <s:element minOccurs="1" maxOccurs="1" name="RepoGuid" type="s1:guid" />
+          <s:element minOccurs="0" maxOccurs="1" name="Text" type="s:string" />
+          <s:element minOccurs="0" maxOccurs="1" name="Description" type="s:string" />
+          <s:element minOccurs="0" maxOccurs="1" name="Icon" type="s:string" />
+          <s:element minOccurs="0" maxOccurs="1" name="Thumbnail" type="s:string" />
+          <s:element minOccurs="0" maxOccurs="1" name="Documentation" type="s:string" />
+          <s:element minOccurs="0" maxOccurs="1" name="Demo" type="s:string" />
+          <s:element minOccurs="1" maxOccurs="1" name="Accepted" type="s:boolean" />
+          <s:element minOccurs="1" maxOccurs="1" name="IsModule" type="s:boolean" />
+          <s:element minOccurs="1" maxOccurs="1" name="EditorsPick" type="s:boolean" />
+          <s:element minOccurs="1" maxOccurs="1" name="Protected" type="s:boolean" />
+          <s:element minOccurs="1" maxOccurs="1" name="HasUpgrade" type="s:boolean" />
+          <s:element minOccurs="0" maxOccurs="1" name="UpgradeVersion" type="s:string" />
+          <s:element minOccurs="0" maxOccurs="1" name="UpgradeReadMe" type="s:string" />
+          <s:element minOccurs="0" maxOccurs="1" name="Url" type="s:string" />
+        </s:sequence>
+      </s:complexType>
+      <s:element name="Modules">
+        <s:complexType />
+      </s:element>
+      <s:element name="ModulesResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="ModulesResult" type="tns:ArrayOfPackage" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="ModulesCategorized">
+        <s:complexType />
+      </s:element>
+      <s:element name="ModulesCategorizedResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="ModulesCategorizedResult" type="tns:ArrayOfCategory" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="Nitros">
+        <s:complexType />
+      </s:element>
+      <s:element name="NitrosResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="NitrosResult" type="tns:ArrayOfPackage" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="NitrosCategorized">
+        <s:complexType />
+      </s:element>
+      <s:element name="NitrosCategorizedResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="NitrosCategorizedResult" type="tns:ArrayOfCategory" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="authenticate">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="email" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="md5Password" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="authenticateResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="authenticateResult" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="fetchPackage">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="packageGuid" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="fetchPackageResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="fetchPackageResult" type="s:base64Binary" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="fetchPackageByVersion">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="packageGuid" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="repoVersion" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="fetchPackageByVersionResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="fetchPackageByVersionResult" type="s:base64Binary" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="fetchProtectedPackage">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="packageGuid" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="memberKey" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="fetchProtectedPackageResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="fetchProtectedPackageResult" type="s:base64Binary" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="SubmitPackage">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="repositoryGuid" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="authorGuid" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="packageGuid" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="packageFile" type="s:base64Binary" />
+            <s:element minOccurs="0" maxOccurs="1" name="packageDoc" type="s:base64Binary" />
+            <s:element minOccurs="0" maxOccurs="1" name="packageThumbnail" type="s:base64Binary" />
+            <s:element minOccurs="0" maxOccurs="1" name="name" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="author" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="authorUrl" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="description" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="SubmitPackageResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="1" maxOccurs="1" name="SubmitPackageResult" type="tns:SubmitStatus" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:simpleType name="SubmitStatus">
+        <s:restriction base="s:string">
+          <s:enumeration value="Complete" />
+          <s:enumeration value="Exists" />
+          <s:enumeration value="NoAccess" />
+          <s:enumeration value="Error" />
+        </s:restriction>
+      </s:simpleType>
+      <s:element name="PackageByGuid">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="packageGuid" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="PackageByGuidResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="PackageByGuidResult" type="tns:Package" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="ArrayOfCategory" nillable="true" type="tns:ArrayOfCategory" />
+      <s:element name="ArrayOfPackage" nillable="true" type="tns:ArrayOfPackage" />
+      <s:element name="string" nillable="true" type="s:string" />
+      <s:element name="base64Binary" nillable="true" type="s:base64Binary" />
+      <s:element name="SubmitStatus" type="tns:SubmitStatus" />
+      <s:element name="Package" nillable="true" type="tns:Package" />
+    </s:schema>
+    <s:schema elementFormDefault="qualified" targetNamespace="http://microsoft.com/wsdl/types/">
+      <s:simpleType name="guid">
+        <s:restriction base="s:string">
+          <s:pattern value="[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}" />
+        </s:restriction>
+      </s:simpleType>
+    </s:schema>
+    <s:schema targetNamespace="http://packages.umbraco.org/webservices/AbstractTypes">
+      <s:import namespace="http://schemas.xmlsoap.org/soap/encoding/" />
+      <s:complexType name="StringArray">
+        <s:complexContent mixed="false">
+          <s:restriction base="soapenc:Array">
+            <s:sequence>
+              <s:element minOccurs="0" maxOccurs="unbounded" name="String" type="s:string" />
+            </s:sequence>
+          </s:restriction>
+        </s:complexContent>
+      </s:complexType>
+    </s:schema>
+  </wsdl:types>
+  <wsdl:message name="CategoriesSoapIn">
+    <wsdl:part name="parameters" element="tns:Categories" />
+  </wsdl:message>
+  <wsdl:message name="CategoriesSoapOut">
+    <wsdl:part name="parameters" element="tns:CategoriesResponse" />
+  </wsdl:message>
+  <wsdl:message name="ModulesSoapIn">
+    <wsdl:part name="parameters" element="tns:Modules" />
+  </wsdl:message>
+  <wsdl:message name="ModulesSoapOut">
+    <wsdl:part name="parameters" element="tns:ModulesResponse" />
+  </wsdl:message>
+  <wsdl:message name="ModulesCategorizedSoapIn">
+    <wsdl:part name="parameters" element="tns:ModulesCategorized" />
+  </wsdl:message>
+  <wsdl:message name="ModulesCategorizedSoapOut">
+    <wsdl:part name="parameters" element="tns:ModulesCategorizedResponse" />
+  </wsdl:message>
+  <wsdl:message name="NitrosSoapIn">
+    <wsdl:part name="parameters" element="tns:Nitros" />
+  </wsdl:message>
+  <wsdl:message name="NitrosSoapOut">
+    <wsdl:part name="parameters" element="tns:NitrosResponse" />
+  </wsdl:message>
+  <wsdl:message name="NitrosCategorizedSoapIn">
+    <wsdl:part name="parameters" element="tns:NitrosCategorized" />
+  </wsdl:message>
+  <wsdl:message name="NitrosCategorizedSoapOut">
+    <wsdl:part name="parameters" element="tns:NitrosCategorizedResponse" />
+  </wsdl:message>
+  <wsdl:message name="authenticateSoapIn">
+    <wsdl:part name="parameters" element="tns:authenticate" />
+  </wsdl:message>
+  <wsdl:message name="authenticateSoapOut">
+    <wsdl:part name="parameters" element="tns:authenticateResponse" />
+  </wsdl:message>
+  <wsdl:message name="fetchPackageSoapIn">
+    <wsdl:part name="parameters" element="tns:fetchPackage" />
+  </wsdl:message>
+  <wsdl:message name="fetchPackageSoapOut">
+    <wsdl:part name="parameters" element="tns:fetchPackageResponse" />
+  </wsdl:message>
+  <wsdl:message name="fetchPackageByVersionSoapIn">
+    <wsdl:part name="parameters" element="tns:fetchPackageByVersion" />
+  </wsdl:message>
+  <wsdl:message name="fetchPackageByVersionSoapOut">
+    <wsdl:part name="parameters" element="tns:fetchPackageByVersionResponse" />
+  </wsdl:message>
+  <wsdl:message name="fetchProtectedPackageSoapIn">
+    <wsdl:part name="parameters" element="tns:fetchProtectedPackage" />
+  </wsdl:message>
+  <wsdl:message name="fetchProtectedPackageSoapOut">
+    <wsdl:part name="parameters" element="tns:fetchProtectedPackageResponse" />
+  </wsdl:message>
+  <wsdl:message name="SubmitPackageSoapIn">
+    <wsdl:part name="parameters" element="tns:SubmitPackage" />
+  </wsdl:message>
+  <wsdl:message name="SubmitPackageSoapOut">
+    <wsdl:part name="parameters" element="tns:SubmitPackageResponse" />
+  </wsdl:message>
+  <wsdl:message name="PackageByGuidSoapIn">
+    <wsdl:part name="parameters" element="tns:PackageByGuid" />
+  </wsdl:message>
+  <wsdl:message name="PackageByGuidSoapOut">
+    <wsdl:part name="parameters" element="tns:PackageByGuidResponse" />
+  </wsdl:message>
+  <wsdl:message name="CategoriesHttpGetIn">
+    <wsdl:part name="repositoryGuid" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="CategoriesHttpGetOut">
+    <wsdl:part name="Body" element="tns:ArrayOfCategory" />
+  </wsdl:message>
+  <wsdl:message name="ModulesHttpGetIn" />
+  <wsdl:message name="ModulesHttpGetOut">
+    <wsdl:part name="Body" element="tns:ArrayOfPackage" />
+  </wsdl:message>
+  <wsdl:message name="ModulesCategorizedHttpGetIn" />
+  <wsdl:message name="ModulesCategorizedHttpGetOut">
+    <wsdl:part name="Body" element="tns:ArrayOfCategory" />
+  </wsdl:message>
+  <wsdl:message name="NitrosHttpGetIn" />
+  <wsdl:message name="NitrosHttpGetOut">
+    <wsdl:part name="Body" element="tns:ArrayOfPackage" />
+  </wsdl:message>
+  <wsdl:message name="NitrosCategorizedHttpGetIn" />
+  <wsdl:message name="NitrosCategorizedHttpGetOut">
+    <wsdl:part name="Body" element="tns:ArrayOfCategory" />
+  </wsdl:message>
+  <wsdl:message name="authenticateHttpGetIn">
+    <wsdl:part name="email" type="s:string" />
+    <wsdl:part name="md5Password" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="authenticateHttpGetOut">
+    <wsdl:part name="Body" element="tns:string" />
+  </wsdl:message>
+  <wsdl:message name="fetchPackageHttpGetIn">
+    <wsdl:part name="packageGuid" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="fetchPackageHttpGetOut">
+    <wsdl:part name="Body" element="tns:base64Binary" />
+  </wsdl:message>
+  <wsdl:message name="fetchPackageByVersionHttpGetIn">
+    <wsdl:part name="packageGuid" type="s:string" />
+    <wsdl:part name="repoVersion" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="fetchPackageByVersionHttpGetOut">
+    <wsdl:part name="Body" element="tns:base64Binary" />
+  </wsdl:message>
+  <wsdl:message name="fetchProtectedPackageHttpGetIn">
+    <wsdl:part name="packageGuid" type="s:string" />
+    <wsdl:part name="memberKey" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="fetchProtectedPackageHttpGetOut">
+    <wsdl:part name="Body" element="tns:base64Binary" />
+  </wsdl:message>
+  <wsdl:message name="SubmitPackageHttpGetIn">
+    <wsdl:part name="repositoryGuid" type="s:string" />
+    <wsdl:part name="authorGuid" type="s:string" />
+    <wsdl:part name="packageGuid" type="s:string" />
+    <wsdl:part name="packageFile" type="s2:StringArray" />
+    <wsdl:part name="packageDoc" type="s2:StringArray" />
+    <wsdl:part name="packageThumbnail" type="s2:StringArray" />
+    <wsdl:part name="name" type="s:string" />
+    <wsdl:part name="author" type="s:string" />
+    <wsdl:part name="authorUrl" type="s:string" />
+    <wsdl:part name="description" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="SubmitPackageHttpGetOut">
+    <wsdl:part name="Body" element="tns:SubmitStatus" />
+  </wsdl:message>
+  <wsdl:message name="PackageByGuidHttpGetIn">
+    <wsdl:part name="packageGuid" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="PackageByGuidHttpGetOut">
+    <wsdl:part name="Body" element="tns:Package" />
+  </wsdl:message>
+  <wsdl:message name="CategoriesHttpPostIn">
+    <wsdl:part name="repositoryGuid" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="CategoriesHttpPostOut">
+    <wsdl:part name="Body" element="tns:ArrayOfCategory" />
+  </wsdl:message>
+  <wsdl:message name="ModulesHttpPostIn" />
+  <wsdl:message name="ModulesHttpPostOut">
+    <wsdl:part name="Body" element="tns:ArrayOfPackage" />
+  </wsdl:message>
+  <wsdl:message name="ModulesCategorizedHttpPostIn" />
+  <wsdl:message name="ModulesCategorizedHttpPostOut">
+    <wsdl:part name="Body" element="tns:ArrayOfCategory" />
+  </wsdl:message>
+  <wsdl:message name="NitrosHttpPostIn" />
+  <wsdl:message name="NitrosHttpPostOut">
+    <wsdl:part name="Body" element="tns:ArrayOfPackage" />
+  </wsdl:message>
+  <wsdl:message name="NitrosCategorizedHttpPostIn" />
+  <wsdl:message name="NitrosCategorizedHttpPostOut">
+    <wsdl:part name="Body" element="tns:ArrayOfCategory" />
+  </wsdl:message>
+  <wsdl:message name="authenticateHttpPostIn">
+    <wsdl:part name="email" type="s:string" />
+    <wsdl:part name="md5Password" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="authenticateHttpPostOut">
+    <wsdl:part name="Body" element="tns:string" />
+  </wsdl:message>
+  <wsdl:message name="fetchPackageHttpPostIn">
+    <wsdl:part name="packageGuid" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="fetchPackageHttpPostOut">
+    <wsdl:part name="Body" element="tns:base64Binary" />
+  </wsdl:message>
+  <wsdl:message name="fetchPackageByVersionHttpPostIn">
+    <wsdl:part name="packageGuid" type="s:string" />
+    <wsdl:part name="repoVersion" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="fetchPackageByVersionHttpPostOut">
+    <wsdl:part name="Body" element="tns:base64Binary" />
+  </wsdl:message>
+  <wsdl:message name="fetchProtectedPackageHttpPostIn">
+    <wsdl:part name="packageGuid" type="s:string" />
+    <wsdl:part name="memberKey" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="fetchProtectedPackageHttpPostOut">
+    <wsdl:part name="Body" element="tns:base64Binary" />
+  </wsdl:message>
+  <wsdl:message name="SubmitPackageHttpPostIn">
+    <wsdl:part name="repositoryGuid" type="s:string" />
+    <wsdl:part name="authorGuid" type="s:string" />
+    <wsdl:part name="packageGuid" type="s:string" />
+    <wsdl:part name="packageFile" type="s2:StringArray" />
+    <wsdl:part name="packageDoc" type="s2:StringArray" />
+    <wsdl:part name="packageThumbnail" type="s2:StringArray" />
+    <wsdl:part name="name" type="s:string" />
+    <wsdl:part name="author" type="s:string" />
+    <wsdl:part name="authorUrl" type="s:string" />
+    <wsdl:part name="description" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="SubmitPackageHttpPostOut">
+    <wsdl:part name="Body" element="tns:SubmitStatus" />
+  </wsdl:message>
+  <wsdl:message name="PackageByGuidHttpPostIn">
+    <wsdl:part name="packageGuid" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="PackageByGuidHttpPostOut">
+    <wsdl:part name="Body" element="tns:Package" />
+  </wsdl:message>
+  <wsdl:portType name="RepositorySoap">
+    <wsdl:operation name="Categories">
+      <wsdl:input message="tns:CategoriesSoapIn" />
+      <wsdl:output message="tns:CategoriesSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="Modules">
+      <wsdl:input message="tns:ModulesSoapIn" />
+      <wsdl:output message="tns:ModulesSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="ModulesCategorized">
+      <wsdl:input message="tns:ModulesCategorizedSoapIn" />
+      <wsdl:output message="tns:ModulesCategorizedSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="Nitros">
+      <wsdl:input message="tns:NitrosSoapIn" />
+      <wsdl:output message="tns:NitrosSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="NitrosCategorized">
+      <wsdl:input message="tns:NitrosCategorizedSoapIn" />
+      <wsdl:output message="tns:NitrosCategorizedSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="authenticate">
+      <wsdl:input message="tns:authenticateSoapIn" />
+      <wsdl:output message="tns:authenticateSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="fetchPackage">
+      <wsdl:input message="tns:fetchPackageSoapIn" />
+      <wsdl:output message="tns:fetchPackageSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="fetchPackageByVersion">
+      <wsdl:input message="tns:fetchPackageByVersionSoapIn" />
+      <wsdl:output message="tns:fetchPackageByVersionSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="fetchProtectedPackage">
+      <wsdl:input message="tns:fetchProtectedPackageSoapIn" />
+      <wsdl:output message="tns:fetchProtectedPackageSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="SubmitPackage">
+      <wsdl:input message="tns:SubmitPackageSoapIn" />
+      <wsdl:output message="tns:SubmitPackageSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="PackageByGuid">
+      <wsdl:input message="tns:PackageByGuidSoapIn" />
+      <wsdl:output message="tns:PackageByGuidSoapOut" />
+    </wsdl:operation>
+  </wsdl:portType>
+  <wsdl:portType name="RepositoryHttpGet">
+    <wsdl:operation name="Categories">
+      <wsdl:input message="tns:CategoriesHttpGetIn" />
+      <wsdl:output message="tns:CategoriesHttpGetOut" />
+    </wsdl:operation>
+    <wsdl:operation name="Modules">
+      <wsdl:input message="tns:ModulesHttpGetIn" />
+      <wsdl:output message="tns:ModulesHttpGetOut" />
+    </wsdl:operation>
+    <wsdl:operation name="ModulesCategorized">
+      <wsdl:input message="tns:ModulesCategorizedHttpGetIn" />
+      <wsdl:output message="tns:ModulesCategorizedHttpGetOut" />
+    </wsdl:operation>
+    <wsdl:operation name="Nitros">
+      <wsdl:input message="tns:NitrosHttpGetIn" />
+      <wsdl:output message="tns:NitrosHttpGetOut" />
+    </wsdl:operation>
+    <wsdl:operation name="NitrosCategorized">
+      <wsdl:input message="tns:NitrosCategorizedHttpGetIn" />
+      <wsdl:output message="tns:NitrosCategorizedHttpGetOut" />
+    </wsdl:operation>
+    <wsdl:operation name="authenticate">
+      <wsdl:input message="tns:authenticateHttpGetIn" />
+      <wsdl:output message="tns:authenticateHttpGetOut" />
+    </wsdl:operation>
+    <wsdl:operation name="fetchPackage">
+      <wsdl:input message="tns:fetchPackageHttpGetIn" />
+      <wsdl:output message="tns:fetchPackageHttpGetOut" />
+    </wsdl:operation>
+    <wsdl:operation name="fetchPackageByVersion">
+      <wsdl:input message="tns:fetchPackageByVersionHttpGetIn" />
+      <wsdl:output message="tns:fetchPackageByVersionHttpGetOut" />
+    </wsdl:operation>
+    <wsdl:operation name="fetchProtectedPackage">
+      <wsdl:input message="tns:fetchProtectedPackageHttpGetIn" />
+      <wsdl:output message="tns:fetchProtectedPackageHttpGetOut" />
+    </wsdl:operation>
+    <wsdl:operation name="SubmitPackage">
+      <wsdl:input message="tns:SubmitPackageHttpGetIn" />
+      <wsdl:output message="tns:SubmitPackageHttpGetOut" />
+    </wsdl:operation>
+    <wsdl:operation name="PackageByGuid">
+      <wsdl:input message="tns:PackageByGuidHttpGetIn" />
+      <wsdl:output message="tns:PackageByGuidHttpGetOut" />
+    </wsdl:operation>
+  </wsdl:portType>
+  <wsdl:portType name="RepositoryHttpPost">
+    <wsdl:operation name="Categories">
+      <wsdl:input message="tns:CategoriesHttpPostIn" />
+      <wsdl:output message="tns:CategoriesHttpPostOut" />
+    </wsdl:operation>
+    <wsdl:operation name="Modules">
+      <wsdl:input message="tns:ModulesHttpPostIn" />
+      <wsdl:output message="tns:ModulesHttpPostOut" />
+    </wsdl:operation>
+    <wsdl:operation name="ModulesCategorized">
+      <wsdl:input message="tns:ModulesCategorizedHttpPostIn" />
+      <wsdl:output message="tns:ModulesCategorizedHttpPostOut" />
+    </wsdl:operation>
+    <wsdl:operation name="Nitros">
+      <wsdl:input message="tns:NitrosHttpPostIn" />
+      <wsdl:output message="tns:NitrosHttpPostOut" />
+    </wsdl:operation>
+    <wsdl:operation name="NitrosCategorized">
+      <wsdl:input message="tns:NitrosCategorizedHttpPostIn" />
+      <wsdl:output message="tns:NitrosCategorizedHttpPostOut" />
+    </wsdl:operation>
+    <wsdl:operation name="authenticate">
+      <wsdl:input message="tns:authenticateHttpPostIn" />
+      <wsdl:output message="tns:authenticateHttpPostOut" />
+    </wsdl:operation>
+    <wsdl:operation name="fetchPackage">
+      <wsdl:input message="tns:fetchPackageHttpPostIn" />
+      <wsdl:output message="tns:fetchPackageHttpPostOut" />
+    </wsdl:operation>
+    <wsdl:operation name="fetchPackageByVersion">
+      <wsdl:input message="tns:fetchPackageByVersionHttpPostIn" />
+      <wsdl:output message="tns:fetchPackageByVersionHttpPostOut" />
+    </wsdl:operation>
+    <wsdl:operation name="fetchProtectedPackage">
+      <wsdl:input message="tns:fetchProtectedPackageHttpPostIn" />
+      <wsdl:output message="tns:fetchProtectedPackageHttpPostOut" />
+    </wsdl:operation>
+    <wsdl:operation name="SubmitPackage">
+      <wsdl:input message="tns:SubmitPackageHttpPostIn" />
+      <wsdl:output message="tns:SubmitPackageHttpPostOut" />
+    </wsdl:operation>
+    <wsdl:operation name="PackageByGuid">
+      <wsdl:input message="tns:PackageByGuidHttpPostIn" />
+      <wsdl:output message="tns:PackageByGuidHttpPostOut" />
+    </wsdl:operation>
+  </wsdl:portType>
+  <wsdl:binding name="RepositorySoap" type="tns:RepositorySoap">
+    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" />
+    <wsdl:operation name="Categories">
+      <soap:operation soapAction="http://packages.umbraco.org/webservices/Categories" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="Modules">
+      <soap:operation soapAction="http://packages.umbraco.org/webservices/Modules" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="ModulesCategorized">
+      <soap:operation soapAction="http://packages.umbraco.org/webservices/ModulesCategorized" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="Nitros">
+      <soap:operation soapAction="http://packages.umbraco.org/webservices/Nitros" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="NitrosCategorized">
+      <soap:operation soapAction="http://packages.umbraco.org/webservices/NitrosCategorized" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="authenticate">
+      <soap:operation soapAction="http://packages.umbraco.org/webservices/authenticate" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="fetchPackage">
+      <soap:operation soapAction="http://packages.umbraco.org/webservices/fetchPackage" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="fetchPackageByVersion">
+      <soap:operation soapAction="http://packages.umbraco.org/webservices/fetchPackageByVersion" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="fetchProtectedPackage">
+      <soap:operation soapAction="http://packages.umbraco.org/webservices/fetchProtectedPackage" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="SubmitPackage">
+      <soap:operation soapAction="http://packages.umbraco.org/webservices/SubmitPackage" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="PackageByGuid">
+      <soap:operation soapAction="http://packages.umbraco.org/webservices/PackageByGuid" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:binding name="RepositorySoap12" type="tns:RepositorySoap">
+    <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" />
+    <wsdl:operation name="Categories">
+      <soap12:operation soapAction="http://packages.umbraco.org/webservices/Categories" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="Modules">
+      <soap12:operation soapAction="http://packages.umbraco.org/webservices/Modules" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="ModulesCategorized">
+      <soap12:operation soapAction="http://packages.umbraco.org/webservices/ModulesCategorized" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="Nitros">
+      <soap12:operation soapAction="http://packages.umbraco.org/webservices/Nitros" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="NitrosCategorized">
+      <soap12:operation soapAction="http://packages.umbraco.org/webservices/NitrosCategorized" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="authenticate">
+      <soap12:operation soapAction="http://packages.umbraco.org/webservices/authenticate" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="fetchPackage">
+      <soap12:operation soapAction="http://packages.umbraco.org/webservices/fetchPackage" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="fetchPackageByVersion">
+      <soap12:operation soapAction="http://packages.umbraco.org/webservices/fetchPackageByVersion" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="fetchProtectedPackage">
+      <soap12:operation soapAction="http://packages.umbraco.org/webservices/fetchProtectedPackage" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="SubmitPackage">
+      <soap12:operation soapAction="http://packages.umbraco.org/webservices/SubmitPackage" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="PackageByGuid">
+      <soap12:operation soapAction="http://packages.umbraco.org/webservices/PackageByGuid" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:binding name="RepositoryHttpGet" type="tns:RepositoryHttpGet">
+    <http:binding verb="GET" />
+    <wsdl:operation name="Categories">
+      <http:operation location="/Categories" />
+      <wsdl:input>
+        <http:urlEncoded />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="Modules">
+      <http:operation location="/Modules" />
+      <wsdl:input>
+        <http:urlEncoded />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="ModulesCategorized">
+      <http:operation location="/ModulesCategorized" />
+      <wsdl:input>
+        <http:urlEncoded />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="Nitros">
+      <http:operation location="/Nitros" />
+      <wsdl:input>
+        <http:urlEncoded />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="NitrosCategorized">
+      <http:operation location="/NitrosCategorized" />
+      <wsdl:input>
+        <http:urlEncoded />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="authenticate">
+      <http:operation location="/authenticate" />
+      <wsdl:input>
+        <http:urlEncoded />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="fetchPackage">
+      <http:operation location="/fetchPackage" />
+      <wsdl:input>
+        <http:urlEncoded />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="fetchPackageByVersion">
+      <http:operation location="/fetchPackageByVersion" />
+      <wsdl:input>
+        <http:urlEncoded />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="fetchProtectedPackage">
+      <http:operation location="/fetchProtectedPackage" />
+      <wsdl:input>
+        <http:urlEncoded />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="SubmitPackage">
+      <http:operation location="/SubmitPackage" />
+      <wsdl:input>
+        <http:urlEncoded />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="PackageByGuid">
+      <http:operation location="/PackageByGuid" />
+      <wsdl:input>
+        <http:urlEncoded />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:binding name="RepositoryHttpPost" type="tns:RepositoryHttpPost">
+    <http:binding verb="POST" />
+    <wsdl:operation name="Categories">
+      <http:operation location="/Categories" />
+      <wsdl:input>
+        <mime:content type="application/x-www-form-urlencoded" />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="Modules">
+      <http:operation location="/Modules" />
+      <wsdl:input>
+        <mime:content type="application/x-www-form-urlencoded" />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="ModulesCategorized">
+      <http:operation location="/ModulesCategorized" />
+      <wsdl:input>
+        <mime:content type="application/x-www-form-urlencoded" />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="Nitros">
+      <http:operation location="/Nitros" />
+      <wsdl:input>
+        <mime:content type="application/x-www-form-urlencoded" />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="NitrosCategorized">
+      <http:operation location="/NitrosCategorized" />
+      <wsdl:input>
+        <mime:content type="application/x-www-form-urlencoded" />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="authenticate">
+      <http:operation location="/authenticate" />
+      <wsdl:input>
+        <mime:content type="application/x-www-form-urlencoded" />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="fetchPackage">
+      <http:operation location="/fetchPackage" />
+      <wsdl:input>
+        <mime:content type="application/x-www-form-urlencoded" />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="fetchPackageByVersion">
+      <http:operation location="/fetchPackageByVersion" />
+      <wsdl:input>
+        <mime:content type="application/x-www-form-urlencoded" />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="fetchProtectedPackage">
+      <http:operation location="/fetchProtectedPackage" />
+      <wsdl:input>
+        <mime:content type="application/x-www-form-urlencoded" />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="SubmitPackage">
+      <http:operation location="/SubmitPackage" />
+      <wsdl:input>
+        <mime:content type="application/x-www-form-urlencoded" />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="PackageByGuid">
+      <http:operation location="/PackageByGuid" />
+      <wsdl:input>
+        <mime:content type="application/x-www-form-urlencoded" />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:service name="Repository">
+    <wsdl:port name="RepositorySoap" binding="tns:RepositorySoap">
+      <soap:address location="https://our.umbraco.com/umbraco/webservices/api/repository.asmx" />
+    </wsdl:port>
+    <wsdl:port name="RepositorySoap12" binding="tns:RepositorySoap12">
+      <soap12:address location="https://our.umbraco.com/umbraco/webservices/api/repository.asmx" />
+    </wsdl:port>
+    <wsdl:port name="RepositoryHttpGet" binding="tns:RepositoryHttpGet">
+      <http:address location="https://our.umbraco.com/umbraco/webservices/api/repository.asmx" />
+    </wsdl:port>
+    <wsdl:port name="RepositoryHttpPost" binding="tns:RepositoryHttpPost">
+      <http:address location="https://our.umbraco.com/umbraco/webservices/api/repository.asmx" />
+    </wsdl:port>
+  </wsdl:service>
+</wsdl:definitions>
\ No newline at end of file

From 83ad1fd9109e6d104a166e4422ef1ac31bb85a66 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Tue, 10 Sep 2019 17:13:31 +0200
Subject: [PATCH 543/776] Apply only the wanted change from V7/bug/6283 save
 member resets password #6284

---
 .../src/views/member/member.edit.controller.js                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
index eb99e46a1f..8d54597791 100644
--- a/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
@@ -133,7 +133,7 @@ function MemberEditController($scope, $routeParams, $location, $q, $window, appS
 
             //anytime a user is changing a member's password without the oldPassword, we are in effect resetting it so we need to set that flag here
             var passwordProp = _.find(contentEditingHelper.getAllProps($scope.content), function (e) { return e.alias === '_umb_password' });
-            if (passwordProp && passwordProp.value && !passwordProp.value.reset) {
+            if (passwordProp && passwordProp.value && (typeof passwordProp.value.reset !== 'undefined') && !passwordProp.value.reset) {
                 //so if the admin is not explicitly resetting the password, flag it for resetting if a new password is being entered
                 passwordProp.value.reset = !passwordProp.value.oldPassword && passwordProp.config.allowManuallyChangingPassword;
             }

From 6de4bbbae66738ef9466137d7760f3420d27e203 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Wed, 11 Sep 2019 09:03:10 +0100
Subject: [PATCH 544/776] Adds new config option to RTE & Grid Property Editors
 - for now uses MediaPicker until we have a FolderPicker Angular PreValue
 view/editor

---
 src/Umbraco.Web/PropertyEditors/GridConfiguration.cs     | 5 +++++
 src/Umbraco.Web/PropertyEditors/RichTextConfiguration.cs | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/src/Umbraco.Web/PropertyEditors/GridConfiguration.cs b/src/Umbraco.Web/PropertyEditors/GridConfiguration.cs
index b7a76ac960..5de7f4d554 100644
--- a/src/Umbraco.Web/PropertyEditors/GridConfiguration.cs
+++ b/src/Umbraco.Web/PropertyEditors/GridConfiguration.cs
@@ -1,4 +1,5 @@
 using Newtonsoft.Json.Linq;
+using Umbraco.Core;
 using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.PropertyEditors
@@ -20,5 +21,9 @@ namespace Umbraco.Web.PropertyEditors
             "Ignore User Start Nodes", "boolean",
             Description = "Selecting this option allows a user to choose nodes that they normally don't have access to.")]
         public bool IgnoreUserStartNodes { get; set; }
+
+        [ConfigurationField("mediaParentId", "Store Pasted Images Folder", "MediaPicker",
+            Description = "Choose where images dragged or pasted into the editor get uploaded to")]
+        public GuidUdi MediaParentId { get; set; }
     }
 }
diff --git a/src/Umbraco.Web/PropertyEditors/RichTextConfiguration.cs b/src/Umbraco.Web/PropertyEditors/RichTextConfiguration.cs
index bd153c8e2f..b346e68be3 100644
--- a/src/Umbraco.Web/PropertyEditors/RichTextConfiguration.cs
+++ b/src/Umbraco.Web/PropertyEditors/RichTextConfiguration.cs
@@ -1,4 +1,5 @@
 using Newtonsoft.Json.Linq;
+using Umbraco.Core;
 using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.PropertyEditors
@@ -19,5 +20,9 @@ namespace Umbraco.Web.PropertyEditors
             "Ignore User Start Nodes", "boolean",
             Description = "Selecting this option allows a user to choose nodes that they normally don't have access to.")]
         public bool IgnoreUserStartNodes { get; set; }
+
+        [ConfigurationField("mediaParentId", "Store Pasted Images Folder", "MediaPicker",
+            Description = "Choose where images dragged or pasted into the editor get uploaded to")]
+        public GuidUdi MediaParentId { get; set; }
     }
 }

From fdeaaad738e61098ac910b47ed23bc5ea0e93c92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Wed, 11 Sep 2019 10:12:01 +0200
Subject: [PATCH 545/776] allow mediapicker to only pick folders

---
 .../components/umbmediagrid.directive.js      | 22 ++++++++++++++++++-
 .../src/less/components/umb-media-grid.less   | 20 +++++++++++++----
 .../mediapicker/mediapicker.controller.js     | 18 +++++++++------
 .../mediapicker/mediapicker.html              |  2 ++
 .../src/views/components/umb-media-grid.html  |  2 +-
 5 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js
index 6a11b07734..ec4469e56f 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js
@@ -118,7 +118,9 @@ Use this directive to generate a thumbnail grid of media items.
                     var item = scope.items[i];
                     setItemData(item);
                     setOriginalSize(item, itemMaxHeight);
-
+                    
+                    item.selectable = getSelectableState(item);
+                    
                     // remove non images when onlyImages is set to true
                     if(scope.onlyImages === "true" && !item.isFolder && !item.thumbnail){
                         scope.items.splice(i, 1);
@@ -188,6 +190,22 @@ Use this directive to generate a thumbnail grid of media items.
                     }
                 }
             }
+            
+            /**
+            * Returns wether a item should be selectable or not.
+            */
+            function getSelectableState(item) {
+
+                // check if item is a folder or image
+                if (item.isFolder) {
+                    return !scope.disableFolderSelect && !scope.onlyImages;
+                } else {
+                    return !scope.onlyFolders;
+                }
+                
+                return false;
+                
+            }
 
             function setOriginalSize(item, maxHeight) {
 
@@ -331,7 +349,9 @@ Use this directive to generate a thumbnail grid of media items.
                 itemMaxHeight: "@",
                 itemMinWidth: "@",
                 itemMinHeight: "@",
+                disableFolderSelect: "@",
                 onlyImages: "@",
+                onlyFolders: "@",
                 includeSubFolders: "@",
                 currentFolderId: "@"
             },
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
index 8c8e4b101c..840377647c 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
@@ -21,12 +21,19 @@
 
     margin: 10px;
     position: relative;
-    user-select: none; 
-    cursor: pointer;
+    user-select: none;
     box-shadow: 0 1px 1px 0 rgba(0,0,0,.2);
     transition: box-shadow 150ms ease-in-out;
 }
 
+.umb-media-grid__item.-unselectable {
+    
+}
+
+.umb-media-grid__item.-selectable {
+    cursor: pointer;
+}
+
 .umb-media-grid__item.-file {
     background-color: @white;
 }
@@ -37,7 +44,8 @@
         color: @ui-selected-type;
     }
 }
-.umb-media-grid__item.-selected, .umb-media-grid__item:hover {
+.umb-media-grid__item.-selected, 
+.umb-media-grid__item.-selectable:hover {
     &::before {
         content: "";
         position: absolute;
@@ -52,7 +60,7 @@
         pointer-events: none;
     }
 }
-.umb-media-grid__item:hover {
+.umb-media-grid__item.-selectable:hover {
     &::before {
         opacity: .33;
     }
@@ -159,6 +167,10 @@
    }
 }
 
+.umb-media-grid__item-name {
+   cursor: pointer;
+}
+
 .umb-media-grid__item-name {
    white-space: nowrap;
    overflow: hidden;
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
index 47182bfbee..faabb73708 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
@@ -2,7 +2,7 @@
 angular.module("umbraco")
     .controller("Umbraco.Editors.MediaPickerController",
         function ($scope, mediaResource, entityResource, userService, mediaHelper, mediaTypeHelper, eventsService, treeService, localStorageService, localizationService, editorService) {
-
+            
             if (!$scope.model.title) {
                 localizationService.localizeMany(["defaultdialogs_selectMedia", "general_includeFromsubFolders"])
                     .then(function (data) {
@@ -14,9 +14,10 @@ angular.module("umbraco")
             }
 
             var dialogOptions = $scope.model;
-
+            
             $scope.disableFolderSelect = dialogOptions.disableFolderSelect;
             $scope.onlyImages = dialogOptions.onlyImages;
+            $scope.onlyFolders = dialogOptions.onlyFolders;
             $scope.showDetails = dialogOptions.showDetails;
             $scope.multiPicker = (dialogOptions.multiPicker && dialogOptions.multiPicker !== "0") ? true : false;
             $scope.startNodeId = dialogOptions.startNodeId ? dialogOptions.startNodeId : -1;
@@ -188,26 +189,25 @@ angular.module("umbraco")
             };
 
             $scope.clickHandler = function (image, event, index) {
+                
                 if (image.isFolder) {
                     if ($scope.disableFolderSelect) {
                         $scope.gotoFolder(image);
                     } else {
-                        eventsService.emit("dialogs.mediaPicker.select", image);
                         selectImage(image);
                     }
                 } else {
-                    eventsService.emit("dialogs.mediaPicker.select", image);
                     if ($scope.showDetails) {
-
+                        
                         $scope.target = image;
-
+                        
                         // handle both entity and full media object
                         if (image.image) {
                             $scope.target.url = image.image;
                         } else {
                             $scope.target.url = mediaHelper.resolveFile(image);
                         }
-
+                        
                         $scope.openDetailsDialog();
                     } else {
                         selectImage(image);
@@ -222,6 +222,9 @@ angular.module("umbraco")
             };
 
             function selectImage(image) {
+                if(!image.selectable) {
+                    return;
+                }
                 if (image.selected) {
                     for (var i = 0; $scope.model.selection.length > i; i++) {
                         var imageInSelection = $scope.model.selection[i];
@@ -234,6 +237,7 @@ angular.module("umbraco")
                     if (!$scope.multiPicker) {
                         deselectAllImages($scope.model.selection);
                     }
+                    eventsService.emit("dialogs.mediaPicker.select", image);
                     image.selected = true;
                     $scope.model.selection.push(image);
                 }
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
index 6eee269cee..b57fa96d44 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
@@ -98,7 +98,9 @@
                         item-max-height="150"
                         item-min-width="100"
                         item-min-height="100"
+                        disable-folder-select={{disableFolderSelect}}
                         only-images={{onlyImages}}
+                        only-folder={{onlyFolders}}
                         include-sub-folders={{showChilds}}
                         current-Folder-id="{{currentFolder.id}}">
                 </umb-media-grid>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html
index 4cc4c105fc..60f407f06b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html
@@ -1,5 +1,5 @@
 <div data-element="media-grid" class="umb-media-grid">
-    <div data-element="media-grid-item-{{$index}}" class="umb-media-grid__item" title="{{item.name}}" ng-click="clickItem(item, $event, $index)" ng-repeat="item in items | filter:filterBy" ng-style="item.flexStyle" ng-class="{'-selected': item.selected, '-file': !item.thumbnail, '-svg': item.extension == 'svg'}">
+    <div data-element="media-grid-item-{{$index}}" class="umb-media-grid__item" title="{{item.name}}" ng-click="clickItem(item, $event, $index)" ng-repeat="item in items | filter:filterBy" ng-style="item.flexStyle" ng-class="{'-selected': item.selected, '-file': !item.thumbnail, '-svg': item.extension == 'svg', '-selectable': item.selectable, '-unselectable': !item.selectable}">
         <div>
             <!--<i ng-show="item.selected" class="icon-check umb-media-grid__checkmark"></i>-->
             <a ng-if="allowOnClickEdit === 'true'" ng-click="clickEdit(item, $event)" ng-href="" class="icon-edit umb-media-grid__edit"></a>

From 28a0e0aa6f2a334116e8b657c30e00c46d2a46a3 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Wed, 11 Sep 2019 10:02:59 +0100
Subject: [PATCH 546/776] Pass through a GUID that a media picker / new folder
 picker will use

---
 .../PropertyEditors/GridPropertyEditor.cs           | 13 +++++++++++--
 .../PropertyEditors/RichTextPropertyEditor.cs       | 12 ++++++++++--
 src/Umbraco.Web/Templates/TemplateUtilities.cs      |  2 +-
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
index 98c65175af..24ab2edbb3 100644
--- a/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
@@ -8,6 +8,7 @@ using Umbraco.Core.Models.Editors;
 using Umbraco.Web.Templates;
 using Umbraco.Web.Composing;
 using Umbraco.Core.Services;
+using System;
 
 namespace Umbraco.Web.PropertyEditors
 {
@@ -69,6 +70,15 @@ namespace Umbraco.Web.PropertyEditors
                 if (editorValue.Value == null)
                     return null;
 
+                var config = editorValue.DataTypeConfiguration as RichTextConfiguration;
+                var mediaParent = config?.MediaParentId;
+                Guid mediaParentId;
+
+                if (mediaParent == null)
+                    mediaParentId = Guid.Empty;
+                else
+                    mediaParentId = mediaParent.Guid;
+
                 // editorValue.Value is a JSON string of the grid
                 var rawJson = editorValue.Value.ToString();
                 var grid = JsonConvert.DeserializeObject<GridValue>(rawJson);
@@ -84,8 +94,7 @@ namespace Umbraco.Web.PropertyEditors
                     
                     var userId = Current.UmbracoContext.Security.CurrentUser.Id;
 
-                    // TODO: In future task(get the parent folder from this config) to save the media into
-                    var parsedHtml = TemplateUtilities.FindAndPersistPastedTempImages(html, -1, userId, _mediaService, _contentTypeBaseServiceProvider);
+                    var parsedHtml = TemplateUtilities.FindAndPersistPastedTempImages(html, mediaParentId, userId, _mediaService, _contentTypeBaseServiceProvider);
                     rte.Value = parsedHtml;
                 }
 
diff --git a/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
index f9267315e4..3acd4bd25e 100644
--- a/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
@@ -115,8 +115,16 @@ namespace Umbraco.Web.PropertyEditors
 
                 var userId = Current.UmbracoContext.Security.CurrentUser.Id;
 
-                // TODO: In future task(get the parent folder from this config) to save the media into
-                parsed = TemplateUtilities.FindAndPersistPastedTempImages(parsed, -1, userId, _mediaService, _contentTypeBaseServiceProvider);
+                var config = editorValue.DataTypeConfiguration as RichTextConfiguration;
+                var mediaParent = config?.MediaParentId;
+                Guid mediaParentId;
+
+                if (mediaParent == null)
+                    mediaParentId = Guid.Empty;
+                else
+                    mediaParentId = mediaParent.Guid;
+                
+                parsed = TemplateUtilities.FindAndPersistPastedTempImages(parsed, mediaParentId, userId, _mediaService, _contentTypeBaseServiceProvider);
                 return parsed;
             }
         }
diff --git a/src/Umbraco.Web/Templates/TemplateUtilities.cs b/src/Umbraco.Web/Templates/TemplateUtilities.cs
index 5969951072..24069bcc6f 100644
--- a/src/Umbraco.Web/Templates/TemplateUtilities.cs
+++ b/src/Umbraco.Web/Templates/TemplateUtilities.cs
@@ -187,7 +187,7 @@ namespace Umbraco.Web.Templates
             // see comment in ResolveMediaFromTextString for group reference
             => ResolveImgPattern.Replace(text, "$1$3$4$5");
 
-        internal static string FindAndPersistPastedTempImages(string html, int mediaParentFolder, int userId, IMediaService mediaService, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider)
+        internal static string FindAndPersistPastedTempImages(string html, Guid mediaParentFolder, int userId, IMediaService mediaService, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider)
         {
             // Find all img's that has data-tmpimg attribute
             // Use HTML Agility Pack - https://html-agility-pack.net

From f735c3eae37e833701752bbbc7352c83bd20ed19 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Wed, 11 Sep 2019 10:05:20 +0100
Subject: [PATCH 547/776] Updates view for Config to new PreValue editor that
 Niels L is working on

---
 src/Umbraco.Web/PropertyEditors/GridConfiguration.cs     | 2 +-
 src/Umbraco.Web/PropertyEditors/RichTextConfiguration.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/PropertyEditors/GridConfiguration.cs b/src/Umbraco.Web/PropertyEditors/GridConfiguration.cs
index 5de7f4d554..e3ab340238 100644
--- a/src/Umbraco.Web/PropertyEditors/GridConfiguration.cs
+++ b/src/Umbraco.Web/PropertyEditors/GridConfiguration.cs
@@ -22,7 +22,7 @@ namespace Umbraco.Web.PropertyEditors
             Description = "Selecting this option allows a user to choose nodes that they normally don't have access to.")]
         public bool IgnoreUserStartNodes { get; set; }
 
-        [ConfigurationField("mediaParentId", "Store Pasted Images Folder", "MediaPicker",
+        [ConfigurationField("mediaParentId", "Store Pasted Images Folder", "MediaFolderPicker",
             Description = "Choose where images dragged or pasted into the editor get uploaded to")]
         public GuidUdi MediaParentId { get; set; }
     }
diff --git a/src/Umbraco.Web/PropertyEditors/RichTextConfiguration.cs b/src/Umbraco.Web/PropertyEditors/RichTextConfiguration.cs
index b346e68be3..7139149739 100644
--- a/src/Umbraco.Web/PropertyEditors/RichTextConfiguration.cs
+++ b/src/Umbraco.Web/PropertyEditors/RichTextConfiguration.cs
@@ -21,7 +21,7 @@ namespace Umbraco.Web.PropertyEditors
             Description = "Selecting this option allows a user to choose nodes that they normally don't have access to.")]
         public bool IgnoreUserStartNodes { get; set; }
 
-        [ConfigurationField("mediaParentId", "Store Pasted Images Folder", "MediaPicker",
+        [ConfigurationField("mediaParentId", "Store Pasted Images Folder", "MediaFolderPicker",
             Description = "Choose where images dragged or pasted into the editor get uploaded to")]
         public GuidUdi MediaParentId { get; set; }
     }

From 313260a6ca625aca6cbd16a4af71db33c7b6e49c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Wed, 11 Sep 2019 11:07:15 +0200
Subject: [PATCH 548/776] remove double end tag

---
 .../src/views/propertyeditors/rte/rte.prevalues.html           | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html
index ade75a1cd6..5141f19d2f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html
@@ -6,7 +6,7 @@
                 <umb-checkbox model="cmd.selected"
                               on-change="selectCommand(cmd)"
                               class="mce-cmd" />
-                
+
                 <!--<img ng-src="{{cmd.icon}}" />-->
                 <i class="mce-ico" ng-class="(cmd.isCustom ? ' mce-i-custom ' : ' mce-i-') + cmd.fontIcon"></i>
 
@@ -24,7 +24,6 @@
                 text="{{css.name}}"/>
         </div>
     </umb-control-group>
-    </umb-control-group>
 
     <umb-control-group label="Dimensions" description="Set the editor dimensions">
         <div class="vertical-align-items">

From 9167cad9fc0b36bb2e52e01cfd5fc7d74f3adaa2 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Wed, 11 Sep 2019 10:36:30 +0100
Subject: [PATCH 549/776] Update copy

---
 src/Umbraco.Web/PropertyEditors/GridConfiguration.cs     | 4 ++--
 src/Umbraco.Web/PropertyEditors/RichTextConfiguration.cs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web/PropertyEditors/GridConfiguration.cs b/src/Umbraco.Web/PropertyEditors/GridConfiguration.cs
index e3ab340238..7c9a549aef 100644
--- a/src/Umbraco.Web/PropertyEditors/GridConfiguration.cs
+++ b/src/Umbraco.Web/PropertyEditors/GridConfiguration.cs
@@ -22,8 +22,8 @@ namespace Umbraco.Web.PropertyEditors
             Description = "Selecting this option allows a user to choose nodes that they normally don't have access to.")]
         public bool IgnoreUserStartNodes { get; set; }
 
-        [ConfigurationField("mediaParentId", "Store Pasted Images Folder", "MediaFolderPicker",
-            Description = "Choose where images dragged or pasted into the editor get uploaded to")]
+        [ConfigurationField("mediaParentId", "Image Upload Folder", "MediaFolderPicker",
+            Description = "Choose the upload location of pasted images")]
         public GuidUdi MediaParentId { get; set; }
     }
 }
diff --git a/src/Umbraco.Web/PropertyEditors/RichTextConfiguration.cs b/src/Umbraco.Web/PropertyEditors/RichTextConfiguration.cs
index 7139149739..c6d4e3ce70 100644
--- a/src/Umbraco.Web/PropertyEditors/RichTextConfiguration.cs
+++ b/src/Umbraco.Web/PropertyEditors/RichTextConfiguration.cs
@@ -21,8 +21,8 @@ namespace Umbraco.Web.PropertyEditors
             Description = "Selecting this option allows a user to choose nodes that they normally don't have access to.")]
         public bool IgnoreUserStartNodes { get; set; }
 
-        [ConfigurationField("mediaParentId", "Store Pasted Images Folder", "MediaFolderPicker",
-            Description = "Choose where images dragged or pasted into the editor get uploaded to")]
+        [ConfigurationField("mediaParentId", "Image Upload Folder", "MediaFolderPicker",
+            Description = "Choose the upload location of pasted images")]
         public GuidUdi MediaParentId { get; set; }
     }
 }

From 9f4697c5b3fe0131e7de3dae1d2f06b5c7311e13 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Wed, 11 Sep 2019 10:54:47 +0100
Subject: [PATCH 550/776] Update
 src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs

Co-Authored-By: Bjarke Berg <mail@bergmania.dk>
---
 src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
index f9267315e4..0e57b2bd35 100644
--- a/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
@@ -116,7 +116,7 @@ namespace Umbraco.Web.PropertyEditors
                 var userId = Current.UmbracoContext.Security.CurrentUser.Id;
 
                 // TODO: In future task(get the parent folder from this config) to save the media into
-                parsed = TemplateUtilities.FindAndPersistPastedTempImages(parsed, -1, userId, _mediaService, _contentTypeBaseServiceProvider);
+                parsed = TemplateUtilities.FindAndPersistPastedTempImages(parsed, Constants.System.Root, userId, _mediaService, _contentTypeBaseServiceProvider);
                 return parsed;
             }
         }

From a47811f210672c051a6060aca5ef3394a79325d5 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Wed, 11 Sep 2019 10:55:12 +0100
Subject: [PATCH 551/776] Update
 src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs

Co-Authored-By: Bjarke Berg <mail@bergmania.dk>
---
 src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
index 98c65175af..710c68eeb3 100644
--- a/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
@@ -85,7 +85,7 @@ namespace Umbraco.Web.PropertyEditors
                     var userId = Current.UmbracoContext.Security.CurrentUser.Id;
 
                     // TODO: In future task(get the parent folder from this config) to save the media into
-                    var parsedHtml = TemplateUtilities.FindAndPersistPastedTempImages(html, -1, userId, _mediaService, _contentTypeBaseServiceProvider);
+                    var parsedHtml = TemplateUtilities.FindAndPersistPastedTempImages(html, Constants.System.Root, userId, _mediaService, _contentTypeBaseServiceProvider);
                     rte.Value = parsedHtml;
                 }
 

From 104d414887001cc2537ad7102569ebaa67082f6c Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Wed, 11 Sep 2019 11:00:23 +0100
Subject: [PATCH 552/776] Fix some trailing typo stuff

---
 src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
index 0e57b2bd35..8cab94a4be 100644
--- a/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
@@ -85,9 +85,9 @@ namespace Umbraco.Web.PropertyEditors
             /// Format the data for the editor
             /// </summary>
             /// <param name="property"></param>
-            /// <param name="dataTypeService"></param>Rte
+            /// <param name="dataTypeService"></param>
             /// <param name="culture"></param>
-            /// <param name="segment"></param>te
+            /// <param name="segment"></param>
             public override object ToEditor(Property property, IDataTypeService dataTypeService, string culture = null, string segment = null)
             {
                 var val = property.GetValue(culture, segment);

From 9bbc66d10d8d3384bae032f0d85c1b389cb4e301 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Wed, 11 Sep 2019 11:06:38 +0100
Subject: [PATCH 553/776] Some rename of variables for readability

---
 .../Templates/TemplateUtilities.cs            | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/Umbraco.Web/Templates/TemplateUtilities.cs b/src/Umbraco.Web/Templates/TemplateUtilities.cs
index 5969951072..58aa76bc02 100644
--- a/src/Umbraco.Web/Templates/TemplateUtilities.cs
+++ b/src/Umbraco.Web/Templates/TemplateUtilities.cs
@@ -206,29 +206,29 @@ namespace Umbraco.Web.Templates
                 if (string.IsNullOrEmpty(tmpImgPath))
                     continue;
 
-                var absTmpImgPath = IOHelper.MapPath(tmpImgPath);
-                var fileName = Path.GetFileName(absTmpImgPath);
+                var absoluteTempImagePath = IOHelper.MapPath(tmpImgPath);
+                var fileName = Path.GetFileName(absoluteTempImagePath);
                 var safeFileName = fileName.ToSafeFileName();
 
                 var mediaItemName = safeFileName.ToFriendlyName();
-                var f = mediaService.CreateMedia(mediaItemName, mediaParentFolder, Constants.Conventions.MediaTypes.Image, userId);
-                var fileInfo = new FileInfo(absTmpImgPath);
+                var mediaFile = mediaService.CreateMedia(mediaItemName, mediaParentFolder, Constants.Conventions.MediaTypes.Image, userId);
+                var fileInfo = new FileInfo(absoluteTempImagePath);
 
-                var fs = fileInfo.OpenReadWithRetry();
-                if (fs == null) throw new InvalidOperationException("Could not acquire file stream");
-                using (fs)
+                var fileStream = fileInfo.OpenReadWithRetry();
+                if (fileStream == null) throw new InvalidOperationException("Could not acquire file stream");
+                using (fileStream)
                 {
-                    f.SetValue(contentTypeBaseServiceProvider, Constants.Conventions.Media.File, safeFileName, fs);
+                    mediaFile.SetValue(contentTypeBaseServiceProvider, Constants.Conventions.Media.File, safeFileName, fileStream);
                 }
 
-                mediaService.Save(f, userId);
+                mediaService.Save(mediaFile, userId);
 
                 // Add the UDI to the img element as new data attribute
-                var udi = f.GetUdi();
+                var udi = mediaFile.GetUdi();
                 img.SetAttributeValue("data-udi", udi.ToString());
 
                 //Get the new persisted image url
-                var mediaTyped = Current.UmbracoHelper.Media(f.Id);
+                var mediaTyped = Current.UmbracoHelper.Media(mediaFile.Id);
                 var location = mediaTyped.Url;
                 img.SetAttributeValue("src", location);
 

From f07be7df1cb399dcd2a39b8238b4fd207999970c Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Wed, 11 Sep 2019 11:13:46 +0100
Subject: [PATCH 554/776] Usa a CONST for the data attribute

---
 src/Umbraco.Web/Templates/TemplateUtilities.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web/Templates/TemplateUtilities.cs b/src/Umbraco.Web/Templates/TemplateUtilities.cs
index 58aa76bc02..96ea2659b1 100644
--- a/src/Umbraco.Web/Templates/TemplateUtilities.cs
+++ b/src/Umbraco.Web/Templates/TemplateUtilities.cs
@@ -20,6 +20,8 @@ namespace Umbraco.Web.Templates
     /// </summary>
     public static class TemplateUtilities
     {
+        const string TemporaryImageDataAttribute = "data-tmpimg";
+
         internal static string ParseInternalLinks(string text, bool preview, UmbracoContext umbracoContext)
         {
             using (umbracoContext.ForcedPreview(preview)) // force for url provider
@@ -194,14 +196,14 @@ namespace Umbraco.Web.Templates
             var htmlDoc = new HtmlDocument();
             htmlDoc.LoadHtml(html);
 
-            var tmpImages = htmlDoc.DocumentNode.SelectNodes("//img[@data-tmpimg]");
+            var tmpImages = htmlDoc.DocumentNode.SelectNodes($"//img[@{TemporaryImageDataAttribute}]");
             if (tmpImages == null || tmpImages.Count == 0)
                 return html;
             
             foreach (var img in tmpImages)
             {
                 // The data attribute contains the path to the tmp img to persist as a media item
-                var tmpImgPath = img.GetAttributeValue("data-tmpimg", string.Empty);
+                var tmpImgPath = img.GetAttributeValue(TemporaryImageDataAttribute, string.Empty);
 
                 if (string.IsNullOrEmpty(tmpImgPath))
                     continue;
@@ -233,7 +235,7 @@ namespace Umbraco.Web.Templates
                 img.SetAttributeValue("src", location);
 
                 // Remove the data attribute (so we do not re-process this)
-                img.Attributes.Remove("data-tmpimg");
+                img.Attributes.Remove(TemporaryImageDataAttribute);
             }
 
             return htmlDoc.DocumentNode.OuterHtml;

From 39050d06f94adc79e3f4c1734561e55f5fa5557f Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Wed, 11 Sep 2019 11:16:47 +0100
Subject: [PATCH 555/776] Use a guid instead of user id & unix time offset for
 unique folder path

---
 src/Umbraco.Web/Editors/TinyMceController.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web/Editors/TinyMceController.cs b/src/Umbraco.Web/Editors/TinyMceController.cs
index f3e97d9f9f..7ed71f0268 100644
--- a/src/Umbraco.Web/Editors/TinyMceController.cs
+++ b/src/Umbraco.Web/Editors/TinyMceController.cs
@@ -36,10 +36,8 @@ namespace Umbraco.Web.Editors
                 throw new HttpResponseException(HttpStatusCode.UnsupportedMediaType);
             }
 
-            // Backoffice user ID (needed for unique folder path) to help with concurrent users
-            // to avoid filename clash along with UTC current time
-            var userId = Security.CurrentUser.Id;
-            var imageTempPath = IOHelper.MapPath(SystemDirectories.TempImageUploads + "/" + userId + "_" + DateTimeOffset.UtcNow.ToUnixTimeSeconds());
+            // Create an unique folder path to help with concurrent users to avoid filename clash
+            var imageTempPath = IOHelper.MapPath(SystemDirectories.TempImageUploads + "/" + Guid.NewGuid().ToString());
 
             // Temp folderpath (Files come in as bodypart & will need to move/saved into imgTempPath
             var folderPath = IOHelper.MapPath(SystemDirectories.TempFileUploads);

From 0b55468e5c69c45a534c6b96f33f580ea48e2259 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Wed, 11 Sep 2019 13:17:26 +0200
Subject: [PATCH 556/776] make sure to check string boolean, since it arrives
 as string because of AngularJS

---
 .../directives/components/umbmediagrid.directive.js       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js
index ec4469e56f..4fe823cae5 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js
@@ -122,7 +122,7 @@ Use this directive to generate a thumbnail grid of media items.
                     item.selectable = getSelectableState(item);
                     
                     // remove non images when onlyImages is set to true
-                    if(scope.onlyImages === "true" && !item.isFolder && !item.thumbnail){
+                    if( scope.onlyImages === "true" && !item.isFolder && !item.thumbnail){
                         scope.items.splice(i, 1);
                         i--;
                     }
@@ -197,10 +197,10 @@ Use this directive to generate a thumbnail grid of media items.
             function getSelectableState(item) {
 
                 // check if item is a folder or image
-                if (item.isFolder) {
-                    return !scope.disableFolderSelect && !scope.onlyImages;
+                if (item.isFolder === true) {
+                    return scope.disableFolderSelect !== "true" && scope.onlyImages !== "true";
                 } else {
-                    return !scope.onlyFolders;
+                    return scope.onlyFolders !== "true";
                 }
                 
                 return false;

From fd3fb4c937ae271e44d0a37d79d93d2dfe280c53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Wed, 11 Sep 2019 13:17:40 +0200
Subject: [PATCH 557/776] grey out not selectable media items in media grid.

---
 .../src/less/components/umb-media-grid.less          | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
index 840377647c..d023a00138 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
@@ -27,7 +27,17 @@
 }
 
 .umb-media-grid__item.-unselectable {
-    
+    &::before {
+        content: "";
+        position: absolute;
+        z-index: 1;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        background-color: rgba(230, 230, 230, .5);
+        pointer-events: none;
+    }
 }
 
 .umb-media-grid__item.-selectable {

From bb6c4ace9024566de55255300285cf409bb383df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Wed, 11 Sep 2019 13:18:04 +0200
Subject: [PATCH 558/776] ensure that we handle string values

---
 .../mediapicker/mediapicker.controller.js                | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
index faabb73708..b4aa5cef58 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
@@ -3,6 +3,7 @@ angular.module("umbraco")
     .controller("Umbraco.Editors.MediaPickerController",
         function ($scope, mediaResource, entityResource, userService, mediaHelper, mediaTypeHelper, eventsService, treeService, localStorageService, localizationService, editorService) {
             
+            
             if (!$scope.model.title) {
                 localizationService.localizeMany(["defaultdialogs_selectMedia", "general_includeFromsubFolders"])
                     .then(function (data) {
@@ -15,10 +16,10 @@ angular.module("umbraco")
 
             var dialogOptions = $scope.model;
             
-            $scope.disableFolderSelect = dialogOptions.disableFolderSelect;
-            $scope.onlyImages = dialogOptions.onlyImages;
-            $scope.onlyFolders = dialogOptions.onlyFolders;
-            $scope.showDetails = dialogOptions.showDetails;
+            $scope.disableFolderSelect = (dialogOptions.disableFolderSelect && dialogOptions.disableFolderSelect !== "0") ? true : false;
+            $scope.onlyImages = (dialogOptions.onlyImages && dialogOptions.onlyImages !== "0") ? true : false;
+            $scope.onlyFolders = (dialogOptions.onlyFolders && dialogOptions.onlyFolders !== "0") ? true : false;
+            $scope.showDetails = (dialogOptions.showDetails && dialogOptions.showDetails !== "0") ? true : false;
             $scope.multiPicker = (dialogOptions.multiPicker && dialogOptions.multiPicker !== "0") ? true : false;
             $scope.startNodeId = dialogOptions.startNodeId ? dialogOptions.startNodeId : -1;
             $scope.cropSize = dialogOptions.cropSize;

From 9b4ccc78d4ebfef8af453d77d23f7043eb2d31eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Wed, 11 Sep 2019 13:18:14 +0200
Subject: [PATCH 559/776] corrected misspelling

---
 .../views/common/infiniteeditors/mediapicker/mediapicker.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
index b57fa96d44..f8cba9fd04 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
@@ -100,7 +100,7 @@
                         item-min-height="100"
                         disable-folder-select={{disableFolderSelect}}
                         only-images={{onlyImages}}
-                        only-folder={{onlyFolders}}
+                        only-folders={{onlyFolders}}
                         include-sub-folders={{showChilds}}
                         current-Folder-id="{{currentFolder.id}}">
                 </umb-media-grid>

From 3c137668e084e03dbb0d4054815df6f12446c67e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Wed, 11 Sep 2019 13:18:40 +0200
Subject: [PATCH 560/776] created prevalueeditor mediafolderpicker

---
 .../mediafolderpicker.controller.js           | 56 +++++++++++++++++++
 .../prevalueeditors/mediafolderpicker.html    | 37 ++++++++++++
 2 files changed, 93 insertions(+)
 create mode 100644 src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediafolderpicker.controller.js
 create mode 100644 src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediafolderpicker.html

diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediafolderpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediafolderpicker.controller.js
new file mode 100644
index 0000000000..ddfca295d4
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediafolderpicker.controller.js
@@ -0,0 +1,56 @@
+function mediaFolderPickerController($scope, editorService, entityResource) {
+    
+    
+    $scope.folderName = "";
+    
+    
+    function retriveFolderData() {
+        
+        var id = $scope.model.value;
+        
+        if (id == null) {
+            $scope.folderName = "";
+            return;
+        }
+        
+        entityResource.getById(id, "Media").then(
+            function (media) {
+                $scope.media = media;
+            }
+        );
+    }
+    
+    
+    retriveFolderData();
+    
+    
+    $scope.add = function() {
+        var mediaPickerOptions = {
+            view: "mediapicker",
+            multiPicker: true,
+            disableFolderSelect: false,
+            onlyImages: false,
+            onlyFolders: true,
+            submit: function (model) {
+                
+                $scope.model.value = model.selection[0].udi;
+                
+                retriveFolderData();
+                
+                editorService.close();
+            },
+            close: function () {
+                editorService.close();
+            } 
+        };
+        editorService.mediaPicker(mediaPickerOptions);
+    };
+
+    $scope.remove = function () {
+        $scope.model.value = null;
+        retriveFolderData();
+    };
+
+}
+
+angular.module('umbraco').controller("Umbraco.PrevalueEditors.MediaFolderPickerController", mediaFolderPickerController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediafolderpicker.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediafolderpicker.html
new file mode 100644
index 0000000000..52a190aeea
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediafolderpicker.html
@@ -0,0 +1,37 @@
+<div ng-controller="Umbraco.PrevalueEditors.MediaFolderPickerController" class="umb-property-editor umb-mediapicker umb-mediapicker-single">
+
+    <div class="flex flex-wrap error">
+        <ul class="umb-sortable-thumbnails">
+            <li ng-if="model.value" class="umb-sortable-thumbnails__wrapper">
+
+                <p class="label label__trashed" ng-if="media.trashed">
+                    <localize key="mediaPicker_trashed"></localize>
+                    <i class="icon-trash" aria-hidden="true"></i>
+                </p>
+
+                <!-- FILE -->
+                <div ng-class="{'trashed': media.trashed}" class="umb-icon-holder" ng-hide="media.thumbnail">
+                    <span class="file-icon">
+                        <i class="icon {{media.icon}}"></i>
+                        <span ng-if="media.extension">.{{media.extension}}</span>
+                    </span>
+                    <small>{{media.name}}</small>
+                </div>
+
+                <div class="umb-sortable-thumbnails__actions" data-element="sortable-thumbnail-actions">
+
+                    <a class="umb-sortable-thumbnails__action -red" data-element="action-remove" href="" ng-click="remove()">
+                        <i class="icon icon-delete"></i>
+                    </a>
+                </div>
+            </li>
+
+            <li style="border: none;" class="add-wrapper unsortable" ng-hide="model.value">
+                <a data-element="sortable-thumbnails-add" href="#" class="add-link add-link-square" ng-click="add()" prevent-default>
+                    <i class="icon icon-add large"></i>
+                </a>
+            </li>
+        </ul>
+    </div>
+
+</div>

From 19716e3c96297d7a3db440b6c2c9ed26c95f62cd Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 11 Sep 2019 21:47:43 +1000
Subject: [PATCH 561/776] fixing tests

---
 src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs b/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
index 146cb23c1f..7ee75b1d9c 100644
--- a/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
@@ -31,6 +31,7 @@ using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Tests.LegacyXmlPublishedCache;
 using Umbraco.Tests.Testing.Objects.Accessors;
+using Umbraco.Web.Cache;
 
 namespace Umbraco.Tests.TestHelpers
 {
@@ -90,6 +91,8 @@ namespace Umbraco.Tests.TestHelpers
                 factory.ResetForTests();
                 return factory;
             });
+
+            Composition.RegisterUnique<BackgroundPublishedSnapshotNotifier>();
         }
 
         [OneTimeTearDown]

From 1c651b4e59485df9528ad78b79e8af3bb1b2a1a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Wed, 11 Sep 2019 14:31:03 +0200
Subject: [PATCH 562/776] store img size as html attributes

---
 .../src/common/services/tinymce.service.js                | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 5578c7a609..e479a0d348 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -442,10 +442,10 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
 
                     if (editor.settings.maxImageSize && editor.settings.maxImageSize !== 0) {
                         var newSize = imageHelper.scaleToMaxSize(editor.settings.maxImageSize, size.w, size.h);
-
-                        var s = "width: " + newSize.width + "px; height:" + newSize.height + "px;";
-                        editor.dom.setAttrib(imgElm, 'style', s);
-
+                        
+                        editor.dom.setAttrib(imgElm, 'width', newSize.width);
+                        editor.dom.setAttrib(imgElm, 'height', newSize.height);
+                        
                         if (img.url) {
                             var src = img.url + "?width=" + newSize.width + "&height=" + newSize.height;
                             editor.dom.setAttrib(imgElm, 'data-mce-src', src);

From 942c6c75c5bb000030739669422d039882c1276d Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 11 Sep 2019 23:01:11 +1000
Subject: [PATCH 563/776] fixes tests

---
 .../Configuration/GlobalSettingsExtensions.cs       | 13 ++++++++++---
 .../Configurations/GlobalSettingsTests.cs           |  8 +++++---
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Core/Configuration/GlobalSettingsExtensions.cs b/src/Umbraco.Core/Configuration/GlobalSettingsExtensions.cs
index fd4b57bf1a..bc76caacee 100644
--- a/src/Umbraco.Core/Configuration/GlobalSettingsExtensions.cs
+++ b/src/Umbraco.Core/Configuration/GlobalSettingsExtensions.cs
@@ -12,7 +12,7 @@ namespace Umbraco.Core.Configuration
     public static class GlobalSettingsExtensions
     {
         private static string _mvcArea;
-        
+
 
         /// <summary>
         /// This returns the string of the MVC Area route.
@@ -29,6 +29,13 @@ namespace Umbraco.Core.Configuration
         {
             if (_mvcArea != null) return _mvcArea;
 
+            _mvcArea = GetUmbracoMvcAreaNoCache(globalSettings);
+
+            return _mvcArea;
+        }
+
+        internal static string GetUmbracoMvcAreaNoCache(this IGlobalSettings globalSettings)
+        {
             if (globalSettings.Path.IsNullOrWhiteSpace())
             {
                 throw new InvalidOperationException("Cannot create an MVC Area path without the umbracoPath specified");
@@ -37,8 +44,8 @@ namespace Umbraco.Core.Configuration
             var path = globalSettings.Path;
             if (path.StartsWith(SystemDirectories.Root)) // beware of TrimStart, see U4-2518
                 path = path.Substring(SystemDirectories.Root.Length);
-            _mvcArea = path.TrimStart('~').TrimStart('/').Replace('/', '-').Trim().ToLower();
-            return _mvcArea;
+            return path.TrimStart('~').TrimStart('/').Replace('/', '-').Trim().ToLower();
         }
+
     }
 }
diff --git a/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs b/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs
index a9dc94d239..50ead4b702 100644
--- a/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs
+++ b/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs
@@ -46,11 +46,13 @@ namespace Umbraco.Tests.Configurations
         [TestCase("~/some-wacky/nestedPath", "/MyVirtualDir/NestedVDir/", "some-wacky-nestedpath")]
         public void Umbraco_Mvc_Area(string path, string rootPath, string outcome)
         {
-            var globalSettingsMock = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
-            globalSettingsMock.Setup(x => x.Path).Returns(IOHelper.ResolveUrl(path));
+            var globalSettings = SettingsForTests.GenerateMockGlobalSettings();
+
+            var globalSettingsMock = Mock.Get(globalSettings);
+            globalSettingsMock.Setup(x => x.Path).Returns(() => IOHelper.ResolveUrl(path));
 
             SystemDirectories.Root = rootPath;
-            Assert.AreEqual(outcome, Current.Configs.Global().GetUmbracoMvcArea());
+            Assert.AreEqual(outcome, globalSettings.GetUmbracoMvcAreaNoCache());
         }
 
         

From 401e362298ea97665c7ede2ed469a719f99bb88b Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 11 Sep 2019 15:20:19 +0200
Subject: [PATCH 564/776] Remove the image from tinyMce cache, otherwise we
 can't handle if we upload the exactly same image twice

---
 .../src/common/services/tinymce.service.js                    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 3bbcdbf73e..92a2389054 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -223,6 +223,10 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                         // When its being persisted in RTE property editor
                         // To create a media item & delete this tmp one etc
                         tinymce.activeEditor.$(img).attr({ "data-tmpimg": tmpLocation });
+
+                        // We need to remove the image from the cache, otherwise we can't handle if we upload the exactly 
+                        // same image twice
+                        tinymce.activeEditor.editorUpload.blobCache.removeByUri(imgSrc);
                     });
                 });
             }

From 54a3bd07d717a64bacf97cc719036b21acdc1b55 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Wed, 11 Sep 2019 14:24:52 +0100
Subject: [PATCH 565/776] Logic to use -1 Media root folder if no media folder
 is picked on the configuration of the RTE or the Grid

---
 src/Umbraco.Web/Templates/TemplateUtilities.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Templates/TemplateUtilities.cs b/src/Umbraco.Web/Templates/TemplateUtilities.cs
index 32c778b559..0fd3b93fef 100644
--- a/src/Umbraco.Web/Templates/TemplateUtilities.cs
+++ b/src/Umbraco.Web/Templates/TemplateUtilities.cs
@@ -5,6 +5,7 @@ using System.Text.RegularExpressions;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
+using Umbraco.Core.Models;
 using Umbraco.Core.Services;
 using Umbraco.Web.Composing;
 using Umbraco.Web.PublishedCache;
@@ -213,7 +214,13 @@ namespace Umbraco.Web.Templates
                 var safeFileName = fileName.ToSafeFileName();
 
                 var mediaItemName = safeFileName.ToFriendlyName();
-                var mediaFile = mediaService.CreateMedia(mediaItemName, mediaParentFolder, Constants.Conventions.MediaTypes.Image, userId);
+                IMedia mediaFile;
+
+                if(mediaParentFolder == Guid.Empty)
+                    mediaFile = mediaService.CreateMedia(mediaItemName, Constants.System.Root, Constants.Conventions.MediaTypes.Image, userId);
+                else
+                    mediaFile = mediaService.CreateMedia(mediaItemName, mediaParentFolder, Constants.Conventions.MediaTypes.Image, userId);
+                               
                 var fileInfo = new FileInfo(absoluteTempImagePath);
 
                 var fileStream = fileInfo.OpenReadWithRetry();

From 81b277314cacbbcf43e1c0f98695bc050d3caca9 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 12 Sep 2019 16:21:17 +1000
Subject: [PATCH 566/776] better logging

---
 src/Umbraco.Web/UmbracoInjectedModule.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/UmbracoInjectedModule.cs b/src/Umbraco.Web/UmbracoInjectedModule.cs
index f2e9e43a50..e306628654 100644
--- a/src/Umbraco.Web/UmbracoInjectedModule.cs
+++ b/src/Umbraco.Web/UmbracoInjectedModule.cs
@@ -113,7 +113,7 @@ namespace Umbraco.Web
 
                 if (sender.IsDocumentRequest(_routableDocumentLookup) && _backgroundNotifier.Wait())
                 {
-                    _logger.Debug<UmbracoModule>("Request was suspended while waiting for background cache notifications to complete");
+                    _logger.Debug<UmbracoModule>("Request was suspended while waiting for background cache notifications to complete {RequestUrl}", umbracoContext.CleanedUmbracoUrl);
                 }
             };
         }

From b0deb4ceabd0cd58deacb964417343846b4b7440 Mon Sep 17 00:00:00 2001
From: Steve Megson <steve@megson.org>
Date: Sun, 21 Jul 2019 16:57:07 +0100
Subject: [PATCH 567/776] AddTypedLabels - find standard label properties based
 on alias rather than ID

---
 .../Upgrade/V_8_0_0/AddTypedLabels.cs          | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/AddTypedLabels.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/AddTypedLabels.cs
index 2f20f01728..309f8acbc3 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/AddTypedLabels.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/AddTypedLabels.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Globalization;
+using System.Linq;
 using NPoco;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Dtos;
@@ -71,10 +72,21 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
 
             // flip known property types
 
-            var intPropertyTypes = new[] { 7, 8, 29 };
-            var bigintPropertyTypes = new[] { 9, 26 };
-            var dtPropertyTypes = new[] { 32, 33, 34 };
+            var labelPropertyTypes = Database.Fetch<PropertyTypeDto>(Sql()
+                .Select<PropertyTypeDto>(x => x.Id, x => x.Alias)
+                .From<PropertyTypeDto>()
+                .Where<PropertyTypeDto>(x => x.DataTypeId == Constants.DataTypes.LabelString)
+                );
 
+            var intPropertyAliases = new[] { Constants.Conventions.Media.Width, Constants.Conventions.Media.Height, Constants.Conventions.Member.FailedPasswordAttempts };
+            var bigintPropertyAliases = new[] { Constants.Conventions.Media.Bytes };
+            var dtPropertyAliases = new[] { Constants.Conventions.Member.LastLockoutDate, Constants.Conventions.Member.LastLoginDate, Constants.Conventions.Member.LastPasswordChangeDate };
+
+            var intPropertyTypes = labelPropertyTypes.Where(pt => intPropertyAliases.Contains(pt.Alias)).Select(pt => pt.Id).ToArray();
+            var bigintPropertyTypes = labelPropertyTypes.Where(pt => bigintPropertyAliases.Contains(pt.Alias)).Select(pt => pt.Id).ToArray();
+            var dtPropertyTypes = labelPropertyTypes.Where(pt => dtPropertyAliases.Contains(pt.Alias)).Select(pt => pt.Id).ToArray();
+
+            Database.Execute(Sql().Update<PropertyTypeDto>(u => u.Set(x => x.DataTypeId, Constants.DataTypes.LabelInt)).WhereIn<PropertyTypeDto>(x => x.Id, intPropertyTypes));
             Database.Execute(Sql().Update<PropertyTypeDto>(u => u.Set(x => x.DataTypeId, Constants.DataTypes.LabelInt)).WhereIn<PropertyTypeDto>(x => x.Id, intPropertyTypes));
             Database.Execute(Sql().Update<PropertyTypeDto>(u => u.Set(x => x.DataTypeId, Constants.DataTypes.LabelBigint)).WhereIn<PropertyTypeDto>(x => x.Id, bigintPropertyTypes));
             Database.Execute(Sql().Update<PropertyTypeDto>(u => u.Set(x => x.DataTypeId, Constants.DataTypes.LabelDateTime)).WhereIn<PropertyTypeDto>(x => x.Id, dtPropertyTypes));

From 4ccebbc20902fe482a15ecf0d8b23ba6037f1d1c Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Thu, 12 Sep 2019 08:49:40 +0100
Subject: [PATCH 568/776] Reopen branch/PR for fixes * Reorder usings * Add an
 error response & log the reason if we can't move a file about * Add
 UmbracoApplicationAuthorize attribute for security so not any user can upload
 images

---
 src/Umbraco.Web/Editors/TinyMceController.cs | 38 ++++++++++++--------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/Umbraco.Web/Editors/TinyMceController.cs b/src/Umbraco.Web/Editors/TinyMceController.cs
index 7ed71f0268..0951b88443 100644
--- a/src/Umbraco.Web/Editors/TinyMceController.cs
+++ b/src/Umbraco.Web/Editors/TinyMceController.cs
@@ -1,32 +1,41 @@
-using System.Net;
-using System.Net.Http;
-using System.Web.Http;
-using Umbraco.Core.Services;
-using Umbraco.Web.WebApi;
-using Umbraco.Core;
-using Umbraco.Web.Mvc;
-using Umbraco.Core.IO;
+using System;
 using System.IO;
-using System.Threading.Tasks;
-using Umbraco.Web.Composing;
-using Umbraco.Core.Configuration.UmbracoSettings;
 using System.Linq;
-using System;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using System.Web.Http;
+using Umbraco.Core;
+using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Services;
+using Umbraco.Web.Composing;
+using Umbraco.Web.Mvc;
+using Umbraco.Web.WebApi;
+using Umbraco.Web.WebApi.Filters;
+using Constants = Umbraco.Core.Constants;
 
 namespace Umbraco.Web.Editors
 {
     [PluginController("UmbracoApi")]
+    [UmbracoApplicationAuthorize(
+        Constants.Applications.Content,
+        Constants.Applications.Media,
+        Constants.Applications.Members)]
     public class TinyMceController : UmbracoAuthorizedApiController
     {
         private IMediaService _mediaService;
         private IContentTypeBaseServiceProvider _contentTypeBaseServiceProvider;
 
+
         public TinyMceController(IMediaService mediaService, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider)
         {
             _mediaService = mediaService;
             _contentTypeBaseServiceProvider = contentTypeBaseServiceProvider;
         }
 
+        [UmbracoApplicationAuthorize(Constants.Applications.Content)]
         [HttpPost]
         public async Task<HttpResponseMessage> UploadImage()
         {
@@ -91,8 +100,9 @@ namespace Umbraco.Web.Editors
             }
             catch (Exception ex)
             {
-                // Could be a file permission ex
-                throw;
+                // IOException, PathTooLong, DirectoryNotFound, UnathorizedAccess
+                Logger.Error<TinyMceController>(ex, "Error when trying to move {CurrentFilePath} to {NewFilePath}", currentFile, newFilePath);
+                return Request.CreateErrorResponse(HttpStatusCode.InternalServerError, $"Error when trying to move {currentFile} to {newFilePath}", ex);
             }            
 
             return Request.CreateResponse(HttpStatusCode.OK, new { tmpLocation = relativeNewFilePath });

From ffcc84b1fb059836af9860336b40ffc458dbd61f Mon Sep 17 00:00:00 2001
From: Steve Megson <steve@megson.org>
Date: Thu, 25 Jul 2019 18:41:41 +0100
Subject: [PATCH 569/776] Data type configuration serialization

---
 src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs b/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs
index ace740a831..bc21da15a7 100644
--- a/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs
+++ b/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs
@@ -172,7 +172,7 @@ namespace Umbraco.Core.Services.Implement
             xml.Add(new XAttribute("Id", dataType.EditorAlias));
             xml.Add(new XAttribute("Definition", dataType.Key));
             xml.Add(new XAttribute("DatabaseType", dataType.DatabaseType.ToString()));
-            xml.Add(new XAttribute("Configuration", JsonConvert.SerializeObject(dataType.Configuration)));
+            xml.Add(new XAttribute("Configuration", JsonConvert.SerializeObject(dataType.Configuration, PropertyEditors.ConfigurationEditor.ConfigurationJsonSettings)));
 
             var folderNames = string.Empty;
             if (dataType.Level != 1)

From 632808acdbdc87c6a27abd4f54fa248db33d7ea7 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Thu, 12 Sep 2019 09:04:23 +0100
Subject: [PATCH 570/776] * Inbject UmbracoContextAccessor & null check it for
 the user id * Remove unused & sort usings

---
 .../PropertyEditors/GridPropertyEditor.cs     | 25 +++++++++++--------
 .../PropertyEditors/RichTextPropertyEditor.cs | 18 ++++++-------
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
index 710c68eeb3..256c64ee30 100644
--- a/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
@@ -1,13 +1,12 @@
-using System.Linq;
-using Umbraco.Core.Logging;
+using Newtonsoft.Json;
+using System.Linq;
 using Umbraco.Core;
-using Umbraco.Core.PropertyEditors;
-using Newtonsoft.Json;
+using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Editors;
-using Umbraco.Web.Templates;
-using Umbraco.Web.Composing;
+using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
+using Umbraco.Web.Templates;
 
 namespace Umbraco.Web.PropertyEditors
 {
@@ -26,12 +25,14 @@ namespace Umbraco.Web.PropertyEditors
     {
         private IMediaService _mediaService;
         private IContentTypeBaseServiceProvider _contentTypeBaseServiceProvider;
+        private IUmbracoContextAccessor _umbracoContextAccessor;
 
-        public GridPropertyEditor(ILogger logger, IMediaService mediaService, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider)
+        public GridPropertyEditor(ILogger logger, IMediaService mediaService, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider, IUmbracoContextAccessor umbracoContextAccessor)
             : base(logger)
         {
             _mediaService = mediaService;
             _contentTypeBaseServiceProvider = contentTypeBaseServiceProvider;
+            _umbracoContextAccessor = umbracoContextAccessor;
         }
 
         public override IPropertyIndexValueFactory PropertyIndexValueFactory => new GridPropertyIndexValueFactory();
@@ -40,7 +41,7 @@ namespace Umbraco.Web.PropertyEditors
         /// Overridden to ensure that the value is validated
         /// </summary>
         /// <returns></returns>
-        protected override IDataValueEditor CreateValueEditor() => new GridPropertyValueEditor(Attribute, _mediaService, _contentTypeBaseServiceProvider);
+        protected override IDataValueEditor CreateValueEditor() => new GridPropertyValueEditor(Attribute, _mediaService, _contentTypeBaseServiceProvider, _umbracoContextAccessor);
 
         protected override IConfigurationEditor CreateConfigurationEditor() => new GridConfigurationEditor();
 
@@ -48,12 +49,14 @@ namespace Umbraco.Web.PropertyEditors
         {
             private IMediaService _mediaService;
             private IContentTypeBaseServiceProvider _contentTypeBaseServiceProvider;
+            private IUmbracoContextAccessor _umbracoContextAccessor;
 
-            public GridPropertyValueEditor(DataEditorAttribute attribute, IMediaService mediaService, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider)
+            public GridPropertyValueEditor(DataEditorAttribute attribute, IMediaService mediaService, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider, IUmbracoContextAccessor umbracoContextAccessor)
                 : base(attribute)
             {
                 _mediaService = mediaService;
                 _contentTypeBaseServiceProvider = contentTypeBaseServiceProvider;
+                _umbracoContextAccessor = umbracoContextAccessor;
             }
 
             /// <summary>
@@ -81,8 +84,8 @@ namespace Umbraco.Web.PropertyEditors
                 {
                     // Parse the HTML
                     var html = rte.Value?.ToString();
-                    
-                    var userId = Current.UmbracoContext.Security.CurrentUser.Id;
+
+                    var userId = _umbracoContextAccessor.UmbracoContext?.Security.CurrentUser.Id ?? -1;
 
                     // TODO: In future task(get the parent folder from this config) to save the media into
                     var parsedHtml = TemplateUtilities.FindAndPersistPastedTempImages(html, Constants.System.Root, userId, _mediaService, _contentTypeBaseServiceProvider);
diff --git a/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
index 8cab94a4be..61461859aa 100644
--- a/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
@@ -1,15 +1,11 @@
-using HtmlAgilityPack;
-using System;
+using System;
 using System.Collections.Generic;
-using System.IO;
 using Umbraco.Core;
-using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
 using Umbraco.Examine;
-using Umbraco.Web.Composing;
 using Umbraco.Web.Macros;
 using Umbraco.Web.Templates;
 
@@ -30,21 +26,23 @@ namespace Umbraco.Web.PropertyEditors
     {
         private IMediaService _mediaService;
         private IContentTypeBaseServiceProvider _contentTypeBaseServiceProvider;
+        private IUmbracoContextAccessor _umbracoContextAccessor;
 
         /// <summary>
         /// The constructor will setup the property editor based on the attribute if one is found
         /// </summary>
-        public RichTextPropertyEditor(ILogger logger, IMediaService mediaService, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider) : base(logger)
+        public RichTextPropertyEditor(ILogger logger, IMediaService mediaService, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider, IUmbracoContextAccessor umbracoContextAccessor) : base(logger)
         {
             _mediaService = mediaService;
             _contentTypeBaseServiceProvider = contentTypeBaseServiceProvider;
+            _umbracoContextAccessor = umbracoContextAccessor;
         }
 
         /// <summary>
         /// Create a custom value editor
         /// </summary>
         /// <returns></returns>
-        protected override IDataValueEditor CreateValueEditor() => new RichTextPropertyValueEditor(Attribute, _mediaService, _contentTypeBaseServiceProvider);
+        protected override IDataValueEditor CreateValueEditor() => new RichTextPropertyValueEditor(Attribute, _mediaService, _contentTypeBaseServiceProvider, _umbracoContextAccessor);
 
         protected override IConfigurationEditor CreateConfigurationEditor() => new RichTextConfigurationEditor();
 
@@ -57,12 +55,14 @@ namespace Umbraco.Web.PropertyEditors
         {
             private IMediaService _mediaService;
             private IContentTypeBaseServiceProvider _contentTypeBaseServiceProvider;
+            private IUmbracoContextAccessor _umbracoContextAccessor;
 
-            public RichTextPropertyValueEditor(DataEditorAttribute attribute, IMediaService mediaService, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider)
+            public RichTextPropertyValueEditor(DataEditorAttribute attribute, IMediaService mediaService, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider, IUmbracoContextAccessor umbracoContextAccessor)
                 : base(attribute)
             {
                 _mediaService = mediaService;
                 _contentTypeBaseServiceProvider = contentTypeBaseServiceProvider;
+                _umbracoContextAccessor = umbracoContextAccessor;
             }
 
             /// <inheritdoc />
@@ -113,7 +113,7 @@ namespace Umbraco.Web.PropertyEditors
                 var editorValueWithMediaUrlsRemoved = TemplateUtilities.RemoveMediaUrlsFromTextString(editorValue.Value.ToString());
                 var parsed = MacroTagParser.FormatRichTextContentForPersistence(editorValueWithMediaUrlsRemoved);
 
-                var userId = Current.UmbracoContext.Security.CurrentUser.Id;
+                var userId = _umbracoContextAccessor.UmbracoContext?.Security.CurrentUser.Id ?? -1;
 
                 // TODO: In future task(get the parent folder from this config) to save the media into
                 parsed = TemplateUtilities.FindAndPersistPastedTempImages(parsed, Constants.System.Root, userId, _mediaService, _contentTypeBaseServiceProvider);

From ba319609f2dee4e8ae88814aab6fc88c90519f0b Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Thu, 12 Sep 2019 09:40:21 +0100
Subject: [PATCH 571/776] Fix up tests - thanks again VS for not notifying me
 that the Build fails when I build the entire SLN

---
 src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs | 3 ++-
 src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs    | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
index 46636483b6..f1e2bf20d6 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
@@ -10,6 +10,7 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Web.PropertyEditors;
 using Umbraco.Core.Services;
+using Umbraco.Web;
 
 namespace Umbraco.Tests.PublishedContent
 {
@@ -39,7 +40,7 @@ namespace Umbraco.Tests.PublishedContent
             var converters = Factory.GetInstance<PropertyValueConverterCollection>();
 
             var dataTypeService = new TestObjects.TestDataTypeService(
-                new DataType(new RichTextPropertyEditor(Mock.Of<ILogger>(), Mock.Of<IMediaService>(), Mock.Of<IContentTypeBaseServiceProvider>())) { Id = 1 });
+                new DataType(new RichTextPropertyEditor(Mock.Of<ILogger>(), Mock.Of<IMediaService>(), Mock.Of<IContentTypeBaseServiceProvider>(), Mock.Of<IUmbracoContextAccessor>())) { Id = 1 });
 
             var publishedContentTypeFactory = new PublishedContentTypeFactory(Mock.Of<IPublishedModelFactory>(), converters, dataTypeService);
 
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
index e98e28c3dd..6ef632bf90 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
@@ -44,11 +44,12 @@ namespace Umbraco.Tests.PublishedContent
             var logger = Mock.Of<ILogger>();
             var mediaService = Mock.Of<IMediaService>();
             var contentTypeBaseServiceProvider = Mock.Of<IContentTypeBaseServiceProvider>();
+            var umbracoContextAccessor = Mock.Of<IUmbracoContextAccessor>();
 
             var dataTypeService = new TestObjects.TestDataTypeService(
                 new DataType(new VoidEditor(logger)) { Id = 1 },
                 new DataType(new TrueFalsePropertyEditor(logger)) { Id = 1001 },
-                new DataType(new RichTextPropertyEditor(logger, mediaService, contentTypeBaseServiceProvider)) { Id = 1002 },
+                new DataType(new RichTextPropertyEditor(logger, mediaService, contentTypeBaseServiceProvider, umbracoContextAccessor)) { Id = 1002 },
                 new DataType(new IntegerPropertyEditor(logger)) { Id = 1003 },
                 new DataType(new TextboxPropertyEditor(logger)) { Id = 1004 },
                 new DataType(new MediaPickerPropertyEditor(logger)) { Id = 1005 });

From a5c5a12a009f2309b6a6d2fd62705c247eafe69d Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Thu, 12 Sep 2019 12:07:57 +0100
Subject: [PATCH 572/776] Remove dupe Authz attribute

---
 src/Umbraco.Web/Editors/TinyMceController.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Umbraco.Web/Editors/TinyMceController.cs b/src/Umbraco.Web/Editors/TinyMceController.cs
index 0951b88443..9bc6830491 100644
--- a/src/Umbraco.Web/Editors/TinyMceController.cs
+++ b/src/Umbraco.Web/Editors/TinyMceController.cs
@@ -35,7 +35,6 @@ namespace Umbraco.Web.Editors
             _contentTypeBaseServiceProvider = contentTypeBaseServiceProvider;
         }
 
-        [UmbracoApplicationAuthorize(Constants.Applications.Content)]
         [HttpPost]
         public async Task<HttpResponseMessage> UploadImage()
         {

From 31d09c5e04e24502d8d1e6d3ed7ceec3031f35c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Thu, 12 Sep 2019 13:47:29 +0200
Subject: [PATCH 573/776] paste tidying

---
 .../common/mocks/editors/prevalues.mocks.js   |  2 +-
 .../src/common/services/tinymce.service.js    | 44 ++++++++++++++++++-
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/editors/prevalues.mocks.js b/src/Umbraco.Web.UI.Client/src/common/mocks/editors/prevalues.mocks.js
index a77cea15fa..96ce626c44 100644
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/editors/prevalues.mocks.js
+++ b/src/Umbraco.Web.UI.Client/src/common/mocks/editors/prevalues.mocks.js
@@ -7,7 +7,7 @@ angular.module('umbraco.mocks').
                 return [401, null, null];
             }
             else {
-                return [200, { "plugins": [{ "name": "code", "useOnFrontend": true }, { "name": "paste", "useOnFrontend": true }, { "name": "umbracolink", "useOnFrontend": true }], "commands": [{ "icon": "images/editor/code.gif", "command": "code", "alias": "code", "frontEndCommand": "code", "value": "", "priority": 1, "isStylePicker": false }, { "icon": "images/editor/removeformat.gif", "command": "removeformat", "alias": "removeformat", "frontEndCommand": "removeformat", "value": "", "priority": 2, "isStylePicker": false }, { "icon": "images/editor/undo.gif", "command": "undo", "alias": "undo", "frontEndCommand": "undo", "value": "", "priority": 11, "isStylePicker": false }, { "icon": "images/editor/redo.gif", "command": "redo", "alias": "redo", "frontEndCommand": "redo", "value": "", "priority": 12, "isStylePicker": false }, { "icon": "images/editor/cut.gif", "command": "cut", "alias": "cut", "frontEndCommand": "cut", "value": "", "priority": 13, "isStylePicker": false }, { "icon": "images/editor/copy.gif", "command": "copy", "alias": "copy", "frontEndCommand": "copy", "value": "", "priority": 14, "isStylePicker": false }, { "icon": "images/editor/showStyles.png", "command": "styleselect", "alias": "styleselect", "frontEndCommand": "styleselect", "value": "", "priority": 20, "isStylePicker": false }, { "icon": "images/editor/bold.gif", "command": "bold", "alias": "bold", "frontEndCommand": "bold", "value": "", "priority": 21, "isStylePicker": false }, { "icon": "images/editor/italic.gif", "command": "italic", "alias": "italic", "frontEndCommand": "italic", "value": "", "priority": 22, "isStylePicker": false }, { "icon": "images/editor/underline.gif", "command": "underline", "alias": "underline", "frontEndCommand": "underline", "value": "", "priority": 23, "isStylePicker": false }, { "icon": "images/editor/strikethrough.gif", "command": "strikethrough", "alias": "strikethrough", "frontEndCommand": "strikethrough", "value": "", "priority": 24, "isStylePicker": false }, { "icon": "images/editor/justifyleft.gif", "command": "justifyleft", "alias": "justifyleft", "frontEndCommand": "alignleft", "value": "", "priority": 31, "isStylePicker": false }, { "icon": "images/editor/justifycenter.gif", "command": "justifycenter", "alias": "justifycenter", "frontEndCommand": "aligncenter", "value": "", "priority": 32, "isStylePicker": false }, { "icon": "images/editor/justifyright.gif", "command": "justifyright", "alias": "justifyright", "frontEndCommand": "alignright", "value": "", "priority": 33, "isStylePicker": false }, { "icon": "images/editor/justifyfull.gif", "command": "justifyfull", "alias": "justifyfull", "frontEndCommand": "alignfull", "value": "", "priority": 34, "isStylePicker": false }, { "icon": "images/editor/bullist.gif", "command": "bullist", "alias": "bullist", "frontEndCommand": "bullist", "value": "", "priority": 41, "isStylePicker": false }, { "icon": "images/editor/numlist.gif", "command": "numlist", "alias": "numlist", "frontEndCommand": "numlist", "value": "", "priority": 42, "isStylePicker": false }, { "icon": "images/editor/outdent.gif", "command": "outdent", "alias": "outdent", "frontEndCommand": "outdent", "value": "", "priority": 43, "isStylePicker": false }, { "icon": "images/editor/indent.gif", "command": "indent", "alias": "indent", "frontEndCommand": "indent", "value": "", "priority": 44, "isStylePicker": false }, { "icon": "images/editor/link.gif", "command": "link", "alias": "mcelink", "frontEndCommand": "link", "value": "", "priority": 51, "isStylePicker": false }, { "icon": "images/editor/unLink.gif", "command": "unlink", "alias": "unlink", "frontEndCommand": "unlink", "value": "", "priority": 52, "isStylePicker": false }, { "icon": "images/editor/anchor.gif", "command": "anchor", "alias": "mceinsertanchor", "frontEndCommand": "anchor", "value": "", "priority": 53, "isStylePicker": false }, { "icon": "images/editor/image.gif", "command": "image", "alias": "mceimage", "frontEndCommand": "umbmediapicker", "value": "", "priority": 61, "isStylePicker": false }, { "icon": "images/editor/insMacro.gif", "command": "umbracomacro", "alias": "umbracomacro", "frontEndCommand": "umbmacro", "value": "", "priority": 62, "isStylePicker": false }, { "icon": "images/editor/table.gif", "command": "table", "alias": "mceinserttable", "frontEndCommand": "table", "value": "", "priority": 63, "isStylePicker": false }, { "icon": "images/editor/media.gif", "command": "umbracoembed", "alias": "umbracoembed", "frontEndCommand": "umbembeddialog", "value": "", "priority": 66, "isStylePicker": false }, { "icon": "images/editor/hr.gif", "command": "hr", "alias": "inserthorizontalrule", "frontEndCommand": "hr", "value": "", "priority": 71, "isStylePicker": false }, { "icon": "images/editor/sub.gif", "command": "sub", "alias": "subscript", "frontEndCommand": "sub", "value": "", "priority": 72, "isStylePicker": false }, { "icon": "images/editor/sup.gif", "command": "sup", "alias": "superscript", "frontEndCommand": "sup", "value": "", "priority": 73, "isStylePicker": false }, { "icon": "images/editor/charmap.gif", "command": "charmap", "alias": "mcecharmap", "frontEndCommand": "charmap", "value": "", "priority": 74, "isStylePicker": false }], "validElements": "+a[id|style|rel|rev|charset|hreflang|dir|lang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur|onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup],-strong/-b[class|style],-em/-i[class|style],-strike[class|style],-u[class|style],#p[id|style|dir|class|align],-ol[class|reversed|start|style|type],-ul[class|style],-li[class|style],br[class],img[id|dir|lang|longdesc|usemap|style|class|src|onmouseover|onmouseout|border|alt=|title|hspace|vspace|width|height|align|umbracoorgwidth|umbracoorgheight|onresize|onresizestart|onresizeend|rel],-sub[style|class],-sup[style|class],-blockquote[dir|style|class],-table[border=0|cellspacing|cellpadding|width|height|class|align|summary|style|dir|id|lang|bgcolor|background|bordercolor],-tr[id|lang|dir|class|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor],tbody[id|class],thead[id|class],tfoot[id|class],#td[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor|scope],-th[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|scope],caption[id|lang|dir|class|style],-div[id|dir|class|align|style],-span[class|align|style],-pre[class|align|style],address[class|align|style],-h1[id|dir|class|align],-h2[id|dir|class|align],-h3[id|dir|class|align],-h4[id|dir|class|align],-h5[id|dir|class|align],-h6[id|style|dir|class|align],hr[class|style],dd[id|class|title|style|dir|lang],dl[id|class|title|style|dir|lang],dt[id|class|title|style|dir|lang],object[class|id|width|height|codebase|*],param[name|value|_value|class],embed[type|width|height|src|class|*],map[name|class],area[shape|coords|href|alt|target|class],bdo[class],button[class],iframe[*]", "inValidElements": "font", "customConfig": { "entity_encoding": "raw" } }, null];
+                return [200, { "plugins": [{ "name": "code", "useOnFrontend": true }, { "name": "paste", "useOnFrontend": true }, { "name": "umbracolink", "useOnFrontend": true }], "commands": [{ "icon": "images/editor/code.gif", "command": "code", "alias": "code", "frontEndCommand": "code", "value": "", "priority": 1, "isStylePicker": false }, { "icon": "images/editor/removeformat.gif", "command": "removeformat", "alias": "removeformat", "frontEndCommand": "removeformat", "value": "", "priority": 2, "isStylePicker": false }, { "icon": "images/editor/undo.gif", "command": "undo", "alias": "undo", "frontEndCommand": "undo", "value": "", "priority": 11, "isStylePicker": false }, { "icon": "images/editor/redo.gif", "command": "redo", "alias": "redo", "frontEndCommand": "redo", "value": "", "priority": 12, "isStylePicker": false }, { "icon": "images/editor/cut.gif", "command": "cut", "alias": "cut", "frontEndCommand": "cut", "value": "", "priority": 13, "isStylePicker": false }, { "icon": "images/editor/copy.gif", "command": "copy", "alias": "copy", "frontEndCommand": "copy", "value": "", "priority": 14, "isStylePicker": false }, { "icon": "images/editor/showStyles.png", "command": "styleselect", "alias": "styleselect", "frontEndCommand": "styleselect", "value": "", "priority": 20, "isStylePicker": false }, { "icon": "images/editor/bold.gif", "command": "bold", "alias": "bold", "frontEndCommand": "bold", "value": "", "priority": 21, "isStylePicker": false }, { "icon": "images/editor/italic.gif", "command": "italic", "alias": "italic", "frontEndCommand": "italic", "value": "", "priority": 22, "isStylePicker": false }, { "icon": "images/editor/underline.gif", "command": "underline", "alias": "underline", "frontEndCommand": "underline", "value": "", "priority": 23, "isStylePicker": false }, { "icon": "images/editor/strikethrough.gif", "command": "strikethrough", "alias": "strikethrough", "frontEndCommand": "strikethrough", "value": "", "priority": 24, "isStylePicker": false }, { "icon": "images/editor/justifyleft.gif", "command": "justifyleft", "alias": "justifyleft", "frontEndCommand": "alignleft", "value": "", "priority": 31, "isStylePicker": false }, { "icon": "images/editor/justifycenter.gif", "command": "justifycenter", "alias": "justifycenter", "frontEndCommand": "aligncenter", "value": "", "priority": 32, "isStylePicker": false }, { "icon": "images/editor/justifyright.gif", "command": "justifyright", "alias": "justifyright", "frontEndCommand": "alignright", "value": "", "priority": 33, "isStylePicker": false }, { "icon": "images/editor/justifyfull.gif", "command": "justifyfull", "alias": "justifyfull", "frontEndCommand": "alignfull", "value": "", "priority": 34, "isStylePicker": false }, { "icon": "images/editor/bullist.gif", "command": "bullist", "alias": "bullist", "frontEndCommand": "bullist", "value": "", "priority": 41, "isStylePicker": false }, { "icon": "images/editor/numlist.gif", "command": "numlist", "alias": "numlist", "frontEndCommand": "numlist", "value": "", "priority": 42, "isStylePicker": false }, { "icon": "images/editor/outdent.gif", "command": "outdent", "alias": "outdent", "frontEndCommand": "outdent", "value": "", "priority": 43, "isStylePicker": false }, { "icon": "images/editor/indent.gif", "command": "indent", "alias": "indent", "frontEndCommand": "indent", "value": "", "priority": 44, "isStylePicker": false }, { "icon": "images/editor/link.gif", "command": "link", "alias": "mcelink", "frontEndCommand": "link", "value": "", "priority": 51, "isStylePicker": false }, { "icon": "images/editor/unLink.gif", "command": "unlink", "alias": "unlink", "frontEndCommand": "unlink", "value": "", "priority": 52, "isStylePicker": false }, { "icon": "images/editor/anchor.gif", "command": "anchor", "alias": "mceinsertanchor", "frontEndCommand": "anchor", "value": "", "priority": 53, "isStylePicker": false }, { "icon": "images/editor/image.gif", "command": "image", "alias": "mceimage", "frontEndCommand": "umbmediapicker", "value": "", "priority": 61, "isStylePicker": false }, { "icon": "images/editor/insMacro.gif", "command": "umbracomacro", "alias": "umbracomacro", "frontEndCommand": "umbmacro", "value": "", "priority": 62, "isStylePicker": false }, { "icon": "images/editor/table.gif", "command": "table", "alias": "mceinserttable", "frontEndCommand": "table", "value": "", "priority": 63, "isStylePicker": false }, { "icon": "images/editor/media.gif", "command": "umbracoembed", "alias": "umbracoembed", "frontEndCommand": "umbembeddialog", "value": "", "priority": 66, "isStylePicker": false }, { "icon": "images/editor/hr.gif", "command": "hr", "alias": "inserthorizontalrule", "frontEndCommand": "hr", "value": "", "priority": 71, "isStylePicker": false }, { "icon": "images/editor/sub.gif", "command": "sub", "alias": "subscript", "frontEndCommand": "sub", "value": "", "priority": 72, "isStylePicker": false }, { "icon": "images/editor/sup.gif", "command": "sup", "alias": "superscript", "frontEndCommand": "sup", "value": "", "priority": 73, "isStylePicker": false }, { "icon": "images/editor/charmap.gif", "command": "charmap", "alias": "mcecharmap", "frontEndCommand": "charmap", "value": "", "priority": 74, "isStylePicker": false }], "validElements": "+a[id|style|rel|rev|charset|hreflang|dir|lang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur|onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup],-strong/-b[class|style],-em/-i[class|style],-strike[class|style],-u[class|style],#p[id|style|dir|class|align],-ol[class|reversed|start|style|type],-ul[class|style],-li[class|style],br[class],img[id|dir|lang|longdesc|usemap|style|class|src|onmouseover|onmouseout|border|alt=|title|hspace|vspace|width|height|align|umbracoorgwidth|umbracoorgheight|onresize|onresizestart|onresizeend|rel],-sub[style|class],-sup[style|class],-blockquote[dir|style|class],-table[border=0|cellspacing|cellpadding|width|height|class|align|summary|style|dir|id|lang|bgcolor|background|bordercolor],-tr[id|lang|dir|class|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor],tbody[id|class],thead[id|class],tfoot[id|class],#td[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor|scope],-th[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|scope],caption[id|lang|dir|class|style],-div[id|dir|class|align|style],-span[class|align|style],-pre[class|align|style],address[class|align|style],-h1[id|dir|class|align],-h2[id|dir|class|align],-h3[id|dir|class|align],-h4[id|dir|class|align],-h5[id|dir|class|align],-h6[id|style|dir|class|align],hr[class|style],dd[id|class|title|style|dir|lang],dl[id|class|title|style|dir|lang],dt[id|class|title|style|dir|lang],object[class|id|width|height|codebase|*],param[name|value|_value|class],embed[type|width|height|src|class|*],map[name|class],area[shape|coords|href|alt|target|class],bdo[class],button[class],iframe[*]", "inValidElements": "font", "customConfig": { "entity_encoding": "raw" }, "pasteTidying": true }, null];
             }
         }
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 92a2389054..8d96863610 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -232,6 +232,17 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
             }
         });
     }
+    
+    function cleanupPastedData(plugin, args) {
+        
+        // Remove spans
+        var spanRemoveRegex = new RegExp("<\/?span[^>]*>([^<\/span]*)<\/span([^>]*)", "g");
+        args.content = args.content.replace(spanRemoveRegex,"");
+        
+        // Convert b to strong.
+        args.content = args.content.replace(/<b([^>]*)>([^<\/b]*)<\/b([^>]*)>/g, "<strong$1>$2</strong$3>");
+        
+    }
 
     return {
 
@@ -332,7 +343,38 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                     images_replace_blob_uris: false,
                     init_instance_callback: initEvents
                 };
-
+                
+                if (tinyMceConfig.pasteTidying) {
+                    plugins.push("paste");
+                    
+                    // We keep spans here, cause removing spans here also removes b-tags inside of them, instead we strip them out later.
+                    var validElements = "-b,-strong,-i,-em,span,p,a,table,th,thead,tbody,tr,td,ul,ol,li,dl,dt,dd,iframe,svg,img,hr,abbr,sub,sup,figure,picture";
+                    
+                    // add valid elements from styleFormats.
+                    var style, i = 0;
+                    for(; i < styles.styleFormats.length; i++) {
+                        style = styles.styleFormats[i];
+                        if(style.block) {
+                            validElements += "," + style.block;
+                        }
+                    }
+                    
+                    var pasteConfig = {
+                        
+                        paste_remove_styles: true,
+                        paste_text_linebreaktype: true,
+                        paste_strip_class_attributes: "all",
+                        paste_retain_style_properties: "all",
+                        
+                        paste_word_valid_elements: validElements,
+                        
+                        paste_preprocess: prepaste
+                        
+                    };
+                    
+                    angular.extend(config, cleanupPastedData);
+                }
+                
                 if (tinyMceConfig.customConfig) {
 
                     //if there is some custom config, we need to see if the string value of each item might actually be json and if so, we need to

From 2c27a631c9a8a08bf0e4cd185447a666cb9009aa Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Thu, 12 Sep 2019 23:14:10 +1000
Subject: [PATCH 574/776] Update src/Umbraco.Web/RoutableDocumentFilter.cs

Co-Authored-By: Bjarke Berg <mail@bergmania.dk>
---
 src/Umbraco.Web/RoutableDocumentFilter.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Umbraco.Web/RoutableDocumentFilter.cs b/src/Umbraco.Web/RoutableDocumentFilter.cs
index be2c8ad405..465480ce22 100644
--- a/src/Umbraco.Web/RoutableDocumentFilter.cs
+++ b/src/Umbraco.Web/RoutableDocumentFilter.cs
@@ -86,7 +86,6 @@ namespace Umbraco.Web
         /// <summary>
         /// Determines whether the specified URL is reserved or is inside a reserved path.
         /// </summary>
-        /// <param name="globalSettings"></param>
         /// <param name="url">The URL to check.</param>
         /// <returns>
         ///     <c>true</c> if the specified URL is reserved; otherwise, <c>false</c>.

From d7b950fe066b04434eacde556486af805af9ca12 Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Thu, 12 Sep 2019 23:14:18 +1000
Subject: [PATCH 575/776] Update src/Umbraco.Web/RoutableDocumentFilter.cs

Co-Authored-By: Bjarke Berg <mail@bergmania.dk>
---
 src/Umbraco.Web/RoutableDocumentFilter.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Umbraco.Web/RoutableDocumentFilter.cs b/src/Umbraco.Web/RoutableDocumentFilter.cs
index 465480ce22..642c60f6d4 100644
--- a/src/Umbraco.Web/RoutableDocumentFilter.cs
+++ b/src/Umbraco.Web/RoutableDocumentFilter.cs
@@ -150,7 +150,6 @@ namespace Umbraco.Web
         /// Determines whether the current request is reserved based on the route table and
         /// whether the specified URL is reserved or is inside a reserved path.
         /// </summary>
-        /// <param name="globalSettings"></param>
         /// <param name="url"></param>
         /// <param name="httpContext"></param>
         /// <param name="routes">The route collection to lookup the request in</param>

From c7c2f64b62a3391159bd417d4876a0cd27879301 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 12 Sep 2019 23:15:03 +1000
Subject: [PATCH 576/776] removes comments

---
 src/Umbraco.Web/Cache/BackgroundPublishedSnapshotNotifier.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/Umbraco.Web/Cache/BackgroundPublishedSnapshotNotifier.cs b/src/Umbraco.Web/Cache/BackgroundPublishedSnapshotNotifier.cs
index 5efbf988a4..e2b3c07cea 100644
--- a/src/Umbraco.Web/Cache/BackgroundPublishedSnapshotNotifier.cs
+++ b/src/Umbraco.Web/Cache/BackgroundPublishedSnapshotNotifier.cs
@@ -33,10 +33,6 @@ namespace Umbraco.Web.Cache
         {
             _publishedModelFactory = publishedModelFactory;
             _publishedSnapshotService = publishedSnapshotService;
-
-            // TODO: We have the option to check if we are in live mode and only run on a background thread if that is the case, else run normally?
-            // IMO I think we should just always run on a background thread, then no matter what state the app is in, it's always doing a consistent operation.
-
             _runner = new BackgroundTaskRunner<IBackgroundTask>("RebuildModelsAndCache", logger);
         }
 

From f6e9fb2845b01a49aa50a1bf325087489f109c4c Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Thu, 12 Sep 2019 14:27:22 +0100
Subject: [PATCH 577/776] Adds same code loop as
 FileUploadCleanupFilterAttribute to delete files

---
 .../Templates/TemplateUtilities.cs            | 34 ++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Templates/TemplateUtilities.cs b/src/Umbraco.Web/Templates/TemplateUtilities.cs
index 96ea2659b1..e9f7105c57 100644
--- a/src/Umbraco.Web/Templates/TemplateUtilities.cs
+++ b/src/Umbraco.Web/Templates/TemplateUtilities.cs
@@ -3,7 +3,6 @@ using System;
 using System.IO;
 using System.Text.RegularExpressions;
 using Umbraco.Core;
-using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
 using Umbraco.Core.Services;
 using Umbraco.Web.Composing;
@@ -236,6 +235,39 @@ namespace Umbraco.Web.Templates
 
                 // Remove the data attribute (so we do not re-process this)
                 img.Attributes.Remove(TemporaryImageDataAttribute);
+
+                // Delete folder & image now its saved in media
+                // The folder should contain one image - as a unique guid folder created
+                // for each image uploaded from TinyMceController
+                var folderName = Path.GetDirectoryName(absoluteTempImagePath);
+                try
+                {
+                    File.Delete(absoluteTempImagePath);
+                    Directory.Delete(folderName);
+                }
+                catch (Exception ex)
+                {
+                    Current.Logger.Error(typeof(TemplateUtilities), ex, "Could not delete temp file or folder {FileName}", absoluteTempImagePath);
+                }
+                
+            }
+
+            // Now remove all old files so that the temp folder(s) never grow
+            // Anything older than one day gets deleted
+            var files = Directory.GetFiles(SystemDirectories.TempFileUploads, "*", SearchOption.AllDirectories);
+            foreach (var file in files)
+            {
+                if (DateTime.UtcNow - File.GetLastWriteTimeUtc(file) > TimeSpan.FromDays(1))
+                {
+                    try
+                    {
+                        File.Delete(file);
+                    }
+                    catch (Exception ex)
+                    {
+                        Current.Logger.Error(typeof(TemplateUtilities), ex, "Could not delete temp file {FileName}", file);
+                    }
+                }
             }
 
             return htmlDoc.DocumentNode.OuterHtml;

From 0d0abca255929ab5330250d691f786c16177b5fb Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Thu, 12 Sep 2019 14:35:45 +0100
Subject: [PATCH 578/776] Move the general cleanup of the
 App_Data/TEMP/FileUploads folder for one day+ old files

---
 src/Umbraco.Web/Editors/TinyMceController.cs  | 20 ++++++++++++++++++-
 .../Templates/TemplateUtilities.cs            | 18 -----------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/Umbraco.Web/Editors/TinyMceController.cs b/src/Umbraco.Web/Editors/TinyMceController.cs
index 9bc6830491..5bed080f7f 100644
--- a/src/Umbraco.Web/Editors/TinyMceController.cs
+++ b/src/Umbraco.Web/Editors/TinyMceController.cs
@@ -102,7 +102,25 @@ namespace Umbraco.Web.Editors
                 // IOException, PathTooLong, DirectoryNotFound, UnathorizedAccess
                 Logger.Error<TinyMceController>(ex, "Error when trying to move {CurrentFilePath} to {NewFilePath}", currentFile, newFilePath);
                 return Request.CreateErrorResponse(HttpStatusCode.InternalServerError, $"Error when trying to move {currentFile} to {newFilePath}", ex);
-            }            
+            }
+
+            // Now remove all old files so that the temp folder(s) never grow
+            // Anything older than one day gets deleted
+            var tempFiles = Directory.GetFiles(SystemDirectories.TempFileUploads, "*", SearchOption.AllDirectories);
+            foreach (var tempFile in tempFiles)
+            {
+                if (DateTime.UtcNow - File.GetLastWriteTimeUtc(tempFile) > TimeSpan.FromDays(1))
+                {
+                    try
+                    {
+                        File.Delete(tempFile);
+                    }
+                    catch (Exception ex)
+                    {
+                        Logger.Error<TinyMceController>(ex, "Could not delete temp file {FileName}", tempFile);
+                    }
+                }
+            }
 
             return Request.CreateResponse(HttpStatusCode.OK, new { tmpLocation = relativeNewFilePath });
         }
diff --git a/src/Umbraco.Web/Templates/TemplateUtilities.cs b/src/Umbraco.Web/Templates/TemplateUtilities.cs
index e9f7105c57..decd547be3 100644
--- a/src/Umbraco.Web/Templates/TemplateUtilities.cs
+++ b/src/Umbraco.Web/Templates/TemplateUtilities.cs
@@ -252,24 +252,6 @@ namespace Umbraco.Web.Templates
                 
             }
 
-            // Now remove all old files so that the temp folder(s) never grow
-            // Anything older than one day gets deleted
-            var files = Directory.GetFiles(SystemDirectories.TempFileUploads, "*", SearchOption.AllDirectories);
-            foreach (var file in files)
-            {
-                if (DateTime.UtcNow - File.GetLastWriteTimeUtc(file) > TimeSpan.FromDays(1))
-                {
-                    try
-                    {
-                        File.Delete(file);
-                    }
-                    catch (Exception ex)
-                    {
-                        Current.Logger.Error(typeof(TemplateUtilities), ex, "Could not delete temp file {FileName}", file);
-                    }
-                }
-            }
-
             return htmlDoc.DocumentNode.OuterHtml;
         }
     }

From aa9ece94b7d63d9565aafad0207d87cccb7084e5 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 12 Sep 2019 23:37:17 +1000
Subject: [PATCH 579/776] naming convention and null check

---
 src/Umbraco.Web/RoutableDocumentFilter.cs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web/RoutableDocumentFilter.cs b/src/Umbraco.Web/RoutableDocumentFilter.cs
index 642c60f6d4..9725ce0e14 100644
--- a/src/Umbraco.Web/RoutableDocumentFilter.cs
+++ b/src/Umbraco.Web/RoutableDocumentFilter.cs
@@ -27,7 +27,7 @@ namespace Umbraco.Web
             _globalSettings = globalSettings;
         }
 
-        private static readonly ConcurrentDictionary<string, bool> _routeChecks = new ConcurrentDictionary<string, bool>();
+        private static readonly ConcurrentDictionary<string, bool> RouteChecks = new ConcurrentDictionary<string, bool>();
         private readonly IGlobalSettings _globalSettings;
         private object _locker = new object();
         private bool _isInit = false;
@@ -179,13 +179,18 @@ namespace Umbraco.Web
                     _routeCount = routes.Count;
 
                     //try clearing each entry
-                    foreach(var r in _routeChecks.Keys.ToList())
-                        _routeChecks.TryRemove(r, out _);
+                    foreach(var r in RouteChecks.Keys.ToList())
+                        RouteChecks.TryRemove(r, out _);
                 }
             }
 
+            var absPath = httpContext?.Request?.Url.AbsolutePath;
+
+            if (absPath.IsNullOrWhiteSpace())
+                return false;
+
             //check if the current request matches a route, if so then it is reserved.
-            var hasRoute = _routeChecks.GetOrAdd(httpContext.Request.Url.AbsolutePath, x => routes.GetRouteData(httpContext) != null);
+            var hasRoute = RouteChecks.GetOrAdd(absPath, x => routes.GetRouteData(httpContext) != null);
             if (hasRoute)
                 return true;
 

From c4026fb92fe8d3cc7aff596a5fd3fcc75987f691 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Thu, 12 Sep 2019 14:54:21 +0100
Subject: [PATCH 580/776] Inject all the things - aka make sure Shan doesn't
 poke with a sharp pointy stick for using Current

---
 src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs  | 10 +++++++---
 .../PropertyEditors/RichTextPropertyEditor.cs          | 10 +++++++---
 src/Umbraco.Web/Templates/TemplateUtilities.cs         |  5 +++--
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
index 256c64ee30..48273a1651 100644
--- a/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
@@ -26,6 +26,7 @@ namespace Umbraco.Web.PropertyEditors
         private IMediaService _mediaService;
         private IContentTypeBaseServiceProvider _contentTypeBaseServiceProvider;
         private IUmbracoContextAccessor _umbracoContextAccessor;
+        private ILogger _logger;
 
         public GridPropertyEditor(ILogger logger, IMediaService mediaService, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider, IUmbracoContextAccessor umbracoContextAccessor)
             : base(logger)
@@ -33,6 +34,7 @@ namespace Umbraco.Web.PropertyEditors
             _mediaService = mediaService;
             _contentTypeBaseServiceProvider = contentTypeBaseServiceProvider;
             _umbracoContextAccessor = umbracoContextAccessor;
+            _logger = logger;
         }
 
         public override IPropertyIndexValueFactory PropertyIndexValueFactory => new GridPropertyIndexValueFactory();
@@ -41,7 +43,7 @@ namespace Umbraco.Web.PropertyEditors
         /// Overridden to ensure that the value is validated
         /// </summary>
         /// <returns></returns>
-        protected override IDataValueEditor CreateValueEditor() => new GridPropertyValueEditor(Attribute, _mediaService, _contentTypeBaseServiceProvider, _umbracoContextAccessor);
+        protected override IDataValueEditor CreateValueEditor() => new GridPropertyValueEditor(Attribute, _mediaService, _contentTypeBaseServiceProvider, _umbracoContextAccessor, _logger);
 
         protected override IConfigurationEditor CreateConfigurationEditor() => new GridConfigurationEditor();
 
@@ -50,13 +52,15 @@ namespace Umbraco.Web.PropertyEditors
             private IMediaService _mediaService;
             private IContentTypeBaseServiceProvider _contentTypeBaseServiceProvider;
             private IUmbracoContextAccessor _umbracoContextAccessor;
+            private ILogger _logger;
 
-            public GridPropertyValueEditor(DataEditorAttribute attribute, IMediaService mediaService, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider, IUmbracoContextAccessor umbracoContextAccessor)
+            public GridPropertyValueEditor(DataEditorAttribute attribute, IMediaService mediaService, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider, IUmbracoContextAccessor umbracoContextAccessor, ILogger logger)
                 : base(attribute)
             {
                 _mediaService = mediaService;
                 _contentTypeBaseServiceProvider = contentTypeBaseServiceProvider;
                 _umbracoContextAccessor = umbracoContextAccessor;
+                _logger = logger;
             }
 
             /// <summary>
@@ -88,7 +92,7 @@ namespace Umbraco.Web.PropertyEditors
                     var userId = _umbracoContextAccessor.UmbracoContext?.Security.CurrentUser.Id ?? -1;
 
                     // TODO: In future task(get the parent folder from this config) to save the media into
-                    var parsedHtml = TemplateUtilities.FindAndPersistPastedTempImages(html, Constants.System.Root, userId, _mediaService, _contentTypeBaseServiceProvider);
+                    var parsedHtml = TemplateUtilities.FindAndPersistPastedTempImages(html, Constants.System.Root, userId, _mediaService, _contentTypeBaseServiceProvider, _logger);
                     rte.Value = parsedHtml;
                 }
 
diff --git a/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
index 61461859aa..ec18ff203f 100644
--- a/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
@@ -27,6 +27,7 @@ namespace Umbraco.Web.PropertyEditors
         private IMediaService _mediaService;
         private IContentTypeBaseServiceProvider _contentTypeBaseServiceProvider;
         private IUmbracoContextAccessor _umbracoContextAccessor;
+        private ILogger _logger;
 
         /// <summary>
         /// The constructor will setup the property editor based on the attribute if one is found
@@ -36,13 +37,14 @@ namespace Umbraco.Web.PropertyEditors
             _mediaService = mediaService;
             _contentTypeBaseServiceProvider = contentTypeBaseServiceProvider;
             _umbracoContextAccessor = umbracoContextAccessor;
+            _logger = logger;
         }
 
         /// <summary>
         /// Create a custom value editor
         /// </summary>
         /// <returns></returns>
-        protected override IDataValueEditor CreateValueEditor() => new RichTextPropertyValueEditor(Attribute, _mediaService, _contentTypeBaseServiceProvider, _umbracoContextAccessor);
+        protected override IDataValueEditor CreateValueEditor() => new RichTextPropertyValueEditor(Attribute, _mediaService, _contentTypeBaseServiceProvider, _umbracoContextAccessor, _logger);
 
         protected override IConfigurationEditor CreateConfigurationEditor() => new RichTextConfigurationEditor();
 
@@ -56,13 +58,15 @@ namespace Umbraco.Web.PropertyEditors
             private IMediaService _mediaService;
             private IContentTypeBaseServiceProvider _contentTypeBaseServiceProvider;
             private IUmbracoContextAccessor _umbracoContextAccessor;
+            private ILogger _logger;
 
-            public RichTextPropertyValueEditor(DataEditorAttribute attribute, IMediaService mediaService, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider, IUmbracoContextAccessor umbracoContextAccessor)
+            public RichTextPropertyValueEditor(DataEditorAttribute attribute, IMediaService mediaService, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider, IUmbracoContextAccessor umbracoContextAccessor, ILogger logger)
                 : base(attribute)
             {
                 _mediaService = mediaService;
                 _contentTypeBaseServiceProvider = contentTypeBaseServiceProvider;
                 _umbracoContextAccessor = umbracoContextAccessor;
+                _logger = logger;
             }
 
             /// <inheritdoc />
@@ -116,7 +120,7 @@ namespace Umbraco.Web.PropertyEditors
                 var userId = _umbracoContextAccessor.UmbracoContext?.Security.CurrentUser.Id ?? -1;
 
                 // TODO: In future task(get the parent folder from this config) to save the media into
-                parsed = TemplateUtilities.FindAndPersistPastedTempImages(parsed, Constants.System.Root, userId, _mediaService, _contentTypeBaseServiceProvider);
+                parsed = TemplateUtilities.FindAndPersistPastedTempImages(parsed, Constants.System.Root, userId, _mediaService, _contentTypeBaseServiceProvider, _logger);
                 return parsed;
             }
         }
diff --git a/src/Umbraco.Web/Templates/TemplateUtilities.cs b/src/Umbraco.Web/Templates/TemplateUtilities.cs
index decd547be3..60a57b500e 100644
--- a/src/Umbraco.Web/Templates/TemplateUtilities.cs
+++ b/src/Umbraco.Web/Templates/TemplateUtilities.cs
@@ -4,6 +4,7 @@ using System.IO;
 using System.Text.RegularExpressions;
 using Umbraco.Core;
 using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
 using Umbraco.Core.Services;
 using Umbraco.Web.Composing;
 using Umbraco.Web.PublishedCache;
@@ -188,7 +189,7 @@ namespace Umbraco.Web.Templates
             // see comment in ResolveMediaFromTextString for group reference
             => ResolveImgPattern.Replace(text, "$1$3$4$5");
 
-        internal static string FindAndPersistPastedTempImages(string html, int mediaParentFolder, int userId, IMediaService mediaService, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider)
+        internal static string FindAndPersistPastedTempImages(string html, int mediaParentFolder, int userId, IMediaService mediaService, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider, ILogger logger)
         {
             // Find all img's that has data-tmpimg attribute
             // Use HTML Agility Pack - https://html-agility-pack.net
@@ -247,7 +248,7 @@ namespace Umbraco.Web.Templates
                 }
                 catch (Exception ex)
                 {
-                    Current.Logger.Error(typeof(TemplateUtilities), ex, "Could not delete temp file or folder {FileName}", absoluteTempImagePath);
+                    logger.Error(typeof(TemplateUtilities), ex, "Could not delete temp file or folder {FileName}", absoluteTempImagePath);
                 }
                 
             }

From a9805e2b5ac7e7a46df4cfb67509e6478c52a3fb Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 13 Sep 2019 11:57:12 +1000
Subject: [PATCH 581/776] bumps cdf requirements

---
 build/NuSpecs/UmbracoCms.Web.nuspec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/NuSpecs/UmbracoCms.Web.nuspec b/build/NuSpecs/UmbracoCms.Web.nuspec
index 4aa354eba2..6591b807d9 100644
--- a/build/NuSpecs/UmbracoCms.Web.nuspec
+++ b/build/NuSpecs/UmbracoCms.Web.nuspec
@@ -25,8 +25,8 @@
                   not want this to happen as the alpha of the next major is, really, the next major already.
                 -->
                 <dependency id="UmbracoCms.Core" version="[$version$]" />
-                <dependency id="ClientDependency" version="[1.9.7,1.999999)" />
-                <dependency id="ClientDependency-Mvc5" version="[1.8.0,1.999999)" />
+                <dependency id="ClientDependency" version="[1.9.8,1.999999)" />
+                <dependency id="ClientDependency-Mvc5" version="[1.9.3,1.999999)" />
                 <dependency id="CSharpTest.Net.Collections" version="[14.906.1403.1082,14.999999)" />
                 <dependency id="Examine" version="[1.0.0,1.999999)" />
                 <dependency id="HtmlAgilityPack" version="[1.8.14,1.999999)" />

From 68393972065e1af25f585a27d1203b7ad432f987 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 13 Sep 2019 11:58:32 +1000
Subject: [PATCH 582/776] bumps examine requirements

---
 build/NuSpecs/UmbracoCms.Web.nuspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/NuSpecs/UmbracoCms.Web.nuspec b/build/NuSpecs/UmbracoCms.Web.nuspec
index 6591b807d9..c8374bc2f7 100644
--- a/build/NuSpecs/UmbracoCms.Web.nuspec
+++ b/build/NuSpecs/UmbracoCms.Web.nuspec
@@ -28,7 +28,7 @@
                 <dependency id="ClientDependency" version="[1.9.8,1.999999)" />
                 <dependency id="ClientDependency-Mvc5" version="[1.9.3,1.999999)" />
                 <dependency id="CSharpTest.Net.Collections" version="[14.906.1403.1082,14.999999)" />
-                <dependency id="Examine" version="[1.0.0,1.999999)" />
+                <dependency id="Examine" version="[1.0.1,1.999999)" />
                 <dependency id="HtmlAgilityPack" version="[1.8.14,1.999999)" />
                 <dependency id="ImageProcessor" version="[2.7.0.100,2.999999)" />
                 <dependency id="LightInject.Mvc" version="[2.0.0,2.999999)" />

From e5634d13f1070d5eb4817be47592127c3386dbe7 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Fri, 13 Sep 2019 09:55:53 +0200
Subject: [PATCH 583/776] Lazily create content and models in NuCache

---
 .../PublishedCache/NuCache/ContentNode.cs     | 66 +++++++++++--------
 .../NuCache/PublishedContent.cs               |  5 +-
 2 files changed, 42 insertions(+), 29 deletions(-)

diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs
index 7379277be4..fad402a0eb 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs
@@ -75,17 +75,11 @@ namespace Umbraco.Web.PublishedCache.NuCache
             if (draftData == null && publishedData == null)
                 throw new ArgumentException("Both draftData and publishedData cannot be null at the same time.");
 
-            if (draftData != null)
-            {
-                DraftContent = new PublishedContent(this, draftData, publishedSnapshotAccessor, variationContextAccessor);
-                DraftModel = DraftContent.CreateModel();
-            }
+            _publishedSnapshotAccessor = publishedSnapshotAccessor;
+            _variationContextAccessor = variationContextAccessor;
 
-            if (publishedData != null)
-            {
-                PublishedContent = new PublishedContent(this, publishedData, publishedSnapshotAccessor, variationContextAccessor);
-                PublishedModel = PublishedContent.CreateModel();
-            }
+            _draftData = draftData;
+            _publishedData = publishedData;
         }
 
         // clone
@@ -105,14 +99,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
             CreateDate = origin.CreateDate;
             CreatorId = origin.CreatorId;
 
-            var originDraft = origin.DraftContent;
-            var originPublished = origin.PublishedContent;
-
-            DraftContent = originDraft == null ? null : new PublishedContent(this, originDraft);
-            PublishedContent = originPublished == null ? null : new PublishedContent(this, originPublished);
-
-            DraftModel = DraftContent?.CreateModel();
-            PublishedModel = PublishedContent?.CreateModel();
+            _draftData = origin._draftData;
+            _publishedData = origin._publishedData;
         }
 
         // everything that is common to both draft and published versions
@@ -131,15 +119,41 @@ namespace Umbraco.Web.PublishedCache.NuCache
         public readonly DateTime CreateDate;
         public readonly int CreatorId;
 
-        // draft and published version (either can be null, but not both)
-        // are the direct PublishedContent instances
-        public PublishedContent DraftContent;
-        public PublishedContent PublishedContent;
+        private ContentData _draftData;
+        private ContentData _publishedData;
+        private IVariationContextAccessor _variationContextAccessor;
+        private IPublishedSnapshotAccessor _publishedSnapshotAccessor;
+
+        public bool HasPublished => _publishedData != null;
+        public bool HasPublishedCulture(string culture) => _publishedData != null && _publishedData.CultureInfos.ContainsKey(culture);
 
         // draft and published version (either can be null, but not both)
         // are models not direct PublishedContent instances
-        public IPublishedContent DraftModel;
-        public IPublishedContent PublishedModel;
+        private IPublishedContent _draftModel;
+        private IPublishedContent _publishedModel;
+
+        private IPublishedContent GetModel(ref IPublishedContent model, ContentData contentData)
+        {
+            if (model != null) return model;
+            if (contentData == null) return null;
+
+            // create the model - we want to be fast, so no lock here: we may create
+            // more than 1 instance, but the lock below ensures we only ever return
+            // 1 unique instance - and locking is a nice explicit way to ensure this
+
+            var m = new PublishedContent(this, contentData, _publishedSnapshotAccessor, _variationContextAccessor).CreateModel();
+
+            // locking 'this' is not a best-practice but ContentNode is internal and
+            // we know what we do, so it is fine here and avoids allocating an object
+            lock (this)
+            {
+                return model = model ?? m;
+            }
+        }
+
+        public IPublishedContent DraftModel => GetModel(ref _draftModel, _draftData);
+
+        public IPublishedContent PublishedModel => GetModel(ref _publishedModel, _publishedData);
 
         public ContentNodeKit ToKit()
             => new ContentNodeKit
@@ -147,8 +161,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     Node = this,
                     ContentTypeId = ContentType.Id,
 
-                    DraftData = DraftContent?.ContentData,
-                    PublishedData = PublishedContent?.ContentData
+                    DraftData = _draftData,
+                    PublishedData = _publishedData
                 };
     }
 }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
index 8fc2dc1006..bf4975714d 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
@@ -233,8 +233,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             // invariant content items)
 
             // if there is no 'published' published content, no culture can be published
-            var hasPublished = _contentNode.PublishedContent != null;
-            if (!hasPublished)
+            if (!_contentNode.HasPublished)
                 return false;
 
             // if there is a 'published' published content, and does not vary = published
@@ -247,7 +246,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
             // there is a 'published' published content, and varies
             // = depends on the culture
-            return _contentNode.PublishedContent.ContentData.CultureInfos.ContainsKey(culture);
+            return _contentNode.HasPublishedCulture(culture);
         }
 
         #endregion

From e2ba9e1eb487ffd915d0042ed1eb353c23c43189 Mon Sep 17 00:00:00 2001
From: Rasmus John Pedersen <mail@rjp.dk>
Date: Fri, 13 Sep 2019 10:25:47 +0200
Subject: [PATCH 584/776] Remove limit of dashboard tabs and fix when expand
 menu is shown

---
 .../components/tabs/umbtabsnav.directive.js   | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tabs/umbtabsnav.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tabs/umbtabsnav.directive.js
index ece024b597..b1c8608124 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tabs/umbtabsnav.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tabs/umbtabsnav.directive.js
@@ -103,29 +103,29 @@ Use this directive to render a tabs navigation.
             });
 
             function calculateWidth(){
-				$timeout(function(){
-                    // 70 is the width of the expand menu (three dots)
-                    var containerWidth = container.width() - 70;
+                $timeout(function(){
+                    // 70 is the width of the expand menu (three dots) + 20 for the margin on umb-tabs-nav
+                    var containerWidth = container.width() - 90;
                     var tabsWidth = 0;
                     ctrl.overflowingSections = 0;
                     ctrl.needTray = false;
-                    ctrl.maxTabs = 7;
-                    					
-					// detect how many tabs we can show on the screen
-					for (var i = 0; i < tabNavItemsWidths.length; i++) {
+                    ctrl.maxTabs = tabNavItemsWidths.length;
+
+                    // detect how many tabs we can show on the screen
+                    for (var i = 0; i <= tabNavItemsWidths.length; i++) {
                         
                         var tabWidth = tabNavItemsWidths[i];
                         tabsWidth += tabWidth;
 
-						if(tabsWidth >= containerWidth) {
-							ctrl.needTray = true;
-							ctrl.maxTabs = i;
-							ctrl.overflowingTabs = ctrl.maxTabs - ctrl.tabs.length;
-							break;
-						}
+                        if(tabsWidth >= containerWidth) {
+                            ctrl.needTray = true;
+                            ctrl.maxTabs = i;
+                            ctrl.overflowingTabs = ctrl.maxTabs - ctrl.tabs.length;
+                            break;
+                        }
                     }
                     
-				});
+                });
             }
 
             $(window).on('resize.tabsNav', function () {
@@ -145,7 +145,6 @@ Use this directive to render a tabs navigation.
             vm.needTray = false;
             vm.showTray = false;
             vm.overflowingSections = 0;
-            vm.maxTabs = 7;
 
             vm.clickTab = clickTab;
             vm.toggleTray = toggleTray;
@@ -188,4 +187,4 @@ Use this directive to render a tabs navigation.
 
     angular.module('umbraco.directives').directive('umbTabsNav', TabsNavDirective);
 
-})();
\ No newline at end of file
+})();

From 63914aec4fba6b06b9d5e84960b80543ba8b5847 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Fri, 13 Sep 2019 11:10:47 +0100
Subject: [PATCH 585/776] Couple of fixes

---
 src/Umbraco.Web/Editors/TinyMceController.cs          | 2 +-
 src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/Editors/TinyMceController.cs b/src/Umbraco.Web/Editors/TinyMceController.cs
index 5bed080f7f..601095bd24 100644
--- a/src/Umbraco.Web/Editors/TinyMceController.cs
+++ b/src/Umbraco.Web/Editors/TinyMceController.cs
@@ -106,7 +106,7 @@ namespace Umbraco.Web.Editors
 
             // Now remove all old files so that the temp folder(s) never grow
             // Anything older than one day gets deleted
-            var tempFiles = Directory.GetFiles(SystemDirectories.TempFileUploads, "*", SearchOption.AllDirectories);
+            var tempFiles = Directory.GetFiles(IOHelper.MapPath(SystemDirectories.TempFileUploads), "*", SearchOption.AllDirectories);
             foreach (var tempFile in tempFiles)
             {
                 if (DateTime.UtcNow - File.GetLastWriteTimeUtc(tempFile) > TimeSpan.FromDays(1))
diff --git a/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
index ebb9b67f0d..92c82ab921 100644
--- a/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
@@ -77,7 +77,7 @@ namespace Umbraco.Web.PropertyEditors
                 if (editorValue.Value == null)
                     return null;
 
-                var config = editorValue.DataTypeConfiguration as RichTextConfiguration;
+                var config = editorValue.DataTypeConfiguration as GridConfiguration;
                 var mediaParent = config?.MediaParentId;
                 Guid mediaParentId;
 

From f59cf544a58c69a26bd59c4bd21fc16e95ab3835 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Fri, 13 Sep 2019 13:43:48 +0200
Subject: [PATCH 586/776] make gulp able to watch libs

---
 src/Umbraco.Web.UI.Client/gulp/tasks/watch.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/gulp/tasks/watch.js b/src/Umbraco.Web.UI.Client/gulp/tasks/watch.js
index a5c476f7d2..5c2fa2e5c8 100644
--- a/src/Umbraco.Web.UI.Client/gulp/tasks/watch.js
+++ b/src/Umbraco.Web.UI.Client/gulp/tasks/watch.js
@@ -53,6 +53,13 @@ gulp.task('watch', function () {
         watch(config.sources.globs.js, { interval: watchInterval })
         .pipe(gulp.dest(config.root + config.targets.js))
     );
+    
+    
+    //watch all lib files that will not be merged - copy single file changes
+    stream.add(
+        watch(config.sources.globs.lib, { interval: watchInterval })
+        .pipe(gulp.dest(config.root + config.targets.lib))
+    );
 
     return stream;
 });

From fa3f5287c1b648e4f9381344081a236a2a0a83e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Fri, 13 Sep 2019 13:44:54 +0200
Subject: [PATCH 587/776] making our own paste plugin to be able to handle
 images in pasted content from MS Word

---
 .../lib/tinymce/plugins/umbpaste/index.js     |    7 +
 .../tinymce/plugins/umbpaste/plugin.min.js    | 1867 +++++++++++++++++
 .../src/common/services/tinymce.service.js    |   36 +-
 3 files changed, 1900 insertions(+), 10 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/lib/tinymce/plugins/umbpaste/index.js
 create mode 100644 src/Umbraco.Web.UI.Client/lib/tinymce/plugins/umbpaste/plugin.min.js

diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/plugins/umbpaste/index.js b/src/Umbraco.Web.UI.Client/lib/tinymce/plugins/umbpaste/index.js
new file mode 100644
index 0000000000..b54d9d1384
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/lib/tinymce/plugins/umbpaste/index.js
@@ -0,0 +1,7 @@
+// Exports the "paste" plugin for usage with module loaders
+// Usage:
+//   CommonJS:
+//     require('tinymce/plugins/paste')
+//   ES2015:
+//     import 'tinymce/plugins/paste'
+require('./plugin.js');
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/plugins/umbpaste/plugin.min.js b/src/Umbraco.Web.UI.Client/lib/tinymce/plugins/umbpaste/plugin.min.js
new file mode 100644
index 0000000000..e197012bfa
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/lib/tinymce/plugins/umbpaste/plugin.min.js
@@ -0,0 +1,1867 @@
+(function () {
+var paste = (function () {
+    'use strict';
+    
+    var Cell = function (initial) {
+      var value = initial;
+      var get = function () {
+        return value;
+      };
+      var set = function (v) {
+        value = v;
+      };
+      var clone = function () {
+        return Cell(get());
+      };
+      return {
+        get: get,
+        set: set,
+        clone: clone
+      };
+    };
+
+    var global = tinymce.util.Tools.resolve('tinymce.PluginManager');
+
+    var hasProPlugin = function (editor) {
+      if (/(^|[ ,])powerpaste([, ]|$)/.test(editor.settings.plugins) && global.get('powerpaste')) {
+        if (typeof window.console !== 'undefined' && window.console.log) {
+          window.console.log('PowerPaste is incompatible with Paste plugin! Remove \'umbpaste\' from the \'plugins\' option.');
+        }
+        return true;
+      } else {
+        return false;
+      }
+    };
+    var DetectProPlugin = { hasProPlugin: hasProPlugin };
+
+    var get = function (clipboard, quirks) {
+      return {
+        clipboard: clipboard,
+        quirks: quirks
+      };
+    };
+    var Api = { get: get };
+
+    var firePastePreProcess = function (editor, html, internal, isWordHtml) {
+      return editor.fire('PastePreProcess', {
+        content: html,
+        internal: internal,
+        wordContent: isWordHtml
+      });
+    };
+    var firePastePostProcess = function (editor, node, internal, isWordHtml) {
+      return editor.fire('PastePostProcess', {
+        node: node,
+        internal: internal,
+        wordContent: isWordHtml
+      });
+    };
+    var firePastePlainTextToggle = function (editor, state) {
+      return editor.fire('PastePlainTextToggle', { state: state });
+    };
+    var firePaste = function (editor, ieFake) {
+      return editor.fire('paste', { ieFake: ieFake });
+    };
+    var Events = {
+      firePastePreProcess: firePastePreProcess,
+      firePastePostProcess: firePastePostProcess,
+      firePastePlainTextToggle: firePastePlainTextToggle,
+      firePaste: firePaste
+    };
+
+    var shouldPlainTextInform = function (editor) {
+      return editor.getParam('paste_plaintext_inform', true);
+    };
+    var shouldBlockDrop = function (editor) {
+      return editor.getParam('paste_block_drop', false);
+    };
+    var shouldPasteDataImages = function (editor) {
+      return editor.getParam('paste_data_images', false);
+    };
+    var shouldFilterDrop = function (editor) {
+      return editor.getParam('paste_filter_drop', true);
+    };
+    var getPreProcess = function (editor) {
+      return editor.getParam('paste_preprocess');
+    };
+    var getPostProcess = function (editor) {
+      return editor.getParam('paste_postprocess');
+    };
+    var getWebkitStyles = function (editor) {
+      return editor.getParam('paste_webkit_styles');
+    };
+    var shouldRemoveWebKitStyles = function (editor) {
+      return editor.getParam('paste_remove_styles_if_webkit', true);
+    };
+    var shouldMergeFormats = function (editor) {
+      return editor.getParam('paste_merge_formats', true);
+    };
+    var isSmartPasteEnabled = function (editor) {
+      return editor.getParam('smart_paste', true);
+    };
+    var isPasteAsTextEnabled = function (editor) {
+      return editor.getParam('paste_as_text', false);
+    };
+    var getRetainStyleProps = function (editor) {
+      return editor.getParam('paste_retain_style_properties');
+    };
+    var getWordValidElements = function (editor) {
+      var defaultValidElements = '-strong/b,-em/i,-u,-span,-p,-ol,-ul,-li,-h1,-h2,-h3,-h4,-h5,-h6,' + '-p/div,-a[href|name],sub,sup,strike,br,del,table[width],tr,' + 'td[colspan|rowspan|width],th[colspan|rowspan|width],thead,tfoot,tbody';
+      return editor.getParam('paste_word_valid_elements', defaultValidElements);
+    };
+    var shouldConvertWordFakeLists = function (editor) {
+      return editor.getParam('paste_convert_word_fake_lists', true);
+    };
+    var shouldUseDefaultFilters = function (editor) {
+      return editor.getParam('paste_enable_default_filters', true);
+    };
+    var Settings = {
+      shouldPlainTextInform: shouldPlainTextInform,
+      shouldBlockDrop: shouldBlockDrop,
+      shouldPasteDataImages: shouldPasteDataImages,
+      shouldFilterDrop: shouldFilterDrop,
+      getPreProcess: getPreProcess,
+      getPostProcess: getPostProcess,
+      getWebkitStyles: getWebkitStyles,
+      shouldRemoveWebKitStyles: shouldRemoveWebKitStyles,
+      shouldMergeFormats: shouldMergeFormats,
+      isSmartPasteEnabled: isSmartPasteEnabled,
+      isPasteAsTextEnabled: isPasteAsTextEnabled,
+      getRetainStyleProps: getRetainStyleProps,
+      getWordValidElements: getWordValidElements,
+      shouldConvertWordFakeLists: shouldConvertWordFakeLists,
+      shouldUseDefaultFilters: shouldUseDefaultFilters
+    };
+
+    var shouldInformUserAboutPlainText = function (editor, userIsInformedState) {
+      return userIsInformedState.get() === false && Settings.shouldPlainTextInform(editor);
+    };
+    var displayNotification = function (editor, message) {
+      editor.notificationManager.open({
+        text: editor.translate(message),
+        type: 'info'
+      });
+    };
+    var togglePlainTextPaste = function (editor, clipboard, userIsInformedState) {
+      if (clipboard.pasteFormat.get() === 'text') {
+        clipboard.pasteFormat.set('html');
+        Events.firePastePlainTextToggle(editor, false);
+      } else {
+        clipboard.pasteFormat.set('text');
+        Events.firePastePlainTextToggle(editor, true);
+        if (shouldInformUserAboutPlainText(editor, userIsInformedState)) {
+          displayNotification(editor, 'Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.');
+          userIsInformedState.set(true);
+        }
+      }
+      editor.focus();
+    };
+    var Actions = { togglePlainTextPaste: togglePlainTextPaste };
+
+    var register = function (editor, clipboard, userIsInformedState) {
+      editor.addCommand('mceTogglePlainTextPaste', function () {
+        Actions.togglePlainTextPaste(editor, clipboard, userIsInformedState);
+      });
+      editor.addCommand('mceInsertClipboardContent', function (ui, value) {
+        if (value.content) {
+          clipboard.pasteHtml(value.content, value.internal);
+        }
+        if (value.text) {
+          clipboard.pasteText(value.text);
+        }
+      });
+    };
+    var Commands = { register: register };
+
+    var global$1 = tinymce.util.Tools.resolve('tinymce.Env');
+
+    var global$2 = tinymce.util.Tools.resolve('tinymce.util.Delay');
+
+    var global$3 = tinymce.util.Tools.resolve('tinymce.util.Tools');
+
+    var global$4 = tinymce.util.Tools.resolve('tinymce.util.VK');
+
+    var internalMimeType = 'x-tinymce/html';
+    var internalMark = '<!-- ' + internalMimeType + ' -->';
+    var mark = function (html) {
+      return internalMark + html;
+    };
+    var unmark = function (html) {
+      return html.replace(internalMark, '');
+    };
+    var isMarked = function (html) {
+      return html.indexOf(internalMark) !== -1;
+    };
+    var InternalHtml = {
+      mark: mark,
+      unmark: unmark,
+      isMarked: isMarked,
+      internalHtmlMime: function () {
+        return internalMimeType;
+      }
+    };
+
+    var global$5 = tinymce.util.Tools.resolve('tinymce.html.Entities');
+
+    var isPlainText = function (text) {
+      return !/<(?:\/?(?!(?:div|p|br|span)>)\w+|(?:(?!(?:span style="white-space:\s?pre;?">)|br\s?\/>))\w+\s[^>]+)>/i.test(text);
+    };
+    var toBRs = function (text) {
+      return text.replace(/\r?\n/g, '<br>');
+    };
+    var openContainer = function (rootTag, rootAttrs) {
+      var key;
+      var attrs = [];
+      var tag = '<' + rootTag;
+      if (typeof rootAttrs === 'object') {
+        for (key in rootAttrs) {
+          if (rootAttrs.hasOwnProperty(key)) {
+            attrs.push(key + '="' + global$5.encodeAllRaw(rootAttrs[key]) + '"');
+          }
+        }
+        if (attrs.length) {
+          tag += ' ' + attrs.join(' ');
+        }
+      }
+      return tag + '>';
+    };
+    var toBlockElements = function (text, rootTag, rootAttrs) {
+      var blocks = text.split(/\n\n/);
+      var tagOpen = openContainer(rootTag, rootAttrs);
+      var tagClose = '</' + rootTag + '>';
+      var paragraphs = global$3.map(blocks, function (p) {
+        return p.split(/\n/).join('<br />');
+      });
+      var stitch = function (p) {
+        return tagOpen + p + tagClose;
+      };
+      return paragraphs.length === 1 ? paragraphs[0] : global$3.map(paragraphs, stitch).join('');
+    };
+    var convert = function (text, rootTag, rootAttrs) {
+      return rootTag ? toBlockElements(text, rootTag, rootAttrs) : toBRs(text);
+    };
+    var Newlines = {
+      isPlainText: isPlainText,
+      convert: convert,
+      toBRs: toBRs,
+      toBlockElements: toBlockElements
+    };
+
+    var global$6 = tinymce.util.Tools.resolve('tinymce.html.DomParser');
+
+    var global$7 = tinymce.util.Tools.resolve('tinymce.html.Node');
+
+    var global$8 = tinymce.util.Tools.resolve('tinymce.html.Schema');
+
+    var global$9 = tinymce.util.Tools.resolve('tinymce.html.Serializer');
+
+    function filter(content, items) {
+      global$3.each(items, function (v) {
+        if (v.constructor === RegExp) {
+          content = content.replace(v, '');
+        } else {
+          content = content.replace(v[0], v[1]);
+        }
+      });
+      return content;
+    }
+    function innerText(html) {
+      var schema = global$8();
+      var domParser = global$6({}, schema);
+      var text = '';
+      var shortEndedElements = schema.getShortEndedElements();
+      var ignoreElements = global$3.makeMap('script noscript style textarea video audio iframe object', ' ');
+      var blockElements = schema.getBlockElements();
+      function walk(node) {
+        var name$$1 = node.name, currentNode = node;
+        if (name$$1 === 'br') {
+          text += '\n';
+          return;
+        }
+        if (name$$1 === 'wbr') {
+          return;
+        }
+        if (shortEndedElements[name$$1]) {
+          text += ' ';
+        }
+        if (ignoreElements[name$$1]) {
+          text += ' ';
+          return;
+        }
+        if (node.type === 3) {
+          text += node.value;
+        }
+        if (!node.shortEnded) {
+          if (node = node.firstChild) {
+            do {
+              walk(node);
+            } while (node = node.next);
+          }
+        }
+        if (blockElements[name$$1] && currentNode.next) {
+          text += '\n';
+          if (name$$1 === 'p') {
+            text += '\n';
+          }
+        }
+      }
+      html = filter(html, [/<!\[[^\]]+\]>/g]);
+      walk(domParser.parse(html));
+      return text;
+    }
+    function trimHtml(html) {
+      function trimSpaces(all, s1, s2) {
+        if (!s1 && !s2) {
+          return ' ';
+        }
+        return '\xA0';
+      }
+      html = filter(html, [
+        /^[\s\S]*<body[^>]*>\s*|\s*<\/body[^>]*>[\s\S]*$/ig,
+        /<!--StartFragment-->|<!--EndFragment-->/g,
+        [
+          /( ?)<span class="Apple-converted-space">\u00a0<\/span>( ?)/g,
+          trimSpaces
+        ],
+        /<br class="Apple-interchange-newline">/g,
+        /<br>$/i
+      ]);
+      return html;
+    }
+    function createIdGenerator(prefix) {
+      var count = 0;
+      return function () {
+        return prefix + count++;
+      };
+    }
+    var isMsEdge = function () {
+      return navigator.userAgent.indexOf(' Edge/') !== -1;
+    };
+    var Utils = {
+      filter: filter,
+      innerText: innerText,
+      trimHtml: trimHtml,
+      createIdGenerator: createIdGenerator,
+      isMsEdge: isMsEdge
+    };
+
+    function isWordContent(content) {
+      return /<font face="Times New Roman"|class="?Mso|style="[^"]*\bmso-|style='[^'']*\bmso-|w:WordDocument/i.test(content) || /class="OutlineElement/.test(content) || /id="?docs\-internal\-guid\-/.test(content);
+    }
+    function isNumericList(text) {
+      var found, patterns;
+      patterns = [
+        /^[IVXLMCD]{1,2}\.[ \u00a0]/,
+        /^[ivxlmcd]{1,2}\.[ \u00a0]/,
+        /^[a-z]{1,2}[\.\)][ \u00a0]/,
+        /^[A-Z]{1,2}[\.\)][ \u00a0]/,
+        /^[0-9]+\.[ \u00a0]/,
+        /^[\u3007\u4e00\u4e8c\u4e09\u56db\u4e94\u516d\u4e03\u516b\u4e5d]+\.[ \u00a0]/,
+        /^[\u58f1\u5f10\u53c2\u56db\u4f0d\u516d\u4e03\u516b\u4e5d\u62fe]+\.[ \u00a0]/
+      ];
+      text = text.replace(/^[\u00a0 ]+/, '');
+      global$3.each(patterns, function (pattern) {
+        if (pattern.test(text)) {
+          found = true;
+          return false;
+        }
+      });
+      return found;
+    }
+    function isBulletList(text) {
+      return /^[\s\u00a0]*[\u2022\u00b7\u00a7\u25CF]\s*/.test(text);
+    }
+    function convertFakeListsToProperLists(node) {
+      var currentListNode, prevListNode, lastLevel = 1;
+      function getText(node) {
+        var txt = '';
+        if (node.type === 3) {
+          return node.value;
+        }
+        if (node = node.firstChild) {
+          do {
+            txt += getText(node);
+          } while (node = node.next);
+        }
+        return txt;
+      }
+      function trimListStart(node, regExp) {
+        if (node.type === 3) {
+          if (regExp.test(node.value)) {
+            node.value = node.value.replace(regExp, '');
+            return false;
+          }
+        }
+        if (node = node.firstChild) {
+          do {
+            if (!trimListStart(node, regExp)) {
+              return false;
+            }
+          } while (node = node.next);
+        }
+        return true;
+      }
+      function removeIgnoredNodes(node) {
+        if (node._listIgnore) {
+          node.remove();
+          return;
+        }
+        if (node = node.firstChild) {
+          do {
+            removeIgnoredNodes(node);
+          } while (node = node.next);
+        }
+      }
+      function convertParagraphToLi(paragraphNode, listName, start) {
+        var level = paragraphNode._listLevel || lastLevel;
+        if (level !== lastLevel) {
+          if (level < lastLevel) {
+            if (currentListNode) {
+              currentListNode = currentListNode.parent.parent;
+            }
+          } else {
+            prevListNode = currentListNode;
+            currentListNode = null;
+          }
+        }
+        if (!currentListNode || currentListNode.name !== listName) {
+          prevListNode = prevListNode || currentListNode;
+          currentListNode = new global$7(listName, 1);
+          if (start > 1) {
+            currentListNode.attr('start', '' + start);
+          }
+          paragraphNode.wrap(currentListNode);
+        } else {
+          currentListNode.append(paragraphNode);
+        }
+        paragraphNode.name = 'li';
+        if (level > lastLevel && prevListNode) {
+          prevListNode.lastChild.append(currentListNode);
+        }
+        lastLevel = level;
+        removeIgnoredNodes(paragraphNode);
+        trimListStart(paragraphNode, /^\u00a0+/);
+        trimListStart(paragraphNode, /^\s*([\u2022\u00b7\u00a7\u25CF]|\w+\.)/);
+        trimListStart(paragraphNode, /^\u00a0+/);
+      }
+      var elements = [];
+      var child = node.firstChild;
+      while (typeof child !== 'undefined' && child !== null) {
+        elements.push(child);
+        child = child.walk();
+        if (child !== null) {
+          while (typeof child !== 'undefined' && child.parent !== node) {
+            child = child.walk();
+          }
+        }
+      }
+      for (var i = 0; i < elements.length; i++) {
+        node = elements[i];
+        if (node.name === 'p' && node.firstChild) {
+          var nodeText = getText(node);
+          if (isBulletList(nodeText)) {
+            convertParagraphToLi(node, 'ul');
+            continue;
+          }
+          if (isNumericList(nodeText)) {
+            var matches = /([0-9]+)\./.exec(nodeText);
+            var start = 1;
+            if (matches) {
+              start = parseInt(matches[1], 10);
+            }
+            convertParagraphToLi(node, 'ol', start);
+            continue;
+          }
+          if (node._listLevel) {
+            convertParagraphToLi(node, 'ul', 1);
+            continue;
+          }
+          currentListNode = null;
+        } else {
+          prevListNode = currentListNode;
+          currentListNode = null;
+        }
+      }
+    }
+    function filterStyles(editor, validStyles, node, styleValue) {
+      var outputStyles = {}, matches;
+      var styles = editor.dom.parseStyle(styleValue);
+      global$3.each(styles, function (value, name) {
+        switch (name) {
+        case 'mso-list':
+          matches = /\w+ \w+([0-9]+)/i.exec(styleValue);
+          if (matches) {
+            node._listLevel = parseInt(matches[1], 10);
+          }
+          if (/Ignore/i.test(value) && node.firstChild) {
+            node._listIgnore = true;
+            node.firstChild._listIgnore = true;
+          }
+          break;
+        case 'horiz-align':
+          name = 'text-align';
+          break;
+        case 'vert-align':
+          name = 'vertical-align';
+          break;
+        case 'font-color':
+        case 'mso-foreground':
+          name = 'color';
+          break;
+        case 'mso-background':
+        case 'mso-highlight':
+          name = 'background';
+          break;
+        case 'font-weight':
+        case 'font-style':
+          if (value !== 'normal') {
+            outputStyles[name] = value;
+          }
+          return;
+        case 'mso-element':
+          if (/^(comment|comment-list)$/i.test(value)) {
+            node.remove();
+            return;
+          }
+          break;
+        }
+        if (name.indexOf('mso-comment') === 0) {
+          node.remove();
+          return;
+        }
+        if (name.indexOf('mso-') === 0) {
+          return;
+        }
+        if (Settings.getRetainStyleProps(editor) === 'all' || validStyles && validStyles[name]) {
+          outputStyles[name] = value;
+        }
+      });
+      if (/(bold)/i.test(outputStyles['font-weight'])) {
+        delete outputStyles['font-weight'];
+        node.wrap(new global$7('b', 1));
+      }
+      if (/(italic)/i.test(outputStyles['font-style'])) {
+        delete outputStyles['font-style'];
+        node.wrap(new global$7('i', 1));
+      }
+      outputStyles = editor.dom.serializeStyle(outputStyles, node.name);
+      if (outputStyles) {
+        return outputStyles;
+      }
+      return null;
+    }
+    var filterWordContent = function (editor, content) {
+        
+        console.log("filterWordContent 3");
+        console.log(content);
+        
+        content = content.replace(/\<!\[(if !vml|endif)\]\>/g, '');// removes <![if !vml]> & <![endif]>
+        
+        
+      var retainStyleProperties, validStyles;
+      retainStyleProperties = Settings.getRetainStyleProps(editor);
+      if (retainStyleProperties) {
+        validStyles = global$3.makeMap(retainStyleProperties.split(/[, ]/));
+      }
+      
+      content = Utils.filter(content, [
+        /<br class="?Apple-interchange-newline"?>/gi,
+        /<b[^>]+id="?docs-internal-[^>]*>/gi,
+        /<!--[\s\S]+?-->/gi,
+        /<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|img|meta|link|style|\w:\w+)(?=[\s\/>]))[^>]*>/gi,
+        [
+          /<(\/?)s>/gi,
+          '<$1strike>'
+        ],
+        [
+          /&nbsp;/gi,
+          '\xA0'
+        ],
+        [
+          /<span\s+style\s*=\s*"\s*mso-spacerun\s*:\s*yes\s*;?\s*"\s*>([\s\u00a0]*)<\/span>/gi,
+          function (str, spaces) {
+            return spaces.length > 0 ? spaces.replace(/./, ' ').slice(Math.floor(spaces.length / 2)).split('').join('\xA0') : '';
+          }
+        ]
+      ]);
+      
+      var validElements = Settings.getWordValidElements(editor);
+      var schema = global$8({
+        valid_elements: validElements,
+        valid_children: '-li[p]'
+      });
+      global$3.each(schema.elements, function (rule) {
+        if (!rule.attributes.class) {
+          rule.attributes.class = {};
+          rule.attributesOrder.push('class');
+        }
+        if (!rule.attributes.style) {
+          rule.attributes.style = {};
+          rule.attributesOrder.push('style');
+        }
+      });
+      var domParser = global$6({}, schema);
+      domParser.addAttributeFilter('style', function (nodes) {
+        var i = nodes.length, node;
+        while (i--) {
+          node = nodes[i];
+          node.attr('style', filterStyles(editor, validStyles, node, node.attr('style')));
+          if (node.name === 'span' && node.parent && !node.attributes.length) {
+            node.unwrap();
+          }
+        }
+      });
+      domParser.addAttributeFilter('class', function (nodes) {
+        var i = nodes.length, node, className;
+        while (i--) {
+          node = nodes[i];
+          className = node.attr('class');
+          if (/^(MsoCommentReference|MsoCommentText|msoDel)$/i.test(className)) {
+            node.remove();
+          }
+          node.attr('class', null);
+        }
+      });
+      domParser.addNodeFilter('del', function (nodes) {
+        var i = nodes.length;
+        while (i--) {
+          nodes[i].remove();
+        }
+      });
+      domParser.addNodeFilter('a', function (nodes) {
+        var i = nodes.length, node, href, name;
+        while (i--) {
+          node = nodes[i];
+          href = node.attr('href');
+          name = node.attr('name');
+          if (href && href.indexOf('#_msocom_') !== -1) {
+            node.remove();
+            continue;
+          }
+          if (href && href.indexOf('file://') === 0) {
+            href = href.split('#')[1];
+            if (href) {
+              href = '#' + href;
+            }
+          }
+          if (!href && !name) {
+            node.unwrap();
+          } else {
+            if (name && !/^_?(?:toc|edn|ftn)/i.test(name)) {
+              node.unwrap();
+              continue;
+            }
+            node.attr({
+              href: href,
+              name: name
+            });
+          }
+        }
+      });
+      var rootNode = domParser.parse(content);
+      if (Settings.shouldConvertWordFakeLists(editor)) {
+        convertFakeListsToProperLists(rootNode);
+      }
+      content = global$9({ validate: editor.settings.validate }, schema).serialize(rootNode);
+      return content;
+    };
+    var preProcess = function (editor, content) {
+      return Settings.shouldUseDefaultFilters(editor) ? filterWordContent(editor, content) : content;
+    };
+    var WordFilter = {
+      preProcess: preProcess,
+      isWordContent: isWordContent
+    };
+
+    var processResult = function (content, cancelled) {
+      return {
+        content: content,
+        cancelled: cancelled
+      };
+    };
+    var postProcessFilter = function (editor, html, internal, isWordHtml) {
+      var tempBody = editor.dom.create('div', { style: 'display:none' }, html);
+      var postProcessArgs = Events.firePastePostProcess(editor, tempBody, internal, isWordHtml);
+      return processResult(postProcessArgs.node.innerHTML, postProcessArgs.isDefaultPrevented());
+    };
+    var filterContent = function (editor, content, internal, isWordHtml) {
+      var preProcessArgs = Events.firePastePreProcess(editor, content, internal, isWordHtml);
+      if (editor.hasEventListeners('PastePostProcess') && !preProcessArgs.isDefaultPrevented()) {
+        return postProcessFilter(editor, preProcessArgs.content, internal, isWordHtml);
+      } else {
+        return processResult(preProcessArgs.content, preProcessArgs.isDefaultPrevented());
+      }
+    };
+    var process = function (editor, html, internal) {
+      var isWordHtml = WordFilter.isWordContent(html);
+      var content = isWordHtml ? WordFilter.preProcess(editor, html) : html;
+      return filterContent(editor, content, internal, isWordHtml);
+    };
+    var ProcessFilters = { process: process };
+
+    var removeMeta = function (editor, html) {
+      var body = editor.dom.create('body', {}, html);
+      global$3.each(body.querySelectorAll('meta'), function (elm) {
+        return elm.parentNode.removeChild(elm);
+      });
+      return body.innerHTML;
+    };
+    var pasteHtml = function (editor, html) {
+      editor.insertContent(removeMeta(editor, html), {
+        merge: Settings.shouldMergeFormats(editor),
+        paste: true
+      });
+      return true;
+    };
+    var isAbsoluteUrl = function (url) {
+      return /^https?:\/\/[\w\?\-\/+=.&%@~#]+$/i.test(url);
+    };
+    var isImageUrl = function (url) {
+      return isAbsoluteUrl(url) && /.(gif|jpe?g|png)$/.test(url);
+    };
+    var createImage = function (editor, url, pasteHtmlFn) {
+      editor.undoManager.extra(function () {
+        pasteHtmlFn(editor, url);
+      }, function () {
+        editor.insertContent('<img src="' + url + '">');
+      });
+      return true;
+    };
+    var createLink = function (editor, url, pasteHtmlFn) {
+      editor.undoManager.extra(function () {
+        pasteHtmlFn(editor, url);
+      }, function () {
+        editor.execCommand('mceInsertLink', false, url);
+      });
+      return true;
+    };
+    var linkSelection = function (editor, html, pasteHtmlFn) {
+      return editor.selection.isCollapsed() === false && isAbsoluteUrl(html) ? createLink(editor, html, pasteHtmlFn) : false;
+    };
+    var insertImage = function (editor, html, pasteHtmlFn) {
+      return isImageUrl(html) ? createImage(editor, html, pasteHtmlFn) : false;
+    };
+    var smartInsertContent = function (editor, html) {
+      global$3.each([
+        linkSelection,
+        insertImage,
+        pasteHtml
+      ], function (action) {
+        return action(editor, html, pasteHtml) !== true;
+      });
+    };
+    var insertContent = function (editor, html) {
+      if (Settings.isSmartPasteEnabled(editor) === false) {
+        pasteHtml(editor, html);
+      } else {
+        smartInsertContent(editor, html);
+      }
+    };
+    var SmartPaste = {
+      isImageUrl: isImageUrl,
+      isAbsoluteUrl: isAbsoluteUrl,
+      insertContent: insertContent
+    };
+
+    var constant = function (value) {
+      return function () {
+        return value;
+      };
+    };
+    function curry(fn) {
+      var initialArgs = [];
+      for (var _i = 1; _i < arguments.length; _i++) {
+        initialArgs[_i - 1] = arguments[_i];
+      }
+      return function () {
+        var restArgs = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+          restArgs[_i] = arguments[_i];
+        }
+        var all = initialArgs.concat(restArgs);
+        return fn.apply(null, all);
+      };
+    }
+    var never = constant(false);
+    var always = constant(true);
+
+    var never$1 = never;
+    var always$1 = always;
+    var none = function () {
+      return NONE;
+    };
+    var NONE = function () {
+      var eq = function (o) {
+        return o.isNone();
+      };
+      var call$$1 = function (thunk) {
+        return thunk();
+      };
+      var id = function (n) {
+        return n;
+      };
+      var noop$$1 = function () {
+      };
+      var nul = function () {
+        return null;
+      };
+      var undef = function () {
+        return undefined;
+      };
+      var me = {
+        fold: function (n, s) {
+          return n();
+        },
+        is: never$1,
+        isSome: never$1,
+        isNone: always$1,
+        getOr: id,
+        getOrThunk: call$$1,
+        getOrDie: function (msg) {
+          throw new Error(msg || 'error: getOrDie called on none.');
+        },
+        getOrNull: nul,
+        getOrUndefined: undef,
+        or: id,
+        orThunk: call$$1,
+        map: none,
+        ap: none,
+        each: noop$$1,
+        bind: none,
+        flatten: none,
+        exists: never$1,
+        forall: always$1,
+        filter: none,
+        equals: eq,
+        equals_: eq,
+        toArray: function () {
+          return [];
+        },
+        toString: constant('none()')
+      };
+      if (Object.freeze)
+        Object.freeze(me);
+      return me;
+    }();
+    var some = function (a) {
+      var constant_a = function () {
+        return a;
+      };
+      var self = function () {
+        return me;
+      };
+      var map = function (f) {
+        return some(f(a));
+      };
+      var bind = function (f) {
+        return f(a);
+      };
+      var me = {
+        fold: function (n, s) {
+          return s(a);
+        },
+        is: function (v) {
+          return a === v;
+        },
+        isSome: always$1,
+        isNone: never$1,
+        getOr: constant_a,
+        getOrThunk: constant_a,
+        getOrDie: constant_a,
+        getOrNull: constant_a,
+        getOrUndefined: constant_a,
+        or: self,
+        orThunk: self,
+        map: map,
+        ap: function (optfab) {
+          return optfab.fold(none, function (fab) {
+            return some(fab(a));
+          });
+        },
+        each: function (f) {
+          f(a);
+        },
+        bind: bind,
+        flatten: constant_a,
+        exists: bind,
+        forall: bind,
+        filter: function (f) {
+          return f(a) ? me : NONE;
+        },
+        equals: function (o) {
+          return o.is(a);
+        },
+        equals_: function (o, elementEq) {
+          return o.fold(never$1, function (b) {
+            return elementEq(a, b);
+          });
+        },
+        toArray: function () {
+          return [a];
+        },
+        toString: function () {
+          return 'some(' + a + ')';
+        }
+      };
+      return me;
+    };
+    var from = function (value) {
+      return value === null || value === undefined ? NONE : some(value);
+    };
+    var Option = {
+      some: some,
+      none: none,
+      from: from
+    };
+
+    var typeOf = function (x) {
+      if (x === null)
+        return 'null';
+      var t = typeof x;
+      if (t === 'object' && Array.prototype.isPrototypeOf(x))
+        return 'array';
+      if (t === 'object' && String.prototype.isPrototypeOf(x))
+        return 'string';
+      return t;
+    };
+    var isType = function (type) {
+      return function (value) {
+        return typeOf(value) === type;
+      };
+    };
+    var isFunction = isType('function');
+
+    var map = function (xs, f) {
+      var len = xs.length;
+      var r = new Array(len);
+      for (var i = 0; i < len; i++) {
+        var x = xs[i];
+        r[i] = f(x, i, xs);
+      }
+      return r;
+    };
+    var each = function (xs, f) {
+      for (var i = 0, len = xs.length; i < len; i++) {
+        var x = xs[i];
+        f(x, i, xs);
+      }
+    };
+    var filter$1 = function (xs, pred) {
+      var r = [];
+      for (var i = 0, len = xs.length; i < len; i++) {
+        var x = xs[i];
+        if (pred(x, i, xs)) {
+          r.push(x);
+        }
+      }
+      return r;
+    };
+    var slice = Array.prototype.slice;
+    var from$1 = isFunction(Array.from) ? Array.from : function (x) {
+      return slice.call(x);
+    };
+
+    var nu = function (baseFn) {
+      var data = Option.none();
+      var callbacks = [];
+      var map$$1 = function (f) {
+        return nu(function (nCallback) {
+          get(function (data) {
+            nCallback(f(data));
+          });
+        });
+      };
+      var get = function (nCallback) {
+        if (isReady())
+          call(nCallback);
+        else
+          callbacks.push(nCallback);
+      };
+      var set = function (x) {
+        data = Option.some(x);
+        run(callbacks);
+        callbacks = [];
+      };
+      var isReady = function () {
+        return data.isSome();
+      };
+      var run = function (cbs) {
+        each(cbs, call);
+      };
+      var call = function (cb) {
+        data.each(function (x) {
+          setTimeout(function () {
+            cb(x);
+          }, 0);
+        });
+      };
+      baseFn(set);
+      return {
+        get: get,
+        map: map$$1,
+        isReady: isReady
+      };
+    };
+    var pure$1 = function (a) {
+      return nu(function (callback) {
+        callback(a);
+      });
+    };
+    var LazyValue = {
+      nu: nu,
+      pure: pure$1
+    };
+
+    var bounce = function (f) {
+      return function () {
+        var args = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+          args[_i] = arguments[_i];
+        }
+        var me = this;
+        setTimeout(function () {
+          f.apply(me, args);
+        }, 0);
+      };
+    };
+
+    var nu$1 = function (baseFn) {
+      var get = function (callback) {
+        baseFn(bounce(callback));
+      };
+      var map = function (fab) {
+        return nu$1(function (callback) {
+          get(function (a) {
+            var value = fab(a);
+            callback(value);
+          });
+        });
+      };
+      var bind = function (aFutureB) {
+        return nu$1(function (callback) {
+          get(function (a) {
+            aFutureB(a).get(callback);
+          });
+        });
+      };
+      var anonBind = function (futureB) {
+        return nu$1(function (callback) {
+          get(function (a) {
+            futureB.get(callback);
+          });
+        });
+      };
+      var toLazy = function () {
+        return LazyValue.nu(get);
+      };
+      var toCached = function () {
+        var cache = null;
+        return nu$1(function (callback) {
+          if (cache === null) {
+            cache = toLazy();
+          }
+          cache.get(callback);
+        });
+      };
+      return {
+        map: map,
+        bind: bind,
+        anonBind: anonBind,
+        toLazy: toLazy,
+        toCached: toCached,
+        get: get
+      };
+    };
+    var pure$2 = function (a) {
+      return nu$1(function (callback) {
+        callback(a);
+      });
+    };
+    var Future = {
+      nu: nu$1,
+      pure: pure$2
+    };
+
+    var par = function (asyncValues, nu) {
+      return nu(function (callback) {
+        var r = [];
+        var count = 0;
+        var cb = function (i) {
+          return function (value) {
+            r[i] = value;
+            count++;
+            if (count >= asyncValues.length) {
+              callback(r);
+            }
+          };
+        };
+        if (asyncValues.length === 0) {
+          callback([]);
+        } else {
+          each(asyncValues, function (asyncValue, i) {
+            asyncValue.get(cb(i));
+          });
+        }
+      });
+    };
+
+    var par$1 = function (futures) {
+      return par(futures, Future.nu);
+    };
+    var mapM = function (array, fn) {
+      var futures = map(array, fn);
+      return par$1(futures);
+    };
+
+    var pasteHtml$1 = function (editor, html, internalFlag) {
+      var internal = internalFlag ? internalFlag : InternalHtml.isMarked(html);
+      var args = ProcessFilters.process(editor, InternalHtml.unmark(html), internal);
+      if (args.cancelled === false) {
+        SmartPaste.insertContent(editor, args.content);
+      }
+    };
+    var pasteText = function (editor, text) {
+      text = editor.dom.encode(text).replace(/\r\n/g, '\n');
+      text = Newlines.convert(text, editor.settings.forced_root_block, editor.settings.forced_root_block_attrs);
+      pasteHtml$1(editor, text, false);
+    };
+    var getDataTransferItems = function (dataTransfer) {
+      var items = {};
+      var mceInternalUrlPrefix = 'data:text/mce-internal,';
+      if (dataTransfer) {
+        if (dataTransfer.getData) {
+          var legacyText = dataTransfer.getData('Text');
+          if (legacyText && legacyText.length > 0) {
+            if (legacyText.indexOf(mceInternalUrlPrefix) === -1) {
+              items['text/plain'] = legacyText;
+            }
+          }
+        }
+        if (dataTransfer.types) {
+          for (var i = 0; i < dataTransfer.types.length; i++) {
+            var contentType = dataTransfer.types[i];
+            try {
+              items[contentType] = dataTransfer.getData(contentType);
+            } catch (ex) {
+              items[contentType] = '';
+            }
+          }
+        }
+      }
+      return items;
+    };
+    var getClipboardContent = function (editor, clipboardEvent) {
+      var content = getDataTransferItems(clipboardEvent.clipboardData || editor.getDoc().dataTransfer);
+      return Utils.isMsEdge() ? global$3.extend(content, { 'text/html': '' }) : content;
+    };
+    var hasContentType = function (clipboardContent, mimeType) {
+      return mimeType in clipboardContent && clipboardContent[mimeType].length > 0;
+    };
+    var hasHtmlOrText = function (content) {
+      return hasContentType(content, 'text/html') || hasContentType(content, 'text/plain');
+    };
+    var getBase64FromUri = function (uri) {
+      var idx;
+      idx = uri.indexOf(',');
+      if (idx !== -1) {
+        return uri.substr(idx + 1);
+      }
+      return null;
+    };
+    var isValidDataUriImage = function (settings, imgElm) {
+      return settings.images_dataimg_filter ? settings.images_dataimg_filter(imgElm) : true;
+    };
+    var extractFilename = function (editor, str) {
+      var m = str.match(/([\s\S]+?)\.(?:jpeg|jpg|png|gif)$/i);
+      return m ? editor.dom.encode(m[1]) : null;
+    };
+    var uniqueId = Utils.createIdGenerator('mceclip');
+    var pasteImage = function (editor, imageItem) {
+      var base64 = getBase64FromUri(imageItem.uri);
+      var id = uniqueId();
+      var name$$1 = editor.settings.images_reuse_filename && imageItem.blob.name ? extractFilename(editor, imageItem.blob.name) : id;
+      var img = new Image();
+      img.src = imageItem.uri;
+      if (isValidDataUriImage(editor.settings, img)) {
+        var blobCache = editor.editorUpload.blobCache;
+        var blobInfo = void 0, existingBlobInfo = void 0;
+        existingBlobInfo = blobCache.findFirst(function (cachedBlobInfo) {
+          return cachedBlobInfo.base64() === base64;
+        });
+        if (!existingBlobInfo) {
+          blobInfo = blobCache.create(id, imageItem.blob, base64, name$$1);
+          blobCache.add(blobInfo);
+        } else {
+          blobInfo = existingBlobInfo;
+        }
+        pasteHtml$1(editor, '<img src="' + blobInfo.blobUri() + '">', false);
+      } else {
+        pasteHtml$1(editor, '<img src="' + imageItem.uri + '">', false);
+      }
+    };
+    var isClipboardEvent = function (event$$1) {
+      return event$$1.type === 'paste';
+    };
+    var readBlobsAsDataUris = function (items) {
+      return mapM(items, function (item) {
+        return Future.nu(function (resolve) {
+          var blob = item.getAsFile ? item.getAsFile() : item;
+          var reader = new window.FileReader();
+          reader.onload = function () {
+            resolve({
+              blob: blob,
+              uri: reader.result
+            });
+          };
+          reader.readAsDataURL(blob);
+        });
+      });
+    };
+    var getImagesFromDataTransfer = function (dataTransfer) {
+      var items = dataTransfer.items ? map(from$1(dataTransfer.items), function (item) {
+        return item.getAsFile();
+      }) : [];
+      var files = dataTransfer.files ? from$1(dataTransfer.files) : [];
+      var images = filter$1(items.length > 0 ? items : files, function (file) {
+        return /^image\/(jpeg|png|gif|bmp)$/.test(file.type);
+      });
+      return images;
+    };
+    var pasteImageData = function (editor, e, rng) {
+      var dataTransfer = isClipboardEvent(e) ? e.clipboardData : e.dataTransfer;
+      if (editor.settings.paste_data_images && dataTransfer) {
+        var images = getImagesFromDataTransfer(dataTransfer);
+        if (images.length > 0) {
+          e.preventDefault();
+          readBlobsAsDataUris(images).get(function (blobResults) {
+            if (rng) {
+              editor.selection.setRng(rng);
+            }
+            each(blobResults, function (result) {
+              pasteImage(editor, result);
+            });
+          });
+          return true;
+        }
+      }
+      return false;
+    };
+    var isBrokenAndroidClipboardEvent = function (e) {
+      var clipboardData = e.clipboardData;
+      return navigator.userAgent.indexOf('Android') !== -1 && clipboardData && clipboardData.items && clipboardData.items.length === 0;
+    };
+    var isKeyboardPasteEvent = function (e) {
+      return global$4.metaKeyPressed(e) && e.keyCode === 86 || e.shiftKey && e.keyCode === 45;
+    };
+    var registerEventHandlers = function (editor, pasteBin, pasteFormat) {
+      var keyboardPasteTimeStamp = 0;
+      var keyboardPastePlainTextState;
+      editor.on('keydown', function (e) {
+        function removePasteBinOnKeyUp(e) {
+          if (isKeyboardPasteEvent(e) && !e.isDefaultPrevented()) {
+            pasteBin.remove();
+          }
+        }
+        if (isKeyboardPasteEvent(e) && !e.isDefaultPrevented()) {
+          keyboardPastePlainTextState = e.shiftKey && e.keyCode === 86;
+          if (keyboardPastePlainTextState && global$1.webkit && navigator.userAgent.indexOf('Version/') !== -1) {
+            return;
+          }
+          e.stopImmediatePropagation();
+          keyboardPasteTimeStamp = new Date().getTime();
+          if (global$1.ie && keyboardPastePlainTextState) {
+            e.preventDefault();
+            Events.firePaste(editor, true);
+            return;
+          }
+          pasteBin.remove();
+          pasteBin.create();
+          editor.once('keyup', removePasteBinOnKeyUp);
+          editor.once('paste', function () {
+            editor.off('keyup', removePasteBinOnKeyUp);
+          });
+        }
+      });
+      function insertClipboardContent(clipboardContent, isKeyBoardPaste, plainTextMode, internal) {
+        var content, isPlainTextHtml;
+        if (hasContentType(clipboardContent, 'text/html')) {
+          content = clipboardContent['text/html'];
+        } else {
+          content = pasteBin.getHtml();
+          internal = internal ? internal : InternalHtml.isMarked(content);
+          if (pasteBin.isDefaultContent(content)) {
+            plainTextMode = true;
+          }
+        }
+        content = Utils.trimHtml(content);
+        pasteBin.remove();
+        isPlainTextHtml = internal === false && Newlines.isPlainText(content);
+        if (!content.length || isPlainTextHtml) {
+          plainTextMode = true;
+        }
+        if (plainTextMode) {
+          if (hasContentType(clipboardContent, 'text/plain') && isPlainTextHtml) {
+            content = clipboardContent['text/plain'];
+          } else {
+            content = Utils.innerText(content);
+          }
+        }
+        if (pasteBin.isDefaultContent(content)) {
+          if (!isKeyBoardPaste) {
+            editor.windowManager.alert('Please use Ctrl+V/Cmd+V keyboard shortcuts to paste contents.');
+          }
+          return;
+        }
+        if (plainTextMode) {
+          pasteText(editor, content);
+        } else {
+          pasteHtml$1(editor, content, internal);
+        }
+      }
+      var getLastRng = function () {
+        return pasteBin.getLastRng() || editor.selection.getRng();
+      };
+      editor.on('paste', function (e) {
+        var clipboardTimer = new Date().getTime();
+        var clipboardContent = getClipboardContent(editor, e);
+        var clipboardDelay = new Date().getTime() - clipboardTimer;
+        var isKeyBoardPaste = new Date().getTime() - keyboardPasteTimeStamp - clipboardDelay < 1000;
+        var plainTextMode = pasteFormat.get() === 'text' || keyboardPastePlainTextState;
+        var internal = hasContentType(clipboardContent, InternalHtml.internalHtmlMime());
+        keyboardPastePlainTextState = false;
+        if (e.isDefaultPrevented() || isBrokenAndroidClipboardEvent(e)) {
+          pasteBin.remove();
+          return;
+        }
+        if (!hasHtmlOrText(clipboardContent) && pasteImageData(editor, e, getLastRng())) {
+          pasteBin.remove();
+          return;
+        }
+        if (!isKeyBoardPaste) {
+          e.preventDefault();
+        }
+        if (global$1.ie && (!isKeyBoardPaste || e.ieFake) && !hasContentType(clipboardContent, 'text/html')) {
+          pasteBin.create();
+          editor.dom.bind(pasteBin.getEl(), 'paste', function (e) {
+            e.stopPropagation();
+          });
+          editor.getDoc().execCommand('Paste', false, null);
+          clipboardContent['text/html'] = pasteBin.getHtml();
+        }
+        if (hasContentType(clipboardContent, 'text/html')) {
+          e.preventDefault();
+          if (!internal) {
+            internal = InternalHtml.isMarked(clipboardContent['text/html']);
+          }
+          insertClipboardContent(clipboardContent, isKeyBoardPaste, plainTextMode, internal);
+        } else {
+          global$2.setEditorTimeout(editor, function () {
+            insertClipboardContent(clipboardContent, isKeyBoardPaste, plainTextMode, internal);
+          }, 0);
+        }
+      });
+    };
+    var registerEventsAndFilters = function (editor, pasteBin, pasteFormat) {
+      registerEventHandlers(editor, pasteBin, pasteFormat);
+      var src;
+      editor.parser.addNodeFilter('img', function (nodes, name$$1, args) {
+        var isPasteInsert = function (args) {
+          return args.data && args.data.paste === true;
+        };
+        var remove = function (node) {
+          if (!node.attr('data-mce-object') && src !== global$1.transparentSrc) {
+            node.remove();
+          }
+        };
+        var isWebKitFakeUrl = function (src) {
+          return src.indexOf('webkit-fake-url') === 0;
+        };
+        var isDataUri = function (src) {
+          return src.indexOf('data:') === 0;
+        };
+        if (!editor.settings.paste_data_images && isPasteInsert(args)) {
+          var i = nodes.length;
+          while (i--) {
+            src = nodes[i].attributes.map.src;
+            if (!src) {
+              continue;
+            }
+            if (isWebKitFakeUrl(src)) {
+              remove(nodes[i]);
+            } else if (!editor.settings.allow_html_data_urls && isDataUri(src)) {
+              remove(nodes[i]);
+            }
+          }
+        }
+      });
+    };
+
+    var getPasteBinParent = function (editor) {
+      return global$1.ie && editor.inline ? document.body : editor.getBody();
+    };
+    var isExternalPasteBin = function (editor) {
+      return getPasteBinParent(editor) !== editor.getBody();
+    };
+    var delegatePasteEvents = function (editor, pasteBinElm, pasteBinDefaultContent) {
+      if (isExternalPasteBin(editor)) {
+        editor.dom.bind(pasteBinElm, 'paste keyup', function (e) {
+          if (!isDefault(editor, pasteBinDefaultContent)) {
+            editor.fire('paste');
+          }
+        });
+      }
+    };
+    var create = function (editor, lastRngCell, pasteBinDefaultContent) {
+      var dom = editor.dom, body = editor.getBody();
+      var pasteBinElm;
+      lastRngCell.set(editor.selection.getRng());
+      pasteBinElm = editor.dom.add(getPasteBinParent(editor), 'div', {
+        'id': 'mcepastebin',
+        'class': 'mce-pastebin',
+        'contentEditable': true,
+        'data-mce-bogus': 'all',
+        'style': 'position: fixed; top: 50%; width: 10px; height: 10px; overflow: hidden; opacity: 0'
+      }, pasteBinDefaultContent);
+      if (global$1.ie || global$1.gecko) {
+        dom.setStyle(pasteBinElm, 'left', dom.getStyle(body, 'direction', true) === 'rtl' ? 65535 : -65535);
+      }
+      dom.bind(pasteBinElm, 'beforedeactivate focusin focusout', function (e) {
+        e.stopPropagation();
+      });
+      delegatePasteEvents(editor, pasteBinElm, pasteBinDefaultContent);
+      pasteBinElm.focus();
+      editor.selection.select(pasteBinElm, true);
+    };
+    var remove = function (editor, lastRngCell) {
+      if (getEl(editor)) {
+        var pasteBinClone = void 0;
+        var lastRng = lastRngCell.get();
+        while (pasteBinClone = editor.dom.get('mcepastebin')) {
+          editor.dom.remove(pasteBinClone);
+          editor.dom.unbind(pasteBinClone);
+        }
+        if (lastRng) {
+          editor.selection.setRng(lastRng);
+        }
+      }
+      lastRngCell.set(null);
+    };
+    var getEl = function (editor) {
+      return editor.dom.get('mcepastebin');
+    };
+    var getHtml = function (editor) {
+      var pasteBinElm, pasteBinClones, i, dirtyWrappers, cleanWrapper;
+      var copyAndRemove = function (toElm, fromElm) {
+        toElm.appendChild(fromElm);
+        editor.dom.remove(fromElm, true);
+      };
+      pasteBinClones = global$3.grep(getPasteBinParent(editor).childNodes, function (elm) {
+        return elm.id === 'mcepastebin';
+      });
+      pasteBinElm = pasteBinClones.shift();
+      global$3.each(pasteBinClones, function (pasteBinClone) {
+        copyAndRemove(pasteBinElm, pasteBinClone);
+      });
+      dirtyWrappers = editor.dom.select('div[id=mcepastebin]', pasteBinElm);
+      for (i = dirtyWrappers.length - 1; i >= 0; i--) {
+        cleanWrapper = editor.dom.create('div');
+        pasteBinElm.insertBefore(cleanWrapper, dirtyWrappers[i]);
+        copyAndRemove(cleanWrapper, dirtyWrappers[i]);
+      }
+      return pasteBinElm ? pasteBinElm.innerHTML : '';
+    };
+    var getLastRng = function (lastRng) {
+      return lastRng.get();
+    };
+    var isDefaultContent = function (pasteBinDefaultContent, content) {
+      return content === pasteBinDefaultContent;
+    };
+    var isPasteBin = function (elm) {
+      return elm && elm.id === 'mcepastebin';
+    };
+    var isDefault = function (editor, pasteBinDefaultContent) {
+      var pasteBinElm = getEl(editor);
+      return isPasteBin(pasteBinElm) && isDefaultContent(pasteBinDefaultContent, pasteBinElm.innerHTML);
+    };
+    var PasteBin = function (editor) {
+      var lastRng = Cell(null);
+      var pasteBinDefaultContent = '%MCEPASTEBIN%';
+      return {
+        create: function () {
+          return create(editor, lastRng, pasteBinDefaultContent);
+        },
+        remove: function () {
+          return remove(editor, lastRng);
+        },
+        getEl: function () {
+          return getEl(editor);
+        },
+        getHtml: function () {
+          return getHtml(editor);
+        },
+        getLastRng: function () {
+          return getLastRng(lastRng);
+        },
+        isDefault: function () {
+          return isDefault(editor, pasteBinDefaultContent);
+        },
+        isDefaultContent: function (content) {
+          return isDefaultContent(pasteBinDefaultContent, content);
+        }
+      };
+    };
+
+    var Clipboard = function (editor, pasteFormat) {
+      var pasteBin = PasteBin(editor);
+      editor.on('preInit', function () {
+        return registerEventsAndFilters(editor, pasteBin, pasteFormat);
+      });
+      return {
+        pasteFormat: pasteFormat,
+        pasteHtml: function (html, internalFlag) {
+          return pasteHtml$1(editor, html, internalFlag);
+        },
+        pasteText: function (text) {
+          return pasteText(editor, text);
+        },
+        pasteImageData: function (e, rng) {
+          return pasteImageData(editor, e, rng);
+        },
+        getDataTransferItems: getDataTransferItems,
+        hasHtmlOrText: hasHtmlOrText,
+        hasContentType: hasContentType
+      };
+    };
+
+    var noop$1 = function () {
+    };
+    var hasWorkingClipboardApi = function (clipboardData) {
+      return global$1.iOS === false && clipboardData !== undefined && typeof clipboardData.setData === 'function' && Utils.isMsEdge() !== true;
+    };
+    var setHtml5Clipboard = function (clipboardData, html, text) {
+      if (hasWorkingClipboardApi(clipboardData)) {
+        try {
+          clipboardData.clearData();
+          clipboardData.setData('text/html', html);
+          clipboardData.setData('text/plain', text);
+          clipboardData.setData(InternalHtml.internalHtmlMime(), html);
+          return true;
+        } catch (e) {
+          return false;
+        }
+      } else {
+        return false;
+      }
+    };
+    var setClipboardData = function (evt, data, fallback, done) {
+      if (setHtml5Clipboard(evt.clipboardData, data.html, data.text)) {
+        evt.preventDefault();
+        done();
+      } else {
+        fallback(data.html, done);
+      }
+    };
+    var fallback = function (editor) {
+      return function (html, done) {
+        var markedHtml = InternalHtml.mark(html);
+        var outer = editor.dom.create('div', {
+          'contenteditable': 'false',
+          'data-mce-bogus': 'all'
+        });
+        var inner = editor.dom.create('div', { contenteditable: 'true' }, markedHtml);
+        editor.dom.setStyles(outer, {
+          position: 'fixed',
+          top: '0',
+          left: '-3000px',
+          width: '1000px',
+          overflow: 'hidden'
+        });
+        outer.appendChild(inner);
+        editor.dom.add(editor.getBody(), outer);
+        var range = editor.selection.getRng();
+        inner.focus();
+        var offscreenRange = editor.dom.createRng();
+        offscreenRange.selectNodeContents(inner);
+        editor.selection.setRng(offscreenRange);
+        setTimeout(function () {
+          editor.selection.setRng(range);
+          outer.parentNode.removeChild(outer);
+          done();
+        }, 0);
+      };
+    };
+    var getData = function (editor) {
+      return {
+        html: editor.selection.getContent({ contextual: true }),
+        text: editor.selection.getContent({ format: 'text' })
+      };
+    };
+    var isTableSelection = function (editor) {
+      return !!editor.dom.getParent(editor.selection.getStart(), 'td[data-mce-selected],th[data-mce-selected]', editor.getBody());
+    };
+    var hasSelectedContent = function (editor) {
+      return !editor.selection.isCollapsed() || isTableSelection(editor);
+    };
+    var cut = function (editor) {
+      return function (evt) {
+        if (hasSelectedContent(editor)) {
+          setClipboardData(evt, getData(editor), fallback(editor), function () {
+            setTimeout(function () {
+              editor.execCommand('Delete');
+            }, 0);
+          });
+        }
+      };
+    };
+    var copy = function (editor) {
+      return function (evt) {
+        if (hasSelectedContent(editor)) {
+          setClipboardData(evt, getData(editor), fallback(editor), noop$1);
+        }
+      };
+    };
+    var register$1 = function (editor) {
+      editor.on('cut', cut(editor));
+      editor.on('copy', copy(editor));
+    };
+    var CutCopy = { register: register$1 };
+
+    var global$a = tinymce.util.Tools.resolve('tinymce.dom.RangeUtils');
+
+    var getCaretRangeFromEvent = function (editor, e) {
+      return global$a.getCaretRangeFromPoint(e.clientX, e.clientY, editor.getDoc());
+    };
+    var isPlainTextFileUrl = function (content) {
+      var plainTextContent = content['text/plain'];
+      return plainTextContent ? plainTextContent.indexOf('file://') === 0 : false;
+    };
+    var setFocusedRange = function (editor, rng) {
+      editor.focus();
+      editor.selection.setRng(rng);
+    };
+    var setup = function (editor, clipboard, draggingInternallyState) {
+      if (Settings.shouldBlockDrop(editor)) {
+        editor.on('dragend dragover draggesture dragdrop drop drag', function (e) {
+          e.preventDefault();
+          e.stopPropagation();
+        });
+      }
+      if (!Settings.shouldPasteDataImages(editor)) {
+        editor.on('drop', function (e) {
+          var dataTransfer = e.dataTransfer;
+          if (dataTransfer && dataTransfer.files && dataTransfer.files.length > 0) {
+            e.preventDefault();
+          }
+        });
+      }
+      editor.on('drop', function (e) {
+        var dropContent, rng;
+        rng = getCaretRangeFromEvent(editor, e);
+        if (e.isDefaultPrevented() || draggingInternallyState.get()) {
+          return;
+        }
+        dropContent = clipboard.getDataTransferItems(e.dataTransfer);
+        var internal = clipboard.hasContentType(dropContent, InternalHtml.internalHtmlMime());
+        if ((!clipboard.hasHtmlOrText(dropContent) || isPlainTextFileUrl(dropContent)) && clipboard.pasteImageData(e, rng)) {
+          return;
+        }
+        if (rng && Settings.shouldFilterDrop(editor)) {
+          var content_1 = dropContent['mce-internal'] || dropContent['text/html'] || dropContent['text/plain'];
+          if (content_1) {
+            e.preventDefault();
+            global$2.setEditorTimeout(editor, function () {
+              editor.undoManager.transact(function () {
+                if (dropContent['mce-internal']) {
+                  editor.execCommand('Delete');
+                }
+                setFocusedRange(editor, rng);
+                content_1 = Utils.trimHtml(content_1);
+                if (!dropContent['text/html']) {
+                  clipboard.pasteText(content_1);
+                } else {
+                  clipboard.pasteHtml(content_1, internal);
+                }
+              });
+            });
+          }
+        }
+      });
+      editor.on('dragstart', function (e) {
+        draggingInternallyState.set(true);
+      });
+      editor.on('dragover dragend', function (e) {
+        if (Settings.shouldPasteDataImages(editor) && draggingInternallyState.get() === false) {
+          e.preventDefault();
+          setFocusedRange(editor, getCaretRangeFromEvent(editor, e));
+        }
+        if (e.type === 'dragend') {
+          draggingInternallyState.set(false);
+        }
+      });
+    };
+    var DragDrop = { setup: setup };
+
+    var setup$1 = function (editor) {
+      var plugin = editor.plugins.umbpaste;
+      var preProcess = Settings.getPreProcess(editor);
+      if (preProcess) {
+        editor.on('PastePreProcess', function (e) {
+          preProcess.call(plugin, plugin, e);
+        });
+      }
+      var postProcess = Settings.getPostProcess(editor);
+      if (postProcess) {
+        editor.on('PastePostProcess', function (e) {
+          postProcess.call(plugin, plugin, e);
+        });
+      }
+    };
+    var PrePostProcess = { setup: setup$1 };
+
+    function addPreProcessFilter(editor, filterFunc) {
+      editor.on('PastePreProcess', function (e) {
+        e.content = filterFunc(editor, e.content, e.internal, e.wordContent);
+      });
+    }
+    function addPostProcessFilter(editor, filterFunc) {
+      editor.on('PastePostProcess', function (e) {
+        filterFunc(editor, e.node);
+      });
+    }
+    function removeExplorerBrElementsAfterBlocks(editor, html) {
+      if (!WordFilter.isWordContent(html)) {
+        return html;
+      }
+      var blockElements = [];
+      global$3.each(editor.schema.getBlockElements(), function (block, blockName) {
+        blockElements.push(blockName);
+      });
+      var explorerBlocksRegExp = new RegExp('(?:<br>&nbsp;[\\s\\r\\n]+|<br>)*(<\\/?(' + blockElements.join('|') + ')[^>]*>)(?:<br>&nbsp;[\\s\\r\\n]+|<br>)*', 'g');
+      html = Utils.filter(html, [[
+          explorerBlocksRegExp,
+          '$1'
+        ]]);
+      html = Utils.filter(html, [
+        [
+          /<br><br>/g,
+          '<BR><BR>'
+        ],
+        [
+          /<br>/g,
+          ' '
+        ],
+        [
+          /<BR><BR>/g,
+          '<br>'
+        ]
+      ]);
+      return html;
+    }
+    function removeWebKitStyles(editor, content, internal, isWordHtml) {
+      if (isWordHtml || internal) {
+        return content;
+      }
+      var webKitStylesSetting = Settings.getWebkitStyles(editor);
+      var webKitStyles;
+      if (Settings.shouldRemoveWebKitStyles(editor) === false || webKitStylesSetting === 'all') {
+        return content;
+      }
+      if (webKitStylesSetting) {
+        webKitStyles = webKitStylesSetting.split(/[, ]/);
+      }
+      if (webKitStyles) {
+        var dom_1 = editor.dom, node_1 = editor.selection.getNode();
+        content = content.replace(/(<[^>]+) style="([^"]*)"([^>]*>)/gi, function (all, before, value, after) {
+          var inputStyles = dom_1.parseStyle(dom_1.decode(value));
+          var outputStyles = {};
+          if (webKitStyles === 'none') {
+            return before + after;
+          }
+          for (var i = 0; i < webKitStyles.length; i++) {
+            var inputValue = inputStyles[webKitStyles[i]], currentValue = dom_1.getStyle(node_1, webKitStyles[i], true);
+            if (/color/.test(webKitStyles[i])) {
+              inputValue = dom_1.toHex(inputValue);
+              currentValue = dom_1.toHex(currentValue);
+            }
+            if (currentValue !== inputValue) {
+              outputStyles[webKitStyles[i]] = inputValue;
+            }
+          }
+          outputStyles = dom_1.serializeStyle(outputStyles, 'span');
+          if (outputStyles) {
+            return before + ' style="' + outputStyles + '"' + after;
+          }
+          return before + after;
+        });
+      } else {
+        content = content.replace(/(<[^>]+) style="([^"]*)"([^>]*>)/gi, '$1$3');
+      }
+      content = content.replace(/(<[^>]+) data-mce-style="([^"]+)"([^>]*>)/gi, function (all, before, value, after) {
+        return before + ' style="' + value + '"' + after;
+      });
+      return content;
+    }
+    function removeUnderlineAndFontInAnchor(editor, root) {
+      editor.$('a', root).find('font,u').each(function (i, node) {
+        editor.dom.remove(node, true);
+      });
+    }
+    var setup$2 = function (editor) {
+      if (global$1.webkit) {
+        addPreProcessFilter(editor, removeWebKitStyles);
+      }
+      if (global$1.ie) {
+        addPreProcessFilter(editor, removeExplorerBrElementsAfterBlocks);
+        addPostProcessFilter(editor, removeUnderlineAndFontInAnchor);
+      }
+    };
+    var Quirks = { setup: setup$2 };
+
+    var stateChange = function (editor, clipboard, e) {
+      var ctrl = e.control;
+      ctrl.active(clipboard.pasteFormat.get() === 'text');
+      editor.on('PastePlainTextToggle', function (e) {
+        ctrl.active(e.state);
+      });
+    };
+    var register$2 = function (editor, clipboard) {
+      var postRender = curry(stateChange, editor, clipboard);
+      editor.addButton('pastetext', {
+        active: false,
+        icon: 'pastetext',
+        tooltip: 'Paste as text',
+        cmd: 'mceTogglePlainTextPaste',
+        onPostRender: postRender
+      });
+      editor.addMenuItem('pastetext', {
+        text: 'Paste as text',
+        selectable: true,
+        active: clipboard.pasteFormat,
+        cmd: 'mceTogglePlainTextPaste',
+        onPostRender: postRender
+      });
+    };
+    var Buttons = { register: register$2 };
+
+    global.add('umbpaste', function (editor) {
+      if (DetectProPlugin.hasProPlugin(editor) === false) {
+        var userIsInformedState = Cell(false);
+        var draggingInternallyState = Cell(false);
+        var pasteFormat = Cell(Settings.isPasteAsTextEnabled(editor) ? 'text' : 'html');
+        var clipboard = Clipboard(editor, pasteFormat);
+        var quirks = Quirks.setup(editor);
+        Buttons.register(editor, clipboard);
+        Commands.register(editor, clipboard, userIsInformedState);
+        PrePostProcess.setup(editor);
+        CutCopy.register(editor);
+        DragDrop.setup(editor, clipboard, draggingInternallyState);
+        return Api.get(clipboard, quirks);
+      }
+    });
+    function Plugin () {
+    }
+
+    return Plugin;
+
+}());
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 8d96863610..0832dc0e15 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -204,6 +204,9 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
     function initEvents(editor){
 
         editor.on('SetContent', function (e) {
+            
+            console.log("setcontent", e)
+            
             var content = e.content;
 
             // Upload BLOB images (dragged/pasted ones)
@@ -233,14 +236,22 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
         });
     }
     
-    function cleanupPastedData(plugin, args) {
+    function cleanupPasteData(plugin, args) {
+        
+        console.log("cleanupPasteData", args.content);
         
         // Remove spans
-        var spanRemoveRegex = new RegExp("<\/?span[^>]*>([^<\/span]*)<\/span([^>]*)", "g");
-        args.content = args.content.replace(spanRemoveRegex,"");
+        //var spanRemoveRegex = new RegExp("</?span[^>]*>([^</span]*)</span([^>]*)", "g");
+        //args.content = args.content.replace(spanRemoveRegex, "$1");
+        args.content = args.content.replace(/<\s*span[^>]*>(.*?)<\s*\/\s*span>/g, "$1");
         
         // Convert b to strong.
-        args.content = args.content.replace(/<b([^>]*)>([^<\/b]*)<\/b([^>]*)>/g, "<strong$1>$2</strong$3>");
+        args.content = args.content.replace(/<\s*b([^>]*)>(.*?)<\s*\/\s*b([^>]*)>/g, "<strong$1>$2</strong$3>");
+        
+        // convert i to em
+        args.content = args.content.replace(/<\s*i([^>]*)>(.*?)<\s*\/\s*i([^>]*)>/g, "<em$1>$2</em$3>");
+        
+        console.log(args.content);
         
     }
 
@@ -272,6 +283,7 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                 //plugins that must always be active
                 plugins.push("autoresize");
                 plugins.push("noneditable");
+                plugins.push("image");
 
                 var modeTheme = '';
                 var modeInline = false;
@@ -344,11 +356,11 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                     init_instance_callback: initEvents
                 };
                 
-                if (tinyMceConfig.pasteTidying) {
-                    plugins.push("paste");
+                //if (tinyMceConfig.pasteTidying) {
+                    plugins.push("umbpaste");
                     
                     // We keep spans here, cause removing spans here also removes b-tags inside of them, instead we strip them out later.
-                    var validElements = "-b,-strong,-i,-em,span,p,a,table,th,thead,tbody,tr,td,ul,ol,li,dl,dt,dd,iframe,svg,img,hr,abbr,sub,sup,figure,picture";
+                    var validElements = "-strong/b,-em/i,-u,-span,-p,-ol,-ul,-li,-p/div,-a[href|name],sub,sup,strike,br,del,table[width],tr,td[colspan|rowspan|width],th[colspan|rowspan|width],thead,tfoot,tbody,img,ul,ol,li"
                     
                     // add valid elements from styleFormats.
                     var style, i = 0;
@@ -361,6 +373,10 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                     
                     var pasteConfig = {
                         
+                        //paste_block_drop: false,
+                        //paste_filter_drop: true,
+                        //paste_enable_default_filters: false, // to avoid stripping img tags from word.
+                        
                         paste_remove_styles: true,
                         paste_text_linebreaktype: true,
                         paste_strip_class_attributes: "all",
@@ -368,12 +384,12 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                         
                         paste_word_valid_elements: validElements,
                         
-                        paste_preprocess: prepaste
+                        paste_preprocess: cleanupPasteData
                         
                     };
                     
-                    angular.extend(config, cleanupPastedData);
-                }
+                    angular.extend(config, pasteConfig);
+                //}
                 
                 if (tinyMceConfig.customConfig) {
 

From 3c0b1797b783e0f802fb04bff9f094b86e537a6b Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Fri, 13 Sep 2019 15:32:26 +0100
Subject: [PATCH 588/776] Wraps all OEmbed items in a div with the magic CSS
 class of mceNonEditable which means users can highlight the entire item in
 one go, to copy/cut/move about as needed

---
 .../src/common/services/tinymce.service.js       | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 8f37f872b1..ef7461d699 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -436,7 +436,21 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
         },
 
         insertEmbeddedMediaInEditor: function (editor, preview) {
-            editor.insertContent(preview);
+            // Wrap HTML preview content here in a DIV with non-editable class of .mceNonEditable
+            // This turns it into a selectable/cutable block to move about
+
+            // TODO: Fix/discuss with Niels L that instagram & others seem will
+            // make their content clickable & navigate away from Umbraco
+
+            // TODO: Do we add data attributes here - so the button can be re-clicked to edit/modify the item
+            // or double/tripple clicked to bring the infinite editor back open
+            // data-embed-url="instagram.com/xyz" data-embed-width="300" data-emebed-height="200"
+
+            // TODO: Added extra CSS class of embeditem wonderting if we can
+            // highlight/show easier things that are not editable
+
+            var wrapper = tinymce.activeEditor.dom.create('div', {'class': 'mceNonEditable embeditem'}, preview);
+            editor.selection.setNode(wrapper);
         },
 
 

From a51f7b29de9c95b751f6997d1f18fd6f51fb5917 Mon Sep 17 00:00:00 2001
From: leekelleher <leekelleher@gmail.com>
Date: Wed, 11 Sep 2019 17:55:39 +0100
Subject: [PATCH 589/776] Help Drawer - Hide Tours if there are none

`vm.tours` is declared as an empty array (in the controller),
it isn't null, so we need to check the array length.
Otherwise if there are none, the "Tours" title is displayed.
---
 .../src/views/common/drawers/help/help.html                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html b/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html
index a0413ce1a6..4ae3121098 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html
@@ -9,7 +9,7 @@
         <umb-drawer-content>
 
         <!-- Tours -->
-        <div class="umb-help-section" ng-if="vm.tours" data-element="help-tours">
+        <div class="umb-help-section" ng-if="vm.tours.length > 0" data-element="help-tours">
 
             <h5 class="umb-help-section__title">Tours</h5>
 

From 3f4bff9ac366405052dfd51201d8a8ef2d0e38df Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Mon, 9 Sep 2019 19:40:08 +0200
Subject: [PATCH 590/776] Don't show NC delete confirmation if an item can't be
 deleted

---
 .../src/less/components/umb-nested-content.less      |  5 +++++
 .../nestedcontent/nestedcontent.controller.js        | 12 +++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
index 59c90972d2..d018e76c0d 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
@@ -154,6 +154,11 @@
 
 .umb-nested-content__icon--disabled {
     opacity: 0.3;
+    cursor: default !important;
+
+    &:hover {
+        color: @ui-option-type;
+    }
 }
 
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
index fbaab3f94f..ffc9f13286 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -271,13 +271,15 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
         };
 
         $scope.deleteNode = function (idx) {
-            if ($scope.nodes.length > $scope.model.config.minItems) {
-                $scope.nodes.splice(idx, 1);
-                $scope.setDirty();
-                updateModel();
-            }
+            $scope.nodes.splice(idx, 1);
+            $scope.setDirty();
+            updateModel();
         };
         $scope.requestDeleteNode = function (idx) {
+            if ($scope.nodes.length <= $scope.model.config.minItems) {
+                return;
+            }
+
             if ($scope.model.config.confirmDeletes === true) {
                 localizationService.localizeMany(["content_nestedContentDeleteItem", "general_delete", "general_cancel", "contentTypeEditor_yesDelete"]).then(function (data) {
                     const overlay = {

From f98df48c25aec1382c3dbe79f1e8bb112165d27e Mon Sep 17 00:00:00 2001
From: leekelleher <leekelleher@gmail.com>
Date: Wed, 11 Sep 2019 17:55:39 +0100
Subject: [PATCH 591/776] Help Drawer - Hide Tours if there are none

`vm.tours` is declared as an empty array (in the controller),
it isn't null, so we need to check the array length.
Otherwise if there are none, the "Tours" title is displayed.

(cherry picked from commit a51f7b29de9c95b751f6997d1f18fd6f51fb5917)
---
 .../src/views/common/drawers/help/help.html                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html b/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html
index 56db1fd88a..0ad1f21a86 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html
@@ -9,7 +9,7 @@
         <umb-drawer-content>
 
         <!-- Tours -->
-        <div class="umb-help-section" ng-if="vm.tours" data-element="help-tours">
+        <div class="umb-help-section" ng-if="vm.tours.length > 0" data-element="help-tours">
 
             <h5 class="umb-help-section__title">Tours</h5>
 

From b0e788fdaa746ab0017d0fb180d61bed0c3d4a56 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Mon, 9 Sep 2019 19:40:08 +0200
Subject: [PATCH 592/776] Don't show NC delete confirmation if an item can't be
 deleted

(cherry picked from commit 3f4bff9ac366405052dfd51201d8a8ef2d0e38df)
---
 .../src/less/components/umb-nested-content.less      |  5 +++++
 .../nestedcontent/nestedcontent.controller.js        | 12 +++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
index 59c90972d2..d018e76c0d 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
@@ -154,6 +154,11 @@
 
 .umb-nested-content__icon--disabled {
     opacity: 0.3;
+    cursor: default !important;
+
+    &:hover {
+        color: @ui-option-type;
+    }
 }
 
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
index aaf7ed08bb..68fcdc3e8b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -232,13 +232,15 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
         };
 
         $scope.deleteNode = function (idx) {
-            if ($scope.nodes.length > $scope.model.config.minItems) {
-                $scope.nodes.splice(idx, 1);
-                $scope.setDirty();
-                updateModel();
-            }
+            $scope.nodes.splice(idx, 1);
+            $scope.setDirty();
+            updateModel();
         };
         $scope.requestDeleteNode = function (idx) {
+            if ($scope.nodes.length <= $scope.model.config.minItems) {
+                return;
+            }
+
             if ($scope.model.config.confirmDeletes === true) {
                 localizationService.localizeMany(["content_nestedContentDeleteItem", "general_delete", "general_cancel", "contentTypeEditor_yesDelete"]).then(function (data) {
                     const overlay = {

From e83760c6bdc01523ac348a55772503cbbf001917 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sun, 8 Sep 2019 20:43:27 +0200
Subject: [PATCH 593/776] Fix textbox aria-required

---
 .../src/views/propertyeditors/textbox/textbox.html              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
index ff62629b1c..f8f9b18c7f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
@@ -4,7 +4,7 @@
                class="umb-property-editor umb-textstring textstring"
                val-server="value"
                ng-required="model.validation.mandatory"
-               aria-required="model.validation.mandatory"
+               aria-required="{{model.validation.mandatory}}"
                aria-invalid="False"
                ng-trim="false"
                ng-keyup="model.change()" />

From 0934a83aec39f659bb8970db37610a80f9423cc2 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sun, 8 Sep 2019 20:43:27 +0200
Subject: [PATCH 594/776] Fix textbox aria-required

(cherry picked from commit e83760c6bdc01523ac348a55772503cbbf001917)
---
 .../src/views/propertyeditors/textbox/textbox.html              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
index ff62629b1c..f8f9b18c7f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
@@ -4,7 +4,7 @@
                class="umb-property-editor umb-textstring textstring"
                val-server="value"
                ng-required="model.validation.mandatory"
-               aria-required="model.validation.mandatory"
+               aria-required="{{model.validation.mandatory}}"
                aria-invalid="False"
                ng-trim="false"
                ng-keyup="model.change()" />

From 1c9ed847a16bb6494335844b09ea233d60fa366d Mon Sep 17 00:00:00 2001
From: Michael Pontin <michaelpontin@sampsonmay.com>
Date: Fri, 6 Sep 2019 17:39:57 +0100
Subject: [PATCH 595/776] Added double check for the decimal label

---
 .../PropertyEditors/ValueConverters/LabelValueConverter.cs      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/LabelValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/LabelValueConverter.cs
index 84baf226cf..eb461b4920 100644
--- a/src/Umbraco.Core/PropertyEditors/ValueConverters/LabelValueConverter.cs
+++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/LabelValueConverter.cs
@@ -65,6 +65,8 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
                     if (source is decimal sourceDecimal) return sourceDecimal;
                     if (source is string sourceDecimalString)
                         return decimal.TryParse(sourceDecimalString, NumberStyles.Any, CultureInfo.InvariantCulture, out var d) ? d : 0;
+					if (source is double sourceDouble)
+						return Convert.ToDecimal(sourceDouble);
                     return (decimal) 0;
                 case ValueTypes.Integer:
                     if (source is int sourceInt) return sourceInt;

From ba63470833bee5da6949f5220ebbceb2667a1181 Mon Sep 17 00:00:00 2001
From: Michael Pontin <michaelpontin@sampsonmay.com>
Date: Fri, 6 Sep 2019 17:39:57 +0100
Subject: [PATCH 596/776] Added double check for the decimal label

(cherry picked from commit 1c9ed847a16bb6494335844b09ea233d60fa366d)
---
 .../PropertyEditors/ValueConverters/LabelValueConverter.cs      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/LabelValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/LabelValueConverter.cs
index 84baf226cf..eb461b4920 100644
--- a/src/Umbraco.Core/PropertyEditors/ValueConverters/LabelValueConverter.cs
+++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/LabelValueConverter.cs
@@ -65,6 +65,8 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
                     if (source is decimal sourceDecimal) return sourceDecimal;
                     if (source is string sourceDecimalString)
                         return decimal.TryParse(sourceDecimalString, NumberStyles.Any, CultureInfo.InvariantCulture, out var d) ? d : 0;
+					if (source is double sourceDouble)
+						return Convert.ToDecimal(sourceDouble);
                     return (decimal) 0;
                 case ValueTypes.Integer:
                     if (source is int sourceInt) return sourceInt;

From 26b40ebfd2cd3d454ef4e8c91be1d7a2ff448518 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sun, 8 Sep 2019 20:33:28 +0200
Subject: [PATCH 597/776] Make integer properties work with mandatory
 validation clientside

---
 .../src/views/propertyeditors/integer/integer.html              | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html
index 549a07319d..5c10790400 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html
@@ -5,6 +5,8 @@
                pattern="[\-0-9]*"
                class="umb-property-editor umb-number"
                ng-model="model.value"
+               ng-required="model.validation.mandatory"
+               aria-required="{{model.validation.mandatory}}"
                id="{{model.alias}}"
                val-server="value"
                fix-number min="{{model.config.min}}" max="{{model.config.max}}" step="{{model.config.step}}" />

From 9ed50613ed88b3c925abd85917e80c8c1ab162d1 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sun, 8 Sep 2019 20:33:28 +0200
Subject: [PATCH 598/776] Make integer properties work with mandatory
 validation clientside

(cherry picked from commit 26b40ebfd2cd3d454ef4e8c91be1d7a2ff448518)
---
 .../src/views/propertyeditors/integer/integer.html              | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html
index 549a07319d..5c10790400 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html
@@ -5,6 +5,8 @@
                pattern="[\-0-9]*"
                class="umb-property-editor umb-number"
                ng-model="model.value"
+               ng-required="model.validation.mandatory"
+               aria-required="{{model.validation.mandatory}}"
                id="{{model.alias}}"
                val-server="value"
                fix-number min="{{model.config.min}}" max="{{model.config.max}}" step="{{model.config.step}}" />

From 0582e4f72ea503f6baf4589eca1b35e8bfa12822 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sun, 8 Sep 2019 20:26:45 +0200
Subject: [PATCH 599/776] Make decimal properties work with mandatory
 validation clientside

---
 .../src/views/propertyeditors/decimal/decimal.html              | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/decimal/decimal.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/decimal/decimal.html
index 28cb909cc0..d5560c8433 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/decimal/decimal.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/decimal/decimal.html
@@ -5,6 +5,8 @@
                pattern="[\-0-9]+([,\.][0-9]+)?"
                class="umb-property-editor umb-number"
                ng-model="model.value"
+               ng-required="model.validation.mandatory"
+               aria-required="{{model.validation.mandatory}}"
                val-server="value"
                fix-number min="{{model.config.min}}" max="{{model.config.max}}" step="{{model.config.step}}" />
 

From 24691b4ce03fa47040375c2a0c5430147d2b5098 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sun, 8 Sep 2019 20:26:45 +0200
Subject: [PATCH 600/776] Make decimal properties work with mandatory
 validation clientside

(cherry picked from commit 0582e4f72ea503f6baf4589eca1b35e8bfa12822)
---
 .../src/views/propertyeditors/decimal/decimal.html              | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/decimal/decimal.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/decimal/decimal.html
index 28cb909cc0..d5560c8433 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/decimal/decimal.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/decimal/decimal.html
@@ -5,6 +5,8 @@
                pattern="[\-0-9]+([,\.][0-9]+)?"
                class="umb-property-editor umb-number"
                ng-model="model.value"
+               ng-required="model.validation.mandatory"
+               aria-required="{{model.validation.mandatory}}"
                val-server="value"
                fix-number min="{{model.config.min}}" max="{{model.config.max}}" step="{{model.config.step}}" />
 

From 234a0c45c0f7a9dcb46e207015dbca5f276b9ff7 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Sun, 15 Sep 2019 12:42:34 +0200
Subject: [PATCH 601/776] v8: umbCheckbox and umbRadiobutton fixes (#6302)

---
 .../components/forms/umbcheckbox.directive.js | 13 +++---
 .../forms/umbradiobutton.directive.js         | 41 +++++++++++--------
 .../views/components/forms/umb-checkbox.html  |  4 +-
 .../components/forms/umb-radiobutton.html     | 15 +++----
 4 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
index 47381a15c0..f8643ad191 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
@@ -22,14 +22,14 @@
 </pre>
 
 @param {boolean} model Set to <code>true</code> or <code>false</code> to set the checkbox to checked or unchecked.
-@param {string} input-id Set the <code>id</code> of the checkbox.
+@param {string} inputId Set the <code>id</code> of the checkbox.
 @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.
-@param {string} server-validation-field Set the <code>val-server-field</code> of the checkbox.
+@param {string} serverValidationField Set the <code>val-server-field</code> of the checkbox.
 @param {boolean} disabled Set the checkbox to be disabled.
 @param {boolean} required Set the checkbox to be required.
-@param {string} on-change Callback when the value of the checkbox changed by interaction.
+@param {callback} onChange Callback when the value of the checkbox change by interaction.
 
 **/
 
@@ -40,8 +40,8 @@
     function UmbCheckboxController($timeout) {
         
         var vm = this;
-        
-        vm.callOnChange = function() {
+
+        if (vm.onChange) {
             $timeout(function() {
                 vm.onChange({model:vm.model, value:vm.value});
             }, 0);
@@ -49,7 +49,6 @@
         
     }
     
-    
     var component = {
         templateUrl: 'views/components/forms/umb-checkbox.html',
         controller: UmbCheckboxController,
@@ -63,7 +62,7 @@
             serverValidationField: "@",
             disabled: "<",
             required: "<",
-            onChange: "&"
+            onChange: "&?"
         }
     };
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
index 351ba2fee2..933107527b 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
@@ -27,31 +27,40 @@
 @param {string} text Set the text for the radiobutton label.
 @param {boolean} disabled Set the radiobutton to be disabled.
 @param {boolean} required Set the radiobutton to be required.
+@param {callback} onChange Callback when the value of the radiobutton change by interaction.
 
 **/
 
 (function () {
     'use strict';
 
-    function RadiobuttonDirective() {
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/forms/umb-radiobutton.html',
-            scope: {
-                model: "=",
-                value: "@",
-                name: "@",
-                text: "@",
-                disabled: "=",
-                required: "="
-            }
-        };
+    function UmbRadiobuttonController($timeout) {
 
-        return directive;
+        var vm = this;
 
+        if (vm.onChange) {
+            $timeout(function () {
+                vm.onChange({ model: vm.model, value: vm.value });
+            }, 0);
+        }
+        
     }
 
-    angular.module('umbraco.directives').directive('umbRadiobutton', RadiobuttonDirective);
+    var component = {
+        templateUrl: 'views/components/forms/umb-radiobutton.html',
+        controller: UmbRadiobuttonController,
+        controllerAs: 'vm',
+        bindings: {
+            model: "=",
+            value: "@",
+            name: "@",
+            text: "@",
+            disabled: "=",
+            required: "=",
+            onChange: "&?"
+        }
+    };
+
+    angular.module('umbraco.directives').component('umbRadiobutton', component);
 
 })();
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-checkbox.html b/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-checkbox.html
index d40263c6b6..2f90905c7d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-checkbox.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-checkbox.html
@@ -1,4 +1,4 @@
-<label class="checkbox umb-form-check umb-form-check--checkbox" ng-class="{ 'umb-form-check--disabled': disabled }">
+<label class="checkbox umb-form-check umb-form-check--checkbox" ng-class="{ 'umb-form-check--disabled': vm.disabled }">
     <input type="checkbox"
            id="{{vm.inputId}}"
            name="{{vm.name}}"
@@ -8,7 +8,7 @@
            ng-model="vm.model"
            ng-disabled="vm.disabled"
            ng-required="vm.required"
-           ng-change="vm.callOnChange()"/>
+           ng-change="vm.onChange()"/>
 
     <span class="umb-form-check__state" aria-hidden="true">
         <span class="umb-form-check__check">
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-radiobutton.html b/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-radiobutton.html
index 877e55a1c5..4f630409e2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-radiobutton.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-radiobutton.html
@@ -1,13 +1,14 @@
-<label class="radio umb-form-check umb-form-check--radiobutton" ng-class="{ 'umb-form-check--disabled': disabled }">
-    <input type="radio" name="{{name}}"
-        value="{{value}}"
+<label class="radio umb-form-check umb-form-check--radiobutton" ng-class="{ 'umb-form-check--disabled': vm.disabled }">
+    <input type="radio" name="{{vm.name}}"
+        value="{{vm.value}}"
         class="umb-form-check__input"
-        ng-model="model"
-        ng-disabled="disabled"
-        ng-required="required" />
+        ng-model="vm.model"
+        ng-disabled="vm.disabled"
+        ng-required="vm.required"
+        ng-change="vm.onChange()" />
 
     <span class="umb-form-check__state" aria-hidden="true">
         <span class="umb-form-check__check"></span>
     </span>
-    <span class="umb-form-check__text">{{text}}</span>
+    <span class="umb-form-check__text">{{vm.text}}</span>
 </label>

From de656acec6a3b8a38c4fd5e83bcdc0309026e6c9 Mon Sep 17 00:00:00 2001
From: Jan Skovgaard <jaskov@gmail.com>
Date: Sun, 15 Sep 2019 15:01:53 +0200
Subject: [PATCH 602/776] Links components (e.g. 'Footer links') can not be
 tabbed to (#6305)

---
 .../src/less/components/umb-node-preview.less |  3 +
 .../views/components/umb-node-preview.html    | 77 +++++++++++++++++--
 .../src/views/prevalueeditors/treepicker.html |  2 +-
 3 files changed, 76 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less
index 1edaffe824..46bfbfa4e6 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less
@@ -67,6 +67,9 @@
 }
 
 .umb-node-preview__action {
+    background: transparent;
+    padding: 0;
+    border: 0 none;
     margin-left: 5px;
     margin-right: 5px;
     font-size: 13px;
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-node-preview.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-node-preview.html
index 00ca425d7a..4f835f4c04 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-node-preview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-node-preview.html
@@ -1,7 +1,7 @@
 <div class="umb-node-preview" ng-class="{'umb-node-preview--sortable': sortable, 'umb-node-preview--unpublished': published === false }">
-    <i ng-if="icon" class="umb-node-preview__icon {{ icon }}"></i>
+    <i ng-if="icon" class="umb-node-preview__icon {{ icon }}" aria-hidden="true"></i>
     <div class="umb-node-preview__content">
-        
+
         <div class="umb-node-preview__name" ng-attr-title="{{alias}}">{{ name }}</div>
         <div class="umb-node-preview__description" ng-if="description">{{ description }}</div>
 
@@ -13,9 +13,76 @@
         </div>
     </div>
     <div class="umb-node-preview__actions">
-        <a class="umb-node-preview__action" title="Edit" ng-href="{{editUrl}}" ng-if="allowEdit"  ng-click="onEdit()"><localize key="general_edit">Edit</localize></a>
-        <a class="umb-node-preview__action" title="Open" ng-href="{{openUrl}}" ng-if="allowOpen"  ng-click="onOpen()"><localize key="general_open">Open</localize></a>
-        <a class="umb-node-preview__action umb-node-preview__action--red" title="Remove" ng-href="{{removeUrl}}" ng-if="allowRemove" ng-click="onRemove()"><localize key="general_remove">Remove</localize></i></a>
+        <!-- If editUrl has a value we render a link otherwise a button-->
+        <a
+            class="umb-node-preview__action"
+            title="Edit {{name}}"
+            ng-href="{{editUrl}}"
+            ng-if="allowEdit && editUrl"
+            ng-click="onEdit()"
+        >
+            <localize key="general_edit">Edit</localize>
+            <span class="sr-only">{{name}}</span>
+        </a>
+
+        <button
+            type="button"
+            class="umb-node-preview__action"
+            title="Edit {{name}}"
+            ng-if="allowEdit && !editUrl"
+            ng-click="onEdit()"
+            aria-haspopup="dialog"
+        >
+            <localize key="general_edit">Edit</localize>
+            <span class="sr-only">{{name}}</span>
+        </button>
+
+        <!-- If openUrl has a value we render a link otherwise a button-->
+        <a
+            class="umb-node-preview__action"
+            title="Open {{name}}"
+            ng-href="{{openUrl}}"
+            ng-if="allowOpen && openUrl"
+            ng-click="onOpen()"
+        >
+            <localize key="general_open">Open</localize>
+            <span class="sr-only">{{name}}</span>
+        </a>
+
+        <button
+            type="button"
+            class="umb-node-preview__action"
+            title="Open {{name}}"
+            ng-if="allowOpen && !openUrl"
+            ng-click="onOpen()"
+            aria-haspopup="dialog"
+        >
+            <localize key="general_open">Open</localize>
+            <span class="sr-only">{{name}}</span>
+        </button>
+
+        <!-- If removeUrl has a value we render a link otherwise a button-->
+        <a
+            class="umb-node-preview__action umb-node-preview__action--red"
+            title="Remove {{name}}"
+            ng-href="{{removeUrl}}"
+            ng-if="allowRemove && removeUrl"
+            ng-click="onRemove()"
+        >
+            <localize key="general_remove">Remove</localize>
+            <span class="sr-only">{{name}}</span>
+        </a>
+
+        <button
+            type="button"
+            class="umb-node-preview__action umb-node-preview__action--red"
+            title="Remove {{name}}"
+            ng-if="allowRemove && !removeUrl"
+            ng-click="onRemove()"
+        >
+            <localize key="general_remove">Remove</localize>
+            <span class="sr-only">{{name}}</span>
+        </button>
     </div>
 
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.html
index ae260b4502..ab1b84db97 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.html
@@ -11,7 +11,7 @@
 			allow-remove="allowRemove"
 			allow-edit="allowEdit"
 			on-remove="remove($index)"
-			on-edit="openContentPicker()">
+            on-edit="openContentPicker()">
 		</umb-node-preview>
 	</div>
 

From 41c4f12d1b7bcca9a8a10ec31a58f9c157871ab2 Mon Sep 17 00:00:00 2001
From: Jan Skovgaard <jaskov@gmail.com>
Date: Sun, 15 Sep 2019 15:08:23 +0200
Subject: [PATCH 603/776] Links components (e.g. 'Footer links'), 'Add' is
 identfied as "Add link" but doesn't identify the label (#6304)

---
 .../src/less/components/umb-node-preview.less    |  2 ++
 .../contentpicker/contentpicker.controller.js    |  8 ++++++--
 .../contentpicker/contentpicker.html             | 16 ++++++++++------
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less
index 46bfbfa4e6..cdd9dfa958 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less
@@ -92,11 +92,13 @@
     display: flex;
     align-items: center;
     justify-content: center;
+    background: transparent;
     border: 1px dashed @ui-action-discreet-border;
     color: @ui-action-discreet-type;
     font-weight: bold;
     padding: 5px 15px;
     box-sizing: border-box;
+    width: 100%;
 }
 
 .umb-node-preview-add:hover {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
index be99ffe8f9..0c8d77eabb 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
@@ -16,7 +16,8 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
 
     var vm = {
         labels: {
-            general_recycleBin: ""
+            general_recycleBin: "",
+            general_add: ""
         }
     };
 
@@ -78,6 +79,8 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
     $scope.renderModel = [];
     $scope.sortableModel = [];
 
+    $scope.labels = vm.labels;
+
     $scope.dialogEditor = editorState && editorState.current && editorState.current.isDialogEditor === true;
 
     //the default pre-values
@@ -479,9 +482,10 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
     }
 
     function init() {
-        localizationService.localizeMany(["general_recycleBin"])
+        localizationService.localizeMany(["general_recycleBin", "general_add"])
             .then(function(data) {
                 vm.labels.general_recycleBin = data[0];
+                vm.labels.general_add = data[1];
 
                 syncRenderModel(false).then(function () {
                     //everything is loaded, start the watch on the model
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
index a589cf8947..cd24988b3d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
@@ -19,13 +19,17 @@
             </umb-node-preview>
         </div>
 
-        <a ng-show="model.config.multiPicker === true && renderModel.length < model.config.maxNumber || renderModel.length === 0 || !model.config.maxNumber"
-           class="umb-node-preview-add"
-           href=""
-           ng-click="openCurrentPicker()"
-           prevent-default>
+        <button
+            ng-show="model.config.multiPicker === true && renderModel.length < model.config.maxNumber || renderModel.length === 0 || !model.config.maxNumber"
+            type="button"
+            class="umb-node-preview-add"
+            ng-click="openCurrentPicker()"
+            id="{{model.alias}}"
+            aria-label="{{model.label}}: {{labels.general_add}}"
+            aria-haspopup="dialog"
+        >
             <localize key="general_add">Add</localize>
-        </a>
+        </button>
 
         <div class="umb-contentpicker__min-max-help" ng-if="model.config.multiPicker === true">
 

From a4ac2328f9f67f0739cffbf7d65c0596791e3c32 Mon Sep 17 00:00:00 2001
From: Jan Skovgaard <jaskov@gmail.com>
Date: Sun, 15 Sep 2019 15:29:44 +0200
Subject: [PATCH 604/776] =?UTF-8?q?"Actions"=20is=20identified=20as=20a=20?=
 =?UTF-8?q?button,=20but=20behaves=20like=20a=20drop=20do=E2=80=A6=20(#630?=
 =?UTF-8?q?3)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/buttons/umbbutton.directive.js | 11 +++++---
 .../views/components/buttons/umb-button.html  | 25 +++++++++++++------
 .../components/editor/umb-editor-menu.html    | 13 ++++++----
 3 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js
index f026a05c45..56416e3544 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js
@@ -67,6 +67,9 @@ Use this directive to render an umbraco button. The directive can be used to gen
 @param {boolean=} disabled Set to <code>true</code> to disable the button.
 @param {string=} addEllipsis Adds an ellipsis character (…) to the button label which means the button will open a dialog or prompt the user for more information.
 @param {string=} showCaret Shows a caret on the right side of the button label
+@param {string=} autoFocus add autoFocus to the button
+@param {string=} hasPopup Used to expose to the accessibility API whether the button will trigger a popup or not
+@param {string=]} isExpanded Used to add an aria-expanded attribute and expose whether the button has expanded a popup or not
 
 **/
 
@@ -96,7 +99,9 @@ Use this directive to render an umbraco button. The directive can be used to gen
                 alias: "@?",
                 addEllipsis: "@?",
                 showCaret: "@?",
-                autoFocus: "@?"
+                autoFocus: "@?",
+                hasPopup: "@?",
+                isExpanded: "<?"
             }
         });
 
@@ -126,13 +131,13 @@ Use this directive to render an umbraco button. The directive can be used to gen
 
                 // make it possible to pass in multiple styles
                 if(vm.buttonStyle.startsWith("[") && vm.buttonStyle.endsWith("]")) {
-                    
+
                     // when using an attr it will always be a string so we need to remove square brackets
                     // and turn it into and array
                     var withoutBrackets = vm.buttonStyle.replace(/[\[\]']+/g,'');
                     // split array by , + make sure to catch whitespaces
                     var array = withoutBrackets.split(/\s?,\s?/g);
-                    
+
                     angular.forEach(array, function(item){
                         vm.style = vm.style + " " + "btn-" + item;
                         if(item === "block") {
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button.html b/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button.html
index 8163b2807b..0c4c58c38f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button.html
@@ -9,25 +9,36 @@
 
     <a ng-if="vm.type === 'link'" ng-href="{{vm.href}}" class="btn umb-button__button {{vm.style}} umb-button--{{vm.size}}" ng-click="vm.clickButton($event)" hotkey="{{vm.shortcut}}" hotkey-when-hidden="{{vm.shortcutWhenHidden}}">
         <span class="umb-button__content" ng-class="{'-hidden': vm.innerState !== 'init'}">
-            <i ng-if="vm.icon" class="{{vm.icon}} umb-button__icon"></i>
+            <i ng-if="vm.icon" class="{{vm.icon}} umb-button__icon" aria-hidden="true"></i>
             {{vm.buttonLabel}}
-            <span ng-if="vm.showCaret" class="umb-button__caret caret"></span>
+            <span ng-if="vm.showCaret" class="umb-button__caret caret" aria-hidden="true"></span>
         </span>
     </a>
 
-    <button ng-if="vm.type === 'button'" type="button" class="btn umb-button__button {{vm.style}} umb-button--{{vm.size}}" ng-click="vm.clickButton($event)" hotkey="{{vm.shortcut}}" hotkey-when-hidden="{{vm.shortcutWhenHidden}}" ng-disabled="vm.disabled" umb-auto-focus="{{vm.autoFocus && !vm.disabled ? 'true' : 'false'}}">
+    <button
+        ng-if="vm.type === 'button'"
+        type="button"
+        class="btn umb-button__button {{vm.style}} umb-button--{{vm.size}}"
+        ng-click="vm.clickButton($event)"
+        hotkey="{{vm.shortcut}}"
+        hotkey-when-hidden="{{vm.shortcutWhenHidden}}"
+        ng-disabled="vm.disabled"
+        umb-auto-focus="{{vm.autoFocus && !vm.disabled ? 'true' : 'false'}}"
+        aria-haspopup="{{vm.hasPopup}}"
+        aria-expanded="{{vm.isExpanded}}"
+        >
         <span class="umb-button__content" ng-class="{'-hidden': vm.innerState !== 'init'}">
-            <i ng-if="vm.icon" class="{{vm.icon}} umb-button__icon"></i>
+            <i ng-if="vm.icon" class="{{vm.icon}} umb-button__icon" aria-hidden="true"></i>
             {{vm.buttonLabel}}
-            <span ng-if="vm.showCaret" class="umb-button__caret caret"></span>
+            <span ng-if="vm.showCaret" class="umb-button__caret caret" aria-hidden="true"></span>
         </span>
     </button>
 
     <button ng-if="vm.type === 'submit'" type="submit" class="btn umb-button__button {{vm.style}} umb-button--{{vm.size}}" hotkey="{{vm.shortcut}}" hotkey-when-hidden="{{vm.shortcutWhenHidden}}" ng-disabled="vm.disabled" umb-auto-focus="{{vm.autoFocus && !vm.disabled ? 'true' : 'false'}}">
         <span class="umb-button__content" ng-class="{'-hidden': vm.innerState !== 'init'}">
-            <i ng-if="vm.icon" class="{{vm.icon}} umb-button__icon"></i>
+            <i ng-if="vm.icon" class="{{vm.icon}} umb-button__icon" aria-hidden="true"></i>
             {{vm.buttonLabel}}
-            <span ng-if="vm.showCaret" class="umb-button__caret caret"></span>
+            <span ng-if="vm.showCaret" class="umb-button__caret caret" aria-hidden="true"></span>
         </span>
     </button>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-menu.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-menu.html
index c621670462..fe90fef07a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-menu.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-menu.html
@@ -5,15 +5,18 @@
         button-style="white"
         action="dropdown.isOpen = !dropdown.isOpen"
         label-key="general_actions"
-        show-caret="true">
+        show-caret="true"
+        has-popup="true"
+        is-expanded="dropdown.isOpen"
+        >
     </umb-button>
 
-    <umb-dropdown ng-if="dropdown.isOpen" class="umb-actions" on-close="dropdown.isOpen = false">
+    <umb-dropdown ng-if="dropdown.isOpen" class="umb-actions" on-close="dropdown.isOpen = false" deep-blur="dropdown.isOpen = false">
         <umb-dropdown-item class="umb-action" ng-class="{'sep':action.separatorm, '-opens-dialog': action.opensDialog}" ng-repeat="action in actions">
-            <a href="" ng-click="executeMenuItem(action)" prevent-default>
-                <i class="icon icon-{{action.cssclass}}"></i>
+            <button type="button" ng-click="executeMenuItem(action)">
+                <i class="icon icon-{{action.cssclass}}" aria-hidden="true"></i>
                 <span class="menu-label">{{action.name}}</span>
-            </a>
+            </button>
         </umb-dropdown-item>
     </umb-dropdown>
 

From dce593d26028a0cefdedfcc6a658d2e6090e5f61 Mon Sep 17 00:00:00 2001
From: Jan Skovgaard <jaskov@gmail.com>
Date: Sun, 15 Sep 2019 15:40:22 +0200
Subject: [PATCH 605/776] Add leave function for "Save and publish" options
 popup #6298 (#6300)

---
 .../src/views/components/buttons/umb-button-group.html    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button-group.html b/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button-group.html
index de082fb48e..2f5b21ca72 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button-group.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button-group.html
@@ -31,7 +31,13 @@
          </span>
    </button>
 
-   <umb-dropdown ng-show="subButtons.length > 0 && dropdown.isOpen" class="umb-button-group__sub-buttons" on-close="closeDropdown()" ng-class="{'-align-right': float === 'right'}">
+    <umb-dropdown
+         ng-show="subButtons.length > 0 && dropdown.isOpen"
+         class="umb-button-group__sub-buttons"
+         on-close="closeDropdown()"
+         deep-blur="closeDropdown()"
+         ng-class="{'-align-right': float === 'right'}"
+         >
       <umb-dropdown-item ng-repeat="subButton in subButtons">
          <button
             data-element="{{subButton.alias ? 'button-' + subButton.alias : 'button-group-secondary-' + $index }}"

From 956b725e3d174a4bd4b0afdcbf93feaba8faa500 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sun, 15 Sep 2019 16:23:14 +0200
Subject: [PATCH 606/776] V8: Localize the default property validation error
 (#6294)

---
 .../validation/valpropertymsg.directive.js          | 13 ++++++++-----
 src/Umbraco.Web.UI/Umbraco/config/lang/da.xml       |  1 +
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml       |  1 +
 src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml    |  1 +
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js
index 39d903d85e..0369b4bd2e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js
@@ -9,7 +9,7 @@
 * and when an error is detected for this property we'll show the error message.
 * In order for this directive to work, the valFormManager directive must be placed on the containing form.
 **/
-function valPropertyMsg(serverValidationManager) {
+function valPropertyMsg(serverValidationManager, localizationService) {
 
     return {
         require: ['^^form', '^^valFormManager', '^^umbProperty', '?^^umbVariantContent'],
@@ -40,6 +40,11 @@ function valPropertyMsg(serverValidationManager) {
             scope.currentProperty = currentProperty;
             var currentCulture = currentProperty.culture;         
 
+            var labels = {};
+            localizationService.localize("errors_propertyHasErrors").then(function (data) {
+                labels.propertyHasErrors = data;
+            });
+
             if (umbVariantCtrl) {
                 //if we are inside of an umbVariantContent directive
 
@@ -68,13 +73,11 @@ function valPropertyMsg(serverValidationManager) {
                         return err.errorMsg;
                     }
                     else {
-                        // TODO: localize
-                        return scope.currentProperty.propertyErrorMessage ? scope.currentProperty.propertyErrorMessage : "Property has errors";
+                        return scope.currentProperty.propertyErrorMessage ? scope.currentProperty.propertyErrorMessage : labels.propertyHasErrors;
                     }
 
                 }
-                // TODO: localize
-                return "Property has errors";
+                return labels.propertyHasErrors;
             }
 
             // We need to subscribe to any changes to our model (based on user input)
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index c4bffedb28..64fa6e458a 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -565,6 +565,7 @@
     <key alias="stylesNoStylesOnPage">Der er ingen aktive styles eller formatteringer på denne side</key>
     <key alias="tableColMergeLeft">Du skal stå til venstre for de 2 celler du ønsker at samle!</key>
     <key alias="tableSplitNotSplittable">Du kan ikke opdele en celle, som ikke allerede er delt.</key>
+    <key alias="propertyHasErrors">Denne egenskab er ugyldig</key>
   </area>
   <area alias="general">
     <key alias="about">Om</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 8c8a3d9434..3c760fa1c2 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -593,6 +593,7 @@
     <key alias="stylesNoStylesOnPage">No active styles available</key>
     <key alias="tableColMergeLeft">Please place cursor at the left of the two cells you wish to merge</key>
     <key alias="tableSplitNotSplittable">You cannot split a cell that hasn't been merged.</key>
+    <key alias="propertyHasErrors">This property is invalid</key>
   </area>
   <area alias="general">
     <key alias="about">About</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index 091d97f4cc..1ddc415db0 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -596,6 +596,7 @@
     <key alias="stylesNoStylesOnPage">No active styles available</key>
     <key alias="tableColMergeLeft">Please place cursor at the left of the two cells you wish to merge</key>
     <key alias="tableSplitNotSplittable">You cannot split a cell that hasn't been merged.</key>
+    <key alias="propertyHasErrors">This property is invalid</key>
   </area>
   <area alias="general">
     <key alias="options">Options</key>

From 5b949cef3cf3485472c84142b89ed41c6a8e3df8 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Fri, 6 Sep 2019 20:24:18 +0200
Subject: [PATCH 607/776] Make sure the validation error help is visible for
 Multi URL Picker

---
 .../views/propertyeditors/multiurlpicker/multiurlpicker.html  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.html
index 0d1c736438..ff1969aab8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.html
@@ -63,12 +63,12 @@
         <input type="hidden" name="minCount" ng-model="renderModel" />
         <input type="hidden" name="maxCount" ng-model="renderModel" />
 
-        <div ng-messages="contentPickerForm.minCount.$error" show-validation-on-submit>
+        <div ng-messages="multiUrlPickerForm.minCount.$error" show-validation-on-submit>
             <div class="help-inline" ng-message="minCount">
                 <localize key="validation_minCount">You need to add at least</localize> {{model.config.minNumber}} <localize key="validation_items">items</localize>
             </div>
         </div>
-        <div ng-messages="contentPickerForm.maxCount.$error" show-validation-on-submit>
+        <div ng-messages="multiUrlPickerForm.maxCount.$error" show-validation-on-submit>
             <div class="help-inline" ng-message="maxCount">
                 <localize key="validation_maxCount">You can only have</localize> {{model.config.maxNumber}} <localize key="validation_itemsSelected">items selected</localize>
             </div>

From 3c71db1a0492a88e1563f9acf0a6365849256300 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Fri, 6 Sep 2019 20:24:18 +0200
Subject: [PATCH 608/776] Make sure the validation error help is visible for
 Multi URL Picker

(cherry picked from commit 5b949cef3cf3485472c84142b89ed41c6a8e3df8)
---
 .../views/propertyeditors/multiurlpicker/multiurlpicker.html  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.html
index 0d1c736438..ff1969aab8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.html
@@ -63,12 +63,12 @@
         <input type="hidden" name="minCount" ng-model="renderModel" />
         <input type="hidden" name="maxCount" ng-model="renderModel" />
 
-        <div ng-messages="contentPickerForm.minCount.$error" show-validation-on-submit>
+        <div ng-messages="multiUrlPickerForm.minCount.$error" show-validation-on-submit>
             <div class="help-inline" ng-message="minCount">
                 <localize key="validation_minCount">You need to add at least</localize> {{model.config.minNumber}} <localize key="validation_items">items</localize>
             </div>
         </div>
-        <div ng-messages="contentPickerForm.maxCount.$error" show-validation-on-submit>
+        <div ng-messages="multiUrlPickerForm.maxCount.$error" show-validation-on-submit>
             <div class="help-inline" ng-message="maxCount">
                 <localize key="validation_maxCount">You can only have</localize> {{model.config.maxNumber}} <localize key="validation_itemsSelected">items selected</localize>
             </div>

From 7507345c93ca2d897c44b3f508aa6ffa20f0116a Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Fri, 6 Sep 2019 20:53:00 +0200
Subject: [PATCH 609/776] Make Multi URL Picker mandatory validation work
 clientside

---
 .../multiurlpicker/multiurlpicker.controller.js             | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
index b2bb47b58c..8381a53644 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
@@ -134,6 +134,12 @@ function multiUrlPickerController($scope, angularHelper, localizationService, en
             .then(function (data) {
                 vm.labels.general_recycleBin = data[0];
             });
+
+        // if the property is mandatory, set the minCount config to 1 (unless of course it is set to something already),
+        // that way the minCount/maxCount validation handles the mandatory as well
+        if ($scope.model.validation && $scope.model.validation.mandatory && !$scope.model.config.minNumber) {
+            $scope.model.config.minNumber = 1;
+        }
     }
 
     init();

From 589cbe504a7694f489105c5c3f97cfaa9d11b49a Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Fri, 6 Sep 2019 20:53:00 +0200
Subject: [PATCH 610/776] Make Multi URL Picker mandatory validation work
 clientside

(cherry picked from commit 7507345c93ca2d897c44b3f508aa6ffa20f0116a)
---
 .../multiurlpicker/multiurlpicker.controller.js             | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
index b2bb47b58c..8381a53644 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
@@ -134,6 +134,12 @@ function multiUrlPickerController($scope, angularHelper, localizationService, en
             .then(function (data) {
                 vm.labels.general_recycleBin = data[0];
             });
+
+        // if the property is mandatory, set the minCount config to 1 (unless of course it is set to something already),
+        // that way the minCount/maxCount validation handles the mandatory as well
+        if ($scope.model.validation && $scope.model.validation.mandatory && !$scope.model.config.minNumber) {
+            $scope.model.config.minNumber = 1;
+        }
     }
 
     init();

From ba74b7543c82da2c81727c940b61323ad17aadd8 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 16 Sep 2019 11:47:05 +1000
Subject: [PATCH 611/776] wraps package uninstall in a scope, creates temp
 SuspendSafeLiveFactory method for testing

---
 .../Packaging/PackageDataInstallation.cs      | 158 ++++++++++--------
 .../PublishedModelFactoryExtensions.cs        |  96 ++++++++++-
 .../Editors/ContentTypeController.cs          |  11 +-
 3 files changed, 187 insertions(+), 78 deletions(-)

diff --git a/src/Umbraco.Core/Packaging/PackageDataInstallation.cs b/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
index 2f6b91edee..79e8d2fc00 100644
--- a/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
+++ b/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
@@ -11,7 +11,9 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Models.Packaging;
+using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Scoping;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;
 
@@ -25,13 +27,16 @@ namespace Umbraco.Core.Packaging
         private readonly ILocalizationService _localizationService;
         private readonly IDataTypeService _dataTypeService;
         private readonly PropertyEditorCollection _propertyEditors;
+        private readonly IScopeProvider _scopeProvider;
+        private readonly IPublishedModelFactory _publishedModelFactory;
         private readonly IEntityService _entityService;
         private readonly IContentTypeService _contentTypeService;
         private readonly IContentService _contentService;
 
         public PackageDataInstallation(ILogger logger, IFileService fileService, IMacroService macroService, ILocalizationService localizationService,
             IDataTypeService dataTypeService, IEntityService entityService, IContentTypeService contentTypeService,
-            IContentService contentService, PropertyEditorCollection propertyEditors)
+            IContentService contentService, PropertyEditorCollection propertyEditors, IScopeProvider scopeProvider,
+            IPublishedModelFactory publishedModelFactory)
         {
             _logger = logger;
             _fileService = fileService;
@@ -39,6 +44,8 @@ namespace Umbraco.Core.Packaging
             _localizationService = localizationService;
             _dataTypeService = dataTypeService;
             _propertyEditors = propertyEditors;
+            _scopeProvider = scopeProvider;
+            _publishedModelFactory = publishedModelFactory;
             _entityService = entityService;
             _contentTypeService = contentTypeService;
             _contentService = contentService;
@@ -57,93 +64,98 @@ namespace Umbraco.Core.Packaging
             var removedDataTypes = new List<IDataType>();
             var removedLanguages = new List<ILanguage>();
 
-
-            //Uninstall templates
-            foreach (var item in package.Templates.ToArray())
+            using(_publishedModelFactory.SuspendSafeLiveFactory()) //ensure that any PureLive models are not regenerated until after the bulk operation
+            using (var scope = _scopeProvider.CreateScope())
             {
-                if (int.TryParse(item, out var nId) == false) continue;
-                var found = _fileService.GetTemplate(nId);
-                if (found != null)
+                //Uninstall templates
+                foreach (var item in package.Templates.ToArray())
                 {
-                    removedTemplates.Add(found);
-                    _fileService.DeleteTemplate(found.Alias, userId);
+                    if (int.TryParse(item, out var nId) == false) continue;
+                    var found = _fileService.GetTemplate(nId);
+                    if (found != null)
+                    {
+                        removedTemplates.Add(found);
+                        _fileService.DeleteTemplate(found.Alias, userId);
+                    }
+                    package.Templates.Remove(nId.ToString());
                 }
-                package.Templates.Remove(nId.ToString());
-            }
 
-            //Uninstall macros
-            foreach (var item in package.Macros.ToArray())
-            {
-                if (int.TryParse(item, out var nId) == false) continue;
-                var macro = _macroService.GetById(nId);
-                if (macro != null)
+                //Uninstall macros
+                foreach (var item in package.Macros.ToArray())
                 {
-                    removedMacros.Add(macro);
-                    _macroService.Delete(macro, userId);
+                    if (int.TryParse(item, out var nId) == false) continue;
+                    var macro = _macroService.GetById(nId);
+                    if (macro != null)
+                    {
+                        removedMacros.Add(macro);
+                        _macroService.Delete(macro, userId);
+                    }
+                    package.Macros.Remove(nId.ToString());
                 }
-                package.Macros.Remove(nId.ToString());
-            }
 
-            //Remove Document Types
-            var contentTypes = new List<IContentType>();
-            var contentTypeService = _contentTypeService;
-            foreach (var item in package.DocumentTypes.ToArray())
-            {
-                if (int.TryParse(item, out var nId) == false) continue;
-                var contentType = contentTypeService.Get(nId);
-                if (contentType == null) continue;
-                contentTypes.Add(contentType);
-                package.DocumentTypes.Remove(nId.ToString(CultureInfo.InvariantCulture));
-            }
-
-            //Order the DocumentTypes before removing them
-            if (contentTypes.Any())
-            {
-                // TODO: I don't think this ordering is necessary
-                var orderedTypes = (from contentType in contentTypes
-                                    orderby contentType.ParentId descending, contentType.Id descending
-                                    select contentType).ToList();
-                removedContentTypes.AddRange(orderedTypes);
-                contentTypeService.Delete(orderedTypes, userId);
-            }
-
-            //Remove Dictionary items
-            foreach (var item in package.DictionaryItems.ToArray())
-            {
-                if (int.TryParse(item, out var nId) == false) continue;
-                var di = _localizationService.GetDictionaryItemById(nId);
-                if (di != null)
+                //Remove Document Types
+                var contentTypes = new List<IContentType>();
+                var contentTypeService = _contentTypeService;
+                foreach (var item in package.DocumentTypes.ToArray())
                 {
-                    removedDictionaryItems.Add(di);
-                    _localizationService.Delete(di, userId);
+                    if (int.TryParse(item, out var nId) == false) continue;
+                    var contentType = contentTypeService.Get(nId);
+                    if (contentType == null) continue;
+                    contentTypes.Add(contentType);
+                    package.DocumentTypes.Remove(nId.ToString(CultureInfo.InvariantCulture));
                 }
-                package.DictionaryItems.Remove(nId.ToString());
-            }
 
-            //Remove Data types
-            foreach (var item in package.DataTypes.ToArray())
-            {
-                if (int.TryParse(item, out var nId) == false) continue;
-                var dtd = _dataTypeService.GetDataType(nId);
-                if (dtd != null)
+                //Order the DocumentTypes before removing them
+                if (contentTypes.Any())
                 {
-                    removedDataTypes.Add(dtd);
-                    _dataTypeService.Delete(dtd, userId);
+                    // TODO: I don't think this ordering is necessary
+                    var orderedTypes = (from contentType in contentTypes
+                                        orderby contentType.ParentId descending, contentType.Id descending
+                                        select contentType).ToList();
+                    removedContentTypes.AddRange(orderedTypes);
+                    contentTypeService.Delete(orderedTypes, userId);
                 }
-                package.DataTypes.Remove(nId.ToString());
-            }
 
-            //Remove Langs
-            foreach (var item in package.Languages.ToArray())
-            {
-                if (int.TryParse(item, out var nId) == false) continue;
-                var lang = _localizationService.GetLanguageById(nId);
-                if (lang != null)
+                //Remove Dictionary items
+                foreach (var item in package.DictionaryItems.ToArray())
                 {
-                    removedLanguages.Add(lang);
-                    _localizationService.Delete(lang, userId);
+                    if (int.TryParse(item, out var nId) == false) continue;
+                    var di = _localizationService.GetDictionaryItemById(nId);
+                    if (di != null)
+                    {
+                        removedDictionaryItems.Add(di);
+                        _localizationService.Delete(di, userId);
+                    }
+                    package.DictionaryItems.Remove(nId.ToString());
                 }
-                package.Languages.Remove(nId.ToString());
+
+                //Remove Data types
+                foreach (var item in package.DataTypes.ToArray())
+                {
+                    if (int.TryParse(item, out var nId) == false) continue;
+                    var dtd = _dataTypeService.GetDataType(nId);
+                    if (dtd != null)
+                    {
+                        removedDataTypes.Add(dtd);
+                        _dataTypeService.Delete(dtd, userId);
+                    }
+                    package.DataTypes.Remove(nId.ToString());
+                }
+
+                //Remove Langs
+                foreach (var item in package.Languages.ToArray())
+                {
+                    if (int.TryParse(item, out var nId) == false) continue;
+                    var lang = _localizationService.GetLanguageById(nId);
+                    if (lang != null)
+                    {
+                        removedLanguages.Add(lang);
+                        _localizationService.Delete(lang, userId);
+                    }
+                    package.Languages.Remove(nId.ToString());
+                }
+
+                scope.Complete();
             }
 
             // create a summary of what was actually removed, for PackagingService.UninstalledPackage
diff --git a/src/Umbraco.Core/PublishedModelFactoryExtensions.cs b/src/Umbraco.Core/PublishedModelFactoryExtensions.cs
index de6eeb6a42..70bef75192 100644
--- a/src/Umbraco.Core/PublishedModelFactoryExtensions.cs
+++ b/src/Umbraco.Core/PublishedModelFactoryExtensions.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using Umbraco.Core.Models.PublishedContent;
 
 namespace Umbraco.Core
@@ -27,9 +28,17 @@ namespace Umbraco.Core
             {
                 lock (liveFactory.SyncRoot)
                 {
-                    //Call refresh on the live factory to re-compile the models
-                    liveFactory.Refresh();
-                    action();
+                    if (_suspend != null)
+                    {
+                        //if we are currently suspended, queue the action
+                        _suspend.Queue(action);
+                    }
+                    else
+                    {
+                        //Call refresh on the live factory to re-compile the models
+                        liveFactory.Refresh();
+                        action();
+                    }
                 }
             }
             else
@@ -37,5 +46,86 @@ namespace Umbraco.Core
                 action();
             }
         }
+
+        public static IDisposable SuspendSafeLiveFactory(this IPublishedModelFactory factory)
+        {
+            if (factory is ILivePublishedModelFactory liveFactory)
+            {
+                lock (liveFactory.SyncRoot)
+                {
+                    if (_suspend == null)
+                    {
+                        _suspend = new SuspendSafeLiveFactory(
+                            factory,
+                            () => _suspend = null); //reset when it's done
+                    }
+                    return _suspend;
+                }
+            }
+            else
+            {
+                return new SuspendSafeLiveFactory(factory); //returns a noop version of IDisposable, this won't actually do anything
+            }
+        }
+
+        private static SuspendSafeLiveFactory _suspend;
+    }
+
+    internal class SuspendSafeLiveFactory : IDisposable
+    {
+        private readonly IPublishedModelFactory _factory;
+        private readonly Action _reset;
+        private readonly List<Action> _actions = new List<Action>();
+
+        public SuspendSafeLiveFactory(IPublishedModelFactory factory, Action reset = null)
+        {
+            _factory = factory;
+            _reset = reset;
+        }
+
+        /// <summary>
+        /// Queue an action to execute on disposal after rebuild
+        /// </summary>
+        /// <param name="action"></param>
+        public void Queue(Action action)
+        {
+            _actions.Add(action);
+        }
+
+        #region IDisposable Support
+        private bool disposedValue = false; // To detect redundant calls
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!disposedValue)
+            {
+                if (disposing)
+                {
+                    if (_factory is ILivePublishedModelFactory liveFactory)
+                    {
+                        lock (liveFactory.SyncRoot)
+                        {
+                            //Call refresh on the live factory to re-compile the models
+                            liveFactory.Refresh();
+
+                            //then we need to call all queued actions
+                            foreach(var action in _actions)
+                                action();
+                        }
+                    }
+                    _reset?.Invoke();
+                }
+                disposedValue = true;
+            }
+        }
+
+        // This code added to correctly implement the disposable pattern.
+        public void Dispose()
+        {
+            // Do not change this code. Put cleanup code in Dispose(bool disposing) above.
+            Dispose(true);
+        }
+        #endregion
+
     }
 }
diff --git a/src/Umbraco.Web/Editors/ContentTypeController.cs b/src/Umbraco.Web/Editors/ContentTypeController.cs
index e99cbdca4a..82cf3a5813 100644
--- a/src/Umbraco.Web/Editors/ContentTypeController.cs
+++ b/src/Umbraco.Web/Editors/ContentTypeController.cs
@@ -17,9 +17,11 @@ using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Editors;
+using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Packaging;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Scoping;
 using Umbraco.Core.Services;
 using Umbraco.Web.Models;
 using Umbraco.Web.Models.ContentEditing;
@@ -46,6 +48,8 @@ namespace Umbraco.Web.Editors
     {
         private readonly IEntityXmlSerializer _serializer;
         private readonly PropertyEditorCollection _propertyEditors;
+        private readonly IScopeProvider _scopeProvider;
+        private readonly IPublishedModelFactory _publishedModelFactory;
 
         public ContentTypeController(IEntityXmlSerializer serializer,
             ICultureDictionaryFactory cultureDictionaryFactory,
@@ -53,11 +57,14 @@ namespace Umbraco.Web.Editors
             IUmbracoContextAccessor umbracoContextAccessor,
             ISqlContext sqlContext, PropertyEditorCollection propertyEditors,
             ServiceContext services, AppCaches appCaches,
-            IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper)
+            IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper,
+            IScopeProvider scopeProvider, IPublishedModelFactory publishedModelFactory)
             : base(cultureDictionaryFactory, globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper)
         {
             _serializer = serializer;
             _propertyEditors = propertyEditors;
+            _scopeProvider = scopeProvider;
+            _publishedModelFactory = publishedModelFactory;
         }
 
         public int GetCount()
@@ -520,7 +527,7 @@ namespace Umbraco.Web.Editors
             }
 
             var dataInstaller = new PackageDataInstallation(Logger, Services.FileService, Services.MacroService, Services.LocalizationService,
-                Services.DataTypeService, Services.EntityService, Services.ContentTypeService, Services.ContentService, _propertyEditors);
+                Services.DataTypeService, Services.EntityService, Services.ContentTypeService, Services.ContentService, _propertyEditors, _scopeProvider, _publishedModelFactory);
 
             var xd = new XmlDocument {XmlResolver = null};
             xd.Load(filePath);

From 5898b641747d282a654ab38dd8547887995730c1 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 16 Sep 2019 14:24:25 +1000
Subject: [PATCH 612/776] disable force rebuilding pure live models on schema
 changes

---
 src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs | 4 ++--
 src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs b/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs
index 266cddf6d5..cf90b60d8a 100644
--- a/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs
@@ -90,8 +90,8 @@ namespace Umbraco.Web.Cache
             // service of changes, else factories may try to rebuild models while
             // we are using the database to load content into caches
 
-            _publishedModelFactory.WithSafeLiveFactory(() =>
-                _publishedSnapshotService.Notify(payloads));
+            //_publishedModelFactory.WithSafeLiveFactory(() =>
+                _publishedSnapshotService.Notify(payloads);
 
             // now we can trigger the event
             base.Refresh(payloads);
diff --git a/src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs b/src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs
index 1d41c0578b..fb4f59fce4 100644
--- a/src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs
@@ -66,8 +66,8 @@ namespace Umbraco.Web.Cache
             // service of changes, else factories may try to rebuild models while
             // we are using the database to load content into caches
 
-            _publishedModelFactory.WithSafeLiveFactory(() =>
-                _publishedSnapshotService.Notify(payloads));
+            //_publishedModelFactory.WithSafeLiveFactory(() =>
+                _publishedSnapshotService.Notify(payloads);
 
             base.Refresh(payloads);
         }

From a85d8f3e21abaccf7b4f2457180ffebb04a00054 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 16 Sep 2019 14:25:02 +1000
Subject: [PATCH 613/776] ensure that we don't CreateModel during cache
 notification

---
 src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
index d6631b779d..b4d409f66f 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
@@ -883,7 +883,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 return true;
             var link = GetParentLink(kit.Node);
             var node = link?.Value;
-            return node?.PublishedModel != null;
+            return node != null && node.HasPublished;
         }
 
         private ContentNode GenCloneLocked(LinkedNode<ContentNode> link)

From bc42adb2ce0ed5c6765a38271cccd939f8b7e739 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 16 Sep 2019 14:31:27 +1000
Subject: [PATCH 614/776] removes notifying all content/media of content type
 changes since nucache model creation is lazy now

---
 .../NuCache/PublishedSnapshotService.cs       | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index 15e6574b40..cde45ae116 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -790,21 +790,22 @@ namespace Umbraco.Web.PublishedCache.NuCache
             Notify<IContentType>(_contentStore, payloads, RefreshContentTypesLocked);
             Notify<IMediaType>(_mediaStore, payloads, RefreshMediaTypesLocked);
 
-            if (_publishedModelFactory.IsLiveFactory())
-            {
-                //In the case of Pure Live - we actually need to refresh all of the content and the media
-                //see https://github.com/umbraco/Umbraco-CMS/issues/5671
-                //The underlying issue is that in Pure Live the ILivePublishedModelFactory will re-compile all of the classes/models
-                //into a new DLL for the application which includes both content types and media types.
-                //Since the models in the cache are based on these actual classes, all of the objects in the cache need to be updated
-                //to use the newest version of the class.
-                using (_contentStore.GetScopedWriteLock(_scopeProvider))
-                using (_mediaStore.GetScopedWriteLock(_scopeProvider))
-                {
-                    NotifyLocked(new[] { new ContentCacheRefresher.JsonPayload(0, TreeChangeTypes.RefreshAll) }, out var draftChanged, out var publishedChanged);
-                    NotifyLocked(new[] { new MediaCacheRefresher.JsonPayload(0, TreeChangeTypes.RefreshAll) }, out var anythingChanged);
-                }
-            }
+            //TODO: I don't think this is necessary with the changes to nucache now that calls to `CreateModel` are lazy!
+            //if (_publishedModelFactory.IsLiveFactory())
+            //{
+            //    //In the case of Pure Live - we actually need to refresh all of the content and the media
+            //    //see https://github.com/umbraco/Umbraco-CMS/issues/5671
+            //    //The underlying issue is that in Pure Live the ILivePublishedModelFactory will re-compile all of the classes/models
+            //    //into a new DLL for the application which includes both content types and media types.
+            //    //Since the models in the cache are based on these actual classes, all of the objects in the cache need to be updated
+            //    //to use the newest version of the class.
+            //    using (_contentStore.GetScopedWriteLock(_scopeProvider))
+            //    using (_mediaStore.GetScopedWriteLock(_scopeProvider))
+            //    {
+            //        NotifyLocked(new[] { new ContentCacheRefresher.JsonPayload(0, TreeChangeTypes.RefreshAll) }, out var draftChanged, out var publishedChanged);
+            //        NotifyLocked(new[] { new MediaCacheRefresher.JsonPayload(0, TreeChangeTypes.RefreshAll) }, out var anythingChanged);
+            //    }
+            //}
 
             ((PublishedSnapshot)CurrentPublishedSnapshot)?.Resync();
         }

From fc821000f3ef9d6c6be2f6d7dec7be4215af7d0a Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 16 Sep 2019 14:50:05 +1000
Subject: [PATCH 615/776] Adds ext methods for creating a flag to indicate
 model recompilation should occur

---
 .../PublishedContentExtensionsForModels.cs    | 10 +---
 .../PublishedModelFactoryExtensions.cs        | 56 +++++++++++++++++++
 .../Cache/ContentTypeCacheRefresher.cs        |  3 +-
 .../Cache/DataTypeCacheRefresher.cs           |  3 +-
 .../NuCache/PublishedSnapshotService.cs       | 33 +++++------
 5 files changed, 78 insertions(+), 27 deletions(-)

diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedContentExtensionsForModels.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedContentExtensionsForModels.cs
index bfc65b70d6..8e68bdae52 100644
--- a/src/Umbraco.Core/Models/PublishedContent/PublishedContentExtensionsForModels.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/PublishedContentExtensionsForModels.cs
@@ -25,15 +25,7 @@ namespace Umbraco.Core.Models.PublishedContent
 
             // get model
             // if factory returns nothing, throw
-            var model = Current.PublishedModelFactory.CreateModel(content);
-            if (model == null)
-                throw new Exception("Factory returned null.");
-
-            // if factory returns a different type, throw
-            if (!(model is IPublishedContent publishedContent))
-                throw new Exception($"Factory returned model of type {model.GetType().FullName} which does not implement IPublishedContent.");
-
-            return publishedContent;
+            return Current.PublishedModelFactory.CreateModelWithSafeLiveFactoryRefreshCheck(content);
         }
     }
 }
diff --git a/src/Umbraco.Core/PublishedModelFactoryExtensions.cs b/src/Umbraco.Core/PublishedModelFactoryExtensions.cs
index 70bef75192..c36643095b 100644
--- a/src/Umbraco.Core/PublishedModelFactoryExtensions.cs
+++ b/src/Umbraco.Core/PublishedModelFactoryExtensions.cs
@@ -47,6 +47,62 @@ namespace Umbraco.Core
             }
         }
 
+        /// <summary>
+        /// Creates a strongly typed model while checking if the factory is <see cref="ILivePublishedModelFactory"/> and if a refresh flag has been set, in which
+        /// case the models will be recompiled before model creation
+        /// </summary>
+        /// <param name="factory"></param>
+        /// <param name="content"></param>
+        /// <returns></returns>
+        internal static IPublishedContent CreateModelWithSafeLiveFactoryRefreshCheck(this IPublishedModelFactory factory, IPublishedContent content)
+        {
+            if (factory is ILivePublishedModelFactory liveFactory && _refresh)
+            {
+                lock (liveFactory.SyncRoot)
+                {
+                    if (_refresh)
+                    {
+                        _refresh = false;
+                        //Call refresh on the live factory to re-compile the models
+                        liveFactory.Refresh();
+                    }
+                }
+            }
+
+            var model = factory.CreateModel(content);
+            if (model == null)
+                throw new Exception("Factory returned null.");
+
+            // if factory returns a different type, throw
+            if (!(model is IPublishedContent publishedContent))
+                throw new Exception($"Factory returned model of type {model.GetType().FullName} which does not implement IPublishedContent.");
+
+            return publishedContent;
+        }
+
+        /// <summary>
+        /// Sets a flag to re-compile the models if the <see cref="IPublishedModelFactory"/> is <see cref="ILivePublishedModelFactory"/>
+        /// </summary>
+        /// <param name="factory"></param>
+        /// <param name="action"></param>
+        internal static void WithSafeLiveFactoryRefreshSet(this IPublishedModelFactory factory, Action action)
+        {
+            if (factory is ILivePublishedModelFactory liveFactory)
+            {
+                lock (liveFactory.SyncRoot)
+                {
+                    _refresh = true;
+                    action();
+                }
+            }
+            else
+            {
+                action();
+            }
+        }
+
+        private static volatile bool _refresh = false;
+
         public static IDisposable SuspendSafeLiveFactory(this IPublishedModelFactory factory)
         {
             if (factory is ILivePublishedModelFactory liveFactory)
diff --git a/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs b/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs
index cf90b60d8a..4d339ff336 100644
--- a/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs
@@ -91,7 +91,8 @@ namespace Umbraco.Web.Cache
             // we are using the database to load content into caches
 
             //_publishedModelFactory.WithSafeLiveFactory(() =>
-                _publishedSnapshotService.Notify(payloads);
+            _publishedModelFactory.WithSafeLiveFactoryRefreshSet(() =>
+                _publishedSnapshotService.Notify(payloads));
 
             // now we can trigger the event
             base.Refresh(payloads);
diff --git a/src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs b/src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs
index fb4f59fce4..b80542af44 100644
--- a/src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs
@@ -67,7 +67,8 @@ namespace Umbraco.Web.Cache
             // we are using the database to load content into caches
 
             //_publishedModelFactory.WithSafeLiveFactory(() =>
-                _publishedSnapshotService.Notify(payloads);
+            _publishedModelFactory.WithSafeLiveFactoryRefreshSet(() =>
+                _publishedSnapshotService.Notify(payloads));
 
             base.Refresh(payloads);
         }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index cde45ae116..66cc5aaed0 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -790,22 +790,23 @@ namespace Umbraco.Web.PublishedCache.NuCache
             Notify<IContentType>(_contentStore, payloads, RefreshContentTypesLocked);
             Notify<IMediaType>(_mediaStore, payloads, RefreshMediaTypesLocked);
 
-            //TODO: I don't think this is necessary with the changes to nucache now that calls to `CreateModel` are lazy!
-            //if (_publishedModelFactory.IsLiveFactory())
-            //{
-            //    //In the case of Pure Live - we actually need to refresh all of the content and the media
-            //    //see https://github.com/umbraco/Umbraco-CMS/issues/5671
-            //    //The underlying issue is that in Pure Live the ILivePublishedModelFactory will re-compile all of the classes/models
-            //    //into a new DLL for the application which includes both content types and media types.
-            //    //Since the models in the cache are based on these actual classes, all of the objects in the cache need to be updated
-            //    //to use the newest version of the class.
-            //    using (_contentStore.GetScopedWriteLock(_scopeProvider))
-            //    using (_mediaStore.GetScopedWriteLock(_scopeProvider))
-            //    {
-            //        NotifyLocked(new[] { new ContentCacheRefresher.JsonPayload(0, TreeChangeTypes.RefreshAll) }, out var draftChanged, out var publishedChanged);
-            //        NotifyLocked(new[] { new MediaCacheRefresher.JsonPayload(0, TreeChangeTypes.RefreshAll) }, out var anythingChanged);
-            //    }
-            //}
+            //TODO: I don't think this is necessary with the changes to nucache now that calls to `CreateModel` are lazy?
+            // but I may be dreaming here, if i remove this call and save a content type, then the cache doesn't render a lot of the content. hrm.
+            if (_publishedModelFactory.IsLiveFactory())
+            {
+                //In the case of Pure Live - we actually need to refresh all of the content and the media
+                //see https://github.com/umbraco/Umbraco-CMS/issues/5671
+                //The underlying issue is that in Pure Live the ILivePublishedModelFactory will re-compile all of the classes/models
+                //into a new DLL for the application which includes both content types and media types.
+                //Since the models in the cache are based on these actual classes, all of the objects in the cache need to be updated
+                //to use the newest version of the class.
+                using (_contentStore.GetScopedWriteLock(_scopeProvider))
+                using (_mediaStore.GetScopedWriteLock(_scopeProvider))
+                {
+                    NotifyLocked(new[] { new ContentCacheRefresher.JsonPayload(0, TreeChangeTypes.RefreshAll) }, out var draftChanged, out var publishedChanged);
+                    NotifyLocked(new[] { new MediaCacheRefresher.JsonPayload(0, TreeChangeTypes.RefreshAll) }, out var anythingChanged);
+                }
+            }
 
             ((PublishedSnapshot)CurrentPublishedSnapshot)?.Resync();
         }

From ebada94a489c339aba31f2646cca5dca8bd56150 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 16 Sep 2019 14:59:12 +1000
Subject: [PATCH 616/776] temp - removing the SuspendSafeLiveFactory for now

---
 .../Packaging/PackageDataInstallation.cs      |  2 +-
 .../PublishedModelFactoryExtensions.cs        | 58 +++++++++----------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/Umbraco.Core/Packaging/PackageDataInstallation.cs b/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
index 79e8d2fc00..133bdd0668 100644
--- a/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
+++ b/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
@@ -64,7 +64,7 @@ namespace Umbraco.Core.Packaging
             var removedDataTypes = new List<IDataType>();
             var removedLanguages = new List<ILanguage>();
 
-            using(_publishedModelFactory.SuspendSafeLiveFactory()) //ensure that any PureLive models are not regenerated until after the bulk operation
+            //using(_publishedModelFactory.SuspendSafeLiveFactory()) //ensure that any PureLive models are not regenerated until after the bulk operation
             using (var scope = _scopeProvider.CreateScope())
             {
                 //Uninstall templates
diff --git a/src/Umbraco.Core/PublishedModelFactoryExtensions.cs b/src/Umbraco.Core/PublishedModelFactoryExtensions.cs
index c36643095b..e314746ffd 100644
--- a/src/Umbraco.Core/PublishedModelFactoryExtensions.cs
+++ b/src/Umbraco.Core/PublishedModelFactoryExtensions.cs
@@ -28,17 +28,17 @@ namespace Umbraco.Core
             {
                 lock (liveFactory.SyncRoot)
                 {
-                    if (_suspend != null)
-                    {
-                        //if we are currently suspended, queue the action
-                        _suspend.Queue(action);
-                    }
-                    else
-                    {
+                    //if (_suspend != null)
+                    //{
+                    //    //if we are currently suspended, queue the action
+                    //    _suspend.Queue(action);
+                    //}
+                    //else
+                    //{
                         //Call refresh on the live factory to re-compile the models
                         liveFactory.Refresh();
                         action();
-                    }
+                    //}
                 }
             }
             else
@@ -103,28 +103,28 @@ namespace Umbraco.Core
 
         private static volatile bool _refresh = false;
 
-        public static IDisposable SuspendSafeLiveFactory(this IPublishedModelFactory factory)
-        {
-            if (factory is ILivePublishedModelFactory liveFactory)
-            {
-                lock (liveFactory.SyncRoot)
-                {
-                    if (_suspend == null)
-                    {
-                        _suspend = new SuspendSafeLiveFactory(
-                            factory,
-                            () => _suspend = null); //reset when it's done
-                    }
-                    return _suspend;
-                }
-            }
-            else
-            {
-                return new SuspendSafeLiveFactory(factory); //returns a noop version of IDisposable, this won't actually do anything
-            }
-        }
+        //public static IDisposable SuspendSafeLiveFactory(this IPublishedModelFactory factory)
+        //{
+        //    if (factory is ILivePublishedModelFactory liveFactory)
+        //    {
+        //        lock (liveFactory.SyncRoot)
+        //        {
+        //            if (_suspend == null)
+        //            {
+        //                _suspend = new SuspendSafeLiveFactory(
+        //                    factory,
+        //                    () => _suspend = null); //reset when it's done
+        //            }
+        //            return _suspend;
+        //        }
+        //    }
+        //    else
+        //    {
+        //        return new SuspendSafeLiveFactory(factory); //returns a noop version of IDisposable, this won't actually do anything
+        //    }
+        //}
 
-        private static SuspendSafeLiveFactory _suspend;
+        //private static SuspendSafeLiveFactory _suspend;
     }
 
     internal class SuspendSafeLiveFactory : IDisposable

From 4c775822c0733bebde8cca7b5203715d5fb67f4f Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 16 Sep 2019 16:22:05 +1000
Subject: [PATCH 617/776] fixes null ref issues since the field values were not
 copied on clone

---
 src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs
index fad402a0eb..5f8e81fd31 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs
@@ -101,6 +101,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
             _draftData = origin._draftData;
             _publishedData = origin._publishedData;
+            _publishedSnapshotAccessor = origin._publishedSnapshotAccessor;
+            _variationContextAccessor = origin._variationContextAccessor;
         }
 
         // everything that is common to both draft and published versions

From bc40216ecaebdab07c8167a0fb283448bfede08a Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 16 Sep 2019 16:31:16 +1000
Subject: [PATCH 618/776] Ensure package installation for data is executed
 within a single scope/trans

---
 .../Packaging/PackageDataInstallation.cs      | 26 ++++++++++++++++++-
 .../Packaging/PackageInstallation.cs          | 15 +----------
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/src/Umbraco.Core/Packaging/PackageDataInstallation.cs b/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
index 133bdd0668..d488f438ff 100644
--- a/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
+++ b/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
@@ -51,7 +51,7 @@ namespace Umbraco.Core.Packaging
             _contentService = contentService;
         }
 
-        #region Uninstall
+        #region Install/Uninstall
 
         public UninstallationSummary UninstallPackageData(PackageDefinition package, int userId)
         {
@@ -176,6 +176,30 @@ namespace Umbraco.Core.Packaging
 
         }
 
+        public InstallationSummary InstallPackageData(CompiledPackage compiledPackage, int userId)
+        {
+            using (var scope = _scopeProvider.CreateScope())
+            {
+                var installationSummary = new InstallationSummary
+                {
+                    DataTypesInstalled = ImportDataTypes(compiledPackage.DataTypes.ToList(), userId),
+                    LanguagesInstalled = ImportLanguages(compiledPackage.Languages, userId),
+                    DictionaryItemsInstalled = ImportDictionaryItems(compiledPackage.DictionaryItems, userId),
+                    MacrosInstalled = ImportMacros(compiledPackage.Macros, userId),
+                    TemplatesInstalled = ImportTemplates(compiledPackage.Templates.ToList(), userId),
+                    DocumentTypesInstalled = ImportDocumentTypes(compiledPackage.DocumentTypes, userId)
+                };
+
+                //we need a reference to the imported doc types to continue
+                var importedDocTypes = installationSummary.DocumentTypesInstalled.ToDictionary(x => x.Alias, x => x);
+
+                installationSummary.StylesheetsInstalled = ImportStylesheets(compiledPackage.Stylesheets, userId);
+                installationSummary.ContentInstalled = ImportContent(compiledPackage.Documents, importedDocTypes, userId);
+                
+                return installationSummary;
+            }
+        }
+
         #endregion
 
         #region Content
diff --git a/src/Umbraco.Core/Packaging/PackageInstallation.cs b/src/Umbraco.Core/Packaging/PackageInstallation.cs
index d791295b38..a42ee1aeb2 100644
--- a/src/Umbraco.Core/Packaging/PackageInstallation.cs
+++ b/src/Umbraco.Core/Packaging/PackageInstallation.cs
@@ -90,21 +90,8 @@ namespace Umbraco.Core.Packaging
 
         public InstallationSummary InstallPackageData(PackageDefinition packageDefinition, CompiledPackage compiledPackage, int userId)
         {
-            var installationSummary = new InstallationSummary
-            {
-                DataTypesInstalled = _packageDataInstallation.ImportDataTypes(compiledPackage.DataTypes.ToList(), userId),
-                LanguagesInstalled = _packageDataInstallation.ImportLanguages(compiledPackage.Languages, userId),
-                DictionaryItemsInstalled = _packageDataInstallation.ImportDictionaryItems(compiledPackage.DictionaryItems, userId),
-                MacrosInstalled = _packageDataInstallation.ImportMacros(compiledPackage.Macros, userId),
-                TemplatesInstalled = _packageDataInstallation.ImportTemplates(compiledPackage.Templates.ToList(), userId),
-                DocumentTypesInstalled = _packageDataInstallation.ImportDocumentTypes(compiledPackage.DocumentTypes, userId)
-            };
+            var installationSummary = _packageDataInstallation.InstallPackageData(compiledPackage, userId);
 
-            //we need a reference to the imported doc types to continue
-            var importedDocTypes = installationSummary.DocumentTypesInstalled.ToDictionary(x => x.Alias, x => x);
-
-            installationSummary.StylesheetsInstalled = _packageDataInstallation.ImportStylesheets(compiledPackage.Stylesheets, userId);
-            installationSummary.ContentInstalled = _packageDataInstallation.ImportContent(compiledPackage.Documents, importedDocTypes, userId);
             installationSummary.Actions = CompiledPackageXmlParser.GetPackageActions(XElement.Parse(compiledPackage.Actions), compiledPackage.Name);
             installationSummary.MetaData = compiledPackage;
             installationSummary.FilesInstalled = packageDefinition.Files;

From 47d3af9bb3772cbd09aaa49f8a6205d6c2d3f9a4 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 16 Sep 2019 16:59:57 +1000
Subject: [PATCH 619/776] removes the test suspendable model factory code

---
 .../Packaging/PackageDataInstallation.cs      |  5 +-
 .../PublishedModelFactoryExtensions.cs        | 94 +------------------
 .../Cache/ContentTypeCacheRefresher.cs        |  1 -
 .../Cache/DataTypeCacheRefresher.cs           |  1 -
 .../Editors/ContentTypeController.cs          |  6 +-
 .../NuCache/PublishedSnapshotService.cs       |  2 -
 6 files changed, 6 insertions(+), 103 deletions(-)

diff --git a/src/Umbraco.Core/Packaging/PackageDataInstallation.cs b/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
index d488f438ff..b6dd49bd18 100644
--- a/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
+++ b/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
@@ -28,15 +28,13 @@ namespace Umbraco.Core.Packaging
         private readonly IDataTypeService _dataTypeService;
         private readonly PropertyEditorCollection _propertyEditors;
         private readonly IScopeProvider _scopeProvider;
-        private readonly IPublishedModelFactory _publishedModelFactory;
         private readonly IEntityService _entityService;
         private readonly IContentTypeService _contentTypeService;
         private readonly IContentService _contentService;
 
         public PackageDataInstallation(ILogger logger, IFileService fileService, IMacroService macroService, ILocalizationService localizationService,
             IDataTypeService dataTypeService, IEntityService entityService, IContentTypeService contentTypeService,
-            IContentService contentService, PropertyEditorCollection propertyEditors, IScopeProvider scopeProvider,
-            IPublishedModelFactory publishedModelFactory)
+            IContentService contentService, PropertyEditorCollection propertyEditors, IScopeProvider scopeProvider)
         {
             _logger = logger;
             _fileService = fileService;
@@ -45,7 +43,6 @@ namespace Umbraco.Core.Packaging
             _dataTypeService = dataTypeService;
             _propertyEditors = propertyEditors;
             _scopeProvider = scopeProvider;
-            _publishedModelFactory = publishedModelFactory;
             _entityService = entityService;
             _contentTypeService = contentTypeService;
             _contentService = contentService;
diff --git a/src/Umbraco.Core/PublishedModelFactoryExtensions.cs b/src/Umbraco.Core/PublishedModelFactoryExtensions.cs
index e314746ffd..0e3aa48c53 100644
--- a/src/Umbraco.Core/PublishedModelFactoryExtensions.cs
+++ b/src/Umbraco.Core/PublishedModelFactoryExtensions.cs
@@ -28,17 +28,9 @@ namespace Umbraco.Core
             {
                 lock (liveFactory.SyncRoot)
                 {
-                    //if (_suspend != null)
-                    //{
-                    //    //if we are currently suspended, queue the action
-                    //    _suspend.Queue(action);
-                    //}
-                    //else
-                    //{
-                        //Call refresh on the live factory to re-compile the models
-                        liveFactory.Refresh();
-                        action();
-                    //}
+                    //Call refresh on the live factory to re-compile the models
+                    liveFactory.Refresh();
+                    action();
                 }
             }
             else
@@ -103,85 +95,5 @@ namespace Umbraco.Core
 
         private static volatile bool _refresh = false;
 
-        //public static IDisposable SuspendSafeLiveFactory(this IPublishedModelFactory factory)
-        //{
-        //    if (factory is ILivePublishedModelFactory liveFactory)
-        //    {
-        //        lock (liveFactory.SyncRoot)
-        //        {
-        //            if (_suspend == null)
-        //            {
-        //                _suspend = new SuspendSafeLiveFactory(
-        //                    factory,
-        //                    () => _suspend = null); //reset when it's done
-        //            }
-        //            return _suspend;
-        //        }
-        //    }
-        //    else
-        //    {
-        //        return new SuspendSafeLiveFactory(factory); //returns a noop version of IDisposable, this won't actually do anything
-        //    }
-        //}
-
-        //private static SuspendSafeLiveFactory _suspend;
-    }
-
-    internal class SuspendSafeLiveFactory : IDisposable
-    {
-        private readonly IPublishedModelFactory _factory;
-        private readonly Action _reset;
-        private readonly List<Action> _actions = new List<Action>();
-
-        public SuspendSafeLiveFactory(IPublishedModelFactory factory, Action reset = null)
-        {
-            _factory = factory;
-            _reset = reset;
-        }
-
-        /// <summary>
-        /// Queue an action to execute on disposal after rebuild
-        /// </summary>
-        /// <param name="action"></param>
-        public void Queue(Action action)
-        {
-            _actions.Add(action);
-        }
-
-        #region IDisposable Support
-        private bool disposedValue = false; // To detect redundant calls
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if (!disposedValue)
-            {
-                if (disposing)
-                {
-                    if (_factory is ILivePublishedModelFactory liveFactory)
-                    {
-                        lock (liveFactory.SyncRoot)
-                        {
-                            //Call refresh on the live factory to re-compile the models
-                            liveFactory.Refresh();
-
-                            //then we need to call all queued actions
-                            foreach(var action in _actions)
-                                action();
-                        }
-                    }
-                    _reset?.Invoke();
-                }
-                disposedValue = true;
-            }
-        }
-
-        // This code added to correctly implement the disposable pattern.
-        public void Dispose()
-        {
-            // Do not change this code. Put cleanup code in Dispose(bool disposing) above.
-            Dispose(true);
-        }
-        #endregion
-
     }
 }
diff --git a/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs b/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs
index 4d339ff336..df81dd85e8 100644
--- a/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs
@@ -90,7 +90,6 @@ namespace Umbraco.Web.Cache
             // service of changes, else factories may try to rebuild models while
             // we are using the database to load content into caches
 
-            //_publishedModelFactory.WithSafeLiveFactory(() =>
             _publishedModelFactory.WithSafeLiveFactoryRefreshSet(() =>
                 _publishedSnapshotService.Notify(payloads));
 
diff --git a/src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs b/src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs
index b80542af44..f86073abdd 100644
--- a/src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs
@@ -66,7 +66,6 @@ namespace Umbraco.Web.Cache
             // service of changes, else factories may try to rebuild models while
             // we are using the database to load content into caches
 
-            //_publishedModelFactory.WithSafeLiveFactory(() =>
             _publishedModelFactory.WithSafeLiveFactoryRefreshSet(() =>
                 _publishedSnapshotService.Notify(payloads));
 
diff --git a/src/Umbraco.Web/Editors/ContentTypeController.cs b/src/Umbraco.Web/Editors/ContentTypeController.cs
index 82cf3a5813..7c63061159 100644
--- a/src/Umbraco.Web/Editors/ContentTypeController.cs
+++ b/src/Umbraco.Web/Editors/ContentTypeController.cs
@@ -49,7 +49,6 @@ namespace Umbraco.Web.Editors
         private readonly IEntityXmlSerializer _serializer;
         private readonly PropertyEditorCollection _propertyEditors;
         private readonly IScopeProvider _scopeProvider;
-        private readonly IPublishedModelFactory _publishedModelFactory;
 
         public ContentTypeController(IEntityXmlSerializer serializer,
             ICultureDictionaryFactory cultureDictionaryFactory,
@@ -58,13 +57,12 @@ namespace Umbraco.Web.Editors
             ISqlContext sqlContext, PropertyEditorCollection propertyEditors,
             ServiceContext services, AppCaches appCaches,
             IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper,
-            IScopeProvider scopeProvider, IPublishedModelFactory publishedModelFactory)
+            IScopeProvider scopeProvider)
             : base(cultureDictionaryFactory, globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper)
         {
             _serializer = serializer;
             _propertyEditors = propertyEditors;
             _scopeProvider = scopeProvider;
-            _publishedModelFactory = publishedModelFactory;
         }
 
         public int GetCount()
@@ -527,7 +525,7 @@ namespace Umbraco.Web.Editors
             }
 
             var dataInstaller = new PackageDataInstallation(Logger, Services.FileService, Services.MacroService, Services.LocalizationService,
-                Services.DataTypeService, Services.EntityService, Services.ContentTypeService, Services.ContentService, _propertyEditors, _scopeProvider, _publishedModelFactory);
+                Services.DataTypeService, Services.EntityService, Services.ContentTypeService, Services.ContentService, _propertyEditors, _scopeProvider);
 
             var xd = new XmlDocument {XmlResolver = null};
             xd.Load(filePath);
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index 66cc5aaed0..15e6574b40 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -790,8 +790,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
             Notify<IContentType>(_contentStore, payloads, RefreshContentTypesLocked);
             Notify<IMediaType>(_mediaStore, payloads, RefreshMediaTypesLocked);
 
-            //TODO: I don't think this is necessary with the changes to nucache now that calls to `CreateModel` are lazy?
-            // but I may be dreaming here, if i remove this call and save a content type, then the cache doesn't render a lot of the content. hrm.
             if (_publishedModelFactory.IsLiveFactory())
             {
                 //In the case of Pure Live - we actually need to refresh all of the content and the media

From 00c720413a7ac08b9707326845f0078a9ae5c06c Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 16 Sep 2019 17:23:00 +1000
Subject: [PATCH 620/776] Uses reflection to call ResetModels to flag MB to
 recompile.

---
 .../PublishedContentExtensionsForModels.cs    | 10 +++-
 .../PublishedModelFactoryExtensions.cs        | 52 +++++--------------
 .../Cache/ContentTypeCacheRefresher.cs        |  2 +-
 .../Cache/DataTypeCacheRefresher.cs           |  2 +-
 4 files changed, 25 insertions(+), 41 deletions(-)

diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedContentExtensionsForModels.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedContentExtensionsForModels.cs
index 8e68bdae52..bfc65b70d6 100644
--- a/src/Umbraco.Core/Models/PublishedContent/PublishedContentExtensionsForModels.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/PublishedContentExtensionsForModels.cs
@@ -25,7 +25,15 @@ namespace Umbraco.Core.Models.PublishedContent
 
             // get model
             // if factory returns nothing, throw
-            return Current.PublishedModelFactory.CreateModelWithSafeLiveFactoryRefreshCheck(content);
+            var model = Current.PublishedModelFactory.CreateModel(content);
+            if (model == null)
+                throw new Exception("Factory returned null.");
+
+            // if factory returns a different type, throw
+            if (!(model is IPublishedContent publishedContent))
+                throw new Exception($"Factory returned model of type {model.GetType().FullName} which does not implement IPublishedContent.");
+
+            return publishedContent;
         }
     }
 }
diff --git a/src/Umbraco.Core/PublishedModelFactoryExtensions.cs b/src/Umbraco.Core/PublishedModelFactoryExtensions.cs
index 0e3aa48c53..e30b87d15e 100644
--- a/src/Umbraco.Core/PublishedModelFactoryExtensions.cs
+++ b/src/Umbraco.Core/PublishedModelFactoryExtensions.cs
@@ -40,50 +40,28 @@ namespace Umbraco.Core
         }
 
         /// <summary>
-        /// Creates a strongly typed model while checking if the factory is <see cref="ILivePublishedModelFactory"/> and if a refresh flag has been set, in which
-        /// case the models will be recompiled before model creation
-        /// </summary>
-        /// <param name="factory"></param>
-        /// <param name="content"></param>
-        /// <returns></returns>
-        internal static IPublishedContent CreateModelWithSafeLiveFactoryRefreshCheck(this IPublishedModelFactory factory, IPublishedContent content)
-        {
-            if (factory is ILivePublishedModelFactory liveFactory && _refresh)
-            {
-                lock (liveFactory.SyncRoot)
-                {
-                    if (_refresh)
-                    {
-                        _refresh = false;
-                        //Call refresh on the live factory to re-compile the models
-                        liveFactory.Refresh();
-                    }
-                }
-            }
-
-            var model = factory.CreateModel(content);
-            if (model == null)
-                throw new Exception("Factory returned null.");
-
-            // if factory returns a different type, throw
-            if (!(model is IPublishedContent publishedContent))
-                throw new Exception($"Factory returned model of type {model.GetType().FullName} which does not implement IPublishedContent.");
-
-            return publishedContent;
-        }
-
-        /// <summary>
-        /// Sets a flag to re-compile the models if the <see cref="IPublishedModelFactory"/> is <see cref="ILivePublishedModelFactory"/>
+        /// Sets a flag to reset the ModelsBuilder models if the <see cref="IPublishedModelFactory"/> is <see cref="ILivePublishedModelFactory"/>
         /// </summary>
         /// <param name="factory"></param>
         /// <param name="action"></param>
-        internal static void WithSafeLiveFactoryRefreshSet(this IPublishedModelFactory factory, Action action)
+        /// <remarks>
+        /// This does not recompile the pure live models, only sets a flag to tell models builder to recompile when they are requested.
+        /// </remarks>
+        internal static void WithSafeLiveFactoryReset(this IPublishedModelFactory factory, Action action)
         {
             if (factory is ILivePublishedModelFactory liveFactory)
             {
                 lock (liveFactory.SyncRoot)
                 {
-                    _refresh = true;
+                    // TODO: Fix this in 8.3! - We need to change the ILivePublishedModelFactory interface to have a Reset method and then when we have an embedded MB
+                    // version we will publicize the ResetModels (and change the name to Reset).
+                    // For now, this will suffice and we'll use reflection, there should be no other implementation of ILivePublishedModelFactory.
+                    // Calling ResetModels resets the MB flag so that the next time EnsureModels is called (which is called when nucache lazily calls CreateModel) it will
+                    // trigger the recompiling of pure live models.
+                    var resetMethod = liveFactory.GetType().GetMethod("ResetModels", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic);
+                    if (resetMethod != null)
+                        resetMethod.Invoke(liveFactory, null);
+
                     action();
                 }
             }
@@ -93,7 +71,5 @@ namespace Umbraco.Core
             }
         }
 
-        private static volatile bool _refresh = false;
-
     }
 }
diff --git a/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs b/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs
index df81dd85e8..dc1a4701d4 100644
--- a/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs
@@ -90,7 +90,7 @@ namespace Umbraco.Web.Cache
             // service of changes, else factories may try to rebuild models while
             // we are using the database to load content into caches
 
-            _publishedModelFactory.WithSafeLiveFactoryRefreshSet(() =>
+            _publishedModelFactory.WithSafeLiveFactoryReset(() =>
                 _publishedSnapshotService.Notify(payloads));
 
             // now we can trigger the event
diff --git a/src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs b/src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs
index f86073abdd..0ddb8c4bf6 100644
--- a/src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs
@@ -66,7 +66,7 @@ namespace Umbraco.Web.Cache
             // service of changes, else factories may try to rebuild models while
             // we are using the database to load content into caches
 
-            _publishedModelFactory.WithSafeLiveFactoryRefreshSet(() =>
+            _publishedModelFactory.WithSafeLiveFactoryReset(() =>
                 _publishedSnapshotService.Notify(payloads));
 
             base.Refresh(payloads);

From c27e876c75633d552ab84e37bf48e2da3d39cc02 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 16 Sep 2019 17:40:48 +1000
Subject: [PATCH 621/776] Removes BackgroundPublishedSnapshotNotifier

---
 .../Routing/UmbracoModuleTests.cs             |   5 -
 .../TestHelpers/TestWithDatabaseBase.cs       |   2 -
 .../BackgroundPublishedSnapshotNotifier.cs    | 120 ------------------
 src/Umbraco.Web/Runtime/WebInitialComposer.cs |   1 -
 src/Umbraco.Web/Umbraco.Web.csproj            |   1 -
 src/Umbraco.Web/UmbracoInjectedModule.cs      |   9 --
 6 files changed, 138 deletions(-)
 delete mode 100644 src/Umbraco.Web/Cache/BackgroundPublishedSnapshotNotifier.cs

diff --git a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
index 060ce549dd..e95fdfc87c 100644
--- a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
+++ b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
@@ -42,11 +42,6 @@ namespace Umbraco.Tests.Routing
                 logger,
                 null, // FIXME: PublishedRouter complexities...
                 Mock.Of<IUmbracoContextFactory>(),
-                Mock.Of<IPublishedModelFactory>(),
-                new Umbraco.Web.Cache.BackgroundPublishedSnapshotNotifier(
-                    Factory.GetInstance<IPublishedModelFactory>(),
-                    Factory.GetInstance<IPublishedSnapshotService>(),
-                    Logger),
                 new RoutableDocumentFilter(globalSettings)
             );
 
diff --git a/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs b/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
index 7ee75b1d9c..9cc2b97445 100644
--- a/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
@@ -91,8 +91,6 @@ namespace Umbraco.Tests.TestHelpers
                 factory.ResetForTests();
                 return factory;
             });
-
-            Composition.RegisterUnique<BackgroundPublishedSnapshotNotifier>();
         }
 
         [OneTimeTearDown]
diff --git a/src/Umbraco.Web/Cache/BackgroundPublishedSnapshotNotifier.cs b/src/Umbraco.Web/Cache/BackgroundPublishedSnapshotNotifier.cs
deleted file mode 100644
index e2b3c07cea..0000000000
--- a/src/Umbraco.Web/Cache/BackgroundPublishedSnapshotNotifier.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-using System.Threading;
-using System.Threading.Tasks;
-using Umbraco.Core;
-using Umbraco.Core.Models.PublishedContent;
-using Umbraco.Core.Logging;
-using Umbraco.Web.PublishedCache;
-using Umbraco.Web.Scheduling;
-
-namespace Umbraco.Web.Cache
-{
-    /// <summary>
-    /// Used to notify the <see cref="IPublishedSnapshotService"/> of changes using a background thread
-    /// </summary>
-    /// <remarks>
-    /// When in Pure Live mode, the models need to be rebuilt before the IPublishedSnapshotService is notified which can result in performance penalties so
-    /// this performs these actions on a background thread so the user isn't waiting for the rebuilding to occur on a UI thread.
-    /// When using this, even when not in Pure Live mode, it still means that the cache is notified on a background thread.
-    /// In order to wait for the processing to complete, this class has a Wait() method which will block until the processing is finished.
-    /// </remarks>
-    public sealed class BackgroundPublishedSnapshotNotifier
-    {
-        private readonly IPublishedModelFactory _publishedModelFactory;
-        private readonly IPublishedSnapshotService _publishedSnapshotService;
-        private readonly BackgroundTaskRunner<IBackgroundTask> _runner;
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="publishedModelFactory"></param>
-        /// <param name="publishedSnapshotService"></param>
-        /// <param name="logger"></param>
-        public BackgroundPublishedSnapshotNotifier(IPublishedModelFactory publishedModelFactory, IPublishedSnapshotService publishedSnapshotService, ILogger logger)
-        {
-            _publishedModelFactory = publishedModelFactory;
-            _publishedSnapshotService = publishedSnapshotService;
-            _runner = new BackgroundTaskRunner<IBackgroundTask>("RebuildModelsAndCache", logger);
-        }
-
-        /// <summary>
-        /// Blocks until the background operation is completed
-        /// </summary>
-        /// <returns>Returns true if waiting was necessary</returns>
-        public bool Wait()
-        {
-            var running = _runner.IsRunning;
-            _runner.StoppedAwaitable.GetAwaiter().GetResult(); //TODO: do we need a try/catch?
-            return running;
-        }
-
-        /// <summary>
-        /// Notify the <see cref="IPublishedSnapshotService"/> of content type changes
-        /// </summary>
-        /// <param name="payloads"></param>
-        public void NotifyWithSafeLiveFactory(ContentTypeCacheRefresher.JsonPayload[] payloads)
-        {
-            _runner.TryAdd(new RebuildModelsAndCacheTask(payloads, _publishedModelFactory, _publishedSnapshotService));
-        }
-
-        /// <summary>
-        /// Notify the <see cref="IPublishedSnapshotService"/> of data type changes
-        /// </summary>
-        /// <param name="payloads"></param>
-        public void NotifyWithSafeLiveFactory(DataTypeCacheRefresher.JsonPayload[] payloads)
-        {
-            _runner.TryAdd(new RebuildModelsAndCacheTask(payloads, _publishedModelFactory, _publishedSnapshotService));
-        }
-
-        /// <summary>
-        /// A simple background task that notifies the <see cref="IPublishedSnapshotService"/> of changes
-        /// </summary>
-        private class RebuildModelsAndCacheTask : IBackgroundTask
-        {
-            private readonly DataTypeCacheRefresher.JsonPayload[] _dataTypePayloads;
-            private readonly ContentTypeCacheRefresher.JsonPayload[] _contentTypePayloads;
-            private readonly IPublishedModelFactory _publishedModelFactory;
-            private readonly IPublishedSnapshotService _publishedSnapshotService;
-
-            private RebuildModelsAndCacheTask(IPublishedModelFactory publishedModelFactory, IPublishedSnapshotService publishedSnapshotService)
-            {
-                _publishedModelFactory = publishedModelFactory;
-                _publishedSnapshotService = publishedSnapshotService;
-            }
-
-            public RebuildModelsAndCacheTask(DataTypeCacheRefresher.JsonPayload[] payloads, IPublishedModelFactory publishedModelFactory, IPublishedSnapshotService publishedSnapshotService)
-                : this(publishedModelFactory, publishedSnapshotService)
-            {
-                _dataTypePayloads = payloads;
-            }
-
-            public RebuildModelsAndCacheTask(ContentTypeCacheRefresher.JsonPayload[] payloads, IPublishedModelFactory publishedModelFactory, IPublishedSnapshotService publishedSnapshotService)
-                : this(publishedModelFactory, publishedSnapshotService)
-            {
-                _contentTypePayloads = payloads;
-            }
-
-            public void Run()
-            {
-                // we have to refresh models before we notify the published snapshot
-                // service of changes, else factories may try to rebuild models while
-                // we are using the database to load content into caches
-
-                _publishedModelFactory.WithSafeLiveFactory(() =>
-                {
-                    if (_dataTypePayloads != null)
-                        _publishedSnapshotService.Notify(_dataTypePayloads);
-                    if (_contentTypePayloads != null)
-                        _publishedSnapshotService.Notify(_contentTypePayloads);
-                });
-            }
-
-            public Task RunAsync(CancellationToken token) => throw new System.NotImplementedException();
-
-            public bool IsAsync => false;
-
-            public void Dispose()
-            {
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Web/Runtime/WebInitialComposer.cs b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
index 9e3413ba4d..87c0f46fba 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
@@ -125,7 +125,6 @@ namespace Umbraco.Web.Runtime
             // register distributed cache
             composition.RegisterUnique(f => new DistributedCache());
 
-            composition.RegisterUnique<BackgroundPublishedSnapshotNotifier>();
             composition.RegisterUnique<RoutableDocumentFilter>();
 
             // replace some services
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 1b8bc1b512..c6945a6b15 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -115,7 +115,6 @@
     <Compile Include="AppBuilderExtensions.cs" />
     <Compile Include="AreaRegistrationContextExtensions.cs" />
     <Compile Include="AspNetHttpContextAccessor.cs" />
-    <Compile Include="Cache\BackgroundPublishedSnapshotNotifier.cs" />
     <Compile Include="Cache\DistributedCacheBinder.cs" />
     <Compile Include="Cache\DistributedCacheBinderComposer.cs" />
     <Compile Include="Cache\DistributedCacheBinder_Handlers.cs" />
diff --git a/src/Umbraco.Web/UmbracoInjectedModule.cs b/src/Umbraco.Web/UmbracoInjectedModule.cs
index 69af843644..75251abaeb 100644
--- a/src/Umbraco.Web/UmbracoInjectedModule.cs
+++ b/src/Umbraco.Web/UmbracoInjectedModule.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.IO;
 using System.Web;
 using System.Web.Routing;
 using Umbraco.Core;
@@ -12,8 +11,6 @@ using Umbraco.Web.Routing;
 using Umbraco.Core.Exceptions;
 using Umbraco.Core.Security;
 using Umbraco.Web.Composing;
-using Umbraco.Web.Cache;
-using Umbraco.Core.Models.PublishedContent;
 
 namespace Umbraco.Web
 {
@@ -39,8 +36,6 @@ namespace Umbraco.Web
         private readonly ILogger _logger;
         private readonly IPublishedRouter _publishedRouter;
         private readonly IUmbracoContextFactory _umbracoContextFactory;
-        private readonly IPublishedModelFactory _publishedModelFactory;
-        private readonly BackgroundPublishedSnapshotNotifier _backgroundNotifier;
         private readonly RoutableDocumentFilter _routableDocumentLookup;
 
         public UmbracoInjectedModule(
@@ -49,8 +44,6 @@ namespace Umbraco.Web
             ILogger logger,
             IPublishedRouter publishedRouter,
             IUmbracoContextFactory umbracoContextFactory,
-            IPublishedModelFactory publishedModelFactory,
-            BackgroundPublishedSnapshotNotifier backgroundNotifier,
             RoutableDocumentFilter routableDocumentLookup)
         {
             _globalSettings = globalSettings;
@@ -58,8 +51,6 @@ namespace Umbraco.Web
             _logger = logger;
             _publishedRouter = publishedRouter;
             _umbracoContextFactory = umbracoContextFactory;
-            _publishedModelFactory = publishedModelFactory;
-            _backgroundNotifier = backgroundNotifier;
             _routableDocumentLookup = routableDocumentLookup;
         }
 

From de8d253a7ca9697b6007c48e2cc0d97307a7ceb3 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 16 Sep 2019 17:44:50 +1000
Subject: [PATCH 622/776] obsoletes WithSafeLiveFactory

---
 src/Umbraco.Core/PublishedModelFactoryExtensions.cs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Core/PublishedModelFactoryExtensions.cs b/src/Umbraco.Core/PublishedModelFactoryExtensions.cs
index e30b87d15e..ac8c9f1be7 100644
--- a/src/Umbraco.Core/PublishedModelFactoryExtensions.cs
+++ b/src/Umbraco.Core/PublishedModelFactoryExtensions.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using Umbraco.Core.Models.PublishedContent;
 
 namespace Umbraco.Core
@@ -16,12 +17,8 @@ namespace Umbraco.Core
         /// <returns></returns>
         public static bool IsLiveFactory(this IPublishedModelFactory factory) => factory is ILivePublishedModelFactory;
 
-        /// <summary>
-        /// Executes an action with a safe live factory
-        /// </summary>
-        /// <remarks>
-        /// <para>If the factory is a live factory, ensures it is refreshed and locked while executing the action.</para>
-        /// </remarks>
+        [Obsolete("This method is no longer used or necessary and will be removed from future")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
         public static void WithSafeLiveFactory(this IPublishedModelFactory factory, Action action)
         {
             if (factory is ILivePublishedModelFactory liveFactory)

From 6d886e38109894a3a8adde3f6010baf9401e3eb3 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 16 Sep 2019 17:55:04 +1000
Subject: [PATCH 623/776] removes uneeded IsDocumentRequest method

---
 src/Umbraco.Web/UmbracoContext.cs        | 19 +------------------
 src/Umbraco.Web/UmbracoInjectedModule.cs |  2 +-
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/src/Umbraco.Web/UmbracoContext.cs b/src/Umbraco.Web/UmbracoContext.cs
index 392eb03d64..347f79e51b 100644
--- a/src/Umbraco.Web/UmbracoContext.cs
+++ b/src/Umbraco.Web/UmbracoContext.cs
@@ -290,24 +290,7 @@ namespace Umbraco.Web
 
             _previewing = _previewToken.IsNullOrWhiteSpace() == false;
         }
-
-        private bool? _isDocumentRequest;
-
-        /// <summary>
-        /// Checks if the request is a document request (i.e. one that the module should handle)
-        /// </summary>
-        /// <param name="httpContext"></param>
-        /// <param name="uri"></param>
-        /// <returns></returns>
-        internal bool IsDocumentRequest(RoutableDocumentFilter docLookup)
-        {
-            if (_isDocumentRequest.HasValue)
-                return _isDocumentRequest.Value;
-
-            _isDocumentRequest = docLookup.IsDocumentRequest(HttpContext, OriginalRequestUrl);
-            return _isDocumentRequest.Value;
-        }
-
+        
         // say we render a macro or RTE in a give 'preview' mode that might not be the 'current' one,
         // then due to the way it all works at the moment, the 'current' published snapshot need to be in the proper
         // default 'preview' mode - somehow we have to force it. and that could be recursive.
diff --git a/src/Umbraco.Web/UmbracoInjectedModule.cs b/src/Umbraco.Web/UmbracoInjectedModule.cs
index 75251abaeb..6dc41d39ee 100644
--- a/src/Umbraco.Web/UmbracoInjectedModule.cs
+++ b/src/Umbraco.Web/UmbracoInjectedModule.cs
@@ -161,7 +161,7 @@ namespace Umbraco.Web
             var reason = EnsureRoutableOutcome.IsRoutable;
 
             // ensure this is a document request
-            if (!context.IsDocumentRequest(_routableDocumentLookup))
+            if (!_routableDocumentLookup.IsDocumentRequest(httpContext, context.OriginalRequestUrl))
             {
                 reason = EnsureRoutableOutcome.NotDocumentRequest;
             }

From 14e33e0cb5bf8039a4668820b273ef3dd5e2af3f Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Mon, 16 Sep 2019 09:33:42 +0100
Subject: [PATCH 624/776] Update
 src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs

Co-Authored-By: Bjarke Berg <mail@bergmania.dk>
---
 src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
index 92c82ab921..3798accb4e 100644
--- a/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
@@ -99,7 +99,7 @@ namespace Umbraco.Web.PropertyEditors
                     // Parse the HTML
                     var html = rte.Value?.ToString();
 
-                    var userId = _umbracoContextAccessor.UmbracoContext?.Security.CurrentUser.Id ?? -1;
+                    var userId = _umbracoContextAccessor.UmbracoContext?.Security.CurrentUser.Id ?? Constants.Security.SuperUserId;
 
                     var parsedHtml = TemplateUtilities.FindAndPersistPastedTempImages(html, mediaParentId, userId, _mediaService, _contentTypeBaseServiceProvider, _logger);
                     rte.Value = parsedHtml;

From 0d4928887583afb2f73b0cc437d698797d04e5ea Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Mon, 16 Sep 2019 09:34:49 +0100
Subject: [PATCH 625/776] Update
 src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs

Co-Authored-By: Bjarke Berg <mail@bergmania.dk>
---
 src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
index 60f68c3606..8696aa14e7 100644
--- a/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
@@ -117,7 +117,7 @@ namespace Umbraco.Web.PropertyEditors
                 var editorValueWithMediaUrlsRemoved = TemplateUtilities.RemoveMediaUrlsFromTextString(editorValue.Value.ToString());
                 var parsed = MacroTagParser.FormatRichTextContentForPersistence(editorValueWithMediaUrlsRemoved);
 
-                var userId = _umbracoContextAccessor.UmbracoContext?.Security.CurrentUser.Id ?? -1;
+                var userId = _umbracoContextAccessor.UmbracoContext?.Security.CurrentUser.Id ?? Constants.Security.SuperUserId;
 
                 var config = editorValue.DataTypeConfiguration as RichTextConfiguration;
                 var mediaParent = config?.MediaParentId;

From 976465be4be77ae886315e6e2c9b81a6c36c26ff Mon Sep 17 00:00:00 2001
From: Jan Skovgaard <jaskov@gmail.com>
Date: Mon, 16 Sep 2019 12:38:16 +0200
Subject: [PATCH 626/776] Fix some accessibility misunderstandings (#6342)

---
 .../src/views/components/buttons/umb-button-group.html      | 2 +-
 .../src/views/components/umb-node-preview.html              | 6 ++----
 .../views/propertyeditors/contentpicker/contentpicker.html  | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button-group.html b/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button-group.html
index 2f5b21ca72..49827910d0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button-group.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button-group.html
@@ -46,7 +46,7 @@
             hotkey-when-hidden="{{subButton.hotKeyWhenHidden}}"
             prevent-default>
                <localize key="{{subButton.labelKey}}">{{subButton.labelKey}}</localize>
-               <span ng-if="subButton.addEllipsis === 'true'" aria-hidden="true">...</span>
+               <span ng-if="subButton.addEllipsis === 'true'">...</span>
          </button>
       </umb-dropdown-item>
    </umb-dropdown>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-node-preview.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-node-preview.html
index 4f835f4c04..f2c86c46ab 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-node-preview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-node-preview.html
@@ -31,10 +31,9 @@
             title="Edit {{name}}"
             ng-if="allowEdit && !editUrl"
             ng-click="onEdit()"
-            aria-haspopup="dialog"
         >
             <localize key="general_edit">Edit</localize>
-            <span class="sr-only">{{name}}</span>
+            <span class="sr-only">{{name}}...</span>
         </button>
 
         <!-- If openUrl has a value we render a link otherwise a button-->
@@ -55,10 +54,9 @@
             title="Open {{name}}"
             ng-if="allowOpen && !openUrl"
             ng-click="onOpen()"
-            aria-haspopup="dialog"
         >
             <localize key="general_open">Open</localize>
-            <span class="sr-only">{{name}}</span>
+            <span class="sr-only">{{name}}...</span>
         </button>
 
         <!-- If removeUrl has a value we render a link otherwise a button-->
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
index cd24988b3d..ab9b078433 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
@@ -26,9 +26,9 @@
             ng-click="openCurrentPicker()"
             id="{{model.alias}}"
             aria-label="{{model.label}}: {{labels.general_add}}"
-            aria-haspopup="dialog"
         >
             <localize key="general_add">Add</localize>
+            <span class="sr-only">...</span>
         </button>
 
         <div class="umb-contentpicker__min-max-help" ng-if="model.config.multiPicker === true">

From be0d38f2af8a15b9850708ef38a85eb5f859c884 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Mon, 16 Sep 2019 12:56:37 +0200
Subject: [PATCH 627/776] v8: Fix onChange callback in umbCheckbox and
 umbRadiobutton (#6345)

---
 .../components/forms/umbcheckbox.directive.js          | 10 +++++-----
 .../components/forms/umbradiobutton.directive.js       |  7 ++++---
 .../src/views/components/forms/umb-checkbox.html       |  2 +-
 .../src/views/components/forms/umb-radiobutton.html    |  2 +-
 .../checkboxlist/checkboxlist.controller.js            |  4 ++--
 .../propertyeditors/checkboxlist/checkboxlist.html     |  2 +-
 .../propertyeditors/radiobuttons/radiobuttons.html     |  2 +-
 7 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
index f8643ad191..274d6e1241 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
@@ -36,17 +36,17 @@
 (function () {
     'use strict';
     
-    
     function UmbCheckboxController($timeout) {
         
         var vm = this;
 
-        if (vm.onChange) {
-            $timeout(function() {
-                vm.onChange({model:vm.model, value:vm.value});
+        vm.change = change;
+
+        function change() {
+            $timeout(function () {
+                vm.onChange({ model: vm.model, value: vm.value });
             }, 0);
         }
-        
     }
     
     var component = {
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
index 933107527b..59c3c3c35d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
@@ -38,12 +38,13 @@
 
         var vm = this;
 
-        if (vm.onChange) {
+        vm.change = change;
+
+        function change() {
             $timeout(function () {
                 vm.onChange({ model: vm.model, value: vm.value });
             }, 0);
-        }
-        
+        }     
     }
 
     var component = {
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-checkbox.html b/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-checkbox.html
index 2f90905c7d..fd3b451e90 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-checkbox.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-checkbox.html
@@ -8,7 +8,7 @@
            ng-model="vm.model"
            ng-disabled="vm.disabled"
            ng-required="vm.required"
-           ng-change="vm.onChange()"/>
+           ng-change="vm.change()"/>
 
     <span class="umb-form-check__state" aria-hidden="true">
         <span class="umb-form-check__check">
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-radiobutton.html b/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-radiobutton.html
index 4f630409e2..5ac82c316a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-radiobutton.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-radiobutton.html
@@ -5,7 +5,7 @@
         ng-model="vm.model"
         ng-disabled="vm.disabled"
         ng-required="vm.required"
-        ng-change="vm.onChange()" />
+        ng-change="vm.change()" />
 
     <span class="umb-form-check__state" aria-hidden="true">
         <span class="umb-form-check__check"></span>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js
index 94b8991e1f..e4245acba2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js
@@ -5,7 +5,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.CheckboxListContro
         
         vm.configItems = [];
         vm.viewItems = [];
-        vm.changed = changed;
+        vm.change = change;
         
         function init() {
             
@@ -74,7 +74,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.CheckboxListContro
             
         }
 
-        function changed(model, value) {
+        function change(model, value) {
             
             var index = $scope.model.value.indexOf(value);
             
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html
index b685b10dd8..cd1b84826a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html
@@ -1,7 +1,7 @@
 <div class="umb-property-editor umb-checkboxlist" ng-controller="Umbraco.PropertyEditors.CheckboxListController as vm">
     <ul class="unstyled">
         <li ng-repeat="item in vm.viewItems track by item.key">
-            <umb-checkbox name="{{::model.alias}}" value="{{::item.value}}" model="item.checked" text="{{::item.value}}" on-change="vm.changed(model, value)" required="vm.model.validation.mandatory && !vm.model.value.length"></umb-checkbox>
+            <umb-checkbox name="{{::model.alias}}" value="{{::item.value}}" model="item.checked" text="{{::item.value}}" on-change="vm.change(model, value)" required="vm.model.validation.mandatory && !vm.model.value.length"></umb-checkbox>
         </li>
     </ul>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html
index 8c5f2a22d3..22c4679d32 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html
@@ -1,7 +1,7 @@
 <div class="umb-property-editor umb-radiobuttons" ng-controller="Umbraco.PropertyEditors.RadioButtonsController">
     <ul class="unstyled">
         <li ng-repeat="item in configItems track by item.id">
-            <umb-radiobutton name="{{model.alias}}" value="{{item.value}}" model="model.value" text="{{item.value}}" required="model.validation.mandatory && model.value == ''"></umb-radiobutton>
+            <umb-radiobutton name="{{model.alias}}" value="{{item.value}}" model="model.value" text="{{item.value}}" on-change="vm.change(model, value)" required="model.validation.mandatory && model.value == ''"></umb-radiobutton>
         </li>
     </ul>
 </div>

From 2faa760628d67c95ceac4c495038fed1a10df3e4 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Mon, 16 Sep 2019 12:56:37 +0200
Subject: [PATCH 628/776] v8: Fix onChange callback in umbCheckbox and
 umbRadiobutton (#6345)

(cherry picked from commit be0d38f2af8a15b9850708ef38a85eb5f859c884)
---
 .../components/forms/umbcheckbox.directive.js          | 10 +++++-----
 .../components/forms/umbradiobutton.directive.js       |  7 ++++---
 .../src/views/components/forms/umb-checkbox.html       |  2 +-
 .../src/views/components/forms/umb-radiobutton.html    |  2 +-
 .../checkboxlist/checkboxlist.controller.js            |  4 ++--
 .../propertyeditors/checkboxlist/checkboxlist.html     |  2 +-
 .../propertyeditors/radiobuttons/radiobuttons.html     |  2 +-
 7 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
index f8643ad191..274d6e1241 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
@@ -36,17 +36,17 @@
 (function () {
     'use strict';
     
-    
     function UmbCheckboxController($timeout) {
         
         var vm = this;
 
-        if (vm.onChange) {
-            $timeout(function() {
-                vm.onChange({model:vm.model, value:vm.value});
+        vm.change = change;
+
+        function change() {
+            $timeout(function () {
+                vm.onChange({ model: vm.model, value: vm.value });
             }, 0);
         }
-        
     }
     
     var component = {
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
index 933107527b..59c3c3c35d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
@@ -38,12 +38,13 @@
 
         var vm = this;
 
-        if (vm.onChange) {
+        vm.change = change;
+
+        function change() {
             $timeout(function () {
                 vm.onChange({ model: vm.model, value: vm.value });
             }, 0);
-        }
-        
+        }     
     }
 
     var component = {
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-checkbox.html b/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-checkbox.html
index 2f90905c7d..fd3b451e90 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-checkbox.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-checkbox.html
@@ -8,7 +8,7 @@
            ng-model="vm.model"
            ng-disabled="vm.disabled"
            ng-required="vm.required"
-           ng-change="vm.onChange()"/>
+           ng-change="vm.change()"/>
 
     <span class="umb-form-check__state" aria-hidden="true">
         <span class="umb-form-check__check">
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-radiobutton.html b/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-radiobutton.html
index 4f630409e2..5ac82c316a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-radiobutton.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-radiobutton.html
@@ -5,7 +5,7 @@
         ng-model="vm.model"
         ng-disabled="vm.disabled"
         ng-required="vm.required"
-        ng-change="vm.onChange()" />
+        ng-change="vm.change()" />
 
     <span class="umb-form-check__state" aria-hidden="true">
         <span class="umb-form-check__check"></span>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js
index 94b8991e1f..e4245acba2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js
@@ -5,7 +5,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.CheckboxListContro
         
         vm.configItems = [];
         vm.viewItems = [];
-        vm.changed = changed;
+        vm.change = change;
         
         function init() {
             
@@ -74,7 +74,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.CheckboxListContro
             
         }
 
-        function changed(model, value) {
+        function change(model, value) {
             
             var index = $scope.model.value.indexOf(value);
             
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html
index b685b10dd8..cd1b84826a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html
@@ -1,7 +1,7 @@
 <div class="umb-property-editor umb-checkboxlist" ng-controller="Umbraco.PropertyEditors.CheckboxListController as vm">
     <ul class="unstyled">
         <li ng-repeat="item in vm.viewItems track by item.key">
-            <umb-checkbox name="{{::model.alias}}" value="{{::item.value}}" model="item.checked" text="{{::item.value}}" on-change="vm.changed(model, value)" required="vm.model.validation.mandatory && !vm.model.value.length"></umb-checkbox>
+            <umb-checkbox name="{{::model.alias}}" value="{{::item.value}}" model="item.checked" text="{{::item.value}}" on-change="vm.change(model, value)" required="vm.model.validation.mandatory && !vm.model.value.length"></umb-checkbox>
         </li>
     </ul>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html
index 8c5f2a22d3..22c4679d32 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html
@@ -1,7 +1,7 @@
 <div class="umb-property-editor umb-radiobuttons" ng-controller="Umbraco.PropertyEditors.RadioButtonsController">
     <ul class="unstyled">
         <li ng-repeat="item in configItems track by item.id">
-            <umb-radiobutton name="{{model.alias}}" value="{{item.value}}" model="model.value" text="{{item.value}}" required="model.validation.mandatory && model.value == ''"></umb-radiobutton>
+            <umb-radiobutton name="{{model.alias}}" value="{{item.value}}" model="model.value" text="{{item.value}}" on-change="vm.change(model, value)" required="model.validation.mandatory && model.value == ''"></umb-radiobutton>
         </li>
     </ul>
 </div>

From 6467aae20651d9619df2cf55cfec83629cd9b5df Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Mon, 16 Sep 2019 16:32:29 +0200
Subject: [PATCH 629/776] Support "allow items of type" for all types in MNTP
 (#6177)

---
 .../src/common/services/editor.service.js     | 48 ++++++++++
 .../treepicker/treepicker.controller.js       | 22 ++++-
 .../contenttypepicker.controller.js           | 54 -----------
 .../prevalueeditors/treesource.controller.js  | 15 ++-
 .../treesourcetypepicker.controller.js        | 95 +++++++++++++++++++
 ...epicker.html => treesourcetypepicker.html} | 10 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/da.xml |  2 +
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml |  2 +
 .../Umbraco/config/lang/en_us.xml             |  2 +
 .../MultiNodePickerConfiguration.cs           |  2 +-
 10 files changed, 186 insertions(+), 66 deletions(-)
 delete mode 100644 src/Umbraco.Web.UI.Client/src/views/prevalueeditors/contenttypepicker.controller.js
 create mode 100644 src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesourcetypepicker.controller.js
 rename src/Umbraco.Web.UI.Client/src/views/prevalueeditors/{contenttypepicker.html => treesourcetypepicker.html} (56%)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js b/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
index ad565412d9..ca4108e18c 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
@@ -394,6 +394,52 @@ When building a custom infinite editor view you can use the same components as a
             editor.treeAlias = "documentTypes";
             open(editor);
         }
+
+        /**
+         * @ngdoc method
+         * @name umbraco.services.editorService#mediaTypePicker
+         * @methodOf umbraco.services.editorService
+         *
+         * @description
+         * Opens a media type picker in infinite editing, the submit callback returns an array of selected items
+         *
+         * @param {Object} editor rendering options
+         * @param {Boolean} editor.multiPicker Pick one or multiple items
+         * @param {Function} editor.submit Callback function when the submit button is clicked. Returns the editor model object
+         * @param {Function} editor.close Callback function when the close button is clicked.
+         *
+         * @returns {Object} editor object
+         */
+        function mediaTypePicker(editor) {
+            editor.view = "views/common/infiniteeditors/treepicker/treepicker.html";
+            editor.size = "small";
+            editor.section = "settings";
+            editor.treeAlias = "mediaTypes";
+            open(editor);
+        }
+
+        /**
+         * @ngdoc method
+         * @name umbraco.services.editorService#memberTypePicker
+         * @methodOf umbraco.services.editorService
+         *
+         * @description
+         * Opens a member type picker in infinite editing, the submit callback returns an array of selected items
+         *
+         * @param {Object} editor rendering options
+         * @param {Boolean} editor.multiPicker Pick one or multiple items
+         * @param {Function} editor.submit Callback function when the submit button is clicked. Returns the editor model object
+         * @param {Function} editor.close Callback function when the close button is clicked.
+         *
+         * @returns {Object} editor object
+         */
+        function memberTypePicker(editor) {
+            editor.view = "views/common/infiniteeditors/treepicker/treepicker.html";
+            editor.size = "small";
+            editor.section = "settings";
+            editor.treeAlias = "memberTypes";
+            open(editor);
+        }
         /**
          * @ngdoc method
          * @name umbraco.services.editorService#copy
@@ -908,6 +954,8 @@ When building a custom infinite editor view you can use the same components as a
             contentEditor: contentEditor,
             contentPicker: contentPicker,
             contentTypePicker: contentTypePicker,
+            mediaTypePicker: mediaTypePicker,
+            memberTypePicker: memberTypePicker,
             copy: copy,
             move: move,
             embed: embed,
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js
index 31430c81cb..0ff6403761 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js
@@ -96,7 +96,7 @@ angular.module("umbraco").controller("Umbraco.Editors.TreePickerController",
                     });
                 }
             }
-            if (vm.treeAlias === "documentTypes") {
+            else if (vm.treeAlias === "documentTypes") {
                 vm.entityType = "DocumentType";
                 if (!$scope.model.title) {
                     localizationService.localize("defaultdialogs_selectContentType").then(function(value){
@@ -107,9 +107,17 @@ angular.module("umbraco").controller("Umbraco.Editors.TreePickerController",
             else if (vm.treeAlias === "member" || vm.section === "member") {
                 vm.entityType = "Member";
                 if (!$scope.model.title) {
-                    localizationService.localize("defaultdialogs_selectMember").then(function(value){
+                    localizationService.localize("defaultdialogs_selectMember").then(function(value) {
                         $scope.model.title = value;
-                    })
+                    });
+                }
+            }
+            else if (vm.treeAlias === "memberTypes") {
+                vm.entityType = "MemberType";
+                if (!$scope.model.title) {
+                    localizationService.localize("defaultdialogs_selectMemberType").then(function(value){
+                        $scope.model.title = value;
+                    });
                 }
             }
             else if (vm.treeAlias === "media" || vm.section === "media") {
@@ -120,6 +128,14 @@ angular.module("umbraco").controller("Umbraco.Editors.TreePickerController",
                     });
                 }
             }
+            else if (vm.treeAlias === "mediaTypes") {
+                vm.entityType = "MediaType";
+                if (!$scope.model.title) {
+                    localizationService.localize("defaultdialogs_selectMediaType").then(function(value){
+                        $scope.model.title = value;
+                    });
+                }
+            }
 
             // TODO: Seems odd this logic is here, i don't think it needs to be and should just exist on the property editor using this
             if ($scope.model.minNumber) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/contenttypepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/contenttypepicker.controller.js
deleted file mode 100644
index dcb2c0e582..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/contenttypepicker.controller.js
+++ /dev/null
@@ -1,54 +0,0 @@
-function ContentTypePickerController($scope, contentTypeResource, editorService, angularHelper) {
-    var vm = this;
-    vm.loading = false;
-    vm.contentTypes = [];
-    vm.remove = remove;
-    vm.add = add;
-
-    var allContentTypes = null;
-
-    function init() {
-        vm.loading = true;
-        contentTypeResource.getAll().then(function (all) {
-            allContentTypes = all;
-            vm.loading = false;
-            // the model value is a comma separated list of content type aliases
-            var currentContentTypes = _.map(($scope.model.value || "").split(","), function (s) { return s.trim(); });
-            vm.contentTypes = _.filter(allContentTypes, function (contentType) {
-                return currentContentTypes.indexOf(contentType.alias) >= 0;
-            });
-        });
-    }
-
-    function add() {
-        editorService.contentTypePicker({
-            multiPicker: true,
-            submit: function (model) {
-                var newContentTypes = _.map(model.selection, function (selected) {
-                    return _.findWhere(allContentTypes, {udi: selected.udi});
-                });
-                vm.contentTypes = _.uniq(_.union(vm.contentTypes, newContentTypes));
-                updateModel();
-                editorService.close();
-            },
-            close: function () {
-                editorService.close();
-            }
-        });
-    }
-
-    function remove(contentType) {
-        vm.contentTypes = _.without(vm.contentTypes, contentType);
-        updateModel();
-    }
-
-    function updateModel() {
-        // the model value is a comma separated list of content type aliases
-        $scope.model.value = _.pluck(vm.contentTypes, "alias").join();
-        angularHelper.getCurrentForm($scope).$setDirty();
-    }
-
-    init();
-}
-
-angular.module('umbraco').controller("Umbraco.PrevalueEditors.ContentTypePickerController", ContentTypePickerController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.controller.js
index 404abbab1f..828763bc1c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.controller.js
@@ -3,7 +3,7 @@
 angular.module('umbraco')
 .controller("Umbraco.PrevalueEditors.TreeSourceController",
 	
-	function($scope, entityResource, iconHelper, editorService){
+	function($scope, $timeout, entityResource, iconHelper, editorService, eventsService){
 
 	    if (!$scope.model) {
 	        $scope.model = {};
@@ -23,7 +23,11 @@ angular.module('umbraco')
 			entityResource.getById($scope.model.value.id, entityType()).then(function(item){
                 populate(item);
 			});
-		}
+        }
+
+	    $timeout(function () {
+	        treeSourceChanged();
+	    }, 100);
 
         function entityType() {
 			var ent = "Document";
@@ -58,8 +62,13 @@ angular.module('umbraco')
 			$scope.model.value.id = null;
             $scope.node = null;
             $scope.model.value.query = null;
+
+		    treeSourceChanged();
 		};
-		
+
+        function treeSourceChanged() {
+            eventsService.emit("treeSourceChanged", { value: $scope.model.value.type });
+        }
 
 		//we always need to ensure we dont submit anything broken
 	    var unsubscribe = $scope.$on("formSubmitting", function (ev, args) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesourcetypepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesourcetypepicker.controller.js
new file mode 100644
index 0000000000..0df1b3cafb
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesourcetypepicker.controller.js
@@ -0,0 +1,95 @@
+function TreeSourceTypePickerController($scope, contentTypeResource, mediaTypeResource, memberTypeResource, editorService, eventsService, angularHelper) {
+    var vm = this;
+    vm.loading = false;
+    vm.itemTypes = [];
+    vm.remove = remove;
+    vm.add = add;
+
+    var allItemTypes = null;
+    var currentItemType = null;
+    var initialLoad = true;
+
+    function init() {
+        vm.loading = true;
+
+        switch (currentItemType) {
+            case "content":
+                contentTypeResource.getAll().then(getAllItemTypesCallback);
+                break;
+            case "media":
+                mediaTypeResource.getAll().then(getAllItemTypesCallback);
+                break;
+            case "member":
+                memberTypeResource.getTypes().then(getAllItemTypesCallback);
+                break;
+        }
+    }
+
+    function getAllItemTypesCallback(all) {
+        allItemTypes = all;
+        vm.loading = false;
+        // the model value is a comma separated list of content type aliases
+        var currentItemTypes = _.map(($scope.model.value || "").split(","), function (s) { return s.trim(); });
+        vm.itemTypes = _.filter(allItemTypes, function (itemType) {
+            return currentItemTypes.indexOf(itemType.alias) >= 0;
+        });
+    }
+
+    function add() {
+        if (!currentItemType) {
+            return;
+        }
+
+        var editor = {
+            multiPicker: true,
+            submit: function (model) {
+                var newItemTypes = _.map(model.selection,
+                    function(selected) {
+                        return _.findWhere(allItemTypes, { udi: selected.udi });
+                    });
+                vm.itemTypes = _.uniq(_.union(vm.itemTypes, newItemTypes));
+                updateModel();
+                editorService.close();
+            },
+            close: function() {
+                editorService.close();
+            }
+        };
+
+        switch (currentItemType) {
+            case "content":
+                editorService.contentTypePicker(editor);
+                break;
+            case "media":
+                editorService.mediaTypePicker(editor);
+                break;
+            case "member":
+                editorService.memberTypePicker(editor);
+                break;
+        }
+    }
+
+    function remove(itemType) {
+        vm.itemTypes = _.without(vm.itemTypes, itemType);
+        updateModel();
+    }
+
+    function updateModel() {
+        // the model value is a comma separated list of content type aliases
+        $scope.model.value = _.pluck(vm.itemTypes, "alias").join();
+        angularHelper.getCurrentForm($scope).$setDirty();
+    }
+
+    eventsService.on("treeSourceChanged", function (e, args) {
+        currentItemType = args.value;
+        // reset the model value if we changed node type (but not on the initial load)
+        if (!initialLoad) {
+            vm.itemTypes = [];
+            updateModel();
+        }
+        initialLoad = false;
+        init();
+    });
+}
+
+angular.module('umbraco').controller("Umbraco.PrevalueEditors.TreeSourceTypePickerController", TreeSourceTypePickerController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/contenttypepicker.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesourcetypepicker.html
similarity index 56%
rename from src/Umbraco.Web.UI.Client/src/views/prevalueeditors/contenttypepicker.html
rename to src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesourcetypepicker.html
index cd89fe4cb5..f679b53093 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/contenttypepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesourcetypepicker.html
@@ -1,15 +1,15 @@
-<div ng-controller="Umbraco.PrevalueEditors.ContentTypePickerController as vm" class="umb-property-editor umb-contenttypepicker">
+<div ng-controller="Umbraco.PrevalueEditors.TreeSourceTypePickerController as vm" class="umb-property-editor umb-contenttypepicker">
 
     <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
 
     <div ng-show="!vm.loading">
-        <umb-node-preview ng-repeat="contentType in vm.contentTypes"
+        <umb-node-preview ng-repeat="itemType in vm.itemTypes"
                           class="mt1"
-                          icon="contentType.icon"
-                          name="contentType.name"
+                          icon="itemType.icon"
+                          name="itemType.name"
                           allow-remove="true"
                           allow-edit="false"
-                          on-remove="vm.remove(contentType)">
+                          on-remove="vm.remove(itemType)">
         </umb-node-preview>
 
         <a class="umb-node-preview-add"
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index 64fa6e458a..35b26f4f18 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -432,6 +432,7 @@
     <key alias="linkToMedia">Link til medie</key>
     <key alias="selectContentStartNode">Vælg indhold startnode</key>
     <key alias="selectMedia">Vælg medie</key>
+    <key alias="selectMediaType">Vælg medietype</key>
     <key alias="selectIcon">Vælg ikon</key>
     <key alias="selectItem">Vælg item</key>
     <key alias="selectLink">Vælg link</key>
@@ -441,6 +442,7 @@
     <key alias="selectMediaStartNode">Vælg medie startnode</key>
     <key alias="selectMember">Vælg medlem</key>
     <key alias="selectMemberGroup">Vælg medlemsgruppe</key>
+    <key alias="selectMemberType">Vælg medlemstype</key>
     <key alias="selectNode">Vælg node</key>
     <key alias="selectSections">Vælg sektioner</key>
     <key alias="selectUsers">Vælg brugere</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 3c760fa1c2..4a49a94823 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -450,6 +450,7 @@
     <key alias="linkToMedia">Link to media</key>
     <key alias="selectContentStartNode">Select content start node</key>
     <key alias="selectMedia">Select media</key>
+    <key alias="selectMediaType">Select media type</key>
     <key alias="selectIcon">Select icon</key>
     <key alias="selectItem">Select item</key>
     <key alias="selectLink">Select link</key>
@@ -459,6 +460,7 @@
     <key alias="selectMediaStartNode">Select media start node</key>
     <key alias="selectMember">Select member</key>
     <key alias="selectMemberGroup">Select member group</key>
+    <key alias="selectMemberType">Select member type</key>
     <key alias="selectNode">Select node</key>
     <key alias="selectSections">Select sections</key>
     <key alias="selectUsers">Select users</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index 1ddc415db0..faf336d94d 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -453,6 +453,7 @@
     <key alias="linkToMedia">Link to media</key>
     <key alias="selectContentStartNode">Select content start node</key>
     <key alias="selectMedia">Select media</key>
+    <key alias="selectMediaType">Select media type</key>
     <key alias="selectIcon">Select icon</key>
     <key alias="selectItem">Select item</key>
     <key alias="selectLink">Select link</key>
@@ -462,6 +463,7 @@
     <key alias="selectMediaStartNode">Select media start node</key>
     <key alias="selectMember">Select member</key>
     <key alias="selectMemberGroup">Select member group</key>
+    <key alias="selectMemberType">Select member type</key>
     <key alias="selectNode">Select node</key>
     <key alias="selectSections">Select sections</key>
     <key alias="selectUsers">Select users</key>
diff --git a/src/Umbraco.Web/PropertyEditors/MultiNodePickerConfiguration.cs b/src/Umbraco.Web/PropertyEditors/MultiNodePickerConfiguration.cs
index b099573b9f..5789c34cb2 100644
--- a/src/Umbraco.Web/PropertyEditors/MultiNodePickerConfiguration.cs
+++ b/src/Umbraco.Web/PropertyEditors/MultiNodePickerConfiguration.cs
@@ -11,7 +11,7 @@ namespace Umbraco.Web.PropertyEditors
         [ConfigurationField("startNode", "Node type", "treesource")]
         public MultiNodePickerConfigurationTreeSource TreeSource { get; set; }
 
-        [ConfigurationField("filter", "Allow items of type", "contenttypepicker", Description = "Select the applicable content types")]
+        [ConfigurationField("filter", "Allow items of type", "treesourcetypepicker", Description = "Select the applicable types")]
         public string Filter { get; set; }
 
         [ConfigurationField("minNumber", "Minimum number of items", "number")]

From 11e82f26000ffe10c7cca260503e5d05f734bfd2 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Mon, 16 Sep 2019 16:42:46 +0200
Subject: [PATCH 630/776] V8: Make validation work properly with multiple
 invalid properties (#6290)

---
 .../validation/valformmanager.directive.js           | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valformmanager.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valformmanager.directive.js
index a53fb75d93..6638ed4e6d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valformmanager.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valformmanager.directive.js
@@ -79,7 +79,17 @@ function valFormManager(serverValidationManager, $rootScope, $timeout, $location
 
                 //get the lengths of each array for each key in the $error collection
                 var validatorLengths = _.map(formCtrl.$error, function (val, key) {
-                    return val.length;
+                    // if there are child ng-forms, include the $error collections in those as well
+                    var innerErrorCount = _.reduce(
+                            _.map(val, v =>
+                                _.reduce(
+                                    _.map(v.$error, e => e.length),
+                                    (m, n) => m + n
+                                )
+                            ),
+                            (memo, num) => memo + num
+                        );
+                    return val.length + innerErrorCount;
                 });
                 //sum up all numbers in the resulting array
                 var sum = _.reduce(validatorLengths, function (memo, num) {

From c1d3bfaa5daf1e0ef302c635d78e819fa44788a5 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 16 Sep 2019 17:21:12 +0200
Subject: [PATCH 631/776] Add breaking NuCache test

---
 .../PublishedContent/NuCacheChildrenTests.cs  | 42 ++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
index 47572a63ee..fbcdf7731a 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
@@ -1,7 +1,9 @@
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Data;
 using System.Linq;
+using System.Reflection;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Core;
@@ -25,6 +27,7 @@ using Umbraco.Web.Cache;
 using Umbraco.Web.PublishedCache;
 using Umbraco.Web.PublishedCache.NuCache;
 using Umbraco.Web.PublishedCache.NuCache.DataSource;
+using Umbraco.Web.PublishedCache.NuCache.Snap;
 
 namespace Umbraco.Tests.PublishedContent
 {
@@ -163,7 +166,7 @@ namespace Umbraco.Tests.PublishedContent
 
             //1x variant (root)
             yield return CreateVariantKit(1, -1, 1, paths);
-            
+
             //1x invariant under root
             yield return CreateInvariantKit(4, 1, 1, paths);
 
@@ -952,6 +955,43 @@ namespace Umbraco.Tests.PublishedContent
             AssertDocuments(documents, "N1-en-US", "N2-en-US", "N3-en-US");
         }
 
+        [Test]
+        public void Issue6353()
+        {
+            IEnumerable<ContentNodeKit> GetKits()
+            {
+                var paths = new Dictionary<int, string> { { -1, "-1" } };
+
+                yield return CreateInvariantKit(1, -1, 1, paths);
+                yield return CreateInvariantKit(2, 1, 1, paths);
+            }
+
+            Init(GetKits());
+
+            var snapshotService = (PublishedSnapshotService) _snapshotService;
+            var contentStoreField = typeof(PublishedSnapshotService).GetField("_contentStore", BindingFlags.Instance | BindingFlags.NonPublic);
+            var contentStore = (ContentStore) contentStoreField.GetValue(snapshotService);
+            var contentNodesField = typeof(ContentStore).GetField("_contentNodes", BindingFlags.Instance | BindingFlags.NonPublic);
+            var contentNodes = (ConcurrentDictionary<int, LinkedNode<ContentNode>>) contentNodesField.GetValue(contentStore);
+
+            var parentNode = contentNodes[1].Value;
+            Assert.AreEqual(-1, parentNode.PreviousSiblingContentId);
+            Assert.AreEqual(-1, parentNode.NextSiblingContentId);
+            Assert.AreEqual(2, parentNode.FirstChildContentId);
+            Assert.AreEqual(2, parentNode.LastChildContentId);
+
+            _snapshotService.Notify(new[]
+            {
+                new ContentCacheRefresher.JsonPayload(2, TreeChangeTypes.Remove)
+            }, out _, out _);
+
+            parentNode = contentNodes[1].Value;
+            Assert.AreEqual(-1, parentNode.PreviousSiblingContentId);
+            Assert.AreEqual(-1, parentNode.NextSiblingContentId);
+            Assert.AreEqual(-1, parentNode.FirstChildContentId);
+            Assert.AreEqual(-1, parentNode.LastChildContentId);
+        }
+
         private void AssertDocuments(IPublishedContent[] documents, params string[] names)
         {
             Assert.AreEqual(names.Length, documents.Length);

From b51fb2da9d132692864149920ae912eb13d7c080 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 16 Sep 2019 17:21:22 +0200
Subject: [PATCH 632/776] Fix NuCache ContentStore

---
 .../PublishedCache/NuCache/ContentStore.cs    | 68 ++++++++++---------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
index d6631b779d..fb4520c5c0 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
@@ -612,43 +612,48 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 //  NextSiblingContentId
                 //  PreviousSiblingContentId
 
-                ContentNode prev = null;
-                ContentNode currParent = null;
+                ContentNode previousNode = null;
+                ContentNode parent = null;
 
                 foreach (var kit in kits)
                 {
-                    if (!BuildKit(kit, out var parentLink)) 
+                    if (!BuildKit(kit, out var parentLink))
                     {
                         ok = false;
                         continue; // skip that one
                     }
 
-                    if (currParent != null && currParent.Id != parentLink.Value.Id)
+                    var thisNode = kit.Node;
+
+                    if (parent == null)
                     {
-                        //the parent is changing so that means the prev tracked one is the last child
-                        currParent.LastChildContentId = prev.Id;
-                        //changed parent, reset prev
-                        prev = null; 
+                        // first parent
+                        parent = parentLink.Value;
+                        parent.FirstChildContentId = thisNode.Id; // this node is the first node
                     }
-                    
-                    currParent = parentLink.Value;
-
-                    _logger.Debug<ContentStore>($"Set {kit.Node.Id} with parent {kit.Node.ParentContentId}");
-                    SetValueLocked(_contentNodes, kit.Node.Id, kit.Node);
-
-                    //if the parent's FirstChildContentId isn't set, then it must be the current one
-                    if (currParent.FirstChildContentId < 0)
-                        currParent.FirstChildContentId = kit.Node.Id;
-
-                    //if there is a previous one on the same level then set it's next sibling id to the current oen
-                    if (prev != null)
+                    else if (parent.Id != parentLink.Value.Id)
                     {
-                        prev.NextSiblingContentId = kit.Node.Id;
-                        kit.Node.PreviousSiblingContentId = prev.Id;
-                    }   
+                        // new parent
+                        parent = parentLink.Value;
+                        parent.FirstChildContentId = thisNode.Id; // this node is the first node
+                        previousNode = null; // there is no previous sibling
+                    }
 
-                    //store the prev
-                    prev = kit.Node;
+                    _logger.Debug<ContentStore>($"Set {thisNode.Id} with parent {thisNode.ParentContentId}");
+                    SetValueLocked(_contentNodes, thisNode.Id, thisNode);
+
+                    // this node is always the last child
+                    parent.LastChildContentId = thisNode.Id;
+
+                    // wire previous node as previous sibling
+                    if (previousNode != null)
+                    {
+                        previousNode.NextSiblingContentId = thisNode.Id;
+                        thisNode.PreviousSiblingContentId = previousNode.Id;
+                    }
+
+                    // this node becomes the previous node
+                    previousNode = thisNode;
 
                     _xmap[kit.Node.Uid] = kit.Node.Id;
                 }
@@ -843,19 +848,16 @@ namespace Umbraco.Web.PublishedCache.NuCache
             if (parent.FirstChildContentId < 0)
                 throw new PanicException("no children");
 
-            if (parent.FirstChildContentId == content.Id)
-            {
-                // if first, clone parent + remove first child
+            // if first/last, clone parent, then remove
+
+            if (parent.FirstChildContentId == content.Id || parent.LastChildContentId == content.Id)
                 parent = GenCloneLocked(parentLink);
+
+            if (parent.FirstChildContentId == content.Id)
                 parent.FirstChildContentId = content.NextSiblingContentId;
-            }
 
             if (parent.LastChildContentId == content.Id)
-            {
-                // if last, clone parent + remove last child
-                parent = GenCloneLocked(parentLink);
                 parent.LastChildContentId = content.PreviousSiblingContentId;
-            }
 
             // maintain linked list
 

From 54110573bca12a79007856097290a41f2effac07 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 17 Sep 2019 17:00:21 +1000
Subject: [PATCH 633/776] dont hide model binding exceptions if in debug mode

---
 src/Umbraco.Web/Mvc/ModelBindingExceptionFilter.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/Mvc/ModelBindingExceptionFilter.cs b/src/Umbraco.Web/Mvc/ModelBindingExceptionFilter.cs
index b9161dbea0..ad0c036bfc 100644
--- a/src/Umbraco.Web/Mvc/ModelBindingExceptionFilter.cs
+++ b/src/Umbraco.Web/Mvc/ModelBindingExceptionFilter.cs
@@ -6,7 +6,8 @@ using System.Web.Mvc;
 namespace Umbraco.Web.Mvc
 {
     /// <summary>
-    ///     An exception filter checking if we get a <see cref="ModelBindingException" /> or <see cref="InvalidCastException" /> with the same model. in which case it returns a redirect to the same page after 1 sec.
+    ///     An exception filter checking if we get a <see cref="ModelBindingException" /> or <see cref="InvalidCastException" /> with the same model.
+    ///     In which case it returns a redirect to the same page after 1 sec if not in debug mode.
     /// </summary>
     internal class ModelBindingExceptionFilter : FilterAttribute, IExceptionFilter
     {
@@ -14,7 +15,8 @@ namespace Umbraco.Web.Mvc
 
         public void OnException(ExceptionContext filterContext)
         {
-            if (!filterContext.ExceptionHandled
+            if (!filterContext.HttpContext.IsDebuggingEnabled
+                && !filterContext.ExceptionHandled
                 && ((filterContext.Exception is ModelBindingException || filterContext.Exception is InvalidCastException)
                     && IsMessageAboutTheSameModelType(filterContext.Exception.Message)))
             {

From 11194314fbe347d0a6d06f7a7085a2fc09b8392c Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Tue, 17 Sep 2019 09:22:09 +0100
Subject: [PATCH 634/776] Be less verbose and assign in one line

---
 src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs     | 7 +------
 src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs | 7 +------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
index 3798accb4e..f940ed5c15 100644
--- a/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
@@ -79,12 +79,7 @@ namespace Umbraco.Web.PropertyEditors
 
                 var config = editorValue.DataTypeConfiguration as GridConfiguration;
                 var mediaParent = config?.MediaParentId;
-                Guid mediaParentId;
-
-                if (mediaParent == null)
-                    mediaParentId = Guid.Empty;
-                else
-                    mediaParentId = mediaParent.Guid;
+                var mediaParentId = mediaParent == null ? Guid.Empty : mediaParent.Guid;
 
                 // editorValue.Value is a JSON string of the grid
                 var rawJson = editorValue.Value.ToString();
diff --git a/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
index 8696aa14e7..d29b96c1db 100644
--- a/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
@@ -121,13 +121,8 @@ namespace Umbraco.Web.PropertyEditors
 
                 var config = editorValue.DataTypeConfiguration as RichTextConfiguration;
                 var mediaParent = config?.MediaParentId;
-                Guid mediaParentId;
+                var mediaParentId = mediaParent == null ? Guid.Empty : mediaParent.Guid;
 
-                if (mediaParent == null)
-                    mediaParentId = Guid.Empty;
-                else
-                    mediaParentId = mediaParent.Guid;
-                
                 parsed = TemplateUtilities.FindAndPersistPastedTempImages(parsed, mediaParentId, userId, _mediaService, _contentTypeBaseServiceProvider, _logger);
                 return parsed;
             }

From 519fcab087b57148e5e75077347238da3ac18642 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Tue, 17 Sep 2019 09:25:26 +0100
Subject: [PATCH 635/776] Use the recrusive feature bool of Directory.Delete to
 delete the file at the same time :)

---
 src/Umbraco.Web/Templates/TemplateUtilities.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web/Templates/TemplateUtilities.cs b/src/Umbraco.Web/Templates/TemplateUtilities.cs
index 56225df3d3..edccbcc9d4 100644
--- a/src/Umbraco.Web/Templates/TemplateUtilities.cs
+++ b/src/Umbraco.Web/Templates/TemplateUtilities.cs
@@ -250,9 +250,8 @@ namespace Umbraco.Web.Templates
                 // for each image uploaded from TinyMceController
                 var folderName = Path.GetDirectoryName(absoluteTempImagePath);
                 try
-                {
-                    File.Delete(absoluteTempImagePath);
-                    Directory.Delete(folderName);
+                {   
+                    Directory.Delete(folderName, true);
                 }
                 catch (Exception ex)
                 {

From f065c455abc7891cd9a373a6e97915084984af0a Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Tue, 17 Sep 2019 10:51:59 +0200
Subject: [PATCH 636/776] Hide the search results automatically when removing
 the search term (#5783)

---
 .../directives/components/tree/umbtreesearchbox.directive.js   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreesearchbox.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreesearchbox.directive.js
index 9c28cbe367..6f195dcc52 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreesearchbox.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreesearchbox.directive.js
@@ -73,6 +73,9 @@ function treeSearchBox(localizationService, searchService, $q) {
                         canceler = null;
                     });
                 }
+                else {
+                    scope.hideSearch();
+                }
             }
 
             scope.$watch("term", _.debounce(function(newVal, oldVal) {

From 39d833c716f370192c2c914a1c72a16a2c55d27a Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Tue, 17 Sep 2019 12:49:34 +0100
Subject: [PATCH 637/776] Adss new deciated CSS/Less file that loads only in
 the TinyMCE RTE for us to style macros & emebed stuff

---
 src/Umbraco.Web.UI.Client/gulp/config.js      |  9 +++---
 .../src/common/services/tinymce.service.js    |  8 ++---
 .../src/less/rte-content.less                 | 32 +++++++++++++++++++
 3 files changed, 41 insertions(+), 8 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/less/rte-content.less

diff --git a/src/Umbraco.Web.UI.Client/gulp/config.js b/src/Umbraco.Web.UI.Client/gulp/config.js
index 705074a18f..af6973ddcb 100755
--- a/src/Umbraco.Web.UI.Client/gulp/config.js
+++ b/src/Umbraco.Web.UI.Client/gulp/config.js
@@ -9,14 +9,15 @@ module.exports = {
             installer: { files: ["./src/less/installer.less"], out: "installer.css" },
             nonodes: { files: ["./src/less/pages/nonodes.less"], out: "nonodes.style.min.css"},
             preview: { files: ["./src/less/canvas-designer.less"], out: "canvasdesigner.css" },
-            umbraco: { files: ["./src/less/belle.less"], out: "umbraco.css" }
+            umbraco: { files: ["./src/less/belle.less"], out: "umbraco.css" },
+            rteContent: { files: ["./src/less/rte-content.less"], out: "rte-content.css" }
         },
 
         //js files for backoffie
         //processed in the js task
         js: {
             preview: { files: ["./src/preview/**/*.js"], out: "umbraco.preview.js" },
-            installer: { files: ["./src/installer/**/*.js"], out: "umbraco.installer.js" },            
+            installer: { files: ["./src/installer/**/*.js"], out: "umbraco.installer.js" },
             filters: { files: ["./src/common/filters/**/*.js"], out: "umbraco.filters.js" },
             resources: { files: ["./src/common/resources/**/*.js"], out: "umbraco.resources.js" },
             services: { files: ["./src/common/services/**/*.js"], out: "umbraco.services.js" },
@@ -24,13 +25,13 @@ module.exports = {
 
             //the controllers for views
             controllers: {
-                files: [                    
+                files: [
                     "./src/views/**/*.controller.js",
                     "./src/*.controller.js"
                 ], out: "umbraco.controllers.js"
             },
 
-            //directives/components 
+            //directives/components
             // - any JS file found in common / directives or common/ components
             // - any JS file found inside views that has the suffix .directive.js or .component.js
             directives: {
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index ef7461d699..12c7ea8254 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -94,6 +94,10 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
         }
 
         return $q.all(promises).then(function() {
+            // Always push our Umbraco RTE stylesheet
+            // So we can style macros, embed items etc...
+            stylesheets.push(`${Umbraco.Sys.ServerVariables.umbracoSettings.umbracoPath}/assets/css/rte-content.css`);
+
             return $q.when({ stylesheets: stylesheets, styleFormats: styleFormats});
         });
     }
@@ -320,10 +324,6 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                     //see http://archive.tinymce.com/wiki.php/Configuration:cache_suffix
                     cache_suffix: "?umb__rnd=" + Umbraco.Sys.ServerVariables.application.cacheBuster,
 
-                    //this is used to style the inline macro bits, sorry hard coding this form now since we don't have a standalone
-                    //stylesheet to load in for this with only these styles (the color is @pinkLight)
-                    content_style: ".mce-content-body .umb-macro-holder { border: 3px dotted #f5c1bc; padding: 7px; display: block; margin: 3px; } .umb-rte .mce-content-body .umb-macro-holder.loading {background: url(assets/img/loader.gif) right no-repeat; background-size: 18px; background-position-x: 99%;}",
-
                     // This allows images to be pasted in & stored as Base64 until they get uploaded to server
                     paste_data_images: true,
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/rte-content.less b/src/Umbraco.Web.UI.Client/src/less/rte-content.less
new file mode 100644
index 0000000000..f133ac8535
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/less/rte-content.less
@@ -0,0 +1,32 @@
+@import "variables.less";
+
+.mce-content-body .umb-macro-holder {
+    border: 3px dotted @pinkLight;
+    padding: 7px;
+    display: block;
+    margin: 3px;
+}
+
+
+.umb-rte .mce-content-body .umb-macro-holder.loading {
+    background: url(assets/img/loader.gif) right no-repeat;
+    background-size: 18px; background-position-x: 99%;
+}
+
+
+.umb-rte .mceNonEditable.embeditem {
+    position:relative;
+}
+
+.umb-rte .mceNonEditable.embeditem::before {
+    z-index:1000;
+    width:100%;
+    height:100%;
+    position:absolute;
+    content:' ';
+    background:rgba(0,0,0,0.1);
+}
+
+.umb-rte .mceNonEditable.embeditem[data-mce-selected] {
+    outline: 2px solid @pinkLight;
+}
\ No newline at end of file

From 7fdbb84c04e0837761a173b209cc6c7501be3d8a Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 17 Sep 2019 22:38:43 +1000
Subject: [PATCH 638/776] Fixes bug with nucache - it wasn't using
 gen/snapshots the way it was supposed to

---
 .../PublishedCache/NuCache/ContentStore.cs    | 66 +++++++++++++------
 1 file changed, 47 insertions(+), 19 deletions(-)

diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
index 884ccb0f74..5157f9493e 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
@@ -470,7 +470,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
         private bool BuildKit(ContentNodeKit kit, out LinkedNode<ContentNode> parent)
         {
             // make sure parent exists
-            parent = GetParentLink(kit.Node);
+            parent = GetParentLink(kit.Node, _liveGen);
             if (parent == null)
             {
                 _logger.Warn<ContentStore>($"Skip item id={kit.Node.Id}, could not find parent id={kit.Node.ParentContentId}.");
@@ -795,7 +795,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             var id = content.FirstChildContentId;
             while (id > 0)
             {
-                var link = GetRequiredLinkedNode(id, "child");
+                var link = GetRequiredLinkedNode(id, "child", _liveGen);
                 ClearBranchLocked(link.Value);
                 id = link.Value.NextSiblingContentId;
             }
@@ -807,10 +807,20 @@ namespace Umbraco.Web.PublishedCache.NuCache
         /// <param name="id"></param>
         /// <param name="description"></param>
         /// <returns></returns>
-        private LinkedNode<ContentNode> GetRequiredLinkedNode(int id, string description)
+        private LinkedNode<ContentNode> GetRequiredLinkedNode(int id, string description, long gen)
         {
-            if (_contentNodes.TryGetValue(id, out var link) && link.Value != null)
-                return link;
+            if (_contentNodes.TryGetValue(id, out var link))
+            {
+                //find the correct snapshot
+                while (link != null && link.Gen != gen)
+                {
+                    link = link.Next;
+                }
+
+                if (link.Value != null)
+                    return link;
+            }
+                
 
             throw new PanicException($"failed to get {description} with id={id}");
         }
@@ -818,11 +828,27 @@ namespace Umbraco.Web.PublishedCache.NuCache
         /// <summary>
         /// Gets the parent link node, may be null or root if ParentContentId is less than 0
         /// </summary>
-        private LinkedNode<ContentNode> GetParentLink(ContentNode content)
+        private LinkedNode<ContentNode> GetParentLink(ContentNode content, long gen)
         {
-            if (content.ParentContentId < 0) return _root;
+            if (content.ParentContentId < 0)
+            {
+                var root = _root;
+                //find the correct snapshot
+                while (root != null && root.Gen != gen)
+                {
+                    root = root.Next;
+                }
+                return root;
+            }
 
-            _contentNodes.TryGetValue(content.ParentContentId, out var link);
+            if (_contentNodes.TryGetValue(content.ParentContentId, out var link))
+            {
+                //find the correct snapshot
+                while (link != null && link.Gen != gen)
+                {
+                    link = link.Next;
+                }
+            }
             return link;
         }
 
@@ -831,16 +857,16 @@ namespace Umbraco.Web.PublishedCache.NuCache
         /// </summary>
         /// <param name="content"></param>
         /// <returns></returns>
-        private LinkedNode<ContentNode> GetRequiredParentLink(ContentNode content)
+        private LinkedNode<ContentNode> GetRequiredParentLink(ContentNode content, long gen)
         {
-            return content.ParentContentId < 0 ? _root : GetRequiredLinkedNode(content.ParentContentId, "parent");
+            return content.ParentContentId < 0 ? _root : GetRequiredLinkedNode(content.ParentContentId, "parent", gen);
         }
 
         private void RemoveTreeNodeLocked(ContentNode content)
         {
             var parentLink = content.ParentContentId < 0
                 ? _root
-                : GetRequiredLinkedNode(content.ParentContentId, "parent");
+                : GetRequiredLinkedNode(content.ParentContentId, "parent", _liveGen);
 
             var parent = parentLink.Value;
 
@@ -863,14 +889,14 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
             if (content.NextSiblingContentId > 0)
             {
-                var nextLink = GetRequiredLinkedNode(content.NextSiblingContentId, "next sibling");
+                var nextLink = GetRequiredLinkedNode(content.NextSiblingContentId, "next sibling", _liveGen);
                 var next = GenCloneLocked(nextLink);
                 next.PreviousSiblingContentId = content.PreviousSiblingContentId;
             }
 
             if (content.PreviousSiblingContentId > 0)
             {
-                var prevLink = GetRequiredLinkedNode(content.PreviousSiblingContentId, "previous sibling");
+                var prevLink = GetRequiredLinkedNode(content.PreviousSiblingContentId, "previous sibling", _liveGen);
                 var prev = GenCloneLocked(prevLink);
                 prev.NextSiblingContentId = content.NextSiblingContentId;
             }
@@ -883,7 +909,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
         {
             if (kit.Node.ParentContentId < 0)
                 return true;
-            var link = GetParentLink(kit.Node);
+            var link = GetParentLink(kit.Node, _liveGen);
             var node = link?.Value;
             return node != null && node.HasPublished;
         }
@@ -909,10 +935,12 @@ namespace Umbraco.Web.PublishedCache.NuCache
         /// </summary>
         private void AddTreeNodeLocked(ContentNode content, LinkedNode<ContentNode> parentLink = null)
         {
-            parentLink = parentLink ?? GetRequiredParentLink(content);
+            parentLink = parentLink ?? GetRequiredParentLink(content, _liveGen);
 
             var parent = parentLink.Value;
 
+            var currentGen = parentLink.Gen;
+
             // if parent has no children, clone parent + add as first child
             if (parent.FirstChildContentId < 0)
             {
@@ -923,7 +951,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             }
 
             // get parent's first child
-            var childLink = GetRequiredLinkedNode(parent.FirstChildContentId, "first child");
+            var childLink = GetRequiredLinkedNode(parent.FirstChildContentId, "first child", currentGen);
             var child = childLink.Value;
 
             // if first, clone parent + insert as first child
@@ -943,7 +971,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             }
 
             // get parent's last child
-            var lastChildLink = GetRequiredLinkedNode(parent.LastChildContentId, "last child");
+            var lastChildLink = GetRequiredLinkedNode(parent.LastChildContentId, "last child", currentGen);
             var lastChild = lastChildLink.Value;
 
             // if last, clone parent + append as last child
@@ -968,7 +996,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             while (child.NextSiblingContentId > 0)
             {
                 // get next child
-                var nextChildLink = GetRequiredLinkedNode(child.NextSiblingContentId, "next child");
+                var nextChildLink = GetRequiredLinkedNode(child.NextSiblingContentId, "next child", currentGen);
                 var nextChild = nextChildLink.Value;
 
                 // if here, clone previous + append/insert
@@ -1086,7 +1114,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
             while (id > 0)
             {
-                var link = GetRequiredLinkedNode(id, "sibling");
+                var link = GetRequiredLinkedNode(id, "root", gen);
                 yield return link.Value;
                 id = link.Value.NextSiblingContentId;
             }

From 1eb1c9dc4dfeefb03895c277797e6514a34dc162 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 17 Sep 2019 22:50:57 +1000
Subject: [PATCH 639/776] allows for disabling the modelbinderexceptionfilter
 from config for testing, adds notes

---
 src/Umbraco.Web/Mvc/ContentModelBinder.cs          | 5 ++++-
 src/Umbraco.Web/Mvc/ModelBindingExceptionFilter.cs | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/Mvc/ContentModelBinder.cs b/src/Umbraco.Web/Mvc/ContentModelBinder.cs
index c6df52e007..052938807a 100644
--- a/src/Umbraco.Web/Mvc/ContentModelBinder.cs
+++ b/src/Umbraco.Web/Mvc/ContentModelBinder.cs
@@ -135,13 +135,16 @@ namespace Umbraco.Web.Mvc
             msg.Append(modelType.FullName);
             msg.Append(".");
 
-// raise event, to give model factories a chance at reporting
+            // raise event, to give model factories a chance at reporting
             // the error with more details, and optionally request that
             // the application restarts.
 
             var args = new ModelBindingArgs(sourceType, modelType, msg);
             ModelBindingException?.Invoke(Instance, args);
 
+            // TODO: with all of the tests I've done i don't think restarting the app here is required anymore,
+            // when I don't have this code enabled and i get a model binding error and just refresh, it fixes itself.
+            // We'll leave this for now though.
             if (args.Restart)
             {
                 msg.Append(" The application is restarting now.");
diff --git a/src/Umbraco.Web/Mvc/ModelBindingExceptionFilter.cs b/src/Umbraco.Web/Mvc/ModelBindingExceptionFilter.cs
index ad0c036bfc..19435d614c 100644
--- a/src/Umbraco.Web/Mvc/ModelBindingExceptionFilter.cs
+++ b/src/Umbraco.Web/Mvc/ModelBindingExceptionFilter.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Configuration;
 using System.Net;
 using System.Text.RegularExpressions;
 using System.Web.Mvc;
@@ -15,7 +16,7 @@ namespace Umbraco.Web.Mvc
 
         public void OnException(ExceptionContext filterContext)
         {
-            if (!filterContext.HttpContext.IsDebuggingEnabled
+            if (ConfigurationManager.AppSettings["Umbraco.Web.DisableModelBindingExceptionFilter"] != "true"
                 && !filterContext.ExceptionHandled
                 && ((filterContext.Exception is ModelBindingException || filterContext.Exception is InvalidCastException)
                     && IsMessageAboutTheSameModelType(filterContext.Exception.Message)))

From ef007382b5cb79c0b970135e79225831f1b00aa7 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 17 Sep 2019 22:58:06 +1000
Subject: [PATCH 640/776] only enable the ModelBindingExceptionFilter when
 running PureLive, there should be no other reason to have this filter

---
 src/Umbraco.Web/Mvc/ModelBindingExceptionFilter.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Mvc/ModelBindingExceptionFilter.cs b/src/Umbraco.Web/Mvc/ModelBindingExceptionFilter.cs
index 19435d614c..5d8fbdac2f 100644
--- a/src/Umbraco.Web/Mvc/ModelBindingExceptionFilter.cs
+++ b/src/Umbraco.Web/Mvc/ModelBindingExceptionFilter.cs
@@ -3,6 +3,8 @@ using System.Configuration;
 using System.Net;
 using System.Text.RegularExpressions;
 using System.Web.Mvc;
+using Umbraco.Core;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.Mvc
 {
@@ -10,13 +12,17 @@ namespace Umbraco.Web.Mvc
     ///     An exception filter checking if we get a <see cref="ModelBindingException" /> or <see cref="InvalidCastException" /> with the same model.
     ///     In which case it returns a redirect to the same page after 1 sec if not in debug mode.
     /// </summary>
+    /// <remarks>
+    /// This is only enabled when running PureLive
+    /// </remarks>
     internal class ModelBindingExceptionFilter : FilterAttribute, IExceptionFilter
     {
         private static readonly Regex GetPublishedModelsTypesRegex = new Regex("Umbraco.Web.PublishedModels.(\\w+)", RegexOptions.Compiled);
 
         public void OnException(ExceptionContext filterContext)
         {
-            if (ConfigurationManager.AppSettings["Umbraco.Web.DisableModelBindingExceptionFilter"] != "true"
+            if (Current.PublishedModelFactory.IsLiveFactory()
+                && ConfigurationManager.AppSettings["Umbraco.Web.DisableModelBindingExceptionFilter"] != "true"
                 && !filterContext.ExceptionHandled
                 && ((filterContext.Exception is ModelBindingException || filterContext.Exception is InvalidCastException)
                     && IsMessageAboutTheSameModelType(filterContext.Exception.Message)))

From ab79cd74b8cdbc00160020911afef173490f70d9 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 17 Sep 2019 23:31:32 +1000
Subject: [PATCH 641/776] Fixes lazy iteration issue on package install

---
 .../Packaging/PackageDataInstallation.cs      | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/Umbraco.Core/Packaging/PackageDataInstallation.cs b/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
index b6dd49bd18..03e03afaaa 100644
--- a/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
+++ b/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
@@ -61,7 +61,6 @@ namespace Umbraco.Core.Packaging
             var removedDataTypes = new List<IDataType>();
             var removedLanguages = new List<ILanguage>();
 
-            //using(_publishedModelFactory.SuspendSafeLiveFactory()) //ensure that any PureLive models are not regenerated until after the bulk operation
             using (var scope = _scopeProvider.CreateScope())
             {
                 //Uninstall templates
@@ -202,9 +201,9 @@ namespace Umbraco.Core.Packaging
         #region Content
 
 
-        public IEnumerable<IContent> ImportContent(IEnumerable<CompiledPackageDocument> docs, IDictionary<string, IContentType> importedDocumentTypes, int userId)
+        public IReadOnlyList<IContent> ImportContent(IEnumerable<CompiledPackageDocument> docs, IDictionary<string, IContentType> importedDocumentTypes, int userId)
         {
-            return docs.SelectMany(x => ImportContent(x, -1, importedDocumentTypes, userId));
+            return docs.SelectMany(x => ImportContent(x, -1, importedDocumentTypes, userId)).ToList();
         }
 
         /// <summary>
@@ -385,7 +384,7 @@ namespace Umbraco.Core.Packaging
 
         #region DocumentTypes
 
-        public IEnumerable<IContentType> ImportDocumentType(XElement docTypeElement, int userId)
+        public IReadOnlyList<IContentType> ImportDocumentType(XElement docTypeElement, int userId)
         {
             return ImportDocumentTypes(new[] { docTypeElement }, userId);
         }
@@ -396,7 +395,7 @@ namespace Umbraco.Core.Packaging
         /// <param name="docTypeElements">Xml to import</param>
         /// <param name="userId">Optional id of the User performing the operation. Default is zero (admin).</param>
         /// <returns>An enumerable list of generated ContentTypes</returns>
-        public IEnumerable<IContentType> ImportDocumentTypes(IEnumerable<XElement> docTypeElements, int userId)
+        public IReadOnlyList<IContentType> ImportDocumentTypes(IEnumerable<XElement> docTypeElements, int userId)
         {
             return ImportDocumentTypes(docTypeElements.ToList(), true, userId);
         }
@@ -408,7 +407,7 @@ namespace Umbraco.Core.Packaging
         /// <param name="importStructure">Boolean indicating whether or not to import the </param>
         /// <param name="userId">Optional id of the User performing the operation. Default is zero (admin).</param>
         /// <returns>An enumerable list of generated ContentTypes</returns>
-        public IEnumerable<IContentType> ImportDocumentTypes(IReadOnlyCollection<XElement> unsortedDocumentTypes, bool importStructure, int userId)
+        public IReadOnlyList<IContentType> ImportDocumentTypes(IReadOnlyCollection<XElement> unsortedDocumentTypes, bool importStructure, int userId)
         {
             var importedContentTypes = new Dictionary<string, IContentType>();
 
@@ -857,7 +856,7 @@ namespace Umbraco.Core.Packaging
         /// <param name="dataTypeElements">Xml to import</param>
         /// <param name="userId">Optional id of the user</param>
         /// <returns>An enumerable list of generated DataTypeDefinitions</returns>
-        public IEnumerable<IDataType> ImportDataTypes(IReadOnlyCollection<XElement> dataTypeElements, int userId)
+        public IReadOnlyList<IDataType> ImportDataTypes(IReadOnlyCollection<XElement> dataTypeElements, int userId)
         {
             var dataTypes = new List<IDataType>();
 
@@ -986,13 +985,13 @@ namespace Umbraco.Core.Packaging
         /// <param name="dictionaryItemElementList">Xml to import</param>
         /// <param name="userId"></param>
         /// <returns>An enumerable list of dictionary items</returns>
-        public IEnumerable<IDictionaryItem> ImportDictionaryItems(IEnumerable<XElement> dictionaryItemElementList, int userId)
+        public IReadOnlyList<IDictionaryItem> ImportDictionaryItems(IEnumerable<XElement> dictionaryItemElementList, int userId)
         {
             var languages = _localizationService.GetAllLanguages().ToList();
             return ImportDictionaryItems(dictionaryItemElementList, languages, null, userId);
         }
 
-        private IEnumerable<IDictionaryItem> ImportDictionaryItems(IEnumerable<XElement> dictionaryItemElementList, List<ILanguage> languages, Guid? parentId, int userId)
+        private IReadOnlyList<IDictionaryItem> ImportDictionaryItems(IEnumerable<XElement> dictionaryItemElementList, List<ILanguage> languages, Guid? parentId, int userId)
         {
             var items = new List<IDictionaryItem>();
             foreach (var dictionaryItemElement in dictionaryItemElementList)
@@ -1069,7 +1068,7 @@ namespace Umbraco.Core.Packaging
         /// <param name="languageElements">Xml to import</param>
         /// <param name="userId">Optional id of the User performing the operation</param>
         /// <returns>An enumerable list of generated languages</returns>
-        public IEnumerable<ILanguage> ImportLanguages(IEnumerable<XElement> languageElements, int userId)
+        public IReadOnlyList<ILanguage> ImportLanguages(IEnumerable<XElement> languageElements, int userId)
         {
             var list = new List<ILanguage>();
             foreach (var languageElement in languageElements)
@@ -1098,7 +1097,7 @@ namespace Umbraco.Core.Packaging
         /// <param name="macroElements">Xml to import</param>
         /// <param name="userId">Optional id of the User performing the operation</param>
         /// <returns></returns>
-        public IEnumerable<IMacro> ImportMacros(IEnumerable<XElement> macroElements, int userId)
+        public IReadOnlyList<IMacro> ImportMacros(IEnumerable<XElement> macroElements, int userId)
         {
             var macros = macroElements.Select(ParseMacroElement).ToList();
 
@@ -1188,7 +1187,7 @@ namespace Umbraco.Core.Packaging
 
         #region Stylesheets
 
-        public IEnumerable<IFile> ImportStylesheets(IEnumerable<XElement> stylesheetElements, int userId)
+        public IReadOnlyList<IFile> ImportStylesheets(IEnumerable<XElement> stylesheetElements, int userId)
         {
             var result = new List<IFile>();
 
@@ -1256,7 +1255,7 @@ namespace Umbraco.Core.Packaging
         /// <param name="templateElements">Xml to import</param>
         /// <param name="userId">Optional user id</param>
         /// <returns>An enumerable list of generated Templates</returns>
-        public IEnumerable<ITemplate> ImportTemplates(IReadOnlyCollection<XElement> templateElements, int userId)
+        public IReadOnlyList<ITemplate> ImportTemplates(IReadOnlyCollection<XElement> templateElements, int userId)
         {
             var templates = new List<ITemplate>();
 

From e6805b23e383748626ffb269dd5106352c868144 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 18 Sep 2019 00:10:02 +1000
Subject: [PATCH 642/776] Oops! didn't complete the scope, ok now package
 install works within a trans, fixes nucache changes to not pass around
 _liveGen since sometimes we want the latest that is not _liveGen

---
 .../Packaging/PackageDataInstallation.cs      |  4 +-
 .../PublishedCache/NuCache/ContentStore.cs    | 69 ++++++++++---------
 2 files changed, 40 insertions(+), 33 deletions(-)

diff --git a/src/Umbraco.Core/Packaging/PackageDataInstallation.cs b/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
index 03e03afaaa..281cc2c396 100644
--- a/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
+++ b/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
@@ -191,7 +191,9 @@ namespace Umbraco.Core.Packaging
 
                 installationSummary.StylesheetsInstalled = ImportStylesheets(compiledPackage.Stylesheets, userId);
                 installationSummary.ContentInstalled = ImportContent(compiledPackage.Documents, importedDocTypes, userId);
-                
+
+                scope.Complete();
+
                 return installationSummary;
             }
         }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
index 5157f9493e..ae439db579 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
@@ -470,7 +470,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
         private bool BuildKit(ContentNodeKit kit, out LinkedNode<ContentNode> parent)
         {
             // make sure parent exists
-            parent = GetParentLink(kit.Node, _liveGen);
+            parent = GetParentLink(kit.Node, null);
             if (parent == null)
             {
                 _logger.Warn<ContentStore>($"Skip item id={kit.Node.Id}, could not find parent id={kit.Node.ParentContentId}.");
@@ -795,7 +795,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             var id = content.FirstChildContentId;
             while (id > 0)
             {
-                var link = GetRequiredLinkedNode(id, "child", _liveGen);
+                var link = GetRequiredLinkedNode(id, "child", null);
                 ClearBranchLocked(link.Value);
                 id = link.Value.NextSiblingContentId;
             }
@@ -806,21 +806,16 @@ namespace Umbraco.Web.PublishedCache.NuCache
         /// </summary>
         /// <param name="id"></param>
         /// <param name="description"></param>
+        /// <param name="gen">the generation requested, null for the latest stored</param>
         /// <returns></returns>
-        private LinkedNode<ContentNode> GetRequiredLinkedNode(int id, string description, long gen)
+        private LinkedNode<ContentNode> GetRequiredLinkedNode(int id, string description, long? gen)
         {
             if (_contentNodes.TryGetValue(id, out var link))
             {
-                //find the correct snapshot
-                while (link != null && link.Gen != gen)
-                {
-                    link = link.Next;
-                }
-
-                if (link.Value != null)
+                link = GetLinkedNodeGen(link, gen);                
+                if (link != null && link.Value != null)
                     return link;
-            }
-                
+            }   
 
             throw new PanicException($"failed to get {description} with id={id}");
         }
@@ -828,27 +823,18 @@ namespace Umbraco.Web.PublishedCache.NuCache
         /// <summary>
         /// Gets the parent link node, may be null or root if ParentContentId is less than 0
         /// </summary>
-        private LinkedNode<ContentNode> GetParentLink(ContentNode content, long gen)
+        /// <param name="gen">the generation requested, null for the latest stored</param>
+        private LinkedNode<ContentNode> GetParentLink(ContentNode content, long? gen)
         {
             if (content.ParentContentId < 0)
             {
-                var root = _root;
-                //find the correct snapshot
-                while (root != null && root.Gen != gen)
-                {
-                    root = root.Next;
-                }
+                var root = GetLinkedNodeGen(_root, gen);                
                 return root;
             }
 
             if (_contentNodes.TryGetValue(content.ParentContentId, out var link))
-            {
-                //find the correct snapshot
-                while (link != null && link.Gen != gen)
-                {
-                    link = link.Next;
-                }
-            }
+                link = GetLinkedNodeGen(link, gen);
+                
             return link;
         }
 
@@ -856,17 +842,36 @@ namespace Umbraco.Web.PublishedCache.NuCache
         /// Gets the linked parent node and if it doesn't exist throw a <see cref="PanicException"/>
         /// </summary>
         /// <param name="content"></param>
+        /// <param name="gen">the generation requested, null for the latest stored</param>
         /// <returns></returns>
-        private LinkedNode<ContentNode> GetRequiredParentLink(ContentNode content, long gen)
+        private LinkedNode<ContentNode> GetRequiredParentLink(ContentNode content, long? gen)
         {
             return content.ParentContentId < 0 ? _root : GetRequiredLinkedNode(content.ParentContentId, "parent", gen);
         }
 
+        /// <summary>
+        /// Iterates over the LinkedNode's generations to find the correct one
+        /// </summary>
+        /// <param name="link"></param>
+        /// <param name="gen">The generation requested, use null to avoid the lookup</param>
+        /// <returns></returns>
+        private LinkedNode<ContentNode> GetLinkedNodeGen(LinkedNode<ContentNode> link, long? gen)
+        {
+            if (!gen.HasValue) return link;
+
+            //find the correct snapshot
+            while (link != null && link.Gen != gen)
+            {
+                link = link.Next;
+            }
+            return link;
+        }
+
         private void RemoveTreeNodeLocked(ContentNode content)
         {
             var parentLink = content.ParentContentId < 0
                 ? _root
-                : GetRequiredLinkedNode(content.ParentContentId, "parent", _liveGen);
+                : GetRequiredLinkedNode(content.ParentContentId, "parent", null);
 
             var parent = parentLink.Value;
 
@@ -889,14 +894,14 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
             if (content.NextSiblingContentId > 0)
             {
-                var nextLink = GetRequiredLinkedNode(content.NextSiblingContentId, "next sibling", _liveGen);
+                var nextLink = GetRequiredLinkedNode(content.NextSiblingContentId, "next sibling", null);
                 var next = GenCloneLocked(nextLink);
                 next.PreviousSiblingContentId = content.PreviousSiblingContentId;
             }
 
             if (content.PreviousSiblingContentId > 0)
             {
-                var prevLink = GetRequiredLinkedNode(content.PreviousSiblingContentId, "previous sibling", _liveGen);
+                var prevLink = GetRequiredLinkedNode(content.PreviousSiblingContentId, "previous sibling", null);
                 var prev = GenCloneLocked(prevLink);
                 prev.NextSiblingContentId = content.NextSiblingContentId;
             }
@@ -909,7 +914,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
         {
             if (kit.Node.ParentContentId < 0)
                 return true;
-            var link = GetParentLink(kit.Node, _liveGen);
+            var link = GetParentLink(kit.Node, null);
             var node = link?.Value;
             return node != null && node.HasPublished;
         }
@@ -935,7 +940,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
         /// </summary>
         private void AddTreeNodeLocked(ContentNode content, LinkedNode<ContentNode> parentLink = null)
         {
-            parentLink = parentLink ?? GetRequiredParentLink(content, _liveGen);
+            parentLink = parentLink ?? GetRequiredParentLink(content, null);
 
             var parent = parentLink.Value;
 

From cc1e46ae056ed87c4e6d5eea8d84be80772b6845 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 18 Sep 2019 00:36:12 +1000
Subject: [PATCH 643/776] Simplifies ContentStore for all the instances it's
 trying to find a linked node by a gen

---
 .../PublishedCache/NuCache/ContentStore.cs    | 60 +++++++------------
 1 file changed, 22 insertions(+), 38 deletions(-)

diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
index ae439db579..c7fc389cb1 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
@@ -506,6 +506,14 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         public int Count => _contentNodes.Count;
 
+        /// <summary>
+        /// Get the most recent version of the LinkedNode stored in the dictionary for the supplied key
+        /// </summary>
+        /// <typeparam name="TKey"></typeparam>
+        /// <typeparam name="TValue"></typeparam>
+        /// <param name="dict"></param>
+        /// <param name="key"></param>
+        /// <returns></returns>
         private static LinkedNode<TValue> GetHead<TKey, TValue>(ConcurrentDictionary<TKey, LinkedNode<TValue>> dict, TKey key)
             where TValue : class
         {
@@ -855,12 +863,13 @@ namespace Umbraco.Web.PublishedCache.NuCache
         /// <param name="link"></param>
         /// <param name="gen">The generation requested, use null to avoid the lookup</param>
         /// <returns></returns>
-        private LinkedNode<ContentNode> GetLinkedNodeGen(LinkedNode<ContentNode> link, long? gen)
+        private LinkedNode<TValue> GetLinkedNodeGen<TValue>(LinkedNode<TValue> link, long? gen)
+            where TValue : class
         {
             if (!gen.HasValue) return link;
 
-            //find the correct snapshot
-            while (link != null && link.Gen != gen)
+            //find the correct snapshot, find the first that is <= the requested gen
+            while (link != null && link.Gen > gen)
             {
                 link = link.Next;
             }
@@ -1105,17 +1114,11 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         public IEnumerable<ContentNode> GetAtRoot(long gen)
         {
-            var z = _root;
-            while (z != null)
-            {
-                if (z.Gen <= gen)
-                    break;
-                z = z.Next;
-            }
-            if (z == null)
+            var root = GetLinkedNodeGen(_root, gen);            
+            if (root == null)
                 yield break;
 
-            var id = z.Value.FirstChildContentId;
+            var id = root.Value.FirstChildContentId;
 
             while (id > 0)
             {
@@ -1130,13 +1133,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
         {
             // look ma, no lock!
             var link = GetHead(dict, key);
-            while (link != null)
-            {
-                if (link.Gen <= gen)
-                    return link.Value; // may be null
-                link = link.Next;
-            }
-            return null;
+            link = GetLinkedNodeGen(link, gen);
+            return link?.Value; // may be null
         }
 
         public IEnumerable<ContentNode> GetAll(long gen)
@@ -1146,17 +1144,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
             var links = _contentNodes.Values.ToArray();
             foreach (var l in links)
             {
-                var link = l;
-                while (link != null)
-                {
-                    if (link.Gen <= gen)
-                    {
-                        if (link.Value != null)
-                            yield return link.Value;
-                        break;
-                    }
-                    link = link.Next;
-                }
+                var link = GetLinkedNodeGen(l, gen);
+                if (link?.Value != null)
+                    yield return link.Value;
             }
         }
 
@@ -1164,14 +1154,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
         {
             var has = _contentNodes.Any(x =>
             {
-                var link = x.Value;
-                while (link != null)
-                {
-                    if (link.Gen <= gen && link.Value != null)
-                        return true;
-                    link = link.Next;
-                }
-                return false;
+                var link = GetLinkedNodeGen(x.Value, gen);
+                return link?.Value != null;
             });
             return has == false;
         }

From 5fb5388fb509485ce7c280953b33efbfe56a9cb4 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Tue, 17 Sep 2019 16:07:43 +0100
Subject: [PATCH 644/776] WIP: Re-open the embed dialog & pass the data
 attribues found on the containert DIV back to the dialog to re-edit URL,
 width/height etc

---
 .../src/common/services/tinymce.service.js    | 55 +++++++++++++++----
 1 file changed, 44 insertions(+), 11 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 12c7ea8254..530681668d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -425,32 +425,64 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
             editor.addButton('umbembeddialog', {
                 icon: 'custom icon-tv',
                 tooltip: 'Embed',
+                stateSelector: 'div[data-embed-url]',
                 onclick: function () {
+
+                    // Get the selected element
+                    // Check nodename is a DIV and the claslist contains 'embeditem'
+                    var selectedElm = editor.selection.getNode();
+                    var nodeName = selectedElm.nodeName;
+                    var embed = {};
+
+                    if(nodeName.toUpperCase() === "DIV" && selectedElm.classList.contains("embeditem")){
+                        // See if we can go and get the attributes
+                        var embedUrl = editor.dom.getAttrib(selectedElm, "data-embed-url");
+                        var embedWidth = editor.dom.getAttrib(selectedElm, "data-embed-width");
+                        var embedHeight = editor.dom.getAttrib(selectedElm, "data-embed-height");
+                        var embedConstrain = editor.dom.getAttrib(selectedElm, "data-embed-constrain");
+
+                        embed = {
+                            url: embedUrl,
+                            width: embedWidth,
+                            height: embedHeight,
+                            constrain: embedConstrain
+                        };
+                    }
+
                     if (callback) {
                         angularHelper.safeApply($rootScope, function() {
-                            callback();
+                            // pass the active element along so we can retrieve it later
+                            callback(selectedElm, embed);
                         });
                     }
                 }
             });
         },
 
-        insertEmbeddedMediaInEditor: function (editor, preview) {
+        insertEmbeddedMediaInEditor: function (editor, embed, activeElement) {
             // Wrap HTML preview content here in a DIV with non-editable class of .mceNonEditable
             // This turns it into a selectable/cutable block to move about
 
-            // TODO: Fix/discuss with Niels L that instagram & others seem will
-            // make their content clickable & navigate away from Umbraco
-
             // TODO: Do we add data attributes here - so the button can be re-clicked to edit/modify the item
             // or double/tripple clicked to bring the infinite editor back open
             // data-embed-url="instagram.com/xyz" data-embed-width="300" data-emebed-height="200"
 
-            // TODO: Added extra CSS class of embeditem wonderting if we can
-            // highlight/show easier things that are not editable
+            var wrapper = tinymce.activeEditor.dom.create('div',
+            {
+                'class': 'mceNonEditable embeditem',
+                'data-embed-url': embed.url,
+                'data-embed-height': embed.height,
+                'data-embed-width': embed.width,
+                'data-embed-constrain': embed.constrain
+            },
+            embed.preview);
 
-            var wrapper = tinymce.activeEditor.dom.create('div', {'class': 'mceNonEditable embeditem'}, preview);
-            editor.selection.setNode(wrapper);
+            if (activeElement) {
+                activeElement.replaceWith(wrapper); // directly replaces the html node
+            }
+            else {
+                editor.selection.setNode(wrapper);
+            }
         },
 
 
@@ -1272,10 +1304,11 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
             });
 
             //Create the embedded plugin
-            self.createInsertEmbeddedMedia(args.editor, function () {
+            self.createInsertEmbeddedMedia(args.editor, function (activeElement, embed) {
                 var embed = {
+                    embed: embed,
                     submit: function (model) {
-                        self.insertEmbeddedMediaInEditor(args.editor, model.embed.preview);
+                        self.insertEmbeddedMediaInEditor(args.editor, model.embed, activeElement);
                         editorService.close();
                     },
                     close: function () {

From bf9eeb4e373a6c4c44586b4cdfba7b26c7c2ad11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Wed, 18 Sep 2019 11:24:42 +0200
Subject: [PATCH 645/776] make OEmbeds non-editable + ability to edit OEmbeds
 on a later state

---
 .../src/common/services/tinymce.service.js    | 19 ++++++++--------
 .../src/less/rte-content.less                 | 22 ++++++++++++++-----
 .../infiniteeditors/embed/embed.controller.js |  4 ++--
 3 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 530681668d..cef1266de4 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -432,7 +432,7 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                     // Check nodename is a DIV and the claslist contains 'embeditem'
                     var selectedElm = editor.selection.getNode();
                     var nodeName = selectedElm.nodeName;
-                    var embed = {};
+                    var modify = null;
 
                     if(nodeName.toUpperCase() === "DIV" && selectedElm.classList.contains("embeditem")){
                         // See if we can go and get the attributes
@@ -441,10 +441,10 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                         var embedHeight = editor.dom.getAttrib(selectedElm, "data-embed-height");
                         var embedConstrain = editor.dom.getAttrib(selectedElm, "data-embed-constrain");
 
-                        embed = {
+                        modify = {
                             url: embedUrl,
-                            width: embedWidth,
-                            height: embedHeight,
+                            width: parseInt(embedWidth) || 0,
+                            height: parseInt(embedHeight) || 0,
                             constrain: embedConstrain
                         };
                     }
@@ -452,7 +452,7 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                     if (callback) {
                         angularHelper.safeApply($rootScope, function() {
                             // pass the active element along so we can retrieve it later
-                            callback(selectedElm, embed);
+                            callback(selectedElm, modify);
                         });
                     }
                 }
@@ -469,11 +469,12 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
 
             var wrapper = tinymce.activeEditor.dom.create('div',
             {
-                'class': 'mceNonEditable embeditem',
+                'class': 'embeditem',
                 'data-embed-url': embed.url,
                 'data-embed-height': embed.height,
                 'data-embed-width': embed.width,
-                'data-embed-constrain': embed.constrain
+                'data-embed-constrain': embed.constrain,
+                'contenteditable': false
             },
             embed.preview);
 
@@ -1304,9 +1305,9 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
             });
 
             //Create the embedded plugin
-            self.createInsertEmbeddedMedia(args.editor, function (activeElement, embed) {
+            self.createInsertEmbeddedMedia(args.editor, function (activeElement, modify) {
                 var embed = {
-                    embed: embed,
+                    modify: modify,
                     submit: function (model) {
                         self.insertEmbeddedMediaInEditor(args.editor, model.embed, activeElement);
                         editorService.close();
diff --git a/src/Umbraco.Web.UI.Client/src/less/rte-content.less b/src/Umbraco.Web.UI.Client/src/less/rte-content.less
index f133ac8535..5fd7bbf1c3 100644
--- a/src/Umbraco.Web.UI.Client/src/less/rte-content.less
+++ b/src/Umbraco.Web.UI.Client/src/less/rte-content.less
@@ -14,19 +14,31 @@
 }
 
 
-.umb-rte .mceNonEditable.embeditem {
+.umb-rte .embeditem {
     position:relative;
+    > * {
+        user-select: none;
+        pointer-events: none;
+    }
 }
 
-.umb-rte .mceNonEditable.embeditem::before {
+.umb-rte .embeditem[data-mce-selected] {
+    outline: 2px solid @pinkLight;
+}
+
+.umb-rte .embeditem::before {
     z-index:1000;
     width:100%;
     height:100%;
     position:absolute;
     content:' ';
-    background:rgba(0,0,0,0.1);
 }
 
-.umb-rte .mceNonEditable.embeditem[data-mce-selected] {
+.umb-rte .embeditem[data-mce-selected]::before {
+    background:rgba(0,0,0,0.025);
+}
+
+.umb-rte *[data-mce-selected="inline-boundary"] {
+    background:rgba(0,0,0,0.025);
     outline: 2px solid @pinkLight;
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.controller.js
index f34dc949ab..515f54e3d7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.controller.js
@@ -21,8 +21,8 @@
             supportsDimensions: false
         };
 
-        if ($scope.model.original) {
-            angular.extend($scope.model.embed, $scope.model.original);
+        if ($scope.model.modify) {
+            angular.extend($scope.model.embed, $scope.model.modify);
 
             showPreview();
         }

From a384c0866bd74c2f8488fc8ca447a2b283b1d712 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 18 Sep 2019 20:37:05 +1000
Subject: [PATCH 646/776] Ensures the tinymce baseURL is set before it's
 initialized so that when we minify it's assets it knows where to load more
 assets from.

---
 .../common/directives/components/grid/grid.rte.directive.js   | 1 -
 .../src/common/services/tinymce.service.js                    | 4 ++++
 .../src/views/propertyeditors/rte/rte.controller.js           | 3 +--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
index af82199d55..f606c0539a 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
@@ -144,7 +144,6 @@ angular.module("umbraco.directives")
                         //we need to add a timeout here, to force a redraw so TinyMCE can find
                         //the elements needed
                         $timeout(function () {
-                            tinymce.DOM.events.domLoaded = true;
                             tinymce.init(baseLineConfigObj);
                         }, 150, false);
                     }
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 8f37f872b1..6b1e6fa853 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -242,6 +242,10 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
          */
         getTinyMceEditorConfig: function (args) {
 
+            //global defaults, called before/during init
+            tinymce.DOM.events.domLoaded = true;
+            tinymce.baseURL = Umbraco.Sys.ServerVariables.umbracoSettings.umbracoPath + "/lib/tinymce/"; // trailing slash important
+
             var promises = [
                 this.configuration(),
                 getStyles(args.stylesheets)
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
index 48170fb4b7..16fa79f667 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
@@ -84,8 +84,7 @@ angular.module("umbraco")
 
                     //we need to add a timeout here, to force a redraw so TinyMCE can find
                     //the elements needed
-                    $timeout(function () {
-                        tinymce.DOM.events.domLoaded = true;
+                    $timeout(function () {                        
                         tinymce.init(baseLineConfigObj);
                     }, 200);
                 }

From c6af9dc6f9bb3d4c8edbc4a18f444dca9811665e Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Wed, 18 Sep 2019 13:00:52 +0100
Subject: [PATCH 647/776] Ad back the magic mceNonEditable CSS class as when
 its moved & cut around the non-editable attribute does not seem to get
 re-aspplied

---
 .../src/common/services/tinymce.service.js                 | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index cef1266de4..85bb592b95 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -462,14 +462,9 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
         insertEmbeddedMediaInEditor: function (editor, embed, activeElement) {
             // Wrap HTML preview content here in a DIV with non-editable class of .mceNonEditable
             // This turns it into a selectable/cutable block to move about
-
-            // TODO: Do we add data attributes here - so the button can be re-clicked to edit/modify the item
-            // or double/tripple clicked to bring the infinite editor back open
-            // data-embed-url="instagram.com/xyz" data-embed-width="300" data-emebed-height="200"
-
             var wrapper = tinymce.activeEditor.dom.create('div',
             {
-                'class': 'embeditem',
+                'class': 'mceNonEditable embeditem',
                 'data-embed-url': embed.url,
                 'data-embed-height': embed.height,
                 'data-embed-width': embed.width,

From 5cfdfd6e9cb96ffba1f9b0f0c21041683037262b Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 18 Sep 2019 22:03:31 +1000
Subject: [PATCH 648/776] Moves temp file cleanup to a background task

---
 src/Umbraco.Web/Editors/TinyMceController.cs  | 18 -----
 src/Umbraco.Web/Scheduling/LogScrubber.cs     |  4 +-
 .../Scheduling/SchedulerComponent.cs          | 17 +++++
 src/Umbraco.Web/Scheduling/TempFileCleanup.cs | 75 +++++++++++++++++++
 src/Umbraco.Web/Umbraco.Web.csproj            |  1 +
 .../FileUploadCleanupFilterAttribute.cs       | 22 ------
 6 files changed, 94 insertions(+), 43 deletions(-)
 create mode 100644 src/Umbraco.Web/Scheduling/TempFileCleanup.cs

diff --git a/src/Umbraco.Web/Editors/TinyMceController.cs b/src/Umbraco.Web/Editors/TinyMceController.cs
index 601095bd24..c6c1acd048 100644
--- a/src/Umbraco.Web/Editors/TinyMceController.cs
+++ b/src/Umbraco.Web/Editors/TinyMceController.cs
@@ -104,24 +104,6 @@ namespace Umbraco.Web.Editors
                 return Request.CreateErrorResponse(HttpStatusCode.InternalServerError, $"Error when trying to move {currentFile} to {newFilePath}", ex);
             }
 
-            // Now remove all old files so that the temp folder(s) never grow
-            // Anything older than one day gets deleted
-            var tempFiles = Directory.GetFiles(IOHelper.MapPath(SystemDirectories.TempFileUploads), "*", SearchOption.AllDirectories);
-            foreach (var tempFile in tempFiles)
-            {
-                if (DateTime.UtcNow - File.GetLastWriteTimeUtc(tempFile) > TimeSpan.FromDays(1))
-                {
-                    try
-                    {
-                        File.Delete(tempFile);
-                    }
-                    catch (Exception ex)
-                    {
-                        Logger.Error<TinyMceController>(ex, "Could not delete temp file {FileName}", tempFile);
-                    }
-                }
-            }
-
             return Request.CreateResponse(HttpStatusCode.OK, new { tmpLocation = relativeNewFilePath });
         }
     }
diff --git a/src/Umbraco.Web/Scheduling/LogScrubber.cs b/src/Umbraco.Web/Scheduling/LogScrubber.cs
index c39f9df1b3..db13a80f9b 100644
--- a/src/Umbraco.Web/Scheduling/LogScrubber.cs
+++ b/src/Umbraco.Web/Scheduling/LogScrubber.cs
@@ -1,16 +1,14 @@
 using System;
-using System.Threading;
-using System.Threading.Tasks;
 using Umbraco.Core;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Logging;
-using Umbraco.Core.Persistence;
 using Umbraco.Core.Scoping;
 using Umbraco.Core.Services;
 using Umbraco.Core.Sync;
 
 namespace Umbraco.Web.Scheduling
 {
+
     internal class LogScrubber : RecurringTaskBase
     {
         private readonly IRuntimeState _runtime;
diff --git a/src/Umbraco.Web/Scheduling/SchedulerComponent.cs b/src/Umbraco.Web/Scheduling/SchedulerComponent.cs
index 5e29b17f56..c334bcee1a 100644
--- a/src/Umbraco.Web/Scheduling/SchedulerComponent.cs
+++ b/src/Umbraco.Web/Scheduling/SchedulerComponent.cs
@@ -1,11 +1,13 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Threading;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.HealthChecks;
 using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Scoping;
 using Umbraco.Core.Services;
@@ -29,6 +31,7 @@ namespace Umbraco.Web.Scheduling
         private BackgroundTaskRunner<IBackgroundTask> _publishingRunner;
         private BackgroundTaskRunner<IBackgroundTask> _tasksRunner;
         private BackgroundTaskRunner<IBackgroundTask> _scrubberRunner;
+        private BackgroundTaskRunner<IBackgroundTask> _fileCleanupRunner;
         private BackgroundTaskRunner<IBackgroundTask> _healthCheckRunner;
 
         private bool _started;
@@ -58,6 +61,7 @@ namespace Umbraco.Web.Scheduling
             _publishingRunner = new BackgroundTaskRunner<IBackgroundTask>("ScheduledPublishing", _logger);
             _tasksRunner = new BackgroundTaskRunner<IBackgroundTask>("ScheduledTasks", _logger);
             _scrubberRunner = new BackgroundTaskRunner<IBackgroundTask>("LogScrubber", _logger);
+            _fileCleanupRunner = new BackgroundTaskRunner<IBackgroundTask>("TempFileCleanup", _logger);
             _healthCheckRunner = new BackgroundTaskRunner<IBackgroundTask>("HealthCheckNotifier", _logger);
 
             // we will start the whole process when a successful request is made
@@ -93,6 +97,7 @@ namespace Umbraco.Web.Scheduling
                 tasks.Add(RegisterKeepAlive());
                 tasks.Add(RegisterScheduledPublishing());
                 tasks.Add(RegisterLogScrubber(settings));
+                tasks.Add(RegisterTempFileCleanup());
 
                 var healthCheckConfig = Current.Configs.HealthChecks();
                 if (healthCheckConfig.NotificationSettings.Enabled)
@@ -154,5 +159,17 @@ namespace Umbraco.Web.Scheduling
             _scrubberRunner.TryAdd(task);
             return task;
         }
+
+        private IBackgroundTask RegisterTempFileCleanup()
+        {
+            // temp file cleanup, will run on all servers - even though file upload should only be handled on the master, this will
+            // ensure that in the case it happes on replicas that they are cleaned up.
+            var task = new TempFileCleanup(_fileCleanupRunner, 60000, 3600000 /* 1 hr */,
+                new[] { new DirectoryInfo(IOHelper.MapPath(SystemDirectories.TempFileUploads)) },
+                TimeSpan.FromDays(1), //files that are over a day old
+                _runtime, _logger);
+            _scrubberRunner.TryAdd(task);
+            return task;
+        }
     }
 }
diff --git a/src/Umbraco.Web/Scheduling/TempFileCleanup.cs b/src/Umbraco.Web/Scheduling/TempFileCleanup.cs
new file mode 100644
index 0000000000..5d28bbfdb1
--- /dev/null
+++ b/src/Umbraco.Web/Scheduling/TempFileCleanup.cs
@@ -0,0 +1,75 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using Umbraco.Core;
+using Umbraco.Core.Logging;
+
+namespace Umbraco.Web.Scheduling
+{
+    /// <summary>
+    /// Used to cleanup temporary file locations
+    /// </summary>
+    internal class TempFileCleanup : RecurringTaskBase
+    {
+        private readonly DirectoryInfo[] _tempFolders;
+        private readonly TimeSpan _age;
+        private readonly IRuntimeState _runtime;
+        private readonly IProfilingLogger _logger;
+
+        public TempFileCleanup(IBackgroundTaskRunner<RecurringTaskBase> runner, int delayMilliseconds, int periodMilliseconds,
+            IEnumerable<DirectoryInfo> tempFolders, TimeSpan age,
+            IRuntimeState runtime, IProfilingLogger logger)
+            : base(runner, delayMilliseconds, periodMilliseconds)
+        {
+            //SystemDirectories.TempFileUploads
+
+            _tempFolders = tempFolders.ToArray();
+            _age = age;
+            _runtime = runtime;
+            _logger = logger;
+        }
+
+        public override bool PerformRun()
+        {
+            // ensure we do not run if not main domain
+            if (_runtime.IsMainDom == false)
+            {
+                _logger.Debug<TempFileCleanup>("Does not run if not MainDom.");
+                return false; // do NOT repeat, going down
+            }
+
+            foreach (var dir in _tempFolders)
+                CleanupFolder(dir);
+
+            return true; //repeat
+        }
+
+        private void CleanupFolder(DirectoryInfo dir)
+        {
+            dir.Refresh(); //in case it's changed during runtime
+            if (!dir.Exists)
+            {
+                _logger.Debug<TempFileCleanup>("The cleanup folder doesn't exist {Folder}", dir.FullName);
+            }
+
+            var files = dir.GetFiles("*.*", SearchOption.AllDirectories);
+            foreach (var file in files)
+            {
+                if (DateTime.UtcNow - file.LastWriteTimeUtc > _age)
+                {
+                    try
+                    {
+                        file.Delete();
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.Error<TempFileCleanup>(ex, "Could not delete temp file {FileName}", file.FullName);
+                    }
+                }
+            }
+        }
+
+        public override bool IsAsync => false;
+    }
+}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index c6945a6b15..166eeba352 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -236,6 +236,7 @@
     <Compile Include="Routing\IPublishedRouter.cs" />
     <Compile Include="Routing\MediaUrlProviderCollection.cs" />
     <Compile Include="Routing\MediaUrlProviderCollectionBuilder.cs" />
+    <Compile Include="Scheduling\TempFileCleanup.cs" />
     <Compile Include="Search\BackgroundIndexRebuilder.cs" />
     <Compile Include="Search\ExamineFinalComponent.cs" />
     <Compile Include="Search\ExamineFinalComposer.cs" />
diff --git a/src/Umbraco.Web/WebApi/Filters/FileUploadCleanupFilterAttribute.cs b/src/Umbraco.Web/WebApi/Filters/FileUploadCleanupFilterAttribute.cs
index 6e6ec35b1b..1646c8a426 100644
--- a/src/Umbraco.Web/WebApi/Filters/FileUploadCleanupFilterAttribute.cs
+++ b/src/Umbraco.Web/WebApi/Filters/FileUploadCleanupFilterAttribute.cs
@@ -146,28 +146,6 @@ namespace Umbraco.Web.WebApi.Filters
                     Current.Logger.Warn<FileUploadCleanupFilterAttribute>("The actionExecutedContext.Request.Content is not ObjectContent, it is {RequestObjectType}", actionExecutedContext.Request.Content.GetType());
                 }
             }
-
-            //Now remove all old files so that the temp folder(s) never grow
-            foreach (var tempFolder in tempFolders.Distinct())
-            {
-                var files = Directory.GetFiles(tempFolder);
-                foreach (var file in files)
-                {
-                    if (DateTime.UtcNow - File.GetLastWriteTimeUtc(file) > TimeSpan.FromDays(1))
-                    {
-                        try
-                        {
-                            File.Delete(file);
-                        }
-                        catch (System.Exception ex)
-                        {
-                            Current.Logger.Error<FileUploadCleanupFilterAttribute>(ex, "Could not delete temp file {FileName}", file);
-                        }
-                    }
-                }
-
-            }
-
         }
     }
 }

From 255bcfbc77e31db7bc49c87cd2f34581c4f77bbd Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Mon, 8 Jul 2019 18:39:40 +1000
Subject: [PATCH 649/776] Merge pull request #5801 from bielu/v8/dev

Remove last casting to LuceneIndex

(cherry picked from commit 9ba7e7742abc58ba773ec4c599246f6ff6059a73)
---
 src/Umbraco.Web/Editors/ExamineManagementController.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web/Editors/ExamineManagementController.cs b/src/Umbraco.Web/Editors/ExamineManagementController.cs
index 5f969cdd80..7c040ae508 100644
--- a/src/Umbraco.Web/Editors/ExamineManagementController.cs
+++ b/src/Umbraco.Web/Editors/ExamineManagementController.cs
@@ -85,7 +85,7 @@ namespace Umbraco.Web.Editors
             };
         }
 
-       
+
 
         /// <summary>
         /// Check if the index has been rebuilt
@@ -250,7 +250,7 @@ namespace Umbraco.Web.Editors
 
         private void Indexer_IndexOperationComplete(object sender, EventArgs e)
         {
-            var indexer = (LuceneIndex)sender;
+            var indexer = (IIndex)sender;
 
             _logger.Debug<ExamineManagementController>("Logging operation completed for index {IndexName}", indexer.Name);
 
@@ -259,7 +259,7 @@ namespace Umbraco.Web.Editors
 
             _logger
                 .Info<ExamineManagementController
-                >($"Rebuilding index '{indexer.Name}' done, {indexer.CommitCount} items committed (can differ from the number of items in the index)");
+                >($"Rebuilding index '{indexer.Name}' done.");
 
             var cacheKey = "temp_indexing_op_" + indexer.Name;
             _runtimeCache.Clear(cacheKey);

From 3f30be450dc8d4786bbbaa615716e5954d447f28 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Wed, 18 Sep 2019 15:27:30 +0100
Subject: [PATCH 650/776] Emit event when upload of image starts & stops Listen
 for events in content edit JS controller to change the state of the buttons
 to be 'busy' to avoid page/node being saved whilst large image is uploaded or
 slow connection

---
 .../directives/components/content/edit.controller.js | 12 ++++++++++++
 .../src/common/services/tinymce.service.js           | 10 +++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
index 806d43f92b..409efec1b0 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
@@ -171,6 +171,18 @@
                 }
             }));
 
+            evts.push(eventsService.on("rte.file.uploading", function(){
+                notificationsService.info("Saving Disabled", "The node cannot be saved until the image/s has finished uploading")
+
+                $scope.page.saveButtonState = "busy";
+                $scope.page.buttonGroupState = "busy";
+
+            }));
+
+            evts.push(eventsService.on("rte.file.uploaded", function(){
+                $scope.page.saveButtonState = "success";
+                $scope.page.buttonGroupState = "success";
+            }));
         }
 
         /**
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index a28318519c..7512da293c 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -7,7 +7,7 @@
  * A service containing all logic for all of the Umbraco TinyMCE plugins
  */
 function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, stylesheetResource, macroResource, macroService,
-    $routeParams, umbRequestHelper, angularHelper, userService, editorService, entityResource) {
+    $routeParams, umbRequestHelper, angularHelper, userService, editorService, entityResource, eventsService) {
 
     //These are absolutely required in order for the macros to render inline
     //we put these as extended elements because they get merged on top of the normal allowed elements by tiny mce
@@ -167,6 +167,14 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
         xhr = new XMLHttpRequest();
         xhr.open('POST', Umbraco.Sys.ServerVariables.umbracoUrls.tinyMceApiBaseUrl + 'UploadImage');
 
+        xhr.onloadstart = function(e) {
+            eventsService.emit("rte.file.uploading");
+        };
+
+        xhr.onloadend = function(e) {
+            eventsService.emit("rte.file.uploaded");
+        };
+
         xhr.upload.onprogress = function (e) {
             progress(e.loaded / e.total * 100);
         };

From 6a143796c34eead5a05b7f822f1e4805c1febc0f Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Wed, 18 Sep 2019 17:30:12 +0200
Subject: [PATCH 651/776] v8: Checkbox radio onchange fix (#6348)

---
 .../components/forms/umbcheckbox.directive.js  |  8 +++++---
 .../forms/umbradiobutton.directive.js          |  8 +++++---
 .../checkboxlist/checkboxlist.controller.js    |  2 +-
 .../radiobuttons/radiobuttons.controller.js    | 18 +++++++++++-------
 .../radiobuttons/radiobuttons.html             |  6 +++---
 5 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
index 274d6e1241..8560b5a3ea 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
@@ -43,9 +43,11 @@
         vm.change = change;
 
         function change() {
-            $timeout(function () {
-                vm.onChange({ model: vm.model, value: vm.value });
-            }, 0);
+            if (vm.onChange) {
+                $timeout(function () {
+                    vm.onChange({ model: vm.model, value: vm.value });
+                }, 0);
+            }
         }
     }
     
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
index 59c3c3c35d..0036f6904b 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
@@ -41,9 +41,11 @@
         vm.change = change;
 
         function change() {
-            $timeout(function () {
-                vm.onChange({ model: vm.model, value: vm.value });
-            }, 0);
+            if (vm.onChange) {
+                $timeout(function () {
+                    vm.onChange({ model: vm.model, value: vm.value });
+                }, 0);
+            }
         }     
     }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js
index e4245acba2..297bf23cef 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js
@@ -20,7 +20,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.CheckboxListContro
                     sortedItems.push({ key: keys[i], sortOrder: vals[i].sortOrder, value: vals[i].value});
                 }
 
-                //ensure the items are sorted by the provided sort order
+                // ensure the items are sorted by the provided sort order
                 sortedItems.sort(function (a, b) { return (a.sortOrder > b.sortOrder) ? 1 : ((b.sortOrder > a.sortOrder) ? -1 : 0); });
                 
                 vm.configItems = sortedItems;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.controller.js
index 3a96b6573a..0618c5e22b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.controller.js
@@ -1,23 +1,27 @@
 angular.module("umbraco").controller("Umbraco.PropertyEditors.RadioButtonsController",
-    function($scope) {
+    function ($scope) {
+
+        var vm = this;
+
+        vm.viewItems = [];
 
         function init() {
 
             //we can't really do anything if the config isn't an object
             if (angular.isObject($scope.model.config.items)) {
 
-                //now we need to format the items in the dictionary because we always want to have an array
-                var configItems = [];
+                // formatting the items in the dictionary into an array
+                var sortedItems = [];
                 var vals = _.values($scope.model.config.items);
                 var keys = _.keys($scope.model.config.items);
                 for (var i = 0; i < vals.length; i++) {
-                    configItems.push({ id: keys[i], sortOrder: vals[i].sortOrder, value: vals[i].value });
+                    sortedItems.push({ key: keys[i], sortOrder: vals[i].sortOrder, value: vals[i].value });
                 }
 
-                //ensure the items are sorted by the provided sort order
-                configItems.sort(function (a, b) { return (a.sortOrder > b.sortOrder) ? 1 : ((b.sortOrder > a.sortOrder) ? -1 : 0); });
+                // ensure the items are sorted by the provided sort order
+                sortedItems.sort(function (a, b) { return (a.sortOrder > b.sortOrder) ? 1 : ((b.sortOrder > a.sortOrder) ? -1 : 0); });
 
-                $scope.configItems = configItems;
+                vm.viewItems = sortedItems;
             }
             
         }
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html
index 22c4679d32..ad006b4992 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html
@@ -1,7 +1,7 @@
-<div class="umb-property-editor umb-radiobuttons" ng-controller="Umbraco.PropertyEditors.RadioButtonsController">
+<div class="umb-property-editor umb-radiobuttons" ng-controller="Umbraco.PropertyEditors.RadioButtonsController as vm">
     <ul class="unstyled">
-        <li ng-repeat="item in configItems track by item.id">
-            <umb-radiobutton name="{{model.alias}}" value="{{item.value}}" model="model.value" text="{{item.value}}" on-change="vm.change(model, value)" required="model.validation.mandatory && model.value == ''"></umb-radiobutton>
+        <li ng-repeat="item in vm.viewItems track by item.key">
+            <umb-radiobutton name="{{model.alias}}" value="{{item.value}}" model="model.value" text="{{item.value}}" required="model.validation.mandatory && model.value == ''"></umb-radiobutton>
         </li>
     </ul>
 </div>

From 71b3260b1d86a55037ff2b830099c53e39be3a0b Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Wed, 18 Sep 2019 17:30:12 +0200
Subject: [PATCH 652/776] v8: Checkbox radio onchange fix (#6348)

(cherry picked from commit 6a143796c34eead5a05b7f822f1e4805c1febc0f)
---
 .../components/forms/umbcheckbox.directive.js  |  8 +++++---
 .../forms/umbradiobutton.directive.js          |  8 +++++---
 .../checkboxlist/checkboxlist.controller.js    |  2 +-
 .../radiobuttons/radiobuttons.controller.js    | 18 +++++++++++-------
 .../radiobuttons/radiobuttons.html             |  6 +++---
 5 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
index 274d6e1241..8560b5a3ea 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
@@ -43,9 +43,11 @@
         vm.change = change;
 
         function change() {
-            $timeout(function () {
-                vm.onChange({ model: vm.model, value: vm.value });
-            }, 0);
+            if (vm.onChange) {
+                $timeout(function () {
+                    vm.onChange({ model: vm.model, value: vm.value });
+                }, 0);
+            }
         }
     }
     
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
index 59c3c3c35d..0036f6904b 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
@@ -41,9 +41,11 @@
         vm.change = change;
 
         function change() {
-            $timeout(function () {
-                vm.onChange({ model: vm.model, value: vm.value });
-            }, 0);
+            if (vm.onChange) {
+                $timeout(function () {
+                    vm.onChange({ model: vm.model, value: vm.value });
+                }, 0);
+            }
         }     
     }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js
index e4245acba2..297bf23cef 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js
@@ -20,7 +20,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.CheckboxListContro
                     sortedItems.push({ key: keys[i], sortOrder: vals[i].sortOrder, value: vals[i].value});
                 }
 
-                //ensure the items are sorted by the provided sort order
+                // ensure the items are sorted by the provided sort order
                 sortedItems.sort(function (a, b) { return (a.sortOrder > b.sortOrder) ? 1 : ((b.sortOrder > a.sortOrder) ? -1 : 0); });
                 
                 vm.configItems = sortedItems;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.controller.js
index 3a96b6573a..0618c5e22b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.controller.js
@@ -1,23 +1,27 @@
 angular.module("umbraco").controller("Umbraco.PropertyEditors.RadioButtonsController",
-    function($scope) {
+    function ($scope) {
+
+        var vm = this;
+
+        vm.viewItems = [];
 
         function init() {
 
             //we can't really do anything if the config isn't an object
             if (angular.isObject($scope.model.config.items)) {
 
-                //now we need to format the items in the dictionary because we always want to have an array
-                var configItems = [];
+                // formatting the items in the dictionary into an array
+                var sortedItems = [];
                 var vals = _.values($scope.model.config.items);
                 var keys = _.keys($scope.model.config.items);
                 for (var i = 0; i < vals.length; i++) {
-                    configItems.push({ id: keys[i], sortOrder: vals[i].sortOrder, value: vals[i].value });
+                    sortedItems.push({ key: keys[i], sortOrder: vals[i].sortOrder, value: vals[i].value });
                 }
 
-                //ensure the items are sorted by the provided sort order
-                configItems.sort(function (a, b) { return (a.sortOrder > b.sortOrder) ? 1 : ((b.sortOrder > a.sortOrder) ? -1 : 0); });
+                // ensure the items are sorted by the provided sort order
+                sortedItems.sort(function (a, b) { return (a.sortOrder > b.sortOrder) ? 1 : ((b.sortOrder > a.sortOrder) ? -1 : 0); });
 
-                $scope.configItems = configItems;
+                vm.viewItems = sortedItems;
             }
             
         }
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html
index 22c4679d32..ad006b4992 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html
@@ -1,7 +1,7 @@
-<div class="umb-property-editor umb-radiobuttons" ng-controller="Umbraco.PropertyEditors.RadioButtonsController">
+<div class="umb-property-editor umb-radiobuttons" ng-controller="Umbraco.PropertyEditors.RadioButtonsController as vm">
     <ul class="unstyled">
-        <li ng-repeat="item in configItems track by item.id">
-            <umb-radiobutton name="{{model.alias}}" value="{{item.value}}" model="model.value" text="{{item.value}}" on-change="vm.change(model, value)" required="model.validation.mandatory && model.value == ''"></umb-radiobutton>
+        <li ng-repeat="item in vm.viewItems track by item.key">
+            <umb-radiobutton name="{{model.alias}}" value="{{item.value}}" model="model.value" text="{{item.value}}" required="model.validation.mandatory && model.value == ''"></umb-radiobutton>
         </li>
     </ul>
 </div>

From ec2e27dd07fb9439f358fc0033f3610551c501dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Thu, 19 Sep 2019 08:21:06 +0200
Subject: [PATCH 653/776] img configs for tiny

---
 .../src/common/services/tinymce.service.js                 | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 0832dc0e15..f0084e1f64 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -205,7 +205,7 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
 
         editor.on('SetContent', function (e) {
             
-            console.log("setcontent", e)
+            console.log("> setcontent", e)
             
             var content = e.content;
 
@@ -357,10 +357,13 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                 };
                 
                 //if (tinyMceConfig.pasteTidying) {
+                    plugins.splice(plugins.indexOf("paste"), 1);
                     plugins.push("umbpaste");
                     
+                    console.log("plugins:", plugins)
+                    
                     // We keep spans here, cause removing spans here also removes b-tags inside of them, instead we strip them out later.
-                    var validElements = "-strong/b,-em/i,-u,-span,-p,-ol,-ul,-li,-p/div,-a[href|name],sub,sup,strike,br,del,table[width],tr,td[colspan|rowspan|width],th[colspan|rowspan|width],thead,tfoot,tbody,img,ul,ol,li"
+                    var validElements = "-strong/b,-em/i,-u,-span,-p,-ol,-ul,-li,-p/div,-a[href|name],sub,sup,strike,br,del,table[width],tr,td[colspan|rowspan|width],th[colspan|rowspan|width],thead,tfoot,tbody,img[src|alt|width|height],ul,ol,li"
                     
                     // add valid elements from styleFormats.
                     var style, i = 0;

From f4e61ddf23fa37f37067e9ccee12962a59170bb9 Mon Sep 17 00:00:00 2001
From: Benjamin Carleski <benjamin@proworks.com>
Date: Wed, 18 Sep 2019 11:17:47 -0700
Subject: [PATCH 654/776] Add missing FROM clause

---
 .../Upgrade/V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs
index 4802750f4b..1956876402 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs
@@ -72,6 +72,7 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
                             {
                                 var sqlNodeData = Sql()
                                     .Select<NodeDto>()
+                                    .From<NodeDto>()
                                     .Where<NodeDto>(x => x.NodeId == intId);
 
                                 var node = Database.Fetch<NodeDto>(sqlNodeData).FirstOrDefault();

From 3be2a98bd3142b639f14b7f43eaf184322c69853 Mon Sep 17 00:00:00 2001
From: Benjamin Carleski <benjamin@proworks.com>
Date: Wed, 18 Sep 2019 11:17:47 -0700
Subject: [PATCH 655/776] Add missing FROM clause

(cherry picked from commit f4e61ddf23fa37f37067e9ccee12962a59170bb9)
---
 .../Upgrade/V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs
index 4802750f4b..1956876402 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs
@@ -72,6 +72,7 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
                             {
                                 var sqlNodeData = Sql()
                                     .Select<NodeDto>()
+                                    .From<NodeDto>()
                                     .Where<NodeDto>(x => x.NodeId == intId);
 
                                 var node = Database.Fetch<NodeDto>(sqlNodeData).FirstOrDefault();

From f8b248928844b810ec3bac5b7b415cb80ba9384c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Thu, 19 Sep 2019 09:18:11 +0200
Subject: [PATCH 656/776] clean out image tests

---
 src/Umbraco.Web.UI.Client/gulp/tasks/watch.js |  7 --
 .../src/common/services/tinymce.service.js    | 66 +++++++------------
 2 files changed, 24 insertions(+), 49 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/gulp/tasks/watch.js b/src/Umbraco.Web.UI.Client/gulp/tasks/watch.js
index 5c2fa2e5c8..9077cc693e 100644
--- a/src/Umbraco.Web.UI.Client/gulp/tasks/watch.js
+++ b/src/Umbraco.Web.UI.Client/gulp/tasks/watch.js
@@ -54,12 +54,5 @@ gulp.task('watch', function () {
         .pipe(gulp.dest(config.root + config.targets.js))
     );
     
-    
-    //watch all lib files that will not be merged - copy single file changes
-    stream.add(
-        watch(config.sources.globs.lib, { interval: watchInterval })
-        .pipe(gulp.dest(config.root + config.targets.lib))
-    );
-
     return stream;
 });
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index f0084e1f64..211e69abb0 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -205,8 +205,6 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
 
         editor.on('SetContent', function (e) {
             
-            console.log("> setcontent", e)
-            
             var content = e.content;
 
             // Upload BLOB images (dragged/pasted ones)
@@ -238,11 +236,7 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
     
     function cleanupPasteData(plugin, args) {
         
-        console.log("cleanupPasteData", args.content);
-        
         // Remove spans
-        //var spanRemoveRegex = new RegExp("</?span[^>]*>([^</span]*)</span([^>]*)", "g");
-        //args.content = args.content.replace(spanRemoveRegex, "$1");
         args.content = args.content.replace(/<\s*span[^>]*>(.*?)<\s*\/\s*span>/g, "$1");
         
         // Convert b to strong.
@@ -251,7 +245,6 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
         // convert i to em
         args.content = args.content.replace(/<\s*i([^>]*)>(.*?)<\s*\/\s*i([^>]*)>/g, "<em$1>$2</em$3>");
         
-        console.log(args.content);
         
     }
 
@@ -283,7 +276,6 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                 //plugins that must always be active
                 plugins.push("autoresize");
                 plugins.push("noneditable");
-                plugins.push("image");
 
                 var modeTheme = '';
                 var modeInline = false;
@@ -356,43 +348,33 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                     init_instance_callback: initEvents
                 };
                 
-                //if (tinyMceConfig.pasteTidying) {
-                    plugins.splice(plugins.indexOf("paste"), 1);
-                    plugins.push("umbpaste");
-                    
-                    console.log("plugins:", plugins)
-                    
-                    // We keep spans here, cause removing spans here also removes b-tags inside of them, instead we strip them out later.
-                    var validElements = "-strong/b,-em/i,-u,-span,-p,-ol,-ul,-li,-p/div,-a[href|name],sub,sup,strike,br,del,table[width],tr,td[colspan|rowspan|width],th[colspan|rowspan|width],thead,tfoot,tbody,img[src|alt|width|height],ul,ol,li"
-                    
-                    // add valid elements from styleFormats.
-                    var style, i = 0;
-                    for(; i < styles.styleFormats.length; i++) {
-                        style = styles.styleFormats[i];
-                        if(style.block) {
-                            validElements += "," + style.block;
-                        }
+                // We keep spans here, cause removing spans here also removes b-tags inside of them, instead we strip them out later.
+                var validElements = "-strong/b,-em/i,-u,-span,-p,-ol,-ul,-li,-p/div,-a[href|name],sub,sup,strike,br,del,table[width],tr,td[colspan|rowspan|width],th[colspan|rowspan|width],thead,tfoot,tbody,img[src|alt|width|height],ul,ol,li"
+                
+                // add valid elements from styleFormats.
+                var style, i = 0;
+                for(; i < styles.styleFormats.length; i++) {
+                    style = styles.styleFormats[i];
+                    if(style.block) {
+                        validElements += "," + style.block;
                     }
+                }
+                
+                var pasteConfig = {
                     
-                    var pasteConfig = {
-                        
-                        //paste_block_drop: false,
-                        //paste_filter_drop: true,
-                        //paste_enable_default_filters: false, // to avoid stripping img tags from word.
-                        
-                        paste_remove_styles: true,
-                        paste_text_linebreaktype: true,
-                        paste_strip_class_attributes: "all",
-                        paste_retain_style_properties: "all",
-                        
-                        paste_word_valid_elements: validElements,
-                        
-                        paste_preprocess: cleanupPasteData
-                        
-                    };
+                    paste_remove_styles: true,
+                    paste_text_linebreaktype: true,
+                    paste_strip_class_attributes: "all",
+                    paste_retain_style_properties: "all",
                     
-                    angular.extend(config, pasteConfig);
-                //}
+                    paste_word_valid_elements: validElements,
+                    
+                    paste_preprocess: cleanupPasteData
+                    
+                };
+                
+                angular.extend(config, pasteConfig);
+                
                 
                 if (tinyMceConfig.customConfig) {
 

From 380d876f7ec22b53b479fdc0d49cdb1a7df1a4dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Thu, 19 Sep 2019 09:19:20 +0200
Subject: [PATCH 657/776] remove test of umb-paste-plugin

---
 .../lib/tinymce/plugins/umbpaste/index.js     |    7 -
 .../tinymce/plugins/umbpaste/plugin.min.js    | 1867 -----------------
 2 files changed, 1874 deletions(-)
 delete mode 100644 src/Umbraco.Web.UI.Client/lib/tinymce/plugins/umbpaste/index.js
 delete mode 100644 src/Umbraco.Web.UI.Client/lib/tinymce/plugins/umbpaste/plugin.min.js

diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/plugins/umbpaste/index.js b/src/Umbraco.Web.UI.Client/lib/tinymce/plugins/umbpaste/index.js
deleted file mode 100644
index b54d9d1384..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/plugins/umbpaste/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// Exports the "paste" plugin for usage with module loaders
-// Usage:
-//   CommonJS:
-//     require('tinymce/plugins/paste')
-//   ES2015:
-//     import 'tinymce/plugins/paste'
-require('./plugin.js');
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/plugins/umbpaste/plugin.min.js b/src/Umbraco.Web.UI.Client/lib/tinymce/plugins/umbpaste/plugin.min.js
deleted file mode 100644
index e197012bfa..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/plugins/umbpaste/plugin.min.js
+++ /dev/null
@@ -1,1867 +0,0 @@
-(function () {
-var paste = (function () {
-    'use strict';
-    
-    var Cell = function (initial) {
-      var value = initial;
-      var get = function () {
-        return value;
-      };
-      var set = function (v) {
-        value = v;
-      };
-      var clone = function () {
-        return Cell(get());
-      };
-      return {
-        get: get,
-        set: set,
-        clone: clone
-      };
-    };
-
-    var global = tinymce.util.Tools.resolve('tinymce.PluginManager');
-
-    var hasProPlugin = function (editor) {
-      if (/(^|[ ,])powerpaste([, ]|$)/.test(editor.settings.plugins) && global.get('powerpaste')) {
-        if (typeof window.console !== 'undefined' && window.console.log) {
-          window.console.log('PowerPaste is incompatible with Paste plugin! Remove \'umbpaste\' from the \'plugins\' option.');
-        }
-        return true;
-      } else {
-        return false;
-      }
-    };
-    var DetectProPlugin = { hasProPlugin: hasProPlugin };
-
-    var get = function (clipboard, quirks) {
-      return {
-        clipboard: clipboard,
-        quirks: quirks
-      };
-    };
-    var Api = { get: get };
-
-    var firePastePreProcess = function (editor, html, internal, isWordHtml) {
-      return editor.fire('PastePreProcess', {
-        content: html,
-        internal: internal,
-        wordContent: isWordHtml
-      });
-    };
-    var firePastePostProcess = function (editor, node, internal, isWordHtml) {
-      return editor.fire('PastePostProcess', {
-        node: node,
-        internal: internal,
-        wordContent: isWordHtml
-      });
-    };
-    var firePastePlainTextToggle = function (editor, state) {
-      return editor.fire('PastePlainTextToggle', { state: state });
-    };
-    var firePaste = function (editor, ieFake) {
-      return editor.fire('paste', { ieFake: ieFake });
-    };
-    var Events = {
-      firePastePreProcess: firePastePreProcess,
-      firePastePostProcess: firePastePostProcess,
-      firePastePlainTextToggle: firePastePlainTextToggle,
-      firePaste: firePaste
-    };
-
-    var shouldPlainTextInform = function (editor) {
-      return editor.getParam('paste_plaintext_inform', true);
-    };
-    var shouldBlockDrop = function (editor) {
-      return editor.getParam('paste_block_drop', false);
-    };
-    var shouldPasteDataImages = function (editor) {
-      return editor.getParam('paste_data_images', false);
-    };
-    var shouldFilterDrop = function (editor) {
-      return editor.getParam('paste_filter_drop', true);
-    };
-    var getPreProcess = function (editor) {
-      return editor.getParam('paste_preprocess');
-    };
-    var getPostProcess = function (editor) {
-      return editor.getParam('paste_postprocess');
-    };
-    var getWebkitStyles = function (editor) {
-      return editor.getParam('paste_webkit_styles');
-    };
-    var shouldRemoveWebKitStyles = function (editor) {
-      return editor.getParam('paste_remove_styles_if_webkit', true);
-    };
-    var shouldMergeFormats = function (editor) {
-      return editor.getParam('paste_merge_formats', true);
-    };
-    var isSmartPasteEnabled = function (editor) {
-      return editor.getParam('smart_paste', true);
-    };
-    var isPasteAsTextEnabled = function (editor) {
-      return editor.getParam('paste_as_text', false);
-    };
-    var getRetainStyleProps = function (editor) {
-      return editor.getParam('paste_retain_style_properties');
-    };
-    var getWordValidElements = function (editor) {
-      var defaultValidElements = '-strong/b,-em/i,-u,-span,-p,-ol,-ul,-li,-h1,-h2,-h3,-h4,-h5,-h6,' + '-p/div,-a[href|name],sub,sup,strike,br,del,table[width],tr,' + 'td[colspan|rowspan|width],th[colspan|rowspan|width],thead,tfoot,tbody';
-      return editor.getParam('paste_word_valid_elements', defaultValidElements);
-    };
-    var shouldConvertWordFakeLists = function (editor) {
-      return editor.getParam('paste_convert_word_fake_lists', true);
-    };
-    var shouldUseDefaultFilters = function (editor) {
-      return editor.getParam('paste_enable_default_filters', true);
-    };
-    var Settings = {
-      shouldPlainTextInform: shouldPlainTextInform,
-      shouldBlockDrop: shouldBlockDrop,
-      shouldPasteDataImages: shouldPasteDataImages,
-      shouldFilterDrop: shouldFilterDrop,
-      getPreProcess: getPreProcess,
-      getPostProcess: getPostProcess,
-      getWebkitStyles: getWebkitStyles,
-      shouldRemoveWebKitStyles: shouldRemoveWebKitStyles,
-      shouldMergeFormats: shouldMergeFormats,
-      isSmartPasteEnabled: isSmartPasteEnabled,
-      isPasteAsTextEnabled: isPasteAsTextEnabled,
-      getRetainStyleProps: getRetainStyleProps,
-      getWordValidElements: getWordValidElements,
-      shouldConvertWordFakeLists: shouldConvertWordFakeLists,
-      shouldUseDefaultFilters: shouldUseDefaultFilters
-    };
-
-    var shouldInformUserAboutPlainText = function (editor, userIsInformedState) {
-      return userIsInformedState.get() === false && Settings.shouldPlainTextInform(editor);
-    };
-    var displayNotification = function (editor, message) {
-      editor.notificationManager.open({
-        text: editor.translate(message),
-        type: 'info'
-      });
-    };
-    var togglePlainTextPaste = function (editor, clipboard, userIsInformedState) {
-      if (clipboard.pasteFormat.get() === 'text') {
-        clipboard.pasteFormat.set('html');
-        Events.firePastePlainTextToggle(editor, false);
-      } else {
-        clipboard.pasteFormat.set('text');
-        Events.firePastePlainTextToggle(editor, true);
-        if (shouldInformUserAboutPlainText(editor, userIsInformedState)) {
-          displayNotification(editor, 'Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.');
-          userIsInformedState.set(true);
-        }
-      }
-      editor.focus();
-    };
-    var Actions = { togglePlainTextPaste: togglePlainTextPaste };
-
-    var register = function (editor, clipboard, userIsInformedState) {
-      editor.addCommand('mceTogglePlainTextPaste', function () {
-        Actions.togglePlainTextPaste(editor, clipboard, userIsInformedState);
-      });
-      editor.addCommand('mceInsertClipboardContent', function (ui, value) {
-        if (value.content) {
-          clipboard.pasteHtml(value.content, value.internal);
-        }
-        if (value.text) {
-          clipboard.pasteText(value.text);
-        }
-      });
-    };
-    var Commands = { register: register };
-
-    var global$1 = tinymce.util.Tools.resolve('tinymce.Env');
-
-    var global$2 = tinymce.util.Tools.resolve('tinymce.util.Delay');
-
-    var global$3 = tinymce.util.Tools.resolve('tinymce.util.Tools');
-
-    var global$4 = tinymce.util.Tools.resolve('tinymce.util.VK');
-
-    var internalMimeType = 'x-tinymce/html';
-    var internalMark = '<!-- ' + internalMimeType + ' -->';
-    var mark = function (html) {
-      return internalMark + html;
-    };
-    var unmark = function (html) {
-      return html.replace(internalMark, '');
-    };
-    var isMarked = function (html) {
-      return html.indexOf(internalMark) !== -1;
-    };
-    var InternalHtml = {
-      mark: mark,
-      unmark: unmark,
-      isMarked: isMarked,
-      internalHtmlMime: function () {
-        return internalMimeType;
-      }
-    };
-
-    var global$5 = tinymce.util.Tools.resolve('tinymce.html.Entities');
-
-    var isPlainText = function (text) {
-      return !/<(?:\/?(?!(?:div|p|br|span)>)\w+|(?:(?!(?:span style="white-space:\s?pre;?">)|br\s?\/>))\w+\s[^>]+)>/i.test(text);
-    };
-    var toBRs = function (text) {
-      return text.replace(/\r?\n/g, '<br>');
-    };
-    var openContainer = function (rootTag, rootAttrs) {
-      var key;
-      var attrs = [];
-      var tag = '<' + rootTag;
-      if (typeof rootAttrs === 'object') {
-        for (key in rootAttrs) {
-          if (rootAttrs.hasOwnProperty(key)) {
-            attrs.push(key + '="' + global$5.encodeAllRaw(rootAttrs[key]) + '"');
-          }
-        }
-        if (attrs.length) {
-          tag += ' ' + attrs.join(' ');
-        }
-      }
-      return tag + '>';
-    };
-    var toBlockElements = function (text, rootTag, rootAttrs) {
-      var blocks = text.split(/\n\n/);
-      var tagOpen = openContainer(rootTag, rootAttrs);
-      var tagClose = '</' + rootTag + '>';
-      var paragraphs = global$3.map(blocks, function (p) {
-        return p.split(/\n/).join('<br />');
-      });
-      var stitch = function (p) {
-        return tagOpen + p + tagClose;
-      };
-      return paragraphs.length === 1 ? paragraphs[0] : global$3.map(paragraphs, stitch).join('');
-    };
-    var convert = function (text, rootTag, rootAttrs) {
-      return rootTag ? toBlockElements(text, rootTag, rootAttrs) : toBRs(text);
-    };
-    var Newlines = {
-      isPlainText: isPlainText,
-      convert: convert,
-      toBRs: toBRs,
-      toBlockElements: toBlockElements
-    };
-
-    var global$6 = tinymce.util.Tools.resolve('tinymce.html.DomParser');
-
-    var global$7 = tinymce.util.Tools.resolve('tinymce.html.Node');
-
-    var global$8 = tinymce.util.Tools.resolve('tinymce.html.Schema');
-
-    var global$9 = tinymce.util.Tools.resolve('tinymce.html.Serializer');
-
-    function filter(content, items) {
-      global$3.each(items, function (v) {
-        if (v.constructor === RegExp) {
-          content = content.replace(v, '');
-        } else {
-          content = content.replace(v[0], v[1]);
-        }
-      });
-      return content;
-    }
-    function innerText(html) {
-      var schema = global$8();
-      var domParser = global$6({}, schema);
-      var text = '';
-      var shortEndedElements = schema.getShortEndedElements();
-      var ignoreElements = global$3.makeMap('script noscript style textarea video audio iframe object', ' ');
-      var blockElements = schema.getBlockElements();
-      function walk(node) {
-        var name$$1 = node.name, currentNode = node;
-        if (name$$1 === 'br') {
-          text += '\n';
-          return;
-        }
-        if (name$$1 === 'wbr') {
-          return;
-        }
-        if (shortEndedElements[name$$1]) {
-          text += ' ';
-        }
-        if (ignoreElements[name$$1]) {
-          text += ' ';
-          return;
-        }
-        if (node.type === 3) {
-          text += node.value;
-        }
-        if (!node.shortEnded) {
-          if (node = node.firstChild) {
-            do {
-              walk(node);
-            } while (node = node.next);
-          }
-        }
-        if (blockElements[name$$1] && currentNode.next) {
-          text += '\n';
-          if (name$$1 === 'p') {
-            text += '\n';
-          }
-        }
-      }
-      html = filter(html, [/<!\[[^\]]+\]>/g]);
-      walk(domParser.parse(html));
-      return text;
-    }
-    function trimHtml(html) {
-      function trimSpaces(all, s1, s2) {
-        if (!s1 && !s2) {
-          return ' ';
-        }
-        return '\xA0';
-      }
-      html = filter(html, [
-        /^[\s\S]*<body[^>]*>\s*|\s*<\/body[^>]*>[\s\S]*$/ig,
-        /<!--StartFragment-->|<!--EndFragment-->/g,
-        [
-          /( ?)<span class="Apple-converted-space">\u00a0<\/span>( ?)/g,
-          trimSpaces
-        ],
-        /<br class="Apple-interchange-newline">/g,
-        /<br>$/i
-      ]);
-      return html;
-    }
-    function createIdGenerator(prefix) {
-      var count = 0;
-      return function () {
-        return prefix + count++;
-      };
-    }
-    var isMsEdge = function () {
-      return navigator.userAgent.indexOf(' Edge/') !== -1;
-    };
-    var Utils = {
-      filter: filter,
-      innerText: innerText,
-      trimHtml: trimHtml,
-      createIdGenerator: createIdGenerator,
-      isMsEdge: isMsEdge
-    };
-
-    function isWordContent(content) {
-      return /<font face="Times New Roman"|class="?Mso|style="[^"]*\bmso-|style='[^'']*\bmso-|w:WordDocument/i.test(content) || /class="OutlineElement/.test(content) || /id="?docs\-internal\-guid\-/.test(content);
-    }
-    function isNumericList(text) {
-      var found, patterns;
-      patterns = [
-        /^[IVXLMCD]{1,2}\.[ \u00a0]/,
-        /^[ivxlmcd]{1,2}\.[ \u00a0]/,
-        /^[a-z]{1,2}[\.\)][ \u00a0]/,
-        /^[A-Z]{1,2}[\.\)][ \u00a0]/,
-        /^[0-9]+\.[ \u00a0]/,
-        /^[\u3007\u4e00\u4e8c\u4e09\u56db\u4e94\u516d\u4e03\u516b\u4e5d]+\.[ \u00a0]/,
-        /^[\u58f1\u5f10\u53c2\u56db\u4f0d\u516d\u4e03\u516b\u4e5d\u62fe]+\.[ \u00a0]/
-      ];
-      text = text.replace(/^[\u00a0 ]+/, '');
-      global$3.each(patterns, function (pattern) {
-        if (pattern.test(text)) {
-          found = true;
-          return false;
-        }
-      });
-      return found;
-    }
-    function isBulletList(text) {
-      return /^[\s\u00a0]*[\u2022\u00b7\u00a7\u25CF]\s*/.test(text);
-    }
-    function convertFakeListsToProperLists(node) {
-      var currentListNode, prevListNode, lastLevel = 1;
-      function getText(node) {
-        var txt = '';
-        if (node.type === 3) {
-          return node.value;
-        }
-        if (node = node.firstChild) {
-          do {
-            txt += getText(node);
-          } while (node = node.next);
-        }
-        return txt;
-      }
-      function trimListStart(node, regExp) {
-        if (node.type === 3) {
-          if (regExp.test(node.value)) {
-            node.value = node.value.replace(regExp, '');
-            return false;
-          }
-        }
-        if (node = node.firstChild) {
-          do {
-            if (!trimListStart(node, regExp)) {
-              return false;
-            }
-          } while (node = node.next);
-        }
-        return true;
-      }
-      function removeIgnoredNodes(node) {
-        if (node._listIgnore) {
-          node.remove();
-          return;
-        }
-        if (node = node.firstChild) {
-          do {
-            removeIgnoredNodes(node);
-          } while (node = node.next);
-        }
-      }
-      function convertParagraphToLi(paragraphNode, listName, start) {
-        var level = paragraphNode._listLevel || lastLevel;
-        if (level !== lastLevel) {
-          if (level < lastLevel) {
-            if (currentListNode) {
-              currentListNode = currentListNode.parent.parent;
-            }
-          } else {
-            prevListNode = currentListNode;
-            currentListNode = null;
-          }
-        }
-        if (!currentListNode || currentListNode.name !== listName) {
-          prevListNode = prevListNode || currentListNode;
-          currentListNode = new global$7(listName, 1);
-          if (start > 1) {
-            currentListNode.attr('start', '' + start);
-          }
-          paragraphNode.wrap(currentListNode);
-        } else {
-          currentListNode.append(paragraphNode);
-        }
-        paragraphNode.name = 'li';
-        if (level > lastLevel && prevListNode) {
-          prevListNode.lastChild.append(currentListNode);
-        }
-        lastLevel = level;
-        removeIgnoredNodes(paragraphNode);
-        trimListStart(paragraphNode, /^\u00a0+/);
-        trimListStart(paragraphNode, /^\s*([\u2022\u00b7\u00a7\u25CF]|\w+\.)/);
-        trimListStart(paragraphNode, /^\u00a0+/);
-      }
-      var elements = [];
-      var child = node.firstChild;
-      while (typeof child !== 'undefined' && child !== null) {
-        elements.push(child);
-        child = child.walk();
-        if (child !== null) {
-          while (typeof child !== 'undefined' && child.parent !== node) {
-            child = child.walk();
-          }
-        }
-      }
-      for (var i = 0; i < elements.length; i++) {
-        node = elements[i];
-        if (node.name === 'p' && node.firstChild) {
-          var nodeText = getText(node);
-          if (isBulletList(nodeText)) {
-            convertParagraphToLi(node, 'ul');
-            continue;
-          }
-          if (isNumericList(nodeText)) {
-            var matches = /([0-9]+)\./.exec(nodeText);
-            var start = 1;
-            if (matches) {
-              start = parseInt(matches[1], 10);
-            }
-            convertParagraphToLi(node, 'ol', start);
-            continue;
-          }
-          if (node._listLevel) {
-            convertParagraphToLi(node, 'ul', 1);
-            continue;
-          }
-          currentListNode = null;
-        } else {
-          prevListNode = currentListNode;
-          currentListNode = null;
-        }
-      }
-    }
-    function filterStyles(editor, validStyles, node, styleValue) {
-      var outputStyles = {}, matches;
-      var styles = editor.dom.parseStyle(styleValue);
-      global$3.each(styles, function (value, name) {
-        switch (name) {
-        case 'mso-list':
-          matches = /\w+ \w+([0-9]+)/i.exec(styleValue);
-          if (matches) {
-            node._listLevel = parseInt(matches[1], 10);
-          }
-          if (/Ignore/i.test(value) && node.firstChild) {
-            node._listIgnore = true;
-            node.firstChild._listIgnore = true;
-          }
-          break;
-        case 'horiz-align':
-          name = 'text-align';
-          break;
-        case 'vert-align':
-          name = 'vertical-align';
-          break;
-        case 'font-color':
-        case 'mso-foreground':
-          name = 'color';
-          break;
-        case 'mso-background':
-        case 'mso-highlight':
-          name = 'background';
-          break;
-        case 'font-weight':
-        case 'font-style':
-          if (value !== 'normal') {
-            outputStyles[name] = value;
-          }
-          return;
-        case 'mso-element':
-          if (/^(comment|comment-list)$/i.test(value)) {
-            node.remove();
-            return;
-          }
-          break;
-        }
-        if (name.indexOf('mso-comment') === 0) {
-          node.remove();
-          return;
-        }
-        if (name.indexOf('mso-') === 0) {
-          return;
-        }
-        if (Settings.getRetainStyleProps(editor) === 'all' || validStyles && validStyles[name]) {
-          outputStyles[name] = value;
-        }
-      });
-      if (/(bold)/i.test(outputStyles['font-weight'])) {
-        delete outputStyles['font-weight'];
-        node.wrap(new global$7('b', 1));
-      }
-      if (/(italic)/i.test(outputStyles['font-style'])) {
-        delete outputStyles['font-style'];
-        node.wrap(new global$7('i', 1));
-      }
-      outputStyles = editor.dom.serializeStyle(outputStyles, node.name);
-      if (outputStyles) {
-        return outputStyles;
-      }
-      return null;
-    }
-    var filterWordContent = function (editor, content) {
-        
-        console.log("filterWordContent 3");
-        console.log(content);
-        
-        content = content.replace(/\<!\[(if !vml|endif)\]\>/g, '');// removes <![if !vml]> & <![endif]>
-        
-        
-      var retainStyleProperties, validStyles;
-      retainStyleProperties = Settings.getRetainStyleProps(editor);
-      if (retainStyleProperties) {
-        validStyles = global$3.makeMap(retainStyleProperties.split(/[, ]/));
-      }
-      
-      content = Utils.filter(content, [
-        /<br class="?Apple-interchange-newline"?>/gi,
-        /<b[^>]+id="?docs-internal-[^>]*>/gi,
-        /<!--[\s\S]+?-->/gi,
-        /<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|img|meta|link|style|\w:\w+)(?=[\s\/>]))[^>]*>/gi,
-        [
-          /<(\/?)s>/gi,
-          '<$1strike>'
-        ],
-        [
-          /&nbsp;/gi,
-          '\xA0'
-        ],
-        [
-          /<span\s+style\s*=\s*"\s*mso-spacerun\s*:\s*yes\s*;?\s*"\s*>([\s\u00a0]*)<\/span>/gi,
-          function (str, spaces) {
-            return spaces.length > 0 ? spaces.replace(/./, ' ').slice(Math.floor(spaces.length / 2)).split('').join('\xA0') : '';
-          }
-        ]
-      ]);
-      
-      var validElements = Settings.getWordValidElements(editor);
-      var schema = global$8({
-        valid_elements: validElements,
-        valid_children: '-li[p]'
-      });
-      global$3.each(schema.elements, function (rule) {
-        if (!rule.attributes.class) {
-          rule.attributes.class = {};
-          rule.attributesOrder.push('class');
-        }
-        if (!rule.attributes.style) {
-          rule.attributes.style = {};
-          rule.attributesOrder.push('style');
-        }
-      });
-      var domParser = global$6({}, schema);
-      domParser.addAttributeFilter('style', function (nodes) {
-        var i = nodes.length, node;
-        while (i--) {
-          node = nodes[i];
-          node.attr('style', filterStyles(editor, validStyles, node, node.attr('style')));
-          if (node.name === 'span' && node.parent && !node.attributes.length) {
-            node.unwrap();
-          }
-        }
-      });
-      domParser.addAttributeFilter('class', function (nodes) {
-        var i = nodes.length, node, className;
-        while (i--) {
-          node = nodes[i];
-          className = node.attr('class');
-          if (/^(MsoCommentReference|MsoCommentText|msoDel)$/i.test(className)) {
-            node.remove();
-          }
-          node.attr('class', null);
-        }
-      });
-      domParser.addNodeFilter('del', function (nodes) {
-        var i = nodes.length;
-        while (i--) {
-          nodes[i].remove();
-        }
-      });
-      domParser.addNodeFilter('a', function (nodes) {
-        var i = nodes.length, node, href, name;
-        while (i--) {
-          node = nodes[i];
-          href = node.attr('href');
-          name = node.attr('name');
-          if (href && href.indexOf('#_msocom_') !== -1) {
-            node.remove();
-            continue;
-          }
-          if (href && href.indexOf('file://') === 0) {
-            href = href.split('#')[1];
-            if (href) {
-              href = '#' + href;
-            }
-          }
-          if (!href && !name) {
-            node.unwrap();
-          } else {
-            if (name && !/^_?(?:toc|edn|ftn)/i.test(name)) {
-              node.unwrap();
-              continue;
-            }
-            node.attr({
-              href: href,
-              name: name
-            });
-          }
-        }
-      });
-      var rootNode = domParser.parse(content);
-      if (Settings.shouldConvertWordFakeLists(editor)) {
-        convertFakeListsToProperLists(rootNode);
-      }
-      content = global$9({ validate: editor.settings.validate }, schema).serialize(rootNode);
-      return content;
-    };
-    var preProcess = function (editor, content) {
-      return Settings.shouldUseDefaultFilters(editor) ? filterWordContent(editor, content) : content;
-    };
-    var WordFilter = {
-      preProcess: preProcess,
-      isWordContent: isWordContent
-    };
-
-    var processResult = function (content, cancelled) {
-      return {
-        content: content,
-        cancelled: cancelled
-      };
-    };
-    var postProcessFilter = function (editor, html, internal, isWordHtml) {
-      var tempBody = editor.dom.create('div', { style: 'display:none' }, html);
-      var postProcessArgs = Events.firePastePostProcess(editor, tempBody, internal, isWordHtml);
-      return processResult(postProcessArgs.node.innerHTML, postProcessArgs.isDefaultPrevented());
-    };
-    var filterContent = function (editor, content, internal, isWordHtml) {
-      var preProcessArgs = Events.firePastePreProcess(editor, content, internal, isWordHtml);
-      if (editor.hasEventListeners('PastePostProcess') && !preProcessArgs.isDefaultPrevented()) {
-        return postProcessFilter(editor, preProcessArgs.content, internal, isWordHtml);
-      } else {
-        return processResult(preProcessArgs.content, preProcessArgs.isDefaultPrevented());
-      }
-    };
-    var process = function (editor, html, internal) {
-      var isWordHtml = WordFilter.isWordContent(html);
-      var content = isWordHtml ? WordFilter.preProcess(editor, html) : html;
-      return filterContent(editor, content, internal, isWordHtml);
-    };
-    var ProcessFilters = { process: process };
-
-    var removeMeta = function (editor, html) {
-      var body = editor.dom.create('body', {}, html);
-      global$3.each(body.querySelectorAll('meta'), function (elm) {
-        return elm.parentNode.removeChild(elm);
-      });
-      return body.innerHTML;
-    };
-    var pasteHtml = function (editor, html) {
-      editor.insertContent(removeMeta(editor, html), {
-        merge: Settings.shouldMergeFormats(editor),
-        paste: true
-      });
-      return true;
-    };
-    var isAbsoluteUrl = function (url) {
-      return /^https?:\/\/[\w\?\-\/+=.&%@~#]+$/i.test(url);
-    };
-    var isImageUrl = function (url) {
-      return isAbsoluteUrl(url) && /.(gif|jpe?g|png)$/.test(url);
-    };
-    var createImage = function (editor, url, pasteHtmlFn) {
-      editor.undoManager.extra(function () {
-        pasteHtmlFn(editor, url);
-      }, function () {
-        editor.insertContent('<img src="' + url + '">');
-      });
-      return true;
-    };
-    var createLink = function (editor, url, pasteHtmlFn) {
-      editor.undoManager.extra(function () {
-        pasteHtmlFn(editor, url);
-      }, function () {
-        editor.execCommand('mceInsertLink', false, url);
-      });
-      return true;
-    };
-    var linkSelection = function (editor, html, pasteHtmlFn) {
-      return editor.selection.isCollapsed() === false && isAbsoluteUrl(html) ? createLink(editor, html, pasteHtmlFn) : false;
-    };
-    var insertImage = function (editor, html, pasteHtmlFn) {
-      return isImageUrl(html) ? createImage(editor, html, pasteHtmlFn) : false;
-    };
-    var smartInsertContent = function (editor, html) {
-      global$3.each([
-        linkSelection,
-        insertImage,
-        pasteHtml
-      ], function (action) {
-        return action(editor, html, pasteHtml) !== true;
-      });
-    };
-    var insertContent = function (editor, html) {
-      if (Settings.isSmartPasteEnabled(editor) === false) {
-        pasteHtml(editor, html);
-      } else {
-        smartInsertContent(editor, html);
-      }
-    };
-    var SmartPaste = {
-      isImageUrl: isImageUrl,
-      isAbsoluteUrl: isAbsoluteUrl,
-      insertContent: insertContent
-    };
-
-    var constant = function (value) {
-      return function () {
-        return value;
-      };
-    };
-    function curry(fn) {
-      var initialArgs = [];
-      for (var _i = 1; _i < arguments.length; _i++) {
-        initialArgs[_i - 1] = arguments[_i];
-      }
-      return function () {
-        var restArgs = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-          restArgs[_i] = arguments[_i];
-        }
-        var all = initialArgs.concat(restArgs);
-        return fn.apply(null, all);
-      };
-    }
-    var never = constant(false);
-    var always = constant(true);
-
-    var never$1 = never;
-    var always$1 = always;
-    var none = function () {
-      return NONE;
-    };
-    var NONE = function () {
-      var eq = function (o) {
-        return o.isNone();
-      };
-      var call$$1 = function (thunk) {
-        return thunk();
-      };
-      var id = function (n) {
-        return n;
-      };
-      var noop$$1 = function () {
-      };
-      var nul = function () {
-        return null;
-      };
-      var undef = function () {
-        return undefined;
-      };
-      var me = {
-        fold: function (n, s) {
-          return n();
-        },
-        is: never$1,
-        isSome: never$1,
-        isNone: always$1,
-        getOr: id,
-        getOrThunk: call$$1,
-        getOrDie: function (msg) {
-          throw new Error(msg || 'error: getOrDie called on none.');
-        },
-        getOrNull: nul,
-        getOrUndefined: undef,
-        or: id,
-        orThunk: call$$1,
-        map: none,
-        ap: none,
-        each: noop$$1,
-        bind: none,
-        flatten: none,
-        exists: never$1,
-        forall: always$1,
-        filter: none,
-        equals: eq,
-        equals_: eq,
-        toArray: function () {
-          return [];
-        },
-        toString: constant('none()')
-      };
-      if (Object.freeze)
-        Object.freeze(me);
-      return me;
-    }();
-    var some = function (a) {
-      var constant_a = function () {
-        return a;
-      };
-      var self = function () {
-        return me;
-      };
-      var map = function (f) {
-        return some(f(a));
-      };
-      var bind = function (f) {
-        return f(a);
-      };
-      var me = {
-        fold: function (n, s) {
-          return s(a);
-        },
-        is: function (v) {
-          return a === v;
-        },
-        isSome: always$1,
-        isNone: never$1,
-        getOr: constant_a,
-        getOrThunk: constant_a,
-        getOrDie: constant_a,
-        getOrNull: constant_a,
-        getOrUndefined: constant_a,
-        or: self,
-        orThunk: self,
-        map: map,
-        ap: function (optfab) {
-          return optfab.fold(none, function (fab) {
-            return some(fab(a));
-          });
-        },
-        each: function (f) {
-          f(a);
-        },
-        bind: bind,
-        flatten: constant_a,
-        exists: bind,
-        forall: bind,
-        filter: function (f) {
-          return f(a) ? me : NONE;
-        },
-        equals: function (o) {
-          return o.is(a);
-        },
-        equals_: function (o, elementEq) {
-          return o.fold(never$1, function (b) {
-            return elementEq(a, b);
-          });
-        },
-        toArray: function () {
-          return [a];
-        },
-        toString: function () {
-          return 'some(' + a + ')';
-        }
-      };
-      return me;
-    };
-    var from = function (value) {
-      return value === null || value === undefined ? NONE : some(value);
-    };
-    var Option = {
-      some: some,
-      none: none,
-      from: from
-    };
-
-    var typeOf = function (x) {
-      if (x === null)
-        return 'null';
-      var t = typeof x;
-      if (t === 'object' && Array.prototype.isPrototypeOf(x))
-        return 'array';
-      if (t === 'object' && String.prototype.isPrototypeOf(x))
-        return 'string';
-      return t;
-    };
-    var isType = function (type) {
-      return function (value) {
-        return typeOf(value) === type;
-      };
-    };
-    var isFunction = isType('function');
-
-    var map = function (xs, f) {
-      var len = xs.length;
-      var r = new Array(len);
-      for (var i = 0; i < len; i++) {
-        var x = xs[i];
-        r[i] = f(x, i, xs);
-      }
-      return r;
-    };
-    var each = function (xs, f) {
-      for (var i = 0, len = xs.length; i < len; i++) {
-        var x = xs[i];
-        f(x, i, xs);
-      }
-    };
-    var filter$1 = function (xs, pred) {
-      var r = [];
-      for (var i = 0, len = xs.length; i < len; i++) {
-        var x = xs[i];
-        if (pred(x, i, xs)) {
-          r.push(x);
-        }
-      }
-      return r;
-    };
-    var slice = Array.prototype.slice;
-    var from$1 = isFunction(Array.from) ? Array.from : function (x) {
-      return slice.call(x);
-    };
-
-    var nu = function (baseFn) {
-      var data = Option.none();
-      var callbacks = [];
-      var map$$1 = function (f) {
-        return nu(function (nCallback) {
-          get(function (data) {
-            nCallback(f(data));
-          });
-        });
-      };
-      var get = function (nCallback) {
-        if (isReady())
-          call(nCallback);
-        else
-          callbacks.push(nCallback);
-      };
-      var set = function (x) {
-        data = Option.some(x);
-        run(callbacks);
-        callbacks = [];
-      };
-      var isReady = function () {
-        return data.isSome();
-      };
-      var run = function (cbs) {
-        each(cbs, call);
-      };
-      var call = function (cb) {
-        data.each(function (x) {
-          setTimeout(function () {
-            cb(x);
-          }, 0);
-        });
-      };
-      baseFn(set);
-      return {
-        get: get,
-        map: map$$1,
-        isReady: isReady
-      };
-    };
-    var pure$1 = function (a) {
-      return nu(function (callback) {
-        callback(a);
-      });
-    };
-    var LazyValue = {
-      nu: nu,
-      pure: pure$1
-    };
-
-    var bounce = function (f) {
-      return function () {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-          args[_i] = arguments[_i];
-        }
-        var me = this;
-        setTimeout(function () {
-          f.apply(me, args);
-        }, 0);
-      };
-    };
-
-    var nu$1 = function (baseFn) {
-      var get = function (callback) {
-        baseFn(bounce(callback));
-      };
-      var map = function (fab) {
-        return nu$1(function (callback) {
-          get(function (a) {
-            var value = fab(a);
-            callback(value);
-          });
-        });
-      };
-      var bind = function (aFutureB) {
-        return nu$1(function (callback) {
-          get(function (a) {
-            aFutureB(a).get(callback);
-          });
-        });
-      };
-      var anonBind = function (futureB) {
-        return nu$1(function (callback) {
-          get(function (a) {
-            futureB.get(callback);
-          });
-        });
-      };
-      var toLazy = function () {
-        return LazyValue.nu(get);
-      };
-      var toCached = function () {
-        var cache = null;
-        return nu$1(function (callback) {
-          if (cache === null) {
-            cache = toLazy();
-          }
-          cache.get(callback);
-        });
-      };
-      return {
-        map: map,
-        bind: bind,
-        anonBind: anonBind,
-        toLazy: toLazy,
-        toCached: toCached,
-        get: get
-      };
-    };
-    var pure$2 = function (a) {
-      return nu$1(function (callback) {
-        callback(a);
-      });
-    };
-    var Future = {
-      nu: nu$1,
-      pure: pure$2
-    };
-
-    var par = function (asyncValues, nu) {
-      return nu(function (callback) {
-        var r = [];
-        var count = 0;
-        var cb = function (i) {
-          return function (value) {
-            r[i] = value;
-            count++;
-            if (count >= asyncValues.length) {
-              callback(r);
-            }
-          };
-        };
-        if (asyncValues.length === 0) {
-          callback([]);
-        } else {
-          each(asyncValues, function (asyncValue, i) {
-            asyncValue.get(cb(i));
-          });
-        }
-      });
-    };
-
-    var par$1 = function (futures) {
-      return par(futures, Future.nu);
-    };
-    var mapM = function (array, fn) {
-      var futures = map(array, fn);
-      return par$1(futures);
-    };
-
-    var pasteHtml$1 = function (editor, html, internalFlag) {
-      var internal = internalFlag ? internalFlag : InternalHtml.isMarked(html);
-      var args = ProcessFilters.process(editor, InternalHtml.unmark(html), internal);
-      if (args.cancelled === false) {
-        SmartPaste.insertContent(editor, args.content);
-      }
-    };
-    var pasteText = function (editor, text) {
-      text = editor.dom.encode(text).replace(/\r\n/g, '\n');
-      text = Newlines.convert(text, editor.settings.forced_root_block, editor.settings.forced_root_block_attrs);
-      pasteHtml$1(editor, text, false);
-    };
-    var getDataTransferItems = function (dataTransfer) {
-      var items = {};
-      var mceInternalUrlPrefix = 'data:text/mce-internal,';
-      if (dataTransfer) {
-        if (dataTransfer.getData) {
-          var legacyText = dataTransfer.getData('Text');
-          if (legacyText && legacyText.length > 0) {
-            if (legacyText.indexOf(mceInternalUrlPrefix) === -1) {
-              items['text/plain'] = legacyText;
-            }
-          }
-        }
-        if (dataTransfer.types) {
-          for (var i = 0; i < dataTransfer.types.length; i++) {
-            var contentType = dataTransfer.types[i];
-            try {
-              items[contentType] = dataTransfer.getData(contentType);
-            } catch (ex) {
-              items[contentType] = '';
-            }
-          }
-        }
-      }
-      return items;
-    };
-    var getClipboardContent = function (editor, clipboardEvent) {
-      var content = getDataTransferItems(clipboardEvent.clipboardData || editor.getDoc().dataTransfer);
-      return Utils.isMsEdge() ? global$3.extend(content, { 'text/html': '' }) : content;
-    };
-    var hasContentType = function (clipboardContent, mimeType) {
-      return mimeType in clipboardContent && clipboardContent[mimeType].length > 0;
-    };
-    var hasHtmlOrText = function (content) {
-      return hasContentType(content, 'text/html') || hasContentType(content, 'text/plain');
-    };
-    var getBase64FromUri = function (uri) {
-      var idx;
-      idx = uri.indexOf(',');
-      if (idx !== -1) {
-        return uri.substr(idx + 1);
-      }
-      return null;
-    };
-    var isValidDataUriImage = function (settings, imgElm) {
-      return settings.images_dataimg_filter ? settings.images_dataimg_filter(imgElm) : true;
-    };
-    var extractFilename = function (editor, str) {
-      var m = str.match(/([\s\S]+?)\.(?:jpeg|jpg|png|gif)$/i);
-      return m ? editor.dom.encode(m[1]) : null;
-    };
-    var uniqueId = Utils.createIdGenerator('mceclip');
-    var pasteImage = function (editor, imageItem) {
-      var base64 = getBase64FromUri(imageItem.uri);
-      var id = uniqueId();
-      var name$$1 = editor.settings.images_reuse_filename && imageItem.blob.name ? extractFilename(editor, imageItem.blob.name) : id;
-      var img = new Image();
-      img.src = imageItem.uri;
-      if (isValidDataUriImage(editor.settings, img)) {
-        var blobCache = editor.editorUpload.blobCache;
-        var blobInfo = void 0, existingBlobInfo = void 0;
-        existingBlobInfo = blobCache.findFirst(function (cachedBlobInfo) {
-          return cachedBlobInfo.base64() === base64;
-        });
-        if (!existingBlobInfo) {
-          blobInfo = blobCache.create(id, imageItem.blob, base64, name$$1);
-          blobCache.add(blobInfo);
-        } else {
-          blobInfo = existingBlobInfo;
-        }
-        pasteHtml$1(editor, '<img src="' + blobInfo.blobUri() + '">', false);
-      } else {
-        pasteHtml$1(editor, '<img src="' + imageItem.uri + '">', false);
-      }
-    };
-    var isClipboardEvent = function (event$$1) {
-      return event$$1.type === 'paste';
-    };
-    var readBlobsAsDataUris = function (items) {
-      return mapM(items, function (item) {
-        return Future.nu(function (resolve) {
-          var blob = item.getAsFile ? item.getAsFile() : item;
-          var reader = new window.FileReader();
-          reader.onload = function () {
-            resolve({
-              blob: blob,
-              uri: reader.result
-            });
-          };
-          reader.readAsDataURL(blob);
-        });
-      });
-    };
-    var getImagesFromDataTransfer = function (dataTransfer) {
-      var items = dataTransfer.items ? map(from$1(dataTransfer.items), function (item) {
-        return item.getAsFile();
-      }) : [];
-      var files = dataTransfer.files ? from$1(dataTransfer.files) : [];
-      var images = filter$1(items.length > 0 ? items : files, function (file) {
-        return /^image\/(jpeg|png|gif|bmp)$/.test(file.type);
-      });
-      return images;
-    };
-    var pasteImageData = function (editor, e, rng) {
-      var dataTransfer = isClipboardEvent(e) ? e.clipboardData : e.dataTransfer;
-      if (editor.settings.paste_data_images && dataTransfer) {
-        var images = getImagesFromDataTransfer(dataTransfer);
-        if (images.length > 0) {
-          e.preventDefault();
-          readBlobsAsDataUris(images).get(function (blobResults) {
-            if (rng) {
-              editor.selection.setRng(rng);
-            }
-            each(blobResults, function (result) {
-              pasteImage(editor, result);
-            });
-          });
-          return true;
-        }
-      }
-      return false;
-    };
-    var isBrokenAndroidClipboardEvent = function (e) {
-      var clipboardData = e.clipboardData;
-      return navigator.userAgent.indexOf('Android') !== -1 && clipboardData && clipboardData.items && clipboardData.items.length === 0;
-    };
-    var isKeyboardPasteEvent = function (e) {
-      return global$4.metaKeyPressed(e) && e.keyCode === 86 || e.shiftKey && e.keyCode === 45;
-    };
-    var registerEventHandlers = function (editor, pasteBin, pasteFormat) {
-      var keyboardPasteTimeStamp = 0;
-      var keyboardPastePlainTextState;
-      editor.on('keydown', function (e) {
-        function removePasteBinOnKeyUp(e) {
-          if (isKeyboardPasteEvent(e) && !e.isDefaultPrevented()) {
-            pasteBin.remove();
-          }
-        }
-        if (isKeyboardPasteEvent(e) && !e.isDefaultPrevented()) {
-          keyboardPastePlainTextState = e.shiftKey && e.keyCode === 86;
-          if (keyboardPastePlainTextState && global$1.webkit && navigator.userAgent.indexOf('Version/') !== -1) {
-            return;
-          }
-          e.stopImmediatePropagation();
-          keyboardPasteTimeStamp = new Date().getTime();
-          if (global$1.ie && keyboardPastePlainTextState) {
-            e.preventDefault();
-            Events.firePaste(editor, true);
-            return;
-          }
-          pasteBin.remove();
-          pasteBin.create();
-          editor.once('keyup', removePasteBinOnKeyUp);
-          editor.once('paste', function () {
-            editor.off('keyup', removePasteBinOnKeyUp);
-          });
-        }
-      });
-      function insertClipboardContent(clipboardContent, isKeyBoardPaste, plainTextMode, internal) {
-        var content, isPlainTextHtml;
-        if (hasContentType(clipboardContent, 'text/html')) {
-          content = clipboardContent['text/html'];
-        } else {
-          content = pasteBin.getHtml();
-          internal = internal ? internal : InternalHtml.isMarked(content);
-          if (pasteBin.isDefaultContent(content)) {
-            plainTextMode = true;
-          }
-        }
-        content = Utils.trimHtml(content);
-        pasteBin.remove();
-        isPlainTextHtml = internal === false && Newlines.isPlainText(content);
-        if (!content.length || isPlainTextHtml) {
-          plainTextMode = true;
-        }
-        if (plainTextMode) {
-          if (hasContentType(clipboardContent, 'text/plain') && isPlainTextHtml) {
-            content = clipboardContent['text/plain'];
-          } else {
-            content = Utils.innerText(content);
-          }
-        }
-        if (pasteBin.isDefaultContent(content)) {
-          if (!isKeyBoardPaste) {
-            editor.windowManager.alert('Please use Ctrl+V/Cmd+V keyboard shortcuts to paste contents.');
-          }
-          return;
-        }
-        if (plainTextMode) {
-          pasteText(editor, content);
-        } else {
-          pasteHtml$1(editor, content, internal);
-        }
-      }
-      var getLastRng = function () {
-        return pasteBin.getLastRng() || editor.selection.getRng();
-      };
-      editor.on('paste', function (e) {
-        var clipboardTimer = new Date().getTime();
-        var clipboardContent = getClipboardContent(editor, e);
-        var clipboardDelay = new Date().getTime() - clipboardTimer;
-        var isKeyBoardPaste = new Date().getTime() - keyboardPasteTimeStamp - clipboardDelay < 1000;
-        var plainTextMode = pasteFormat.get() === 'text' || keyboardPastePlainTextState;
-        var internal = hasContentType(clipboardContent, InternalHtml.internalHtmlMime());
-        keyboardPastePlainTextState = false;
-        if (e.isDefaultPrevented() || isBrokenAndroidClipboardEvent(e)) {
-          pasteBin.remove();
-          return;
-        }
-        if (!hasHtmlOrText(clipboardContent) && pasteImageData(editor, e, getLastRng())) {
-          pasteBin.remove();
-          return;
-        }
-        if (!isKeyBoardPaste) {
-          e.preventDefault();
-        }
-        if (global$1.ie && (!isKeyBoardPaste || e.ieFake) && !hasContentType(clipboardContent, 'text/html')) {
-          pasteBin.create();
-          editor.dom.bind(pasteBin.getEl(), 'paste', function (e) {
-            e.stopPropagation();
-          });
-          editor.getDoc().execCommand('Paste', false, null);
-          clipboardContent['text/html'] = pasteBin.getHtml();
-        }
-        if (hasContentType(clipboardContent, 'text/html')) {
-          e.preventDefault();
-          if (!internal) {
-            internal = InternalHtml.isMarked(clipboardContent['text/html']);
-          }
-          insertClipboardContent(clipboardContent, isKeyBoardPaste, plainTextMode, internal);
-        } else {
-          global$2.setEditorTimeout(editor, function () {
-            insertClipboardContent(clipboardContent, isKeyBoardPaste, plainTextMode, internal);
-          }, 0);
-        }
-      });
-    };
-    var registerEventsAndFilters = function (editor, pasteBin, pasteFormat) {
-      registerEventHandlers(editor, pasteBin, pasteFormat);
-      var src;
-      editor.parser.addNodeFilter('img', function (nodes, name$$1, args) {
-        var isPasteInsert = function (args) {
-          return args.data && args.data.paste === true;
-        };
-        var remove = function (node) {
-          if (!node.attr('data-mce-object') && src !== global$1.transparentSrc) {
-            node.remove();
-          }
-        };
-        var isWebKitFakeUrl = function (src) {
-          return src.indexOf('webkit-fake-url') === 0;
-        };
-        var isDataUri = function (src) {
-          return src.indexOf('data:') === 0;
-        };
-        if (!editor.settings.paste_data_images && isPasteInsert(args)) {
-          var i = nodes.length;
-          while (i--) {
-            src = nodes[i].attributes.map.src;
-            if (!src) {
-              continue;
-            }
-            if (isWebKitFakeUrl(src)) {
-              remove(nodes[i]);
-            } else if (!editor.settings.allow_html_data_urls && isDataUri(src)) {
-              remove(nodes[i]);
-            }
-          }
-        }
-      });
-    };
-
-    var getPasteBinParent = function (editor) {
-      return global$1.ie && editor.inline ? document.body : editor.getBody();
-    };
-    var isExternalPasteBin = function (editor) {
-      return getPasteBinParent(editor) !== editor.getBody();
-    };
-    var delegatePasteEvents = function (editor, pasteBinElm, pasteBinDefaultContent) {
-      if (isExternalPasteBin(editor)) {
-        editor.dom.bind(pasteBinElm, 'paste keyup', function (e) {
-          if (!isDefault(editor, pasteBinDefaultContent)) {
-            editor.fire('paste');
-          }
-        });
-      }
-    };
-    var create = function (editor, lastRngCell, pasteBinDefaultContent) {
-      var dom = editor.dom, body = editor.getBody();
-      var pasteBinElm;
-      lastRngCell.set(editor.selection.getRng());
-      pasteBinElm = editor.dom.add(getPasteBinParent(editor), 'div', {
-        'id': 'mcepastebin',
-        'class': 'mce-pastebin',
-        'contentEditable': true,
-        'data-mce-bogus': 'all',
-        'style': 'position: fixed; top: 50%; width: 10px; height: 10px; overflow: hidden; opacity: 0'
-      }, pasteBinDefaultContent);
-      if (global$1.ie || global$1.gecko) {
-        dom.setStyle(pasteBinElm, 'left', dom.getStyle(body, 'direction', true) === 'rtl' ? 65535 : -65535);
-      }
-      dom.bind(pasteBinElm, 'beforedeactivate focusin focusout', function (e) {
-        e.stopPropagation();
-      });
-      delegatePasteEvents(editor, pasteBinElm, pasteBinDefaultContent);
-      pasteBinElm.focus();
-      editor.selection.select(pasteBinElm, true);
-    };
-    var remove = function (editor, lastRngCell) {
-      if (getEl(editor)) {
-        var pasteBinClone = void 0;
-        var lastRng = lastRngCell.get();
-        while (pasteBinClone = editor.dom.get('mcepastebin')) {
-          editor.dom.remove(pasteBinClone);
-          editor.dom.unbind(pasteBinClone);
-        }
-        if (lastRng) {
-          editor.selection.setRng(lastRng);
-        }
-      }
-      lastRngCell.set(null);
-    };
-    var getEl = function (editor) {
-      return editor.dom.get('mcepastebin');
-    };
-    var getHtml = function (editor) {
-      var pasteBinElm, pasteBinClones, i, dirtyWrappers, cleanWrapper;
-      var copyAndRemove = function (toElm, fromElm) {
-        toElm.appendChild(fromElm);
-        editor.dom.remove(fromElm, true);
-      };
-      pasteBinClones = global$3.grep(getPasteBinParent(editor).childNodes, function (elm) {
-        return elm.id === 'mcepastebin';
-      });
-      pasteBinElm = pasteBinClones.shift();
-      global$3.each(pasteBinClones, function (pasteBinClone) {
-        copyAndRemove(pasteBinElm, pasteBinClone);
-      });
-      dirtyWrappers = editor.dom.select('div[id=mcepastebin]', pasteBinElm);
-      for (i = dirtyWrappers.length - 1; i >= 0; i--) {
-        cleanWrapper = editor.dom.create('div');
-        pasteBinElm.insertBefore(cleanWrapper, dirtyWrappers[i]);
-        copyAndRemove(cleanWrapper, dirtyWrappers[i]);
-      }
-      return pasteBinElm ? pasteBinElm.innerHTML : '';
-    };
-    var getLastRng = function (lastRng) {
-      return lastRng.get();
-    };
-    var isDefaultContent = function (pasteBinDefaultContent, content) {
-      return content === pasteBinDefaultContent;
-    };
-    var isPasteBin = function (elm) {
-      return elm && elm.id === 'mcepastebin';
-    };
-    var isDefault = function (editor, pasteBinDefaultContent) {
-      var pasteBinElm = getEl(editor);
-      return isPasteBin(pasteBinElm) && isDefaultContent(pasteBinDefaultContent, pasteBinElm.innerHTML);
-    };
-    var PasteBin = function (editor) {
-      var lastRng = Cell(null);
-      var pasteBinDefaultContent = '%MCEPASTEBIN%';
-      return {
-        create: function () {
-          return create(editor, lastRng, pasteBinDefaultContent);
-        },
-        remove: function () {
-          return remove(editor, lastRng);
-        },
-        getEl: function () {
-          return getEl(editor);
-        },
-        getHtml: function () {
-          return getHtml(editor);
-        },
-        getLastRng: function () {
-          return getLastRng(lastRng);
-        },
-        isDefault: function () {
-          return isDefault(editor, pasteBinDefaultContent);
-        },
-        isDefaultContent: function (content) {
-          return isDefaultContent(pasteBinDefaultContent, content);
-        }
-      };
-    };
-
-    var Clipboard = function (editor, pasteFormat) {
-      var pasteBin = PasteBin(editor);
-      editor.on('preInit', function () {
-        return registerEventsAndFilters(editor, pasteBin, pasteFormat);
-      });
-      return {
-        pasteFormat: pasteFormat,
-        pasteHtml: function (html, internalFlag) {
-          return pasteHtml$1(editor, html, internalFlag);
-        },
-        pasteText: function (text) {
-          return pasteText(editor, text);
-        },
-        pasteImageData: function (e, rng) {
-          return pasteImageData(editor, e, rng);
-        },
-        getDataTransferItems: getDataTransferItems,
-        hasHtmlOrText: hasHtmlOrText,
-        hasContentType: hasContentType
-      };
-    };
-
-    var noop$1 = function () {
-    };
-    var hasWorkingClipboardApi = function (clipboardData) {
-      return global$1.iOS === false && clipboardData !== undefined && typeof clipboardData.setData === 'function' && Utils.isMsEdge() !== true;
-    };
-    var setHtml5Clipboard = function (clipboardData, html, text) {
-      if (hasWorkingClipboardApi(clipboardData)) {
-        try {
-          clipboardData.clearData();
-          clipboardData.setData('text/html', html);
-          clipboardData.setData('text/plain', text);
-          clipboardData.setData(InternalHtml.internalHtmlMime(), html);
-          return true;
-        } catch (e) {
-          return false;
-        }
-      } else {
-        return false;
-      }
-    };
-    var setClipboardData = function (evt, data, fallback, done) {
-      if (setHtml5Clipboard(evt.clipboardData, data.html, data.text)) {
-        evt.preventDefault();
-        done();
-      } else {
-        fallback(data.html, done);
-      }
-    };
-    var fallback = function (editor) {
-      return function (html, done) {
-        var markedHtml = InternalHtml.mark(html);
-        var outer = editor.dom.create('div', {
-          'contenteditable': 'false',
-          'data-mce-bogus': 'all'
-        });
-        var inner = editor.dom.create('div', { contenteditable: 'true' }, markedHtml);
-        editor.dom.setStyles(outer, {
-          position: 'fixed',
-          top: '0',
-          left: '-3000px',
-          width: '1000px',
-          overflow: 'hidden'
-        });
-        outer.appendChild(inner);
-        editor.dom.add(editor.getBody(), outer);
-        var range = editor.selection.getRng();
-        inner.focus();
-        var offscreenRange = editor.dom.createRng();
-        offscreenRange.selectNodeContents(inner);
-        editor.selection.setRng(offscreenRange);
-        setTimeout(function () {
-          editor.selection.setRng(range);
-          outer.parentNode.removeChild(outer);
-          done();
-        }, 0);
-      };
-    };
-    var getData = function (editor) {
-      return {
-        html: editor.selection.getContent({ contextual: true }),
-        text: editor.selection.getContent({ format: 'text' })
-      };
-    };
-    var isTableSelection = function (editor) {
-      return !!editor.dom.getParent(editor.selection.getStart(), 'td[data-mce-selected],th[data-mce-selected]', editor.getBody());
-    };
-    var hasSelectedContent = function (editor) {
-      return !editor.selection.isCollapsed() || isTableSelection(editor);
-    };
-    var cut = function (editor) {
-      return function (evt) {
-        if (hasSelectedContent(editor)) {
-          setClipboardData(evt, getData(editor), fallback(editor), function () {
-            setTimeout(function () {
-              editor.execCommand('Delete');
-            }, 0);
-          });
-        }
-      };
-    };
-    var copy = function (editor) {
-      return function (evt) {
-        if (hasSelectedContent(editor)) {
-          setClipboardData(evt, getData(editor), fallback(editor), noop$1);
-        }
-      };
-    };
-    var register$1 = function (editor) {
-      editor.on('cut', cut(editor));
-      editor.on('copy', copy(editor));
-    };
-    var CutCopy = { register: register$1 };
-
-    var global$a = tinymce.util.Tools.resolve('tinymce.dom.RangeUtils');
-
-    var getCaretRangeFromEvent = function (editor, e) {
-      return global$a.getCaretRangeFromPoint(e.clientX, e.clientY, editor.getDoc());
-    };
-    var isPlainTextFileUrl = function (content) {
-      var plainTextContent = content['text/plain'];
-      return plainTextContent ? plainTextContent.indexOf('file://') === 0 : false;
-    };
-    var setFocusedRange = function (editor, rng) {
-      editor.focus();
-      editor.selection.setRng(rng);
-    };
-    var setup = function (editor, clipboard, draggingInternallyState) {
-      if (Settings.shouldBlockDrop(editor)) {
-        editor.on('dragend dragover draggesture dragdrop drop drag', function (e) {
-          e.preventDefault();
-          e.stopPropagation();
-        });
-      }
-      if (!Settings.shouldPasteDataImages(editor)) {
-        editor.on('drop', function (e) {
-          var dataTransfer = e.dataTransfer;
-          if (dataTransfer && dataTransfer.files && dataTransfer.files.length > 0) {
-            e.preventDefault();
-          }
-        });
-      }
-      editor.on('drop', function (e) {
-        var dropContent, rng;
-        rng = getCaretRangeFromEvent(editor, e);
-        if (e.isDefaultPrevented() || draggingInternallyState.get()) {
-          return;
-        }
-        dropContent = clipboard.getDataTransferItems(e.dataTransfer);
-        var internal = clipboard.hasContentType(dropContent, InternalHtml.internalHtmlMime());
-        if ((!clipboard.hasHtmlOrText(dropContent) || isPlainTextFileUrl(dropContent)) && clipboard.pasteImageData(e, rng)) {
-          return;
-        }
-        if (rng && Settings.shouldFilterDrop(editor)) {
-          var content_1 = dropContent['mce-internal'] || dropContent['text/html'] || dropContent['text/plain'];
-          if (content_1) {
-            e.preventDefault();
-            global$2.setEditorTimeout(editor, function () {
-              editor.undoManager.transact(function () {
-                if (dropContent['mce-internal']) {
-                  editor.execCommand('Delete');
-                }
-                setFocusedRange(editor, rng);
-                content_1 = Utils.trimHtml(content_1);
-                if (!dropContent['text/html']) {
-                  clipboard.pasteText(content_1);
-                } else {
-                  clipboard.pasteHtml(content_1, internal);
-                }
-              });
-            });
-          }
-        }
-      });
-      editor.on('dragstart', function (e) {
-        draggingInternallyState.set(true);
-      });
-      editor.on('dragover dragend', function (e) {
-        if (Settings.shouldPasteDataImages(editor) && draggingInternallyState.get() === false) {
-          e.preventDefault();
-          setFocusedRange(editor, getCaretRangeFromEvent(editor, e));
-        }
-        if (e.type === 'dragend') {
-          draggingInternallyState.set(false);
-        }
-      });
-    };
-    var DragDrop = { setup: setup };
-
-    var setup$1 = function (editor) {
-      var plugin = editor.plugins.umbpaste;
-      var preProcess = Settings.getPreProcess(editor);
-      if (preProcess) {
-        editor.on('PastePreProcess', function (e) {
-          preProcess.call(plugin, plugin, e);
-        });
-      }
-      var postProcess = Settings.getPostProcess(editor);
-      if (postProcess) {
-        editor.on('PastePostProcess', function (e) {
-          postProcess.call(plugin, plugin, e);
-        });
-      }
-    };
-    var PrePostProcess = { setup: setup$1 };
-
-    function addPreProcessFilter(editor, filterFunc) {
-      editor.on('PastePreProcess', function (e) {
-        e.content = filterFunc(editor, e.content, e.internal, e.wordContent);
-      });
-    }
-    function addPostProcessFilter(editor, filterFunc) {
-      editor.on('PastePostProcess', function (e) {
-        filterFunc(editor, e.node);
-      });
-    }
-    function removeExplorerBrElementsAfterBlocks(editor, html) {
-      if (!WordFilter.isWordContent(html)) {
-        return html;
-      }
-      var blockElements = [];
-      global$3.each(editor.schema.getBlockElements(), function (block, blockName) {
-        blockElements.push(blockName);
-      });
-      var explorerBlocksRegExp = new RegExp('(?:<br>&nbsp;[\\s\\r\\n]+|<br>)*(<\\/?(' + blockElements.join('|') + ')[^>]*>)(?:<br>&nbsp;[\\s\\r\\n]+|<br>)*', 'g');
-      html = Utils.filter(html, [[
-          explorerBlocksRegExp,
-          '$1'
-        ]]);
-      html = Utils.filter(html, [
-        [
-          /<br><br>/g,
-          '<BR><BR>'
-        ],
-        [
-          /<br>/g,
-          ' '
-        ],
-        [
-          /<BR><BR>/g,
-          '<br>'
-        ]
-      ]);
-      return html;
-    }
-    function removeWebKitStyles(editor, content, internal, isWordHtml) {
-      if (isWordHtml || internal) {
-        return content;
-      }
-      var webKitStylesSetting = Settings.getWebkitStyles(editor);
-      var webKitStyles;
-      if (Settings.shouldRemoveWebKitStyles(editor) === false || webKitStylesSetting === 'all') {
-        return content;
-      }
-      if (webKitStylesSetting) {
-        webKitStyles = webKitStylesSetting.split(/[, ]/);
-      }
-      if (webKitStyles) {
-        var dom_1 = editor.dom, node_1 = editor.selection.getNode();
-        content = content.replace(/(<[^>]+) style="([^"]*)"([^>]*>)/gi, function (all, before, value, after) {
-          var inputStyles = dom_1.parseStyle(dom_1.decode(value));
-          var outputStyles = {};
-          if (webKitStyles === 'none') {
-            return before + after;
-          }
-          for (var i = 0; i < webKitStyles.length; i++) {
-            var inputValue = inputStyles[webKitStyles[i]], currentValue = dom_1.getStyle(node_1, webKitStyles[i], true);
-            if (/color/.test(webKitStyles[i])) {
-              inputValue = dom_1.toHex(inputValue);
-              currentValue = dom_1.toHex(currentValue);
-            }
-            if (currentValue !== inputValue) {
-              outputStyles[webKitStyles[i]] = inputValue;
-            }
-          }
-          outputStyles = dom_1.serializeStyle(outputStyles, 'span');
-          if (outputStyles) {
-            return before + ' style="' + outputStyles + '"' + after;
-          }
-          return before + after;
-        });
-      } else {
-        content = content.replace(/(<[^>]+) style="([^"]*)"([^>]*>)/gi, '$1$3');
-      }
-      content = content.replace(/(<[^>]+) data-mce-style="([^"]+)"([^>]*>)/gi, function (all, before, value, after) {
-        return before + ' style="' + value + '"' + after;
-      });
-      return content;
-    }
-    function removeUnderlineAndFontInAnchor(editor, root) {
-      editor.$('a', root).find('font,u').each(function (i, node) {
-        editor.dom.remove(node, true);
-      });
-    }
-    var setup$2 = function (editor) {
-      if (global$1.webkit) {
-        addPreProcessFilter(editor, removeWebKitStyles);
-      }
-      if (global$1.ie) {
-        addPreProcessFilter(editor, removeExplorerBrElementsAfterBlocks);
-        addPostProcessFilter(editor, removeUnderlineAndFontInAnchor);
-      }
-    };
-    var Quirks = { setup: setup$2 };
-
-    var stateChange = function (editor, clipboard, e) {
-      var ctrl = e.control;
-      ctrl.active(clipboard.pasteFormat.get() === 'text');
-      editor.on('PastePlainTextToggle', function (e) {
-        ctrl.active(e.state);
-      });
-    };
-    var register$2 = function (editor, clipboard) {
-      var postRender = curry(stateChange, editor, clipboard);
-      editor.addButton('pastetext', {
-        active: false,
-        icon: 'pastetext',
-        tooltip: 'Paste as text',
-        cmd: 'mceTogglePlainTextPaste',
-        onPostRender: postRender
-      });
-      editor.addMenuItem('pastetext', {
-        text: 'Paste as text',
-        selectable: true,
-        active: clipboard.pasteFormat,
-        cmd: 'mceTogglePlainTextPaste',
-        onPostRender: postRender
-      });
-    };
-    var Buttons = { register: register$2 };
-
-    global.add('umbpaste', function (editor) {
-      if (DetectProPlugin.hasProPlugin(editor) === false) {
-        var userIsInformedState = Cell(false);
-        var draggingInternallyState = Cell(false);
-        var pasteFormat = Cell(Settings.isPasteAsTextEnabled(editor) ? 'text' : 'html');
-        var clipboard = Clipboard(editor, pasteFormat);
-        var quirks = Quirks.setup(editor);
-        Buttons.register(editor, clipboard);
-        Commands.register(editor, clipboard, userIsInformedState);
-        PrePostProcess.setup(editor);
-        CutCopy.register(editor);
-        DragDrop.setup(editor, clipboard, draggingInternallyState);
-        return Api.get(clipboard, quirks);
-      }
-    });
-    function Plugin () {
-    }
-
-    return Plugin;
-
-}());
-})();

From 23ee9eae424912d670155fd48014ffb6f40f8a1a Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Wed, 18 Sep 2019 20:20:18 +0200
Subject: [PATCH 658/776] Grant the default admin group access to the
 Translation section

---
 src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs b/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
index dd5c17713a..7d5c05d584 100644
--- a/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
+++ b/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
@@ -190,6 +190,7 @@ namespace Umbraco.Core.Migrations.Install
             _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Settings });
             _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Users });
             _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Forms });
+            _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Translation });
 
             _database.Insert(new UserGroup2AppDto { UserGroupId = 2, AppAlias = Constants.Applications.Content });
 

From bb99891c2f861dd286ef41b06d3a8627d3d8e903 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Thu, 19 Sep 2019 09:29:53 +0200
Subject: [PATCH 659/776] a few extra element types to allow

---
 .../src/common/services/tinymce.service.js                    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 211e69abb0..36e4409bc1 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -349,8 +349,8 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                 };
                 
                 // We keep spans here, cause removing spans here also removes b-tags inside of them, instead we strip them out later.
-                var validElements = "-strong/b,-em/i,-u,-span,-p,-ol,-ul,-li,-p/div,-a[href|name],sub,sup,strike,br,del,table[width],tr,td[colspan|rowspan|width],th[colspan|rowspan|width],thead,tfoot,tbody,img[src|alt|width|height],ul,ol,li"
-                
+                var validElements = "-strong/b,-em/i,-u,-span,-p,-ol,-ul,-li,-p/div,-a[href|name],sub,sup,strike,br,del,table[width],tr,td[colspan|rowspan|width],th[colspan|rowspan|width],thead,tfoot,tbody,img[src|alt|width|height],ul,ol,li,hr,pre,dl,dt,figure,figcaption,wbr"
+                  
                 // add valid elements from styleFormats.
                 var style, i = 0;
                 for(; i < styles.styleFormats.length; i++) {

From 5caaec2af8c8698921c8cf23602ee60fc7a804c1 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Thu, 19 Sep 2019 10:10:09 +0200
Subject: [PATCH 660/776] V8: Set the form as dirty when adding/removing colors
 to/from Umbraco.ColorPicker (#5998)

---
 .../multicolorpicker.controller.js            | 25 +++----------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js
index 287a0f48fc..91c6e673b9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js
@@ -102,6 +102,7 @@
                 return x.value === item.value && x.label === item.label;
             });
 
+            angularHelper.getCurrentForm($scope).$setDirty();
         };
 
         $scope.add = function (evt) {
@@ -120,6 +121,7 @@
                     $scope.newLabel = "";
                     $scope.hasError = false;
                     $scope.focusOnNew = true;
+                    angularHelper.getCurrentForm($scope).$setDirty();
                     return;
                 }
 
@@ -137,31 +139,10 @@
             items: '> div.control-group',
             tolerance: 'pointer',
             update: function (e, ui) {
-                // Get the new and old index for the moved element (using the text as the identifier, so 
-                // we'd have a problem if two prevalues were the same, but that would be unlikely)
-                var newIndex = ui.item.index();
-                var movedPrevalueText = $('pre', ui.item).text();
-                var originalIndex = getElementIndexByPrevalueText(movedPrevalueText);
-
-                //// Move the element in the model
-                if (originalIndex > -1) {
-                    var movedElement = $scope.model.value[originalIndex];
-                    $scope.model.value.splice(originalIndex, 1);
-                    $scope.model.value.splice(newIndex, 0, movedElement);
-                }
+                angularHelper.getCurrentForm($scope).$setDirty();
             }
         };
 
-        function getElementIndexByPrevalueText(value) {
-            for (var i = 0; i < $scope.model.value.length; i++) {
-                if ($scope.model.value[i].value === value) {
-                    return i;
-                }
-            }
-
-            return -1;
-        }
-
         //load the separate css for the editor to avoid it blocking our js loading
         assetsService.loadCss("lib/spectrum/spectrum.css", $scope);
     });

From a420c145ae8b4c47a50744a277ab3fcd3c30efd8 Mon Sep 17 00:00:00 2001
From: Malthe Petersen <malthebpet@gmail.com>
Date: Thu, 19 Sep 2019 10:23:55 +0200
Subject: [PATCH 661/776] 5989 - fixed focalpoint for infinite media picker
 (#5991)

---
 .../mediapicker/mediapicker.controller.js         | 15 ++++++++++++++-
 .../infiniteeditors/mediapicker/mediapicker.html  |  3 ++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
index b4aa5cef58..837c0ebc9d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
@@ -474,6 +474,19 @@ angular.module("umbraco")
                 editorService.mediaEditor(mediaEditor);
             };
 
+            /**
+             * Called when the umgImageGravity component updates the focal point value
+             * @param {any} left
+             * @param {any} top
+             */
+            $scope.focalPointChanged = function (left, top) {
+                //update the model focalpoint value
+                $scope.target.focalPoint = {
+                    left: left,
+                    top: top
+                };
+            }
+
             function setUpdatedMediaNodes(item) {
                 // add udi to list of updated media items so we easily can update them in other editors
                 if ($scope.model.updatedMediaNodes.indexOf(item.udi) === -1) {
@@ -495,4 +508,4 @@ angular.module("umbraco")
 
             onInit();
 
-        });
+        });
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
index f8cba9fd04..9e2193f07c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
@@ -127,7 +127,8 @@
                     <div ng-if="target.url">
                         <umb-image-gravity
                             src="target.url"
-                            center="target.focalPoint">
+                            center="target.focalPoint"
+							on-value-changed="focalPointChanged(left, top)">
                         </umb-image-gravity>
                     </div>
 

From 7d0d5b9c939a9d9578c9e112a2f1d90bac6df777 Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Thu, 19 Sep 2019 18:46:02 +1000
Subject: [PATCH 662/776] U4-9912 Previewing without changing creates new
 version (#1943)

---
 src/Umbraco.Core/Services/ContentService.cs  | 5894 +++++++++---------
 src/Umbraco.Web/Editors/ContentController.cs | 2442 ++++----
 2 files changed, 4172 insertions(+), 4164 deletions(-)

diff --git a/src/Umbraco.Core/Services/ContentService.cs b/src/Umbraco.Core/Services/ContentService.cs
index 2994bcc4f6..0b50eb1f65 100644
--- a/src/Umbraco.Core/Services/ContentService.cs
+++ b/src/Umbraco.Core/Services/ContentService.cs
@@ -1,2945 +1,2949 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Text.RegularExpressions;
-using System.Threading;
-using System.Xml;
-using System.Xml.Linq;
-using Umbraco.Core.Events;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.Membership;
-using Umbraco.Core.Models.Rdbms;
-using Umbraco.Core.Persistence;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
-using Umbraco.Core.Persistence.Querying;
-using Umbraco.Core.Persistence.Repositories;
-using Umbraco.Core.Persistence.UnitOfWork;
-using Umbraco.Core.Publishing;
-
-namespace Umbraco.Core.Services
-{
-    /// <summary>
-    /// Represents the Content Service, which is an easy access to operations involving <see cref="IContent"/>
-    /// </summary>
-    public class ContentService : ScopeRepositoryService, IContentService, IContentServiceOperations
-    {
-        private readonly IPublishingStrategy2 _publishingStrategy;
-        private readonly EntityXmlSerializer _entitySerializer = new EntityXmlSerializer();
-        private readonly IDataTypeService _dataTypeService;
-        private readonly IUserService _userService;
-
-        //Support recursive locks because some of the methods that require locking call other methods that require locking.
-        //for example, the Move method needs to be locked but this calls the Save method which also needs to be locked.
-        private static readonly ReaderWriterLockSlim Locker = new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion);
-        private static readonly Regex AnchorRegex = new Regex("<a id=\"(.*?)\">", RegexOptions.Compiled);
-
-        public ContentService(
-            IDatabaseUnitOfWorkProvider provider,
-            RepositoryFactory repositoryFactory,
-            ILogger logger,
-            IEventMessagesFactory eventMessagesFactory,
-            IDataTypeService dataTypeService,
-            IUserService userService)
-            : base(provider, repositoryFactory, logger, eventMessagesFactory)
-        {
-            if (dataTypeService == null) throw new ArgumentNullException("dataTypeService");
-            if (userService == null) throw new ArgumentNullException("userService");
-            _publishingStrategy = new PublishingStrategy(UowProvider.ScopeProvider, eventMessagesFactory, logger);
-            _dataTypeService = dataTypeService;
-            _userService = userService;
-        }
-
-        #region Static Queries
-
-        private IQuery<IContent> _notTrashedQuery;
-
-        #endregion
-
-        public int CountPublished(string contentTypeAlias = null)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                return repository.CountPublished(contentTypeAlias);
-            }
-        }
-
-        public int Count(string contentTypeAlias = null)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                return repository.Count(contentTypeAlias);
-            }
-        }
-
-        public int CountChildren(int parentId, string contentTypeAlias = null)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                return repository.CountChildren(parentId, contentTypeAlias);
-            }
-        }
-
-        public int CountDescendants(int parentId, string contentTypeAlias = null)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                return repository.CountDescendants(parentId, contentTypeAlias);
-            }
-        }
-
-        /// <summary>
-        /// Used to bulk update the permissions set for a content item. This will replace all permissions
-        /// assigned to an entity with a list of user id & permission pairs.
-        /// </summary>
-        /// <param name="permissionSet"></param>
-        public void ReplaceContentPermissions(EntityPermissionSet permissionSet)
-        {
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                repository.ReplaceContentPermissions(permissionSet);
-                uow.Commit();
-            }
-        }
-
-        /// <summary>
-        /// Assigns a single permission to the current content item for the specified group ids
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <param name="permission"></param>
-        /// <param name="groupIds"></param>
-        public void AssignContentPermission(IContent entity, char permission, IEnumerable<int> groupIds)
-        {
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                repository.AssignEntityPermission(entity, permission, groupIds);
-                uow.Commit();
-            }
-        }
-
-        /// <summary>
-        /// Returns implicit/inherited permissions assigned to the content item for all user groups
-        /// </summary>
-        /// <param name="content"></param>
-        /// <returns></returns>
-        public EntityPermissionCollection GetPermissionsForEntity(IContent content)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                return repository.GetPermissionsForEntity(content.Id);
-            }
-        }
-
-        /// <summary>
-        /// Creates an <see cref="IContent"/> object using the alias of the <see cref="IContentType"/>
-        /// that this Content should based on.
-        /// </summary>
-        /// <remarks>
-        /// Note that using this method will simply return a new IContent without any identity
-        /// as it has not yet been persisted. It is intended as a shortcut to creating new content objects
-        /// that does not invoke a save operation against the database.
-        /// </remarks>
-        /// <param name="name">Name of the Content object</param>
-        /// <param name="parentId">Id of Parent for the new Content</param>
-        /// <param name="contentTypeAlias">Alias of the <see cref="IContentType"/></param>
-        /// <param name="userId">Optional id of the user creating the content</param>
-        /// <returns><see cref="IContent"/></returns>
-        public IContent CreateContent(string name, Guid parentId, string contentTypeAlias, int userId = 0)
-        {
-            var parent = GetById(parentId);
-            return CreateContent(name, parent, contentTypeAlias, userId);
-        }
-
-        /// <summary>
-        /// Creates an <see cref="IContent"/> object using the alias of the <see cref="IContentType"/>
-        /// that this Content should based on.
-        /// </summary>
-        /// <remarks>
-        /// Note that using this method will simply return a new IContent without any identity
-        /// as it has not yet been persisted. It is intended as a shortcut to creating new content objects
-        /// that does not invoke a save operation against the database.
-        /// </remarks>
-        /// <param name="name">Name of the Content object</param>
-        /// <param name="parentId">Id of Parent for the new Content</param>
-        /// <param name="contentTypeAlias">Alias of the <see cref="IContentType"/></param>
-        /// <param name="userId">Optional id of the user creating the content</param>
-        /// <returns><see cref="IContent"/></returns>
-        public IContent CreateContent(string name, int parentId, string contentTypeAlias, int userId = 0)
-        {
-            var contentType = FindContentTypeByAlias(contentTypeAlias);
-            var content = new Content(name, parentId, contentType);
-            var parent = GetById(content.ParentId);
-            content.Path = string.Concat(parent.IfNotNull(x => x.Path, content.ParentId.ToString()), ",", content.Id);
-
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var newEventArgs = new NewEventArgs<IContent>(content, contentTypeAlias, parentId);
-                if (uow.Events.DispatchCancelable(Creating, this, newEventArgs))
-                {
-                    uow.Commit();
-                    content.WasCancelled = true;
-                    return content;
-                }
-
-                content.CreatorId = userId;
-                content.WriterId = userId;
-                newEventArgs.CanCancel = false;
-                uow.Events.Dispatch(Created, this, newEventArgs);
-
-                uow.Commit();
-            }
-
-            return content;
-        }
-
-        /// <summary>
-        /// Creates an <see cref="IContent"/> object using the alias of the <see cref="IContentType"/>
-        /// that this Content should based on.
-        /// </summary>
-        /// <remarks>
-        /// Note that using this method will simply return a new IContent without any identity
-        /// as it has not yet been persisted. It is intended as a shortcut to creating new content objects
-        /// that does not invoke a save operation against the database.
-        /// </remarks>
-        /// <param name="name">Name of the Content object</param>
-        /// <param name="parent">Parent <see cref="IContent"/> object for the new Content</param>
-        /// <param name="contentTypeAlias">Alias of the <see cref="IContentType"/></param>
-        /// <param name="userId">Optional id of the user creating the content</param>
-        /// <returns><see cref="IContent"/></returns>
-        public IContent CreateContent(string name, IContent parent, string contentTypeAlias, int userId = 0)
-        {
-            if (parent == null) throw new ArgumentNullException("parent");
-
-            var contentType = FindContentTypeByAlias(contentTypeAlias);
-            var content = new Content(name, parent, contentType);
-            content.Path = string.Concat(parent.Path, ",", content.Id);
-
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var newEventArgs = new NewEventArgs<IContent>(content, contentTypeAlias, parent);
-                if (uow.Events.DispatchCancelable(Creating, this, newEventArgs))
-                {
-                    uow.Commit();
-                    content.WasCancelled = true;
-                    return content;
-                }
-
-                content.CreatorId = userId;
-                content.WriterId = userId;
-                newEventArgs.CanCancel = false;
-                uow.Events.Dispatch(Created, this, newEventArgs);
-
-                uow.Commit();
-            }
-
-            return content;
-        }
-
-        /// <summary>
-        /// Creates and saves an <see cref="IContent"/> object using the alias of the <see cref="IContentType"/>
-        /// that this Content should based on.
-        /// </summary>
-        /// <remarks>
-        /// This method returns an <see cref="IContent"/> object that has been persisted to the database
-        /// and therefor has an identity.
-        /// </remarks>
-        /// <param name="name">Name of the Content object</param>
-        /// <param name="parentId">Id of Parent for the new Content</param>
-        /// <param name="contentTypeAlias">Alias of the <see cref="IContentType"/></param>
-        /// <param name="userId">Optional id of the user creating the content</param>
-        /// <returns><see cref="IContent"/></returns>
-        public IContent CreateContentWithIdentity(string name, int parentId, string contentTypeAlias, int userId = 0)
-        {
-            var contentType = FindContentTypeByAlias(contentTypeAlias);
-            var content = new Content(name, parentId, contentType);
-
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                //NOTE: I really hate the notion of these Creating/Created events - they are so inconsistent, I've only just found
-                // out that in these 'WithIdentity' methods, the Saving/Saved events were not fired, wtf. Anyways, they're added now.
-                var newEventArgs = new NewEventArgs<IContent>(content, contentTypeAlias, parentId);
-                if (uow.Events.DispatchCancelable(Creating, this, newEventArgs))
-                {
-                    uow.Commit();
-                    content.WasCancelled = true;
-                    return content;
-                }
-
-                var saveEventArgs = new SaveEventArgs<IContent>(content);
-                if (uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
-                {
-                    uow.Commit();
-                    content.WasCancelled = true;
-                    return content;
-                }
-
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                content.CreatorId = userId;
-                content.WriterId = userId;
-
-                repository.AddOrUpdate(content);
-                repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-                saveEventArgs.CanCancel = false;
-                uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
-                newEventArgs.CanCancel = false;
-                uow.Events.Dispatch(Created, this, newEventArgs);
-
-                Audit(uow, AuditType.New, string.Format("Content '{0}' was created with Id {1}", name, content.Id), content.CreatorId, content.Id);
-                uow.Commit();
-            }
-
-            return content;
-        }
-
-        public IEnumerable<string> GetAnchorValuesFromRTEs(int id)
-        {
-            var result = new List<string>();
-
-            var content = GetById(id);
-
-            foreach (var contentProperty in content.Properties)
-            {
-                if (contentProperty.PropertyType.PropertyEditorAlias.InvariantEquals(Constants.PropertyEditors.TinyMCEAlias))
-                {
-                    var value = contentProperty.Value?.ToString();
-
-                    if (!string.IsNullOrEmpty(value))
-                    {
-                        result.AddRange(GetAnchorValuesFromRTEContent(value));
-                    }
-
-                }
-            }
-
-
-            return result;
-        }
-
-
-        public IEnumerable<string> GetAnchorValuesFromRTEContent(string rteContent)
-        {
-            var result = new List<string>();
-
-            var matches = AnchorRegex.Matches(rteContent);
-
-            foreach (Match match in matches)
-            {
-                result.Add(match.Value.Split('\"')[1]);
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// Creates and saves an <see cref="IContent"/> object using the alias of the <see cref="IContentType"/>
-        /// that this Content should based on.
-        /// </summary>
-        /// <remarks>
-        /// This method returns an <see cref="IContent"/> object that has been persisted to the database
-        /// and therefor has an identity.
-        /// </remarks>
-        /// <param name="name">Name of the Content object</param>
-        /// <param name="parent">Parent <see cref="IContent"/> object for the new Content</param>
-        /// <param name="contentTypeAlias">Alias of the <see cref="IContentType"/></param>
-        /// <param name="userId">Optional id of the user creating the content</param>
-        /// <returns><see cref="IContent"/></returns>
-        public IContent CreateContentWithIdentity(string name, IContent parent, string contentTypeAlias, int userId = 0)
-        {
-            if (parent == null) throw new ArgumentNullException("parent");
-
-            var contentType = FindContentTypeByAlias(contentTypeAlias);
-            var content = new Content(name, parent, contentType);
-
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                //NOTE: I really hate the notion of these Creating/Created events - they are so inconsistent, I've only just found
-                // out that in these 'WithIdentity' methods, the Saving/Saved events were not fired, wtf. Anyways, they're added now.
-                var newEventArgs = new NewEventArgs<IContent>(content, contentTypeAlias, parent);
-                if (uow.Events.DispatchCancelable(Creating, this, newEventArgs))
-                {
-                    uow.Commit();
-                    content.WasCancelled = true;
-                    return content;
-                }
-
-                var saveEventArgs = new SaveEventArgs<IContent>(content);
-                if (uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
-                {
-                    uow.Commit();
-                    content.WasCancelled = true;
-                    return content;
-                }
-
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                content.CreatorId = userId;
-                content.WriterId = userId;
-
-                repository.AddOrUpdate(content);
-                repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-                saveEventArgs.CanCancel = false;
-                uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
-                newEventArgs.CanCancel = false;
-                uow.Events.Dispatch(Created, this, newEventArgs);
-
-                Audit(uow, AuditType.New, string.Format("Content '{0}' was created with Id {1}", name, content.Id), content.CreatorId, content.Id);
-                uow.Commit();
-            }
-
-            return content;
-        }
-
-        /// <summary>
-        /// Gets an <see cref="IContent"/> object by Id
-        /// </summary>
-        /// <param name="id">Id of the Content to retrieve</param>
-        /// <returns><see cref="IContent"/></returns>
-        public IContent GetById(int id)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                return repository.Get(id);
-            }
-        }
-
-        /// <summary>
-        /// Gets <see cref="IContent"/> objects by Ids
-        /// </summary>
-        /// <param name="ids">Ids of the Content to retrieve</param>
-        /// <returns><see cref="IContent"/></returns>
-        public IEnumerable<IContent> GetByIds(IEnumerable<int> ids)
-        {
-            var idsArray = ids.ToArray();
-            if (idsArray.Length == 0) return Enumerable.Empty<IContent>();
-
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                // ensure that the result has the order based on the ids passed in
-                var result = repository.GetAll(idsArray);
-                var content = result.ToDictionary(x => x.Id, x => x);
-
-                var sortedResult = idsArray.Select(x =>
-                {
-                    IContent c;
-                    return content.TryGetValue(x, out c) ? c : null;
-                }).WhereNotNull();
-
-                return sortedResult;
-            }
-        }
-
-        /// <summary>
-        /// Gets <see cref="IContent"/> objects by Ids
-        /// </summary>
-        /// <param name="ids">Ids of the Content to retrieve</param>
-        /// <returns><see cref="IContent"/></returns>
-        public IEnumerable<IContent> GetByIds(IEnumerable<Guid> ids)
-        {
-            var idsArray = ids.ToArray();
-            if (idsArray.Length == 0) return Enumerable.Empty<IContent>();
-
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                // ensure that the result has the order based on the ids passed in
-                var result = repository.GetAll(idsArray);
-                var content = result.ToDictionary(x => x.Key, x => x);
-
-                var sortedResult = idsArray.Select(x =>
-                {
-                    IContent c;
-                    return content.TryGetValue(x, out c) ? c : null;
-                }).WhereNotNull();
-
-                return sortedResult;
-            }
-        }
-
-        /// <summary>
-        /// Gets an <see cref="IContent"/> object by its 'UniqueId'
-        /// </summary>
-        /// <param name="key">Guid key of the Content to retrieve</param>
-        /// <returns><see cref="IContent"/></returns>
-        public IContent GetById(Guid key)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                return repository.Get(key);
-            }
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects by the Id of the <see cref="IContentType"/>
-        /// </summary>
-        /// <param name="id">Id of the <see cref="IContentType"/></param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetContentOfContentType(int id)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                var query = Query<IContent>.Builder.Where(x => x.ContentTypeId == id);
-                return repository.GetByQuery(query);
-            }
-        }
-
-        internal IEnumerable<IContent> GetPublishedContentOfContentType(int id)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                var query = Query<IContent>.Builder.Where(x => x.ContentTypeId == id);
-                return repository.GetByPublishedVersion(query);
-            }
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects by Level
-        /// </summary>
-        /// <param name="level">The level to retrieve Content from</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetByLevel(int level)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                var query = Query<IContent>.Builder.Where(x => x.Level == level && x.Path.StartsWith(Constants.System.RecycleBinContent.ToInvariantString()) == false);
-                return repository.GetByQuery(query);
-            }
-        }
-
-        /// <summary>
-        /// Gets a specific version of an <see cref="IContent"/> item.
-        /// </summary>
-        /// <param name="versionId">Id of the version to retrieve</param>
-        /// <returns>An <see cref="IContent"/> item</returns>
-        public IContent GetByVersion(Guid versionId)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                return repository.GetByVersion(versionId);
-            }
-        }
-
-
-        /// <summary>
-        /// Gets a collection of an <see cref="IContent"/> objects versions by Id
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetVersions(int id)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                return repository.GetAllVersions(id);
-            }
-        }
-
-        /// <summary>
-        /// Gets a list of all version Ids for the given content item ordered so latest is first
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="maxRows">The maximum number of rows to return</param>
-        /// <returns></returns>
-        public IEnumerable<Guid> GetVersionIds(int id, int maxRows)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                return repository.GetVersionIds(id, maxRows);
-            }
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects, which are ancestors of the current content.
-        /// </summary>
-        /// <param name="id">Id of the <see cref="IContent"/> to retrieve ancestors for</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetAncestors(int id)
-        {
-            var content = GetById(id);
-            return GetAncestors(content);
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects, which are ancestors of the current content.
-        /// </summary>
-        /// <param name="content"><see cref="IContent"/> to retrieve ancestors for</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetAncestors(IContent content)
-        {
-            //null check otherwise we get exceptions
-            if (content.Path.IsNullOrWhiteSpace()) return Enumerable.Empty<IContent>();
-
-            var ids = content.Path.Split(',').Where(x => x != Constants.System.Root.ToInvariantString() && x != content.Id.ToString(CultureInfo.InvariantCulture)).Select(int.Parse).ToArray();
-            if (ids.Any() == false)
-                return new List<IContent>();
-
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                return repository.GetAll(ids);
-            }
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
-        /// </summary>
-        /// <param name="id">Id of the Parent to retrieve Children from</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetChildren(int id)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                var query = Query<IContent>.Builder.Where(x => x.ParentId == id);
-                return repository.GetByQuery(query).OrderBy(x => x.SortOrder);
-            }
-        }
-
-        [Obsolete("Use the overload with 'long' parameter types instead")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public IEnumerable<IContent> GetPagedChildren(int id, int pageIndex, int pageSize, out int totalChildren,
-            string orderBy, Direction orderDirection, string filter = "")
-        {
-            long total;
-            var result = GetPagedChildren(id, Convert.ToInt64(pageIndex), pageSize, out total, orderBy, orderDirection, true, filter);
-            totalChildren = Convert.ToInt32(total);
-            return result;
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
-        /// </summary>
-        /// <param name="id">Id of the Parent to retrieve Children from</param>
-        /// <param name="pageIndex">Page index (zero based)</param>
-        /// <param name="pageSize">Page size</param>
-        /// <param name="totalChildren">Total records query would return without paging</param>
-        /// <param name="orderBy">Field to order by</param>
-        /// <param name="orderDirection">Direction to order by</param>
-        /// <param name="filter">Search text filter</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetPagedChildren(int id, long pageIndex, int pageSize, out long totalChildren,
-            string orderBy, Direction orderDirection, string filter = "")
-        {
-            return GetPagedChildren(id, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, true, filter);
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
-        /// </summary>
-        /// <param name="id">Id of the Parent to retrieve Children from</param>
-        /// <param name="pageIndex">Page index (zero based)</param>
-        /// <param name="pageSize">Page size</param>
-        /// <param name="totalChildren">Total records query would return without paging</param>
-        /// <param name="orderBy">Field to order by</param>
-        /// <param name="orderDirection">Direction to order by</param>
-        /// <param name="orderBySystemField">Flag to indicate when ordering by system field</param>
-        /// <param name="filter">Search text filter</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetPagedChildren(int id, long pageIndex, int pageSize, out long totalChildren,
-            string orderBy, Direction orderDirection, bool orderBySystemField, string filter)
-        {
-            Mandate.ParameterCondition(pageIndex >= 0, "pageIndex");
-            Mandate.ParameterCondition(pageSize > 0, "pageSize");
-
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                var query = Query<IContent>.Builder;
-                // always check for a parent - else it will also get decendants (and then you should use the GetPagedDescendants method)
-                query.Where(x => x.ParentId == id);
-
-                IQuery<IContent> filterQuery = null;
-                if (filter.IsNullOrWhiteSpace() == false)
-                {
-                    filterQuery = Query<IContent>.Builder.Where(x => x.Name.Contains(filter));
-                }
-                return repository.GetPagedResultsByQuery(query, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, orderBySystemField, filterQuery);
-            }
-        }
-
-        [Obsolete("Use the overload with 'long' parameter types instead")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public IEnumerable<IContent> GetPagedDescendants(int id, int pageIndex, int pageSize, out int totalChildren, string orderBy = "path", Direction orderDirection = Direction.Ascending, string filter = "")
-        {
-            long total;
-            var result = GetPagedDescendants(id, Convert.ToInt64(pageIndex), pageSize, out total, orderBy, orderDirection, true, filter);
-            totalChildren = Convert.ToInt32(total);
-            return result;
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
-        /// </summary>
-        /// <param name="id">Id of the Parent to retrieve Descendants from</param>
-        /// <param name="pageIndex">Page number</param>
-        /// <param name="pageSize">Page size</param>
-        /// <param name="totalChildren">Total records query would return without paging</param>
-        /// <param name="orderBy">Field to order by</param>
-        /// <param name="orderDirection">Direction to order by</param>
-        /// <param name="filter">Search text filter</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetPagedDescendants(int id, long pageIndex, int pageSize, out long totalChildren, string orderBy = "path", Direction orderDirection = Direction.Ascending, string filter = "")
-        {
-            return GetPagedDescendants(id, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, true, filter);
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
-        /// </summary>
-        /// <param name="id">Id of the Parent to retrieve Descendants from</param>
-        /// <param name="pageIndex">Page number</param>
-        /// <param name="pageSize">Page size</param>
-        /// <param name="totalChildren">Total records query would return without paging</param>
-        /// <param name="orderBy">Field to order by</param>
-        /// <param name="orderDirection">Direction to order by</param>
-        /// <param name="orderBySystemField">Flag to indicate when ordering by system field</param>
-        /// <param name="filter">Search text filter</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetPagedDescendants(int id, long pageIndex, int pageSize, out long totalChildren, string orderBy, Direction orderDirection, bool orderBySystemField, string filter)
-        {
-            Mandate.ParameterCondition(pageIndex >= 0, "pageIndex");
-            Mandate.ParameterCondition(pageSize > 0, "pageSize");
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                // get query - if the id is System Root, then just get all
-                var query = Query<IContent>.Builder;
-                if (id != Constants.System.Root)
-                {
-                    var entityRepository = RepositoryFactory.CreateEntityRepository(uow);
-                    var contentPath = entityRepository.GetAllPaths(Constants.ObjectTypes.DocumentGuid, id).ToArray();
-                    if (contentPath.Length == 0)
-                    {
-                        totalChildren = 0;
-                        return Enumerable.Empty<IContent>();
-                    }
-                    query.Where(x => x.Path.SqlStartsWith(string.Format("{0},", contentPath[0].Path), TextColumnType.NVarchar));
-                }
-
-
-                // get filter
-                IQuery<IContent> filterQuery = null;
-                if (filter.IsNullOrWhiteSpace() == false)
-                    filterQuery = Query<IContent>.Builder.Where(x => x.Name.Contains(filter));
-
-                return repository.GetPagedResultsByQuery(query, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, orderBySystemField, filterQuery);
-            }
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
-        /// </summary>
-        /// <param name="id">Id of the Parent to retrieve Descendants from</param>
-        /// <param name="pageIndex">Page number</param>
-        /// <param name="pageSize">Page size</param>
-        /// <param name="totalChildren">Total records query would return without paging</param>
-        /// <param name="orderBy">Field to order by</param>
-        /// <param name="orderDirection">Direction to order by</param>
-        /// <param name="orderBySystemField">Flag to indicate when ordering by system field</param>
-        /// <param name="filter">Search filter</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetPagedDescendants(int id, long pageIndex, int pageSize, out long totalChildren, string orderBy, Direction orderDirection, bool orderBySystemField, IQuery<IContent> filter)
-        {
-            Mandate.ParameterCondition(pageIndex >= 0, "pageIndex");
-            Mandate.ParameterCondition(pageSize > 0, "pageSize");
-
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                // get query - if the id is System Root, then just get all
-                var query = Query<IContent>.Builder;
-                if (id != Constants.System.Root)
-                {
-                    var entityRepository = RepositoryFactory.CreateEntityRepository(uow);
-                    var contentPath = entityRepository.GetAllPaths(Constants.ObjectTypes.DocumentGuid, id).ToArray();
-                    if (contentPath.Length == 0)
-                    {
-                        totalChildren = 0;
-                        return Enumerable.Empty<IContent>();
-                    }
-                    query.Where(x => x.Path.SqlStartsWith(string.Format("{0},", contentPath[0].Path), TextColumnType.NVarchar));
-                }
-
-                return repository.GetPagedResultsByQuery(query, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, orderBySystemField, filter);
-            }
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects by its name or partial name
-        /// </summary>
-        /// <param name="parentId">Id of the Parent to retrieve Children from</param>
-        /// <param name="name">Full or partial name of the children</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetChildrenByName(int parentId, string name)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                var query = Query<IContent>.Builder.Where(x => x.ParentId == parentId && x.Name.Contains(name));
-                return repository.GetByQuery(query);
-            }
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
-        /// </summary>
-        /// <param name="id">Id of the Parent to retrieve Descendants from</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetDescendants(int id)
-        {
-            var content = GetById(id);
-            return content == null ? Enumerable.Empty<IContent>() : GetDescendants(content);
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
-        /// </summary>
-        /// <param name="content"><see cref="IContent"/> item to retrieve Descendants from</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetDescendants(IContent content)
-        {
-            //This is a check to ensure that the path is correct for this entity to avoid problems like: http://issues.umbraco.org/issue/U4-9336 due to data corruption
-            if (content.ValidatePath() == false)
-                throw new InvalidDataException(string.Format("The content item {0} has an invalid path: {1} with parentID: {2}", content.Id, content.Path, content.ParentId));
-
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                var pathMatch = content.Path + ",";
-                var query = Query<IContent>.Builder.Where(x => x.Path.StartsWith(pathMatch) && x.Id != content.Id);
-                return repository.GetByQuery(query);
-            }
-        }
-
-        /// <summary>
-        /// Gets the parent of the current content as an <see cref="IContent"/> item.
-        /// </summary>
-        /// <param name="id">Id of the <see cref="IContent"/> to retrieve the parent from</param>
-        /// <returns>Parent <see cref="IContent"/> object</returns>
-        public IContent GetParent(int id)
-        {
-            var content = GetById(id);
-            return GetParent(content);
-        }
-
-        /// <summary>
-        /// Gets the parent of the current content as an <see cref="IContent"/> item.
-        /// </summary>
-        /// <param name="content"><see cref="IContent"/> to retrieve the parent from</param>
-        /// <returns>Parent <see cref="IContent"/> object</returns>
-        public IContent GetParent(IContent content)
-        {
-            if (content.ParentId == Constants.System.Root || content.ParentId == Constants.System.RecycleBinContent)
-                return null;
-
-            return GetById(content.ParentId);
-        }
-
-        /// <summary>
-        /// Gets the published version of an <see cref="IContent"/> item
-        /// </summary>
-        /// <param name="id">Id of the <see cref="IContent"/> to retrieve version from</param>
-        /// <returns>An <see cref="IContent"/> item</returns>
-        public IContent GetPublishedVersion(int id)
-        {
-            var version = GetVersions(id);
-            return version.FirstOrDefault(x => x.Published);
-        }
-
-        /// <summary>
-        /// Gets the published version of a <see cref="IContent"/> item.
-        /// </summary>
-        /// <param name="content">The content item.</param>
-        /// <returns>The published version, if any; otherwise, null.</returns>
-        public IContent GetPublishedVersion(IContent content)
-        {
-            if (content.Published) return content;
-            return content.HasPublishedVersion
-                ? GetByVersion(content.PublishedVersionGuid)
-                : null;
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects, which reside at the first level / root
-        /// </summary>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetRootContent()
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                var query = Query<IContent>.Builder.Where(x => x.ParentId == Constants.System.Root);
-                return repository.GetByQuery(query);
-            }
-        }
-
-        /// <summary>
-        /// Gets all published content items
-        /// </summary>
-        /// <returns></returns>
-        internal IEnumerable<IContent> GetAllPublished()
-        {
-            //create it once if it is needed (no need for locking here)
-            if (_notTrashedQuery == null)
-            {
-                _notTrashedQuery = Query<IContent>.Builder.Where(x => x.Trashed == false);
-            }
-
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                return repository.GetByPublishedVersion(_notTrashedQuery);
-            }
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects, which has an expiration date less than or equal to today.
-        /// </summary>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetContentForExpiration()
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                var query = Query<IContent>.Builder.Where(x => x.ExpireDate <= DateTime.Now);
-                return repository.GetByQuery(query).Where(x => x.HasPublishedVersion);
-            }
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects, which has a release date less than or equal to today.
-        /// </summary>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetContentForRelease()
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                var query = Query<IContent>.Builder.Where(x => x.Published == false && x.ReleaseDate <= DateTime.Now);
-                return repository.GetByQuery(query);
-            }
-        }
-
-        /// <summary>
-        /// Gets a collection of an <see cref="IContent"/> objects, which resides in the Recycle Bin
-        /// </summary>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetContentInRecycleBin()
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                var query = Query<IContent>.Builder.Where(x => x.Path.StartsWith(Constants.System.RecycleBinContentPathPrefix));
-                return repository.GetByQuery(query);
-            }
-        }
-
-        /// <summary>
-        /// Checks whether an <see cref="IContent"/> item has any children
-        /// </summary>
-        /// <param name="id">Id of the <see cref="IContent"/></param>
-        /// <returns>True if the content has any children otherwise False</returns>
-        public bool HasChildren(int id)
-        {
-            return CountChildren(id) > 0;
-        }
-
-        internal int CountChildren(int id)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                var query = Query<IContent>.Builder.Where(x => x.ParentId == id);
-                return repository.Count(query);
-            }
-        }
-
-        /// <summary>
-        /// Checks whether an <see cref="IContent"/> item has any published versions
-        /// </summary>
-        /// <param name="id">Id of the <see cref="IContent"/></param>
-        /// <returns>True if the content has any published version otherwise False</returns>
-        public bool HasPublishedVersion(int id)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                var query = Query<IContent>.Builder.Where(x => x.Published == true && x.Id == id && x.Trashed == false);
-                return repository.Count(query) > 0;
-            }
-        }
-
-        /// <summary>
-        /// Checks if the passed in <see cref="IContent"/> can be published based on the anscestors publish state.
-        /// </summary>
-        /// <param name="content"><see cref="IContent"/> to check if anscestors are published</param>
-        /// <returns>True if the Content can be published, otherwise False</returns>
-        public bool IsPublishable(IContent content)
-        {
-            int[] ids;
-            if (content.HasIdentity)
-            {
-                // get ids from path (we have identity)
-                // skip the first one that has to be -1 - and we don't care
-                // skip the last one that has to be "this" - and it's ok to stop at the parent
-                ids = content.Path.Split(',').Skip(1).SkipLast().Select(int.Parse).ToArray();
-            }
-            else
-            {
-                // no path yet (no identity), have to move up to parent
-                // skip the first one that has to be -1 - and we don't care
-                // don't skip the last one that is "parent"
-                var parent = GetById(content.ParentId);
-                if (parent == null) return false;
-                ids = parent.Path.Split(',').Skip(1).Select(int.Parse).ToArray();
-            }
-            if (ids.Length == 0)
-                return false;
-
-            // if the first one is recycle bin, fail fast
-            if (ids[0] == Constants.System.RecycleBinContent)
-                return false;
-
-            // fixme - move to repository?
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var sql = new Sql(@"
-                    SELECT id
-                    FROM umbracoNode
-                    JOIN cmsDocument ON umbracoNode.id=cmsDocument.nodeId AND cmsDocument.published=@0
-                    WHERE umbracoNode.trashed=@1 AND umbracoNode.id IN (@2)",
-                    true, false, ids);
-                var x = uow.Database.Fetch<int>(sql);
-                return ids.Length == x.Count;
-            }
-        }
-
-        /// <summary>
-        /// This will rebuild the xml structures for content in the database.
-        /// </summary>
-        /// <param name="userId">This is not used for anything</param>
-        /// <returns>True if publishing succeeded, otherwise False</returns>
-        /// <remarks>
-        /// This is used for when a document type alias or a document type property is changed, the xml will need to
-        /// be regenerated.
-        /// </remarks>
-        public bool RePublishAll(int userId = 0)
-        {
-            try
-            {
-                RebuildXmlStructures();
-                return true;
-            }
-            catch (Exception ex)
-            {
-                Logger.Error<ContentService>("An error occurred executing RePublishAll", ex);
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// This will rebuild the xml structures for content in the database.
-        /// </summary>
-        /// <param name="contentTypeIds">
-        /// If specified will only rebuild the xml for the content type's specified, otherwise will update the structure
-        /// for all published content.
-        /// </param>
-        internal void RePublishAll(params int[] contentTypeIds)
-        {
-            try
-            {
-                RebuildXmlStructures(contentTypeIds);
-            }
-            catch (Exception ex)
-            {
-                Logger.Error<ContentService>("An error occurred executing RePublishAll", ex);
-            }
-        }
-
-        /// <summary>
-        /// Publishes a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to publish</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <returns>True if publishing succeeded, otherwise False</returns>
-        public bool Publish(IContent content, int userId = 0)
-        {
-            var result = SaveAndPublishDo(content, userId);
-            Logger.Info<ContentService>("Call was made to ContentService.Publish, use PublishWithStatus instead since that method will provide more detailed information on the outcome");
-            return result.Success;
-        }
-
-        /// <summary>
-        /// Publishes a <see cref="IContent"/> object and all its children
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to publish along with its children</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <param name="includeUnpublished"></param>
-        /// <returns>The list of statuses for all published items</returns>
-        IEnumerable<Attempt<PublishStatus>> IContentServiceOperations.PublishWithChildren(IContent content, int userId, bool includeUnpublished)
-        {
-            return PublishWithChildrenDo(content, userId, includeUnpublished);
-        }
-
-        /// <summary>
-        /// Saves and Publishes a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to save and publish</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise save events.</param>
-        /// <returns>True if publishing succeeded, otherwise False</returns>
-        Attempt<PublishStatus> IContentServiceOperations.SaveAndPublish(IContent content, int userId, bool raiseEvents)
-        {
-            return SaveAndPublishDo(content, userId, raiseEvents);
-        }
-
-        /// <summary>
-        /// Deletes an <see cref="IContent"/> object by moving it to the Recycle Bin
-        /// </summary>
-        /// <remarks>Move an item to the Recycle Bin will result in the item being unpublished</remarks>
-        /// <param name="content">The <see cref="IContent"/> to delete</param>
-        /// <param name="userId">Optional Id of the User deleting the Content</param>
-        Attempt<OperationStatus> IContentServiceOperations.MoveToRecycleBin(IContent content, int userId)
-        {
-            return MoveToRecycleBinDo(content, userId, false);
-        }
-
-        /// <summary>
-        /// Deletes an <see cref="IContent"/> object by moving it to the Recycle Bin
-        /// </summary>
-        /// <remarks>Move an item to the Recycle Bin will result in the item being unpublished</remarks>
-        /// <param name="content">The <see cref="IContent"/> to delete</param>
-        /// <param name="userId">Optional Id of the User deleting the Content</param>
-        /// <param name="ignoreDescendants">
-        /// A boolean indicating to ignore this item's descendant list from also being moved to the recycle bin. This is required for the DeleteContentOfTypes method
-        /// because it has already looked up all descendant nodes that will need to be recycled
-        /// TODO: Fix all of this, it will require a reasonable refactor and most of this stuff should be done at the repo level instead of service sub operations
-        /// </param>
-        private Attempt<OperationStatus> MoveToRecycleBinDo(IContent content, int userId, bool ignoreDescendants)
-        {
-            var evtMsgs = EventMessagesFactory.Get();
-            using (new WriteLock(Locker))
-            {
-                using (var uow = UowProvider.GetUnitOfWork())
-                {
-                    //Hack: this ensures that the entity's path is valid and if not it fixes/persists it
-                    //see: http://issues.umbraco.org/issue/U4-9336
-                    content.EnsureValidPath(Logger, entity => GetById(entity.ParentId), QuickUpdate);
-                    var originalPath = content.Path;
-                    var moveEventInfo = new MoveEventInfo<IContent>(content, originalPath, Constants.System.RecycleBinContent);
-                    var moveEventArgs = new MoveEventArgs<IContent>(evtMsgs, moveEventInfo);
-                    if (uow.Events.DispatchCancelable(Trashing, this, moveEventArgs, "Trashing"))
-                    {
-                        uow.Commit();
-                        return OperationStatus.Cancelled(evtMsgs);
-                    }
-                    var moveInfo = new List<MoveEventInfo<IContent>>
-                    {
-                        moveEventInfo
-                    };
-
-                    //get descendents to process of the content item that is being moved to trash - must be done before changing the state below
-                    //must be processed with shallowest levels first
-                    var descendants = ignoreDescendants ? Enumerable.Empty<IContent>() : GetDescendants(content).OrderBy(x => x.Level);
-
-                    //Do the updates for this item
-                    var repository = RepositoryFactory.CreateContentRepository(uow);
-                    //Make sure that published content is unpublished before being moved to the Recycle Bin
-                    if (HasPublishedVersion(content.Id))
-                    {
-                        //TODO: this shouldn't be a 'sub operation', and if it needs to be it cannot raise events and cannot be cancelled!
-                        UnPublish(content, userId);
-                    }
-                    content.WriterId = userId;
-                    content.ChangeTrashedState(true);
-                    repository.AddOrUpdate(content);
-
-                    //Loop through descendants to update their trash state, but ensuring structure by keeping the ParentId
-                    foreach (var descendant in descendants)
-                    {
-                        //TODO: this shouldn't be a 'sub operation', and if it needs to be it cannot raise events and cannot be cancelled!
-                        UnPublish(descendant, userId);
-                        descendant.WriterId = userId;
-                        descendant.ChangeTrashedState(true, descendant.ParentId);
-                        repository.AddOrUpdate(descendant);
-
-                        moveInfo.Add(new MoveEventInfo<IContent>(descendant, descendant.Path, descendant.ParentId));
-                    }
-
-                    moveEventArgs.CanCancel = false;
-                    moveEventArgs.MoveInfoCollection = moveInfo;
-                    uow.Events.Dispatch(Trashed, this, moveEventArgs, "Trashed");
-
-                    Audit(uow, AuditType.Move, "Move Content to Recycle Bin performed by user", userId, content.Id);
-                    uow.Commit();
-                }
-
-                return OperationStatus.Success(evtMsgs);
-            }
-        }
-
-        /// <summary>
-        /// UnPublishes a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to publish</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <returns>True if unpublishing succeeded, otherwise False</returns>
-        Attempt<UnPublishStatus> IContentServiceOperations.UnPublish(IContent content, int userId)
-        {
-            return UnPublishDo(content, false, userId);
-        }
-
-        /// <summary>
-        /// Publishes a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to publish</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <returns>True if publishing succeeded, otherwise False</returns>
-        public Attempt<PublishStatus> PublishWithStatus(IContent content, int userId = 0)
-        {
-            return ((IContentServiceOperations)this).Publish(content, userId);
-        }
-
-        /// <summary>
-        /// Publishes a <see cref="IContent"/> object and all its children
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to publish along with its children</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <returns>True if publishing succeeded, otherwise False</returns>
-        [Obsolete("Use PublishWithChildrenWithStatus instead, that method will provide more detailed information on the outcome and also allows the includeUnpublished flag")]
-        public bool PublishWithChildren(IContent content, int userId = 0)
-        {
-            var result = PublishWithChildrenDo(content, userId, true);
-
-            //This used to just return false only when the parent content failed, otherwise would always return true so we'll
-            // do the same thing for the moment
-            if (result.All(x => x.Result.ContentItem.Id != content.Id))
-                return false;
-
-            return result.Single(x => x.Result.ContentItem.Id == content.Id).Success;
-        }
-
-        /// <summary>
-        /// Publishes a <see cref="IContent"/> object and all its children
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to publish along with its children</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <param name="includeUnpublished">set to true if you want to also publish children that are currently unpublished</param>
-        /// <returns>True if publishing succeeded, otherwise False</returns>
-        public IEnumerable<Attempt<PublishStatus>> PublishWithChildrenWithStatus(IContent content, int userId = 0, bool includeUnpublished = false)
-        {
-            return ((IContentServiceOperations)this).PublishWithChildren(content, userId, includeUnpublished);
-        }
-
-        /// <summary>
-        /// UnPublishes a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to publish</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <returns>True if unpublishing succeeded, otherwise False</returns>
-        public bool UnPublish(IContent content, int userId = 0)
-        {
-            var attempt = ((IContentServiceOperations)this).UnPublish(content, userId);
-            LogHelper.Debug<ContentService>(string.Format("Result of unpublish attempt: {0}", attempt.Result.StatusType));
-            return attempt.Success;
-        }
-
-        /// <summary>
-        /// Saves and Publishes a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to save and publish</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise save events.</param>
-        /// <returns>True if publishing succeeded, otherwise False</returns>
-        [Obsolete("Use SaveAndPublishWithStatus instead, that method will provide more detailed information on the outcome")]
-        public bool SaveAndPublish(IContent content, int userId = 0, bool raiseEvents = true)
-        {
-            var result = SaveAndPublishDo(content, userId, raiseEvents);
-            return result.Success;
-        }
-
-        /// <summary>
-        /// Saves and Publishes a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to save and publish</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise save events.</param>
-        /// <returns>True if publishing succeeded, otherwise False</returns>
-        public Attempt<PublishStatus> SaveAndPublishWithStatus(IContent content, int userId = 0, bool raiseEvents = true)
-        {
-            return ((IContentServiceOperations)this).SaveAndPublish(content, userId, raiseEvents);
-        }
-
-        public IContent GetBlueprintById(int id)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentBlueprintRepository(uow);
-                var blueprint = repository.Get(id);
-                if (blueprint != null)
-                    ((Content) blueprint).IsBlueprint = true;
-                return blueprint;
-            }
-        }
-
-        public IContent GetBlueprintById(Guid id)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentBlueprintRepository(uow);
-                var blueprint = repository.Get(id);
-                if (blueprint != null)
-                    ((Content)blueprint).IsBlueprint = true;
-                return blueprint;
-            }
-        }
-
-        public void SaveBlueprint(IContent content, int userId = 0)
-        {
-            //always ensure the blueprint is at the root
-            if (content.ParentId != -1)
-                content.ParentId = -1;
-
-            ((Content) content).IsBlueprint = true;
-
-            using (new WriteLock(Locker))
-            {
-                using (var uow = UowProvider.GetUnitOfWork())
-                {
-                    if (string.IsNullOrWhiteSpace(content.Name))
-                    {
-                        throw new ArgumentException("Cannot save content blueprint with empty name.");
-                    }
-
-                    var repository = RepositoryFactory.CreateContentBlueprintRepository(uow);
-
-                    if (content.HasIdentity == false)
-                    {
-                        content.CreatorId = userId;
-                    }
-                    content.WriterId = userId;
-
-                    repository.AddOrUpdate(content);
-
-                    uow.Events.Dispatch(SavedBlueprint, this, new SaveEventArgs<IContent>(content), "SavedBlueprint");
-
-                    uow.Commit();
-                }
-            }
-        }
-
-        public void DeleteBlueprint(IContent content, int userId = 0)
-        {
-            using (new WriteLock(Locker))
-            {
-                using (var uow = UowProvider.GetUnitOfWork())
-                {
-                    var repository = RepositoryFactory.CreateContentBlueprintRepository(uow);
-                    repository.Delete(content);
-                    uow.Events.Dispatch(DeletedBlueprint, this, new DeleteEventArgs<IContent>(content), "DeletedBlueprint");
-                    uow.Commit();
-                }
-            }
-        }
-
-        public IContent CreateContentFromBlueprint(IContent blueprint, string name, int userId = 0)
-        {
-            if (blueprint == null) throw new ArgumentNullException("blueprint");
-
-            var contentType = blueprint.ContentType;
-            var content = new Content(name, -1, contentType);
-            content.Path = string.Concat(content.ParentId.ToString(), ",", content.Id);
-
-            content.CreatorId = userId;
-            content.WriterId = userId;
-
-            foreach (var property in blueprint.Properties)
-                content.SetValue(property.Alias, property.Value);
-
-            return content;
-        }
-
-        public void DeleteBlueprintsOfTypes(IEnumerable<int> contentTypeIds, int userId = 0)
-        {
-            using (new WriteLock(Locker))
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var repository = RepositoryFactory.CreateContentBlueprintRepository(uow);
-
-                var contentTypeIdsA = contentTypeIds.ToArray();
-                var query = new Query<IContent>();
-                if (contentTypeIdsA.Length > 0)
-                {
-                    query.Where(x => contentTypeIdsA.Contains(x.ContentTypeId));
-                }
-                var blueprints = repository.GetByQuery(query).Select(x =>
-                {
-                    ((Content) x).IsBlueprint = true;
-                    return x;
-                }).ToArray();
-
-                foreach (var blueprint in blueprints)
-                {
-                    repository.Delete(blueprint);
-                }
-
-                uow.Events.Dispatch(DeletedBlueprint, this, new DeleteEventArgs<IContent>(blueprints), "DeletedBlueprint");
-                uow.Commit();
-            }
-        }
-
-        public void DeleteBlueprintsOfType(int contentTypeId, int userId = 0)
-        {
-            DeleteBlueprintsOfTypes(new[] {contentTypeId}, userId);
-        }
-
-        /// <summary>
-        /// Saves a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to save</param>
-        /// <param name="userId">Optional Id of the User saving the Content</param>
-        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
-        public void Save(IContent content, int userId = 0, bool raiseEvents = true)
-        {
-            ((IContentServiceOperations)this).Save(content, userId, raiseEvents);
-        }
-
-        /// <summary>
-        /// Saves a collection of <see cref="IContent"/> objects.
-        /// </summary>
-        /// <param name="contents">Collection of <see cref="IContent"/> to save</param>
-        /// <param name="userId">Optional Id of the User saving the Content</param>
-        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
-        Attempt<OperationStatus> IContentServiceOperations.Save(IEnumerable<IContent> contents, int userId, bool raiseEvents)
-        {
-            var asArray = contents.ToArray();
-
-            var evtMsgs = EventMessagesFactory.Get();
-
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var saveEventArgs = new SaveEventArgs<IContent>(asArray, evtMsgs);
-                if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
-                {
-                    uow.Commit();
-                    return OperationStatus.Cancelled(evtMsgs);
-                }
-
-                // todo - understand what's a lock in a scope?
-                // (though, these locks are refactored in v8)
-                using (new WriteLock(Locker))
-                {
-                    var containsNew = asArray.Any(x => x.HasIdentity == false);
-                    var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                    if (containsNew)
-                    {
-                        foreach (var content in asArray)
-                        {
-                            content.WriterId = userId;
-
-                            //Only change the publish state if the "previous" version was actually published
-                            if (content.Published)
-                                content.ChangePublishedState(PublishedState.Saved);
-
-                            repository.AddOrUpdate(content);
-                            //add or update preview
-                            repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-                        }
-                    }
-                    else
-                    {
-                        foreach (var content in asArray)
-                        {
-                            content.WriterId = userId;
-                            repository.AddOrUpdate(content);
-                            //add or update preview
-                            repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-                        }
-                    }
-                }
-
-                if (raiseEvents)
-                {
-                    saveEventArgs.CanCancel = false;
-                    uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
-                }
-
-                Audit(uow, AuditType.Save, "Bulk Save content performed by user", userId == -1 ? 0 : userId, Constants.System.Root);
-                uow.Commit();
-
-                return OperationStatus.Success(evtMsgs);
-            }
-        }
-
-        /// <summary>
-        /// Permanently deletes an <see cref="IContent"/> object.
-        /// </summary>
-        /// <remarks>
-        /// This method will also delete associated media files, child content and possibly associated domains.
-        /// </remarks>
-        /// <remarks>Please note that this method will completely remove the Content from the database</remarks>
-        /// <param name="content">The <see cref="IContent"/> to delete</param>
-        /// <param name="userId">Optional Id of the User deleting the Content</param>
-        Attempt<OperationStatus> IContentServiceOperations.Delete(IContent content, int userId)
-        {
-            var evtMsgs = EventMessagesFactory.Get();
-
-            using (new WriteLock(Locker))
-            {
-                using (var uow = UowProvider.GetUnitOfWork())
-                {
-                    var deleteEventArgs = new DeleteEventArgs<IContent>(content, evtMsgs);
-                    if (uow.Events.DispatchCancelable(Deleting, this, deleteEventArgs, "Deleting"))
-                    {
-                        uow.Commit();
-                        return OperationStatus.Cancelled(evtMsgs);
-                    }
-
-                    //Make sure that published content is unpublished before being deleted
-                    if (HasPublishedVersion(content.Id))
-                    {
-                        UnPublish(content, userId);
-                    }
-
-                    //Delete children before deleting the 'possible parent'
-                    var children = GetChildren(content.Id);
-                    foreach (var child in children)
-                    {
-                        Delete(child, userId);
-                    }
-
-                    var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                    repository.Delete(content);
-
-                    deleteEventArgs.CanCancel = false;
-                    uow.Events.Dispatch(Deleted, this, deleteEventArgs, "Deleted");
-
-                    Audit(uow, AuditType.Delete, "Delete Content performed by user", userId, content.Id);
-                    uow.Commit();
-                }
-
-                return OperationStatus.Success(evtMsgs);
-            }
-        }
-
-        /// <summary>
-        /// Publishes a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to publish</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <returns>The published status attempt</returns>
-        Attempt<PublishStatus> IContentServiceOperations.Publish(IContent content, int userId)
-        {
-            return SaveAndPublishDo(content, userId);
-        }
-
-        /// <summary>
-        /// Saves a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to save</param>
-        /// <param name="userId">Optional Id of the User saving the Content</param>
-        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
-        Attempt<OperationStatus> IContentServiceOperations.Save(IContent content, int userId, bool raiseEvents)
-        {
-            return Save(content, true, userId, raiseEvents);
-        }
-
-        /// <summary>
-        /// Saves a collection of <see cref="IContent"/> objects.
-        /// </summary>
-        /// <remarks>
-        /// If the collection of content contains new objects that references eachother by Id or ParentId,
-        /// then use the overload Save method with a collection of Lazy <see cref="IContent"/>.
-        /// </remarks>
-        /// <param name="contents">Collection of <see cref="IContent"/> to save</param>
-        /// <param name="userId">Optional Id of the User saving the Content</param>
-        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
-        public void Save(IEnumerable<IContent> contents, int userId = 0, bool raiseEvents = true)
-        {
-            ((IContentServiceOperations)this).Save(contents, userId, raiseEvents);
-        }
-
-        /// <summary>
-        /// Deletes all content of the specified types. All Descendants of deleted content that is not of these types is moved to Recycle Bin.
-        /// </summary>
-        /// <param name="contentTypeIds">Id of the <see cref="IContentType"/></param>
-        /// <param name="userId">Optional Id of the user issueing the delete operation</param>
-        public void DeleteContentOfTypes(IEnumerable<int> contentTypeIds, int userId = 0)
-        {
-            using (new WriteLock(Locker))
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                //track the 'root' items of the collection of nodes discovered to delete, we need to use
-                //these items to lookup descendants that are not of this doc type so they can be transfered
-                //to the recycle bin
-                IDictionary<string, IContent> rootItems;
-                var contentToDelete = this.TrackDeletionsForDeleteContentOfTypes(contentTypeIds, repository, out rootItems).ToArray();
-
-                if (uow.Events.DispatchCancelable(Deleting, this, new DeleteEventArgs<IContent>(contentToDelete), "Deleting"))
-                {
-                    uow.Commit();
-                    return;
-                }
-
-                //Determine the items that will need to be recycled (that are children of these content items but not of these content types)
-                var contentToRecycle = this.TrackTrashedForDeleteContentOfTypes(contentTypeIds, rootItems, repository);
-
-                //move each item to the bin starting with the deepest items
-                foreach (var child in contentToRecycle.OrderByDescending(x => x.Level))
-                {
-                    MoveToRecycleBinDo(child, userId, true);
-                }
-
-                foreach (var content in contentToDelete)
-                {
-                    Delete(content, userId);
-                }
-
-                Audit(uow, AuditType.Delete,
-                    string.Format("Delete Content of Types {0} performed by user", string.Join(",", contentTypeIds)),
-                    userId, Constants.System.Root);
-                uow.Commit();
-            }
-        }
-
-        /// <summary>
-        /// Deletes all content of specified type. All children of deleted content is moved to Recycle Bin.
-        /// </summary>
-        /// <remarks>This needs extra care and attention as its potentially a dangerous and extensive operation</remarks>
-        /// <param name="contentTypeId">Id of the <see cref="IContentType"/></param>
-        /// <param name="userId">Optional Id of the user issueing the delete operation</param>
-        public void DeleteContentOfType(int contentTypeId, int userId = 0)
-        {
-            DeleteContentOfTypes(new[] {contentTypeId}, userId);
-        }
-
-        /// <summary>
-        /// Permanently deletes an <see cref="IContent"/> object as well as all of its Children.
-        /// </summary>
-        /// <remarks>
-        /// This method will also delete associated media files, child content and possibly associated domains.
-        /// </remarks>
-        /// <remarks>Please note that this method will completely remove the Content from the database</remarks>
-        /// <param name="content">The <see cref="IContent"/> to delete</param>
-        /// <param name="userId">Optional Id of the User deleting the Content</param>
-        public void Delete(IContent content, int userId = 0)
-        {
-            ((IContentServiceOperations)this).Delete(content, userId);
-        }
-
-        /// <summary>
-        /// Permanently deletes versions from an <see cref="IContent"/> object prior to a specific date.
-        /// This method will never delete the latest version of a content item.
-        /// </summary>
-        /// <param name="id">Id of the <see cref="IContent"/> object to delete versions from</param>
-        /// <param name="versionDate">Latest version date</param>
-        /// <param name="userId">Optional Id of the User deleting versions of a Content object</param>
-        public void DeleteVersions(int id, DateTime versionDate, int userId = 0)
-        {
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var deleteRevisionsEventArgs = new DeleteRevisionsEventArgs(id, dateToRetain: versionDate);
-                if (uow.Events.DispatchCancelable(DeletingVersions, this, deleteRevisionsEventArgs, "DeletingVersions"))
-                {
-                    uow.Commit();
-                    return;
-                }
-
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                repository.DeleteVersions(id, versionDate);
-                deleteRevisionsEventArgs.CanCancel = false;
-                uow.Events.Dispatch(DeletedVersions, this, deleteRevisionsEventArgs, "DeletedVersions");
-
-                Audit(uow, AuditType.Delete, "Delete Content by version date performed by user", userId, Constants.System.Root);
-                uow.Commit();
-            }
-        }
-
-        /// <summary>
-        /// Permanently deletes specific version(s) from an <see cref="IContent"/> object.
-        /// This method will never delete the latest version of a content item.
-        /// </summary>
-        /// <param name="id">Id of the <see cref="IContent"/> object to delete a version from</param>
-        /// <param name="versionId">Id of the version to delete</param>
-        /// <param name="deletePriorVersions">Boolean indicating whether to delete versions prior to the versionId</param>
-        /// <param name="userId">Optional Id of the User deleting versions of a Content object</param>
-        public void DeleteVersion(int id, Guid versionId, bool deletePriorVersions, int userId = 0)
-        {
-            using (new WriteLock(Locker))
-            {
-                using (var uow = UowProvider.GetUnitOfWork())
-                {
-                    if (uow.Events.DispatchCancelable(DeletingVersions, this, new DeleteRevisionsEventArgs(id, specificVersion: versionId), "DeletingVersions"))
-                    {
-                        uow.Commit();
-                        return;
-                    }
-
-                    if (deletePriorVersions)
-                    {
-                        var content = GetByVersion(versionId);
-                        DeleteVersions(id, content.UpdateDate, userId);
-                    }
-
-                    var repository = RepositoryFactory.CreateContentRepository(uow);
-                    repository.DeleteVersion(versionId);
-
-                    uow.Events.Dispatch(DeletedVersions, this, new DeleteRevisionsEventArgs(id, false, specificVersion: versionId), "DeletedVersions");
-
-                    Audit(uow, AuditType.Delete, "Delete Content by version performed by user", userId, Constants.System.Root);
-                    uow.Commit();
-                }
-            }
-        }
-
-        /// <summary>
-        /// Deletes an <see cref="IContent"/> object by moving it to the Recycle Bin
-        /// </summary>
-        /// <remarks>Move an item to the Recycle Bin will result in the item being unpublished</remarks>
-        /// <param name="content">The <see cref="IContent"/> to delete</param>
-        /// <param name="userId">Optional Id of the User deleting the Content</param>
-        public void MoveToRecycleBin(IContent content, int userId = 0)
-        {
-            ((IContentServiceOperations)this).MoveToRecycleBin(content, userId);
-        }
-
-        /// <summary>
-        /// Moves an <see cref="IContent"/> object to a new location by changing its parent id.
-        /// </summary>
-        /// <remarks>
-        /// If the <see cref="IContent"/> object is already published it will be
-        /// published after being moved to its new location. Otherwise it'll just
-        /// be saved with a new parent id.
-        /// </remarks>
-        /// <param name="content">The <see cref="IContent"/> to move</param>
-        /// <param name="parentId">Id of the Content's new Parent</param>
-        /// <param name="userId">Optional Id of the User moving the Content</param>
-        public void Move(IContent content, int parentId, int userId = 0)
-        {
-            using (new WriteLock(Locker))
-            {
-                //This ensures that the correct method is called if this method is used to Move to recycle bin.
-                if (parentId == Constants.System.RecycleBinContent)
-                {
-                    MoveToRecycleBin(content, userId);
-                    return;
-                }
-
-                using (var uow = UowProvider.GetUnitOfWork())
-                {
-                    var moveEventInfo = new MoveEventInfo<IContent>(content, content.Path, parentId);
-                    var moveEventArgs = new MoveEventArgs<IContent>(moveEventInfo);
-                    if (uow.Events.DispatchCancelable(Moving, this, moveEventArgs, "Moving"))
-                    {
-                        uow.Commit();
-                        return;
-                    }
-
-                    //used to track all the moved entities to be given to the event
-                    var moveInfo = new List<MoveEventInfo<IContent>>();
-
-                    //call private method that does the recursive moving
-                    PerformMove(content, parentId, userId, moveInfo);
-
-                    moveEventArgs.MoveInfoCollection = moveInfo;
-                    moveEventArgs.CanCancel = false;
-                    uow.Events.Dispatch(Moved, this, moveEventArgs, "Moved");
-
-                    Audit(uow, AuditType.Move, "Move Content performed by user", userId, content.Id);
-                    uow.Commit();
-                }
-            }
-        }
-
-        /// <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")]
-        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))
-            {
-                var nodeObjectType = Constants.ObjectTypes.DocumentGuid;
-
-                using (var uow = UowProvider.GetUnitOfWork())
-                {
-                    var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                    //Create a dictionary of ids -> dictionary of property aliases + values
-                    var entities = repository.GetEntitiesInRecycleBin()
-                        .ToDictionary(
-                            key => key.Id,
-                            val => (IEnumerable<Property>)val.Properties);
-
-                    var files = ((ContentRepository)repository).GetFilesInRecycleBinForUploadField();
-
-                    var recycleBinEventArgs = new RecycleBinEventArgs(nodeObjectType, entities, files);
-                    if (uow.Events.DispatchCancelable(EmptyingRecycleBin, this, recycleBinEventArgs))
-                    {
-                        uow.Commit();
-                        return;
-                    }
-
-                    var success = repository.EmptyRecycleBin();
-                    recycleBinEventArgs.CanCancel = false;
-                    recycleBinEventArgs.RecycleBinEmptiedSuccessfully = success;
-                    uow.Events.Dispatch(EmptiedRecycleBin, this, recycleBinEventArgs);
-
-                    Audit(uow, AuditType.Delete, "Empty Content Recycle Bin performed by user", userId, Constants.System.RecycleBinContent);
-                    uow.Commit();
-                }
-            }
-        }
-
-        /// <summary>
-        /// Copies an <see cref="IContent"/> object by creating a new Content object of the same type and copies all data from the current
-        /// to the new copy which is returned. Recursively copies all children.
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to copy</param>
-        /// <param name="parentId">Id of the Content's new Parent</param>
-        /// <param name="relateToOriginal">Boolean indicating whether the copy should be related to the original</param>
-        /// <param name="userId">Optional Id of the User copying the Content</param>
-        /// <returns>The newly created <see cref="IContent"/> object</returns>
-        public IContent Copy(IContent content, int parentId, bool relateToOriginal, int userId = 0)
-        {
-            return Copy(content, parentId, relateToOriginal, true, userId);
-        }
-
-        /// <summary>
-        /// Copies an <see cref="IContent"/> object by creating a new Content object of the same type and copies all data from the current
-        /// to the new copy which is returned.
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to copy</param>
-        /// <param name="parentId">Id of the Content's new Parent</param>
-        /// <param name="relateToOriginal">Boolean indicating whether the copy should be related to the original</param>
-        /// <param name="recursive">A value indicating whether to recursively copy children.</param>
-        /// <param name="userId">Optional Id of the User copying the Content</param>
-        /// <returns>The newly created <see cref="IContent"/> object</returns>
-        public IContent Copy(IContent content, int parentId, bool relateToOriginal, bool recursive, int userId = 0)
-        {
-            //TODO: This all needs to be managed correctly so that the logic is submitted in one
-            // transaction, the CRUD needs to be moved to the repo
-
-            using (new WriteLock(Locker))
-            {
-                var copy = content.DeepCloneWithResetIdentities();
-                copy.ParentId = parentId;
-
-                // A copy should never be set to published automatically even if the original was.
-                copy.ChangePublishedState(PublishedState.Unpublished);
-
-                using (var uow = UowProvider.GetUnitOfWork())
-                {
-                    var copyEventArgs = new CopyEventArgs<IContent>(content, copy, true, parentId, relateToOriginal);
-                    if (uow.Events.DispatchCancelable(Copying, this, copyEventArgs))
-                    {
-                        uow.Commit();
-                        return null;
-                    }
-
-                    var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                    // Update the create author and last edit author
-                    copy.CreatorId = userId;
-                    copy.WriterId = userId;
-
-                    //get the current permissions, if there are any explicit ones they need to be copied
-                    var currentPermissions = GetPermissionsForEntity(content);
-                    currentPermissions.RemoveWhere(p => p.IsDefaultPermissions);
-
-                    repository.AddOrUpdate(copy);
-                    repository.AddOrUpdatePreviewXml(copy, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-
-                    //add permissions
-                    if (currentPermissions.Count > 0)
-                    {
-                        var permissionSet = new ContentPermissionSet(copy, currentPermissions);
-                        repository.AddOrUpdatePermissions(permissionSet);
-                    }
-
-                    uow.Commit(); // todo - this should flush, not commit
-
-                    //Special case for the associated tags
-                    //TODO: Move this to the repository layer in a single transaction!
-                    //don't copy tags data in tags table if the item is in the recycle bin
-                    if (parentId != Constants.System.RecycleBinContent)
-                    {
-                        var tags = uow.Database.Fetch<TagRelationshipDto>("WHERE nodeId = @Id", new { Id = content.Id });
-                        foreach (var tag in tags)
-                            uow.Database.Insert(new TagRelationshipDto
-                            {
-                                NodeId = copy.Id, TagId = tag.TagId, PropertyTypeId = tag.PropertyTypeId
-                            });
-                    }
-                    uow.Commit(); // todo - this should flush, not commit
-
-                    if (recursive)
-                    {
-                        //Look for children and copy those as well
-                        var children = GetChildren(content.Id);
-                        foreach (var child in children)
-                        {
-                            //TODO: This shouldn't recurse back to this method, it should be done in a private method
-                            // that doesn't have a nested lock and so we can perform the entire operation in one commit.
-                            Copy(child, copy.Id, relateToOriginal, true, userId);
-                        }
-                    }
-                    copyEventArgs.CanCancel = false;
-                    uow.Events.Dispatch(Copied, this, copyEventArgs);
-                    Audit(uow, AuditType.Copy, "Copy Content performed by user", userId, content.Id);
-                    uow.Commit();
-                }
-
-                return copy;
-            }
-        }
-
-
-        /// <summary>
-        /// Sends an <see cref="IContent"/> to Publication, which executes handlers and events for the 'Send to Publication' action.
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to send to publication</param>
-        /// <param name="userId">Optional Id of the User issueing the send to publication</param>
-        /// <returns>True if sending publication was succesfull otherwise false</returns>
-        public bool SendToPublication(IContent content, int userId = 0)
-        {
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var sendToPublishEventArgs = new SendToPublishEventArgs<IContent>(content);
-                if (uow.Events.DispatchCancelable(SendingToPublish, this, sendToPublishEventArgs))
-                {
-                    uow.Commit();
-                    return false;
-                }
-
-                //Save before raising event
-                Save(content, userId);
-                sendToPublishEventArgs.CanCancel = false;
-                uow.Events.Dispatch(SentToPublish, this, sendToPublishEventArgs);
-
-                Audit(uow, AuditType.SendToPublish, "Send to Publish performed by user", content.WriterId, content.Id);
-                uow.Commit();
-
-                return true;
-            }
-        }
-
-        /// <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.
-        /// </summary>
-        /// <remarks>
-        /// The way data is stored actually only allows us to rollback on properties
-        /// and not data like Name and Alias of the Content.
-        /// </remarks>
-        /// <param name="id">Id of the <see cref="IContent"/>being rolled back</param>
-        /// <param name="versionId">Id of the version to rollback to</param>
-        /// <param name="userId">Optional Id of the User issueing the rollback of the Content</param>
-        /// <returns>The newly created <see cref="IContent"/> object</returns>
-        public IContent Rollback(int id, Guid versionId, int userId = 0)
-        {
-            var content = GetByVersion(versionId);
-
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var rollbackEventArgs = new RollbackEventArgs<IContent>(content);
-                if (uow.Events.DispatchCancelable(RollingBack, this, rollbackEventArgs))
-                {
-                    uow.Commit();
-                    return content;
-                }
-
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                content.WriterId = userId;
-                content.CreatorId = userId;
-                content.ChangePublishedState(PublishedState.Unpublished);
-
-                repository.AddOrUpdate(content);
-                repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-                rollbackEventArgs.CanCancel = false;
-                uow.Events.Dispatch(RolledBack, this, rollbackEventArgs);
-
-                Audit(uow, AuditType.RollBack, "Content rollback performed by user", content.WriterId, content.Id);
-                uow.Commit();
-            }
-
-            return content;
-        }
-
-        /// <summary>
-        /// Sorts a collection of <see cref="IContent"/> objects by updating the SortOrder according
-        /// to the ordering of items in the passed in <see cref="IEnumerable{T}"/>.
-        /// </summary>
-        /// <remarks>
-        /// Using this method will ensure that the Published-state is maintained upon sorting
-        /// so the cache is updated accordingly - as needed.
-        /// </remarks>
-        /// <param name="items"></param>
-        /// <param name="userId"></param>
-        /// <param name="raiseEvents"></param>
-        /// <returns>True if sorting succeeded, otherwise False</returns>
-        public bool Sort(IEnumerable<IContent> items, int userId = 0, bool raiseEvents = true)
-        {
-            var shouldBePublished = new List<IContent>();
-            var shouldBeSaved = new List<IContent>();
-
-            using (new WriteLock(Locker))
-            {
-                using (var uow = UowProvider.GetUnitOfWork())
-                {
-                    var asArray = items.ToArray();
-                    var saveEventArgs = new SaveEventArgs<IContent>(asArray);
-                    if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
-                    {
-                        uow.Commit();
-                        return false;
-                    }
-
-                    var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                    var i = 0;
-                    foreach (var content in asArray)
-                    {
-                        //If the current sort order equals that of the content
-                        //we don't need to update it, so just increment the sort order
-                        //and continue.
-                        if (content.SortOrder == i)
-                        {
-                            i++;
-                            continue;
-                        }
-
-                        content.SortOrder = i;
-                        content.WriterId = userId;
-                        i++;
-
-                        if (content.Published)
-                        {
-                            //TODO: This should not be an inner operation, but if we do this, it cannot raise events and cannot be cancellable!
-                            var published = _publishingStrategy.Publish(uow, content, userId).Success;
-                            shouldBePublished.Add(content);
-                        }
-                        else
-                            shouldBeSaved.Add(content);
-
-                        repository.AddOrUpdate(content);
-                        //add or update a preview
-                        repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-                    }
-
-                    foreach (var content in shouldBePublished)
-                    {
-                        //Create and Save ContentXml DTO
-                        repository.AddOrUpdateContentXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-                    }
-
-                    if (raiseEvents)
-                    {
-                        saveEventArgs.CanCancel = false;
-                        uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
-                    }
-
-                    if (shouldBePublished.Any())
-                    {
-                        //TODO: This should not be an inner operation, but if we do this, it cannot raise events and cannot be cancellable!
-                        _publishingStrategy.PublishingFinalized(uow, shouldBePublished, false);
-                    }
-
-                    Audit(uow, AuditType.Sort, "Sorting content performed by user", userId, 0);
-                    uow.Commit();
-                }
-            }
-
-            return true;
-        }
-
-        /// <summary>
-        /// Sorts a collection of <see cref="IContent"/> objects by updating the SortOrder according
-        /// to the ordering of node Ids passed in.
-        /// </summary>
-        /// <remarks>
-        /// Using this method will ensure that the Published-state is maintained upon sorting
-        /// so the cache is updated accordingly - as needed.
-        /// </remarks>
-        /// <param name="ids"></param>
-        /// <param name="userId"></param>
-        /// <param name="raiseEvents"></param>
-        /// <returns>True if sorting succeeded, otherwise False</returns>
-        public bool Sort(int[] ids, int userId = 0, bool raiseEvents = true)
-        {
-            var shouldBePublished = new List<IContent>();
-            var shouldBeSaved = new List<IContent>();
-
-            using (new WriteLock(Locker))
-            {
-                var allContent = GetByIds(ids).ToDictionary(x => x.Id, x => x);
-                if (allContent.Any() == false)
-                {
-                    return false;
-                }
-                var items = ids.Select(x => allContent[x]).ToArray();
-
-                using (var uow = UowProvider.GetUnitOfWork())
-                {
-                    var saveEventArgs = new SaveEventArgs<IContent>(items);
-                    if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
-                    {
-                        uow.Commit();
-                        return false;
-                    }
-
-                    var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                    var i = 0;
-                    foreach (var content in items)
-                    {
-                        //If the current sort order equals that of the content
-                        //we don't need to update it, so just increment the sort order
-                        //and continue.
-                        if (content.SortOrder == i)
-                        {
-                            i++;
-                            continue;
-                        }
-
-                        content.SortOrder = i;
-                        content.WriterId = userId;
-                        i++;
-
-                        if (content.Published)
-                        {
-                            //TODO: This should not be an inner operation, but if we do this, it cannot raise events and cannot be cancellable!
-                            var published = _publishingStrategy.Publish(uow, content, userId).Success;
-                            shouldBePublished.Add(content);
-                        }
-                        else
-                            shouldBeSaved.Add(content);
-
-                        repository.AddOrUpdate(content);
-                        //add or update a preview
-                        repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-                    }
-
-                    foreach (var content in shouldBePublished)
-                    {
-                        //Create and Save ContentXml DTO
-                        repository.AddOrUpdateContentXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-                    }
-
-                    if (raiseEvents)
-                    {
-                        saveEventArgs.CanCancel = false;
-                        uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
-                    }
-
-                    if (shouldBePublished.Any())
-                    {
-                        //TODO: This should not be an inner operation, but if we do this, it cannot raise events and cannot be cancellable!
-                        _publishingStrategy.PublishingFinalized(uow, shouldBePublished, false);
-                    }
-
-                    Audit(uow, AuditType.Sort, "Sort child items performed by user", userId, items.First().ParentId);
-                    uow.Commit();
-                }
-            }
-
-            return true;
-        }
-
-        public IEnumerable<IContent> GetBlueprintsForContentTypes(params int[] documentTypeIds)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentBlueprintRepository(uow);
-
-                var query = new Query<IContent>();
-                if (documentTypeIds.Length > 0)
-                {
-                    query.Where(x => documentTypeIds.Contains(x.ContentTypeId));
-                }
-                return repository.GetByQuery(query).Select(x =>
-                {
-                    ((Content) x).IsBlueprint = true;
-                    return x;
-                });
-            }
-        }
-
-        /// <summary>
-        /// Gets paged content descendants as XML by path
-        /// </summary>
-        /// <param name="path">Path starts with</param>
-        /// <param name="pageIndex">Page number</param>
-        /// <param name="pageSize">Page size</param>
-        /// <param name="totalRecords">Total records the query would return without paging</param>
-        /// <returns>A paged enumerable of XML entries of content items</returns>
-        public IEnumerable<XElement> GetPagedXmlEntries(string path, long pageIndex, int pageSize, out long totalRecords)
-        {
-            Mandate.ParameterCondition(pageIndex >= 0, "pageIndex");
-            Mandate.ParameterCondition(pageSize > 0, "pageSize");
-
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                var contents = repository.GetPagedXmlEntriesByPath(path, pageIndex, pageSize,
-                    //This order by is VERY important! This allows us to figure out what is implicitly not published, see ContentRepository.BuildXmlCache and
-                    // UmbracoContentIndexer.PerformIndexAll which uses the logic based on this sort order
-                    new[] { "level", "parentID", "sortOrder" },
-                    out totalRecords);
-                return contents;
-            }
-        }
-
-        /// <summary>
-        /// This builds the Xml document used for the XML cache
-        /// </summary>
-        /// <returns></returns>
-        public XmlDocument BuildXmlCache()
-        {
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                var result = repository.BuildXmlCache();
-                uow.Commit();
-                return result;
-            }
-        }
-
-        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>
-        /// <param name="contentTypeIds">
-        /// Only rebuild the xml structures for the content type ids passed in, if none then rebuilds the structures
-        /// for all content
-        /// </param>
-        public void RebuildXmlStructures(params int[] contentTypeIds)
-        {
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                repository.RebuildXmlStructures(
-                    content => _entitySerializer.Serialize(this, _dataTypeService, _userService, content),
-                    contentTypeIds: contentTypeIds.Length == 0 ? null : contentTypeIds);
-
-                Audit(uow, AuditType.Publish, "ContentService.RebuildXmlStructures completed, the xml has been regenerated in the database", 0, Constants.System.Root);
-                uow.Commit();
-            }
-        }
-
-        #region Internal Methods
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> descendants by the first Parent.
-        /// </summary>
-        /// <param name="content"><see cref="IContent"/> item to retrieve Descendants from</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        internal IEnumerable<IContent> GetPublishedDescendants(IContent content)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                var query = Query<IContent>.Builder.Where(x => x.Id != content.Id && x.Path.StartsWith(content.Path) && x.Trashed == false);
-                return repository.GetByPublishedVersion(query);
-            }
-        }
-
-        #endregion
-
-        #region Private Methods
-
-        /// <summary>
-        /// Hack: This is used to fix some data if an entity's properties are invalid/corrupt
-        /// </summary>
-        /// <param name="content"></param>
-        private void QuickUpdate(IContent content)
-        {
-            if (content == null) throw new ArgumentNullException("content");
-            if (content.HasIdentity == false) throw new InvalidOperationException("Cannot update an entity without an Identity");
-
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                repository.AddOrUpdate(content);
-                uow.Commit();
-            }
-        }
-
-        private void Audit(IScopeUnitOfWork uow, AuditType type, string message, int userId, int objectId)
-        {
-            var auditRepo = RepositoryFactory.CreateAuditRepository(uow);
-            auditRepo.AddOrUpdate(new AuditItem(objectId, message, type, userId));
-        }
-
-        //TODO: All of this needs to be moved to the repository
-        private void PerformMove(IContent content, int parentId, int userId, ICollection<MoveEventInfo<IContent>> moveInfo)
-        {
-            //add a tracking item to use in the Moved event
-            moveInfo.Add(new MoveEventInfo<IContent>(content, content.Path, parentId));
-
-            content.WriterId = userId;
-            if (parentId == Constants.System.Root)
-            {
-                content.Path = string.Concat(Constants.System.Root, ",", content.Id);
-                content.Level = 1;
-            }
-            else
-            {
-                var parent = GetById(parentId);
-                content.Path = string.Concat(parent.Path, ",", content.Id);
-                content.Level = parent.Level + 1;
-            }
-
-            //If Content is being moved away from Recycle Bin, its state should be un-trashed
-            if (content.Trashed && parentId != Constants.System.RecycleBinContent)
-            {
-                content.ChangeTrashedState(false, parentId);
-            }
-            else
-            {
-                content.ParentId = parentId;
-            }
-
-            //If Content is published, it should be (re)published from its new location
-            if (content.Published)
-            {
-                //If Content is Publishable its saved and published
-                //otherwise we save the content without changing the publish state, and generate new xml because the Path, Level and Parent has changed.
-                if (IsPublishable(content))
-                {
-                    //TODO: This is raising events, probably not desirable as this costs performance for event listeners like Examine
-                    SaveAndPublish(content, userId);
-                }
-                else
-                {
-                    //TODO: This is raising events, probably not desirable as this costs performance for event listeners like Examine
-                    Save(content, false, userId);
-
-                    //TODO: This shouldn't be here! This needs to be part of the repository logic but in order to fix this we need to
-                    // change how this method calls "Save" as it needs to save using an internal method
-                    using (var uow = UowProvider.GetUnitOfWork())
-                    {
-                        var xml = _entitySerializer.Serialize(this, _dataTypeService, _userService, content);
-
-                        var poco = new ContentXmlDto { NodeId = content.Id, Xml = xml.ToDataString() };
-                        var exists =
-                            uow.Database.FirstOrDefault<ContentXmlDto>("WHERE nodeId = @Id", new { Id = content.Id }) !=
-                            null;
-                        int result = exists
-                                         ? uow.Database.Update(poco)
-                                         : Convert.ToInt32(uow.Database.Insert(poco));
-                        uow.Commit();
-                    }
-                }
-            }
-            else
-            {
-                //TODO: This is raising events, probably not desirable as this costs performance for event listeners like Examine
-                Save(content, userId);
-            }
-
-            //Ensure that Path and Level is updated on children
-            var children = GetChildren(content.Id).ToArray();
-            if (children.Any())
-            {
-                foreach (var child in children)
-                {
-                    PerformMove(child, content.Id, userId, moveInfo);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Publishes a <see cref="IContent"/> object and all its children
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to publish along with its children</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <param name="includeUnpublished">If set to true, this will also publish descendants that are completely unpublished, normally this will only publish children that have previously been published</param>
-        /// <returns>
-        /// A list of publish statues. If the parent document is not valid or cannot be published because it's parent(s) is not published
-        /// then the list will only contain one status item, otherwise it will contain status items for it and all of it's descendants that
-        /// are to be published.
-        /// </returns>
-        private IEnumerable<Attempt<PublishStatus>> PublishWithChildrenDo(
-            IContent content, int userId = 0, bool includeUnpublished = false)
-        {
-            if (content == null) throw new ArgumentNullException("content");
-
-            var evtMsgs = EventMessagesFactory.Get();
-
-            using (new WriteLock(Locker))
-            {
-                //Hack: this ensures that the entity's path is valid and if not it fixes/persists it
-                //see: http://issues.umbraco.org/issue/U4-9336
-                content.EnsureValidPath(Logger, entity => GetById(entity.ParentId), QuickUpdate);
-
-                var result = new List<Attempt<PublishStatus>>();
-
-                //Check if parent is published (although not if its a root node) - if parent isn't published this Content cannot be published
-                if (content.ParentId != Constants.System.Root && content.ParentId != Constants.System.RecycleBinContent && IsPublishable(content) == false)
-                {
-                    Logger.Info<ContentService>(
-                        string.Format(
-                            "Content '{0}' with Id '{1}' could not be published because its parent or one of its ancestors is not published.",
-                            content.Name, content.Id));
-                    result.Add(Attempt.Fail(new PublishStatus(content, PublishStatusType.FailedPathNotPublished, evtMsgs)));
-                    return result;
-                }
-
-                //Content contains invalid property values and can therefore not be published - fire event?
-                if (!content.IsValid())
-                {
-                    Logger.Info<ContentService>(
-                        string.Format("Content '{0}' with Id '{1}' could not be published because of invalid properties.",
-                                      content.Name, content.Id));
-                    result.Add(
-                        Attempt.Fail(
-                            new PublishStatus(content, PublishStatusType.FailedContentInvalid, evtMsgs)
-                            {
-                                InvalidProperties = ((ContentBase)content).LastInvalidProperties
-                            }));
-                    return result;
-                }
-
-                //Consider creating a Path query instead of recursive method:
-                //var query = Query<IContent>.Builder.Where(x => x.Path.StartsWith(content.Path));
-
-                var updated = new List<IContent>();
-                var list = new List<IContent>();
-                list.Add(content); //include parent item
-                list.AddRange(GetDescendants(content));
-
-                var internalStrategy = _publishingStrategy;
-
-                using (var uow = UowProvider.GetUnitOfWork())
-                {
-                    //Publish and then update the database with new status
-                    var publishedOutcome = internalStrategy.PublishWithChildren(uow, list, userId, includeUnpublished).ToArray();
-                    var published = publishedOutcome
-                        .Where(x => x.Success || x.Result.StatusType == PublishStatusType.SuccessAlreadyPublished)
-                        // ensure proper order (for events) - cannot publish a child before its parent!
-                        .OrderBy(x => x.Result.ContentItem.Level)
-                        .ThenBy(x => x.Result.ContentItem.SortOrder);
-
-                    var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                    //NOTE The Publish with subpages-dialog was used more as a republish-type-thing, so we'll have to include PublishStatusType.SuccessAlreadyPublished
-                    //in the updated-list, so the Published event is triggered with the expected set of pages and the xml is updated.
-                    foreach (var item in published)
-                    {
-                        item.Result.ContentItem.WriterId = userId;
-                        repository.AddOrUpdate(item.Result.ContentItem);
-                        //add or update a preview
-                        repository.AddOrUpdatePreviewXml(item.Result.ContentItem, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-                        //add or update the published xml
-                        repository.AddOrUpdateContentXml(item.Result.ContentItem, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-                        updated.Add(item.Result.ContentItem);
-                    }
-
-                    //Save xml to db and call following method to fire event:
-                    _publishingStrategy.PublishingFinalized(uow, updated, false);
-
-                    Audit(uow, AuditType.Publish, "Publish with Children performed by user", userId, content.Id);
-                    uow.Commit();
-
-                    return publishedOutcome;
-                }
-            }
-        }
-
-        /// <summary>
-        /// UnPublishes a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to publish</param>
-        /// <param name="omitCacheRefresh">Optional boolean to avoid having the cache refreshed when calling this Unpublish method. By default this method will update the cache.</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <returns>True if unpublishing succeeded, otherwise False</returns>
-        private Attempt<UnPublishStatus> UnPublishDo(IContent content, bool omitCacheRefresh = false, int userId = 0)
-        {
-            var newest = GetById(content.Id); // ensure we have the newest version
-            if (content.Version != newest.Version) // but use the original object if it's already the newest version
-                content = newest;
-
-            var evtMsgs = EventMessagesFactory.Get();
-
-            var published = content.Published ? content : GetPublishedVersion(content.Id); // get the published version
-            if (published == null)
-            {
-                return Attempt.Succeed(new UnPublishStatus(content, UnPublishedStatusType.SuccessAlreadyUnPublished, evtMsgs)); // already unpublished
-            }
-
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var unpublished = _publishingStrategy.UnPublish(uow, content, userId);
-                if (unpublished == false)
-                {
-                    uow.Commit();
-                    return Attempt.Fail(new UnPublishStatus(content, UnPublishedStatusType.FailedCancelledByEvent, evtMsgs));
-                }
-
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                content.WriterId = userId;
-                repository.AddOrUpdate(content);
-                // is published is not newest, reset the published flag on published version
-                if (published.Version != content.Version)
-                    repository.ClearPublished(published);
-                repository.DeleteContentXml(content);
-
-                //Delete xml from db? and call following method to fire event through PublishingStrategy to update cache
-                if (omitCacheRefresh == false)
-                    _publishingStrategy.UnPublishingFinalized(uow, content);
-
-                Audit(uow, AuditType.UnPublish, "UnPublish performed by user", userId, content.Id);
-                uow.Commit();
-            }
-
-            return Attempt.Succeed(new UnPublishStatus(content, UnPublishedStatusType.Success, evtMsgs));
-        }
-
-        /// <summary>
-        /// Saves and Publishes a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to save and publish</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise save events.</param>
-        /// <returns>True if publishing succeeded, otherwise False</returns>
-        private Attempt<PublishStatus> SaveAndPublishDo(IContent content, int userId = 0, bool raiseEvents = true)
-        {
-            var evtMsgs = EventMessagesFactory.Get();
-
-            using (new WriteLock(Locker))
-            {
-                using (var uow = UowProvider.GetUnitOfWork())
-                {
-                    var saveEventArgs = new SaveEventArgs<IContent>(content, evtMsgs);
-                    if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
-                    {
-                        uow.Commit();
-                        return Attempt.Fail(new PublishStatus(content, PublishStatusType.FailedCancelledByEvent, evtMsgs));
-                    }
-
-                    //Has this content item previously been published? If so, we don't need to refresh the children
-                    var previouslyPublished = content.HasIdentity && HasPublishedVersion(content.Id); //content might not have an id
-                    var publishStatus = new PublishStatus(content, PublishStatusType.Success, evtMsgs); //initially set to success
-
-                    //Check if parent is published (although not if its a root node) - if parent isn't published this Content cannot be published
-                    publishStatus.StatusType = CheckAndLogIsPublishable(content);
-                    //if it is not successful, then check if the props are valid
-                    if ((int)publishStatus.StatusType < 10)
-                    {
-                        //Content contains invalid property values and can therefore not be published - fire event?
-                        publishStatus.StatusType = CheckAndLogIsValid(content);
-                        //set the invalid properties (if there are any)
-                        publishStatus.InvalidProperties = ((ContentBase)content).LastInvalidProperties;
-                    }
-                    //if we're still successful, then publish using the strategy
-                    if (publishStatus.StatusType == PublishStatusType.Success)
-                    {
-                        //Publish and then update the database with new status
-                        var publishResult = _publishingStrategy.Publish(uow, content, userId);
-                        //set the status type to the publish result
-                        publishStatus.StatusType = publishResult.Result.StatusType;
-                    }
-
-                    //we are successfully published if our publishStatus is still Successful
-                    bool published = publishStatus.StatusType == PublishStatusType.Success;
-
-                    var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                    if (published == false)
-                    {
-                        content.ChangePublishedState(PublishedState.Saved);
-                    }
-                    //Since this is the Save and Publish method, the content should be saved even though the publish fails or isn't allowed
-                    if (content.HasIdentity == false)
-                    {
-                        content.CreatorId = userId;
-                    }
-                    content.WriterId = userId;
-
-                    repository.AddOrUpdate(content);
-                    repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-
-                    if (published)
-                    {
-                        //Content Xml
-                        repository.AddOrUpdateContentXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-                    }
-
-                    if (raiseEvents)
-                    {
-                        saveEventArgs.CanCancel = false;
-                        uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
-                    }
-
-                    //Save xml to db and call following method to fire event through PublishingStrategy to update cache
-                    if (published)
-                    {
-                        _publishingStrategy.PublishingFinalized(uow, content);
-                    }
-
-                    //We need to check if children and their publish state to ensure that we 'republish' content that was previously published
-                    if (published && previouslyPublished == false && HasChildren(content.Id))
-                    {
-                    //TODO: Horrible for performance if there are lots of descendents! We should page if anything but this is crazy
-                        var descendants = GetPublishedDescendants(content);
-                        _publishingStrategy.PublishingFinalized(uow, descendants, false);
-                    }
-
-                    uow.Commit();
-
-                    if (publishStatus.StatusType == PublishStatusType.Success)
-                    {
-                        Audit(uow, AuditType.Publish, "Save and Publish performed by user", userId, content.Id);
-                    }
-                    else
-                    {
-                        Audit(uow, AuditType.Save, "Save performed by user", userId, content.Id);
-                    }
-                    uow.Commit();
-
-                    return Attempt.If(publishStatus.StatusType == PublishStatusType.Success, publishStatus);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Saves a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to save</param>
-        /// <param name="changeState">Boolean indicating whether or not to change the Published state upon saving</param>
-        /// <param name="userId">Optional Id of the User saving the Content</param>
-        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
-        private Attempt<OperationStatus> Save(IContent content, bool changeState, int userId = 0, bool raiseEvents = true)
-        {
-            var evtMsgs = EventMessagesFactory.Get();
-
-            using (new WriteLock(Locker))
-            {
-                using (var uow = UowProvider.GetUnitOfWork())
-                {
-                    var saveEventArgs = new SaveEventArgs<IContent>(content, evtMsgs);
-                    if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
-                    {
-                        uow.Commit();
-                        return OperationStatus.Cancelled(evtMsgs);
-                    }
-
-                    if (string.IsNullOrWhiteSpace(content.Name))
-                    {
-                        throw new ArgumentException("Cannot save content with empty name.");
-                    }
-
-                    var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                    if (content.HasIdentity == false)
-                    {
-                        content.CreatorId = userId;
-                    }
-                    content.WriterId = userId;
-
-                    //Only change the publish state if the "previous" version was actually published or marked as unpublished
-                    if (changeState && (content.Published || ((Content)content).PublishedState == PublishedState.Unpublished))
-                        content.ChangePublishedState(PublishedState.Saved);
-
-                    repository.AddOrUpdate(content);
-
-                    //Generate a new preview
-                    repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-
-                    if (raiseEvents)
-                    {
-                        saveEventArgs.CanCancel = false;
-                        uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
-                    }
-
-                    Audit(uow, AuditType.Save, "Save Content performed by user", userId, content.Id);
-                    uow.Commit();
-                }
-
-                return OperationStatus.Success(evtMsgs);
-            }
-        }
-
-        private PublishStatusType CheckAndLogIsPublishable(IContent content)
-        {
-            //Check if parent is published (although not if its a root node) - if parent isn't published this Content cannot be published
-            if (content.ParentId != Constants.System.Root && content.ParentId != Constants.System.RecycleBinContent && IsPublishable(content) == false)
-            {
-                Logger.Info<ContentService>(
-                    string.Format(
-                        "Content '{0}' with Id '{1}' could not be published because its parent is not published.",
-                        content.Name, content.Id));
-                return PublishStatusType.FailedPathNotPublished;
-            }
-
-            if (content.ExpireDate.HasValue && content.ExpireDate.Value > DateTime.MinValue && DateTime.Now > content.ExpireDate.Value)
-            {
-                Logger.Info<ContentService>(
-                    string.Format(
-                        "Content '{0}' with Id '{1}' has expired and could not be published.",
-                        content.Name, content.Id));
-                return PublishStatusType.FailedHasExpired;
-            }
-
-            if (content.ReleaseDate.HasValue && content.ReleaseDate.Value > DateTime.MinValue && content.ReleaseDate.Value > DateTime.Now)
-            {
-                Logger.Info<ContentService>(
-                    string.Format(
-                        "Content '{0}' with Id '{1}' is awaiting release and could not be published.",
-                        content.Name, content.Id));
-                return PublishStatusType.FailedAwaitingRelease;
-            }
-
-            return PublishStatusType.Success;
-        }
-
-        private PublishStatusType CheckAndLogIsValid(IContent content)
-        {
-            //Content contains invalid property values and can therefore not be published - fire event?
-            if (content.IsValid() == false)
-            {
-                Logger.Info<ContentService>(
-                    string.Format(
-                        "Content '{0}' with Id '{1}' could not be published because of invalid properties.",
-                        content.Name, content.Id));
-                return PublishStatusType.FailedContentInvalid;
-            }
-
-            return PublishStatusType.Success;
-        }
-
-        private IContentType FindContentTypeByAlias(string contentTypeAlias)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentTypeRepository(uow);
-
-                var query = Query<IContentType>.Builder.Where(x => x.Alias == contentTypeAlias);
-                var types = repository.GetByQuery(query);
-
-                if (types.Any() == false)
-                    throw new Exception(
-                        string.Format("No ContentType matching the passed in Alias: '{0}' was found",
-                                      contentTypeAlias));
-
-                var contentType = types.First();
-
-                if (contentType == null)
-                    throw new Exception(string.Format("ContentType matching the passed in Alias: '{0}' was null",
-                                                      contentTypeAlias));
-                return contentType;
-            }
-        }
-
-        #endregion
-
-        #region Proxy Event Handlers
-        /// <summary>
-        /// Occurs before publish.
-        /// </summary>
-        /// <remarks>Proxy to the real event on the <see cref="PublishingStrategy"/></remarks>
-        public static event TypedEventHandler<IPublishingStrategy, PublishEventArgs<IContent>> Publishing
-        {
-            add { PublishingStrategy.Publishing += value; }
-            remove { PublishingStrategy.Publishing -= value; }
-        }
-
-        /// <summary>
-        /// Occurs after publish.
-        /// </summary>
-        /// <remarks>Proxy to the real event on the <see cref="PublishingStrategy"/></remarks>
-        public static event TypedEventHandler<IPublishingStrategy, PublishEventArgs<IContent>> Published
-        {
-            add { PublishingStrategy.Published += value; }
-            remove { PublishingStrategy.Published -= value; }
-        }
-        /// <summary>
-        /// Occurs before unpublish.
-        /// </summary>
-        /// <remarks>Proxy to the real event on the <see cref="PublishingStrategy"/></remarks>
-        public static event TypedEventHandler<IPublishingStrategy, PublishEventArgs<IContent>> UnPublishing
-        {
-            add { PublishingStrategy.UnPublishing += value; }
-            remove { PublishingStrategy.UnPublishing -= value; }
-        }
-
-        /// <summary>
-        /// Occurs after unpublish.
-        /// </summary>
-        /// <remarks>Proxy to the real event on the <see cref="PublishingStrategy"/></remarks>
-        public static event TypedEventHandler<IPublishingStrategy, PublishEventArgs<IContent>> UnPublished
-        {
-            add { PublishingStrategy.UnPublished += value; }
-            remove { PublishingStrategy.UnPublished -= value; }
-        }
-        #endregion
-
-        #region Event Handlers
-        /// <summary>
-        /// Occurs before Delete
-        /// </summary>
-        public static event TypedEventHandler<IContentService, DeleteEventArgs<IContent>> Deleting;
-
-        /// <summary>
-        /// Occurs after Delete
-        /// </summary>
-        public static event TypedEventHandler<IContentService, DeleteEventArgs<IContent>> Deleted;
-
-        /// <summary>
-        /// Occurs before Delete Versions
-        /// </summary>
-        public static event TypedEventHandler<IContentService, DeleteRevisionsEventArgs> DeletingVersions;
-
-        /// <summary>
-        /// Occurs after Delete Versions
-        /// </summary>
-        public static event TypedEventHandler<IContentService, DeleteRevisionsEventArgs> DeletedVersions;
-
-        /// <summary>
-        /// Occurs before Save
-        /// </summary>
-        public static event TypedEventHandler<IContentService, SaveEventArgs<IContent>> Saving;
-
-        /// <summary>
-        /// Occurs after Save
-        /// </summary>
-        public static event TypedEventHandler<IContentService, SaveEventArgs<IContent>> Saved;
-
-        /// <summary>
-        /// Occurs before Create
-        /// </summary>
-        [Obsolete("Use the Created event instead, the Creating and Created events both offer the same functionality, Creating event has been deprecated.")]
-        public static event TypedEventHandler<IContentService, NewEventArgs<IContent>> Creating;
-
-        /// <summary>
-        /// Occurs after Create
-        /// </summary>
-        /// <remarks>
-        /// Please note that the Content object has been created, but might not have been saved
-        /// so it does not have an identity yet (meaning no Id has been set).
-        /// </remarks>
-        public static event TypedEventHandler<IContentService, NewEventArgs<IContent>> Created;
-
-        /// <summary>
-        /// Occurs before Copy
-        /// </summary>
-        public static event TypedEventHandler<IContentService, CopyEventArgs<IContent>> Copying;
-
-        /// <summary>
-        /// Occurs after Copy
-        /// </summary>
-        public static event TypedEventHandler<IContentService, CopyEventArgs<IContent>> Copied;
-
-        /// <summary>
-        /// Occurs before Content is moved to Recycle Bin
-        /// </summary>
-        public static event TypedEventHandler<IContentService, MoveEventArgs<IContent>> Trashing;
-
-        /// <summary>
-        /// Occurs after Content is moved to Recycle Bin
-        /// </summary>
-        public static event TypedEventHandler<IContentService, MoveEventArgs<IContent>> Trashed;
-
-        /// <summary>
-        /// Occurs before Move
-        /// </summary>
-        public static event TypedEventHandler<IContentService, MoveEventArgs<IContent>> Moving;
-
-        /// <summary>
-        /// Occurs after Move
-        /// </summary>
-        public static event TypedEventHandler<IContentService, MoveEventArgs<IContent>> Moved;
-
-        /// <summary>
-        /// Occurs before Rollback
-        /// </summary>
-        public static event TypedEventHandler<IContentService, RollbackEventArgs<IContent>> RollingBack;
-
-        /// <summary>
-        /// Occurs after Rollback
-        /// </summary>
-        public static event TypedEventHandler<IContentService, RollbackEventArgs<IContent>> RolledBack;
-
-        /// <summary>
-        /// Occurs before Send to Publish
-        /// </summary>
-        public static event TypedEventHandler<IContentService, SendToPublishEventArgs<IContent>> SendingToPublish;
-
-        /// <summary>
-        /// Occurs after Send to Publish
-        /// </summary>
-        public static event TypedEventHandler<IContentService, SendToPublishEventArgs<IContent>> SentToPublish;
-
-        /// <summary>
-        /// Occurs before the Recycle Bin is emptied
-        /// </summary>
-        public static event TypedEventHandler<IContentService, RecycleBinEventArgs> EmptyingRecycleBin;
-
-        /// <summary>
-        /// Occurs after the Recycle Bin has been Emptied
-        /// </summary>
-        public static event TypedEventHandler<IContentService, RecycleBinEventArgs> EmptiedRecycleBin;
-
-        /// <summary>
-        /// Occurs after a blueprint has been saved.
-        /// </summary>
-        public static event TypedEventHandler<IContentService, SaveEventArgs<IContent>> SavedBlueprint;
-
-        /// <summary>
-        /// Occurs after a blueprint has been deleted.
-        /// </summary>
-        public static event TypedEventHandler<IContentService, DeleteEventArgs<IContent>> DeletedBlueprint;
-
-        #endregion
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Xml;
+using System.Xml.Linq;
+using Umbraco.Core.Events;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.Membership;
+using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
+using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.UnitOfWork;
+using Umbraco.Core.Publishing;
+
+namespace Umbraco.Core.Services
+{
+    /// <summary>
+    /// Represents the Content Service, which is an easy access to operations involving <see cref="IContent"/>
+    /// </summary>
+    public class ContentService : ScopeRepositoryService, IContentService, IContentServiceOperations
+    {
+        private readonly IPublishingStrategy2 _publishingStrategy;
+        private readonly EntityXmlSerializer _entitySerializer = new EntityXmlSerializer();
+        private readonly IDataTypeService _dataTypeService;
+        private readonly IUserService _userService;
+
+        //Support recursive locks because some of the methods that require locking call other methods that require locking.
+        //for example, the Move method needs to be locked but this calls the Save method which also needs to be locked.
+        private static readonly ReaderWriterLockSlim Locker = new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion);
+        private static readonly Regex AnchorRegex = new Regex("<a id=\"(.*?)\">", RegexOptions.Compiled);
+
+        public ContentService(
+            IDatabaseUnitOfWorkProvider provider,
+            RepositoryFactory repositoryFactory,
+            ILogger logger,
+            IEventMessagesFactory eventMessagesFactory,
+            IDataTypeService dataTypeService,
+            IUserService userService)
+            : base(provider, repositoryFactory, logger, eventMessagesFactory)
+        {
+            if (dataTypeService == null) throw new ArgumentNullException("dataTypeService");
+            if (userService == null) throw new ArgumentNullException("userService");
+            _publishingStrategy = new PublishingStrategy(UowProvider.ScopeProvider, eventMessagesFactory, logger);
+            _dataTypeService = dataTypeService;
+            _userService = userService;
+        }
+
+        #region Static Queries
+
+        private IQuery<IContent> _notTrashedQuery;
+
+        #endregion
+
+        public int CountPublished(string contentTypeAlias = null)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                return repository.CountPublished(contentTypeAlias);
+            }
+        }
+
+        public int Count(string contentTypeAlias = null)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                return repository.Count(contentTypeAlias);
+            }
+        }
+
+        public int CountChildren(int parentId, string contentTypeAlias = null)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                return repository.CountChildren(parentId, contentTypeAlias);
+            }
+        }
+
+        public int CountDescendants(int parentId, string contentTypeAlias = null)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                return repository.CountDescendants(parentId, contentTypeAlias);
+            }
+        }
+
+        /// <summary>
+        /// Used to bulk update the permissions set for a content item. This will replace all permissions
+        /// assigned to an entity with a list of user id & permission pairs.
+        /// </summary>
+        /// <param name="permissionSet"></param>
+        public void ReplaceContentPermissions(EntityPermissionSet permissionSet)
+        {
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                repository.ReplaceContentPermissions(permissionSet);
+                uow.Commit();
+            }
+        }
+
+        /// <summary>
+        /// Assigns a single permission to the current content item for the specified group ids
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <param name="permission"></param>
+        /// <param name="groupIds"></param>
+        public void AssignContentPermission(IContent entity, char permission, IEnumerable<int> groupIds)
+        {
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                repository.AssignEntityPermission(entity, permission, groupIds);
+                uow.Commit();
+            }
+        }
+
+        /// <summary>
+        /// Returns implicit/inherited permissions assigned to the content item for all user groups
+        /// </summary>
+        /// <param name="content"></param>
+        /// <returns></returns>
+        public EntityPermissionCollection GetPermissionsForEntity(IContent content)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                return repository.GetPermissionsForEntity(content.Id);
+            }
+        }
+
+        /// <summary>
+        /// Creates an <see cref="IContent"/> object using the alias of the <see cref="IContentType"/>
+        /// that this Content should based on.
+        /// </summary>
+        /// <remarks>
+        /// Note that using this method will simply return a new IContent without any identity
+        /// as it has not yet been persisted. It is intended as a shortcut to creating new content objects
+        /// that does not invoke a save operation against the database.
+        /// </remarks>
+        /// <param name="name">Name of the Content object</param>
+        /// <param name="parentId">Id of Parent for the new Content</param>
+        /// <param name="contentTypeAlias">Alias of the <see cref="IContentType"/></param>
+        /// <param name="userId">Optional id of the user creating the content</param>
+        /// <returns><see cref="IContent"/></returns>
+        public IContent CreateContent(string name, Guid parentId, string contentTypeAlias, int userId = 0)
+        {
+            var parent = GetById(parentId);
+            return CreateContent(name, parent, contentTypeAlias, userId);
+        }
+
+        /// <summary>
+        /// Creates an <see cref="IContent"/> object using the alias of the <see cref="IContentType"/>
+        /// that this Content should based on.
+        /// </summary>
+        /// <remarks>
+        /// Note that using this method will simply return a new IContent without any identity
+        /// as it has not yet been persisted. It is intended as a shortcut to creating new content objects
+        /// that does not invoke a save operation against the database.
+        /// </remarks>
+        /// <param name="name">Name of the Content object</param>
+        /// <param name="parentId">Id of Parent for the new Content</param>
+        /// <param name="contentTypeAlias">Alias of the <see cref="IContentType"/></param>
+        /// <param name="userId">Optional id of the user creating the content</param>
+        /// <returns><see cref="IContent"/></returns>
+        public IContent CreateContent(string name, int parentId, string contentTypeAlias, int userId = 0)
+        {
+            var contentType = FindContentTypeByAlias(contentTypeAlias);
+            var content = new Content(name, parentId, contentType);
+            var parent = GetById(content.ParentId);
+            content.Path = string.Concat(parent.IfNotNull(x => x.Path, content.ParentId.ToString()), ",", content.Id);
+
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var newEventArgs = new NewEventArgs<IContent>(content, contentTypeAlias, parentId);
+                if (uow.Events.DispatchCancelable(Creating, this, newEventArgs))
+                {
+                    uow.Commit();
+                    content.WasCancelled = true;
+                    return content;
+                }
+
+                content.CreatorId = userId;
+                content.WriterId = userId;
+                newEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Created, this, newEventArgs);
+
+                uow.Commit();
+            }
+
+            return content;
+        }
+
+        /// <summary>
+        /// Creates an <see cref="IContent"/> object using the alias of the <see cref="IContentType"/>
+        /// that this Content should based on.
+        /// </summary>
+        /// <remarks>
+        /// Note that using this method will simply return a new IContent without any identity
+        /// as it has not yet been persisted. It is intended as a shortcut to creating new content objects
+        /// that does not invoke a save operation against the database.
+        /// </remarks>
+        /// <param name="name">Name of the Content object</param>
+        /// <param name="parent">Parent <see cref="IContent"/> object for the new Content</param>
+        /// <param name="contentTypeAlias">Alias of the <see cref="IContentType"/></param>
+        /// <param name="userId">Optional id of the user creating the content</param>
+        /// <returns><see cref="IContent"/></returns>
+        public IContent CreateContent(string name, IContent parent, string contentTypeAlias, int userId = 0)
+        {
+            if (parent == null) throw new ArgumentNullException("parent");
+
+            var contentType = FindContentTypeByAlias(contentTypeAlias);
+            var content = new Content(name, parent, contentType);
+            content.Path = string.Concat(parent.Path, ",", content.Id);
+
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var newEventArgs = new NewEventArgs<IContent>(content, contentTypeAlias, parent);
+                if (uow.Events.DispatchCancelable(Creating, this, newEventArgs))
+                {
+                    uow.Commit();
+                    content.WasCancelled = true;
+                    return content;
+                }
+
+                content.CreatorId = userId;
+                content.WriterId = userId;
+                newEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Created, this, newEventArgs);
+
+                uow.Commit();
+            }
+
+            return content;
+        }
+
+        /// <summary>
+        /// Creates and saves an <see cref="IContent"/> object using the alias of the <see cref="IContentType"/>
+        /// that this Content should based on.
+        /// </summary>
+        /// <remarks>
+        /// This method returns an <see cref="IContent"/> object that has been persisted to the database
+        /// and therefor has an identity.
+        /// </remarks>
+        /// <param name="name">Name of the Content object</param>
+        /// <param name="parentId">Id of Parent for the new Content</param>
+        /// <param name="contentTypeAlias">Alias of the <see cref="IContentType"/></param>
+        /// <param name="userId">Optional id of the user creating the content</param>
+        /// <returns><see cref="IContent"/></returns>
+        public IContent CreateContentWithIdentity(string name, int parentId, string contentTypeAlias, int userId = 0)
+        {
+            var contentType = FindContentTypeByAlias(contentTypeAlias);
+            var content = new Content(name, parentId, contentType);
+
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                //NOTE: I really hate the notion of these Creating/Created events - they are so inconsistent, I've only just found
+                // out that in these 'WithIdentity' methods, the Saving/Saved events were not fired, wtf. Anyways, they're added now.
+                var newEventArgs = new NewEventArgs<IContent>(content, contentTypeAlias, parentId);
+                if (uow.Events.DispatchCancelable(Creating, this, newEventArgs))
+                {
+                    uow.Commit();
+                    content.WasCancelled = true;
+                    return content;
+                }
+
+                var saveEventArgs = new SaveEventArgs<IContent>(content);
+                if (uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
+                {
+                    uow.Commit();
+                    content.WasCancelled = true;
+                    return content;
+                }
+
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                content.CreatorId = userId;
+                content.WriterId = userId;
+
+                repository.AddOrUpdate(content);
+                repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                saveEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
+                newEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Created, this, newEventArgs);
+
+                Audit(uow, AuditType.New, string.Format("Content '{0}' was created with Id {1}", name, content.Id), content.CreatorId, content.Id);
+                uow.Commit();
+            }
+
+            return content;
+        }
+
+        public IEnumerable<string> GetAnchorValuesFromRTEs(int id)
+        {
+            var result = new List<string>();
+
+            var content = GetById(id);
+
+            foreach (var contentProperty in content.Properties)
+            {
+                if (contentProperty.PropertyType.PropertyEditorAlias.InvariantEquals(Constants.PropertyEditors.TinyMCEAlias))
+                {
+                    var value = contentProperty.Value?.ToString();
+
+                    if (!string.IsNullOrEmpty(value))
+                    {
+                        result.AddRange(GetAnchorValuesFromRTEContent(value));
+                    }
+
+                }
+            }
+
+
+            return result;
+        }
+
+
+        public IEnumerable<string> GetAnchorValuesFromRTEContent(string rteContent)
+        {
+            var result = new List<string>();
+
+            var matches = AnchorRegex.Matches(rteContent);
+
+            foreach (Match match in matches)
+            {
+                result.Add(match.Value.Split('\"')[1]);
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Creates and saves an <see cref="IContent"/> object using the alias of the <see cref="IContentType"/>
+        /// that this Content should based on.
+        /// </summary>
+        /// <remarks>
+        /// This method returns an <see cref="IContent"/> object that has been persisted to the database
+        /// and therefor has an identity.
+        /// </remarks>
+        /// <param name="name">Name of the Content object</param>
+        /// <param name="parent">Parent <see cref="IContent"/> object for the new Content</param>
+        /// <param name="contentTypeAlias">Alias of the <see cref="IContentType"/></param>
+        /// <param name="userId">Optional id of the user creating the content</param>
+        /// <returns><see cref="IContent"/></returns>
+        public IContent CreateContentWithIdentity(string name, IContent parent, string contentTypeAlias, int userId = 0)
+        {
+            if (parent == null) throw new ArgumentNullException("parent");
+
+            var contentType = FindContentTypeByAlias(contentTypeAlias);
+            var content = new Content(name, parent, contentType);
+
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                //NOTE: I really hate the notion of these Creating/Created events - they are so inconsistent, I've only just found
+                // out that in these 'WithIdentity' methods, the Saving/Saved events were not fired, wtf. Anyways, they're added now.
+                var newEventArgs = new NewEventArgs<IContent>(content, contentTypeAlias, parent);
+                if (uow.Events.DispatchCancelable(Creating, this, newEventArgs))
+                {
+                    uow.Commit();
+                    content.WasCancelled = true;
+                    return content;
+                }
+
+                var saveEventArgs = new SaveEventArgs<IContent>(content);
+                if (uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
+                {
+                    uow.Commit();
+                    content.WasCancelled = true;
+                    return content;
+                }
+
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                content.CreatorId = userId;
+                content.WriterId = userId;
+
+                repository.AddOrUpdate(content);
+                repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                saveEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
+                newEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Created, this, newEventArgs);
+
+                Audit(uow, AuditType.New, string.Format("Content '{0}' was created with Id {1}", name, content.Id), content.CreatorId, content.Id);
+                uow.Commit();
+            }
+
+            return content;
+        }
+
+        /// <summary>
+        /// Gets an <see cref="IContent"/> object by Id
+        /// </summary>
+        /// <param name="id">Id of the Content to retrieve</param>
+        /// <returns><see cref="IContent"/></returns>
+        public IContent GetById(int id)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                return repository.Get(id);
+            }
+        }
+
+        /// <summary>
+        /// Gets <see cref="IContent"/> objects by Ids
+        /// </summary>
+        /// <param name="ids">Ids of the Content to retrieve</param>
+        /// <returns><see cref="IContent"/></returns>
+        public IEnumerable<IContent> GetByIds(IEnumerable<int> ids)
+        {
+            var idsArray = ids.ToArray();
+            if (idsArray.Length == 0) return Enumerable.Empty<IContent>();
+
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                // ensure that the result has the order based on the ids passed in
+                var result = repository.GetAll(idsArray);
+                var content = result.ToDictionary(x => x.Id, x => x);
+
+                var sortedResult = idsArray.Select(x =>
+                {
+                    IContent c;
+                    return content.TryGetValue(x, out c) ? c : null;
+                }).WhereNotNull();
+
+                return sortedResult;
+            }
+        }
+
+        /// <summary>
+        /// Gets <see cref="IContent"/> objects by Ids
+        /// </summary>
+        /// <param name="ids">Ids of the Content to retrieve</param>
+        /// <returns><see cref="IContent"/></returns>
+        public IEnumerable<IContent> GetByIds(IEnumerable<Guid> ids)
+        {
+            var idsArray = ids.ToArray();
+            if (idsArray.Length == 0) return Enumerable.Empty<IContent>();
+
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                // ensure that the result has the order based on the ids passed in
+                var result = repository.GetAll(idsArray);
+                var content = result.ToDictionary(x => x.Key, x => x);
+
+                var sortedResult = idsArray.Select(x =>
+                {
+                    IContent c;
+                    return content.TryGetValue(x, out c) ? c : null;
+                }).WhereNotNull();
+
+                return sortedResult;
+            }
+        }
+
+        /// <summary>
+        /// Gets an <see cref="IContent"/> object by its 'UniqueId'
+        /// </summary>
+        /// <param name="key">Guid key of the Content to retrieve</param>
+        /// <returns><see cref="IContent"/></returns>
+        public IContent GetById(Guid key)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                return repository.Get(key);
+            }
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects by the Id of the <see cref="IContentType"/>
+        /// </summary>
+        /// <param name="id">Id of the <see cref="IContentType"/></param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetContentOfContentType(int id)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                var query = Query<IContent>.Builder.Where(x => x.ContentTypeId == id);
+                return repository.GetByQuery(query);
+            }
+        }
+
+        internal IEnumerable<IContent> GetPublishedContentOfContentType(int id)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                var query = Query<IContent>.Builder.Where(x => x.ContentTypeId == id);
+                return repository.GetByPublishedVersion(query);
+            }
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects by Level
+        /// </summary>
+        /// <param name="level">The level to retrieve Content from</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetByLevel(int level)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                var query = Query<IContent>.Builder.Where(x => x.Level == level && x.Path.StartsWith(Constants.System.RecycleBinContent.ToInvariantString()) == false);
+                return repository.GetByQuery(query);
+            }
+        }
+
+        /// <summary>
+        /// Gets a specific version of an <see cref="IContent"/> item.
+        /// </summary>
+        /// <param name="versionId">Id of the version to retrieve</param>
+        /// <returns>An <see cref="IContent"/> item</returns>
+        public IContent GetByVersion(Guid versionId)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                return repository.GetByVersion(versionId);
+            }
+        }
+
+
+        /// <summary>
+        /// Gets a collection of an <see cref="IContent"/> objects versions by Id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetVersions(int id)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                return repository.GetAllVersions(id);
+            }
+        }
+
+        /// <summary>
+        /// Gets a list of all version Ids for the given content item ordered so latest is first
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="maxRows">The maximum number of rows to return</param>
+        /// <returns></returns>
+        public IEnumerable<Guid> GetVersionIds(int id, int maxRows)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                return repository.GetVersionIds(id, maxRows);
+            }
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects, which are ancestors of the current content.
+        /// </summary>
+        /// <param name="id">Id of the <see cref="IContent"/> to retrieve ancestors for</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetAncestors(int id)
+        {
+            var content = GetById(id);
+            return GetAncestors(content);
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects, which are ancestors of the current content.
+        /// </summary>
+        /// <param name="content"><see cref="IContent"/> to retrieve ancestors for</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetAncestors(IContent content)
+        {
+            //null check otherwise we get exceptions
+            if (content.Path.IsNullOrWhiteSpace()) return Enumerable.Empty<IContent>();
+
+            var ids = content.Path.Split(',').Where(x => x != Constants.System.Root.ToInvariantString() && x != content.Id.ToString(CultureInfo.InvariantCulture)).Select(int.Parse).ToArray();
+            if (ids.Any() == false)
+                return new List<IContent>();
+
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                return repository.GetAll(ids);
+            }
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
+        /// </summary>
+        /// <param name="id">Id of the Parent to retrieve Children from</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetChildren(int id)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                var query = Query<IContent>.Builder.Where(x => x.ParentId == id);
+                return repository.GetByQuery(query).OrderBy(x => x.SortOrder);
+            }
+        }
+
+        [Obsolete("Use the overload with 'long' parameter types instead")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public IEnumerable<IContent> GetPagedChildren(int id, int pageIndex, int pageSize, out int totalChildren,
+            string orderBy, Direction orderDirection, string filter = "")
+        {
+            long total;
+            var result = GetPagedChildren(id, Convert.ToInt64(pageIndex), pageSize, out total, orderBy, orderDirection, true, filter);
+            totalChildren = Convert.ToInt32(total);
+            return result;
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
+        /// </summary>
+        /// <param name="id">Id of the Parent to retrieve Children from</param>
+        /// <param name="pageIndex">Page index (zero based)</param>
+        /// <param name="pageSize">Page size</param>
+        /// <param name="totalChildren">Total records query would return without paging</param>
+        /// <param name="orderBy">Field to order by</param>
+        /// <param name="orderDirection">Direction to order by</param>
+        /// <param name="filter">Search text filter</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetPagedChildren(int id, long pageIndex, int pageSize, out long totalChildren,
+            string orderBy, Direction orderDirection, string filter = "")
+        {
+            return GetPagedChildren(id, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, true, filter);
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
+        /// </summary>
+        /// <param name="id">Id of the Parent to retrieve Children from</param>
+        /// <param name="pageIndex">Page index (zero based)</param>
+        /// <param name="pageSize">Page size</param>
+        /// <param name="totalChildren">Total records query would return without paging</param>
+        /// <param name="orderBy">Field to order by</param>
+        /// <param name="orderDirection">Direction to order by</param>
+        /// <param name="orderBySystemField">Flag to indicate when ordering by system field</param>
+        /// <param name="filter">Search text filter</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetPagedChildren(int id, long pageIndex, int pageSize, out long totalChildren,
+            string orderBy, Direction orderDirection, bool orderBySystemField, string filter)
+        {
+            Mandate.ParameterCondition(pageIndex >= 0, "pageIndex");
+            Mandate.ParameterCondition(pageSize > 0, "pageSize");
+
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                var query = Query<IContent>.Builder;
+                // always check for a parent - else it will also get decendants (and then you should use the GetPagedDescendants method)
+                query.Where(x => x.ParentId == id);
+
+                IQuery<IContent> filterQuery = null;
+                if (filter.IsNullOrWhiteSpace() == false)
+                {
+                    filterQuery = Query<IContent>.Builder.Where(x => x.Name.Contains(filter));
+                }
+                return repository.GetPagedResultsByQuery(query, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, orderBySystemField, filterQuery);
+            }
+        }
+
+        [Obsolete("Use the overload with 'long' parameter types instead")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public IEnumerable<IContent> GetPagedDescendants(int id, int pageIndex, int pageSize, out int totalChildren, string orderBy = "path", Direction orderDirection = Direction.Ascending, string filter = "")
+        {
+            long total;
+            var result = GetPagedDescendants(id, Convert.ToInt64(pageIndex), pageSize, out total, orderBy, orderDirection, true, filter);
+            totalChildren = Convert.ToInt32(total);
+            return result;
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
+        /// </summary>
+        /// <param name="id">Id of the Parent to retrieve Descendants from</param>
+        /// <param name="pageIndex">Page number</param>
+        /// <param name="pageSize">Page size</param>
+        /// <param name="totalChildren">Total records query would return without paging</param>
+        /// <param name="orderBy">Field to order by</param>
+        /// <param name="orderDirection">Direction to order by</param>
+        /// <param name="filter">Search text filter</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetPagedDescendants(int id, long pageIndex, int pageSize, out long totalChildren, string orderBy = "path", Direction orderDirection = Direction.Ascending, string filter = "")
+        {
+            return GetPagedDescendants(id, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, true, filter);
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
+        /// </summary>
+        /// <param name="id">Id of the Parent to retrieve Descendants from</param>
+        /// <param name="pageIndex">Page number</param>
+        /// <param name="pageSize">Page size</param>
+        /// <param name="totalChildren">Total records query would return without paging</param>
+        /// <param name="orderBy">Field to order by</param>
+        /// <param name="orderDirection">Direction to order by</param>
+        /// <param name="orderBySystemField">Flag to indicate when ordering by system field</param>
+        /// <param name="filter">Search text filter</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetPagedDescendants(int id, long pageIndex, int pageSize, out long totalChildren, string orderBy, Direction orderDirection, bool orderBySystemField, string filter)
+        {
+            Mandate.ParameterCondition(pageIndex >= 0, "pageIndex");
+            Mandate.ParameterCondition(pageSize > 0, "pageSize");
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                // get query - if the id is System Root, then just get all
+                var query = Query<IContent>.Builder;
+                if (id != Constants.System.Root)
+                {
+                    var entityRepository = RepositoryFactory.CreateEntityRepository(uow);
+                    var contentPath = entityRepository.GetAllPaths(Constants.ObjectTypes.DocumentGuid, id).ToArray();
+                    if (contentPath.Length == 0)
+                    {
+                        totalChildren = 0;
+                        return Enumerable.Empty<IContent>();
+                    }
+                    query.Where(x => x.Path.SqlStartsWith(string.Format("{0},", contentPath[0].Path), TextColumnType.NVarchar));
+                }
+
+
+                // get filter
+                IQuery<IContent> filterQuery = null;
+                if (filter.IsNullOrWhiteSpace() == false)
+                    filterQuery = Query<IContent>.Builder.Where(x => x.Name.Contains(filter));
+
+                return repository.GetPagedResultsByQuery(query, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, orderBySystemField, filterQuery);
+            }
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
+        /// </summary>
+        /// <param name="id">Id of the Parent to retrieve Descendants from</param>
+        /// <param name="pageIndex">Page number</param>
+        /// <param name="pageSize">Page size</param>
+        /// <param name="totalChildren">Total records query would return without paging</param>
+        /// <param name="orderBy">Field to order by</param>
+        /// <param name="orderDirection">Direction to order by</param>
+        /// <param name="orderBySystemField">Flag to indicate when ordering by system field</param>
+        /// <param name="filter">Search filter</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetPagedDescendants(int id, long pageIndex, int pageSize, out long totalChildren, string orderBy, Direction orderDirection, bool orderBySystemField, IQuery<IContent> filter)
+        {
+            Mandate.ParameterCondition(pageIndex >= 0, "pageIndex");
+            Mandate.ParameterCondition(pageSize > 0, "pageSize");
+
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                // get query - if the id is System Root, then just get all
+                var query = Query<IContent>.Builder;
+                if (id != Constants.System.Root)
+                {
+                    var entityRepository = RepositoryFactory.CreateEntityRepository(uow);
+                    var contentPath = entityRepository.GetAllPaths(Constants.ObjectTypes.DocumentGuid, id).ToArray();
+                    if (contentPath.Length == 0)
+                    {
+                        totalChildren = 0;
+                        return Enumerable.Empty<IContent>();
+                    }
+                    query.Where(x => x.Path.SqlStartsWith(string.Format("{0},", contentPath[0].Path), TextColumnType.NVarchar));
+                }
+
+                return repository.GetPagedResultsByQuery(query, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, orderBySystemField, filter);
+            }
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects by its name or partial name
+        /// </summary>
+        /// <param name="parentId">Id of the Parent to retrieve Children from</param>
+        /// <param name="name">Full or partial name of the children</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetChildrenByName(int parentId, string name)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                var query = Query<IContent>.Builder.Where(x => x.ParentId == parentId && x.Name.Contains(name));
+                return repository.GetByQuery(query);
+            }
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
+        /// </summary>
+        /// <param name="id">Id of the Parent to retrieve Descendants from</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetDescendants(int id)
+        {
+            var content = GetById(id);
+            return content == null ? Enumerable.Empty<IContent>() : GetDescendants(content);
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
+        /// </summary>
+        /// <param name="content"><see cref="IContent"/> item to retrieve Descendants from</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetDescendants(IContent content)
+        {
+            //This is a check to ensure that the path is correct for this entity to avoid problems like: http://issues.umbraco.org/issue/U4-9336 due to data corruption
+            if (content.ValidatePath() == false)
+                throw new InvalidDataException(string.Format("The content item {0} has an invalid path: {1} with parentID: {2}", content.Id, content.Path, content.ParentId));
+
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                var pathMatch = content.Path + ",";
+                var query = Query<IContent>.Builder.Where(x => x.Path.StartsWith(pathMatch) && x.Id != content.Id);
+                return repository.GetByQuery(query);
+            }
+        }
+
+        /// <summary>
+        /// Gets the parent of the current content as an <see cref="IContent"/> item.
+        /// </summary>
+        /// <param name="id">Id of the <see cref="IContent"/> to retrieve the parent from</param>
+        /// <returns>Parent <see cref="IContent"/> object</returns>
+        public IContent GetParent(int id)
+        {
+            var content = GetById(id);
+            return GetParent(content);
+        }
+
+        /// <summary>
+        /// Gets the parent of the current content as an <see cref="IContent"/> item.
+        /// </summary>
+        /// <param name="content"><see cref="IContent"/> to retrieve the parent from</param>
+        /// <returns>Parent <see cref="IContent"/> object</returns>
+        public IContent GetParent(IContent content)
+        {
+            if (content.ParentId == Constants.System.Root || content.ParentId == Constants.System.RecycleBinContent)
+                return null;
+
+            return GetById(content.ParentId);
+        }
+
+        /// <summary>
+        /// Gets the published version of an <see cref="IContent"/> item
+        /// </summary>
+        /// <param name="id">Id of the <see cref="IContent"/> to retrieve version from</param>
+        /// <returns>An <see cref="IContent"/> item</returns>
+        public IContent GetPublishedVersion(int id)
+        {
+            var version = GetVersions(id);
+            return version.FirstOrDefault(x => x.Published);
+        }
+
+        /// <summary>
+        /// Gets the published version of a <see cref="IContent"/> item.
+        /// </summary>
+        /// <param name="content">The content item.</param>
+        /// <returns>The published version, if any; otherwise, null.</returns>
+        public IContent GetPublishedVersion(IContent content)
+        {
+            if (content.Published) return content;
+            return content.HasPublishedVersion
+                ? GetByVersion(content.PublishedVersionGuid)
+                : null;
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects, which reside at the first level / root
+        /// </summary>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetRootContent()
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                var query = Query<IContent>.Builder.Where(x => x.ParentId == Constants.System.Root);
+                return repository.GetByQuery(query);
+            }
+        }
+
+        /// <summary>
+        /// Gets all published content items
+        /// </summary>
+        /// <returns></returns>
+        internal IEnumerable<IContent> GetAllPublished()
+        {
+            //create it once if it is needed (no need for locking here)
+            if (_notTrashedQuery == null)
+            {
+                _notTrashedQuery = Query<IContent>.Builder.Where(x => x.Trashed == false);
+            }
+
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                return repository.GetByPublishedVersion(_notTrashedQuery);
+            }
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects, which has an expiration date less than or equal to today.
+        /// </summary>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetContentForExpiration()
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                var query = Query<IContent>.Builder.Where(x => x.ExpireDate <= DateTime.Now);
+                return repository.GetByQuery(query).Where(x => x.HasPublishedVersion);
+            }
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects, which has a release date less than or equal to today.
+        /// </summary>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetContentForRelease()
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                var query = Query<IContent>.Builder.Where(x => x.Published == false && x.ReleaseDate <= DateTime.Now);
+                return repository.GetByQuery(query);
+            }
+        }
+
+        /// <summary>
+        /// Gets a collection of an <see cref="IContent"/> objects, which resides in the Recycle Bin
+        /// </summary>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetContentInRecycleBin()
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                var query = Query<IContent>.Builder.Where(x => x.Path.StartsWith(Constants.System.RecycleBinContentPathPrefix));
+                return repository.GetByQuery(query);
+            }
+        }
+
+        /// <summary>
+        /// Checks whether an <see cref="IContent"/> item has any children
+        /// </summary>
+        /// <param name="id">Id of the <see cref="IContent"/></param>
+        /// <returns>True if the content has any children otherwise False</returns>
+        public bool HasChildren(int id)
+        {
+            return CountChildren(id) > 0;
+        }
+
+        internal int CountChildren(int id)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                var query = Query<IContent>.Builder.Where(x => x.ParentId == id);
+                return repository.Count(query);
+            }
+        }
+
+        /// <summary>
+        /// Checks whether an <see cref="IContent"/> item has any published versions
+        /// </summary>
+        /// <param name="id">Id of the <see cref="IContent"/></param>
+        /// <returns>True if the content has any published version otherwise False</returns>
+        public bool HasPublishedVersion(int id)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                var query = Query<IContent>.Builder.Where(x => x.Published == true && x.Id == id && x.Trashed == false);
+                return repository.Count(query) > 0;
+            }
+        }
+
+        /// <summary>
+        /// Checks if the passed in <see cref="IContent"/> can be published based on the anscestors publish state.
+        /// </summary>
+        /// <param name="content"><see cref="IContent"/> to check if anscestors are published</param>
+        /// <returns>True if the Content can be published, otherwise False</returns>
+        public bool IsPublishable(IContent content)
+        {
+            int[] ids;
+            if (content.HasIdentity)
+            {
+                // get ids from path (we have identity)
+                // skip the first one that has to be -1 - and we don't care
+                // skip the last one that has to be "this" - and it's ok to stop at the parent
+                ids = content.Path.Split(',').Skip(1).SkipLast().Select(int.Parse).ToArray();
+            }
+            else
+            {
+                // no path yet (no identity), have to move up to parent
+                // skip the first one that has to be -1 - and we don't care
+                // don't skip the last one that is "parent"
+                var parent = GetById(content.ParentId);
+                if (parent == null) return false;
+                ids = parent.Path.Split(',').Skip(1).Select(int.Parse).ToArray();
+            }
+            if (ids.Length == 0)
+                return false;
+
+            // if the first one is recycle bin, fail fast
+            if (ids[0] == Constants.System.RecycleBinContent)
+                return false;
+
+            // fixme - move to repository?
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var sql = new Sql(@"
+                    SELECT id
+                    FROM umbracoNode
+                    JOIN cmsDocument ON umbracoNode.id=cmsDocument.nodeId AND cmsDocument.published=@0
+                    WHERE umbracoNode.trashed=@1 AND umbracoNode.id IN (@2)",
+                    true, false, ids);
+                var x = uow.Database.Fetch<int>(sql);
+                return ids.Length == x.Count;
+            }
+        }
+
+        /// <summary>
+        /// This will rebuild the xml structures for content in the database.
+        /// </summary>
+        /// <param name="userId">This is not used for anything</param>
+        /// <returns>True if publishing succeeded, otherwise False</returns>
+        /// <remarks>
+        /// This is used for when a document type alias or a document type property is changed, the xml will need to
+        /// be regenerated.
+        /// </remarks>
+        public bool RePublishAll(int userId = 0)
+        {
+            try
+            {
+                RebuildXmlStructures();
+                return true;
+            }
+            catch (Exception ex)
+            {
+                Logger.Error<ContentService>("An error occurred executing RePublishAll", ex);
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// This will rebuild the xml structures for content in the database.
+        /// </summary>
+        /// <param name="contentTypeIds">
+        /// If specified will only rebuild the xml for the content type's specified, otherwise will update the structure
+        /// for all published content.
+        /// </param>
+        internal void RePublishAll(params int[] contentTypeIds)
+        {
+            try
+            {
+                RebuildXmlStructures(contentTypeIds);
+            }
+            catch (Exception ex)
+            {
+                Logger.Error<ContentService>("An error occurred executing RePublishAll", ex);
+            }
+        }
+
+        /// <summary>
+        /// Publishes a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to publish</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <returns>True if publishing succeeded, otherwise False</returns>
+        public bool Publish(IContent content, int userId = 0)
+        {
+            var result = SaveAndPublishDo(content, userId);
+            Logger.Info<ContentService>("Call was made to ContentService.Publish, use PublishWithStatus instead since that method will provide more detailed information on the outcome");
+            return result.Success;
+        }
+
+        /// <summary>
+        /// Publishes a <see cref="IContent"/> object and all its children
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to publish along with its children</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <param name="includeUnpublished"></param>
+        /// <returns>The list of statuses for all published items</returns>
+        IEnumerable<Attempt<PublishStatus>> IContentServiceOperations.PublishWithChildren(IContent content, int userId, bool includeUnpublished)
+        {
+            return PublishWithChildrenDo(content, userId, includeUnpublished);
+        }
+
+        /// <summary>
+        /// Saves and Publishes a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to save and publish</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise save events.</param>
+        /// <returns>True if publishing succeeded, otherwise False</returns>
+        Attempt<PublishStatus> IContentServiceOperations.SaveAndPublish(IContent content, int userId, bool raiseEvents)
+        {
+            return SaveAndPublishDo(content, userId, raiseEvents);
+        }
+
+        /// <summary>
+        /// Deletes an <see cref="IContent"/> object by moving it to the Recycle Bin
+        /// </summary>
+        /// <remarks>Move an item to the Recycle Bin will result in the item being unpublished</remarks>
+        /// <param name="content">The <see cref="IContent"/> to delete</param>
+        /// <param name="userId">Optional Id of the User deleting the Content</param>
+        Attempt<OperationStatus> IContentServiceOperations.MoveToRecycleBin(IContent content, int userId)
+        {
+            return MoveToRecycleBinDo(content, userId, false);
+        }
+
+        /// <summary>
+        /// Deletes an <see cref="IContent"/> object by moving it to the Recycle Bin
+        /// </summary>
+        /// <remarks>Move an item to the Recycle Bin will result in the item being unpublished</remarks>
+        /// <param name="content">The <see cref="IContent"/> to delete</param>
+        /// <param name="userId">Optional Id of the User deleting the Content</param>
+        /// <param name="ignoreDescendants">
+        /// A boolean indicating to ignore this item's descendant list from also being moved to the recycle bin. This is required for the DeleteContentOfTypes method
+        /// because it has already looked up all descendant nodes that will need to be recycled
+        /// TODO: Fix all of this, it will require a reasonable refactor and most of this stuff should be done at the repo level instead of service sub operations
+        /// </param>
+        private Attempt<OperationStatus> MoveToRecycleBinDo(IContent content, int userId, bool ignoreDescendants)
+        {
+            var evtMsgs = EventMessagesFactory.Get();
+            using (new WriteLock(Locker))
+            {
+                using (var uow = UowProvider.GetUnitOfWork())
+                {
+                    //Hack: this ensures that the entity's path is valid and if not it fixes/persists it
+                    //see: http://issues.umbraco.org/issue/U4-9336
+                    content.EnsureValidPath(Logger, entity => GetById(entity.ParentId), QuickUpdate);
+                    var originalPath = content.Path;
+                    var moveEventInfo = new MoveEventInfo<IContent>(content, originalPath, Constants.System.RecycleBinContent);
+                    var moveEventArgs = new MoveEventArgs<IContent>(evtMsgs, moveEventInfo);
+                    if (uow.Events.DispatchCancelable(Trashing, this, moveEventArgs, "Trashing"))
+                    {
+                        uow.Commit();
+                        return OperationStatus.Cancelled(evtMsgs);
+                    }
+                    var moveInfo = new List<MoveEventInfo<IContent>>
+                    {
+                        moveEventInfo
+                    };
+
+                    //get descendents to process of the content item that is being moved to trash - must be done before changing the state below
+                    //must be processed with shallowest levels first
+                    var descendants = ignoreDescendants ? Enumerable.Empty<IContent>() : GetDescendants(content).OrderBy(x => x.Level);
+
+                    //Do the updates for this item
+                    var repository = RepositoryFactory.CreateContentRepository(uow);
+                    //Make sure that published content is unpublished before being moved to the Recycle Bin
+                    if (HasPublishedVersion(content.Id))
+                    {
+                        //TODO: this shouldn't be a 'sub operation', and if it needs to be it cannot raise events and cannot be cancelled!
+                        UnPublish(content, userId);
+                    }
+                    content.WriterId = userId;
+                    content.ChangeTrashedState(true);
+                    repository.AddOrUpdate(content);
+
+                    //Loop through descendants to update their trash state, but ensuring structure by keeping the ParentId
+                    foreach (var descendant in descendants)
+                    {
+                        //TODO: this shouldn't be a 'sub operation', and if it needs to be it cannot raise events and cannot be cancelled!
+                        UnPublish(descendant, userId);
+                        descendant.WriterId = userId;
+                        descendant.ChangeTrashedState(true, descendant.ParentId);
+                        repository.AddOrUpdate(descendant);
+
+                        moveInfo.Add(new MoveEventInfo<IContent>(descendant, descendant.Path, descendant.ParentId));
+                    }
+
+                    moveEventArgs.CanCancel = false;
+                    moveEventArgs.MoveInfoCollection = moveInfo;
+                    uow.Events.Dispatch(Trashed, this, moveEventArgs, "Trashed");
+
+                    Audit(uow, AuditType.Move, "Move Content to Recycle Bin performed by user", userId, content.Id);
+                    uow.Commit();
+                }
+
+                return OperationStatus.Success(evtMsgs);
+            }
+        }
+
+        /// <summary>
+        /// UnPublishes a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to publish</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <returns>True if unpublishing succeeded, otherwise False</returns>
+        Attempt<UnPublishStatus> IContentServiceOperations.UnPublish(IContent content, int userId)
+        {
+            return UnPublishDo(content, false, userId);
+        }
+
+        /// <summary>
+        /// Publishes a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to publish</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <returns>True if publishing succeeded, otherwise False</returns>
+        public Attempt<PublishStatus> PublishWithStatus(IContent content, int userId = 0)
+        {
+            return ((IContentServiceOperations)this).Publish(content, userId);
+        }
+
+        /// <summary>
+        /// Publishes a <see cref="IContent"/> object and all its children
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to publish along with its children</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <returns>True if publishing succeeded, otherwise False</returns>
+        [Obsolete("Use PublishWithChildrenWithStatus instead, that method will provide more detailed information on the outcome and also allows the includeUnpublished flag")]
+        public bool PublishWithChildren(IContent content, int userId = 0)
+        {
+            var result = PublishWithChildrenDo(content, userId, true);
+
+            //This used to just return false only when the parent content failed, otherwise would always return true so we'll
+            // do the same thing for the moment
+            if (result.All(x => x.Result.ContentItem.Id != content.Id))
+                return false;
+
+            return result.Single(x => x.Result.ContentItem.Id == content.Id).Success;
+        }
+
+        /// <summary>
+        /// Publishes a <see cref="IContent"/> object and all its children
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to publish along with its children</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <param name="includeUnpublished">set to true if you want to also publish children that are currently unpublished</param>
+        /// <returns>True if publishing succeeded, otherwise False</returns>
+        public IEnumerable<Attempt<PublishStatus>> PublishWithChildrenWithStatus(IContent content, int userId = 0, bool includeUnpublished = false)
+        {
+            return ((IContentServiceOperations)this).PublishWithChildren(content, userId, includeUnpublished);
+        }
+
+        /// <summary>
+        /// UnPublishes a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to publish</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <returns>True if unpublishing succeeded, otherwise False</returns>
+        public bool UnPublish(IContent content, int userId = 0)
+        {
+            var attempt = ((IContentServiceOperations)this).UnPublish(content, userId);
+            LogHelper.Debug<ContentService>(string.Format("Result of unpublish attempt: {0}", attempt.Result.StatusType));
+            return attempt.Success;
+        }
+
+        /// <summary>
+        /// Saves and Publishes a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to save and publish</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise save events.</param>
+        /// <returns>True if publishing succeeded, otherwise False</returns>
+        [Obsolete("Use SaveAndPublishWithStatus instead, that method will provide more detailed information on the outcome")]
+        public bool SaveAndPublish(IContent content, int userId = 0, bool raiseEvents = true)
+        {
+            var result = SaveAndPublishDo(content, userId, raiseEvents);
+            return result.Success;
+        }
+
+        /// <summary>
+        /// Saves and Publishes a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to save and publish</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise save events.</param>
+        /// <returns>True if publishing succeeded, otherwise False</returns>
+        public Attempt<PublishStatus> SaveAndPublishWithStatus(IContent content, int userId = 0, bool raiseEvents = true)
+        {
+            return ((IContentServiceOperations)this).SaveAndPublish(content, userId, raiseEvents);
+        }
+
+        public IContent GetBlueprintById(int id)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentBlueprintRepository(uow);
+                var blueprint = repository.Get(id);
+                if (blueprint != null)
+                    ((Content) blueprint).IsBlueprint = true;
+                return blueprint;
+            }
+        }
+
+        public IContent GetBlueprintById(Guid id)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentBlueprintRepository(uow);
+                var blueprint = repository.Get(id);
+                if (blueprint != null)
+                    ((Content)blueprint).IsBlueprint = true;
+                return blueprint;
+            }
+        }
+
+        public void SaveBlueprint(IContent content, int userId = 0)
+        {
+            //always ensure the blueprint is at the root
+            if (content.ParentId != -1)
+                content.ParentId = -1;
+
+            ((Content) content).IsBlueprint = true;
+
+            using (new WriteLock(Locker))
+            {
+                using (var uow = UowProvider.GetUnitOfWork())
+                {
+                    if (string.IsNullOrWhiteSpace(content.Name))
+                    {
+                        throw new ArgumentException("Cannot save content blueprint with empty name.");
+                    }
+
+                    var repository = RepositoryFactory.CreateContentBlueprintRepository(uow);
+
+                    if (content.HasIdentity == false)
+                    {
+                        content.CreatorId = userId;
+                    }
+                    content.WriterId = userId;
+
+                    repository.AddOrUpdate(content);
+
+                    uow.Events.Dispatch(SavedBlueprint, this, new SaveEventArgs<IContent>(content), "SavedBlueprint");
+
+                    uow.Commit();
+                }
+            }
+        }
+
+        public void DeleteBlueprint(IContent content, int userId = 0)
+        {
+            using (new WriteLock(Locker))
+            {
+                using (var uow = UowProvider.GetUnitOfWork())
+                {
+                    var repository = RepositoryFactory.CreateContentBlueprintRepository(uow);
+                    repository.Delete(content);
+                    uow.Events.Dispatch(DeletedBlueprint, this, new DeleteEventArgs<IContent>(content), "DeletedBlueprint");
+                    uow.Commit();
+                }
+            }
+        }
+
+        public IContent CreateContentFromBlueprint(IContent blueprint, string name, int userId = 0)
+        {
+            if (blueprint == null) throw new ArgumentNullException("blueprint");
+
+            var contentType = blueprint.ContentType;
+            var content = new Content(name, -1, contentType);
+            content.Path = string.Concat(content.ParentId.ToString(), ",", content.Id);
+
+            content.CreatorId = userId;
+            content.WriterId = userId;
+
+            foreach (var property in blueprint.Properties)
+                content.SetValue(property.Alias, property.Value);
+
+            return content;
+        }
+
+        public void DeleteBlueprintsOfTypes(IEnumerable<int> contentTypeIds, int userId = 0)
+        {
+            using (new WriteLock(Locker))
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var repository = RepositoryFactory.CreateContentBlueprintRepository(uow);
+
+                var contentTypeIdsA = contentTypeIds.ToArray();
+                var query = new Query<IContent>();
+                if (contentTypeIdsA.Length > 0)
+                {
+                    query.Where(x => contentTypeIdsA.Contains(x.ContentTypeId));
+                }
+                var blueprints = repository.GetByQuery(query).Select(x =>
+                {
+                    ((Content) x).IsBlueprint = true;
+                    return x;
+                }).ToArray();
+
+                foreach (var blueprint in blueprints)
+                {
+                    repository.Delete(blueprint);
+                }
+
+                uow.Events.Dispatch(DeletedBlueprint, this, new DeleteEventArgs<IContent>(blueprints), "DeletedBlueprint");
+                uow.Commit();
+            }
+        }
+
+        public void DeleteBlueprintsOfType(int contentTypeId, int userId = 0)
+        {
+            DeleteBlueprintsOfTypes(new[] {contentTypeId}, userId);
+        }
+
+        /// <summary>
+        /// Saves a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to save</param>
+        /// <param name="userId">Optional Id of the User saving the Content</param>
+        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
+        public void Save(IContent content, int userId = 0, bool raiseEvents = true)
+        {
+            ((IContentServiceOperations)this).Save(content, userId, raiseEvents);
+        }
+
+        /// <summary>
+        /// Saves a collection of <see cref="IContent"/> objects.
+        /// </summary>
+        /// <param name="contents">Collection of <see cref="IContent"/> to save</param>
+        /// <param name="userId">Optional Id of the User saving the Content</param>
+        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
+        Attempt<OperationStatus> IContentServiceOperations.Save(IEnumerable<IContent> contents, int userId, bool raiseEvents)
+        {
+            var asArray = contents.ToArray();
+
+            var evtMsgs = EventMessagesFactory.Get();
+
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var saveEventArgs = new SaveEventArgs<IContent>(asArray, evtMsgs);
+                if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
+                {
+                    uow.Commit();
+                    return OperationStatus.Cancelled(evtMsgs);
+                }
+
+                // todo - understand what's a lock in a scope?
+                // (though, these locks are refactored in v8)
+                using (new WriteLock(Locker))
+                {
+                    var containsNew = asArray.Any(x => x.HasIdentity == false);
+                    var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                    if (containsNew)
+                    {
+                        foreach (var content in asArray)
+                        {
+                            content.WriterId = userId;
+
+                            //Only change the publish state if the "previous" version was actually published
+                            if (content.Published)
+                                content.ChangePublishedState(PublishedState.Saved);
+
+                            repository.AddOrUpdate(content);
+                            //add or update preview
+                            repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                        }
+                    }
+                    else
+                    {
+                        foreach (var content in asArray)
+                        {
+                            content.WriterId = userId;
+                            repository.AddOrUpdate(content);
+                            //add or update preview
+                            repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                        }
+                    }
+                }
+
+                if (raiseEvents)
+                {
+                    saveEventArgs.CanCancel = false;
+                    uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
+                }
+
+                Audit(uow, AuditType.Save, "Bulk Save content performed by user", userId == -1 ? 0 : userId, Constants.System.Root);
+                uow.Commit();
+
+                return OperationStatus.Success(evtMsgs);
+            }
+        }
+
+        /// <summary>
+        /// Permanently deletes an <see cref="IContent"/> object.
+        /// </summary>
+        /// <remarks>
+        /// This method will also delete associated media files, child content and possibly associated domains.
+        /// </remarks>
+        /// <remarks>Please note that this method will completely remove the Content from the database</remarks>
+        /// <param name="content">The <see cref="IContent"/> to delete</param>
+        /// <param name="userId">Optional Id of the User deleting the Content</param>
+        Attempt<OperationStatus> IContentServiceOperations.Delete(IContent content, int userId)
+        {
+            var evtMsgs = EventMessagesFactory.Get();
+
+            using (new WriteLock(Locker))
+            {
+                using (var uow = UowProvider.GetUnitOfWork())
+                {
+                    var deleteEventArgs = new DeleteEventArgs<IContent>(content, evtMsgs);
+                    if (uow.Events.DispatchCancelable(Deleting, this, deleteEventArgs, "Deleting"))
+                    {
+                        uow.Commit();
+                        return OperationStatus.Cancelled(evtMsgs);
+                    }
+
+                    //Make sure that published content is unpublished before being deleted
+                    if (HasPublishedVersion(content.Id))
+                    {
+                        UnPublish(content, userId);
+                    }
+
+                    //Delete children before deleting the 'possible parent'
+                    var children = GetChildren(content.Id);
+                    foreach (var child in children)
+                    {
+                        Delete(child, userId);
+                    }
+
+                    var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                    repository.Delete(content);
+
+                    deleteEventArgs.CanCancel = false;
+                    uow.Events.Dispatch(Deleted, this, deleteEventArgs, "Deleted");
+
+                    Audit(uow, AuditType.Delete, "Delete Content performed by user", userId, content.Id);
+                    uow.Commit();
+                }
+
+                return OperationStatus.Success(evtMsgs);
+            }
+        }
+
+        /// <summary>
+        /// Publishes a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to publish</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <returns>The published status attempt</returns>
+        Attempt<PublishStatus> IContentServiceOperations.Publish(IContent content, int userId)
+        {
+            return SaveAndPublishDo(content, userId);
+        }
+
+        /// <summary>
+        /// Saves a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to save</param>
+        /// <param name="userId">Optional Id of the User saving the Content</param>
+        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
+        Attempt<OperationStatus> IContentServiceOperations.Save(IContent content, int userId, bool raiseEvents)
+        {
+            return Save(content, true, userId, raiseEvents);
+        }
+
+        /// <summary>
+        /// Saves a collection of <see cref="IContent"/> objects.
+        /// </summary>
+        /// <remarks>
+        /// If the collection of content contains new objects that references eachother by Id or ParentId,
+        /// then use the overload Save method with a collection of Lazy <see cref="IContent"/>.
+        /// </remarks>
+        /// <param name="contents">Collection of <see cref="IContent"/> to save</param>
+        /// <param name="userId">Optional Id of the User saving the Content</param>
+        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
+        public void Save(IEnumerable<IContent> contents, int userId = 0, bool raiseEvents = true)
+        {
+            ((IContentServiceOperations)this).Save(contents, userId, raiseEvents);
+        }
+
+        /// <summary>
+        /// Deletes all content of the specified types. All Descendants of deleted content that is not of these types is moved to Recycle Bin.
+        /// </summary>
+        /// <param name="contentTypeIds">Id of the <see cref="IContentType"/></param>
+        /// <param name="userId">Optional Id of the user issueing the delete operation</param>
+        public void DeleteContentOfTypes(IEnumerable<int> contentTypeIds, int userId = 0)
+        {
+            using (new WriteLock(Locker))
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                //track the 'root' items of the collection of nodes discovered to delete, we need to use
+                //these items to lookup descendants that are not of this doc type so they can be transfered
+                //to the recycle bin
+                IDictionary<string, IContent> rootItems;
+                var contentToDelete = this.TrackDeletionsForDeleteContentOfTypes(contentTypeIds, repository, out rootItems).ToArray();
+
+                if (uow.Events.DispatchCancelable(Deleting, this, new DeleteEventArgs<IContent>(contentToDelete), "Deleting"))
+                {
+                    uow.Commit();
+                    return;
+                }
+
+                //Determine the items that will need to be recycled (that are children of these content items but not of these content types)
+                var contentToRecycle = this.TrackTrashedForDeleteContentOfTypes(contentTypeIds, rootItems, repository);
+
+                //move each item to the bin starting with the deepest items
+                foreach (var child in contentToRecycle.OrderByDescending(x => x.Level))
+                {
+                    MoveToRecycleBinDo(child, userId, true);
+                }
+
+                foreach (var content in contentToDelete)
+                {
+                    Delete(content, userId);
+                }
+
+                Audit(uow, AuditType.Delete,
+                    string.Format("Delete Content of Types {0} performed by user", string.Join(",", contentTypeIds)),
+                    userId, Constants.System.Root);
+                uow.Commit();
+            }
+        }
+
+        /// <summary>
+        /// Deletes all content of specified type. All children of deleted content is moved to Recycle Bin.
+        /// </summary>
+        /// <remarks>This needs extra care and attention as its potentially a dangerous and extensive operation</remarks>
+        /// <param name="contentTypeId">Id of the <see cref="IContentType"/></param>
+        /// <param name="userId">Optional Id of the user issueing the delete operation</param>
+        public void DeleteContentOfType(int contentTypeId, int userId = 0)
+        {
+            DeleteContentOfTypes(new[] {contentTypeId}, userId);
+        }
+
+        /// <summary>
+        /// Permanently deletes an <see cref="IContent"/> object as well as all of its Children.
+        /// </summary>
+        /// <remarks>
+        /// This method will also delete associated media files, child content and possibly associated domains.
+        /// </remarks>
+        /// <remarks>Please note that this method will completely remove the Content from the database</remarks>
+        /// <param name="content">The <see cref="IContent"/> to delete</param>
+        /// <param name="userId">Optional Id of the User deleting the Content</param>
+        public void Delete(IContent content, int userId = 0)
+        {
+            ((IContentServiceOperations)this).Delete(content, userId);
+        }
+
+        /// <summary>
+        /// Permanently deletes versions from an <see cref="IContent"/> object prior to a specific date.
+        /// This method will never delete the latest version of a content item.
+        /// </summary>
+        /// <param name="id">Id of the <see cref="IContent"/> object to delete versions from</param>
+        /// <param name="versionDate">Latest version date</param>
+        /// <param name="userId">Optional Id of the User deleting versions of a Content object</param>
+        public void DeleteVersions(int id, DateTime versionDate, int userId = 0)
+        {
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var deleteRevisionsEventArgs = new DeleteRevisionsEventArgs(id, dateToRetain: versionDate);
+                if (uow.Events.DispatchCancelable(DeletingVersions, this, deleteRevisionsEventArgs, "DeletingVersions"))
+                {
+                    uow.Commit();
+                    return;
+                }
+
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                repository.DeleteVersions(id, versionDate);
+                deleteRevisionsEventArgs.CanCancel = false;
+                uow.Events.Dispatch(DeletedVersions, this, deleteRevisionsEventArgs, "DeletedVersions");
+
+                Audit(uow, AuditType.Delete, "Delete Content by version date performed by user", userId, Constants.System.Root);
+                uow.Commit();
+            }
+        }
+
+        /// <summary>
+        /// Permanently deletes specific version(s) from an <see cref="IContent"/> object.
+        /// This method will never delete the latest version of a content item.
+        /// </summary>
+        /// <param name="id">Id of the <see cref="IContent"/> object to delete a version from</param>
+        /// <param name="versionId">Id of the version to delete</param>
+        /// <param name="deletePriorVersions">Boolean indicating whether to delete versions prior to the versionId</param>
+        /// <param name="userId">Optional Id of the User deleting versions of a Content object</param>
+        public void DeleteVersion(int id, Guid versionId, bool deletePriorVersions, int userId = 0)
+        {
+            using (new WriteLock(Locker))
+            {
+                using (var uow = UowProvider.GetUnitOfWork())
+                {
+                    if (uow.Events.DispatchCancelable(DeletingVersions, this, new DeleteRevisionsEventArgs(id, specificVersion: versionId), "DeletingVersions"))
+                    {
+                        uow.Commit();
+                        return;
+                    }
+
+                    if (deletePriorVersions)
+                    {
+                        var content = GetByVersion(versionId);
+                        DeleteVersions(id, content.UpdateDate, userId);
+                    }
+
+                    var repository = RepositoryFactory.CreateContentRepository(uow);
+                    repository.DeleteVersion(versionId);
+
+                    uow.Events.Dispatch(DeletedVersions, this, new DeleteRevisionsEventArgs(id, false, specificVersion: versionId), "DeletedVersions");
+
+                    Audit(uow, AuditType.Delete, "Delete Content by version performed by user", userId, Constants.System.Root);
+                    uow.Commit();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Deletes an <see cref="IContent"/> object by moving it to the Recycle Bin
+        /// </summary>
+        /// <remarks>Move an item to the Recycle Bin will result in the item being unpublished</remarks>
+        /// <param name="content">The <see cref="IContent"/> to delete</param>
+        /// <param name="userId">Optional Id of the User deleting the Content</param>
+        public void MoveToRecycleBin(IContent content, int userId = 0)
+        {
+            ((IContentServiceOperations)this).MoveToRecycleBin(content, userId);
+        }
+
+        /// <summary>
+        /// Moves an <see cref="IContent"/> object to a new location by changing its parent id.
+        /// </summary>
+        /// <remarks>
+        /// If the <see cref="IContent"/> object is already published it will be
+        /// published after being moved to its new location. Otherwise it'll just
+        /// be saved with a new parent id.
+        /// </remarks>
+        /// <param name="content">The <see cref="IContent"/> to move</param>
+        /// <param name="parentId">Id of the Content's new Parent</param>
+        /// <param name="userId">Optional Id of the User moving the Content</param>
+        public void Move(IContent content, int parentId, int userId = 0)
+        {
+            using (new WriteLock(Locker))
+            {
+                //This ensures that the correct method is called if this method is used to Move to recycle bin.
+                if (parentId == Constants.System.RecycleBinContent)
+                {
+                    MoveToRecycleBin(content, userId);
+                    return;
+                }
+
+                using (var uow = UowProvider.GetUnitOfWork())
+                {
+                    var moveEventInfo = new MoveEventInfo<IContent>(content, content.Path, parentId);
+                    var moveEventArgs = new MoveEventArgs<IContent>(moveEventInfo);
+                    if (uow.Events.DispatchCancelable(Moving, this, moveEventArgs, "Moving"))
+                    {
+                        uow.Commit();
+                        return;
+                    }
+
+                    //used to track all the moved entities to be given to the event
+                    var moveInfo = new List<MoveEventInfo<IContent>>();
+
+                    //call private method that does the recursive moving
+                    PerformMove(content, parentId, userId, moveInfo);
+
+                    moveEventArgs.MoveInfoCollection = moveInfo;
+                    moveEventArgs.CanCancel = false;
+                    uow.Events.Dispatch(Moved, this, moveEventArgs, "Moved");
+
+                    Audit(uow, AuditType.Move, "Move Content performed by user", userId, content.Id);
+                    uow.Commit();
+                }
+            }
+        }
+
+        /// <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")]
+        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))
+            {
+                var nodeObjectType = Constants.ObjectTypes.DocumentGuid;
+
+                using (var uow = UowProvider.GetUnitOfWork())
+                {
+                    var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                    //Create a dictionary of ids -> dictionary of property aliases + values
+                    var entities = repository.GetEntitiesInRecycleBin()
+                        .ToDictionary(
+                            key => key.Id,
+                            val => (IEnumerable<Property>)val.Properties);
+
+                    var files = ((ContentRepository)repository).GetFilesInRecycleBinForUploadField();
+
+                    var recycleBinEventArgs = new RecycleBinEventArgs(nodeObjectType, entities, files);
+                    if (uow.Events.DispatchCancelable(EmptyingRecycleBin, this, recycleBinEventArgs))
+                    {
+                        uow.Commit();
+                        return;
+                    }
+
+                    var success = repository.EmptyRecycleBin();
+                    recycleBinEventArgs.CanCancel = false;
+                    recycleBinEventArgs.RecycleBinEmptiedSuccessfully = success;
+                    uow.Events.Dispatch(EmptiedRecycleBin, this, recycleBinEventArgs);
+
+                    Audit(uow, AuditType.Delete, "Empty Content Recycle Bin performed by user", userId, Constants.System.RecycleBinContent);
+                    uow.Commit();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Copies an <see cref="IContent"/> object by creating a new Content object of the same type and copies all data from the current
+        /// to the new copy which is returned. Recursively copies all children.
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to copy</param>
+        /// <param name="parentId">Id of the Content's new Parent</param>
+        /// <param name="relateToOriginal">Boolean indicating whether the copy should be related to the original</param>
+        /// <param name="userId">Optional Id of the User copying the Content</param>
+        /// <returns>The newly created <see cref="IContent"/> object</returns>
+        public IContent Copy(IContent content, int parentId, bool relateToOriginal, int userId = 0)
+        {
+            return Copy(content, parentId, relateToOriginal, true, userId);
+        }
+
+        /// <summary>
+        /// Copies an <see cref="IContent"/> object by creating a new Content object of the same type and copies all data from the current
+        /// to the new copy which is returned.
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to copy</param>
+        /// <param name="parentId">Id of the Content's new Parent</param>
+        /// <param name="relateToOriginal">Boolean indicating whether the copy should be related to the original</param>
+        /// <param name="recursive">A value indicating whether to recursively copy children.</param>
+        /// <param name="userId">Optional Id of the User copying the Content</param>
+        /// <returns>The newly created <see cref="IContent"/> object</returns>
+        public IContent Copy(IContent content, int parentId, bool relateToOriginal, bool recursive, int userId = 0)
+        {
+            //TODO: This all needs to be managed correctly so that the logic is submitted in one
+            // transaction, the CRUD needs to be moved to the repo
+
+            using (new WriteLock(Locker))
+            {
+                var copy = content.DeepCloneWithResetIdentities();
+                copy.ParentId = parentId;
+
+                // A copy should never be set to published automatically even if the original was.
+                copy.ChangePublishedState(PublishedState.Unpublished);
+
+                using (var uow = UowProvider.GetUnitOfWork())
+                {
+                    var copyEventArgs = new CopyEventArgs<IContent>(content, copy, true, parentId, relateToOriginal);
+                    if (uow.Events.DispatchCancelable(Copying, this, copyEventArgs))
+                    {
+                        uow.Commit();
+                        return null;
+                    }
+
+                    var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                    // Update the create author and last edit author
+                    copy.CreatorId = userId;
+                    copy.WriterId = userId;
+
+                    //get the current permissions, if there are any explicit ones they need to be copied
+                    var currentPermissions = GetPermissionsForEntity(content);
+                    currentPermissions.RemoveWhere(p => p.IsDefaultPermissions);
+
+                    repository.AddOrUpdate(copy);
+                    repository.AddOrUpdatePreviewXml(copy, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+
+                    //add permissions
+                    if (currentPermissions.Count > 0)
+                    {
+                        var permissionSet = new ContentPermissionSet(copy, currentPermissions);
+                        repository.AddOrUpdatePermissions(permissionSet);
+                    }
+
+                    uow.Commit(); // todo - this should flush, not commit
+
+                    //Special case for the associated tags
+                    //TODO: Move this to the repository layer in a single transaction!
+                    //don't copy tags data in tags table if the item is in the recycle bin
+                    if (parentId != Constants.System.RecycleBinContent)
+                    {
+                        var tags = uow.Database.Fetch<TagRelationshipDto>("WHERE nodeId = @Id", new { Id = content.Id });
+                        foreach (var tag in tags)
+                            uow.Database.Insert(new TagRelationshipDto
+                            {
+                                NodeId = copy.Id, TagId = tag.TagId, PropertyTypeId = tag.PropertyTypeId
+                            });
+                    }
+                    uow.Commit(); // todo - this should flush, not commit
+
+                    if (recursive)
+                    {
+                        //Look for children and copy those as well
+                        var children = GetChildren(content.Id);
+                        foreach (var child in children)
+                        {
+                            //TODO: This shouldn't recurse back to this method, it should be done in a private method
+                            // that doesn't have a nested lock and so we can perform the entire operation in one commit.
+                            Copy(child, copy.Id, relateToOriginal, true, userId);
+                        }
+                    }
+                    copyEventArgs.CanCancel = false;
+                    uow.Events.Dispatch(Copied, this, copyEventArgs);
+                    Audit(uow, AuditType.Copy, "Copy Content performed by user", userId, content.Id);
+                    uow.Commit();
+                }
+
+                return copy;
+            }
+        }
+
+
+        /// <summary>
+        /// Sends an <see cref="IContent"/> to Publication, which executes handlers and events for the 'Send to Publication' action.
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to send to publication</param>
+        /// <param name="userId">Optional Id of the User issueing the send to publication</param>
+        /// <returns>True if sending publication was succesfull otherwise false</returns>
+        public bool SendToPublication(IContent content, int userId = 0)
+        {
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var sendToPublishEventArgs = new SendToPublishEventArgs<IContent>(content);
+                if (uow.Events.DispatchCancelable(SendingToPublish, this, sendToPublishEventArgs))
+                {
+                    uow.Commit();
+                    return false;
+                }
+
+                //Save before raising event
+                Save(content, userId);
+                sendToPublishEventArgs.CanCancel = false;
+                uow.Events.Dispatch(SentToPublish, this, sendToPublishEventArgs);
+
+                Audit(uow, AuditType.SendToPublish, "Send to Publish performed by user", content.WriterId, content.Id);
+                uow.Commit();
+
+                return true;
+            }
+        }
+
+        /// <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.
+        /// </summary>
+        /// <remarks>
+        /// The way data is stored actually only allows us to rollback on properties
+        /// and not data like Name and Alias of the Content.
+        /// </remarks>
+        /// <param name="id">Id of the <see cref="IContent"/>being rolled back</param>
+        /// <param name="versionId">Id of the version to rollback to</param>
+        /// <param name="userId">Optional Id of the User issueing the rollback of the Content</param>
+        /// <returns>The newly created <see cref="IContent"/> object</returns>
+        public IContent Rollback(int id, Guid versionId, int userId = 0)
+        {
+            var content = GetByVersion(versionId);
+
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var rollbackEventArgs = new RollbackEventArgs<IContent>(content);
+                if (uow.Events.DispatchCancelable(RollingBack, this, rollbackEventArgs))
+                {
+                    uow.Commit();
+                    return content;
+                }
+
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                content.WriterId = userId;
+                content.CreatorId = userId;
+                content.ChangePublishedState(PublishedState.Unpublished);
+
+                repository.AddOrUpdate(content);
+                repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                rollbackEventArgs.CanCancel = false;
+                uow.Events.Dispatch(RolledBack, this, rollbackEventArgs);
+
+                Audit(uow, AuditType.RollBack, "Content rollback performed by user", content.WriterId, content.Id);
+                uow.Commit();
+            }
+
+            return content;
+        }
+
+        /// <summary>
+        /// Sorts a collection of <see cref="IContent"/> objects by updating the SortOrder according
+        /// to the ordering of items in the passed in <see cref="IEnumerable{T}"/>.
+        /// </summary>
+        /// <remarks>
+        /// Using this method will ensure that the Published-state is maintained upon sorting
+        /// so the cache is updated accordingly - as needed.
+        /// </remarks>
+        /// <param name="items"></param>
+        /// <param name="userId"></param>
+        /// <param name="raiseEvents"></param>
+        /// <returns>True if sorting succeeded, otherwise False</returns>
+        public bool Sort(IEnumerable<IContent> items, int userId = 0, bool raiseEvents = true)
+        {
+            var shouldBePublished = new List<IContent>();
+            var shouldBeSaved = new List<IContent>();
+
+            using (new WriteLock(Locker))
+            {
+                using (var uow = UowProvider.GetUnitOfWork())
+                {
+                    var asArray = items.ToArray();
+                    var saveEventArgs = new SaveEventArgs<IContent>(asArray);
+                    if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
+                    {
+                        uow.Commit();
+                        return false;
+                    }
+
+                    var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                    var i = 0;
+                    foreach (var content in asArray)
+                    {
+                        //If the current sort order equals that of the content
+                        //we don't need to update it, so just increment the sort order
+                        //and continue.
+                        if (content.SortOrder == i)
+                        {
+                            i++;
+                            continue;
+                        }
+
+                        content.SortOrder = i;
+                        content.WriterId = userId;
+                        i++;
+
+                        if (content.Published)
+                        {
+                            //TODO: This should not be an inner operation, but if we do this, it cannot raise events and cannot be cancellable!
+                            var published = _publishingStrategy.Publish(uow, content, userId).Success;
+                            shouldBePublished.Add(content);
+                        }
+                        else
+                            shouldBeSaved.Add(content);
+
+                        repository.AddOrUpdate(content);
+                        //add or update a preview
+                        repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                    }
+
+                    foreach (var content in shouldBePublished)
+                    {
+                        //Create and Save ContentXml DTO
+                        repository.AddOrUpdateContentXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                    }
+
+                    if (raiseEvents)
+                    {
+                        saveEventArgs.CanCancel = false;
+                        uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
+                    }
+
+                    if (shouldBePublished.Any())
+                    {
+                        //TODO: This should not be an inner operation, but if we do this, it cannot raise events and cannot be cancellable!
+                        _publishingStrategy.PublishingFinalized(uow, shouldBePublished, false);
+                    }
+
+                    Audit(uow, AuditType.Sort, "Sorting content performed by user", userId, 0);
+                    uow.Commit();
+                }
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// Sorts a collection of <see cref="IContent"/> objects by updating the SortOrder according
+        /// to the ordering of node Ids passed in.
+        /// </summary>
+        /// <remarks>
+        /// Using this method will ensure that the Published-state is maintained upon sorting
+        /// so the cache is updated accordingly - as needed.
+        /// </remarks>
+        /// <param name="ids"></param>
+        /// <param name="userId"></param>
+        /// <param name="raiseEvents"></param>
+        /// <returns>True if sorting succeeded, otherwise False</returns>
+        public bool Sort(int[] ids, int userId = 0, bool raiseEvents = true)
+        {
+            var shouldBePublished = new List<IContent>();
+            var shouldBeSaved = new List<IContent>();
+
+            using (new WriteLock(Locker))
+            {
+                var allContent = GetByIds(ids).ToDictionary(x => x.Id, x => x);
+                if (allContent.Any() == false)
+                {
+                    return false;
+                }
+                var items = ids.Select(x => allContent[x]).ToArray();
+
+                using (var uow = UowProvider.GetUnitOfWork())
+                {
+                    var saveEventArgs = new SaveEventArgs<IContent>(items);
+                    if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
+                    {
+                        uow.Commit();
+                        return false;
+                    }
+
+                    var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                    var i = 0;
+                    foreach (var content in items)
+                    {
+                        //If the current sort order equals that of the content
+                        //we don't need to update it, so just increment the sort order
+                        //and continue.
+                        if (content.SortOrder == i)
+                        {
+                            i++;
+                            continue;
+                        }
+
+                        content.SortOrder = i;
+                        content.WriterId = userId;
+                        i++;
+
+                        if (content.Published)
+                        {
+                            //TODO: This should not be an inner operation, but if we do this, it cannot raise events and cannot be cancellable!
+                            var published = _publishingStrategy.Publish(uow, content, userId).Success;
+                            shouldBePublished.Add(content);
+                        }
+                        else
+                            shouldBeSaved.Add(content);
+
+                        repository.AddOrUpdate(content);
+                        //add or update a preview
+                        repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                    }
+
+                    foreach (var content in shouldBePublished)
+                    {
+                        //Create and Save ContentXml DTO
+                        repository.AddOrUpdateContentXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                    }
+
+                    if (raiseEvents)
+                    {
+                        saveEventArgs.CanCancel = false;
+                        uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
+                    }
+
+                    if (shouldBePublished.Any())
+                    {
+                        //TODO: This should not be an inner operation, but if we do this, it cannot raise events and cannot be cancellable!
+                        _publishingStrategy.PublishingFinalized(uow, shouldBePublished, false);
+                    }
+
+                    Audit(uow, AuditType.Sort, "Sort child items performed by user", userId, items.First().ParentId);
+                    uow.Commit();
+                }
+            }
+
+            return true;
+        }
+
+        public IEnumerable<IContent> GetBlueprintsForContentTypes(params int[] documentTypeIds)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentBlueprintRepository(uow);
+
+                var query = new Query<IContent>();
+                if (documentTypeIds.Length > 0)
+                {
+                    query.Where(x => documentTypeIds.Contains(x.ContentTypeId));
+                }
+                return repository.GetByQuery(query).Select(x =>
+                {
+                    ((Content) x).IsBlueprint = true;
+                    return x;
+                });
+            }
+        }
+
+        /// <summary>
+        /// Gets paged content descendants as XML by path
+        /// </summary>
+        /// <param name="path">Path starts with</param>
+        /// <param name="pageIndex">Page number</param>
+        /// <param name="pageSize">Page size</param>
+        /// <param name="totalRecords">Total records the query would return without paging</param>
+        /// <returns>A paged enumerable of XML entries of content items</returns>
+        public IEnumerable<XElement> GetPagedXmlEntries(string path, long pageIndex, int pageSize, out long totalRecords)
+        {
+            Mandate.ParameterCondition(pageIndex >= 0, "pageIndex");
+            Mandate.ParameterCondition(pageSize > 0, "pageSize");
+
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                var contents = repository.GetPagedXmlEntriesByPath(path, pageIndex, pageSize,
+                    //This order by is VERY important! This allows us to figure out what is implicitly not published, see ContentRepository.BuildXmlCache and
+                    // UmbracoContentIndexer.PerformIndexAll which uses the logic based on this sort order
+                    new[] { "level", "parentID", "sortOrder" },
+                    out totalRecords);
+                return contents;
+            }
+        }
+
+        /// <summary>
+        /// This builds the Xml document used for the XML cache
+        /// </summary>
+        /// <returns></returns>
+        public XmlDocument BuildXmlCache()
+        {
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                var result = repository.BuildXmlCache();
+                uow.Commit();
+                return result;
+            }
+        }
+
+        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>
+        /// <param name="contentTypeIds">
+        /// Only rebuild the xml structures for the content type ids passed in, if none then rebuilds the structures
+        /// for all content
+        /// </param>
+        public void RebuildXmlStructures(params int[] contentTypeIds)
+        {
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                repository.RebuildXmlStructures(
+                    content => _entitySerializer.Serialize(this, _dataTypeService, _userService, content),
+                    contentTypeIds: contentTypeIds.Length == 0 ? null : contentTypeIds);
+
+                Audit(uow, AuditType.Publish, "ContentService.RebuildXmlStructures completed, the xml has been regenerated in the database", 0, Constants.System.Root);
+                uow.Commit();
+            }
+        }
+
+        #region Internal Methods
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> descendants by the first Parent.
+        /// </summary>
+        /// <param name="content"><see cref="IContent"/> item to retrieve Descendants from</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        internal IEnumerable<IContent> GetPublishedDescendants(IContent content)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                var query = Query<IContent>.Builder.Where(x => x.Id != content.Id && x.Path.StartsWith(content.Path) && x.Trashed == false);
+                return repository.GetByPublishedVersion(query);
+            }
+        }
+
+        #endregion
+
+        #region Private Methods
+
+        /// <summary>
+        /// Hack: This is used to fix some data if an entity's properties are invalid/corrupt
+        /// </summary>
+        /// <param name="content"></param>
+        private void QuickUpdate(IContent content)
+        {
+            if (content == null) throw new ArgumentNullException("content");
+            if (content.HasIdentity == false) throw new InvalidOperationException("Cannot update an entity without an Identity");
+
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                repository.AddOrUpdate(content);
+                uow.Commit();
+            }
+        }
+
+        private void Audit(IScopeUnitOfWork uow, AuditType type, string message, int userId, int objectId)
+        {
+            var auditRepo = RepositoryFactory.CreateAuditRepository(uow);
+            auditRepo.AddOrUpdate(new AuditItem(objectId, message, type, userId));
+        }
+
+        //TODO: All of this needs to be moved to the repository
+        private void PerformMove(IContent content, int parentId, int userId, ICollection<MoveEventInfo<IContent>> moveInfo)
+        {
+            //add a tracking item to use in the Moved event
+            moveInfo.Add(new MoveEventInfo<IContent>(content, content.Path, parentId));
+
+            content.WriterId = userId;
+            if (parentId == Constants.System.Root)
+            {
+                content.Path = string.Concat(Constants.System.Root, ",", content.Id);
+                content.Level = 1;
+            }
+            else
+            {
+                var parent = GetById(parentId);
+                content.Path = string.Concat(parent.Path, ",", content.Id);
+                content.Level = parent.Level + 1;
+            }
+
+            //If Content is being moved away from Recycle Bin, its state should be un-trashed
+            if (content.Trashed && parentId != Constants.System.RecycleBinContent)
+            {
+                content.ChangeTrashedState(false, parentId);
+            }
+            else
+            {
+                content.ParentId = parentId;
+            }
+
+            //If Content is published, it should be (re)published from its new location
+            if (content.Published)
+            {
+                //If Content is Publishable its saved and published
+                //otherwise we save the content without changing the publish state, and generate new xml because the Path, Level and Parent has changed.
+                if (IsPublishable(content))
+                {
+                    //TODO: This is raising events, probably not desirable as this costs performance for event listeners like Examine
+                    SaveAndPublish(content, userId);
+                }
+                else
+                {
+                    //TODO: This is raising events, probably not desirable as this costs performance for event listeners like Examine
+                    Save(content, false, userId);
+
+                    //TODO: This shouldn't be here! This needs to be part of the repository logic but in order to fix this we need to
+                    // change how this method calls "Save" as it needs to save using an internal method
+                    using (var uow = UowProvider.GetUnitOfWork())
+                    {
+                        var xml = _entitySerializer.Serialize(this, _dataTypeService, _userService, content);
+
+                        var poco = new ContentXmlDto { NodeId = content.Id, Xml = xml.ToDataString() };
+                        var exists =
+                            uow.Database.FirstOrDefault<ContentXmlDto>("WHERE nodeId = @Id", new { Id = content.Id }) !=
+                            null;
+                        int result = exists
+                                         ? uow.Database.Update(poco)
+                                         : Convert.ToInt32(uow.Database.Insert(poco));
+                        uow.Commit();
+                    }
+                }
+            }
+            else
+            {
+                //TODO: This is raising events, probably not desirable as this costs performance for event listeners like Examine
+                Save(content, userId);
+            }
+
+            //Ensure that Path and Level is updated on children
+            var children = GetChildren(content.Id).ToArray();
+            if (children.Any())
+            {
+                foreach (var child in children)
+                {
+                    PerformMove(child, content.Id, userId, moveInfo);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Publishes a <see cref="IContent"/> object and all its children
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to publish along with its children</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <param name="includeUnpublished">If set to true, this will also publish descendants that are completely unpublished, normally this will only publish children that have previously been published</param>
+        /// <returns>
+        /// A list of publish statues. If the parent document is not valid or cannot be published because it's parent(s) is not published
+        /// then the list will only contain one status item, otherwise it will contain status items for it and all of it's descendants that
+        /// are to be published.
+        /// </returns>
+        private IEnumerable<Attempt<PublishStatus>> PublishWithChildrenDo(
+            IContent content, int userId = 0, bool includeUnpublished = false)
+        {
+            if (content == null) throw new ArgumentNullException("content");
+
+            var evtMsgs = EventMessagesFactory.Get();
+
+            using (new WriteLock(Locker))
+            {
+                //Hack: this ensures that the entity's path is valid and if not it fixes/persists it
+                //see: http://issues.umbraco.org/issue/U4-9336
+                content.EnsureValidPath(Logger, entity => GetById(entity.ParentId), QuickUpdate);
+
+                var result = new List<Attempt<PublishStatus>>();
+
+                //Check if parent is published (although not if its a root node) - if parent isn't published this Content cannot be published
+                if (content.ParentId != Constants.System.Root && content.ParentId != Constants.System.RecycleBinContent && IsPublishable(content) == false)
+                {
+                    Logger.Info<ContentService>(
+                        string.Format(
+                            "Content '{0}' with Id '{1}' could not be published because its parent or one of its ancestors is not published.",
+                            content.Name, content.Id));
+                    result.Add(Attempt.Fail(new PublishStatus(content, PublishStatusType.FailedPathNotPublished, evtMsgs)));
+                    return result;
+                }
+
+                //Content contains invalid property values and can therefore not be published - fire event?
+                if (!content.IsValid())
+                {
+                    Logger.Info<ContentService>(
+                        string.Format("Content '{0}' with Id '{1}' could not be published because of invalid properties.",
+                                      content.Name, content.Id));
+                    result.Add(
+                        Attempt.Fail(
+                            new PublishStatus(content, PublishStatusType.FailedContentInvalid, evtMsgs)
+                            {
+                                InvalidProperties = ((ContentBase)content).LastInvalidProperties
+                            }));
+                    return result;
+                }
+
+                //Consider creating a Path query instead of recursive method:
+                //var query = Query<IContent>.Builder.Where(x => x.Path.StartsWith(content.Path));
+
+                var updated = new List<IContent>();
+                var list = new List<IContent>();
+                list.Add(content); //include parent item
+                list.AddRange(GetDescendants(content));
+
+                var internalStrategy = _publishingStrategy;
+
+                using (var uow = UowProvider.GetUnitOfWork())
+                {
+                    //Publish and then update the database with new status
+                    var publishedOutcome = internalStrategy.PublishWithChildren(uow, list, userId, includeUnpublished).ToArray();
+                    var published = publishedOutcome
+                        .Where(x => x.Success || x.Result.StatusType == PublishStatusType.SuccessAlreadyPublished)
+                        // ensure proper order (for events) - cannot publish a child before its parent!
+                        .OrderBy(x => x.Result.ContentItem.Level)
+                        .ThenBy(x => x.Result.ContentItem.SortOrder);
+
+                    var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                    //NOTE The Publish with subpages-dialog was used more as a republish-type-thing, so we'll have to include PublishStatusType.SuccessAlreadyPublished
+                    //in the updated-list, so the Published event is triggered with the expected set of pages and the xml is updated.
+                    foreach (var item in published)
+                    {
+                        item.Result.ContentItem.WriterId = userId;
+                        repository.AddOrUpdate(item.Result.ContentItem);
+                        //add or update a preview
+                        repository.AddOrUpdatePreviewXml(item.Result.ContentItem, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                        //add or update the published xml
+                        repository.AddOrUpdateContentXml(item.Result.ContentItem, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                        updated.Add(item.Result.ContentItem);
+                    }
+
+                    //Save xml to db and call following method to fire event:
+                    _publishingStrategy.PublishingFinalized(uow, updated, false);
+
+                    Audit(uow, AuditType.Publish, "Publish with Children performed by user", userId, content.Id);
+                    uow.Commit();
+
+                    return publishedOutcome;
+                }
+            }
+        }
+
+        /// <summary>
+        /// UnPublishes a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to publish</param>
+        /// <param name="omitCacheRefresh">Optional boolean to avoid having the cache refreshed when calling this Unpublish method. By default this method will update the cache.</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <returns>True if unpublishing succeeded, otherwise False</returns>
+        private Attempt<UnPublishStatus> UnPublishDo(IContent content, bool omitCacheRefresh = false, int userId = 0)
+        {
+            var newest = GetById(content.Id); // ensure we have the newest version
+            if (content.Version != newest.Version) // but use the original object if it's already the newest version
+                content = newest;
+
+            var evtMsgs = EventMessagesFactory.Get();
+
+            var published = content.Published ? content : GetPublishedVersion(content.Id); // get the published version
+            if (published == null)
+            {
+                return Attempt.Succeed(new UnPublishStatus(content, UnPublishedStatusType.SuccessAlreadyUnPublished, evtMsgs)); // already unpublished
+            }
+
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var unpublished = _publishingStrategy.UnPublish(uow, content, userId);
+                if (unpublished == false)
+                {
+                    uow.Commit();
+                    return Attempt.Fail(new UnPublishStatus(content, UnPublishedStatusType.FailedCancelledByEvent, evtMsgs));
+                }
+
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                content.WriterId = userId;
+                repository.AddOrUpdate(content);
+                // is published is not newest, reset the published flag on published version
+                if (published.Version != content.Version)
+                    repository.ClearPublished(published);
+                repository.DeleteContentXml(content);
+
+                //Delete xml from db? and call following method to fire event through PublishingStrategy to update cache
+                if (omitCacheRefresh == false)
+                    _publishingStrategy.UnPublishingFinalized(uow, content);
+
+                Audit(uow, AuditType.UnPublish, "UnPublish performed by user", userId, content.Id);
+                uow.Commit();
+            }
+
+            return Attempt.Succeed(new UnPublishStatus(content, UnPublishedStatusType.Success, evtMsgs));
+        }
+
+        /// <summary>
+        /// Saves and Publishes a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to save and publish</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise save events.</param>
+        /// <returns>True if publishing succeeded, otherwise False</returns>
+        private Attempt<PublishStatus> SaveAndPublishDo(IContent content, int userId = 0, bool raiseEvents = true)
+        {
+            var evtMsgs = EventMessagesFactory.Get();
+
+            using (new WriteLock(Locker))
+            {
+                using (var uow = UowProvider.GetUnitOfWork())
+                {
+                    var saveEventArgs = new SaveEventArgs<IContent>(content, evtMsgs);
+                    if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
+                    {
+                        uow.Commit();
+                        return Attempt.Fail(new PublishStatus(content, PublishStatusType.FailedCancelledByEvent, evtMsgs));
+                    }
+
+                    //Has this content item previously been published? If so, we don't need to refresh the children
+                    var previouslyPublished = content.HasIdentity && HasPublishedVersion(content.Id); //content might not have an id
+                    var publishStatus = new PublishStatus(content, PublishStatusType.Success, evtMsgs); //initially set to success
+
+                    //Check if parent is published (although not if its a root node) - if parent isn't published this Content cannot be published
+                    publishStatus.StatusType = CheckAndLogIsPublishable(content);
+                    //if it is not successful, then check if the props are valid
+                    if ((int)publishStatus.StatusType < 10)
+                    {
+                        //Content contains invalid property values and can therefore not be published - fire event?
+                        publishStatus.StatusType = CheckAndLogIsValid(content);
+                        //set the invalid properties (if there are any)
+                        publishStatus.InvalidProperties = ((ContentBase)content).LastInvalidProperties;
+                    }
+                    //if we're still successful, then publish using the strategy
+                    if (publishStatus.StatusType == PublishStatusType.Success)
+                    {
+                        //Publish and then update the database with new status
+                        var publishResult = _publishingStrategy.Publish(uow, content, userId);
+                        //set the status type to the publish result
+                        publishStatus.StatusType = publishResult.Result.StatusType;
+                    }
+
+                    //we are successfully published if our publishStatus is still Successful
+                    bool published = publishStatus.StatusType == PublishStatusType.Success;
+
+                    var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                    if (published == false)
+                    {
+                        content.ChangePublishedState(PublishedState.Saved);
+                    }
+                    //Since this is the Save and Publish method, the content should be saved even though the publish fails or isn't allowed
+                    if (content.HasIdentity == false)
+                    {
+                        content.CreatorId = userId;
+                    }
+                    content.WriterId = userId;
+
+                    repository.AddOrUpdate(content);
+                    repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+
+                    if (published)
+                    {
+                        //Content Xml
+                        repository.AddOrUpdateContentXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                    }
+
+                    if (raiseEvents)
+                    {
+                        saveEventArgs.CanCancel = false;
+                        uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
+                    }
+
+                    //Save xml to db and call following method to fire event through PublishingStrategy to update cache
+                    if (published)
+                    {
+                        _publishingStrategy.PublishingFinalized(uow, content);
+                    }
+
+                    //We need to check if children and their publish state to ensure that we 'republish' content that was previously published
+                    if (published && previouslyPublished == false && HasChildren(content.Id))
+                    {
+                    //TODO: Horrible for performance if there are lots of descendents! We should page if anything but this is crazy
+                        var descendants = GetPublishedDescendants(content);
+                        _publishingStrategy.PublishingFinalized(uow, descendants, false);
+                    }
+
+                    uow.Commit();
+
+                    if (publishStatus.StatusType == PublishStatusType.Success)
+                    {
+                        Audit(uow, AuditType.Publish, "Save and Publish performed by user", userId, content.Id);
+                    }
+                    else
+                    {
+                        Audit(uow, AuditType.Save, "Save performed by user", userId, content.Id);
+                    }
+                    uow.Commit();
+
+                    return Attempt.If(publishStatus.StatusType == PublishStatusType.Success, publishStatus);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Saves a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to save</param>
+        /// <param name="changeState">Boolean indicating whether or not to change the Published state upon saving</param>
+        /// <param name="userId">Optional Id of the User saving the Content</param>
+        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
+        private Attempt<OperationStatus> Save(IContent content, bool changeState, int userId = 0, bool raiseEvents = true)
+        {
+            var evtMsgs = EventMessagesFactory.Get();
+
+            using (new WriteLock(Locker))
+            {
+                var currVersion = content.Version;
+
+                using (var uow = UowProvider.GetUnitOfWork())
+                {
+                    var saveEventArgs = new SaveEventArgs<IContent>(content, evtMsgs);
+                    if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
+                    {
+                        uow.Commit();
+                        return OperationStatus.Cancelled(evtMsgs);
+                    }
+
+                    if (string.IsNullOrWhiteSpace(content.Name))
+                    {
+                        throw new ArgumentException("Cannot save content with empty name.");
+                    }
+
+                    var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                    if (content.HasIdentity == false)
+                    {
+                        content.CreatorId = userId;
+                    }
+                    content.WriterId = userId;
+
+                    //Only change the publish state if the "previous" version was actually published or marked as unpublished
+                    if (changeState && (content.Published || ((Content)content).PublishedState == PublishedState.Unpublished))
+                        content.ChangePublishedState(PublishedState.Saved);
+
+                    repository.AddOrUpdate(content);
+
+                    //Generate a new preview
+                    repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+
+                    if (raiseEvents)
+                    {
+                        saveEventArgs.CanCancel = false;
+                        uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
+                    }
+
+                    Audit(uow, AuditType.Save, "Save Content performed by user", userId, content.Id);
+                    uow.Commit();
+                }
+
+                return currVersion == content.Version
+                    ? OperationStatus.NoOperation(evtMsgs)
+                    : OperationStatus.Success(evtMsgs);
+            }
+        }
+
+        private PublishStatusType CheckAndLogIsPublishable(IContent content)
+        {
+            //Check if parent is published (although not if its a root node) - if parent isn't published this Content cannot be published
+            if (content.ParentId != Constants.System.Root && content.ParentId != Constants.System.RecycleBinContent && IsPublishable(content) == false)
+            {
+                Logger.Info<ContentService>(
+                    string.Format(
+                        "Content '{0}' with Id '{1}' could not be published because its parent is not published.",
+                        content.Name, content.Id));
+                return PublishStatusType.FailedPathNotPublished;
+            }
+
+            if (content.ExpireDate.HasValue && content.ExpireDate.Value > DateTime.MinValue && DateTime.Now > content.ExpireDate.Value)
+            {
+                Logger.Info<ContentService>(
+                    string.Format(
+                        "Content '{0}' with Id '{1}' has expired and could not be published.",
+                        content.Name, content.Id));
+                return PublishStatusType.FailedHasExpired;
+            }
+
+            if (content.ReleaseDate.HasValue && content.ReleaseDate.Value > DateTime.MinValue && content.ReleaseDate.Value > DateTime.Now)
+            {
+                Logger.Info<ContentService>(
+                    string.Format(
+                        "Content '{0}' with Id '{1}' is awaiting release and could not be published.",
+                        content.Name, content.Id));
+                return PublishStatusType.FailedAwaitingRelease;
+            }
+
+            return PublishStatusType.Success;
+        }
+
+        private PublishStatusType CheckAndLogIsValid(IContent content)
+        {
+            //Content contains invalid property values and can therefore not be published - fire event?
+            if (content.IsValid() == false)
+            {
+                Logger.Info<ContentService>(
+                    string.Format(
+                        "Content '{0}' with Id '{1}' could not be published because of invalid properties.",
+                        content.Name, content.Id));
+                return PublishStatusType.FailedContentInvalid;
+            }
+
+            return PublishStatusType.Success;
+        }
+
+        private IContentType FindContentTypeByAlias(string contentTypeAlias)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentTypeRepository(uow);
+
+                var query = Query<IContentType>.Builder.Where(x => x.Alias == contentTypeAlias);
+                var types = repository.GetByQuery(query);
+
+                if (types.Any() == false)
+                    throw new Exception(
+                        string.Format("No ContentType matching the passed in Alias: '{0}' was found",
+                                      contentTypeAlias));
+
+                var contentType = types.First();
+
+                if (contentType == null)
+                    throw new Exception(string.Format("ContentType matching the passed in Alias: '{0}' was null",
+                                                      contentTypeAlias));
+                return contentType;
+            }
+        }
+
+        #endregion
+
+        #region Proxy Event Handlers
+        /// <summary>
+        /// Occurs before publish.
+        /// </summary>
+        /// <remarks>Proxy to the real event on the <see cref="PublishingStrategy"/></remarks>
+        public static event TypedEventHandler<IPublishingStrategy, PublishEventArgs<IContent>> Publishing
+        {
+            add { PublishingStrategy.Publishing += value; }
+            remove { PublishingStrategy.Publishing -= value; }
+        }
+
+        /// <summary>
+        /// Occurs after publish.
+        /// </summary>
+        /// <remarks>Proxy to the real event on the <see cref="PublishingStrategy"/></remarks>
+        public static event TypedEventHandler<IPublishingStrategy, PublishEventArgs<IContent>> Published
+        {
+            add { PublishingStrategy.Published += value; }
+            remove { PublishingStrategy.Published -= value; }
+        }
+        /// <summary>
+        /// Occurs before unpublish.
+        /// </summary>
+        /// <remarks>Proxy to the real event on the <see cref="PublishingStrategy"/></remarks>
+        public static event TypedEventHandler<IPublishingStrategy, PublishEventArgs<IContent>> UnPublishing
+        {
+            add { PublishingStrategy.UnPublishing += value; }
+            remove { PublishingStrategy.UnPublishing -= value; }
+        }
+
+        /// <summary>
+        /// Occurs after unpublish.
+        /// </summary>
+        /// <remarks>Proxy to the real event on the <see cref="PublishingStrategy"/></remarks>
+        public static event TypedEventHandler<IPublishingStrategy, PublishEventArgs<IContent>> UnPublished
+        {
+            add { PublishingStrategy.UnPublished += value; }
+            remove { PublishingStrategy.UnPublished -= value; }
+        }
+        #endregion
+
+        #region Event Handlers
+        /// <summary>
+        /// Occurs before Delete
+        /// </summary>
+        public static event TypedEventHandler<IContentService, DeleteEventArgs<IContent>> Deleting;
+
+        /// <summary>
+        /// Occurs after Delete
+        /// </summary>
+        public static event TypedEventHandler<IContentService, DeleteEventArgs<IContent>> Deleted;
+
+        /// <summary>
+        /// Occurs before Delete Versions
+        /// </summary>
+        public static event TypedEventHandler<IContentService, DeleteRevisionsEventArgs> DeletingVersions;
+
+        /// <summary>
+        /// Occurs after Delete Versions
+        /// </summary>
+        public static event TypedEventHandler<IContentService, DeleteRevisionsEventArgs> DeletedVersions;
+
+        /// <summary>
+        /// Occurs before Save
+        /// </summary>
+        public static event TypedEventHandler<IContentService, SaveEventArgs<IContent>> Saving;
+
+        /// <summary>
+        /// Occurs after Save
+        /// </summary>
+        public static event TypedEventHandler<IContentService, SaveEventArgs<IContent>> Saved;
+
+        /// <summary>
+        /// Occurs before Create
+        /// </summary>
+        [Obsolete("Use the Created event instead, the Creating and Created events both offer the same functionality, Creating event has been deprecated.")]
+        public static event TypedEventHandler<IContentService, NewEventArgs<IContent>> Creating;
+
+        /// <summary>
+        /// Occurs after Create
+        /// </summary>
+        /// <remarks>
+        /// Please note that the Content object has been created, but might not have been saved
+        /// so it does not have an identity yet (meaning no Id has been set).
+        /// </remarks>
+        public static event TypedEventHandler<IContentService, NewEventArgs<IContent>> Created;
+
+        /// <summary>
+        /// Occurs before Copy
+        /// </summary>
+        public static event TypedEventHandler<IContentService, CopyEventArgs<IContent>> Copying;
+
+        /// <summary>
+        /// Occurs after Copy
+        /// </summary>
+        public static event TypedEventHandler<IContentService, CopyEventArgs<IContent>> Copied;
+
+        /// <summary>
+        /// Occurs before Content is moved to Recycle Bin
+        /// </summary>
+        public static event TypedEventHandler<IContentService, MoveEventArgs<IContent>> Trashing;
+
+        /// <summary>
+        /// Occurs after Content is moved to Recycle Bin
+        /// </summary>
+        public static event TypedEventHandler<IContentService, MoveEventArgs<IContent>> Trashed;
+
+        /// <summary>
+        /// Occurs before Move
+        /// </summary>
+        public static event TypedEventHandler<IContentService, MoveEventArgs<IContent>> Moving;
+
+        /// <summary>
+        /// Occurs after Move
+        /// </summary>
+        public static event TypedEventHandler<IContentService, MoveEventArgs<IContent>> Moved;
+
+        /// <summary>
+        /// Occurs before Rollback
+        /// </summary>
+        public static event TypedEventHandler<IContentService, RollbackEventArgs<IContent>> RollingBack;
+
+        /// <summary>
+        /// Occurs after Rollback
+        /// </summary>
+        public static event TypedEventHandler<IContentService, RollbackEventArgs<IContent>> RolledBack;
+
+        /// <summary>
+        /// Occurs before Send to Publish
+        /// </summary>
+        public static event TypedEventHandler<IContentService, SendToPublishEventArgs<IContent>> SendingToPublish;
+
+        /// <summary>
+        /// Occurs after Send to Publish
+        /// </summary>
+        public static event TypedEventHandler<IContentService, SendToPublishEventArgs<IContent>> SentToPublish;
+
+        /// <summary>
+        /// Occurs before the Recycle Bin is emptied
+        /// </summary>
+        public static event TypedEventHandler<IContentService, RecycleBinEventArgs> EmptyingRecycleBin;
+
+        /// <summary>
+        /// Occurs after the Recycle Bin has been Emptied
+        /// </summary>
+        public static event TypedEventHandler<IContentService, RecycleBinEventArgs> EmptiedRecycleBin;
+
+        /// <summary>
+        /// Occurs after a blueprint has been saved.
+        /// </summary>
+        public static event TypedEventHandler<IContentService, SaveEventArgs<IContent>> SavedBlueprint;
+
+        /// <summary>
+        /// Occurs after a blueprint has been deleted.
+        /// </summary>
+        public static event TypedEventHandler<IContentService, DeleteEventArgs<IContent>> DeletedBlueprint;
+
+        #endregion
+    }
+}
diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs
index 1ac8318f9c..8bb7af0077 100644
--- a/src/Umbraco.Web/Editors/ContentController.cs
+++ b/src/Umbraco.Web/Editors/ContentController.cs
@@ -1,1219 +1,1223 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Text;
-using System.Web.Http;
-using System.Web.Http.Controllers;
-using System.Web.Http.ModelBinding;
-using AutoMapper;
-using Umbraco.Core;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.Membership;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
-using Umbraco.Core.Publishing;
-using Umbraco.Core.Services;
-using Umbraco.Web.Models.ContentEditing;
-using Umbraco.Web.Models.Mapping;
-using Umbraco.Web.Mvc;
-using Umbraco.Web.WebApi;
-using Umbraco.Web.WebApi.Binders;
-using Umbraco.Web.WebApi.Filters;
-using Umbraco.Core.Events;
-using Constants = Umbraco.Core.Constants;
-using umbraco.cms.businesslogic;
-using System.Collections;
-using umbraco;
-
-namespace Umbraco.Web.Editors
-{
-    /// <summary>
-    /// The API controller used for editing content
-    /// </summary>
-    /// <remarks>
-    /// This controller is decorated with the UmbracoApplicationAuthorizeAttribute which means that any user requesting
-    /// access to ALL of the methods on this controller will need access to the content application.
-    /// </remarks>
-    [PluginController("UmbracoApi")]
-    [UmbracoApplicationAuthorize(Constants.Applications.Content)]
-    [ContentControllerConfiguration]
-    public class ContentController : ContentControllerBase
-    {
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        public ContentController()
-                : this(UmbracoContext.Current)
-        {
-        }
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="umbracoContext"></param>
-        public ContentController(UmbracoContext umbracoContext)
-                : base(umbracoContext)
-        {
-        }
-
-        /// <summary>
-        /// Configures this controller with a custom action selector
-        /// </summary>
-        private class ContentControllerConfigurationAttribute : Attribute, IControllerConfiguration
-        {
-            public void Initialize(HttpControllerSettings controllerSettings, HttpControllerDescriptor controllerDescriptor)
-            {
-                controllerSettings.Services.Replace(typeof(IHttpActionSelector), new ParameterSwapControllerActionSelector(
-                    new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetNiceUrl", "id", typeof(int), typeof(Guid), typeof(Udi)),
-                    new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetById", "id", typeof(int), typeof(Guid), typeof(Udi))
-                ));
-            }
-        }
-
-        /// <summary>
-        /// Return content for the specified ids
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <returns></returns>
-        [FilterAllowedOutgoingContent(typeof(IEnumerable<ContentItemDisplay>))]
-        public IEnumerable<ContentItemDisplay> GetByIds([FromUri]int[] ids)
-        {
-            var foundContent = Services.ContentService.GetByIds(ids);
-            return foundContent.Select(content => AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(content, UmbracoContext));
-        }
-
-        /// <summary>
-        /// Updates the permissions for a content item for a particular user group
-        /// </summary>
-        /// <param name="saveModel"></param>
-        /// <returns></returns>
-        /// <remarks>
-        /// Permission check is done for letter 'R' which is for <see cref="ActionRights"/> which the user must have access to to update
-        /// </remarks>
-        [EnsureUserPermissionForContent("saveModel.ContentId", 'R')]
-        public IEnumerable<AssignedUserGroupPermissions> PostSaveUserGroupPermissions(UserGroupPermissionsSave saveModel)
-        {
-            if (saveModel.ContentId <= 0) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
-
-            //TODO: Should non-admins be alowed to set granular permissions?
-
-            var content = Services.ContentService.GetById(saveModel.ContentId);
-            if (content == null) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
-
-            //current permissions explicitly assigned to this content item
-            var contentPermissions = Services.ContentService.GetPermissionsForEntity(content)
-                .ToDictionary(x => x.UserGroupId, x => x);
-
-            var allUserGroups = Services.UserService.GetAllUserGroups().ToArray();
-
-            //loop through each user group
-            foreach (var userGroup in allUserGroups)
-            {
-                //check if there's a permission set posted up for this user group
-                IEnumerable<string> groupPermissions;
-                if (saveModel.AssignedPermissions.TryGetValue(userGroup.Id, out groupPermissions))
-                {
-                    //create a string collection of the assigned letters
-                    var groupPermissionCodes = groupPermissions.ToArray();
-
-                    //check if there are no permissions assigned for this group save model, if that is the case we want to reset the permissions
-                    //for this group/node which will go back to the defaults
-                    if (groupPermissionCodes.Length == 0)
-                    {
-                        Services.UserService.RemoveUserGroupPermissions(userGroup.Id, content.Id);
-                    }
-                    //check if they are the defaults, if so we should just remove them if they exist since it's more overhead having them stored
-                    else if (userGroup.Permissions.UnsortedSequenceEqual(groupPermissionCodes))
-                    {
-                        //only remove them if they are actually currently assigned
-                        if (contentPermissions.ContainsKey(userGroup.Id))
-                        {
-                            //remove these permissions from this node for this group since the ones being assigned are the same as the defaults
-                            Services.UserService.RemoveUserGroupPermissions(userGroup.Id, content.Id);
-                        }
-                    }
-                    //if they are different we need to update, otherwise there's nothing to update
-                    else if (contentPermissions.ContainsKey(userGroup.Id) == false || contentPermissions[userGroup.Id].AssignedPermissions.UnsortedSequenceEqual(groupPermissionCodes) == false)
-                    {
-
-                        Services.UserService.ReplaceUserGroupPermissions(userGroup.Id, groupPermissionCodes.Select(x => x[0]), content.Id);
-                    }
-                }
-            }
-
-            return GetDetailedPermissions(content, allUserGroups);
-        }
-
-        /// <summary>
-        /// Returns the user group permissions for user groups assigned to this node
-        /// </summary>
-        /// <param name="contentId"></param>
-        /// <returns></returns>
-        /// <remarks>
-        /// Permission check is done for letter 'R' which is for <see cref="ActionRights"/> which the user must have access to to view
-        /// </remarks>
-        [EnsureUserPermissionForContent("contentId", 'R')]
-        public IEnumerable<AssignedUserGroupPermissions> GetDetailedPermissions(int contentId)
-        {
-            if (contentId <= 0) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
-            var content = Services.ContentService.GetById(contentId);
-            if (content == null) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
-
-            //TODO: Should non-admins be able to see detailed permissions?
-
-            var allUserGroups = Services.UserService.GetAllUserGroups();
-
-            return GetDetailedPermissions(content, allUserGroups);
-        }
-
-        private IEnumerable<AssignedUserGroupPermissions> GetDetailedPermissions(IContent content, IEnumerable<IUserGroup> allUserGroups)
-        {
-            //get all user groups and map their default permissions to the AssignedUserGroupPermissions model.
-            //we do this because not all groups will have true assigned permissions for this node so if they don't have assigned permissions, we need to show the defaults.
-
-            var defaultPermissionsByGroup = Mapper.Map<IEnumerable<AssignedUserGroupPermissions>>(allUserGroups).ToArray();
-
-            var defaultPermissionsAsDictionary = defaultPermissionsByGroup
-                .ToDictionary(x => Convert.ToInt32(x.Id), x => x);
-
-            //get the actual assigned permissions
-            var assignedPermissionsByGroup = Services.ContentService.GetPermissionsForEntity(content).ToArray();
-
-            //iterate over assigned and update the defaults with the real values
-            foreach (var assignedGroupPermission in assignedPermissionsByGroup)
-            {
-                var defaultUserGroupPermissions = defaultPermissionsAsDictionary[assignedGroupPermission.UserGroupId];
-
-                //clone the default permissions model to the assigned ones
-                defaultUserGroupPermissions.AssignedPermissions = AssignedUserGroupPermissions.ClonePermissions(defaultUserGroupPermissions.DefaultPermissions);
-
-                //since there is custom permissions assigned to this node for this group, we need to clear all of the default permissions
-                //and we'll re-check it if it's one of the explicitly assigned ones
-                foreach (var permission in defaultUserGroupPermissions.AssignedPermissions.SelectMany(x => x.Value))
-                {
-                    permission.Checked = false;
-                    permission.Checked = assignedGroupPermission.AssignedPermissions.Contains(permission.PermissionCode, StringComparer.InvariantCulture);
-                }
-
-            }
-
-            return defaultPermissionsByGroup;
-        }
-
-        /// <summary>
-        /// Returns an item to be used to display the recycle bin for content
-        /// </summary>
-        /// <returns></returns>
-        public ContentItemDisplay GetRecycleBin()
-        {
-            var display = new ContentItemDisplay
-            {
-                Id = Constants.System.RecycleBinContent,
-                Alias = "recycleBin",
-                ParentId = -1,
-                Name = Services.TextService.Localize("general/recycleBin"),
-                ContentTypeAlias = "recycleBin",
-                CreateDate = DateTime.Now,
-                IsContainer = true,
-                Path = "-1," + Constants.System.RecycleBinContent
-            };
-
-            TabsAndPropertiesResolver<IContent>.AddListView(display, "content", Services.DataTypeService, Services.TextService);
-
-            return display;
-        }
-
-        public ContentItemDisplay GetBlueprintById(int id)
-        {
-            var foundContent = Services.ContentService.GetBlueprintById(id);
-            if (foundContent == null)
-            {
-                HandleContentNotFound(id);
-            }
-
-            var content = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(foundContent, UmbracoContext);
-
-            SetupBlueprint(content, foundContent);
-
-            return content;
-        }
-
-        private static void SetupBlueprint(ContentItemDisplay content, IContent persistedContent)
-        {
-            content.AllowPreview = false;
-
-            //set a custom path since the tree that renders this has the content type id as the parent
-            content.Path = string.Format("-1,{0},{1}", persistedContent.ContentTypeId, content.Id);
-
-            content.AllowedActions = new[] { "A" };
-            content.IsBlueprint = true;
-
-            var excludeProps = new[] { "_umb_urls", "_umb_releasedate", "_umb_expiredate", "_umb_template" };
-            var propsTab = content.Tabs.Last();
-            propsTab.Properties = propsTab.Properties
-                .Where(p => excludeProps.Contains(p.Alias) == false);
-        }
-
-        /// <summary>
-        /// Gets the content json for the content id
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        [OutgoingEditorModelEvent]
-        [EnsureUserPermissionForContent("id")]
-        public ContentItemDisplay GetById(int id)
-        {
-            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
-            if (foundContent == null)
-            {
-                HandleContentNotFound(id);
-            }
-
-            var content = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(foundContent, UmbracoContext);
-            return content;
-        }
-
-        /// <summary>
-        /// Gets the content json for the content id
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        [OutgoingEditorModelEvent]
-        [EnsureUserPermissionForContent("id")]
-        public ContentItemDisplay GetById(Guid id)
-        {
-            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
-            if (foundContent == null)
-            {
-                HandleContentNotFound(id);
-            }
-
-            var content = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(foundContent, UmbracoContext);
-            return content;
-        }
-
-        /// <summary>
-        /// Gets the content json for the content id
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        [OutgoingEditorModelEvent]
-        [EnsureUserPermissionForContent("id")]
-        public ContentItemDisplay GetById(Udi id)
-        {
-            var guidUdi = id as GuidUdi;
-            if (guidUdi != null)
-            {
-                return GetById(guidUdi.Guid);
-            }
-
-            throw new HttpResponseException(HttpStatusCode.NotFound);
-        }
-
-        [EnsureUserPermissionForContent("id")]
-        public ContentItemDisplay GetWithTreeDefinition(int id)
-        {
-            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
-            if (foundContent == null)
-            {
-                HandleContentNotFound(id);
-            }
-
-            var content = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(foundContent, UmbracoContext);
-            return content;
-        }
-
-        /// <summary>
-        /// Gets an empty content item for the
-        /// </summary>
-        /// <param name="contentTypeAlias"></param>
-        /// <param name="parentId"></param>
-        /// <returns>
-        /// If this is a container type, we'll remove the umbContainerView tab for a new item since
-        /// it cannot actually list children if it doesn't exist yet.
-        /// </returns>
-        [OutgoingEditorModelEvent]
-        public ContentItemDisplay GetEmpty(string contentTypeAlias, int parentId)
-        {
-            var contentType = Services.ContentTypeService.GetContentType(contentTypeAlias);
-            if (contentType == null)
-            {
-                throw new HttpResponseException(HttpStatusCode.NotFound);
-            }
-
-            var emptyContent = Services.ContentService.CreateContent("", parentId, contentType.Alias, UmbracoUser.Id);
-            var mapped = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(emptyContent, UmbracoContext);
-            // translate the content type name if applicable
-            mapped.ContentTypeName = Services.TextService.UmbracoDictionaryTranslate(mapped.ContentTypeName);
-            // if your user type doesn't have access to the Settings section it would not get this property mapped
-            if(mapped.DocumentType != null)
-                mapped.DocumentType.Name = Services.TextService.UmbracoDictionaryTranslate(mapped.DocumentType.Name);
-
-            //remove this tab if it exists: umbContainerView
-            var containerTab = mapped.Tabs.FirstOrDefault(x => x.Alias == Constants.Conventions.PropertyGroups.ListViewGroupName);
-            mapped.Tabs = mapped.Tabs.Except(new[] { containerTab });
-            return mapped;
-        }
-
-        [OutgoingEditorModelEvent]
-        public ContentItemDisplay GetEmpty(int blueprintId, int parentId)
-        {
-            var blueprint = Services.ContentService.GetBlueprintById(blueprintId);
-            if (blueprint == null)
-            {
-                throw new HttpResponseException(HttpStatusCode.NotFound);
-            }
-
-            blueprint.Id = 0;
-            blueprint.Name = string.Empty;
-            blueprint.ParentId = parentId;
-
-            var mapped = Mapper.Map<ContentItemDisplay>(blueprint);
-
-            //remove this tab if it exists: umbContainerView
-            var containerTab = mapped.Tabs.FirstOrDefault(x => x.Alias == Constants.Conventions.PropertyGroups.ListViewGroupName);
-            mapped.Tabs = mapped.Tabs.Except(new[] { containerTab });
-            return mapped;
-        }
-
-        /// <summary>
-        /// Gets the Url for a given node ID
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        public HttpResponseMessage GetNiceUrl(int id)
-        {
-            var url = Umbraco.NiceUrl(id);
-            var response = Request.CreateResponse(HttpStatusCode.OK);
-            response.Content = new StringContent(url, Encoding.UTF8, "application/json");
-            return response;
-        }
-
-        /// <summary>
-        /// Gets the Url for a given node ID
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        public HttpResponseMessage GetNiceUrl(Guid id)
-        {
-            var url = Umbraco.UrlProvider.GetUrl(id);
-            var response = Request.CreateResponse(HttpStatusCode.OK);
-            response.Content = new StringContent(url, Encoding.UTF8, "application/json");
-            return response;
-        }
-
-        /// <summary>
-        /// Gets the Url for a given node ID
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        public HttpResponseMessage GetNiceUrl(Udi id)
-        {
-            var guidUdi = id as GuidUdi;
-            if (guidUdi != null)
-            {
-                return GetNiceUrl(guidUdi.Guid);
-            }
-            throw new HttpResponseException(HttpStatusCode.NotFound);
-        }
-
-        /// <summary>
-        /// Gets the children for the content id passed in
-        /// </summary>
-        /// <returns></returns>
-        [FilterAllowedOutgoingContent(typeof(IEnumerable<ContentItemBasic<ContentPropertyBasic, IContent>>), "Items")]
-        public PagedResult<ContentItemBasic<ContentPropertyBasic, IContent>> GetChildren(
-                int id,
-                int pageNumber = 0,  //TODO: This should be '1' as it's not the index
-                int pageSize = 0,
-                string orderBy = "SortOrder",
-                Direction orderDirection = Direction.Ascending,
-                bool orderBySystemField = true,
-                string filter = "")
-        {
-            return GetChildren(id, null, pageNumber, pageSize, orderBy, orderDirection, orderBySystemField, filter);
-        }
-
-        /// <summary>
-        /// Gets the children for the content id passed in
-        /// </summary>
-        /// <returns></returns>
-        [FilterAllowedOutgoingContent(typeof(IEnumerable<ContentItemBasic<ContentPropertyBasic, IContent>>), "Items")]
-        public PagedResult<ContentItemBasic<ContentPropertyBasic, IContent>> GetChildren(
-                int id,
-                string includeProperties,
-                int pageNumber = 0,  //TODO: This should be '1' as it's not the index
-                int pageSize = 0,
-                string orderBy = "SortOrder",
-                Direction orderDirection = Direction.Ascending,
-                bool orderBySystemField = true,
-                string filter = "")
-        {
-            long totalChildren;
-            IContent[] children;
-            if (pageNumber > 0 && pageSize > 0)
-            {
-                children = Services.ContentService
-                 .GetPagedChildren(id, (pageNumber - 1), pageSize, out totalChildren
-                 , orderBy, orderDirection, orderBySystemField, filter).ToArray();
-            }
-            else
-            {
-                children = Services.ContentService.GetChildren(id).ToArray();
-                totalChildren = children.Length;
-            }
-
-            if (totalChildren == 0)
-            {
-                return new PagedResult<ContentItemBasic<ContentPropertyBasic, IContent>>(0, 0, 0);
-            }
-
-            var pagedResult = new PagedResult<ContentItemBasic<ContentPropertyBasic, IContent>>(totalChildren, pageNumber, pageSize);
-            pagedResult.Items = children.Select(content =>
-                Mapper.Map<IContent, ContentItemBasic<ContentPropertyBasic, IContent>>(content,
-                    opts =>
-                    {
-                        // if there's a list of property aliases to map - we will make sure to store this in the mapping context.
-                        if (String.IsNullOrWhiteSpace(includeProperties) == false)
-                        {
-                            opts.Items["IncludeProperties"] = includeProperties.Split(new[] { ", ", "," }, StringSplitOptions.RemoveEmptyEntries);
-                        }
-                    }));
-
-            return pagedResult;
-        }
-
-        [Obsolete("Dont use this, it is incorrectly named, use HasPermission instead")]
-        public bool GetHasPermission(string permissionToCheck, int nodeId)
-        {
-            return HasPermission(permissionToCheck, nodeId);
-        }
-
-        /// <summary>
-        /// Returns permissions for all nodes passed in for the current user
-        /// TODO: This should be moved to the CurrentUserController?
-        /// </summary>
-        /// <param name="nodeIds"></param>
-        /// <returns></returns>
-        [HttpPost]
-        public Dictionary<int, string[]> GetPermissions(int[] nodeIds)
-        {
-            var permissions = Services.UserService
-                    .GetPermissions(Security.CurrentUser, nodeIds);
-
-            var permissionsDictionary = new Dictionary<int, string[]>();
-            foreach (var nodeId in nodeIds)
-            {
-                var aggregatePerms = permissions.GetAllPermissions(nodeId).ToArray();
-                permissionsDictionary.Add(nodeId, aggregatePerms);
-            }
-
-            return permissionsDictionary;
-        }
-
-        /// <summary>
-        /// Checks a nodes permission for the current user
-        /// TODO: This should be moved to the CurrentUserController?
-        /// </summary>
-        /// <param name="permissionToCheck"></param>
-        /// <param name="nodeId"></param>
-        /// <returns></returns>
-        [HttpGet]
-        public bool HasPermission(string permissionToCheck, int nodeId)
-        {
-            var p = Services.UserService.GetPermissions(Security.CurrentUser, nodeId).GetAllPermissions();
-            if (p.Contains(permissionToCheck.ToString(CultureInfo.InvariantCulture)))
-            {
-                return true;
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Creates a blueprint from a content item
-        /// </summary>
-        /// <param name="contentId">The content id to copy</param>
-        /// <param name="name">The name of the blueprint</param>
-        /// <returns></returns>
-        [HttpPost]
-        public SimpleNotificationModel CreateBlueprintFromContent([FromUri]int contentId, [FromUri]string name)
-        {
-            if (string.IsNullOrWhiteSpace(name)) throw new ArgumentException("Value cannot be null or whitespace.", "name");
-
-            var content = Services.ContentService.GetById(contentId);
-            if (content == null)
-                throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
-
-            EnsureUniqueName(name, content, "name");
-
-            var blueprint = Services.ContentService.CreateContentFromBlueprint(content, name, Security.CurrentUser.Id);
-
-            Services.ContentService.SaveBlueprint(blueprint, Security.CurrentUser.Id);
-
-            var notificationModel = new SimpleNotificationModel();
-            notificationModel.AddSuccessNotification(
-                Services.TextService.Localize("blueprints/createdBlueprintHeading"),
-                Services.TextService.Localize("blueprints/createdBlueprintMessage", new[] { content.Name })
-            );
-
-            return notificationModel;
-        }
-
-        private void EnsureUniqueName(string name, IContent content, string modelName)
-        {
-            var existing = Services.ContentService.GetBlueprintsForContentTypes(content.ContentTypeId);
-            if (existing.Any(x => x.Name == name && x.Id != content.Id))
-            {
-                ModelState.AddModelError(modelName, Services.TextService.Localize("blueprints/duplicateBlueprintMessage"));
-                throw new HttpResponseException(Request.CreateValidationErrorResponse(ModelState));
-            }
-        }
-
-        /// <summary>
-        /// Saves content
-        /// </summary>
-        /// <returns></returns>
-        [FileUploadCleanupFilter]
-        [ContentPostValidate]
-        public ContentItemDisplay PostSaveBlueprint(
-            [ModelBinder(typeof(BlueprintItemBinder))] ContentItemSave contentItem)
-        {
-            var contentItemDisplay = PostSaveInternal(contentItem,
-                content =>
-                {
-                    EnsureUniqueName(content.Name, content, "Name");
-
-                    Services.ContentService.SaveBlueprint(contentItem.PersistedContent, Security.CurrentUser.Id);
-                    //we need to reuse the underlying logic so return the result that it wants
-                    return Attempt<OperationStatus>.Succeed(new OperationStatus(OperationStatusType.Success, new EventMessages()));
-                });
-            SetupBlueprint(contentItemDisplay, contentItemDisplay.PersistedContent);
-
-            return contentItemDisplay;
-        }
-
-        /// <summary>
-        /// Saves content
-        /// </summary>
-        /// <returns></returns>
-        [FileUploadCleanupFilter]
-        [ContentPostValidate]
-        [OutgoingEditorModelEvent]
-        public ContentItemDisplay PostSave(
-                [ModelBinder(typeof(ContentItemBinder))]
-                                ContentItemSave contentItem)
-        {
-            return PostSaveInternal(contentItem,
-                content => Services.ContentService.WithResult().Save(contentItem.PersistedContent, Security.CurrentUser.Id));
-        }
-
-        private ContentItemDisplay PostSaveInternal(ContentItemSave contentItem, Func<IContent, Attempt<OperationStatus>> saveMethod)
-        {
-            //Recent versions of IE/Edge may send in the full clientside file path instead of just the file name.
-            //To ensure similar behavior across all browsers no matter what they do - we strip the FileName property of all
-            //uploaded files to being *only* the actual file name (as it should be).
-            if (contentItem.UploadedFiles != null && contentItem.UploadedFiles.Any())
-            {
-                foreach (var file in contentItem.UploadedFiles)
-                {
-                    file.FileName = Path.GetFileName(file.FileName);
-                }
-            }
-
-            //If we've reached here it means:
-            // * Our model has been bound
-            // * and validated
-            // * any file attachments have been saved to their temporary location for us to use
-            // * we have a reference to the DTO object and the persisted object
-            // * Permissions are valid
-            MapPropertyValues(contentItem);
-
-            //We need to manually check the validation results here because:
-            // * We still need to save the entity even if there are validation value errors
-            // * Depending on if the entity is new, and if there are non property validation errors (i.e. the name is null)
-            //      then we cannot continue saving, we can only display errors
-            // * If there are validation errors and they were attempting to publish, we can only save, NOT publish and display
-            //      a message indicating this
-            if (ModelState.IsValid == false)
-            {
-                if (ValidationHelper.ModelHasRequiredForPersistenceErrors(contentItem) && IsCreatingAction(contentItem.Action))
-                {
-                    //ok, so the absolute mandatory data is invalid and it's new, we cannot actually continue!
-                    // add the modelstate to the outgoing object and throw a validation message
-                    var forDisplay = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(contentItem.PersistedContent, UmbracoContext);
-                    forDisplay.Errors = ModelState.ToErrorDictionary();
-                    throw new HttpResponseException(Request.CreateValidationErrorResponse(forDisplay));
-
-                }
-
-                //if the model state is not valid we cannot publish so change it to save
-                switch (contentItem.Action)
-                {
-                    case ContentSaveAction.Publish:
-                        contentItem.Action = ContentSaveAction.Save;
-                        break;
-                    case ContentSaveAction.PublishNew:
-                        contentItem.Action = ContentSaveAction.SaveNew;
-                        break;
-                }
-            }
-
-            //initialize this to successful
-            var publishStatus = Attempt<PublishStatus>.Succeed();
-            var wasCancelled = false;
-
-            if (contentItem.Action == ContentSaveAction.Save || contentItem.Action == ContentSaveAction.SaveNew)
-            {
-                //save the item
-                var saveResult = saveMethod(contentItem.PersistedContent);
-
-                wasCancelled = saveResult.Success == false && saveResult.Result.StatusType == OperationStatusType.FailedCancelledByEvent;
-            }
-            else if (contentItem.Action == ContentSaveAction.SendPublish || contentItem.Action == ContentSaveAction.SendPublishNew)
-            {
-                var sendResult = Services.ContentService.SendToPublication(contentItem.PersistedContent, Security.CurrentUser.Id);
-                wasCancelled = sendResult == false;
-            }
-            else
-            {
-                //publish the item and check if it worked, if not we will show a diff msg below
-                publishStatus = Services.ContentService.SaveAndPublishWithStatus(contentItem.PersistedContent, Security.CurrentUser.Id);
-                wasCancelled = publishStatus.Result.StatusType == PublishStatusType.FailedCancelledByEvent;
-            }
-
-            //return the updated model
-            var display = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(contentItem.PersistedContent, UmbracoContext);
-
-            //lasty, if it is not valid, add the modelstate to the outgoing object and throw a 403
-            HandleInvalidModelState(display);
-
-            //put the correct msgs in
-            switch (contentItem.Action)
-            {
-                case ContentSaveAction.Save:
-                case ContentSaveAction.SaveNew:
-                    if (wasCancelled == false)
-                    {
-                        display.AddSuccessNotification(
-                            Services.TextService.Localize("speechBubbles/editContentSavedHeader"),
-                            contentItem.ReleaseDate.HasValue
-                                ? Services.TextService.Localize("speechBubbles/editContentSavedWithReleaseDateText", new [] { contentItem.ReleaseDate.Value.ToLongDateString(), contentItem.ReleaseDate.Value.ToShortTimeString() })
-                                : Services.TextService.Localize("speechBubbles/editContentSavedText")
-                        );
-                    }
-                    else
-                    {
-                        AddCancelMessage(display);
-                    }
-                    break;
-                case ContentSaveAction.SendPublish:
-                case ContentSaveAction.SendPublishNew:
-                    if (wasCancelled == false)
-                    {
-                        display.AddSuccessNotification(
-                            Services.TextService.Localize("speechBubbles/editContentSendToPublish"),
-                            Services.TextService.Localize("speechBubbles/editContentSendToPublishText"));
-                    }
-                    else
-                    {
-                        AddCancelMessage(display);
-                    }
-                    break;
-                case ContentSaveAction.Publish:
-                case ContentSaveAction.PublishNew:
-                    ShowMessageForPublishStatus(publishStatus.Result, display, contentItem.ExpireDate);
-                    break;
-            }
-
-            //If the item is new and the operation was cancelled, we need to return a different
-            // status code so the UI can handle it since it won't be able to redirect since there
-            // is no Id to redirect to!
-            if (wasCancelled && IsCreatingAction(contentItem.Action))
-            {
-                throw new HttpResponseException(Request.CreateValidationErrorResponse(display));
-            }
-
-            display.PersistedContent = contentItem.PersistedContent;
-
-            return display;
-        }
-
-        /// <summary>
-        /// Publishes a document with a given ID
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        /// <remarks>
-        /// The CanAccessContentAuthorize attribute will deny access to this method if the current user
-        /// does not have Publish access to this node.
-        /// </remarks>
-        ///
-        [EnsureUserPermissionForContent("id", 'U')]
-        public HttpResponseMessage PostPublishById(int id)
-        {
-            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
-
-            if (foundContent == null)
-            {
-                return HandleContentNotFound(id, false);
-            }
-
-            var publishResult = Services.ContentService.PublishWithStatus(foundContent, Security.CurrentUser.Id);
-            if (publishResult.Success == false)
-            {
-                var notificationModel = new SimpleNotificationModel();
-                ShowMessageForPublishStatus(publishResult.Result, notificationModel, foundContent.ExpireDate);
-                return Request.CreateValidationErrorResponse(notificationModel);
-            }
-
-            //return ok
-            return Request.CreateResponse(HttpStatusCode.OK);
-
-        }
-
-        [HttpDelete]
-        [HttpPost]
-        public HttpResponseMessage DeleteBlueprint(int id)
-        {
-            var found = Services.ContentService.GetBlueprintById(id);
-
-            if (found == null)
-            {
-                return HandleContentNotFound(id, false);
-            }
-
-            Services.ContentService.DeleteBlueprint(found);
-
-            return Request.CreateResponse(HttpStatusCode.OK);
-        }
-
-        /// <summary>
-        /// Moves an item to the recycle bin, if it is already there then it will permanently delete it
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        /// <remarks>
-        /// The CanAccessContentAuthorize attribute will deny access to this method if the current user
-        /// does not have Delete access to this node.
-        /// </remarks>
-        [EnsureUserPermissionForContent("id", 'D')]
-        [HttpDelete]
-        [HttpPost]
-        public HttpResponseMessage DeleteById(int id)
-        {
-            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
-
-            if (foundContent == null)
-            {
-                return HandleContentNotFound(id, false);
-            }
-
-            //if the current item is in the recycle bin
-            if (foundContent.IsInRecycleBin() == false)
-            {
-                var moveResult = Services.ContentService.WithResult().MoveToRecycleBin(foundContent, Security.CurrentUser.Id);
-                if (moveResult == false)
-                {
-                    //returning an object of INotificationModel will ensure that any pending
-                    // notification messages are added to the response.
-                    return Request.CreateValidationErrorResponse(new SimpleNotificationModel());
-                }
-            }
-            else
-            {
-                var deleteResult = Services.ContentService.WithResult().Delete(foundContent, Security.CurrentUser.Id);
-                if (deleteResult == false)
-                {
-                    //returning an object of INotificationModel will ensure that any pending
-                    // notification messages are added to the response.
-                    return Request.CreateValidationErrorResponse(new SimpleNotificationModel());
-                }
-            }
-
-            return Request.CreateResponse(HttpStatusCode.OK);
-        }
-
-        /// <summary>
-        /// Empties the recycle bin
-        /// </summary>
-        /// <returns></returns>
-        /// <remarks>
-        /// attributed with EnsureUserPermissionForContent to verify the user has access to the recycle bin
-        /// </remarks>
-        [HttpDelete]
-        [HttpPost]
-        [EnsureUserPermissionForContent(Constants.System.RecycleBinContent, 'D')]
-        public HttpResponseMessage EmptyRecycleBin()
-        {
-            Services.ContentService.EmptyRecycleBin(Security.CurrentUser.Id);
-
-            return Request.CreateNotificationSuccessResponse(Services.TextService.Localize("defaultdialogs/recycleBinIsEmpty"));
-        }
-
-        /// <summary>
-        /// Change the sort order for content
-        /// </summary>
-        /// <param name="sorted"></param>
-        /// <returns></returns>
-        [EnsureUserPermissionForContent("sorted.ParentId", 'S')]
-        public HttpResponseMessage PostSort(ContentSortOrder sorted)
-        {
-            if (sorted == null)
-            {
-                return Request.CreateResponse(HttpStatusCode.NotFound);
-            }
-
-            //if there's nothing to sort just return ok
-            if (sorted.IdSortOrder.Length == 0)
-            {
-                return Request.CreateResponse(HttpStatusCode.OK);
-            }
-
-            try
-            {
-                var contentService = Services.ContentService;
-
-                // Save content with new sort order and update content xml in db accordingly
-                if (contentService.Sort(sorted.IdSortOrder, Security.CurrentUser.Id) == false)
-                {
-                    LogHelper.Warn<ContentController>("Content sorting failed, this was probably caused by an event being cancelled");
-                    return Request.CreateValidationErrorResponse("Content sorting failed, this was probably caused by an event being cancelled");
-                }
-                return Request.CreateResponse(HttpStatusCode.OK);
-            }
-            catch (Exception ex)
-            {
-                LogHelper.Error<ContentController>("Could not update content sort order", ex);
-                throw;
-            }
-        }
-
-        /// <summary>
-        /// Change the sort order for media
-        /// </summary>
-        /// <param name="move"></param>
-        /// <returns></returns>
-        [EnsureUserPermissionForContent("move.ParentId", 'M')]
-        public HttpResponseMessage PostMove(MoveOrCopy move)
-        {
-            var toMove = ValidateMoveOrCopy(move);
-
-            Services.ContentService.Move(toMove, move.ParentId, Security.CurrentUser.Id);
-
-            var response = Request.CreateResponse(HttpStatusCode.OK);
-            response.Content = new StringContent(toMove.Path, Encoding.UTF8, "application/json");
-            return response;
-        }
-
-        /// <summary>
-        /// Copies a content item and places the copy as a child of a given parent Id
-        /// </summary>
-        /// <param name="copy"></param>
-        /// <returns></returns>
-        [EnsureUserPermissionForContent("copy.ParentId", 'C')]
-        public HttpResponseMessage PostCopy(MoveOrCopy copy)
-        {
-            var toCopy = ValidateMoveOrCopy(copy);
-
-            var c = Services.ContentService.Copy(toCopy, copy.ParentId, copy.RelateToOriginal, copy.Recursive, Security.CurrentUser.Id);
-
-            var response = Request.CreateResponse(HttpStatusCode.OK);
-            response.Content = new StringContent(c.Path, Encoding.UTF8, "application/json");
-            return response;
-        }
-
-        /// <summary>
-        /// Unpublishes a node with a given Id and returns the unpublished entity
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        [EnsureUserPermissionForContent("id", 'U')]
-        [OutgoingEditorModelEvent]
-        public ContentItemDisplay PostUnPublish(int id)
-        {
-            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
-
-            if (foundContent == null)
-                HandleContentNotFound(id);
-
-            var unpublishResult = Services.ContentService.WithResult().UnPublish(foundContent, Security.CurrentUser.Id);
-
-            var content = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(foundContent, UmbracoContext);
-
-            if (unpublishResult == false)
-            {
-                AddCancelMessage(content);
-                throw new HttpResponseException(Request.CreateValidationErrorResponse(content));
-            }
-            else
-            {
-                content.AddSuccessNotification(Services.TextService.Localize("content/unPublish"), Services.TextService.Localize("speechBubbles/contentUnpublished"));
-                return content;
-            }
-        }
-
-        /// <summary>
-        /// Maps the dto property values to the persisted model
-        /// </summary>
-        /// <param name="contentItem"></param>
-        private void MapPropertyValues(ContentItemSave contentItem)
-        {
-            UpdateName(contentItem);
-
-            //TODO: We need to support 'send to publish'
-
-            contentItem.PersistedContent.ExpireDate = contentItem.ExpireDate;
-            contentItem.PersistedContent.ReleaseDate = contentItem.ReleaseDate;
-            //only set the template if it didn't change
-            var templateChanged = (contentItem.PersistedContent.Template == null && contentItem.TemplateAlias.IsNullOrWhiteSpace() == false)
-                                                        || (contentItem.PersistedContent.Template != null && contentItem.PersistedContent.Template.Alias != contentItem.TemplateAlias)
-                                                        || (contentItem.PersistedContent.Template != null && contentItem.TemplateAlias.IsNullOrWhiteSpace());
-            if (templateChanged)
-            {
-                var template = Services.FileService.GetTemplate(contentItem.TemplateAlias);
-                if (template == null && contentItem.TemplateAlias.IsNullOrWhiteSpace() == false)
-                {
-                    //ModelState.AddModelError("Template", "No template exists with the specified alias: " + contentItem.TemplateAlias);
-                    LogHelper.Warn<ContentController>("No template exists with the specified alias: " + contentItem.TemplateAlias);
-                }
-                else
-                {
-                    //NOTE: this could be null if there was a template and the posted template is null, this should remove the assigned template
-                    contentItem.PersistedContent.Template = template;
-                }
-            }
-
-            base.MapPropertyValues(contentItem);
-        }
-
-        /// <summary>
-        /// Ensures the item can be moved/copied to the new location
-        /// </summary>
-        /// <param name="model"></param>
-        /// <returns></returns>
-        private IContent ValidateMoveOrCopy(MoveOrCopy model)
-        {
-            if (model == null)
-            {
-                throw new HttpResponseException(HttpStatusCode.NotFound);
-            }
-
-            var contentService = Services.ContentService;
-            var toMove = contentService.GetById(model.Id);
-            if (toMove == null)
-            {
-                throw new HttpResponseException(HttpStatusCode.NotFound);
-            }
-            if (model.ParentId < 0)
-            {
-                //cannot move if the content item is not allowed at the root
-                if (toMove.ContentType.AllowedAsRoot == false)
-                {
-                    throw new HttpResponseException(
-                            Request.CreateNotificationValidationErrorResponse(
-                                    Services.TextService.Localize("moveOrCopy/notAllowedAtRoot")));
-                }
-            }
-            else
-            {
-                var parent = contentService.GetById(model.ParentId);
-                if (parent == null)
-                {
-                    throw new HttpResponseException(HttpStatusCode.NotFound);
-                }
-
-                //check if the item is allowed under this one
-                if (parent.ContentType.AllowedContentTypes.Select(x => x.Id).ToArray()
-                        .Any(x => x.Value == toMove.ContentType.Id) == false)
-                {
-                    throw new HttpResponseException(
-                            Request.CreateNotificationValidationErrorResponse(
-                                    Services.TextService.Localize("moveOrCopy/notAllowedByContentType")));
-                }
-
-                // Check on paths
-                if ((string.Format(",{0},", parent.Path)).IndexOf(string.Format(",{0},", toMove.Id), StringComparison.Ordinal) > -1)
-                {
-                    throw new HttpResponseException(
-                            Request.CreateNotificationValidationErrorResponse(
-                                    Services.TextService.Localize("moveOrCopy/notAllowedByPath")));
-                }
-            }
-
-            return toMove;
-        }
-
-        private void ShowMessageForPublishStatus(PublishStatus status, INotificationModel display, DateTime? expireDate)
-        {
-            switch (status.StatusType)
-            {
-                case PublishStatusType.Success:
-                case PublishStatusType.SuccessAlreadyPublished:
-                    display.AddSuccessNotification(
-                            Services.TextService.Localize("speechBubbles/editContentPublishedHeader"),
-                            expireDate.HasValue
-                                ? Services.TextService.Localize("speechBubbles/editContentPublishedWithExpireDateText", new [] { expireDate.Value.ToLongDateString(), expireDate.Value.ToShortTimeString() })
-                                : Services.TextService.Localize("speechBubbles/editContentPublishedText")
-                    );
-                    break;
-                case PublishStatusType.FailedPathNotPublished:
-                    display.AddWarningNotification(
-                            Services.TextService.Localize("publish"),
-                            Services.TextService.Localize("publish/contentPublishedFailedByParent",
-                                    new[] { string.Format("{0} ({1})", status.ContentItem.Name, status.ContentItem.Id) }).Trim());
-                    break;
-                case PublishStatusType.FailedCancelledByEvent:
-                    AddCancelMessage(display, "publish", "speechBubbles/contentPublishedFailedByEvent");
-                    break;
-                case PublishStatusType.FailedAwaitingRelease:
-                    display.AddWarningNotification(
-                            Services.TextService.Localize("publish"),
-                            Services.TextService.Localize("publish/contentPublishedFailedAwaitingRelease",
-                                    new[] { string.Format("{0} ({1})", status.ContentItem.Name, status.ContentItem.Id) }).Trim());
-                    break;
-                case PublishStatusType.FailedHasExpired:
-                    display.AddWarningNotification(
-                            Services.TextService.Localize("publish"),
-                            Services.TextService.Localize("publish/contentPublishedFailedExpired",
-                                    new[]
-                                    {
-                                                                string.Format("{0} ({1})", status.ContentItem.Name, status.ContentItem.Id),
-                                    }).Trim());
-                    break;
-                case PublishStatusType.FailedIsTrashed:
-                    //TODO: We should add proper error messaging for this!
-                    break;
-                case PublishStatusType.FailedContentInvalid:
-                    display.AddWarningNotification(
-                            Services.TextService.Localize("publish"),
-                            Services.TextService.Localize("publish/contentPublishedFailedInvalid",
-                                    new[]
-                                    {
-                                                                string.Format("{0} ({1})", status.ContentItem.Name, status.ContentItem.Id),
-                                                                string.Join(",", status.InvalidProperties.Select(x => x.Alias))
-                                    }).Trim());
-                    break;
-                default:
-                    throw new IndexOutOfRangeException();
-            }
-        }
-
-
-        /// <summary>
-        /// Performs a permissions check for the user to check if it has access to the node based on
-        /// start node and/or permissions for the node
-        /// </summary>
-        /// <param name="storage">The storage to add the content item to so it can be reused</param>
-        /// <param name="user"></param>
-        /// <param name="userService"></param>
-        /// <param name="contentService"></param>
-        /// <param name="entityService"></param>
-        /// <param name="nodeId">The content to lookup, if the contentItem is not specified</param>
-        /// <param name="permissionsToCheck"></param>
-        /// <param name="contentItem">Specifies the already resolved content item to check against</param>
-        /// <returns></returns>
-        internal static bool CheckPermissions(
-                IDictionary<string, object> storage,
-                IUser user,
-                IUserService userService,
-                IContentService contentService,
-                IEntityService entityService,
-                int nodeId,
-                char[] permissionsToCheck = null,
-                IContent contentItem = null)
-        {
-            if (storage == null) throw new ArgumentNullException("storage");
-            if (user == null) throw new ArgumentNullException("user");
-            if (userService == null) throw new ArgumentNullException("userService");
-            if (contentService == null) throw new ArgumentNullException("contentService");
-            if (entityService == null) throw new ArgumentNullException("entityService");
-
-            if (contentItem == null && nodeId != Constants.System.Root && nodeId != Constants.System.RecycleBinContent)
-            {
-                contentItem = contentService.GetById(nodeId);
-                //put the content item into storage so it can be retreived
-                // in the controller (saves a lookup)
-                storage[typeof(IContent).ToString()] = contentItem;
-            }
-
-            if (contentItem == null && nodeId != Constants.System.Root && nodeId != Constants.System.RecycleBinContent)
-            {
-                throw new HttpResponseException(HttpStatusCode.NotFound);
-            }
-
-            var hasPathAccess = (nodeId == Constants.System.Root)
-                ? user.HasContentRootAccess(entityService)
-                : (nodeId == Constants.System.RecycleBinContent)
-                    ? user.HasContentBinAccess(entityService)
-                    : user.HasPathAccess(contentItem, entityService);
-
-            if (hasPathAccess == false)
-            {
-                return false;
-            }
-
-            if (permissionsToCheck == null || permissionsToCheck.Length == 0)
-            {
-                return true;
-            }
-
-            //get the implicit/inherited permissions for the user for this path,
-            //if there is no content item for this id, than just use the id as the path (i.e. -1 or -20)
-            var path = contentItem != null ? contentItem.Path : nodeId.ToString();
-            var permission = userService.GetPermissionsForPath(user, path);
-
-            var allowed = true;
-            foreach (var p in permissionsToCheck)
-            {
-                if (permission == null
-                    || permission.GetAllPermissions().Contains(p.ToString(CultureInfo.InvariantCulture)) == false)
-                {
-                    allowed = false;
-                }
-            }
-            return allowed;
-        }
-
-        [EnsureUserPermissionForContent("contentId", 'F')]
-        public IEnumerable<NotifySetting> GetNotificationOptions(int contentId)
-        {
-            var notifications = new List<NotifySetting>();
-            if (contentId <= 0) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
-
-            var content = Services.ContentService.GetById(contentId);
-            if (content == null) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
-
-            var actionList = ActionsResolver.Current.Actions;
-            foreach (var a in actionList)
-            {
-                if (a.ShowInNotifier)
-                {
-                    NotifySetting n = new NotifySetting
-                    {
-                        Name = ui.Text("actions", a.Alias),
-                        Checked = (UmbracoUser.GetNotifications(content.Path).IndexOf(a.Letter) > -1),
-                        NotifyCode = a.Letter.ToString()
-                    };
-                    notifications.Add(n);
-                }
-            }
-            return notifications;
-        }
-
-        public void PostNotificationOptions(int contentId, string notifyOptions = "")
-        {
-            if (contentId <= 0) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
-            var content = Services.ContentService.GetById(contentId);
-
-            if (content == null) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
-            var node = new CMSNode(contentId);
-
-            global::umbraco.cms.businesslogic.workflow.Notification.UpdateNotifications(UmbracoUser, node, notifyOptions ?? "");
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using System.Web.Http;
+using System.Web.Http.Controllers;
+using System.Web.Http.ModelBinding;
+using AutoMapper;
+using Umbraco.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.Membership;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
+using Umbraco.Core.Publishing;
+using Umbraco.Core.Services;
+using Umbraco.Web.Models.ContentEditing;
+using Umbraco.Web.Models.Mapping;
+using Umbraco.Web.Mvc;
+using Umbraco.Web.WebApi;
+using Umbraco.Web.WebApi.Binders;
+using Umbraco.Web.WebApi.Filters;
+using Umbraco.Core.Events;
+using Constants = Umbraco.Core.Constants;
+using umbraco.cms.businesslogic;
+using System.Collections;
+using umbraco;
+
+namespace Umbraco.Web.Editors
+{
+    /// <summary>
+    /// The API controller used for editing content
+    /// </summary>
+    /// <remarks>
+    /// This controller is decorated with the UmbracoApplicationAuthorizeAttribute which means that any user requesting
+    /// access to ALL of the methods on this controller will need access to the content application.
+    /// </remarks>
+    [PluginController("UmbracoApi")]
+    [UmbracoApplicationAuthorize(Constants.Applications.Content)]
+    [ContentControllerConfiguration]
+    public class ContentController : ContentControllerBase
+    {
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public ContentController()
+                : this(UmbracoContext.Current)
+        {
+        }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="umbracoContext"></param>
+        public ContentController(UmbracoContext umbracoContext)
+                : base(umbracoContext)
+        {
+        }
+
+        /// <summary>
+        /// Configures this controller with a custom action selector
+        /// </summary>
+        private class ContentControllerConfigurationAttribute : Attribute, IControllerConfiguration
+        {
+            public void Initialize(HttpControllerSettings controllerSettings, HttpControllerDescriptor controllerDescriptor)
+            {
+                controllerSettings.Services.Replace(typeof(IHttpActionSelector), new ParameterSwapControllerActionSelector(
+                    new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetNiceUrl", "id", typeof(int), typeof(Guid), typeof(Udi)),
+                    new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetById", "id", typeof(int), typeof(Guid), typeof(Udi))
+                ));
+            }
+        }
+
+        /// <summary>
+        /// Return content for the specified ids
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        [FilterAllowedOutgoingContent(typeof(IEnumerable<ContentItemDisplay>))]
+        public IEnumerable<ContentItemDisplay> GetByIds([FromUri]int[] ids)
+        {
+            var foundContent = Services.ContentService.GetByIds(ids);
+            return foundContent.Select(content => AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(content, UmbracoContext));
+        }
+
+        /// <summary>
+        /// Updates the permissions for a content item for a particular user group
+        /// </summary>
+        /// <param name="saveModel"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// Permission check is done for letter 'R' which is for <see cref="ActionRights"/> which the user must have access to to update
+        /// </remarks>
+        [EnsureUserPermissionForContent("saveModel.ContentId", 'R')]
+        public IEnumerable<AssignedUserGroupPermissions> PostSaveUserGroupPermissions(UserGroupPermissionsSave saveModel)
+        {
+            if (saveModel.ContentId <= 0) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
+
+            //TODO: Should non-admins be alowed to set granular permissions?
+
+            var content = Services.ContentService.GetById(saveModel.ContentId);
+            if (content == null) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
+
+            //current permissions explicitly assigned to this content item
+            var contentPermissions = Services.ContentService.GetPermissionsForEntity(content)
+                .ToDictionary(x => x.UserGroupId, x => x);
+
+            var allUserGroups = Services.UserService.GetAllUserGroups().ToArray();
+
+            //loop through each user group
+            foreach (var userGroup in allUserGroups)
+            {
+                //check if there's a permission set posted up for this user group
+                IEnumerable<string> groupPermissions;
+                if (saveModel.AssignedPermissions.TryGetValue(userGroup.Id, out groupPermissions))
+                {
+                    //create a string collection of the assigned letters
+                    var groupPermissionCodes = groupPermissions.ToArray();
+
+                    //check if there are no permissions assigned for this group save model, if that is the case we want to reset the permissions
+                    //for this group/node which will go back to the defaults
+                    if (groupPermissionCodes.Length == 0)
+                    {
+                        Services.UserService.RemoveUserGroupPermissions(userGroup.Id, content.Id);
+                    }
+                    //check if they are the defaults, if so we should just remove them if they exist since it's more overhead having them stored
+                    else if (userGroup.Permissions.UnsortedSequenceEqual(groupPermissionCodes))
+                    {
+                        //only remove them if they are actually currently assigned
+                        if (contentPermissions.ContainsKey(userGroup.Id))
+                        {
+                            //remove these permissions from this node for this group since the ones being assigned are the same as the defaults
+                            Services.UserService.RemoveUserGroupPermissions(userGroup.Id, content.Id);
+                        }
+                    }
+                    //if they are different we need to update, otherwise there's nothing to update
+                    else if (contentPermissions.ContainsKey(userGroup.Id) == false || contentPermissions[userGroup.Id].AssignedPermissions.UnsortedSequenceEqual(groupPermissionCodes) == false)
+                    {
+
+                        Services.UserService.ReplaceUserGroupPermissions(userGroup.Id, groupPermissionCodes.Select(x => x[0]), content.Id);
+                    }
+                }
+            }
+
+            return GetDetailedPermissions(content, allUserGroups);
+        }
+
+        /// <summary>
+        /// Returns the user group permissions for user groups assigned to this node
+        /// </summary>
+        /// <param name="contentId"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// Permission check is done for letter 'R' which is for <see cref="ActionRights"/> which the user must have access to to view
+        /// </remarks>
+        [EnsureUserPermissionForContent("contentId", 'R')]
+        public IEnumerable<AssignedUserGroupPermissions> GetDetailedPermissions(int contentId)
+        {
+            if (contentId <= 0) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
+            var content = Services.ContentService.GetById(contentId);
+            if (content == null) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
+
+            //TODO: Should non-admins be able to see detailed permissions?
+
+            var allUserGroups = Services.UserService.GetAllUserGroups();
+
+            return GetDetailedPermissions(content, allUserGroups);
+        }
+
+        private IEnumerable<AssignedUserGroupPermissions> GetDetailedPermissions(IContent content, IEnumerable<IUserGroup> allUserGroups)
+        {
+            //get all user groups and map their default permissions to the AssignedUserGroupPermissions model.
+            //we do this because not all groups will have true assigned permissions for this node so if they don't have assigned permissions, we need to show the defaults.
+
+            var defaultPermissionsByGroup = Mapper.Map<IEnumerable<AssignedUserGroupPermissions>>(allUserGroups).ToArray();
+
+            var defaultPermissionsAsDictionary = defaultPermissionsByGroup
+                .ToDictionary(x => Convert.ToInt32(x.Id), x => x);
+
+            //get the actual assigned permissions
+            var assignedPermissionsByGroup = Services.ContentService.GetPermissionsForEntity(content).ToArray();
+
+            //iterate over assigned and update the defaults with the real values
+            foreach (var assignedGroupPermission in assignedPermissionsByGroup)
+            {
+                var defaultUserGroupPermissions = defaultPermissionsAsDictionary[assignedGroupPermission.UserGroupId];
+
+                //clone the default permissions model to the assigned ones
+                defaultUserGroupPermissions.AssignedPermissions = AssignedUserGroupPermissions.ClonePermissions(defaultUserGroupPermissions.DefaultPermissions);
+
+                //since there is custom permissions assigned to this node for this group, we need to clear all of the default permissions
+                //and we'll re-check it if it's one of the explicitly assigned ones
+                foreach (var permission in defaultUserGroupPermissions.AssignedPermissions.SelectMany(x => x.Value))
+                {
+                    permission.Checked = false;
+                    permission.Checked = assignedGroupPermission.AssignedPermissions.Contains(permission.PermissionCode, StringComparer.InvariantCulture);
+                }
+
+            }
+
+            return defaultPermissionsByGroup;
+        }
+
+        /// <summary>
+        /// Returns an item to be used to display the recycle bin for content
+        /// </summary>
+        /// <returns></returns>
+        public ContentItemDisplay GetRecycleBin()
+        {
+            var display = new ContentItemDisplay
+            {
+                Id = Constants.System.RecycleBinContent,
+                Alias = "recycleBin",
+                ParentId = -1,
+                Name = Services.TextService.Localize("general/recycleBin"),
+                ContentTypeAlias = "recycleBin",
+                CreateDate = DateTime.Now,
+                IsContainer = true,
+                Path = "-1," + Constants.System.RecycleBinContent
+            };
+
+            TabsAndPropertiesResolver<IContent>.AddListView(display, "content", Services.DataTypeService, Services.TextService);
+
+            return display;
+        }
+
+        public ContentItemDisplay GetBlueprintById(int id)
+        {
+            var foundContent = Services.ContentService.GetBlueprintById(id);
+            if (foundContent == null)
+            {
+                HandleContentNotFound(id);
+            }
+
+            var content = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(foundContent, UmbracoContext);
+
+            SetupBlueprint(content, foundContent);
+
+            return content;
+        }
+
+        private static void SetupBlueprint(ContentItemDisplay content, IContent persistedContent)
+        {
+            content.AllowPreview = false;
+
+            //set a custom path since the tree that renders this has the content type id as the parent
+            content.Path = string.Format("-1,{0},{1}", persistedContent.ContentTypeId, content.Id);
+
+            content.AllowedActions = new[] { "A" };
+            content.IsBlueprint = true;
+
+            var excludeProps = new[] { "_umb_urls", "_umb_releasedate", "_umb_expiredate", "_umb_template" };
+            var propsTab = content.Tabs.Last();
+            propsTab.Properties = propsTab.Properties
+                .Where(p => excludeProps.Contains(p.Alias) == false);
+        }
+
+        /// <summary>
+        /// Gets the content json for the content id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [OutgoingEditorModelEvent]
+        [EnsureUserPermissionForContent("id")]
+        public ContentItemDisplay GetById(int id)
+        {
+            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
+            if (foundContent == null)
+            {
+                HandleContentNotFound(id);
+            }
+
+            var content = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(foundContent, UmbracoContext);
+            return content;
+        }
+
+        /// <summary>
+        /// Gets the content json for the content id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [OutgoingEditorModelEvent]
+        [EnsureUserPermissionForContent("id")]
+        public ContentItemDisplay GetById(Guid id)
+        {
+            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
+            if (foundContent == null)
+            {
+                HandleContentNotFound(id);
+            }
+
+            var content = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(foundContent, UmbracoContext);
+            return content;
+        }
+
+        /// <summary>
+        /// Gets the content json for the content id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [OutgoingEditorModelEvent]
+        [EnsureUserPermissionForContent("id")]
+        public ContentItemDisplay GetById(Udi id)
+        {
+            var guidUdi = id as GuidUdi;
+            if (guidUdi != null)
+            {
+                return GetById(guidUdi.Guid);
+            }
+
+            throw new HttpResponseException(HttpStatusCode.NotFound);
+        }
+
+        [EnsureUserPermissionForContent("id")]
+        public ContentItemDisplay GetWithTreeDefinition(int id)
+        {
+            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
+            if (foundContent == null)
+            {
+                HandleContentNotFound(id);
+            }
+
+            var content = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(foundContent, UmbracoContext);
+            return content;
+        }
+
+        /// <summary>
+        /// Gets an empty content item for the
+        /// </summary>
+        /// <param name="contentTypeAlias"></param>
+        /// <param name="parentId"></param>
+        /// <returns>
+        /// If this is a container type, we'll remove the umbContainerView tab for a new item since
+        /// it cannot actually list children if it doesn't exist yet.
+        /// </returns>
+        [OutgoingEditorModelEvent]
+        public ContentItemDisplay GetEmpty(string contentTypeAlias, int parentId)
+        {
+            var contentType = Services.ContentTypeService.GetContentType(contentTypeAlias);
+            if (contentType == null)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+
+            var emptyContent = Services.ContentService.CreateContent("", parentId, contentType.Alias, UmbracoUser.Id);
+            var mapped = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(emptyContent, UmbracoContext);
+            // translate the content type name if applicable
+            mapped.ContentTypeName = Services.TextService.UmbracoDictionaryTranslate(mapped.ContentTypeName);
+            // if your user type doesn't have access to the Settings section it would not get this property mapped
+            if(mapped.DocumentType != null)
+                mapped.DocumentType.Name = Services.TextService.UmbracoDictionaryTranslate(mapped.DocumentType.Name);
+
+            //remove this tab if it exists: umbContainerView
+            var containerTab = mapped.Tabs.FirstOrDefault(x => x.Alias == Constants.Conventions.PropertyGroups.ListViewGroupName);
+            mapped.Tabs = mapped.Tabs.Except(new[] { containerTab });
+            return mapped;
+        }
+
+        [OutgoingEditorModelEvent]
+        public ContentItemDisplay GetEmpty(int blueprintId, int parentId)
+        {
+            var blueprint = Services.ContentService.GetBlueprintById(blueprintId);
+            if (blueprint == null)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+
+            blueprint.Id = 0;
+            blueprint.Name = string.Empty;
+            blueprint.ParentId = parentId;
+
+            var mapped = Mapper.Map<ContentItemDisplay>(blueprint);
+
+            //remove this tab if it exists: umbContainerView
+            var containerTab = mapped.Tabs.FirstOrDefault(x => x.Alias == Constants.Conventions.PropertyGroups.ListViewGroupName);
+            mapped.Tabs = mapped.Tabs.Except(new[] { containerTab });
+            return mapped;
+        }
+
+        /// <summary>
+        /// Gets the Url for a given node ID
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public HttpResponseMessage GetNiceUrl(int id)
+        {
+            var url = Umbraco.NiceUrl(id);
+            var response = Request.CreateResponse(HttpStatusCode.OK);
+            response.Content = new StringContent(url, Encoding.UTF8, "application/json");
+            return response;
+        }
+
+        /// <summary>
+        /// Gets the Url for a given node ID
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public HttpResponseMessage GetNiceUrl(Guid id)
+        {
+            var url = Umbraco.UrlProvider.GetUrl(id);
+            var response = Request.CreateResponse(HttpStatusCode.OK);
+            response.Content = new StringContent(url, Encoding.UTF8, "application/json");
+            return response;
+        }
+
+        /// <summary>
+        /// Gets the Url for a given node ID
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public HttpResponseMessage GetNiceUrl(Udi id)
+        {
+            var guidUdi = id as GuidUdi;
+            if (guidUdi != null)
+            {
+                return GetNiceUrl(guidUdi.Guid);
+            }
+            throw new HttpResponseException(HttpStatusCode.NotFound);
+        }
+
+        /// <summary>
+        /// Gets the children for the content id passed in
+        /// </summary>
+        /// <returns></returns>
+        [FilterAllowedOutgoingContent(typeof(IEnumerable<ContentItemBasic<ContentPropertyBasic, IContent>>), "Items")]
+        public PagedResult<ContentItemBasic<ContentPropertyBasic, IContent>> GetChildren(
+                int id,
+                int pageNumber = 0,  //TODO: This should be '1' as it's not the index
+                int pageSize = 0,
+                string orderBy = "SortOrder",
+                Direction orderDirection = Direction.Ascending,
+                bool orderBySystemField = true,
+                string filter = "")
+        {
+            return GetChildren(id, null, pageNumber, pageSize, orderBy, orderDirection, orderBySystemField, filter);
+        }
+
+        /// <summary>
+        /// Gets the children for the content id passed in
+        /// </summary>
+        /// <returns></returns>
+        [FilterAllowedOutgoingContent(typeof(IEnumerable<ContentItemBasic<ContentPropertyBasic, IContent>>), "Items")]
+        public PagedResult<ContentItemBasic<ContentPropertyBasic, IContent>> GetChildren(
+                int id,
+                string includeProperties,
+                int pageNumber = 0,  //TODO: This should be '1' as it's not the index
+                int pageSize = 0,
+                string orderBy = "SortOrder",
+                Direction orderDirection = Direction.Ascending,
+                bool orderBySystemField = true,
+                string filter = "")
+        {
+            long totalChildren;
+            IContent[] children;
+            if (pageNumber > 0 && pageSize > 0)
+            {
+                children = Services.ContentService
+                 .GetPagedChildren(id, (pageNumber - 1), pageSize, out totalChildren
+                 , orderBy, orderDirection, orderBySystemField, filter).ToArray();
+            }
+            else
+            {
+                children = Services.ContentService.GetChildren(id).ToArray();
+                totalChildren = children.Length;
+            }
+
+            if (totalChildren == 0)
+            {
+                return new PagedResult<ContentItemBasic<ContentPropertyBasic, IContent>>(0, 0, 0);
+            }
+
+            var pagedResult = new PagedResult<ContentItemBasic<ContentPropertyBasic, IContent>>(totalChildren, pageNumber, pageSize);
+            pagedResult.Items = children.Select(content =>
+                Mapper.Map<IContent, ContentItemBasic<ContentPropertyBasic, IContent>>(content,
+                    opts =>
+                    {
+                        // if there's a list of property aliases to map - we will make sure to store this in the mapping context.
+                        if (String.IsNullOrWhiteSpace(includeProperties) == false)
+                        {
+                            opts.Items["IncludeProperties"] = includeProperties.Split(new[] { ", ", "," }, StringSplitOptions.RemoveEmptyEntries);
+                        }
+                    }));
+
+            return pagedResult;
+        }
+
+        [Obsolete("Dont use this, it is incorrectly named, use HasPermission instead")]
+        public bool GetHasPermission(string permissionToCheck, int nodeId)
+        {
+            return HasPermission(permissionToCheck, nodeId);
+        }
+
+        /// <summary>
+        /// Returns permissions for all nodes passed in for the current user
+        /// TODO: This should be moved to the CurrentUserController?
+        /// </summary>
+        /// <param name="nodeIds"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public Dictionary<int, string[]> GetPermissions(int[] nodeIds)
+        {
+            var permissions = Services.UserService
+                    .GetPermissions(Security.CurrentUser, nodeIds);
+
+            var permissionsDictionary = new Dictionary<int, string[]>();
+            foreach (var nodeId in nodeIds)
+            {
+                var aggregatePerms = permissions.GetAllPermissions(nodeId).ToArray();
+                permissionsDictionary.Add(nodeId, aggregatePerms);
+            }
+
+            return permissionsDictionary;
+        }
+
+        /// <summary>
+        /// Checks a nodes permission for the current user
+        /// TODO: This should be moved to the CurrentUserController?
+        /// </summary>
+        /// <param name="permissionToCheck"></param>
+        /// <param name="nodeId"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public bool HasPermission(string permissionToCheck, int nodeId)
+        {
+            var p = Services.UserService.GetPermissions(Security.CurrentUser, nodeId).GetAllPermissions();
+            if (p.Contains(permissionToCheck.ToString(CultureInfo.InvariantCulture)))
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Creates a blueprint from a content item
+        /// </summary>
+        /// <param name="contentId">The content id to copy</param>
+        /// <param name="name">The name of the blueprint</param>
+        /// <returns></returns>
+        [HttpPost]
+        public SimpleNotificationModel CreateBlueprintFromContent([FromUri]int contentId, [FromUri]string name)
+        {
+            if (string.IsNullOrWhiteSpace(name)) throw new ArgumentException("Value cannot be null or whitespace.", "name");
+
+            var content = Services.ContentService.GetById(contentId);
+            if (content == null)
+                throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
+
+            EnsureUniqueName(name, content, "name");
+
+            var blueprint = Services.ContentService.CreateContentFromBlueprint(content, name, Security.CurrentUser.Id);
+
+            Services.ContentService.SaveBlueprint(blueprint, Security.CurrentUser.Id);
+
+            var notificationModel = new SimpleNotificationModel();
+            notificationModel.AddSuccessNotification(
+                Services.TextService.Localize("blueprints/createdBlueprintHeading"),
+                Services.TextService.Localize("blueprints/createdBlueprintMessage", new[] { content.Name })
+            );
+
+            return notificationModel;
+        }
+
+        private void EnsureUniqueName(string name, IContent content, string modelName)
+        {
+            var existing = Services.ContentService.GetBlueprintsForContentTypes(content.ContentTypeId);
+            if (existing.Any(x => x.Name == name && x.Id != content.Id))
+            {
+                ModelState.AddModelError(modelName, Services.TextService.Localize("blueprints/duplicateBlueprintMessage"));
+                throw new HttpResponseException(Request.CreateValidationErrorResponse(ModelState));
+            }
+        }
+
+        /// <summary>
+        /// Saves content
+        /// </summary>
+        /// <returns></returns>
+        [FileUploadCleanupFilter]
+        [ContentPostValidate]
+        public ContentItemDisplay PostSaveBlueprint(
+            [ModelBinder(typeof(BlueprintItemBinder))] ContentItemSave contentItem)
+        {
+            var contentItemDisplay = PostSaveInternal(contentItem,
+                content =>
+                {
+                    EnsureUniqueName(content.Name, content, "Name");
+
+                    Services.ContentService.SaveBlueprint(contentItem.PersistedContent, Security.CurrentUser.Id);
+                    //we need to reuse the underlying logic so return the result that it wants
+                    return Attempt<OperationStatus>.Succeed(new OperationStatus(OperationStatusType.Success, new EventMessages()));
+                });
+            SetupBlueprint(contentItemDisplay, contentItemDisplay.PersistedContent);
+
+            return contentItemDisplay;
+        }
+
+        /// <summary>
+        /// Saves content
+        /// </summary>
+        /// <returns></returns>
+        [FileUploadCleanupFilter]
+        [ContentPostValidate]
+        [OutgoingEditorModelEvent]
+        public ContentItemDisplay PostSave(
+                [ModelBinder(typeof(ContentItemBinder))]
+                                ContentItemSave contentItem)
+        {
+            return PostSaveInternal(contentItem,
+                content => Services.ContentService.WithResult().Save(contentItem.PersistedContent, Security.CurrentUser.Id));
+        }
+
+        private ContentItemDisplay PostSaveInternal(ContentItemSave contentItem, Func<IContent, Attempt<OperationStatus>> saveMethod)
+        {
+            //Recent versions of IE/Edge may send in the full clientside file path instead of just the file name.
+            //To ensure similar behavior across all browsers no matter what they do - we strip the FileName property of all
+            //uploaded files to being *only* the actual file name (as it should be).
+            if (contentItem.UploadedFiles != null && contentItem.UploadedFiles.Any())
+            {
+                foreach (var file in contentItem.UploadedFiles)
+                {
+                    file.FileName = Path.GetFileName(file.FileName);
+                }
+            }
+
+            //If we've reached here it means:
+            // * Our model has been bound
+            // * and validated
+            // * any file attachments have been saved to their temporary location for us to use
+            // * we have a reference to the DTO object and the persisted object
+            // * Permissions are valid
+            MapPropertyValues(contentItem);
+
+            //We need to manually check the validation results here because:
+            // * We still need to save the entity even if there are validation value errors
+            // * Depending on if the entity is new, and if there are non property validation errors (i.e. the name is null)
+            //      then we cannot continue saving, we can only display errors
+            // * If there are validation errors and they were attempting to publish, we can only save, NOT publish and display
+            //      a message indicating this
+            if (ModelState.IsValid == false)
+            {
+                if (ValidationHelper.ModelHasRequiredForPersistenceErrors(contentItem) && IsCreatingAction(contentItem.Action))
+                {
+                    //ok, so the absolute mandatory data is invalid and it's new, we cannot actually continue!
+                    // add the modelstate to the outgoing object and throw a validation message
+                    var forDisplay = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(contentItem.PersistedContent, UmbracoContext);
+                    forDisplay.Errors = ModelState.ToErrorDictionary();
+                    throw new HttpResponseException(Request.CreateValidationErrorResponse(forDisplay));
+
+                }
+
+                //if the model state is not valid we cannot publish so change it to save
+                switch (contentItem.Action)
+                {
+                    case ContentSaveAction.Publish:
+                        contentItem.Action = ContentSaveAction.Save;
+                        break;
+                    case ContentSaveAction.PublishNew:
+                        contentItem.Action = ContentSaveAction.SaveNew;
+                        break;
+                }
+            }
+
+            //initialize this to successful
+            var publishStatus = Attempt<PublishStatus>.Succeed();
+            var wasCancelled = false;   //tracks if the operation was cancelled
+            var noop = false;           //tracks if the operation performed no operation (nothing to save)
+
+            if (contentItem.Action == ContentSaveAction.Save || contentItem.Action == ContentSaveAction.SaveNew)
+            {
+                //save the item
+                var saveResult = saveMethod(contentItem.PersistedContent);
+
+                wasCancelled = saveResult.Success == false && saveResult.Result.StatusType == OperationStatusType.FailedCancelledByEvent;
+                noop = saveResult.Result.StatusType == OperationStatusType.NoOperation;
+            }
+            else if (contentItem.Action == ContentSaveAction.SendPublish || contentItem.Action == ContentSaveAction.SendPublishNew)
+            {
+                var sendResult = Services.ContentService.SendToPublication(contentItem.PersistedContent, Security.CurrentUser.Id);
+                wasCancelled = sendResult == false;
+            }
+            else
+            {
+                //publish the item and check if it worked, if not we will show a diff msg below
+                publishStatus = Services.ContentService.SaveAndPublishWithStatus(contentItem.PersistedContent, Security.CurrentUser.Id);
+                wasCancelled = publishStatus.Result.StatusType == PublishStatusType.FailedCancelledByEvent;
+            }
+
+            //return the updated model
+            var display = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(contentItem.PersistedContent, UmbracoContext);
+
+            //lasty, if it is not valid, add the modelstate to the outgoing object and throw a 403
+            HandleInvalidModelState(display);
+
+            //put the correct msgs in
+            switch (contentItem.Action)
+            {
+                case ContentSaveAction.Save:
+                case ContentSaveAction.SaveNew:
+                    if (wasCancelled)
+                    {
+                        AddCancelMessage(display);
+                        
+                    }
+                    else if (noop == false)
+                    {
+                        display.AddSuccessNotification(
+                            Services.TextService.Localize("speechBubbles/editContentSavedHeader"),
+                            contentItem.ReleaseDate.HasValue
+                                ? Services.TextService.Localize("speechBubbles/editContentSavedWithReleaseDateText", new[] { contentItem.ReleaseDate.Value.ToLongDateString(), contentItem.ReleaseDate.Value.ToShortTimeString() })
+                                : Services.TextService.Localize("speechBubbles/editContentSavedText")
+                        );
+                    }
+                    break;
+                case ContentSaveAction.SendPublish:
+                case ContentSaveAction.SendPublishNew:
+                    if (wasCancelled)
+                    {
+                        AddCancelMessage(display);
+                    }
+                    else if (noop == false)
+                    {
+                        display.AddSuccessNotification(
+                            Services.TextService.Localize("speechBubbles/editContentSendToPublish"),
+                            Services.TextService.Localize("speechBubbles/editContentSendToPublishText"));
+                    }
+
+                    break;
+                case ContentSaveAction.Publish:
+                case ContentSaveAction.PublishNew:
+                    ShowMessageForPublishStatus(publishStatus.Result, display, contentItem.ExpireDate);
+                    break;
+            }
+
+            //If the item is new and the operation was cancelled, we need to return a different
+            // status code so the UI can handle it since it won't be able to redirect since there
+            // is no Id to redirect to!
+            if (wasCancelled && IsCreatingAction(contentItem.Action))
+            {
+                throw new HttpResponseException(Request.CreateValidationErrorResponse(display));
+            }
+
+            display.PersistedContent = contentItem.PersistedContent;
+
+            return display;
+        }
+
+        /// <summary>
+        /// Publishes a document with a given ID
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// The CanAccessContentAuthorize attribute will deny access to this method if the current user
+        /// does not have Publish access to this node.
+        /// </remarks>
+        ///
+        [EnsureUserPermissionForContent("id", 'U')]
+        public HttpResponseMessage PostPublishById(int id)
+        {
+            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
+
+            if (foundContent == null)
+            {
+                return HandleContentNotFound(id, false);
+            }
+
+            var publishResult = Services.ContentService.PublishWithStatus(foundContent, Security.CurrentUser.Id);
+            if (publishResult.Success == false)
+            {
+                var notificationModel = new SimpleNotificationModel();
+                ShowMessageForPublishStatus(publishResult.Result, notificationModel, foundContent.ExpireDate);
+                return Request.CreateValidationErrorResponse(notificationModel);
+            }
+
+            //return ok
+            return Request.CreateResponse(HttpStatusCode.OK);
+
+        }
+
+        [HttpDelete]
+        [HttpPost]
+        public HttpResponseMessage DeleteBlueprint(int id)
+        {
+            var found = Services.ContentService.GetBlueprintById(id);
+
+            if (found == null)
+            {
+                return HandleContentNotFound(id, false);
+            }
+
+            Services.ContentService.DeleteBlueprint(found);
+
+            return Request.CreateResponse(HttpStatusCode.OK);
+        }
+
+        /// <summary>
+        /// Moves an item to the recycle bin, if it is already there then it will permanently delete it
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// The CanAccessContentAuthorize attribute will deny access to this method if the current user
+        /// does not have Delete access to this node.
+        /// </remarks>
+        [EnsureUserPermissionForContent("id", 'D')]
+        [HttpDelete]
+        [HttpPost]
+        public HttpResponseMessage DeleteById(int id)
+        {
+            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
+
+            if (foundContent == null)
+            {
+                return HandleContentNotFound(id, false);
+            }
+
+            //if the current item is in the recycle bin
+            if (foundContent.IsInRecycleBin() == false)
+            {
+                var moveResult = Services.ContentService.WithResult().MoveToRecycleBin(foundContent, Security.CurrentUser.Id);
+                if (moveResult == false)
+                {
+                    //returning an object of INotificationModel will ensure that any pending
+                    // notification messages are added to the response.
+                    return Request.CreateValidationErrorResponse(new SimpleNotificationModel());
+                }
+            }
+            else
+            {
+                var deleteResult = Services.ContentService.WithResult().Delete(foundContent, Security.CurrentUser.Id);
+                if (deleteResult == false)
+                {
+                    //returning an object of INotificationModel will ensure that any pending
+                    // notification messages are added to the response.
+                    return Request.CreateValidationErrorResponse(new SimpleNotificationModel());
+                }
+            }
+
+            return Request.CreateResponse(HttpStatusCode.OK);
+        }
+
+        /// <summary>
+        /// Empties the recycle bin
+        /// </summary>
+        /// <returns></returns>
+        /// <remarks>
+        /// attributed with EnsureUserPermissionForContent to verify the user has access to the recycle bin
+        /// </remarks>
+        [HttpDelete]
+        [HttpPost]
+        [EnsureUserPermissionForContent(Constants.System.RecycleBinContent, 'D')]
+        public HttpResponseMessage EmptyRecycleBin()
+        {
+            Services.ContentService.EmptyRecycleBin(Security.CurrentUser.Id);
+
+            return Request.CreateNotificationSuccessResponse(Services.TextService.Localize("defaultdialogs/recycleBinIsEmpty"));
+        }
+
+        /// <summary>
+        /// Change the sort order for content
+        /// </summary>
+        /// <param name="sorted"></param>
+        /// <returns></returns>
+        [EnsureUserPermissionForContent("sorted.ParentId", 'S')]
+        public HttpResponseMessage PostSort(ContentSortOrder sorted)
+        {
+            if (sorted == null)
+            {
+                return Request.CreateResponse(HttpStatusCode.NotFound);
+            }
+
+            //if there's nothing to sort just return ok
+            if (sorted.IdSortOrder.Length == 0)
+            {
+                return Request.CreateResponse(HttpStatusCode.OK);
+            }
+
+            try
+            {
+                var contentService = Services.ContentService;
+
+                // Save content with new sort order and update content xml in db accordingly
+                if (contentService.Sort(sorted.IdSortOrder, Security.CurrentUser.Id) == false)
+                {
+                    LogHelper.Warn<ContentController>("Content sorting failed, this was probably caused by an event being cancelled");
+                    return Request.CreateValidationErrorResponse("Content sorting failed, this was probably caused by an event being cancelled");
+                }
+                return Request.CreateResponse(HttpStatusCode.OK);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Error<ContentController>("Could not update content sort order", ex);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// Change the sort order for media
+        /// </summary>
+        /// <param name="move"></param>
+        /// <returns></returns>
+        [EnsureUserPermissionForContent("move.ParentId", 'M')]
+        public HttpResponseMessage PostMove(MoveOrCopy move)
+        {
+            var toMove = ValidateMoveOrCopy(move);
+
+            Services.ContentService.Move(toMove, move.ParentId, Security.CurrentUser.Id);
+
+            var response = Request.CreateResponse(HttpStatusCode.OK);
+            response.Content = new StringContent(toMove.Path, Encoding.UTF8, "application/json");
+            return response;
+        }
+
+        /// <summary>
+        /// Copies a content item and places the copy as a child of a given parent Id
+        /// </summary>
+        /// <param name="copy"></param>
+        /// <returns></returns>
+        [EnsureUserPermissionForContent("copy.ParentId", 'C')]
+        public HttpResponseMessage PostCopy(MoveOrCopy copy)
+        {
+            var toCopy = ValidateMoveOrCopy(copy);
+
+            var c = Services.ContentService.Copy(toCopy, copy.ParentId, copy.RelateToOriginal, copy.Recursive, Security.CurrentUser.Id);
+
+            var response = Request.CreateResponse(HttpStatusCode.OK);
+            response.Content = new StringContent(c.Path, Encoding.UTF8, "application/json");
+            return response;
+        }
+
+        /// <summary>
+        /// Unpublishes a node with a given Id and returns the unpublished entity
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [EnsureUserPermissionForContent("id", 'U')]
+        [OutgoingEditorModelEvent]
+        public ContentItemDisplay PostUnPublish(int id)
+        {
+            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
+
+            if (foundContent == null)
+                HandleContentNotFound(id);
+
+            var unpublishResult = Services.ContentService.WithResult().UnPublish(foundContent, Security.CurrentUser.Id);
+
+            var content = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(foundContent, UmbracoContext);
+
+            if (unpublishResult == false)
+            {
+                AddCancelMessage(content);
+                throw new HttpResponseException(Request.CreateValidationErrorResponse(content));
+            }
+            else
+            {
+                content.AddSuccessNotification(Services.TextService.Localize("content/unPublish"), Services.TextService.Localize("speechBubbles/contentUnpublished"));
+                return content;
+            }
+        }
+
+        /// <summary>
+        /// Maps the dto property values to the persisted model
+        /// </summary>
+        /// <param name="contentItem"></param>
+        private void MapPropertyValues(ContentItemSave contentItem)
+        {
+            UpdateName(contentItem);
+
+            //TODO: We need to support 'send to publish'
+
+            contentItem.PersistedContent.ExpireDate = contentItem.ExpireDate;
+            contentItem.PersistedContent.ReleaseDate = contentItem.ReleaseDate;
+            //only set the template if it didn't change
+            var templateChanged = (contentItem.PersistedContent.Template == null && contentItem.TemplateAlias.IsNullOrWhiteSpace() == false)
+                                                        || (contentItem.PersistedContent.Template != null && contentItem.PersistedContent.Template.Alias != contentItem.TemplateAlias)
+                                                        || (contentItem.PersistedContent.Template != null && contentItem.TemplateAlias.IsNullOrWhiteSpace());
+            if (templateChanged)
+            {
+                var template = Services.FileService.GetTemplate(contentItem.TemplateAlias);
+                if (template == null && contentItem.TemplateAlias.IsNullOrWhiteSpace() == false)
+                {
+                    //ModelState.AddModelError("Template", "No template exists with the specified alias: " + contentItem.TemplateAlias);
+                    LogHelper.Warn<ContentController>("No template exists with the specified alias: " + contentItem.TemplateAlias);
+                }
+                else
+                {
+                    //NOTE: this could be null if there was a template and the posted template is null, this should remove the assigned template
+                    contentItem.PersistedContent.Template = template;
+                }
+            }
+
+            base.MapPropertyValues(contentItem);
+        }
+
+        /// <summary>
+        /// Ensures the item can be moved/copied to the new location
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        private IContent ValidateMoveOrCopy(MoveOrCopy model)
+        {
+            if (model == null)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+
+            var contentService = Services.ContentService;
+            var toMove = contentService.GetById(model.Id);
+            if (toMove == null)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+            if (model.ParentId < 0)
+            {
+                //cannot move if the content item is not allowed at the root
+                if (toMove.ContentType.AllowedAsRoot == false)
+                {
+                    throw new HttpResponseException(
+                            Request.CreateNotificationValidationErrorResponse(
+                                    Services.TextService.Localize("moveOrCopy/notAllowedAtRoot")));
+                }
+            }
+            else
+            {
+                var parent = contentService.GetById(model.ParentId);
+                if (parent == null)
+                {
+                    throw new HttpResponseException(HttpStatusCode.NotFound);
+                }
+
+                //check if the item is allowed under this one
+                if (parent.ContentType.AllowedContentTypes.Select(x => x.Id).ToArray()
+                        .Any(x => x.Value == toMove.ContentType.Id) == false)
+                {
+                    throw new HttpResponseException(
+                            Request.CreateNotificationValidationErrorResponse(
+                                    Services.TextService.Localize("moveOrCopy/notAllowedByContentType")));
+                }
+
+                // Check on paths
+                if ((string.Format(",{0},", parent.Path)).IndexOf(string.Format(",{0},", toMove.Id), StringComparison.Ordinal) > -1)
+                {
+                    throw new HttpResponseException(
+                            Request.CreateNotificationValidationErrorResponse(
+                                    Services.TextService.Localize("moveOrCopy/notAllowedByPath")));
+                }
+            }
+
+            return toMove;
+        }
+
+        private void ShowMessageForPublishStatus(PublishStatus status, INotificationModel display, DateTime? expireDate)
+        {
+            switch (status.StatusType)
+            {
+                case PublishStatusType.Success:
+                case PublishStatusType.SuccessAlreadyPublished:
+                    display.AddSuccessNotification(
+                            Services.TextService.Localize("speechBubbles/editContentPublishedHeader"),
+                            expireDate.HasValue
+                                ? Services.TextService.Localize("speechBubbles/editContentPublishedWithExpireDateText", new [] { expireDate.Value.ToLongDateString(), expireDate.Value.ToShortTimeString() })
+                                : Services.TextService.Localize("speechBubbles/editContentPublishedText")
+                    );
+                    break;
+                case PublishStatusType.FailedPathNotPublished:
+                    display.AddWarningNotification(
+                            Services.TextService.Localize("publish"),
+                            Services.TextService.Localize("publish/contentPublishedFailedByParent",
+                                    new[] { string.Format("{0} ({1})", status.ContentItem.Name, status.ContentItem.Id) }).Trim());
+                    break;
+                case PublishStatusType.FailedCancelledByEvent:
+                    AddCancelMessage(display, "publish", "speechBubbles/contentPublishedFailedByEvent");
+                    break;
+                case PublishStatusType.FailedAwaitingRelease:
+                    display.AddWarningNotification(
+                            Services.TextService.Localize("publish"),
+                            Services.TextService.Localize("publish/contentPublishedFailedAwaitingRelease",
+                                    new[] { string.Format("{0} ({1})", status.ContentItem.Name, status.ContentItem.Id) }).Trim());
+                    break;
+                case PublishStatusType.FailedHasExpired:
+                    display.AddWarningNotification(
+                            Services.TextService.Localize("publish"),
+                            Services.TextService.Localize("publish/contentPublishedFailedExpired",
+                                    new[]
+                                    {
+                                                                string.Format("{0} ({1})", status.ContentItem.Name, status.ContentItem.Id),
+                                    }).Trim());
+                    break;
+                case PublishStatusType.FailedIsTrashed:
+                    //TODO: We should add proper error messaging for this!
+                    break;
+                case PublishStatusType.FailedContentInvalid:
+                    display.AddWarningNotification(
+                            Services.TextService.Localize("publish"),
+                            Services.TextService.Localize("publish/contentPublishedFailedInvalid",
+                                    new[]
+                                    {
+                                                                string.Format("{0} ({1})", status.ContentItem.Name, status.ContentItem.Id),
+                                                                string.Join(",", status.InvalidProperties.Select(x => x.Alias))
+                                    }).Trim());
+                    break;
+                default:
+                    throw new IndexOutOfRangeException();
+            }
+        }
+
+
+        /// <summary>
+        /// Performs a permissions check for the user to check if it has access to the node based on
+        /// start node and/or permissions for the node
+        /// </summary>
+        /// <param name="storage">The storage to add the content item to so it can be reused</param>
+        /// <param name="user"></param>
+        /// <param name="userService"></param>
+        /// <param name="contentService"></param>
+        /// <param name="entityService"></param>
+        /// <param name="nodeId">The content to lookup, if the contentItem is not specified</param>
+        /// <param name="permissionsToCheck"></param>
+        /// <param name="contentItem">Specifies the already resolved content item to check against</param>
+        /// <returns></returns>
+        internal static bool CheckPermissions(
+                IDictionary<string, object> storage,
+                IUser user,
+                IUserService userService,
+                IContentService contentService,
+                IEntityService entityService,
+                int nodeId,
+                char[] permissionsToCheck = null,
+                IContent contentItem = null)
+        {
+            if (storage == null) throw new ArgumentNullException("storage");
+            if (user == null) throw new ArgumentNullException("user");
+            if (userService == null) throw new ArgumentNullException("userService");
+            if (contentService == null) throw new ArgumentNullException("contentService");
+            if (entityService == null) throw new ArgumentNullException("entityService");
+
+            if (contentItem == null && nodeId != Constants.System.Root && nodeId != Constants.System.RecycleBinContent)
+            {
+                contentItem = contentService.GetById(nodeId);
+                //put the content item into storage so it can be retreived
+                // in the controller (saves a lookup)
+                storage[typeof(IContent).ToString()] = contentItem;
+            }
+
+            if (contentItem == null && nodeId != Constants.System.Root && nodeId != Constants.System.RecycleBinContent)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+
+            var hasPathAccess = (nodeId == Constants.System.Root)
+                ? user.HasContentRootAccess(entityService)
+                : (nodeId == Constants.System.RecycleBinContent)
+                    ? user.HasContentBinAccess(entityService)
+                    : user.HasPathAccess(contentItem, entityService);
+
+            if (hasPathAccess == false)
+            {
+                return false;
+            }
+
+            if (permissionsToCheck == null || permissionsToCheck.Length == 0)
+            {
+                return true;
+            }
+
+            //get the implicit/inherited permissions for the user for this path,
+            //if there is no content item for this id, than just use the id as the path (i.e. -1 or -20)
+            var path = contentItem != null ? contentItem.Path : nodeId.ToString();
+            var permission = userService.GetPermissionsForPath(user, path);
+
+            var allowed = true;
+            foreach (var p in permissionsToCheck)
+            {
+                if (permission == null
+                    || permission.GetAllPermissions().Contains(p.ToString(CultureInfo.InvariantCulture)) == false)
+                {
+                    allowed = false;
+                }
+            }
+            return allowed;
+        }
+
+        [EnsureUserPermissionForContent("contentId", 'F')]
+        public IEnumerable<NotifySetting> GetNotificationOptions(int contentId)
+        {
+            var notifications = new List<NotifySetting>();
+            if (contentId <= 0) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
+
+            var content = Services.ContentService.GetById(contentId);
+            if (content == null) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
+
+            var actionList = ActionsResolver.Current.Actions;
+            foreach (var a in actionList)
+            {
+                if (a.ShowInNotifier)
+                {
+                    NotifySetting n = new NotifySetting
+                    {
+                        Name = ui.Text("actions", a.Alias),
+                        Checked = (UmbracoUser.GetNotifications(content.Path).IndexOf(a.Letter) > -1),
+                        NotifyCode = a.Letter.ToString()
+                    };
+                    notifications.Add(n);
+                }
+            }
+            return notifications;
+        }
+
+        public void PostNotificationOptions(int contentId, string notifyOptions = "")
+        {
+            if (contentId <= 0) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
+            var content = Services.ContentService.GetById(contentId);
+
+            if (content == null) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
+            var node = new CMSNode(contentId);
+
+            global::umbraco.cms.businesslogic.workflow.Notification.UpdateNotifications(UmbracoUser, node, notifyOptions ?? "");
+        }
+    }
+}

From 8c46984a2fbe34c9beb903919be1be421ffa539d Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Thu, 19 Sep 2019 18:46:02 +1000
Subject: [PATCH 663/776] U4-9912 Previewing without changing creates new
 version (#1943)

(cherry picked from commit 7d0d5b9c939a9d9578c9e112a2f1d90bac6df777)
---
 src/Umbraco.Core/Services/ContentService.cs  | 5894 +++++++++---------
 src/Umbraco.Web/Editors/ContentController.cs | 2442 ++++----
 2 files changed, 4172 insertions(+), 4164 deletions(-)

diff --git a/src/Umbraco.Core/Services/ContentService.cs b/src/Umbraco.Core/Services/ContentService.cs
index 2994bcc4f6..0b50eb1f65 100644
--- a/src/Umbraco.Core/Services/ContentService.cs
+++ b/src/Umbraco.Core/Services/ContentService.cs
@@ -1,2945 +1,2949 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Text.RegularExpressions;
-using System.Threading;
-using System.Xml;
-using System.Xml.Linq;
-using Umbraco.Core.Events;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.Membership;
-using Umbraco.Core.Models.Rdbms;
-using Umbraco.Core.Persistence;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
-using Umbraco.Core.Persistence.Querying;
-using Umbraco.Core.Persistence.Repositories;
-using Umbraco.Core.Persistence.UnitOfWork;
-using Umbraco.Core.Publishing;
-
-namespace Umbraco.Core.Services
-{
-    /// <summary>
-    /// Represents the Content Service, which is an easy access to operations involving <see cref="IContent"/>
-    /// </summary>
-    public class ContentService : ScopeRepositoryService, IContentService, IContentServiceOperations
-    {
-        private readonly IPublishingStrategy2 _publishingStrategy;
-        private readonly EntityXmlSerializer _entitySerializer = new EntityXmlSerializer();
-        private readonly IDataTypeService _dataTypeService;
-        private readonly IUserService _userService;
-
-        //Support recursive locks because some of the methods that require locking call other methods that require locking.
-        //for example, the Move method needs to be locked but this calls the Save method which also needs to be locked.
-        private static readonly ReaderWriterLockSlim Locker = new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion);
-        private static readonly Regex AnchorRegex = new Regex("<a id=\"(.*?)\">", RegexOptions.Compiled);
-
-        public ContentService(
-            IDatabaseUnitOfWorkProvider provider,
-            RepositoryFactory repositoryFactory,
-            ILogger logger,
-            IEventMessagesFactory eventMessagesFactory,
-            IDataTypeService dataTypeService,
-            IUserService userService)
-            : base(provider, repositoryFactory, logger, eventMessagesFactory)
-        {
-            if (dataTypeService == null) throw new ArgumentNullException("dataTypeService");
-            if (userService == null) throw new ArgumentNullException("userService");
-            _publishingStrategy = new PublishingStrategy(UowProvider.ScopeProvider, eventMessagesFactory, logger);
-            _dataTypeService = dataTypeService;
-            _userService = userService;
-        }
-
-        #region Static Queries
-
-        private IQuery<IContent> _notTrashedQuery;
-
-        #endregion
-
-        public int CountPublished(string contentTypeAlias = null)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                return repository.CountPublished(contentTypeAlias);
-            }
-        }
-
-        public int Count(string contentTypeAlias = null)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                return repository.Count(contentTypeAlias);
-            }
-        }
-
-        public int CountChildren(int parentId, string contentTypeAlias = null)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                return repository.CountChildren(parentId, contentTypeAlias);
-            }
-        }
-
-        public int CountDescendants(int parentId, string contentTypeAlias = null)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                return repository.CountDescendants(parentId, contentTypeAlias);
-            }
-        }
-
-        /// <summary>
-        /// Used to bulk update the permissions set for a content item. This will replace all permissions
-        /// assigned to an entity with a list of user id & permission pairs.
-        /// </summary>
-        /// <param name="permissionSet"></param>
-        public void ReplaceContentPermissions(EntityPermissionSet permissionSet)
-        {
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                repository.ReplaceContentPermissions(permissionSet);
-                uow.Commit();
-            }
-        }
-
-        /// <summary>
-        /// Assigns a single permission to the current content item for the specified group ids
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <param name="permission"></param>
-        /// <param name="groupIds"></param>
-        public void AssignContentPermission(IContent entity, char permission, IEnumerable<int> groupIds)
-        {
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                repository.AssignEntityPermission(entity, permission, groupIds);
-                uow.Commit();
-            }
-        }
-
-        /// <summary>
-        /// Returns implicit/inherited permissions assigned to the content item for all user groups
-        /// </summary>
-        /// <param name="content"></param>
-        /// <returns></returns>
-        public EntityPermissionCollection GetPermissionsForEntity(IContent content)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                return repository.GetPermissionsForEntity(content.Id);
-            }
-        }
-
-        /// <summary>
-        /// Creates an <see cref="IContent"/> object using the alias of the <see cref="IContentType"/>
-        /// that this Content should based on.
-        /// </summary>
-        /// <remarks>
-        /// Note that using this method will simply return a new IContent without any identity
-        /// as it has not yet been persisted. It is intended as a shortcut to creating new content objects
-        /// that does not invoke a save operation against the database.
-        /// </remarks>
-        /// <param name="name">Name of the Content object</param>
-        /// <param name="parentId">Id of Parent for the new Content</param>
-        /// <param name="contentTypeAlias">Alias of the <see cref="IContentType"/></param>
-        /// <param name="userId">Optional id of the user creating the content</param>
-        /// <returns><see cref="IContent"/></returns>
-        public IContent CreateContent(string name, Guid parentId, string contentTypeAlias, int userId = 0)
-        {
-            var parent = GetById(parentId);
-            return CreateContent(name, parent, contentTypeAlias, userId);
-        }
-
-        /// <summary>
-        /// Creates an <see cref="IContent"/> object using the alias of the <see cref="IContentType"/>
-        /// that this Content should based on.
-        /// </summary>
-        /// <remarks>
-        /// Note that using this method will simply return a new IContent without any identity
-        /// as it has not yet been persisted. It is intended as a shortcut to creating new content objects
-        /// that does not invoke a save operation against the database.
-        /// </remarks>
-        /// <param name="name">Name of the Content object</param>
-        /// <param name="parentId">Id of Parent for the new Content</param>
-        /// <param name="contentTypeAlias">Alias of the <see cref="IContentType"/></param>
-        /// <param name="userId">Optional id of the user creating the content</param>
-        /// <returns><see cref="IContent"/></returns>
-        public IContent CreateContent(string name, int parentId, string contentTypeAlias, int userId = 0)
-        {
-            var contentType = FindContentTypeByAlias(contentTypeAlias);
-            var content = new Content(name, parentId, contentType);
-            var parent = GetById(content.ParentId);
-            content.Path = string.Concat(parent.IfNotNull(x => x.Path, content.ParentId.ToString()), ",", content.Id);
-
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var newEventArgs = new NewEventArgs<IContent>(content, contentTypeAlias, parentId);
-                if (uow.Events.DispatchCancelable(Creating, this, newEventArgs))
-                {
-                    uow.Commit();
-                    content.WasCancelled = true;
-                    return content;
-                }
-
-                content.CreatorId = userId;
-                content.WriterId = userId;
-                newEventArgs.CanCancel = false;
-                uow.Events.Dispatch(Created, this, newEventArgs);
-
-                uow.Commit();
-            }
-
-            return content;
-        }
-
-        /// <summary>
-        /// Creates an <see cref="IContent"/> object using the alias of the <see cref="IContentType"/>
-        /// that this Content should based on.
-        /// </summary>
-        /// <remarks>
-        /// Note that using this method will simply return a new IContent without any identity
-        /// as it has not yet been persisted. It is intended as a shortcut to creating new content objects
-        /// that does not invoke a save operation against the database.
-        /// </remarks>
-        /// <param name="name">Name of the Content object</param>
-        /// <param name="parent">Parent <see cref="IContent"/> object for the new Content</param>
-        /// <param name="contentTypeAlias">Alias of the <see cref="IContentType"/></param>
-        /// <param name="userId">Optional id of the user creating the content</param>
-        /// <returns><see cref="IContent"/></returns>
-        public IContent CreateContent(string name, IContent parent, string contentTypeAlias, int userId = 0)
-        {
-            if (parent == null) throw new ArgumentNullException("parent");
-
-            var contentType = FindContentTypeByAlias(contentTypeAlias);
-            var content = new Content(name, parent, contentType);
-            content.Path = string.Concat(parent.Path, ",", content.Id);
-
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var newEventArgs = new NewEventArgs<IContent>(content, contentTypeAlias, parent);
-                if (uow.Events.DispatchCancelable(Creating, this, newEventArgs))
-                {
-                    uow.Commit();
-                    content.WasCancelled = true;
-                    return content;
-                }
-
-                content.CreatorId = userId;
-                content.WriterId = userId;
-                newEventArgs.CanCancel = false;
-                uow.Events.Dispatch(Created, this, newEventArgs);
-
-                uow.Commit();
-            }
-
-            return content;
-        }
-
-        /// <summary>
-        /// Creates and saves an <see cref="IContent"/> object using the alias of the <see cref="IContentType"/>
-        /// that this Content should based on.
-        /// </summary>
-        /// <remarks>
-        /// This method returns an <see cref="IContent"/> object that has been persisted to the database
-        /// and therefor has an identity.
-        /// </remarks>
-        /// <param name="name">Name of the Content object</param>
-        /// <param name="parentId">Id of Parent for the new Content</param>
-        /// <param name="contentTypeAlias">Alias of the <see cref="IContentType"/></param>
-        /// <param name="userId">Optional id of the user creating the content</param>
-        /// <returns><see cref="IContent"/></returns>
-        public IContent CreateContentWithIdentity(string name, int parentId, string contentTypeAlias, int userId = 0)
-        {
-            var contentType = FindContentTypeByAlias(contentTypeAlias);
-            var content = new Content(name, parentId, contentType);
-
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                //NOTE: I really hate the notion of these Creating/Created events - they are so inconsistent, I've only just found
-                // out that in these 'WithIdentity' methods, the Saving/Saved events were not fired, wtf. Anyways, they're added now.
-                var newEventArgs = new NewEventArgs<IContent>(content, contentTypeAlias, parentId);
-                if (uow.Events.DispatchCancelable(Creating, this, newEventArgs))
-                {
-                    uow.Commit();
-                    content.WasCancelled = true;
-                    return content;
-                }
-
-                var saveEventArgs = new SaveEventArgs<IContent>(content);
-                if (uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
-                {
-                    uow.Commit();
-                    content.WasCancelled = true;
-                    return content;
-                }
-
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                content.CreatorId = userId;
-                content.WriterId = userId;
-
-                repository.AddOrUpdate(content);
-                repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-                saveEventArgs.CanCancel = false;
-                uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
-                newEventArgs.CanCancel = false;
-                uow.Events.Dispatch(Created, this, newEventArgs);
-
-                Audit(uow, AuditType.New, string.Format("Content '{0}' was created with Id {1}", name, content.Id), content.CreatorId, content.Id);
-                uow.Commit();
-            }
-
-            return content;
-        }
-
-        public IEnumerable<string> GetAnchorValuesFromRTEs(int id)
-        {
-            var result = new List<string>();
-
-            var content = GetById(id);
-
-            foreach (var contentProperty in content.Properties)
-            {
-                if (contentProperty.PropertyType.PropertyEditorAlias.InvariantEquals(Constants.PropertyEditors.TinyMCEAlias))
-                {
-                    var value = contentProperty.Value?.ToString();
-
-                    if (!string.IsNullOrEmpty(value))
-                    {
-                        result.AddRange(GetAnchorValuesFromRTEContent(value));
-                    }
-
-                }
-            }
-
-
-            return result;
-        }
-
-
-        public IEnumerable<string> GetAnchorValuesFromRTEContent(string rteContent)
-        {
-            var result = new List<string>();
-
-            var matches = AnchorRegex.Matches(rteContent);
-
-            foreach (Match match in matches)
-            {
-                result.Add(match.Value.Split('\"')[1]);
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// Creates and saves an <see cref="IContent"/> object using the alias of the <see cref="IContentType"/>
-        /// that this Content should based on.
-        /// </summary>
-        /// <remarks>
-        /// This method returns an <see cref="IContent"/> object that has been persisted to the database
-        /// and therefor has an identity.
-        /// </remarks>
-        /// <param name="name">Name of the Content object</param>
-        /// <param name="parent">Parent <see cref="IContent"/> object for the new Content</param>
-        /// <param name="contentTypeAlias">Alias of the <see cref="IContentType"/></param>
-        /// <param name="userId">Optional id of the user creating the content</param>
-        /// <returns><see cref="IContent"/></returns>
-        public IContent CreateContentWithIdentity(string name, IContent parent, string contentTypeAlias, int userId = 0)
-        {
-            if (parent == null) throw new ArgumentNullException("parent");
-
-            var contentType = FindContentTypeByAlias(contentTypeAlias);
-            var content = new Content(name, parent, contentType);
-
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                //NOTE: I really hate the notion of these Creating/Created events - they are so inconsistent, I've only just found
-                // out that in these 'WithIdentity' methods, the Saving/Saved events were not fired, wtf. Anyways, they're added now.
-                var newEventArgs = new NewEventArgs<IContent>(content, contentTypeAlias, parent);
-                if (uow.Events.DispatchCancelable(Creating, this, newEventArgs))
-                {
-                    uow.Commit();
-                    content.WasCancelled = true;
-                    return content;
-                }
-
-                var saveEventArgs = new SaveEventArgs<IContent>(content);
-                if (uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
-                {
-                    uow.Commit();
-                    content.WasCancelled = true;
-                    return content;
-                }
-
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                content.CreatorId = userId;
-                content.WriterId = userId;
-
-                repository.AddOrUpdate(content);
-                repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-                saveEventArgs.CanCancel = false;
-                uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
-                newEventArgs.CanCancel = false;
-                uow.Events.Dispatch(Created, this, newEventArgs);
-
-                Audit(uow, AuditType.New, string.Format("Content '{0}' was created with Id {1}", name, content.Id), content.CreatorId, content.Id);
-                uow.Commit();
-            }
-
-            return content;
-        }
-
-        /// <summary>
-        /// Gets an <see cref="IContent"/> object by Id
-        /// </summary>
-        /// <param name="id">Id of the Content to retrieve</param>
-        /// <returns><see cref="IContent"/></returns>
-        public IContent GetById(int id)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                return repository.Get(id);
-            }
-        }
-
-        /// <summary>
-        /// Gets <see cref="IContent"/> objects by Ids
-        /// </summary>
-        /// <param name="ids">Ids of the Content to retrieve</param>
-        /// <returns><see cref="IContent"/></returns>
-        public IEnumerable<IContent> GetByIds(IEnumerable<int> ids)
-        {
-            var idsArray = ids.ToArray();
-            if (idsArray.Length == 0) return Enumerable.Empty<IContent>();
-
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                // ensure that the result has the order based on the ids passed in
-                var result = repository.GetAll(idsArray);
-                var content = result.ToDictionary(x => x.Id, x => x);
-
-                var sortedResult = idsArray.Select(x =>
-                {
-                    IContent c;
-                    return content.TryGetValue(x, out c) ? c : null;
-                }).WhereNotNull();
-
-                return sortedResult;
-            }
-        }
-
-        /// <summary>
-        /// Gets <see cref="IContent"/> objects by Ids
-        /// </summary>
-        /// <param name="ids">Ids of the Content to retrieve</param>
-        /// <returns><see cref="IContent"/></returns>
-        public IEnumerable<IContent> GetByIds(IEnumerable<Guid> ids)
-        {
-            var idsArray = ids.ToArray();
-            if (idsArray.Length == 0) return Enumerable.Empty<IContent>();
-
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                // ensure that the result has the order based on the ids passed in
-                var result = repository.GetAll(idsArray);
-                var content = result.ToDictionary(x => x.Key, x => x);
-
-                var sortedResult = idsArray.Select(x =>
-                {
-                    IContent c;
-                    return content.TryGetValue(x, out c) ? c : null;
-                }).WhereNotNull();
-
-                return sortedResult;
-            }
-        }
-
-        /// <summary>
-        /// Gets an <see cref="IContent"/> object by its 'UniqueId'
-        /// </summary>
-        /// <param name="key">Guid key of the Content to retrieve</param>
-        /// <returns><see cref="IContent"/></returns>
-        public IContent GetById(Guid key)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                return repository.Get(key);
-            }
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects by the Id of the <see cref="IContentType"/>
-        /// </summary>
-        /// <param name="id">Id of the <see cref="IContentType"/></param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetContentOfContentType(int id)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                var query = Query<IContent>.Builder.Where(x => x.ContentTypeId == id);
-                return repository.GetByQuery(query);
-            }
-        }
-
-        internal IEnumerable<IContent> GetPublishedContentOfContentType(int id)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                var query = Query<IContent>.Builder.Where(x => x.ContentTypeId == id);
-                return repository.GetByPublishedVersion(query);
-            }
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects by Level
-        /// </summary>
-        /// <param name="level">The level to retrieve Content from</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetByLevel(int level)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                var query = Query<IContent>.Builder.Where(x => x.Level == level && x.Path.StartsWith(Constants.System.RecycleBinContent.ToInvariantString()) == false);
-                return repository.GetByQuery(query);
-            }
-        }
-
-        /// <summary>
-        /// Gets a specific version of an <see cref="IContent"/> item.
-        /// </summary>
-        /// <param name="versionId">Id of the version to retrieve</param>
-        /// <returns>An <see cref="IContent"/> item</returns>
-        public IContent GetByVersion(Guid versionId)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                return repository.GetByVersion(versionId);
-            }
-        }
-
-
-        /// <summary>
-        /// Gets a collection of an <see cref="IContent"/> objects versions by Id
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetVersions(int id)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                return repository.GetAllVersions(id);
-            }
-        }
-
-        /// <summary>
-        /// Gets a list of all version Ids for the given content item ordered so latest is first
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="maxRows">The maximum number of rows to return</param>
-        /// <returns></returns>
-        public IEnumerable<Guid> GetVersionIds(int id, int maxRows)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                return repository.GetVersionIds(id, maxRows);
-            }
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects, which are ancestors of the current content.
-        /// </summary>
-        /// <param name="id">Id of the <see cref="IContent"/> to retrieve ancestors for</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetAncestors(int id)
-        {
-            var content = GetById(id);
-            return GetAncestors(content);
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects, which are ancestors of the current content.
-        /// </summary>
-        /// <param name="content"><see cref="IContent"/> to retrieve ancestors for</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetAncestors(IContent content)
-        {
-            //null check otherwise we get exceptions
-            if (content.Path.IsNullOrWhiteSpace()) return Enumerable.Empty<IContent>();
-
-            var ids = content.Path.Split(',').Where(x => x != Constants.System.Root.ToInvariantString() && x != content.Id.ToString(CultureInfo.InvariantCulture)).Select(int.Parse).ToArray();
-            if (ids.Any() == false)
-                return new List<IContent>();
-
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                return repository.GetAll(ids);
-            }
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
-        /// </summary>
-        /// <param name="id">Id of the Parent to retrieve Children from</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetChildren(int id)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                var query = Query<IContent>.Builder.Where(x => x.ParentId == id);
-                return repository.GetByQuery(query).OrderBy(x => x.SortOrder);
-            }
-        }
-
-        [Obsolete("Use the overload with 'long' parameter types instead")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public IEnumerable<IContent> GetPagedChildren(int id, int pageIndex, int pageSize, out int totalChildren,
-            string orderBy, Direction orderDirection, string filter = "")
-        {
-            long total;
-            var result = GetPagedChildren(id, Convert.ToInt64(pageIndex), pageSize, out total, orderBy, orderDirection, true, filter);
-            totalChildren = Convert.ToInt32(total);
-            return result;
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
-        /// </summary>
-        /// <param name="id">Id of the Parent to retrieve Children from</param>
-        /// <param name="pageIndex">Page index (zero based)</param>
-        /// <param name="pageSize">Page size</param>
-        /// <param name="totalChildren">Total records query would return without paging</param>
-        /// <param name="orderBy">Field to order by</param>
-        /// <param name="orderDirection">Direction to order by</param>
-        /// <param name="filter">Search text filter</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetPagedChildren(int id, long pageIndex, int pageSize, out long totalChildren,
-            string orderBy, Direction orderDirection, string filter = "")
-        {
-            return GetPagedChildren(id, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, true, filter);
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
-        /// </summary>
-        /// <param name="id">Id of the Parent to retrieve Children from</param>
-        /// <param name="pageIndex">Page index (zero based)</param>
-        /// <param name="pageSize">Page size</param>
-        /// <param name="totalChildren">Total records query would return without paging</param>
-        /// <param name="orderBy">Field to order by</param>
-        /// <param name="orderDirection">Direction to order by</param>
-        /// <param name="orderBySystemField">Flag to indicate when ordering by system field</param>
-        /// <param name="filter">Search text filter</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetPagedChildren(int id, long pageIndex, int pageSize, out long totalChildren,
-            string orderBy, Direction orderDirection, bool orderBySystemField, string filter)
-        {
-            Mandate.ParameterCondition(pageIndex >= 0, "pageIndex");
-            Mandate.ParameterCondition(pageSize > 0, "pageSize");
-
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                var query = Query<IContent>.Builder;
-                // always check for a parent - else it will also get decendants (and then you should use the GetPagedDescendants method)
-                query.Where(x => x.ParentId == id);
-
-                IQuery<IContent> filterQuery = null;
-                if (filter.IsNullOrWhiteSpace() == false)
-                {
-                    filterQuery = Query<IContent>.Builder.Where(x => x.Name.Contains(filter));
-                }
-                return repository.GetPagedResultsByQuery(query, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, orderBySystemField, filterQuery);
-            }
-        }
-
-        [Obsolete("Use the overload with 'long' parameter types instead")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public IEnumerable<IContent> GetPagedDescendants(int id, int pageIndex, int pageSize, out int totalChildren, string orderBy = "path", Direction orderDirection = Direction.Ascending, string filter = "")
-        {
-            long total;
-            var result = GetPagedDescendants(id, Convert.ToInt64(pageIndex), pageSize, out total, orderBy, orderDirection, true, filter);
-            totalChildren = Convert.ToInt32(total);
-            return result;
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
-        /// </summary>
-        /// <param name="id">Id of the Parent to retrieve Descendants from</param>
-        /// <param name="pageIndex">Page number</param>
-        /// <param name="pageSize">Page size</param>
-        /// <param name="totalChildren">Total records query would return without paging</param>
-        /// <param name="orderBy">Field to order by</param>
-        /// <param name="orderDirection">Direction to order by</param>
-        /// <param name="filter">Search text filter</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetPagedDescendants(int id, long pageIndex, int pageSize, out long totalChildren, string orderBy = "path", Direction orderDirection = Direction.Ascending, string filter = "")
-        {
-            return GetPagedDescendants(id, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, true, filter);
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
-        /// </summary>
-        /// <param name="id">Id of the Parent to retrieve Descendants from</param>
-        /// <param name="pageIndex">Page number</param>
-        /// <param name="pageSize">Page size</param>
-        /// <param name="totalChildren">Total records query would return without paging</param>
-        /// <param name="orderBy">Field to order by</param>
-        /// <param name="orderDirection">Direction to order by</param>
-        /// <param name="orderBySystemField">Flag to indicate when ordering by system field</param>
-        /// <param name="filter">Search text filter</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetPagedDescendants(int id, long pageIndex, int pageSize, out long totalChildren, string orderBy, Direction orderDirection, bool orderBySystemField, string filter)
-        {
-            Mandate.ParameterCondition(pageIndex >= 0, "pageIndex");
-            Mandate.ParameterCondition(pageSize > 0, "pageSize");
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                // get query - if the id is System Root, then just get all
-                var query = Query<IContent>.Builder;
-                if (id != Constants.System.Root)
-                {
-                    var entityRepository = RepositoryFactory.CreateEntityRepository(uow);
-                    var contentPath = entityRepository.GetAllPaths(Constants.ObjectTypes.DocumentGuid, id).ToArray();
-                    if (contentPath.Length == 0)
-                    {
-                        totalChildren = 0;
-                        return Enumerable.Empty<IContent>();
-                    }
-                    query.Where(x => x.Path.SqlStartsWith(string.Format("{0},", contentPath[0].Path), TextColumnType.NVarchar));
-                }
-
-
-                // get filter
-                IQuery<IContent> filterQuery = null;
-                if (filter.IsNullOrWhiteSpace() == false)
-                    filterQuery = Query<IContent>.Builder.Where(x => x.Name.Contains(filter));
-
-                return repository.GetPagedResultsByQuery(query, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, orderBySystemField, filterQuery);
-            }
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
-        /// </summary>
-        /// <param name="id">Id of the Parent to retrieve Descendants from</param>
-        /// <param name="pageIndex">Page number</param>
-        /// <param name="pageSize">Page size</param>
-        /// <param name="totalChildren">Total records query would return without paging</param>
-        /// <param name="orderBy">Field to order by</param>
-        /// <param name="orderDirection">Direction to order by</param>
-        /// <param name="orderBySystemField">Flag to indicate when ordering by system field</param>
-        /// <param name="filter">Search filter</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetPagedDescendants(int id, long pageIndex, int pageSize, out long totalChildren, string orderBy, Direction orderDirection, bool orderBySystemField, IQuery<IContent> filter)
-        {
-            Mandate.ParameterCondition(pageIndex >= 0, "pageIndex");
-            Mandate.ParameterCondition(pageSize > 0, "pageSize");
-
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                // get query - if the id is System Root, then just get all
-                var query = Query<IContent>.Builder;
-                if (id != Constants.System.Root)
-                {
-                    var entityRepository = RepositoryFactory.CreateEntityRepository(uow);
-                    var contentPath = entityRepository.GetAllPaths(Constants.ObjectTypes.DocumentGuid, id).ToArray();
-                    if (contentPath.Length == 0)
-                    {
-                        totalChildren = 0;
-                        return Enumerable.Empty<IContent>();
-                    }
-                    query.Where(x => x.Path.SqlStartsWith(string.Format("{0},", contentPath[0].Path), TextColumnType.NVarchar));
-                }
-
-                return repository.GetPagedResultsByQuery(query, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, orderBySystemField, filter);
-            }
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects by its name or partial name
-        /// </summary>
-        /// <param name="parentId">Id of the Parent to retrieve Children from</param>
-        /// <param name="name">Full or partial name of the children</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetChildrenByName(int parentId, string name)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                var query = Query<IContent>.Builder.Where(x => x.ParentId == parentId && x.Name.Contains(name));
-                return repository.GetByQuery(query);
-            }
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
-        /// </summary>
-        /// <param name="id">Id of the Parent to retrieve Descendants from</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetDescendants(int id)
-        {
-            var content = GetById(id);
-            return content == null ? Enumerable.Empty<IContent>() : GetDescendants(content);
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
-        /// </summary>
-        /// <param name="content"><see cref="IContent"/> item to retrieve Descendants from</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetDescendants(IContent content)
-        {
-            //This is a check to ensure that the path is correct for this entity to avoid problems like: http://issues.umbraco.org/issue/U4-9336 due to data corruption
-            if (content.ValidatePath() == false)
-                throw new InvalidDataException(string.Format("The content item {0} has an invalid path: {1} with parentID: {2}", content.Id, content.Path, content.ParentId));
-
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                var pathMatch = content.Path + ",";
-                var query = Query<IContent>.Builder.Where(x => x.Path.StartsWith(pathMatch) && x.Id != content.Id);
-                return repository.GetByQuery(query);
-            }
-        }
-
-        /// <summary>
-        /// Gets the parent of the current content as an <see cref="IContent"/> item.
-        /// </summary>
-        /// <param name="id">Id of the <see cref="IContent"/> to retrieve the parent from</param>
-        /// <returns>Parent <see cref="IContent"/> object</returns>
-        public IContent GetParent(int id)
-        {
-            var content = GetById(id);
-            return GetParent(content);
-        }
-
-        /// <summary>
-        /// Gets the parent of the current content as an <see cref="IContent"/> item.
-        /// </summary>
-        /// <param name="content"><see cref="IContent"/> to retrieve the parent from</param>
-        /// <returns>Parent <see cref="IContent"/> object</returns>
-        public IContent GetParent(IContent content)
-        {
-            if (content.ParentId == Constants.System.Root || content.ParentId == Constants.System.RecycleBinContent)
-                return null;
-
-            return GetById(content.ParentId);
-        }
-
-        /// <summary>
-        /// Gets the published version of an <see cref="IContent"/> item
-        /// </summary>
-        /// <param name="id">Id of the <see cref="IContent"/> to retrieve version from</param>
-        /// <returns>An <see cref="IContent"/> item</returns>
-        public IContent GetPublishedVersion(int id)
-        {
-            var version = GetVersions(id);
-            return version.FirstOrDefault(x => x.Published);
-        }
-
-        /// <summary>
-        /// Gets the published version of a <see cref="IContent"/> item.
-        /// </summary>
-        /// <param name="content">The content item.</param>
-        /// <returns>The published version, if any; otherwise, null.</returns>
-        public IContent GetPublishedVersion(IContent content)
-        {
-            if (content.Published) return content;
-            return content.HasPublishedVersion
-                ? GetByVersion(content.PublishedVersionGuid)
-                : null;
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects, which reside at the first level / root
-        /// </summary>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetRootContent()
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                var query = Query<IContent>.Builder.Where(x => x.ParentId == Constants.System.Root);
-                return repository.GetByQuery(query);
-            }
-        }
-
-        /// <summary>
-        /// Gets all published content items
-        /// </summary>
-        /// <returns></returns>
-        internal IEnumerable<IContent> GetAllPublished()
-        {
-            //create it once if it is needed (no need for locking here)
-            if (_notTrashedQuery == null)
-            {
-                _notTrashedQuery = Query<IContent>.Builder.Where(x => x.Trashed == false);
-            }
-
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                return repository.GetByPublishedVersion(_notTrashedQuery);
-            }
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects, which has an expiration date less than or equal to today.
-        /// </summary>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetContentForExpiration()
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                var query = Query<IContent>.Builder.Where(x => x.ExpireDate <= DateTime.Now);
-                return repository.GetByQuery(query).Where(x => x.HasPublishedVersion);
-            }
-        }
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> objects, which has a release date less than or equal to today.
-        /// </summary>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetContentForRelease()
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                var query = Query<IContent>.Builder.Where(x => x.Published == false && x.ReleaseDate <= DateTime.Now);
-                return repository.GetByQuery(query);
-            }
-        }
-
-        /// <summary>
-        /// Gets a collection of an <see cref="IContent"/> objects, which resides in the Recycle Bin
-        /// </summary>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        public IEnumerable<IContent> GetContentInRecycleBin()
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                var query = Query<IContent>.Builder.Where(x => x.Path.StartsWith(Constants.System.RecycleBinContentPathPrefix));
-                return repository.GetByQuery(query);
-            }
-        }
-
-        /// <summary>
-        /// Checks whether an <see cref="IContent"/> item has any children
-        /// </summary>
-        /// <param name="id">Id of the <see cref="IContent"/></param>
-        /// <returns>True if the content has any children otherwise False</returns>
-        public bool HasChildren(int id)
-        {
-            return CountChildren(id) > 0;
-        }
-
-        internal int CountChildren(int id)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                var query = Query<IContent>.Builder.Where(x => x.ParentId == id);
-                return repository.Count(query);
-            }
-        }
-
-        /// <summary>
-        /// Checks whether an <see cref="IContent"/> item has any published versions
-        /// </summary>
-        /// <param name="id">Id of the <see cref="IContent"/></param>
-        /// <returns>True if the content has any published version otherwise False</returns>
-        public bool HasPublishedVersion(int id)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                var query = Query<IContent>.Builder.Where(x => x.Published == true && x.Id == id && x.Trashed == false);
-                return repository.Count(query) > 0;
-            }
-        }
-
-        /// <summary>
-        /// Checks if the passed in <see cref="IContent"/> can be published based on the anscestors publish state.
-        /// </summary>
-        /// <param name="content"><see cref="IContent"/> to check if anscestors are published</param>
-        /// <returns>True if the Content can be published, otherwise False</returns>
-        public bool IsPublishable(IContent content)
-        {
-            int[] ids;
-            if (content.HasIdentity)
-            {
-                // get ids from path (we have identity)
-                // skip the first one that has to be -1 - and we don't care
-                // skip the last one that has to be "this" - and it's ok to stop at the parent
-                ids = content.Path.Split(',').Skip(1).SkipLast().Select(int.Parse).ToArray();
-            }
-            else
-            {
-                // no path yet (no identity), have to move up to parent
-                // skip the first one that has to be -1 - and we don't care
-                // don't skip the last one that is "parent"
-                var parent = GetById(content.ParentId);
-                if (parent == null) return false;
-                ids = parent.Path.Split(',').Skip(1).Select(int.Parse).ToArray();
-            }
-            if (ids.Length == 0)
-                return false;
-
-            // if the first one is recycle bin, fail fast
-            if (ids[0] == Constants.System.RecycleBinContent)
-                return false;
-
-            // fixme - move to repository?
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var sql = new Sql(@"
-                    SELECT id
-                    FROM umbracoNode
-                    JOIN cmsDocument ON umbracoNode.id=cmsDocument.nodeId AND cmsDocument.published=@0
-                    WHERE umbracoNode.trashed=@1 AND umbracoNode.id IN (@2)",
-                    true, false, ids);
-                var x = uow.Database.Fetch<int>(sql);
-                return ids.Length == x.Count;
-            }
-        }
-
-        /// <summary>
-        /// This will rebuild the xml structures for content in the database.
-        /// </summary>
-        /// <param name="userId">This is not used for anything</param>
-        /// <returns>True if publishing succeeded, otherwise False</returns>
-        /// <remarks>
-        /// This is used for when a document type alias or a document type property is changed, the xml will need to
-        /// be regenerated.
-        /// </remarks>
-        public bool RePublishAll(int userId = 0)
-        {
-            try
-            {
-                RebuildXmlStructures();
-                return true;
-            }
-            catch (Exception ex)
-            {
-                Logger.Error<ContentService>("An error occurred executing RePublishAll", ex);
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// This will rebuild the xml structures for content in the database.
-        /// </summary>
-        /// <param name="contentTypeIds">
-        /// If specified will only rebuild the xml for the content type's specified, otherwise will update the structure
-        /// for all published content.
-        /// </param>
-        internal void RePublishAll(params int[] contentTypeIds)
-        {
-            try
-            {
-                RebuildXmlStructures(contentTypeIds);
-            }
-            catch (Exception ex)
-            {
-                Logger.Error<ContentService>("An error occurred executing RePublishAll", ex);
-            }
-        }
-
-        /// <summary>
-        /// Publishes a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to publish</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <returns>True if publishing succeeded, otherwise False</returns>
-        public bool Publish(IContent content, int userId = 0)
-        {
-            var result = SaveAndPublishDo(content, userId);
-            Logger.Info<ContentService>("Call was made to ContentService.Publish, use PublishWithStatus instead since that method will provide more detailed information on the outcome");
-            return result.Success;
-        }
-
-        /// <summary>
-        /// Publishes a <see cref="IContent"/> object and all its children
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to publish along with its children</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <param name="includeUnpublished"></param>
-        /// <returns>The list of statuses for all published items</returns>
-        IEnumerable<Attempt<PublishStatus>> IContentServiceOperations.PublishWithChildren(IContent content, int userId, bool includeUnpublished)
-        {
-            return PublishWithChildrenDo(content, userId, includeUnpublished);
-        }
-
-        /// <summary>
-        /// Saves and Publishes a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to save and publish</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise save events.</param>
-        /// <returns>True if publishing succeeded, otherwise False</returns>
-        Attempt<PublishStatus> IContentServiceOperations.SaveAndPublish(IContent content, int userId, bool raiseEvents)
-        {
-            return SaveAndPublishDo(content, userId, raiseEvents);
-        }
-
-        /// <summary>
-        /// Deletes an <see cref="IContent"/> object by moving it to the Recycle Bin
-        /// </summary>
-        /// <remarks>Move an item to the Recycle Bin will result in the item being unpublished</remarks>
-        /// <param name="content">The <see cref="IContent"/> to delete</param>
-        /// <param name="userId">Optional Id of the User deleting the Content</param>
-        Attempt<OperationStatus> IContentServiceOperations.MoveToRecycleBin(IContent content, int userId)
-        {
-            return MoveToRecycleBinDo(content, userId, false);
-        }
-
-        /// <summary>
-        /// Deletes an <see cref="IContent"/> object by moving it to the Recycle Bin
-        /// </summary>
-        /// <remarks>Move an item to the Recycle Bin will result in the item being unpublished</remarks>
-        /// <param name="content">The <see cref="IContent"/> to delete</param>
-        /// <param name="userId">Optional Id of the User deleting the Content</param>
-        /// <param name="ignoreDescendants">
-        /// A boolean indicating to ignore this item's descendant list from also being moved to the recycle bin. This is required for the DeleteContentOfTypes method
-        /// because it has already looked up all descendant nodes that will need to be recycled
-        /// TODO: Fix all of this, it will require a reasonable refactor and most of this stuff should be done at the repo level instead of service sub operations
-        /// </param>
-        private Attempt<OperationStatus> MoveToRecycleBinDo(IContent content, int userId, bool ignoreDescendants)
-        {
-            var evtMsgs = EventMessagesFactory.Get();
-            using (new WriteLock(Locker))
-            {
-                using (var uow = UowProvider.GetUnitOfWork())
-                {
-                    //Hack: this ensures that the entity's path is valid and if not it fixes/persists it
-                    //see: http://issues.umbraco.org/issue/U4-9336
-                    content.EnsureValidPath(Logger, entity => GetById(entity.ParentId), QuickUpdate);
-                    var originalPath = content.Path;
-                    var moveEventInfo = new MoveEventInfo<IContent>(content, originalPath, Constants.System.RecycleBinContent);
-                    var moveEventArgs = new MoveEventArgs<IContent>(evtMsgs, moveEventInfo);
-                    if (uow.Events.DispatchCancelable(Trashing, this, moveEventArgs, "Trashing"))
-                    {
-                        uow.Commit();
-                        return OperationStatus.Cancelled(evtMsgs);
-                    }
-                    var moveInfo = new List<MoveEventInfo<IContent>>
-                    {
-                        moveEventInfo
-                    };
-
-                    //get descendents to process of the content item that is being moved to trash - must be done before changing the state below
-                    //must be processed with shallowest levels first
-                    var descendants = ignoreDescendants ? Enumerable.Empty<IContent>() : GetDescendants(content).OrderBy(x => x.Level);
-
-                    //Do the updates for this item
-                    var repository = RepositoryFactory.CreateContentRepository(uow);
-                    //Make sure that published content is unpublished before being moved to the Recycle Bin
-                    if (HasPublishedVersion(content.Id))
-                    {
-                        //TODO: this shouldn't be a 'sub operation', and if it needs to be it cannot raise events and cannot be cancelled!
-                        UnPublish(content, userId);
-                    }
-                    content.WriterId = userId;
-                    content.ChangeTrashedState(true);
-                    repository.AddOrUpdate(content);
-
-                    //Loop through descendants to update their trash state, but ensuring structure by keeping the ParentId
-                    foreach (var descendant in descendants)
-                    {
-                        //TODO: this shouldn't be a 'sub operation', and if it needs to be it cannot raise events and cannot be cancelled!
-                        UnPublish(descendant, userId);
-                        descendant.WriterId = userId;
-                        descendant.ChangeTrashedState(true, descendant.ParentId);
-                        repository.AddOrUpdate(descendant);
-
-                        moveInfo.Add(new MoveEventInfo<IContent>(descendant, descendant.Path, descendant.ParentId));
-                    }
-
-                    moveEventArgs.CanCancel = false;
-                    moveEventArgs.MoveInfoCollection = moveInfo;
-                    uow.Events.Dispatch(Trashed, this, moveEventArgs, "Trashed");
-
-                    Audit(uow, AuditType.Move, "Move Content to Recycle Bin performed by user", userId, content.Id);
-                    uow.Commit();
-                }
-
-                return OperationStatus.Success(evtMsgs);
-            }
-        }
-
-        /// <summary>
-        /// UnPublishes a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to publish</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <returns>True if unpublishing succeeded, otherwise False</returns>
-        Attempt<UnPublishStatus> IContentServiceOperations.UnPublish(IContent content, int userId)
-        {
-            return UnPublishDo(content, false, userId);
-        }
-
-        /// <summary>
-        /// Publishes a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to publish</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <returns>True if publishing succeeded, otherwise False</returns>
-        public Attempt<PublishStatus> PublishWithStatus(IContent content, int userId = 0)
-        {
-            return ((IContentServiceOperations)this).Publish(content, userId);
-        }
-
-        /// <summary>
-        /// Publishes a <see cref="IContent"/> object and all its children
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to publish along with its children</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <returns>True if publishing succeeded, otherwise False</returns>
-        [Obsolete("Use PublishWithChildrenWithStatus instead, that method will provide more detailed information on the outcome and also allows the includeUnpublished flag")]
-        public bool PublishWithChildren(IContent content, int userId = 0)
-        {
-            var result = PublishWithChildrenDo(content, userId, true);
-
-            //This used to just return false only when the parent content failed, otherwise would always return true so we'll
-            // do the same thing for the moment
-            if (result.All(x => x.Result.ContentItem.Id != content.Id))
-                return false;
-
-            return result.Single(x => x.Result.ContentItem.Id == content.Id).Success;
-        }
-
-        /// <summary>
-        /// Publishes a <see cref="IContent"/> object and all its children
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to publish along with its children</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <param name="includeUnpublished">set to true if you want to also publish children that are currently unpublished</param>
-        /// <returns>True if publishing succeeded, otherwise False</returns>
-        public IEnumerable<Attempt<PublishStatus>> PublishWithChildrenWithStatus(IContent content, int userId = 0, bool includeUnpublished = false)
-        {
-            return ((IContentServiceOperations)this).PublishWithChildren(content, userId, includeUnpublished);
-        }
-
-        /// <summary>
-        /// UnPublishes a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to publish</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <returns>True if unpublishing succeeded, otherwise False</returns>
-        public bool UnPublish(IContent content, int userId = 0)
-        {
-            var attempt = ((IContentServiceOperations)this).UnPublish(content, userId);
-            LogHelper.Debug<ContentService>(string.Format("Result of unpublish attempt: {0}", attempt.Result.StatusType));
-            return attempt.Success;
-        }
-
-        /// <summary>
-        /// Saves and Publishes a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to save and publish</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise save events.</param>
-        /// <returns>True if publishing succeeded, otherwise False</returns>
-        [Obsolete("Use SaveAndPublishWithStatus instead, that method will provide more detailed information on the outcome")]
-        public bool SaveAndPublish(IContent content, int userId = 0, bool raiseEvents = true)
-        {
-            var result = SaveAndPublishDo(content, userId, raiseEvents);
-            return result.Success;
-        }
-
-        /// <summary>
-        /// Saves and Publishes a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to save and publish</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise save events.</param>
-        /// <returns>True if publishing succeeded, otherwise False</returns>
-        public Attempt<PublishStatus> SaveAndPublishWithStatus(IContent content, int userId = 0, bool raiseEvents = true)
-        {
-            return ((IContentServiceOperations)this).SaveAndPublish(content, userId, raiseEvents);
-        }
-
-        public IContent GetBlueprintById(int id)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentBlueprintRepository(uow);
-                var blueprint = repository.Get(id);
-                if (blueprint != null)
-                    ((Content) blueprint).IsBlueprint = true;
-                return blueprint;
-            }
-        }
-
-        public IContent GetBlueprintById(Guid id)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentBlueprintRepository(uow);
-                var blueprint = repository.Get(id);
-                if (blueprint != null)
-                    ((Content)blueprint).IsBlueprint = true;
-                return blueprint;
-            }
-        }
-
-        public void SaveBlueprint(IContent content, int userId = 0)
-        {
-            //always ensure the blueprint is at the root
-            if (content.ParentId != -1)
-                content.ParentId = -1;
-
-            ((Content) content).IsBlueprint = true;
-
-            using (new WriteLock(Locker))
-            {
-                using (var uow = UowProvider.GetUnitOfWork())
-                {
-                    if (string.IsNullOrWhiteSpace(content.Name))
-                    {
-                        throw new ArgumentException("Cannot save content blueprint with empty name.");
-                    }
-
-                    var repository = RepositoryFactory.CreateContentBlueprintRepository(uow);
-
-                    if (content.HasIdentity == false)
-                    {
-                        content.CreatorId = userId;
-                    }
-                    content.WriterId = userId;
-
-                    repository.AddOrUpdate(content);
-
-                    uow.Events.Dispatch(SavedBlueprint, this, new SaveEventArgs<IContent>(content), "SavedBlueprint");
-
-                    uow.Commit();
-                }
-            }
-        }
-
-        public void DeleteBlueprint(IContent content, int userId = 0)
-        {
-            using (new WriteLock(Locker))
-            {
-                using (var uow = UowProvider.GetUnitOfWork())
-                {
-                    var repository = RepositoryFactory.CreateContentBlueprintRepository(uow);
-                    repository.Delete(content);
-                    uow.Events.Dispatch(DeletedBlueprint, this, new DeleteEventArgs<IContent>(content), "DeletedBlueprint");
-                    uow.Commit();
-                }
-            }
-        }
-
-        public IContent CreateContentFromBlueprint(IContent blueprint, string name, int userId = 0)
-        {
-            if (blueprint == null) throw new ArgumentNullException("blueprint");
-
-            var contentType = blueprint.ContentType;
-            var content = new Content(name, -1, contentType);
-            content.Path = string.Concat(content.ParentId.ToString(), ",", content.Id);
-
-            content.CreatorId = userId;
-            content.WriterId = userId;
-
-            foreach (var property in blueprint.Properties)
-                content.SetValue(property.Alias, property.Value);
-
-            return content;
-        }
-
-        public void DeleteBlueprintsOfTypes(IEnumerable<int> contentTypeIds, int userId = 0)
-        {
-            using (new WriteLock(Locker))
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var repository = RepositoryFactory.CreateContentBlueprintRepository(uow);
-
-                var contentTypeIdsA = contentTypeIds.ToArray();
-                var query = new Query<IContent>();
-                if (contentTypeIdsA.Length > 0)
-                {
-                    query.Where(x => contentTypeIdsA.Contains(x.ContentTypeId));
-                }
-                var blueprints = repository.GetByQuery(query).Select(x =>
-                {
-                    ((Content) x).IsBlueprint = true;
-                    return x;
-                }).ToArray();
-
-                foreach (var blueprint in blueprints)
-                {
-                    repository.Delete(blueprint);
-                }
-
-                uow.Events.Dispatch(DeletedBlueprint, this, new DeleteEventArgs<IContent>(blueprints), "DeletedBlueprint");
-                uow.Commit();
-            }
-        }
-
-        public void DeleteBlueprintsOfType(int contentTypeId, int userId = 0)
-        {
-            DeleteBlueprintsOfTypes(new[] {contentTypeId}, userId);
-        }
-
-        /// <summary>
-        /// Saves a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to save</param>
-        /// <param name="userId">Optional Id of the User saving the Content</param>
-        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
-        public void Save(IContent content, int userId = 0, bool raiseEvents = true)
-        {
-            ((IContentServiceOperations)this).Save(content, userId, raiseEvents);
-        }
-
-        /// <summary>
-        /// Saves a collection of <see cref="IContent"/> objects.
-        /// </summary>
-        /// <param name="contents">Collection of <see cref="IContent"/> to save</param>
-        /// <param name="userId">Optional Id of the User saving the Content</param>
-        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
-        Attempt<OperationStatus> IContentServiceOperations.Save(IEnumerable<IContent> contents, int userId, bool raiseEvents)
-        {
-            var asArray = contents.ToArray();
-
-            var evtMsgs = EventMessagesFactory.Get();
-
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var saveEventArgs = new SaveEventArgs<IContent>(asArray, evtMsgs);
-                if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
-                {
-                    uow.Commit();
-                    return OperationStatus.Cancelled(evtMsgs);
-                }
-
-                // todo - understand what's a lock in a scope?
-                // (though, these locks are refactored in v8)
-                using (new WriteLock(Locker))
-                {
-                    var containsNew = asArray.Any(x => x.HasIdentity == false);
-                    var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                    if (containsNew)
-                    {
-                        foreach (var content in asArray)
-                        {
-                            content.WriterId = userId;
-
-                            //Only change the publish state if the "previous" version was actually published
-                            if (content.Published)
-                                content.ChangePublishedState(PublishedState.Saved);
-
-                            repository.AddOrUpdate(content);
-                            //add or update preview
-                            repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-                        }
-                    }
-                    else
-                    {
-                        foreach (var content in asArray)
-                        {
-                            content.WriterId = userId;
-                            repository.AddOrUpdate(content);
-                            //add or update preview
-                            repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-                        }
-                    }
-                }
-
-                if (raiseEvents)
-                {
-                    saveEventArgs.CanCancel = false;
-                    uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
-                }
-
-                Audit(uow, AuditType.Save, "Bulk Save content performed by user", userId == -1 ? 0 : userId, Constants.System.Root);
-                uow.Commit();
-
-                return OperationStatus.Success(evtMsgs);
-            }
-        }
-
-        /// <summary>
-        /// Permanently deletes an <see cref="IContent"/> object.
-        /// </summary>
-        /// <remarks>
-        /// This method will also delete associated media files, child content and possibly associated domains.
-        /// </remarks>
-        /// <remarks>Please note that this method will completely remove the Content from the database</remarks>
-        /// <param name="content">The <see cref="IContent"/> to delete</param>
-        /// <param name="userId">Optional Id of the User deleting the Content</param>
-        Attempt<OperationStatus> IContentServiceOperations.Delete(IContent content, int userId)
-        {
-            var evtMsgs = EventMessagesFactory.Get();
-
-            using (new WriteLock(Locker))
-            {
-                using (var uow = UowProvider.GetUnitOfWork())
-                {
-                    var deleteEventArgs = new DeleteEventArgs<IContent>(content, evtMsgs);
-                    if (uow.Events.DispatchCancelable(Deleting, this, deleteEventArgs, "Deleting"))
-                    {
-                        uow.Commit();
-                        return OperationStatus.Cancelled(evtMsgs);
-                    }
-
-                    //Make sure that published content is unpublished before being deleted
-                    if (HasPublishedVersion(content.Id))
-                    {
-                        UnPublish(content, userId);
-                    }
-
-                    //Delete children before deleting the 'possible parent'
-                    var children = GetChildren(content.Id);
-                    foreach (var child in children)
-                    {
-                        Delete(child, userId);
-                    }
-
-                    var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                    repository.Delete(content);
-
-                    deleteEventArgs.CanCancel = false;
-                    uow.Events.Dispatch(Deleted, this, deleteEventArgs, "Deleted");
-
-                    Audit(uow, AuditType.Delete, "Delete Content performed by user", userId, content.Id);
-                    uow.Commit();
-                }
-
-                return OperationStatus.Success(evtMsgs);
-            }
-        }
-
-        /// <summary>
-        /// Publishes a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to publish</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <returns>The published status attempt</returns>
-        Attempt<PublishStatus> IContentServiceOperations.Publish(IContent content, int userId)
-        {
-            return SaveAndPublishDo(content, userId);
-        }
-
-        /// <summary>
-        /// Saves a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to save</param>
-        /// <param name="userId">Optional Id of the User saving the Content</param>
-        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
-        Attempt<OperationStatus> IContentServiceOperations.Save(IContent content, int userId, bool raiseEvents)
-        {
-            return Save(content, true, userId, raiseEvents);
-        }
-
-        /// <summary>
-        /// Saves a collection of <see cref="IContent"/> objects.
-        /// </summary>
-        /// <remarks>
-        /// If the collection of content contains new objects that references eachother by Id or ParentId,
-        /// then use the overload Save method with a collection of Lazy <see cref="IContent"/>.
-        /// </remarks>
-        /// <param name="contents">Collection of <see cref="IContent"/> to save</param>
-        /// <param name="userId">Optional Id of the User saving the Content</param>
-        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
-        public void Save(IEnumerable<IContent> contents, int userId = 0, bool raiseEvents = true)
-        {
-            ((IContentServiceOperations)this).Save(contents, userId, raiseEvents);
-        }
-
-        /// <summary>
-        /// Deletes all content of the specified types. All Descendants of deleted content that is not of these types is moved to Recycle Bin.
-        /// </summary>
-        /// <param name="contentTypeIds">Id of the <see cref="IContentType"/></param>
-        /// <param name="userId">Optional Id of the user issueing the delete operation</param>
-        public void DeleteContentOfTypes(IEnumerable<int> contentTypeIds, int userId = 0)
-        {
-            using (new WriteLock(Locker))
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                //track the 'root' items of the collection of nodes discovered to delete, we need to use
-                //these items to lookup descendants that are not of this doc type so they can be transfered
-                //to the recycle bin
-                IDictionary<string, IContent> rootItems;
-                var contentToDelete = this.TrackDeletionsForDeleteContentOfTypes(contentTypeIds, repository, out rootItems).ToArray();
-
-                if (uow.Events.DispatchCancelable(Deleting, this, new DeleteEventArgs<IContent>(contentToDelete), "Deleting"))
-                {
-                    uow.Commit();
-                    return;
-                }
-
-                //Determine the items that will need to be recycled (that are children of these content items but not of these content types)
-                var contentToRecycle = this.TrackTrashedForDeleteContentOfTypes(contentTypeIds, rootItems, repository);
-
-                //move each item to the bin starting with the deepest items
-                foreach (var child in contentToRecycle.OrderByDescending(x => x.Level))
-                {
-                    MoveToRecycleBinDo(child, userId, true);
-                }
-
-                foreach (var content in contentToDelete)
-                {
-                    Delete(content, userId);
-                }
-
-                Audit(uow, AuditType.Delete,
-                    string.Format("Delete Content of Types {0} performed by user", string.Join(",", contentTypeIds)),
-                    userId, Constants.System.Root);
-                uow.Commit();
-            }
-        }
-
-        /// <summary>
-        /// Deletes all content of specified type. All children of deleted content is moved to Recycle Bin.
-        /// </summary>
-        /// <remarks>This needs extra care and attention as its potentially a dangerous and extensive operation</remarks>
-        /// <param name="contentTypeId">Id of the <see cref="IContentType"/></param>
-        /// <param name="userId">Optional Id of the user issueing the delete operation</param>
-        public void DeleteContentOfType(int contentTypeId, int userId = 0)
-        {
-            DeleteContentOfTypes(new[] {contentTypeId}, userId);
-        }
-
-        /// <summary>
-        /// Permanently deletes an <see cref="IContent"/> object as well as all of its Children.
-        /// </summary>
-        /// <remarks>
-        /// This method will also delete associated media files, child content and possibly associated domains.
-        /// </remarks>
-        /// <remarks>Please note that this method will completely remove the Content from the database</remarks>
-        /// <param name="content">The <see cref="IContent"/> to delete</param>
-        /// <param name="userId">Optional Id of the User deleting the Content</param>
-        public void Delete(IContent content, int userId = 0)
-        {
-            ((IContentServiceOperations)this).Delete(content, userId);
-        }
-
-        /// <summary>
-        /// Permanently deletes versions from an <see cref="IContent"/> object prior to a specific date.
-        /// This method will never delete the latest version of a content item.
-        /// </summary>
-        /// <param name="id">Id of the <see cref="IContent"/> object to delete versions from</param>
-        /// <param name="versionDate">Latest version date</param>
-        /// <param name="userId">Optional Id of the User deleting versions of a Content object</param>
-        public void DeleteVersions(int id, DateTime versionDate, int userId = 0)
-        {
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var deleteRevisionsEventArgs = new DeleteRevisionsEventArgs(id, dateToRetain: versionDate);
-                if (uow.Events.DispatchCancelable(DeletingVersions, this, deleteRevisionsEventArgs, "DeletingVersions"))
-                {
-                    uow.Commit();
-                    return;
-                }
-
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                repository.DeleteVersions(id, versionDate);
-                deleteRevisionsEventArgs.CanCancel = false;
-                uow.Events.Dispatch(DeletedVersions, this, deleteRevisionsEventArgs, "DeletedVersions");
-
-                Audit(uow, AuditType.Delete, "Delete Content by version date performed by user", userId, Constants.System.Root);
-                uow.Commit();
-            }
-        }
-
-        /// <summary>
-        /// Permanently deletes specific version(s) from an <see cref="IContent"/> object.
-        /// This method will never delete the latest version of a content item.
-        /// </summary>
-        /// <param name="id">Id of the <see cref="IContent"/> object to delete a version from</param>
-        /// <param name="versionId">Id of the version to delete</param>
-        /// <param name="deletePriorVersions">Boolean indicating whether to delete versions prior to the versionId</param>
-        /// <param name="userId">Optional Id of the User deleting versions of a Content object</param>
-        public void DeleteVersion(int id, Guid versionId, bool deletePriorVersions, int userId = 0)
-        {
-            using (new WriteLock(Locker))
-            {
-                using (var uow = UowProvider.GetUnitOfWork())
-                {
-                    if (uow.Events.DispatchCancelable(DeletingVersions, this, new DeleteRevisionsEventArgs(id, specificVersion: versionId), "DeletingVersions"))
-                    {
-                        uow.Commit();
-                        return;
-                    }
-
-                    if (deletePriorVersions)
-                    {
-                        var content = GetByVersion(versionId);
-                        DeleteVersions(id, content.UpdateDate, userId);
-                    }
-
-                    var repository = RepositoryFactory.CreateContentRepository(uow);
-                    repository.DeleteVersion(versionId);
-
-                    uow.Events.Dispatch(DeletedVersions, this, new DeleteRevisionsEventArgs(id, false, specificVersion: versionId), "DeletedVersions");
-
-                    Audit(uow, AuditType.Delete, "Delete Content by version performed by user", userId, Constants.System.Root);
-                    uow.Commit();
-                }
-            }
-        }
-
-        /// <summary>
-        /// Deletes an <see cref="IContent"/> object by moving it to the Recycle Bin
-        /// </summary>
-        /// <remarks>Move an item to the Recycle Bin will result in the item being unpublished</remarks>
-        /// <param name="content">The <see cref="IContent"/> to delete</param>
-        /// <param name="userId">Optional Id of the User deleting the Content</param>
-        public void MoveToRecycleBin(IContent content, int userId = 0)
-        {
-            ((IContentServiceOperations)this).MoveToRecycleBin(content, userId);
-        }
-
-        /// <summary>
-        /// Moves an <see cref="IContent"/> object to a new location by changing its parent id.
-        /// </summary>
-        /// <remarks>
-        /// If the <see cref="IContent"/> object is already published it will be
-        /// published after being moved to its new location. Otherwise it'll just
-        /// be saved with a new parent id.
-        /// </remarks>
-        /// <param name="content">The <see cref="IContent"/> to move</param>
-        /// <param name="parentId">Id of the Content's new Parent</param>
-        /// <param name="userId">Optional Id of the User moving the Content</param>
-        public void Move(IContent content, int parentId, int userId = 0)
-        {
-            using (new WriteLock(Locker))
-            {
-                //This ensures that the correct method is called if this method is used to Move to recycle bin.
-                if (parentId == Constants.System.RecycleBinContent)
-                {
-                    MoveToRecycleBin(content, userId);
-                    return;
-                }
-
-                using (var uow = UowProvider.GetUnitOfWork())
-                {
-                    var moveEventInfo = new MoveEventInfo<IContent>(content, content.Path, parentId);
-                    var moveEventArgs = new MoveEventArgs<IContent>(moveEventInfo);
-                    if (uow.Events.DispatchCancelable(Moving, this, moveEventArgs, "Moving"))
-                    {
-                        uow.Commit();
-                        return;
-                    }
-
-                    //used to track all the moved entities to be given to the event
-                    var moveInfo = new List<MoveEventInfo<IContent>>();
-
-                    //call private method that does the recursive moving
-                    PerformMove(content, parentId, userId, moveInfo);
-
-                    moveEventArgs.MoveInfoCollection = moveInfo;
-                    moveEventArgs.CanCancel = false;
-                    uow.Events.Dispatch(Moved, this, moveEventArgs, "Moved");
-
-                    Audit(uow, AuditType.Move, "Move Content performed by user", userId, content.Id);
-                    uow.Commit();
-                }
-            }
-        }
-
-        /// <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")]
-        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))
-            {
-                var nodeObjectType = Constants.ObjectTypes.DocumentGuid;
-
-                using (var uow = UowProvider.GetUnitOfWork())
-                {
-                    var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                    //Create a dictionary of ids -> dictionary of property aliases + values
-                    var entities = repository.GetEntitiesInRecycleBin()
-                        .ToDictionary(
-                            key => key.Id,
-                            val => (IEnumerable<Property>)val.Properties);
-
-                    var files = ((ContentRepository)repository).GetFilesInRecycleBinForUploadField();
-
-                    var recycleBinEventArgs = new RecycleBinEventArgs(nodeObjectType, entities, files);
-                    if (uow.Events.DispatchCancelable(EmptyingRecycleBin, this, recycleBinEventArgs))
-                    {
-                        uow.Commit();
-                        return;
-                    }
-
-                    var success = repository.EmptyRecycleBin();
-                    recycleBinEventArgs.CanCancel = false;
-                    recycleBinEventArgs.RecycleBinEmptiedSuccessfully = success;
-                    uow.Events.Dispatch(EmptiedRecycleBin, this, recycleBinEventArgs);
-
-                    Audit(uow, AuditType.Delete, "Empty Content Recycle Bin performed by user", userId, Constants.System.RecycleBinContent);
-                    uow.Commit();
-                }
-            }
-        }
-
-        /// <summary>
-        /// Copies an <see cref="IContent"/> object by creating a new Content object of the same type and copies all data from the current
-        /// to the new copy which is returned. Recursively copies all children.
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to copy</param>
-        /// <param name="parentId">Id of the Content's new Parent</param>
-        /// <param name="relateToOriginal">Boolean indicating whether the copy should be related to the original</param>
-        /// <param name="userId">Optional Id of the User copying the Content</param>
-        /// <returns>The newly created <see cref="IContent"/> object</returns>
-        public IContent Copy(IContent content, int parentId, bool relateToOriginal, int userId = 0)
-        {
-            return Copy(content, parentId, relateToOriginal, true, userId);
-        }
-
-        /// <summary>
-        /// Copies an <see cref="IContent"/> object by creating a new Content object of the same type and copies all data from the current
-        /// to the new copy which is returned.
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to copy</param>
-        /// <param name="parentId">Id of the Content's new Parent</param>
-        /// <param name="relateToOriginal">Boolean indicating whether the copy should be related to the original</param>
-        /// <param name="recursive">A value indicating whether to recursively copy children.</param>
-        /// <param name="userId">Optional Id of the User copying the Content</param>
-        /// <returns>The newly created <see cref="IContent"/> object</returns>
-        public IContent Copy(IContent content, int parentId, bool relateToOriginal, bool recursive, int userId = 0)
-        {
-            //TODO: This all needs to be managed correctly so that the logic is submitted in one
-            // transaction, the CRUD needs to be moved to the repo
-
-            using (new WriteLock(Locker))
-            {
-                var copy = content.DeepCloneWithResetIdentities();
-                copy.ParentId = parentId;
-
-                // A copy should never be set to published automatically even if the original was.
-                copy.ChangePublishedState(PublishedState.Unpublished);
-
-                using (var uow = UowProvider.GetUnitOfWork())
-                {
-                    var copyEventArgs = new CopyEventArgs<IContent>(content, copy, true, parentId, relateToOriginal);
-                    if (uow.Events.DispatchCancelable(Copying, this, copyEventArgs))
-                    {
-                        uow.Commit();
-                        return null;
-                    }
-
-                    var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                    // Update the create author and last edit author
-                    copy.CreatorId = userId;
-                    copy.WriterId = userId;
-
-                    //get the current permissions, if there are any explicit ones they need to be copied
-                    var currentPermissions = GetPermissionsForEntity(content);
-                    currentPermissions.RemoveWhere(p => p.IsDefaultPermissions);
-
-                    repository.AddOrUpdate(copy);
-                    repository.AddOrUpdatePreviewXml(copy, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-
-                    //add permissions
-                    if (currentPermissions.Count > 0)
-                    {
-                        var permissionSet = new ContentPermissionSet(copy, currentPermissions);
-                        repository.AddOrUpdatePermissions(permissionSet);
-                    }
-
-                    uow.Commit(); // todo - this should flush, not commit
-
-                    //Special case for the associated tags
-                    //TODO: Move this to the repository layer in a single transaction!
-                    //don't copy tags data in tags table if the item is in the recycle bin
-                    if (parentId != Constants.System.RecycleBinContent)
-                    {
-                        var tags = uow.Database.Fetch<TagRelationshipDto>("WHERE nodeId = @Id", new { Id = content.Id });
-                        foreach (var tag in tags)
-                            uow.Database.Insert(new TagRelationshipDto
-                            {
-                                NodeId = copy.Id, TagId = tag.TagId, PropertyTypeId = tag.PropertyTypeId
-                            });
-                    }
-                    uow.Commit(); // todo - this should flush, not commit
-
-                    if (recursive)
-                    {
-                        //Look for children and copy those as well
-                        var children = GetChildren(content.Id);
-                        foreach (var child in children)
-                        {
-                            //TODO: This shouldn't recurse back to this method, it should be done in a private method
-                            // that doesn't have a nested lock and so we can perform the entire operation in one commit.
-                            Copy(child, copy.Id, relateToOriginal, true, userId);
-                        }
-                    }
-                    copyEventArgs.CanCancel = false;
-                    uow.Events.Dispatch(Copied, this, copyEventArgs);
-                    Audit(uow, AuditType.Copy, "Copy Content performed by user", userId, content.Id);
-                    uow.Commit();
-                }
-
-                return copy;
-            }
-        }
-
-
-        /// <summary>
-        /// Sends an <see cref="IContent"/> to Publication, which executes handlers and events for the 'Send to Publication' action.
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to send to publication</param>
-        /// <param name="userId">Optional Id of the User issueing the send to publication</param>
-        /// <returns>True if sending publication was succesfull otherwise false</returns>
-        public bool SendToPublication(IContent content, int userId = 0)
-        {
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var sendToPublishEventArgs = new SendToPublishEventArgs<IContent>(content);
-                if (uow.Events.DispatchCancelable(SendingToPublish, this, sendToPublishEventArgs))
-                {
-                    uow.Commit();
-                    return false;
-                }
-
-                //Save before raising event
-                Save(content, userId);
-                sendToPublishEventArgs.CanCancel = false;
-                uow.Events.Dispatch(SentToPublish, this, sendToPublishEventArgs);
-
-                Audit(uow, AuditType.SendToPublish, "Send to Publish performed by user", content.WriterId, content.Id);
-                uow.Commit();
-
-                return true;
-            }
-        }
-
-        /// <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.
-        /// </summary>
-        /// <remarks>
-        /// The way data is stored actually only allows us to rollback on properties
-        /// and not data like Name and Alias of the Content.
-        /// </remarks>
-        /// <param name="id">Id of the <see cref="IContent"/>being rolled back</param>
-        /// <param name="versionId">Id of the version to rollback to</param>
-        /// <param name="userId">Optional Id of the User issueing the rollback of the Content</param>
-        /// <returns>The newly created <see cref="IContent"/> object</returns>
-        public IContent Rollback(int id, Guid versionId, int userId = 0)
-        {
-            var content = GetByVersion(versionId);
-
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var rollbackEventArgs = new RollbackEventArgs<IContent>(content);
-                if (uow.Events.DispatchCancelable(RollingBack, this, rollbackEventArgs))
-                {
-                    uow.Commit();
-                    return content;
-                }
-
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                content.WriterId = userId;
-                content.CreatorId = userId;
-                content.ChangePublishedState(PublishedState.Unpublished);
-
-                repository.AddOrUpdate(content);
-                repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-                rollbackEventArgs.CanCancel = false;
-                uow.Events.Dispatch(RolledBack, this, rollbackEventArgs);
-
-                Audit(uow, AuditType.RollBack, "Content rollback performed by user", content.WriterId, content.Id);
-                uow.Commit();
-            }
-
-            return content;
-        }
-
-        /// <summary>
-        /// Sorts a collection of <see cref="IContent"/> objects by updating the SortOrder according
-        /// to the ordering of items in the passed in <see cref="IEnumerable{T}"/>.
-        /// </summary>
-        /// <remarks>
-        /// Using this method will ensure that the Published-state is maintained upon sorting
-        /// so the cache is updated accordingly - as needed.
-        /// </remarks>
-        /// <param name="items"></param>
-        /// <param name="userId"></param>
-        /// <param name="raiseEvents"></param>
-        /// <returns>True if sorting succeeded, otherwise False</returns>
-        public bool Sort(IEnumerable<IContent> items, int userId = 0, bool raiseEvents = true)
-        {
-            var shouldBePublished = new List<IContent>();
-            var shouldBeSaved = new List<IContent>();
-
-            using (new WriteLock(Locker))
-            {
-                using (var uow = UowProvider.GetUnitOfWork())
-                {
-                    var asArray = items.ToArray();
-                    var saveEventArgs = new SaveEventArgs<IContent>(asArray);
-                    if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
-                    {
-                        uow.Commit();
-                        return false;
-                    }
-
-                    var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                    var i = 0;
-                    foreach (var content in asArray)
-                    {
-                        //If the current sort order equals that of the content
-                        //we don't need to update it, so just increment the sort order
-                        //and continue.
-                        if (content.SortOrder == i)
-                        {
-                            i++;
-                            continue;
-                        }
-
-                        content.SortOrder = i;
-                        content.WriterId = userId;
-                        i++;
-
-                        if (content.Published)
-                        {
-                            //TODO: This should not be an inner operation, but if we do this, it cannot raise events and cannot be cancellable!
-                            var published = _publishingStrategy.Publish(uow, content, userId).Success;
-                            shouldBePublished.Add(content);
-                        }
-                        else
-                            shouldBeSaved.Add(content);
-
-                        repository.AddOrUpdate(content);
-                        //add or update a preview
-                        repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-                    }
-
-                    foreach (var content in shouldBePublished)
-                    {
-                        //Create and Save ContentXml DTO
-                        repository.AddOrUpdateContentXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-                    }
-
-                    if (raiseEvents)
-                    {
-                        saveEventArgs.CanCancel = false;
-                        uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
-                    }
-
-                    if (shouldBePublished.Any())
-                    {
-                        //TODO: This should not be an inner operation, but if we do this, it cannot raise events and cannot be cancellable!
-                        _publishingStrategy.PublishingFinalized(uow, shouldBePublished, false);
-                    }
-
-                    Audit(uow, AuditType.Sort, "Sorting content performed by user", userId, 0);
-                    uow.Commit();
-                }
-            }
-
-            return true;
-        }
-
-        /// <summary>
-        /// Sorts a collection of <see cref="IContent"/> objects by updating the SortOrder according
-        /// to the ordering of node Ids passed in.
-        /// </summary>
-        /// <remarks>
-        /// Using this method will ensure that the Published-state is maintained upon sorting
-        /// so the cache is updated accordingly - as needed.
-        /// </remarks>
-        /// <param name="ids"></param>
-        /// <param name="userId"></param>
-        /// <param name="raiseEvents"></param>
-        /// <returns>True if sorting succeeded, otherwise False</returns>
-        public bool Sort(int[] ids, int userId = 0, bool raiseEvents = true)
-        {
-            var shouldBePublished = new List<IContent>();
-            var shouldBeSaved = new List<IContent>();
-
-            using (new WriteLock(Locker))
-            {
-                var allContent = GetByIds(ids).ToDictionary(x => x.Id, x => x);
-                if (allContent.Any() == false)
-                {
-                    return false;
-                }
-                var items = ids.Select(x => allContent[x]).ToArray();
-
-                using (var uow = UowProvider.GetUnitOfWork())
-                {
-                    var saveEventArgs = new SaveEventArgs<IContent>(items);
-                    if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
-                    {
-                        uow.Commit();
-                        return false;
-                    }
-
-                    var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                    var i = 0;
-                    foreach (var content in items)
-                    {
-                        //If the current sort order equals that of the content
-                        //we don't need to update it, so just increment the sort order
-                        //and continue.
-                        if (content.SortOrder == i)
-                        {
-                            i++;
-                            continue;
-                        }
-
-                        content.SortOrder = i;
-                        content.WriterId = userId;
-                        i++;
-
-                        if (content.Published)
-                        {
-                            //TODO: This should not be an inner operation, but if we do this, it cannot raise events and cannot be cancellable!
-                            var published = _publishingStrategy.Publish(uow, content, userId).Success;
-                            shouldBePublished.Add(content);
-                        }
-                        else
-                            shouldBeSaved.Add(content);
-
-                        repository.AddOrUpdate(content);
-                        //add or update a preview
-                        repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-                    }
-
-                    foreach (var content in shouldBePublished)
-                    {
-                        //Create and Save ContentXml DTO
-                        repository.AddOrUpdateContentXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-                    }
-
-                    if (raiseEvents)
-                    {
-                        saveEventArgs.CanCancel = false;
-                        uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
-                    }
-
-                    if (shouldBePublished.Any())
-                    {
-                        //TODO: This should not be an inner operation, but if we do this, it cannot raise events and cannot be cancellable!
-                        _publishingStrategy.PublishingFinalized(uow, shouldBePublished, false);
-                    }
-
-                    Audit(uow, AuditType.Sort, "Sort child items performed by user", userId, items.First().ParentId);
-                    uow.Commit();
-                }
-            }
-
-            return true;
-        }
-
-        public IEnumerable<IContent> GetBlueprintsForContentTypes(params int[] documentTypeIds)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentBlueprintRepository(uow);
-
-                var query = new Query<IContent>();
-                if (documentTypeIds.Length > 0)
-                {
-                    query.Where(x => documentTypeIds.Contains(x.ContentTypeId));
-                }
-                return repository.GetByQuery(query).Select(x =>
-                {
-                    ((Content) x).IsBlueprint = true;
-                    return x;
-                });
-            }
-        }
-
-        /// <summary>
-        /// Gets paged content descendants as XML by path
-        /// </summary>
-        /// <param name="path">Path starts with</param>
-        /// <param name="pageIndex">Page number</param>
-        /// <param name="pageSize">Page size</param>
-        /// <param name="totalRecords">Total records the query would return without paging</param>
-        /// <returns>A paged enumerable of XML entries of content items</returns>
-        public IEnumerable<XElement> GetPagedXmlEntries(string path, long pageIndex, int pageSize, out long totalRecords)
-        {
-            Mandate.ParameterCondition(pageIndex >= 0, "pageIndex");
-            Mandate.ParameterCondition(pageSize > 0, "pageSize");
-
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                var contents = repository.GetPagedXmlEntriesByPath(path, pageIndex, pageSize,
-                    //This order by is VERY important! This allows us to figure out what is implicitly not published, see ContentRepository.BuildXmlCache and
-                    // UmbracoContentIndexer.PerformIndexAll which uses the logic based on this sort order
-                    new[] { "level", "parentID", "sortOrder" },
-                    out totalRecords);
-                return contents;
-            }
-        }
-
-        /// <summary>
-        /// This builds the Xml document used for the XML cache
-        /// </summary>
-        /// <returns></returns>
-        public XmlDocument BuildXmlCache()
-        {
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                var result = repository.BuildXmlCache();
-                uow.Commit();
-                return result;
-            }
-        }
-
-        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>
-        /// <param name="contentTypeIds">
-        /// Only rebuild the xml structures for the content type ids passed in, if none then rebuilds the structures
-        /// for all content
-        /// </param>
-        public void RebuildXmlStructures(params int[] contentTypeIds)
-        {
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                repository.RebuildXmlStructures(
-                    content => _entitySerializer.Serialize(this, _dataTypeService, _userService, content),
-                    contentTypeIds: contentTypeIds.Length == 0 ? null : contentTypeIds);
-
-                Audit(uow, AuditType.Publish, "ContentService.RebuildXmlStructures completed, the xml has been regenerated in the database", 0, Constants.System.Root);
-                uow.Commit();
-            }
-        }
-
-        #region Internal Methods
-
-        /// <summary>
-        /// Gets a collection of <see cref="IContent"/> descendants by the first Parent.
-        /// </summary>
-        /// <param name="content"><see cref="IContent"/> item to retrieve Descendants from</param>
-        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
-        internal IEnumerable<IContent> GetPublishedDescendants(IContent content)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                var query = Query<IContent>.Builder.Where(x => x.Id != content.Id && x.Path.StartsWith(content.Path) && x.Trashed == false);
-                return repository.GetByPublishedVersion(query);
-            }
-        }
-
-        #endregion
-
-        #region Private Methods
-
-        /// <summary>
-        /// Hack: This is used to fix some data if an entity's properties are invalid/corrupt
-        /// </summary>
-        /// <param name="content"></param>
-        private void QuickUpdate(IContent content)
-        {
-            if (content == null) throw new ArgumentNullException("content");
-            if (content.HasIdentity == false) throw new InvalidOperationException("Cannot update an entity without an Identity");
-
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-                repository.AddOrUpdate(content);
-                uow.Commit();
-            }
-        }
-
-        private void Audit(IScopeUnitOfWork uow, AuditType type, string message, int userId, int objectId)
-        {
-            var auditRepo = RepositoryFactory.CreateAuditRepository(uow);
-            auditRepo.AddOrUpdate(new AuditItem(objectId, message, type, userId));
-        }
-
-        //TODO: All of this needs to be moved to the repository
-        private void PerformMove(IContent content, int parentId, int userId, ICollection<MoveEventInfo<IContent>> moveInfo)
-        {
-            //add a tracking item to use in the Moved event
-            moveInfo.Add(new MoveEventInfo<IContent>(content, content.Path, parentId));
-
-            content.WriterId = userId;
-            if (parentId == Constants.System.Root)
-            {
-                content.Path = string.Concat(Constants.System.Root, ",", content.Id);
-                content.Level = 1;
-            }
-            else
-            {
-                var parent = GetById(parentId);
-                content.Path = string.Concat(parent.Path, ",", content.Id);
-                content.Level = parent.Level + 1;
-            }
-
-            //If Content is being moved away from Recycle Bin, its state should be un-trashed
-            if (content.Trashed && parentId != Constants.System.RecycleBinContent)
-            {
-                content.ChangeTrashedState(false, parentId);
-            }
-            else
-            {
-                content.ParentId = parentId;
-            }
-
-            //If Content is published, it should be (re)published from its new location
-            if (content.Published)
-            {
-                //If Content is Publishable its saved and published
-                //otherwise we save the content without changing the publish state, and generate new xml because the Path, Level and Parent has changed.
-                if (IsPublishable(content))
-                {
-                    //TODO: This is raising events, probably not desirable as this costs performance for event listeners like Examine
-                    SaveAndPublish(content, userId);
-                }
-                else
-                {
-                    //TODO: This is raising events, probably not desirable as this costs performance for event listeners like Examine
-                    Save(content, false, userId);
-
-                    //TODO: This shouldn't be here! This needs to be part of the repository logic but in order to fix this we need to
-                    // change how this method calls "Save" as it needs to save using an internal method
-                    using (var uow = UowProvider.GetUnitOfWork())
-                    {
-                        var xml = _entitySerializer.Serialize(this, _dataTypeService, _userService, content);
-
-                        var poco = new ContentXmlDto { NodeId = content.Id, Xml = xml.ToDataString() };
-                        var exists =
-                            uow.Database.FirstOrDefault<ContentXmlDto>("WHERE nodeId = @Id", new { Id = content.Id }) !=
-                            null;
-                        int result = exists
-                                         ? uow.Database.Update(poco)
-                                         : Convert.ToInt32(uow.Database.Insert(poco));
-                        uow.Commit();
-                    }
-                }
-            }
-            else
-            {
-                //TODO: This is raising events, probably not desirable as this costs performance for event listeners like Examine
-                Save(content, userId);
-            }
-
-            //Ensure that Path and Level is updated on children
-            var children = GetChildren(content.Id).ToArray();
-            if (children.Any())
-            {
-                foreach (var child in children)
-                {
-                    PerformMove(child, content.Id, userId, moveInfo);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Publishes a <see cref="IContent"/> object and all its children
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to publish along with its children</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <param name="includeUnpublished">If set to true, this will also publish descendants that are completely unpublished, normally this will only publish children that have previously been published</param>
-        /// <returns>
-        /// A list of publish statues. If the parent document is not valid or cannot be published because it's parent(s) is not published
-        /// then the list will only contain one status item, otherwise it will contain status items for it and all of it's descendants that
-        /// are to be published.
-        /// </returns>
-        private IEnumerable<Attempt<PublishStatus>> PublishWithChildrenDo(
-            IContent content, int userId = 0, bool includeUnpublished = false)
-        {
-            if (content == null) throw new ArgumentNullException("content");
-
-            var evtMsgs = EventMessagesFactory.Get();
-
-            using (new WriteLock(Locker))
-            {
-                //Hack: this ensures that the entity's path is valid and if not it fixes/persists it
-                //see: http://issues.umbraco.org/issue/U4-9336
-                content.EnsureValidPath(Logger, entity => GetById(entity.ParentId), QuickUpdate);
-
-                var result = new List<Attempt<PublishStatus>>();
-
-                //Check if parent is published (although not if its a root node) - if parent isn't published this Content cannot be published
-                if (content.ParentId != Constants.System.Root && content.ParentId != Constants.System.RecycleBinContent && IsPublishable(content) == false)
-                {
-                    Logger.Info<ContentService>(
-                        string.Format(
-                            "Content '{0}' with Id '{1}' could not be published because its parent or one of its ancestors is not published.",
-                            content.Name, content.Id));
-                    result.Add(Attempt.Fail(new PublishStatus(content, PublishStatusType.FailedPathNotPublished, evtMsgs)));
-                    return result;
-                }
-
-                //Content contains invalid property values and can therefore not be published - fire event?
-                if (!content.IsValid())
-                {
-                    Logger.Info<ContentService>(
-                        string.Format("Content '{0}' with Id '{1}' could not be published because of invalid properties.",
-                                      content.Name, content.Id));
-                    result.Add(
-                        Attempt.Fail(
-                            new PublishStatus(content, PublishStatusType.FailedContentInvalid, evtMsgs)
-                            {
-                                InvalidProperties = ((ContentBase)content).LastInvalidProperties
-                            }));
-                    return result;
-                }
-
-                //Consider creating a Path query instead of recursive method:
-                //var query = Query<IContent>.Builder.Where(x => x.Path.StartsWith(content.Path));
-
-                var updated = new List<IContent>();
-                var list = new List<IContent>();
-                list.Add(content); //include parent item
-                list.AddRange(GetDescendants(content));
-
-                var internalStrategy = _publishingStrategy;
-
-                using (var uow = UowProvider.GetUnitOfWork())
-                {
-                    //Publish and then update the database with new status
-                    var publishedOutcome = internalStrategy.PublishWithChildren(uow, list, userId, includeUnpublished).ToArray();
-                    var published = publishedOutcome
-                        .Where(x => x.Success || x.Result.StatusType == PublishStatusType.SuccessAlreadyPublished)
-                        // ensure proper order (for events) - cannot publish a child before its parent!
-                        .OrderBy(x => x.Result.ContentItem.Level)
-                        .ThenBy(x => x.Result.ContentItem.SortOrder);
-
-                    var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                    //NOTE The Publish with subpages-dialog was used more as a republish-type-thing, so we'll have to include PublishStatusType.SuccessAlreadyPublished
-                    //in the updated-list, so the Published event is triggered with the expected set of pages and the xml is updated.
-                    foreach (var item in published)
-                    {
-                        item.Result.ContentItem.WriterId = userId;
-                        repository.AddOrUpdate(item.Result.ContentItem);
-                        //add or update a preview
-                        repository.AddOrUpdatePreviewXml(item.Result.ContentItem, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-                        //add or update the published xml
-                        repository.AddOrUpdateContentXml(item.Result.ContentItem, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-                        updated.Add(item.Result.ContentItem);
-                    }
-
-                    //Save xml to db and call following method to fire event:
-                    _publishingStrategy.PublishingFinalized(uow, updated, false);
-
-                    Audit(uow, AuditType.Publish, "Publish with Children performed by user", userId, content.Id);
-                    uow.Commit();
-
-                    return publishedOutcome;
-                }
-            }
-        }
-
-        /// <summary>
-        /// UnPublishes a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to publish</param>
-        /// <param name="omitCacheRefresh">Optional boolean to avoid having the cache refreshed when calling this Unpublish method. By default this method will update the cache.</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <returns>True if unpublishing succeeded, otherwise False</returns>
-        private Attempt<UnPublishStatus> UnPublishDo(IContent content, bool omitCacheRefresh = false, int userId = 0)
-        {
-            var newest = GetById(content.Id); // ensure we have the newest version
-            if (content.Version != newest.Version) // but use the original object if it's already the newest version
-                content = newest;
-
-            var evtMsgs = EventMessagesFactory.Get();
-
-            var published = content.Published ? content : GetPublishedVersion(content.Id); // get the published version
-            if (published == null)
-            {
-                return Attempt.Succeed(new UnPublishStatus(content, UnPublishedStatusType.SuccessAlreadyUnPublished, evtMsgs)); // already unpublished
-            }
-
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var unpublished = _publishingStrategy.UnPublish(uow, content, userId);
-                if (unpublished == false)
-                {
-                    uow.Commit();
-                    return Attempt.Fail(new UnPublishStatus(content, UnPublishedStatusType.FailedCancelledByEvent, evtMsgs));
-                }
-
-                var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                content.WriterId = userId;
-                repository.AddOrUpdate(content);
-                // is published is not newest, reset the published flag on published version
-                if (published.Version != content.Version)
-                    repository.ClearPublished(published);
-                repository.DeleteContentXml(content);
-
-                //Delete xml from db? and call following method to fire event through PublishingStrategy to update cache
-                if (omitCacheRefresh == false)
-                    _publishingStrategy.UnPublishingFinalized(uow, content);
-
-                Audit(uow, AuditType.UnPublish, "UnPublish performed by user", userId, content.Id);
-                uow.Commit();
-            }
-
-            return Attempt.Succeed(new UnPublishStatus(content, UnPublishedStatusType.Success, evtMsgs));
-        }
-
-        /// <summary>
-        /// Saves and Publishes a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to save and publish</param>
-        /// <param name="userId">Optional Id of the User issueing the publishing</param>
-        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise save events.</param>
-        /// <returns>True if publishing succeeded, otherwise False</returns>
-        private Attempt<PublishStatus> SaveAndPublishDo(IContent content, int userId = 0, bool raiseEvents = true)
-        {
-            var evtMsgs = EventMessagesFactory.Get();
-
-            using (new WriteLock(Locker))
-            {
-                using (var uow = UowProvider.GetUnitOfWork())
-                {
-                    var saveEventArgs = new SaveEventArgs<IContent>(content, evtMsgs);
-                    if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
-                    {
-                        uow.Commit();
-                        return Attempt.Fail(new PublishStatus(content, PublishStatusType.FailedCancelledByEvent, evtMsgs));
-                    }
-
-                    //Has this content item previously been published? If so, we don't need to refresh the children
-                    var previouslyPublished = content.HasIdentity && HasPublishedVersion(content.Id); //content might not have an id
-                    var publishStatus = new PublishStatus(content, PublishStatusType.Success, evtMsgs); //initially set to success
-
-                    //Check if parent is published (although not if its a root node) - if parent isn't published this Content cannot be published
-                    publishStatus.StatusType = CheckAndLogIsPublishable(content);
-                    //if it is not successful, then check if the props are valid
-                    if ((int)publishStatus.StatusType < 10)
-                    {
-                        //Content contains invalid property values and can therefore not be published - fire event?
-                        publishStatus.StatusType = CheckAndLogIsValid(content);
-                        //set the invalid properties (if there are any)
-                        publishStatus.InvalidProperties = ((ContentBase)content).LastInvalidProperties;
-                    }
-                    //if we're still successful, then publish using the strategy
-                    if (publishStatus.StatusType == PublishStatusType.Success)
-                    {
-                        //Publish and then update the database with new status
-                        var publishResult = _publishingStrategy.Publish(uow, content, userId);
-                        //set the status type to the publish result
-                        publishStatus.StatusType = publishResult.Result.StatusType;
-                    }
-
-                    //we are successfully published if our publishStatus is still Successful
-                    bool published = publishStatus.StatusType == PublishStatusType.Success;
-
-                    var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                    if (published == false)
-                    {
-                        content.ChangePublishedState(PublishedState.Saved);
-                    }
-                    //Since this is the Save and Publish method, the content should be saved even though the publish fails or isn't allowed
-                    if (content.HasIdentity == false)
-                    {
-                        content.CreatorId = userId;
-                    }
-                    content.WriterId = userId;
-
-                    repository.AddOrUpdate(content);
-                    repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-
-                    if (published)
-                    {
-                        //Content Xml
-                        repository.AddOrUpdateContentXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-                    }
-
-                    if (raiseEvents)
-                    {
-                        saveEventArgs.CanCancel = false;
-                        uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
-                    }
-
-                    //Save xml to db and call following method to fire event through PublishingStrategy to update cache
-                    if (published)
-                    {
-                        _publishingStrategy.PublishingFinalized(uow, content);
-                    }
-
-                    //We need to check if children and their publish state to ensure that we 'republish' content that was previously published
-                    if (published && previouslyPublished == false && HasChildren(content.Id))
-                    {
-                    //TODO: Horrible for performance if there are lots of descendents! We should page if anything but this is crazy
-                        var descendants = GetPublishedDescendants(content);
-                        _publishingStrategy.PublishingFinalized(uow, descendants, false);
-                    }
-
-                    uow.Commit();
-
-                    if (publishStatus.StatusType == PublishStatusType.Success)
-                    {
-                        Audit(uow, AuditType.Publish, "Save and Publish performed by user", userId, content.Id);
-                    }
-                    else
-                    {
-                        Audit(uow, AuditType.Save, "Save performed by user", userId, content.Id);
-                    }
-                    uow.Commit();
-
-                    return Attempt.If(publishStatus.StatusType == PublishStatusType.Success, publishStatus);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Saves a single <see cref="IContent"/> object
-        /// </summary>
-        /// <param name="content">The <see cref="IContent"/> to save</param>
-        /// <param name="changeState">Boolean indicating whether or not to change the Published state upon saving</param>
-        /// <param name="userId">Optional Id of the User saving the Content</param>
-        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
-        private Attempt<OperationStatus> Save(IContent content, bool changeState, int userId = 0, bool raiseEvents = true)
-        {
-            var evtMsgs = EventMessagesFactory.Get();
-
-            using (new WriteLock(Locker))
-            {
-                using (var uow = UowProvider.GetUnitOfWork())
-                {
-                    var saveEventArgs = new SaveEventArgs<IContent>(content, evtMsgs);
-                    if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
-                    {
-                        uow.Commit();
-                        return OperationStatus.Cancelled(evtMsgs);
-                    }
-
-                    if (string.IsNullOrWhiteSpace(content.Name))
-                    {
-                        throw new ArgumentException("Cannot save content with empty name.");
-                    }
-
-                    var repository = RepositoryFactory.CreateContentRepository(uow);
-
-                    if (content.HasIdentity == false)
-                    {
-                        content.CreatorId = userId;
-                    }
-                    content.WriterId = userId;
-
-                    //Only change the publish state if the "previous" version was actually published or marked as unpublished
-                    if (changeState && (content.Published || ((Content)content).PublishedState == PublishedState.Unpublished))
-                        content.ChangePublishedState(PublishedState.Saved);
-
-                    repository.AddOrUpdate(content);
-
-                    //Generate a new preview
-                    repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-
-                    if (raiseEvents)
-                    {
-                        saveEventArgs.CanCancel = false;
-                        uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
-                    }
-
-                    Audit(uow, AuditType.Save, "Save Content performed by user", userId, content.Id);
-                    uow.Commit();
-                }
-
-                return OperationStatus.Success(evtMsgs);
-            }
-        }
-
-        private PublishStatusType CheckAndLogIsPublishable(IContent content)
-        {
-            //Check if parent is published (although not if its a root node) - if parent isn't published this Content cannot be published
-            if (content.ParentId != Constants.System.Root && content.ParentId != Constants.System.RecycleBinContent && IsPublishable(content) == false)
-            {
-                Logger.Info<ContentService>(
-                    string.Format(
-                        "Content '{0}' with Id '{1}' could not be published because its parent is not published.",
-                        content.Name, content.Id));
-                return PublishStatusType.FailedPathNotPublished;
-            }
-
-            if (content.ExpireDate.HasValue && content.ExpireDate.Value > DateTime.MinValue && DateTime.Now > content.ExpireDate.Value)
-            {
-                Logger.Info<ContentService>(
-                    string.Format(
-                        "Content '{0}' with Id '{1}' has expired and could not be published.",
-                        content.Name, content.Id));
-                return PublishStatusType.FailedHasExpired;
-            }
-
-            if (content.ReleaseDate.HasValue && content.ReleaseDate.Value > DateTime.MinValue && content.ReleaseDate.Value > DateTime.Now)
-            {
-                Logger.Info<ContentService>(
-                    string.Format(
-                        "Content '{0}' with Id '{1}' is awaiting release and could not be published.",
-                        content.Name, content.Id));
-                return PublishStatusType.FailedAwaitingRelease;
-            }
-
-            return PublishStatusType.Success;
-        }
-
-        private PublishStatusType CheckAndLogIsValid(IContent content)
-        {
-            //Content contains invalid property values and can therefore not be published - fire event?
-            if (content.IsValid() == false)
-            {
-                Logger.Info<ContentService>(
-                    string.Format(
-                        "Content '{0}' with Id '{1}' could not be published because of invalid properties.",
-                        content.Name, content.Id));
-                return PublishStatusType.FailedContentInvalid;
-            }
-
-            return PublishStatusType.Success;
-        }
-
-        private IContentType FindContentTypeByAlias(string contentTypeAlias)
-        {
-            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
-            {
-                var repository = RepositoryFactory.CreateContentTypeRepository(uow);
-
-                var query = Query<IContentType>.Builder.Where(x => x.Alias == contentTypeAlias);
-                var types = repository.GetByQuery(query);
-
-                if (types.Any() == false)
-                    throw new Exception(
-                        string.Format("No ContentType matching the passed in Alias: '{0}' was found",
-                                      contentTypeAlias));
-
-                var contentType = types.First();
-
-                if (contentType == null)
-                    throw new Exception(string.Format("ContentType matching the passed in Alias: '{0}' was null",
-                                                      contentTypeAlias));
-                return contentType;
-            }
-        }
-
-        #endregion
-
-        #region Proxy Event Handlers
-        /// <summary>
-        /// Occurs before publish.
-        /// </summary>
-        /// <remarks>Proxy to the real event on the <see cref="PublishingStrategy"/></remarks>
-        public static event TypedEventHandler<IPublishingStrategy, PublishEventArgs<IContent>> Publishing
-        {
-            add { PublishingStrategy.Publishing += value; }
-            remove { PublishingStrategy.Publishing -= value; }
-        }
-
-        /// <summary>
-        /// Occurs after publish.
-        /// </summary>
-        /// <remarks>Proxy to the real event on the <see cref="PublishingStrategy"/></remarks>
-        public static event TypedEventHandler<IPublishingStrategy, PublishEventArgs<IContent>> Published
-        {
-            add { PublishingStrategy.Published += value; }
-            remove { PublishingStrategy.Published -= value; }
-        }
-        /// <summary>
-        /// Occurs before unpublish.
-        /// </summary>
-        /// <remarks>Proxy to the real event on the <see cref="PublishingStrategy"/></remarks>
-        public static event TypedEventHandler<IPublishingStrategy, PublishEventArgs<IContent>> UnPublishing
-        {
-            add { PublishingStrategy.UnPublishing += value; }
-            remove { PublishingStrategy.UnPublishing -= value; }
-        }
-
-        /// <summary>
-        /// Occurs after unpublish.
-        /// </summary>
-        /// <remarks>Proxy to the real event on the <see cref="PublishingStrategy"/></remarks>
-        public static event TypedEventHandler<IPublishingStrategy, PublishEventArgs<IContent>> UnPublished
-        {
-            add { PublishingStrategy.UnPublished += value; }
-            remove { PublishingStrategy.UnPublished -= value; }
-        }
-        #endregion
-
-        #region Event Handlers
-        /// <summary>
-        /// Occurs before Delete
-        /// </summary>
-        public static event TypedEventHandler<IContentService, DeleteEventArgs<IContent>> Deleting;
-
-        /// <summary>
-        /// Occurs after Delete
-        /// </summary>
-        public static event TypedEventHandler<IContentService, DeleteEventArgs<IContent>> Deleted;
-
-        /// <summary>
-        /// Occurs before Delete Versions
-        /// </summary>
-        public static event TypedEventHandler<IContentService, DeleteRevisionsEventArgs> DeletingVersions;
-
-        /// <summary>
-        /// Occurs after Delete Versions
-        /// </summary>
-        public static event TypedEventHandler<IContentService, DeleteRevisionsEventArgs> DeletedVersions;
-
-        /// <summary>
-        /// Occurs before Save
-        /// </summary>
-        public static event TypedEventHandler<IContentService, SaveEventArgs<IContent>> Saving;
-
-        /// <summary>
-        /// Occurs after Save
-        /// </summary>
-        public static event TypedEventHandler<IContentService, SaveEventArgs<IContent>> Saved;
-
-        /// <summary>
-        /// Occurs before Create
-        /// </summary>
-        [Obsolete("Use the Created event instead, the Creating and Created events both offer the same functionality, Creating event has been deprecated.")]
-        public static event TypedEventHandler<IContentService, NewEventArgs<IContent>> Creating;
-
-        /// <summary>
-        /// Occurs after Create
-        /// </summary>
-        /// <remarks>
-        /// Please note that the Content object has been created, but might not have been saved
-        /// so it does not have an identity yet (meaning no Id has been set).
-        /// </remarks>
-        public static event TypedEventHandler<IContentService, NewEventArgs<IContent>> Created;
-
-        /// <summary>
-        /// Occurs before Copy
-        /// </summary>
-        public static event TypedEventHandler<IContentService, CopyEventArgs<IContent>> Copying;
-
-        /// <summary>
-        /// Occurs after Copy
-        /// </summary>
-        public static event TypedEventHandler<IContentService, CopyEventArgs<IContent>> Copied;
-
-        /// <summary>
-        /// Occurs before Content is moved to Recycle Bin
-        /// </summary>
-        public static event TypedEventHandler<IContentService, MoveEventArgs<IContent>> Trashing;
-
-        /// <summary>
-        /// Occurs after Content is moved to Recycle Bin
-        /// </summary>
-        public static event TypedEventHandler<IContentService, MoveEventArgs<IContent>> Trashed;
-
-        /// <summary>
-        /// Occurs before Move
-        /// </summary>
-        public static event TypedEventHandler<IContentService, MoveEventArgs<IContent>> Moving;
-
-        /// <summary>
-        /// Occurs after Move
-        /// </summary>
-        public static event TypedEventHandler<IContentService, MoveEventArgs<IContent>> Moved;
-
-        /// <summary>
-        /// Occurs before Rollback
-        /// </summary>
-        public static event TypedEventHandler<IContentService, RollbackEventArgs<IContent>> RollingBack;
-
-        /// <summary>
-        /// Occurs after Rollback
-        /// </summary>
-        public static event TypedEventHandler<IContentService, RollbackEventArgs<IContent>> RolledBack;
-
-        /// <summary>
-        /// Occurs before Send to Publish
-        /// </summary>
-        public static event TypedEventHandler<IContentService, SendToPublishEventArgs<IContent>> SendingToPublish;
-
-        /// <summary>
-        /// Occurs after Send to Publish
-        /// </summary>
-        public static event TypedEventHandler<IContentService, SendToPublishEventArgs<IContent>> SentToPublish;
-
-        /// <summary>
-        /// Occurs before the Recycle Bin is emptied
-        /// </summary>
-        public static event TypedEventHandler<IContentService, RecycleBinEventArgs> EmptyingRecycleBin;
-
-        /// <summary>
-        /// Occurs after the Recycle Bin has been Emptied
-        /// </summary>
-        public static event TypedEventHandler<IContentService, RecycleBinEventArgs> EmptiedRecycleBin;
-
-        /// <summary>
-        /// Occurs after a blueprint has been saved.
-        /// </summary>
-        public static event TypedEventHandler<IContentService, SaveEventArgs<IContent>> SavedBlueprint;
-
-        /// <summary>
-        /// Occurs after a blueprint has been deleted.
-        /// </summary>
-        public static event TypedEventHandler<IContentService, DeleteEventArgs<IContent>> DeletedBlueprint;
-
-        #endregion
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Xml;
+using System.Xml.Linq;
+using Umbraco.Core.Events;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.Membership;
+using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
+using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.UnitOfWork;
+using Umbraco.Core.Publishing;
+
+namespace Umbraco.Core.Services
+{
+    /// <summary>
+    /// Represents the Content Service, which is an easy access to operations involving <see cref="IContent"/>
+    /// </summary>
+    public class ContentService : ScopeRepositoryService, IContentService, IContentServiceOperations
+    {
+        private readonly IPublishingStrategy2 _publishingStrategy;
+        private readonly EntityXmlSerializer _entitySerializer = new EntityXmlSerializer();
+        private readonly IDataTypeService _dataTypeService;
+        private readonly IUserService _userService;
+
+        //Support recursive locks because some of the methods that require locking call other methods that require locking.
+        //for example, the Move method needs to be locked but this calls the Save method which also needs to be locked.
+        private static readonly ReaderWriterLockSlim Locker = new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion);
+        private static readonly Regex AnchorRegex = new Regex("<a id=\"(.*?)\">", RegexOptions.Compiled);
+
+        public ContentService(
+            IDatabaseUnitOfWorkProvider provider,
+            RepositoryFactory repositoryFactory,
+            ILogger logger,
+            IEventMessagesFactory eventMessagesFactory,
+            IDataTypeService dataTypeService,
+            IUserService userService)
+            : base(provider, repositoryFactory, logger, eventMessagesFactory)
+        {
+            if (dataTypeService == null) throw new ArgumentNullException("dataTypeService");
+            if (userService == null) throw new ArgumentNullException("userService");
+            _publishingStrategy = new PublishingStrategy(UowProvider.ScopeProvider, eventMessagesFactory, logger);
+            _dataTypeService = dataTypeService;
+            _userService = userService;
+        }
+
+        #region Static Queries
+
+        private IQuery<IContent> _notTrashedQuery;
+
+        #endregion
+
+        public int CountPublished(string contentTypeAlias = null)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                return repository.CountPublished(contentTypeAlias);
+            }
+        }
+
+        public int Count(string contentTypeAlias = null)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                return repository.Count(contentTypeAlias);
+            }
+        }
+
+        public int CountChildren(int parentId, string contentTypeAlias = null)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                return repository.CountChildren(parentId, contentTypeAlias);
+            }
+        }
+
+        public int CountDescendants(int parentId, string contentTypeAlias = null)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                return repository.CountDescendants(parentId, contentTypeAlias);
+            }
+        }
+
+        /// <summary>
+        /// Used to bulk update the permissions set for a content item. This will replace all permissions
+        /// assigned to an entity with a list of user id & permission pairs.
+        /// </summary>
+        /// <param name="permissionSet"></param>
+        public void ReplaceContentPermissions(EntityPermissionSet permissionSet)
+        {
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                repository.ReplaceContentPermissions(permissionSet);
+                uow.Commit();
+            }
+        }
+
+        /// <summary>
+        /// Assigns a single permission to the current content item for the specified group ids
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <param name="permission"></param>
+        /// <param name="groupIds"></param>
+        public void AssignContentPermission(IContent entity, char permission, IEnumerable<int> groupIds)
+        {
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                repository.AssignEntityPermission(entity, permission, groupIds);
+                uow.Commit();
+            }
+        }
+
+        /// <summary>
+        /// Returns implicit/inherited permissions assigned to the content item for all user groups
+        /// </summary>
+        /// <param name="content"></param>
+        /// <returns></returns>
+        public EntityPermissionCollection GetPermissionsForEntity(IContent content)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                return repository.GetPermissionsForEntity(content.Id);
+            }
+        }
+
+        /// <summary>
+        /// Creates an <see cref="IContent"/> object using the alias of the <see cref="IContentType"/>
+        /// that this Content should based on.
+        /// </summary>
+        /// <remarks>
+        /// Note that using this method will simply return a new IContent without any identity
+        /// as it has not yet been persisted. It is intended as a shortcut to creating new content objects
+        /// that does not invoke a save operation against the database.
+        /// </remarks>
+        /// <param name="name">Name of the Content object</param>
+        /// <param name="parentId">Id of Parent for the new Content</param>
+        /// <param name="contentTypeAlias">Alias of the <see cref="IContentType"/></param>
+        /// <param name="userId">Optional id of the user creating the content</param>
+        /// <returns><see cref="IContent"/></returns>
+        public IContent CreateContent(string name, Guid parentId, string contentTypeAlias, int userId = 0)
+        {
+            var parent = GetById(parentId);
+            return CreateContent(name, parent, contentTypeAlias, userId);
+        }
+
+        /// <summary>
+        /// Creates an <see cref="IContent"/> object using the alias of the <see cref="IContentType"/>
+        /// that this Content should based on.
+        /// </summary>
+        /// <remarks>
+        /// Note that using this method will simply return a new IContent without any identity
+        /// as it has not yet been persisted. It is intended as a shortcut to creating new content objects
+        /// that does not invoke a save operation against the database.
+        /// </remarks>
+        /// <param name="name">Name of the Content object</param>
+        /// <param name="parentId">Id of Parent for the new Content</param>
+        /// <param name="contentTypeAlias">Alias of the <see cref="IContentType"/></param>
+        /// <param name="userId">Optional id of the user creating the content</param>
+        /// <returns><see cref="IContent"/></returns>
+        public IContent CreateContent(string name, int parentId, string contentTypeAlias, int userId = 0)
+        {
+            var contentType = FindContentTypeByAlias(contentTypeAlias);
+            var content = new Content(name, parentId, contentType);
+            var parent = GetById(content.ParentId);
+            content.Path = string.Concat(parent.IfNotNull(x => x.Path, content.ParentId.ToString()), ",", content.Id);
+
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var newEventArgs = new NewEventArgs<IContent>(content, contentTypeAlias, parentId);
+                if (uow.Events.DispatchCancelable(Creating, this, newEventArgs))
+                {
+                    uow.Commit();
+                    content.WasCancelled = true;
+                    return content;
+                }
+
+                content.CreatorId = userId;
+                content.WriterId = userId;
+                newEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Created, this, newEventArgs);
+
+                uow.Commit();
+            }
+
+            return content;
+        }
+
+        /// <summary>
+        /// Creates an <see cref="IContent"/> object using the alias of the <see cref="IContentType"/>
+        /// that this Content should based on.
+        /// </summary>
+        /// <remarks>
+        /// Note that using this method will simply return a new IContent without any identity
+        /// as it has not yet been persisted. It is intended as a shortcut to creating new content objects
+        /// that does not invoke a save operation against the database.
+        /// </remarks>
+        /// <param name="name">Name of the Content object</param>
+        /// <param name="parent">Parent <see cref="IContent"/> object for the new Content</param>
+        /// <param name="contentTypeAlias">Alias of the <see cref="IContentType"/></param>
+        /// <param name="userId">Optional id of the user creating the content</param>
+        /// <returns><see cref="IContent"/></returns>
+        public IContent CreateContent(string name, IContent parent, string contentTypeAlias, int userId = 0)
+        {
+            if (parent == null) throw new ArgumentNullException("parent");
+
+            var contentType = FindContentTypeByAlias(contentTypeAlias);
+            var content = new Content(name, parent, contentType);
+            content.Path = string.Concat(parent.Path, ",", content.Id);
+
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var newEventArgs = new NewEventArgs<IContent>(content, contentTypeAlias, parent);
+                if (uow.Events.DispatchCancelable(Creating, this, newEventArgs))
+                {
+                    uow.Commit();
+                    content.WasCancelled = true;
+                    return content;
+                }
+
+                content.CreatorId = userId;
+                content.WriterId = userId;
+                newEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Created, this, newEventArgs);
+
+                uow.Commit();
+            }
+
+            return content;
+        }
+
+        /// <summary>
+        /// Creates and saves an <see cref="IContent"/> object using the alias of the <see cref="IContentType"/>
+        /// that this Content should based on.
+        /// </summary>
+        /// <remarks>
+        /// This method returns an <see cref="IContent"/> object that has been persisted to the database
+        /// and therefor has an identity.
+        /// </remarks>
+        /// <param name="name">Name of the Content object</param>
+        /// <param name="parentId">Id of Parent for the new Content</param>
+        /// <param name="contentTypeAlias">Alias of the <see cref="IContentType"/></param>
+        /// <param name="userId">Optional id of the user creating the content</param>
+        /// <returns><see cref="IContent"/></returns>
+        public IContent CreateContentWithIdentity(string name, int parentId, string contentTypeAlias, int userId = 0)
+        {
+            var contentType = FindContentTypeByAlias(contentTypeAlias);
+            var content = new Content(name, parentId, contentType);
+
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                //NOTE: I really hate the notion of these Creating/Created events - they are so inconsistent, I've only just found
+                // out that in these 'WithIdentity' methods, the Saving/Saved events were not fired, wtf. Anyways, they're added now.
+                var newEventArgs = new NewEventArgs<IContent>(content, contentTypeAlias, parentId);
+                if (uow.Events.DispatchCancelable(Creating, this, newEventArgs))
+                {
+                    uow.Commit();
+                    content.WasCancelled = true;
+                    return content;
+                }
+
+                var saveEventArgs = new SaveEventArgs<IContent>(content);
+                if (uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
+                {
+                    uow.Commit();
+                    content.WasCancelled = true;
+                    return content;
+                }
+
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                content.CreatorId = userId;
+                content.WriterId = userId;
+
+                repository.AddOrUpdate(content);
+                repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                saveEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
+                newEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Created, this, newEventArgs);
+
+                Audit(uow, AuditType.New, string.Format("Content '{0}' was created with Id {1}", name, content.Id), content.CreatorId, content.Id);
+                uow.Commit();
+            }
+
+            return content;
+        }
+
+        public IEnumerable<string> GetAnchorValuesFromRTEs(int id)
+        {
+            var result = new List<string>();
+
+            var content = GetById(id);
+
+            foreach (var contentProperty in content.Properties)
+            {
+                if (contentProperty.PropertyType.PropertyEditorAlias.InvariantEquals(Constants.PropertyEditors.TinyMCEAlias))
+                {
+                    var value = contentProperty.Value?.ToString();
+
+                    if (!string.IsNullOrEmpty(value))
+                    {
+                        result.AddRange(GetAnchorValuesFromRTEContent(value));
+                    }
+
+                }
+            }
+
+
+            return result;
+        }
+
+
+        public IEnumerable<string> GetAnchorValuesFromRTEContent(string rteContent)
+        {
+            var result = new List<string>();
+
+            var matches = AnchorRegex.Matches(rteContent);
+
+            foreach (Match match in matches)
+            {
+                result.Add(match.Value.Split('\"')[1]);
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Creates and saves an <see cref="IContent"/> object using the alias of the <see cref="IContentType"/>
+        /// that this Content should based on.
+        /// </summary>
+        /// <remarks>
+        /// This method returns an <see cref="IContent"/> object that has been persisted to the database
+        /// and therefor has an identity.
+        /// </remarks>
+        /// <param name="name">Name of the Content object</param>
+        /// <param name="parent">Parent <see cref="IContent"/> object for the new Content</param>
+        /// <param name="contentTypeAlias">Alias of the <see cref="IContentType"/></param>
+        /// <param name="userId">Optional id of the user creating the content</param>
+        /// <returns><see cref="IContent"/></returns>
+        public IContent CreateContentWithIdentity(string name, IContent parent, string contentTypeAlias, int userId = 0)
+        {
+            if (parent == null) throw new ArgumentNullException("parent");
+
+            var contentType = FindContentTypeByAlias(contentTypeAlias);
+            var content = new Content(name, parent, contentType);
+
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                //NOTE: I really hate the notion of these Creating/Created events - they are so inconsistent, I've only just found
+                // out that in these 'WithIdentity' methods, the Saving/Saved events were not fired, wtf. Anyways, they're added now.
+                var newEventArgs = new NewEventArgs<IContent>(content, contentTypeAlias, parent);
+                if (uow.Events.DispatchCancelable(Creating, this, newEventArgs))
+                {
+                    uow.Commit();
+                    content.WasCancelled = true;
+                    return content;
+                }
+
+                var saveEventArgs = new SaveEventArgs<IContent>(content);
+                if (uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
+                {
+                    uow.Commit();
+                    content.WasCancelled = true;
+                    return content;
+                }
+
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                content.CreatorId = userId;
+                content.WriterId = userId;
+
+                repository.AddOrUpdate(content);
+                repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                saveEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
+                newEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Created, this, newEventArgs);
+
+                Audit(uow, AuditType.New, string.Format("Content '{0}' was created with Id {1}", name, content.Id), content.CreatorId, content.Id);
+                uow.Commit();
+            }
+
+            return content;
+        }
+
+        /// <summary>
+        /// Gets an <see cref="IContent"/> object by Id
+        /// </summary>
+        /// <param name="id">Id of the Content to retrieve</param>
+        /// <returns><see cref="IContent"/></returns>
+        public IContent GetById(int id)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                return repository.Get(id);
+            }
+        }
+
+        /// <summary>
+        /// Gets <see cref="IContent"/> objects by Ids
+        /// </summary>
+        /// <param name="ids">Ids of the Content to retrieve</param>
+        /// <returns><see cref="IContent"/></returns>
+        public IEnumerable<IContent> GetByIds(IEnumerable<int> ids)
+        {
+            var idsArray = ids.ToArray();
+            if (idsArray.Length == 0) return Enumerable.Empty<IContent>();
+
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                // ensure that the result has the order based on the ids passed in
+                var result = repository.GetAll(idsArray);
+                var content = result.ToDictionary(x => x.Id, x => x);
+
+                var sortedResult = idsArray.Select(x =>
+                {
+                    IContent c;
+                    return content.TryGetValue(x, out c) ? c : null;
+                }).WhereNotNull();
+
+                return sortedResult;
+            }
+        }
+
+        /// <summary>
+        /// Gets <see cref="IContent"/> objects by Ids
+        /// </summary>
+        /// <param name="ids">Ids of the Content to retrieve</param>
+        /// <returns><see cref="IContent"/></returns>
+        public IEnumerable<IContent> GetByIds(IEnumerable<Guid> ids)
+        {
+            var idsArray = ids.ToArray();
+            if (idsArray.Length == 0) return Enumerable.Empty<IContent>();
+
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                // ensure that the result has the order based on the ids passed in
+                var result = repository.GetAll(idsArray);
+                var content = result.ToDictionary(x => x.Key, x => x);
+
+                var sortedResult = idsArray.Select(x =>
+                {
+                    IContent c;
+                    return content.TryGetValue(x, out c) ? c : null;
+                }).WhereNotNull();
+
+                return sortedResult;
+            }
+        }
+
+        /// <summary>
+        /// Gets an <see cref="IContent"/> object by its 'UniqueId'
+        /// </summary>
+        /// <param name="key">Guid key of the Content to retrieve</param>
+        /// <returns><see cref="IContent"/></returns>
+        public IContent GetById(Guid key)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                return repository.Get(key);
+            }
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects by the Id of the <see cref="IContentType"/>
+        /// </summary>
+        /// <param name="id">Id of the <see cref="IContentType"/></param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetContentOfContentType(int id)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                var query = Query<IContent>.Builder.Where(x => x.ContentTypeId == id);
+                return repository.GetByQuery(query);
+            }
+        }
+
+        internal IEnumerable<IContent> GetPublishedContentOfContentType(int id)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                var query = Query<IContent>.Builder.Where(x => x.ContentTypeId == id);
+                return repository.GetByPublishedVersion(query);
+            }
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects by Level
+        /// </summary>
+        /// <param name="level">The level to retrieve Content from</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetByLevel(int level)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                var query = Query<IContent>.Builder.Where(x => x.Level == level && x.Path.StartsWith(Constants.System.RecycleBinContent.ToInvariantString()) == false);
+                return repository.GetByQuery(query);
+            }
+        }
+
+        /// <summary>
+        /// Gets a specific version of an <see cref="IContent"/> item.
+        /// </summary>
+        /// <param name="versionId">Id of the version to retrieve</param>
+        /// <returns>An <see cref="IContent"/> item</returns>
+        public IContent GetByVersion(Guid versionId)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                return repository.GetByVersion(versionId);
+            }
+        }
+
+
+        /// <summary>
+        /// Gets a collection of an <see cref="IContent"/> objects versions by Id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetVersions(int id)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                return repository.GetAllVersions(id);
+            }
+        }
+
+        /// <summary>
+        /// Gets a list of all version Ids for the given content item ordered so latest is first
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="maxRows">The maximum number of rows to return</param>
+        /// <returns></returns>
+        public IEnumerable<Guid> GetVersionIds(int id, int maxRows)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                return repository.GetVersionIds(id, maxRows);
+            }
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects, which are ancestors of the current content.
+        /// </summary>
+        /// <param name="id">Id of the <see cref="IContent"/> to retrieve ancestors for</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetAncestors(int id)
+        {
+            var content = GetById(id);
+            return GetAncestors(content);
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects, which are ancestors of the current content.
+        /// </summary>
+        /// <param name="content"><see cref="IContent"/> to retrieve ancestors for</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetAncestors(IContent content)
+        {
+            //null check otherwise we get exceptions
+            if (content.Path.IsNullOrWhiteSpace()) return Enumerable.Empty<IContent>();
+
+            var ids = content.Path.Split(',').Where(x => x != Constants.System.Root.ToInvariantString() && x != content.Id.ToString(CultureInfo.InvariantCulture)).Select(int.Parse).ToArray();
+            if (ids.Any() == false)
+                return new List<IContent>();
+
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                return repository.GetAll(ids);
+            }
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
+        /// </summary>
+        /// <param name="id">Id of the Parent to retrieve Children from</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetChildren(int id)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                var query = Query<IContent>.Builder.Where(x => x.ParentId == id);
+                return repository.GetByQuery(query).OrderBy(x => x.SortOrder);
+            }
+        }
+
+        [Obsolete("Use the overload with 'long' parameter types instead")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public IEnumerable<IContent> GetPagedChildren(int id, int pageIndex, int pageSize, out int totalChildren,
+            string orderBy, Direction orderDirection, string filter = "")
+        {
+            long total;
+            var result = GetPagedChildren(id, Convert.ToInt64(pageIndex), pageSize, out total, orderBy, orderDirection, true, filter);
+            totalChildren = Convert.ToInt32(total);
+            return result;
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
+        /// </summary>
+        /// <param name="id">Id of the Parent to retrieve Children from</param>
+        /// <param name="pageIndex">Page index (zero based)</param>
+        /// <param name="pageSize">Page size</param>
+        /// <param name="totalChildren">Total records query would return without paging</param>
+        /// <param name="orderBy">Field to order by</param>
+        /// <param name="orderDirection">Direction to order by</param>
+        /// <param name="filter">Search text filter</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetPagedChildren(int id, long pageIndex, int pageSize, out long totalChildren,
+            string orderBy, Direction orderDirection, string filter = "")
+        {
+            return GetPagedChildren(id, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, true, filter);
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
+        /// </summary>
+        /// <param name="id">Id of the Parent to retrieve Children from</param>
+        /// <param name="pageIndex">Page index (zero based)</param>
+        /// <param name="pageSize">Page size</param>
+        /// <param name="totalChildren">Total records query would return without paging</param>
+        /// <param name="orderBy">Field to order by</param>
+        /// <param name="orderDirection">Direction to order by</param>
+        /// <param name="orderBySystemField">Flag to indicate when ordering by system field</param>
+        /// <param name="filter">Search text filter</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetPagedChildren(int id, long pageIndex, int pageSize, out long totalChildren,
+            string orderBy, Direction orderDirection, bool orderBySystemField, string filter)
+        {
+            Mandate.ParameterCondition(pageIndex >= 0, "pageIndex");
+            Mandate.ParameterCondition(pageSize > 0, "pageSize");
+
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                var query = Query<IContent>.Builder;
+                // always check for a parent - else it will also get decendants (and then you should use the GetPagedDescendants method)
+                query.Where(x => x.ParentId == id);
+
+                IQuery<IContent> filterQuery = null;
+                if (filter.IsNullOrWhiteSpace() == false)
+                {
+                    filterQuery = Query<IContent>.Builder.Where(x => x.Name.Contains(filter));
+                }
+                return repository.GetPagedResultsByQuery(query, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, orderBySystemField, filterQuery);
+            }
+        }
+
+        [Obsolete("Use the overload with 'long' parameter types instead")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public IEnumerable<IContent> GetPagedDescendants(int id, int pageIndex, int pageSize, out int totalChildren, string orderBy = "path", Direction orderDirection = Direction.Ascending, string filter = "")
+        {
+            long total;
+            var result = GetPagedDescendants(id, Convert.ToInt64(pageIndex), pageSize, out total, orderBy, orderDirection, true, filter);
+            totalChildren = Convert.ToInt32(total);
+            return result;
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
+        /// </summary>
+        /// <param name="id">Id of the Parent to retrieve Descendants from</param>
+        /// <param name="pageIndex">Page number</param>
+        /// <param name="pageSize">Page size</param>
+        /// <param name="totalChildren">Total records query would return without paging</param>
+        /// <param name="orderBy">Field to order by</param>
+        /// <param name="orderDirection">Direction to order by</param>
+        /// <param name="filter">Search text filter</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetPagedDescendants(int id, long pageIndex, int pageSize, out long totalChildren, string orderBy = "path", Direction orderDirection = Direction.Ascending, string filter = "")
+        {
+            return GetPagedDescendants(id, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, true, filter);
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
+        /// </summary>
+        /// <param name="id">Id of the Parent to retrieve Descendants from</param>
+        /// <param name="pageIndex">Page number</param>
+        /// <param name="pageSize">Page size</param>
+        /// <param name="totalChildren">Total records query would return without paging</param>
+        /// <param name="orderBy">Field to order by</param>
+        /// <param name="orderDirection">Direction to order by</param>
+        /// <param name="orderBySystemField">Flag to indicate when ordering by system field</param>
+        /// <param name="filter">Search text filter</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetPagedDescendants(int id, long pageIndex, int pageSize, out long totalChildren, string orderBy, Direction orderDirection, bool orderBySystemField, string filter)
+        {
+            Mandate.ParameterCondition(pageIndex >= 0, "pageIndex");
+            Mandate.ParameterCondition(pageSize > 0, "pageSize");
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                // get query - if the id is System Root, then just get all
+                var query = Query<IContent>.Builder;
+                if (id != Constants.System.Root)
+                {
+                    var entityRepository = RepositoryFactory.CreateEntityRepository(uow);
+                    var contentPath = entityRepository.GetAllPaths(Constants.ObjectTypes.DocumentGuid, id).ToArray();
+                    if (contentPath.Length == 0)
+                    {
+                        totalChildren = 0;
+                        return Enumerable.Empty<IContent>();
+                    }
+                    query.Where(x => x.Path.SqlStartsWith(string.Format("{0},", contentPath[0].Path), TextColumnType.NVarchar));
+                }
+
+
+                // get filter
+                IQuery<IContent> filterQuery = null;
+                if (filter.IsNullOrWhiteSpace() == false)
+                    filterQuery = Query<IContent>.Builder.Where(x => x.Name.Contains(filter));
+
+                return repository.GetPagedResultsByQuery(query, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, orderBySystemField, filterQuery);
+            }
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
+        /// </summary>
+        /// <param name="id">Id of the Parent to retrieve Descendants from</param>
+        /// <param name="pageIndex">Page number</param>
+        /// <param name="pageSize">Page size</param>
+        /// <param name="totalChildren">Total records query would return without paging</param>
+        /// <param name="orderBy">Field to order by</param>
+        /// <param name="orderDirection">Direction to order by</param>
+        /// <param name="orderBySystemField">Flag to indicate when ordering by system field</param>
+        /// <param name="filter">Search filter</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetPagedDescendants(int id, long pageIndex, int pageSize, out long totalChildren, string orderBy, Direction orderDirection, bool orderBySystemField, IQuery<IContent> filter)
+        {
+            Mandate.ParameterCondition(pageIndex >= 0, "pageIndex");
+            Mandate.ParameterCondition(pageSize > 0, "pageSize");
+
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                // get query - if the id is System Root, then just get all
+                var query = Query<IContent>.Builder;
+                if (id != Constants.System.Root)
+                {
+                    var entityRepository = RepositoryFactory.CreateEntityRepository(uow);
+                    var contentPath = entityRepository.GetAllPaths(Constants.ObjectTypes.DocumentGuid, id).ToArray();
+                    if (contentPath.Length == 0)
+                    {
+                        totalChildren = 0;
+                        return Enumerable.Empty<IContent>();
+                    }
+                    query.Where(x => x.Path.SqlStartsWith(string.Format("{0},", contentPath[0].Path), TextColumnType.NVarchar));
+                }
+
+                return repository.GetPagedResultsByQuery(query, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, orderBySystemField, filter);
+            }
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects by its name or partial name
+        /// </summary>
+        /// <param name="parentId">Id of the Parent to retrieve Children from</param>
+        /// <param name="name">Full or partial name of the children</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetChildrenByName(int parentId, string name)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                var query = Query<IContent>.Builder.Where(x => x.ParentId == parentId && x.Name.Contains(name));
+                return repository.GetByQuery(query);
+            }
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
+        /// </summary>
+        /// <param name="id">Id of the Parent to retrieve Descendants from</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetDescendants(int id)
+        {
+            var content = GetById(id);
+            return content == null ? Enumerable.Empty<IContent>() : GetDescendants(content);
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects by Parent Id
+        /// </summary>
+        /// <param name="content"><see cref="IContent"/> item to retrieve Descendants from</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetDescendants(IContent content)
+        {
+            //This is a check to ensure that the path is correct for this entity to avoid problems like: http://issues.umbraco.org/issue/U4-9336 due to data corruption
+            if (content.ValidatePath() == false)
+                throw new InvalidDataException(string.Format("The content item {0} has an invalid path: {1} with parentID: {2}", content.Id, content.Path, content.ParentId));
+
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                var pathMatch = content.Path + ",";
+                var query = Query<IContent>.Builder.Where(x => x.Path.StartsWith(pathMatch) && x.Id != content.Id);
+                return repository.GetByQuery(query);
+            }
+        }
+
+        /// <summary>
+        /// Gets the parent of the current content as an <see cref="IContent"/> item.
+        /// </summary>
+        /// <param name="id">Id of the <see cref="IContent"/> to retrieve the parent from</param>
+        /// <returns>Parent <see cref="IContent"/> object</returns>
+        public IContent GetParent(int id)
+        {
+            var content = GetById(id);
+            return GetParent(content);
+        }
+
+        /// <summary>
+        /// Gets the parent of the current content as an <see cref="IContent"/> item.
+        /// </summary>
+        /// <param name="content"><see cref="IContent"/> to retrieve the parent from</param>
+        /// <returns>Parent <see cref="IContent"/> object</returns>
+        public IContent GetParent(IContent content)
+        {
+            if (content.ParentId == Constants.System.Root || content.ParentId == Constants.System.RecycleBinContent)
+                return null;
+
+            return GetById(content.ParentId);
+        }
+
+        /// <summary>
+        /// Gets the published version of an <see cref="IContent"/> item
+        /// </summary>
+        /// <param name="id">Id of the <see cref="IContent"/> to retrieve version from</param>
+        /// <returns>An <see cref="IContent"/> item</returns>
+        public IContent GetPublishedVersion(int id)
+        {
+            var version = GetVersions(id);
+            return version.FirstOrDefault(x => x.Published);
+        }
+
+        /// <summary>
+        /// Gets the published version of a <see cref="IContent"/> item.
+        /// </summary>
+        /// <param name="content">The content item.</param>
+        /// <returns>The published version, if any; otherwise, null.</returns>
+        public IContent GetPublishedVersion(IContent content)
+        {
+            if (content.Published) return content;
+            return content.HasPublishedVersion
+                ? GetByVersion(content.PublishedVersionGuid)
+                : null;
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects, which reside at the first level / root
+        /// </summary>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetRootContent()
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                var query = Query<IContent>.Builder.Where(x => x.ParentId == Constants.System.Root);
+                return repository.GetByQuery(query);
+            }
+        }
+
+        /// <summary>
+        /// Gets all published content items
+        /// </summary>
+        /// <returns></returns>
+        internal IEnumerable<IContent> GetAllPublished()
+        {
+            //create it once if it is needed (no need for locking here)
+            if (_notTrashedQuery == null)
+            {
+                _notTrashedQuery = Query<IContent>.Builder.Where(x => x.Trashed == false);
+            }
+
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                return repository.GetByPublishedVersion(_notTrashedQuery);
+            }
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects, which has an expiration date less than or equal to today.
+        /// </summary>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetContentForExpiration()
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                var query = Query<IContent>.Builder.Where(x => x.ExpireDate <= DateTime.Now);
+                return repository.GetByQuery(query).Where(x => x.HasPublishedVersion);
+            }
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> objects, which has a release date less than or equal to today.
+        /// </summary>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetContentForRelease()
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                var query = Query<IContent>.Builder.Where(x => x.Published == false && x.ReleaseDate <= DateTime.Now);
+                return repository.GetByQuery(query);
+            }
+        }
+
+        /// <summary>
+        /// Gets a collection of an <see cref="IContent"/> objects, which resides in the Recycle Bin
+        /// </summary>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        public IEnumerable<IContent> GetContentInRecycleBin()
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                var query = Query<IContent>.Builder.Where(x => x.Path.StartsWith(Constants.System.RecycleBinContentPathPrefix));
+                return repository.GetByQuery(query);
+            }
+        }
+
+        /// <summary>
+        /// Checks whether an <see cref="IContent"/> item has any children
+        /// </summary>
+        /// <param name="id">Id of the <see cref="IContent"/></param>
+        /// <returns>True if the content has any children otherwise False</returns>
+        public bool HasChildren(int id)
+        {
+            return CountChildren(id) > 0;
+        }
+
+        internal int CountChildren(int id)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                var query = Query<IContent>.Builder.Where(x => x.ParentId == id);
+                return repository.Count(query);
+            }
+        }
+
+        /// <summary>
+        /// Checks whether an <see cref="IContent"/> item has any published versions
+        /// </summary>
+        /// <param name="id">Id of the <see cref="IContent"/></param>
+        /// <returns>True if the content has any published version otherwise False</returns>
+        public bool HasPublishedVersion(int id)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                var query = Query<IContent>.Builder.Where(x => x.Published == true && x.Id == id && x.Trashed == false);
+                return repository.Count(query) > 0;
+            }
+        }
+
+        /// <summary>
+        /// Checks if the passed in <see cref="IContent"/> can be published based on the anscestors publish state.
+        /// </summary>
+        /// <param name="content"><see cref="IContent"/> to check if anscestors are published</param>
+        /// <returns>True if the Content can be published, otherwise False</returns>
+        public bool IsPublishable(IContent content)
+        {
+            int[] ids;
+            if (content.HasIdentity)
+            {
+                // get ids from path (we have identity)
+                // skip the first one that has to be -1 - and we don't care
+                // skip the last one that has to be "this" - and it's ok to stop at the parent
+                ids = content.Path.Split(',').Skip(1).SkipLast().Select(int.Parse).ToArray();
+            }
+            else
+            {
+                // no path yet (no identity), have to move up to parent
+                // skip the first one that has to be -1 - and we don't care
+                // don't skip the last one that is "parent"
+                var parent = GetById(content.ParentId);
+                if (parent == null) return false;
+                ids = parent.Path.Split(',').Skip(1).Select(int.Parse).ToArray();
+            }
+            if (ids.Length == 0)
+                return false;
+
+            // if the first one is recycle bin, fail fast
+            if (ids[0] == Constants.System.RecycleBinContent)
+                return false;
+
+            // fixme - move to repository?
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var sql = new Sql(@"
+                    SELECT id
+                    FROM umbracoNode
+                    JOIN cmsDocument ON umbracoNode.id=cmsDocument.nodeId AND cmsDocument.published=@0
+                    WHERE umbracoNode.trashed=@1 AND umbracoNode.id IN (@2)",
+                    true, false, ids);
+                var x = uow.Database.Fetch<int>(sql);
+                return ids.Length == x.Count;
+            }
+        }
+
+        /// <summary>
+        /// This will rebuild the xml structures for content in the database.
+        /// </summary>
+        /// <param name="userId">This is not used for anything</param>
+        /// <returns>True if publishing succeeded, otherwise False</returns>
+        /// <remarks>
+        /// This is used for when a document type alias or a document type property is changed, the xml will need to
+        /// be regenerated.
+        /// </remarks>
+        public bool RePublishAll(int userId = 0)
+        {
+            try
+            {
+                RebuildXmlStructures();
+                return true;
+            }
+            catch (Exception ex)
+            {
+                Logger.Error<ContentService>("An error occurred executing RePublishAll", ex);
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// This will rebuild the xml structures for content in the database.
+        /// </summary>
+        /// <param name="contentTypeIds">
+        /// If specified will only rebuild the xml for the content type's specified, otherwise will update the structure
+        /// for all published content.
+        /// </param>
+        internal void RePublishAll(params int[] contentTypeIds)
+        {
+            try
+            {
+                RebuildXmlStructures(contentTypeIds);
+            }
+            catch (Exception ex)
+            {
+                Logger.Error<ContentService>("An error occurred executing RePublishAll", ex);
+            }
+        }
+
+        /// <summary>
+        /// Publishes a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to publish</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <returns>True if publishing succeeded, otherwise False</returns>
+        public bool Publish(IContent content, int userId = 0)
+        {
+            var result = SaveAndPublishDo(content, userId);
+            Logger.Info<ContentService>("Call was made to ContentService.Publish, use PublishWithStatus instead since that method will provide more detailed information on the outcome");
+            return result.Success;
+        }
+
+        /// <summary>
+        /// Publishes a <see cref="IContent"/> object and all its children
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to publish along with its children</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <param name="includeUnpublished"></param>
+        /// <returns>The list of statuses for all published items</returns>
+        IEnumerable<Attempt<PublishStatus>> IContentServiceOperations.PublishWithChildren(IContent content, int userId, bool includeUnpublished)
+        {
+            return PublishWithChildrenDo(content, userId, includeUnpublished);
+        }
+
+        /// <summary>
+        /// Saves and Publishes a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to save and publish</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise save events.</param>
+        /// <returns>True if publishing succeeded, otherwise False</returns>
+        Attempt<PublishStatus> IContentServiceOperations.SaveAndPublish(IContent content, int userId, bool raiseEvents)
+        {
+            return SaveAndPublishDo(content, userId, raiseEvents);
+        }
+
+        /// <summary>
+        /// Deletes an <see cref="IContent"/> object by moving it to the Recycle Bin
+        /// </summary>
+        /// <remarks>Move an item to the Recycle Bin will result in the item being unpublished</remarks>
+        /// <param name="content">The <see cref="IContent"/> to delete</param>
+        /// <param name="userId">Optional Id of the User deleting the Content</param>
+        Attempt<OperationStatus> IContentServiceOperations.MoveToRecycleBin(IContent content, int userId)
+        {
+            return MoveToRecycleBinDo(content, userId, false);
+        }
+
+        /// <summary>
+        /// Deletes an <see cref="IContent"/> object by moving it to the Recycle Bin
+        /// </summary>
+        /// <remarks>Move an item to the Recycle Bin will result in the item being unpublished</remarks>
+        /// <param name="content">The <see cref="IContent"/> to delete</param>
+        /// <param name="userId">Optional Id of the User deleting the Content</param>
+        /// <param name="ignoreDescendants">
+        /// A boolean indicating to ignore this item's descendant list from also being moved to the recycle bin. This is required for the DeleteContentOfTypes method
+        /// because it has already looked up all descendant nodes that will need to be recycled
+        /// TODO: Fix all of this, it will require a reasonable refactor and most of this stuff should be done at the repo level instead of service sub operations
+        /// </param>
+        private Attempt<OperationStatus> MoveToRecycleBinDo(IContent content, int userId, bool ignoreDescendants)
+        {
+            var evtMsgs = EventMessagesFactory.Get();
+            using (new WriteLock(Locker))
+            {
+                using (var uow = UowProvider.GetUnitOfWork())
+                {
+                    //Hack: this ensures that the entity's path is valid and if not it fixes/persists it
+                    //see: http://issues.umbraco.org/issue/U4-9336
+                    content.EnsureValidPath(Logger, entity => GetById(entity.ParentId), QuickUpdate);
+                    var originalPath = content.Path;
+                    var moveEventInfo = new MoveEventInfo<IContent>(content, originalPath, Constants.System.RecycleBinContent);
+                    var moveEventArgs = new MoveEventArgs<IContent>(evtMsgs, moveEventInfo);
+                    if (uow.Events.DispatchCancelable(Trashing, this, moveEventArgs, "Trashing"))
+                    {
+                        uow.Commit();
+                        return OperationStatus.Cancelled(evtMsgs);
+                    }
+                    var moveInfo = new List<MoveEventInfo<IContent>>
+                    {
+                        moveEventInfo
+                    };
+
+                    //get descendents to process of the content item that is being moved to trash - must be done before changing the state below
+                    //must be processed with shallowest levels first
+                    var descendants = ignoreDescendants ? Enumerable.Empty<IContent>() : GetDescendants(content).OrderBy(x => x.Level);
+
+                    //Do the updates for this item
+                    var repository = RepositoryFactory.CreateContentRepository(uow);
+                    //Make sure that published content is unpublished before being moved to the Recycle Bin
+                    if (HasPublishedVersion(content.Id))
+                    {
+                        //TODO: this shouldn't be a 'sub operation', and if it needs to be it cannot raise events and cannot be cancelled!
+                        UnPublish(content, userId);
+                    }
+                    content.WriterId = userId;
+                    content.ChangeTrashedState(true);
+                    repository.AddOrUpdate(content);
+
+                    //Loop through descendants to update their trash state, but ensuring structure by keeping the ParentId
+                    foreach (var descendant in descendants)
+                    {
+                        //TODO: this shouldn't be a 'sub operation', and if it needs to be it cannot raise events and cannot be cancelled!
+                        UnPublish(descendant, userId);
+                        descendant.WriterId = userId;
+                        descendant.ChangeTrashedState(true, descendant.ParentId);
+                        repository.AddOrUpdate(descendant);
+
+                        moveInfo.Add(new MoveEventInfo<IContent>(descendant, descendant.Path, descendant.ParentId));
+                    }
+
+                    moveEventArgs.CanCancel = false;
+                    moveEventArgs.MoveInfoCollection = moveInfo;
+                    uow.Events.Dispatch(Trashed, this, moveEventArgs, "Trashed");
+
+                    Audit(uow, AuditType.Move, "Move Content to Recycle Bin performed by user", userId, content.Id);
+                    uow.Commit();
+                }
+
+                return OperationStatus.Success(evtMsgs);
+            }
+        }
+
+        /// <summary>
+        /// UnPublishes a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to publish</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <returns>True if unpublishing succeeded, otherwise False</returns>
+        Attempt<UnPublishStatus> IContentServiceOperations.UnPublish(IContent content, int userId)
+        {
+            return UnPublishDo(content, false, userId);
+        }
+
+        /// <summary>
+        /// Publishes a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to publish</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <returns>True if publishing succeeded, otherwise False</returns>
+        public Attempt<PublishStatus> PublishWithStatus(IContent content, int userId = 0)
+        {
+            return ((IContentServiceOperations)this).Publish(content, userId);
+        }
+
+        /// <summary>
+        /// Publishes a <see cref="IContent"/> object and all its children
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to publish along with its children</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <returns>True if publishing succeeded, otherwise False</returns>
+        [Obsolete("Use PublishWithChildrenWithStatus instead, that method will provide more detailed information on the outcome and also allows the includeUnpublished flag")]
+        public bool PublishWithChildren(IContent content, int userId = 0)
+        {
+            var result = PublishWithChildrenDo(content, userId, true);
+
+            //This used to just return false only when the parent content failed, otherwise would always return true so we'll
+            // do the same thing for the moment
+            if (result.All(x => x.Result.ContentItem.Id != content.Id))
+                return false;
+
+            return result.Single(x => x.Result.ContentItem.Id == content.Id).Success;
+        }
+
+        /// <summary>
+        /// Publishes a <see cref="IContent"/> object and all its children
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to publish along with its children</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <param name="includeUnpublished">set to true if you want to also publish children that are currently unpublished</param>
+        /// <returns>True if publishing succeeded, otherwise False</returns>
+        public IEnumerable<Attempt<PublishStatus>> PublishWithChildrenWithStatus(IContent content, int userId = 0, bool includeUnpublished = false)
+        {
+            return ((IContentServiceOperations)this).PublishWithChildren(content, userId, includeUnpublished);
+        }
+
+        /// <summary>
+        /// UnPublishes a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to publish</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <returns>True if unpublishing succeeded, otherwise False</returns>
+        public bool UnPublish(IContent content, int userId = 0)
+        {
+            var attempt = ((IContentServiceOperations)this).UnPublish(content, userId);
+            LogHelper.Debug<ContentService>(string.Format("Result of unpublish attempt: {0}", attempt.Result.StatusType));
+            return attempt.Success;
+        }
+
+        /// <summary>
+        /// Saves and Publishes a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to save and publish</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise save events.</param>
+        /// <returns>True if publishing succeeded, otherwise False</returns>
+        [Obsolete("Use SaveAndPublishWithStatus instead, that method will provide more detailed information on the outcome")]
+        public bool SaveAndPublish(IContent content, int userId = 0, bool raiseEvents = true)
+        {
+            var result = SaveAndPublishDo(content, userId, raiseEvents);
+            return result.Success;
+        }
+
+        /// <summary>
+        /// Saves and Publishes a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to save and publish</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise save events.</param>
+        /// <returns>True if publishing succeeded, otherwise False</returns>
+        public Attempt<PublishStatus> SaveAndPublishWithStatus(IContent content, int userId = 0, bool raiseEvents = true)
+        {
+            return ((IContentServiceOperations)this).SaveAndPublish(content, userId, raiseEvents);
+        }
+
+        public IContent GetBlueprintById(int id)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentBlueprintRepository(uow);
+                var blueprint = repository.Get(id);
+                if (blueprint != null)
+                    ((Content) blueprint).IsBlueprint = true;
+                return blueprint;
+            }
+        }
+
+        public IContent GetBlueprintById(Guid id)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentBlueprintRepository(uow);
+                var blueprint = repository.Get(id);
+                if (blueprint != null)
+                    ((Content)blueprint).IsBlueprint = true;
+                return blueprint;
+            }
+        }
+
+        public void SaveBlueprint(IContent content, int userId = 0)
+        {
+            //always ensure the blueprint is at the root
+            if (content.ParentId != -1)
+                content.ParentId = -1;
+
+            ((Content) content).IsBlueprint = true;
+
+            using (new WriteLock(Locker))
+            {
+                using (var uow = UowProvider.GetUnitOfWork())
+                {
+                    if (string.IsNullOrWhiteSpace(content.Name))
+                    {
+                        throw new ArgumentException("Cannot save content blueprint with empty name.");
+                    }
+
+                    var repository = RepositoryFactory.CreateContentBlueprintRepository(uow);
+
+                    if (content.HasIdentity == false)
+                    {
+                        content.CreatorId = userId;
+                    }
+                    content.WriterId = userId;
+
+                    repository.AddOrUpdate(content);
+
+                    uow.Events.Dispatch(SavedBlueprint, this, new SaveEventArgs<IContent>(content), "SavedBlueprint");
+
+                    uow.Commit();
+                }
+            }
+        }
+
+        public void DeleteBlueprint(IContent content, int userId = 0)
+        {
+            using (new WriteLock(Locker))
+            {
+                using (var uow = UowProvider.GetUnitOfWork())
+                {
+                    var repository = RepositoryFactory.CreateContentBlueprintRepository(uow);
+                    repository.Delete(content);
+                    uow.Events.Dispatch(DeletedBlueprint, this, new DeleteEventArgs<IContent>(content), "DeletedBlueprint");
+                    uow.Commit();
+                }
+            }
+        }
+
+        public IContent CreateContentFromBlueprint(IContent blueprint, string name, int userId = 0)
+        {
+            if (blueprint == null) throw new ArgumentNullException("blueprint");
+
+            var contentType = blueprint.ContentType;
+            var content = new Content(name, -1, contentType);
+            content.Path = string.Concat(content.ParentId.ToString(), ",", content.Id);
+
+            content.CreatorId = userId;
+            content.WriterId = userId;
+
+            foreach (var property in blueprint.Properties)
+                content.SetValue(property.Alias, property.Value);
+
+            return content;
+        }
+
+        public void DeleteBlueprintsOfTypes(IEnumerable<int> contentTypeIds, int userId = 0)
+        {
+            using (new WriteLock(Locker))
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var repository = RepositoryFactory.CreateContentBlueprintRepository(uow);
+
+                var contentTypeIdsA = contentTypeIds.ToArray();
+                var query = new Query<IContent>();
+                if (contentTypeIdsA.Length > 0)
+                {
+                    query.Where(x => contentTypeIdsA.Contains(x.ContentTypeId));
+                }
+                var blueprints = repository.GetByQuery(query).Select(x =>
+                {
+                    ((Content) x).IsBlueprint = true;
+                    return x;
+                }).ToArray();
+
+                foreach (var blueprint in blueprints)
+                {
+                    repository.Delete(blueprint);
+                }
+
+                uow.Events.Dispatch(DeletedBlueprint, this, new DeleteEventArgs<IContent>(blueprints), "DeletedBlueprint");
+                uow.Commit();
+            }
+        }
+
+        public void DeleteBlueprintsOfType(int contentTypeId, int userId = 0)
+        {
+            DeleteBlueprintsOfTypes(new[] {contentTypeId}, userId);
+        }
+
+        /// <summary>
+        /// Saves a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to save</param>
+        /// <param name="userId">Optional Id of the User saving the Content</param>
+        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
+        public void Save(IContent content, int userId = 0, bool raiseEvents = true)
+        {
+            ((IContentServiceOperations)this).Save(content, userId, raiseEvents);
+        }
+
+        /// <summary>
+        /// Saves a collection of <see cref="IContent"/> objects.
+        /// </summary>
+        /// <param name="contents">Collection of <see cref="IContent"/> to save</param>
+        /// <param name="userId">Optional Id of the User saving the Content</param>
+        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
+        Attempt<OperationStatus> IContentServiceOperations.Save(IEnumerable<IContent> contents, int userId, bool raiseEvents)
+        {
+            var asArray = contents.ToArray();
+
+            var evtMsgs = EventMessagesFactory.Get();
+
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var saveEventArgs = new SaveEventArgs<IContent>(asArray, evtMsgs);
+                if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
+                {
+                    uow.Commit();
+                    return OperationStatus.Cancelled(evtMsgs);
+                }
+
+                // todo - understand what's a lock in a scope?
+                // (though, these locks are refactored in v8)
+                using (new WriteLock(Locker))
+                {
+                    var containsNew = asArray.Any(x => x.HasIdentity == false);
+                    var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                    if (containsNew)
+                    {
+                        foreach (var content in asArray)
+                        {
+                            content.WriterId = userId;
+
+                            //Only change the publish state if the "previous" version was actually published
+                            if (content.Published)
+                                content.ChangePublishedState(PublishedState.Saved);
+
+                            repository.AddOrUpdate(content);
+                            //add or update preview
+                            repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                        }
+                    }
+                    else
+                    {
+                        foreach (var content in asArray)
+                        {
+                            content.WriterId = userId;
+                            repository.AddOrUpdate(content);
+                            //add or update preview
+                            repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                        }
+                    }
+                }
+
+                if (raiseEvents)
+                {
+                    saveEventArgs.CanCancel = false;
+                    uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
+                }
+
+                Audit(uow, AuditType.Save, "Bulk Save content performed by user", userId == -1 ? 0 : userId, Constants.System.Root);
+                uow.Commit();
+
+                return OperationStatus.Success(evtMsgs);
+            }
+        }
+
+        /// <summary>
+        /// Permanently deletes an <see cref="IContent"/> object.
+        /// </summary>
+        /// <remarks>
+        /// This method will also delete associated media files, child content and possibly associated domains.
+        /// </remarks>
+        /// <remarks>Please note that this method will completely remove the Content from the database</remarks>
+        /// <param name="content">The <see cref="IContent"/> to delete</param>
+        /// <param name="userId">Optional Id of the User deleting the Content</param>
+        Attempt<OperationStatus> IContentServiceOperations.Delete(IContent content, int userId)
+        {
+            var evtMsgs = EventMessagesFactory.Get();
+
+            using (new WriteLock(Locker))
+            {
+                using (var uow = UowProvider.GetUnitOfWork())
+                {
+                    var deleteEventArgs = new DeleteEventArgs<IContent>(content, evtMsgs);
+                    if (uow.Events.DispatchCancelable(Deleting, this, deleteEventArgs, "Deleting"))
+                    {
+                        uow.Commit();
+                        return OperationStatus.Cancelled(evtMsgs);
+                    }
+
+                    //Make sure that published content is unpublished before being deleted
+                    if (HasPublishedVersion(content.Id))
+                    {
+                        UnPublish(content, userId);
+                    }
+
+                    //Delete children before deleting the 'possible parent'
+                    var children = GetChildren(content.Id);
+                    foreach (var child in children)
+                    {
+                        Delete(child, userId);
+                    }
+
+                    var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                    repository.Delete(content);
+
+                    deleteEventArgs.CanCancel = false;
+                    uow.Events.Dispatch(Deleted, this, deleteEventArgs, "Deleted");
+
+                    Audit(uow, AuditType.Delete, "Delete Content performed by user", userId, content.Id);
+                    uow.Commit();
+                }
+
+                return OperationStatus.Success(evtMsgs);
+            }
+        }
+
+        /// <summary>
+        /// Publishes a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to publish</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <returns>The published status attempt</returns>
+        Attempt<PublishStatus> IContentServiceOperations.Publish(IContent content, int userId)
+        {
+            return SaveAndPublishDo(content, userId);
+        }
+
+        /// <summary>
+        /// Saves a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to save</param>
+        /// <param name="userId">Optional Id of the User saving the Content</param>
+        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
+        Attempt<OperationStatus> IContentServiceOperations.Save(IContent content, int userId, bool raiseEvents)
+        {
+            return Save(content, true, userId, raiseEvents);
+        }
+
+        /// <summary>
+        /// Saves a collection of <see cref="IContent"/> objects.
+        /// </summary>
+        /// <remarks>
+        /// If the collection of content contains new objects that references eachother by Id or ParentId,
+        /// then use the overload Save method with a collection of Lazy <see cref="IContent"/>.
+        /// </remarks>
+        /// <param name="contents">Collection of <see cref="IContent"/> to save</param>
+        /// <param name="userId">Optional Id of the User saving the Content</param>
+        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
+        public void Save(IEnumerable<IContent> contents, int userId = 0, bool raiseEvents = true)
+        {
+            ((IContentServiceOperations)this).Save(contents, userId, raiseEvents);
+        }
+
+        /// <summary>
+        /// Deletes all content of the specified types. All Descendants of deleted content that is not of these types is moved to Recycle Bin.
+        /// </summary>
+        /// <param name="contentTypeIds">Id of the <see cref="IContentType"/></param>
+        /// <param name="userId">Optional Id of the user issueing the delete operation</param>
+        public void DeleteContentOfTypes(IEnumerable<int> contentTypeIds, int userId = 0)
+        {
+            using (new WriteLock(Locker))
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                //track the 'root' items of the collection of nodes discovered to delete, we need to use
+                //these items to lookup descendants that are not of this doc type so they can be transfered
+                //to the recycle bin
+                IDictionary<string, IContent> rootItems;
+                var contentToDelete = this.TrackDeletionsForDeleteContentOfTypes(contentTypeIds, repository, out rootItems).ToArray();
+
+                if (uow.Events.DispatchCancelable(Deleting, this, new DeleteEventArgs<IContent>(contentToDelete), "Deleting"))
+                {
+                    uow.Commit();
+                    return;
+                }
+
+                //Determine the items that will need to be recycled (that are children of these content items but not of these content types)
+                var contentToRecycle = this.TrackTrashedForDeleteContentOfTypes(contentTypeIds, rootItems, repository);
+
+                //move each item to the bin starting with the deepest items
+                foreach (var child in contentToRecycle.OrderByDescending(x => x.Level))
+                {
+                    MoveToRecycleBinDo(child, userId, true);
+                }
+
+                foreach (var content in contentToDelete)
+                {
+                    Delete(content, userId);
+                }
+
+                Audit(uow, AuditType.Delete,
+                    string.Format("Delete Content of Types {0} performed by user", string.Join(",", contentTypeIds)),
+                    userId, Constants.System.Root);
+                uow.Commit();
+            }
+        }
+
+        /// <summary>
+        /// Deletes all content of specified type. All children of deleted content is moved to Recycle Bin.
+        /// </summary>
+        /// <remarks>This needs extra care and attention as its potentially a dangerous and extensive operation</remarks>
+        /// <param name="contentTypeId">Id of the <see cref="IContentType"/></param>
+        /// <param name="userId">Optional Id of the user issueing the delete operation</param>
+        public void DeleteContentOfType(int contentTypeId, int userId = 0)
+        {
+            DeleteContentOfTypes(new[] {contentTypeId}, userId);
+        }
+
+        /// <summary>
+        /// Permanently deletes an <see cref="IContent"/> object as well as all of its Children.
+        /// </summary>
+        /// <remarks>
+        /// This method will also delete associated media files, child content and possibly associated domains.
+        /// </remarks>
+        /// <remarks>Please note that this method will completely remove the Content from the database</remarks>
+        /// <param name="content">The <see cref="IContent"/> to delete</param>
+        /// <param name="userId">Optional Id of the User deleting the Content</param>
+        public void Delete(IContent content, int userId = 0)
+        {
+            ((IContentServiceOperations)this).Delete(content, userId);
+        }
+
+        /// <summary>
+        /// Permanently deletes versions from an <see cref="IContent"/> object prior to a specific date.
+        /// This method will never delete the latest version of a content item.
+        /// </summary>
+        /// <param name="id">Id of the <see cref="IContent"/> object to delete versions from</param>
+        /// <param name="versionDate">Latest version date</param>
+        /// <param name="userId">Optional Id of the User deleting versions of a Content object</param>
+        public void DeleteVersions(int id, DateTime versionDate, int userId = 0)
+        {
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var deleteRevisionsEventArgs = new DeleteRevisionsEventArgs(id, dateToRetain: versionDate);
+                if (uow.Events.DispatchCancelable(DeletingVersions, this, deleteRevisionsEventArgs, "DeletingVersions"))
+                {
+                    uow.Commit();
+                    return;
+                }
+
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                repository.DeleteVersions(id, versionDate);
+                deleteRevisionsEventArgs.CanCancel = false;
+                uow.Events.Dispatch(DeletedVersions, this, deleteRevisionsEventArgs, "DeletedVersions");
+
+                Audit(uow, AuditType.Delete, "Delete Content by version date performed by user", userId, Constants.System.Root);
+                uow.Commit();
+            }
+        }
+
+        /// <summary>
+        /// Permanently deletes specific version(s) from an <see cref="IContent"/> object.
+        /// This method will never delete the latest version of a content item.
+        /// </summary>
+        /// <param name="id">Id of the <see cref="IContent"/> object to delete a version from</param>
+        /// <param name="versionId">Id of the version to delete</param>
+        /// <param name="deletePriorVersions">Boolean indicating whether to delete versions prior to the versionId</param>
+        /// <param name="userId">Optional Id of the User deleting versions of a Content object</param>
+        public void DeleteVersion(int id, Guid versionId, bool deletePriorVersions, int userId = 0)
+        {
+            using (new WriteLock(Locker))
+            {
+                using (var uow = UowProvider.GetUnitOfWork())
+                {
+                    if (uow.Events.DispatchCancelable(DeletingVersions, this, new DeleteRevisionsEventArgs(id, specificVersion: versionId), "DeletingVersions"))
+                    {
+                        uow.Commit();
+                        return;
+                    }
+
+                    if (deletePriorVersions)
+                    {
+                        var content = GetByVersion(versionId);
+                        DeleteVersions(id, content.UpdateDate, userId);
+                    }
+
+                    var repository = RepositoryFactory.CreateContentRepository(uow);
+                    repository.DeleteVersion(versionId);
+
+                    uow.Events.Dispatch(DeletedVersions, this, new DeleteRevisionsEventArgs(id, false, specificVersion: versionId), "DeletedVersions");
+
+                    Audit(uow, AuditType.Delete, "Delete Content by version performed by user", userId, Constants.System.Root);
+                    uow.Commit();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Deletes an <see cref="IContent"/> object by moving it to the Recycle Bin
+        /// </summary>
+        /// <remarks>Move an item to the Recycle Bin will result in the item being unpublished</remarks>
+        /// <param name="content">The <see cref="IContent"/> to delete</param>
+        /// <param name="userId">Optional Id of the User deleting the Content</param>
+        public void MoveToRecycleBin(IContent content, int userId = 0)
+        {
+            ((IContentServiceOperations)this).MoveToRecycleBin(content, userId);
+        }
+
+        /// <summary>
+        /// Moves an <see cref="IContent"/> object to a new location by changing its parent id.
+        /// </summary>
+        /// <remarks>
+        /// If the <see cref="IContent"/> object is already published it will be
+        /// published after being moved to its new location. Otherwise it'll just
+        /// be saved with a new parent id.
+        /// </remarks>
+        /// <param name="content">The <see cref="IContent"/> to move</param>
+        /// <param name="parentId">Id of the Content's new Parent</param>
+        /// <param name="userId">Optional Id of the User moving the Content</param>
+        public void Move(IContent content, int parentId, int userId = 0)
+        {
+            using (new WriteLock(Locker))
+            {
+                //This ensures that the correct method is called if this method is used to Move to recycle bin.
+                if (parentId == Constants.System.RecycleBinContent)
+                {
+                    MoveToRecycleBin(content, userId);
+                    return;
+                }
+
+                using (var uow = UowProvider.GetUnitOfWork())
+                {
+                    var moveEventInfo = new MoveEventInfo<IContent>(content, content.Path, parentId);
+                    var moveEventArgs = new MoveEventArgs<IContent>(moveEventInfo);
+                    if (uow.Events.DispatchCancelable(Moving, this, moveEventArgs, "Moving"))
+                    {
+                        uow.Commit();
+                        return;
+                    }
+
+                    //used to track all the moved entities to be given to the event
+                    var moveInfo = new List<MoveEventInfo<IContent>>();
+
+                    //call private method that does the recursive moving
+                    PerformMove(content, parentId, userId, moveInfo);
+
+                    moveEventArgs.MoveInfoCollection = moveInfo;
+                    moveEventArgs.CanCancel = false;
+                    uow.Events.Dispatch(Moved, this, moveEventArgs, "Moved");
+
+                    Audit(uow, AuditType.Move, "Move Content performed by user", userId, content.Id);
+                    uow.Commit();
+                }
+            }
+        }
+
+        /// <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")]
+        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))
+            {
+                var nodeObjectType = Constants.ObjectTypes.DocumentGuid;
+
+                using (var uow = UowProvider.GetUnitOfWork())
+                {
+                    var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                    //Create a dictionary of ids -> dictionary of property aliases + values
+                    var entities = repository.GetEntitiesInRecycleBin()
+                        .ToDictionary(
+                            key => key.Id,
+                            val => (IEnumerable<Property>)val.Properties);
+
+                    var files = ((ContentRepository)repository).GetFilesInRecycleBinForUploadField();
+
+                    var recycleBinEventArgs = new RecycleBinEventArgs(nodeObjectType, entities, files);
+                    if (uow.Events.DispatchCancelable(EmptyingRecycleBin, this, recycleBinEventArgs))
+                    {
+                        uow.Commit();
+                        return;
+                    }
+
+                    var success = repository.EmptyRecycleBin();
+                    recycleBinEventArgs.CanCancel = false;
+                    recycleBinEventArgs.RecycleBinEmptiedSuccessfully = success;
+                    uow.Events.Dispatch(EmptiedRecycleBin, this, recycleBinEventArgs);
+
+                    Audit(uow, AuditType.Delete, "Empty Content Recycle Bin performed by user", userId, Constants.System.RecycleBinContent);
+                    uow.Commit();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Copies an <see cref="IContent"/> object by creating a new Content object of the same type and copies all data from the current
+        /// to the new copy which is returned. Recursively copies all children.
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to copy</param>
+        /// <param name="parentId">Id of the Content's new Parent</param>
+        /// <param name="relateToOriginal">Boolean indicating whether the copy should be related to the original</param>
+        /// <param name="userId">Optional Id of the User copying the Content</param>
+        /// <returns>The newly created <see cref="IContent"/> object</returns>
+        public IContent Copy(IContent content, int parentId, bool relateToOriginal, int userId = 0)
+        {
+            return Copy(content, parentId, relateToOriginal, true, userId);
+        }
+
+        /// <summary>
+        /// Copies an <see cref="IContent"/> object by creating a new Content object of the same type and copies all data from the current
+        /// to the new copy which is returned.
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to copy</param>
+        /// <param name="parentId">Id of the Content's new Parent</param>
+        /// <param name="relateToOriginal">Boolean indicating whether the copy should be related to the original</param>
+        /// <param name="recursive">A value indicating whether to recursively copy children.</param>
+        /// <param name="userId">Optional Id of the User copying the Content</param>
+        /// <returns>The newly created <see cref="IContent"/> object</returns>
+        public IContent Copy(IContent content, int parentId, bool relateToOriginal, bool recursive, int userId = 0)
+        {
+            //TODO: This all needs to be managed correctly so that the logic is submitted in one
+            // transaction, the CRUD needs to be moved to the repo
+
+            using (new WriteLock(Locker))
+            {
+                var copy = content.DeepCloneWithResetIdentities();
+                copy.ParentId = parentId;
+
+                // A copy should never be set to published automatically even if the original was.
+                copy.ChangePublishedState(PublishedState.Unpublished);
+
+                using (var uow = UowProvider.GetUnitOfWork())
+                {
+                    var copyEventArgs = new CopyEventArgs<IContent>(content, copy, true, parentId, relateToOriginal);
+                    if (uow.Events.DispatchCancelable(Copying, this, copyEventArgs))
+                    {
+                        uow.Commit();
+                        return null;
+                    }
+
+                    var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                    // Update the create author and last edit author
+                    copy.CreatorId = userId;
+                    copy.WriterId = userId;
+
+                    //get the current permissions, if there are any explicit ones they need to be copied
+                    var currentPermissions = GetPermissionsForEntity(content);
+                    currentPermissions.RemoveWhere(p => p.IsDefaultPermissions);
+
+                    repository.AddOrUpdate(copy);
+                    repository.AddOrUpdatePreviewXml(copy, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+
+                    //add permissions
+                    if (currentPermissions.Count > 0)
+                    {
+                        var permissionSet = new ContentPermissionSet(copy, currentPermissions);
+                        repository.AddOrUpdatePermissions(permissionSet);
+                    }
+
+                    uow.Commit(); // todo - this should flush, not commit
+
+                    //Special case for the associated tags
+                    //TODO: Move this to the repository layer in a single transaction!
+                    //don't copy tags data in tags table if the item is in the recycle bin
+                    if (parentId != Constants.System.RecycleBinContent)
+                    {
+                        var tags = uow.Database.Fetch<TagRelationshipDto>("WHERE nodeId = @Id", new { Id = content.Id });
+                        foreach (var tag in tags)
+                            uow.Database.Insert(new TagRelationshipDto
+                            {
+                                NodeId = copy.Id, TagId = tag.TagId, PropertyTypeId = tag.PropertyTypeId
+                            });
+                    }
+                    uow.Commit(); // todo - this should flush, not commit
+
+                    if (recursive)
+                    {
+                        //Look for children and copy those as well
+                        var children = GetChildren(content.Id);
+                        foreach (var child in children)
+                        {
+                            //TODO: This shouldn't recurse back to this method, it should be done in a private method
+                            // that doesn't have a nested lock and so we can perform the entire operation in one commit.
+                            Copy(child, copy.Id, relateToOriginal, true, userId);
+                        }
+                    }
+                    copyEventArgs.CanCancel = false;
+                    uow.Events.Dispatch(Copied, this, copyEventArgs);
+                    Audit(uow, AuditType.Copy, "Copy Content performed by user", userId, content.Id);
+                    uow.Commit();
+                }
+
+                return copy;
+            }
+        }
+
+
+        /// <summary>
+        /// Sends an <see cref="IContent"/> to Publication, which executes handlers and events for the 'Send to Publication' action.
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to send to publication</param>
+        /// <param name="userId">Optional Id of the User issueing the send to publication</param>
+        /// <returns>True if sending publication was succesfull otherwise false</returns>
+        public bool SendToPublication(IContent content, int userId = 0)
+        {
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var sendToPublishEventArgs = new SendToPublishEventArgs<IContent>(content);
+                if (uow.Events.DispatchCancelable(SendingToPublish, this, sendToPublishEventArgs))
+                {
+                    uow.Commit();
+                    return false;
+                }
+
+                //Save before raising event
+                Save(content, userId);
+                sendToPublishEventArgs.CanCancel = false;
+                uow.Events.Dispatch(SentToPublish, this, sendToPublishEventArgs);
+
+                Audit(uow, AuditType.SendToPublish, "Send to Publish performed by user", content.WriterId, content.Id);
+                uow.Commit();
+
+                return true;
+            }
+        }
+
+        /// <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.
+        /// </summary>
+        /// <remarks>
+        /// The way data is stored actually only allows us to rollback on properties
+        /// and not data like Name and Alias of the Content.
+        /// </remarks>
+        /// <param name="id">Id of the <see cref="IContent"/>being rolled back</param>
+        /// <param name="versionId">Id of the version to rollback to</param>
+        /// <param name="userId">Optional Id of the User issueing the rollback of the Content</param>
+        /// <returns>The newly created <see cref="IContent"/> object</returns>
+        public IContent Rollback(int id, Guid versionId, int userId = 0)
+        {
+            var content = GetByVersion(versionId);
+
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var rollbackEventArgs = new RollbackEventArgs<IContent>(content);
+                if (uow.Events.DispatchCancelable(RollingBack, this, rollbackEventArgs))
+                {
+                    uow.Commit();
+                    return content;
+                }
+
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                content.WriterId = userId;
+                content.CreatorId = userId;
+                content.ChangePublishedState(PublishedState.Unpublished);
+
+                repository.AddOrUpdate(content);
+                repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                rollbackEventArgs.CanCancel = false;
+                uow.Events.Dispatch(RolledBack, this, rollbackEventArgs);
+
+                Audit(uow, AuditType.RollBack, "Content rollback performed by user", content.WriterId, content.Id);
+                uow.Commit();
+            }
+
+            return content;
+        }
+
+        /// <summary>
+        /// Sorts a collection of <see cref="IContent"/> objects by updating the SortOrder according
+        /// to the ordering of items in the passed in <see cref="IEnumerable{T}"/>.
+        /// </summary>
+        /// <remarks>
+        /// Using this method will ensure that the Published-state is maintained upon sorting
+        /// so the cache is updated accordingly - as needed.
+        /// </remarks>
+        /// <param name="items"></param>
+        /// <param name="userId"></param>
+        /// <param name="raiseEvents"></param>
+        /// <returns>True if sorting succeeded, otherwise False</returns>
+        public bool Sort(IEnumerable<IContent> items, int userId = 0, bool raiseEvents = true)
+        {
+            var shouldBePublished = new List<IContent>();
+            var shouldBeSaved = new List<IContent>();
+
+            using (new WriteLock(Locker))
+            {
+                using (var uow = UowProvider.GetUnitOfWork())
+                {
+                    var asArray = items.ToArray();
+                    var saveEventArgs = new SaveEventArgs<IContent>(asArray);
+                    if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
+                    {
+                        uow.Commit();
+                        return false;
+                    }
+
+                    var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                    var i = 0;
+                    foreach (var content in asArray)
+                    {
+                        //If the current sort order equals that of the content
+                        //we don't need to update it, so just increment the sort order
+                        //and continue.
+                        if (content.SortOrder == i)
+                        {
+                            i++;
+                            continue;
+                        }
+
+                        content.SortOrder = i;
+                        content.WriterId = userId;
+                        i++;
+
+                        if (content.Published)
+                        {
+                            //TODO: This should not be an inner operation, but if we do this, it cannot raise events and cannot be cancellable!
+                            var published = _publishingStrategy.Publish(uow, content, userId).Success;
+                            shouldBePublished.Add(content);
+                        }
+                        else
+                            shouldBeSaved.Add(content);
+
+                        repository.AddOrUpdate(content);
+                        //add or update a preview
+                        repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                    }
+
+                    foreach (var content in shouldBePublished)
+                    {
+                        //Create and Save ContentXml DTO
+                        repository.AddOrUpdateContentXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                    }
+
+                    if (raiseEvents)
+                    {
+                        saveEventArgs.CanCancel = false;
+                        uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
+                    }
+
+                    if (shouldBePublished.Any())
+                    {
+                        //TODO: This should not be an inner operation, but if we do this, it cannot raise events and cannot be cancellable!
+                        _publishingStrategy.PublishingFinalized(uow, shouldBePublished, false);
+                    }
+
+                    Audit(uow, AuditType.Sort, "Sorting content performed by user", userId, 0);
+                    uow.Commit();
+                }
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// Sorts a collection of <see cref="IContent"/> objects by updating the SortOrder according
+        /// to the ordering of node Ids passed in.
+        /// </summary>
+        /// <remarks>
+        /// Using this method will ensure that the Published-state is maintained upon sorting
+        /// so the cache is updated accordingly - as needed.
+        /// </remarks>
+        /// <param name="ids"></param>
+        /// <param name="userId"></param>
+        /// <param name="raiseEvents"></param>
+        /// <returns>True if sorting succeeded, otherwise False</returns>
+        public bool Sort(int[] ids, int userId = 0, bool raiseEvents = true)
+        {
+            var shouldBePublished = new List<IContent>();
+            var shouldBeSaved = new List<IContent>();
+
+            using (new WriteLock(Locker))
+            {
+                var allContent = GetByIds(ids).ToDictionary(x => x.Id, x => x);
+                if (allContent.Any() == false)
+                {
+                    return false;
+                }
+                var items = ids.Select(x => allContent[x]).ToArray();
+
+                using (var uow = UowProvider.GetUnitOfWork())
+                {
+                    var saveEventArgs = new SaveEventArgs<IContent>(items);
+                    if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
+                    {
+                        uow.Commit();
+                        return false;
+                    }
+
+                    var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                    var i = 0;
+                    foreach (var content in items)
+                    {
+                        //If the current sort order equals that of the content
+                        //we don't need to update it, so just increment the sort order
+                        //and continue.
+                        if (content.SortOrder == i)
+                        {
+                            i++;
+                            continue;
+                        }
+
+                        content.SortOrder = i;
+                        content.WriterId = userId;
+                        i++;
+
+                        if (content.Published)
+                        {
+                            //TODO: This should not be an inner operation, but if we do this, it cannot raise events and cannot be cancellable!
+                            var published = _publishingStrategy.Publish(uow, content, userId).Success;
+                            shouldBePublished.Add(content);
+                        }
+                        else
+                            shouldBeSaved.Add(content);
+
+                        repository.AddOrUpdate(content);
+                        //add or update a preview
+                        repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                    }
+
+                    foreach (var content in shouldBePublished)
+                    {
+                        //Create and Save ContentXml DTO
+                        repository.AddOrUpdateContentXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                    }
+
+                    if (raiseEvents)
+                    {
+                        saveEventArgs.CanCancel = false;
+                        uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
+                    }
+
+                    if (shouldBePublished.Any())
+                    {
+                        //TODO: This should not be an inner operation, but if we do this, it cannot raise events and cannot be cancellable!
+                        _publishingStrategy.PublishingFinalized(uow, shouldBePublished, false);
+                    }
+
+                    Audit(uow, AuditType.Sort, "Sort child items performed by user", userId, items.First().ParentId);
+                    uow.Commit();
+                }
+            }
+
+            return true;
+        }
+
+        public IEnumerable<IContent> GetBlueprintsForContentTypes(params int[] documentTypeIds)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentBlueprintRepository(uow);
+
+                var query = new Query<IContent>();
+                if (documentTypeIds.Length > 0)
+                {
+                    query.Where(x => documentTypeIds.Contains(x.ContentTypeId));
+                }
+                return repository.GetByQuery(query).Select(x =>
+                {
+                    ((Content) x).IsBlueprint = true;
+                    return x;
+                });
+            }
+        }
+
+        /// <summary>
+        /// Gets paged content descendants as XML by path
+        /// </summary>
+        /// <param name="path">Path starts with</param>
+        /// <param name="pageIndex">Page number</param>
+        /// <param name="pageSize">Page size</param>
+        /// <param name="totalRecords">Total records the query would return without paging</param>
+        /// <returns>A paged enumerable of XML entries of content items</returns>
+        public IEnumerable<XElement> GetPagedXmlEntries(string path, long pageIndex, int pageSize, out long totalRecords)
+        {
+            Mandate.ParameterCondition(pageIndex >= 0, "pageIndex");
+            Mandate.ParameterCondition(pageSize > 0, "pageSize");
+
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                var contents = repository.GetPagedXmlEntriesByPath(path, pageIndex, pageSize,
+                    //This order by is VERY important! This allows us to figure out what is implicitly not published, see ContentRepository.BuildXmlCache and
+                    // UmbracoContentIndexer.PerformIndexAll which uses the logic based on this sort order
+                    new[] { "level", "parentID", "sortOrder" },
+                    out totalRecords);
+                return contents;
+            }
+        }
+
+        /// <summary>
+        /// This builds the Xml document used for the XML cache
+        /// </summary>
+        /// <returns></returns>
+        public XmlDocument BuildXmlCache()
+        {
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                var result = repository.BuildXmlCache();
+                uow.Commit();
+                return result;
+            }
+        }
+
+        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>
+        /// <param name="contentTypeIds">
+        /// Only rebuild the xml structures for the content type ids passed in, if none then rebuilds the structures
+        /// for all content
+        /// </param>
+        public void RebuildXmlStructures(params int[] contentTypeIds)
+        {
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                repository.RebuildXmlStructures(
+                    content => _entitySerializer.Serialize(this, _dataTypeService, _userService, content),
+                    contentTypeIds: contentTypeIds.Length == 0 ? null : contentTypeIds);
+
+                Audit(uow, AuditType.Publish, "ContentService.RebuildXmlStructures completed, the xml has been regenerated in the database", 0, Constants.System.Root);
+                uow.Commit();
+            }
+        }
+
+        #region Internal Methods
+
+        /// <summary>
+        /// Gets a collection of <see cref="IContent"/> descendants by the first Parent.
+        /// </summary>
+        /// <param name="content"><see cref="IContent"/> item to retrieve Descendants from</param>
+        /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
+        internal IEnumerable<IContent> GetPublishedDescendants(IContent content)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                var query = Query<IContent>.Builder.Where(x => x.Id != content.Id && x.Path.StartsWith(content.Path) && x.Trashed == false);
+                return repository.GetByPublishedVersion(query);
+            }
+        }
+
+        #endregion
+
+        #region Private Methods
+
+        /// <summary>
+        /// Hack: This is used to fix some data if an entity's properties are invalid/corrupt
+        /// </summary>
+        /// <param name="content"></param>
+        private void QuickUpdate(IContent content)
+        {
+            if (content == null) throw new ArgumentNullException("content");
+            if (content.HasIdentity == false) throw new InvalidOperationException("Cannot update an entity without an Identity");
+
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                repository.AddOrUpdate(content);
+                uow.Commit();
+            }
+        }
+
+        private void Audit(IScopeUnitOfWork uow, AuditType type, string message, int userId, int objectId)
+        {
+            var auditRepo = RepositoryFactory.CreateAuditRepository(uow);
+            auditRepo.AddOrUpdate(new AuditItem(objectId, message, type, userId));
+        }
+
+        //TODO: All of this needs to be moved to the repository
+        private void PerformMove(IContent content, int parentId, int userId, ICollection<MoveEventInfo<IContent>> moveInfo)
+        {
+            //add a tracking item to use in the Moved event
+            moveInfo.Add(new MoveEventInfo<IContent>(content, content.Path, parentId));
+
+            content.WriterId = userId;
+            if (parentId == Constants.System.Root)
+            {
+                content.Path = string.Concat(Constants.System.Root, ",", content.Id);
+                content.Level = 1;
+            }
+            else
+            {
+                var parent = GetById(parentId);
+                content.Path = string.Concat(parent.Path, ",", content.Id);
+                content.Level = parent.Level + 1;
+            }
+
+            //If Content is being moved away from Recycle Bin, its state should be un-trashed
+            if (content.Trashed && parentId != Constants.System.RecycleBinContent)
+            {
+                content.ChangeTrashedState(false, parentId);
+            }
+            else
+            {
+                content.ParentId = parentId;
+            }
+
+            //If Content is published, it should be (re)published from its new location
+            if (content.Published)
+            {
+                //If Content is Publishable its saved and published
+                //otherwise we save the content without changing the publish state, and generate new xml because the Path, Level and Parent has changed.
+                if (IsPublishable(content))
+                {
+                    //TODO: This is raising events, probably not desirable as this costs performance for event listeners like Examine
+                    SaveAndPublish(content, userId);
+                }
+                else
+                {
+                    //TODO: This is raising events, probably not desirable as this costs performance for event listeners like Examine
+                    Save(content, false, userId);
+
+                    //TODO: This shouldn't be here! This needs to be part of the repository logic but in order to fix this we need to
+                    // change how this method calls "Save" as it needs to save using an internal method
+                    using (var uow = UowProvider.GetUnitOfWork())
+                    {
+                        var xml = _entitySerializer.Serialize(this, _dataTypeService, _userService, content);
+
+                        var poco = new ContentXmlDto { NodeId = content.Id, Xml = xml.ToDataString() };
+                        var exists =
+                            uow.Database.FirstOrDefault<ContentXmlDto>("WHERE nodeId = @Id", new { Id = content.Id }) !=
+                            null;
+                        int result = exists
+                                         ? uow.Database.Update(poco)
+                                         : Convert.ToInt32(uow.Database.Insert(poco));
+                        uow.Commit();
+                    }
+                }
+            }
+            else
+            {
+                //TODO: This is raising events, probably not desirable as this costs performance for event listeners like Examine
+                Save(content, userId);
+            }
+
+            //Ensure that Path and Level is updated on children
+            var children = GetChildren(content.Id).ToArray();
+            if (children.Any())
+            {
+                foreach (var child in children)
+                {
+                    PerformMove(child, content.Id, userId, moveInfo);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Publishes a <see cref="IContent"/> object and all its children
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to publish along with its children</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <param name="includeUnpublished">If set to true, this will also publish descendants that are completely unpublished, normally this will only publish children that have previously been published</param>
+        /// <returns>
+        /// A list of publish statues. If the parent document is not valid or cannot be published because it's parent(s) is not published
+        /// then the list will only contain one status item, otherwise it will contain status items for it and all of it's descendants that
+        /// are to be published.
+        /// </returns>
+        private IEnumerable<Attempt<PublishStatus>> PublishWithChildrenDo(
+            IContent content, int userId = 0, bool includeUnpublished = false)
+        {
+            if (content == null) throw new ArgumentNullException("content");
+
+            var evtMsgs = EventMessagesFactory.Get();
+
+            using (new WriteLock(Locker))
+            {
+                //Hack: this ensures that the entity's path is valid and if not it fixes/persists it
+                //see: http://issues.umbraco.org/issue/U4-9336
+                content.EnsureValidPath(Logger, entity => GetById(entity.ParentId), QuickUpdate);
+
+                var result = new List<Attempt<PublishStatus>>();
+
+                //Check if parent is published (although not if its a root node) - if parent isn't published this Content cannot be published
+                if (content.ParentId != Constants.System.Root && content.ParentId != Constants.System.RecycleBinContent && IsPublishable(content) == false)
+                {
+                    Logger.Info<ContentService>(
+                        string.Format(
+                            "Content '{0}' with Id '{1}' could not be published because its parent or one of its ancestors is not published.",
+                            content.Name, content.Id));
+                    result.Add(Attempt.Fail(new PublishStatus(content, PublishStatusType.FailedPathNotPublished, evtMsgs)));
+                    return result;
+                }
+
+                //Content contains invalid property values and can therefore not be published - fire event?
+                if (!content.IsValid())
+                {
+                    Logger.Info<ContentService>(
+                        string.Format("Content '{0}' with Id '{1}' could not be published because of invalid properties.",
+                                      content.Name, content.Id));
+                    result.Add(
+                        Attempt.Fail(
+                            new PublishStatus(content, PublishStatusType.FailedContentInvalid, evtMsgs)
+                            {
+                                InvalidProperties = ((ContentBase)content).LastInvalidProperties
+                            }));
+                    return result;
+                }
+
+                //Consider creating a Path query instead of recursive method:
+                //var query = Query<IContent>.Builder.Where(x => x.Path.StartsWith(content.Path));
+
+                var updated = new List<IContent>();
+                var list = new List<IContent>();
+                list.Add(content); //include parent item
+                list.AddRange(GetDescendants(content));
+
+                var internalStrategy = _publishingStrategy;
+
+                using (var uow = UowProvider.GetUnitOfWork())
+                {
+                    //Publish and then update the database with new status
+                    var publishedOutcome = internalStrategy.PublishWithChildren(uow, list, userId, includeUnpublished).ToArray();
+                    var published = publishedOutcome
+                        .Where(x => x.Success || x.Result.StatusType == PublishStatusType.SuccessAlreadyPublished)
+                        // ensure proper order (for events) - cannot publish a child before its parent!
+                        .OrderBy(x => x.Result.ContentItem.Level)
+                        .ThenBy(x => x.Result.ContentItem.SortOrder);
+
+                    var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                    //NOTE The Publish with subpages-dialog was used more as a republish-type-thing, so we'll have to include PublishStatusType.SuccessAlreadyPublished
+                    //in the updated-list, so the Published event is triggered with the expected set of pages and the xml is updated.
+                    foreach (var item in published)
+                    {
+                        item.Result.ContentItem.WriterId = userId;
+                        repository.AddOrUpdate(item.Result.ContentItem);
+                        //add or update a preview
+                        repository.AddOrUpdatePreviewXml(item.Result.ContentItem, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                        //add or update the published xml
+                        repository.AddOrUpdateContentXml(item.Result.ContentItem, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                        updated.Add(item.Result.ContentItem);
+                    }
+
+                    //Save xml to db and call following method to fire event:
+                    _publishingStrategy.PublishingFinalized(uow, updated, false);
+
+                    Audit(uow, AuditType.Publish, "Publish with Children performed by user", userId, content.Id);
+                    uow.Commit();
+
+                    return publishedOutcome;
+                }
+            }
+        }
+
+        /// <summary>
+        /// UnPublishes a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to publish</param>
+        /// <param name="omitCacheRefresh">Optional boolean to avoid having the cache refreshed when calling this Unpublish method. By default this method will update the cache.</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <returns>True if unpublishing succeeded, otherwise False</returns>
+        private Attempt<UnPublishStatus> UnPublishDo(IContent content, bool omitCacheRefresh = false, int userId = 0)
+        {
+            var newest = GetById(content.Id); // ensure we have the newest version
+            if (content.Version != newest.Version) // but use the original object if it's already the newest version
+                content = newest;
+
+            var evtMsgs = EventMessagesFactory.Get();
+
+            var published = content.Published ? content : GetPublishedVersion(content.Id); // get the published version
+            if (published == null)
+            {
+                return Attempt.Succeed(new UnPublishStatus(content, UnPublishedStatusType.SuccessAlreadyUnPublished, evtMsgs)); // already unpublished
+            }
+
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var unpublished = _publishingStrategy.UnPublish(uow, content, userId);
+                if (unpublished == false)
+                {
+                    uow.Commit();
+                    return Attempt.Fail(new UnPublishStatus(content, UnPublishedStatusType.FailedCancelledByEvent, evtMsgs));
+                }
+
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                content.WriterId = userId;
+                repository.AddOrUpdate(content);
+                // is published is not newest, reset the published flag on published version
+                if (published.Version != content.Version)
+                    repository.ClearPublished(published);
+                repository.DeleteContentXml(content);
+
+                //Delete xml from db? and call following method to fire event through PublishingStrategy to update cache
+                if (omitCacheRefresh == false)
+                    _publishingStrategy.UnPublishingFinalized(uow, content);
+
+                Audit(uow, AuditType.UnPublish, "UnPublish performed by user", userId, content.Id);
+                uow.Commit();
+            }
+
+            return Attempt.Succeed(new UnPublishStatus(content, UnPublishedStatusType.Success, evtMsgs));
+        }
+
+        /// <summary>
+        /// Saves and Publishes a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to save and publish</param>
+        /// <param name="userId">Optional Id of the User issueing the publishing</param>
+        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise save events.</param>
+        /// <returns>True if publishing succeeded, otherwise False</returns>
+        private Attempt<PublishStatus> SaveAndPublishDo(IContent content, int userId = 0, bool raiseEvents = true)
+        {
+            var evtMsgs = EventMessagesFactory.Get();
+
+            using (new WriteLock(Locker))
+            {
+                using (var uow = UowProvider.GetUnitOfWork())
+                {
+                    var saveEventArgs = new SaveEventArgs<IContent>(content, evtMsgs);
+                    if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
+                    {
+                        uow.Commit();
+                        return Attempt.Fail(new PublishStatus(content, PublishStatusType.FailedCancelledByEvent, evtMsgs));
+                    }
+
+                    //Has this content item previously been published? If so, we don't need to refresh the children
+                    var previouslyPublished = content.HasIdentity && HasPublishedVersion(content.Id); //content might not have an id
+                    var publishStatus = new PublishStatus(content, PublishStatusType.Success, evtMsgs); //initially set to success
+
+                    //Check if parent is published (although not if its a root node) - if parent isn't published this Content cannot be published
+                    publishStatus.StatusType = CheckAndLogIsPublishable(content);
+                    //if it is not successful, then check if the props are valid
+                    if ((int)publishStatus.StatusType < 10)
+                    {
+                        //Content contains invalid property values and can therefore not be published - fire event?
+                        publishStatus.StatusType = CheckAndLogIsValid(content);
+                        //set the invalid properties (if there are any)
+                        publishStatus.InvalidProperties = ((ContentBase)content).LastInvalidProperties;
+                    }
+                    //if we're still successful, then publish using the strategy
+                    if (publishStatus.StatusType == PublishStatusType.Success)
+                    {
+                        //Publish and then update the database with new status
+                        var publishResult = _publishingStrategy.Publish(uow, content, userId);
+                        //set the status type to the publish result
+                        publishStatus.StatusType = publishResult.Result.StatusType;
+                    }
+
+                    //we are successfully published if our publishStatus is still Successful
+                    bool published = publishStatus.StatusType == PublishStatusType.Success;
+
+                    var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                    if (published == false)
+                    {
+                        content.ChangePublishedState(PublishedState.Saved);
+                    }
+                    //Since this is the Save and Publish method, the content should be saved even though the publish fails or isn't allowed
+                    if (content.HasIdentity == false)
+                    {
+                        content.CreatorId = userId;
+                    }
+                    content.WriterId = userId;
+
+                    repository.AddOrUpdate(content);
+                    repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+
+                    if (published)
+                    {
+                        //Content Xml
+                        repository.AddOrUpdateContentXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                    }
+
+                    if (raiseEvents)
+                    {
+                        saveEventArgs.CanCancel = false;
+                        uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
+                    }
+
+                    //Save xml to db and call following method to fire event through PublishingStrategy to update cache
+                    if (published)
+                    {
+                        _publishingStrategy.PublishingFinalized(uow, content);
+                    }
+
+                    //We need to check if children and their publish state to ensure that we 'republish' content that was previously published
+                    if (published && previouslyPublished == false && HasChildren(content.Id))
+                    {
+                    //TODO: Horrible for performance if there are lots of descendents! We should page if anything but this is crazy
+                        var descendants = GetPublishedDescendants(content);
+                        _publishingStrategy.PublishingFinalized(uow, descendants, false);
+                    }
+
+                    uow.Commit();
+
+                    if (publishStatus.StatusType == PublishStatusType.Success)
+                    {
+                        Audit(uow, AuditType.Publish, "Save and Publish performed by user", userId, content.Id);
+                    }
+                    else
+                    {
+                        Audit(uow, AuditType.Save, "Save performed by user", userId, content.Id);
+                    }
+                    uow.Commit();
+
+                    return Attempt.If(publishStatus.StatusType == PublishStatusType.Success, publishStatus);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Saves a single <see cref="IContent"/> object
+        /// </summary>
+        /// <param name="content">The <see cref="IContent"/> to save</param>
+        /// <param name="changeState">Boolean indicating whether or not to change the Published state upon saving</param>
+        /// <param name="userId">Optional Id of the User saving the Content</param>
+        /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
+        private Attempt<OperationStatus> Save(IContent content, bool changeState, int userId = 0, bool raiseEvents = true)
+        {
+            var evtMsgs = EventMessagesFactory.Get();
+
+            using (new WriteLock(Locker))
+            {
+                var currVersion = content.Version;
+
+                using (var uow = UowProvider.GetUnitOfWork())
+                {
+                    var saveEventArgs = new SaveEventArgs<IContent>(content, evtMsgs);
+                    if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
+                    {
+                        uow.Commit();
+                        return OperationStatus.Cancelled(evtMsgs);
+                    }
+
+                    if (string.IsNullOrWhiteSpace(content.Name))
+                    {
+                        throw new ArgumentException("Cannot save content with empty name.");
+                    }
+
+                    var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                    if (content.HasIdentity == false)
+                    {
+                        content.CreatorId = userId;
+                    }
+                    content.WriterId = userId;
+
+                    //Only change the publish state if the "previous" version was actually published or marked as unpublished
+                    if (changeState && (content.Published || ((Content)content).PublishedState == PublishedState.Unpublished))
+                        content.ChangePublishedState(PublishedState.Saved);
+
+                    repository.AddOrUpdate(content);
+
+                    //Generate a new preview
+                    repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+
+                    if (raiseEvents)
+                    {
+                        saveEventArgs.CanCancel = false;
+                        uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
+                    }
+
+                    Audit(uow, AuditType.Save, "Save Content performed by user", userId, content.Id);
+                    uow.Commit();
+                }
+
+                return currVersion == content.Version
+                    ? OperationStatus.NoOperation(evtMsgs)
+                    : OperationStatus.Success(evtMsgs);
+            }
+        }
+
+        private PublishStatusType CheckAndLogIsPublishable(IContent content)
+        {
+            //Check if parent is published (although not if its a root node) - if parent isn't published this Content cannot be published
+            if (content.ParentId != Constants.System.Root && content.ParentId != Constants.System.RecycleBinContent && IsPublishable(content) == false)
+            {
+                Logger.Info<ContentService>(
+                    string.Format(
+                        "Content '{0}' with Id '{1}' could not be published because its parent is not published.",
+                        content.Name, content.Id));
+                return PublishStatusType.FailedPathNotPublished;
+            }
+
+            if (content.ExpireDate.HasValue && content.ExpireDate.Value > DateTime.MinValue && DateTime.Now > content.ExpireDate.Value)
+            {
+                Logger.Info<ContentService>(
+                    string.Format(
+                        "Content '{0}' with Id '{1}' has expired and could not be published.",
+                        content.Name, content.Id));
+                return PublishStatusType.FailedHasExpired;
+            }
+
+            if (content.ReleaseDate.HasValue && content.ReleaseDate.Value > DateTime.MinValue && content.ReleaseDate.Value > DateTime.Now)
+            {
+                Logger.Info<ContentService>(
+                    string.Format(
+                        "Content '{0}' with Id '{1}' is awaiting release and could not be published.",
+                        content.Name, content.Id));
+                return PublishStatusType.FailedAwaitingRelease;
+            }
+
+            return PublishStatusType.Success;
+        }
+
+        private PublishStatusType CheckAndLogIsValid(IContent content)
+        {
+            //Content contains invalid property values and can therefore not be published - fire event?
+            if (content.IsValid() == false)
+            {
+                Logger.Info<ContentService>(
+                    string.Format(
+                        "Content '{0}' with Id '{1}' could not be published because of invalid properties.",
+                        content.Name, content.Id));
+                return PublishStatusType.FailedContentInvalid;
+            }
+
+            return PublishStatusType.Success;
+        }
+
+        private IContentType FindContentTypeByAlias(string contentTypeAlias)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateContentTypeRepository(uow);
+
+                var query = Query<IContentType>.Builder.Where(x => x.Alias == contentTypeAlias);
+                var types = repository.GetByQuery(query);
+
+                if (types.Any() == false)
+                    throw new Exception(
+                        string.Format("No ContentType matching the passed in Alias: '{0}' was found",
+                                      contentTypeAlias));
+
+                var contentType = types.First();
+
+                if (contentType == null)
+                    throw new Exception(string.Format("ContentType matching the passed in Alias: '{0}' was null",
+                                                      contentTypeAlias));
+                return contentType;
+            }
+        }
+
+        #endregion
+
+        #region Proxy Event Handlers
+        /// <summary>
+        /// Occurs before publish.
+        /// </summary>
+        /// <remarks>Proxy to the real event on the <see cref="PublishingStrategy"/></remarks>
+        public static event TypedEventHandler<IPublishingStrategy, PublishEventArgs<IContent>> Publishing
+        {
+            add { PublishingStrategy.Publishing += value; }
+            remove { PublishingStrategy.Publishing -= value; }
+        }
+
+        /// <summary>
+        /// Occurs after publish.
+        /// </summary>
+        /// <remarks>Proxy to the real event on the <see cref="PublishingStrategy"/></remarks>
+        public static event TypedEventHandler<IPublishingStrategy, PublishEventArgs<IContent>> Published
+        {
+            add { PublishingStrategy.Published += value; }
+            remove { PublishingStrategy.Published -= value; }
+        }
+        /// <summary>
+        /// Occurs before unpublish.
+        /// </summary>
+        /// <remarks>Proxy to the real event on the <see cref="PublishingStrategy"/></remarks>
+        public static event TypedEventHandler<IPublishingStrategy, PublishEventArgs<IContent>> UnPublishing
+        {
+            add { PublishingStrategy.UnPublishing += value; }
+            remove { PublishingStrategy.UnPublishing -= value; }
+        }
+
+        /// <summary>
+        /// Occurs after unpublish.
+        /// </summary>
+        /// <remarks>Proxy to the real event on the <see cref="PublishingStrategy"/></remarks>
+        public static event TypedEventHandler<IPublishingStrategy, PublishEventArgs<IContent>> UnPublished
+        {
+            add { PublishingStrategy.UnPublished += value; }
+            remove { PublishingStrategy.UnPublished -= value; }
+        }
+        #endregion
+
+        #region Event Handlers
+        /// <summary>
+        /// Occurs before Delete
+        /// </summary>
+        public static event TypedEventHandler<IContentService, DeleteEventArgs<IContent>> Deleting;
+
+        /// <summary>
+        /// Occurs after Delete
+        /// </summary>
+        public static event TypedEventHandler<IContentService, DeleteEventArgs<IContent>> Deleted;
+
+        /// <summary>
+        /// Occurs before Delete Versions
+        /// </summary>
+        public static event TypedEventHandler<IContentService, DeleteRevisionsEventArgs> DeletingVersions;
+
+        /// <summary>
+        /// Occurs after Delete Versions
+        /// </summary>
+        public static event TypedEventHandler<IContentService, DeleteRevisionsEventArgs> DeletedVersions;
+
+        /// <summary>
+        /// Occurs before Save
+        /// </summary>
+        public static event TypedEventHandler<IContentService, SaveEventArgs<IContent>> Saving;
+
+        /// <summary>
+        /// Occurs after Save
+        /// </summary>
+        public static event TypedEventHandler<IContentService, SaveEventArgs<IContent>> Saved;
+
+        /// <summary>
+        /// Occurs before Create
+        /// </summary>
+        [Obsolete("Use the Created event instead, the Creating and Created events both offer the same functionality, Creating event has been deprecated.")]
+        public static event TypedEventHandler<IContentService, NewEventArgs<IContent>> Creating;
+
+        /// <summary>
+        /// Occurs after Create
+        /// </summary>
+        /// <remarks>
+        /// Please note that the Content object has been created, but might not have been saved
+        /// so it does not have an identity yet (meaning no Id has been set).
+        /// </remarks>
+        public static event TypedEventHandler<IContentService, NewEventArgs<IContent>> Created;
+
+        /// <summary>
+        /// Occurs before Copy
+        /// </summary>
+        public static event TypedEventHandler<IContentService, CopyEventArgs<IContent>> Copying;
+
+        /// <summary>
+        /// Occurs after Copy
+        /// </summary>
+        public static event TypedEventHandler<IContentService, CopyEventArgs<IContent>> Copied;
+
+        /// <summary>
+        /// Occurs before Content is moved to Recycle Bin
+        /// </summary>
+        public static event TypedEventHandler<IContentService, MoveEventArgs<IContent>> Trashing;
+
+        /// <summary>
+        /// Occurs after Content is moved to Recycle Bin
+        /// </summary>
+        public static event TypedEventHandler<IContentService, MoveEventArgs<IContent>> Trashed;
+
+        /// <summary>
+        /// Occurs before Move
+        /// </summary>
+        public static event TypedEventHandler<IContentService, MoveEventArgs<IContent>> Moving;
+
+        /// <summary>
+        /// Occurs after Move
+        /// </summary>
+        public static event TypedEventHandler<IContentService, MoveEventArgs<IContent>> Moved;
+
+        /// <summary>
+        /// Occurs before Rollback
+        /// </summary>
+        public static event TypedEventHandler<IContentService, RollbackEventArgs<IContent>> RollingBack;
+
+        /// <summary>
+        /// Occurs after Rollback
+        /// </summary>
+        public static event TypedEventHandler<IContentService, RollbackEventArgs<IContent>> RolledBack;
+
+        /// <summary>
+        /// Occurs before Send to Publish
+        /// </summary>
+        public static event TypedEventHandler<IContentService, SendToPublishEventArgs<IContent>> SendingToPublish;
+
+        /// <summary>
+        /// Occurs after Send to Publish
+        /// </summary>
+        public static event TypedEventHandler<IContentService, SendToPublishEventArgs<IContent>> SentToPublish;
+
+        /// <summary>
+        /// Occurs before the Recycle Bin is emptied
+        /// </summary>
+        public static event TypedEventHandler<IContentService, RecycleBinEventArgs> EmptyingRecycleBin;
+
+        /// <summary>
+        /// Occurs after the Recycle Bin has been Emptied
+        /// </summary>
+        public static event TypedEventHandler<IContentService, RecycleBinEventArgs> EmptiedRecycleBin;
+
+        /// <summary>
+        /// Occurs after a blueprint has been saved.
+        /// </summary>
+        public static event TypedEventHandler<IContentService, SaveEventArgs<IContent>> SavedBlueprint;
+
+        /// <summary>
+        /// Occurs after a blueprint has been deleted.
+        /// </summary>
+        public static event TypedEventHandler<IContentService, DeleteEventArgs<IContent>> DeletedBlueprint;
+
+        #endregion
+    }
+}
diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs
index 1ac8318f9c..8bb7af0077 100644
--- a/src/Umbraco.Web/Editors/ContentController.cs
+++ b/src/Umbraco.Web/Editors/ContentController.cs
@@ -1,1219 +1,1223 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Text;
-using System.Web.Http;
-using System.Web.Http.Controllers;
-using System.Web.Http.ModelBinding;
-using AutoMapper;
-using Umbraco.Core;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.Membership;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
-using Umbraco.Core.Publishing;
-using Umbraco.Core.Services;
-using Umbraco.Web.Models.ContentEditing;
-using Umbraco.Web.Models.Mapping;
-using Umbraco.Web.Mvc;
-using Umbraco.Web.WebApi;
-using Umbraco.Web.WebApi.Binders;
-using Umbraco.Web.WebApi.Filters;
-using Umbraco.Core.Events;
-using Constants = Umbraco.Core.Constants;
-using umbraco.cms.businesslogic;
-using System.Collections;
-using umbraco;
-
-namespace Umbraco.Web.Editors
-{
-    /// <summary>
-    /// The API controller used for editing content
-    /// </summary>
-    /// <remarks>
-    /// This controller is decorated with the UmbracoApplicationAuthorizeAttribute which means that any user requesting
-    /// access to ALL of the methods on this controller will need access to the content application.
-    /// </remarks>
-    [PluginController("UmbracoApi")]
-    [UmbracoApplicationAuthorize(Constants.Applications.Content)]
-    [ContentControllerConfiguration]
-    public class ContentController : ContentControllerBase
-    {
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        public ContentController()
-                : this(UmbracoContext.Current)
-        {
-        }
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="umbracoContext"></param>
-        public ContentController(UmbracoContext umbracoContext)
-                : base(umbracoContext)
-        {
-        }
-
-        /// <summary>
-        /// Configures this controller with a custom action selector
-        /// </summary>
-        private class ContentControllerConfigurationAttribute : Attribute, IControllerConfiguration
-        {
-            public void Initialize(HttpControllerSettings controllerSettings, HttpControllerDescriptor controllerDescriptor)
-            {
-                controllerSettings.Services.Replace(typeof(IHttpActionSelector), new ParameterSwapControllerActionSelector(
-                    new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetNiceUrl", "id", typeof(int), typeof(Guid), typeof(Udi)),
-                    new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetById", "id", typeof(int), typeof(Guid), typeof(Udi))
-                ));
-            }
-        }
-
-        /// <summary>
-        /// Return content for the specified ids
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <returns></returns>
-        [FilterAllowedOutgoingContent(typeof(IEnumerable<ContentItemDisplay>))]
-        public IEnumerable<ContentItemDisplay> GetByIds([FromUri]int[] ids)
-        {
-            var foundContent = Services.ContentService.GetByIds(ids);
-            return foundContent.Select(content => AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(content, UmbracoContext));
-        }
-
-        /// <summary>
-        /// Updates the permissions for a content item for a particular user group
-        /// </summary>
-        /// <param name="saveModel"></param>
-        /// <returns></returns>
-        /// <remarks>
-        /// Permission check is done for letter 'R' which is for <see cref="ActionRights"/> which the user must have access to to update
-        /// </remarks>
-        [EnsureUserPermissionForContent("saveModel.ContentId", 'R')]
-        public IEnumerable<AssignedUserGroupPermissions> PostSaveUserGroupPermissions(UserGroupPermissionsSave saveModel)
-        {
-            if (saveModel.ContentId <= 0) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
-
-            //TODO: Should non-admins be alowed to set granular permissions?
-
-            var content = Services.ContentService.GetById(saveModel.ContentId);
-            if (content == null) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
-
-            //current permissions explicitly assigned to this content item
-            var contentPermissions = Services.ContentService.GetPermissionsForEntity(content)
-                .ToDictionary(x => x.UserGroupId, x => x);
-
-            var allUserGroups = Services.UserService.GetAllUserGroups().ToArray();
-
-            //loop through each user group
-            foreach (var userGroup in allUserGroups)
-            {
-                //check if there's a permission set posted up for this user group
-                IEnumerable<string> groupPermissions;
-                if (saveModel.AssignedPermissions.TryGetValue(userGroup.Id, out groupPermissions))
-                {
-                    //create a string collection of the assigned letters
-                    var groupPermissionCodes = groupPermissions.ToArray();
-
-                    //check if there are no permissions assigned for this group save model, if that is the case we want to reset the permissions
-                    //for this group/node which will go back to the defaults
-                    if (groupPermissionCodes.Length == 0)
-                    {
-                        Services.UserService.RemoveUserGroupPermissions(userGroup.Id, content.Id);
-                    }
-                    //check if they are the defaults, if so we should just remove them if they exist since it's more overhead having them stored
-                    else if (userGroup.Permissions.UnsortedSequenceEqual(groupPermissionCodes))
-                    {
-                        //only remove them if they are actually currently assigned
-                        if (contentPermissions.ContainsKey(userGroup.Id))
-                        {
-                            //remove these permissions from this node for this group since the ones being assigned are the same as the defaults
-                            Services.UserService.RemoveUserGroupPermissions(userGroup.Id, content.Id);
-                        }
-                    }
-                    //if they are different we need to update, otherwise there's nothing to update
-                    else if (contentPermissions.ContainsKey(userGroup.Id) == false || contentPermissions[userGroup.Id].AssignedPermissions.UnsortedSequenceEqual(groupPermissionCodes) == false)
-                    {
-
-                        Services.UserService.ReplaceUserGroupPermissions(userGroup.Id, groupPermissionCodes.Select(x => x[0]), content.Id);
-                    }
-                }
-            }
-
-            return GetDetailedPermissions(content, allUserGroups);
-        }
-
-        /// <summary>
-        /// Returns the user group permissions for user groups assigned to this node
-        /// </summary>
-        /// <param name="contentId"></param>
-        /// <returns></returns>
-        /// <remarks>
-        /// Permission check is done for letter 'R' which is for <see cref="ActionRights"/> which the user must have access to to view
-        /// </remarks>
-        [EnsureUserPermissionForContent("contentId", 'R')]
-        public IEnumerable<AssignedUserGroupPermissions> GetDetailedPermissions(int contentId)
-        {
-            if (contentId <= 0) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
-            var content = Services.ContentService.GetById(contentId);
-            if (content == null) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
-
-            //TODO: Should non-admins be able to see detailed permissions?
-
-            var allUserGroups = Services.UserService.GetAllUserGroups();
-
-            return GetDetailedPermissions(content, allUserGroups);
-        }
-
-        private IEnumerable<AssignedUserGroupPermissions> GetDetailedPermissions(IContent content, IEnumerable<IUserGroup> allUserGroups)
-        {
-            //get all user groups and map their default permissions to the AssignedUserGroupPermissions model.
-            //we do this because not all groups will have true assigned permissions for this node so if they don't have assigned permissions, we need to show the defaults.
-
-            var defaultPermissionsByGroup = Mapper.Map<IEnumerable<AssignedUserGroupPermissions>>(allUserGroups).ToArray();
-
-            var defaultPermissionsAsDictionary = defaultPermissionsByGroup
-                .ToDictionary(x => Convert.ToInt32(x.Id), x => x);
-
-            //get the actual assigned permissions
-            var assignedPermissionsByGroup = Services.ContentService.GetPermissionsForEntity(content).ToArray();
-
-            //iterate over assigned and update the defaults with the real values
-            foreach (var assignedGroupPermission in assignedPermissionsByGroup)
-            {
-                var defaultUserGroupPermissions = defaultPermissionsAsDictionary[assignedGroupPermission.UserGroupId];
-
-                //clone the default permissions model to the assigned ones
-                defaultUserGroupPermissions.AssignedPermissions = AssignedUserGroupPermissions.ClonePermissions(defaultUserGroupPermissions.DefaultPermissions);
-
-                //since there is custom permissions assigned to this node for this group, we need to clear all of the default permissions
-                //and we'll re-check it if it's one of the explicitly assigned ones
-                foreach (var permission in defaultUserGroupPermissions.AssignedPermissions.SelectMany(x => x.Value))
-                {
-                    permission.Checked = false;
-                    permission.Checked = assignedGroupPermission.AssignedPermissions.Contains(permission.PermissionCode, StringComparer.InvariantCulture);
-                }
-
-            }
-
-            return defaultPermissionsByGroup;
-        }
-
-        /// <summary>
-        /// Returns an item to be used to display the recycle bin for content
-        /// </summary>
-        /// <returns></returns>
-        public ContentItemDisplay GetRecycleBin()
-        {
-            var display = new ContentItemDisplay
-            {
-                Id = Constants.System.RecycleBinContent,
-                Alias = "recycleBin",
-                ParentId = -1,
-                Name = Services.TextService.Localize("general/recycleBin"),
-                ContentTypeAlias = "recycleBin",
-                CreateDate = DateTime.Now,
-                IsContainer = true,
-                Path = "-1," + Constants.System.RecycleBinContent
-            };
-
-            TabsAndPropertiesResolver<IContent>.AddListView(display, "content", Services.DataTypeService, Services.TextService);
-
-            return display;
-        }
-
-        public ContentItemDisplay GetBlueprintById(int id)
-        {
-            var foundContent = Services.ContentService.GetBlueprintById(id);
-            if (foundContent == null)
-            {
-                HandleContentNotFound(id);
-            }
-
-            var content = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(foundContent, UmbracoContext);
-
-            SetupBlueprint(content, foundContent);
-
-            return content;
-        }
-
-        private static void SetupBlueprint(ContentItemDisplay content, IContent persistedContent)
-        {
-            content.AllowPreview = false;
-
-            //set a custom path since the tree that renders this has the content type id as the parent
-            content.Path = string.Format("-1,{0},{1}", persistedContent.ContentTypeId, content.Id);
-
-            content.AllowedActions = new[] { "A" };
-            content.IsBlueprint = true;
-
-            var excludeProps = new[] { "_umb_urls", "_umb_releasedate", "_umb_expiredate", "_umb_template" };
-            var propsTab = content.Tabs.Last();
-            propsTab.Properties = propsTab.Properties
-                .Where(p => excludeProps.Contains(p.Alias) == false);
-        }
-
-        /// <summary>
-        /// Gets the content json for the content id
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        [OutgoingEditorModelEvent]
-        [EnsureUserPermissionForContent("id")]
-        public ContentItemDisplay GetById(int id)
-        {
-            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
-            if (foundContent == null)
-            {
-                HandleContentNotFound(id);
-            }
-
-            var content = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(foundContent, UmbracoContext);
-            return content;
-        }
-
-        /// <summary>
-        /// Gets the content json for the content id
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        [OutgoingEditorModelEvent]
-        [EnsureUserPermissionForContent("id")]
-        public ContentItemDisplay GetById(Guid id)
-        {
-            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
-            if (foundContent == null)
-            {
-                HandleContentNotFound(id);
-            }
-
-            var content = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(foundContent, UmbracoContext);
-            return content;
-        }
-
-        /// <summary>
-        /// Gets the content json for the content id
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        [OutgoingEditorModelEvent]
-        [EnsureUserPermissionForContent("id")]
-        public ContentItemDisplay GetById(Udi id)
-        {
-            var guidUdi = id as GuidUdi;
-            if (guidUdi != null)
-            {
-                return GetById(guidUdi.Guid);
-            }
-
-            throw new HttpResponseException(HttpStatusCode.NotFound);
-        }
-
-        [EnsureUserPermissionForContent("id")]
-        public ContentItemDisplay GetWithTreeDefinition(int id)
-        {
-            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
-            if (foundContent == null)
-            {
-                HandleContentNotFound(id);
-            }
-
-            var content = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(foundContent, UmbracoContext);
-            return content;
-        }
-
-        /// <summary>
-        /// Gets an empty content item for the
-        /// </summary>
-        /// <param name="contentTypeAlias"></param>
-        /// <param name="parentId"></param>
-        /// <returns>
-        /// If this is a container type, we'll remove the umbContainerView tab for a new item since
-        /// it cannot actually list children if it doesn't exist yet.
-        /// </returns>
-        [OutgoingEditorModelEvent]
-        public ContentItemDisplay GetEmpty(string contentTypeAlias, int parentId)
-        {
-            var contentType = Services.ContentTypeService.GetContentType(contentTypeAlias);
-            if (contentType == null)
-            {
-                throw new HttpResponseException(HttpStatusCode.NotFound);
-            }
-
-            var emptyContent = Services.ContentService.CreateContent("", parentId, contentType.Alias, UmbracoUser.Id);
-            var mapped = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(emptyContent, UmbracoContext);
-            // translate the content type name if applicable
-            mapped.ContentTypeName = Services.TextService.UmbracoDictionaryTranslate(mapped.ContentTypeName);
-            // if your user type doesn't have access to the Settings section it would not get this property mapped
-            if(mapped.DocumentType != null)
-                mapped.DocumentType.Name = Services.TextService.UmbracoDictionaryTranslate(mapped.DocumentType.Name);
-
-            //remove this tab if it exists: umbContainerView
-            var containerTab = mapped.Tabs.FirstOrDefault(x => x.Alias == Constants.Conventions.PropertyGroups.ListViewGroupName);
-            mapped.Tabs = mapped.Tabs.Except(new[] { containerTab });
-            return mapped;
-        }
-
-        [OutgoingEditorModelEvent]
-        public ContentItemDisplay GetEmpty(int blueprintId, int parentId)
-        {
-            var blueprint = Services.ContentService.GetBlueprintById(blueprintId);
-            if (blueprint == null)
-            {
-                throw new HttpResponseException(HttpStatusCode.NotFound);
-            }
-
-            blueprint.Id = 0;
-            blueprint.Name = string.Empty;
-            blueprint.ParentId = parentId;
-
-            var mapped = Mapper.Map<ContentItemDisplay>(blueprint);
-
-            //remove this tab if it exists: umbContainerView
-            var containerTab = mapped.Tabs.FirstOrDefault(x => x.Alias == Constants.Conventions.PropertyGroups.ListViewGroupName);
-            mapped.Tabs = mapped.Tabs.Except(new[] { containerTab });
-            return mapped;
-        }
-
-        /// <summary>
-        /// Gets the Url for a given node ID
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        public HttpResponseMessage GetNiceUrl(int id)
-        {
-            var url = Umbraco.NiceUrl(id);
-            var response = Request.CreateResponse(HttpStatusCode.OK);
-            response.Content = new StringContent(url, Encoding.UTF8, "application/json");
-            return response;
-        }
-
-        /// <summary>
-        /// Gets the Url for a given node ID
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        public HttpResponseMessage GetNiceUrl(Guid id)
-        {
-            var url = Umbraco.UrlProvider.GetUrl(id);
-            var response = Request.CreateResponse(HttpStatusCode.OK);
-            response.Content = new StringContent(url, Encoding.UTF8, "application/json");
-            return response;
-        }
-
-        /// <summary>
-        /// Gets the Url for a given node ID
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        public HttpResponseMessage GetNiceUrl(Udi id)
-        {
-            var guidUdi = id as GuidUdi;
-            if (guidUdi != null)
-            {
-                return GetNiceUrl(guidUdi.Guid);
-            }
-            throw new HttpResponseException(HttpStatusCode.NotFound);
-        }
-
-        /// <summary>
-        /// Gets the children for the content id passed in
-        /// </summary>
-        /// <returns></returns>
-        [FilterAllowedOutgoingContent(typeof(IEnumerable<ContentItemBasic<ContentPropertyBasic, IContent>>), "Items")]
-        public PagedResult<ContentItemBasic<ContentPropertyBasic, IContent>> GetChildren(
-                int id,
-                int pageNumber = 0,  //TODO: This should be '1' as it's not the index
-                int pageSize = 0,
-                string orderBy = "SortOrder",
-                Direction orderDirection = Direction.Ascending,
-                bool orderBySystemField = true,
-                string filter = "")
-        {
-            return GetChildren(id, null, pageNumber, pageSize, orderBy, orderDirection, orderBySystemField, filter);
-        }
-
-        /// <summary>
-        /// Gets the children for the content id passed in
-        /// </summary>
-        /// <returns></returns>
-        [FilterAllowedOutgoingContent(typeof(IEnumerable<ContentItemBasic<ContentPropertyBasic, IContent>>), "Items")]
-        public PagedResult<ContentItemBasic<ContentPropertyBasic, IContent>> GetChildren(
-                int id,
-                string includeProperties,
-                int pageNumber = 0,  //TODO: This should be '1' as it's not the index
-                int pageSize = 0,
-                string orderBy = "SortOrder",
-                Direction orderDirection = Direction.Ascending,
-                bool orderBySystemField = true,
-                string filter = "")
-        {
-            long totalChildren;
-            IContent[] children;
-            if (pageNumber > 0 && pageSize > 0)
-            {
-                children = Services.ContentService
-                 .GetPagedChildren(id, (pageNumber - 1), pageSize, out totalChildren
-                 , orderBy, orderDirection, orderBySystemField, filter).ToArray();
-            }
-            else
-            {
-                children = Services.ContentService.GetChildren(id).ToArray();
-                totalChildren = children.Length;
-            }
-
-            if (totalChildren == 0)
-            {
-                return new PagedResult<ContentItemBasic<ContentPropertyBasic, IContent>>(0, 0, 0);
-            }
-
-            var pagedResult = new PagedResult<ContentItemBasic<ContentPropertyBasic, IContent>>(totalChildren, pageNumber, pageSize);
-            pagedResult.Items = children.Select(content =>
-                Mapper.Map<IContent, ContentItemBasic<ContentPropertyBasic, IContent>>(content,
-                    opts =>
-                    {
-                        // if there's a list of property aliases to map - we will make sure to store this in the mapping context.
-                        if (String.IsNullOrWhiteSpace(includeProperties) == false)
-                        {
-                            opts.Items["IncludeProperties"] = includeProperties.Split(new[] { ", ", "," }, StringSplitOptions.RemoveEmptyEntries);
-                        }
-                    }));
-
-            return pagedResult;
-        }
-
-        [Obsolete("Dont use this, it is incorrectly named, use HasPermission instead")]
-        public bool GetHasPermission(string permissionToCheck, int nodeId)
-        {
-            return HasPermission(permissionToCheck, nodeId);
-        }
-
-        /// <summary>
-        /// Returns permissions for all nodes passed in for the current user
-        /// TODO: This should be moved to the CurrentUserController?
-        /// </summary>
-        /// <param name="nodeIds"></param>
-        /// <returns></returns>
-        [HttpPost]
-        public Dictionary<int, string[]> GetPermissions(int[] nodeIds)
-        {
-            var permissions = Services.UserService
-                    .GetPermissions(Security.CurrentUser, nodeIds);
-
-            var permissionsDictionary = new Dictionary<int, string[]>();
-            foreach (var nodeId in nodeIds)
-            {
-                var aggregatePerms = permissions.GetAllPermissions(nodeId).ToArray();
-                permissionsDictionary.Add(nodeId, aggregatePerms);
-            }
-
-            return permissionsDictionary;
-        }
-
-        /// <summary>
-        /// Checks a nodes permission for the current user
-        /// TODO: This should be moved to the CurrentUserController?
-        /// </summary>
-        /// <param name="permissionToCheck"></param>
-        /// <param name="nodeId"></param>
-        /// <returns></returns>
-        [HttpGet]
-        public bool HasPermission(string permissionToCheck, int nodeId)
-        {
-            var p = Services.UserService.GetPermissions(Security.CurrentUser, nodeId).GetAllPermissions();
-            if (p.Contains(permissionToCheck.ToString(CultureInfo.InvariantCulture)))
-            {
-                return true;
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Creates a blueprint from a content item
-        /// </summary>
-        /// <param name="contentId">The content id to copy</param>
-        /// <param name="name">The name of the blueprint</param>
-        /// <returns></returns>
-        [HttpPost]
-        public SimpleNotificationModel CreateBlueprintFromContent([FromUri]int contentId, [FromUri]string name)
-        {
-            if (string.IsNullOrWhiteSpace(name)) throw new ArgumentException("Value cannot be null or whitespace.", "name");
-
-            var content = Services.ContentService.GetById(contentId);
-            if (content == null)
-                throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
-
-            EnsureUniqueName(name, content, "name");
-
-            var blueprint = Services.ContentService.CreateContentFromBlueprint(content, name, Security.CurrentUser.Id);
-
-            Services.ContentService.SaveBlueprint(blueprint, Security.CurrentUser.Id);
-
-            var notificationModel = new SimpleNotificationModel();
-            notificationModel.AddSuccessNotification(
-                Services.TextService.Localize("blueprints/createdBlueprintHeading"),
-                Services.TextService.Localize("blueprints/createdBlueprintMessage", new[] { content.Name })
-            );
-
-            return notificationModel;
-        }
-
-        private void EnsureUniqueName(string name, IContent content, string modelName)
-        {
-            var existing = Services.ContentService.GetBlueprintsForContentTypes(content.ContentTypeId);
-            if (existing.Any(x => x.Name == name && x.Id != content.Id))
-            {
-                ModelState.AddModelError(modelName, Services.TextService.Localize("blueprints/duplicateBlueprintMessage"));
-                throw new HttpResponseException(Request.CreateValidationErrorResponse(ModelState));
-            }
-        }
-
-        /// <summary>
-        /// Saves content
-        /// </summary>
-        /// <returns></returns>
-        [FileUploadCleanupFilter]
-        [ContentPostValidate]
-        public ContentItemDisplay PostSaveBlueprint(
-            [ModelBinder(typeof(BlueprintItemBinder))] ContentItemSave contentItem)
-        {
-            var contentItemDisplay = PostSaveInternal(contentItem,
-                content =>
-                {
-                    EnsureUniqueName(content.Name, content, "Name");
-
-                    Services.ContentService.SaveBlueprint(contentItem.PersistedContent, Security.CurrentUser.Id);
-                    //we need to reuse the underlying logic so return the result that it wants
-                    return Attempt<OperationStatus>.Succeed(new OperationStatus(OperationStatusType.Success, new EventMessages()));
-                });
-            SetupBlueprint(contentItemDisplay, contentItemDisplay.PersistedContent);
-
-            return contentItemDisplay;
-        }
-
-        /// <summary>
-        /// Saves content
-        /// </summary>
-        /// <returns></returns>
-        [FileUploadCleanupFilter]
-        [ContentPostValidate]
-        [OutgoingEditorModelEvent]
-        public ContentItemDisplay PostSave(
-                [ModelBinder(typeof(ContentItemBinder))]
-                                ContentItemSave contentItem)
-        {
-            return PostSaveInternal(contentItem,
-                content => Services.ContentService.WithResult().Save(contentItem.PersistedContent, Security.CurrentUser.Id));
-        }
-
-        private ContentItemDisplay PostSaveInternal(ContentItemSave contentItem, Func<IContent, Attempt<OperationStatus>> saveMethod)
-        {
-            //Recent versions of IE/Edge may send in the full clientside file path instead of just the file name.
-            //To ensure similar behavior across all browsers no matter what they do - we strip the FileName property of all
-            //uploaded files to being *only* the actual file name (as it should be).
-            if (contentItem.UploadedFiles != null && contentItem.UploadedFiles.Any())
-            {
-                foreach (var file in contentItem.UploadedFiles)
-                {
-                    file.FileName = Path.GetFileName(file.FileName);
-                }
-            }
-
-            //If we've reached here it means:
-            // * Our model has been bound
-            // * and validated
-            // * any file attachments have been saved to their temporary location for us to use
-            // * we have a reference to the DTO object and the persisted object
-            // * Permissions are valid
-            MapPropertyValues(contentItem);
-
-            //We need to manually check the validation results here because:
-            // * We still need to save the entity even if there are validation value errors
-            // * Depending on if the entity is new, and if there are non property validation errors (i.e. the name is null)
-            //      then we cannot continue saving, we can only display errors
-            // * If there are validation errors and they were attempting to publish, we can only save, NOT publish and display
-            //      a message indicating this
-            if (ModelState.IsValid == false)
-            {
-                if (ValidationHelper.ModelHasRequiredForPersistenceErrors(contentItem) && IsCreatingAction(contentItem.Action))
-                {
-                    //ok, so the absolute mandatory data is invalid and it's new, we cannot actually continue!
-                    // add the modelstate to the outgoing object and throw a validation message
-                    var forDisplay = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(contentItem.PersistedContent, UmbracoContext);
-                    forDisplay.Errors = ModelState.ToErrorDictionary();
-                    throw new HttpResponseException(Request.CreateValidationErrorResponse(forDisplay));
-
-                }
-
-                //if the model state is not valid we cannot publish so change it to save
-                switch (contentItem.Action)
-                {
-                    case ContentSaveAction.Publish:
-                        contentItem.Action = ContentSaveAction.Save;
-                        break;
-                    case ContentSaveAction.PublishNew:
-                        contentItem.Action = ContentSaveAction.SaveNew;
-                        break;
-                }
-            }
-
-            //initialize this to successful
-            var publishStatus = Attempt<PublishStatus>.Succeed();
-            var wasCancelled = false;
-
-            if (contentItem.Action == ContentSaveAction.Save || contentItem.Action == ContentSaveAction.SaveNew)
-            {
-                //save the item
-                var saveResult = saveMethod(contentItem.PersistedContent);
-
-                wasCancelled = saveResult.Success == false && saveResult.Result.StatusType == OperationStatusType.FailedCancelledByEvent;
-            }
-            else if (contentItem.Action == ContentSaveAction.SendPublish || contentItem.Action == ContentSaveAction.SendPublishNew)
-            {
-                var sendResult = Services.ContentService.SendToPublication(contentItem.PersistedContent, Security.CurrentUser.Id);
-                wasCancelled = sendResult == false;
-            }
-            else
-            {
-                //publish the item and check if it worked, if not we will show a diff msg below
-                publishStatus = Services.ContentService.SaveAndPublishWithStatus(contentItem.PersistedContent, Security.CurrentUser.Id);
-                wasCancelled = publishStatus.Result.StatusType == PublishStatusType.FailedCancelledByEvent;
-            }
-
-            //return the updated model
-            var display = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(contentItem.PersistedContent, UmbracoContext);
-
-            //lasty, if it is not valid, add the modelstate to the outgoing object and throw a 403
-            HandleInvalidModelState(display);
-
-            //put the correct msgs in
-            switch (contentItem.Action)
-            {
-                case ContentSaveAction.Save:
-                case ContentSaveAction.SaveNew:
-                    if (wasCancelled == false)
-                    {
-                        display.AddSuccessNotification(
-                            Services.TextService.Localize("speechBubbles/editContentSavedHeader"),
-                            contentItem.ReleaseDate.HasValue
-                                ? Services.TextService.Localize("speechBubbles/editContentSavedWithReleaseDateText", new [] { contentItem.ReleaseDate.Value.ToLongDateString(), contentItem.ReleaseDate.Value.ToShortTimeString() })
-                                : Services.TextService.Localize("speechBubbles/editContentSavedText")
-                        );
-                    }
-                    else
-                    {
-                        AddCancelMessage(display);
-                    }
-                    break;
-                case ContentSaveAction.SendPublish:
-                case ContentSaveAction.SendPublishNew:
-                    if (wasCancelled == false)
-                    {
-                        display.AddSuccessNotification(
-                            Services.TextService.Localize("speechBubbles/editContentSendToPublish"),
-                            Services.TextService.Localize("speechBubbles/editContentSendToPublishText"));
-                    }
-                    else
-                    {
-                        AddCancelMessage(display);
-                    }
-                    break;
-                case ContentSaveAction.Publish:
-                case ContentSaveAction.PublishNew:
-                    ShowMessageForPublishStatus(publishStatus.Result, display, contentItem.ExpireDate);
-                    break;
-            }
-
-            //If the item is new and the operation was cancelled, we need to return a different
-            // status code so the UI can handle it since it won't be able to redirect since there
-            // is no Id to redirect to!
-            if (wasCancelled && IsCreatingAction(contentItem.Action))
-            {
-                throw new HttpResponseException(Request.CreateValidationErrorResponse(display));
-            }
-
-            display.PersistedContent = contentItem.PersistedContent;
-
-            return display;
-        }
-
-        /// <summary>
-        /// Publishes a document with a given ID
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        /// <remarks>
-        /// The CanAccessContentAuthorize attribute will deny access to this method if the current user
-        /// does not have Publish access to this node.
-        /// </remarks>
-        ///
-        [EnsureUserPermissionForContent("id", 'U')]
-        public HttpResponseMessage PostPublishById(int id)
-        {
-            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
-
-            if (foundContent == null)
-            {
-                return HandleContentNotFound(id, false);
-            }
-
-            var publishResult = Services.ContentService.PublishWithStatus(foundContent, Security.CurrentUser.Id);
-            if (publishResult.Success == false)
-            {
-                var notificationModel = new SimpleNotificationModel();
-                ShowMessageForPublishStatus(publishResult.Result, notificationModel, foundContent.ExpireDate);
-                return Request.CreateValidationErrorResponse(notificationModel);
-            }
-
-            //return ok
-            return Request.CreateResponse(HttpStatusCode.OK);
-
-        }
-
-        [HttpDelete]
-        [HttpPost]
-        public HttpResponseMessage DeleteBlueprint(int id)
-        {
-            var found = Services.ContentService.GetBlueprintById(id);
-
-            if (found == null)
-            {
-                return HandleContentNotFound(id, false);
-            }
-
-            Services.ContentService.DeleteBlueprint(found);
-
-            return Request.CreateResponse(HttpStatusCode.OK);
-        }
-
-        /// <summary>
-        /// Moves an item to the recycle bin, if it is already there then it will permanently delete it
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        /// <remarks>
-        /// The CanAccessContentAuthorize attribute will deny access to this method if the current user
-        /// does not have Delete access to this node.
-        /// </remarks>
-        [EnsureUserPermissionForContent("id", 'D')]
-        [HttpDelete]
-        [HttpPost]
-        public HttpResponseMessage DeleteById(int id)
-        {
-            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
-
-            if (foundContent == null)
-            {
-                return HandleContentNotFound(id, false);
-            }
-
-            //if the current item is in the recycle bin
-            if (foundContent.IsInRecycleBin() == false)
-            {
-                var moveResult = Services.ContentService.WithResult().MoveToRecycleBin(foundContent, Security.CurrentUser.Id);
-                if (moveResult == false)
-                {
-                    //returning an object of INotificationModel will ensure that any pending
-                    // notification messages are added to the response.
-                    return Request.CreateValidationErrorResponse(new SimpleNotificationModel());
-                }
-            }
-            else
-            {
-                var deleteResult = Services.ContentService.WithResult().Delete(foundContent, Security.CurrentUser.Id);
-                if (deleteResult == false)
-                {
-                    //returning an object of INotificationModel will ensure that any pending
-                    // notification messages are added to the response.
-                    return Request.CreateValidationErrorResponse(new SimpleNotificationModel());
-                }
-            }
-
-            return Request.CreateResponse(HttpStatusCode.OK);
-        }
-
-        /// <summary>
-        /// Empties the recycle bin
-        /// </summary>
-        /// <returns></returns>
-        /// <remarks>
-        /// attributed with EnsureUserPermissionForContent to verify the user has access to the recycle bin
-        /// </remarks>
-        [HttpDelete]
-        [HttpPost]
-        [EnsureUserPermissionForContent(Constants.System.RecycleBinContent, 'D')]
-        public HttpResponseMessage EmptyRecycleBin()
-        {
-            Services.ContentService.EmptyRecycleBin(Security.CurrentUser.Id);
-
-            return Request.CreateNotificationSuccessResponse(Services.TextService.Localize("defaultdialogs/recycleBinIsEmpty"));
-        }
-
-        /// <summary>
-        /// Change the sort order for content
-        /// </summary>
-        /// <param name="sorted"></param>
-        /// <returns></returns>
-        [EnsureUserPermissionForContent("sorted.ParentId", 'S')]
-        public HttpResponseMessage PostSort(ContentSortOrder sorted)
-        {
-            if (sorted == null)
-            {
-                return Request.CreateResponse(HttpStatusCode.NotFound);
-            }
-
-            //if there's nothing to sort just return ok
-            if (sorted.IdSortOrder.Length == 0)
-            {
-                return Request.CreateResponse(HttpStatusCode.OK);
-            }
-
-            try
-            {
-                var contentService = Services.ContentService;
-
-                // Save content with new sort order and update content xml in db accordingly
-                if (contentService.Sort(sorted.IdSortOrder, Security.CurrentUser.Id) == false)
-                {
-                    LogHelper.Warn<ContentController>("Content sorting failed, this was probably caused by an event being cancelled");
-                    return Request.CreateValidationErrorResponse("Content sorting failed, this was probably caused by an event being cancelled");
-                }
-                return Request.CreateResponse(HttpStatusCode.OK);
-            }
-            catch (Exception ex)
-            {
-                LogHelper.Error<ContentController>("Could not update content sort order", ex);
-                throw;
-            }
-        }
-
-        /// <summary>
-        /// Change the sort order for media
-        /// </summary>
-        /// <param name="move"></param>
-        /// <returns></returns>
-        [EnsureUserPermissionForContent("move.ParentId", 'M')]
-        public HttpResponseMessage PostMove(MoveOrCopy move)
-        {
-            var toMove = ValidateMoveOrCopy(move);
-
-            Services.ContentService.Move(toMove, move.ParentId, Security.CurrentUser.Id);
-
-            var response = Request.CreateResponse(HttpStatusCode.OK);
-            response.Content = new StringContent(toMove.Path, Encoding.UTF8, "application/json");
-            return response;
-        }
-
-        /// <summary>
-        /// Copies a content item and places the copy as a child of a given parent Id
-        /// </summary>
-        /// <param name="copy"></param>
-        /// <returns></returns>
-        [EnsureUserPermissionForContent("copy.ParentId", 'C')]
-        public HttpResponseMessage PostCopy(MoveOrCopy copy)
-        {
-            var toCopy = ValidateMoveOrCopy(copy);
-
-            var c = Services.ContentService.Copy(toCopy, copy.ParentId, copy.RelateToOriginal, copy.Recursive, Security.CurrentUser.Id);
-
-            var response = Request.CreateResponse(HttpStatusCode.OK);
-            response.Content = new StringContent(c.Path, Encoding.UTF8, "application/json");
-            return response;
-        }
-
-        /// <summary>
-        /// Unpublishes a node with a given Id and returns the unpublished entity
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        [EnsureUserPermissionForContent("id", 'U')]
-        [OutgoingEditorModelEvent]
-        public ContentItemDisplay PostUnPublish(int id)
-        {
-            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
-
-            if (foundContent == null)
-                HandleContentNotFound(id);
-
-            var unpublishResult = Services.ContentService.WithResult().UnPublish(foundContent, Security.CurrentUser.Id);
-
-            var content = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(foundContent, UmbracoContext);
-
-            if (unpublishResult == false)
-            {
-                AddCancelMessage(content);
-                throw new HttpResponseException(Request.CreateValidationErrorResponse(content));
-            }
-            else
-            {
-                content.AddSuccessNotification(Services.TextService.Localize("content/unPublish"), Services.TextService.Localize("speechBubbles/contentUnpublished"));
-                return content;
-            }
-        }
-
-        /// <summary>
-        /// Maps the dto property values to the persisted model
-        /// </summary>
-        /// <param name="contentItem"></param>
-        private void MapPropertyValues(ContentItemSave contentItem)
-        {
-            UpdateName(contentItem);
-
-            //TODO: We need to support 'send to publish'
-
-            contentItem.PersistedContent.ExpireDate = contentItem.ExpireDate;
-            contentItem.PersistedContent.ReleaseDate = contentItem.ReleaseDate;
-            //only set the template if it didn't change
-            var templateChanged = (contentItem.PersistedContent.Template == null && contentItem.TemplateAlias.IsNullOrWhiteSpace() == false)
-                                                        || (contentItem.PersistedContent.Template != null && contentItem.PersistedContent.Template.Alias != contentItem.TemplateAlias)
-                                                        || (contentItem.PersistedContent.Template != null && contentItem.TemplateAlias.IsNullOrWhiteSpace());
-            if (templateChanged)
-            {
-                var template = Services.FileService.GetTemplate(contentItem.TemplateAlias);
-                if (template == null && contentItem.TemplateAlias.IsNullOrWhiteSpace() == false)
-                {
-                    //ModelState.AddModelError("Template", "No template exists with the specified alias: " + contentItem.TemplateAlias);
-                    LogHelper.Warn<ContentController>("No template exists with the specified alias: " + contentItem.TemplateAlias);
-                }
-                else
-                {
-                    //NOTE: this could be null if there was a template and the posted template is null, this should remove the assigned template
-                    contentItem.PersistedContent.Template = template;
-                }
-            }
-
-            base.MapPropertyValues(contentItem);
-        }
-
-        /// <summary>
-        /// Ensures the item can be moved/copied to the new location
-        /// </summary>
-        /// <param name="model"></param>
-        /// <returns></returns>
-        private IContent ValidateMoveOrCopy(MoveOrCopy model)
-        {
-            if (model == null)
-            {
-                throw new HttpResponseException(HttpStatusCode.NotFound);
-            }
-
-            var contentService = Services.ContentService;
-            var toMove = contentService.GetById(model.Id);
-            if (toMove == null)
-            {
-                throw new HttpResponseException(HttpStatusCode.NotFound);
-            }
-            if (model.ParentId < 0)
-            {
-                //cannot move if the content item is not allowed at the root
-                if (toMove.ContentType.AllowedAsRoot == false)
-                {
-                    throw new HttpResponseException(
-                            Request.CreateNotificationValidationErrorResponse(
-                                    Services.TextService.Localize("moveOrCopy/notAllowedAtRoot")));
-                }
-            }
-            else
-            {
-                var parent = contentService.GetById(model.ParentId);
-                if (parent == null)
-                {
-                    throw new HttpResponseException(HttpStatusCode.NotFound);
-                }
-
-                //check if the item is allowed under this one
-                if (parent.ContentType.AllowedContentTypes.Select(x => x.Id).ToArray()
-                        .Any(x => x.Value == toMove.ContentType.Id) == false)
-                {
-                    throw new HttpResponseException(
-                            Request.CreateNotificationValidationErrorResponse(
-                                    Services.TextService.Localize("moveOrCopy/notAllowedByContentType")));
-                }
-
-                // Check on paths
-                if ((string.Format(",{0},", parent.Path)).IndexOf(string.Format(",{0},", toMove.Id), StringComparison.Ordinal) > -1)
-                {
-                    throw new HttpResponseException(
-                            Request.CreateNotificationValidationErrorResponse(
-                                    Services.TextService.Localize("moveOrCopy/notAllowedByPath")));
-                }
-            }
-
-            return toMove;
-        }
-
-        private void ShowMessageForPublishStatus(PublishStatus status, INotificationModel display, DateTime? expireDate)
-        {
-            switch (status.StatusType)
-            {
-                case PublishStatusType.Success:
-                case PublishStatusType.SuccessAlreadyPublished:
-                    display.AddSuccessNotification(
-                            Services.TextService.Localize("speechBubbles/editContentPublishedHeader"),
-                            expireDate.HasValue
-                                ? Services.TextService.Localize("speechBubbles/editContentPublishedWithExpireDateText", new [] { expireDate.Value.ToLongDateString(), expireDate.Value.ToShortTimeString() })
-                                : Services.TextService.Localize("speechBubbles/editContentPublishedText")
-                    );
-                    break;
-                case PublishStatusType.FailedPathNotPublished:
-                    display.AddWarningNotification(
-                            Services.TextService.Localize("publish"),
-                            Services.TextService.Localize("publish/contentPublishedFailedByParent",
-                                    new[] { string.Format("{0} ({1})", status.ContentItem.Name, status.ContentItem.Id) }).Trim());
-                    break;
-                case PublishStatusType.FailedCancelledByEvent:
-                    AddCancelMessage(display, "publish", "speechBubbles/contentPublishedFailedByEvent");
-                    break;
-                case PublishStatusType.FailedAwaitingRelease:
-                    display.AddWarningNotification(
-                            Services.TextService.Localize("publish"),
-                            Services.TextService.Localize("publish/contentPublishedFailedAwaitingRelease",
-                                    new[] { string.Format("{0} ({1})", status.ContentItem.Name, status.ContentItem.Id) }).Trim());
-                    break;
-                case PublishStatusType.FailedHasExpired:
-                    display.AddWarningNotification(
-                            Services.TextService.Localize("publish"),
-                            Services.TextService.Localize("publish/contentPublishedFailedExpired",
-                                    new[]
-                                    {
-                                                                string.Format("{0} ({1})", status.ContentItem.Name, status.ContentItem.Id),
-                                    }).Trim());
-                    break;
-                case PublishStatusType.FailedIsTrashed:
-                    //TODO: We should add proper error messaging for this!
-                    break;
-                case PublishStatusType.FailedContentInvalid:
-                    display.AddWarningNotification(
-                            Services.TextService.Localize("publish"),
-                            Services.TextService.Localize("publish/contentPublishedFailedInvalid",
-                                    new[]
-                                    {
-                                                                string.Format("{0} ({1})", status.ContentItem.Name, status.ContentItem.Id),
-                                                                string.Join(",", status.InvalidProperties.Select(x => x.Alias))
-                                    }).Trim());
-                    break;
-                default:
-                    throw new IndexOutOfRangeException();
-            }
-        }
-
-
-        /// <summary>
-        /// Performs a permissions check for the user to check if it has access to the node based on
-        /// start node and/or permissions for the node
-        /// </summary>
-        /// <param name="storage">The storage to add the content item to so it can be reused</param>
-        /// <param name="user"></param>
-        /// <param name="userService"></param>
-        /// <param name="contentService"></param>
-        /// <param name="entityService"></param>
-        /// <param name="nodeId">The content to lookup, if the contentItem is not specified</param>
-        /// <param name="permissionsToCheck"></param>
-        /// <param name="contentItem">Specifies the already resolved content item to check against</param>
-        /// <returns></returns>
-        internal static bool CheckPermissions(
-                IDictionary<string, object> storage,
-                IUser user,
-                IUserService userService,
-                IContentService contentService,
-                IEntityService entityService,
-                int nodeId,
-                char[] permissionsToCheck = null,
-                IContent contentItem = null)
-        {
-            if (storage == null) throw new ArgumentNullException("storage");
-            if (user == null) throw new ArgumentNullException("user");
-            if (userService == null) throw new ArgumentNullException("userService");
-            if (contentService == null) throw new ArgumentNullException("contentService");
-            if (entityService == null) throw new ArgumentNullException("entityService");
-
-            if (contentItem == null && nodeId != Constants.System.Root && nodeId != Constants.System.RecycleBinContent)
-            {
-                contentItem = contentService.GetById(nodeId);
-                //put the content item into storage so it can be retreived
-                // in the controller (saves a lookup)
-                storage[typeof(IContent).ToString()] = contentItem;
-            }
-
-            if (contentItem == null && nodeId != Constants.System.Root && nodeId != Constants.System.RecycleBinContent)
-            {
-                throw new HttpResponseException(HttpStatusCode.NotFound);
-            }
-
-            var hasPathAccess = (nodeId == Constants.System.Root)
-                ? user.HasContentRootAccess(entityService)
-                : (nodeId == Constants.System.RecycleBinContent)
-                    ? user.HasContentBinAccess(entityService)
-                    : user.HasPathAccess(contentItem, entityService);
-
-            if (hasPathAccess == false)
-            {
-                return false;
-            }
-
-            if (permissionsToCheck == null || permissionsToCheck.Length == 0)
-            {
-                return true;
-            }
-
-            //get the implicit/inherited permissions for the user for this path,
-            //if there is no content item for this id, than just use the id as the path (i.e. -1 or -20)
-            var path = contentItem != null ? contentItem.Path : nodeId.ToString();
-            var permission = userService.GetPermissionsForPath(user, path);
-
-            var allowed = true;
-            foreach (var p in permissionsToCheck)
-            {
-                if (permission == null
-                    || permission.GetAllPermissions().Contains(p.ToString(CultureInfo.InvariantCulture)) == false)
-                {
-                    allowed = false;
-                }
-            }
-            return allowed;
-        }
-
-        [EnsureUserPermissionForContent("contentId", 'F')]
-        public IEnumerable<NotifySetting> GetNotificationOptions(int contentId)
-        {
-            var notifications = new List<NotifySetting>();
-            if (contentId <= 0) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
-
-            var content = Services.ContentService.GetById(contentId);
-            if (content == null) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
-
-            var actionList = ActionsResolver.Current.Actions;
-            foreach (var a in actionList)
-            {
-                if (a.ShowInNotifier)
-                {
-                    NotifySetting n = new NotifySetting
-                    {
-                        Name = ui.Text("actions", a.Alias),
-                        Checked = (UmbracoUser.GetNotifications(content.Path).IndexOf(a.Letter) > -1),
-                        NotifyCode = a.Letter.ToString()
-                    };
-                    notifications.Add(n);
-                }
-            }
-            return notifications;
-        }
-
-        public void PostNotificationOptions(int contentId, string notifyOptions = "")
-        {
-            if (contentId <= 0) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
-            var content = Services.ContentService.GetById(contentId);
-
-            if (content == null) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
-            var node = new CMSNode(contentId);
-
-            global::umbraco.cms.businesslogic.workflow.Notification.UpdateNotifications(UmbracoUser, node, notifyOptions ?? "");
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using System.Web.Http;
+using System.Web.Http.Controllers;
+using System.Web.Http.ModelBinding;
+using AutoMapper;
+using Umbraco.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.Membership;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
+using Umbraco.Core.Publishing;
+using Umbraco.Core.Services;
+using Umbraco.Web.Models.ContentEditing;
+using Umbraco.Web.Models.Mapping;
+using Umbraco.Web.Mvc;
+using Umbraco.Web.WebApi;
+using Umbraco.Web.WebApi.Binders;
+using Umbraco.Web.WebApi.Filters;
+using Umbraco.Core.Events;
+using Constants = Umbraco.Core.Constants;
+using umbraco.cms.businesslogic;
+using System.Collections;
+using umbraco;
+
+namespace Umbraco.Web.Editors
+{
+    /// <summary>
+    /// The API controller used for editing content
+    /// </summary>
+    /// <remarks>
+    /// This controller is decorated with the UmbracoApplicationAuthorizeAttribute which means that any user requesting
+    /// access to ALL of the methods on this controller will need access to the content application.
+    /// </remarks>
+    [PluginController("UmbracoApi")]
+    [UmbracoApplicationAuthorize(Constants.Applications.Content)]
+    [ContentControllerConfiguration]
+    public class ContentController : ContentControllerBase
+    {
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public ContentController()
+                : this(UmbracoContext.Current)
+        {
+        }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="umbracoContext"></param>
+        public ContentController(UmbracoContext umbracoContext)
+                : base(umbracoContext)
+        {
+        }
+
+        /// <summary>
+        /// Configures this controller with a custom action selector
+        /// </summary>
+        private class ContentControllerConfigurationAttribute : Attribute, IControllerConfiguration
+        {
+            public void Initialize(HttpControllerSettings controllerSettings, HttpControllerDescriptor controllerDescriptor)
+            {
+                controllerSettings.Services.Replace(typeof(IHttpActionSelector), new ParameterSwapControllerActionSelector(
+                    new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetNiceUrl", "id", typeof(int), typeof(Guid), typeof(Udi)),
+                    new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetById", "id", typeof(int), typeof(Guid), typeof(Udi))
+                ));
+            }
+        }
+
+        /// <summary>
+        /// Return content for the specified ids
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        [FilterAllowedOutgoingContent(typeof(IEnumerable<ContentItemDisplay>))]
+        public IEnumerable<ContentItemDisplay> GetByIds([FromUri]int[] ids)
+        {
+            var foundContent = Services.ContentService.GetByIds(ids);
+            return foundContent.Select(content => AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(content, UmbracoContext));
+        }
+
+        /// <summary>
+        /// Updates the permissions for a content item for a particular user group
+        /// </summary>
+        /// <param name="saveModel"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// Permission check is done for letter 'R' which is for <see cref="ActionRights"/> which the user must have access to to update
+        /// </remarks>
+        [EnsureUserPermissionForContent("saveModel.ContentId", 'R')]
+        public IEnumerable<AssignedUserGroupPermissions> PostSaveUserGroupPermissions(UserGroupPermissionsSave saveModel)
+        {
+            if (saveModel.ContentId <= 0) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
+
+            //TODO: Should non-admins be alowed to set granular permissions?
+
+            var content = Services.ContentService.GetById(saveModel.ContentId);
+            if (content == null) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
+
+            //current permissions explicitly assigned to this content item
+            var contentPermissions = Services.ContentService.GetPermissionsForEntity(content)
+                .ToDictionary(x => x.UserGroupId, x => x);
+
+            var allUserGroups = Services.UserService.GetAllUserGroups().ToArray();
+
+            //loop through each user group
+            foreach (var userGroup in allUserGroups)
+            {
+                //check if there's a permission set posted up for this user group
+                IEnumerable<string> groupPermissions;
+                if (saveModel.AssignedPermissions.TryGetValue(userGroup.Id, out groupPermissions))
+                {
+                    //create a string collection of the assigned letters
+                    var groupPermissionCodes = groupPermissions.ToArray();
+
+                    //check if there are no permissions assigned for this group save model, if that is the case we want to reset the permissions
+                    //for this group/node which will go back to the defaults
+                    if (groupPermissionCodes.Length == 0)
+                    {
+                        Services.UserService.RemoveUserGroupPermissions(userGroup.Id, content.Id);
+                    }
+                    //check if they are the defaults, if so we should just remove them if they exist since it's more overhead having them stored
+                    else if (userGroup.Permissions.UnsortedSequenceEqual(groupPermissionCodes))
+                    {
+                        //only remove them if they are actually currently assigned
+                        if (contentPermissions.ContainsKey(userGroup.Id))
+                        {
+                            //remove these permissions from this node for this group since the ones being assigned are the same as the defaults
+                            Services.UserService.RemoveUserGroupPermissions(userGroup.Id, content.Id);
+                        }
+                    }
+                    //if they are different we need to update, otherwise there's nothing to update
+                    else if (contentPermissions.ContainsKey(userGroup.Id) == false || contentPermissions[userGroup.Id].AssignedPermissions.UnsortedSequenceEqual(groupPermissionCodes) == false)
+                    {
+
+                        Services.UserService.ReplaceUserGroupPermissions(userGroup.Id, groupPermissionCodes.Select(x => x[0]), content.Id);
+                    }
+                }
+            }
+
+            return GetDetailedPermissions(content, allUserGroups);
+        }
+
+        /// <summary>
+        /// Returns the user group permissions for user groups assigned to this node
+        /// </summary>
+        /// <param name="contentId"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// Permission check is done for letter 'R' which is for <see cref="ActionRights"/> which the user must have access to to view
+        /// </remarks>
+        [EnsureUserPermissionForContent("contentId", 'R')]
+        public IEnumerable<AssignedUserGroupPermissions> GetDetailedPermissions(int contentId)
+        {
+            if (contentId <= 0) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
+            var content = Services.ContentService.GetById(contentId);
+            if (content == null) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
+
+            //TODO: Should non-admins be able to see detailed permissions?
+
+            var allUserGroups = Services.UserService.GetAllUserGroups();
+
+            return GetDetailedPermissions(content, allUserGroups);
+        }
+
+        private IEnumerable<AssignedUserGroupPermissions> GetDetailedPermissions(IContent content, IEnumerable<IUserGroup> allUserGroups)
+        {
+            //get all user groups and map their default permissions to the AssignedUserGroupPermissions model.
+            //we do this because not all groups will have true assigned permissions for this node so if they don't have assigned permissions, we need to show the defaults.
+
+            var defaultPermissionsByGroup = Mapper.Map<IEnumerable<AssignedUserGroupPermissions>>(allUserGroups).ToArray();
+
+            var defaultPermissionsAsDictionary = defaultPermissionsByGroup
+                .ToDictionary(x => Convert.ToInt32(x.Id), x => x);
+
+            //get the actual assigned permissions
+            var assignedPermissionsByGroup = Services.ContentService.GetPermissionsForEntity(content).ToArray();
+
+            //iterate over assigned and update the defaults with the real values
+            foreach (var assignedGroupPermission in assignedPermissionsByGroup)
+            {
+                var defaultUserGroupPermissions = defaultPermissionsAsDictionary[assignedGroupPermission.UserGroupId];
+
+                //clone the default permissions model to the assigned ones
+                defaultUserGroupPermissions.AssignedPermissions = AssignedUserGroupPermissions.ClonePermissions(defaultUserGroupPermissions.DefaultPermissions);
+
+                //since there is custom permissions assigned to this node for this group, we need to clear all of the default permissions
+                //and we'll re-check it if it's one of the explicitly assigned ones
+                foreach (var permission in defaultUserGroupPermissions.AssignedPermissions.SelectMany(x => x.Value))
+                {
+                    permission.Checked = false;
+                    permission.Checked = assignedGroupPermission.AssignedPermissions.Contains(permission.PermissionCode, StringComparer.InvariantCulture);
+                }
+
+            }
+
+            return defaultPermissionsByGroup;
+        }
+
+        /// <summary>
+        /// Returns an item to be used to display the recycle bin for content
+        /// </summary>
+        /// <returns></returns>
+        public ContentItemDisplay GetRecycleBin()
+        {
+            var display = new ContentItemDisplay
+            {
+                Id = Constants.System.RecycleBinContent,
+                Alias = "recycleBin",
+                ParentId = -1,
+                Name = Services.TextService.Localize("general/recycleBin"),
+                ContentTypeAlias = "recycleBin",
+                CreateDate = DateTime.Now,
+                IsContainer = true,
+                Path = "-1," + Constants.System.RecycleBinContent
+            };
+
+            TabsAndPropertiesResolver<IContent>.AddListView(display, "content", Services.DataTypeService, Services.TextService);
+
+            return display;
+        }
+
+        public ContentItemDisplay GetBlueprintById(int id)
+        {
+            var foundContent = Services.ContentService.GetBlueprintById(id);
+            if (foundContent == null)
+            {
+                HandleContentNotFound(id);
+            }
+
+            var content = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(foundContent, UmbracoContext);
+
+            SetupBlueprint(content, foundContent);
+
+            return content;
+        }
+
+        private static void SetupBlueprint(ContentItemDisplay content, IContent persistedContent)
+        {
+            content.AllowPreview = false;
+
+            //set a custom path since the tree that renders this has the content type id as the parent
+            content.Path = string.Format("-1,{0},{1}", persistedContent.ContentTypeId, content.Id);
+
+            content.AllowedActions = new[] { "A" };
+            content.IsBlueprint = true;
+
+            var excludeProps = new[] { "_umb_urls", "_umb_releasedate", "_umb_expiredate", "_umb_template" };
+            var propsTab = content.Tabs.Last();
+            propsTab.Properties = propsTab.Properties
+                .Where(p => excludeProps.Contains(p.Alias) == false);
+        }
+
+        /// <summary>
+        /// Gets the content json for the content id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [OutgoingEditorModelEvent]
+        [EnsureUserPermissionForContent("id")]
+        public ContentItemDisplay GetById(int id)
+        {
+            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
+            if (foundContent == null)
+            {
+                HandleContentNotFound(id);
+            }
+
+            var content = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(foundContent, UmbracoContext);
+            return content;
+        }
+
+        /// <summary>
+        /// Gets the content json for the content id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [OutgoingEditorModelEvent]
+        [EnsureUserPermissionForContent("id")]
+        public ContentItemDisplay GetById(Guid id)
+        {
+            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
+            if (foundContent == null)
+            {
+                HandleContentNotFound(id);
+            }
+
+            var content = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(foundContent, UmbracoContext);
+            return content;
+        }
+
+        /// <summary>
+        /// Gets the content json for the content id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [OutgoingEditorModelEvent]
+        [EnsureUserPermissionForContent("id")]
+        public ContentItemDisplay GetById(Udi id)
+        {
+            var guidUdi = id as GuidUdi;
+            if (guidUdi != null)
+            {
+                return GetById(guidUdi.Guid);
+            }
+
+            throw new HttpResponseException(HttpStatusCode.NotFound);
+        }
+
+        [EnsureUserPermissionForContent("id")]
+        public ContentItemDisplay GetWithTreeDefinition(int id)
+        {
+            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
+            if (foundContent == null)
+            {
+                HandleContentNotFound(id);
+            }
+
+            var content = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(foundContent, UmbracoContext);
+            return content;
+        }
+
+        /// <summary>
+        /// Gets an empty content item for the
+        /// </summary>
+        /// <param name="contentTypeAlias"></param>
+        /// <param name="parentId"></param>
+        /// <returns>
+        /// If this is a container type, we'll remove the umbContainerView tab for a new item since
+        /// it cannot actually list children if it doesn't exist yet.
+        /// </returns>
+        [OutgoingEditorModelEvent]
+        public ContentItemDisplay GetEmpty(string contentTypeAlias, int parentId)
+        {
+            var contentType = Services.ContentTypeService.GetContentType(contentTypeAlias);
+            if (contentType == null)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+
+            var emptyContent = Services.ContentService.CreateContent("", parentId, contentType.Alias, UmbracoUser.Id);
+            var mapped = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(emptyContent, UmbracoContext);
+            // translate the content type name if applicable
+            mapped.ContentTypeName = Services.TextService.UmbracoDictionaryTranslate(mapped.ContentTypeName);
+            // if your user type doesn't have access to the Settings section it would not get this property mapped
+            if(mapped.DocumentType != null)
+                mapped.DocumentType.Name = Services.TextService.UmbracoDictionaryTranslate(mapped.DocumentType.Name);
+
+            //remove this tab if it exists: umbContainerView
+            var containerTab = mapped.Tabs.FirstOrDefault(x => x.Alias == Constants.Conventions.PropertyGroups.ListViewGroupName);
+            mapped.Tabs = mapped.Tabs.Except(new[] { containerTab });
+            return mapped;
+        }
+
+        [OutgoingEditorModelEvent]
+        public ContentItemDisplay GetEmpty(int blueprintId, int parentId)
+        {
+            var blueprint = Services.ContentService.GetBlueprintById(blueprintId);
+            if (blueprint == null)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+
+            blueprint.Id = 0;
+            blueprint.Name = string.Empty;
+            blueprint.ParentId = parentId;
+
+            var mapped = Mapper.Map<ContentItemDisplay>(blueprint);
+
+            //remove this tab if it exists: umbContainerView
+            var containerTab = mapped.Tabs.FirstOrDefault(x => x.Alias == Constants.Conventions.PropertyGroups.ListViewGroupName);
+            mapped.Tabs = mapped.Tabs.Except(new[] { containerTab });
+            return mapped;
+        }
+
+        /// <summary>
+        /// Gets the Url for a given node ID
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public HttpResponseMessage GetNiceUrl(int id)
+        {
+            var url = Umbraco.NiceUrl(id);
+            var response = Request.CreateResponse(HttpStatusCode.OK);
+            response.Content = new StringContent(url, Encoding.UTF8, "application/json");
+            return response;
+        }
+
+        /// <summary>
+        /// Gets the Url for a given node ID
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public HttpResponseMessage GetNiceUrl(Guid id)
+        {
+            var url = Umbraco.UrlProvider.GetUrl(id);
+            var response = Request.CreateResponse(HttpStatusCode.OK);
+            response.Content = new StringContent(url, Encoding.UTF8, "application/json");
+            return response;
+        }
+
+        /// <summary>
+        /// Gets the Url for a given node ID
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public HttpResponseMessage GetNiceUrl(Udi id)
+        {
+            var guidUdi = id as GuidUdi;
+            if (guidUdi != null)
+            {
+                return GetNiceUrl(guidUdi.Guid);
+            }
+            throw new HttpResponseException(HttpStatusCode.NotFound);
+        }
+
+        /// <summary>
+        /// Gets the children for the content id passed in
+        /// </summary>
+        /// <returns></returns>
+        [FilterAllowedOutgoingContent(typeof(IEnumerable<ContentItemBasic<ContentPropertyBasic, IContent>>), "Items")]
+        public PagedResult<ContentItemBasic<ContentPropertyBasic, IContent>> GetChildren(
+                int id,
+                int pageNumber = 0,  //TODO: This should be '1' as it's not the index
+                int pageSize = 0,
+                string orderBy = "SortOrder",
+                Direction orderDirection = Direction.Ascending,
+                bool orderBySystemField = true,
+                string filter = "")
+        {
+            return GetChildren(id, null, pageNumber, pageSize, orderBy, orderDirection, orderBySystemField, filter);
+        }
+
+        /// <summary>
+        /// Gets the children for the content id passed in
+        /// </summary>
+        /// <returns></returns>
+        [FilterAllowedOutgoingContent(typeof(IEnumerable<ContentItemBasic<ContentPropertyBasic, IContent>>), "Items")]
+        public PagedResult<ContentItemBasic<ContentPropertyBasic, IContent>> GetChildren(
+                int id,
+                string includeProperties,
+                int pageNumber = 0,  //TODO: This should be '1' as it's not the index
+                int pageSize = 0,
+                string orderBy = "SortOrder",
+                Direction orderDirection = Direction.Ascending,
+                bool orderBySystemField = true,
+                string filter = "")
+        {
+            long totalChildren;
+            IContent[] children;
+            if (pageNumber > 0 && pageSize > 0)
+            {
+                children = Services.ContentService
+                 .GetPagedChildren(id, (pageNumber - 1), pageSize, out totalChildren
+                 , orderBy, orderDirection, orderBySystemField, filter).ToArray();
+            }
+            else
+            {
+                children = Services.ContentService.GetChildren(id).ToArray();
+                totalChildren = children.Length;
+            }
+
+            if (totalChildren == 0)
+            {
+                return new PagedResult<ContentItemBasic<ContentPropertyBasic, IContent>>(0, 0, 0);
+            }
+
+            var pagedResult = new PagedResult<ContentItemBasic<ContentPropertyBasic, IContent>>(totalChildren, pageNumber, pageSize);
+            pagedResult.Items = children.Select(content =>
+                Mapper.Map<IContent, ContentItemBasic<ContentPropertyBasic, IContent>>(content,
+                    opts =>
+                    {
+                        // if there's a list of property aliases to map - we will make sure to store this in the mapping context.
+                        if (String.IsNullOrWhiteSpace(includeProperties) == false)
+                        {
+                            opts.Items["IncludeProperties"] = includeProperties.Split(new[] { ", ", "," }, StringSplitOptions.RemoveEmptyEntries);
+                        }
+                    }));
+
+            return pagedResult;
+        }
+
+        [Obsolete("Dont use this, it is incorrectly named, use HasPermission instead")]
+        public bool GetHasPermission(string permissionToCheck, int nodeId)
+        {
+            return HasPermission(permissionToCheck, nodeId);
+        }
+
+        /// <summary>
+        /// Returns permissions for all nodes passed in for the current user
+        /// TODO: This should be moved to the CurrentUserController?
+        /// </summary>
+        /// <param name="nodeIds"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public Dictionary<int, string[]> GetPermissions(int[] nodeIds)
+        {
+            var permissions = Services.UserService
+                    .GetPermissions(Security.CurrentUser, nodeIds);
+
+            var permissionsDictionary = new Dictionary<int, string[]>();
+            foreach (var nodeId in nodeIds)
+            {
+                var aggregatePerms = permissions.GetAllPermissions(nodeId).ToArray();
+                permissionsDictionary.Add(nodeId, aggregatePerms);
+            }
+
+            return permissionsDictionary;
+        }
+
+        /// <summary>
+        /// Checks a nodes permission for the current user
+        /// TODO: This should be moved to the CurrentUserController?
+        /// </summary>
+        /// <param name="permissionToCheck"></param>
+        /// <param name="nodeId"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public bool HasPermission(string permissionToCheck, int nodeId)
+        {
+            var p = Services.UserService.GetPermissions(Security.CurrentUser, nodeId).GetAllPermissions();
+            if (p.Contains(permissionToCheck.ToString(CultureInfo.InvariantCulture)))
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Creates a blueprint from a content item
+        /// </summary>
+        /// <param name="contentId">The content id to copy</param>
+        /// <param name="name">The name of the blueprint</param>
+        /// <returns></returns>
+        [HttpPost]
+        public SimpleNotificationModel CreateBlueprintFromContent([FromUri]int contentId, [FromUri]string name)
+        {
+            if (string.IsNullOrWhiteSpace(name)) throw new ArgumentException("Value cannot be null or whitespace.", "name");
+
+            var content = Services.ContentService.GetById(contentId);
+            if (content == null)
+                throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
+
+            EnsureUniqueName(name, content, "name");
+
+            var blueprint = Services.ContentService.CreateContentFromBlueprint(content, name, Security.CurrentUser.Id);
+
+            Services.ContentService.SaveBlueprint(blueprint, Security.CurrentUser.Id);
+
+            var notificationModel = new SimpleNotificationModel();
+            notificationModel.AddSuccessNotification(
+                Services.TextService.Localize("blueprints/createdBlueprintHeading"),
+                Services.TextService.Localize("blueprints/createdBlueprintMessage", new[] { content.Name })
+            );
+
+            return notificationModel;
+        }
+
+        private void EnsureUniqueName(string name, IContent content, string modelName)
+        {
+            var existing = Services.ContentService.GetBlueprintsForContentTypes(content.ContentTypeId);
+            if (existing.Any(x => x.Name == name && x.Id != content.Id))
+            {
+                ModelState.AddModelError(modelName, Services.TextService.Localize("blueprints/duplicateBlueprintMessage"));
+                throw new HttpResponseException(Request.CreateValidationErrorResponse(ModelState));
+            }
+        }
+
+        /// <summary>
+        /// Saves content
+        /// </summary>
+        /// <returns></returns>
+        [FileUploadCleanupFilter]
+        [ContentPostValidate]
+        public ContentItemDisplay PostSaveBlueprint(
+            [ModelBinder(typeof(BlueprintItemBinder))] ContentItemSave contentItem)
+        {
+            var contentItemDisplay = PostSaveInternal(contentItem,
+                content =>
+                {
+                    EnsureUniqueName(content.Name, content, "Name");
+
+                    Services.ContentService.SaveBlueprint(contentItem.PersistedContent, Security.CurrentUser.Id);
+                    //we need to reuse the underlying logic so return the result that it wants
+                    return Attempt<OperationStatus>.Succeed(new OperationStatus(OperationStatusType.Success, new EventMessages()));
+                });
+            SetupBlueprint(contentItemDisplay, contentItemDisplay.PersistedContent);
+
+            return contentItemDisplay;
+        }
+
+        /// <summary>
+        /// Saves content
+        /// </summary>
+        /// <returns></returns>
+        [FileUploadCleanupFilter]
+        [ContentPostValidate]
+        [OutgoingEditorModelEvent]
+        public ContentItemDisplay PostSave(
+                [ModelBinder(typeof(ContentItemBinder))]
+                                ContentItemSave contentItem)
+        {
+            return PostSaveInternal(contentItem,
+                content => Services.ContentService.WithResult().Save(contentItem.PersistedContent, Security.CurrentUser.Id));
+        }
+
+        private ContentItemDisplay PostSaveInternal(ContentItemSave contentItem, Func<IContent, Attempt<OperationStatus>> saveMethod)
+        {
+            //Recent versions of IE/Edge may send in the full clientside file path instead of just the file name.
+            //To ensure similar behavior across all browsers no matter what they do - we strip the FileName property of all
+            //uploaded files to being *only* the actual file name (as it should be).
+            if (contentItem.UploadedFiles != null && contentItem.UploadedFiles.Any())
+            {
+                foreach (var file in contentItem.UploadedFiles)
+                {
+                    file.FileName = Path.GetFileName(file.FileName);
+                }
+            }
+
+            //If we've reached here it means:
+            // * Our model has been bound
+            // * and validated
+            // * any file attachments have been saved to their temporary location for us to use
+            // * we have a reference to the DTO object and the persisted object
+            // * Permissions are valid
+            MapPropertyValues(contentItem);
+
+            //We need to manually check the validation results here because:
+            // * We still need to save the entity even if there are validation value errors
+            // * Depending on if the entity is new, and if there are non property validation errors (i.e. the name is null)
+            //      then we cannot continue saving, we can only display errors
+            // * If there are validation errors and they were attempting to publish, we can only save, NOT publish and display
+            //      a message indicating this
+            if (ModelState.IsValid == false)
+            {
+                if (ValidationHelper.ModelHasRequiredForPersistenceErrors(contentItem) && IsCreatingAction(contentItem.Action))
+                {
+                    //ok, so the absolute mandatory data is invalid and it's new, we cannot actually continue!
+                    // add the modelstate to the outgoing object and throw a validation message
+                    var forDisplay = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(contentItem.PersistedContent, UmbracoContext);
+                    forDisplay.Errors = ModelState.ToErrorDictionary();
+                    throw new HttpResponseException(Request.CreateValidationErrorResponse(forDisplay));
+
+                }
+
+                //if the model state is not valid we cannot publish so change it to save
+                switch (contentItem.Action)
+                {
+                    case ContentSaveAction.Publish:
+                        contentItem.Action = ContentSaveAction.Save;
+                        break;
+                    case ContentSaveAction.PublishNew:
+                        contentItem.Action = ContentSaveAction.SaveNew;
+                        break;
+                }
+            }
+
+            //initialize this to successful
+            var publishStatus = Attempt<PublishStatus>.Succeed();
+            var wasCancelled = false;   //tracks if the operation was cancelled
+            var noop = false;           //tracks if the operation performed no operation (nothing to save)
+
+            if (contentItem.Action == ContentSaveAction.Save || contentItem.Action == ContentSaveAction.SaveNew)
+            {
+                //save the item
+                var saveResult = saveMethod(contentItem.PersistedContent);
+
+                wasCancelled = saveResult.Success == false && saveResult.Result.StatusType == OperationStatusType.FailedCancelledByEvent;
+                noop = saveResult.Result.StatusType == OperationStatusType.NoOperation;
+            }
+            else if (contentItem.Action == ContentSaveAction.SendPublish || contentItem.Action == ContentSaveAction.SendPublishNew)
+            {
+                var sendResult = Services.ContentService.SendToPublication(contentItem.PersistedContent, Security.CurrentUser.Id);
+                wasCancelled = sendResult == false;
+            }
+            else
+            {
+                //publish the item and check if it worked, if not we will show a diff msg below
+                publishStatus = Services.ContentService.SaveAndPublishWithStatus(contentItem.PersistedContent, Security.CurrentUser.Id);
+                wasCancelled = publishStatus.Result.StatusType == PublishStatusType.FailedCancelledByEvent;
+            }
+
+            //return the updated model
+            var display = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(contentItem.PersistedContent, UmbracoContext);
+
+            //lasty, if it is not valid, add the modelstate to the outgoing object and throw a 403
+            HandleInvalidModelState(display);
+
+            //put the correct msgs in
+            switch (contentItem.Action)
+            {
+                case ContentSaveAction.Save:
+                case ContentSaveAction.SaveNew:
+                    if (wasCancelled)
+                    {
+                        AddCancelMessage(display);
+                        
+                    }
+                    else if (noop == false)
+                    {
+                        display.AddSuccessNotification(
+                            Services.TextService.Localize("speechBubbles/editContentSavedHeader"),
+                            contentItem.ReleaseDate.HasValue
+                                ? Services.TextService.Localize("speechBubbles/editContentSavedWithReleaseDateText", new[] { contentItem.ReleaseDate.Value.ToLongDateString(), contentItem.ReleaseDate.Value.ToShortTimeString() })
+                                : Services.TextService.Localize("speechBubbles/editContentSavedText")
+                        );
+                    }
+                    break;
+                case ContentSaveAction.SendPublish:
+                case ContentSaveAction.SendPublishNew:
+                    if (wasCancelled)
+                    {
+                        AddCancelMessage(display);
+                    }
+                    else if (noop == false)
+                    {
+                        display.AddSuccessNotification(
+                            Services.TextService.Localize("speechBubbles/editContentSendToPublish"),
+                            Services.TextService.Localize("speechBubbles/editContentSendToPublishText"));
+                    }
+
+                    break;
+                case ContentSaveAction.Publish:
+                case ContentSaveAction.PublishNew:
+                    ShowMessageForPublishStatus(publishStatus.Result, display, contentItem.ExpireDate);
+                    break;
+            }
+
+            //If the item is new and the operation was cancelled, we need to return a different
+            // status code so the UI can handle it since it won't be able to redirect since there
+            // is no Id to redirect to!
+            if (wasCancelled && IsCreatingAction(contentItem.Action))
+            {
+                throw new HttpResponseException(Request.CreateValidationErrorResponse(display));
+            }
+
+            display.PersistedContent = contentItem.PersistedContent;
+
+            return display;
+        }
+
+        /// <summary>
+        /// Publishes a document with a given ID
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// The CanAccessContentAuthorize attribute will deny access to this method if the current user
+        /// does not have Publish access to this node.
+        /// </remarks>
+        ///
+        [EnsureUserPermissionForContent("id", 'U')]
+        public HttpResponseMessage PostPublishById(int id)
+        {
+            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
+
+            if (foundContent == null)
+            {
+                return HandleContentNotFound(id, false);
+            }
+
+            var publishResult = Services.ContentService.PublishWithStatus(foundContent, Security.CurrentUser.Id);
+            if (publishResult.Success == false)
+            {
+                var notificationModel = new SimpleNotificationModel();
+                ShowMessageForPublishStatus(publishResult.Result, notificationModel, foundContent.ExpireDate);
+                return Request.CreateValidationErrorResponse(notificationModel);
+            }
+
+            //return ok
+            return Request.CreateResponse(HttpStatusCode.OK);
+
+        }
+
+        [HttpDelete]
+        [HttpPost]
+        public HttpResponseMessage DeleteBlueprint(int id)
+        {
+            var found = Services.ContentService.GetBlueprintById(id);
+
+            if (found == null)
+            {
+                return HandleContentNotFound(id, false);
+            }
+
+            Services.ContentService.DeleteBlueprint(found);
+
+            return Request.CreateResponse(HttpStatusCode.OK);
+        }
+
+        /// <summary>
+        /// Moves an item to the recycle bin, if it is already there then it will permanently delete it
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// The CanAccessContentAuthorize attribute will deny access to this method if the current user
+        /// does not have Delete access to this node.
+        /// </remarks>
+        [EnsureUserPermissionForContent("id", 'D')]
+        [HttpDelete]
+        [HttpPost]
+        public HttpResponseMessage DeleteById(int id)
+        {
+            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
+
+            if (foundContent == null)
+            {
+                return HandleContentNotFound(id, false);
+            }
+
+            //if the current item is in the recycle bin
+            if (foundContent.IsInRecycleBin() == false)
+            {
+                var moveResult = Services.ContentService.WithResult().MoveToRecycleBin(foundContent, Security.CurrentUser.Id);
+                if (moveResult == false)
+                {
+                    //returning an object of INotificationModel will ensure that any pending
+                    // notification messages are added to the response.
+                    return Request.CreateValidationErrorResponse(new SimpleNotificationModel());
+                }
+            }
+            else
+            {
+                var deleteResult = Services.ContentService.WithResult().Delete(foundContent, Security.CurrentUser.Id);
+                if (deleteResult == false)
+                {
+                    //returning an object of INotificationModel will ensure that any pending
+                    // notification messages are added to the response.
+                    return Request.CreateValidationErrorResponse(new SimpleNotificationModel());
+                }
+            }
+
+            return Request.CreateResponse(HttpStatusCode.OK);
+        }
+
+        /// <summary>
+        /// Empties the recycle bin
+        /// </summary>
+        /// <returns></returns>
+        /// <remarks>
+        /// attributed with EnsureUserPermissionForContent to verify the user has access to the recycle bin
+        /// </remarks>
+        [HttpDelete]
+        [HttpPost]
+        [EnsureUserPermissionForContent(Constants.System.RecycleBinContent, 'D')]
+        public HttpResponseMessage EmptyRecycleBin()
+        {
+            Services.ContentService.EmptyRecycleBin(Security.CurrentUser.Id);
+
+            return Request.CreateNotificationSuccessResponse(Services.TextService.Localize("defaultdialogs/recycleBinIsEmpty"));
+        }
+
+        /// <summary>
+        /// Change the sort order for content
+        /// </summary>
+        /// <param name="sorted"></param>
+        /// <returns></returns>
+        [EnsureUserPermissionForContent("sorted.ParentId", 'S')]
+        public HttpResponseMessage PostSort(ContentSortOrder sorted)
+        {
+            if (sorted == null)
+            {
+                return Request.CreateResponse(HttpStatusCode.NotFound);
+            }
+
+            //if there's nothing to sort just return ok
+            if (sorted.IdSortOrder.Length == 0)
+            {
+                return Request.CreateResponse(HttpStatusCode.OK);
+            }
+
+            try
+            {
+                var contentService = Services.ContentService;
+
+                // Save content with new sort order and update content xml in db accordingly
+                if (contentService.Sort(sorted.IdSortOrder, Security.CurrentUser.Id) == false)
+                {
+                    LogHelper.Warn<ContentController>("Content sorting failed, this was probably caused by an event being cancelled");
+                    return Request.CreateValidationErrorResponse("Content sorting failed, this was probably caused by an event being cancelled");
+                }
+                return Request.CreateResponse(HttpStatusCode.OK);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Error<ContentController>("Could not update content sort order", ex);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// Change the sort order for media
+        /// </summary>
+        /// <param name="move"></param>
+        /// <returns></returns>
+        [EnsureUserPermissionForContent("move.ParentId", 'M')]
+        public HttpResponseMessage PostMove(MoveOrCopy move)
+        {
+            var toMove = ValidateMoveOrCopy(move);
+
+            Services.ContentService.Move(toMove, move.ParentId, Security.CurrentUser.Id);
+
+            var response = Request.CreateResponse(HttpStatusCode.OK);
+            response.Content = new StringContent(toMove.Path, Encoding.UTF8, "application/json");
+            return response;
+        }
+
+        /// <summary>
+        /// Copies a content item and places the copy as a child of a given parent Id
+        /// </summary>
+        /// <param name="copy"></param>
+        /// <returns></returns>
+        [EnsureUserPermissionForContent("copy.ParentId", 'C')]
+        public HttpResponseMessage PostCopy(MoveOrCopy copy)
+        {
+            var toCopy = ValidateMoveOrCopy(copy);
+
+            var c = Services.ContentService.Copy(toCopy, copy.ParentId, copy.RelateToOriginal, copy.Recursive, Security.CurrentUser.Id);
+
+            var response = Request.CreateResponse(HttpStatusCode.OK);
+            response.Content = new StringContent(c.Path, Encoding.UTF8, "application/json");
+            return response;
+        }
+
+        /// <summary>
+        /// Unpublishes a node with a given Id and returns the unpublished entity
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [EnsureUserPermissionForContent("id", 'U')]
+        [OutgoingEditorModelEvent]
+        public ContentItemDisplay PostUnPublish(int id)
+        {
+            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
+
+            if (foundContent == null)
+                HandleContentNotFound(id);
+
+            var unpublishResult = Services.ContentService.WithResult().UnPublish(foundContent, Security.CurrentUser.Id);
+
+            var content = AutoMapperExtensions.MapWithUmbracoContext<IContent, ContentItemDisplay>(foundContent, UmbracoContext);
+
+            if (unpublishResult == false)
+            {
+                AddCancelMessage(content);
+                throw new HttpResponseException(Request.CreateValidationErrorResponse(content));
+            }
+            else
+            {
+                content.AddSuccessNotification(Services.TextService.Localize("content/unPublish"), Services.TextService.Localize("speechBubbles/contentUnpublished"));
+                return content;
+            }
+        }
+
+        /// <summary>
+        /// Maps the dto property values to the persisted model
+        /// </summary>
+        /// <param name="contentItem"></param>
+        private void MapPropertyValues(ContentItemSave contentItem)
+        {
+            UpdateName(contentItem);
+
+            //TODO: We need to support 'send to publish'
+
+            contentItem.PersistedContent.ExpireDate = contentItem.ExpireDate;
+            contentItem.PersistedContent.ReleaseDate = contentItem.ReleaseDate;
+            //only set the template if it didn't change
+            var templateChanged = (contentItem.PersistedContent.Template == null && contentItem.TemplateAlias.IsNullOrWhiteSpace() == false)
+                                                        || (contentItem.PersistedContent.Template != null && contentItem.PersistedContent.Template.Alias != contentItem.TemplateAlias)
+                                                        || (contentItem.PersistedContent.Template != null && contentItem.TemplateAlias.IsNullOrWhiteSpace());
+            if (templateChanged)
+            {
+                var template = Services.FileService.GetTemplate(contentItem.TemplateAlias);
+                if (template == null && contentItem.TemplateAlias.IsNullOrWhiteSpace() == false)
+                {
+                    //ModelState.AddModelError("Template", "No template exists with the specified alias: " + contentItem.TemplateAlias);
+                    LogHelper.Warn<ContentController>("No template exists with the specified alias: " + contentItem.TemplateAlias);
+                }
+                else
+                {
+                    //NOTE: this could be null if there was a template and the posted template is null, this should remove the assigned template
+                    contentItem.PersistedContent.Template = template;
+                }
+            }
+
+            base.MapPropertyValues(contentItem);
+        }
+
+        /// <summary>
+        /// Ensures the item can be moved/copied to the new location
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        private IContent ValidateMoveOrCopy(MoveOrCopy model)
+        {
+            if (model == null)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+
+            var contentService = Services.ContentService;
+            var toMove = contentService.GetById(model.Id);
+            if (toMove == null)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+            if (model.ParentId < 0)
+            {
+                //cannot move if the content item is not allowed at the root
+                if (toMove.ContentType.AllowedAsRoot == false)
+                {
+                    throw new HttpResponseException(
+                            Request.CreateNotificationValidationErrorResponse(
+                                    Services.TextService.Localize("moveOrCopy/notAllowedAtRoot")));
+                }
+            }
+            else
+            {
+                var parent = contentService.GetById(model.ParentId);
+                if (parent == null)
+                {
+                    throw new HttpResponseException(HttpStatusCode.NotFound);
+                }
+
+                //check if the item is allowed under this one
+                if (parent.ContentType.AllowedContentTypes.Select(x => x.Id).ToArray()
+                        .Any(x => x.Value == toMove.ContentType.Id) == false)
+                {
+                    throw new HttpResponseException(
+                            Request.CreateNotificationValidationErrorResponse(
+                                    Services.TextService.Localize("moveOrCopy/notAllowedByContentType")));
+                }
+
+                // Check on paths
+                if ((string.Format(",{0},", parent.Path)).IndexOf(string.Format(",{0},", toMove.Id), StringComparison.Ordinal) > -1)
+                {
+                    throw new HttpResponseException(
+                            Request.CreateNotificationValidationErrorResponse(
+                                    Services.TextService.Localize("moveOrCopy/notAllowedByPath")));
+                }
+            }
+
+            return toMove;
+        }
+
+        private void ShowMessageForPublishStatus(PublishStatus status, INotificationModel display, DateTime? expireDate)
+        {
+            switch (status.StatusType)
+            {
+                case PublishStatusType.Success:
+                case PublishStatusType.SuccessAlreadyPublished:
+                    display.AddSuccessNotification(
+                            Services.TextService.Localize("speechBubbles/editContentPublishedHeader"),
+                            expireDate.HasValue
+                                ? Services.TextService.Localize("speechBubbles/editContentPublishedWithExpireDateText", new [] { expireDate.Value.ToLongDateString(), expireDate.Value.ToShortTimeString() })
+                                : Services.TextService.Localize("speechBubbles/editContentPublishedText")
+                    );
+                    break;
+                case PublishStatusType.FailedPathNotPublished:
+                    display.AddWarningNotification(
+                            Services.TextService.Localize("publish"),
+                            Services.TextService.Localize("publish/contentPublishedFailedByParent",
+                                    new[] { string.Format("{0} ({1})", status.ContentItem.Name, status.ContentItem.Id) }).Trim());
+                    break;
+                case PublishStatusType.FailedCancelledByEvent:
+                    AddCancelMessage(display, "publish", "speechBubbles/contentPublishedFailedByEvent");
+                    break;
+                case PublishStatusType.FailedAwaitingRelease:
+                    display.AddWarningNotification(
+                            Services.TextService.Localize("publish"),
+                            Services.TextService.Localize("publish/contentPublishedFailedAwaitingRelease",
+                                    new[] { string.Format("{0} ({1})", status.ContentItem.Name, status.ContentItem.Id) }).Trim());
+                    break;
+                case PublishStatusType.FailedHasExpired:
+                    display.AddWarningNotification(
+                            Services.TextService.Localize("publish"),
+                            Services.TextService.Localize("publish/contentPublishedFailedExpired",
+                                    new[]
+                                    {
+                                                                string.Format("{0} ({1})", status.ContentItem.Name, status.ContentItem.Id),
+                                    }).Trim());
+                    break;
+                case PublishStatusType.FailedIsTrashed:
+                    //TODO: We should add proper error messaging for this!
+                    break;
+                case PublishStatusType.FailedContentInvalid:
+                    display.AddWarningNotification(
+                            Services.TextService.Localize("publish"),
+                            Services.TextService.Localize("publish/contentPublishedFailedInvalid",
+                                    new[]
+                                    {
+                                                                string.Format("{0} ({1})", status.ContentItem.Name, status.ContentItem.Id),
+                                                                string.Join(",", status.InvalidProperties.Select(x => x.Alias))
+                                    }).Trim());
+                    break;
+                default:
+                    throw new IndexOutOfRangeException();
+            }
+        }
+
+
+        /// <summary>
+        /// Performs a permissions check for the user to check if it has access to the node based on
+        /// start node and/or permissions for the node
+        /// </summary>
+        /// <param name="storage">The storage to add the content item to so it can be reused</param>
+        /// <param name="user"></param>
+        /// <param name="userService"></param>
+        /// <param name="contentService"></param>
+        /// <param name="entityService"></param>
+        /// <param name="nodeId">The content to lookup, if the contentItem is not specified</param>
+        /// <param name="permissionsToCheck"></param>
+        /// <param name="contentItem">Specifies the already resolved content item to check against</param>
+        /// <returns></returns>
+        internal static bool CheckPermissions(
+                IDictionary<string, object> storage,
+                IUser user,
+                IUserService userService,
+                IContentService contentService,
+                IEntityService entityService,
+                int nodeId,
+                char[] permissionsToCheck = null,
+                IContent contentItem = null)
+        {
+            if (storage == null) throw new ArgumentNullException("storage");
+            if (user == null) throw new ArgumentNullException("user");
+            if (userService == null) throw new ArgumentNullException("userService");
+            if (contentService == null) throw new ArgumentNullException("contentService");
+            if (entityService == null) throw new ArgumentNullException("entityService");
+
+            if (contentItem == null && nodeId != Constants.System.Root && nodeId != Constants.System.RecycleBinContent)
+            {
+                contentItem = contentService.GetById(nodeId);
+                //put the content item into storage so it can be retreived
+                // in the controller (saves a lookup)
+                storage[typeof(IContent).ToString()] = contentItem;
+            }
+
+            if (contentItem == null && nodeId != Constants.System.Root && nodeId != Constants.System.RecycleBinContent)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+
+            var hasPathAccess = (nodeId == Constants.System.Root)
+                ? user.HasContentRootAccess(entityService)
+                : (nodeId == Constants.System.RecycleBinContent)
+                    ? user.HasContentBinAccess(entityService)
+                    : user.HasPathAccess(contentItem, entityService);
+
+            if (hasPathAccess == false)
+            {
+                return false;
+            }
+
+            if (permissionsToCheck == null || permissionsToCheck.Length == 0)
+            {
+                return true;
+            }
+
+            //get the implicit/inherited permissions for the user for this path,
+            //if there is no content item for this id, than just use the id as the path (i.e. -1 or -20)
+            var path = contentItem != null ? contentItem.Path : nodeId.ToString();
+            var permission = userService.GetPermissionsForPath(user, path);
+
+            var allowed = true;
+            foreach (var p in permissionsToCheck)
+            {
+                if (permission == null
+                    || permission.GetAllPermissions().Contains(p.ToString(CultureInfo.InvariantCulture)) == false)
+                {
+                    allowed = false;
+                }
+            }
+            return allowed;
+        }
+
+        [EnsureUserPermissionForContent("contentId", 'F')]
+        public IEnumerable<NotifySetting> GetNotificationOptions(int contentId)
+        {
+            var notifications = new List<NotifySetting>();
+            if (contentId <= 0) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
+
+            var content = Services.ContentService.GetById(contentId);
+            if (content == null) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
+
+            var actionList = ActionsResolver.Current.Actions;
+            foreach (var a in actionList)
+            {
+                if (a.ShowInNotifier)
+                {
+                    NotifySetting n = new NotifySetting
+                    {
+                        Name = ui.Text("actions", a.Alias),
+                        Checked = (UmbracoUser.GetNotifications(content.Path).IndexOf(a.Letter) > -1),
+                        NotifyCode = a.Letter.ToString()
+                    };
+                    notifications.Add(n);
+                }
+            }
+            return notifications;
+        }
+
+        public void PostNotificationOptions(int contentId, string notifyOptions = "")
+        {
+            if (contentId <= 0) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
+            var content = Services.ContentService.GetById(contentId);
+
+            if (content == null) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
+            var node = new CMSNode(contentId);
+
+            global::umbraco.cms.businesslogic.workflow.Notification.UpdateNotifications(UmbracoUser, node, notifyOptions ?? "");
+        }
+    }
+}

From e92823f756b3bfa1089ec7164310afc76b61eefa Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Thu, 19 Sep 2019 10:00:42 +0100
Subject: [PATCH 664/776] Remove the un-needed notificiation

---
 .../directives/components/content/edit.controller.js      | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
index 409efec1b0..2bb50bd07b 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
@@ -38,7 +38,7 @@
 
             //watch for changes to isNew & the content.id, set the page.isNew accordingly and load the breadcrumb if we can
             $scope.$watchGroup(['isNew', 'content.id'], function (newVal, oldVal) {
-                
+
                 var contentId = newVal[1];
                 $scope.page.isNew = Object.toBoolean(newVal[0]);
 
@@ -65,7 +65,7 @@
             if (content.id && content.isChildOfListView && content.trashed === false) {
                 $scope.page.listViewPath = "/content/content/edit/" + content.parentId
                     + "?list=" + $routeParams.list
-                    + "&page=" + $routeParams.page 
+                    + "&page=" + $routeParams.page
                     + "&filter=" + $routeParams.filter
                     + "&orderBy=" + $routeParams.orderBy
                     + "&orderDirection=" + $routeParams.orderDirection;
@@ -172,8 +172,6 @@
             }));
 
             evts.push(eventsService.on("rte.file.uploading", function(){
-                notificationsService.info("Saving Disabled", "The node cannot be saved until the image/s has finished uploading")
-
                 $scope.page.saveButtonState = "busy";
                 $scope.page.buttonGroupState = "busy";
 
@@ -505,7 +503,7 @@
 
         $scope.unpublish = function () {
             clearNotifications($scope.content);
-            if (formHelper.submitForm({ scope: $scope, action: "unpublish", skipValidation: true })) {                
+            if (formHelper.submitForm({ scope: $scope, action: "unpublish", skipValidation: true })) {
                 var dialog = {
                     parentScope: $scope,
                     view: "views/content/overlays/unpublish.html",

From f7d9c0b1088de961e247e69d1c00f35ad27bac7d Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Thu, 19 Sep 2019 11:04:02 +0200
Subject: [PATCH 665/776] V8: Fix clientside mandatory validation for checkbox
 list (#5780)

---
 .../src/views/propertyeditors/checkboxlist/checkboxlist.html    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html
index cd1b84826a..eccb77c2a1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html
@@ -1,7 +1,7 @@
 <div class="umb-property-editor umb-checkboxlist" ng-controller="Umbraco.PropertyEditors.CheckboxListController as vm">
     <ul class="unstyled">
         <li ng-repeat="item in vm.viewItems track by item.key">
-            <umb-checkbox name="{{::model.alias}}" value="{{::item.value}}" model="item.checked" text="{{::item.value}}" on-change="vm.change(model, value)" required="vm.model.validation.mandatory && !vm.model.value.length"></umb-checkbox>
+            <umb-checkbox name="{{::model.alias}}" value="{{::item.value}}" model="item.checked" text="{{::item.value}}" on-change="vm.changed(model, value)" required="model.validation.mandatory && !model.value.length"></umb-checkbox>
         </li>
     </ul>
 </div>

From 9c12b4ee40cc9d51adcc78fa47dd3d072024244f Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Thu, 19 Sep 2019 11:04:02 +0200
Subject: [PATCH 666/776] V8: Fix clientside mandatory validation for checkbox
 list (#5780)

(cherry picked from commit f7d9c0b1088de961e247e69d1c00f35ad27bac7d)
---
 .../src/views/propertyeditors/checkboxlist/checkboxlist.html    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html
index cd1b84826a..eccb77c2a1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html
@@ -1,7 +1,7 @@
 <div class="umb-property-editor umb-checkboxlist" ng-controller="Umbraco.PropertyEditors.CheckboxListController as vm">
     <ul class="unstyled">
         <li ng-repeat="item in vm.viewItems track by item.key">
-            <umb-checkbox name="{{::model.alias}}" value="{{::item.value}}" model="item.checked" text="{{::item.value}}" on-change="vm.change(model, value)" required="vm.model.validation.mandatory && !vm.model.value.length"></umb-checkbox>
+            <umb-checkbox name="{{::model.alias}}" value="{{::item.value}}" model="item.checked" text="{{::item.value}}" on-change="vm.changed(model, value)" required="model.validation.mandatory && !model.value.length"></umb-checkbox>
         </li>
     </ul>
 </div>

From f28d52898d3317f9451fd0f3b12af12b6c9ec791 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Thu, 19 Sep 2019 11:15:32 +0200
Subject: [PATCH 667/776] no need for this one

---
 src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 36e4409bc1..28df45f10f 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -365,7 +365,6 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                     paste_remove_styles: true,
                     paste_text_linebreaktype: true,
                     paste_strip_class_attributes: "all",
-                    paste_retain_style_properties: "all",
                     
                     paste_word_valid_elements: validElements,
                     

From a3de75f4c076256fb353b42214d7b58e9d18a54f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Thu, 19 Sep 2019 11:34:45 +0200
Subject: [PATCH 668/776] added comments + better naming

---
 .../src/common/services/tinymce.service.js             | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 28df45f10f..865dccc7fa 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -349,24 +349,24 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                 };
                 
                 // We keep spans here, cause removing spans here also removes b-tags inside of them, instead we strip them out later.
-                var validElements = "-strong/b,-em/i,-u,-span,-p,-ol,-ul,-li,-p/div,-a[href|name],sub,sup,strike,br,del,table[width],tr,td[colspan|rowspan|width],th[colspan|rowspan|width],thead,tfoot,tbody,img[src|alt|width|height],ul,ol,li,hr,pre,dl,dt,figure,figcaption,wbr"
+                var validPasteElements = "-strong/b,-em/i,-u,-span,-p,-ol,-ul,-li,-p/div,-a[href|name],sub,sup,strike,br,del,table[width],tr,td[colspan|rowspan|width],th[colspan|rowspan|width],thead,tfoot,tbody,img[src|alt|width|height],ul,ol,li,hr,pre,dl,dt,figure,figcaption,wbr"
                   
-                // add valid elements from styleFormats.
+                // add elements from user configurated styleFormats to our list of validPasteElements.
                 var style, i = 0;
                 for(; i < styles.styleFormats.length; i++) {
                     style = styles.styleFormats[i];
                     if(style.block) {
-                        validElements += "," + style.block;
+                        validPasteElements += "," + style.block;
                     }
                 }
                 
                 var pasteConfig = {
                     
                     paste_remove_styles: true,
-                    paste_text_linebreaktype: true,
+                    paste_text_linebreaktype: true, //Converts plaintext linebreaks to br or p elements.
                     paste_strip_class_attributes: "all",
                     
-                    paste_word_valid_elements: validElements,
+                    paste_word_valid_elements: validPasteElements,
                     
                     paste_preprocess: cleanupPasteData
                     

From 59c5f4cd7cb154b18a5f93d96b95979a56a25502 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Thu, 19 Sep 2019 11:36:41 +0200
Subject: [PATCH 669/776] further comment

---
 .../src/common/services/tinymce.service.js                     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 865dccc7fa..91427b81c6 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -350,8 +350,9 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                 
                 // We keep spans here, cause removing spans here also removes b-tags inside of them, instead we strip them out later.
                 var validPasteElements = "-strong/b,-em/i,-u,-span,-p,-ol,-ul,-li,-p/div,-a[href|name],sub,sup,strike,br,del,table[width],tr,td[colspan|rowspan|width],th[colspan|rowspan|width],thead,tfoot,tbody,img[src|alt|width|height],ul,ol,li,hr,pre,dl,dt,figure,figcaption,wbr"
-                  
+                
                 // add elements from user configurated styleFormats to our list of validPasteElements.
+                // (This means that we only allow H3-element if its configured as a styleFormat on this specific propertyEditor.)
                 var style, i = 0;
                 for(; i < styles.styleFormats.length; i++) {
                     style = styles.styleFormats[i];

From 8708a0ae979e32e12cd2ae4270041816de27a1d5 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Thu, 19 Sep 2019 10:38:33 +0100
Subject: [PATCH 670/776] Wrap in safeApply

---
 .../src/common/services/tinymce.service.js                | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 7512da293c..69db2be561 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -168,11 +168,15 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
         xhr.open('POST', Umbraco.Sys.ServerVariables.umbracoUrls.tinyMceApiBaseUrl + 'UploadImage');
 
         xhr.onloadstart = function(e) {
-            eventsService.emit("rte.file.uploading");
+            angularHelper.safeApply($rootScope, function() {
+                eventsService.emit("rte.file.uploading");
+            });
         };
 
         xhr.onloadend = function(e) {
-            eventsService.emit("rte.file.uploaded");
+            angularHelper.safeApply($rootScope, function() {
+                eventsService.emit("rte.file.uploaded");
+            });
         };
 
         xhr.upload.onprogress = function (e) {

From b4495d0ae5142d0e6cb02c09b1bcabe3b8091dc3 Mon Sep 17 00:00:00 2001
From: martin j griffiths <martin.griffiths@lcp.uk.com>
Date: Thu, 19 Sep 2019 10:30:51 +0100
Subject: [PATCH 671/776] Update rte.controller.js

Fix issue where an embedded macro prevents editor from returning to pristine/valid after a publish
---
 .../src/views/propertyeditors/rte/rte.controller.js          | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
index 109aa37fbb..eb049ea1b3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
@@ -257,7 +257,10 @@ angular.module("umbraco")
                     // Update model on change, i.e. copy/pasted text, plugins altering content
                     editor.on('SetContent', function (e) {
                         if (!e.initial) {
-                            syncContent(editor);
+                              // sync content if editor is dirty
+                              if (!editor.isNotDirty) {
+                                syncContent(editor);
+                            }
                         }
                     });
 

From 4535885bdb4598031a5b5bd7ec5abe22d24532af Mon Sep 17 00:00:00 2001
From: martin j griffiths <martin.griffiths@lcp.uk.com>
Date: Thu, 19 Sep 2019 10:30:51 +0100
Subject: [PATCH 672/776] Update rte.controller.js

Fix issue where an embedded macro prevents editor from returning to pristine/valid after a publish

(cherry picked from commit b4495d0ae5142d0e6cb02c09b1bcabe3b8091dc3)
---
 .../src/views/propertyeditors/rte/rte.controller.js          | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
index 109aa37fbb..eb049ea1b3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
@@ -257,7 +257,10 @@ angular.module("umbraco")
                     // Update model on change, i.e. copy/pasted text, plugins altering content
                     editor.on('SetContent', function (e) {
                         if (!e.initial) {
-                            syncContent(editor);
+                              // sync content if editor is dirty
+                              if (!editor.isNotDirty) {
+                                syncContent(editor);
+                            }
                         }
                     });
 

From 5fdae055d56873b670fa141503d73c0a9060a57e Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 19 Sep 2019 13:13:21 +0200
Subject: [PATCH 673/776] Fix bad merge

---
 .../src/views/propertyeditors/checkboxlist/checkboxlist.html    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html
index eccb77c2a1..20f24728dd 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html
@@ -1,7 +1,7 @@
 <div class="umb-property-editor umb-checkboxlist" ng-controller="Umbraco.PropertyEditors.CheckboxListController as vm">
     <ul class="unstyled">
         <li ng-repeat="item in vm.viewItems track by item.key">
-            <umb-checkbox name="{{::model.alias}}" value="{{::item.value}}" model="item.checked" text="{{::item.value}}" on-change="vm.changed(model, value)" required="model.validation.mandatory && !model.value.length"></umb-checkbox>
+            <umb-checkbox name="{{::model.alias}}" value="{{::item.value}}" model="item.checked" text="{{::item.value}}" on-change="vm.change(model, value)" required="model.validation.mandatory && !model.value.length"></umb-checkbox>
         </li>
     </ul>
 </div>

From 2a3b169923e2382e6ed4c6a6f07ed8ab2c874cc6 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 19 Sep 2019 13:13:21 +0200
Subject: [PATCH 674/776] Fix bad merge

(cherry picked from commit 5fdae055d56873b670fa141503d73c0a9060a57e)
---
 .../src/views/propertyeditors/checkboxlist/checkboxlist.html    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html
index eccb77c2a1..20f24728dd 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html
@@ -1,7 +1,7 @@
 <div class="umb-property-editor umb-checkboxlist" ng-controller="Umbraco.PropertyEditors.CheckboxListController as vm">
     <ul class="unstyled">
         <li ng-repeat="item in vm.viewItems track by item.key">
-            <umb-checkbox name="{{::model.alias}}" value="{{::item.value}}" model="item.checked" text="{{::item.value}}" on-change="vm.changed(model, value)" required="model.validation.mandatory && !model.value.length"></umb-checkbox>
+            <umb-checkbox name="{{::model.alias}}" value="{{::item.value}}" model="item.checked" text="{{::item.value}}" on-change="vm.change(model, value)" required="model.validation.mandatory && !model.value.length"></umb-checkbox>
         </li>
     </ul>
 </div>

From 7c2643d57af14eabd55c0aa1f04765917805f629 Mon Sep 17 00:00:00 2001
From: Steve Megson <steve@megson.org>
Date: Mon, 16 Sep 2019 15:33:07 +0100
Subject: [PATCH 675/776] Reload after rollback

---
 .../directives/components/content/edit.controller.js      | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
index 806d43f92b..5324869061 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
@@ -171,6 +171,14 @@
                 }
             }));
 
+            evts.push(eventsService.on("editors.content.reload", function (name, args) {                
+                if (args && args.node && $scope.content.id === args.node.id) {
+                    reload();
+                    loadBreadcrumb();
+                    syncTreeNode($scope.content, $scope.content.path);
+                }
+            }));
+
         }
 
         /**

From e9bd67b695c4df195376258f524ab65b78880ed5 Mon Sep 17 00:00:00 2001
From: stevemegson <steve@megson.org>
Date: Thu, 19 Sep 2019 14:20:17 +0100
Subject: [PATCH 676/776] V8: Tours - fix scrolling highlighted element into
 view (#6356)

---
 .../application/umbtour.directive.js          | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js
index b749518660..287962b6d3 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js
@@ -327,10 +327,24 @@ In the following example you see how to run some custom logic before a step goes
                     }
 
                     var scrollParent = element.scrollParent();
-                    var scrollToCenterOfContainer = element[0].offsetTop - (scrollParent[0].clientHeight / 2 ) + (element[0].clientHeight / 2);
+                    var el = element;
+                    var offsetTop = 0;
+                    if (scrollParent[0] === document) {
+                        offsetTop = el[0].offsetTop;
+                    } else {
+                        while ($.contains(scrollParent[0], el[0])) {
+                            offsetTop += el[0].offsetTop;
+                            el = el.offsetParent();
+                        }
+                    }
+                    
+                    var scrollToCenterOfContainer = offsetTop - (scrollParent[0].clientHeight / 2);
+                    if (element[0].clientHeight < scrollParent[0].clientHeight) {
+                        scrollToCenterOfContainer += (element[0].clientHeight / 2);
+                    }
 
                     // Detect if scroll is needed
-                    if (element[0].offsetTop > scrollParent[0].clientHeight) {
+                    if (offsetTop > scrollParent[0].clientHeight - 200) {
                         scrollParent.animate({
                             scrollTop: scrollToCenterOfContainer
                         }, function () {
@@ -391,7 +405,7 @@ In the following example you see how to run some custom logic before a step goes
                         }
 
                         if (position === "right") {
-                            if (offset.top < documentHeight / 2) {
+                            if (offset.top + popoverHeight < documentHeight) {
                                 css.top = offset.top;
                                 css.left = offset.left + width + margin;
                             } else {
@@ -411,7 +425,7 @@ In the following example you see how to run some custom logic before a step goes
                         }
 
                         if (position === "left") {
-                            if (offset.top < documentHeight / 2) {
+                            if (offset.top + popoverHeight < documentHeight) {
                                 css.top = offset.top;
                                 css.left = offset.left - popoverWidth - margin;
                             } else {

From 97ac31a858fed26bdeb7d384de6263500bf0a1d3 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Wed, 28 Aug 2019 18:30:11 +0200
Subject: [PATCH 677/776] Fix preview with multiple cultures + highlight the
 current culture

---
 .../src/less/canvas-designer.less                      | 10 +++++++++-
 .../src/preview/preview.controller.js                  |  5 ++++-
 src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml  |  8 ++++----
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less b/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less
index 4db2e434d2..8b043c9045 100644
--- a/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less
+++ b/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less
@@ -272,7 +272,6 @@ a, a:hover{
 ul.sections {
     display: block;
     background: #1b264f;
-    height: 100%;
     position:absolute;
     top: 90px;
     width: 80px;
@@ -281,12 +280,21 @@ ul.sections {
     margin:0;
     padding:0;
     margin-left: -80px;
+    overflow: scroll;
+    overflow-x: hidden;
+    height: calc(100% - 91px);
+
+    &::-webkit-scrollbar {
+        width: 0px;
+        background: transparent; 
+    }
 }
 
 ul.sections li {
     display: block;
     border-left: 4px #1b264f solid;
     transition: all .3s linear;
+    cursor: pointer;
 }
 
 .fix-left-menu ul.sections li a span,
diff --git a/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js b/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
index 1316642e93..c4cb821818 100644
--- a/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
@@ -143,7 +143,10 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
                 setPageUrl();
             }
         };
-        
+
+        $scope.isCurrentCulture = function(culture) {
+            return $location.search().culture === culture;
+        }
     })
 
 
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
index 17a2f3c66a..65f77dbf85 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
@@ -44,21 +44,21 @@
             </div>
             <ul class="sections" ng-class="{selected: showDevicesPreview && showDevices}">
                 <li ng-repeat="device in devices" ng-class="{ current:previewDevice==device }">
-                    <a href="" ng-click="updatePreviewDevice(device)"><i class="icon {{device.icon}}" title="{{device.title}}"></i><span></span></a>
+                    <a ng-click="updatePreviewDevice(device)"><i class="icon {{device.icon}}" title="{{device.title}}"></i><span></span></a>
                 </li>
 
                 @if (Model.Languages != null && Model.Languages.Count() > 1)
                 {
                     foreach (var previewLink in Model.Languages)
                      {
-                         <li>
-                             <a href="" ng-click="changeCulture('@previewLink.IsoCode')" title="Preview in @previewLink.CultureName"><i class="icon icon-globe-europe---africa"></i><span>@previewLink.CultureName</span></a>
+                         <li ng-class="{ current:isCurrentCulture('@previewLink.IsoCode') }">
+                             <a ng-click="changeCulture('@previewLink.IsoCode')" title="Preview in @previewLink.CultureName"><i class="icon icon-globe-europe---africa"></i><span>@previewLink.CultureName</span></a>
                          </li>
                      }
                 }
 
                 <li>
-                    <a href="" ng-click="exitPreview()" title="Exit Preview"><i class="icon icon-wrong"></i><span> </span></a>
+                    <a ng-click="exitPreview()" title="Exit Preview"><i class="icon icon-wrong"></i><span> </span></a>
                 </li>
             </ul>
         </div>

From a0c0f61ef4e54c90076007e13ec722612015af22 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 20 Sep 2019 11:03:45 +1000
Subject: [PATCH 678/776] fix js unit test

---
 src/Umbraco.Web.UI.Client/package-lock.json   | 96 +++++++++----------
 .../propertyeditors/rte-controller.spec.js    | 14 ++-
 2 files changed, 61 insertions(+), 49 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json
index b14c415dfb..be1582f1e4 100644
--- a/src/Umbraco.Web.UI.Client/package-lock.json
+++ b/src/Umbraco.Web.UI.Client/package-lock.json
@@ -955,7 +955,7 @@
     },
     "ansi-escapes": {
       "version": "3.1.0",
-      "resolved": "http://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
       "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==",
       "dev": true
     },
@@ -1178,7 +1178,7 @@
     "array-slice": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
-      "integrity": "sha1-42jqFfibxwaff/uJrsOmx9SsItQ=",
+      "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
       "dev": true
     },
     "array-sort": {
@@ -1555,7 +1555,7 @@
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "optional": true,
@@ -1571,7 +1571,7 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "optional": true,
@@ -1746,7 +1746,7 @@
     "buffer-alloc": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
-      "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
+      "integrity": "sha1-iQ3ZDZI6hz4I4Q5f1RpX5bfM4Ow=",
       "dev": true,
       "requires": {
         "buffer-alloc-unsafe": "^1.1.0",
@@ -1756,7 +1756,7 @@
     "buffer-alloc-unsafe": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
-      "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==",
+      "integrity": "sha1-vX3CauKXLQ7aJTvgYdupkjScGfA=",
       "dev": true
     },
     "buffer-crc32": {
@@ -2455,7 +2455,7 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
@@ -2578,7 +2578,7 @@
     "core-js": {
       "version": "2.5.7",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz",
-      "integrity": "sha1-+XJgj/DOrWi4QaFqky0LGDeRgU4=",
+      "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==",
       "dev": true
     },
     "core-util-is": {
@@ -3562,7 +3562,7 @@
     "doctrine": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha1-XNAfwQFiG0LEzX9dGmYkNxbT850=",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
       "dev": true,
       "requires": {
         "esutils": "^2.0.2"
@@ -4166,7 +4166,7 @@
     },
     "engine.io-client": {
       "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz",
+      "resolved": "http://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz",
       "integrity": "sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==",
       "dev": true,
       "requires": {
@@ -4368,7 +4368,7 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true,
           "optional": true
         }
@@ -4463,7 +4463,7 @@
     "eslint-scope": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz",
-      "integrity": "sha1-UL8wcekzi83EMzF5Sgy1M/ATYXI=",
+      "integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==",
       "dev": true,
       "requires": {
         "esrecurse": "^4.1.0",
@@ -4473,13 +4473,13 @@
     "eslint-utils": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.3.1.tgz",
-      "integrity": "sha1-moUbqJ7nxGA0b5fPiTnHKYgn5RI=",
+      "integrity": "sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==",
       "dev": true
     },
     "eslint-visitor-keys": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
-      "integrity": "sha1-PzGA+y4pEBdxastMnW1bXDSmqB0=",
+      "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==",
       "dev": true
     },
     "espree": {
@@ -4502,7 +4502,7 @@
     "esquery": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
-      "integrity": "sha1-QGxRZYsfWZGl+bYrHcJbAOPlxwg=",
+      "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
       "dev": true,
       "requires": {
         "estraverse": "^4.0.0"
@@ -4511,7 +4511,7 @@
     "esrecurse": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
-      "integrity": "sha1-AHo7n9vCs7uH5IeeoZyS/b05Qs8=",
+      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
       "dev": true,
       "requires": {
         "estraverse": "^4.1.0"
@@ -4587,7 +4587,7 @@
     "exec-buffer": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/exec-buffer/-/exec-buffer-3.2.0.tgz",
-      "integrity": "sha512-wsiD+2Tp6BWHoVv3B+5Dcx6E7u5zky+hUwOHjuH2hKSLR3dvRmX8fk8UD8uqQixHs4Wk6eDmiegVrMPjKj7wpA==",
+      "integrity": "sha1-sWhtvZBMfPmC5lLB9aebHlVzCCs=",
       "dev": true,
       "optional": true,
       "requires": {
@@ -4796,7 +4796,7 @@
         "fill-range": {
           "version": "2.2.4",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
-          "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
+          "integrity": "sha1-6x53OrsFbc2N8r/favWbizqTZWU=",
           "dev": true,
           "requires": {
             "is-number": "^2.1.0",
@@ -5352,7 +5352,7 @@
     "fs-constants": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
+      "integrity": "sha1-a+Dem+mYzhavivwkSXue6bfM2a0=",
       "dev": true,
       "optional": true
     },
@@ -6140,7 +6140,7 @@
     "global-modules": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-      "integrity": "sha1-bXcPDrUjrHgWTXK15xqIdyZcw+o=",
+      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
       "dev": true,
       "requires": {
         "global-prefix": "^1.0.1",
@@ -6743,7 +6743,7 @@
     "gulp-eslint": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/gulp-eslint/-/gulp-eslint-5.0.0.tgz",
-      "integrity": "sha1-KiaECV93Syz3kxAmIHjFbMehK1I=",
+      "integrity": "sha512-9GUqCqh85C7rP9120cpxXuZz2ayq3BZc85pCTuPJS03VQYxne0aWPIXWx6LSvsGPa3uRqtSO537vaugOh+5cXg==",
       "dev": true,
       "requires": {
         "eslint": "^5.0.1",
@@ -8198,7 +8198,7 @@
     "is-absolute": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
-      "integrity": "sha1-OV4a6EsR8mrReV5zwXN45IowFXY=",
+      "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
       "dev": true,
       "requires": {
         "is-relative": "^1.0.0",
@@ -8497,7 +8497,7 @@
     "is-relative": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
-      "integrity": "sha1-obtpNc6MXboei5dUubLcwCDiJg0=",
+      "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
       "dev": true,
       "requires": {
         "is-unc-path": "^1.0.0"
@@ -8506,7 +8506,7 @@
     "is-resolvable": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
-      "integrity": "sha1-+xj4fOH+uSUWnJpAfBkxijIG7Yg=",
+      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
       "dev": true
     },
     "is-retry-allowed": {
@@ -8556,7 +8556,7 @@
     "is-unc-path": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
-      "integrity": "sha1-1zHoiY7QkKEsNSrS6u1Qla0yLJ0=",
+      "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
       "dev": true,
       "requires": {
         "unc-path-regex": "^0.1.2"
@@ -8716,7 +8716,7 @@
     "json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
       "dev": true
     },
     "json-stable-stringify-without-jsonify": {
@@ -9475,7 +9475,7 @@
     "lowercase-keys": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
-      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
+      "integrity": "sha1-b54wtHCE2XGnyCD/FabFFnt0wm8=",
       "dev": true,
       "optional": true
     },
@@ -9510,7 +9510,7 @@
     "make-dir": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
-      "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+      "integrity": "sha1-ecEDO4BRW9bSTsmTPoYMp17ifww=",
       "dev": true,
       "requires": {
         "pify": "^3.0.0"
@@ -9527,7 +9527,7 @@
     "make-iterator": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
-      "integrity": "sha1-KbM/MSqo9UfEpeSQ9Wr87JkTOtY=",
+      "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
       "dev": true,
       "requires": {
         "kind-of": "^6.0.2"
@@ -9724,7 +9724,7 @@
     "mimic-fn": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-      "integrity": "sha1-ggyGo5M0ZA6ZUWkovQP8qIBX0CI=",
+      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
       "dev": true
     },
     "minimatch": {
@@ -12877,7 +12877,7 @@
       "dependencies": {
         "minimist": {
           "version": "0.0.10",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+          "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
           "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
           "dev": true
         },
@@ -13269,7 +13269,7 @@
     "pluralize": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
-      "integrity": "sha1-KYuJ34uTsCIdv0Ia0rGx6iP8Z3c=",
+      "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==",
       "dev": true
     },
     "posix-character-classes": {
@@ -13961,7 +13961,7 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
@@ -14459,7 +14459,7 @@
     "safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo=",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
       "dev": true
     },
     "sax": {
@@ -14648,7 +14648,7 @@
     "setprototypeof": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-      "integrity": "sha1-0L2FU2iHtv58DYGMuWLZ2RxU5lY=",
+      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
       "dev": true
     },
     "shebang-command": {
@@ -14926,7 +14926,7 @@
     },
     "socket.io-parser": {
       "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz",
+      "resolved": "http://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz",
       "integrity": "sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==",
       "dev": true,
       "requires": {
@@ -15071,7 +15071,7 @@
         },
         "chalk": {
           "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "optional": true,
@@ -15224,7 +15224,7 @@
     "stream-consume": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.1.tgz",
-      "integrity": "sha1-0721mMK9CugrjKx6xQsRB6eZbEg=",
+      "integrity": "sha512-tNa3hzgkjEP7XbCkbRXe1jpg+ievoa0O4SCFlMOYEscGSS4JJsckGL8swUyAa/ApGU3Ae4t6Honor4HhL+tRyg==",
       "dev": true
     },
     "stream-shift": {
@@ -15237,7 +15237,7 @@
     "streamroller": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-0.7.0.tgz",
-      "integrity": "sha1-odG3z4PTmvsNYwSaWsv5NJO99ks=",
+      "integrity": "sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==",
       "dev": true,
       "requires": {
         "date-format": "^1.2.0",
@@ -15264,7 +15264,7 @@
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha1-sRwn2IuP8fvgcGQ8+UsMea4bCq8=",
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
             "core-util-is": "~1.0.0",
@@ -15279,7 +15279,7 @@
         "string_decoder": {
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
             "safe-buffer": "~5.1.0"
@@ -15296,7 +15296,7 @@
     "string-width": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
       "dev": true,
       "requires": {
         "is-fullwidth-code-point": "^2.0.0",
@@ -15492,7 +15492,7 @@
     "strip-outer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz",
-      "integrity": "sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==",
+      "integrity": "sha1-sv0qv2YEudHmATBXGV34Nrip1jE=",
       "dev": true,
       "optional": true,
       "requires": {
@@ -15661,7 +15661,7 @@
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "optional": true,
@@ -15873,7 +15873,7 @@
     "tmp": {
       "version": "0.0.33",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha1-bTQzWIl2jSGyvNoKonfO07G/rfk=",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
       "dev": true,
       "requires": {
         "os-tmpdir": "~1.0.2"
@@ -15910,7 +15910,7 @@
     "to-buffer": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz",
-      "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==",
+      "integrity": "sha1-STvUj2LXxD/N7TE6A9ytsuEhOoA=",
       "dev": true,
       "optional": true
     },
@@ -16246,13 +16246,13 @@
     "upath": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
-      "integrity": "sha1-NSVll+RqWB20eT0M5H+prr/J+r0=",
+      "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==",
       "dev": true
     },
     "uri-js": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-      "integrity": "sha1-lMVA4f93KVbiKZUHwBCupsiDjrA=",
+      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
       "dev": true,
       "requires": {
         "punycode": "^2.1.0"
diff --git a/src/Umbraco.Web.UI.Client/test/unit/app/propertyeditors/rte-controller.spec.js b/src/Umbraco.Web.UI.Client/test/unit/app/propertyeditors/rte-controller.spec.js
index 274d256a64..f813ec24a8 100644
--- a/src/Umbraco.Web.UI.Client/test/unit/app/propertyeditors/rte-controller.spec.js
+++ b/src/Umbraco.Web.UI.Client/test/unit/app/propertyeditors/rte-controller.spec.js
@@ -1,6 +1,18 @@
 describe('RTE controller tests', function () {
     var scope, controllerFactory;
-    
+
+    //mock tinymce globals
+    if ((typeof tinymce) === "undefined") {
+        tinymce = {
+            DOM: {
+                events: {
+                    domLoaded: false
+                }
+            },
+            baseUrl: ""
+        }
+    }
+
     beforeEach(module('umbraco', function ($provide) {
         $provide.value('tinyMceAssets', []);
     }));

From 12fd9baf3b33955ff1ad197f67d8b0cf3e982e56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Fri, 20 Sep 2019 09:08:28 +0200
Subject: [PATCH 679/776] clean up init + move editor.uploadImages to service
 instead of specific implementation

---
 .../src/common/services/tinymce.service.js    | 88 ++++++++++---------
 .../propertyeditors/rte/rte.controller.js     | 37 ++++----
 2 files changed, 66 insertions(+), 59 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index a28318519c..1b346a3bc6 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -205,38 +205,6 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
         xhr.send(formData);
     }
 
-    function initEvents(editor){
-
-        editor.on('SetContent', function (e) {
-            var content = e.content;
-
-            // Upload BLOB images (dragged/pasted ones)
-            if(content.indexOf('<img src="blob:') > -1){
-
-                editor.uploadImages(function(data) {
-                    // Once all images have been uploaded
-                    data.forEach(function(item) {
-                        // Select img element
-                        var img = item.element;
-
-                        // Get img src
-                        var imgSrc = img.getAttribute("src");
-                        var tmpLocation = localStorage.getItem(`tinymce__${imgSrc}`);
-
-                        // Select the img & add new attr which we can search for
-                        // When its being persisted in RTE property editor
-                        // To create a media item & delete this tmp one etc
-                        tinymce.activeEditor.$(img).attr({ "data-tmpimg": tmpLocation });
-
-                        // We need to remove the image from the cache, otherwise we can't handle if we upload the exactly 
-                        // same image twice
-                        tinymce.activeEditor.editorUpload.blobCache.removeByUri(imgSrc);
-                    });
-                });
-            }
-        });
-    }
-
     return {
 
         /**
@@ -259,7 +227,7 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
 
                 var tinyMceConfig = result[0];
                 var styles = result[1];
-
+                
                 var toolbars = getToolbars(args.toolbar, tinyMceConfig);
 
                 var plugins = _.map(tinyMceConfig.plugins, function (plugin) {
@@ -300,7 +268,7 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
 
                 //create a baseline Config to exten upon
                 var config = {
-                    selector: "#" + args.htmlId,
+                    //selector: "#" + args.htmlId,
                     theme: modeTheme,
                     //skin: "umbraco",
                     inline: modeInline,
@@ -333,10 +301,17 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
 
                     images_upload_handler: uploadImageHandler,
                     automatic_uploads: false,
-                    images_replace_blob_uris: false,
-                    init_instance_callback: initEvents
+                    images_replace_blob_uris: false
                 };
-
+                
+                if (args.htmlId) {
+                    config.selector = "#" + args.htmlId;
+                } else if (args.target) {
+                    config.target = args.target;
+                }
+                
+                
+                
                 if (tinyMceConfig.customConfig) {
 
                     //if there is some custom config, we need to see if the string value of each item might actually be json and if so, we need to
@@ -372,7 +347,7 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                     angular.extend(config, tinyMceConfig.customConfig);
                 }
 
-                return $q.when(config);
+                return config;
 
             });
 
@@ -1209,13 +1184,46 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                 startWatch();
             }
 
-            args.editor.on('init', function (e) {
+            args.editor.on('SetContent', function (e) {
+                var content = e.content;
 
+                // Upload BLOB images (dragged/pasted ones)
+                if(content.indexOf('<img src="blob:') > -1){
+
+                    editor.uploadImages(function(data) {
+                        // Once all images have been uploaded
+                        data.forEach(function(item) {
+                            // Select img element
+                            var img = item.element;
+
+                            // Get img src
+                            var imgSrc = img.getAttribute("src");
+                            var tmpLocation = localStorage.getItem(`tinymce__${imgSrc}`);
+
+                            // Select the img & add new attr which we can search for
+                            // When its being persisted in RTE property editor
+                            // To create a media item & delete this tmp one etc
+                            tinymce.activeEditor.$(img).attr({ "data-tmpimg": tmpLocation });
+
+                            // We need to remove the image from the cache, otherwise we can't handle if we upload the exactly 
+                            // same image twice
+                            tinymce.activeEditor.editorUpload.blobCache.removeByUri(imgSrc);
+                        });
+                    });
+                }
+            });
+
+            args.editor.on('init', function (e) {
+                
                 if (args.model.value) {
                     args.editor.setContent(args.model.value);
                 }
+                
                 //enable browser based spell checking
                 args.editor.getBody().setAttribute('spellcheck', true);
+                
+                //start watching the value
+                startWatch();
             });
 
             args.editor.on('Change', function (e) {
@@ -1360,8 +1368,6 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                 editorService.open(aceEditor);
             });
 
-            //start watching the value
-            startWatch(args.editor);
         }
 
     };
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
index 16fa79f667..948a96df15 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
@@ -1,10 +1,12 @@
 angular.module("umbraco")
     .controller("Umbraco.PropertyEditors.RTEController",
-        function ($scope, $q, assetsService, $timeout, tinyMceService, angularHelper, tinyMceAssets) {
+        function ($scope, $q, assetsService, $timeout, tinyMceService, angularHelper, tinyMceAssets, $element) {
 
             // TODO: A lot of the code below should be shared between the grid rte and the normal rte
 
             $scope.isLoading = true;
+            
+            var editorNode = $element[0].querySelector('.umb-rte-editor');
 
             //To id the html textarea we need to use the datetime ticks because we can have multiple rte's per a single property alias
             // because now we have to support having 2x (maybe more at some stage) content editors being displayed at once. This is because
@@ -38,7 +40,7 @@ angular.module("umbraco")
             var tinyMceEditor = null;
 
             promises.push(tinyMceService.getTinyMceEditorConfig({
-                htmlId: $scope.textAreaHtmlId,
+                target: editorNode,
                 stylesheets: editorConfig.stylesheets,
                 toolbar: editorConfig.toolbar,
                 mode: editorConfig.mode
@@ -46,7 +48,7 @@ angular.module("umbraco")
 
             //wait for queue to end
             $q.all(promises).then(function (result) {
-
+                
                 var standardConfig = result[promises.length - 1];
                 
                 if (height !== null) {
@@ -57,10 +59,7 @@ angular.module("umbraco")
                 var baseLineConfigObj = {
                     maxImageSize: editorConfig.maxImageSize,
                     width: width,
-                    height: height,
-                    init_instance_callback: function(editor){
-                        $scope.isLoading = false;
-                    }
+                    height: height
                 };
 
                 angular.extend(baseLineConfigObj, standardConfig);
@@ -69,7 +68,18 @@ angular.module("umbraco")
 
                     //set the reference
                     tinyMceEditor = editor;
-
+                    
+                    //$scope.isLoading = false;
+                    
+                    tinyMceEditor.on('init', function (e) {
+                        $timeout(function () {
+                            console.log(editor);
+                            //editor.editorContainer.style.display = 'block'
+                            //editorNode.style.display = 'block'
+                            $scope.isLoading = false;
+                        }, 1000)
+                    });
+                    
                     //initialize the standard editor functionality for Umbraco
                     tinyMceService.initializeEditor({
                         editor: editor,
@@ -80,16 +90,7 @@ angular.module("umbraco")
                 };
 
                 /** Loads in the editor */
-                function loadTinyMce() {
-
-                    //we need to add a timeout here, to force a redraw so TinyMCE can find
-                    //the elements needed
-                    $timeout(function () {                        
-                        tinymce.init(baseLineConfigObj);
-                    }, 200);
-                }
-
-                loadTinyMce();
+                tinymce.init(baseLineConfigObj);
 
                 //listen for formSubmitting event (the result is callback used to remove the event subscription)
                 var unsubscribe = $scope.$on("formSubmitting", function () {

From 77ff96d64fefcd0f9afeb0c0570dfbfffdfc8b9b Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Fri, 20 Sep 2019 09:54:30 +0200
Subject: [PATCH 680/776] Bump version to 8.1.5

---
 src/SolutionInfo.cs                      | 4 ++--
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index 73fb2a1448..6f02d2bbb3 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -18,5 +18,5 @@ using System.Resources;
 [assembly: AssemblyVersion("8.0.0")]
 
 // these are FYI and changed automatically
-[assembly: AssemblyFileVersion("8.1.4")]
-[assembly: AssemblyInformationalVersion("8.1.4")]
+[assembly: AssemblyFileVersion("8.1.5")]
+[assembly: AssemblyInformationalVersion("8.1.5")]
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 40f3e3afbd..7e70eed54c 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -345,9 +345,9 @@
         <WebProjectProperties>
           <UseIIS>False</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>8140</DevelopmentServerPort>
+          <DevelopmentServerPort>8150</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:8140</IISUrl>
+          <IISUrl>http://localhost:8150</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

From 4259c9bf1d4b27596b8ba74a30bcdd94255e047b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Fri, 20 Sep 2019 11:08:21 +0200
Subject: [PATCH 681/776] less flickering on init of TinyMCE

---
 src/Umbraco.Web.UI.Client/src/less/rte.less    | 12 ++++++++++--
 .../propertyeditors/rte/rte.controller.js      | 18 ++++++------------
 .../src/views/propertyeditors/rte/rte.html     |  7 ++++---
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/rte.less b/src/Umbraco.Web.UI.Client/src/less/rte.less
index 9f537a7931..01af7c3936 100644
--- a/src/Umbraco.Web.UI.Client/src/less/rte.less
+++ b/src/Umbraco.Web.UI.Client/src/less/rte.less
@@ -9,12 +9,20 @@
 
 .umb-rte .mce-tinymce {
     box-shadow: none;
-    
 }
 
-.umb-rte .umb-rte-editor{
+.umb-rte .umb-rte-editor-con {
+    height: 24px;
+    visibility: hidden;
+}
+.umb-rte .umb-rte-editor {
     min-height: 100px;
 }
+.umb-rte.--initialized .umb-rte-editor-con {
+    height:auto;
+    min-height: 100px;
+    visibility: visible;
+}
 
 .umb-rte .mce-content-body {
     background-color: @white;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
index 948a96df15..c7036fec22 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
@@ -45,7 +45,7 @@ angular.module("umbraco")
                 toolbar: editorConfig.toolbar,
                 mode: editorConfig.mode
             }));
-
+            
             //wait for queue to end
             $q.all(promises).then(function (result) {
                 
@@ -61,23 +61,16 @@ angular.module("umbraco")
                     width: width,
                     height: height
                 };
-
-                angular.extend(baseLineConfigObj, standardConfig);
-
+                
                 baseLineConfigObj.setup = function (editor) {
-
+                    
                     //set the reference
                     tinyMceEditor = editor;
                     
-                    //$scope.isLoading = false;
-                    
                     tinyMceEditor.on('init', function (e) {
                         $timeout(function () {
-                            console.log(editor);
-                            //editor.editorContainer.style.display = 'block'
-                            //editorNode.style.display = 'block'
                             $scope.isLoading = false;
-                        }, 1000)
+                        });
                     });
                     
                     //initialize the standard editor functionality for Umbraco
@@ -86,9 +79,10 @@ angular.module("umbraco")
                         model: $scope.model,
                         currentForm: angularHelper.getCurrentForm($scope)
                     });
-
+    
                 };
 
+                angular.extend(baseLineConfigObj, standardConfig);
                 /** Loads in the editor */
                 tinymce.init(baseLineConfigObj);
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html
index 7dde17bb06..34cbd21404 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html
@@ -1,6 +1,7 @@
-<div ng-controller="Umbraco.PropertyEditors.RTEController" class="umb-property-editor umb-rte">
+<div ng-controller="Umbraco.PropertyEditors.RTEController" class="umb-property-editor umb-rte" ng-class="{'--initialized': !isLoading}">
     <umb-load-indicator ng-if="isLoading"></umb-load-indicator>
 
-    <div ng-style="{ visibility :  isLoading ? 'hidden' : 'visible', width :containerWidth, height: containerHeight, overflow: containerOverflow}"
-         id="{{textAreaHtmlId}}" class="umb-rte-editor"></div>
+    <div class="umb-rte-editor-con">
+        <div class="umb-rte-editor"></div>
+    </div>
 </div>

From 98e39ed3ef3277216df9c423494ecbc1d259476c Mon Sep 17 00:00:00 2001
From: stevemegson <steve@megson.org>
Date: Fri, 20 Sep 2019 10:38:44 +0100
Subject: [PATCH 682/776] V7: Error upgrading due to SecurityStamp being null
 (#6343)

* Allow login with a null SecurityStamp when upgrading

* Added migration to fill in missing SecurityStamp

* Make sure we initialize UmbracoContext as it is needed in some tests that use UmbracoBackOfficeIdentity.AddUserDataClaims

* Moved check for null SecurityStamp

* Generate new SecurityStamp in C#

* Bump version to 7.15.4
---
 src/SolutionInfo.cs                           |  4 ++--
 .../Configuration/UmbracoVersion.cs           |  2 +-
 .../PopulateMissingSecurityStamps.cs          | 24 +++++++++++++++++++
 .../Security/UmbracoBackOfficeIdentity.cs     |  8 +++++++
 src/Umbraco.Core/Umbraco.Core.csproj          |  1 +
 .../UmbracoBackOfficeIdentityTests.cs         | 22 ++++++++++++++++-
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj      |  4 ++--
 7 files changed, 59 insertions(+), 6 deletions(-)
 create mode 100644 src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenFifteenFour/PopulateMissingSecurityStamps.cs

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index 97ebd98e8c..b5a8fbc738 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -11,5 +11,5 @@ using System.Resources;
 
 [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyFileVersion("7.15.3")]
-[assembly: AssemblyInformationalVersion("7.15.3")]
+[assembly: AssemblyFileVersion("7.15.4")]
+[assembly: AssemblyInformationalVersion("7.15.4")]
diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
index 8c8755577a..65bd4f8694 100644
--- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
@@ -6,7 +6,7 @@ namespace Umbraco.Core.Configuration
 {
     public class UmbracoVersion
     {
-        private static readonly Version Version = new Version("7.15.3");
+        private static readonly Version Version = new Version("7.15.4");
 
         /// <summary>
         /// Gets the current version of Umbraco.
diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenFifteenFour/PopulateMissingSecurityStamps.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenFifteenFour/PopulateMissingSecurityStamps.cs
new file mode 100644
index 0000000000..042a003c75
--- /dev/null
+++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenFifteenFour/PopulateMissingSecurityStamps.cs
@@ -0,0 +1,24 @@
+using System;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Persistence.SqlSyntax;
+
+namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenFifteenFour
+{
+    [Migration("7.15.4", 1, Constants.System.UmbracoMigrationName)]
+    public class PopulateMissingSecurityStamps : MigrationBase
+    {
+        public PopulateMissingSecurityStamps(ISqlSyntaxProvider sqlSyntax, ILogger logger) : base(sqlSyntax, logger)
+        {
+        }
+
+        public override void Up()
+        {
+            // A user with a NULL securityStampToken can't log in after v7.8.0
+            Execute.Sql($@"UPDATE umbracoUser SET securityStampToken = '{Guid.NewGuid().ToString()}' WHERE securityStampToken IS NULL");
+        }
+
+        public override void Down()
+        {
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Security/UmbracoBackOfficeIdentity.cs b/src/Umbraco.Core/Security/UmbracoBackOfficeIdentity.cs
index fcb5547027..7772b198c6 100644
--- a/src/Umbraco.Core/Security/UmbracoBackOfficeIdentity.cs
+++ b/src/Umbraco.Core/Security/UmbracoBackOfficeIdentity.cs
@@ -115,6 +115,12 @@ namespace Umbraco.Core.Security
                 AddClaim(new Claim(ClaimTypes.CookiePath, "/", ClaimValueTypes.String, Issuer, Issuer, this));
             }
 
+            // if upgrading from a pre-7.3.0 version, SecurityStamp will be null
+            if (userdata.SecurityStamp == null && ApplicationContext.Current.IsUpgrading)
+            {
+                userdata.SecurityStamp = Guid.NewGuid().ToString();
+            }
+
             _currentIssuer = claimsIdentity.AuthenticationType;
             UserData = userdata;
             AddExistingClaims(claimsIdentity);
@@ -227,7 +233,9 @@ namespace Umbraco.Core.Security
             //The security stamp claim is also required... this is because this claim type is hard coded
             // by the SecurityStampValidator, see: https://katanaproject.codeplex.com/workitem/444
             if (HasClaim(x => x.Type == Microsoft.AspNet.Identity.Constants.DefaultSecurityStampClaimType) == false)
+            {
                 AddClaim(new Claim(Microsoft.AspNet.Identity.Constants.DefaultSecurityStampClaimType, SecurityStamp, ClaimValueTypes.String, Issuer, Issuer, this));
+            }
 
             //Add each app as a separate claim
             if (HasClaim(x => x.Type == Constants.Security.AllowedApplicationsClaimType) == false)
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 3b5d0aaff6..fe822e10bc 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -576,6 +576,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\TargetVersionSevenFifteenFour\PopulateMissingSecurityStamps.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" />
diff --git a/src/Umbraco.Tests/Security/UmbracoBackOfficeIdentityTests.cs b/src/Umbraco.Tests/Security/UmbracoBackOfficeIdentityTests.cs
index d9ab9c9a3d..950c2b898f 100644
--- a/src/Umbraco.Tests/Security/UmbracoBackOfficeIdentityTests.cs
+++ b/src/Umbraco.Tests/Security/UmbracoBackOfficeIdentityTests.cs
@@ -4,9 +4,14 @@ using System.Security.Claims;
 using System.Text;
 using System.Threading.Tasks;
 using System.Web.Security;
+using Moq;
 using Newtonsoft.Json;
 using NUnit.Framework;
 using Umbraco.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Persistence.SqlSyntax;
+using Umbraco.Core.Profiling;
+using Umbraco.Core.Scoping;
 using Umbraco.Core.Security;
 using Umbraco.Core.Services;
 
@@ -15,9 +20,24 @@ namespace Umbraco.Tests.Security
     [TestFixture]
     public class UmbracoBackOfficeIdentityTests
     {
-
         public const string TestIssuer = "TestIssuer";
 
+        [SetUp]
+        public void Initialize()
+        {
+            var sqlSyntax = new SqlCeSyntaxProvider();
+
+            //This is needed because the Migration resolver is creating migration instances with their full ctors
+            ApplicationContext.EnsureContext(
+                new ApplicationContext(
+                    new DatabaseContext(Mock.Of<IScopeProviderInternal>(), Mock.Of<ILogger>(), sqlSyntax, "test"),
+                    new ServiceContext(),
+                    CacheHelper.CreateDisabledCacheHelper(),
+                    new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>())),
+                true);
+        }
+
+
         [Test]
         public void Create_From_Claims_Identity()
         {
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 76d2765672..3e0ce457e1 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -1028,9 +1028,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
         <WebProjectProperties>
           <UseIIS>True</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>7153</DevelopmentServerPort>
+          <DevelopmentServerPort>7154</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:7153</IISUrl>
+          <IISUrl>http://localhost:7154</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

From 2adb6636bd2bb122d711293ff1ba17f5e1a01761 Mon Sep 17 00:00:00 2001
From: stevemegson <steve@megson.org>
Date: Fri, 20 Sep 2019 10:38:44 +0100
Subject: [PATCH 683/776] V7: Error upgrading due to SecurityStamp being null
 (#6343)

* Allow login with a null SecurityStamp when upgrading

* Added migration to fill in missing SecurityStamp

* Make sure we initialize UmbracoContext as it is needed in some tests that use UmbracoBackOfficeIdentity.AddUserDataClaims

* Moved check for null SecurityStamp

* Generate new SecurityStamp in C#

* Bump version to 7.15.4
---
 src/SolutionInfo.cs                           |  4 ++--
 .../Configuration/UmbracoVersion.cs           |  2 +-
 .../PopulateMissingSecurityStamps.cs          | 24 +++++++++++++++++++
 .../Security/UmbracoBackOfficeIdentity.cs     |  8 +++++++
 src/Umbraco.Core/Umbraco.Core.csproj          |  1 +
 .../UmbracoBackOfficeIdentityTests.cs         | 22 ++++++++++++++++-
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj      |  4 ++--
 7 files changed, 59 insertions(+), 6 deletions(-)
 create mode 100644 src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenFifteenFour/PopulateMissingSecurityStamps.cs

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index 97ebd98e8c..b5a8fbc738 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -11,5 +11,5 @@ using System.Resources;
 
 [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyFileVersion("7.15.3")]
-[assembly: AssemblyInformationalVersion("7.15.3")]
+[assembly: AssemblyFileVersion("7.15.4")]
+[assembly: AssemblyInformationalVersion("7.15.4")]
diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
index 8c8755577a..65bd4f8694 100644
--- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
@@ -6,7 +6,7 @@ namespace Umbraco.Core.Configuration
 {
     public class UmbracoVersion
     {
-        private static readonly Version Version = new Version("7.15.3");
+        private static readonly Version Version = new Version("7.15.4");
 
         /// <summary>
         /// Gets the current version of Umbraco.
diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenFifteenFour/PopulateMissingSecurityStamps.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenFifteenFour/PopulateMissingSecurityStamps.cs
new file mode 100644
index 0000000000..042a003c75
--- /dev/null
+++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenFifteenFour/PopulateMissingSecurityStamps.cs
@@ -0,0 +1,24 @@
+using System;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Persistence.SqlSyntax;
+
+namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenFifteenFour
+{
+    [Migration("7.15.4", 1, Constants.System.UmbracoMigrationName)]
+    public class PopulateMissingSecurityStamps : MigrationBase
+    {
+        public PopulateMissingSecurityStamps(ISqlSyntaxProvider sqlSyntax, ILogger logger) : base(sqlSyntax, logger)
+        {
+        }
+
+        public override void Up()
+        {
+            // A user with a NULL securityStampToken can't log in after v7.8.0
+            Execute.Sql($@"UPDATE umbracoUser SET securityStampToken = '{Guid.NewGuid().ToString()}' WHERE securityStampToken IS NULL");
+        }
+
+        public override void Down()
+        {
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Security/UmbracoBackOfficeIdentity.cs b/src/Umbraco.Core/Security/UmbracoBackOfficeIdentity.cs
index fcb5547027..7772b198c6 100644
--- a/src/Umbraco.Core/Security/UmbracoBackOfficeIdentity.cs
+++ b/src/Umbraco.Core/Security/UmbracoBackOfficeIdentity.cs
@@ -115,6 +115,12 @@ namespace Umbraco.Core.Security
                 AddClaim(new Claim(ClaimTypes.CookiePath, "/", ClaimValueTypes.String, Issuer, Issuer, this));
             }
 
+            // if upgrading from a pre-7.3.0 version, SecurityStamp will be null
+            if (userdata.SecurityStamp == null && ApplicationContext.Current.IsUpgrading)
+            {
+                userdata.SecurityStamp = Guid.NewGuid().ToString();
+            }
+
             _currentIssuer = claimsIdentity.AuthenticationType;
             UserData = userdata;
             AddExistingClaims(claimsIdentity);
@@ -227,7 +233,9 @@ namespace Umbraco.Core.Security
             //The security stamp claim is also required... this is because this claim type is hard coded
             // by the SecurityStampValidator, see: https://katanaproject.codeplex.com/workitem/444
             if (HasClaim(x => x.Type == Microsoft.AspNet.Identity.Constants.DefaultSecurityStampClaimType) == false)
+            {
                 AddClaim(new Claim(Microsoft.AspNet.Identity.Constants.DefaultSecurityStampClaimType, SecurityStamp, ClaimValueTypes.String, Issuer, Issuer, this));
+            }
 
             //Add each app as a separate claim
             if (HasClaim(x => x.Type == Constants.Security.AllowedApplicationsClaimType) == false)
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 3b5d0aaff6..fe822e10bc 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -576,6 +576,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\TargetVersionSevenFifteenFour\PopulateMissingSecurityStamps.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" />
diff --git a/src/Umbraco.Tests/Security/UmbracoBackOfficeIdentityTests.cs b/src/Umbraco.Tests/Security/UmbracoBackOfficeIdentityTests.cs
index d9ab9c9a3d..950c2b898f 100644
--- a/src/Umbraco.Tests/Security/UmbracoBackOfficeIdentityTests.cs
+++ b/src/Umbraco.Tests/Security/UmbracoBackOfficeIdentityTests.cs
@@ -4,9 +4,14 @@ using System.Security.Claims;
 using System.Text;
 using System.Threading.Tasks;
 using System.Web.Security;
+using Moq;
 using Newtonsoft.Json;
 using NUnit.Framework;
 using Umbraco.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Persistence.SqlSyntax;
+using Umbraco.Core.Profiling;
+using Umbraco.Core.Scoping;
 using Umbraco.Core.Security;
 using Umbraco.Core.Services;
 
@@ -15,9 +20,24 @@ namespace Umbraco.Tests.Security
     [TestFixture]
     public class UmbracoBackOfficeIdentityTests
     {
-
         public const string TestIssuer = "TestIssuer";
 
+        [SetUp]
+        public void Initialize()
+        {
+            var sqlSyntax = new SqlCeSyntaxProvider();
+
+            //This is needed because the Migration resolver is creating migration instances with their full ctors
+            ApplicationContext.EnsureContext(
+                new ApplicationContext(
+                    new DatabaseContext(Mock.Of<IScopeProviderInternal>(), Mock.Of<ILogger>(), sqlSyntax, "test"),
+                    new ServiceContext(),
+                    CacheHelper.CreateDisabledCacheHelper(),
+                    new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>())),
+                true);
+        }
+
+
         [Test]
         public void Create_From_Claims_Identity()
         {
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 76d2765672..3e0ce457e1 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -1028,9 +1028,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
         <WebProjectProperties>
           <UseIIS>True</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>7153</DevelopmentServerPort>
+          <DevelopmentServerPort>7154</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:7153</IISUrl>
+          <IISUrl>http://localhost:7154</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

From 77e41489c1cbda9aa679383039834e31a7c1cac6 Mon Sep 17 00:00:00 2001
From: Lynne Finnigan <lynne.finnigan@screenmedia.co.uk>
Date: Thu, 19 Sep 2019 17:24:06 +0100
Subject: [PATCH 684/776] Changed 'customize' anchor tag to a button element

---
 .../src/installer/steps/user.html             | 123 +++++++++---------
 1 file changed, 61 insertions(+), 62 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/user.html b/src/Umbraco.Web.UI.Client/src/installer/steps/user.html
index 73107f79a4..a7ebc33f39 100644
--- a/src/Umbraco.Web.UI.Client/src/installer/steps/user.html
+++ b/src/Umbraco.Web.UI.Client/src/installer/steps/user.html
@@ -1,72 +1,71 @@
-<div ng-controller="Umbraco.Install.UserController">
-<h1>Install Umbraco 8</h1>
+<div ng-controller="Umbraco.Install.UserController">
+    <h1>Install Umbraco 8</h1>
 
-<p>Enter your name, email and password to install Umbraco 8 with its default settings, alternatively you can customize your installation</p>
+    <p>Enter your name, email and password to install Umbraco 8 with its default settings, alternatively you can customize your installation</p>
 
-<form name="myForm" class="form-horizontal" novalidate ng-submit="validateAndInstall();">
+    <form name="myForm" class="form-horizontal" novalidate ng-submit="validateAndInstall();">
 
-	<div class="row">	
-		<div class="span8">
-			<div class="pull-right">
-				<div class="control-group">
-					<label class="control-label" for="name">Name</label>
-					<div class="controls">
-						<input type="text" id="name" name="name" placeholder="Full name" required ng-model="installer.current.model.name" />
-					</div>
-				</div>
-
-				<div class="control-group">
-					<label class="control-label" for="email">Email</label>
-					<div class="controls">
-						<input type="email" id="email" name="email" placeholder="you@example.com" val-email required ng-model="installer.current.model.email" />
-						<small class="inline-help">Your email will be used as your login</small>
-					</div>
-				</div>
-
-				<div class="control-group">
-					<label class="control-label" for="password">Password</label>
-                    <div class="controls">
-                        <!-- why isn't this masked: https://www.nngroup.com/articles/stop-password-masking/ -->
-                        <input type="text" name="installer.current.model.password"
-                               ng-minlength="{{installer.current.model.minCharLength}}"
-                               ng-pattern="passwordPattern"
-                               autocorrect="off"
-                               autocapitalize="off"
-                               autocomplete="off"
-                               required
-                               ng-model="installer.current.model.password" id="password" />
-                        <small class="inline-help">At least {{installer.current.model.minCharLength}} characters long</small>
-
-                        <small ng-if="installer.current.model.minNonAlphaNumericLength > 0" class="inline-help">
-                            At least {{installer.current.model.minNonAlphaNumericLength}} symbol{{installer.current.model.minNonAlphaNumericLength > 1 ? 's' : ''}}
-                        </small>
+        <div class="row">
+            <div class="span8">
+                <div class="pull-right">
+                    <div class="control-group">
+                        <label class="control-label" for="name">Name</label>
+                        <div class="controls">
+                            <input type="text" id="name" name="name" placeholder="Full name" required ng-model="installer.current.model.name" />
+                        </div>
+                    </div>
+
+                    <div class="control-group">
+                        <label class="control-label" for="email">Email</label>
+                        <div class="controls">
+                            <input type="email" id="email" name="email" placeholder="you@example.com" val-email required ng-model="installer.current.model.email" />
+                            <small class="inline-help">Your email will be used as your login</small>
+                        </div>
+                    </div>
+
+                    <div class="control-group">
+                        <label class="control-label" for="password">Password</label>
+                        <div class="controls">
+                            <!-- why isn't this masked: https://www.nngroup.com/articles/stop-password-masking/ -->
+                            <input type="text" name="installer.current.model.password"
+                                   ng-minlength="{{installer.current.model.minCharLength}}"
+                                   ng-pattern="passwordPattern"
+                                   autocorrect="off"
+                                   autocapitalize="off"
+                                   autocomplete="off"
+                                   required
+                                   ng-model="installer.current.model.password" id="password" />
+                            <small class="inline-help">At least {{installer.current.model.minCharLength}} characters long</small>
+
+                            <small ng-if="installer.current.model.minNonAlphaNumericLength > 0" class="inline-help">
+                                At least {{installer.current.model.minNonAlphaNumericLength}} symbol{{installer.current.model.minNonAlphaNumericLength > 1 ? 's' : ''}}
+                            </small>
+                        </div>
                     </div>
-				</div>
 
 
-				<div class="control-group">
-					<div class="controls">
-						<label>
-							<input
-								type="checkbox" 
-								id="subscribeToNewsLetter" 
-								name="subscribeToNewsLetter"
-							    ng-model="installer.current.model.subscribeToNewsLetter" /> 
-							Keep me updated on Umbraco Versions, Security Bulletins and Community News
-						</label>
-					</div>
-				</div>
+                    <div class="control-group">
+                        <div class="controls">
+                            <label>
+                                <input type="checkbox"
+                                       id="subscribeToNewsLetter"
+                                       name="subscribeToNewsLetter"
+                                       ng-model="installer.current.model.subscribeToNewsLetter" />
+                                Keep me updated on Umbraco Versions, Security Bulletins and Community News
+                            </label>
+                        </div>
+                    </div>
 
-				<div class="control-group" ng-class="{disabled:myForm.$invalid}">	
-					<div class="controls">
-						<input type="submit" ng-disabled="myForm.$invalid"  value="Install" class="btn btn-success" />	
-						<a href class="btn btn-info control-customize" ng-disabled="myForm.$invalid" ng-click="validateAndForward()">Customize</a>
-					</div>
-				</div>
+                    <div class="control-group" ng-class="{disabled:myForm.$invalid}">
+                        <div class="controls">
+                            <input type="submit" ng-disabled="myForm.$invalid" value="Install" class="btn btn-success" />
+                            <button class="btn btn-info control-customize" ng-disabled="myForm.$invalid" ng-click="validateAndForward()">Customize</button>
+                        </div>
+                    </div>
 
-			</div>	
-		</div>
-	</div>
-</form>
+                </div>
+            </div>
+        </div>
+    </form>
 
 </div>

From 1d6dbbebe31518c45e327ed7e4c0035cb972d586 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Thu, 19 Sep 2019 21:47:07 +0200
Subject: [PATCH 685/776] Make mandatory validation work for Markdown Editor

---
 .../views/propertyeditors/markdowneditor/markdowneditor.html    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/markdowneditor/markdowneditor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/markdowneditor/markdowneditor.html
index 68fc86f002..0834c4705b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/markdowneditor/markdowneditor.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/markdowneditor/markdowneditor.html
@@ -1,7 +1,7 @@
 <div class="wmd-panel" ng-controller="Umbraco.PropertyEditors.MarkdownEditorController">
    <div id="wmd-button-bar-{{editorId}}"></div>
 
-   <textarea class="wmd-input" id="wmd-input-{{editorId}}" ng-model="model.value"></textarea>
+   <textarea class="wmd-input" id="wmd-input-{{editorId}}" ng-model="model.value" ng-required="model.validation.mandatory"></textarea>
 
    <div class="wmd-panel wmd-preview" id="wmd-preview-{{editorId}}" ng-show="model.config.preview"></div>
 

From 0c676037459fdb7cfa3fe16a57ddaa0f17dd669b Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Fri, 20 Sep 2019 13:48:31 +0200
Subject: [PATCH 686/776] Make mandatory validation work for Media Picker
 (#6394)

---
 .../src/views/propertyeditors/mediapicker/mediapicker.html      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
index fb9b5d77b7..47aaa7e4f3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
@@ -53,4 +53,6 @@
         </ul>
     </div>
 
+    <input type="hidden" name="mandatory" ng-model="model.mandatory" ng-required="model.validation.mandatory && !mediaItems.length" />
+
 </div>

From 71f4a799595f5e20a4ba0b995ba87ee465fa9a79 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Fri, 20 Sep 2019 13:49:27 +0200
Subject: [PATCH 687/776] Fix mandatory validation for Member and Member Group
 pickers (#6393)

---
 .../propertyeditors/membergrouppicker/membergrouppicker.html    | 2 ++
 .../src/views/propertyeditors/memberpicker/memberpicker.html    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergrouppicker/membergrouppicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergrouppicker/membergrouppicker.html
index 48e1851262..4c53ac5d17 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergrouppicker/membergrouppicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergrouppicker/membergrouppicker.html
@@ -18,4 +18,6 @@
 		<localize key="general_add">Add</localize>
 	</a>
 
+    <input type="hidden" name="mandatory" ng-model="model.mandatory" ng-required="model.validation.mandatory && !renderModel.length" />
+
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/memberpicker/memberpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/memberpicker/memberpicker.html
index d8f04eeae5..d968f08d71 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/memberpicker/memberpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/memberpicker/memberpicker.html
@@ -18,4 +18,6 @@
 		<localize key="general_add">Add</localize>
 	</a>
 
+    <input type="hidden" name="mandatory" ng-model="model.mandatory" ng-required="model.validation.mandatory && !renderModel.length" />
+
 </div>

From 1b4fdf17575852b936468a4d16a67be9cca2cbd3 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Fri, 20 Sep 2019 12:51:06 +0100
Subject: [PATCH 688/776] Update FindAndPersistPastedTempImages method to deal
 with duplicate images in the same RTE to only upload it once

---
 .../Templates/TemplateUtilities.cs            | 76 ++++++++++++-------
 1 file changed, 48 insertions(+), 28 deletions(-)

diff --git a/src/Umbraco.Web/Templates/TemplateUtilities.cs b/src/Umbraco.Web/Templates/TemplateUtilities.cs
index edccbcc9d4..7134d088a6 100644
--- a/src/Umbraco.Web/Templates/TemplateUtilities.cs
+++ b/src/Umbraco.Web/Templates/TemplateUtilities.cs
@@ -1,5 +1,6 @@
 using HtmlAgilityPack;
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Text.RegularExpressions;
 using Umbraco.Core;
@@ -201,7 +202,11 @@ namespace Umbraco.Web.Templates
             var tmpImages = htmlDoc.DocumentNode.SelectNodes($"//img[@{TemporaryImageDataAttribute}]");
             if (tmpImages == null || tmpImages.Count == 0)
                 return html;
-            
+
+            // An array to contain a list of URLs that
+            //  we have already processed to avoid dupes
+            var uploadedImages = new Dictionary<string, GuidUdi>();
+
             foreach (var img in tmpImages)
             {
                 // The data attribute contains the path to the tmp img to persist as a media item
@@ -209,55 +214,70 @@ namespace Umbraco.Web.Templates
 
                 if (string.IsNullOrEmpty(tmpImgPath))
                     continue;
-
+                                
                 var absoluteTempImagePath = IOHelper.MapPath(tmpImgPath);
                 var fileName = Path.GetFileName(absoluteTempImagePath);
                 var safeFileName = fileName.ToSafeFileName();
 
                 var mediaItemName = safeFileName.ToFriendlyName();
                 IMedia mediaFile;
+                GuidUdi udi;
 
-                if(mediaParentFolder == Guid.Empty)
-                    mediaFile = mediaService.CreateMedia(mediaItemName, Constants.System.Root, Constants.Conventions.MediaTypes.Image, userId);
-                else
-                    mediaFile = mediaService.CreateMedia(mediaItemName, mediaParentFolder, Constants.Conventions.MediaTypes.Image, userId);
-                               
-                var fileInfo = new FileInfo(absoluteTempImagePath);
-
-                var fileStream = fileInfo.OpenReadWithRetry();
-                if (fileStream == null) throw new InvalidOperationException("Could not acquire file stream");
-                using (fileStream)
+                if (uploadedImages.ContainsKey(tmpImgPath) == false)
                 {
-                    mediaFile.SetValue(contentTypeBaseServiceProvider, Constants.Conventions.Media.File, safeFileName, fileStream);
-                }
+                    if (mediaParentFolder == Guid.Empty)
+                        mediaFile = mediaService.CreateMedia(mediaItemName, Constants.System.Root, Constants.Conventions.MediaTypes.Image, userId);
+                    else
+                        mediaFile = mediaService.CreateMedia(mediaItemName, mediaParentFolder, Constants.Conventions.MediaTypes.Image, userId);
 
-                mediaService.Save(mediaFile, userId);
+                    var fileInfo = new FileInfo(absoluteTempImagePath);
+
+                    var fileStream = fileInfo.OpenReadWithRetry();
+                    if (fileStream == null) throw new InvalidOperationException("Could not acquire file stream");
+                    using (fileStream)
+                    {
+                        mediaFile.SetValue(contentTypeBaseServiceProvider, Constants.Conventions.Media.File, safeFileName, fileStream);
+                    }
+
+                    mediaService.Save(mediaFile, userId);
+
+                    udi = mediaFile.GetUdi();
+                }
+                else
+                {
+                    // Already been uploaded & we have it's UDI
+                    udi = uploadedImages[tmpImgPath];
+                }                
 
                 // Add the UDI to the img element as new data attribute
-                var udi = mediaFile.GetUdi();
                 img.SetAttributeValue("data-udi", udi.ToString());
 
                 //Get the new persisted image url
-                var mediaTyped = Current.UmbracoHelper.Media(mediaFile.Id);
+                var mediaTyped = Current.UmbracoHelper.Media(udi.Guid);
                 var location = mediaTyped.Url;
                 img.SetAttributeValue("src", location);
 
                 // Remove the data attribute (so we do not re-process this)
                 img.Attributes.Remove(TemporaryImageDataAttribute);
 
-                // Delete folder & image now its saved in media
-                // The folder should contain one image - as a unique guid folder created
-                // for each image uploaded from TinyMceController
-                var folderName = Path.GetDirectoryName(absoluteTempImagePath);
-                try
-                {   
-                    Directory.Delete(folderName, true);
-                }
-                catch (Exception ex)
+                // Add to the dictionary to avoid dupes
+                if(uploadedImages.ContainsKey(tmpImgPath) == false)
                 {
-                    logger.Error(typeof(TemplateUtilities), ex, "Could not delete temp file or folder {FileName}", absoluteTempImagePath);
+                    uploadedImages.Add(tmpImgPath, udi);
+
+                    // Delete folder & image now its saved in media
+                    // The folder should contain one image - as a unique guid folder created
+                    // for each image uploaded from TinyMceController
+                    var folderName = Path.GetDirectoryName(absoluteTempImagePath);
+                    try
+                    {
+                        Directory.Delete(folderName, true);
+                    }
+                    catch (Exception ex)
+                    {
+                        logger.Error(typeof(TemplateUtilities), ex, "Could not delete temp file or folder {FileName}", absoluteTempImagePath);
+                    }
                 }
-                
             }
 
             return htmlDoc.DocumentNode.OuterHtml;

From 92d10db2aba14b7e67a1299df17203a12a2c608d Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Fri, 20 Sep 2019 12:52:21 +0100
Subject: [PATCH 689/776] Removing  the code to remove the item from blobCache
 - fixes Shan's reported bug

---
 .../src/common/services/tinymce.service.js                    | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 370a15a455..5d93efe772 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -228,10 +228,6 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                         // When its being persisted in RTE property editor
                         // To create a media item & delete this tmp one etc
                         tinymce.activeEditor.$(img).attr({ "data-tmpimg": tmpLocation });
-
-                        // We need to remove the image from the cache, otherwise we can't handle if we upload the exactly 
-                        // same image twice
-                        tinymce.activeEditor.editorUpload.blobCache.removeByUri(imgSrc);
                     });
                 });
             }

From fdfaf0671752b6bd991897a4820c5810b11f5b6e Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Fri, 20 Sep 2019 12:53:30 +0100
Subject: [PATCH 690/776] By removing the blobCache code - reintroduced a bug
 where if the same image was put into the RTE the data-tmpimg attribute is not
 applied to the duplicate image which this fixes

---
 .../src/common/services/tinymce.service.js    | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 5d93efe772..2030cf12b8 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -230,6 +230,26 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                         tinymce.activeEditor.$(img).attr({ "data-tmpimg": tmpLocation });
                     });
                 });
+
+                // Get all img where src starts with blob: AND does NOT have a data=tmpimg attribute
+                // This is most likely seen as a duplicate image that has already been uploaded
+                // editor.uploadImages() does not give us any indiciation that the image been uploaded already
+                var blobImageWithNoTmpImgAttribute = editor.dom.select("img[src^='blob:']:not([data-tmpimg])");
+
+                //For each of these selected items
+                blobImageWithNoTmpImgAttribute.forEach(imageElement => {
+                    var blobSrcUri = editor.dom.getAttrib(imageElement, "src");
+
+                    // Select/find the same image uploaded with the matching SRC uri
+                    var uploadedImage = editor.dom.select(`img[src="${blobSrcUri}"][data-tmpimg]`);
+
+                    if(uploadedImage){
+                        // Get the value of the tmpimg - so we can apply it to the matched/duplicate image
+                        var dataTmpImg = editor.dom.getAttrib(uploadedImage, "data-tmpimg");
+                        editor.dom.setAttrib(imageElement, "data-tmpimg", dataTmpImg);
+                    }
+                });
+
             }
         });
     }

From 10aac80adaa8da0cabbacd4344b88b40ed81db85 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Fri, 20 Sep 2019 14:09:38 +0200
Subject: [PATCH 691/776] =?UTF-8?q?V8:=20Add=20clientside=20mandatory=20va?=
 =?UTF-8?q?lidation=20to=20Multiple=20Textstring=E2=80=A6=20(#6391)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../multipletextbox.controller.js             | 12 ++++
 .../multipletextbox/multipletextbox.html      | 57 ++++++++++---------
 2 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
index 2d411597cf..aaf41f3083 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
@@ -80,6 +80,7 @@
                 break;
             default:
         }
+        validate();
     }
 
     $scope.add = function () {
@@ -89,6 +90,7 @@
             var newItemIndex = $scope.model.value.length - 1;
             $scope.model.value[newItemIndex].hasFocus = true;
         }
+        validate();
     };
 
     $scope.remove = function (index) {
@@ -118,6 +120,16 @@
         $scope.promptIsVisible = "-1";
     }
 
+    function validate() {
+        if ($scope.multipleTextboxForm) {
+            var invalid = $scope.model.validation.mandatory && !$scope.model.value.length
+            $scope.multipleTextboxForm.mandatory.$setValidity("minCount", !invalid);
+        }
+    }
+    $timeout(function () {
+        validate();
+    });
+    
 }
 
 angular.module("umbraco").controller("Umbraco.PropertyEditors.MultipleTextBoxController", MultipleTextBoxController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
index 64330926a4..85221c61f7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
@@ -1,31 +1,32 @@
 <div class="umb-property-editor umb-multiple-textbox" ng-controller="Umbraco.PropertyEditors.MultipleTextBoxController">
-
-  <div ui-sortable="sortableOptions" ng-model="model.value">
-    <div class="flex flex-wrap textbox-wrapper" ng-repeat="item in model.value track by $index">
-        <input type="text" name="item_{{$index}}" ng-model="item.value" class="umb-property-editor umb-textstring textstring flx-i"
-               ng-keyup="addRemoveOnKeyDown($event, $index)" focus-when="{{item.hasFocus}}"/>
-        <div class="icon-wrapper">
-            <i class="icon icon-navigation handle" localize="title" title="@general_move"></i>
-
-            <div class="umb-multiple-textbox__confirm" ng-show="model.value.length > model.config.min">
-                <button class="umb-multiple-textbox__confirm-action" type="button" prevet-default ng-click="showPrompt($index, item)" localize="title" title="@content_removeTextBox">
-                    <i class="icon-trash"></i>
-                </button>
-
-                <umb-confirm-action
-                    ng-if="promptIsVisible === $index"
-                    direction="left"
-                    on-confirm="remove($index)"
-                    on-cancel="hidePrompt()">
-                </umb-confirm-action>
-            </div>
-        </div>
+  <ng-form name="multipleTextboxForm">
+    <div ui-sortable="sortableOptions" ng-model="model.value">
+      <div class="flex flex-wrap textbox-wrapper" ng-repeat="item in model.value track by $index">
+          <input type="text" name="item_{{$index}}" ng-model="item.value" class="umb-property-editor umb-textstring textstring flx-i"
+                 ng-keyup="addRemoveOnKeyDown($event, $index)" focus-when="{{item.hasFocus}}"/>
+          <div class="icon-wrapper">
+              <i class="icon icon-navigation handle" localize="title" title="@general_move"></i>
+  
+              <div class="umb-multiple-textbox__confirm" ng-show="model.value.length > model.config.min">
+                  <button class="umb-multiple-textbox__confirm-action" type="button" prevet-default ng-click="showPrompt($index, item)" localize="title" title="@content_removeTextBox">
+                      <i class="icon-trash"></i>
+                  </button>
+  
+                  <umb-confirm-action
+                      ng-if="promptIsVisible === $index"
+                      direction="left"
+                      on-confirm="remove($index)"
+                      on-cancel="hidePrompt()">
+                  </umb-confirm-action>
+              </div>
+          </div>
+      </div>
     </div>
-  </div>
-  <a prevent-default href="" class="add-link" localize="title" title="@content_addTextBox"
-     ng-show="model.config.max <= 0 || model.value.length < model.config.max"
-     ng-click="add()">
-      <localize key="general_add">Add</localize>
-  </a>
-
+    <a prevent-default href="" class="add-link" localize="title" title="@content_addTextBox"
+       ng-show="model.config.max <= 0 || model.value.length < model.config.max"
+       ng-click="add()">
+        <localize key="general_add">Add</localize>
+    </a>
+    <input type="hidden" name="mandatory" ng-model="model.value" />
+  </ng-form>
 </div>

From 705713b49799d782c0c25b29ab10b5c940996ff2 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Fri, 20 Sep 2019 14:10:48 +0200
Subject: [PATCH 692/776] V8: Add clientside mandatory validation to textarea
 (#6390)

---
 .../src/views/propertyeditors/textarea/textarea.html            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
index 1be37d92d6..4842a6bfb7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
@@ -1,6 +1,6 @@
 <div ng-controller="Umbraco.PropertyEditors.textAreaController">
     <ng-form name="textareaFieldForm">
-        <textarea ng-model="model.value" id="{{model.alias}}" name="textarea" rows="{{model.config.rows || 10}}" class="umb-property-editor umb-textarea textstring" val-server="value" ng-keyup="model.change()"></textarea>
+        <textarea ng-model="model.value" id="{{model.alias}}" name="textarea" rows="{{model.config.rows || 10}}" class="umb-property-editor umb-textarea textstring" val-server="value" ng-keyup="model.change()" ng-required="model.validation.mandatory" aria-required="{{model.validation.mandatory}}"></textarea>
 
         <span ng-messages="textareaFieldForm.textarea.$error" show-validation-on-submit >
             <span class="help-inline" ng-message="required"><localize key="general_required">Required</localize></span>

From 362fb7722d5baf2f236ea457b4f21f7b9daf9c6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Kottal?= <snielsen43@gmail.com>
Date: Fri, 20 Sep 2019 15:34:54 +0200
Subject: [PATCH 693/776] Open composition doctypes in infinite editor (#6387)

---
 .../components/umbgroupsbuilder.directive.js     | 16 ++++++++++++++++
 .../src/less/utilities/_spacing.less             |  2 ++
 .../src/views/components/umb-groups-builder.html |  2 +-
 .../src/views/documenttypes/edit.controller.js   |  6 ++++++
 4 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
index ba479429f1..d1f35f8e03 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
@@ -364,6 +364,22 @@
       };
 
 
+      scope.openDocumentType = function (documentTypeId) {
+          const editor = {
+              id: documentTypeId,
+              submit: function (model) {
+                  const args = { node: scope.model };
+                  eventsService.emit("editors.documentType.reload", args);
+                  editorService.close();
+              },
+              close: function () {
+                  editorService.close();
+              }
+          };
+          editorService.documentTypeEditor(editor);
+
+      };
+
       /* ---------- GROUPS ---------- */
 
       scope.addGroup = function(group) {
diff --git a/src/Umbraco.Web.UI.Client/src/less/utilities/_spacing.less b/src/Umbraco.Web.UI.Client/src/less/utilities/_spacing.less
index b9c8b909e8..6c38aa4a31 100644
--- a/src/Umbraco.Web.UI.Client/src/less/utilities/_spacing.less
+++ b/src/Umbraco.Web.UI.Client/src/less/utilities/_spacing.less
@@ -66,3 +66,5 @@
 .ml5 { margin-left: @spacing-extra-large; }
 .ml6 { margin-left: @spacing-extra-extra-large; }
 .ml7 { margin-left: @spacing-extra-extra-extra-large; }
+
+.p0 { padding: @spacing-none; }
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
index e8e47f6ae6..2770a8a02b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
@@ -81,7 +81,7 @@
                         <i class="icon icon-merge"></i>
                         <localize key="contentTypeEditor_inheritedFrom"></localize>: {{ tab.inheritedFromName }}
                         <span ng-repeat="contentTypeName in tab.parentTabContentTypeNames">
-                            <a href="#/settings/documentTypes/edit/{{tab.parentTabContentTypes[$index]}}">{{ contentTypeName }}</a>
+                            <button type="button" class="btn-link btn-small p0" ng-click="openDocumentType(tab.parentTabContentTypes[$index])">{{ contentTypeName }}</button>
                             <span ng-if="!$last">, </span>
                         </span>
                     </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
index adc12c137b..f261cf9b14 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
@@ -497,6 +497,12 @@
             loadDocumentType();
         }));
 
+        evts.push(eventsService.on("editors.documentType.reload", function (name, args) {
+            if (args && args.node && vm.contentType.id === args.node.id) {
+                loadDocumentType();
+            }
+        }));
+
         evts.push(eventsService.on("editors.documentType.saved", function(name, args) {
             if(args.documentType.allowedTemplates.length > 0){
                 navigationService.syncTree({ tree: "templates", path: [], forceReload: true })

From 327764d3660caf1d59317309a985bf1018498b6a Mon Sep 17 00:00:00 2001
From: Lynne Finnigan <lynnewritescode@gmail.com>
Date: Thu, 19 Sep 2019 17:58:16 +0100
Subject: [PATCH 694/776] Change link text for installing starter kit thumbnail
 & update styles

---
 .../src/installer/steps/starterkit.html       |  28 +-
 .../src/less/installer.less                   | 299 ++++++++++--------
 2 files changed, 180 insertions(+), 147 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html b/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html
index 1ffbdb205b..cfb08744b2 100644
--- a/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html
+++ b/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html
@@ -1,23 +1,27 @@
-<div ng-controller="Umbraco.Installer.PackagesController" id="starterKits">
-	<h1>Install a starter website</h1>
+<div ng-controller="Umbraco.Installer.PackagesController" id="starterKits">
+    <h1>Install a starter website</h1>
+
+    <p>
+        Installing a starter website helps you learn how Umbraco works, and
+        gives you a solid and simple foundation to build on top of.
+    </p>
 
-	<p>
-		Installing a starter website helps you learn how Umbraco works, and gives you a solid
-		and simple foundation to build on top of.
-	</p>
-    
     <small ng-if="!packages || packages.length == 0">Loading...</small>
 
-    <ul class="thumbnails">        
+    <ul class="thumbnails">
         <li class="span3" ng-repeat="pck in packages">
-            <a href ng-click="setPackageAndContinue(pck.id)" class="thumbnail">
-                <small>Loading...</small>
-                <img ng-src="https://our.umbraco.com{{pck.thumbnail}}?width=170" alt="{{pck.name}}">
+            <a ng-click="setPackageAndContinue(pck.id)" class="thumbnail">
+                <img ng-src="https://our.umbraco.com{{
+                        pck.thumbnail
+                    }}?width=170"
+                     alt="{{ pck.name }}" />
+                <small>Install starter website</small>
             </a>
         </li>
     </ul>
 
-    <a href ng-click="setPackageAndContinue('00000000-0000-0000-0000-000000000000')" class="btn btn-link btn-link-reverse">
+    <a href ng-click="setPackageAndContinue('00000000-0000-0000-0000-000000000000')"
+       class="btn btn-link btn-link-reverse">
         No thanks, I do not want to install a starter website
     </a>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/less/installer.less b/src/Umbraco.Web.UI.Client/src/less/installer.less
index 8090b971fc..865f015ffa 100644
--- a/src/Umbraco.Web.UI.Client/src/less/installer.less
+++ b/src/Umbraco.Web.UI.Client/src/less/installer.less
@@ -1,4 +1,4 @@
-// Core variables and mixins
+// Core variables and mixins
 @import "fonts.less"; // Loading fonts
 @import "variables.less"; // Modify this for custom colors, font-sizes, etc
 @import "mixins.less";
@@ -18,154 +18,172 @@
 
 
 [ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak {
-  display: none !important;
+    display: none !important;
 }
 
 
 html {
-  background: url('../img/installer.jpg') no-repeat center center fixed;
-  background-size: cover;
+    background: url('../img/installer.jpg') no-repeat center center fixed;
+    background-size: cover;
 }
 
 body {
-  margin: 0;
-  padding: 0;
-  height: 100%;
-  width: 100%;
-
-  font-family: @baseFontFamily;
-  font-size: @baseFontSize;
-  line-height: @baseLineHeight;
-  color: @textColor;
-
-  vertical-align: middle;
-  text-align: center;
-
-  // better font rendering
-  -webkit-font-smoothing: antialiased;
-  font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-
+    margin: 0;
+    padding: 0;
+    height: 100%;
+    width: 100%;
+    font-family: @baseFontFamily;
+    font-size: @baseFontSize;
+    line-height: @baseLineHeight;
+    color: @textColor;
+    vertical-align: middle;
+    text-align: center;
+    // better font rendering
+    -webkit-font-smoothing: antialiased;
+    font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
 }
 
-#logo{
-	position: absolute;
-	top: 20px;
-	left: 20px;
-	opacity: 0.8;
-  z-index: 777;
+#logo {
+    position: absolute;
+    top: 20px;
+    left: 20px;
+    opacity: 0.8;
+    z-index: 777;
 }
 
-#installer{
-	margin: auto;
+#installer {
+    margin: auto;
     background: @white;
-  width: 750px;
-  height: 600px;
-  text-align: left;
-  padding: 30px;
-  overflow:hidden;
-  z-index: 667;
+    width: 750px;
+    height: 600px;
+    text-align: left;
+    padding: 30px;
+    overflow: hidden;
+    z-index: 667;
 }
 
-#overlay{
-  position: absolute;
-  top: 0;
-  right: 0;
-  left: 0;
-  bottom: 0;
-  background: @purple-d2;
-  z-index: 666;
+#overlay {
+    position: absolute;
+    top: 0;
+    right: 0;
+    left: 0;
+    bottom: 0;
+    background: @purple-d2;
+    z-index: 666;
 }
 
-.loading #overlay{
+.loading #overlay {
     opacity: 0.5;
     display: block !important;
 }
 
 
-#fact{
-  color: @white;
-  text-shadow: 0px 0px 4px @black;
-  font-size: 25px;
-  text-align: left;
-  line-height: 35px;
-  z-index: 667;
-  height: 600px;
-  width: 750px;
+#fact {
+    color: @white;
+    text-shadow: 0px 0px 4px @black;
+    font-size: 25px;
+    text-align: left;
+    line-height: 35px;
+    z-index: 667;
+    height: 600px;
+    width: 750px;
+
+    h2 {
+        font-size: 35px;
+        border-bottom: 1px solid @white;
+        padding-bottom: 10px;
+        margin-bottom: 20px;
+        color: @white;
+    }
+
+    a {
+        color: @white;
+    }
 }
 
-#fact h2{
-  font-size: 35px;
-  border-bottom: 1px solid @white;
-  padding-bottom: 10px;
-  margin-bottom: 20px;
-  color: @white;
-} 
-
-#fact a{color: @white;}
-
-#feedback{
-  color: @white;
-  text-shadow: 0px 0px 4px @black;
-  font-size: 14px;
-  text-align: center;
-  line-height: 20px;
-  z-index: 667;
-  bottom: 20px;
-  right: 0;
-  left: 0;
-  height: 25px;
-  position: absolute;
+#feedback {
+    color: @white;
+    text-shadow: 0px 0px 4px @black;
+    font-size: 14px;
+    text-align: center;
+    line-height: 20px;
+    z-index: 667;
+    bottom: 20px;
+    right: 0;
+    left: 0;
+    height: 25px;
+    position: absolute;
 }
 
 
-h1{
-  border-bottom: 1px solid @gray-10;
-  padding-bottom: 10px;
-  color: @gray-2;
+h1 {
+    border-bottom: 1px solid @gray-10;
+    padding-bottom: 10px;
+    color: @gray-2;
 }
 
-.error h1, .error .message, span.error{ color: @red;}
+.error h1, .error .message, span.error {
+    color: @red;
+}
 
-legend{font-size: 14px; font-weight: bold}
+legend {
+    font-size: 14px;
+    font-weight: bold
+}
 
-input.ng-dirty.ng-invalid{border-color: #b94a48; color: #b94a48;}
-.disabled{
-  opacity: 0.6;
+input.ng-dirty.ng-invalid {
+    border-color: #b94a48;
+    color: #b94a48;
+}
+
+.disabled {
+    opacity: 0.6;
 }
 
 
-#installer label.control-label, 
+#installer label.control-label,
 #installer .constrol-label {
     padding-top: 5px !important;
 }
 
-.controls{
-	text-align: left
-}
+.controls {
+    text-align: left;
 
-.controls small{display: block; color: @gray-3;}
+    small {
+        display: block;
+        color: @gray-3;
+    }
+}
 
 .absolute-center {
-  margin: auto;
-  position: absolute;
-  top: 0; left: 0; bottom: 0; right: 0;
+    margin: auto;
+    position: absolute;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
 }
 
-.fade-hide, .fade-show {
-    transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
-}
-.fade-hide {
-    opacity:1;
-}
-.fade-hide.fade-hide-active {
-    opacity:0;
-}
+.fade-hide,
 .fade-show {
-    opacity:0;
+    transition: all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
 }
+
+.fade-hide {
+    opacity: 1;
+}
+
+.fade-hide.fade-hide-active {
+    opacity: 0;
+}
+
+.fade-show {
+    opacity: 0;
+}
+
 .fade-show.fade-show-active {
-    opacity:1;
+    opacity: 1;
 }
 
 .umb-installer-loader {
@@ -180,49 +198,60 @@ input.ng-dirty.ng-invalid{border-color: #b94a48; color: #b94a48;}
 }
 
 .permissions-report {
-    overflow:auto;
-    height:320px;
-    margin:0;
-    display:block;
-    padding:0;
+    overflow: auto;
+    height: 320px;
+    margin: 0;
+    display: block;
+    padding: 0;
 }
+
 .permissions-report > li {
-    list-style:none;
+    list-style: none;
 }
+
 .permissions-report h4 {
-    margin:7px;
+    margin: 7px;
 }
 
 .upgrade-report {
-    overflow:auto;
-    height:280px;
-    display:block;
+    overflow: auto;
+    height: 280px;
+    display: block;
 }
 
 select {
-    width:320px;
+    width: 320px;
 }
 
 #ysod {
-    height:500px;
-    width:100%;
-    overflow:auto;
-    border:none;
+    height: 500px;
+    width: 100%;
+    overflow: auto;
+    border: none;
 }
-#starterKits .thumbnails{
-    min-height:128px;
-}
-#starterKits a.thumbnail {
-    position:relative;
-    height:98px;
-}
-#starterKits a.thumbnail small {
-    position:absolute;
-    z-index: 50;
-    top:10px;
-    left:10px;
-}
-#starterKits a.thumbnail img {
-    position:relative;
-    z-index:100;
+
+#starterKits {
+    .thumbnails {
+        min-height: 128px;
+        padding-left: 0;
+    }
+
+    .thumbnail {
+        position: relative;
+        cursor: pointer;
+
+        small {
+            padding: 10px 10px 5px;
+            display: inline-block;
+        }
+
+        img {
+            position: relative;
+            z-index: 100;
+        }
+    }
+
+    .btn-link {
+        padding-left: 0;
+    }
 }

From 44e2c2d93c49430d4ff49ac26da2b491b65ef31d Mon Sep 17 00:00:00 2001
From: CatButtes <39886661+Catbuttes@users.noreply.github.com>
Date: Fri, 20 Sep 2019 15:43:00 +0100
Subject: [PATCH 695/776] Set add language button to correct colour

Fix Issue #6380
---
 src/Umbraco.Web.UI.Client/src/views/languages/overview.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/languages/overview.html b/src/Umbraco.Web.UI.Client/src/views/languages/overview.html
index 2e5f8572bf..4cf0ac7bf2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/languages/overview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/languages/overview.html
@@ -16,7 +16,7 @@
             <umb-editor-sub-header>
 
                 <umb-editor-sub-header-content-left>
-                    <umb-button button-style="success"
+                    <umb-button button-style="action"
                                 type="button"
                                 action="vm.addLanguage()"
                                 label-key="languages_addLanguage">

From 92a5182427fe70ee776f94b79182362c79c64f2e Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Mon, 23 Sep 2019 14:42:28 +0100
Subject: [PATCH 696/776] Moves the image resize on insert into a function that
 media insert & drag/pasted images uses

---
 .../src/common/services/tinymce.service.js    | 57 ++++++++++++-------
 1 file changed, 36 insertions(+), 21 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index def020f8f6..45b345ca74 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -241,7 +241,12 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                         // To create a media item & delete this tmp one etc
                         tinymce.activeEditor.$(img).attr({ "data-tmpimg": tmpLocation });
 
-                        // We need to remove the image from the cache, otherwise we can't handle if we upload the exactly 
+                        // Resize the image to the max size configured
+                        // NOTE: no imagesrc passed into func as the src is blob://...
+                        // We will append ImageResizing Querystrings on perist to DB with node save
+                        sizeImageInEditor(editor, img);
+
+                        // We need to remove the image from the cache, otherwise we can't handle if we upload the exactly
                         // same image twice
                         tinymce.activeEditor.editorUpload.blobCache.removeByUri(imgSrc);
                     });
@@ -249,19 +254,42 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
             }
         });
     }
-    
+
     function cleanupPasteData(plugin, args) {
-        
+
         // Remove spans
         args.content = args.content.replace(/<\s*span[^>]*>(.*?)<\s*\/\s*span>/g, "$1");
-        
+
         // Convert b to strong.
         args.content = args.content.replace(/<\s*b([^>]*)>(.*?)<\s*\/\s*b([^>]*)>/g, "<strong$1>$2</strong$3>");
-        
+
         // convert i to em
         args.content = args.content.replace(/<\s*i([^>]*)>(.*?)<\s*\/\s*i([^>]*)>/g, "<em$1>$2</em$3>");
-        
-        
+
+
+    }
+
+    function sizeImageInEditor(editor, imageDomElement, imgUrl) {
+
+        var size = editor.dom.getSize(imageDomElement);
+        console.log('size', size);
+
+        if (editor.settings.maxImageSize && editor.settings.maxImageSize !== 0) {
+            var newSize = imageHelper.scaleToMaxSize(editor.settings.maxImageSize, size.w, size.h);
+
+            console.log('new size', newSize);
+
+            editor.dom.setAttrib(imageDomElement, 'width', newSize.width);
+            editor.dom.setAttrib(imageDomElement, 'height', newSize.height);
+
+            // Images inserted via Media Picker will have a URL we can use for ImageResizer QueryStrings
+            // Images pasted/dragged in are not persisted to media until saved & thus will need to be added
+            if(imgUrl){
+                console.log('got an img src use QS');
+                var src = imgUrl + "?width=" + newSize.width + "&height=" + newSize.height;
+                editor.dom.setAttrib(imageDomElement, 'data-mce-src', src);
+            }
+        }
     }
 
     return {
@@ -620,21 +648,8 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
 
                 $timeout(function () {
                     var imgElm = editor.dom.get('__mcenew');
-                    var size = editor.dom.getSize(imgElm);
-
-                    if (editor.settings.maxImageSize && editor.settings.maxImageSize !== 0) {
-                        var newSize = imageHelper.scaleToMaxSize(editor.settings.maxImageSize, size.w, size.h);
-                        
-                        editor.dom.setAttrib(imgElm, 'width', newSize.width);
-                        editor.dom.setAttrib(imgElm, 'height', newSize.height);
-                        
-                        if (img.url) {
-                            var src = img.url + "?width=" + newSize.width + "&height=" + newSize.height;
-                            editor.dom.setAttrib(imgElm, 'data-mce-src', src);
-                        }
-                    }
+                    sizeImageInEditor(editor, imgElm, img.url);
 				    editor.dom.setAttrib(imgElm, 'id', null);
-
                     editor.fire('Change');
 
                 }, 500);

From 7404ccf02428be01de392ae41cdd880b8eadab1d Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Mon, 23 Sep 2019 14:47:41 +0100
Subject: [PATCH 697/776] C# change to append/perist the width & height into
 the pasted/dragged image to the image src url for ImageProcessor resizing

---
 src/Umbraco.Web/Templates/TemplateUtilities.cs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Templates/TemplateUtilities.cs b/src/Umbraco.Web/Templates/TemplateUtilities.cs
index edccbcc9d4..bc34dbdda7 100644
--- a/src/Umbraco.Web/Templates/TemplateUtilities.cs
+++ b/src/Umbraco.Web/Templates/TemplateUtilities.cs
@@ -237,9 +237,19 @@ namespace Umbraco.Web.Templates
                 var udi = mediaFile.GetUdi();
                 img.SetAttributeValue("data-udi", udi.ToString());
 
-                //Get the new persisted image url
+                // Get the new persisted image url
                 var mediaTyped = Current.UmbracoHelper.Media(mediaFile.Id);
                 var location = mediaTyped.Url;
+
+                // Find the width & height attributes as we need to set the imageprocessor QueryString
+                var width = img.GetAttributeValue("width", int.MinValue);
+                var height = img.GetAttributeValue("height", int.MinValue);
+
+                if(width != int.MinValue && height != int.MinValue)
+                {
+                    location = $"{location}?width={width}&height={height}&mode=max";
+                }
+                
                 img.SetAttributeValue("src", location);
 
                 // Remove the data attribute (so we do not re-process this)

From aef4bfaac44196b799c7394b828274d110e4b852 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 24 Sep 2019 11:11:48 +0200
Subject: [PATCH 698/776] we do not use this value jet.

---
 .../src/common/mocks/editors/prevalues.mocks.js                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/editors/prevalues.mocks.js b/src/Umbraco.Web.UI.Client/src/common/mocks/editors/prevalues.mocks.js
index 96ce626c44..a77cea15fa 100644
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/editors/prevalues.mocks.js
+++ b/src/Umbraco.Web.UI.Client/src/common/mocks/editors/prevalues.mocks.js
@@ -7,7 +7,7 @@ angular.module('umbraco.mocks').
                 return [401, null, null];
             }
             else {
-                return [200, { "plugins": [{ "name": "code", "useOnFrontend": true }, { "name": "paste", "useOnFrontend": true }, { "name": "umbracolink", "useOnFrontend": true }], "commands": [{ "icon": "images/editor/code.gif", "command": "code", "alias": "code", "frontEndCommand": "code", "value": "", "priority": 1, "isStylePicker": false }, { "icon": "images/editor/removeformat.gif", "command": "removeformat", "alias": "removeformat", "frontEndCommand": "removeformat", "value": "", "priority": 2, "isStylePicker": false }, { "icon": "images/editor/undo.gif", "command": "undo", "alias": "undo", "frontEndCommand": "undo", "value": "", "priority": 11, "isStylePicker": false }, { "icon": "images/editor/redo.gif", "command": "redo", "alias": "redo", "frontEndCommand": "redo", "value": "", "priority": 12, "isStylePicker": false }, { "icon": "images/editor/cut.gif", "command": "cut", "alias": "cut", "frontEndCommand": "cut", "value": "", "priority": 13, "isStylePicker": false }, { "icon": "images/editor/copy.gif", "command": "copy", "alias": "copy", "frontEndCommand": "copy", "value": "", "priority": 14, "isStylePicker": false }, { "icon": "images/editor/showStyles.png", "command": "styleselect", "alias": "styleselect", "frontEndCommand": "styleselect", "value": "", "priority": 20, "isStylePicker": false }, { "icon": "images/editor/bold.gif", "command": "bold", "alias": "bold", "frontEndCommand": "bold", "value": "", "priority": 21, "isStylePicker": false }, { "icon": "images/editor/italic.gif", "command": "italic", "alias": "italic", "frontEndCommand": "italic", "value": "", "priority": 22, "isStylePicker": false }, { "icon": "images/editor/underline.gif", "command": "underline", "alias": "underline", "frontEndCommand": "underline", "value": "", "priority": 23, "isStylePicker": false }, { "icon": "images/editor/strikethrough.gif", "command": "strikethrough", "alias": "strikethrough", "frontEndCommand": "strikethrough", "value": "", "priority": 24, "isStylePicker": false }, { "icon": "images/editor/justifyleft.gif", "command": "justifyleft", "alias": "justifyleft", "frontEndCommand": "alignleft", "value": "", "priority": 31, "isStylePicker": false }, { "icon": "images/editor/justifycenter.gif", "command": "justifycenter", "alias": "justifycenter", "frontEndCommand": "aligncenter", "value": "", "priority": 32, "isStylePicker": false }, { "icon": "images/editor/justifyright.gif", "command": "justifyright", "alias": "justifyright", "frontEndCommand": "alignright", "value": "", "priority": 33, "isStylePicker": false }, { "icon": "images/editor/justifyfull.gif", "command": "justifyfull", "alias": "justifyfull", "frontEndCommand": "alignfull", "value": "", "priority": 34, "isStylePicker": false }, { "icon": "images/editor/bullist.gif", "command": "bullist", "alias": "bullist", "frontEndCommand": "bullist", "value": "", "priority": 41, "isStylePicker": false }, { "icon": "images/editor/numlist.gif", "command": "numlist", "alias": "numlist", "frontEndCommand": "numlist", "value": "", "priority": 42, "isStylePicker": false }, { "icon": "images/editor/outdent.gif", "command": "outdent", "alias": "outdent", "frontEndCommand": "outdent", "value": "", "priority": 43, "isStylePicker": false }, { "icon": "images/editor/indent.gif", "command": "indent", "alias": "indent", "frontEndCommand": "indent", "value": "", "priority": 44, "isStylePicker": false }, { "icon": "images/editor/link.gif", "command": "link", "alias": "mcelink", "frontEndCommand": "link", "value": "", "priority": 51, "isStylePicker": false }, { "icon": "images/editor/unLink.gif", "command": "unlink", "alias": "unlink", "frontEndCommand": "unlink", "value": "", "priority": 52, "isStylePicker": false }, { "icon": "images/editor/anchor.gif", "command": "anchor", "alias": "mceinsertanchor", "frontEndCommand": "anchor", "value": "", "priority": 53, "isStylePicker": false }, { "icon": "images/editor/image.gif", "command": "image", "alias": "mceimage", "frontEndCommand": "umbmediapicker", "value": "", "priority": 61, "isStylePicker": false }, { "icon": "images/editor/insMacro.gif", "command": "umbracomacro", "alias": "umbracomacro", "frontEndCommand": "umbmacro", "value": "", "priority": 62, "isStylePicker": false }, { "icon": "images/editor/table.gif", "command": "table", "alias": "mceinserttable", "frontEndCommand": "table", "value": "", "priority": 63, "isStylePicker": false }, { "icon": "images/editor/media.gif", "command": "umbracoembed", "alias": "umbracoembed", "frontEndCommand": "umbembeddialog", "value": "", "priority": 66, "isStylePicker": false }, { "icon": "images/editor/hr.gif", "command": "hr", "alias": "inserthorizontalrule", "frontEndCommand": "hr", "value": "", "priority": 71, "isStylePicker": false }, { "icon": "images/editor/sub.gif", "command": "sub", "alias": "subscript", "frontEndCommand": "sub", "value": "", "priority": 72, "isStylePicker": false }, { "icon": "images/editor/sup.gif", "command": "sup", "alias": "superscript", "frontEndCommand": "sup", "value": "", "priority": 73, "isStylePicker": false }, { "icon": "images/editor/charmap.gif", "command": "charmap", "alias": "mcecharmap", "frontEndCommand": "charmap", "value": "", "priority": 74, "isStylePicker": false }], "validElements": "+a[id|style|rel|rev|charset|hreflang|dir|lang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur|onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup],-strong/-b[class|style],-em/-i[class|style],-strike[class|style],-u[class|style],#p[id|style|dir|class|align],-ol[class|reversed|start|style|type],-ul[class|style],-li[class|style],br[class],img[id|dir|lang|longdesc|usemap|style|class|src|onmouseover|onmouseout|border|alt=|title|hspace|vspace|width|height|align|umbracoorgwidth|umbracoorgheight|onresize|onresizestart|onresizeend|rel],-sub[style|class],-sup[style|class],-blockquote[dir|style|class],-table[border=0|cellspacing|cellpadding|width|height|class|align|summary|style|dir|id|lang|bgcolor|background|bordercolor],-tr[id|lang|dir|class|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor],tbody[id|class],thead[id|class],tfoot[id|class],#td[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor|scope],-th[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|scope],caption[id|lang|dir|class|style],-div[id|dir|class|align|style],-span[class|align|style],-pre[class|align|style],address[class|align|style],-h1[id|dir|class|align],-h2[id|dir|class|align],-h3[id|dir|class|align],-h4[id|dir|class|align],-h5[id|dir|class|align],-h6[id|style|dir|class|align],hr[class|style],dd[id|class|title|style|dir|lang],dl[id|class|title|style|dir|lang],dt[id|class|title|style|dir|lang],object[class|id|width|height|codebase|*],param[name|value|_value|class],embed[type|width|height|src|class|*],map[name|class],area[shape|coords|href|alt|target|class],bdo[class],button[class],iframe[*]", "inValidElements": "font", "customConfig": { "entity_encoding": "raw" }, "pasteTidying": true }, null];
+                return [200, { "plugins": [{ "name": "code", "useOnFrontend": true }, { "name": "paste", "useOnFrontend": true }, { "name": "umbracolink", "useOnFrontend": true }], "commands": [{ "icon": "images/editor/code.gif", "command": "code", "alias": "code", "frontEndCommand": "code", "value": "", "priority": 1, "isStylePicker": false }, { "icon": "images/editor/removeformat.gif", "command": "removeformat", "alias": "removeformat", "frontEndCommand": "removeformat", "value": "", "priority": 2, "isStylePicker": false }, { "icon": "images/editor/undo.gif", "command": "undo", "alias": "undo", "frontEndCommand": "undo", "value": "", "priority": 11, "isStylePicker": false }, { "icon": "images/editor/redo.gif", "command": "redo", "alias": "redo", "frontEndCommand": "redo", "value": "", "priority": 12, "isStylePicker": false }, { "icon": "images/editor/cut.gif", "command": "cut", "alias": "cut", "frontEndCommand": "cut", "value": "", "priority": 13, "isStylePicker": false }, { "icon": "images/editor/copy.gif", "command": "copy", "alias": "copy", "frontEndCommand": "copy", "value": "", "priority": 14, "isStylePicker": false }, { "icon": "images/editor/showStyles.png", "command": "styleselect", "alias": "styleselect", "frontEndCommand": "styleselect", "value": "", "priority": 20, "isStylePicker": false }, { "icon": "images/editor/bold.gif", "command": "bold", "alias": "bold", "frontEndCommand": "bold", "value": "", "priority": 21, "isStylePicker": false }, { "icon": "images/editor/italic.gif", "command": "italic", "alias": "italic", "frontEndCommand": "italic", "value": "", "priority": 22, "isStylePicker": false }, { "icon": "images/editor/underline.gif", "command": "underline", "alias": "underline", "frontEndCommand": "underline", "value": "", "priority": 23, "isStylePicker": false }, { "icon": "images/editor/strikethrough.gif", "command": "strikethrough", "alias": "strikethrough", "frontEndCommand": "strikethrough", "value": "", "priority": 24, "isStylePicker": false }, { "icon": "images/editor/justifyleft.gif", "command": "justifyleft", "alias": "justifyleft", "frontEndCommand": "alignleft", "value": "", "priority": 31, "isStylePicker": false }, { "icon": "images/editor/justifycenter.gif", "command": "justifycenter", "alias": "justifycenter", "frontEndCommand": "aligncenter", "value": "", "priority": 32, "isStylePicker": false }, { "icon": "images/editor/justifyright.gif", "command": "justifyright", "alias": "justifyright", "frontEndCommand": "alignright", "value": "", "priority": 33, "isStylePicker": false }, { "icon": "images/editor/justifyfull.gif", "command": "justifyfull", "alias": "justifyfull", "frontEndCommand": "alignfull", "value": "", "priority": 34, "isStylePicker": false }, { "icon": "images/editor/bullist.gif", "command": "bullist", "alias": "bullist", "frontEndCommand": "bullist", "value": "", "priority": 41, "isStylePicker": false }, { "icon": "images/editor/numlist.gif", "command": "numlist", "alias": "numlist", "frontEndCommand": "numlist", "value": "", "priority": 42, "isStylePicker": false }, { "icon": "images/editor/outdent.gif", "command": "outdent", "alias": "outdent", "frontEndCommand": "outdent", "value": "", "priority": 43, "isStylePicker": false }, { "icon": "images/editor/indent.gif", "command": "indent", "alias": "indent", "frontEndCommand": "indent", "value": "", "priority": 44, "isStylePicker": false }, { "icon": "images/editor/link.gif", "command": "link", "alias": "mcelink", "frontEndCommand": "link", "value": "", "priority": 51, "isStylePicker": false }, { "icon": "images/editor/unLink.gif", "command": "unlink", "alias": "unlink", "frontEndCommand": "unlink", "value": "", "priority": 52, "isStylePicker": false }, { "icon": "images/editor/anchor.gif", "command": "anchor", "alias": "mceinsertanchor", "frontEndCommand": "anchor", "value": "", "priority": 53, "isStylePicker": false }, { "icon": "images/editor/image.gif", "command": "image", "alias": "mceimage", "frontEndCommand": "umbmediapicker", "value": "", "priority": 61, "isStylePicker": false }, { "icon": "images/editor/insMacro.gif", "command": "umbracomacro", "alias": "umbracomacro", "frontEndCommand": "umbmacro", "value": "", "priority": 62, "isStylePicker": false }, { "icon": "images/editor/table.gif", "command": "table", "alias": "mceinserttable", "frontEndCommand": "table", "value": "", "priority": 63, "isStylePicker": false }, { "icon": "images/editor/media.gif", "command": "umbracoembed", "alias": "umbracoembed", "frontEndCommand": "umbembeddialog", "value": "", "priority": 66, "isStylePicker": false }, { "icon": "images/editor/hr.gif", "command": "hr", "alias": "inserthorizontalrule", "frontEndCommand": "hr", "value": "", "priority": 71, "isStylePicker": false }, { "icon": "images/editor/sub.gif", "command": "sub", "alias": "subscript", "frontEndCommand": "sub", "value": "", "priority": 72, "isStylePicker": false }, { "icon": "images/editor/sup.gif", "command": "sup", "alias": "superscript", "frontEndCommand": "sup", "value": "", "priority": 73, "isStylePicker": false }, { "icon": "images/editor/charmap.gif", "command": "charmap", "alias": "mcecharmap", "frontEndCommand": "charmap", "value": "", "priority": 74, "isStylePicker": false }], "validElements": "+a[id|style|rel|rev|charset|hreflang|dir|lang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur|onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup],-strong/-b[class|style],-em/-i[class|style],-strike[class|style],-u[class|style],#p[id|style|dir|class|align],-ol[class|reversed|start|style|type],-ul[class|style],-li[class|style],br[class],img[id|dir|lang|longdesc|usemap|style|class|src|onmouseover|onmouseout|border|alt=|title|hspace|vspace|width|height|align|umbracoorgwidth|umbracoorgheight|onresize|onresizestart|onresizeend|rel],-sub[style|class],-sup[style|class],-blockquote[dir|style|class],-table[border=0|cellspacing|cellpadding|width|height|class|align|summary|style|dir|id|lang|bgcolor|background|bordercolor],-tr[id|lang|dir|class|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor],tbody[id|class],thead[id|class],tfoot[id|class],#td[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor|scope],-th[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|scope],caption[id|lang|dir|class|style],-div[id|dir|class|align|style],-span[class|align|style],-pre[class|align|style],address[class|align|style],-h1[id|dir|class|align],-h2[id|dir|class|align],-h3[id|dir|class|align],-h4[id|dir|class|align],-h5[id|dir|class|align],-h6[id|style|dir|class|align],hr[class|style],dd[id|class|title|style|dir|lang],dl[id|class|title|style|dir|lang],dt[id|class|title|style|dir|lang],object[class|id|width|height|codebase|*],param[name|value|_value|class],embed[type|width|height|src|class|*],map[name|class],area[shape|coords|href|alt|target|class],bdo[class],button[class],iframe[*]", "inValidElements": "font", "customConfig": { "entity_encoding": "raw" } }, null];
             }
         }
 

From 52125148187a01346dbe74279495feabb9d796fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 24 Sep 2019 11:12:13 +0200
Subject: [PATCH 699/776] lets allow classes and h1,h2,h3,h4,h5,h6 no matter
 the configuration.

---
 .../src/common/services/tinymce.service.js           | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index def020f8f6..8b0965d950 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -364,7 +364,9 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                     init_instance_callback: initEvents
                 };
                 
-                // We keep spans here, cause removing spans here also removes b-tags inside of them, instead we strip them out later.
+                /*
+                // We are not ready to limit the pasted elements further than default, we will return to this feature. ( TODO: Make this feature an option. )
+                // We keep spans here, cause removing spans here also removes b-tags inside of them, instead we strip them out later. (TODO: move this definition to the config file... )
                 var validPasteElements = "-strong/b,-em/i,-u,-span,-p,-ol,-ul,-li,-p/div,-a[href|name],sub,sup,strike,br,del,table[width],tr,td[colspan|rowspan|width],th[colspan|rowspan|width],thead,tfoot,tbody,img[src|alt|width|height],ul,ol,li,hr,pre,dl,dt,figure,figcaption,wbr"
                 
                 // add elements from user configurated styleFormats to our list of validPasteElements.
@@ -376,14 +378,18 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                         validPasteElements += "," + style.block;
                     }
                 }
+                */
                 
+                /**
+                The default paste config can be overwritten by defining these properties in the customConfig.
+                */
                 var pasteConfig = {
                     
                     paste_remove_styles: true,
                     paste_text_linebreaktype: true, //Converts plaintext linebreaks to br or p elements.
-                    paste_strip_class_attributes: "all",
+                    paste_strip_class_attributes: "none",
                     
-                    paste_word_valid_elements: validPasteElements,
+                    //paste_word_valid_elements: validPasteElements,
                     
                     paste_preprocess: cleanupPasteData
                     

From 7728559ce47c9931d0888c5a0af88444d4a9824b Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Tue, 24 Sep 2019 11:47:33 +0100
Subject: [PATCH 700/776] Rather than tryinbg to find off an inserted img in
 the DOM use the localStorage Uses the Angular localStorage lib that falls
 back to cookies as opposed to native browser localStorage Clears out
 tinymce__ localstorage keys when we save the node to ensure we dont have
 loads stored for the user

---
 .../components/content/edit.controller.js     |  9 ++++++++-
 .../src/common/services/tinymce.service.js    | 19 ++++++++++---------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
index a7d02cc2ab..aa01df35dc 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
@@ -4,7 +4,7 @@
     function ContentEditController($rootScope, $scope, $routeParams, $q, $window,
         appState, contentResource, entityResource, navigationService, notificationsService,
         serverValidationManager, contentEditingHelper, localizationService, formHelper, umbRequestHelper,
-        editorState, $http, eventsService, overlayService, $location) {
+        editorState, $http, eventsService, overlayService, $location, localStorageService) {
 
         var evts = [];
         var infiniteMode = $scope.infiniteModel && $scope.infiniteModel.infiniteMode;
@@ -189,6 +189,13 @@
                 $scope.page.saveButtonState = "success";
                 $scope.page.buttonGroupState = "success";
             }));
+
+            evts.push(eventsService.on("content.saved", function(){
+                // Clear out localstorage keys that start with tinymce__
+                // When we save/perist a content node
+                // NOTE: clearAll supports a RegEx pattern of items to remove
+                localStorageService.clearAll(/^tinymce__/);
+            }));
         }
 
         /**
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index cd85dba029..5a8041191e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -7,7 +7,7 @@
  * A service containing all logic for all of the Umbraco TinyMCE plugins
  */
 function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, stylesheetResource, macroResource, macroService,
-    $routeParams, umbRequestHelper, angularHelper, userService, editorService, entityResource, eventsService) {
+    $routeParams, umbRequestHelper, angularHelper, userService, editorService, entityResource, eventsService, localStorageService) {
 
     //These are absolutely required in order for the macros to render inline
     //we put these as extended elements because they get merged on top of the normal allowed elements by tiny mce
@@ -203,7 +203,7 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
             }
 
             // Put temp location into localstorage (used to update the img with data-tmpimg later on)
-            localStorage.setItem(`tinymce__${blobInfo.blobUri()}`, json.tmpLocation);
+            localStorageService.set(`tinymce__${blobInfo.blobUri()}`, json.tmpLocation);
 
             // We set the img src url to be the same as we started
             // The Blob URI is stored in TinyMce's cache
@@ -234,7 +234,7 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
 
                         // Get img src
                         var imgSrc = img.getAttribute("src");
-                        var tmpLocation = localStorage.getItem(`tinymce__${imgSrc}`);
+                        var tmpLocation = localStorageService.get(`tinymce__${imgSrc}`)
 
                         // Select the img & add new attr which we can search for
                         // When its being persisted in RTE property editor
@@ -252,13 +252,14 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                 blobImageWithNoTmpImgAttribute.forEach(imageElement => {
                     var blobSrcUri = editor.dom.getAttrib(imageElement, "src");
 
-                    // Select/find the same image uploaded with the matching SRC uri
-                    var uploadedImage = editor.dom.select(`img[src="${blobSrcUri}"][data-tmpimg]`);
+                    // Find the same image uploaded (Should be in LocalStorage)
+                    // May already exist in the editor as duplicate image
+                    // OR added to the RTE, deleted & re-added again
+                    // So lets fetch the tempurl out of localstorage for that blob URI item
+                    var tmpLocation = localStorageService.get(`tinymce__${blobSrcUri}`)
 
-                    if(uploadedImage){
-                        // Get the value of the tmpimg - so we can apply it to the matched/duplicate image
-                        var dataTmpImg = editor.dom.getAttrib(uploadedImage, "data-tmpimg");
-                        editor.dom.setAttrib(imageElement, "data-tmpimg", dataTmpImg);
+                    if(tmpLocation){
+                        editor.dom.setAttrib(imageElement, "data-tmpimg", tmpLocation);
                     }
                 });
 

From f43a6a9004b48176e7b2a126c4207a8310672da9 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Tue, 24 Sep 2019 12:00:39 +0100
Subject: [PATCH 701/776] Fix unit test

---
 .../test/unit/app/propertyeditors/rte-controller.spec.js        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/test/unit/app/propertyeditors/rte-controller.spec.js b/src/Umbraco.Web.UI.Client/test/unit/app/propertyeditors/rte-controller.spec.js
index f813ec24a8..715861de0b 100644
--- a/src/Umbraco.Web.UI.Client/test/unit/app/propertyeditors/rte-controller.spec.js
+++ b/src/Umbraco.Web.UI.Client/test/unit/app/propertyeditors/rte-controller.spec.js
@@ -13,6 +13,8 @@ describe('RTE controller tests', function () {
         }
     }
 
+    beforeEach(module('LocalStorageModule'));
+
     beforeEach(module('umbraco', function ($provide) {
         $provide.value('tinyMceAssets', []);
     }));

From e0218dc96e0cca2618569db94641b456bc308327 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Tue, 24 Sep 2019 12:10:55 +0100
Subject: [PATCH 702/776] Update
 src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js

Co-Authored-By: Bjarke Berg <mail@bergmania.dk>
---
 src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 45b345ca74..9e6f175301 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -277,7 +277,6 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
         if (editor.settings.maxImageSize && editor.settings.maxImageSize !== 0) {
             var newSize = imageHelper.scaleToMaxSize(editor.settings.maxImageSize, size.w, size.h);
 
-            console.log('new size', newSize);
 
             editor.dom.setAttrib(imageDomElement, 'width', newSize.width);
             editor.dom.setAttrib(imageDomElement, 'height', newSize.height);

From ab7d380ecc547e57af45d5841df95fa5050fbc07 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Tue, 24 Sep 2019 12:11:01 +0100
Subject: [PATCH 703/776] Update
 src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js

Co-Authored-By: Bjarke Berg <mail@bergmania.dk>
---
 src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 9e6f175301..dcc186b1d2 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -284,7 +284,6 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
             // Images inserted via Media Picker will have a URL we can use for ImageResizer QueryStrings
             // Images pasted/dragged in are not persisted to media until saved & thus will need to be added
             if(imgUrl){
-                console.log('got an img src use QS');
                 var src = imgUrl + "?width=" + newSize.width + "&height=" + newSize.height;
                 editor.dom.setAttrib(imageDomElement, 'data-mce-src', src);
             }

From e3b4283cedc93c0f06a00fc9a2004eaed910f0ae Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Tue, 24 Sep 2019 12:11:14 +0100
Subject: [PATCH 704/776] Update
 src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js

Co-Authored-By: Bjarke Berg <mail@bergmania.dk>
---
 src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index dcc186b1d2..6c01f49442 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -272,7 +272,6 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
     function sizeImageInEditor(editor, imageDomElement, imgUrl) {
 
         var size = editor.dom.getSize(imageDomElement);
-        console.log('size', size);
 
         if (editor.settings.maxImageSize && editor.settings.maxImageSize !== 0) {
             var newSize = imageHelper.scaleToMaxSize(editor.settings.maxImageSize, size.w, size.h);

From 8782935edb37a870cb51ac73603a1d41284958f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 24 Sep 2019 13:28:18 +0200
Subject: [PATCH 705/776] no need for this anymore

---
 .../src/views/propertyeditors/rte/rte.controller.js          | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
index c7036fec22..f4af762dc5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
@@ -8,11 +8,6 @@ angular.module("umbraco")
             
             var editorNode = $element[0].querySelector('.umb-rte-editor');
 
-            //To id the html textarea we need to use the datetime ticks because we can have multiple rte's per a single property alias
-            // because now we have to support having 2x (maybe more at some stage) content editors being displayed at once. This is because
-            // we have this mini content editor panel that can be launched with MNTP.
-            $scope.textAreaHtmlId = $scope.model.alias + "_" + String.CreateGuid();
-
             var editorConfig = $scope.model.config ? $scope.model.config.editor : null;
             if (!editorConfig || angular.isString(editorConfig)) {
                 editorConfig = tinyMceService.defaultPrevalues();

From bbb369cbfba6487a7105f02c34ffef117bf05a08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 24 Sep 2019 13:29:02 +0200
Subject: [PATCH 706/776] lets keep this

---
 .../src/views/propertyeditors/rte/rte.html                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html
index 34cbd21404..9b3867e1e7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html
@@ -2,6 +2,6 @@
     <umb-load-indicator ng-if="isLoading"></umb-load-indicator>
 
     <div class="umb-rte-editor-con">
-        <div class="umb-rte-editor"></div>
+        <div class="umb-rte-editor" ng-style="{ width: containerWidth, height: containerHeight, overflow: containerOverflow}"></div>
     </div>
 </div>

From eedff5d9d1eb8f0cfcbbeb24e6be7aa22ca2e3c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 24 Sep 2019 13:29:48 +0200
Subject: [PATCH 707/776] getting rid of comments

---
 .../src/common/services/tinymce.service.js                      | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 1b346a3bc6..2d78e9fe5f 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -268,9 +268,7 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
 
                 //create a baseline Config to exten upon
                 var config = {
-                    //selector: "#" + args.htmlId,
                     theme: modeTheme,
-                    //skin: "umbraco",
                     inline: modeInline,
                     plugins: plugins,
                     valid_elements: tinyMceConfig.validElements,

From 5d364230875afe555afeb307825f46ad96a864a0 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Tue, 24 Sep 2019 13:47:04 +0100
Subject: [PATCH 708/776] After merge - makes sure to resize the deleted & then
 re-added same image using the same sizing function

---
 src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index b89a15db41..b671bcec00 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -266,6 +266,7 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                     var tmpLocation = localStorageService.get(`tinymce__${blobSrcUri}`)
 
                     if(tmpLocation){
+                        sizeImageInEditor(editor, imageElement);
                         editor.dom.setAttrib(imageElement, "data-tmpimg", tmpLocation);
                     }
                 });

From 493d7010badda64d02e9f1fa895778b97d79ea0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 24 Sep 2019 17:10:20 +0200
Subject: [PATCH 709/776] Reverting to use element ID to initialisation

---
 .../src/views/propertyeditors/rte/rte.controller.js   | 11 +++++++----
 .../src/views/propertyeditors/rte/rte.html            |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
index f4af762dc5..f78eedab33 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
@@ -1,13 +1,16 @@
 angular.module("umbraco")
     .controller("Umbraco.PropertyEditors.RTEController",
-        function ($scope, $q, assetsService, $timeout, tinyMceService, angularHelper, tinyMceAssets, $element) {
+        function ($scope, $q, assetsService, $timeout, tinyMceService, angularHelper, tinyMceAssets) {
 
             // TODO: A lot of the code below should be shared between the grid rte and the normal rte
 
             $scope.isLoading = true;
             
-            var editorNode = $element[0].querySelector('.umb-rte-editor');
-
+            //To id the html textarea we need to use the datetime ticks because we can have multiple rte's per a single property alias
+            // because now we have to support having 2x (maybe more at some stage) content editors being displayed at once. This is because
+            // we have this mini content editor panel that can be launched with MNTP.
+            $scope.textAreaHtmlId = $scope.model.alias + "_" + String.CreateGuid();
+            
             var editorConfig = $scope.model.config ? $scope.model.config.editor : null;
             if (!editorConfig || angular.isString(editorConfig)) {
                 editorConfig = tinyMceService.defaultPrevalues();
@@ -35,7 +38,7 @@ angular.module("umbraco")
             var tinyMceEditor = null;
 
             promises.push(tinyMceService.getTinyMceEditorConfig({
-                target: editorNode,
+                htmlId: $scope.textAreaHtmlId,
                 stylesheets: editorConfig.stylesheets,
                 toolbar: editorConfig.toolbar,
                 mode: editorConfig.mode
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html
index 9b3867e1e7..d2cf29d75a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html
@@ -2,6 +2,6 @@
     <umb-load-indicator ng-if="isLoading"></umb-load-indicator>
 
     <div class="umb-rte-editor-con">
-        <div class="umb-rte-editor" ng-style="{ width: containerWidth, height: containerHeight, overflow: containerOverflow}"></div>
+        <div id="{{textAreaHtmlId}}" class="umb-rte-editor" ng-style="{ width: containerWidth, height: containerHeight, overflow: containerOverflow}"></div>
     </div>
 </div>

From aafa314f0e1d5097c9beec3a7fab970da5e9c31e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Wed, 25 Sep 2019 10:52:33 +0200
Subject: [PATCH 710/776] Separate gulp script for docs (#6409)

---
 .gitignore                                    |    2 +-
 build/build-docs.ps1                          |   44 -
 build/build.ps1                               |   19 +-
 .../docs/src/api/index.ngdoc                  |   19 -
 src/Umbraco.Web.UI.Client/gulp/config.js      |    2 +-
 .../gulp/tasks/docserve.js                    |   10 -
 src/Umbraco.Web.UI.Client/package-lock.json   | 1221 +-----
 src/Umbraco.Web.UI.Client/package.json        |    6 +-
 src/Umbraco.Web.UI.Docs/README.md             |   14 +
 .../gulpfile.js}                              |   17 +-
 src/Umbraco.Web.UI.Docs/package-lock.json     | 3612 +++++++++++++++++
 src/Umbraco.Web.UI.Docs/package.json          |   14 +
 .../docs => Umbraco.Web.UI.Docs}/umb-docs.css |    0
 13 files changed, 3754 insertions(+), 1226 deletions(-)
 delete mode 100644 build/build-docs.ps1
 delete mode 100644 src/Umbraco.Web.UI.Client/docs/src/api/index.ngdoc
 delete mode 100644 src/Umbraco.Web.UI.Client/gulp/tasks/docserve.js
 create mode 100644 src/Umbraco.Web.UI.Docs/README.md
 rename src/{Umbraco.Web.UI.Client/gulp/tasks/docs.js => Umbraco.Web.UI.Docs/gulpfile.js} (73%)
 create mode 100644 src/Umbraco.Web.UI.Docs/package-lock.json
 create mode 100644 src/Umbraco.Web.UI.Docs/package.json
 rename src/{Umbraco.Web.UI.Client/docs => Umbraco.Web.UI.Docs}/umb-docs.css (100%)

diff --git a/.gitignore b/.gitignore
index 585bd855b7..2478a5e64c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -132,7 +132,7 @@ src/Umbraco.Web.UI.Client/bower_components/*
 preserve.belle
 
 #Ignore Rule for output of generated documentation files from Grunt docserve
-src/Umbraco.Web.UI.Client/docs/api
+src/Umbraco.Web.UI.Docs/api
 src/*.boltdata/
 src/umbraco.sln.ide/*
 src/.vs/
diff --git a/build/build-docs.ps1 b/build/build-docs.ps1
deleted file mode 100644
index 8cd3f090c7..0000000000
--- a/build/build-docs.ps1
+++ /dev/null
@@ -1,44 +0,0 @@
-$uenv=build/build.ps1 -get
-
-$src = "$($uenv.SolutionRoot)\src"
-$tmp = $uenv.BuildTemp
-$out = $uenv.BuildOutput
-$DocFxJson = "$src\ApiDocs\docfx.json"
-$DocFxSiteOutput = "$tmp\_site\*.*"
-
-################ Do the UI docs
-$uenv.CompileBelle()
-
-"Moving to Umbraco.Web.UI.Client folder"
-cd .\src\Umbraco.Web.UI.Client
-
-"Generating the docs and waiting before executing the next commands"
-& gulp docs | Out-Null
-
-# change baseUrl
-$BaseUrl = "https://our.umbraco.com/apidocs/v8/ui/"
-$IndexPath = "./docs/api/index.html"
-(Get-Content $IndexPath).replace('location.href.replace(rUrl, indexFile)', "`'" + $BaseUrl + "`'") | Set-Content $IndexPath
-
-# zip it
-& $uenv.BuildEnv.Zip a -tzip -r "$out\ui-docs.zip" "$src\Umbraco.Web.UI.Client\docs\api\*.*"
-
-
-################ Do the c# docs
-
-# Build the solution in debug mode
-$SolutionPath = Join-Path -Path $src -ChildPath "umbraco.sln"
-#$uenv.CompileUmbraco()
-
-#restore nuget packages
-$uenv.RestoreNuGet()
-
-# run DocFx
-$DocFx = $uenv.BuildEnv.DocFx
-
-Write-Host "$DocFxJson"
-& $DocFx metadata $DocFxJson
-& $DocFx build $DocFxJson
-
-# zip it
-& $uenv.BuildEnv.Zip a -tzip -r "$out\csharp-docs.zip" $DocFxSiteOutput
diff --git a/build/build.ps1 b/build/build.ps1
index e4994d2c4a..892654d3cd 100644
--- a/build/build.ps1
+++ b/build/build.ps1
@@ -456,25 +456,24 @@
   $ubuild.DefineMethod("PrepareAngularDocs",
   {
     Write-Host "Prepare Angular Documentation"
-
+    
     $src = "$($this.SolutionRoot)\src"
-      $out = $this.BuildOutput
-
-    $this.CompileBelle()
-
-    "Moving to Umbraco.Web.UI.Client folder"
-    cd .\src\Umbraco.Web.UI.Client
+    $out = $this.BuildOutput
+	  
+    "Moving to Umbraco.Web.UI.Docs folder"
+    cd ..\src\Umbraco.Web.UI.Docs
 
     "Generating the docs and waiting before executing the next commands"
-    & gulp docs | Out-Null
+	& npm install
+    & npx gulp docs
 
     # change baseUrl
     $BaseUrl = "https://our.umbraco.com/apidocs/v8/ui/"
-    $IndexPath = "./docs/api/index.html"
+    $IndexPath = "./api/index.html"
     (Get-Content $IndexPath).replace('location.href.replace(rUrl, indexFile)', "`'" + $BaseUrl + "`'") | Set-Content $IndexPath
 
     # zip it
-    & $this.BuildEnv.Zip a -tzip -r "$out\ui-docs.zip" "$src\Umbraco.Web.UI.Client\docs\api\*.*"
+    & $this.BuildEnv.Zip a -tzip -r "$out\ui-docs.zip" "$src\Umbraco.Web.UI.Docs\api\*.*"
   })
 
   $ubuild.DefineMethod("Build",
diff --git a/src/Umbraco.Web.UI.Client/docs/src/api/index.ngdoc b/src/Umbraco.Web.UI.Client/docs/src/api/index.ngdoc
deleted file mode 100644
index 7b6a1f9d22..0000000000
--- a/src/Umbraco.Web.UI.Client/docs/src/api/index.ngdoc
+++ /dev/null
@@ -1,19 +0,0 @@
-@ngdoc overview
-@name Umbraco 7 JS documentation 
-@description
-
-#Umbraco Backoffice UI API documentation
-
-This documentation relates to the angular, js, css and less APIs for developing back office components
-
-##Getting started
-The current app is built, following conventions from angularJs and bootstrap. To get started with the applicaton you will need to atleast know the basics of these frameworks 
-
-###AngularJS
-- Excellent introduction videos on http://www.egghead.io/
-- Official guide at: http://docs.angularjs.org/guide/
-
-
-
-
-
diff --git a/src/Umbraco.Web.UI.Client/gulp/config.js b/src/Umbraco.Web.UI.Client/gulp/config.js
index af6973ddcb..bf8804bf6b 100755
--- a/src/Umbraco.Web.UI.Client/gulp/config.js
+++ b/src/Umbraco.Web.UI.Client/gulp/config.js
@@ -41,7 +41,7 @@ module.exports = {
                     "./src/views/**/*.{directive,component}.js"
                 ],
                 out: "umbraco.directives.js"
-            },
+            }
         },
 
         //selectors for copying all views into the build
diff --git a/src/Umbraco.Web.UI.Client/gulp/tasks/docserve.js b/src/Umbraco.Web.UI.Client/gulp/tasks/docserve.js
deleted file mode 100644
index a402003383..0000000000
--- a/src/Umbraco.Web.UI.Client/gulp/tasks/docserve.js
+++ /dev/null
@@ -1,10 +0,0 @@
-'use strict';
-
-var config = require('../config');
-var gulp = require('gulp');
-var runSequence = require('run-sequence');
-
-// Docserve - build and open the back office documentation
-gulp.task('docserve', function(cb) {
-    runSequence('docs', 'connect:docs', 'open:docs', cb);
-});
diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json
index be1582f1e4..eb9b5141f7 100644
--- a/src/Umbraco.Web.UI.Client/package-lock.json
+++ b/src/Umbraco.Web.UI.Client/package-lock.json
@@ -937,7 +937,7 @@
     },
     "ansi-colors": {
       "version": "1.1.0",
-      "resolved": "http://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
       "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
       "dev": true,
       "requires": {
@@ -1104,7 +1104,6 @@
       "resolved": "https://registry.npmjs.org/archive-type/-/archive-type-3.2.0.tgz",
       "integrity": "sha1-nNnABpV+vpX62tW9YJiUKoE3N/Y=",
       "dev": true,
-      "optional": true,
       "requires": {
         "file-type": "^3.1.0"
       },
@@ -1113,8 +1112,7 @@
           "version": "3.9.0",
           "resolved": "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
           "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -1406,12 +1404,6 @@
       "integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=",
       "dev": true
     },
-    "batch": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
-      "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
-      "dev": true
-    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -1537,10 +1529,9 @@
     },
     "bl": {
       "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
+      "resolved": "http://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
       "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==",
       "dev": true,
-      "optional": true,
       "requires": {
         "readable-stream": "^2.3.5",
         "safe-buffer": "^5.1.1"
@@ -1550,15 +1541,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -1574,7 +1563,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -1593,18 +1581,6 @@
       "integrity": "sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==",
       "dev": true
     },
-    "body": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/body/-/body-5.1.0.tgz",
-      "integrity": "sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk=",
-      "dev": true,
-      "requires": {
-        "continuable-cache": "^0.3.1",
-        "error": "^7.0.0",
-        "raw-body": "~1.1.0",
-        "safe-json-parse": "~1.0.1"
-      }
-    },
     "body-parser": {
       "version": "1.18.3",
       "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz",
@@ -1763,8 +1739,7 @@
       "version": "0.2.13",
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
       "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "buffer-fill": {
       "version": "1.0.0",
@@ -1783,7 +1758,6 @@
       "resolved": "https://registry.npmjs.org/buffer-to-vinyl/-/buffer-to-vinyl-1.1.0.tgz",
       "integrity": "sha1-APFfruOreh3aLN5tkSG//dB7ImI=",
       "dev": true,
-      "optional": true,
       "requires": {
         "file-type": "^3.1.0",
         "readable-stream": "^2.0.2",
@@ -1795,22 +1769,19 @@
           "version": "3.9.0",
           "resolved": "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
           "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "isarray": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -1826,7 +1797,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -1835,15 +1805,13 @@
           "version": "2.0.3",
           "resolved": "http://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
           "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "vinyl": {
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -1867,12 +1835,6 @@
       "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
       "dev": true
     },
-    "bytes": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz",
-      "integrity": "sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g=",
-      "dev": true
-    },
     "cache-base": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
@@ -1954,18 +1916,11 @@
       "integrity": "sha512-rUBIbap+VJfxTzrM4akJ00lkvVb5/n5v3EGXfWzSH5zT8aJmGzjA8HWhJ4U6kCpzxozUSnB+yvAYDRPY6mRpgQ==",
       "dev": true
     },
-    "canonical-path": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/canonical-path/-/canonical-path-0.0.2.tgz",
-      "integrity": "sha1-4x65N6jJPuKgHfGDl5RyGQKHRXQ=",
-      "dev": true
-    },
     "capture-stack-trace": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz",
       "integrity": "sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "caseless": {
       "version": "0.12.0",
@@ -1978,7 +1933,6 @@
       "resolved": "https://registry.npmjs.org/caw/-/caw-1.2.0.tgz",
       "integrity": "sha1-/7Im/n78VHKI3GLuPpcHPCEtEDQ=",
       "dev": true,
-      "optional": true,
       "requires": {
         "get-proxy": "^1.0.1",
         "is-obj": "^1.0.0",
@@ -1990,8 +1944,7 @@
           "version": "0.4.3",
           "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
           "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -2266,8 +2219,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/co/-/co-3.1.0.tgz",
       "integrity": "sha1-TqVOpaCJOBUxheFSEMaNkJK8G3g=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "coa": {
       "version": "2.0.1",
@@ -2391,7 +2343,6 @@
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
       "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
       "dev": true,
-      "optional": true,
       "requires": {
         "graceful-readlink": ">= 1.0.0"
       }
@@ -2510,12 +2461,6 @@
         }
       }
     },
-    "connect-livereload": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.6.0.tgz",
-      "integrity": "sha1-+fAJh0rWg3GDr7FwtMTjhXodfOs=",
-      "dev": true
-    },
     "console-stream": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/console-stream/-/console-stream-0.1.1.tgz",
@@ -2538,12 +2483,6 @@
       "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
       "dev": true
     },
-    "continuable-cache": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/continuable-cache/-/continuable-cache-0.3.1.tgz",
-      "integrity": "sha1-vXJ6f67XfnH/OYWskzUakSczrQ8=",
-      "dev": true
-    },
     "convert-source-map": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz",
@@ -2578,7 +2517,7 @@
     "core-js": {
       "version": "2.5.7",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz",
-      "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==",
+      "integrity": "sha1-+XJgj/DOrWi4QaFqky0LGDeRgU4=",
       "dev": true
     },
     "core-util-is": {
@@ -2604,7 +2543,6 @@
       "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
       "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
       "dev": true,
-      "optional": true,
       "requires": {
         "capture-stack-trace": "^1.0.0"
       }
@@ -2859,7 +2797,6 @@
       "resolved": "https://registry.npmjs.org/decompress/-/decompress-3.0.0.tgz",
       "integrity": "sha1-rx3VDQbjv8QyRh033hGzjA2ZG+0=",
       "dev": true,
-      "optional": true,
       "requires": {
         "buffer-to-vinyl": "^1.0.0",
         "concat-stream": "^1.4.6",
@@ -2877,7 +2814,6 @@
           "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
           "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
           "dev": true,
-          "optional": true,
           "requires": {
             "arr-flatten": "^1.0.1"
           }
@@ -2886,15 +2822,13 @@
           "version": "0.2.1",
           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
           "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "braces": {
           "version": "1.8.5",
           "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
           "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
           "dev": true,
-          "optional": true,
           "requires": {
             "expand-range": "^1.8.1",
             "preserve": "^0.2.0",
@@ -2906,7 +2840,6 @@
           "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
           "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-posix-bracket": "^0.1.0"
           }
@@ -2916,7 +2849,6 @@
           "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
           "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -2926,7 +2858,6 @@
           "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
           "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
           "dev": true,
-          "optional": true,
           "requires": {
             "inflight": "^1.0.4",
             "inherits": "2",
@@ -2940,7 +2871,6 @@
           "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz",
           "integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=",
           "dev": true,
-          "optional": true,
           "requires": {
             "extend": "^3.0.0",
             "glob": "^5.0.3",
@@ -2956,15 +2886,13 @@
               "version": "0.0.1",
               "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
               "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "readable-stream": {
               "version": "1.0.34",
               "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
               "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
               "dev": true,
-              "optional": true,
               "requires": {
                 "core-util-is": "~1.0.0",
                 "inherits": "~2.0.1",
@@ -2976,15 +2904,13 @@
               "version": "0.10.31",
               "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
               "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "through2": {
               "version": "0.6.5",
               "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
               "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
               "dev": true,
-              "optional": true,
               "requires": {
                 "readable-stream": ">=1.0.33-1 <1.1.0-0",
                 "xtend": ">=4.0.0 <4.1.0-0"
@@ -2996,22 +2922,19 @@
           "version": "4.1.15",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
           "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "is-extglob": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
           "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "is-glob": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
           "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -3020,15 +2943,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -3038,7 +2959,6 @@
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
           "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
           "dev": true,
-          "optional": true,
           "requires": {
             "arr-diff": "^2.0.0",
             "array-unique": "^0.2.1",
@@ -3059,15 +2979,13 @@
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ordered-read-streams": {
           "version": "0.3.0",
           "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz",
           "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-stream": "^1.0.1",
             "readable-stream": "^2.0.1"
@@ -3078,7 +2996,6 @@
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -3094,7 +3011,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -3104,7 +3020,6 @@
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
           "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-utf8": "^0.2.0"
           }
@@ -3114,7 +3029,6 @@
           "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz",
           "integrity": "sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=",
           "dev": true,
-          "optional": true,
           "requires": {
             "first-chunk-stream": "^1.0.0",
             "strip-bom": "^2.0.0"
@@ -3125,7 +3039,6 @@
           "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
           "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
           "dev": true,
-          "optional": true,
           "requires": {
             "json-stable-stringify-without-jsonify": "^1.0.1",
             "through2-filter": "^3.0.0"
@@ -3136,7 +3049,6 @@
               "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
               "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
               "dev": true,
-              "optional": true,
               "requires": {
                 "through2": "~2.0.0",
                 "xtend": "~4.0.0"
@@ -3149,7 +3061,6 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -3161,7 +3072,6 @@
           "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz",
           "integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=",
           "dev": true,
-          "optional": true,
           "requires": {
             "duplexify": "^3.2.0",
             "glob-stream": "^5.3.2",
@@ -3189,7 +3099,6 @@
       "resolved": "https://registry.npmjs.org/decompress-tar/-/decompress-tar-3.1.0.tgz",
       "integrity": "sha1-IXx4n5uURQ76rcXF5TeXj8MzxGY=",
       "dev": true,
-      "optional": true,
       "requires": {
         "is-tar": "^1.0.0",
         "object-assign": "^2.0.0",
@@ -3203,22 +3112,19 @@
           "version": "0.2.0",
           "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
           "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
           "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "1.0.34",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.1",
@@ -3231,7 +3137,6 @@
           "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
           "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
           "dev": true,
-          "optional": true,
           "requires": {
             "readable-stream": ">=1.0.33-1 <1.1.0-0",
             "xtend": ">=4.0.0 <4.1.0-0"
@@ -3242,7 +3147,6 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^0.2.0",
             "clone-stats": "^0.0.1"
@@ -3255,7 +3159,6 @@
       "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-3.1.0.tgz",
       "integrity": "sha1-iyOTVoE1X58YnYclag+L3ZbZZm0=",
       "dev": true,
-      "optional": true,
       "requires": {
         "is-bzip2": "^1.0.0",
         "object-assign": "^2.0.0",
@@ -3270,22 +3173,19 @@
           "version": "0.2.0",
           "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
           "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
           "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "1.0.34",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.1",
@@ -3298,7 +3198,6 @@
           "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
           "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
           "dev": true,
-          "optional": true,
           "requires": {
             "readable-stream": ">=1.0.33-1 <1.1.0-0",
             "xtend": ">=4.0.0 <4.1.0-0"
@@ -3309,7 +3208,6 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^0.2.0",
             "clone-stats": "^0.0.1"
@@ -3322,7 +3220,6 @@
       "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-3.1.0.tgz",
       "integrity": "sha1-ssE9+YFmJomRtxXWRH9kLpaW9aA=",
       "dev": true,
-      "optional": true,
       "requires": {
         "is-gzip": "^1.0.0",
         "object-assign": "^2.0.0",
@@ -3336,22 +3233,19 @@
           "version": "0.2.0",
           "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
           "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
           "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "1.0.34",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.1",
@@ -3364,7 +3258,6 @@
           "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
           "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
           "dev": true,
-          "optional": true,
           "requires": {
             "readable-stream": ">=1.0.33-1 <1.1.0-0",
             "xtend": ">=4.0.0 <4.1.0-0"
@@ -3375,7 +3268,6 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^0.2.0",
             "clone-stats": "^0.0.1"
@@ -3388,7 +3280,6 @@
       "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-3.4.0.tgz",
       "integrity": "sha1-YUdbQVIGa74/7hL51inRX+ZHjus=",
       "dev": true,
-      "optional": true,
       "requires": {
         "is-zip": "^1.0.0",
         "read-all-stream": "^3.0.0",
@@ -3404,7 +3295,6 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -3417,8 +3307,7 @@
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
       "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "deep-is": {
       "version": "0.1.3",
@@ -3525,12 +3414,6 @@
       "integrity": "sha1-+cmvVGSvoeepcUWKi97yqpTVuxk=",
       "dev": true
     },
-    "destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
-      "dev": true
-    },
     "detect-file": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
@@ -3637,7 +3520,6 @@
       "resolved": "https://registry.npmjs.org/download/-/download-4.4.3.tgz",
       "integrity": "sha1-qlX9rTktldS2jowr4D4MKqIbqaw=",
       "dev": true,
-      "optional": true,
       "requires": {
         "caw": "^1.0.1",
         "concat-stream": "^1.4.7",
@@ -3661,7 +3543,6 @@
           "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
           "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
           "dev": true,
-          "optional": true,
           "requires": {
             "arr-flatten": "^1.0.1"
           }
@@ -3670,15 +3551,13 @@
           "version": "0.2.1",
           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
           "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "braces": {
           "version": "1.8.5",
           "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
           "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
           "dev": true,
-          "optional": true,
           "requires": {
             "expand-range": "^1.8.1",
             "preserve": "^0.2.0",
@@ -3690,7 +3569,6 @@
           "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
           "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-posix-bracket": "^0.1.0"
           }
@@ -3700,7 +3578,6 @@
           "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
           "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -3710,7 +3587,6 @@
           "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
           "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
           "dev": true,
-          "optional": true,
           "requires": {
             "inflight": "^1.0.4",
             "inherits": "2",
@@ -3724,7 +3600,6 @@
           "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz",
           "integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=",
           "dev": true,
-          "optional": true,
           "requires": {
             "extend": "^3.0.0",
             "glob": "^5.0.3",
@@ -3740,15 +3615,13 @@
               "version": "0.0.1",
               "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
               "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "readable-stream": {
               "version": "1.0.34",
               "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
               "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
               "dev": true,
-              "optional": true,
               "requires": {
                 "core-util-is": "~1.0.0",
                 "inherits": "~2.0.1",
@@ -3760,15 +3633,13 @@
               "version": "0.10.31",
               "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
               "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "through2": {
               "version": "0.6.5",
               "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
               "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
               "dev": true,
-              "optional": true,
               "requires": {
                 "readable-stream": ">=1.0.33-1 <1.1.0-0",
                 "xtend": ">=4.0.0 <4.1.0-0"
@@ -3780,22 +3651,19 @@
           "version": "4.1.15",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
           "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "is-extglob": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
           "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "is-glob": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
           "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -3804,15 +3672,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -3822,7 +3688,6 @@
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
           "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
           "dev": true,
-          "optional": true,
           "requires": {
             "arr-diff": "^2.0.0",
             "array-unique": "^0.2.1",
@@ -3843,15 +3708,13 @@
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ordered-read-streams": {
           "version": "0.3.0",
           "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz",
           "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-stream": "^1.0.1",
             "readable-stream": "^2.0.1"
@@ -3862,7 +3725,6 @@
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -3878,7 +3740,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -3888,7 +3749,6 @@
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
           "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-utf8": "^0.2.0"
           }
@@ -3898,7 +3758,6 @@
           "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz",
           "integrity": "sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=",
           "dev": true,
-          "optional": true,
           "requires": {
             "first-chunk-stream": "^1.0.0",
             "strip-bom": "^2.0.0"
@@ -3909,7 +3768,6 @@
           "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
           "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
           "dev": true,
-          "optional": true,
           "requires": {
             "json-stable-stringify-without-jsonify": "^1.0.1",
             "through2-filter": "^3.0.0"
@@ -3920,7 +3778,6 @@
               "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
               "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
               "dev": true,
-              "optional": true,
               "requires": {
                 "through2": "~2.0.0",
                 "xtend": "~4.0.0"
@@ -3933,7 +3790,6 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -3945,7 +3801,6 @@
           "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz",
           "integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=",
           "dev": true,
-          "optional": true,
           "requires": {
             "duplexify": "^3.2.0",
             "glob-stream": "^5.3.2",
@@ -3968,12 +3823,6 @@
         }
       }
     },
-    "duplexer": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
-      "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
-      "dev": true
-    },
     "duplexer2": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
@@ -3988,7 +3837,6 @@
       "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.1.tgz",
       "integrity": "sha512-vM58DwdnKmty+FSPzT14K9JXb90H+j5emaR4KYbr2KTIz00WHGbWOe5ghQTx233ZCLZtrGDALzKwcjEtSt35mA==",
       "dev": true,
-      "optional": true,
       "requires": {
         "end-of-stream": "^1.0.0",
         "inherits": "^2.0.1",
@@ -4001,7 +3849,6 @@
           "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
           "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
           "dev": true,
-          "optional": true,
           "requires": {
             "once": "^1.4.0"
           }
@@ -4010,15 +3857,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "once": {
           "version": "1.4.0",
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -4028,7 +3873,6 @@
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -4044,7 +3888,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -4056,7 +3899,6 @@
       "resolved": "https://registry.npmjs.org/each-async/-/each-async-1.1.1.tgz",
       "integrity": "sha1-3uUim98KtrogEqOV4bhpq/iBNHM=",
       "dev": true,
-      "optional": true,
       "requires": {
         "onetime": "^1.0.0",
         "set-immediate-shim": "^1.0.0"
@@ -4066,8 +3908,7 @@
           "version": "1.1.0",
           "resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
           "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -4241,16 +4082,6 @@
         "prr": "~1.0.1"
       }
     },
-    "error": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/error/-/error-7.0.2.tgz",
-      "integrity": "sha1-pfdf/02ZJhJt2sDqXcOOaJFTywI=",
-      "dev": true,
-      "requires": {
-        "string-template": "~0.2.1",
-        "xtend": "~4.0.0"
-      }
-    },
     "error-ex": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
@@ -4547,12 +4378,6 @@
       "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
       "dev": true
     },
-    "etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
-      "dev": true
-    },
     "event-emitter": {
       "version": "0.3.5",
       "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
@@ -4563,21 +4388,6 @@
         "es5-ext": "~0.10.14"
       }
     },
-    "event-stream": {
-      "version": "3.3.5",
-      "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.5.tgz",
-      "integrity": "sha512-vyibDcu5JL20Me1fP734QBH/kenBGLZap2n0+XXM7mvuUPzJ20Ydqj1aKcIeMdri1p+PU+4yAKugjN8KCVst+g==",
-      "dev": true,
-      "requires": {
-        "duplexer": "^0.1.1",
-        "from": "^0.1.7",
-        "map-stream": "0.0.7",
-        "pause-stream": "^0.0.11",
-        "split": "^1.0.1",
-        "stream-combiner": "^0.2.2",
-        "through": "^2.3.8"
-      }
-    },
     "eventemitter3": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz",
@@ -4796,7 +4606,7 @@
         "fill-range": {
           "version": "2.2.4",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
-          "integrity": "sha1-6x53OrsFbc2N8r/favWbizqTZWU=",
+          "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
           "dev": true,
           "requires": {
             "is-number": "^2.1.0",
@@ -5036,21 +4846,11 @@
       "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
       "dev": true
     },
-    "faye-websocket": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
-      "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
-      "dev": true,
-      "requires": {
-        "websocket-driver": ">=0.5.1"
-      }
-    },
     "fd-slicer": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
       "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
       "dev": true,
-      "optional": true,
       "requires": {
         "pend": "~1.2.0"
       }
@@ -5098,15 +4898,13 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-1.0.0.tgz",
       "integrity": "sha1-5hz4BfDeHJhFZ9A4bcXfUO5a9+Q=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "filenamify": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-1.2.1.tgz",
       "integrity": "sha1-qfL/0RxQO+0wABUCknI3jx8TZaU=",
       "dev": true,
-      "optional": true,
       "requires": {
         "filename-reserved-regex": "^1.0.0",
         "strip-outer": "^1.0.0",
@@ -5331,18 +5129,6 @@
         "map-cache": "^0.2.2"
       }
     },
-    "fresh": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
-      "dev": true
-    },
-    "from": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
-      "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=",
-      "dev": true
-    },
     "fs": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/fs/-/fs-0.0.2.tgz",
@@ -5353,8 +5139,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
       "integrity": "sha1-a+Dem+mYzhavivwkSXue6bfM2a0=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "fs-extra": {
       "version": "1.0.0",
@@ -5418,8 +5203,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -5440,14 +5224,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"
@@ -5462,20 +5244,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",
@@ -5592,8 +5371,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5605,7 +5383,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5620,7 +5397,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -5628,14 +5404,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"
@@ -5654,7 +5428,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5735,8 +5508,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5748,7 +5520,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5834,8 +5605,7 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5871,7 +5641,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",
@@ -5891,7 +5660,6 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5935,14 +5703,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
         }
       }
     },
@@ -5978,7 +5744,6 @@
       "resolved": "https://registry.npmjs.org/get-proxy/-/get-proxy-1.1.0.tgz",
       "integrity": "sha1-iUhUSRvFkbDxR9euVw9cZ4tyVus=",
       "dev": true,
-      "optional": true,
       "requires": {
         "rc": "^1.1.2"
       }
@@ -6285,7 +6050,6 @@
       "resolved": "http://registry.npmjs.org/got/-/got-5.7.1.tgz",
       "integrity": "sha1-X4FjWmHkplifGAVp6k44FoClHzU=",
       "dev": true,
-      "optional": true,
       "requires": {
         "create-error-class": "^3.0.1",
         "duplexer2": "^0.1.4",
@@ -6309,7 +6073,6 @@
           "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
           "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
           "dev": true,
-          "optional": true,
           "requires": {
             "readable-stream": "^2.0.2"
           }
@@ -6318,22 +6081,19 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "parse-json": {
           "version": "2.2.0",
           "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
           "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
           "dev": true,
-          "optional": true,
           "requires": {
             "error-ex": "^1.2.0"
           }
@@ -6343,7 +6103,6 @@
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -6359,7 +6118,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -6379,8 +6137,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
       "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "growly": {
       "version": "1.3.0",
@@ -6667,37 +6424,11 @@
         }
       }
     },
-    "gulp-connect": {
-      "version": "5.6.1",
-      "resolved": "https://registry.npmjs.org/gulp-connect/-/gulp-connect-5.6.1.tgz",
-      "integrity": "sha512-FknHeA6smZhiRNrK/3UVH8BHLCFHS7WZdE7Y2VbZHtxye1UTIa5ZY0Cnst6O9n3kL8z7y43QI+acx3nUtJoiHw==",
-      "dev": true,
-      "requires": {
-        "ansi-colors": "^2.0.5",
-        "connect": "^3.6.6",
-        "connect-livereload": "^0.6.0",
-        "event-stream": "^3.3.4",
-        "fancy-log": "^1.3.2",
-        "send": "^0.16.2",
-        "serve-index": "^1.9.1",
-        "serve-static": "^1.13.2",
-        "tiny-lr": "^1.1.1"
-      },
-      "dependencies": {
-        "ansi-colors": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-2.0.5.tgz",
-          "integrity": "sha512-yAdfUZ+c2wetVNIFsNRn44THW+Lty6S5TwMpUfLA/UaGhiXbBv/F8E60/1hMLd0cnF/CDoWH8vzVaI5bAcHCjw==",
-          "dev": true
-        }
-      }
-    },
     "gulp-decompress": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/gulp-decompress/-/gulp-decompress-1.2.0.tgz",
       "integrity": "sha1-jutlpeAV+O2FMsr+KEVJYGJvDcc=",
       "dev": true,
-      "optional": true,
       "requires": {
         "archive-type": "^3.0.0",
         "decompress": "^3.0.0",
@@ -6709,15 +6440,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -6733,7 +6462,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -6901,315 +6629,6 @@
         }
       }
     },
-    "gulp-ngdocs": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/gulp-ngdocs/-/gulp-ngdocs-0.3.0.tgz",
-      "integrity": "sha1-J7Z6Ql6zh1ImNFq4lgTXN/Y1fCE=",
-      "dev": true,
-      "requires": {
-        "angular": "~1.3.1",
-        "angular-animate": "~1.3.1",
-        "canonical-path": "0.0.2",
-        "extend": "1.3.0",
-        "gulp-util": "3.0.0",
-        "lodash": "2.4.1",
-        "marked": "0.3.2",
-        "merge-stream": "0.1.5",
-        "path": "0.4.9",
-        "string_decoder": "0.10.31",
-        "through2": "0.6.1",
-        "vinyl-fs": "0.3.7"
-      },
-      "dependencies": {
-        "angular": {
-          "version": "1.3.20",
-          "resolved": "http://registry.npmjs.org/angular/-/angular-1.3.20.tgz",
-          "integrity": "sha1-sjo9fF5/mffZW5tNSbmsNVJpuu4=",
-          "dev": true
-        },
-        "angular-animate": {
-          "version": "1.3.20",
-          "resolved": "http://registry.npmjs.org/angular-animate/-/angular-animate-1.3.20.tgz",
-          "integrity": "sha1-0XB8cn+K0N8hxKLewgzX/ElFtSo=",
-          "dev": true
-        },
-        "ansi-regex": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
-          "integrity": "sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz",
-          "integrity": "sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
-          "integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^1.1.0",
-            "escape-string-regexp": "^1.0.0",
-            "has-ansi": "^0.1.0",
-            "strip-ansi": "^0.3.0",
-            "supports-color": "^0.2.0"
-          }
-        },
-        "clone": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
-          "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-          "dev": true
-        },
-        "dateformat": {
-          "version": "1.0.12",
-          "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
-          "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=",
-          "dev": true,
-          "requires": {
-            "get-stdin": "^4.0.1",
-            "meow": "^3.3.0"
-          }
-        },
-        "extend": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/extend/-/extend-1.3.0.tgz",
-          "integrity": "sha1-0VFvsP9WJNLr+RI+odrFoZlABPg=",
-          "dev": true
-        },
-        "gulp-util": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.0.tgz",
-          "integrity": "sha1-b+7cR9aXKCO6zplH/F9GvYo0Zuc=",
-          "dev": true,
-          "requires": {
-            "chalk": "^0.5.0",
-            "dateformat": "^1.0.7-1.2.3",
-            "lodash": "^2.4.1",
-            "lodash._reinterpolate": "^2.4.1",
-            "lodash.template": "^2.4.1",
-            "minimist": "^0.2.0",
-            "multipipe": "^0.1.0",
-            "through2": "^0.5.0",
-            "vinyl": "^0.2.1"
-          },
-          "dependencies": {
-            "through2": {
-              "version": "0.5.1",
-              "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
-              "integrity": "sha1-390BLrnHAOIyP9M084rGIqs3Lac=",
-              "dev": true,
-              "requires": {
-                "readable-stream": "~1.0.17",
-                "xtend": "~3.0.0"
-              }
-            }
-          }
-        },
-        "has-ansi": {
-          "version": "0.1.0",
-          "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
-          "integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^0.2.0"
-          }
-        },
-        "lodash": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz",
-          "integrity": "sha1-W3cjA03aTSYuWkb7LFjXzCL3FCA=",
-          "dev": true
-        },
-        "lodash._reinterpolate": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz",
-          "integrity": "sha1-TxInqlqHEfxjL1sHofRgequLMiI=",
-          "dev": true
-        },
-        "lodash.defaults": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
-          "integrity": "sha1-p+iIXwXmiFEUS24SqPNngCa8TFQ=",
-          "dev": true,
-          "requires": {
-            "lodash._objecttypes": "~2.4.1",
-            "lodash.keys": "~2.4.1"
-          }
-        },
-        "lodash.escape": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-2.4.1.tgz",
-          "integrity": "sha1-LOEsXghNsKV92l5dHu659dF1o7Q=",
-          "dev": true,
-          "requires": {
-            "lodash._escapehtmlchar": "~2.4.1",
-            "lodash._reunescapedhtml": "~2.4.1",
-            "lodash.keys": "~2.4.1"
-          }
-        },
-        "lodash.keys": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
-          "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=",
-          "dev": true,
-          "requires": {
-            "lodash._isnative": "~2.4.1",
-            "lodash._shimkeys": "~2.4.1",
-            "lodash.isobject": "~2.4.1"
-          }
-        },
-        "lodash.template": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-2.4.1.tgz",
-          "integrity": "sha1-nmEQB+32KRKal0qzxIuBez4c8g0=",
-          "dev": true,
-          "requires": {
-            "lodash._escapestringchar": "~2.4.1",
-            "lodash._reinterpolate": "~2.4.1",
-            "lodash.defaults": "~2.4.1",
-            "lodash.escape": "~2.4.1",
-            "lodash.keys": "~2.4.1",
-            "lodash.templatesettings": "~2.4.1",
-            "lodash.values": "~2.4.1"
-          }
-        },
-        "lodash.templatesettings": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz",
-          "integrity": "sha1-6nbHXRHrhtTb6JqDiTu4YZKaxpk=",
-          "dev": true,
-          "requires": {
-            "lodash._reinterpolate": "~2.4.1",
-            "lodash.escape": "~2.4.1"
-          }
-        },
-        "marked": {
-          "version": "0.3.2",
-          "resolved": "http://registry.npmjs.org/marked/-/marked-0.3.2.tgz",
-          "integrity": "sha1-AV2xWIZEOPJKZL3WGgQotBhwbQk=",
-          "dev": true
-        },
-        "merge-stream": {
-          "version": "0.1.5",
-          "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-0.1.5.tgz",
-          "integrity": "sha1-5oIPet267gA/SMpKWMfFolPV4Fw=",
-          "dev": true,
-          "requires": {
-            "through2": "^0.5.1"
-          },
-          "dependencies": {
-            "through2": {
-              "version": "0.5.1",
-              "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
-              "integrity": "sha1-390BLrnHAOIyP9M084rGIqs3Lac=",
-              "dev": true,
-              "requires": {
-                "readable-stream": "~1.0.17",
-                "xtend": "~3.0.0"
-              }
-            }
-          }
-        },
-        "minimist": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz",
-          "integrity": "sha1-Tf/lJdriuGTGbC4jxicdev3s784=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
-          }
-        },
-        "strip-ansi": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
-          "integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^0.2.1"
-          }
-        },
-        "supports-color": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz",
-          "integrity": "sha1-2S3iaU6z9nMjlz1649i1W0wiGQo=",
-          "dev": true
-        },
-        "through2": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.1.tgz",
-          "integrity": "sha1-90KzKJPovSYUbnieT9LMssB6cX4=",
-          "dev": true,
-          "requires": {
-            "readable-stream": ">=1.0.27-1 <1.1.0-0",
-            "xtend": ">=4.0.0 <4.1.0-0"
-          },
-          "dependencies": {
-            "xtend": {
-              "version": "4.0.1",
-              "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-              "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-              "dev": true
-            }
-          }
-        },
-        "vinyl": {
-          "version": "0.2.3",
-          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.2.3.tgz",
-          "integrity": "sha1-vKk4IJWC7FpJrVOKAPofEl5RMlI=",
-          "dev": true,
-          "requires": {
-            "clone-stats": "~0.0.1"
-          }
-        },
-        "vinyl-fs": {
-          "version": "0.3.7",
-          "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.7.tgz",
-          "integrity": "sha1-LiXP5t9cgIGPl/9Be/XCGkHkpJs=",
-          "dev": true,
-          "requires": {
-            "glob-stream": "^3.1.5",
-            "glob-watcher": "^0.0.6",
-            "graceful-fs": "^3.0.0",
-            "lodash": "^2.4.1",
-            "mkdirp": "^0.5.0",
-            "strip-bom": "^1.0.0",
-            "through2": "^0.6.1",
-            "vinyl": "^0.4.0"
-          },
-          "dependencies": {
-            "vinyl": {
-              "version": "0.4.6",
-              "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
-              "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
-              "dev": true,
-              "requires": {
-                "clone": "^0.2.0",
-                "clone-stats": "^0.0.1"
-              }
-            }
-          }
-        },
-        "xtend": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
-          "integrity": "sha1-XM50B7r2Qsunvs2laBEcST9ZZlo=",
-          "dev": true
-        }
-      }
-    },
     "gulp-notify": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/gulp-notify/-/gulp-notify-3.2.0.tgz",
@@ -7306,18 +6725,6 @@
         }
       }
     },
-    "gulp-open": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/gulp-open/-/gulp-open-3.0.1.tgz",
-      "integrity": "sha512-dohokw+npnt48AsD0hhvCLEHLnDMqM35F+amvIfJlX1H2nNHYUClR0Oy1rI0TvbL1/pHiHGNLmohhk+kvwIKjA==",
-      "dev": true,
-      "requires": {
-        "colors": "^1.1.2",
-        "opn": "5.2.0",
-        "plugin-log": "^0.1.0",
-        "through2": "^2.0.1"
-      }
-    },
     "gulp-postcss": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/gulp-postcss/-/gulp-postcss-8.0.0.tgz",
@@ -7351,7 +6758,6 @@
       "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz",
       "integrity": "sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=",
       "dev": true,
-      "optional": true,
       "requires": {
         "convert-source-map": "^1.1.1",
         "graceful-fs": "^4.1.2",
@@ -7364,15 +6770,13 @@
           "version": "4.1.15",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
           "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "strip-bom": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
           "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-utf8": "^0.2.0"
           }
@@ -7382,7 +6786,6 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -7895,12 +7298,6 @@
         }
       }
     },
-    "http-parser-js": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.0.tgz",
-      "integrity": "sha512-cZdEF7r4gfRIq7ezX9J0T+kQmJNOub71dWbgAXVHDct80TKP4MCETtZQ31xyv38UwgzkWPYF/Xc0ge55dW9Z9w==",
-      "dev": true
-    },
     "http-proxy": {
       "version": "1.17.0",
       "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz",
@@ -8265,8 +7662,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-bzip2/-/is-bzip2-1.0.0.tgz",
       "integrity": "sha1-XuWOqlounIDiFAe+3yOuWsCRs/w=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-callable": {
       "version": "1.1.4",
@@ -8401,8 +7797,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-gzip/-/is-gzip-1.0.0.tgz",
       "integrity": "sha1-bKiwe5nHeZgCWQDlVc7Y7YCHmoM=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-jpg": {
       "version": "1.0.1",
@@ -8415,8 +7810,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-2.1.1.tgz",
       "integrity": "sha1-fUxXKDd+84bD4ZSpkRv1fG3DNec=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-number": {
       "version": "3.0.0",
@@ -8482,8 +7876,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
       "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-regex": {
       "version": "1.0.4",
@@ -8513,8 +7906,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
       "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-stream": {
       "version": "1.1.0",
@@ -8544,8 +7936,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-tar/-/is-tar-1.0.0.tgz",
       "integrity": "sha1-L2suF5LB9bs2UZrKqdZcDSb+hT0=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-typedarray": {
       "version": "1.0.0",
@@ -8566,8 +7957,7 @@
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz",
       "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-utf8": {
       "version": "0.2.1",
@@ -8579,8 +7969,7 @@
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz",
       "integrity": "sha1-1LVcafUYhvm2XHDWwmItN+KfSP4=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-windows": {
       "version": "1.0.2",
@@ -8588,18 +7977,11 @@
       "integrity": "sha1-0YUOuXkezRjmGCzhKjDzlmNLsZ0=",
       "dev": true
     },
-    "is-wsl": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
-      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
-      "dev": true
-    },
     "is-zip": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-zip/-/is-zip-1.0.0.tgz",
       "integrity": "sha1-R7Co/004p2QxzP2ZqOFaTIa6IyU=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "isarray": {
       "version": "0.0.1",
@@ -8939,7 +8321,6 @@
       "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
       "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
       "dev": true,
-      "optional": true,
       "requires": {
         "readable-stream": "^2.0.5"
       },
@@ -8948,15 +8329,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -8972,7 +8351,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -9053,12 +8431,6 @@
         "resolve": "^1.1.7"
       }
     },
-    "livereload-js": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/livereload-js/-/livereload-js-2.4.0.tgz",
-      "integrity": "sha512-XPQH8Z2GDP/Hwz2PCDrh2mth4yFejwA1OZ/81Ti3LgKyhDcEjsSsqFWZojHG0va/duGd+WyosY7eXLDoOyqcPw==",
-      "dev": true
-    },
     "load-json-file": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
@@ -9128,51 +8500,18 @@
       "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=",
       "dev": true
     },
-    "lodash._escapehtmlchar": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz",
-      "integrity": "sha1-32fDu2t+jh6DGrSL+geVuSr+iZ0=",
-      "dev": true,
-      "requires": {
-        "lodash._htmlescapes": "~2.4.1"
-      }
-    },
-    "lodash._escapestringchar": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz",
-      "integrity": "sha1-7P4iYYoq3lC/7qQ5N+Ud9m8O23I=",
-      "dev": true
-    },
     "lodash._getnative": {
       "version": "3.9.1",
       "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
       "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
       "dev": true
     },
-    "lodash._htmlescapes": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz",
-      "integrity": "sha1-MtFL8IRLbeb4tioFG09nwii2JMs=",
-      "dev": true
-    },
     "lodash._isiterateecall": {
       "version": "3.0.9",
       "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
       "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
       "dev": true
     },
-    "lodash._isnative": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz",
-      "integrity": "sha1-PqZAS3hKe+g2x7V1gOHN95sUgyw=",
-      "dev": true
-    },
-    "lodash._objecttypes": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz",
-      "integrity": "sha1-fAt/admKH3ZSn4kLDNsbTf7BHBE=",
-      "dev": true
-    },
     "lodash._reescape": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
@@ -9191,44 +8530,12 @@
       "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
       "dev": true
     },
-    "lodash._reunescapedhtml": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz",
-      "integrity": "sha1-dHxPxAED6zu4oJduVx96JlnpO6c=",
-      "dev": true,
-      "requires": {
-        "lodash._htmlescapes": "~2.4.1",
-        "lodash.keys": "~2.4.1"
-      },
-      "dependencies": {
-        "lodash.keys": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
-          "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=",
-          "dev": true,
-          "requires": {
-            "lodash._isnative": "~2.4.1",
-            "lodash._shimkeys": "~2.4.1",
-            "lodash.isobject": "~2.4.1"
-          }
-        }
-      }
-    },
     "lodash._root": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
       "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=",
       "dev": true
     },
-    "lodash._shimkeys": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz",
-      "integrity": "sha1-bpzJZm/wgfC1psl4uD4kLmlJ0gM=",
-      "dev": true,
-      "requires": {
-        "lodash._objecttypes": "~2.4.1"
-      }
-    },
     "lodash.clone": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.5.0.tgz",
@@ -9278,17 +8585,7 @@
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
       "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=",
-      "dev": true,
-      "optional": true
-    },
-    "lodash.isobject": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
-      "integrity": "sha1-Wi5H/mmVPx7mMafrof5k0tBlWPU=",
-      "dev": true,
-      "requires": {
-        "lodash._objecttypes": "~2.4.1"
-      }
+      "dev": true
     },
     "lodash.keys": {
       "version": "3.1.2",
@@ -9364,28 +8661,6 @@
       "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
       "dev": true
     },
-    "lodash.values": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash.values/-/lodash.values-2.4.1.tgz",
-      "integrity": "sha1-q/UUQ2s8twUAFieXjLzzCxKA7qQ=",
-      "dev": true,
-      "requires": {
-        "lodash.keys": "~2.4.1"
-      },
-      "dependencies": {
-        "lodash.keys": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
-          "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=",
-          "dev": true,
-          "requires": {
-            "lodash._isnative": "~2.4.1",
-            "lodash._shimkeys": "~2.4.1",
-            "lodash.isobject": "~2.4.1"
-          }
-        }
-      }
-    },
     "log4js": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/log4js/-/log4js-3.0.6.tgz",
@@ -9476,8 +8751,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
       "integrity": "sha1-b54wtHCE2XGnyCD/FabFFnt0wm8=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "lpad-align": {
       "version": "1.1.2",
@@ -9545,12 +8819,6 @@
       "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
       "dev": true
     },
-    "map-stream": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz",
-      "integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=",
-      "dev": true
-    },
     "map-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
@@ -9704,7 +8972,8 @@
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
       "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "mime-db": {
       "version": "1.37.0",
@@ -9913,8 +9182,7 @@
       "version": "1.0.0",
       "resolved": "http://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz",
       "integrity": "sha1-WuVUHQJGRdMqWPzdyc7s6nrjrC8=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "node.extend": {
       "version": "1.1.8",
@@ -12856,15 +12124,6 @@
         "mimic-fn": "^1.0.0"
       }
     },
-    "opn": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/opn/-/opn-5.2.0.tgz",
-      "integrity": "sha512-Jd/GpzPyHF4P2/aNOVmS3lfMSWV9J7cOhCG1s08XCEAsPkB7lp6ddiU0J7XzyQRDUh8BqJ7PchfINjR8jyofRQ==",
-      "dev": true,
-      "requires": {
-        "is-wsl": "^1.1.0"
-      }
-    },
     "optimist": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
@@ -12964,8 +12223,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
       "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "p-pipe": {
       "version": "1.2.0",
@@ -13065,12 +12323,6 @@
       "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
       "dev": true
     },
-    "path": {
-      "version": "0.4.9",
-      "resolved": "https://registry.npmjs.org/path/-/path-0.4.9.tgz",
-      "integrity": "sha1-OAxo0BJz5D+TaNetUP7l4+jUd/A=",
-      "dev": true
-    },
     "path-dirname": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
@@ -13125,15 +12377,6 @@
       "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=",
       "dev": true
     },
-    "pause-stream": {
-      "version": "0.0.11",
-      "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
-      "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
-      "dev": true,
-      "requires": {
-        "through": "~2.3"
-      }
-    },
     "pend": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
@@ -13210,53 +12453,6 @@
         "extend-shallow": "^3.0.2"
       }
     },
-    "plugin-log": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/plugin-log/-/plugin-log-0.1.0.tgz",
-      "integrity": "sha1-hgSc9qsQgzOYqTHzaJy67nteEzM=",
-      "dev": true,
-      "requires": {
-        "chalk": "^1.1.1",
-        "dateformat": "^1.0.11"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "dateformat": {
-          "version": "1.0.12",
-          "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
-          "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=",
-          "dev": true,
-          "requires": {
-            "get-stdin": "^4.0.1",
-            "meow": "^3.3.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        }
-      }
-    },
     "plur": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/plur/-/plur-2.1.2.tgz",
@@ -13676,8 +12872,7 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
       "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "preserve": {
       "version": "0.2.0",
@@ -13763,12 +12958,6 @@
       "integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==",
       "dev": true
     },
-    "qs": {
-      "version": "6.6.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.6.0.tgz",
-      "integrity": "sha512-KIJqT9jQJDQx5h5uAVPimw6yVg2SekOKu959OCtktD3FjzbpvaPr8i4zzg07DOMz+igA4W/aNM7OV8H37pFYfA==",
-      "dev": true
-    },
     "randomatic": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
@@ -13794,22 +12983,11 @@
       "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=",
       "dev": true
     },
-    "raw-body": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-1.1.7.tgz",
-      "integrity": "sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU=",
-      "dev": true,
-      "requires": {
-        "bytes": "1",
-        "string_decoder": "0.10"
-      }
-    },
     "rc": {
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
       "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
       "dev": true,
-      "optional": true,
       "requires": {
         "deep-extend": "^0.6.0",
         "ini": "~1.3.0",
@@ -13822,7 +13000,6 @@
       "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz",
       "integrity": "sha1-NcPhd/IHjveJ7kv6+kNzB06u9Po=",
       "dev": true,
-      "optional": true,
       "requires": {
         "pinkie-promise": "^2.0.0",
         "readable-stream": "^2.0.0"
@@ -13832,15 +13009,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -13856,7 +13031,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -14441,12 +13615,6 @@
       "integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0=",
       "dev": true
     },
-    "safe-json-parse": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/safe-json-parse/-/safe-json-parse-1.0.1.tgz",
-      "integrity": "sha1-PnZyPjjf3aE8mx0poeB//uSzC1c=",
-      "dev": true
-    },
     "safe-regex": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
@@ -14473,7 +13641,6 @@
       "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz",
       "integrity": "sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=",
       "dev": true,
-      "optional": true,
       "requires": {
         "commander": "~2.8.1"
       }
@@ -14515,100 +13682,12 @@
         "semver": "^5.3.0"
       }
     },
-    "send": {
-      "version": "0.16.2",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
-      "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
-      "dev": true,
-      "requires": {
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "~1.6.2",
-        "mime": "1.4.1",
-        "ms": "2.0.0",
-        "on-finished": "~2.3.0",
-        "range-parser": "~1.2.0",
-        "statuses": "~1.4.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        },
-        "statuses": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
-          "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==",
-          "dev": true
-        }
-      }
-    },
     "sequencify": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz",
       "integrity": "sha1-kM/xnQLgcCf9dn9erT57ldHnOAw=",
       "dev": true
     },
-    "serve-index": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
-      "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
-      "dev": true,
-      "requires": {
-        "accepts": "~1.3.4",
-        "batch": "0.6.1",
-        "debug": "2.6.9",
-        "escape-html": "~1.0.3",
-        "http-errors": "~1.6.2",
-        "mime-types": "~2.1.17",
-        "parseurl": "~1.3.2"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        }
-      }
-    },
-    "serve-static": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz",
-      "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==",
-      "dev": true,
-      "requires": {
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "parseurl": "~1.3.2",
-        "send": "0.16.2"
-      }
-    },
     "set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
@@ -14619,8 +13698,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
       "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "set-value": {
       "version": "2.0.0",
@@ -15026,15 +14104,6 @@
       "resolved": "https://registry.npmjs.org/spectrum-colorpicker/-/spectrum-colorpicker-1.8.0.tgz",
       "integrity": "sha1-uSbPUALAp3hgtfg1HhwJPGUgAQc="
     },
-    "split": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
-      "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
-      "dev": true,
-      "requires": {
-        "through": "2"
-      }
-    },
     "split-string": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
@@ -15125,8 +14194,7 @@
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-0.2.2.tgz",
       "integrity": "sha1-5sgLYjEj19gM8TLOU480YokHJQI=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "static-extend": {
       "version": "0.1.2",
@@ -15155,22 +14223,11 @@
       "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
       "dev": true
     },
-    "stream-combiner": {
-      "version": "0.2.2",
-      "resolved": "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.2.2.tgz",
-      "integrity": "sha1-rsjLrBd7Vrb0+kec7YwZEs7lKFg=",
-      "dev": true,
-      "requires": {
-        "duplexer": "~0.1.1",
-        "through": "~2.3.4"
-      }
-    },
     "stream-combiner2": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz",
       "integrity": "sha1-+02KFCDqNidk4hrUeAOXvry0HL4=",
       "dev": true,
-      "optional": true,
       "requires": {
         "duplexer2": "~0.1.0",
         "readable-stream": "^2.0.2"
@@ -15181,7 +14238,6 @@
           "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
           "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
           "dev": true,
-          "optional": true,
           "requires": {
             "readable-stream": "^2.0.2"
           }
@@ -15190,15 +14246,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -15214,7 +14268,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -15224,20 +14277,19 @@
     "stream-consume": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.1.tgz",
-      "integrity": "sha512-tNa3hzgkjEP7XbCkbRXe1jpg+ievoa0O4SCFlMOYEscGSS4JJsckGL8swUyAa/ApGU3Ae4t6Honor4HhL+tRyg==",
+      "integrity": "sha1-0721mMK9CugrjKx6xQsRB6eZbEg=",
       "dev": true
     },
     "stream-shift": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
       "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "streamroller": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-0.7.0.tgz",
-      "integrity": "sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==",
+      "integrity": "sha1-odG3z4PTmvsNYwSaWsv5NJO99ks=",
       "dev": true,
       "requires": {
         "date-format": "^1.2.0",
@@ -15264,7 +14316,7 @@
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+          "integrity": "sha1-sRwn2IuP8fvgcGQ8+UsMea4bCq8=",
           "dev": true,
           "requires": {
             "core-util-is": "~1.0.0",
@@ -15279,7 +14331,7 @@
         "string_decoder": {
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=",
           "dev": true,
           "requires": {
             "safe-buffer": "~5.1.0"
@@ -15287,12 +14339,6 @@
         }
       }
     },
-    "string-template": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz",
-      "integrity": "sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=",
-      "dev": true
-    },
     "string-width": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
@@ -15410,7 +14456,6 @@
       "resolved": "http://registry.npmjs.org/strip-dirs/-/strip-dirs-1.1.1.tgz",
       "integrity": "sha1-lgu9EoeETzl1pFWKoQOoJV4kVqA=",
       "dev": true,
-      "optional": true,
       "requires": {
         "chalk": "^1.0.0",
         "get-stdin": "^4.0.1",
@@ -15424,15 +14469,13 @@
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "chalk": {
           "version": "1.1.3",
           "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-styles": "^2.2.1",
             "escape-string-regexp": "^1.0.2",
@@ -15446,7 +14489,6 @@
           "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz",
           "integrity": "sha1-hHSREZ/MtftDYhfMc39/qtUPYD8=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-relative": "^0.1.0"
           }
@@ -15455,15 +14497,13 @@
           "version": "0.1.3",
           "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz",
           "integrity": "sha1-kF/uiuhvRbPsYUvDwVyGnfCHboI=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "supports-color": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
           "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -15494,7 +14534,6 @@
       "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz",
       "integrity": "sha1-sv0qv2YEudHmATBXGV34Nrip1jE=",
       "dev": true,
-      "optional": true,
       "requires": {
         "escape-string-regexp": "^1.0.2"
       }
@@ -15528,7 +14567,6 @@
       "resolved": "https://registry.npmjs.org/sum-up/-/sum-up-1.0.3.tgz",
       "integrity": "sha1-HGYfZnBX9jvLeHWqFDi8FiUlFW4=",
       "dev": true,
-      "optional": true,
       "requires": {
         "chalk": "^1.0.0"
       },
@@ -15537,15 +14575,13 @@
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "chalk": {
           "version": "1.1.3",
           "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-styles": "^2.2.1",
             "escape-string-regexp": "^1.0.2",
@@ -15558,8 +14594,7 @@
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
           "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -15621,7 +14656,6 @@
       "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz",
       "integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==",
       "dev": true,
-      "optional": true,
       "requires": {
         "bl": "^1.0.0",
         "buffer-alloc": "^1.2.0",
@@ -15637,7 +14671,6 @@
           "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
           "integrity": "sha1-7SljTRm6ukY7bOa4CjchPqtx7EM=",
           "dev": true,
-          "optional": true,
           "requires": {
             "once": "^1.4.0"
           }
@@ -15646,15 +14679,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "once": {
           "version": "1.4.0",
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -15664,7 +14695,6 @@
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -15680,7 +14710,6 @@
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -15785,7 +14814,6 @@
       "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz",
       "integrity": "sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=",
       "dev": true,
-      "optional": true,
       "requires": {
         "through2": "~2.0.0",
         "xtend": "~4.0.0"
@@ -15810,8 +14838,7 @@
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz",
       "integrity": "sha1-lYYL/MXHbCd/j4Mm/Q9bLiDrohc=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "timers-ext": {
       "version": "0.1.7",
@@ -15834,37 +14861,6 @@
       "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.0.2.tgz",
       "integrity": "sha512-2NM0auVBGft5tee/OxP4PI3d8WItkDM+fPnaRAVo6xTDI2knbz9eC5ArWGqtGlYqiH3RU5yMpdyTTO7MguC4ow=="
     },
-    "tiny-lr": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.1.tgz",
-      "integrity": "sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA==",
-      "dev": true,
-      "requires": {
-        "body": "^5.1.0",
-        "debug": "^3.1.0",
-        "faye-websocket": "~0.10.0",
-        "livereload-js": "^2.3.0",
-        "object-assign": "^4.1.0",
-        "qs": "^6.4.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "object-assign": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-          "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true
-        }
-      }
-    },
     "tinymce": {
       "version": "4.9.2",
       "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-4.9.2.tgz",
@@ -15884,7 +14880,6 @@
       "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz",
       "integrity": "sha1-HN+kcqnvUMI57maZm2YsoOs5k38=",
       "dev": true,
-      "optional": true,
       "requires": {
         "extend-shallow": "^2.0.1"
       },
@@ -15894,7 +14889,6 @@
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-extendable": "^0.1.0"
           }
@@ -15911,8 +14905,7 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz",
       "integrity": "sha1-STvUj2LXxD/N7TE6A9ytsuEhOoA=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "to-fast-properties": {
       "version": "2.0.0",
@@ -15991,7 +14984,6 @@
       "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz",
       "integrity": "sha1-42RqLqTokTEr9+rObPsFOAvAHCE=",
       "dev": true,
-      "optional": true,
       "requires": {
         "escape-string-regexp": "^1.0.2"
       }
@@ -16240,13 +15232,12 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz",
       "integrity": "sha1-uYTwh3/AqJwsdzzB73tbIytbBv4=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "upath": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
-      "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==",
+      "integrity": "sha1-NSVll+RqWB20eT0M5H+prr/J+r0=",
       "dev": true
     },
     "uri-js": {
@@ -16269,7 +15260,6 @@
       "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
       "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
       "dev": true,
-      "optional": true,
       "requires": {
         "prepend-http": "^1.0.1"
       }
@@ -16355,8 +15345,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz",
       "integrity": "sha1-G5BKWWCfsyjvB4E4Qgk09rhnCaY=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "validate-npm-package-license": {
       "version": "3.0.4",
@@ -16401,7 +15390,6 @@
       "resolved": "https://registry.npmjs.org/vinyl-assign/-/vinyl-assign-1.2.1.tgz",
       "integrity": "sha1-TRmIkbVRWRHXcajNnFSApGoHSkU=",
       "dev": true,
-      "optional": true,
       "requires": {
         "object-assign": "^4.0.1",
         "readable-stream": "^2.0.0"
@@ -16411,22 +15399,19 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -16442,7 +15427,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -16582,27 +15566,10 @@
       "resolved": "https://registry.npmjs.org/ware/-/ware-1.3.0.tgz",
       "integrity": "sha1-0bFPOdLiy0q4xAmPdW/ksWTkc9Q=",
       "dev": true,
-      "optional": true,
       "requires": {
         "wrap-fn": "^0.1.0"
       }
     },
-    "websocket-driver": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz",
-      "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=",
-      "dev": true,
-      "requires": {
-        "http-parser-js": ">=0.4.0",
-        "websocket-extensions": ">=0.1.1"
-      }
-    },
-    "websocket-extensions": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz",
-      "integrity": "sha1-XS/yKXcAPsaHpLhwc9+7rBRszyk=",
-      "dev": true
-    },
     "when": {
       "version": "3.7.8",
       "resolved": "https://registry.npmjs.org/when/-/when-3.7.8.tgz",
@@ -16673,7 +15640,6 @@
       "resolved": "https://registry.npmjs.org/wrap-fn/-/wrap-fn-0.1.5.tgz",
       "integrity": "sha1-8htuQQFv9KfjFyDbxjoJAWvfmEU=",
       "dev": true,
-      "optional": true,
       "requires": {
         "co": "3.1.0"
       }
@@ -16777,7 +15743,6 @@
       "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
       "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
       "dev": true,
-      "optional": true,
       "requires": {
         "buffer-crc32": "~0.2.3",
         "fd-slicer": "~1.1.0"
diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json
index 35d808056c..7f3a7b54f0 100644
--- a/src/Umbraco.Web.UI.Client/package.json
+++ b/src/Umbraco.Web.UI.Client/package.json
@@ -4,8 +4,7 @@
     "test": "karma start test/config/karma.conf.js --singlerun",
     "build": "gulp build",
     "dev": "gulp dev",
-    "fastdev": "gulp fastdev",
-    "docs": "gulp docs"
+    "fastdev": "gulp fastdev"
   },
   "dependencies": {
     "ace-builds": "1.4.2",
@@ -55,13 +54,10 @@
     "gulp-clean-css": "4.0.0",
     "gulp-cli": "^2.0.1",
     "gulp-concat": "2.6.1",
-    "gulp-connect": "5.6.1",
     "gulp-eslint": "^5.0.0",
     "gulp-imagemin": "^4.1.0",
     "gulp-less": "4.0.1",
-    "gulp-ngdocs": "0.3.0",
     "gulp-notify": "^3.0.0",
-    "gulp-open": "3.0.1",
     "gulp-postcss": "8.0.0",
     "gulp-rename": "1.4.0",
     "gulp-sort": "2.0.0",
diff --git a/src/Umbraco.Web.UI.Docs/README.md b/src/Umbraco.Web.UI.Docs/README.md
new file mode 100644
index 0000000000..ad9f631241
--- /dev/null
+++ b/src/Umbraco.Web.UI.Docs/README.md
@@ -0,0 +1,14 @@
+# Umbraco Backoffice UI API Documentation
+
+This project builds the documentation for the UI of the Umbraco backoffice, it is published on Our Umbraco in the "Reference" section of the documentation.
+
+In order to build the documentation, please follow the following two steps:
+
+```
+npm install
+npx gulp docs
+```
+
+After this, you should have an `api` directory which contains index.html. 
+
+In order to check if the documentation works properly, you would need to run the `api` directory in a webserver. On Windows, this can be accomplished by opening the `api` directory in [Visual Studio Code](https://code.visualstudio.com/) and running it with the [IIS Express plugin](https://marketplace.visualstudio.com/items?itemName=warren-buckley.iis-express).
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/gulp/tasks/docs.js b/src/Umbraco.Web.UI.Docs/gulpfile.js
similarity index 73%
rename from src/Umbraco.Web.UI.Client/gulp/tasks/docs.js
rename to src/Umbraco.Web.UI.Docs/gulpfile.js
index 34271a018c..ade7aa64c4 100644
--- a/src/Umbraco.Web.UI.Client/gulp/tasks/docs.js
+++ b/src/Umbraco.Web.UI.Docs/gulpfile.js
@@ -1,6 +1,7 @@
 'use strict';
 
-var config = require('../config');
+
+var config = require('../Umbraco.Web.UI.Client/gulp/config');
 var gulp = require('gulp');
 
 var connect = require('gulp-connect');
@@ -16,28 +17,28 @@ gulp.task('docs', [], function (cb) {
         html5Mode: false,
         startPage: '/api',
         title: "Umbraco Backoffice UI API Documentation",
-        dest: 'docs/api',
-        styles: ['docs/umb-docs.css'],
+        dest: './api',
+        styles: ['./umb-docs.css'],
         image: "https://our.umbraco.com/assets/images/logo.svg"
     }
 
     return gulpDocs.sections({
         api: {
-            glob: ['src/common/**/*.js', 'docs/src/api/**/*.ngdoc'],
+            glob: ['../Umbraco.Web.UI.Client/src/common/**/*.js', './src/api/**/*.ngdoc'],
             api: true,
-            title: 'API Documentation'
+            title: 'UI API Documentation'
         }
     })
     .pipe(gulpDocs.process(options))
-    .pipe(gulp.dest('docs/api'));
+    .pipe(gulp.dest('./api'));
     cb();
 });
 
 gulp.task('connect:docs', function (cb) {
     connect.server({
-        root: 'docs/api',
+        root: './api',
         livereload: true,
-        fallback: 'docs/api/index.html',
+        fallback: './api/index.html',
         port: 8880
     });
     cb();
diff --git a/src/Umbraco.Web.UI.Docs/package-lock.json b/src/Umbraco.Web.UI.Docs/package-lock.json
new file mode 100644
index 0000000000..b0dee3c5ac
--- /dev/null
+++ b/src/Umbraco.Web.UI.Docs/package-lock.json
@@ -0,0 +1,3612 @@
+{
+  "requires": true,
+  "lockfileVersion": 1,
+  "dependencies": {
+    "accepts": {
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
+      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
+      "dev": true,
+      "requires": {
+        "mime-types": "~2.1.24",
+        "negotiator": "0.6.2"
+      }
+    },
+    "angular": {
+      "version": "1.3.20",
+      "resolved": "https://registry.npmjs.org/angular/-/angular-1.3.20.tgz",
+      "integrity": "sha1-sjo9fF5/mffZW5tNSbmsNVJpuu4=",
+      "dev": true
+    },
+    "angular-animate": {
+      "version": "1.3.20",
+      "resolved": "https://registry.npmjs.org/angular-animate/-/angular-animate-1.3.20.tgz",
+      "integrity": "sha1-0XB8cn+K0N8hxKLewgzX/ElFtSo=",
+      "dev": true
+    },
+    "ansi-colors": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-2.0.5.tgz",
+      "integrity": "sha512-yAdfUZ+c2wetVNIFsNRn44THW+Lty6S5TwMpUfLA/UaGhiXbBv/F8E60/1hMLd0cnF/CDoWH8vzVaI5bAcHCjw==",
+      "dev": true
+    },
+    "ansi-gray": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
+      "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=",
+      "dev": true,
+      "requires": {
+        "ansi-wrap": "0.1.0"
+      }
+    },
+    "ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "dev": true
+    },
+    "ansi-styles": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+      "dev": true
+    },
+    "ansi-wrap": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
+      "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=",
+      "dev": true
+    },
+    "archy": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
+      "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
+      "dev": true
+    },
+    "arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+      "dev": true
+    },
+    "arr-flatten": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+      "dev": true
+    },
+    "arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+      "dev": true
+    },
+    "array-differ": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
+      "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=",
+      "dev": true
+    },
+    "array-each": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
+      "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
+      "dev": true
+    },
+    "array-find-index": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
+      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
+      "dev": true
+    },
+    "array-slice": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
+      "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
+      "dev": true
+    },
+    "array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
+      "dev": true
+    },
+    "array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+      "dev": true
+    },
+    "assign-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
+      "dev": true
+    },
+    "atob": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+      "dev": true
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "dev": true
+    },
+    "base": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+      "dev": true,
+      "requires": {
+        "cache-base": "^1.0.1",
+        "class-utils": "^0.3.5",
+        "component-emitter": "^1.2.1",
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.1",
+        "mixin-deep": "^1.2.0",
+        "pascalcase": "^0.1.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "batch": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
+      "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
+      "dev": true
+    },
+    "beeper": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz",
+      "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=",
+      "dev": true
+    },
+    "body": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/body/-/body-5.1.0.tgz",
+      "integrity": "sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk=",
+      "dev": true,
+      "requires": {
+        "continuable-cache": "^0.3.1",
+        "error": "^7.0.0",
+        "raw-body": "~1.1.0",
+        "safe-json-parse": "~1.0.1"
+      }
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "requires": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "bytes": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz",
+      "integrity": "sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g=",
+      "dev": true
+    },
+    "cache-base": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+      "dev": true,
+      "requires": {
+        "collection-visit": "^1.0.0",
+        "component-emitter": "^1.2.1",
+        "get-value": "^2.0.6",
+        "has-value": "^1.0.0",
+        "isobject": "^3.0.1",
+        "set-value": "^2.0.0",
+        "to-object-path": "^0.3.0",
+        "union-value": "^1.0.0",
+        "unset-value": "^1.0.0"
+      }
+    },
+    "camelcase": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
+      "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
+      "dev": true
+    },
+    "camelcase-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
+      "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
+      "dev": true,
+      "requires": {
+        "camelcase": "^2.0.0",
+        "map-obj": "^1.0.0"
+      }
+    },
+    "canonical-path": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/canonical-path/-/canonical-path-0.0.2.tgz",
+      "integrity": "sha1-4x65N6jJPuKgHfGDl5RyGQKHRXQ=",
+      "dev": true
+    },
+    "chalk": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^2.2.1",
+        "escape-string-regexp": "^1.0.2",
+        "has-ansi": "^2.0.0",
+        "strip-ansi": "^3.0.0",
+        "supports-color": "^2.0.0"
+      }
+    },
+    "class-utils": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+      "dev": true,
+      "requires": {
+        "arr-union": "^3.1.0",
+        "define-property": "^0.2.5",
+        "isobject": "^3.0.0",
+        "static-extend": "^0.1.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
+      }
+    },
+    "clone": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
+      "dev": true
+    },
+    "clone-stats": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
+      "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=",
+      "dev": true
+    },
+    "collection-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
+      "dev": true,
+      "requires": {
+        "map-visit": "^1.0.0",
+        "object-visit": "^1.0.0"
+      }
+    },
+    "color-support": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
+      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
+      "dev": true
+    },
+    "colors": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
+      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
+      "dev": true
+    },
+    "component-emitter": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
+      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
+      "dev": true
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
+    },
+    "connect": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
+      "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9",
+        "finalhandler": "1.1.2",
+        "parseurl": "~1.3.3",
+        "utils-merge": "1.0.1"
+      }
+    },
+    "connect-livereload": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.6.1.tgz",
+      "integrity": "sha512-3R0kMOdL7CjJpU66fzAkCe6HNtd3AavCS4m+uW4KtJjrdGPT0SQEZieAYd+cm+lJoBznNQ4lqipYWkhBMgk00g==",
+      "dev": true
+    },
+    "continuable-cache": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/continuable-cache/-/continuable-cache-0.3.1.tgz",
+      "integrity": "sha1-vXJ6f67XfnH/OYWskzUakSczrQ8=",
+      "dev": true
+    },
+    "copy-descriptor": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
+      "dev": true
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "dev": true
+    },
+    "currently-unhandled": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
+      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
+      "dev": true,
+      "requires": {
+        "array-find-index": "^1.0.1"
+      }
+    },
+    "dateformat": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz",
+      "integrity": "sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=",
+      "dev": true
+    },
+    "debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "requires": {
+        "ms": "2.0.0"
+      }
+    },
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "dev": true
+    },
+    "decode-uri-component": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
+      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
+      "dev": true
+    },
+    "defaults": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
+      "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
+      "dev": true,
+      "requires": {
+        "clone": "^1.0.2"
+      }
+    },
+    "define-property": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+      "dev": true,
+      "requires": {
+        "is-descriptor": "^1.0.2",
+        "isobject": "^3.0.1"
+      },
+      "dependencies": {
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+      "dev": true
+    },
+    "deprecated": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz",
+      "integrity": "sha1-+cmvVGSvoeepcUWKi97yqpTVuxk=",
+      "dev": true
+    },
+    "destroy": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
+      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
+      "dev": true
+    },
+    "detect-file": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
+      "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
+      "dev": true
+    },
+    "duplexer": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
+      "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
+      "dev": true
+    },
+    "duplexer2": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
+      "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "~1.1.9"
+      }
+    },
+    "ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
+      "dev": true
+    },
+    "encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
+      "dev": true
+    },
+    "end-of-stream": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
+      "integrity": "sha1-jhdyBsPICDfYVjLouTWd/osvbq8=",
+      "dev": true,
+      "requires": {
+        "once": "~1.3.0"
+      }
+    },
+    "error": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/error/-/error-7.2.0.tgz",
+      "integrity": "sha512-M6t3j3Vt3uDicrViMP5fLq2AeADNrCVFD8Oj4Qt2MHsX0mPYG7D5XdnEfSdRpaHQzjAJ19wu+I1mw9rQYMTAPg==",
+      "dev": true,
+      "requires": {
+        "string-template": "~0.2.1"
+      }
+    },
+    "error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "requires": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
+      "dev": true
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true
+    },
+    "etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
+      "dev": true
+    },
+    "event-stream": {
+      "version": "3.3.5",
+      "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.5.tgz",
+      "integrity": "sha512-vyibDcu5JL20Me1fP734QBH/kenBGLZap2n0+XXM7mvuUPzJ20Ydqj1aKcIeMdri1p+PU+4yAKugjN8KCVst+g==",
+      "dev": true,
+      "requires": {
+        "duplexer": "^0.1.1",
+        "from": "^0.1.7",
+        "map-stream": "0.0.7",
+        "pause-stream": "^0.0.11",
+        "split": "^1.0.1",
+        "stream-combiner": "^0.2.2",
+        "through": "^2.3.8"
+      }
+    },
+    "expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+      "dev": true,
+      "requires": {
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "expand-tilde": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
+      "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
+      "dev": true,
+      "requires": {
+        "homedir-polyfill": "^1.0.1"
+      }
+    },
+    "extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+      "dev": true
+    },
+    "extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "dev": true,
+      "requires": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
+    "extglob": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "dev": true,
+      "requires": {
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "fancy-log": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
+      "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
+      "dev": true,
+      "requires": {
+        "ansi-gray": "^0.1.1",
+        "color-support": "^1.1.3",
+        "parse-node-version": "^1.0.0",
+        "time-stamp": "^1.0.0"
+      }
+    },
+    "faye-websocket": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
+      "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
+      "dev": true,
+      "requires": {
+        "websocket-driver": ">=0.5.1"
+      }
+    },
+    "fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "finalhandler": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
+      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.3",
+        "statuses": "~1.5.0",
+        "unpipe": "~1.0.0"
+      }
+    },
+    "find-index": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz",
+      "integrity": "sha1-Z101iyyjiS15Whq0cjL4tuLg3eQ=",
+      "dev": true
+    },
+    "find-up": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+      "dev": true,
+      "requires": {
+        "path-exists": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      }
+    },
+    "findup-sync": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
+      "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
+      "dev": true,
+      "requires": {
+        "detect-file": "^1.0.0",
+        "is-glob": "^3.1.0",
+        "micromatch": "^3.0.4",
+        "resolve-dir": "^1.0.1"
+      }
+    },
+    "fined": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz",
+      "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
+      "dev": true,
+      "requires": {
+        "expand-tilde": "^2.0.2",
+        "is-plain-object": "^2.0.3",
+        "object.defaults": "^1.1.0",
+        "object.pick": "^1.2.0",
+        "parse-filepath": "^1.0.1"
+      }
+    },
+    "first-chunk-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz",
+      "integrity": "sha1-Wb+1DNkF9g18OUzT2ayqtOatk04=",
+      "dev": true
+    },
+    "flagged-respawn": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
+      "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
+      "dev": true
+    },
+    "for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+      "dev": true
+    },
+    "for-own": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
+      "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
+      "dev": true,
+      "requires": {
+        "for-in": "^1.0.1"
+      }
+    },
+    "fragment-cache": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
+      "dev": true,
+      "requires": {
+        "map-cache": "^0.2.2"
+      }
+    },
+    "fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
+      "dev": true
+    },
+    "from": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
+      "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=",
+      "dev": true
+    },
+    "gaze": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz",
+      "integrity": "sha1-QLcJU30k0dRXZ9takIaJ3+aaxE8=",
+      "dev": true,
+      "requires": {
+        "globule": "~0.1.0"
+      }
+    },
+    "get-stdin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
+      "dev": true
+    },
+    "get-value": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
+      "dev": true
+    },
+    "glob": {
+      "version": "4.5.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+      "integrity": "sha1-xstz0yJsHv7wTePFbQEvAzd+4V8=",
+      "dev": true,
+      "requires": {
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^2.0.1",
+        "once": "^1.3.0"
+      }
+    },
+    "glob-stream": {
+      "version": "3.1.18",
+      "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
+      "integrity": "sha1-kXCl8St5Awb9/lmPMT+PeVT9FDs=",
+      "dev": true,
+      "requires": {
+        "glob": "^4.3.1",
+        "glob2base": "^0.0.12",
+        "minimatch": "^2.0.1",
+        "ordered-read-streams": "^0.1.0",
+        "through2": "^0.6.1",
+        "unique-stream": "^1.0.0"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "1.0.34",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
+            "isarray": "0.0.1",
+            "string_decoder": "~0.10.x"
+          }
+        },
+        "through2": {
+          "version": "0.6.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+          "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
+          "dev": true,
+          "requires": {
+            "readable-stream": ">=1.0.33-1 <1.1.0-0",
+            "xtend": ">=4.0.0 <4.1.0-0"
+          }
+        }
+      }
+    },
+    "glob-watcher": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
+      "integrity": "sha1-uVtKjfdLOcgymLDAXJeLTZo7cQs=",
+      "dev": true,
+      "requires": {
+        "gaze": "^0.5.1"
+      }
+    },
+    "glob2base": {
+      "version": "0.0.12",
+      "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
+      "integrity": "sha1-nUGbPijxLoOjYhZKJ3BVkiycDVY=",
+      "dev": true,
+      "requires": {
+        "find-index": "^0.1.1"
+      }
+    },
+    "global-modules": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
+      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+      "dev": true,
+      "requires": {
+        "global-prefix": "^1.0.1",
+        "is-windows": "^1.0.1",
+        "resolve-dir": "^1.0.0"
+      }
+    },
+    "global-prefix": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
+      "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
+      "dev": true,
+      "requires": {
+        "expand-tilde": "^2.0.2",
+        "homedir-polyfill": "^1.0.1",
+        "ini": "^1.3.4",
+        "is-windows": "^1.0.1",
+        "which": "^1.2.14"
+      }
+    },
+    "globule": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
+      "integrity": "sha1-2cjt3h2nnRJaFRt5UzuXhnY0auU=",
+      "dev": true,
+      "requires": {
+        "glob": "~3.1.21",
+        "lodash": "~1.0.1",
+        "minimatch": "~0.2.11"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "3.1.21",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
+          "integrity": "sha1-0p4KBV3qUTj00H7UDomC6DwgZs0=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "~1.2.0",
+            "inherits": "1",
+            "minimatch": "~0.2.11"
+          }
+        },
+        "graceful-fs": {
+          "version": "1.2.3",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz",
+          "integrity": "sha1-FaSAaldUfLLS2/J/QuiajDRRs2Q=",
+          "dev": true
+        },
+        "inherits": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz",
+          "integrity": "sha1-ykMJ2t7mtUzAuNJH6NfHoJdb3Js=",
+          "dev": true
+        },
+        "minimatch": {
+          "version": "0.2.14",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+          "integrity": "sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=",
+          "dev": true,
+          "requires": {
+            "lru-cache": "2",
+            "sigmund": "~1.0.0"
+          }
+        }
+      }
+    },
+    "glogg": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz",
+      "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==",
+      "dev": true,
+      "requires": {
+        "sparkles": "^1.0.0"
+      }
+    },
+    "graceful-fs": {
+      "version": "3.0.12",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.12.tgz",
+      "integrity": "sha512-J55gaCS4iTTJfTXIxSVw3EMQckcqkpdRv3IR7gu6sq0+tbC363Zx6KH/SEwXASK9JRbhyZmVjJEVJIOxYsB3Qg==",
+      "dev": true,
+      "requires": {
+        "natives": "^1.1.3"
+      }
+    },
+    "gulp": {
+      "version": "3.9.1",
+      "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz",
+      "integrity": "sha1-VxzkWSjdQK9lFPxAEYZgFsE4RbQ=",
+      "dev": true,
+      "requires": {
+        "archy": "^1.0.0",
+        "chalk": "^1.0.0",
+        "deprecated": "^0.0.1",
+        "gulp-util": "^3.0.0",
+        "interpret": "^1.0.0",
+        "liftoff": "^2.1.0",
+        "minimist": "^1.1.0",
+        "orchestrator": "^0.3.0",
+        "pretty-hrtime": "^1.0.0",
+        "semver": "^4.1.0",
+        "tildify": "^1.0.0",
+        "v8flags": "^2.0.2",
+        "vinyl-fs": "^0.3.0"
+      }
+    },
+    "gulp-connect": {
+      "version": "5.6.1",
+      "resolved": "https://registry.npmjs.org/gulp-connect/-/gulp-connect-5.6.1.tgz",
+      "integrity": "sha512-FknHeA6smZhiRNrK/3UVH8BHLCFHS7WZdE7Y2VbZHtxye1UTIa5ZY0Cnst6O9n3kL8z7y43QI+acx3nUtJoiHw==",
+      "dev": true,
+      "requires": {
+        "ansi-colors": "^2.0.5",
+        "connect": "^3.6.6",
+        "connect-livereload": "^0.6.0",
+        "event-stream": "^3.3.4",
+        "fancy-log": "^1.3.2",
+        "send": "^0.16.2",
+        "serve-index": "^1.9.1",
+        "serve-static": "^1.13.2",
+        "tiny-lr": "^1.1.1"
+      }
+    },
+    "gulp-ngdocs": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/gulp-ngdocs/-/gulp-ngdocs-0.3.0.tgz",
+      "integrity": "sha1-J7Z6Ql6zh1ImNFq4lgTXN/Y1fCE=",
+      "dev": true,
+      "requires": {
+        "angular": "~1.3.1",
+        "angular-animate": "~1.3.1",
+        "canonical-path": "0.0.2",
+        "extend": "1.3.0",
+        "gulp-util": "3.0.0",
+        "lodash": "2.4.1",
+        "marked": "0.3.2",
+        "merge-stream": "0.1.5",
+        "path": "0.4.9",
+        "string_decoder": "0.10.31",
+        "through2": "0.6.1",
+        "vinyl-fs": "0.3.7"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
+          "integrity": "sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk=",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz",
+          "integrity": "sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "0.5.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
+          "integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^1.1.0",
+            "escape-string-regexp": "^1.0.0",
+            "has-ansi": "^0.1.0",
+            "strip-ansi": "^0.3.0",
+            "supports-color": "^0.2.0"
+          }
+        },
+        "clone": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
+          "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
+          "dev": true
+        },
+        "dateformat": {
+          "version": "1.0.12",
+          "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
+          "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=",
+          "dev": true,
+          "requires": {
+            "get-stdin": "^4.0.1",
+            "meow": "^3.3.0"
+          }
+        },
+        "extend": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/extend/-/extend-1.3.0.tgz",
+          "integrity": "sha1-0VFvsP9WJNLr+RI+odrFoZlABPg=",
+          "dev": true
+        },
+        "gulp-util": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.0.tgz",
+          "integrity": "sha1-b+7cR9aXKCO6zplH/F9GvYo0Zuc=",
+          "dev": true,
+          "requires": {
+            "chalk": "^0.5.0",
+            "dateformat": "^1.0.7-1.2.3",
+            "lodash": "^2.4.1",
+            "lodash._reinterpolate": "^2.4.1",
+            "lodash.template": "^2.4.1",
+            "minimist": "^0.2.0",
+            "multipipe": "^0.1.0",
+            "through2": "^0.5.0",
+            "vinyl": "^0.2.1"
+          },
+          "dependencies": {
+            "through2": {
+              "version": "0.5.1",
+              "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
+              "integrity": "sha1-390BLrnHAOIyP9M084rGIqs3Lac=",
+              "dev": true,
+              "requires": {
+                "readable-stream": "~1.0.17",
+                "xtend": "~3.0.0"
+              }
+            }
+          }
+        },
+        "has-ansi": {
+          "version": "0.1.0",
+          "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
+          "integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^0.2.0"
+          }
+        },
+        "lodash": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz",
+          "integrity": "sha1-W3cjA03aTSYuWkb7LFjXzCL3FCA=",
+          "dev": true
+        },
+        "lodash._reinterpolate": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz",
+          "integrity": "sha1-TxInqlqHEfxjL1sHofRgequLMiI=",
+          "dev": true
+        },
+        "lodash.escape": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-2.4.1.tgz",
+          "integrity": "sha1-LOEsXghNsKV92l5dHu659dF1o7Q=",
+          "dev": true,
+          "requires": {
+            "lodash._escapehtmlchar": "~2.4.1",
+            "lodash._reunescapedhtml": "~2.4.1",
+            "lodash.keys": "~2.4.1"
+          }
+        },
+        "lodash.keys": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
+          "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=",
+          "dev": true,
+          "requires": {
+            "lodash._isnative": "~2.4.1",
+            "lodash._shimkeys": "~2.4.1",
+            "lodash.isobject": "~2.4.1"
+          }
+        },
+        "lodash.template": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-2.4.1.tgz",
+          "integrity": "sha1-nmEQB+32KRKal0qzxIuBez4c8g0=",
+          "dev": true,
+          "requires": {
+            "lodash._escapestringchar": "~2.4.1",
+            "lodash._reinterpolate": "~2.4.1",
+            "lodash.defaults": "~2.4.1",
+            "lodash.escape": "~2.4.1",
+            "lodash.keys": "~2.4.1",
+            "lodash.templatesettings": "~2.4.1",
+            "lodash.values": "~2.4.1"
+          }
+        },
+        "lodash.templatesettings": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz",
+          "integrity": "sha1-6nbHXRHrhtTb6JqDiTu4YZKaxpk=",
+          "dev": true,
+          "requires": {
+            "lodash._reinterpolate": "~2.4.1",
+            "lodash.escape": "~2.4.1"
+          }
+        },
+        "minimist": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz",
+          "integrity": "sha1-Tf/lJdriuGTGbC4jxicdev3s784=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "1.0.34",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
+            "isarray": "0.0.1",
+            "string_decoder": "~0.10.x"
+          }
+        },
+        "strip-ansi": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
+          "integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^0.2.1"
+          }
+        },
+        "supports-color": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz",
+          "integrity": "sha1-2S3iaU6z9nMjlz1649i1W0wiGQo=",
+          "dev": true
+        },
+        "through2": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.1.tgz",
+          "integrity": "sha1-90KzKJPovSYUbnieT9LMssB6cX4=",
+          "dev": true,
+          "requires": {
+            "readable-stream": ">=1.0.27-1 <1.1.0-0",
+            "xtend": ">=4.0.0 <4.1.0-0"
+          },
+          "dependencies": {
+            "xtend": {
+              "version": "4.0.2",
+              "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+              "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+              "dev": true
+            }
+          }
+        },
+        "vinyl": {
+          "version": "0.2.3",
+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.2.3.tgz",
+          "integrity": "sha1-vKk4IJWC7FpJrVOKAPofEl5RMlI=",
+          "dev": true,
+          "requires": {
+            "clone-stats": "~0.0.1"
+          }
+        },
+        "vinyl-fs": {
+          "version": "0.3.7",
+          "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.7.tgz",
+          "integrity": "sha1-LiXP5t9cgIGPl/9Be/XCGkHkpJs=",
+          "dev": true,
+          "requires": {
+            "glob-stream": "^3.1.5",
+            "glob-watcher": "^0.0.6",
+            "graceful-fs": "^3.0.0",
+            "lodash": "^2.4.1",
+            "mkdirp": "^0.5.0",
+            "strip-bom": "^1.0.0",
+            "through2": "^0.6.1",
+            "vinyl": "^0.4.0"
+          },
+          "dependencies": {
+            "vinyl": {
+              "version": "0.4.6",
+              "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
+              "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
+              "dev": true,
+              "requires": {
+                "clone": "^0.2.0",
+                "clone-stats": "^0.0.1"
+              }
+            }
+          }
+        },
+        "xtend": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
+          "integrity": "sha1-XM50B7r2Qsunvs2laBEcST9ZZlo=",
+          "dev": true
+        }
+      }
+    },
+    "gulp-open": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/gulp-open/-/gulp-open-3.0.1.tgz",
+      "integrity": "sha512-dohokw+npnt48AsD0hhvCLEHLnDMqM35F+amvIfJlX1H2nNHYUClR0Oy1rI0TvbL1/pHiHGNLmohhk+kvwIKjA==",
+      "dev": true,
+      "requires": {
+        "colors": "^1.1.2",
+        "opn": "5.2.0",
+        "plugin-log": "^0.1.0",
+        "through2": "^2.0.1"
+      }
+    },
+    "gulp-util": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz",
+      "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=",
+      "dev": true,
+      "requires": {
+        "array-differ": "^1.0.0",
+        "array-uniq": "^1.0.2",
+        "beeper": "^1.0.0",
+        "chalk": "^1.0.0",
+        "dateformat": "^2.0.0",
+        "fancy-log": "^1.1.0",
+        "gulplog": "^1.0.0",
+        "has-gulplog": "^0.1.0",
+        "lodash._reescape": "^3.0.0",
+        "lodash._reevaluate": "^3.0.0",
+        "lodash._reinterpolate": "^3.0.0",
+        "lodash.template": "^3.0.0",
+        "minimist": "^1.1.0",
+        "multipipe": "^0.1.2",
+        "object-assign": "^3.0.0",
+        "replace-ext": "0.0.1",
+        "through2": "^2.0.0",
+        "vinyl": "^0.5.0"
+      }
+    },
+    "gulplog": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
+      "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
+      "dev": true,
+      "requires": {
+        "glogg": "^1.0.0"
+      }
+    },
+    "has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^2.0.0"
+      }
+    },
+    "has-gulplog": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
+      "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=",
+      "dev": true,
+      "requires": {
+        "sparkles": "^1.0.0"
+      }
+    },
+    "has-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+      "dev": true,
+      "requires": {
+        "get-value": "^2.0.6",
+        "has-values": "^1.0.0",
+        "isobject": "^3.0.0"
+      }
+    },
+    "has-values": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+      "dev": true,
+      "requires": {
+        "is-number": "^3.0.0",
+        "kind-of": "^4.0.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "homedir-polyfill": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
+      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
+      "dev": true,
+      "requires": {
+        "parse-passwd": "^1.0.0"
+      }
+    },
+    "hosted-git-info": {
+      "version": "2.8.4",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.4.tgz",
+      "integrity": "sha512-pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ==",
+      "dev": true
+    },
+    "http-errors": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+      "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+      "dev": true,
+      "requires": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.0",
+        "statuses": ">= 1.4.0 < 2"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+          "dev": true
+        }
+      }
+    },
+    "http-parser-js": {
+      "version": "0.4.10",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.10.tgz",
+      "integrity": "sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=",
+      "dev": true
+    },
+    "indent-string": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
+      "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
+      "dev": true,
+      "requires": {
+        "repeating": "^2.0.0"
+      }
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "ini": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+      "dev": true
+    },
+    "interpret": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz",
+      "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==",
+      "dev": true
+    },
+    "is-absolute": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
+      "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
+      "dev": true,
+      "requires": {
+        "is-relative": "^1.0.0",
+        "is-windows": "^1.0.1"
+      }
+    },
+    "is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+      "dev": true
+    },
+    "is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "requires": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "dev": true
+        }
+      }
+    },
+    "is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true
+    },
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "dev": true
+    },
+    "is-finite": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
+      "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
+      "dev": true,
+      "requires": {
+        "number-is-nan": "^1.0.0"
+      }
+    },
+    "is-glob": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+      "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+      "dev": true,
+      "requires": {
+        "is-extglob": "^2.1.0"
+      }
+    },
+    "is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.1"
+      }
+    },
+    "is-relative": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
+      "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
+      "dev": true,
+      "requires": {
+        "is-unc-path": "^1.0.0"
+      }
+    },
+    "is-unc-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
+      "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
+      "dev": true,
+      "requires": {
+        "unc-path-regex": "^0.1.2"
+      }
+    },
+    "is-utf8": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
+      "dev": true
+    },
+    "is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+      "dev": true
+    },
+    "is-wsl": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
+      "dev": true
+    },
+    "isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+      "dev": true
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
+    },
+    "isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true
+    },
+    "kind-of": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+      "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+      "dev": true
+    },
+    "liftoff": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-2.5.0.tgz",
+      "integrity": "sha1-IAkpG7Mc6oYbvxCnwVooyvdcMew=",
+      "dev": true,
+      "requires": {
+        "extend": "^3.0.0",
+        "findup-sync": "^2.0.0",
+        "fined": "^1.0.1",
+        "flagged-respawn": "^1.0.0",
+        "is-plain-object": "^2.0.4",
+        "object.map": "^1.0.0",
+        "rechoir": "^0.6.2",
+        "resolve": "^1.1.7"
+      }
+    },
+    "livereload-js": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/livereload-js/-/livereload-js-2.4.0.tgz",
+      "integrity": "sha512-XPQH8Z2GDP/Hwz2PCDrh2mth4yFejwA1OZ/81Ti3LgKyhDcEjsSsqFWZojHG0va/duGd+WyosY7eXLDoOyqcPw==",
+      "dev": true
+    },
+    "load-json-file": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^2.2.0",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0",
+        "strip-bom": "^2.0.0"
+      },
+      "dependencies": {
+        "graceful-fs": {
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
+          "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==",
+          "dev": true
+        },
+        "strip-bom": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+          "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+          "dev": true,
+          "requires": {
+            "is-utf8": "^0.2.0"
+          }
+        }
+      }
+    },
+    "lodash": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz",
+      "integrity": "sha1-j1dWDIO1n8JwvT1WG2kAQ0MOJVE=",
+      "dev": true
+    },
+    "lodash._basecopy": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
+      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
+      "dev": true
+    },
+    "lodash._basetostring": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
+      "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=",
+      "dev": true
+    },
+    "lodash._basevalues": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
+      "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=",
+      "dev": true
+    },
+    "lodash._escapehtmlchar": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz",
+      "integrity": "sha1-32fDu2t+jh6DGrSL+geVuSr+iZ0=",
+      "dev": true,
+      "requires": {
+        "lodash._htmlescapes": "~2.4.1"
+      }
+    },
+    "lodash._escapestringchar": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz",
+      "integrity": "sha1-7P4iYYoq3lC/7qQ5N+Ud9m8O23I=",
+      "dev": true
+    },
+    "lodash._getnative": {
+      "version": "3.9.1",
+      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
+      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
+      "dev": true
+    },
+    "lodash._htmlescapes": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz",
+      "integrity": "sha1-MtFL8IRLbeb4tioFG09nwii2JMs=",
+      "dev": true
+    },
+    "lodash._isiterateecall": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
+      "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
+      "dev": true
+    },
+    "lodash._isnative": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz",
+      "integrity": "sha1-PqZAS3hKe+g2x7V1gOHN95sUgyw=",
+      "dev": true
+    },
+    "lodash._objecttypes": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz",
+      "integrity": "sha1-fAt/admKH3ZSn4kLDNsbTf7BHBE=",
+      "dev": true
+    },
+    "lodash._reescape": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
+      "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=",
+      "dev": true
+    },
+    "lodash._reevaluate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
+      "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=",
+      "dev": true
+    },
+    "lodash._reinterpolate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
+      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
+      "dev": true
+    },
+    "lodash._reunescapedhtml": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz",
+      "integrity": "sha1-dHxPxAED6zu4oJduVx96JlnpO6c=",
+      "dev": true,
+      "requires": {
+        "lodash._htmlescapes": "~2.4.1",
+        "lodash.keys": "~2.4.1"
+      },
+      "dependencies": {
+        "lodash.keys": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
+          "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=",
+          "dev": true,
+          "requires": {
+            "lodash._isnative": "~2.4.1",
+            "lodash._shimkeys": "~2.4.1",
+            "lodash.isobject": "~2.4.1"
+          }
+        }
+      }
+    },
+    "lodash._root": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
+      "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=",
+      "dev": true
+    },
+    "lodash._shimkeys": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz",
+      "integrity": "sha1-bpzJZm/wgfC1psl4uD4kLmlJ0gM=",
+      "dev": true,
+      "requires": {
+        "lodash._objecttypes": "~2.4.1"
+      }
+    },
+    "lodash.defaults": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
+      "integrity": "sha1-p+iIXwXmiFEUS24SqPNngCa8TFQ=",
+      "dev": true,
+      "requires": {
+        "lodash._objecttypes": "~2.4.1",
+        "lodash.keys": "~2.4.1"
+      },
+      "dependencies": {
+        "lodash.keys": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
+          "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=",
+          "dev": true,
+          "requires": {
+            "lodash._isnative": "~2.4.1",
+            "lodash._shimkeys": "~2.4.1",
+            "lodash.isobject": "~2.4.1"
+          }
+        }
+      }
+    },
+    "lodash.escape": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
+      "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=",
+      "dev": true,
+      "requires": {
+        "lodash._root": "^3.0.0"
+      }
+    },
+    "lodash.isarguments": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
+      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
+      "dev": true
+    },
+    "lodash.isarray": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
+      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
+      "dev": true
+    },
+    "lodash.isobject": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
+      "integrity": "sha1-Wi5H/mmVPx7mMafrof5k0tBlWPU=",
+      "dev": true,
+      "requires": {
+        "lodash._objecttypes": "~2.4.1"
+      }
+    },
+    "lodash.keys": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
+      "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
+      "dev": true,
+      "requires": {
+        "lodash._getnative": "^3.0.0",
+        "lodash.isarguments": "^3.0.0",
+        "lodash.isarray": "^3.0.0"
+      }
+    },
+    "lodash.restparam": {
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
+      "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=",
+      "dev": true
+    },
+    "lodash.template": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
+      "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=",
+      "dev": true,
+      "requires": {
+        "lodash._basecopy": "^3.0.0",
+        "lodash._basetostring": "^3.0.0",
+        "lodash._basevalues": "^3.0.0",
+        "lodash._isiterateecall": "^3.0.0",
+        "lodash._reinterpolate": "^3.0.0",
+        "lodash.escape": "^3.0.0",
+        "lodash.keys": "^3.0.0",
+        "lodash.restparam": "^3.0.0",
+        "lodash.templatesettings": "^3.0.0"
+      }
+    },
+    "lodash.templatesettings": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz",
+      "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=",
+      "dev": true,
+      "requires": {
+        "lodash._reinterpolate": "^3.0.0",
+        "lodash.escape": "^3.0.0"
+      }
+    },
+    "lodash.values": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/lodash.values/-/lodash.values-2.4.1.tgz",
+      "integrity": "sha1-q/UUQ2s8twUAFieXjLzzCxKA7qQ=",
+      "dev": true,
+      "requires": {
+        "lodash.keys": "~2.4.1"
+      },
+      "dependencies": {
+        "lodash.keys": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
+          "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=",
+          "dev": true,
+          "requires": {
+            "lodash._isnative": "~2.4.1",
+            "lodash._shimkeys": "~2.4.1",
+            "lodash.isobject": "~2.4.1"
+          }
+        }
+      }
+    },
+    "loud-rejection": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
+      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
+      "dev": true,
+      "requires": {
+        "currently-unhandled": "^0.4.1",
+        "signal-exit": "^3.0.0"
+      }
+    },
+    "lru-cache": {
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
+      "integrity": "sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=",
+      "dev": true
+    },
+    "make-iterator": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
+      "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
+      "dev": true,
+      "requires": {
+        "kind-of": "^6.0.2"
+      }
+    },
+    "map-cache": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
+      "dev": true
+    },
+    "map-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
+      "dev": true
+    },
+    "map-stream": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz",
+      "integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=",
+      "dev": true
+    },
+    "map-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+      "dev": true,
+      "requires": {
+        "object-visit": "^1.0.0"
+      }
+    },
+    "marked": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.2.tgz",
+      "integrity": "sha1-AV2xWIZEOPJKZL3WGgQotBhwbQk=",
+      "dev": true
+    },
+    "meow": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
+      "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
+      "dev": true,
+      "requires": {
+        "camelcase-keys": "^2.0.0",
+        "decamelize": "^1.1.2",
+        "loud-rejection": "^1.0.0",
+        "map-obj": "^1.0.1",
+        "minimist": "^1.1.3",
+        "normalize-package-data": "^2.3.4",
+        "object-assign": "^4.0.1",
+        "read-pkg-up": "^1.0.1",
+        "redent": "^1.0.0",
+        "trim-newlines": "^1.0.0"
+      },
+      "dependencies": {
+        "object-assign": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+          "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+          "dev": true
+        }
+      }
+    },
+    "merge-stream": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-0.1.5.tgz",
+      "integrity": "sha1-5oIPet267gA/SMpKWMfFolPV4Fw=",
+      "dev": true,
+      "requires": {
+        "through2": "^0.5.1"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "1.0.34",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
+            "isarray": "0.0.1",
+            "string_decoder": "~0.10.x"
+          }
+        },
+        "through2": {
+          "version": "0.5.1",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
+          "integrity": "sha1-390BLrnHAOIyP9M084rGIqs3Lac=",
+          "dev": true,
+          "requires": {
+            "readable-stream": "~1.0.17",
+            "xtend": "~3.0.0"
+          }
+        },
+        "xtend": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
+          "integrity": "sha1-XM50B7r2Qsunvs2laBEcST9ZZlo=",
+          "dev": true
+        }
+      }
+    },
+    "micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "requires": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      }
+    },
+    "mime": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
+      "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
+      "dev": true
+    },
+    "mime-db": {
+      "version": "1.40.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
+      "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==",
+      "dev": true
+    },
+    "mime-types": {
+      "version": "2.1.24",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
+      "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
+      "dev": true,
+      "requires": {
+        "mime-db": "1.40.0"
+      }
+    },
+    "minimatch": {
+      "version": "2.0.10",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+      "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=",
+      "dev": true,
+      "requires": {
+        "brace-expansion": "^1.0.0"
+      }
+    },
+    "minimist": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+      "dev": true
+    },
+    "mixin-deep": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+      "dev": true,
+      "requires": {
+        "for-in": "^1.0.2",
+        "is-extendable": "^1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
+    "mkdirp": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "dev": true,
+      "requires": {
+        "minimist": "0.0.8"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "0.0.8",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+          "dev": true
+        }
+      }
+    },
+    "ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
+    "multipipe": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
+      "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=",
+      "dev": true,
+      "requires": {
+        "duplexer2": "0.0.2"
+      }
+    },
+    "nanomatch": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+      "dev": true,
+      "requires": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "fragment-cache": "^0.2.1",
+        "is-windows": "^1.0.2",
+        "kind-of": "^6.0.2",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      }
+    },
+    "natives": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.6.tgz",
+      "integrity": "sha512-6+TDFewD4yxY14ptjKaS63GVdtKiES1pTPyxn9Jb0rBqPMZ7VcCiooEhPNsr+mqHtMGxa/5c/HhcC4uPEUw/nA==",
+      "dev": true
+    },
+    "negotiator": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
+      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
+      "dev": true
+    },
+    "normalize-package-data": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "dev": true,
+      "requires": {
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      }
+    },
+    "number-is-nan": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+      "dev": true
+    },
+    "object-assign": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
+      "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=",
+      "dev": true
+    },
+    "object-copy": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+      "dev": true,
+      "requires": {
+        "copy-descriptor": "^0.1.0",
+        "define-property": "^0.2.5",
+        "kind-of": "^3.0.3"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "object-visit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.0"
+      }
+    },
+    "object.defaults": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
+      "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=",
+      "dev": true,
+      "requires": {
+        "array-each": "^1.0.1",
+        "array-slice": "^1.0.0",
+        "for-own": "^1.0.0",
+        "isobject": "^3.0.0"
+      }
+    },
+    "object.map": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
+      "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=",
+      "dev": true,
+      "requires": {
+        "for-own": "^1.0.0",
+        "make-iterator": "^1.0.0"
+      }
+    },
+    "object.pick": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.1"
+      }
+    },
+    "on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "dev": true,
+      "requires": {
+        "ee-first": "1.1.1"
+      }
+    },
+    "once": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+      "integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=",
+      "dev": true,
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "opn": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/opn/-/opn-5.2.0.tgz",
+      "integrity": "sha512-Jd/GpzPyHF4P2/aNOVmS3lfMSWV9J7cOhCG1s08XCEAsPkB7lp6ddiU0J7XzyQRDUh8BqJ7PchfINjR8jyofRQ==",
+      "dev": true,
+      "requires": {
+        "is-wsl": "^1.1.0"
+      }
+    },
+    "orchestrator": {
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.8.tgz",
+      "integrity": "sha1-FOfp4nZPcxX7rBhOUGx6pt+UrX4=",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "~0.1.5",
+        "sequencify": "~0.0.7",
+        "stream-consume": "~0.1.0"
+      }
+    },
+    "ordered-read-streams": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz",
+      "integrity": "sha1-/VZamvjrRHO6abbtijQ1LLVS8SY=",
+      "dev": true
+    },
+    "os-homedir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+      "dev": true
+    },
+    "parse-filepath": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
+      "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=",
+      "dev": true,
+      "requires": {
+        "is-absolute": "^1.0.0",
+        "map-cache": "^0.2.0",
+        "path-root": "^0.1.1"
+      }
+    },
+    "parse-json": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+      "dev": true,
+      "requires": {
+        "error-ex": "^1.2.0"
+      }
+    },
+    "parse-node-version": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
+      "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
+      "dev": true
+    },
+    "parse-passwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
+      "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
+      "dev": true
+    },
+    "parseurl": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+      "dev": true
+    },
+    "pascalcase": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
+      "dev": true
+    },
+    "path": {
+      "version": "0.4.9",
+      "resolved": "https://registry.npmjs.org/path/-/path-0.4.9.tgz",
+      "integrity": "sha1-OAxo0BJz5D+TaNetUP7l4+jUd/A=",
+      "dev": true
+    },
+    "path-exists": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+      "dev": true,
+      "requires": {
+        "pinkie-promise": "^2.0.0"
+      }
+    },
+    "path-parse": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+      "dev": true
+    },
+    "path-root": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
+      "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=",
+      "dev": true,
+      "requires": {
+        "path-root-regex": "^0.1.0"
+      }
+    },
+    "path-root-regex": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
+      "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=",
+      "dev": true
+    },
+    "path-type": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      },
+      "dependencies": {
+        "graceful-fs": {
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
+          "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==",
+          "dev": true
+        }
+      }
+    },
+    "pause-stream": {
+      "version": "0.0.11",
+      "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
+      "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
+      "dev": true,
+      "requires": {
+        "through": "~2.3"
+      }
+    },
+    "pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+      "dev": true
+    },
+    "pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+      "dev": true
+    },
+    "pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "dev": true,
+      "requires": {
+        "pinkie": "^2.0.0"
+      }
+    },
+    "plugin-log": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/plugin-log/-/plugin-log-0.1.0.tgz",
+      "integrity": "sha1-hgSc9qsQgzOYqTHzaJy67nteEzM=",
+      "dev": true,
+      "requires": {
+        "chalk": "^1.1.1",
+        "dateformat": "^1.0.11"
+      },
+      "dependencies": {
+        "dateformat": {
+          "version": "1.0.12",
+          "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
+          "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=",
+          "dev": true,
+          "requires": {
+            "get-stdin": "^4.0.1",
+            "meow": "^3.3.0"
+          }
+        }
+      }
+    },
+    "posix-character-classes": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
+      "dev": true
+    },
+    "pretty-hrtime": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
+      "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
+      "dev": true
+    },
+    "process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "dev": true
+    },
+    "qs": {
+      "version": "6.9.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.0.tgz",
+      "integrity": "sha512-27RP4UotQORTpmNQDX8BHPukOnBP3p1uUJY5UnDhaJB+rMt9iMsok724XL+UHU23bEFOHRMQ2ZhI99qOWUMGFA==",
+      "dev": true
+    },
+    "range-parser": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+      "dev": true
+    },
+    "raw-body": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-1.1.7.tgz",
+      "integrity": "sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU=",
+      "dev": true,
+      "requires": {
+        "bytes": "1",
+        "string_decoder": "0.10"
+      }
+    },
+    "read-pkg": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+      "dev": true,
+      "requires": {
+        "load-json-file": "^1.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^1.0.0"
+      }
+    },
+    "read-pkg-up": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+      "dev": true,
+      "requires": {
+        "find-up": "^1.0.0",
+        "read-pkg": "^1.0.0"
+      }
+    },
+    "readable-stream": {
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+      "dev": true,
+      "requires": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "rechoir": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
+      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
+      "dev": true,
+      "requires": {
+        "resolve": "^1.1.6"
+      }
+    },
+    "redent": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
+      "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
+      "dev": true,
+      "requires": {
+        "indent-string": "^2.1.0",
+        "strip-indent": "^1.0.1"
+      }
+    },
+    "regex-not": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^3.0.2",
+        "safe-regex": "^1.1.0"
+      }
+    },
+    "repeat-element": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
+      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
+      "dev": true
+    },
+    "repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
+      "dev": true
+    },
+    "repeating": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
+      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
+      "dev": true,
+      "requires": {
+        "is-finite": "^1.0.0"
+      }
+    },
+    "replace-ext": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
+      "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
+      "dev": true
+    },
+    "resolve": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
+      "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
+      "dev": true,
+      "requires": {
+        "path-parse": "^1.0.6"
+      }
+    },
+    "resolve-dir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
+      "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
+      "dev": true,
+      "requires": {
+        "expand-tilde": "^2.0.0",
+        "global-modules": "^1.0.0"
+      }
+    },
+    "resolve-url": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
+      "dev": true
+    },
+    "ret": {
+      "version": "0.1.15",
+      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+      "dev": true
+    },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "safe-json-parse": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/safe-json-parse/-/safe-json-parse-1.0.1.tgz",
+      "integrity": "sha1-PnZyPjjf3aE8mx0poeB//uSzC1c=",
+      "dev": true
+    },
+    "safe-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+      "dev": true,
+      "requires": {
+        "ret": "~0.1.10"
+      }
+    },
+    "semver": {
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
+      "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=",
+      "dev": true
+    },
+    "send": {
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
+      "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "destroy": "~1.0.4",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "~1.6.2",
+        "mime": "1.4.1",
+        "ms": "2.0.0",
+        "on-finished": "~2.3.0",
+        "range-parser": "~1.2.0",
+        "statuses": "~1.4.0"
+      },
+      "dependencies": {
+        "statuses": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
+          "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==",
+          "dev": true
+        }
+      }
+    },
+    "sequencify": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz",
+      "integrity": "sha1-kM/xnQLgcCf9dn9erT57ldHnOAw=",
+      "dev": true
+    },
+    "serve-index": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
+      "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
+      "dev": true,
+      "requires": {
+        "accepts": "~1.3.4",
+        "batch": "0.6.1",
+        "debug": "2.6.9",
+        "escape-html": "~1.0.3",
+        "http-errors": "~1.6.2",
+        "mime-types": "~2.1.17",
+        "parseurl": "~1.3.2"
+      }
+    },
+    "serve-static": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
+      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
+      "dev": true,
+      "requires": {
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.3",
+        "send": "0.17.1"
+      },
+      "dependencies": {
+        "http-errors": {
+          "version": "1.7.3",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz",
+          "integrity": "sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==",
+          "dev": true,
+          "requires": {
+            "depd": "~1.1.2",
+            "inherits": "2.0.4",
+            "setprototypeof": "1.1.1",
+            "statuses": ">= 1.5.0 < 2",
+            "toidentifier": "1.0.0"
+          }
+        },
+        "mime": {
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+          "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+          "dev": true
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "dev": true
+        },
+        "send": {
+          "version": "0.17.1",
+          "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
+          "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
+          "dev": true,
+          "requires": {
+            "debug": "2.6.9",
+            "depd": "~1.1.2",
+            "destroy": "~1.0.4",
+            "encodeurl": "~1.0.2",
+            "escape-html": "~1.0.3",
+            "etag": "~1.8.1",
+            "fresh": "0.5.2",
+            "http-errors": "~1.7.2",
+            "mime": "1.6.0",
+            "ms": "2.1.1",
+            "on-finished": "~2.3.0",
+            "range-parser": "~1.2.1",
+            "statuses": "~1.5.0"
+          }
+        },
+        "setprototypeof": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
+          "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==",
+          "dev": true
+        }
+      }
+    },
+    "set-value": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^2.0.1",
+        "is-extendable": "^0.1.1",
+        "is-plain-object": "^2.0.3",
+        "split-string": "^3.0.1"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "setprototypeof": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+      "dev": true
+    },
+    "sigmund": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
+      "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=",
+      "dev": true
+    },
+    "signal-exit": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+      "dev": true
+    },
+    "snapdragon": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+      "dev": true,
+      "requires": {
+        "base": "^0.11.1",
+        "debug": "^2.2.0",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "map-cache": "^0.2.2",
+        "source-map": "^0.5.6",
+        "source-map-resolve": "^0.5.0",
+        "use": "^3.1.0"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "snapdragon-node": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+      "dev": true,
+      "requires": {
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.0",
+        "snapdragon-util": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "snapdragon-util": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.2.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+      "dev": true
+    },
+    "source-map-resolve": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
+      "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+      "dev": true,
+      "requires": {
+        "atob": "^2.1.1",
+        "decode-uri-component": "^0.2.0",
+        "resolve-url": "^0.2.1",
+        "source-map-url": "^0.4.0",
+        "urix": "^0.1.0"
+      }
+    },
+    "source-map-url": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
+      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
+      "dev": true
+    },
+    "sparkles": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz",
+      "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==",
+      "dev": true
+    },
+    "spdx-correct": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
+      "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
+      "dev": true,
+      "requires": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-exceptions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
+      "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==",
+      "dev": true
+    },
+    "spdx-expression-parse": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
+      "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+      "dev": true,
+      "requires": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-license-ids": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
+      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
+      "dev": true
+    },
+    "split": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
+      "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
+      "dev": true,
+      "requires": {
+        "through": "2"
+      }
+    },
+    "split-string": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^3.0.0"
+      }
+    },
+    "static-extend": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
+      "dev": true,
+      "requires": {
+        "define-property": "^0.2.5",
+        "object-copy": "^0.1.0"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
+      }
+    },
+    "statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+      "dev": true
+    },
+    "stream-combiner": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.2.2.tgz",
+      "integrity": "sha1-rsjLrBd7Vrb0+kec7YwZEs7lKFg=",
+      "dev": true,
+      "requires": {
+        "duplexer": "~0.1.1",
+        "through": "~2.3.4"
+      }
+    },
+    "stream-consume": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.1.tgz",
+      "integrity": "sha512-tNa3hzgkjEP7XbCkbRXe1jpg+ievoa0O4SCFlMOYEscGSS4JJsckGL8swUyAa/ApGU3Ae4t6Honor4HhL+tRyg==",
+      "dev": true
+    },
+    "string-template": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz",
+      "integrity": "sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=",
+      "dev": true
+    },
+    "string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+      "dev": true
+    },
+    "strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^2.0.0"
+      }
+    },
+    "strip-bom": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
+      "integrity": "sha1-hbiGLzhEtabV7IRnqTWYFzo295Q=",
+      "dev": true,
+      "requires": {
+        "first-chunk-stream": "^1.0.0",
+        "is-utf8": "^0.2.0"
+      }
+    },
+    "strip-indent": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
+      "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
+      "dev": true,
+      "requires": {
+        "get-stdin": "^4.0.1"
+      }
+    },
+    "supports-color": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+      "dev": true
+    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+      "dev": true
+    },
+    "through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "requires": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
+    "tildify": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz",
+      "integrity": "sha1-3OwD9V3Km3qj5bBPIYF+tW5jWIo=",
+      "dev": true,
+      "requires": {
+        "os-homedir": "^1.0.0"
+      }
+    },
+    "time-stamp": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
+      "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
+      "dev": true
+    },
+    "tiny-lr": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.1.tgz",
+      "integrity": "sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA==",
+      "dev": true,
+      "requires": {
+        "body": "^5.1.0",
+        "debug": "^3.1.0",
+        "faye-websocket": "~0.10.0",
+        "livereload-js": "^2.3.0",
+        "object-assign": "^4.1.0",
+        "qs": "^6.4.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        },
+        "object-assign": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+          "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+          "dev": true
+        }
+      }
+    },
+    "to-object-path": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "to-regex": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+      "dev": true,
+      "requires": {
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "regex-not": "^1.0.2",
+        "safe-regex": "^1.1.0"
+      }
+    },
+    "to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+      "dev": true,
+      "requires": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      }
+    },
+    "toidentifier": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
+      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
+      "dev": true
+    },
+    "trim-newlines": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
+      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
+      "dev": true
+    },
+    "unc-path-regex": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
+      "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
+      "dev": true
+    },
+    "union-value": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
+      "dev": true,
+      "requires": {
+        "arr-union": "^3.1.0",
+        "get-value": "^2.0.6",
+        "is-extendable": "^0.1.1",
+        "set-value": "^2.0.1"
+      }
+    },
+    "unique-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz",
+      "integrity": "sha1-1ZpKdUJ0R9mqbJHnAmP40mpLEEs=",
+      "dev": true
+    },
+    "unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+      "dev": true
+    },
+    "unset-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+      "dev": true,
+      "requires": {
+        "has-value": "^0.3.1",
+        "isobject": "^3.0.0"
+      },
+      "dependencies": {
+        "has-value": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+          "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+          "dev": true,
+          "requires": {
+            "get-value": "^2.0.3",
+            "has-values": "^0.1.4",
+            "isobject": "^2.0.0"
+          },
+          "dependencies": {
+            "isobject": {
+              "version": "2.1.0",
+              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+              "dev": true,
+              "requires": {
+                "isarray": "1.0.0"
+              }
+            }
+          }
+        },
+        "has-values": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
+          "dev": true
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        }
+      }
+    },
+    "urix": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
+      "dev": true
+    },
+    "use": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
+      "dev": true
+    },
+    "user-home": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
+      "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=",
+      "dev": true
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
+    },
+    "utils-merge": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
+      "dev": true
+    },
+    "v8flags": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz",
+      "integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=",
+      "dev": true,
+      "requires": {
+        "user-home": "^1.1.1"
+      }
+    },
+    "validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dev": true,
+      "requires": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "vinyl": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
+      "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=",
+      "dev": true,
+      "requires": {
+        "clone": "^1.0.0",
+        "clone-stats": "^0.0.1",
+        "replace-ext": "0.0.1"
+      }
+    },
+    "vinyl-fs": {
+      "version": "0.3.14",
+      "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.14.tgz",
+      "integrity": "sha1-mmhRzhysHBzqX+hsCTHWIMLPqeY=",
+      "dev": true,
+      "requires": {
+        "defaults": "^1.0.0",
+        "glob-stream": "^3.1.5",
+        "glob-watcher": "^0.0.6",
+        "graceful-fs": "^3.0.0",
+        "mkdirp": "^0.5.0",
+        "strip-bom": "^1.0.0",
+        "through2": "^0.6.1",
+        "vinyl": "^0.4.0"
+      },
+      "dependencies": {
+        "clone": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
+          "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "1.0.34",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
+            "isarray": "0.0.1",
+            "string_decoder": "~0.10.x"
+          }
+        },
+        "through2": {
+          "version": "0.6.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+          "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
+          "dev": true,
+          "requires": {
+            "readable-stream": ">=1.0.33-1 <1.1.0-0",
+            "xtend": ">=4.0.0 <4.1.0-0"
+          }
+        },
+        "vinyl": {
+          "version": "0.4.6",
+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
+          "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
+          "dev": true,
+          "requires": {
+            "clone": "^0.2.0",
+            "clone-stats": "^0.0.1"
+          }
+        }
+      }
+    },
+    "websocket-driver": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.3.tgz",
+      "integrity": "sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==",
+      "dev": true,
+      "requires": {
+        "http-parser-js": ">=0.4.0 <0.4.11",
+        "safe-buffer": ">=5.1.0",
+        "websocket-extensions": ">=0.1.1"
+      }
+    },
+    "websocket-extensions": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz",
+      "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==",
+      "dev": true
+    },
+    "which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
+    "xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+      "dev": true
+    }
+  }
+}
diff --git a/src/Umbraco.Web.UI.Docs/package.json b/src/Umbraco.Web.UI.Docs/package.json
new file mode 100644
index 0000000000..843740482e
--- /dev/null
+++ b/src/Umbraco.Web.UI.Docs/package.json
@@ -0,0 +1,14 @@
+{
+  "private": true,
+  "scripts": {
+    "docs": "gulp docs",
+    "start": "gulp docs",
+    "default": "gulp docs"
+  },
+  "devDependencies": {
+    "gulp": "^3.9.1",
+    "gulp-connect": "5.6.1",
+    "gulp-ngdocs": "0.3.0",
+    "gulp-open": "3.0.1"
+  }
+}
diff --git a/src/Umbraco.Web.UI.Client/docs/umb-docs.css b/src/Umbraco.Web.UI.Docs/umb-docs.css
similarity index 100%
rename from src/Umbraco.Web.UI.Client/docs/umb-docs.css
rename to src/Umbraco.Web.UI.Docs/umb-docs.css

From a341bc19fbcc70716b1a746d467a0a23d0183dc1 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Wed, 25 Sep 2019 11:57:10 +0200
Subject: [PATCH 711/776] Remove package lock from the docs build to prevent
 more githubs security warnings

Regenerate package lock in Web.UI.Client to remove old docs references that no longer need to be there
---
 src/Umbraco.Web.UI.Client/package-lock.json | 4743 +++++++++++--------
 src/Umbraco.Web.UI.Docs/package-lock.json   | 3612 --------------
 2 files changed, 2743 insertions(+), 5612 deletions(-)
 delete mode 100644 src/Umbraco.Web.UI.Docs/package-lock.json

diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json
index eb9b5141f7..e8682e746d 100644
--- a/src/Umbraco.Web.UI.Client/package-lock.json
+++ b/src/Umbraco.Web.UI.Client/package-lock.json
@@ -3,9 +3,9 @@
   "lockfileVersion": 1,
   "dependencies": {
     "@babel/code-frame": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz",
-      "integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==",
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz",
+      "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==",
       "dev": true,
       "requires": {
         "@babel/highlight": "^7.0.0"
@@ -34,16 +34,23 @@
       }
     },
     "@babel/generator": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.1.6.tgz",
-      "integrity": "sha512-brwPBtVvdYdGxtenbQgfCdDPmtkmUBZPjUoK5SXJEBuHaA5BCubh9ly65fzXz7R6o5rA76Rs22ES8Z+HCc0YIQ==",
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.6.2.tgz",
+      "integrity": "sha512-j8iHaIW4gGPnViaIHI7e9t/Hl8qLjERI6DcV9kEpAIDJsAOrcnXqRS7t+QbhL76pwbtqP+QCQLL0z1CyVmtjjQ==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.1.6",
+        "@babel/types": "^7.6.0",
         "jsesc": "^2.5.1",
-        "lodash": "^4.17.10",
-        "source-map": "^0.5.0",
-        "trim-right": "^1.0.1"
+        "lodash": "^4.17.13",
+        "source-map": "^0.5.0"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.15",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+          "dev": true
+        }
       }
     },
     "@babel/helper-annotate-as-pure": {
@@ -66,25 +73,33 @@
       }
     },
     "@babel/helper-call-delegate": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.1.0.tgz",
-      "integrity": "sha512-YEtYZrw3GUK6emQHKthltKNZwszBcHK58Ygcis+gVUrF4/FmTVr5CCqQNSfmvg2y+YDEANyYoaLz/SHsnusCwQ==",
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.4.4.tgz",
+      "integrity": "sha512-l79boDFJ8S1c5hvQvG+rc+wHw6IuH7YldmRKsYtpbawsxURu/paVy57FZMomGK22/JckepaikOkY0MoAmdyOlQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-hoist-variables": "^7.0.0",
-        "@babel/traverse": "^7.1.0",
-        "@babel/types": "^7.0.0"
+        "@babel/helper-hoist-variables": "^7.4.4",
+        "@babel/traverse": "^7.4.4",
+        "@babel/types": "^7.4.4"
       }
     },
     "@babel/helper-define-map": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.1.0.tgz",
-      "integrity": "sha512-yPPcW8dc3gZLN+U1mhYV91QU3n5uTbx7DUdf8NnPbjS0RMwBuHi9Xt2MUgppmNz7CJxTBWsGczTiEp1CSOTPRg==",
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.5.5.tgz",
+      "integrity": "sha512-fTfxx7i0B5NJqvUOBBGREnrqbTxRh7zinBANpZXAVDlsZxYdclDp467G1sQ8VZYMnAURY3RpBUAgOYT9GfzHBg==",
       "dev": true,
       "requires": {
         "@babel/helper-function-name": "^7.1.0",
-        "@babel/types": "^7.0.0",
-        "lodash": "^4.17.10"
+        "@babel/types": "^7.5.5",
+        "lodash": "^4.17.13"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.15",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+          "dev": true
+        }
       }
     },
     "@babel/helper-explode-assignable-expression": {
@@ -118,21 +133,21 @@
       }
     },
     "@babel/helper-hoist-variables": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.0.0.tgz",
-      "integrity": "sha512-Ggv5sldXUeSKsuzLkddtyhyHe2YantsxWKNi7A+7LeD12ExRDWTRk29JCXpaHPAbMaIPZSil7n+lq78WY2VY7w==",
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz",
+      "integrity": "sha512-VYk2/H/BnYbZDDg39hr3t2kKyifAm1W6zHRfhx8jGjIHpQEBv9dry7oQ2f3+J703TLu69nYdxsovl0XYfcnK4w==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.0.0"
+        "@babel/types": "^7.4.4"
       }
     },
     "@babel/helper-member-expression-to-functions": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.0.0.tgz",
-      "integrity": "sha512-avo+lm/QmZlv27Zsi0xEor2fKcqWG56D5ae9dzklpIaY7cQMK5N8VSpaNVPPagiqmy7LrEjK1IWdGMOqPu5csg==",
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.5.5.tgz",
+      "integrity": "sha512-5qZ3D1uMclSNqYcXqiHoA0meVdv+xUEex9em2fqMnrk/scphGlGgg66zjMrPJESPwrFJ6sbfFQYUSa0Mz7FabA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.0.0"
+        "@babel/types": "^7.5.5"
       }
     },
     "@babel/helper-module-imports": {
@@ -145,17 +160,25 @@
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.1.0.tgz",
-      "integrity": "sha512-0JZRd2yhawo79Rcm4w0LwSMILFmFXjugG3yqf+P/UsKsRS1mJCmMwwlHDlMg7Avr9LrvSpp4ZSULO9r8jpCzcw==",
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.5.5.tgz",
+      "integrity": "sha512-jBeCvETKuJqeiaCdyaheF40aXnnU1+wkSiUs/IQg3tB85up1LyL8x77ClY8qJpuRJUcXQo+ZtdNESmZl4j56Pw==",
       "dev": true,
       "requires": {
         "@babel/helper-module-imports": "^7.0.0",
         "@babel/helper-simple-access": "^7.1.0",
-        "@babel/helper-split-export-declaration": "^7.0.0",
-        "@babel/template": "^7.1.0",
-        "@babel/types": "^7.0.0",
-        "lodash": "^4.17.10"
+        "@babel/helper-split-export-declaration": "^7.4.4",
+        "@babel/template": "^7.4.4",
+        "@babel/types": "^7.5.5",
+        "lodash": "^4.17.13"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.15",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+          "dev": true
+        }
       }
     },
     "@babel/helper-optimise-call-expression": {
@@ -174,12 +197,20 @@
       "dev": true
     },
     "@babel/helper-regex": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.0.0.tgz",
-      "integrity": "sha512-TR0/N0NDCcUIUEbqV6dCO+LptmmSQFQ7q70lfcEB4URsjD0E1HzicrwUH+ap6BAQ2jhCX9Q4UqZy4wilujWlkg==",
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.5.5.tgz",
+      "integrity": "sha512-CkCYQLkfkiugbRDO8eZn6lRuR8kzZoGXCg3149iTk5se7g6qykSpy3+hELSwquhu+TgHn8nkLiBwHvNX8Hofcw==",
       "dev": true,
       "requires": {
-        "lodash": "^4.17.10"
+        "lodash": "^4.17.13"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.15",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+          "dev": true
+        }
       }
     },
     "@babel/helper-remap-async-to-generator": {
@@ -196,15 +227,15 @@
       }
     },
     "@babel/helper-replace-supers": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.1.0.tgz",
-      "integrity": "sha512-BvcDWYZRWVuDeXTYZWxekQNO5D4kO55aArwZOTFXw6rlLQA8ZaDicJR1sO47h+HrnCiDFiww0fSPV0d713KBGQ==",
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.5.5.tgz",
+      "integrity": "sha512-XvRFWrNnlsow2u7jXDuH4jDDctkxbS7gXssrP4q2nUD606ukXHRvydj346wmNg+zAgpFx4MWf4+usfC93bElJg==",
       "dev": true,
       "requires": {
-        "@babel/helper-member-expression-to-functions": "^7.0.0",
+        "@babel/helper-member-expression-to-functions": "^7.5.5",
         "@babel/helper-optimise-call-expression": "^7.0.0",
-        "@babel/traverse": "^7.1.0",
-        "@babel/types": "^7.0.0"
+        "@babel/traverse": "^7.5.5",
+        "@babel/types": "^7.5.5"
       }
     },
     "@babel/helper-simple-access": {
@@ -218,41 +249,41 @@
       }
     },
     "@babel/helper-split-export-declaration": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz",
-      "integrity": "sha512-MXkOJqva62dfC0w85mEf/LucPPS/1+04nmmRMPEBUB++hiiThQ2zPtX/mEWQ3mtzCEjIJvPY8nuwxXtQeQwUag==",
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz",
+      "integrity": "sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.0.0"
+        "@babel/types": "^7.4.4"
       }
     },
     "@babel/helper-wrap-function": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.1.0.tgz",
-      "integrity": "sha512-R6HU3dete+rwsdAfrOzTlE9Mcpk4RjU3aX3gi9grtmugQY0u79X7eogUvfXA5sI81Mfq1cn6AgxihfN33STjJA==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz",
+      "integrity": "sha512-o9fP1BZLLSrYlxYEYyl2aS+Flun5gtjTIG8iln+XuEzQTs0PLagAGSXUcqruJwD5fM48jzIEggCKpIfWTcR7pQ==",
       "dev": true,
       "requires": {
         "@babel/helper-function-name": "^7.1.0",
         "@babel/template": "^7.1.0",
         "@babel/traverse": "^7.1.0",
-        "@babel/types": "^7.0.0"
+        "@babel/types": "^7.2.0"
       }
     },
     "@babel/helpers": {
-      "version": "7.1.5",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.1.5.tgz",
-      "integrity": "sha512-2jkcdL02ywNBry1YNFAH/fViq4fXG0vdckHqeJk+75fpQ2OH+Az6076tX/M0835zA45E0Cqa6pV5Kiv9YOqjEg==",
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.6.2.tgz",
+      "integrity": "sha512-3/bAUL8zZxYs1cdX2ilEE0WobqbCmKWr/889lf2SS0PpDcpEIY8pb1CCyz0pEcX3pEb+MCbks1jIokz2xLtGTA==",
       "dev": true,
       "requires": {
-        "@babel/template": "^7.1.2",
-        "@babel/traverse": "^7.1.5",
-        "@babel/types": "^7.1.5"
+        "@babel/template": "^7.6.0",
+        "@babel/traverse": "^7.6.2",
+        "@babel/types": "^7.6.0"
       }
     },
     "@babel/highlight": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz",
-      "integrity": "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==",
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz",
+      "integrity": "sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==",
       "dev": true,
       "requires": {
         "chalk": "^2.0.0",
@@ -261,112 +292,112 @@
       }
     },
     "@babel/parser": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.1.6.tgz",
-      "integrity": "sha512-dWP6LJm9nKT6ALaa+bnL247GHHMWir3vSlZ2+IHgHgktZQx0L3Uvq2uAWcuzIe+fujRsYWBW2q622C5UvGK9iQ==",
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.6.2.tgz",
+      "integrity": "sha512-mdFqWrSPCmikBoaBYMuBulzTIKuXVPtEISFbRRVNwMWpCms/hmE2kRq0bblUHaNRKrjRlmVbx1sDHmjmRgD2Xg==",
       "dev": true
     },
     "@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.1.0.tgz",
-      "integrity": "sha512-Fq803F3Jcxo20MXUSDdmZZXrPe6BWyGcWBPPNB/M7WaUYESKDeKMOGIxEzQOjGSmW/NWb6UaPZrtTB2ekhB/ew==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz",
+      "integrity": "sha512-+Dfo/SCQqrwx48ptLVGLdE39YtWRuKc/Y9I5Fy0P1DDBB9lsAHpjcEJQt+4IifuSOSTLBKJObJqMvaO1pIE8LQ==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "@babel/helper-remap-async-to-generator": "^7.1.0",
-        "@babel/plugin-syntax-async-generators": "^7.0.0"
+        "@babel/plugin-syntax-async-generators": "^7.2.0"
       }
     },
     "@babel/plugin-proposal-json-strings": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.0.0.tgz",
-      "integrity": "sha512-kfVdUkIAGJIVmHmtS/40i/fg/AGnw/rsZBCaapY5yjeO5RA9m165Xbw9KMOu2nqXP5dTFjEjHdfNdoVcHv133Q==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz",
+      "integrity": "sha512-MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-syntax-json-strings": "^7.0.0"
+        "@babel/plugin-syntax-json-strings": "^7.2.0"
       }
     },
     "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.0.0.tgz",
-      "integrity": "sha512-14fhfoPcNu7itSen7Py1iGN0gEm87hX/B+8nZPqkdmANyyYWYMY2pjA3r8WXbWVKMzfnSNS0xY8GVS0IjXi/iw==",
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.6.2.tgz",
+      "integrity": "sha512-LDBXlmADCsMZV1Y9OQwMc0MyGZ8Ta/zlD9N67BfQT8uYwkRswiu2hU6nJKrjrt/58aH/vqfQlR/9yId/7A2gWw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-syntax-object-rest-spread": "^7.0.0"
+        "@babel/plugin-syntax-object-rest-spread": "^7.2.0"
       }
     },
     "@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.0.0.tgz",
-      "integrity": "sha512-JPqAvLG1s13B/AuoBjdBYvn38RqW6n1TzrQO839/sIpqLpbnXKacsAgpZHzLD83Sm8SDXMkkrAvEnJ25+0yIpw==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz",
+      "integrity": "sha512-mgYj3jCcxug6KUcX4OBoOJz3CMrwRfQELPQ5560F70YQUBZB7uac9fqaWamKR1iWUzGiK2t0ygzjTScZnVz75g==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.0.0"
+        "@babel/plugin-syntax-optional-catch-binding": "^7.2.0"
       }
     },
     "@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.0.0.tgz",
-      "integrity": "sha512-tM3icA6GhC3ch2SkmSxv7J/hCWKISzwycub6eGsDrFDgukD4dZ/I+x81XgW0YslS6mzNuQ1Cbzh5osjIMgepPQ==",
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.6.2.tgz",
+      "integrity": "sha512-NxHETdmpeSCtiatMRYWVJo7266rrvAC3DTeG5exQBIH/fMIUK7ejDNznBbn3HQl/o9peymRRg7Yqkx6PdUXmMw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-regex": "^7.0.0",
-        "regexpu-core": "^4.2.0"
+        "@babel/helper-regex": "^7.4.4",
+        "regexpu-core": "^4.6.0"
       }
     },
     "@babel/plugin-syntax-async-generators": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.0.0.tgz",
-      "integrity": "sha512-im7ged00ddGKAjcZgewXmp1vxSZQQywuQXe2B1A7kajjZmDeY/ekMPmWr9zJgveSaQH0k7BcGrojQhcK06l0zA==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz",
+      "integrity": "sha512-1ZrIRBv2t0GSlcwVoQ6VgSLpLgiN/FVQUzt9znxo7v2Ov4jJrs8RY8tv0wvDmFN3qIdMKWrmMMW6yZ0G19MfGg==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-syntax-json-strings": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.0.0.tgz",
-      "integrity": "sha512-UlSfNydC+XLj4bw7ijpldc1uZ/HB84vw+U6BTuqMdIEmz/LDe63w/GHtpQMdXWdqQZFeAI9PjnHe/vDhwirhKA==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz",
+      "integrity": "sha512-5UGYnMSLRE1dqqZwug+1LISpA403HzlSfsg6P9VXU6TBjcSHeNlw4DxDx7LgpF+iKZoOG/+uzqoRHTdcUpiZNg==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-syntax-object-rest-spread": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.0.0.tgz",
-      "integrity": "sha512-5A0n4p6bIiVe5OvQPxBnesezsgFJdHhSs3uFSvaPdMqtsovajLZ+G2vZyvNe10EzJBWWo3AcHGKhAFUxqwp2dw==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz",
+      "integrity": "sha512-t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-syntax-optional-catch-binding": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.0.0.tgz",
-      "integrity": "sha512-Wc+HVvwjcq5qBg1w5RG9o9RVzmCaAg/Vp0erHCKpAYV8La6I94o4GQAmFYNmkzoMO6gzoOSulpKeSSz6mPEoZw==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz",
+      "integrity": "sha512-bDe4xKNhb0LI7IvZHiA13kff0KEfaGX/Hv4lMA9+7TEc63hMNvfKo6ZFpXhKuEp+II/q35Gc4NoMeDZyaUbj9w==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-arrow-functions": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.0.0.tgz",
-      "integrity": "sha512-2EZDBl1WIO/q4DIkIp4s86sdp4ZifL51MoIviLY/gG/mLSuOIEg7J8o6mhbxOTvUJkaN50n+8u41FVsr5KLy/w==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz",
+      "integrity": "sha512-ER77Cax1+8/8jCB9fo4Ud161OZzWN5qawi4GusDuRLcDbDG+bIGYY20zb2dfAFdTRGzrfq2xZPvF0R64EHnimg==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-async-to-generator": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.1.0.tgz",
-      "integrity": "sha512-rNmcmoQ78IrvNCIt/R9U+cixUHeYAzgusTFgIAv+wQb9HJU4szhpDD6e5GCACmj/JP5KxuCwM96bX3L9v4ZN/g==",
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.5.0.tgz",
+      "integrity": "sha512-mqvkzwIGkq0bEF1zLRRiTdjfomZJDV33AH3oQzHVGkI2VzEmXLpKKOBvEVaFZBJdN0XTyH38s9j/Kiqr68dggg==",
       "dev": true,
       "requires": {
         "@babel/helper-module-imports": "^7.0.0",
@@ -375,82 +406,90 @@
       }
     },
     "@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.0.0.tgz",
-      "integrity": "sha512-AOBiyUp7vYTqz2Jibe1UaAWL0Hl9JUXEgjFvvvcSc9MVDItv46ViXFw2F7SVt1B5k+KWjl44eeXOAk3UDEaJjQ==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz",
+      "integrity": "sha512-ntQPR6q1/NKuphly49+QiQiTN0O63uOwjdD6dhIjSWBI5xlrbUFh720TIpzBhpnrLfv2tNH/BXvLIab1+BAI0w==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-block-scoping": {
-      "version": "7.1.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.1.5.tgz",
-      "integrity": "sha512-jlYcDrz+5ayWC7mxgpn1Wj8zj0mmjCT2w0mPIMSwO926eXBRxpEgoN/uQVRBfjtr8ayjcmS+xk2G1jaP8JjMJQ==",
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.6.2.tgz",
+      "integrity": "sha512-zZT8ivau9LOQQaOGC7bQLQOT4XPkPXgN2ERfUgk1X8ql+mVkLc4E8eKk+FO3o0154kxzqenWCorfmEXpEZcrSQ==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
-        "lodash": "^4.17.10"
+        "lodash": "^4.17.13"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.15",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+          "dev": true
+        }
       }
     },
     "@babel/plugin-transform-classes": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.1.0.tgz",
-      "integrity": "sha512-rNaqoD+4OCBZjM7VaskladgqnZ1LO6o2UxuWSDzljzW21pN1KXkB7BstAVweZdxQkHAujps5QMNOTWesBciKFg==",
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.5.5.tgz",
+      "integrity": "sha512-U2htCNK/6e9K7jGyJ++1p5XRU+LJjrwtoiVn9SzRlDT2KubcZ11OOwy3s24TjHxPgxNwonCYP7U2K51uVYCMDg==",
       "dev": true,
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.0.0",
-        "@babel/helper-define-map": "^7.1.0",
+        "@babel/helper-define-map": "^7.5.5",
         "@babel/helper-function-name": "^7.1.0",
         "@babel/helper-optimise-call-expression": "^7.0.0",
         "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-replace-supers": "^7.1.0",
-        "@babel/helper-split-export-declaration": "^7.0.0",
+        "@babel/helper-replace-supers": "^7.5.5",
+        "@babel/helper-split-export-declaration": "^7.4.4",
         "globals": "^11.1.0"
       }
     },
     "@babel/plugin-transform-computed-properties": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.0.0.tgz",
-      "integrity": "sha512-ubouZdChNAv4AAWAgU7QKbB93NU5sHwInEWfp+/OzJKA02E6Woh9RVoX4sZrbRwtybky/d7baTUqwFx+HgbvMA==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz",
+      "integrity": "sha512-kP/drqTxY6Xt3NNpKiMomfgkNn4o7+vKxK2DDKcBG9sHj51vHqMBGy8wbDS/J4lMxnqs153/T3+DmCEAkC5cpA==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-destructuring": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.1.3.tgz",
-      "integrity": "sha512-Mb9M4DGIOspH1ExHOUnn2UUXFOyVTiX84fXCd+6B5iWrQg/QMeeRmSwpZ9lnjYLSXtZwiw80ytVMr3zue0ucYw==",
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.6.0.tgz",
+      "integrity": "sha512-2bGIS5P1v4+sWTCnKNDZDxbGvEqi0ijeqM/YqHtVGrvG2y0ySgnEEhXErvE9dA0bnIzY9bIzdFK0jFA46ASIIQ==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-dotall-regex": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.0.0.tgz",
-      "integrity": "sha512-00THs8eJxOJUFVx1w8i1MBF4XH4PsAjKjQ1eqN/uCH3YKwP21GCKfrn6YZFZswbOk9+0cw1zGQPHVc1KBlSxig==",
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.6.2.tgz",
+      "integrity": "sha512-KGKT9aqKV+9YMZSkowzYoYEiHqgaDhGmPNZlZxX6UeHC4z30nC1J9IrZuGqbYFB1jaIGdv91ujpze0exiVK8bA==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-regex": "^7.0.0",
-        "regexpu-core": "^4.1.3"
+        "@babel/helper-regex": "^7.4.4",
+        "regexpu-core": "^4.6.0"
       }
     },
     "@babel/plugin-transform-duplicate-keys": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.0.0.tgz",
-      "integrity": "sha512-w2vfPkMqRkdxx+C71ATLJG30PpwtTpW7DDdLqYt2acXU7YjztzeWW2Jk1T6hKqCLYCcEA5UQM/+xTAm+QCSnuQ==",
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.5.0.tgz",
+      "integrity": "sha512-igcziksHizyQPlX9gfSjHkE2wmoCH3evvD2qR5w29/Dk0SMKE/eOI7f1HhBdNhR/zxJDqrgpoDTq5YSLH/XMsQ==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.1.0.tgz",
-      "integrity": "sha512-uZt9kD1Pp/JubkukOGQml9tqAeI8NkE98oZnHZ2qHRElmeKCodbTZgOEUtujSCSLhHSBWbzNiFSDIMC4/RBTLQ==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz",
+      "integrity": "sha512-umh4hR6N7mu4Elq9GG8TOu9M0bakvlsREEC+ialrQN6ABS4oDQ69qJv1VtR3uxlKMCQMCvzk7vr17RHKcjx68A==",
       "dev": true,
       "requires": {
         "@babel/helper-builder-binary-assignment-operator-visitor": "^7.1.0",
@@ -458,18 +497,18 @@
       }
     },
     "@babel/plugin-transform-for-of": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.0.0.tgz",
-      "integrity": "sha512-TlxKecN20X2tt2UEr2LNE6aqA0oPeMT1Y3cgz8k4Dn1j5ObT8M3nl9aA37LLklx0PBZKETC9ZAf9n/6SujTuXA==",
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz",
+      "integrity": "sha512-9T/5Dlr14Z9TIEXLXkt8T1DU7F24cbhwhMNUziN3hB1AXoZcdzPcTiKGRn/6iOymDqtTKWnr/BtRKN9JwbKtdQ==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-function-name": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.1.0.tgz",
-      "integrity": "sha512-VxOa1TMlFMtqPW2IDYZQaHsFrq/dDoIjgN098NowhexhZcz3UGlvPgZXuE1jEvNygyWyxRacqDpCZt+par1FNg==",
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.4.tgz",
+      "integrity": "sha512-iU9pv7U+2jC9ANQkKeNF6DrPy4GBa4NWQtl6dHB4Pb3izX2JOEvDTFarlNsBj/63ZEzNNIAMs3Qw4fNCcSOXJA==",
       "dev": true,
       "requires": {
         "@babel/helper-function-name": "^7.1.0",
@@ -477,49 +516,52 @@
       }
     },
     "@babel/plugin-transform-literals": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.0.0.tgz",
-      "integrity": "sha512-1NTDBWkeNXgpUcyoVFxbr9hS57EpZYXpje92zv0SUzjdu3enaRwF/l3cmyRnXLtIdyJASyiS6PtybK+CgKf7jA==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz",
+      "integrity": "sha512-2ThDhm4lI4oV7fVQ6pNNK+sx+c/GM5/SaML0w/r4ZB7sAneD/piDJtwdKlNckXeyGK7wlwg2E2w33C/Hh+VFCg==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-modules-amd": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.1.0.tgz",
-      "integrity": "sha512-wt8P+xQ85rrnGNr2x1iV3DW32W8zrB6ctuBkYBbf5/ZzJY99Ob4MFgsZDFgczNU76iy9PWsy4EuxOliDjdKw6A==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-transforms": "^7.1.0",
-        "@babel/helper-plugin-utils": "^7.0.0"
-      }
-    },
-    "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.1.0.tgz",
-      "integrity": "sha512-wtNwtMjn1XGwM0AXPspQgvmE6msSJP15CX2RVfpTSTNPLhKhaOjaIfBaVfj4iUZ/VrFSodcFedwtPg/NxwQlPA==",
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.5.0.tgz",
+      "integrity": "sha512-n20UsQMKnWrltocZZm24cRURxQnWIvsABPJlw/fvoy9c6AgHZzoelAIzajDHAQrDpuKFFPPcFGd7ChsYuIUMpg==",
       "dev": true,
       "requires": {
         "@babel/helper-module-transforms": "^7.1.0",
         "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-simple-access": "^7.1.0"
+        "babel-plugin-dynamic-import-node": "^2.3.0"
+      }
+    },
+    "@babel/plugin-transform-modules-commonjs": {
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.6.0.tgz",
+      "integrity": "sha512-Ma93Ix95PNSEngqomy5LSBMAQvYKVe3dy+JlVJSHEXZR5ASL9lQBedMiCyVtmTLraIDVRE3ZjTZvmXXD2Ozw3g==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-transforms": "^7.4.4",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-simple-access": "^7.1.0",
+        "babel-plugin-dynamic-import-node": "^2.3.0"
       }
     },
     "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.1.3.tgz",
-      "integrity": "sha512-PvTxgjxQAq4pvVUZF3mD5gEtVDuId8NtWkJsZLEJZMZAW3TvgQl1pmydLLN1bM8huHFVVU43lf0uvjQj9FRkKw==",
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.5.0.tgz",
+      "integrity": "sha512-Q2m56tyoQWmuNGxEtUyeEkm6qJYFqs4c+XyXH5RAuYxObRNz9Zgj/1g2GMnjYp2EUyEy7YTrxliGCXzecl/vJg==",
       "dev": true,
       "requires": {
-        "@babel/helper-hoist-variables": "^7.0.0",
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-hoist-variables": "^7.4.4",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "babel-plugin-dynamic-import-node": "^2.3.0"
       }
     },
     "@babel/plugin-transform-modules-umd": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.1.0.tgz",
-      "integrity": "sha512-enrRtn5TfRhMmbRwm7F8qOj0qEYByqUvTttPEGimcBH4CJHphjyK1Vg7sdU7JjeEmgSpM890IT/efS2nMHwYig==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz",
+      "integrity": "sha512-BV3bw6MyUH1iIsGhXlOK6sXhmSarZjtJ/vMiD9dNmpY8QXFFQTj+6v92pcfy1iqa8DeAfJFwoxcrS/TUZda6sw==",
       "dev": true,
       "requires": {
         "@babel/helper-module-transforms": "^7.1.0",
@@ -527,66 +569,66 @@
       }
     },
     "@babel/plugin-transform-new-target": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.0.0.tgz",
-      "integrity": "sha512-yin069FYjah+LbqfGeTfzIBODex/e++Yfa0rH0fpfam9uTbuEeEOx5GLGr210ggOV77mVRNoeqSYqeuaqSzVSw==",
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz",
+      "integrity": "sha512-r1z3T2DNGQwwe2vPGZMBNjioT2scgWzK9BCnDEh+46z8EEwXBq24uRzd65I7pjtugzPSj921aM15RpESgzsSuA==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-object-super": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.1.0.tgz",
-      "integrity": "sha512-/O02Je1CRTSk2SSJaq0xjwQ8hG4zhZGNjE8psTsSNPXyLRCODv7/PBozqT5AmQMzp7MI3ndvMhGdqp9c96tTEw==",
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.5.5.tgz",
+      "integrity": "sha512-un1zJQAhSosGFBduPgN/YFNvWVpRuHKU7IHBglLoLZsGmruJPOo6pbInneflUdmq7YvSVqhpPs5zdBvLnteltQ==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-replace-supers": "^7.1.0"
+        "@babel/helper-replace-supers": "^7.5.5"
       }
     },
     "@babel/plugin-transform-parameters": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.1.0.tgz",
-      "integrity": "sha512-vHV7oxkEJ8IHxTfRr3hNGzV446GAb+0hgbA7o/0Jd76s+YzccdWuTU296FOCOl/xweU4t/Ya4g41yWz80RFCRw==",
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz",
+      "integrity": "sha512-oMh5DUO1V63nZcu/ZVLQFqiihBGo4OpxJxR1otF50GMeCLiRx5nUdtokd+u9SuVJrvvuIh9OosRFPP4pIPnwmw==",
       "dev": true,
       "requires": {
-        "@babel/helper-call-delegate": "^7.1.0",
+        "@babel/helper-call-delegate": "^7.4.4",
         "@babel/helper-get-function-arity": "^7.0.0",
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-regenerator": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.0.0.tgz",
-      "integrity": "sha512-sj2qzsEx8KDVv1QuJc/dEfilkg3RRPvPYx/VnKLtItVQRWt1Wqf5eVCOLZm29CiGFfYYsA3VPjfizTCV0S0Dlw==",
+      "version": "7.4.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.5.tgz",
+      "integrity": "sha512-gBKRh5qAaCWntnd09S8QC7r3auLCqq5DI6O0DlfoyDjslSBVqBibrMdsqO+Uhmx3+BlOmE/Kw1HFxmGbv0N9dA==",
       "dev": true,
       "requires": {
-        "regenerator-transform": "^0.13.3"
+        "regenerator-transform": "^0.14.0"
       }
     },
     "@babel/plugin-transform-shorthand-properties": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.0.0.tgz",
-      "integrity": "sha512-g/99LI4vm5iOf5r1Gdxq5Xmu91zvjhEG5+yZDJW268AZELAu4J1EiFLnkSG3yuUsZyOipVOVUKoGPYwfsTymhw==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz",
+      "integrity": "sha512-QP4eUM83ha9zmYtpbnyjTLAGKQritA5XW/iG9cjtuOI8s1RuL/3V6a3DeSHfKutJQ+ayUfeZJPcnCYEQzaPQqg==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-spread": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.0.0.tgz",
-      "integrity": "sha512-L702YFy2EvirrR4shTj0g2xQp7aNwZoWNCkNu2mcoU0uyzMl0XRwDSwzB/xp6DSUFiBmEXuyAyEN16LsgVqGGQ==",
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.6.2.tgz",
+      "integrity": "sha512-DpSvPFryKdK1x+EDJYCy28nmAaIMdxmhot62jAXF/o99iA33Zj2Lmcp3vDmz+MUh0LNYVPvfj5iC3feb3/+PFg==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-sticky-regex": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.0.0.tgz",
-      "integrity": "sha512-LFUToxiyS/WD+XEWpkx/XJBrUXKewSZpzX68s+yEOtIbdnsRjpryDw9U06gYc6klYEij/+KQVRnD3nz3AoKmjw==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz",
+      "integrity": "sha512-KKYCoGaRAf+ckH8gEL3JHUaFVyNHKe3ASNsZ+AlktgHevvxGigoIttrEJb8iKN03Q7Eazlv1s6cx2B2cQ3Jabw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
@@ -594,9 +636,9 @@
       }
     },
     "@babel/plugin-transform-template-literals": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.0.0.tgz",
-      "integrity": "sha512-vA6rkTCabRZu7Nbl9DfLZE1imj4tzdWcg5vtdQGvj+OH9itNNB6hxuRMHuIY8SGnEt1T9g5foqs9LnrHzsqEFg==",
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz",
+      "integrity": "sha512-mQrEC4TWkhLN0z8ygIvEL9ZEToPhG5K7KDW3pzGqOfIGZ28Jb0POUkeWcoz8HnHvhFy6dwAT1j8OzqN8s804+g==",
       "dev": true,
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.0.0",
@@ -604,23 +646,23 @@
       }
     },
     "@babel/plugin-transform-typeof-symbol": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.0.0.tgz",
-      "integrity": "sha512-1r1X5DO78WnaAIvs5uC48t41LLckxsYklJrZjNKcevyz83sF2l4RHbw29qrCPr/6ksFsdfRpT/ZgxNWHXRnffg==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz",
+      "integrity": "sha512-2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-unicode-regex": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.0.0.tgz",
-      "integrity": "sha512-uJBrJhBOEa3D033P95nPHu3nbFwFE9ZgXsfEitzoIXIwqAZWk7uXcg06yFKXz9FSxBH5ucgU/cYdX0IV8ldHKw==",
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.6.2.tgz",
+      "integrity": "sha512-orZI6cWlR3nk2YmYdb0gImrgCUwb5cBUwjf6Ks6dvNVvXERkwtJWOQaEOjPiu0Gu1Tq6Yq/hruCZZOOi9F34Dw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-regex": "^7.0.0",
-        "regexpu-core": "^4.1.3"
+        "@babel/helper-regex": "^7.4.4",
+        "regexpu-core": "^4.6.0"
       }
     },
     "@babel/preset-env": {
@@ -673,57 +715,79 @@
       }
     },
     "@babel/template": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.1.2.tgz",
-      "integrity": "sha512-SY1MmplssORfFiLDcOETrW7fCLl+PavlwMh92rrGcikQaRq4iWPVH0MpwPpY3etVMx6RnDjXtr6VZYr/IbP/Ag==",
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.6.0.tgz",
+      "integrity": "sha512-5AEH2EXD8euCk446b7edmgFdub/qfH1SN6Nii3+fyXP807QRx9Q73A2N5hNwRRslC2H9sNzaFhsPubkS4L8oNQ==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.0.0",
-        "@babel/parser": "^7.1.2",
-        "@babel/types": "^7.1.2"
+        "@babel/parser": "^7.6.0",
+        "@babel/types": "^7.6.0"
       }
     },
     "@babel/traverse": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.1.6.tgz",
-      "integrity": "sha512-CXedit6GpISz3sC2k2FsGCUpOhUqKdyL0lqNrImQojagnUMXf8hex4AxYFRuMkNGcvJX5QAFGzB5WJQmSv8SiQ==",
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.6.2.tgz",
+      "integrity": "sha512-8fRE76xNwNttVEF2TwxJDGBLWthUkHWSldmfuBzVRmEDWOtu4XdINTgN7TDWzuLg4bbeIMLvfMFD9we5YcWkRQ==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "@babel/generator": "^7.1.6",
+        "@babel/code-frame": "^7.5.5",
+        "@babel/generator": "^7.6.2",
         "@babel/helper-function-name": "^7.1.0",
-        "@babel/helper-split-export-declaration": "^7.0.0",
-        "@babel/parser": "^7.1.6",
-        "@babel/types": "^7.1.6",
+        "@babel/helper-split-export-declaration": "^7.4.4",
+        "@babel/parser": "^7.6.2",
+        "@babel/types": "^7.6.0",
         "debug": "^4.1.0",
         "globals": "^11.1.0",
-        "lodash": "^4.17.10"
+        "lodash": "^4.17.13"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.15",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+          "dev": true
+        }
       }
     },
     "@babel/types": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.1.6.tgz",
-      "integrity": "sha512-DMiUzlY9DSjVsOylJssxLHSgj6tWM9PRFJOGW/RaOglVOK9nzTxoOMfTfRQXGUCUQ/HmlG2efwC+XqUEJ5ay4w==",
+      "version": "7.6.1",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.6.1.tgz",
+      "integrity": "sha512-X7gdiuaCmA0uRjCmRtYJNAVCc/q+5xSgsfKJHqMN4iNLILX39677fJE1O40arPMh0TTtS9ItH67yre6c7k6t0g==",
       "dev": true,
       "requires": {
         "esutils": "^2.0.2",
-        "lodash": "^4.17.10",
+        "lodash": "^4.17.13",
         "to-fast-properties": "^2.0.0"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.15",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+          "dev": true
+        }
       }
     },
     "@types/angular": {
-      "version": "1.6.51",
-      "resolved": "https://registry.npmjs.org/@types/angular/-/angular-1.6.51.tgz",
-      "integrity": "sha512-wYU+/zlJWih7ZmonWVjGQ18tG7GboI9asMNjRBM5fpIFJWXSioQttCTw9qGL44cP82ghM8sCV9apEqm1zBDq2w=="
+      "version": "1.6.56",
+      "resolved": "https://registry.npmjs.org/@types/angular/-/angular-1.6.56.tgz",
+      "integrity": "sha512-HxtqilvklZ7i6XOaiP7uIJIrFXEVEhfbSY45nfv2DeBRngncI58Y4ZOUMiUkcT8sqgLL1ablmbfylChUg7A3GA=="
+    },
+    "@types/q": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.2.tgz",
+      "integrity": "sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==",
+      "dev": true
     },
     "accepts": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
-      "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
+      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
       "dev": true,
       "requires": {
-        "mime-types": "~2.1.18",
-        "negotiator": "0.6.1"
+        "mime-types": "~2.1.24",
+        "negotiator": "0.6.2"
       }
     },
     "accord": {
@@ -749,9 +813,9 @@
       },
       "dependencies": {
         "glob": {
-          "version": "7.1.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-          "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+          "version": "7.1.4",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+          "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
           "dev": true,
           "requires": {
             "fs.realpath": "^1.0.0",
@@ -779,15 +843,15 @@
       "integrity": "sha512-M1JtZctO2Zg+1qeGUFZXtYKsyaRptqQtqpVzlj80I0NzGW9MF3um0DBuizIvQlrPYUlTdm+wcOPZpZoerkxQdA=="
     },
     "acorn": {
-      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.0.4.tgz",
-      "integrity": "sha512-VY4i5EKSKkofY2I+6QLTbTTN/UvEQPCo6eiwzzSaSWfpaDhOmStMCMod6wmuPciNq+XS0faCglFu2lHZpdHUtg==",
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz",
+      "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==",
       "dev": true
     },
     "acorn-jsx": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.1.tgz",
-      "integrity": "sha512-HJ7CfNHrfJLlNTzIEUTj43LNWGkqpRLxm3YjAlcD0ACydk9XynzYsCBHxut+iqt+1aBXkx9UP/w/ZqMr13XIzg==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.2.tgz",
+      "integrity": "sha512-tiNTrP1MP0QrChmD2DdupCr6HWSFeKVw5d/dHTu4Y7rkAkRhU/Dt7dphAfIUyxtHpl/eBVip5uTNSpQJHylpAw==",
       "dev": true
     },
     "after": {
@@ -797,9 +861,9 @@
       "dev": true
     },
     "ajv": {
-      "version": "6.6.1",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.6.1.tgz",
-      "integrity": "sha512-ZoJjft5B+EJBjUyu9C9Hc0OZyPZSSlOF+plzouTrg6UlA8f+e/n8NIgBFG/9tppJtpPWfthHakK7juJdNDODww==",
+      "version": "6.10.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
+      "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
       "dev": true,
       "requires": {
         "fast-deep-equal": "^2.0.1",
@@ -954,9 +1018,9 @@
       }
     },
     "ansi-escapes": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
-      "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
+      "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
       "dev": true
     },
     "ansi-gray": {
@@ -990,6 +1054,23 @@
       "dev": true,
       "requires": {
         "color-convert": "^1.9.0"
+      },
+      "dependencies": {
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "dev": true,
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+          "dev": true
+        }
       }
     },
     "ansi-wrap": {
@@ -1001,7 +1082,7 @@
     "anymatch": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
-      "integrity": "sha1-VT3Lj5HjyImEXf26NMd3IbkLnXo=",
+      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
       "dev": true,
       "requires": {
         "micromatch": "^2.1.5",
@@ -1104,15 +1185,17 @@
       "resolved": "https://registry.npmjs.org/archive-type/-/archive-type-3.2.0.tgz",
       "integrity": "sha1-nNnABpV+vpX62tW9YJiUKoE3N/Y=",
       "dev": true,
+      "optional": true,
       "requires": {
         "file-type": "^3.1.0"
       },
       "dependencies": {
         "file-type": {
           "version": "3.9.0",
-          "resolved": "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
+          "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
           "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -1131,7 +1214,7 @@
     "argparse": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha1-vNZ5HqWuCXJeF+WtmIE0zUCz2RE=",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
       "dev": true,
       "requires": {
         "sprintf-js": "~1.0.2"
@@ -1146,7 +1229,7 @@
     "arr-flatten": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-      "integrity": "sha1-NgSLv/TntH4TZkQxbJlmnqWukfE=",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
       "dev": true
     },
     "arr-union": {
@@ -1171,7 +1254,8 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
       "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "array-slice": {
       "version": "1.1.0",
@@ -1260,18 +1344,26 @@
       "dev": true
     },
     "async": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz",
-      "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==",
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
+      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
       "dev": true,
       "requires": {
-        "lodash": "^4.17.11"
+        "lodash": "^4.17.14"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.15",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+          "dev": true
+        }
       }
     },
     "async-each": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz",
-      "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
+      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
       "dev": true
     },
     "async-each-series": {
@@ -1282,9 +1374,9 @@
       "optional": true
     },
     "async-limiter": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
-      "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
+      "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==",
       "dev": true
     },
     "asynckit": {
@@ -1325,6 +1417,15 @@
       "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==",
       "dev": true
     },
+    "babel-plugin-dynamic-import-node": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz",
+      "integrity": "sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ==",
+      "dev": true,
+      "requires": {
+        "object.assign": "^4.1.0"
+      }
+    },
     "backo2": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz",
@@ -1340,7 +1441,7 @@
     "base": {
       "version": "0.11.2",
       "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-      "integrity": "sha1-e95c7RRbbVUakNuH+DxVi060io8=",
+      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
       "dev": true,
       "requires": {
         "cache-base": "^1.0.1",
@@ -1364,7 +1465,7 @@
         "is-accessor-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
@@ -1373,7 +1474,7 @@
         "is-data-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
@@ -1382,7 +1483,7 @@
         "is-descriptor": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "dev": true,
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
@@ -1430,7 +1531,7 @@
     },
     "bin-build": {
       "version": "2.2.0",
-      "resolved": "http://registry.npmjs.org/bin-build/-/bin-build-2.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/bin-build/-/bin-build-2.2.0.tgz",
       "integrity": "sha1-EfjdYfcP/Por3KpbRvXo/t1CIcw=",
       "dev": true,
       "optional": true,
@@ -1457,7 +1558,7 @@
         },
         "uuid": {
           "version": "2.0.3",
-          "resolved": "http://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
           "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
           "dev": true,
           "optional": true
@@ -1476,7 +1577,7 @@
     },
     "bin-version": {
       "version": "1.0.4",
-      "resolved": "http://registry.npmjs.org/bin-version/-/bin-version-1.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/bin-version/-/bin-version-1.0.4.tgz",
       "integrity": "sha1-nrSY7m/Xb3q5p8FgQ2+JV5Q1144=",
       "dev": true,
       "optional": true,
@@ -1486,7 +1587,7 @@
     },
     "bin-version-check": {
       "version": "2.1.0",
-      "resolved": "http://registry.npmjs.org/bin-version-check/-/bin-version-check-2.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/bin-version-check/-/bin-version-check-2.1.0.tgz",
       "integrity": "sha1-5OXfKQuQaffRETJAMe/BP90RpbA=",
       "dev": true,
       "optional": true,
@@ -1499,7 +1600,7 @@
       "dependencies": {
         "semver": {
           "version": "4.3.6",
-          "resolved": "http://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
           "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=",
           "dev": true,
           "optional": true
@@ -1508,7 +1609,7 @@
     },
     "bin-wrapper": {
       "version": "3.0.2",
-      "resolved": "http://registry.npmjs.org/bin-wrapper/-/bin-wrapper-3.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/bin-wrapper/-/bin-wrapper-3.0.2.tgz",
       "integrity": "sha1-Z9MwYmLksaXy+I7iNGT2plVneus=",
       "dev": true,
       "optional": true,
@@ -1522,16 +1623,17 @@
       }
     },
     "binary-extensions": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.12.0.tgz",
-      "integrity": "sha512-DYWGk01lDcxeS/K9IHPGWfT8PsJmbXRtRd2Sx72Tnb8pcYZQFF1oSDb8hJtS1vhp212q1Rzi5dUf9+nq0o9UIg==",
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
       "dev": true
     },
     "bl": {
       "version": "1.2.2",
-      "resolved": "http://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
       "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==",
       "dev": true,
+      "optional": true,
       "requires": {
         "readable-stream": "^2.3.5",
         "safe-buffer": "^5.1.1"
@@ -1541,13 +1643,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -1560,9 +1664,10 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -1576,35 +1681,29 @@
       "dev": true
     },
     "bluebird": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz",
-      "integrity": "sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==",
+      "version": "3.5.5",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz",
+      "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==",
       "dev": true
     },
     "body-parser": {
-      "version": "1.18.3",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz",
-      "integrity": "sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=",
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
+      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
       "dev": true,
       "requires": {
-        "bytes": "3.0.0",
+        "bytes": "3.1.0",
         "content-type": "~1.0.4",
         "debug": "2.6.9",
         "depd": "~1.1.2",
-        "http-errors": "~1.6.3",
-        "iconv-lite": "0.4.23",
+        "http-errors": "1.7.2",
+        "iconv-lite": "0.4.24",
         "on-finished": "~2.3.0",
-        "qs": "6.5.2",
-        "raw-body": "2.3.3",
-        "type-is": "~1.6.16"
+        "qs": "6.7.0",
+        "raw-body": "2.4.0",
+        "type-is": "~1.6.17"
       },
       "dependencies": {
-        "bytes": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-          "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
-          "dev": true
-        },
         "debug": {
           "version": "2.6.9",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -1614,15 +1713,6 @@
             "ms": "2.0.0"
           }
         },
-        "iconv-lite": {
-          "version": "0.4.23",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
-          "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
-          "dev": true,
-          "requires": {
-            "safer-buffer": ">= 2.1.2 < 3"
-          }
-        },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -1630,22 +1720,10 @@
           "dev": true
         },
         "qs": {
-          "version": "6.5.2",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-          "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+          "version": "6.7.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
           "dev": true
-        },
-        "raw-body": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz",
-          "integrity": "sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==",
-          "dev": true,
-          "requires": {
-            "bytes": "3.0.0",
-            "http-errors": "1.6.3",
-            "iconv-lite": "0.4.23",
-            "unpipe": "1.0.0"
-          }
         }
       }
     },
@@ -1656,9 +1734,9 @@
       "dev": true
     },
     "bootstrap": {
-      "version": "3.3.7",
-      "resolved": "http://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz",
-      "integrity": "sha1-WjiTlFSfIzMIdaOxUGVldPip63E="
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.4.1.tgz",
+      "integrity": "sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA=="
     },
     "bootstrap-social": {
       "version": "5.1.1",
@@ -1672,7 +1750,7 @@
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
       "requires": {
         "balanced-match": "^1.0.0",
@@ -1682,7 +1760,7 @@
     "braces": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha1-WXn9PxTNUxVl5fot8av/8d+u5yk=",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
       "dev": true,
       "requires": {
         "arr-flatten": "^1.1.0",
@@ -1709,20 +1787,20 @@
       }
     },
     "browserslist": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.3.5.tgz",
-      "integrity": "sha512-z9ZhGc3d9e/sJ9dIx5NFXkKoaiQTnrvrMsN3R1fGb1tkWWNSz12UewJn9TNxGo1l7J23h0MRaPmk7jfeTZYs1w==",
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.7.0.tgz",
+      "integrity": "sha512-9rGNDtnj+HaahxiVV38Gn8n8Lr8REKsel68v1sPFfIGEK6uSXTY3h9acgiT1dZVtOOUtifo/Dn8daDQ5dUgVsA==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "^1.0.30000912",
-        "electron-to-chromium": "^1.3.86",
-        "node-releases": "^1.0.5"
+        "caniuse-lite": "^1.0.30000989",
+        "electron-to-chromium": "^1.3.247",
+        "node-releases": "^1.1.29"
       }
     },
     "buffer-alloc": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
-      "integrity": "sha1-iQ3ZDZI6hz4I4Q5f1RpX5bfM4Ow=",
+      "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
       "dev": true,
       "requires": {
         "buffer-alloc-unsafe": "^1.1.0",
@@ -1732,14 +1810,15 @@
     "buffer-alloc-unsafe": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
-      "integrity": "sha1-vX3CauKXLQ7aJTvgYdupkjScGfA=",
+      "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==",
       "dev": true
     },
     "buffer-crc32": {
       "version": "0.2.13",
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
       "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "buffer-fill": {
       "version": "1.0.0",
@@ -1758,6 +1837,7 @@
       "resolved": "https://registry.npmjs.org/buffer-to-vinyl/-/buffer-to-vinyl-1.1.0.tgz",
       "integrity": "sha1-APFfruOreh3aLN5tkSG//dB7ImI=",
       "dev": true,
+      "optional": true,
       "requires": {
         "file-type": "^3.1.0",
         "readable-stream": "^2.0.2",
@@ -1767,21 +1847,24 @@
       "dependencies": {
         "file-type": {
           "version": "3.9.0",
-          "resolved": "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
+          "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
           "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "isarray": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -1794,24 +1877,27 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
         },
         "uuid": {
           "version": "2.0.3",
-          "resolved": "http://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
           "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "vinyl": {
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
+          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -1829,16 +1915,16 @@
         "readable-stream": "^1.0.33"
       }
     },
-    "builtin-modules": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
-      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
+    "bytes": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
+      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
       "dev": true
     },
     "cache-base": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
-      "integrity": "sha1-Cn9GQWgxyLZi7jb+TnxZ129marI=",
+      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
       "dev": true,
       "requires": {
         "collection-visit": "^1.0.0",
@@ -1878,14 +1964,14 @@
     },
     "callsites": {
       "version": "2.0.0",
-      "resolved": "http://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
       "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
       "dev": true
     },
     "camelcase": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-      "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+      "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
       "dev": true
     },
     "camelcase-keys": {
@@ -1893,9 +1979,19 @@
       "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
       "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
       "dev": true,
+      "optional": true,
       "requires": {
         "camelcase": "^2.0.0",
         "map-obj": "^1.0.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
+          "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
+          "dev": true,
+          "optional": true
+        }
       }
     },
     "caniuse-api": {
@@ -1911,16 +2007,17 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30000967",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000967.tgz",
-      "integrity": "sha512-rUBIbap+VJfxTzrM4akJ00lkvVb5/n5v3EGXfWzSH5zT8aJmGzjA8HWhJ4U6kCpzxozUSnB+yvAYDRPY6mRpgQ==",
+      "version": "1.0.30000997",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000997.tgz",
+      "integrity": "sha512-BQLFPIdj2ntgBNWp9Q64LGUIEmvhKkzzHhUHR3CD5A9Lb7ZKF20/+sgadhFap69lk5XmK1fTUleDclaRFvgVUA==",
       "dev": true
     },
     "capture-stack-trace": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz",
       "integrity": "sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "caseless": {
       "version": "0.12.0",
@@ -1933,19 +2030,12 @@
       "resolved": "https://registry.npmjs.org/caw/-/caw-1.2.0.tgz",
       "integrity": "sha1-/7Im/n78VHKI3GLuPpcHPCEtEDQ=",
       "dev": true,
+      "optional": true,
       "requires": {
         "get-proxy": "^1.0.1",
         "is-obj": "^1.0.0",
         "object-assign": "^3.0.0",
         "tunnel-agent": "^0.4.0"
-      },
-      "dependencies": {
-        "tunnel-agent": {
-          "version": "0.4.3",
-          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-          "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
-          "dev": true
-        }
       }
     },
     "center-align": {
@@ -1959,9 +2049,9 @@
       }
     },
     "chalk": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
-      "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
       "dev": true,
       "requires": {
         "ansi-styles": "^3.2.1",
@@ -1976,57 +2066,49 @@
       "dev": true
     },
     "chart.js": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-2.7.3.tgz",
-      "integrity": "sha512-3+7k/DbR92m6BsMUYP6M0dMsMVZpMnwkUyNSAbqolHKsbIzH2Q4LWVEHHYq7v0fmEV8whXE0DrjANulw9j2K5g==",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-2.8.0.tgz",
+      "integrity": "sha512-Di3wUL4BFvqI5FB5K26aQ+hvWh8wnP9A3DWGvXHVkO13D3DSnaSsdZx29cXlEsYKVkn1E2az+ZYFS4t0zi8x0w==",
       "requires": {
         "chartjs-color": "^2.1.0",
         "moment": "^2.10.2"
       }
     },
     "chartjs-color": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/chartjs-color/-/chartjs-color-2.2.0.tgz",
-      "integrity": "sha1-hKL7dVeH7YXDndbdjHsdiEKbrq4=",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/chartjs-color/-/chartjs-color-2.3.0.tgz",
+      "integrity": "sha512-hEvVheqczsoHD+fZ+tfPUE+1+RbV6b+eksp2LwAhwRTVXEjCSEavvk+Hg3H6SZfGlPh/UfmWKGIvZbtobOEm3g==",
       "requires": {
-        "chartjs-color-string": "^0.5.0",
+        "chartjs-color-string": "^0.6.0",
         "color-convert": "^0.5.3"
-      },
-      "dependencies": {
-        "color-convert": {
-          "version": "0.5.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-0.5.3.tgz",
-          "integrity": "sha1-vbbGnOZg+t/+CwAHzER+G59ygr0="
-        }
       }
     },
     "chartjs-color-string": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/chartjs-color-string/-/chartjs-color-string-0.5.0.tgz",
-      "integrity": "sha512-amWNvCOXlOUYxZVDSa0YOab5K/lmEhbFNKI55PWc4mlv28BDzA7zaoQTGxSBgJMHIW+hGX8YUrvw/FH4LyhwSQ==",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz",
+      "integrity": "sha512-TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A==",
       "requires": {
         "color-name": "^1.0.0"
       }
     },
     "chokidar": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-      "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
       "dev": true,
       "requires": {
         "anymatch": "^2.0.0",
-        "async-each": "^1.0.0",
-        "braces": "^2.3.0",
-        "fsevents": "^1.2.2",
+        "async-each": "^1.0.1",
+        "braces": "^2.3.2",
+        "fsevents": "^1.2.7",
         "glob-parent": "^3.1.0",
-        "inherits": "^2.0.1",
+        "inherits": "^2.0.3",
         "is-binary-path": "^1.0.0",
         "is-glob": "^4.0.0",
-        "lodash.debounce": "^4.0.8",
-        "normalize-path": "^2.1.1",
+        "normalize-path": "^3.0.0",
         "path-is-absolute": "^1.0.0",
-        "readdirp": "^2.0.0",
-        "upath": "^1.0.5"
+        "readdirp": "^2.2.1",
+        "upath": "^1.1.1"
       },
       "dependencies": {
         "anymatch": {
@@ -2037,29 +2119,46 @@
           "requires": {
             "micromatch": "^3.1.4",
             "normalize-path": "^2.1.1"
+          },
+          "dependencies": {
+            "normalize-path": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+              "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+              "dev": true,
+              "requires": {
+                "remove-trailing-separator": "^1.0.1"
+              }
+            }
           }
         },
         "is-glob": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz",
-          "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+          "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
           "dev": true,
           "requires": {
             "is-extglob": "^2.1.1"
           }
+        },
+        "normalize-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+          "dev": true
         }
       }
     },
     "circular-json": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
-      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
+      "version": "0.5.9",
+      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.5.9.tgz",
+      "integrity": "sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==",
       "dev": true
     },
     "class-utils": {
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
-      "integrity": "sha1-+TNprouafOAv1B+q0MqDAzGQxGM=",
+      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
       "dev": true,
       "requires": {
         "arr-union": "^3.1.0",
@@ -2136,22 +2235,14 @@
       }
     },
     "cliui": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
-      "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
       "dev": true,
       "requires": {
-        "center-align": "^0.1.1",
-        "right-align": "^0.1.1",
-        "wordwrap": "0.0.2"
-      },
-      "dependencies": {
-        "wordwrap": {
-          "version": "0.0.2",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-          "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
-          "dev": true
-        }
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wrap-ansi": "^2.0.0"
       }
     },
     "clone": {
@@ -2173,9 +2264,9 @@
       "dev": true
     },
     "cloneable-readable": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.2.tgz",
-      "integrity": "sha1-1ZHe5Kj4vBXaQ86X3O66E9Q+KmU=",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz",
+      "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==",
       "dev": true,
       "requires": {
         "inherits": "^2.0.1",
@@ -2191,7 +2282,7 @@
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
@@ -2206,7 +2297,7 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
@@ -2219,14 +2310,17 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/co/-/co-3.1.0.tgz",
       "integrity": "sha1-TqVOpaCJOBUxheFSEMaNkJK8G3g=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "coa": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.1.tgz",
-      "integrity": "sha512-5wfTTO8E2/ja4jFSxePXlG5nRu5bBtL/r1HCIpJW/lzT6yDtKl0u0Z4o/Vpz32IpKmBn7HerheEZQgA9N2DarQ==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
+      "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
       "dev": true,
       "requires": {
+        "@types/q": "^1.5.1",
+        "chalk": "^2.4.1",
         "q": "^1.1.2"
       }
     },
@@ -2247,28 +2341,41 @@
       }
     },
     "color": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/color/-/color-3.1.0.tgz",
-      "integrity": "sha512-CwyopLkuRYO5ei2EpzpIh6LqJMt6Mt+jZhO5VI5f/wJLZriXQE32/SSqzmrh+QB+AZT81Cj8yv+7zwToW8ahZg==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/color/-/color-3.1.2.tgz",
+      "integrity": "sha512-vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg==",
       "dev": true,
       "requires": {
         "color-convert": "^1.9.1",
         "color-string": "^1.5.2"
+      },
+      "dependencies": {
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "dev": true,
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+          "dev": true
+        }
       }
     },
     "color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "requires": {
-        "color-name": "1.1.3"
-      }
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-0.5.3.tgz",
+      "integrity": "sha1-vbbGnOZg+t/+CwAHzER+G59ygr0="
     },
     "color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "color-string": {
       "version": "1.5.3",
@@ -2283,7 +2390,7 @@
     "color-support": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
-      "integrity": "sha1-k4NDeaHMmgxh+C9S8NBDIiUb1aI=",
+      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
       "dev": true
     },
     "colornames": {
@@ -2293,15 +2400,15 @@
       "dev": true
     },
     "colors": {
-      "version": "1.1.2",
-      "resolved": "http://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
-      "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
+      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
       "dev": true
     },
     "colorspace": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.1.tgz",
-      "integrity": "sha512-pI3btWyiuz7Ken0BWh9Elzsmv2bM9AhA7psXib4anUXy/orfZ/E0MbQwhSOG/9L8hLlalqrU0UhOuqxW1YjmVw==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.2.tgz",
+      "integrity": "sha512-vt+OoIP2d76xLhjwbBaucYlNSpPsrJWPlBTtwCpQKIu6/CSMutyzX93O/Do0qzpH3YoHEes8YEFXyZ797rEhzQ==",
       "dev": true,
       "requires": {
         "color": "3.0.x",
@@ -2317,6 +2424,21 @@
             "color-convert": "^1.9.1",
             "color-string": "^1.5.2"
           }
+        },
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "dev": true,
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+          "dev": true
         }
       }
     },
@@ -2330,9 +2452,9 @@
       }
     },
     "combined-stream": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz",
-      "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
       "dev": true,
       "requires": {
         "delayed-stream": "~1.0.0"
@@ -2343,6 +2465,7 @@
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
       "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
       "dev": true,
+      "optional": true,
       "requires": {
         "graceful-readlink": ">= 1.0.0"
       }
@@ -2354,9 +2477,9 @@
       "dev": true
     },
     "component-emitter": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-      "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
+      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
       "dev": true
     },
     "component-inherit": {
@@ -2391,7 +2514,7 @@
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
@@ -2418,7 +2541,7 @@
     "concat-with-sourcemaps": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz",
-      "integrity": "sha1-1OqT8FriV5CVG5nns7CeOQikCC4=",
+      "integrity": "sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==",
       "dev": true,
       "requires": {
         "source-map": "^0.6.1"
@@ -2427,20 +2550,20 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         }
       }
     },
     "connect": {
-      "version": "3.6.6",
-      "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz",
-      "integrity": "sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ=",
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
+      "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==",
       "dev": true,
       "requires": {
         "debug": "2.6.9",
-        "finalhandler": "1.1.0",
-        "parseurl": "~1.3.2",
+        "finalhandler": "1.1.2",
+        "parseurl": "~1.3.3",
         "utils-merge": "1.0.1"
       },
       "dependencies": {
@@ -2515,9 +2638,9 @@
       }
     },
     "core-js": {
-      "version": "2.5.7",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz",
-      "integrity": "sha1-+XJgj/DOrWi4QaFqky0LGDeRgU4=",
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.9.tgz",
+      "integrity": "sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A==",
       "dev": true
     },
     "core-util-is": {
@@ -2527,14 +2650,14 @@
       "dev": true
     },
     "cosmiconfig": {
-      "version": "5.0.7",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.0.7.tgz",
-      "integrity": "sha512-PcLqxTKiDmNT6pSpy4N6KtuPwb53W+2tzNvwOZw0WH9N6O0vLIBq0x8aj8Oj75ere4YcGi48bDFCL+3fRJdlNA==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
+      "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
       "dev": true,
       "requires": {
         "import-fresh": "^2.0.0",
         "is-directory": "^0.3.1",
-        "js-yaml": "^3.9.0",
+        "js-yaml": "^3.13.1",
         "parse-json": "^4.0.0"
       }
     },
@@ -2543,6 +2666,7 @@
       "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
       "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
       "dev": true,
+      "optional": true,
       "requires": {
         "capture-stack-trace": "^1.0.0"
       }
@@ -2595,12 +2719,12 @@
       "dev": true
     },
     "css-tree": {
-      "version": "1.0.0-alpha.28",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.28.tgz",
-      "integrity": "sha512-joNNW1gCp3qFFzj4St6zk+Wh/NBv0vM5YbEreZk0SD4S23S+1xBKb6cLDg2uj4P4k/GUMlIm6cKIDqIG+vdt0w==",
+      "version": "1.0.0-alpha.33",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.33.tgz",
+      "integrity": "sha512-SPt57bh5nQnpsTBsx/IXbO14sRc9xXu5MtMAVuo0BaQQmyf0NupNPPSoMaqiAF5tDFafYsTkfeH4Q/HCKXkg4w==",
       "dev": true,
       "requires": {
-        "mdn-data": "~1.1.0",
+        "mdn-data": "2.0.4",
         "source-map": "^0.5.3"
       }
     },
@@ -2610,16 +2734,10 @@
       "integrity": "sha1-2bkoGtz9jO2TW9urqDeGiX9k6ZY=",
       "dev": true
     },
-    "css-url-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/css-url-regex/-/css-url-regex-1.1.0.tgz",
-      "integrity": "sha1-g4NCMMyfdMRX3lnuvRVD/uuDt+w=",
-      "dev": true
-    },
     "css-what": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.2.tgz",
-      "integrity": "sha512-wan8dMWQ0GUeF7DGEPVjhHemVW/vy6xUYmFzRY8RYqgA0JtXC9rJmbScBjqSu6dg9q0lwPQy6ZAmJVr3PPTvqQ==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
+      "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
       "dev": true
     },
     "cssesc": {
@@ -2641,40 +2759,40 @@
       }
     },
     "cssnano-preset-default": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.5.tgz",
-      "integrity": "sha512-f1uhya0ZAjPYtDD58QkBB0R+uYdzHPei7cDxJyQQIHt5acdhyGXaSXl2nDLzWHLwGFbZcHxQtkJS8mmNwnxTvw==",
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz",
+      "integrity": "sha512-x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA==",
       "dev": true,
       "requires": {
         "css-declaration-sorter": "^4.0.1",
         "cssnano-util-raw-cache": "^4.0.1",
         "postcss": "^7.0.0",
-        "postcss-calc": "^7.0.0",
-        "postcss-colormin": "^4.0.2",
+        "postcss-calc": "^7.0.1",
+        "postcss-colormin": "^4.0.3",
         "postcss-convert-values": "^4.0.1",
-        "postcss-discard-comments": "^4.0.1",
+        "postcss-discard-comments": "^4.0.2",
         "postcss-discard-duplicates": "^4.0.2",
         "postcss-discard-empty": "^4.0.1",
         "postcss-discard-overridden": "^4.0.1",
-        "postcss-merge-longhand": "^4.0.9",
-        "postcss-merge-rules": "^4.0.2",
+        "postcss-merge-longhand": "^4.0.11",
+        "postcss-merge-rules": "^4.0.3",
         "postcss-minify-font-values": "^4.0.2",
-        "postcss-minify-gradients": "^4.0.1",
-        "postcss-minify-params": "^4.0.1",
-        "postcss-minify-selectors": "^4.0.1",
+        "postcss-minify-gradients": "^4.0.2",
+        "postcss-minify-params": "^4.0.2",
+        "postcss-minify-selectors": "^4.0.2",
         "postcss-normalize-charset": "^4.0.1",
-        "postcss-normalize-display-values": "^4.0.1",
-        "postcss-normalize-positions": "^4.0.1",
-        "postcss-normalize-repeat-style": "^4.0.1",
-        "postcss-normalize-string": "^4.0.1",
-        "postcss-normalize-timing-functions": "^4.0.1",
+        "postcss-normalize-display-values": "^4.0.2",
+        "postcss-normalize-positions": "^4.0.2",
+        "postcss-normalize-repeat-style": "^4.0.2",
+        "postcss-normalize-string": "^4.0.2",
+        "postcss-normalize-timing-functions": "^4.0.2",
         "postcss-normalize-unicode": "^4.0.1",
         "postcss-normalize-url": "^4.0.1",
-        "postcss-normalize-whitespace": "^4.0.1",
-        "postcss-ordered-values": "^4.1.1",
-        "postcss-reduce-initial": "^4.0.2",
-        "postcss-reduce-transforms": "^4.0.1",
-        "postcss-svgo": "^4.0.1",
+        "postcss-normalize-whitespace": "^4.0.2",
+        "postcss-ordered-values": "^4.1.2",
+        "postcss-reduce-initial": "^4.0.3",
+        "postcss-reduce-transforms": "^4.0.2",
+        "postcss-svgo": "^4.0.2",
         "postcss-unique-selectors": "^4.0.1"
       }
     },
@@ -2723,6 +2841,12 @@
             "mdn-data": "~1.1.0",
             "source-map": "^0.5.3"
           }
+        },
+        "mdn-data": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-1.1.4.tgz",
+          "integrity": "sha512-FSYbp3lyKjyj3E7fMl6rYvUdX0FBXaluGqlFoYESWQlyUTq8R+wp0rkFxoYFqZlHCvsUXGjyJmLQSnXToYhOSA==",
+          "dev": true
         }
       }
     },
@@ -2731,6 +2855,7 @@
       "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
       "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
       "dev": true,
+      "optional": true,
       "requires": {
         "array-find-index": "^1.0.1"
       }
@@ -2742,12 +2867,13 @@
       "dev": true
     },
     "d": {
-      "version": "1.0.0",
-      "resolved": "http://registry.npmjs.org/d/-/d-1.0.0.tgz",
-      "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
+      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
       "dev": true,
       "requires": {
-        "es5-ext": "^0.10.9"
+        "es5-ext": "^0.10.50",
+        "type": "^1.0.1"
       }
     },
     "dashdash": {
@@ -2772,9 +2898,9 @@
       "dev": true
     },
     "debug": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.0.tgz",
-      "integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
       "dev": true,
       "requires": {
         "ms": "^2.1.1"
@@ -2797,6 +2923,7 @@
       "resolved": "https://registry.npmjs.org/decompress/-/decompress-3.0.0.tgz",
       "integrity": "sha1-rx3VDQbjv8QyRh033hGzjA2ZG+0=",
       "dev": true,
+      "optional": true,
       "requires": {
         "buffer-to-vinyl": "^1.0.0",
         "concat-stream": "^1.4.6",
@@ -2814,6 +2941,7 @@
           "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
           "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
           "dev": true,
+          "optional": true,
           "requires": {
             "arr-flatten": "^1.0.1"
           }
@@ -2822,13 +2950,15 @@
           "version": "0.2.1",
           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
           "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "braces": {
           "version": "1.8.5",
           "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
           "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
           "dev": true,
+          "optional": true,
           "requires": {
             "expand-range": "^1.8.1",
             "preserve": "^0.2.0",
@@ -2840,6 +2970,7 @@
           "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
           "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-posix-bracket": "^0.1.0"
           }
@@ -2849,6 +2980,7 @@
           "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
           "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -2858,6 +2990,7 @@
           "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
           "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
           "dev": true,
+          "optional": true,
           "requires": {
             "inflight": "^1.0.4",
             "inherits": "2",
@@ -2871,6 +3004,7 @@
           "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz",
           "integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=",
           "dev": true,
+          "optional": true,
           "requires": {
             "extend": "^3.0.0",
             "glob": "^5.0.3",
@@ -2886,13 +3020,15 @@
               "version": "0.0.1",
               "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
               "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "readable-stream": {
               "version": "1.0.34",
-              "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
               "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
               "dev": true,
+              "optional": true,
               "requires": {
                 "core-util-is": "~1.0.0",
                 "inherits": "~2.0.1",
@@ -2902,15 +3038,17 @@
             },
             "string_decoder": {
               "version": "0.10.31",
-              "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
               "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "through2": {
               "version": "0.6.5",
-              "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+              "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
               "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
               "dev": true,
+              "optional": true,
               "requires": {
                 "readable-stream": ">=1.0.33-1 <1.1.0-0",
                 "xtend": ">=4.0.0 <4.1.0-0"
@@ -2919,22 +3057,25 @@
           }
         },
         "graceful-fs": {
-          "version": "4.1.15",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
-          "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
-          "dev": true
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
+          "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==",
+          "dev": true,
+          "optional": true
         },
         "is-extglob": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
           "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "is-glob": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
           "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -2943,13 +3084,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -2959,6 +3102,7 @@
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
           "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
           "dev": true,
+          "optional": true,
           "requires": {
             "arr-diff": "^2.0.0",
             "array-unique": "^0.2.1",
@@ -2979,13 +3123,15 @@
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ordered-read-streams": {
           "version": "0.3.0",
           "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz",
           "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-stream": "^1.0.1",
             "readable-stream": "^2.0.1"
@@ -2993,9 +3139,10 @@
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -3008,9 +3155,10 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -3020,25 +3168,17 @@
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
           "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-utf8": "^0.2.0"
           }
         },
-        "strip-bom-stream": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz",
-          "integrity": "sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=",
-          "dev": true,
-          "requires": {
-            "first-chunk-stream": "^1.0.0",
-            "strip-bom": "^2.0.0"
-          }
-        },
         "unique-stream": {
           "version": "2.3.1",
           "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
           "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
           "dev": true,
+          "optional": true,
           "requires": {
             "json-stable-stringify-without-jsonify": "^1.0.1",
             "through2-filter": "^3.0.0"
@@ -3049,6 +3189,7 @@
               "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
               "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
               "dev": true,
+              "optional": true,
               "requires": {
                 "through2": "~2.0.0",
                 "xtend": "~4.0.0"
@@ -3061,6 +3202,7 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
+          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -3072,6 +3214,7 @@
           "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz",
           "integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=",
           "dev": true,
+          "optional": true,
           "requires": {
             "duplexify": "^3.2.0",
             "glob-stream": "^5.3.2",
@@ -3099,6 +3242,7 @@
       "resolved": "https://registry.npmjs.org/decompress-tar/-/decompress-tar-3.1.0.tgz",
       "integrity": "sha1-IXx4n5uURQ76rcXF5TeXj8MzxGY=",
       "dev": true,
+      "optional": true,
       "requires": {
         "is-tar": "^1.0.0",
         "object-assign": "^2.0.0",
@@ -3112,19 +3256,22 @@
           "version": "0.2.0",
           "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
           "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
           "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "1.0.34",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.1",
@@ -3134,9 +3281,10 @@
         },
         "through2": {
           "version": "0.6.5",
-          "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
           "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
           "dev": true,
+          "optional": true,
           "requires": {
             "readable-stream": ">=1.0.33-1 <1.1.0-0",
             "xtend": ">=4.0.0 <4.1.0-0"
@@ -3147,6 +3295,7 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
           "dev": true,
+          "optional": true,
           "requires": {
             "clone": "^0.2.0",
             "clone-stats": "^0.0.1"
@@ -3159,6 +3308,7 @@
       "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-3.1.0.tgz",
       "integrity": "sha1-iyOTVoE1X58YnYclag+L3ZbZZm0=",
       "dev": true,
+      "optional": true,
       "requires": {
         "is-bzip2": "^1.0.0",
         "object-assign": "^2.0.0",
@@ -3173,19 +3323,22 @@
           "version": "0.2.0",
           "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
           "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
           "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "1.0.34",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.1",
@@ -3195,9 +3348,10 @@
         },
         "through2": {
           "version": "0.6.5",
-          "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
           "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
           "dev": true,
+          "optional": true,
           "requires": {
             "readable-stream": ">=1.0.33-1 <1.1.0-0",
             "xtend": ">=4.0.0 <4.1.0-0"
@@ -3208,6 +3362,7 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
           "dev": true,
+          "optional": true,
           "requires": {
             "clone": "^0.2.0",
             "clone-stats": "^0.0.1"
@@ -3220,6 +3375,7 @@
       "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-3.1.0.tgz",
       "integrity": "sha1-ssE9+YFmJomRtxXWRH9kLpaW9aA=",
       "dev": true,
+      "optional": true,
       "requires": {
         "is-gzip": "^1.0.0",
         "object-assign": "^2.0.0",
@@ -3233,19 +3389,22 @@
           "version": "0.2.0",
           "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
           "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
           "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "1.0.34",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.1",
@@ -3255,9 +3414,10 @@
         },
         "through2": {
           "version": "0.6.5",
-          "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
           "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
           "dev": true,
+          "optional": true,
           "requires": {
             "readable-stream": ">=1.0.33-1 <1.1.0-0",
             "xtend": ">=4.0.0 <4.1.0-0"
@@ -3268,6 +3428,7 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
           "dev": true,
+          "optional": true,
           "requires": {
             "clone": "^0.2.0",
             "clone-stats": "^0.0.1"
@@ -3280,6 +3441,7 @@
       "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-3.4.0.tgz",
       "integrity": "sha1-YUdbQVIGa74/7hL51inRX+ZHjus=",
       "dev": true,
+      "optional": true,
       "requires": {
         "is-zip": "^1.0.0",
         "read-all-stream": "^3.0.0",
@@ -3295,6 +3457,7 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
+          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -3307,7 +3470,8 @@
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
       "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "deep-is": {
       "version": "0.1.3",
@@ -3353,7 +3517,7 @@
     "define-property": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
-      "integrity": "sha1-1Flono1lS6d+AqgX+HENcCyxbp0=",
+      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
       "dev": true,
       "requires": {
         "is-descriptor": "^1.0.2",
@@ -3363,7 +3527,7 @@
         "is-accessor-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
@@ -3372,7 +3536,7 @@
         "is-data-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
@@ -3381,7 +3545,7 @@
         "is-descriptor": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "dev": true,
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
@@ -3443,9 +3607,9 @@
       "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA=="
     },
     "doctrine": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
       "dev": true,
       "requires": {
         "esutils": "^2.0.2"
@@ -3464,27 +3628,27 @@
       }
     },
     "dom-serializer": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
-      "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.1.tgz",
+      "integrity": "sha512-sK3ujri04WyjwQXVoK4PU3y8ula1stq10GJZpqHIUgoGZdsGzAGu65BnU3d08aTVSvO7mGPZUc0wTEDL+qGE0Q==",
       "dev": true,
       "requires": {
-        "domelementtype": "~1.1.1",
-        "entities": "~1.1.1"
+        "domelementtype": "^2.0.1",
+        "entities": "^2.0.0"
       },
       "dependencies": {
         "domelementtype": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
-          "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=",
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz",
+          "integrity": "sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==",
           "dev": true
         }
       }
     },
     "domelementtype": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.2.1.tgz",
-      "integrity": "sha512-SQVCLFS2E7G5CRCMdn6K9bIhRj1bS6QBWZfF0TUPh4V/BbqrQ619IdSS3/izn0FZ+9l+uODzaZjb08fjOfablA==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
+      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
       "dev": true
     },
     "domhandler": {
@@ -3520,6 +3684,7 @@
       "resolved": "https://registry.npmjs.org/download/-/download-4.4.3.tgz",
       "integrity": "sha1-qlX9rTktldS2jowr4D4MKqIbqaw=",
       "dev": true,
+      "optional": true,
       "requires": {
         "caw": "^1.0.1",
         "concat-stream": "^1.4.7",
@@ -3543,6 +3708,7 @@
           "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
           "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
           "dev": true,
+          "optional": true,
           "requires": {
             "arr-flatten": "^1.0.1"
           }
@@ -3551,13 +3717,15 @@
           "version": "0.2.1",
           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
           "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "braces": {
           "version": "1.8.5",
           "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
           "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
           "dev": true,
+          "optional": true,
           "requires": {
             "expand-range": "^1.8.1",
             "preserve": "^0.2.0",
@@ -3569,6 +3737,7 @@
           "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
           "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-posix-bracket": "^0.1.0"
           }
@@ -3578,6 +3747,7 @@
           "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
           "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -3587,6 +3757,7 @@
           "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
           "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
           "dev": true,
+          "optional": true,
           "requires": {
             "inflight": "^1.0.4",
             "inherits": "2",
@@ -3600,6 +3771,7 @@
           "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz",
           "integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=",
           "dev": true,
+          "optional": true,
           "requires": {
             "extend": "^3.0.0",
             "glob": "^5.0.3",
@@ -3615,13 +3787,15 @@
               "version": "0.0.1",
               "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
               "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "readable-stream": {
               "version": "1.0.34",
-              "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
               "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
               "dev": true,
+              "optional": true,
               "requires": {
                 "core-util-is": "~1.0.0",
                 "inherits": "~2.0.1",
@@ -3631,15 +3805,17 @@
             },
             "string_decoder": {
               "version": "0.10.31",
-              "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
               "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "through2": {
               "version": "0.6.5",
-              "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+              "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
               "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
               "dev": true,
+              "optional": true,
               "requires": {
                 "readable-stream": ">=1.0.33-1 <1.1.0-0",
                 "xtend": ">=4.0.0 <4.1.0-0"
@@ -3648,22 +3824,25 @@
           }
         },
         "graceful-fs": {
-          "version": "4.1.15",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
-          "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
-          "dev": true
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
+          "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==",
+          "dev": true,
+          "optional": true
         },
         "is-extglob": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
           "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "is-glob": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
           "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -3672,13 +3851,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -3688,6 +3869,7 @@
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
           "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
           "dev": true,
+          "optional": true,
           "requires": {
             "arr-diff": "^2.0.0",
             "array-unique": "^0.2.1",
@@ -3708,13 +3890,15 @@
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ordered-read-streams": {
           "version": "0.3.0",
           "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz",
           "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-stream": "^1.0.1",
             "readable-stream": "^2.0.1"
@@ -3722,9 +3906,10 @@
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -3737,9 +3922,10 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -3749,25 +3935,17 @@
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
           "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-utf8": "^0.2.0"
           }
         },
-        "strip-bom-stream": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz",
-          "integrity": "sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=",
-          "dev": true,
-          "requires": {
-            "first-chunk-stream": "^1.0.0",
-            "strip-bom": "^2.0.0"
-          }
-        },
         "unique-stream": {
           "version": "2.3.1",
           "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
           "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
           "dev": true,
+          "optional": true,
           "requires": {
             "json-stable-stringify-without-jsonify": "^1.0.1",
             "through2-filter": "^3.0.0"
@@ -3778,6 +3956,7 @@
               "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
               "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
               "dev": true,
+              "optional": true,
               "requires": {
                 "through2": "~2.0.0",
                 "xtend": "~4.0.0"
@@ -3790,6 +3969,7 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
+          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -3801,6 +3981,7 @@
           "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz",
           "integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=",
           "dev": true,
+          "optional": true,
           "requires": {
             "duplexify": "^3.2.0",
             "glob-stream": "^5.3.2",
@@ -3833,10 +4014,11 @@
       }
     },
     "duplexify": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.1.tgz",
-      "integrity": "sha512-vM58DwdnKmty+FSPzT14K9JXb90H+j5emaR4KYbr2KTIz00WHGbWOe5ghQTx233ZCLZtrGDALzKwcjEtSt35mA==",
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
+      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
       "dev": true,
+      "optional": true,
       "requires": {
         "end-of-stream": "^1.0.0",
         "inherits": "^2.0.1",
@@ -3845,10 +4027,11 @@
       },
       "dependencies": {
         "end-of-stream": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
-          "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
+          "version": "1.4.3",
+          "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.3.tgz",
+          "integrity": "sha512-cbNhPFS6MlYlWTGncSiDYbdqKhwWFy7kNeb1YSOG6K65i/wPTkLVCJQj0hXA4j0m5Da+hBWnqopEnu1FFelisQ==",
           "dev": true,
+          "optional": true,
           "requires": {
             "once": "^1.4.0"
           }
@@ -3857,22 +4040,25 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "once": {
           "version": "1.4.0",
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -3885,9 +4071,10 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -3899,6 +4086,7 @@
       "resolved": "https://registry.npmjs.org/each-async/-/each-async-1.1.1.tgz",
       "integrity": "sha1-3uUim98KtrogEqOV4bhpq/iBNHM=",
       "dev": true,
+      "optional": true,
       "requires": {
         "onetime": "^1.0.0",
         "set-immediate-shim": "^1.0.0"
@@ -3906,9 +4094,10 @@
       "dependencies": {
         "onetime": {
           "version": "1.1.0",
-          "resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
+          "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
           "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -3939,9 +4128,9 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.3.87",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.87.tgz",
-      "integrity": "sha512-EV5FZ68Hu+n9fHVhOc9AcG3Lvf+E1YqR36ulJUpwaQTkf4LwdvBqmGIazaIrt4kt6J8Gw3Kv7r9F+PQjAkjWeA==",
+      "version": "1.3.266",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.266.tgz",
+      "integrity": "sha512-UTuTZ4v8T0gLPHI7U75PXLQePWI65MTS3mckRrnLCkNljHvsutbYs+hn2Ua/RFul3Jt/L3Ht2rLP+dU/AlBfrQ==",
       "dev": true
     },
     "emits": {
@@ -3950,6 +4139,12 @@
       "integrity": "sha1-MnUrupXhcHshlWI4Srm7ix/WL3A=",
       "dev": true
     },
+    "emoji-regex": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+      "dev": true
+    },
     "enabled": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/enabled/-/enabled-1.0.2.tgz",
@@ -4007,7 +4202,7 @@
     },
     "engine.io-client": {
       "version": "3.2.1",
-      "resolved": "http://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz",
       "integrity": "sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==",
       "dev": true,
       "requires": {
@@ -4024,6 +4219,12 @@
         "yeast": "0.1.2"
       },
       "dependencies": {
+        "component-emitter": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+          "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
+          "dev": true
+        },
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
@@ -4061,9 +4262,9 @@
       "dev": true
     },
     "entities": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
-      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz",
+      "integrity": "sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==",
       "dev": true
     },
     "env-variable": {
@@ -4075,7 +4276,7 @@
     "errno": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
-      "integrity": "sha1-RoTXF3mtOa8Xfj8AeZb3xnyFJhg=",
+      "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
       "dev": true,
       "optional": true,
       "requires": {
@@ -4092,16 +4293,21 @@
       }
     },
     "es-abstract": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.12.0.tgz",
-      "integrity": "sha1-nbvdJ8aFbwABQhyhh4LXhr+KYWU=",
+      "version": "1.14.2",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.14.2.tgz",
+      "integrity": "sha512-DgoQmbpFNOofkjJtKwr87Ma5EW4Dc8fWhD0R+ndq7Oc456ivUfGOOP6oAZTTKl5/CcNMP+EN+e3/iUzgE0veZg==",
       "dev": true,
       "requires": {
-        "es-to-primitive": "^1.1.1",
+        "es-to-primitive": "^1.2.0",
         "function-bind": "^1.1.1",
-        "has": "^1.0.1",
-        "is-callable": "^1.1.3",
-        "is-regex": "^1.0.4"
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.0",
+        "is-callable": "^1.1.4",
+        "is-regex": "^1.0.4",
+        "object-inspect": "^1.6.0",
+        "object-keys": "^1.1.1",
+        "string.prototype.trimleft": "^2.0.0",
+        "string.prototype.trimright": "^2.0.0"
       }
     },
     "es-to-primitive": {
@@ -4116,14 +4322,14 @@
       }
     },
     "es5-ext": {
-      "version": "0.10.46",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.46.tgz",
-      "integrity": "sha512-24XxRvJXNFwEMpJb3nOkiRJKRoupmjYmOPVlI65Qy2SrtxwOTB+g6ODjBKOtwEHbYrhWRty9xxOWLNdClT2djw==",
+      "version": "0.10.51",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.51.tgz",
+      "integrity": "sha512-oRpWzM2WcLHVKpnrcyB7OW8j/s67Ba04JCm0WnNv3RiABSvs7mrQlutB8DBv793gKcp0XENR8Il8WxGTlZ73gQ==",
       "dev": true,
       "requires": {
         "es6-iterator": "~2.0.3",
         "es6-symbol": "~3.1.1",
-        "next-tick": "1"
+        "next-tick": "^1.0.0"
       }
     },
     "es6-iterator": {
@@ -4144,24 +4350,24 @@
       "dev": true
     },
     "es6-symbol": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
-      "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.2.tgz",
+      "integrity": "sha512-/ZypxQsArlv+KHpGvng52/Iz8by3EQPxhmbuz8yFG89N/caTFBSbcXONDw0aMjy827gQg26XAjP4uXFvnfINmQ==",
       "dev": true,
       "requires": {
-        "d": "1",
-        "es5-ext": "~0.10.14"
+        "d": "^1.0.1",
+        "es5-ext": "^0.10.51"
       }
     },
     "es6-weak-map": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz",
-      "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
+      "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
       "dev": true,
       "requires": {
         "d": "1",
-        "es5-ext": "^0.10.14",
-        "es6-iterator": "^2.0.1",
+        "es5-ext": "^0.10.46",
+        "es6-iterator": "^2.0.3",
         "es6-symbol": "^3.1.1"
       }
     },
@@ -4178,9 +4384,9 @@
       "dev": true
     },
     "escodegen": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.11.0.tgz",
-      "integrity": "sha512-IeMV45ReixHS53K/OmfKAIztN/igDHzTJUhZM3k1jMhIZWjk45SMwAtBsEXiJp3vSPmTcu6CXn7mDvFHRN66fw==",
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.12.0.tgz",
+      "integrity": "sha512-TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg==",
       "dev": true,
       "requires": {
         "esprima": "^3.1.3",
@@ -4206,48 +4412,46 @@
       }
     },
     "eslint": {
-      "version": "5.9.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.9.0.tgz",
-      "integrity": "sha512-g4KWpPdqN0nth+goDNICNXGfJF7nNnepthp46CAlJoJtC5K/cLu3NgCM3AHu1CkJ5Hzt9V0Y0PBAO6Ay/gGb+w==",
+      "version": "5.16.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.16.0.tgz",
+      "integrity": "sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.0.0",
-        "ajv": "^6.5.3",
+        "ajv": "^6.9.1",
         "chalk": "^2.1.0",
         "cross-spawn": "^6.0.5",
         "debug": "^4.0.1",
-        "doctrine": "^2.1.0",
-        "eslint-scope": "^4.0.0",
+        "doctrine": "^3.0.0",
+        "eslint-scope": "^4.0.3",
         "eslint-utils": "^1.3.1",
         "eslint-visitor-keys": "^1.0.0",
-        "espree": "^4.0.0",
+        "espree": "^5.0.1",
         "esquery": "^1.0.1",
         "esutils": "^2.0.2",
-        "file-entry-cache": "^2.0.0",
+        "file-entry-cache": "^5.0.1",
         "functional-red-black-tree": "^1.0.1",
         "glob": "^7.1.2",
         "globals": "^11.7.0",
         "ignore": "^4.0.6",
+        "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
-        "inquirer": "^6.1.0",
-        "is-resolvable": "^1.1.0",
-        "js-yaml": "^3.12.0",
+        "inquirer": "^6.2.2",
+        "js-yaml": "^3.13.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
         "levn": "^0.3.0",
-        "lodash": "^4.17.5",
+        "lodash": "^4.17.11",
         "minimatch": "^3.0.4",
         "mkdirp": "^0.5.1",
         "natural-compare": "^1.4.0",
         "optionator": "^0.8.2",
         "path-is-inside": "^1.0.2",
-        "pluralize": "^7.0.0",
         "progress": "^2.0.0",
         "regexpp": "^2.0.1",
-        "require-uncached": "^1.0.3",
         "semver": "^5.5.1",
         "strip-ansi": "^4.0.0",
         "strip-json-comments": "^2.0.1",
-        "table": "^5.0.2",
+        "table": "^5.2.3",
         "text-table": "^0.2.0"
       },
       "dependencies": {
@@ -4258,9 +4462,9 @@
           "dev": true
         },
         "glob": {
-          "version": "7.1.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-          "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+          "version": "7.1.4",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+          "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
           "dev": true,
           "requires": {
             "fs.realpath": "^1.0.0",
@@ -4271,6 +4475,16 @@
             "path-is-absolute": "^1.0.0"
           }
         },
+        "import-fresh": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.1.0.tgz",
+          "integrity": "sha512-PpuksHKGt8rXfWEr9m9EHIpgyyaltBy8+eF6GJM0QCAxMgxCfucMF3mjecK2QsJr0amJW7gTqh5/wht0z2UhEQ==",
+          "dev": true,
+          "requires": {
+            "parent-module": "^1.0.0",
+            "resolve-from": "^4.0.0"
+          }
+        },
         "minimatch": {
           "version": "3.0.4",
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
@@ -4280,6 +4494,12 @@
             "brace-expansion": "^1.1.7"
           }
         },
+        "resolve-from": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+          "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+          "dev": true
+        },
         "strip-ansi": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
@@ -4292,9 +4512,9 @@
       }
     },
     "eslint-scope": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz",
-      "integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
+      "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
       "dev": true,
       "requires": {
         "esrecurse": "^4.1.0",
@@ -4302,24 +4522,27 @@
       }
     },
     "eslint-utils": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.3.1.tgz",
-      "integrity": "sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==",
-      "dev": true
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.2.tgz",
+      "integrity": "sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q==",
+      "dev": true,
+      "requires": {
+        "eslint-visitor-keys": "^1.0.0"
+      }
     },
     "eslint-visitor-keys": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
-      "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz",
+      "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==",
       "dev": true
     },
     "espree": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-4.1.0.tgz",
-      "integrity": "sha512-I5BycZW6FCVIub93TeVY1s7vjhP9CY6cXCznIRfiig7nRviKZYdRnj/sHEWC6A7WE9RDWOFq9+7OsWSYz8qv2w==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-5.0.1.tgz",
+      "integrity": "sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==",
       "dev": true,
       "requires": {
-        "acorn": "^6.0.2",
+        "acorn": "^6.0.7",
         "acorn-jsx": "^5.0.0",
         "eslint-visitor-keys": "^1.0.0"
       }
@@ -4367,15 +4590,15 @@
       }
     },
     "estraverse": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
       "dev": true
     },
     "esutils": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
-      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
       "dev": true
     },
     "event-emitter": {
@@ -4389,15 +4612,15 @@
       }
     },
     "eventemitter3": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz",
-      "integrity": "sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz",
+      "integrity": "sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==",
       "dev": true
     },
     "exec-buffer": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/exec-buffer/-/exec-buffer-3.2.0.tgz",
-      "integrity": "sha1-sWhtvZBMfPmC5lLB9aebHlVzCCs=",
+      "integrity": "sha512-wsiD+2Tp6BWHoVv3B+5Dcx6E7u5zky+hUwOHjuH2hKSLR3dvRmX8fk8UD8uqQixHs4Wk6eDmiegVrMPjKj7wpA==",
       "dev": true,
       "optional": true,
       "requires": {
@@ -4679,7 +4902,7 @@
         "is-extendable": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
           "dev": true,
           "requires": {
             "is-plain-object": "^2.0.4"
@@ -4688,9 +4911,9 @@
       }
     },
     "external-editor": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.0.3.tgz",
-      "integrity": "sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
+      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
       "dev": true,
       "requires": {
         "chardet": "^0.7.0",
@@ -4701,7 +4924,7 @@
     "extglob": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-      "integrity": "sha1-rQD+TcYSqSMuhxhxHcXLWrAoVUM=",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
       "dev": true,
       "requires": {
         "array-unique": "^0.3.2",
@@ -4735,7 +4958,7 @@
         "is-accessor-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
@@ -4744,7 +4967,7 @@
         "is-data-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
@@ -4753,7 +4976,7 @@
         "is-descriptor": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "dev": true,
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
@@ -4851,6 +5074,7 @@
       "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
       "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
       "dev": true,
+      "optional": true,
       "requires": {
         "pend": "~1.2.0"
       }
@@ -4865,21 +5089,12 @@
       }
     },
     "file-entry-cache": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
-      "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
+      "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
       "dev": true,
       "requires": {
-        "flat-cache": "^1.2.1",
-        "object-assign": "^4.0.1"
-      },
-      "dependencies": {
-        "object-assign": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-          "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true
-        }
+        "flat-cache": "^2.0.1"
       }
     },
     "file-type": {
@@ -4898,13 +5113,15 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-1.0.0.tgz",
       "integrity": "sha1-5hz4BfDeHJhFZ9A4bcXfUO5a9+Q=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "filenamify": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-1.2.1.tgz",
       "integrity": "sha1-qfL/0RxQO+0wABUCknI3jx8TZaU=",
       "dev": true,
+      "optional": true,
       "requires": {
         "filename-reserved-regex": "^1.0.0",
         "strip-outer": "^1.0.0",
@@ -4935,17 +5152,17 @@
       }
     },
     "finalhandler": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz",
-      "integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
+      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
       "dev": true,
       "requires": {
         "debug": "2.6.9",
-        "encodeurl": "~1.0.1",
+        "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "on-finished": "~2.3.0",
-        "parseurl": "~1.3.2",
-        "statuses": "~1.3.1",
+        "parseurl": "~1.3.3",
+        "statuses": "~1.5.0",
         "unpipe": "~1.0.0"
       },
       "dependencies": {
@@ -4984,7 +5201,7 @@
     },
     "find-versions": {
       "version": "1.2.1",
-      "resolved": "http://registry.npmjs.org/find-versions/-/find-versions-1.2.1.tgz",
+      "resolved": "https://registry.npmjs.org/find-versions/-/find-versions-1.2.1.tgz",
       "integrity": "sha1-y96fEuOFdaCvG+G5osXV/Y8Ya2I=",
       "dev": true,
       "optional": true,
@@ -5008,9 +5225,9 @@
       }
     },
     "fined": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/fined/-/fined-1.1.0.tgz",
-      "integrity": "sha1-s33IRLdqL15wgeiE98CuNE8VNHY=",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz",
+      "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
       "dev": true,
       "requires": {
         "expand-tilde": "^2.0.2",
@@ -5027,29 +5244,20 @@
       "dev": true
     },
     "flagged-respawn": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.0.tgz",
-      "integrity": "sha1-Tnmumy6zi/hrO7Vr8+ClaqX8q9c=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
+      "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
       "dev": true
     },
     "flat-cache": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.4.tgz",
-      "integrity": "sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
+      "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
       "dev": true,
       "requires": {
-        "circular-json": "^0.3.1",
-        "graceful-fs": "^4.1.2",
-        "rimraf": "~2.6.2",
-        "write": "^0.2.1"
-      },
-      "dependencies": {
-        "graceful-fs": {
-          "version": "4.1.15",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
-          "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
-          "dev": true
-        }
+        "flatted": "^2.0.0",
+        "rimraf": "2.6.3",
+        "write": "1.0.3"
       }
     },
     "flatpickr": {
@@ -5057,29 +5265,29 @@
       "resolved": "https://registry.npmjs.org/flatpickr/-/flatpickr-4.5.2.tgz",
       "integrity": "sha512-jDy4QYGpmiy7+Qk8QvKJ4spjDdxcx9cxMydmq1x427HkKWBw0qizLYeYM2F6tMcvvqGjU5VpJS55j4LnsaBblA=="
     },
+    "flatted": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz",
+      "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==",
+      "dev": true
+    },
     "follow-redirects": {
-      "version": "1.5.10",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
-      "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.9.0.tgz",
+      "integrity": "sha512-CRcPzsSIbXyVDl0QI01muNDu69S8trU4jArW9LpOt2WtC6LyUJetcIrmfHsRBx7/Jb6GHJUiuqyYxPooFfNt6A==",
       "dev": true,
       "requires": {
-        "debug": "=3.1.0"
+        "debug": "^3.0.0"
       },
       "dependencies": {
         "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "dev": true,
           "requires": {
-            "ms": "2.0.0"
+            "ms": "^2.1.1"
           }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
         }
       }
     },
@@ -5138,8 +5346,9 @@
     "fs-constants": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-      "integrity": "sha1-a+Dem+mYzhavivwkSXue6bfM2a0=",
-      "dev": true
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
+      "dev": true,
+      "optional": true
     },
     "fs-extra": {
       "version": "1.0.0",
@@ -5153,9 +5362,9 @@
       },
       "dependencies": {
         "graceful-fs": {
-          "version": "4.1.15",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
-          "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
+          "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==",
           "dev": true
         }
       }
@@ -5170,9 +5379,9 @@
       },
       "dependencies": {
         "graceful-fs": {
-          "version": "4.1.15",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
-          "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
+          "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==",
           "dev": true
         }
       }
@@ -5184,14 +5393,14 @@
       "dev": true
     },
     "fsevents": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz",
-      "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==",
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz",
+      "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==",
       "dev": true,
       "optional": true,
       "requires": {
-        "nan": "^2.9.2",
-        "node-pre-gyp": "^0.10.0"
+        "nan": "^2.12.1",
+        "node-pre-gyp": "^0.12.0"
       },
       "dependencies": {
         "abbrev": {
@@ -5203,7 +5412,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -5212,7 +5422,7 @@
           "optional": true
         },
         "are-we-there-yet": {
-          "version": "1.1.4",
+          "version": "1.1.5",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -5224,19 +5434,21 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
           }
         },
         "chownr": {
-          "version": "1.0.1",
+          "version": "1.1.1",
           "bundled": true,
           "dev": true,
           "optional": true
@@ -5244,17 +5456,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5263,16 +5478,16 @@
           "optional": true
         },
         "debug": {
-          "version": "2.6.9",
+          "version": "4.1.1",
           "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
-            "ms": "2.0.0"
+            "ms": "^2.1.1"
           }
         },
         "deep-extend": {
-          "version": "0.5.1",
+          "version": "0.6.0",
           "bundled": true,
           "dev": true,
           "optional": true
@@ -5321,7 +5536,7 @@
           }
         },
         "glob": {
-          "version": "7.1.2",
+          "version": "7.1.3",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -5341,12 +5556,12 @@
           "optional": true
         },
         "iconv-lite": {
-          "version": "0.4.21",
+          "version": "0.4.24",
           "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
-            "safer-buffer": "^2.1.0"
+            "safer-buffer": ">= 2.1.2 < 3"
           }
         },
         "ignore-walk": {
@@ -5371,7 +5586,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5383,6 +5599,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5397,6 +5614,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -5404,19 +5622,21 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
-          "version": "2.2.4",
+          "version": "2.3.5",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "safe-buffer": "^5.1.1",
+            "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
           }
         },
         "minizlib": {
-          "version": "1.1.0",
+          "version": "1.2.1",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -5428,40 +5648,41 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
         },
         "ms": {
-          "version": "2.0.0",
+          "version": "2.1.1",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "needle": {
-          "version": "2.2.0",
+          "version": "2.3.0",
           "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
-            "debug": "^2.1.2",
+            "debug": "^4.1.0",
             "iconv-lite": "^0.4.4",
             "sax": "^1.2.4"
           }
         },
         "node-pre-gyp": {
-          "version": "0.10.0",
+          "version": "0.12.0",
           "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
             "detect-libc": "^1.0.2",
             "mkdirp": "^0.5.1",
-            "needle": "^2.2.0",
+            "needle": "^2.2.1",
             "nopt": "^4.0.1",
             "npm-packlist": "^1.1.6",
             "npmlog": "^4.0.2",
-            "rc": "^1.1.7",
+            "rc": "^1.2.7",
             "rimraf": "^2.6.1",
             "semver": "^5.3.0",
             "tar": "^4"
@@ -5478,13 +5699,13 @@
           }
         },
         "npm-bundled": {
-          "version": "1.0.3",
+          "version": "1.0.6",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "npm-packlist": {
-          "version": "1.1.10",
+          "version": "1.4.1",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -5508,7 +5729,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5520,6 +5742,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5559,12 +5782,12 @@
           "optional": true
         },
         "rc": {
-          "version": "1.2.7",
+          "version": "1.2.8",
           "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
-            "deep-extend": "^0.5.1",
+            "deep-extend": "^0.6.0",
             "ini": "~1.3.0",
             "minimist": "^1.2.0",
             "strip-json-comments": "~2.0.1"
@@ -5594,18 +5817,19 @@
           }
         },
         "rimraf": {
-          "version": "2.6.2",
+          "version": "2.6.3",
           "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
-            "glob": "^7.0.5"
+            "glob": "^7.1.3"
           }
         },
         "safe-buffer": {
-          "version": "5.1.1",
+          "version": "5.1.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5620,7 +5844,7 @@
           "optional": true
         },
         "semver": {
-          "version": "5.5.0",
+          "version": "5.7.0",
           "bundled": true,
           "dev": true,
           "optional": true
@@ -5641,6 +5865,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5660,6 +5885,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5671,17 +5897,17 @@
           "optional": true
         },
         "tar": {
-          "version": "4.4.1",
+          "version": "4.4.8",
           "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
-            "chownr": "^1.0.1",
+            "chownr": "^1.1.1",
             "fs-minipass": "^1.2.5",
-            "minipass": "^2.2.4",
-            "minizlib": "^1.1.0",
+            "minipass": "^2.3.4",
+            "minizlib": "^1.1.1",
             "mkdirp": "^0.5.0",
-            "safe-buffer": "^5.1.1",
+            "safe-buffer": "^5.1.2",
             "yallist": "^3.0.2"
           }
         },
@@ -5692,30 +5918,32 @@
           "optional": true
         },
         "wide-align": {
-          "version": "1.1.2",
+          "version": "1.1.3",
           "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
-            "string-width": "^1.0.2"
+            "string-width": "^1.0.2 || 2"
           }
         },
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
-          "version": "3.0.2",
+          "version": "3.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
     "function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0=",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
       "dev": true
     },
     "functional-red-black-tree": {
@@ -5744,6 +5972,7 @@
       "resolved": "https://registry.npmjs.org/get-proxy/-/get-proxy-1.1.0.tgz",
       "integrity": "sha1-iUhUSRvFkbDxR9euVw9cZ4tyVus=",
       "dev": true,
+      "optional": true,
       "requires": {
         "rc": "^1.1.2"
       }
@@ -5752,7 +5981,8 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
       "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "get-stream": {
       "version": "3.0.0",
@@ -5778,7 +6008,7 @@
     },
     "gifsicle": {
       "version": "3.0.4",
-      "resolved": "http://registry.npmjs.org/gifsicle/-/gifsicle-3.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/gifsicle/-/gifsicle-3.0.4.tgz",
       "integrity": "sha1-9Fy17RAWW2ZdySng6TKLbIId+js=",
       "dev": true,
       "optional": true,
@@ -5927,14 +6157,14 @@
       }
     },
     "globals": {
-      "version": "11.9.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.9.0.tgz",
-      "integrity": "sha512-5cJVtyXWH8PiJPVLZzzoIizXx944O4OmRro5MWKx5fT4MgcN7OfaMutPeaTdJCCURwbWdhhcCWcKIffPnmTzBg==",
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
       "dev": true
     },
     "globby": {
       "version": "6.1.0",
-      "resolved": "http://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
       "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
       "dev": true,
       "requires": {
@@ -5946,9 +6176,9 @@
       },
       "dependencies": {
         "glob": {
-          "version": "7.1.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-          "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+          "version": "7.1.4",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+          "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
           "dev": true,
           "requires": {
             "fs.realpath": "^1.0.0",
@@ -6029,9 +6259,9 @@
       }
     },
     "glogg": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.1.tgz",
-      "integrity": "sha1-3PdY5EeJzD89MsHzVio2duajSBA=",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz",
+      "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==",
       "dev": true,
       "requires": {
         "sparkles": "^1.0.0"
@@ -6047,9 +6277,10 @@
     },
     "got": {
       "version": "5.7.1",
-      "resolved": "http://registry.npmjs.org/got/-/got-5.7.1.tgz",
+      "resolved": "https://registry.npmjs.org/got/-/got-5.7.1.tgz",
       "integrity": "sha1-X4FjWmHkplifGAVp6k44FoClHzU=",
       "dev": true,
+      "optional": true,
       "requires": {
         "create-error-class": "^3.0.1",
         "duplexer2": "^0.1.4",
@@ -6073,6 +6304,7 @@
           "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
           "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
           "dev": true,
+          "optional": true,
           "requires": {
             "readable-stream": "^2.0.2"
           }
@@ -6081,28 +6313,32 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "parse-json": {
           "version": "2.2.0",
           "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
           "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
           "dev": true,
+          "optional": true,
           "requires": {
             "error-ex": "^1.2.0"
           }
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -6115,9 +6351,10 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -6125,19 +6362,20 @@
       }
     },
     "graceful-fs": {
-      "version": "3.0.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz",
-      "integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=",
+      "version": "3.0.12",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.12.tgz",
+      "integrity": "sha512-J55gaCS4iTTJfTXIxSVw3EMQckcqkpdRv3IR7gu6sq0+tbC363Zx6KH/SEwXASK9JRbhyZmVjJEVJIOxYsB3Qg==",
       "dev": true,
       "requires": {
-        "natives": "^1.1.0"
+        "natives": "^1.1.3"
       }
     },
     "graceful-readlink": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
       "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "growly": {
       "version": "1.3.0",
@@ -6147,7 +6385,7 @@
     },
     "gulp": {
       "version": "3.9.1",
-      "resolved": "http://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz",
+      "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz",
       "integrity": "sha1-VxzkWSjdQK9lFPxAEYZgFsE4RbQ=",
       "dev": true,
       "requires": {
@@ -6174,7 +6412,7 @@
         },
         "chalk": {
           "version": "1.1.3",
-          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
@@ -6187,7 +6425,7 @@
         },
         "semver": {
           "version": "4.3.6",
-          "resolved": "http://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
           "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=",
           "dev": true
         },
@@ -6253,9 +6491,9 @@
       },
       "dependencies": {
         "readable-stream": {
-          "version": "3.0.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.0.6.tgz",
-          "integrity": "sha512-9E1oLoOWfhSXHGv6QlwXJim7uNzd9EVlWK+21tCU9Ju/kR0/p2AZYPz4qSchgO8PlLIH4FpZYfzwS+rEksZjIg==",
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz",
+          "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==",
           "dev": true,
           "requires": {
             "inherits": "^2.0.3",
@@ -6263,13 +6501,19 @@
             "util-deprecate": "^1.0.1"
           }
         },
+        "safe-buffer": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
+          "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==",
+          "dev": true
+        },
         "string_decoder": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.2.0.tgz",
-          "integrity": "sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==",
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+          "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
           "dev": true,
           "requires": {
-            "safe-buffer": "~5.1.0"
+            "safe-buffer": "~5.2.0"
           }
         },
         "through2": {
@@ -6285,9 +6529,9 @@
       }
     },
     "gulp-cli": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.0.1.tgz",
-      "integrity": "sha512-RxujJJdN8/O6IW2nPugl7YazhmrIEjmiVfPKrWt68r71UCaLKS71Hp0gpKT+F6qOUFtr7KqtifDKaAJPRVvMYQ==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.2.0.tgz",
+      "integrity": "sha512-rGs3bVYHdyJpLqR0TUBnlcZ1O5O++Zs4bA0ajm+zr3WFCfiSLjGwoCBqFs18wzN+ZxahT9DkOK5nDf26iDsWjA==",
       "dev": true,
       "requires": {
         "ansi-colors": "^1.0.1",
@@ -6300,7 +6544,7 @@
         "gulplog": "^1.0.0",
         "interpret": "^1.1.0",
         "isobject": "^3.0.1",
-        "liftoff": "^2.5.0",
+        "liftoff": "^3.1.0",
         "matchdep": "^2.0.0",
         "mute-stdout": "^1.0.0",
         "pretty-hrtime": "^1.0.0",
@@ -6310,72 +6554,51 @@
         "yargs": "^7.1.0"
       },
       "dependencies": {
-        "camelcase": {
+        "findup-sync": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-          "dev": true
-        },
-        "cliui": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-          "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+          "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
+          "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==",
           "dev": true,
           "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1",
-            "wrap-ansi": "^2.0.0"
+            "detect-file": "^1.0.0",
+            "is-glob": "^4.0.0",
+            "micromatch": "^3.0.4",
+            "resolve-dir": "^1.0.1"
           }
         },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+        "is-glob": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+          "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
           "dev": true,
           "requires": {
-            "number-is-nan": "^1.0.0"
+            "is-extglob": "^2.1.1"
           }
         },
-        "string-width": {
-          "version": "1.0.2",
-          "resolved": "http://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+        "liftoff": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz",
+          "integrity": "sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==",
           "dev": true,
           "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
+            "extend": "^3.0.0",
+            "findup-sync": "^3.0.0",
+            "fined": "^1.0.1",
+            "flagged-respawn": "^1.0.0",
+            "is-plain-object": "^2.0.4",
+            "object.map": "^1.0.0",
+            "rechoir": "^0.6.2",
+            "resolve": "^1.1.7"
           }
         },
         "v8flags": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.1.2.tgz",
-          "integrity": "sha512-MtivA7GF24yMPte9Rp/BWGCYQNaUj86zeYxV/x2RRJMKagImbbv3u8iJC57lNhWLPcGLJmHcHmFWkNsplbbLWw==",
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.1.3.tgz",
+          "integrity": "sha512-amh9CCg3ZxkzQ48Mhcb8iX7xpAfYJgePHxWMQCBWECpOSqJUXgY26ncA61UTV0BkPqfhcy6mzwCIoP4ygxpW8w==",
           "dev": true,
           "requires": {
             "homedir-polyfill": "^1.0.1"
           }
-        },
-        "yargs": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
-          "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
-          "dev": true,
-          "requires": {
-            "camelcase": "^3.0.0",
-            "cliui": "^3.2.0",
-            "decamelize": "^1.1.1",
-            "get-caller-file": "^1.0.1",
-            "os-locale": "^1.4.0",
-            "read-pkg-up": "^1.0.1",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^1.0.1",
-            "set-blocking": "^2.0.0",
-            "string-width": "^1.0.2",
-            "which-module": "^1.0.0",
-            "y18n": "^3.2.1",
-            "yargs-parser": "^5.0.0"
-          }
         }
       }
     },
@@ -6429,6 +6652,7 @@
       "resolved": "https://registry.npmjs.org/gulp-decompress/-/gulp-decompress-1.2.0.tgz",
       "integrity": "sha1-jutlpeAV+O2FMsr+KEVJYGJvDcc=",
       "dev": true,
+      "optional": true,
       "requires": {
         "archive-type": "^3.0.0",
         "decompress": "^3.0.0",
@@ -6440,13 +6664,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -6459,9 +6685,10 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -6531,7 +6758,7 @@
         },
         "kind-of": {
           "version": "1.1.0",
-          "resolved": "http://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
           "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
           "dev": true
         },
@@ -6598,7 +6825,7 @@
         },
         "kind-of": {
           "version": "1.1.0",
-          "resolved": "http://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
           "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
           "dev": true
         },
@@ -6682,32 +6909,22 @@
           "dev": true
         },
         "lodash.template": {
-          "version": "4.4.0",
-          "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.4.0.tgz",
-          "integrity": "sha1-5zoDhcg1VZF0bgILmWecaQ5o+6A=",
+          "version": "4.5.0",
+          "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz",
+          "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==",
           "dev": true,
           "requires": {
-            "lodash._reinterpolate": "~3.0.0",
+            "lodash._reinterpolate": "^3.0.0",
             "lodash.templatesettings": "^4.0.0"
           }
         },
         "lodash.templatesettings": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz",
-          "integrity": "sha1-K01OlbpEDZFf8IvImeRVNmZxMxY=",
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz",
+          "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==",
           "dev": true,
           "requires": {
-            "lodash._reinterpolate": "~3.0.0"
-          }
-        },
-        "node.extend": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/node.extend/-/node.extend-2.0.2.tgz",
-          "integrity": "sha512-pDT4Dchl94/+kkgdwyS2PauDFjZG0Hk0IcHIB+LkW27HLDtdoeMxHTxZh39DYbPP8UflWXWj9JcdDozF+YDOpQ==",
-          "dev": true,
-          "requires": {
-            "has": "^1.0.3",
-            "is": "^3.2.1"
+            "lodash._reinterpolate": "^3.0.0"
           }
         },
         "plugin-error": {
@@ -6758,6 +6975,7 @@
       "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz",
       "integrity": "sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=",
       "dev": true,
+      "optional": true,
       "requires": {
         "convert-source-map": "^1.1.1",
         "graceful-fs": "^4.1.2",
@@ -6767,16 +6985,18 @@
       },
       "dependencies": {
         "graceful-fs": {
-          "version": "4.1.15",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
-          "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
-          "dev": true
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
+          "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==",
+          "dev": true,
+          "optional": true
         },
         "strip-bom": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
           "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-utf8": "^0.2.0"
           }
@@ -6786,6 +7006,7 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
+          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -6828,7 +7049,7 @@
         },
         "chalk": {
           "version": "1.1.3",
-          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
@@ -6904,7 +7125,7 @@
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
@@ -6925,7 +7146,7 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
@@ -6999,10 +7220,20 @@
         },
         "kind-of": {
           "version": "1.1.0",
-          "resolved": "http://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
           "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
           "dev": true
         },
+        "node.extend": {
+          "version": "1.1.8",
+          "resolved": "https://registry.npmjs.org/node.extend/-/node.extend-1.1.8.tgz",
+          "integrity": "sha512-L/dvEBwyg3UowwqOUTyDsGBU6kjBQOpOhshio9V3i3BMPv5YUb9+mWNN8MK0IbWqT0AqaTSONZf0aTuMMahWgA==",
+          "dev": true,
+          "requires": {
+            "has": "^1.0.3",
+            "is": "^3.2.1"
+          }
+        },
         "plugin-error": {
           "version": "0.1.2",
           "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
@@ -7194,18 +7425,18 @@
       "dev": true
     },
     "homedir-polyfill": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz",
-      "integrity": "sha1-TCu8inWJmP7r9e1oWA921GdotLw=",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
+      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
       "dev": true,
       "requires": {
         "parse-passwd": "^1.0.0"
       }
     },
     "hosted-git-info": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
-      "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==",
+      "version": "2.8.4",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.4.tgz",
+      "integrity": "sha512-pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ==",
       "dev": true
     },
     "hsl-regex": {
@@ -7240,10 +7471,10 @@
         "readable-stream": "^2.0.2"
       },
       "dependencies": {
-        "domelementtype": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
-          "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
+        "entities": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
+          "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
           "dev": true
         },
         "isarray": {
@@ -7279,32 +7510,33 @@
       }
     },
     "http-errors": {
-      "version": "1.6.3",
-      "resolved": "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-      "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
+      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
       "dev": true,
       "requires": {
         "depd": "~1.1.2",
         "inherits": "2.0.3",
-        "setprototypeof": "1.1.0",
-        "statuses": ">= 1.4.0 < 2"
+        "setprototypeof": "1.1.1",
+        "statuses": ">= 1.5.0 < 2",
+        "toidentifier": "1.0.0"
       },
       "dependencies": {
-        "statuses": {
-          "version": "1.5.0",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-          "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
           "dev": true
         }
       }
     },
     "http-proxy": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz",
-      "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.0.tgz",
+      "integrity": "sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==",
       "dev": true,
       "requires": {
-        "eventemitter3": "^3.0.0",
+        "eventemitter3": "^4.0.0",
         "follow-redirects": "^1.0.0",
         "requires-port": "^1.0.0"
       }
@@ -7378,7 +7610,7 @@
     },
     "imagemin-jpegtran": {
       "version": "5.0.2",
-      "resolved": "http://registry.npmjs.org/imagemin-jpegtran/-/imagemin-jpegtran-5.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/imagemin-jpegtran/-/imagemin-jpegtran-5.0.2.tgz",
       "integrity": "sha1-5ogiY7j3kW/duABkDPddLpcNKtY=",
       "dev": true,
       "optional": true,
@@ -7390,7 +7622,7 @@
     },
     "imagemin-optipng": {
       "version": "5.2.1",
-      "resolved": "http://registry.npmjs.org/imagemin-optipng/-/imagemin-optipng-5.2.1.tgz",
+      "resolved": "https://registry.npmjs.org/imagemin-optipng/-/imagemin-optipng-5.2.1.tgz",
       "integrity": "sha1-0i2kEsCfX/AKQzmWC5ioix2+hpU=",
       "dev": true,
       "optional": true,
@@ -7470,6 +7702,7 @@
       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
       "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
       "dev": true,
+      "optional": true,
       "requires": {
         "repeating": "^2.0.0"
       }
@@ -7503,59 +7736,100 @@
       }
     },
     "inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
       "dev": true
     },
     "ini": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-      "integrity": "sha1-7uJfVtscnsYIXgwid4CD9Zar+Sc=",
+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
       "dev": true
     },
     "inquirer": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.2.1.tgz",
-      "integrity": "sha512-088kl3DRT2dLU5riVMKKr1DlImd6X7smDhpXUCkJDCKvTEJeRiXh0G132HG9u5a+6Ylw9plFRY7RuTnwohYSpg==",
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz",
+      "integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==",
       "dev": true,
       "requires": {
-        "ansi-escapes": "^3.0.0",
-        "chalk": "^2.0.0",
+        "ansi-escapes": "^3.2.0",
+        "chalk": "^2.4.2",
         "cli-cursor": "^2.1.0",
         "cli-width": "^2.0.0",
-        "external-editor": "^3.0.0",
+        "external-editor": "^3.0.3",
         "figures": "^2.0.0",
-        "lodash": "^4.17.10",
+        "lodash": "^4.17.12",
         "mute-stream": "0.0.7",
         "run-async": "^2.2.0",
-        "rxjs": "^6.1.0",
+        "rxjs": "^6.4.0",
         "string-width": "^2.1.0",
-        "strip-ansi": "^5.0.0",
+        "strip-ansi": "^5.1.0",
         "through": "^2.3.6"
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.0.0.tgz",
-          "integrity": "sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
           "dev": true
         },
-        "strip-ansi": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz",
-          "integrity": "sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==",
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "lodash": {
+          "version": "4.17.15",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^4.0.0"
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
+          },
+          "dependencies": {
+            "strip-ansi": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "^3.0.0"
+              }
+            }
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "4.1.0",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+              "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+              "dev": true
+            }
           }
         }
       }
     },
     "interpret": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz",
-      "integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz",
+      "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==",
       "dev": true
     },
     "invariant": {
@@ -7587,9 +7861,9 @@
       "dev": true
     },
     "is": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/is/-/is-3.2.1.tgz",
-      "integrity": "sha1-0Kwq1V63sL7JJqUmb2xmKqqD3KU=",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/is/-/is-3.3.0.tgz",
+      "integrity": "sha512-nW24QBoPcFGGHJGUwnfpI7Yc5CdqWNdsyHQszVE/z2pKHXzh7FZ5GWhJqSyaQ9wMkQnsTx+kAI8bHlCX4tKdbg==",
       "dev": true
     },
     "is-absolute": {
@@ -7646,28 +7920,20 @@
     "is-buffer": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha1-76ouqdqg16suoTqXsritUf776L4=",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
       "dev": true
     },
-    "is-builtin-module": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
-      "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
-      "dev": true,
-      "requires": {
-        "builtin-modules": "^1.0.0"
-      }
-    },
     "is-bzip2": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-bzip2/-/is-bzip2-1.0.0.tgz",
       "integrity": "sha1-XuWOqlounIDiFAe+3yOuWsCRs/w=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-callable": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
-      "integrity": "sha1-HhrfIZ4e62hNaR+dagX/DTCiTXU=",
+      "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==",
       "dev": true
     },
     "is-color-stop": {
@@ -7713,7 +7979,7 @@
     "is-descriptor": {
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha1-Nm2CQN3kh8pRgjsaufB6EKeCUco=",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
       "dev": true,
       "requires": {
         "is-accessor-descriptor": "^0.1.6",
@@ -7724,7 +7990,7 @@
         "kind-of": {
           "version": "5.1.0",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha1-cpyR4thXt6QZofmqZWhcTDP1hF0=",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
           "dev": true
         }
       }
@@ -7767,19 +8033,23 @@
       "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
       "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
       "dev": true,
+      "optional": true,
       "requires": {
         "number-is-nan": "^1.0.0"
       }
     },
     "is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-      "dev": true
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+      "dev": true,
+      "requires": {
+        "number-is-nan": "^1.0.0"
+      }
     },
     "is-gif": {
       "version": "1.0.0",
-      "resolved": "http://registry.npmjs.org/is-gif/-/is-gif-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/is-gif/-/is-gif-1.0.0.tgz",
       "integrity": "sha1-ptKumIkwB7/6l6HYwB1jIFgyCX4=",
       "dev": true,
       "optional": true
@@ -7797,7 +8067,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-gzip/-/is-gzip-1.0.0.tgz",
       "integrity": "sha1-bKiwe5nHeZgCWQDlVc7Y7YCHmoM=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-jpg": {
       "version": "1.0.1",
@@ -7810,7 +8081,8 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-2.1.1.tgz",
       "integrity": "sha1-fUxXKDd+84bD4ZSpkRv1fG3DNec=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-number": {
       "version": "3.0.0",
@@ -7841,7 +8113,7 @@
     "is-plain-object": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc=",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
       "dev": true,
       "requires": {
         "isobject": "^3.0.1"
@@ -7876,7 +8148,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
       "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-regex": {
       "version": "1.0.4",
@@ -7903,10 +8176,11 @@
       "dev": true
     },
     "is-retry-allowed": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
-      "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=",
-      "dev": true
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz",
+      "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==",
+      "dev": true,
+      "optional": true
     },
     "is-stream": {
       "version": "1.1.0",
@@ -7936,7 +8210,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-tar/-/is-tar-1.0.0.tgz",
       "integrity": "sha1-L2suF5LB9bs2UZrKqdZcDSb+hT0=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-typedarray": {
       "version": "1.0.0",
@@ -7957,7 +8232,8 @@
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz",
       "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-utf8": {
       "version": "0.2.1",
@@ -7969,19 +8245,27 @@
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz",
       "integrity": "sha1-1LVcafUYhvm2XHDWwmItN+KfSP4=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-windows": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-      "integrity": "sha1-0YUOuXkezRjmGCzhKjDzlmNLsZ0=",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+      "dev": true
+    },
+    "is-wsl": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
       "dev": true
     },
     "is-zip": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-zip/-/is-zip-1.0.0.tgz",
       "integrity": "sha1-R7Co/004p2QxzP2ZqOFaTIa6IyU=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "isarray": {
       "version": "0.0.1",
@@ -8024,7 +8308,7 @@
     },
     "jpegtran-bin": {
       "version": "3.2.0",
-      "resolved": "http://registry.npmjs.org/jpegtran-bin/-/jpegtran-bin-3.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/jpegtran-bin/-/jpegtran-bin-3.2.0.tgz",
       "integrity": "sha1-9g7PSumZwL2tLp+83ytvCYHnops=",
       "dev": true,
       "optional": true,
@@ -8035,9 +8319,9 @@
       }
     },
     "jquery": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.4.0.tgz",
-      "integrity": "sha512-ggRCXln9zEqv6OqAGXFEcshF5dSBvCkzj6Gm2gzuR5fWawaX8t7cxKVkkygKODrDAzKdoYw3l/e3pm3vlT4IbQ=="
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz",
+      "integrity": "sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw=="
     },
     "jquery-ui-dist": {
       "version": "1.12.1",
@@ -8050,9 +8334,9 @@
       "integrity": "sha1-7tgiQnM7okP0az6HwYQbMIGR2mg="
     },
     "js-levenshtein": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.4.tgz",
-      "integrity": "sha512-PxfGzSs0ztShKrUYPIn5r0MtyAhYcCwmndozzpz8YObbPnD1jFxzlBGbRnX2mIu6Z13xN6+PTu05TQFnZFlzow==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz",
+      "integrity": "sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==",
       "dev": true
     },
     "js-tokens": {
@@ -8062,9 +8346,9 @@
       "dev": true
     },
     "js-yaml": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz",
-      "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==",
+      "version": "3.13.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
       "dev": true,
       "requires": {
         "argparse": "^1.0.7",
@@ -8132,9 +8416,9 @@
       },
       "dependencies": {
         "graceful-fs": {
-          "version": "4.1.15",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
-          "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
+          "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==",
           "dev": true,
           "optional": true
         }
@@ -8188,9 +8472,9 @@
       },
       "dependencies": {
         "glob": {
-          "version": "7.1.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-          "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+          "version": "7.1.4",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+          "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
           "dev": true,
           "requires": {
             "fs.realpath": "^1.0.0",
@@ -8202,15 +8486,15 @@
           }
         },
         "graceful-fs": {
-          "version": "4.1.15",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
-          "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
+          "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==",
           "dev": true
         },
         "mime": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
-          "integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
+          "version": "2.4.4",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
+          "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==",
           "dev": true
         },
         "minimatch": {
@@ -8225,7 +8509,7 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         }
       }
@@ -8268,7 +8552,7 @@
     "kind-of": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-      "integrity": "sha1-ARRrNqYhjmTljzqNZt5df8b20FE=",
+      "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
       "dev": true
     },
     "klaw": {
@@ -8281,9 +8565,9 @@
       },
       "dependencies": {
         "graceful-fs": {
-          "version": "4.1.15",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
-          "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
+          "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==",
           "dev": true,
           "optional": true
         }
@@ -8306,7 +8590,7 @@
     },
     "lazy-req": {
       "version": "1.1.0",
-      "resolved": "http://registry.npmjs.org/lazy-req/-/lazy-req-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/lazy-req/-/lazy-req-1.1.0.tgz",
       "integrity": "sha1-va6+rTD42CQDnODOFJ1Nqge6H6w=",
       "dev": true,
       "optional": true
@@ -8321,6 +8605,7 @@
       "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
       "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
       "dev": true,
+      "optional": true,
       "requires": {
         "readable-stream": "^2.0.5"
       },
@@ -8329,13 +8614,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -8348,9 +8635,10 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -8390,9 +8678,9 @@
           "dev": true
         },
         "graceful-fs": {
-          "version": "4.1.15",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
-          "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
+          "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==",
           "dev": true,
           "optional": true
         },
@@ -8445,9 +8733,9 @@
       },
       "dependencies": {
         "graceful-fs": {
-          "version": "4.1.15",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
-          "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
+          "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==",
           "dev": true
         },
         "parse-json": {
@@ -8459,12 +8747,6 @@
             "error-ex": "^1.2.0"
           }
         },
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
-        },
         "strip-bom": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
@@ -8542,12 +8824,6 @@
       "integrity": "sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y=",
       "dev": true
     },
-    "lodash.debounce": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
-      "dev": true
-    },
     "lodash.defaults": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
@@ -8585,7 +8861,8 @@
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
       "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "lodash.keys": {
       "version": "3.1.2",
@@ -8605,9 +8882,9 @@
       "dev": true
     },
     "lodash.merge": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.1.tgz",
-      "integrity": "sha1-rcJdnLmbk5HFliTzefu6YNcRHVQ=",
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
     "lodash.partialright": {
@@ -8674,12 +8951,6 @@
         "streamroller": "0.7.0"
       },
       "dependencies": {
-        "circular-json": {
-          "version": "0.5.9",
-          "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.5.9.tgz",
-          "integrity": "sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==",
-          "dev": true
-        },
         "debug": {
           "version": "3.2.6",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
@@ -8742,6 +9013,7 @@
       "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
       "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
       "dev": true,
+      "optional": true,
       "requires": {
         "currently-unhandled": "^0.4.1",
         "signal-exit": "^3.0.0"
@@ -8750,8 +9022,9 @@
     "lowercase-keys": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
-      "integrity": "sha1-b54wtHCE2XGnyCD/FabFFnt0wm8=",
-      "dev": true
+      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
+      "dev": true,
+      "optional": true
     },
     "lpad-align": {
       "version": "1.1.2",
@@ -8784,7 +9057,7 @@
     "make-dir": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
-      "integrity": "sha1-ecEDO4BRW9bSTsmTPoYMp17ifww=",
+      "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
       "dev": true,
       "requires": {
         "pify": "^3.0.0"
@@ -8817,7 +9090,8 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
       "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "map-visit": {
       "version": "1.0.0",
@@ -8847,15 +9121,15 @@
       }
     },
     "math-random": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.1.tgz",
-      "integrity": "sha1-izqsWIuKZuSXXjzepn97sylgH6w=",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
+      "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==",
       "dev": true
     },
     "mdn-data": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-1.1.4.tgz",
-      "integrity": "sha1-ULXU/8RXUnZXPE7tuHgIEqhBnwE=",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
+      "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==",
       "dev": true
     },
     "media-typer": {
@@ -8885,6 +9159,7 @@
       "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
       "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
       "dev": true,
+      "optional": true,
       "requires": {
         "camelcase-keys": "^2.0.0",
         "decamelize": "^1.1.2",
@@ -8902,7 +9177,8 @@
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -8923,7 +9199,7 @@
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
@@ -8938,7 +9214,7 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
@@ -8950,7 +9226,7 @@
     "micromatch": {
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha1-cIWbyVyYQJUvNZoGij/En57PrCM=",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
       "dev": true,
       "requires": {
         "arr-diff": "^4.0.0",
@@ -8969,25 +9245,25 @@
       }
     },
     "mime": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
-      "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
       "dev": true,
       "optional": true
     },
     "mime-db": {
-      "version": "1.37.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz",
-      "integrity": "sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==",
+      "version": "1.40.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
+      "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==",
       "dev": true
     },
     "mime-types": {
-      "version": "2.1.21",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz",
-      "integrity": "sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==",
+      "version": "2.1.24",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
+      "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
       "dev": true,
       "requires": {
-        "mime-db": "~1.37.0"
+        "mime-db": "1.40.0"
       }
     },
     "mimic-fn": {
@@ -9007,7 +9283,7 @@
     },
     "minimist": {
       "version": "1.2.0",
-      "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
       "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
       "dev": true
     },
@@ -9027,9 +9303,9 @@
       }
     },
     "mixin-deep": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
-      "integrity": "sha1-pJ5yaNzhoNlpjkUybFYm3zVD0P4=",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
       "dev": true,
       "requires": {
         "for-in": "^1.0.2",
@@ -9039,7 +9315,7 @@
         "is-extendable": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
           "dev": true,
           "requires": {
             "is-plain-object": "^2.0.4"
@@ -9058,7 +9334,7 @@
       "dependencies": {
         "minimist": {
           "version": "0.0.8",
-          "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
           "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
           "dev": true
         }
@@ -9070,9 +9346,9 @@
       "integrity": "sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y="
     },
     "ms": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-      "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
       "dev": true
     },
     "multipipe": {
@@ -9097,9 +9373,9 @@
       "dev": true
     },
     "nan": {
-      "version": "2.11.1",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.1.tgz",
-      "integrity": "sha512-iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA==",
+      "version": "2.14.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
+      "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
       "dev": true,
       "optional": true
     },
@@ -9135,14 +9411,14 @@
       "dev": true
     },
     "negotiator": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
-      "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=",
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
+      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
       "dev": true
     },
     "next-tick": {
       "version": "1.0.0",
-      "resolved": "http://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
       "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
       "dev": true
     },
@@ -9158,21 +9434,22 @@
       "dev": true
     },
     "node-notifier": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.3.0.tgz",
-      "integrity": "sha512-AhENzCSGZnZJgBARsUjnQ7DnZbzyP+HxlVXuD0xqAnvL8q+OqtSX7lGg9e8nHzwXkMMXNdVeqq4E2M3EUAqX6Q==",
+      "version": "5.4.3",
+      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.3.tgz",
+      "integrity": "sha512-M4UBGcs4jeOK9CjTsYwkvH6/MzuUmGCyTW+kCY7uO+1ZVr0+FHGdPdIf5CCLqAaxnRrWidyoQlNkMIIVwbKB8Q==",
       "dev": true,
       "requires": {
         "growly": "^1.3.0",
+        "is-wsl": "^1.1.0",
         "semver": "^5.5.0",
         "shellwords": "^0.1.1",
         "which": "^1.3.0"
       }
     },
     "node-releases": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.0.5.tgz",
-      "integrity": "sha512-Ky7q0BO1BBkG/rQz6PkEZ59rwo+aSfhczHP1wwq8IowoVdN/FpiP7qp0XW0P2+BVCWe5fQUBozdbVd54q1RbCQ==",
+      "version": "1.1.32",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.32.tgz",
+      "integrity": "sha512-VhVknkitq8dqtWoluagsGPn3dxTvN9fwgR59fV3D7sLBHe0JfDramsMI8n8mY//ccq/Kkrf8ZRHRpsyVZ3qw1A==",
       "dev": true,
       "requires": {
         "semver": "^5.3.0"
@@ -9180,14 +9457,15 @@
     },
     "node-status-codes": {
       "version": "1.0.0",
-      "resolved": "http://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz",
       "integrity": "sha1-WuVUHQJGRdMqWPzdyc7s6nrjrC8=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "node.extend": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/node.extend/-/node.extend-1.1.8.tgz",
-      "integrity": "sha512-L/dvEBwyg3UowwqOUTyDsGBU6kjBQOpOhshio9V3i3BMPv5YUb9+mWNN8MK0IbWqT0AqaTSONZf0aTuMMahWgA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/node.extend/-/node.extend-2.0.2.tgz",
+      "integrity": "sha512-pDT4Dchl94/+kkgdwyS2PauDFjZG0Hk0IcHIB+LkW27HLDtdoeMxHTxZh39DYbPP8UflWXWj9JcdDozF+YDOpQ==",
       "dev": true,
       "requires": {
         "has": "^1.0.3",
@@ -9195,13 +9473,13 @@
       }
     },
     "normalize-package-data": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-      "integrity": "sha1-EvlaMH1YNSB1oEkHuErIvpisAS8=",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
       "dev": true,
       "requires": {
         "hosted-git-info": "^2.1.4",
-        "is-builtin-module": "^1.0.0",
+        "resolve": "^1.10.0",
         "semver": "2 || 3 || 4 || 5",
         "validate-npm-package-license": "^3.0.1"
       }
@@ -9233,55 +9511,61 @@
       "integrity": "sha512-YNLKuABWYxmC5WXJ9TUj3N7+iyL/xT3+jm1mgOMXoqBhAL0Pj9BMgyKmLgwRnrxNN+C/fe7sFmpQDDPsxbMT2w=="
     },
     "npm": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/npm/-/npm-6.4.1.tgz",
-      "integrity": "sha512-mXJL1NTVU136PtuopXCUQaNWuHlXCTp4McwlSW8S9/Aj8OEPAlSBgo8og7kJ01MjCDrkmqFQTvN5tTEhBMhXQg==",
+      "version": "6.11.3",
+      "resolved": "https://registry.npmjs.org/npm/-/npm-6.11.3.tgz",
+      "integrity": "sha512-K2h+MPzZiY39Xf6eHEdECe/LKoJXam4UCflz5kIxoskN3LQFeYs5fqBGT5i4TtM/aBk+86Mcf+jgXs/WuWAutQ==",
       "requires": {
-        "JSONStream": "^1.3.4",
+        "JSONStream": "^1.3.5",
         "abbrev": "~1.1.1",
         "ansicolors": "~0.3.2",
         "ansistyles": "~0.1.3",
-        "aproba": "~1.2.0",
+        "aproba": "^2.0.0",
         "archy": "~1.0.0",
-        "bin-links": "^1.1.2",
-        "bluebird": "~3.5.1",
-        "byte-size": "^4.0.3",
-        "cacache": "^11.2.0",
-        "call-limit": "~1.1.0",
-        "chownr": "~1.0.1",
-        "ci-info": "^1.4.0",
+        "bin-links": "^1.1.3",
+        "bluebird": "^3.5.5",
+        "byte-size": "^5.0.1",
+        "cacache": "^12.0.3",
+        "call-limit": "^1.1.1",
+        "chownr": "^1.1.2",
+        "ci-info": "^2.0.0",
         "cli-columns": "^3.1.2",
-        "cli-table3": "^0.5.0",
-        "cmd-shim": "~2.0.2",
+        "cli-table3": "^0.5.1",
+        "cmd-shim": "^3.0.3",
         "columnify": "~1.5.4",
-        "config-chain": "~1.1.11",
+        "config-chain": "^1.1.12",
         "debuglog": "*",
         "detect-indent": "~5.0.0",
         "detect-newline": "^2.1.0",
         "dezalgo": "~1.0.3",
         "editor": "~1.0.0",
-        "figgy-pudding": "^3.4.1",
+        "figgy-pudding": "^3.5.1",
         "find-npm-prefix": "^1.0.2",
         "fs-vacuum": "~1.2.10",
         "fs-write-stream-atomic": "~1.0.10",
-        "gentle-fs": "^2.0.1",
-        "glob": "~7.1.2",
-        "graceful-fs": "~4.1.11",
+        "gentle-fs": "^2.2.1",
+        "glob": "^7.1.4",
+        "graceful-fs": "^4.2.2",
         "has-unicode": "~2.0.1",
-        "hosted-git-info": "^2.7.1",
+        "hosted-git-info": "^2.8.2",
         "iferr": "^1.0.2",
         "imurmurhash": "*",
+        "infer-owner": "^1.0.4",
         "inflight": "~1.0.6",
-        "inherits": "~2.0.3",
+        "inherits": "^2.0.4",
         "ini": "^1.3.5",
         "init-package-json": "^1.10.3",
-        "is-cidr": "^2.0.6",
+        "is-cidr": "^3.0.0",
         "json-parse-better-errors": "^1.0.2",
         "lazy-property": "~1.0.0",
-        "libcipm": "^2.0.2",
-        "libnpmhook": "^4.0.1",
+        "libcipm": "^4.0.3",
+        "libnpm": "^3.0.1",
+        "libnpmaccess": "^3.0.2",
+        "libnpmhook": "^5.0.3",
+        "libnpmorg": "^1.0.1",
+        "libnpmsearch": "^2.0.2",
+        "libnpmteam": "^1.0.2",
         "libnpx": "^10.2.0",
-        "lock-verify": "^2.0.2",
+        "lock-verify": "^2.1.0",
         "lockfile": "^1.0.4",
         "lodash._baseindexof": "*",
         "lodash._baseuniq": "~4.6.0",
@@ -9294,71 +9578,70 @@
         "lodash.union": "~4.6.0",
         "lodash.uniq": "~4.5.0",
         "lodash.without": "~4.4.0",
-        "lru-cache": "^4.1.3",
+        "lru-cache": "^5.1.1",
         "meant": "~1.0.1",
         "mississippi": "^3.0.0",
         "mkdirp": "~0.5.1",
         "move-concurrently": "^1.0.1",
-        "node-gyp": "^3.8.0",
+        "node-gyp": "^5.0.3",
         "nopt": "~4.0.1",
-        "normalize-package-data": "~2.4.0",
-        "npm-audit-report": "^1.3.1",
+        "normalize-package-data": "^2.5.0",
+        "npm-audit-report": "^1.3.2",
         "npm-cache-filename": "~1.0.2",
         "npm-install-checks": "~3.0.0",
-        "npm-lifecycle": "^2.1.0",
-        "npm-package-arg": "^6.1.0",
-        "npm-packlist": "^1.1.11",
-        "npm-pick-manifest": "^2.1.0",
-        "npm-profile": "^3.0.2",
-        "npm-registry-client": "^8.6.0",
-        "npm-registry-fetch": "^1.1.0",
+        "npm-lifecycle": "^3.1.3",
+        "npm-package-arg": "^6.1.1",
+        "npm-packlist": "^1.4.4",
+        "npm-pick-manifest": "^3.0.2",
+        "npm-profile": "^4.0.2",
+        "npm-registry-fetch": "^4.0.0",
         "npm-user-validate": "~1.0.0",
         "npmlog": "~4.1.2",
         "once": "~1.4.0",
-        "opener": "^1.5.0",
+        "opener": "^1.5.1",
         "osenv": "^0.1.5",
-        "pacote": "^8.1.6",
+        "pacote": "^9.5.8",
         "path-is-inside": "~1.0.2",
         "promise-inflight": "~1.0.1",
         "qrcode-terminal": "^0.12.0",
-        "query-string": "^6.1.0",
+        "query-string": "^6.8.2",
         "qw": "~1.0.1",
         "read": "~1.0.7",
-        "read-cmd-shim": "~1.0.1",
+        "read-cmd-shim": "^1.0.4",
         "read-installed": "~4.0.3",
-        "read-package-json": "^2.0.13",
-        "read-package-tree": "^5.2.1",
-        "readable-stream": "^2.3.6",
-        "readdir-scoped-modules": "*",
+        "read-package-json": "^2.1.0",
+        "read-package-tree": "^5.3.1",
+        "readable-stream": "^3.4.0",
+        "readdir-scoped-modules": "^1.1.0",
         "request": "^2.88.0",
         "retry": "^0.12.0",
-        "rimraf": "~2.6.2",
+        "rimraf": "^2.6.3",
         "safe-buffer": "^5.1.2",
-        "semver": "^5.5.0",
-        "sha": "~2.0.1",
+        "semver": "^5.7.1",
+        "sha": "^3.0.0",
         "slide": "~1.1.6",
         "sorted-object": "~2.0.1",
         "sorted-union-stream": "~2.1.3",
-        "ssri": "^6.0.0",
+        "ssri": "^6.0.1",
         "stringify-package": "^1.0.0",
-        "tar": "^4.4.6",
+        "tar": "^4.4.10",
         "text-table": "~0.2.0",
         "tiny-relative-date": "^1.3.0",
         "uid-number": "0.0.6",
         "umask": "~1.1.0",
-        "unique-filename": "~1.1.0",
+        "unique-filename": "^1.1.1",
         "unpipe": "~1.0.0",
         "update-notifier": "^2.5.0",
         "uuid": "^3.3.2",
         "validate-npm-package-license": "^3.0.4",
         "validate-npm-package-name": "~3.0.0",
         "which": "^1.3.1",
-        "worker-farm": "^1.6.0",
-        "write-file-atomic": "^2.3.0"
+        "worker-farm": "^1.7.0",
+        "write-file-atomic": "^2.4.3"
       },
       "dependencies": {
         "JSONStream": {
-          "version": "1.3.4",
+          "version": "1.3.5",
           "bundled": true,
           "requires": {
             "jsonparse": "^1.2.0",
@@ -9370,14 +9653,14 @@
           "bundled": true
         },
         "agent-base": {
-          "version": "4.2.0",
+          "version": "4.3.0",
           "bundled": true,
           "requires": {
             "es6-promisify": "^5.0.0"
           }
         },
         "agentkeepalive": {
-          "version": "3.4.1",
+          "version": "3.5.2",
           "bundled": true,
           "requires": {
             "humanize-ms": "^1.2.1"
@@ -9420,7 +9703,7 @@
           "bundled": true
         },
         "aproba": {
-          "version": "1.2.0",
+          "version": "2.0.0",
           "bundled": true
         },
         "archy": {
@@ -9433,6 +9716,28 @@
           "requires": {
             "delegates": "^1.0.0",
             "readable-stream": "^2.0.6"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            }
           }
         },
         "asap": {
@@ -9475,25 +9780,18 @@
           }
         },
         "bin-links": {
-          "version": "1.1.2",
+          "version": "1.1.3",
           "bundled": true,
           "requires": {
-            "bluebird": "^3.5.0",
-            "cmd-shim": "^2.0.2",
-            "gentle-fs": "^2.0.0",
-            "graceful-fs": "^4.1.11",
+            "bluebird": "^3.5.3",
+            "cmd-shim": "^3.0.0",
+            "gentle-fs": "^2.0.1",
+            "graceful-fs": "^4.1.15",
             "write-file-atomic": "^2.3.0"
           }
         },
-        "block-stream": {
-          "version": "0.0.9",
-          "bundled": true,
-          "requires": {
-            "inherits": "~2.0.0"
-          }
-        },
         "bluebird": {
-          "version": "3.5.1",
+          "version": "3.5.5",
           "bundled": true
         },
         "boxen": {
@@ -9521,10 +9819,6 @@
           "version": "1.0.0",
           "bundled": true
         },
-        "builtin-modules": {
-          "version": "1.1.1",
-          "bundled": true
-        },
         "builtins": {
           "version": "1.0.3",
           "bundled": true
@@ -9534,31 +9828,32 @@
           "bundled": true
         },
         "byte-size": {
-          "version": "4.0.3",
+          "version": "5.0.1",
           "bundled": true
         },
         "cacache": {
-          "version": "11.2.0",
+          "version": "12.0.3",
           "bundled": true,
           "requires": {
-            "bluebird": "^3.5.1",
-            "chownr": "^1.0.1",
-            "figgy-pudding": "^3.1.0",
-            "glob": "^7.1.2",
-            "graceful-fs": "^4.1.11",
-            "lru-cache": "^4.1.3",
+            "bluebird": "^3.5.5",
+            "chownr": "^1.1.1",
+            "figgy-pudding": "^3.5.1",
+            "glob": "^7.1.4",
+            "graceful-fs": "^4.1.15",
+            "infer-owner": "^1.0.3",
+            "lru-cache": "^5.1.1",
             "mississippi": "^3.0.0",
             "mkdirp": "^0.5.1",
             "move-concurrently": "^1.0.1",
             "promise-inflight": "^1.0.1",
-            "rimraf": "^2.6.2",
-            "ssri": "^6.0.0",
-            "unique-filename": "^1.1.0",
+            "rimraf": "^2.6.3",
+            "ssri": "^6.0.1",
+            "unique-filename": "^1.1.1",
             "y18n": "^4.0.0"
           }
         },
         "call-limit": {
-          "version": "1.1.0",
+          "version": "1.1.1",
           "bundled": true
         },
         "camelcase": {
@@ -9583,15 +9878,15 @@
           }
         },
         "chownr": {
-          "version": "1.0.1",
+          "version": "1.1.2",
           "bundled": true
         },
         "ci-info": {
-          "version": "1.4.0",
+          "version": "2.0.0",
           "bundled": true
         },
         "cidr-regex": {
-          "version": "2.0.9",
+          "version": "2.0.10",
           "bundled": true,
           "requires": {
             "ip-regex": "^2.1.0"
@@ -9610,7 +9905,7 @@
           }
         },
         "cli-table3": {
-          "version": "0.5.0",
+          "version": "0.5.1",
           "bundled": true,
           "requires": {
             "colors": "^1.1.2",
@@ -9645,7 +9940,7 @@
           "bundled": true
         },
         "cmd-shim": {
-          "version": "2.0.2",
+          "version": "3.0.3",
           "bundled": true,
           "requires": {
             "graceful-fs": "^4.1.2",
@@ -9672,7 +9967,7 @@
           "bundled": true
         },
         "colors": {
-          "version": "1.1.2",
+          "version": "1.3.3",
           "bundled": true,
           "optional": true
         },
@@ -9703,10 +9998,32 @@
             "inherits": "^2.0.3",
             "readable-stream": "^2.2.2",
             "typedarray": "^0.0.6"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            }
           }
         },
         "config-chain": {
-          "version": "1.1.11",
+          "version": "1.1.12",
           "bundled": true,
           "requires": {
             "ini": "^1.3.4",
@@ -9741,6 +10058,10 @@
             "run-queue": "^1.0.0"
           },
           "dependencies": {
+            "aproba": {
+              "version": "1.2.0",
+              "bundled": true
+            },
             "iferr": {
               "version": "0.1.5",
               "bundled": true
@@ -9765,6 +10086,20 @@
             "lru-cache": "^4.0.1",
             "shebang-command": "^1.2.0",
             "which": "^1.2.9"
+          },
+          "dependencies": {
+            "lru-cache": {
+              "version": "4.1.5",
+              "bundled": true,
+              "requires": {
+                "pseudomap": "^1.0.2",
+                "yallist": "^2.1.2"
+              }
+            },
+            "yallist": {
+              "version": "2.1.2",
+              "bundled": true
+            }
           }
         },
         "crypto-random-string": {
@@ -9818,6 +10153,13 @@
             "clone": "^1.0.2"
           }
         },
+        "define-properties": {
+          "version": "1.1.3",
+          "bundled": true,
+          "requires": {
+            "object-keys": "^1.0.12"
+          }
+        },
         "delayed-stream": {
           "version": "1.0.0",
           "bundled": true
@@ -9865,6 +10207,28 @@
             "inherits": "^2.0.1",
             "readable-stream": "^2.0.0",
             "stream-shift": "^1.0.0"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            }
           }
         },
         "ecc-jsbn": {
@@ -9894,6 +10258,10 @@
             "once": "^1.4.0"
           }
         },
+        "env-paths": {
+          "version": "1.0.0",
+          "bundled": true
+        },
         "err-code": {
           "version": "1.1.2",
           "bundled": true
@@ -9905,8 +10273,28 @@
             "prr": "~1.0.1"
           }
         },
+        "es-abstract": {
+          "version": "1.12.0",
+          "bundled": true,
+          "requires": {
+            "es-to-primitive": "^1.1.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.1",
+            "is-callable": "^1.1.3",
+            "is-regex": "^1.0.4"
+          }
+        },
+        "es-to-primitive": {
+          "version": "1.2.0",
+          "bundled": true,
+          "requires": {
+            "is-callable": "^1.1.4",
+            "is-date-object": "^1.0.1",
+            "is-symbol": "^1.0.2"
+          }
+        },
         "es6-promise": {
-          "version": "4.2.4",
+          "version": "4.2.8",
           "bundled": true
         },
         "es6-promisify": {
@@ -9931,6 +10319,12 @@
             "p-finally": "^1.0.0",
             "signal-exit": "^3.0.0",
             "strip-eof": "^1.0.0"
+          },
+          "dependencies": {
+            "get-stream": {
+              "version": "3.0.0",
+              "bundled": true
+            }
           }
         },
         "extend": {
@@ -9950,7 +10344,7 @@
           "bundled": true
         },
         "figgy-pudding": {
-          "version": "3.4.1",
+          "version": "3.5.1",
           "bundled": true
         },
         "find-npm-prefix": {
@@ -9970,6 +10364,28 @@
           "requires": {
             "inherits": "^2.0.1",
             "readable-stream": "^2.0.4"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            }
           }
         },
         "forever-agent": {
@@ -9991,10 +10407,32 @@
           "requires": {
             "inherits": "^2.0.1",
             "readable-stream": "^2.0.0"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            }
           }
         },
         "fs-minipass": {
-          "version": "1.2.5",
+          "version": "1.2.6",
           "bundled": true,
           "requires": {
             "minipass": "^2.2.1"
@@ -10022,6 +10460,26 @@
             "iferr": {
               "version": "0.1.5",
               "bundled": true
+            },
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
             }
           }
         },
@@ -10029,15 +10487,9 @@
           "version": "1.0.0",
           "bundled": true
         },
-        "fstream": {
-          "version": "1.0.11",
-          "bundled": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "inherits": "~2.0.0",
-            "mkdirp": ">=0.5 0",
-            "rimraf": "2"
-          }
+        "function-bind": {
+          "version": "1.1.1",
+          "bundled": true
         },
         "gauge": {
           "version": "2.7.4",
@@ -10053,6 +10505,10 @@
             "wide-align": "^1.1.0"
           },
           "dependencies": {
+            "aproba": {
+              "version": "1.2.0",
+              "bundled": true
+            },
             "string-width": {
               "version": "1.0.2",
               "bundled": true,
@@ -10065,23 +10521,29 @@
           }
         },
         "genfun": {
-          "version": "4.0.1",
+          "version": "5.0.0",
           "bundled": true
         },
         "gentle-fs": {
-          "version": "2.0.1",
+          "version": "2.2.1",
           "bundled": true,
           "requires": {
             "aproba": "^1.1.2",
+            "chownr": "^1.1.2",
             "fs-vacuum": "^1.2.10",
             "graceful-fs": "^4.1.11",
             "iferr": "^0.1.5",
+            "infer-owner": "^1.0.4",
             "mkdirp": "^0.5.1",
             "path-is-inside": "^1.0.2",
             "read-cmd-shim": "^1.0.1",
             "slide": "^1.1.6"
           },
           "dependencies": {
+            "aproba": {
+              "version": "1.2.0",
+              "bundled": true
+            },
             "iferr": {
               "version": "0.1.5",
               "bundled": true
@@ -10093,8 +10555,11 @@
           "bundled": true
         },
         "get-stream": {
-          "version": "3.0.0",
-          "bundled": true
+          "version": "4.1.0",
+          "bundled": true,
+          "requires": {
+            "pump": "^3.0.0"
+          }
         },
         "getpass": {
           "version": "0.1.7",
@@ -10104,7 +10569,7 @@
           }
         },
         "glob": {
-          "version": "7.1.2",
+          "version": "7.1.4",
           "bundled": true,
           "requires": {
             "fs.realpath": "^1.0.0",
@@ -10137,10 +10602,16 @@
             "timed-out": "^4.0.0",
             "unzip-response": "^2.0.1",
             "url-parse-lax": "^1.0.0"
+          },
+          "dependencies": {
+            "get-stream": {
+              "version": "3.0.0",
+              "bundled": true
+            }
           }
         },
         "graceful-fs": {
-          "version": "4.1.11",
+          "version": "4.2.2",
           "bundled": true
         },
         "har-schema": {
@@ -10155,17 +10626,31 @@
             "har-schema": "^2.0.0"
           }
         },
+        "has": {
+          "version": "1.0.3",
+          "bundled": true,
+          "requires": {
+            "function-bind": "^1.1.1"
+          }
+        },
         "has-flag": {
           "version": "3.0.0",
           "bundled": true
         },
+        "has-symbols": {
+          "version": "1.0.0",
+          "bundled": true
+        },
         "has-unicode": {
           "version": "2.0.1",
           "bundled": true
         },
         "hosted-git-info": {
-          "version": "2.7.1",
-          "bundled": true
+          "version": "2.8.2",
+          "bundled": true,
+          "requires": {
+            "lru-cache": "^5.1.1"
+          }
         },
         "http-cache-semantics": {
           "version": "3.8.1",
@@ -10189,10 +10674,10 @@
           }
         },
         "https-proxy-agent": {
-          "version": "2.2.1",
+          "version": "2.2.2",
           "bundled": true,
           "requires": {
-            "agent-base": "^4.1.0",
+            "agent-base": "^4.3.0",
             "debug": "^3.1.0"
           }
         },
@@ -10229,6 +10714,10 @@
           "version": "0.1.4",
           "bundled": true
         },
+        "infer-owner": {
+          "version": "1.0.4",
+          "bundled": true
+        },
         "inflight": {
           "version": "1.0.6",
           "bundled": true,
@@ -10238,7 +10727,7 @@
           }
         },
         "inherits": {
-          "version": "2.0.3",
+          "version": "2.0.4",
           "bundled": true
         },
         "ini": {
@@ -10271,27 +10760,34 @@
           "version": "2.1.0",
           "bundled": true
         },
-        "is-builtin-module": {
-          "version": "1.0.0",
-          "bundled": true,
-          "requires": {
-            "builtin-modules": "^1.0.0"
-          }
+        "is-callable": {
+          "version": "1.1.4",
+          "bundled": true
         },
         "is-ci": {
           "version": "1.1.0",
           "bundled": true,
           "requires": {
             "ci-info": "^1.0.0"
+          },
+          "dependencies": {
+            "ci-info": {
+              "version": "1.6.0",
+              "bundled": true
+            }
           }
         },
         "is-cidr": {
-          "version": "2.0.6",
+          "version": "3.0.0",
           "bundled": true,
           "requires": {
-            "cidr-regex": "^2.0.8"
+            "cidr-regex": "^2.0.10"
           }
         },
+        "is-date-object": {
+          "version": "1.0.1",
+          "bundled": true
+        },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "bundled": true,
@@ -10326,6 +10822,13 @@
           "version": "1.0.0",
           "bundled": true
         },
+        "is-regex": {
+          "version": "1.0.4",
+          "bundled": true,
+          "requires": {
+            "has": "^1.0.1"
+          }
+        },
         "is-retry-allowed": {
           "version": "1.1.0",
           "bundled": true
@@ -10334,6 +10837,13 @@
           "version": "1.1.0",
           "bundled": true
         },
+        "is-symbol": {
+          "version": "1.0.2",
+          "bundled": true,
+          "requires": {
+            "has-symbols": "^1.0.0"
+          }
+        },
         "is-typedarray": {
           "version": "1.0.0",
           "bundled": true
@@ -10404,46 +10914,160 @@
           }
         },
         "libcipm": {
-          "version": "2.0.2",
+          "version": "4.0.3",
           "bundled": true,
           "requires": {
             "bin-links": "^1.1.2",
             "bluebird": "^3.5.1",
+            "figgy-pudding": "^3.5.1",
             "find-npm-prefix": "^1.0.2",
             "graceful-fs": "^4.1.11",
+            "ini": "^1.3.5",
             "lock-verify": "^2.0.2",
             "mkdirp": "^0.5.1",
-            "npm-lifecycle": "^2.0.3",
+            "npm-lifecycle": "^3.0.0",
             "npm-logical-tree": "^1.2.1",
             "npm-package-arg": "^6.1.0",
-            "pacote": "^8.1.6",
-            "protoduck": "^5.0.0",
+            "pacote": "^9.1.0",
             "read-package-json": "^2.0.13",
             "rimraf": "^2.6.2",
             "worker-farm": "^1.6.0"
           }
         },
-        "libnpmhook": {
-          "version": "4.0.1",
+        "libnpm": {
+          "version": "3.0.1",
           "bundled": true,
           "requires": {
-            "figgy-pudding": "^3.1.0",
-            "npm-registry-fetch": "^3.0.0"
+            "bin-links": "^1.1.2",
+            "bluebird": "^3.5.3",
+            "find-npm-prefix": "^1.0.2",
+            "libnpmaccess": "^3.0.2",
+            "libnpmconfig": "^1.2.1",
+            "libnpmhook": "^5.0.3",
+            "libnpmorg": "^1.0.1",
+            "libnpmpublish": "^1.1.2",
+            "libnpmsearch": "^2.0.2",
+            "libnpmteam": "^1.0.2",
+            "lock-verify": "^2.0.2",
+            "npm-lifecycle": "^3.0.0",
+            "npm-logical-tree": "^1.2.1",
+            "npm-package-arg": "^6.1.0",
+            "npm-profile": "^4.0.2",
+            "npm-registry-fetch": "^4.0.0",
+            "npmlog": "^4.1.2",
+            "pacote": "^9.5.3",
+            "read-package-json": "^2.0.13",
+            "stringify-package": "^1.0.0"
+          }
+        },
+        "libnpmaccess": {
+          "version": "3.0.2",
+          "bundled": true,
+          "requires": {
+            "aproba": "^2.0.0",
+            "get-stream": "^4.0.0",
+            "npm-package-arg": "^6.1.0",
+            "npm-registry-fetch": "^4.0.0"
+          }
+        },
+        "libnpmconfig": {
+          "version": "1.2.1",
+          "bundled": true,
+          "requires": {
+            "figgy-pudding": "^3.5.1",
+            "find-up": "^3.0.0",
+            "ini": "^1.3.5"
           },
           "dependencies": {
-            "npm-registry-fetch": {
-              "version": "3.1.1",
+            "find-up": {
+              "version": "3.0.0",
               "bundled": true,
               "requires": {
-                "bluebird": "^3.5.1",
-                "figgy-pudding": "^3.1.0",
-                "lru-cache": "^4.1.2",
-                "make-fetch-happen": "^4.0.0",
-                "npm-package-arg": "^6.0.0"
+                "locate-path": "^3.0.0"
               }
+            },
+            "locate-path": {
+              "version": "3.0.0",
+              "bundled": true,
+              "requires": {
+                "p-locate": "^3.0.0",
+                "path-exists": "^3.0.0"
+              }
+            },
+            "p-limit": {
+              "version": "2.2.0",
+              "bundled": true,
+              "requires": {
+                "p-try": "^2.0.0"
+              }
+            },
+            "p-locate": {
+              "version": "3.0.0",
+              "bundled": true,
+              "requires": {
+                "p-limit": "^2.0.0"
+              }
+            },
+            "p-try": {
+              "version": "2.2.0",
+              "bundled": true
             }
           }
         },
+        "libnpmhook": {
+          "version": "5.0.3",
+          "bundled": true,
+          "requires": {
+            "aproba": "^2.0.0",
+            "figgy-pudding": "^3.4.1",
+            "get-stream": "^4.0.0",
+            "npm-registry-fetch": "^4.0.0"
+          }
+        },
+        "libnpmorg": {
+          "version": "1.0.1",
+          "bundled": true,
+          "requires": {
+            "aproba": "^2.0.0",
+            "figgy-pudding": "^3.4.1",
+            "get-stream": "^4.0.0",
+            "npm-registry-fetch": "^4.0.0"
+          }
+        },
+        "libnpmpublish": {
+          "version": "1.1.2",
+          "bundled": true,
+          "requires": {
+            "aproba": "^2.0.0",
+            "figgy-pudding": "^3.5.1",
+            "get-stream": "^4.0.0",
+            "lodash.clonedeep": "^4.5.0",
+            "normalize-package-data": "^2.4.0",
+            "npm-package-arg": "^6.1.0",
+            "npm-registry-fetch": "^4.0.0",
+            "semver": "^5.5.1",
+            "ssri": "^6.0.1"
+          }
+        },
+        "libnpmsearch": {
+          "version": "2.0.2",
+          "bundled": true,
+          "requires": {
+            "figgy-pudding": "^3.5.1",
+            "get-stream": "^4.0.0",
+            "npm-registry-fetch": "^4.0.0"
+          }
+        },
+        "libnpmteam": {
+          "version": "1.0.2",
+          "bundled": true,
+          "requires": {
+            "aproba": "^2.0.0",
+            "figgy-pudding": "^3.4.1",
+            "get-stream": "^4.0.0",
+            "npm-registry-fetch": "^4.0.0"
+          }
+        },
         "libnpx": {
           "version": "10.2.0",
           "bundled": true,
@@ -10467,10 +11091,10 @@
           }
         },
         "lock-verify": {
-          "version": "2.0.2",
+          "version": "2.1.0",
           "bundled": true,
           "requires": {
-            "npm-package-arg": "^5.1.2 || 6",
+            "npm-package-arg": "^6.1.0",
             "semver": "^5.4.1"
           }
         },
@@ -10545,11 +11169,10 @@
           "bundled": true
         },
         "lru-cache": {
-          "version": "4.1.3",
+          "version": "5.1.1",
           "bundled": true,
           "requires": {
-            "pseudomap": "^1.0.2",
-            "yallist": "^2.1.2"
+            "yallist": "^3.0.2"
           }
         },
         "make-dir": {
@@ -10560,15 +11183,15 @@
           }
         },
         "make-fetch-happen": {
-          "version": "4.0.1",
+          "version": "5.0.0",
           "bundled": true,
           "requires": {
             "agentkeepalive": "^3.4.1",
-            "cacache": "^11.0.1",
+            "cacache": "^12.0.0",
             "http-cache-semantics": "^3.8.1",
             "http-proxy-agent": "^2.1.0",
             "https-proxy-agent": "^2.2.1",
-            "lru-cache": "^4.1.2",
+            "lru-cache": "^5.1.1",
             "mississippi": "^3.0.0",
             "node-fetch-npm": "^2.0.2",
             "promise-retry": "^1.1.1",
@@ -10628,7 +11251,7 @@
           }
         },
         "minizlib": {
-          "version": "1.1.0",
+          "version": "1.2.1",
           "bundled": true,
           "requires": {
             "minipass": "^2.2.1"
@@ -10667,6 +11290,12 @@
             "mkdirp": "^0.5.1",
             "rimraf": "^2.5.4",
             "run-queue": "^1.0.3"
+          },
+          "dependencies": {
+            "aproba": {
+              "version": "1.2.0",
+              "bundled": true
+            }
           }
         },
         "ms": {
@@ -10687,20 +11316,19 @@
           }
         },
         "node-gyp": {
-          "version": "3.8.0",
+          "version": "5.0.3",
           "bundled": true,
           "requires": {
-            "fstream": "^1.0.0",
+            "env-paths": "^1.0.0",
             "glob": "^7.0.3",
             "graceful-fs": "^4.1.2",
             "mkdirp": "^0.5.0",
             "nopt": "2 || 3",
             "npmlog": "0 || 1 || 2 || 3 || 4",
-            "osenv": "0",
             "request": "^2.87.0",
             "rimraf": "2",
             "semver": "~5.3.0",
-            "tar": "^2.0.0",
+            "tar": "^4.4.8",
             "which": "1"
           },
           "dependencies": {
@@ -10714,15 +11342,6 @@
             "semver": {
               "version": "5.3.0",
               "bundled": true
-            },
-            "tar": {
-              "version": "2.2.1",
-              "bundled": true,
-              "requires": {
-                "block-stream": "*",
-                "fstream": "^1.0.2",
-                "inherits": "2"
-              }
             }
           }
         },
@@ -10735,17 +11354,26 @@
           }
         },
         "normalize-package-data": {
-          "version": "2.4.0",
+          "version": "2.5.0",
           "bundled": true,
           "requires": {
             "hosted-git-info": "^2.1.4",
-            "is-builtin-module": "^1.0.0",
+            "resolve": "^1.10.0",
             "semver": "2 || 3 || 4 || 5",
             "validate-npm-package-license": "^3.0.1"
+          },
+          "dependencies": {
+            "resolve": {
+              "version": "1.10.0",
+              "bundled": true,
+              "requires": {
+                "path-parse": "^1.0.6"
+              }
+            }
           }
         },
         "npm-audit-report": {
-          "version": "1.3.1",
+          "version": "1.3.2",
           "bundled": true,
           "requires": {
             "cli-table3": "^0.5.0",
@@ -10753,7 +11381,7 @@
           }
         },
         "npm-bundled": {
-          "version": "1.0.5",
+          "version": "1.0.6",
           "bundled": true
         },
         "npm-cache-filename": {
@@ -10768,12 +11396,12 @@
           }
         },
         "npm-lifecycle": {
-          "version": "2.1.0",
+          "version": "3.1.3",
           "bundled": true,
           "requires": {
             "byline": "^5.0.0",
-            "graceful-fs": "^4.1.11",
-            "node-gyp": "^3.8.0",
+            "graceful-fs": "^4.1.15",
+            "node-gyp": "^5.0.2",
             "resolve-from": "^4.0.0",
             "slide": "^1.1.6",
             "uid-number": "0.0.6",
@@ -10786,17 +11414,17 @@
           "bundled": true
         },
         "npm-package-arg": {
-          "version": "6.1.0",
+          "version": "6.1.1",
           "bundled": true,
           "requires": {
-            "hosted-git-info": "^2.6.0",
+            "hosted-git-info": "^2.7.1",
             "osenv": "^0.1.5",
-            "semver": "^5.5.0",
+            "semver": "^5.6.0",
             "validate-npm-package-name": "^3.0.0"
           }
         },
         "npm-packlist": {
-          "version": "1.1.11",
+          "version": "1.4.4",
           "bundled": true,
           "requires": {
             "ignore-walk": "^3.0.1",
@@ -10804,157 +11432,33 @@
           }
         },
         "npm-pick-manifest": {
-          "version": "2.1.0",
+          "version": "3.0.2",
           "bundled": true,
           "requires": {
+            "figgy-pudding": "^3.5.1",
             "npm-package-arg": "^6.0.0",
             "semver": "^5.4.1"
           }
         },
         "npm-profile": {
-          "version": "3.0.2",
+          "version": "4.0.2",
           "bundled": true,
           "requires": {
             "aproba": "^1.1.2 || 2",
-            "make-fetch-happen": "^2.5.0 || 3 || 4"
-          }
-        },
-        "npm-registry-client": {
-          "version": "8.6.0",
-          "bundled": true,
-          "requires": {
-            "concat-stream": "^1.5.2",
-            "graceful-fs": "^4.1.6",
-            "normalize-package-data": "~1.0.1 || ^2.0.0",
-            "npm-package-arg": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0",
-            "npmlog": "2 || ^3.1.0 || ^4.0.0",
-            "once": "^1.3.3",
-            "request": "^2.74.0",
-            "retry": "^0.10.0",
-            "safe-buffer": "^5.1.1",
-            "semver": "2 >=2.2.1 || 3.x || 4 || 5",
-            "slide": "^1.1.3",
-            "ssri": "^5.2.4"
-          },
-          "dependencies": {
-            "retry": {
-              "version": "0.10.1",
-              "bundled": true
-            },
-            "ssri": {
-              "version": "5.3.0",
-              "bundled": true,
-              "requires": {
-                "safe-buffer": "^5.1.1"
-              }
-            }
+            "figgy-pudding": "^3.4.1",
+            "npm-registry-fetch": "^4.0.0"
           }
         },
         "npm-registry-fetch": {
-          "version": "1.1.0",
+          "version": "4.0.0",
           "bundled": true,
           "requires": {
+            "JSONStream": "^1.3.4",
             "bluebird": "^3.5.1",
-            "figgy-pudding": "^2.0.1",
-            "lru-cache": "^4.1.2",
-            "make-fetch-happen": "^3.0.0",
-            "npm-package-arg": "^6.0.0",
-            "safe-buffer": "^5.1.1"
-          },
-          "dependencies": {
-            "cacache": {
-              "version": "10.0.4",
-              "bundled": true,
-              "requires": {
-                "bluebird": "^3.5.1",
-                "chownr": "^1.0.1",
-                "glob": "^7.1.2",
-                "graceful-fs": "^4.1.11",
-                "lru-cache": "^4.1.1",
-                "mississippi": "^2.0.0",
-                "mkdirp": "^0.5.1",
-                "move-concurrently": "^1.0.1",
-                "promise-inflight": "^1.0.1",
-                "rimraf": "^2.6.2",
-                "ssri": "^5.2.4",
-                "unique-filename": "^1.1.0",
-                "y18n": "^4.0.0"
-              },
-              "dependencies": {
-                "mississippi": {
-                  "version": "2.0.0",
-                  "bundled": true,
-                  "requires": {
-                    "concat-stream": "^1.5.0",
-                    "duplexify": "^3.4.2",
-                    "end-of-stream": "^1.1.0",
-                    "flush-write-stream": "^1.0.0",
-                    "from2": "^2.1.0",
-                    "parallel-transform": "^1.1.0",
-                    "pump": "^2.0.1",
-                    "pumpify": "^1.3.3",
-                    "stream-each": "^1.1.0",
-                    "through2": "^2.0.0"
-                  }
-                }
-              }
-            },
-            "figgy-pudding": {
-              "version": "2.0.1",
-              "bundled": true
-            },
-            "make-fetch-happen": {
-              "version": "3.0.0",
-              "bundled": true,
-              "requires": {
-                "agentkeepalive": "^3.4.1",
-                "cacache": "^10.0.4",
-                "http-cache-semantics": "^3.8.1",
-                "http-proxy-agent": "^2.1.0",
-                "https-proxy-agent": "^2.2.0",
-                "lru-cache": "^4.1.2",
-                "mississippi": "^3.0.0",
-                "node-fetch-npm": "^2.0.2",
-                "promise-retry": "^1.1.1",
-                "socks-proxy-agent": "^3.0.1",
-                "ssri": "^5.2.4"
-              }
-            },
-            "pump": {
-              "version": "2.0.1",
-              "bundled": true,
-              "requires": {
-                "end-of-stream": "^1.1.0",
-                "once": "^1.3.1"
-              }
-            },
-            "smart-buffer": {
-              "version": "1.1.15",
-              "bundled": true
-            },
-            "socks": {
-              "version": "1.1.10",
-              "bundled": true,
-              "requires": {
-                "ip": "^1.1.4",
-                "smart-buffer": "^1.0.13"
-              }
-            },
-            "socks-proxy-agent": {
-              "version": "3.0.1",
-              "bundled": true,
-              "requires": {
-                "agent-base": "^4.1.0",
-                "socks": "^1.1.10"
-              }
-            },
-            "ssri": {
-              "version": "5.3.0",
-              "bundled": true,
-              "requires": {
-                "safe-buffer": "^5.1.1"
-              }
-            }
+            "figgy-pudding": "^3.4.1",
+            "lru-cache": "^5.1.1",
+            "make-fetch-happen": "^5.0.0",
+            "npm-package-arg": "^6.1.0"
           }
         },
         "npm-run-path": {
@@ -10990,6 +11494,18 @@
           "version": "4.1.1",
           "bundled": true
         },
+        "object-keys": {
+          "version": "1.0.12",
+          "bundled": true
+        },
+        "object.getownpropertydescriptors": {
+          "version": "2.0.3",
+          "bundled": true,
+          "requires": {
+            "define-properties": "^1.1.2",
+            "es-abstract": "^1.5.1"
+          }
+        },
         "once": {
           "version": "1.4.0",
           "bundled": true,
@@ -10998,7 +11514,7 @@
           }
         },
         "opener": {
-          "version": "1.5.0",
+          "version": "1.5.1",
           "bundled": true
         },
         "os-homedir": {
@@ -11059,34 +11575,48 @@
           }
         },
         "pacote": {
-          "version": "8.1.6",
+          "version": "9.5.8",
           "bundled": true,
           "requires": {
-            "bluebird": "^3.5.1",
-            "cacache": "^11.0.2",
-            "get-stream": "^3.0.0",
-            "glob": "^7.1.2",
-            "lru-cache": "^4.1.3",
-            "make-fetch-happen": "^4.0.1",
+            "bluebird": "^3.5.3",
+            "cacache": "^12.0.2",
+            "chownr": "^1.1.2",
+            "figgy-pudding": "^3.5.1",
+            "get-stream": "^4.1.0",
+            "glob": "^7.1.3",
+            "infer-owner": "^1.0.4",
+            "lru-cache": "^5.1.1",
+            "make-fetch-happen": "^5.0.0",
             "minimatch": "^3.0.4",
-            "minipass": "^2.3.3",
+            "minipass": "^2.3.5",
             "mississippi": "^3.0.0",
             "mkdirp": "^0.5.1",
             "normalize-package-data": "^2.4.0",
             "npm-package-arg": "^6.1.0",
-            "npm-packlist": "^1.1.10",
-            "npm-pick-manifest": "^2.1.0",
+            "npm-packlist": "^1.1.12",
+            "npm-pick-manifest": "^3.0.0",
+            "npm-registry-fetch": "^4.0.0",
             "osenv": "^0.1.5",
             "promise-inflight": "^1.0.1",
             "promise-retry": "^1.1.1",
-            "protoduck": "^5.0.0",
+            "protoduck": "^5.0.1",
             "rimraf": "^2.6.2",
             "safe-buffer": "^5.1.2",
-            "semver": "^5.5.0",
-            "ssri": "^6.0.0",
-            "tar": "^4.4.3",
-            "unique-filename": "^1.1.0",
-            "which": "^1.3.0"
+            "semver": "^5.6.0",
+            "ssri": "^6.0.1",
+            "tar": "^4.4.10",
+            "unique-filename": "^1.1.1",
+            "which": "^1.3.1"
+          },
+          "dependencies": {
+            "minipass": {
+              "version": "2.3.5",
+              "bundled": true,
+              "requires": {
+                "safe-buffer": "^5.1.2",
+                "yallist": "^3.0.0"
+              }
+            }
           }
         },
         "parallel-transform": {
@@ -11096,6 +11626,28 @@
             "cyclist": "~0.2.2",
             "inherits": "^2.0.3",
             "readable-stream": "^2.1.5"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            }
           }
         },
         "path-exists": {
@@ -11114,6 +11666,10 @@
           "version": "2.0.1",
           "bundled": true
         },
+        "path-parse": {
+          "version": "1.0.6",
+          "bundled": true
+        },
         "performance-now": {
           "version": "2.1.0",
           "bundled": true
@@ -11160,10 +11716,10 @@
           "bundled": true
         },
         "protoduck": {
-          "version": "5.0.0",
+          "version": "5.0.1",
           "bundled": true,
           "requires": {
-            "genfun": "^4.0.1"
+            "genfun": "^5.0.0"
           }
         },
         "prr": {
@@ -11218,10 +11774,11 @@
           "bundled": true
         },
         "query-string": {
-          "version": "6.1.0",
+          "version": "6.8.2",
           "bundled": true,
           "requires": {
             "decode-uri-component": "^0.2.0",
+            "split-on-first": "^1.0.0",
             "strict-uri-encode": "^2.0.0"
           }
         },
@@ -11253,7 +11810,7 @@
           }
         },
         "read-cmd-shim": {
-          "version": "1.0.1",
+          "version": "1.0.4",
           "bundled": true,
           "requires": {
             "graceful-fs": "^4.1.2"
@@ -11273,7 +11830,7 @@
           }
         },
         "read-package-json": {
-          "version": "2.0.13",
+          "version": "2.1.0",
           "bundled": true,
           "requires": {
             "glob": "^7.1.1",
@@ -11284,31 +11841,25 @@
           }
         },
         "read-package-tree": {
-          "version": "5.2.1",
+          "version": "5.3.1",
           "bundled": true,
           "requires": {
-            "debuglog": "^1.0.1",
-            "dezalgo": "^1.0.0",
-            "once": "^1.3.0",
             "read-package-json": "^2.0.0",
-            "readdir-scoped-modules": "^1.0.0"
+            "readdir-scoped-modules": "^1.0.0",
+            "util-promisify": "^2.1.0"
           }
         },
         "readable-stream": {
-          "version": "2.3.6",
+          "version": "3.4.0",
           "bundled": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
           }
         },
         "readdir-scoped-modules": {
-          "version": "1.0.2",
+          "version": "1.1.0",
           "bundled": true,
           "requires": {
             "debuglog": "^1.0.1",
@@ -11375,10 +11926,10 @@
           "bundled": true
         },
         "rimraf": {
-          "version": "2.6.2",
+          "version": "2.6.3",
           "bundled": true,
           "requires": {
-            "glob": "^7.0.5"
+            "glob": "^7.1.3"
           }
         },
         "run-queue": {
@@ -11386,6 +11937,12 @@
           "bundled": true,
           "requires": {
             "aproba": "^1.1.1"
+          },
+          "dependencies": {
+            "aproba": {
+              "version": "1.2.0",
+              "bundled": true
+            }
           }
         },
         "safe-buffer": {
@@ -11397,7 +11954,7 @@
           "bundled": true
         },
         "semver": {
-          "version": "5.5.0",
+          "version": "5.7.1",
           "bundled": true
         },
         "semver-diff": {
@@ -11412,11 +11969,10 @@
           "bundled": true
         },
         "sha": {
-          "version": "2.0.1",
+          "version": "3.0.0",
           "bundled": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "readable-stream": "^2.0.2"
+            "graceful-fs": "^4.1.2"
           }
         },
         "shebang-command": {
@@ -11443,23 +11999,32 @@
           "bundled": true
         },
         "smart-buffer": {
-          "version": "4.0.1",
+          "version": "4.0.2",
           "bundled": true
         },
         "socks": {
-          "version": "2.2.0",
+          "version": "2.3.2",
           "bundled": true,
           "requires": {
             "ip": "^1.1.5",
-            "smart-buffer": "^4.0.1"
+            "smart-buffer": "4.0.2"
           }
         },
         "socks-proxy-agent": {
-          "version": "4.0.1",
+          "version": "4.0.2",
           "bundled": true,
           "requires": {
-            "agent-base": "~4.2.0",
-            "socks": "~2.2.0"
+            "agent-base": "~4.2.1",
+            "socks": "~2.3.2"
+          },
+          "dependencies": {
+            "agent-base": {
+              "version": "4.2.1",
+              "bundled": true,
+              "requires": {
+                "es6-promisify": "^5.0.0"
+              }
+            }
           }
         },
         "sorted-object": {
@@ -11523,7 +12088,11 @@
           }
         },
         "spdx-license-ids": {
-          "version": "3.0.0",
+          "version": "3.0.3",
+          "bundled": true
+        },
+        "split-on-first": {
+          "version": "1.1.0",
           "bundled": true
         },
         "sshpk": {
@@ -11542,8 +12111,11 @@
           }
         },
         "ssri": {
-          "version": "6.0.0",
-          "bundled": true
+          "version": "6.0.1",
+          "bundled": true,
+          "requires": {
+            "figgy-pudding": "^3.5.1"
+          }
         },
         "stream-each": {
           "version": "1.2.2",
@@ -11559,6 +12131,28 @@
           "requires": {
             "readable-stream": "^2.1.5",
             "stream-shift": "^1.0.0"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            }
           }
         },
         "stream-shift": {
@@ -11595,7 +12189,7 @@
           }
         },
         "string_decoder": {
-          "version": "1.1.1",
+          "version": "1.2.0",
           "bundled": true,
           "requires": {
             "safe-buffer": "~5.1.0"
@@ -11628,20 +12222,28 @@
           }
         },
         "tar": {
-          "version": "4.4.6",
+          "version": "4.4.10",
           "bundled": true,
           "requires": {
-            "chownr": "^1.0.1",
+            "chownr": "^1.1.1",
             "fs-minipass": "^1.2.5",
-            "minipass": "^2.3.3",
-            "minizlib": "^1.1.0",
+            "minipass": "^2.3.5",
+            "minizlib": "^1.2.1",
             "mkdirp": "^0.5.0",
             "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.2"
+            "yallist": "^3.0.3"
           },
           "dependencies": {
+            "minipass": {
+              "version": "2.3.5",
+              "bundled": true,
+              "requires": {
+                "safe-buffer": "^5.1.2",
+                "yallist": "^3.0.0"
+              }
+            },
             "yallist": {
-              "version": "3.0.2",
+              "version": "3.0.3",
               "bundled": true
             }
           }
@@ -11667,6 +12269,28 @@
           "requires": {
             "readable-stream": "^2.1.5",
             "xtend": "~4.0.1"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            }
           }
         },
         "timed-out": {
@@ -11710,7 +12334,7 @@
           "bundled": true
         },
         "unique-filename": {
-          "version": "1.1.0",
+          "version": "1.1.1",
           "bundled": true,
           "requires": {
             "unique-slug": "^2.0.0"
@@ -11769,6 +12393,13 @@
           "version": "1.0.3",
           "bundled": true
         },
+        "util-promisify": {
+          "version": "2.1.0",
+          "bundled": true,
+          "requires": {
+            "object.getownpropertydescriptors": "^2.0.3"
+          }
+        },
         "uuid": {
           "version": "3.3.2",
           "bundled": true
@@ -11841,7 +12472,7 @@
           }
         },
         "worker-farm": {
-          "version": "1.6.0",
+          "version": "1.7.0",
           "bundled": true,
           "requires": {
             "errno": "~0.1.7"
@@ -11871,7 +12502,7 @@
           "bundled": true
         },
         "write-file-atomic": {
-          "version": "2.3.0",
+          "version": "2.4.3",
           "bundled": true,
           "requires": {
             "graceful-fs": "^4.1.11",
@@ -11892,7 +12523,7 @@
           "bundled": true
         },
         "yallist": {
-          "version": "2.1.2",
+          "version": "3.0.3",
           "bundled": true
         },
         "yargs": {
@@ -12008,10 +12639,16 @@
         }
       }
     },
+    "object-inspect": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz",
+      "integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==",
+      "dev": true
+    },
     "object-keys": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz",
-      "integrity": "sha1-CcU4VTd1dTEMymL1W7M0q/97PtI=",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
       "dev": true
     },
     "object-visit": {
@@ -12023,6 +12660,18 @@
         "isobject": "^3.0.0"
       }
     },
+    "object.assign": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
+      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.2",
+        "function-bind": "^1.1.1",
+        "has-symbols": "^1.0.0",
+        "object-keys": "^1.0.11"
+      }
+    },
     "object.defaults": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
@@ -12086,15 +12735,15 @@
       }
     },
     "object.values": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.0.4.tgz",
-      "integrity": "sha1-5STaCbT2b/Bd9FdUbscqyZ8TBpo=",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.0.tgz",
+      "integrity": "sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.2",
-        "es-abstract": "^1.6.1",
-        "function-bind": "^1.1.0",
-        "has": "^1.0.1"
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.12.0",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3"
       }
     },
     "on-finished": {
@@ -12136,7 +12785,7 @@
       "dependencies": {
         "minimist": {
           "version": "0.0.10",
-          "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
           "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
           "dev": true
         },
@@ -12200,13 +12849,13 @@
     },
     "os-homedir": {
       "version": "1.0.2",
-      "resolved": "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
       "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
       "dev": true
     },
     "os-locale": {
       "version": "1.4.0",
-      "resolved": "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
       "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
       "dev": true,
       "requires": {
@@ -12223,7 +12872,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
       "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "p-pipe": {
       "version": "1.2.0",
@@ -12231,6 +12881,23 @@
       "integrity": "sha1-SxoROZoRUgpneQ7loMHViB1r7+k=",
       "dev": true
     },
+    "parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "requires": {
+        "callsites": "^3.0.0"
+      },
+      "dependencies": {
+        "callsites": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+          "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+          "dev": true
+        }
+      }
+    },
     "parse-filepath": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
@@ -12282,9 +12949,9 @@
       }
     },
     "parse-node-version": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.0.tgz",
-      "integrity": "sha512-02GTVHD1u0nWc20n2G7WX/PgdhNFG04j5fi1OkaJzPWLTcf6vh6229Lta1wTmXG/7Dg42tCssgkccVt7qvd8Kg==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
+      "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
       "dev": true
     },
     "parse-passwd": {
@@ -12312,9 +12979,9 @@
       }
     },
     "parseurl": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz",
-      "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
       "dev": true
     },
     "pascalcase": {
@@ -12377,6 +13044,25 @@
       "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=",
       "dev": true
     },
+    "path-type": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      },
+      "dependencies": {
+        "graceful-fs": {
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
+          "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==",
+          "dev": true
+        }
+      }
+    },
     "pend": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
@@ -12407,9 +13093,9 @@
       },
       "dependencies": {
         "es6-promise": {
-          "version": "4.2.5",
-          "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.5.tgz",
-          "integrity": "sha512-n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg==",
+          "version": "4.2.8",
+          "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
+          "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
           "dev": true
         },
         "progress": {
@@ -12422,7 +13108,7 @@
     },
     "pify": {
       "version": "2.3.0",
-      "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
       "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
       "dev": true
     },
@@ -12462,12 +13148,6 @@
         "irregular-plurals": "^1.0.0"
       }
     },
-    "pluralize": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
-      "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==",
-      "dev": true
-    },
     "posix-character-classes": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
@@ -12475,14 +13155,14 @@
       "dev": true
     },
     "postcss": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.6.tgz",
-      "integrity": "sha512-Nq/rNjnHFcKgCDDZYO0lNsl6YWe6U7tTy+ESN+PnLxebL8uBtYX59HZqvrj7YLK5UCyll2hqDsJOo3ndzEW8Ug==",
+      "version": "7.0.18",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.18.tgz",
+      "integrity": "sha512-/7g1QXXgegpF+9GJj4iN7ChGF40sYuGYJ8WZu8DZWnmhQ/G36hfdk3q9LBJmoK+lZ+yzZ5KYpOoxq7LF1BxE8g==",
       "dev": true,
       "requires": {
-        "chalk": "^2.4.1",
+        "chalk": "^2.4.2",
         "source-map": "^0.6.1",
-        "supports-color": "^5.5.0"
+        "supports-color": "^6.1.0"
       },
       "dependencies": {
         "source-map": {
@@ -12490,6 +13170,15 @@
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
+        },
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
         }
       }
     },
@@ -12506,9 +13195,9 @@
       }
     },
     "postcss-colormin": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.2.tgz",
-      "integrity": "sha512-1QJc2coIehnVFsz0otges8kQLsryi4lo19WD+U5xCWvXd0uw/Z+KKYnbiNDCnO9GP+PvErPHCG0jNvWTngk9Rw==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz",
+      "integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==",
       "dev": true,
       "requires": {
         "browserslist": "^4.0.0",
@@ -12529,9 +13218,9 @@
       }
     },
     "postcss-discard-comments": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.1.tgz",
-      "integrity": "sha512-Ay+rZu1Sz6g8IdzRjUgG2NafSNpp2MSMOQUb+9kkzzzP+kh07fP0yNbhtFejURnyVXSX3FYy2nVNW1QTnNjgBQ==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz",
+      "integrity": "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==",
       "dev": true,
       "requires": {
         "postcss": "^7.0.0"
@@ -12565,33 +13254,19 @@
       }
     },
     "postcss-load-config": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.0.0.tgz",
-      "integrity": "sha512-V5JBLzw406BB8UIfsAWSK2KSwIJ5yoEIVFb4gVkXci0QdKgA24jLmHZ/ghe/GgX0lJ0/D1uUK1ejhzEY94MChQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.0.tgz",
+      "integrity": "sha512-4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q==",
       "dev": true,
       "requires": {
-        "cosmiconfig": "^4.0.0",
+        "cosmiconfig": "^5.0.0",
         "import-cwd": "^2.0.0"
-      },
-      "dependencies": {
-        "cosmiconfig": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-4.0.0.tgz",
-          "integrity": "sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==",
-          "dev": true,
-          "requires": {
-            "is-directory": "^0.3.1",
-            "js-yaml": "^3.9.0",
-            "parse-json": "^4.0.0",
-            "require-from-string": "^2.0.1"
-          }
-        }
       }
     },
     "postcss-merge-longhand": {
-      "version": "4.0.9",
-      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.9.tgz",
-      "integrity": "sha512-UVMXrXF5K/kIwUbK/crPFCytpWbNX2Q3dZSc8+nQUgfOHrCT4+MHncpdxVphUlQeZxlLXUJbDyXc5NBhTnS2tA==",
+      "version": "4.0.11",
+      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz",
+      "integrity": "sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==",
       "dev": true,
       "requires": {
         "css-color-names": "0.0.4",
@@ -12601,9 +13276,9 @@
       }
     },
     "postcss-merge-rules": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.2.tgz",
-      "integrity": "sha512-UiuXwCCJtQy9tAIxsnurfF0mrNHKc4NnNx6NxqmzNNjXpQwLSukUxELHTRF0Rg1pAmcoKLih8PwvZbiordchag==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz",
+      "integrity": "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==",
       "dev": true,
       "requires": {
         "browserslist": "^4.0.0",
@@ -12638,9 +13313,9 @@
       }
     },
     "postcss-minify-gradients": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.1.tgz",
-      "integrity": "sha512-pySEW3E6Ly5mHm18rekbWiAjVi/Wj8KKt2vwSfVFAWdW6wOIekgqxKxLU7vJfb107o3FDNPkaYFCxGAJBFyogA==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz",
+      "integrity": "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==",
       "dev": true,
       "requires": {
         "cssnano-util-get-arguments": "^4.0.0",
@@ -12650,9 +13325,9 @@
       }
     },
     "postcss-minify-params": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.1.tgz",
-      "integrity": "sha512-h4W0FEMEzBLxpxIVelRtMheskOKKp52ND6rJv+nBS33G1twu2tCyurYj/YtgU76+UDCvWeNs0hs8HFAWE2OUFg==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz",
+      "integrity": "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==",
       "dev": true,
       "requires": {
         "alphanum-sort": "^1.0.0",
@@ -12664,9 +13339,9 @@
       }
     },
     "postcss-minify-selectors": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.1.tgz",
-      "integrity": "sha512-8+plQkomve3G+CodLCgbhAKrb5lekAnLYuL1d7Nz+/7RANpBEVdgBkPNwljfSKvZ9xkkZTZITd04KP+zeJTJqg==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz",
+      "integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==",
       "dev": true,
       "requires": {
         "alphanum-sort": "^1.0.0",
@@ -12698,9 +13373,9 @@
       }
     },
     "postcss-normalize-display-values": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.1.tgz",
-      "integrity": "sha512-R5mC4vaDdvsrku96yXP7zak+O3Mm9Y8IslUobk7IMP+u/g+lXvcN4jngmHY5zeJnrQvE13dfAg5ViU05ZFDwdg==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz",
+      "integrity": "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==",
       "dev": true,
       "requires": {
         "cssnano-util-get-match": "^4.0.0",
@@ -12709,9 +13384,9 @@
       }
     },
     "postcss-normalize-positions": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.1.tgz",
-      "integrity": "sha512-GNoOaLRBM0gvH+ZRb2vKCIujzz4aclli64MBwDuYGU2EY53LwiP7MxOZGE46UGtotrSnmarPPZ69l2S/uxdaWA==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz",
+      "integrity": "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==",
       "dev": true,
       "requires": {
         "cssnano-util-get-arguments": "^4.0.0",
@@ -12721,9 +13396,9 @@
       }
     },
     "postcss-normalize-repeat-style": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.1.tgz",
-      "integrity": "sha512-fFHPGIjBUyUiswY2rd9rsFcC0t3oRta4wxE1h3lpwfQZwFeFjXFSiDtdJ7APCmHQOnUZnqYBADNRPKPwFAONgA==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz",
+      "integrity": "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==",
       "dev": true,
       "requires": {
         "cssnano-util-get-arguments": "^4.0.0",
@@ -12733,9 +13408,9 @@
       }
     },
     "postcss-normalize-string": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.1.tgz",
-      "integrity": "sha512-IJoexFTkAvAq5UZVxWXAGE0yLoNN/012v7TQh5nDo6imZJl2Fwgbhy3J2qnIoaDBrtUP0H7JrXlX1jjn2YcvCQ==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz",
+      "integrity": "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==",
       "dev": true,
       "requires": {
         "has": "^1.0.0",
@@ -12744,9 +13419,9 @@
       }
     },
     "postcss-normalize-timing-functions": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.1.tgz",
-      "integrity": "sha512-1nOtk7ze36+63ONWD8RCaRDYsnzorrj+Q6fxkQV+mlY5+471Qx9kspqv0O/qQNMeApg8KNrRf496zHwJ3tBZ7w==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz",
+      "integrity": "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==",
       "dev": true,
       "requires": {
         "cssnano-util-get-match": "^4.0.0",
@@ -12778,9 +13453,9 @@
       }
     },
     "postcss-normalize-whitespace": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.1.tgz",
-      "integrity": "sha512-U8MBODMB2L+nStzOk6VvWWjZgi5kQNShCyjRhMT3s+W9Jw93yIjOnrEkKYD3Ul7ChWbEcjDWmXq0qOL9MIAnAw==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz",
+      "integrity": "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==",
       "dev": true,
       "requires": {
         "postcss": "^7.0.0",
@@ -12788,9 +13463,9 @@
       }
     },
     "postcss-ordered-values": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.1.tgz",
-      "integrity": "sha512-PeJiLgJWPzkVF8JuKSBcylaU+hDJ/TX3zqAMIjlghgn1JBi6QwQaDZoDIlqWRcCAI8SxKrt3FCPSRmOgKRB97Q==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz",
+      "integrity": "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==",
       "dev": true,
       "requires": {
         "cssnano-util-get-arguments": "^4.0.0",
@@ -12799,9 +13474,9 @@
       }
     },
     "postcss-reduce-initial": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.2.tgz",
-      "integrity": "sha512-epUiC39NonKUKG+P3eAOKKZtm5OtAtQJL7Ye0CBN1f+UQTHzqotudp+hki7zxXm7tT0ZAKDMBj1uihpPjP25ug==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz",
+      "integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==",
       "dev": true,
       "requires": {
         "browserslist": "^4.0.0",
@@ -12811,9 +13486,9 @@
       }
     },
     "postcss-reduce-transforms": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.1.tgz",
-      "integrity": "sha512-sZVr3QlGs0pjh6JAIe6DzWvBaqYw05V1t3d9Tp+VnFRT5j+rsqoWsysh/iSD7YNsULjq9IAylCznIwVd5oU/zA==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz",
+      "integrity": "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==",
       "dev": true,
       "requires": {
         "cssnano-util-get-match": "^4.0.0",
@@ -12823,9 +13498,9 @@
       }
     },
     "postcss-selector-parser": {
-      "version": "5.0.0-rc.4",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0-rc.4.tgz",
-      "integrity": "sha512-0XvfYuShrKlTk1ooUrVzMCFQRcypsdEIsGqh5IxC5rdtBi4/M/tDAJeSONwC2MTqEFsmPZYAV7Dd4X8rgAfV0A==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
+      "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
       "dev": true,
       "requires": {
         "cssesc": "^2.0.0",
@@ -12834,9 +13509,9 @@
       }
     },
     "postcss-svgo": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.1.tgz",
-      "integrity": "sha512-YD5uIk5NDRySy0hcI+ZJHwqemv2WiqqzDgtvgMzO8EGSkK5aONyX8HMVFRFJSdO8wUWTuisUFn/d7yRRbBr5Qw==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.2.tgz",
+      "integrity": "sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw==",
       "dev": true,
       "requires": {
         "is-svg": "^3.0.0",
@@ -12872,7 +13547,8 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
       "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "preserve": {
       "version": "0.2.0",
@@ -12882,13 +13558,13 @@
     },
     "pretty-bytes": {
       "version": "4.0.2",
-      "resolved": "http://registry.npmjs.org/pretty-bytes/-/pretty-bytes-4.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-4.0.2.tgz",
       "integrity": "sha1-sr+C5zUNZcbDOqlaqlpPYyf2HNk=",
       "dev": true
     },
     "pretty-hrtime": {
       "version": "1.0.3",
-      "resolved": "http://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
       "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
       "dev": true
     },
@@ -12899,21 +13575,21 @@
       "dev": true
     },
     "process-nextick-args": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-      "integrity": "sha1-o31zL0JxtKsa0HDTVQjoKQeI/6o=",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
       "dev": true
     },
     "progress": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.1.tgz",
-      "integrity": "sha512-OE+a6vzqazc+K6LxJrX5UPyKFvGnL5CYmq2jFGNIBWHpc4QyE49/YOumcrpQFJpfejmvRtbJzgO1zPmMCqlbBg==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
       "dev": true
     },
     "promise": {
       "version": "7.3.1",
       "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
-      "integrity": "sha1-BktyYCsY+Q8pGSuLG8QY/9Hr078=",
+      "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
       "dev": true,
       "optional": true,
       "requires": {
@@ -12935,9 +13611,9 @@
       "optional": true
     },
     "psl": {
-      "version": "1.1.29",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.29.tgz",
-      "integrity": "sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz",
+      "integrity": "sha512-HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw==",
       "dev": true
     },
     "punycode": {
@@ -12958,6 +13634,12 @@
       "integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==",
       "dev": true
     },
+    "qs": {
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+      "dev": true
+    },
     "randomatic": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
@@ -12978,16 +13660,29 @@
       }
     },
     "range-parser": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
-      "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
       "dev": true
     },
+    "raw-body": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
+      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
+      "dev": true,
+      "requires": {
+        "bytes": "3.1.0",
+        "http-errors": "1.7.2",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      }
+    },
     "rc": {
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
       "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
       "dev": true,
+      "optional": true,
       "requires": {
         "deep-extend": "^0.6.0",
         "ini": "~1.3.0",
@@ -13000,6 +13695,7 @@
       "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz",
       "integrity": "sha1-NcPhd/IHjveJ7kv6+kNzB06u9Po=",
       "dev": true,
+      "optional": true,
       "requires": {
         "pinkie-promise": "^2.0.0",
         "readable-stream": "^2.0.0"
@@ -13009,13 +13705,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -13028,9 +13726,10 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -13046,31 +13745,6 @@
         "load-json-file": "^1.0.0",
         "normalize-package-data": "^2.3.2",
         "path-type": "^1.0.0"
-      },
-      "dependencies": {
-        "graceful-fs": {
-          "version": "4.1.15",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
-          "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
-          "dev": true
-        },
-        "path-type": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-          "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
-        }
       }
     },
     "read-pkg-up": {
@@ -13107,9 +13781,9 @@
       },
       "dependencies": {
         "graceful-fs": {
-          "version": "4.1.15",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
-          "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
+          "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==",
           "dev": true
         },
         "isarray": {
@@ -13120,7 +13794,7 @@
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
@@ -13158,6 +13832,7 @@
       "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
       "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
       "dev": true,
+      "optional": true,
       "requires": {
         "indent-string": "^2.1.0",
         "strip-indent": "^1.0.1"
@@ -13170,18 +13845,18 @@
       "dev": true
     },
     "regenerate-unicode-properties": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-7.0.0.tgz",
-      "integrity": "sha512-s5NGghCE4itSlUS+0WUj88G6cfMVMmH8boTPNvABf8od+2dhT9WDlWu8n01raQAJZMOK8Ch6jSexaRO7swd6aw==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz",
+      "integrity": "sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA==",
       "dev": true,
       "requires": {
         "regenerate": "^1.4.0"
       }
     },
     "regenerator-transform": {
-      "version": "0.13.3",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.13.3.tgz",
-      "integrity": "sha512-5ipTrZFSq5vU2YoGoww4uaRVAK4wyYC4TSICibbfEPOruUu8FFP7ErV0BjmbIOEpn3O/k9na9UEdYR/3m7N6uA==",
+      "version": "0.14.1",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.1.tgz",
+      "integrity": "sha512-flVuee02C3FKRISbxhXl9mGzdbWUVHubl1SMaknjxkFB1/iqpJhArQUvRxOOPEc/9tAiX0BaQ28FJH10E4isSQ==",
       "dev": true,
       "requires": {
         "private": "^0.1.6"
@@ -13190,7 +13865,7 @@
     "regex-cache": {
       "version": "0.4.4",
       "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
-      "integrity": "sha1-db3FiioUls7EihKDW8VMjVYjNt0=",
+      "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
       "dev": true,
       "requires": {
         "is-equal-shallow": "^0.1.3"
@@ -13199,7 +13874,7 @@
     "regex-not": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
-      "integrity": "sha1-H07OJ+ALC2XgJHpoEOaoXYOldSw=",
+      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
       "dev": true,
       "requires": {
         "extend-shallow": "^3.0.2",
@@ -13213,29 +13888,29 @@
       "dev": true
     },
     "regexpu-core": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.2.0.tgz",
-      "integrity": "sha512-Z835VSnJJ46CNBttalHD/dB+Sj2ezmY6Xp38npwU87peK6mqOzOpV8eYktdkLTEkzzD+JsTcxd84ozd8I14+rw==",
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.6.0.tgz",
+      "integrity": "sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg==",
       "dev": true,
       "requires": {
         "regenerate": "^1.4.0",
-        "regenerate-unicode-properties": "^7.0.0",
-        "regjsgen": "^0.4.0",
-        "regjsparser": "^0.3.0",
+        "regenerate-unicode-properties": "^8.1.0",
+        "regjsgen": "^0.5.0",
+        "regjsparser": "^0.6.0",
         "unicode-match-property-ecmascript": "^1.0.4",
-        "unicode-match-property-value-ecmascript": "^1.0.2"
+        "unicode-match-property-value-ecmascript": "^1.1.0"
       }
     },
     "regjsgen": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.4.0.tgz",
-      "integrity": "sha512-X51Lte1gCYUdlwhF28+2YMO0U6WeN0GLpgpA7LK7mbdDnkQYiwvEpmpe0F/cv5L14EbxgrdayAG3JETBv0dbXA==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.0.tgz",
+      "integrity": "sha512-RnIrLhrXCX5ow/E5/Mh2O4e/oa1/jW0eaBKTSy3LaCj+M3Bqvm97GWDp2yUtzIs4LEn65zR2yiYGFqb2ApnzDA==",
       "dev": true
     },
     "regjsparser": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.3.0.tgz",
-      "integrity": "sha512-zza72oZBBHzt64G7DxdqrOo/30bhHkwMUoT0WqfGu98XLd7N+1tsy5MJ96Bk4MD0y74n629RhmrGW6XlnLLwCA==",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.0.tgz",
+      "integrity": "sha512-RQ7YyokLiQBomUJuUG8iGVvkgOLxwyZM8k6d3q5SAXpg4r5TZJZigKFvC6PpD+qQ98bCDC5YelPeA3EucDoNeQ==",
       "dev": true,
       "requires": {
         "jsesc": "~0.5.0"
@@ -13272,6 +13947,7 @@
       "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
       "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
       "dev": true,
+      "optional": true,
       "requires": {
         "is-finite": "^1.0.0"
       }
@@ -13321,11 +13997,14 @@
         "uuid": "^3.3.2"
       },
       "dependencies": {
-        "qs": {
-          "version": "6.5.2",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-          "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-          "dev": true
+        "tunnel-agent": {
+          "version": "0.6.0",
+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+          "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "^5.0.1"
+          }
         }
       }
     },
@@ -13344,51 +14023,12 @@
       "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
       "dev": true
     },
-    "require-from-string": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "dev": true
-    },
     "require-main-filename": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
       "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
       "dev": true
     },
-    "require-uncached": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
-      "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
-      "dev": true,
-      "requires": {
-        "caller-path": "^0.1.0",
-        "resolve-from": "^1.0.0"
-      },
-      "dependencies": {
-        "caller-path": {
-          "version": "0.1.0",
-          "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
-          "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
-          "dev": true,
-          "requires": {
-            "callsites": "^0.2.0"
-          }
-        },
-        "callsites": {
-          "version": "0.2.0",
-          "resolved": "http://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
-          "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=",
-          "dev": true
-        },
-        "resolve-from": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
-          "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=",
-          "dev": true
-        }
-      }
-    },
     "requires-port": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
@@ -13396,12 +14036,12 @@
       "dev": true
     },
     "resolve": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz",
-      "integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==",
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
+      "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
       "dev": true,
       "requires": {
-        "path-parse": "^1.0.5"
+        "path-parse": "^1.0.6"
       }
     },
     "resolve-dir": {
@@ -13439,13 +14079,13 @@
     "ret": {
       "version": "0.1.15",
       "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
-      "integrity": "sha1-uKSCXVvbH8P29Twrwz+BOIaBx7w=",
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
       "dev": true
     },
     "rfdc": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.1.2.tgz",
-      "integrity": "sha512-92ktAgvZhBzYTIK0Mja9uen5q5J3NRVMoDkJL2VMwq6SXjVCgqvQeVP2XAaUY6HT+XpQYeLSjb3UoitBryKmdA==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.1.4.tgz",
+      "integrity": "sha512-5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug==",
       "dev": true
     },
     "rgb-regex": {
@@ -13470,18 +14110,18 @@
       }
     },
     "rimraf": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
-      "integrity": "sha1-LtgVDSShbqhlHm1u8PR8QVjOejY=",
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
       "dev": true,
       "requires": {
-        "glob": "^7.0.5"
+        "glob": "^7.1.3"
       },
       "dependencies": {
         "glob": {
-          "version": "7.1.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-          "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+          "version": "7.1.4",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+          "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
           "dev": true,
           "requires": {
             "fs.realpath": "^1.0.0",
@@ -13515,7 +14155,7 @@
     "run-sequence": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/run-sequence/-/run-sequence-2.2.1.tgz",
-      "integrity": "sha1-HOZD2jb9jH6n4akynaM/wriJhJU=",
+      "integrity": "sha512-qkzZnQWMZjcKbh3CNly2srtrkaO/2H/SI5f2eliMCapdRD3UhMrwjfOAZJAnZ2H8Ju4aBzFZkBGXUqFs9V0yxw==",
       "dev": true,
       "requires": {
         "chalk": "^1.1.3",
@@ -13553,7 +14193,7 @@
         },
         "chalk": {
           "version": "1.1.3",
-          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
@@ -13575,7 +14215,7 @@
         },
         "kind-of": {
           "version": "1.1.0",
-          "resolved": "http://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
           "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
           "dev": true
         },
@@ -13601,9 +14241,9 @@
       }
     },
     "rxjs": {
-      "version": "6.3.3",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-      "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz",
+      "integrity": "sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==",
       "dev": true,
       "requires": {
         "tslib": "^1.9.0"
@@ -13612,7 +14252,7 @@
     "safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0=",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
       "dev": true
     },
     "safe-regex": {
@@ -13633,7 +14273,7 @@
     "sax": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha1-KBYjTiN4vdxOU1T6tcqold9xANk=",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
       "dev": true
     },
     "seek-bzip": {
@@ -13641,6 +14281,7 @@
       "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz",
       "integrity": "sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=",
       "dev": true,
+      "optional": true,
       "requires": {
         "commander": "~2.8.1"
       }
@@ -13651,9 +14292,9 @@
       "integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0="
     },
     "semver": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
-      "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
       "dev": true
     },
     "semver-greatest-satisfied-range": {
@@ -13698,12 +14339,13 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
       "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "set-value": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
-      "integrity": "sha1-ca5KiPD+77v1LR6mBPP7MV67YnQ=",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
       "dev": true,
       "requires": {
         "extend-shallow": "^2.0.1",
@@ -13724,9 +14366,9 @@
       }
     },
     "setprototypeof": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
+      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==",
       "dev": true
     },
     "shebang-command": {
@@ -13794,20 +14436,28 @@
       "dev": true
     },
     "slice-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.0.0.tgz",
-      "integrity": "sha512-4j2WTWjp3GsZ+AOagyzVbzp4vWGtZ0hEZ/gDY/uTvm6MTxUfTUIsnMIFb1bn8o0RuXiqUw15H1bue8f22Vw2oQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
+      "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
       "dev": true,
       "requires": {
         "ansi-styles": "^3.2.0",
         "astral-regex": "^1.0.0",
         "is-fullwidth-code-point": "^2.0.0"
+      },
+      "dependencies": {
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        }
       }
     },
     "snapdragon": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-      "integrity": "sha1-ZJIufFZbDhQgS6GqfWlkJ40lGC0=",
+      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
       "dev": true,
       "requires": {
         "base": "^0.11.1",
@@ -13858,7 +14508,7 @@
     "snapdragon-node": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
-      "integrity": "sha1-bBdfhv8UvbByRWPo88GwIaKGhTs=",
+      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
       "dev": true,
       "requires": {
         "define-property": "^1.0.0",
@@ -13878,7 +14528,7 @@
         "is-accessor-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
@@ -13887,7 +14537,7 @@
         "is-data-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
@@ -13896,7 +14546,7 @@
         "is-descriptor": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "dev": true,
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
@@ -13909,7 +14559,7 @@
     "snapdragon-util": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
-      "integrity": "sha1-+VZHlIbyrNeXAGk/b3uAXkWrVuI=",
+      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
       "dev": true,
       "requires": {
         "kind-of": "^3.2.0"
@@ -13985,6 +14635,12 @@
         "to-array": "0.1.4"
       },
       "dependencies": {
+        "component-emitter": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+          "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
+          "dev": true
+        },
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
@@ -14004,7 +14660,7 @@
     },
     "socket.io-parser": {
       "version": "3.2.0",
-      "resolved": "http://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz",
       "integrity": "sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==",
       "dev": true,
       "requires": {
@@ -14013,6 +14669,12 @@
         "isarray": "2.0.1"
       },
       "dependencies": {
+        "component-emitter": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+          "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
+          "dev": true
+        },
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
@@ -14068,9 +14730,9 @@
       "dev": true
     },
     "spdx-correct": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.2.tgz",
-      "integrity": "sha512-q9hedtzyXHr5S0A1vEPoK/7l8NpfkFYTq6iCY+Pno2ZbdZR6WexZFtqeVGkGxW3TEJMN914Z55EnAGMmenlIQQ==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
+      "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
       "dev": true,
       "requires": {
         "spdx-expression-parse": "^3.0.0",
@@ -14086,7 +14748,7 @@
     "spdx-expression-parse": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
-      "integrity": "sha1-meEZt6XaAOBUkcn6M4t5BII7QdA=",
+      "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
       "dev": true,
       "requires": {
         "spdx-exceptions": "^2.1.0",
@@ -14094,9 +14756,9 @@
       }
     },
     "spdx-license-ids": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.2.tgz",
-      "integrity": "sha512-qky9CVt0lVIECkEsYbNILVnPvycuEBkXoMFLRWsREkomQLevYhtRKC+R91a5TOAQ3bCMjikRwhyaRqj1VYatYg==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
+      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
       "dev": true
     },
     "spectrum-colorpicker": {
@@ -14107,7 +14769,7 @@
     "split-string": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
-      "integrity": "sha1-fLCd2jqGWFcFxks5pkZgOGguj+I=",
+      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
       "dev": true,
       "requires": {
         "extend-shallow": "^3.0.0"
@@ -14140,7 +14802,7 @@
         },
         "chalk": {
           "version": "1.1.3",
-          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "optional": true,
@@ -14162,9 +14824,9 @@
       }
     },
     "sshpk": {
-      "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.15.2.tgz",
-      "integrity": "sha512-Ra/OXQtuh0/enyl4ETZAfTaeksa6BXks5ZcjpSUNrjBr0DvrJKX+1fsKDPpT9TBXgHAFsa4510aNVgI8g/+SzA==",
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
+      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
       "dev": true,
       "requires": {
         "asn1": "~0.2.3",
@@ -14181,7 +14843,7 @@
     "stable": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
-      "integrity": "sha1-g26zyDgv4pNv6vVEYxAXzn1Ho88=",
+      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
       "dev": true
     },
     "stack-trace": {
@@ -14194,7 +14856,8 @@
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-0.2.2.tgz",
       "integrity": "sha1-5sgLYjEj19gM8TLOU480YokHJQI=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "static-extend": {
       "version": "0.1.2",
@@ -14218,9 +14881,9 @@
       }
     },
     "statuses": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
-      "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
       "dev": true
     },
     "stream-combiner2": {
@@ -14228,6 +14891,7 @@
       "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz",
       "integrity": "sha1-+02KFCDqNidk4hrUeAOXvry0HL4=",
       "dev": true,
+      "optional": true,
       "requires": {
         "duplexer2": "~0.1.0",
         "readable-stream": "^2.0.2"
@@ -14238,6 +14902,7 @@
           "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
           "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
           "dev": true,
+          "optional": true,
           "requires": {
             "readable-stream": "^2.0.2"
           }
@@ -14246,13 +14911,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -14265,9 +14932,10 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -14277,19 +14945,20 @@
     "stream-consume": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.1.tgz",
-      "integrity": "sha1-0721mMK9CugrjKx6xQsRB6eZbEg=",
+      "integrity": "sha512-tNa3hzgkjEP7XbCkbRXe1jpg+ievoa0O4SCFlMOYEscGSS4JJsckGL8swUyAa/ApGU3Ae4t6Honor4HhL+tRyg==",
       "dev": true
     },
     "stream-shift": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
       "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "streamroller": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-0.7.0.tgz",
-      "integrity": "sha1-odG3z4PTmvsNYwSaWsv5NJO99ks=",
+      "integrity": "sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==",
       "dev": true,
       "requires": {
         "date-format": "^1.2.0",
@@ -14316,7 +14985,7 @@
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha1-sRwn2IuP8fvgcGQ8+UsMea4bCq8=",
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
             "core-util-is": "~1.0.0",
@@ -14331,7 +15000,7 @@
         "string_decoder": {
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
             "safe-buffer": "~5.1.0"
@@ -14340,30 +15009,34 @@
       }
     },
     "string-width": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
       "dev": true,
       "requires": {
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^4.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^3.0.0"
-          }
-        }
+        "code-point-at": "^1.0.0",
+        "is-fullwidth-code-point": "^1.0.0",
+        "strip-ansi": "^3.0.0"
+      }
+    },
+    "string.prototype.trimleft": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz",
+      "integrity": "sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3",
+        "function-bind": "^1.1.1"
+      }
+    },
+    "string.prototype.trimright": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz",
+      "integrity": "sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3",
+        "function-bind": "^1.1.1"
       }
     },
     "string_decoder": {
@@ -14392,59 +15065,22 @@
       }
     },
     "strip-bom-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-2.0.0.tgz",
-      "integrity": "sha1-+H217yYT9paKpUWr/h7HKLaoKco=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz",
+      "integrity": "sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=",
       "dev": true,
+      "optional": true,
       "requires": {
-        "first-chunk-stream": "^2.0.0",
+        "first-chunk-stream": "^1.0.0",
         "strip-bom": "^2.0.0"
       },
       "dependencies": {
-        "first-chunk-stream": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz",
-          "integrity": "sha1-G97NuOCDwGZLkZRVgVd6Q6nzHXA=",
-          "dev": true,
-          "requires": {
-            "readable-stream": "^2.0.2"
-          }
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        },
         "strip-bom": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
           "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-utf8": "^0.2.0"
           }
@@ -14453,9 +15089,10 @@
     },
     "strip-dirs": {
       "version": "1.1.1",
-      "resolved": "http://registry.npmjs.org/strip-dirs/-/strip-dirs-1.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/strip-dirs/-/strip-dirs-1.1.1.tgz",
       "integrity": "sha1-lgu9EoeETzl1pFWKoQOoJV4kVqA=",
       "dev": true,
+      "optional": true,
       "requires": {
         "chalk": "^1.0.0",
         "get-stdin": "^4.0.1",
@@ -14469,13 +15106,15 @@
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "chalk": {
           "version": "1.1.3",
-          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-styles": "^2.2.1",
             "escape-string-regexp": "^1.0.2",
@@ -14489,6 +15128,7 @@
           "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz",
           "integrity": "sha1-hHSREZ/MtftDYhfMc39/qtUPYD8=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-relative": "^0.1.0"
           }
@@ -14497,13 +15137,15 @@
           "version": "0.1.3",
           "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz",
           "integrity": "sha1-kF/uiuhvRbPsYUvDwVyGnfCHboI=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "supports-color": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
           "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -14519,6 +15161,7 @@
       "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
       "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
       "dev": true,
+      "optional": true,
       "requires": {
         "get-stdin": "^4.0.1"
       }
@@ -14532,16 +15175,17 @@
     "strip-outer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz",
-      "integrity": "sha1-sv0qv2YEudHmATBXGV34Nrip1jE=",
+      "integrity": "sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==",
       "dev": true,
+      "optional": true,
       "requires": {
         "escape-string-regexp": "^1.0.2"
       }
     },
     "stylehacks": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.1.tgz",
-      "integrity": "sha512-TK5zEPeD9NyC1uPIdjikzsgWxdQQN/ry1X3d1iOz1UkYDCmcr928gWD1KHgyC27F50UnE0xCTrBOO1l6KR8M4w==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz",
+      "integrity": "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==",
       "dev": true,
       "requires": {
         "browserslist": "^4.0.0",
@@ -14567,6 +15211,7 @@
       "resolved": "https://registry.npmjs.org/sum-up/-/sum-up-1.0.3.tgz",
       "integrity": "sha1-HGYfZnBX9jvLeHWqFDi8FiUlFW4=",
       "dev": true,
+      "optional": true,
       "requires": {
         "chalk": "^1.0.0"
       },
@@ -14575,13 +15220,15 @@
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "chalk": {
           "version": "1.1.3",
-          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-styles": "^2.2.1",
             "escape-string-regexp": "^1.0.2",
@@ -14594,7 +15241,8 @@
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
           "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -14618,37 +15266,76 @@
       }
     },
     "svgo": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.1.1.tgz",
-      "integrity": "sha512-GBkJbnTuFpM4jFbiERHDWhZc/S/kpHToqmZag3aEBjPYK44JAN2QBjvrGIxLOoCyMZjuFQIfTO2eJd8uwLY/9g==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.0.tgz",
+      "integrity": "sha512-MLfUA6O+qauLDbym+mMZgtXCGRfIxyQoeH6IKVcFslyODEe/ElJNwr0FohQ3xG4C6HK6bk3KYPPXwHVJk3V5NQ==",
       "dev": true,
       "requires": {
-        "coa": "~2.0.1",
-        "colors": "~1.1.2",
+        "chalk": "^2.4.1",
+        "coa": "^2.0.2",
         "css-select": "^2.0.0",
-        "css-select-base-adapter": "~0.1.0",
-        "css-tree": "1.0.0-alpha.28",
-        "css-url-regex": "^1.1.0",
-        "csso": "^3.5.0",
-        "js-yaml": "^3.12.0",
+        "css-select-base-adapter": "^0.1.1",
+        "css-tree": "1.0.0-alpha.33",
+        "csso": "^3.5.1",
+        "js-yaml": "^3.13.1",
         "mkdirp": "~0.5.1",
-        "object.values": "^1.0.4",
+        "object.values": "^1.1.0",
         "sax": "~1.2.4",
-        "stable": "~0.1.6",
+        "stable": "^0.1.8",
         "unquote": "~1.1.1",
         "util.promisify": "~1.0.0"
       }
     },
     "table": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/table/-/table-5.1.1.tgz",
-      "integrity": "sha512-NUjapYb/qd4PeFW03HnAuOJ7OMcBkJlqeClWxeNlQ0lXGSb52oZXGzkO0/I0ARegQ2eUT1g2VDJH0eUxDRcHmw==",
+      "version": "5.4.6",
+      "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
+      "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
       "dev": true,
       "requires": {
-        "ajv": "^6.6.1",
-        "lodash": "^4.17.11",
-        "slice-ansi": "2.0.0",
-        "string-width": "^2.1.1"
+        "ajv": "^6.10.2",
+        "lodash": "^4.17.14",
+        "slice-ansi": "^2.1.0",
+        "string-width": "^3.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "lodash": {
+          "version": "4.17.15",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
       }
     },
     "tar-stream": {
@@ -14656,6 +15343,7 @@
       "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz",
       "integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==",
       "dev": true,
+      "optional": true,
       "requires": {
         "bl": "^1.0.0",
         "buffer-alloc": "^1.2.0",
@@ -14667,10 +15355,11 @@
       },
       "dependencies": {
         "end-of-stream": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
-          "integrity": "sha1-7SljTRm6ukY7bOa4CjchPqtx7EM=",
+          "version": "1.4.3",
+          "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.3.tgz",
+          "integrity": "sha512-cbNhPFS6MlYlWTGncSiDYbdqKhwWFy7kNeb1YSOG6K65i/wPTkLVCJQj0hXA4j0m5Da+hBWnqopEnu1FFelisQ==",
           "dev": true,
+          "optional": true,
           "requires": {
             "once": "^1.4.0"
           }
@@ -14679,22 +15368,25 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "once": {
           "version": "1.4.0",
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -14710,6 +15402,7 @@
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -14776,7 +15469,7 @@
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
@@ -14791,7 +15484,7 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
@@ -14814,6 +15507,7 @@
       "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz",
       "integrity": "sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=",
       "dev": true,
+      "optional": true,
       "requires": {
         "through2": "~2.0.0",
         "xtend": "~4.0.0"
@@ -14838,7 +15532,8 @@
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz",
       "integrity": "sha1-lYYL/MXHbCd/j4Mm/Q9bLiDrohc=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "timers-ext": {
       "version": "0.1.7",
@@ -14857,9 +15552,9 @@
       "dev": true
     },
     "tiny-emitter": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.0.2.tgz",
-      "integrity": "sha512-2NM0auVBGft5tee/OxP4PI3d8WItkDM+fPnaRAVo6xTDI2knbz9eC5ArWGqtGlYqiH3RU5yMpdyTTO7MguC4ow=="
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
+      "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
     },
     "tinymce": {
       "version": "4.9.2",
@@ -14880,6 +15575,7 @@
       "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz",
       "integrity": "sha1-HN+kcqnvUMI57maZm2YsoOs5k38=",
       "dev": true,
+      "optional": true,
       "requires": {
         "extend-shallow": "^2.0.1"
       },
@@ -14889,6 +15585,7 @@
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-extendable": "^0.1.0"
           }
@@ -14904,8 +15601,9 @@
     "to-buffer": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz",
-      "integrity": "sha1-STvUj2LXxD/N7TE6A9ytsuEhOoA=",
-      "dev": true
+      "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==",
+      "dev": true,
+      "optional": true
     },
     "to-fast-properties": {
       "version": "2.0.0",
@@ -14936,7 +15634,7 @@
     "to-regex": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-      "integrity": "sha1-E8/dmzNlUvMLUfM6iuG0Knp1mc4=",
+      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
       "dev": true,
       "requires": {
         "define-property": "^2.0.2",
@@ -14955,6 +15653,12 @@
         "repeat-string": "^1.6.1"
       }
     },
+    "toidentifier": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
+      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
+      "dev": true
+    },
     "tough-cookie": {
       "version": "2.4.3",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
@@ -14977,23 +15681,19 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
       "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "trim-repeated": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz",
       "integrity": "sha1-42RqLqTokTEr9+rObPsFOAvAHCE=",
       "dev": true,
+      "optional": true,
       "requires": {
         "escape-string-regexp": "^1.0.2"
       }
     },
-    "trim-right": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
-      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
-      "dev": true
-    },
     "tryit": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz",
@@ -15001,19 +15701,17 @@
       "dev": true
     },
     "tslib": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
-      "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
+      "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==",
       "dev": true
     },
     "tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
+      "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
       "dev": true,
-      "requires": {
-        "safe-buffer": "^5.0.1"
-      }
+      "optional": true
     },
     "tweetnacl": {
       "version": "0.14.5",
@@ -15021,6 +15719,12 @@
       "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
       "dev": true
     },
+    "type": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
+      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
+      "dev": true
+    },
     "type-check": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
@@ -15031,13 +15735,13 @@
       }
     },
     "type-is": {
-      "version": "1.6.16",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
-      "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
+      "version": "1.6.18",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
       "dev": true,
       "requires": {
         "media-typer": "0.3.0",
-        "mime-types": "~2.1.18"
+        "mime-types": "~2.1.24"
       }
     },
     "typeahead.js": {
@@ -15063,6 +15767,43 @@
         "source-map": "~0.5.1",
         "uglify-to-browserify": "~1.0.0",
         "yargs": "~3.10.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
+          "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
+          "dev": true
+        },
+        "cliui": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
+          "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
+          "dev": true,
+          "requires": {
+            "center-align": "^0.1.1",
+            "right-align": "^0.1.1",
+            "wordwrap": "0.0.2"
+          }
+        },
+        "wordwrap": {
+          "version": "0.0.2",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+          "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
+          "dev": true
+        },
+        "yargs": {
+          "version": "3.10.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
+          "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
+          "dev": true,
+          "requires": {
+            "camelcase": "^1.0.2",
+            "cliui": "^2.1.0",
+            "decamelize": "^1.0.0",
+            "window-size": "0.1.0"
+          }
+        }
       }
     },
     "uglify-to-browserify": {
@@ -15106,50 +15847,27 @@
       }
     },
     "unicode-match-property-value-ecmascript": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.0.2.tgz",
-      "integrity": "sha512-Rx7yODZC1L/T8XKo/2kNzVAQaRE88AaMvI1EF/Xnj3GW2wzN6fop9DDWuFAKUVFH7vozkz26DzP0qyWLKLIVPQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz",
+      "integrity": "sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g==",
       "dev": true
     },
     "unicode-property-aliases-ecmascript": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.4.tgz",
-      "integrity": "sha512-2WSLa6OdYd2ng8oqiGIWnJqyFArvhn+5vgx5GTxMbUYjCYKUcuKS62YLFF0R/BDGlB1yzXjQOLtPAfHsgirEpg==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz",
+      "integrity": "sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw==",
       "dev": true
     },
     "union-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
-      "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
       "dev": true,
       "requires": {
         "arr-union": "^3.1.0",
         "get-value": "^2.0.6",
         "is-extendable": "^0.1.1",
-        "set-value": "^0.4.3"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "set-value": {
-          "version": "0.4.3",
-          "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
-          "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-extendable": "^0.1.1",
-            "is-plain-object": "^2.0.1",
-            "to-object-path": "^0.3.0"
-          }
-        }
+        "set-value": "^2.0.1"
       }
     },
     "uniq": {
@@ -15232,12 +15950,13 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz",
       "integrity": "sha1-uYTwh3/AqJwsdzzB73tbIytbBv4=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "upath": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
-      "integrity": "sha1-NSVll+RqWB20eT0M5H+prr/J+r0=",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
+      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
       "dev": true
     },
     "uri-js": {
@@ -15260,6 +15979,7 @@
       "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
       "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
       "dev": true,
+      "optional": true,
       "requires": {
         "prepend-http": "^1.0.1"
       }
@@ -15298,7 +16018,7 @@
       "dependencies": {
         "lru-cache": {
           "version": "2.2.4",
-          "resolved": "http://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz",
           "integrity": "sha1-bGWGGb7PFAMdDQtZSxYELOTcBj0=",
           "dev": true
         }
@@ -15313,7 +16033,7 @@
     "util.promisify": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
-      "integrity": "sha1-RA9xZaRZyaFtwUXrjnLzVocJcDA=",
+      "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
       "dev": true,
       "requires": {
         "define-properties": "^1.1.2",
@@ -15327,9 +16047,9 @@
       "dev": true
     },
     "uuid": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
-      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz",
+      "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==",
       "dev": true
     },
     "v8flags": {
@@ -15345,7 +16065,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz",
       "integrity": "sha1-G5BKWWCfsyjvB4E4Qgk09rhnCaY=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "validate-npm-package-license": {
       "version": "3.0.4",
@@ -15358,9 +16079,9 @@
       }
     },
     "vendors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.2.tgz",
-      "integrity": "sha1-f8te759WI7FWvOqJ7DfWNnbyGAE=",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.3.tgz",
+      "integrity": "sha512-fOi47nsJP5Wqefa43kyWSg80qF+Q3XA6MUkgi7Hp1HQaKDQW4cQrK2D0P7mmbFtsV1N89am55Yru/nyEwRubcw==",
       "dev": true
     },
     "verror": {
@@ -15390,6 +16111,7 @@
       "resolved": "https://registry.npmjs.org/vinyl-assign/-/vinyl-assign-1.2.1.tgz",
       "integrity": "sha1-TRmIkbVRWRHXcajNnFSApGoHSkU=",
       "dev": true,
+      "optional": true,
       "requires": {
         "object-assign": "^4.0.1",
         "readable-stream": "^2.0.0"
@@ -15399,19 +16121,22 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -15424,9 +16149,10 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -15456,18 +16182,51 @@
         "vinyl": "^1.1.0"
       },
       "dependencies": {
+        "first-chunk-stream": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz",
+          "integrity": "sha1-G97NuOCDwGZLkZRVgVd6Q6nzHXA=",
+          "dev": true,
+          "requires": {
+            "readable-stream": "^2.0.2"
+          }
+        },
         "graceful-fs": {
-          "version": "4.1.15",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
-          "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
+          "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==",
           "dev": true
         },
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
           "dev": true
         },
+        "readable-stream": {
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        },
         "strip-bom": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
@@ -15477,6 +16236,16 @@
             "is-utf8": "^0.2.0"
           }
         },
+        "strip-bom-stream": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-2.0.0.tgz",
+          "integrity": "sha1-+H217yYT9paKpUWr/h7HKLaoKco=",
+          "dev": true,
+          "requires": {
+            "first-chunk-stream": "^2.0.0",
+            "strip-bom": "^2.0.0"
+          }
+        },
         "vinyl": {
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
@@ -15514,7 +16283,7 @@
         },
         "readable-stream": {
           "version": "1.0.34",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
           "requires": {
@@ -15526,7 +16295,7 @@
         },
         "through2": {
           "version": "0.6.5",
-          "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
           "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
           "dev": true,
           "requires": {
@@ -15566,6 +16335,7 @@
       "resolved": "https://registry.npmjs.org/ware/-/ware-1.3.0.tgz",
       "integrity": "sha1-0bFPOdLiy0q4xAmPdW/ksWTkc9Q=",
       "dev": true,
+      "optional": true,
       "requires": {
         "wrap-fn": "^0.1.0"
       }
@@ -15605,34 +16375,12 @@
     },
     "wrap-ansi": {
       "version": "2.1.0",
-      "resolved": "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
       "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
       "dev": true,
       "requires": {
         "string-width": "^1.0.1",
         "strip-ansi": "^3.0.1"
-      },
-      "dependencies": {
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-          "dev": true,
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "resolved": "http://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-          "dev": true,
-          "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
-          }
-        }
       }
     },
     "wrap-fn": {
@@ -15640,6 +16388,7 @@
       "resolved": "https://registry.npmjs.org/wrap-fn/-/wrap-fn-0.1.5.tgz",
       "integrity": "sha1-8htuQQFv9KfjFyDbxjoJAWvfmEU=",
       "dev": true,
+      "optional": true,
       "requires": {
         "co": "3.1.0"
       }
@@ -15651,9 +16400,9 @@
       "dev": true
     },
     "write": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
-      "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
+      "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
       "dev": true,
       "requires": {
         "mkdirp": "^0.5.1"
@@ -15683,9 +16432,9 @@
       "dev": true
     },
     "xtend": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
       "dev": true
     },
     "y18n": {
@@ -15702,23 +16451,24 @@
       "optional": true
     },
     "yargs": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
-      "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
+      "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
       "dev": true,
       "requires": {
-        "camelcase": "^1.0.2",
-        "cliui": "^2.1.0",
-        "decamelize": "^1.0.0",
-        "window-size": "0.1.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
-          "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
-          "dev": true
-        }
+        "camelcase": "^3.0.0",
+        "cliui": "^3.2.0",
+        "decamelize": "^1.1.1",
+        "get-caller-file": "^1.0.1",
+        "os-locale": "^1.4.0",
+        "read-pkg-up": "^1.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^1.0.1",
+        "set-blocking": "^2.0.0",
+        "string-width": "^1.0.2",
+        "which-module": "^1.0.0",
+        "y18n": "^3.2.1",
+        "yargs-parser": "^5.0.0"
       }
     },
     "yargs-parser": {
@@ -15728,14 +16478,6 @@
       "dev": true,
       "requires": {
         "camelcase": "^3.0.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-          "dev": true
-        }
       }
     },
     "yauzl": {
@@ -15743,6 +16485,7 @@
       "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
       "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
       "dev": true,
+      "optional": true,
       "requires": {
         "buffer-crc32": "~0.2.3",
         "fd-slicer": "~1.1.0"
diff --git a/src/Umbraco.Web.UI.Docs/package-lock.json b/src/Umbraco.Web.UI.Docs/package-lock.json
deleted file mode 100644
index b0dee3c5ac..0000000000
--- a/src/Umbraco.Web.UI.Docs/package-lock.json
+++ /dev/null
@@ -1,3612 +0,0 @@
-{
-  "requires": true,
-  "lockfileVersion": 1,
-  "dependencies": {
-    "accepts": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
-      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
-      "dev": true,
-      "requires": {
-        "mime-types": "~2.1.24",
-        "negotiator": "0.6.2"
-      }
-    },
-    "angular": {
-      "version": "1.3.20",
-      "resolved": "https://registry.npmjs.org/angular/-/angular-1.3.20.tgz",
-      "integrity": "sha1-sjo9fF5/mffZW5tNSbmsNVJpuu4=",
-      "dev": true
-    },
-    "angular-animate": {
-      "version": "1.3.20",
-      "resolved": "https://registry.npmjs.org/angular-animate/-/angular-animate-1.3.20.tgz",
-      "integrity": "sha1-0XB8cn+K0N8hxKLewgzX/ElFtSo=",
-      "dev": true
-    },
-    "ansi-colors": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-2.0.5.tgz",
-      "integrity": "sha512-yAdfUZ+c2wetVNIFsNRn44THW+Lty6S5TwMpUfLA/UaGhiXbBv/F8E60/1hMLd0cnF/CDoWH8vzVaI5bAcHCjw==",
-      "dev": true
-    },
-    "ansi-gray": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
-      "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=",
-      "dev": true,
-      "requires": {
-        "ansi-wrap": "0.1.0"
-      }
-    },
-    "ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "dev": true
-    },
-    "ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-      "dev": true
-    },
-    "ansi-wrap": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
-      "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=",
-      "dev": true
-    },
-    "archy": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
-      "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
-      "dev": true
-    },
-    "arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-      "dev": true
-    },
-    "arr-flatten": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-      "dev": true
-    },
-    "arr-union": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
-      "dev": true
-    },
-    "array-differ": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
-      "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=",
-      "dev": true
-    },
-    "array-each": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
-      "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
-      "dev": true
-    },
-    "array-find-index": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
-      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
-      "dev": true
-    },
-    "array-slice": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
-      "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
-      "dev": true
-    },
-    "array-uniq": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
-      "dev": true
-    },
-    "array-unique": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-      "dev": true
-    },
-    "assign-symbols": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
-      "dev": true
-    },
-    "atob": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-      "dev": true
-    },
-    "balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-      "dev": true
-    },
-    "base": {
-      "version": "0.11.2",
-      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-      "dev": true,
-      "requires": {
-        "cache-base": "^1.0.1",
-        "class-utils": "^0.3.5",
-        "component-emitter": "^1.2.1",
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.1",
-        "mixin-deep": "^1.2.0",
-        "pascalcase": "^0.1.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        }
-      }
-    },
-    "batch": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
-      "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
-      "dev": true
-    },
-    "beeper": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz",
-      "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=",
-      "dev": true
-    },
-    "body": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/body/-/body-5.1.0.tgz",
-      "integrity": "sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk=",
-      "dev": true,
-      "requires": {
-        "continuable-cache": "^0.3.1",
-        "error": "^7.0.0",
-        "raw-body": "~1.1.0",
-        "safe-json-parse": "~1.0.1"
-      }
-    },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
-      "requires": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
-      }
-    },
-    "bytes": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz",
-      "integrity": "sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g=",
-      "dev": true
-    },
-    "cache-base": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
-      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
-      "dev": true,
-      "requires": {
-        "collection-visit": "^1.0.0",
-        "component-emitter": "^1.2.1",
-        "get-value": "^2.0.6",
-        "has-value": "^1.0.0",
-        "isobject": "^3.0.1",
-        "set-value": "^2.0.0",
-        "to-object-path": "^0.3.0",
-        "union-value": "^1.0.0",
-        "unset-value": "^1.0.0"
-      }
-    },
-    "camelcase": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-      "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
-      "dev": true
-    },
-    "camelcase-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
-      "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
-      "dev": true,
-      "requires": {
-        "camelcase": "^2.0.0",
-        "map-obj": "^1.0.0"
-      }
-    },
-    "canonical-path": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/canonical-path/-/canonical-path-0.0.2.tgz",
-      "integrity": "sha1-4x65N6jJPuKgHfGDl5RyGQKHRXQ=",
-      "dev": true
-    },
-    "chalk": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "^2.2.1",
-        "escape-string-regexp": "^1.0.2",
-        "has-ansi": "^2.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^2.0.0"
-      }
-    },
-    "class-utils": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
-      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
-      "dev": true,
-      "requires": {
-        "arr-union": "^3.1.0",
-        "define-property": "^0.2.5",
-        "isobject": "^3.0.0",
-        "static-extend": "^0.1.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        }
-      }
-    },
-    "clone": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
-      "dev": true
-    },
-    "clone-stats": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
-      "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=",
-      "dev": true
-    },
-    "collection-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
-      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
-      "dev": true,
-      "requires": {
-        "map-visit": "^1.0.0",
-        "object-visit": "^1.0.0"
-      }
-    },
-    "color-support": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
-      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
-      "dev": true
-    },
-    "colors": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
-      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
-      "dev": true
-    },
-    "component-emitter": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
-      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
-      "dev": true
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
-    },
-    "connect": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
-      "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==",
-      "dev": true,
-      "requires": {
-        "debug": "2.6.9",
-        "finalhandler": "1.1.2",
-        "parseurl": "~1.3.3",
-        "utils-merge": "1.0.1"
-      }
-    },
-    "connect-livereload": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.6.1.tgz",
-      "integrity": "sha512-3R0kMOdL7CjJpU66fzAkCe6HNtd3AavCS4m+uW4KtJjrdGPT0SQEZieAYd+cm+lJoBznNQ4lqipYWkhBMgk00g==",
-      "dev": true
-    },
-    "continuable-cache": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/continuable-cache/-/continuable-cache-0.3.1.tgz",
-      "integrity": "sha1-vXJ6f67XfnH/OYWskzUakSczrQ8=",
-      "dev": true
-    },
-    "copy-descriptor": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
-      "dev": true
-    },
-    "core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-      "dev": true
-    },
-    "currently-unhandled": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
-      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
-      "dev": true,
-      "requires": {
-        "array-find-index": "^1.0.1"
-      }
-    },
-    "dateformat": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz",
-      "integrity": "sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=",
-      "dev": true
-    },
-    "debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "requires": {
-        "ms": "2.0.0"
-      }
-    },
-    "decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-      "dev": true
-    },
-    "decode-uri-component": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
-      "dev": true
-    },
-    "defaults": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
-      "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
-      "dev": true,
-      "requires": {
-        "clone": "^1.0.2"
-      }
-    },
-    "define-property": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
-      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
-      "dev": true,
-      "requires": {
-        "is-descriptor": "^1.0.2",
-        "isobject": "^3.0.1"
-      },
-      "dependencies": {
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        }
-      }
-    },
-    "depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
-      "dev": true
-    },
-    "deprecated": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz",
-      "integrity": "sha1-+cmvVGSvoeepcUWKi97yqpTVuxk=",
-      "dev": true
-    },
-    "destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
-      "dev": true
-    },
-    "detect-file": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
-      "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
-      "dev": true
-    },
-    "duplexer": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
-      "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
-      "dev": true
-    },
-    "duplexer2": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-      "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
-      "dev": true,
-      "requires": {
-        "readable-stream": "~1.1.9"
-      }
-    },
-    "ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
-      "dev": true
-    },
-    "encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
-      "dev": true
-    },
-    "end-of-stream": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
-      "integrity": "sha1-jhdyBsPICDfYVjLouTWd/osvbq8=",
-      "dev": true,
-      "requires": {
-        "once": "~1.3.0"
-      }
-    },
-    "error": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/error/-/error-7.2.0.tgz",
-      "integrity": "sha512-M6t3j3Vt3uDicrViMP5fLq2AeADNrCVFD8Oj4Qt2MHsX0mPYG7D5XdnEfSdRpaHQzjAJ19wu+I1mw9rQYMTAPg==",
-      "dev": true,
-      "requires": {
-        "string-template": "~0.2.1"
-      }
-    },
-    "error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "dev": true,
-      "requires": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
-      "dev": true
-    },
-    "escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true
-    },
-    "etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
-      "dev": true
-    },
-    "event-stream": {
-      "version": "3.3.5",
-      "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.5.tgz",
-      "integrity": "sha512-vyibDcu5JL20Me1fP734QBH/kenBGLZap2n0+XXM7mvuUPzJ20Ydqj1aKcIeMdri1p+PU+4yAKugjN8KCVst+g==",
-      "dev": true,
-      "requires": {
-        "duplexer": "^0.1.1",
-        "from": "^0.1.7",
-        "map-stream": "0.0.7",
-        "pause-stream": "^0.0.11",
-        "split": "^1.0.1",
-        "stream-combiner": "^0.2.2",
-        "through": "^2.3.8"
-      }
-    },
-    "expand-brackets": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-      "dev": true,
-      "requires": {
-        "debug": "^2.3.3",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "posix-character-classes": "^0.1.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
-      }
-    },
-    "expand-tilde": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-      "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
-      "dev": true,
-      "requires": {
-        "homedir-polyfill": "^1.0.1"
-      }
-    },
-    "extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-      "dev": true
-    },
-    "extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-      "dev": true,
-      "requires": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
-      },
-      "dependencies": {
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        }
-      }
-    },
-    "extglob": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-      "dev": true,
-      "requires": {
-        "array-unique": "^0.3.2",
-        "define-property": "^1.0.0",
-        "expand-brackets": "^2.1.4",
-        "extend-shallow": "^2.0.1",
-        "fragment-cache": "^0.2.1",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        }
-      }
-    },
-    "fancy-log": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
-      "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
-      "dev": true,
-      "requires": {
-        "ansi-gray": "^0.1.1",
-        "color-support": "^1.1.3",
-        "parse-node-version": "^1.0.0",
-        "time-stamp": "^1.0.0"
-      }
-    },
-    "faye-websocket": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
-      "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
-      "dev": true,
-      "requires": {
-        "websocket-driver": ">=0.5.1"
-      }
-    },
-    "fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-      "dev": true,
-      "requires": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
-      }
-    },
-    "finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
-      "dev": true,
-      "requires": {
-        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
-        "unpipe": "~1.0.0"
-      }
-    },
-    "find-index": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz",
-      "integrity": "sha1-Z101iyyjiS15Whq0cjL4tuLg3eQ=",
-      "dev": true
-    },
-    "find-up": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-      "dev": true,
-      "requires": {
-        "path-exists": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      }
-    },
-    "findup-sync": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
-      "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
-      "dev": true,
-      "requires": {
-        "detect-file": "^1.0.0",
-        "is-glob": "^3.1.0",
-        "micromatch": "^3.0.4",
-        "resolve-dir": "^1.0.1"
-      }
-    },
-    "fined": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz",
-      "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
-      "dev": true,
-      "requires": {
-        "expand-tilde": "^2.0.2",
-        "is-plain-object": "^2.0.3",
-        "object.defaults": "^1.1.0",
-        "object.pick": "^1.2.0",
-        "parse-filepath": "^1.0.1"
-      }
-    },
-    "first-chunk-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz",
-      "integrity": "sha1-Wb+1DNkF9g18OUzT2ayqtOatk04=",
-      "dev": true
-    },
-    "flagged-respawn": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
-      "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
-      "dev": true
-    },
-    "for-in": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
-      "dev": true
-    },
-    "for-own": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
-      "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
-      "dev": true,
-      "requires": {
-        "for-in": "^1.0.1"
-      }
-    },
-    "fragment-cache": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
-      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
-      "dev": true,
-      "requires": {
-        "map-cache": "^0.2.2"
-      }
-    },
-    "fresh": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
-      "dev": true
-    },
-    "from": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
-      "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=",
-      "dev": true
-    },
-    "gaze": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz",
-      "integrity": "sha1-QLcJU30k0dRXZ9takIaJ3+aaxE8=",
-      "dev": true,
-      "requires": {
-        "globule": "~0.1.0"
-      }
-    },
-    "get-stdin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
-      "dev": true
-    },
-    "get-value": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
-      "dev": true
-    },
-    "glob": {
-      "version": "4.5.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
-      "integrity": "sha1-xstz0yJsHv7wTePFbQEvAzd+4V8=",
-      "dev": true,
-      "requires": {
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^2.0.1",
-        "once": "^1.3.0"
-      }
-    },
-    "glob-stream": {
-      "version": "3.1.18",
-      "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
-      "integrity": "sha1-kXCl8St5Awb9/lmPMT+PeVT9FDs=",
-      "dev": true,
-      "requires": {
-        "glob": "^4.3.1",
-        "glob2base": "^0.0.12",
-        "minimatch": "^2.0.1",
-        "ordered-read-streams": "^0.1.0",
-        "through2": "^0.6.1",
-        "unique-stream": "^1.0.0"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "1.0.34",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
-          }
-        },
-        "through2": {
-          "version": "0.6.5",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-          "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-          "dev": true,
-          "requires": {
-            "readable-stream": ">=1.0.33-1 <1.1.0-0",
-            "xtend": ">=4.0.0 <4.1.0-0"
-          }
-        }
-      }
-    },
-    "glob-watcher": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
-      "integrity": "sha1-uVtKjfdLOcgymLDAXJeLTZo7cQs=",
-      "dev": true,
-      "requires": {
-        "gaze": "^0.5.1"
-      }
-    },
-    "glob2base": {
-      "version": "0.0.12",
-      "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
-      "integrity": "sha1-nUGbPijxLoOjYhZKJ3BVkiycDVY=",
-      "dev": true,
-      "requires": {
-        "find-index": "^0.1.1"
-      }
-    },
-    "global-modules": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
-      "dev": true,
-      "requires": {
-        "global-prefix": "^1.0.1",
-        "is-windows": "^1.0.1",
-        "resolve-dir": "^1.0.0"
-      }
-    },
-    "global-prefix": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
-      "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
-      "dev": true,
-      "requires": {
-        "expand-tilde": "^2.0.2",
-        "homedir-polyfill": "^1.0.1",
-        "ini": "^1.3.4",
-        "is-windows": "^1.0.1",
-        "which": "^1.2.14"
-      }
-    },
-    "globule": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
-      "integrity": "sha1-2cjt3h2nnRJaFRt5UzuXhnY0auU=",
-      "dev": true,
-      "requires": {
-        "glob": "~3.1.21",
-        "lodash": "~1.0.1",
-        "minimatch": "~0.2.11"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "3.1.21",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
-          "integrity": "sha1-0p4KBV3qUTj00H7UDomC6DwgZs0=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "~1.2.0",
-            "inherits": "1",
-            "minimatch": "~0.2.11"
-          }
-        },
-        "graceful-fs": {
-          "version": "1.2.3",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz",
-          "integrity": "sha1-FaSAaldUfLLS2/J/QuiajDRRs2Q=",
-          "dev": true
-        },
-        "inherits": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz",
-          "integrity": "sha1-ykMJ2t7mtUzAuNJH6NfHoJdb3Js=",
-          "dev": true
-        },
-        "minimatch": {
-          "version": "0.2.14",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
-          "integrity": "sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=",
-          "dev": true,
-          "requires": {
-            "lru-cache": "2",
-            "sigmund": "~1.0.0"
-          }
-        }
-      }
-    },
-    "glogg": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz",
-      "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==",
-      "dev": true,
-      "requires": {
-        "sparkles": "^1.0.0"
-      }
-    },
-    "graceful-fs": {
-      "version": "3.0.12",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.12.tgz",
-      "integrity": "sha512-J55gaCS4iTTJfTXIxSVw3EMQckcqkpdRv3IR7gu6sq0+tbC363Zx6KH/SEwXASK9JRbhyZmVjJEVJIOxYsB3Qg==",
-      "dev": true,
-      "requires": {
-        "natives": "^1.1.3"
-      }
-    },
-    "gulp": {
-      "version": "3.9.1",
-      "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz",
-      "integrity": "sha1-VxzkWSjdQK9lFPxAEYZgFsE4RbQ=",
-      "dev": true,
-      "requires": {
-        "archy": "^1.0.0",
-        "chalk": "^1.0.0",
-        "deprecated": "^0.0.1",
-        "gulp-util": "^3.0.0",
-        "interpret": "^1.0.0",
-        "liftoff": "^2.1.0",
-        "minimist": "^1.1.0",
-        "orchestrator": "^0.3.0",
-        "pretty-hrtime": "^1.0.0",
-        "semver": "^4.1.0",
-        "tildify": "^1.0.0",
-        "v8flags": "^2.0.2",
-        "vinyl-fs": "^0.3.0"
-      }
-    },
-    "gulp-connect": {
-      "version": "5.6.1",
-      "resolved": "https://registry.npmjs.org/gulp-connect/-/gulp-connect-5.6.1.tgz",
-      "integrity": "sha512-FknHeA6smZhiRNrK/3UVH8BHLCFHS7WZdE7Y2VbZHtxye1UTIa5ZY0Cnst6O9n3kL8z7y43QI+acx3nUtJoiHw==",
-      "dev": true,
-      "requires": {
-        "ansi-colors": "^2.0.5",
-        "connect": "^3.6.6",
-        "connect-livereload": "^0.6.0",
-        "event-stream": "^3.3.4",
-        "fancy-log": "^1.3.2",
-        "send": "^0.16.2",
-        "serve-index": "^1.9.1",
-        "serve-static": "^1.13.2",
-        "tiny-lr": "^1.1.1"
-      }
-    },
-    "gulp-ngdocs": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/gulp-ngdocs/-/gulp-ngdocs-0.3.0.tgz",
-      "integrity": "sha1-J7Z6Ql6zh1ImNFq4lgTXN/Y1fCE=",
-      "dev": true,
-      "requires": {
-        "angular": "~1.3.1",
-        "angular-animate": "~1.3.1",
-        "canonical-path": "0.0.2",
-        "extend": "1.3.0",
-        "gulp-util": "3.0.0",
-        "lodash": "2.4.1",
-        "marked": "0.3.2",
-        "merge-stream": "0.1.5",
-        "path": "0.4.9",
-        "string_decoder": "0.10.31",
-        "through2": "0.6.1",
-        "vinyl-fs": "0.3.7"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
-          "integrity": "sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz",
-          "integrity": "sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
-          "integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^1.1.0",
-            "escape-string-regexp": "^1.0.0",
-            "has-ansi": "^0.1.0",
-            "strip-ansi": "^0.3.0",
-            "supports-color": "^0.2.0"
-          }
-        },
-        "clone": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
-          "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-          "dev": true
-        },
-        "dateformat": {
-          "version": "1.0.12",
-          "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
-          "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=",
-          "dev": true,
-          "requires": {
-            "get-stdin": "^4.0.1",
-            "meow": "^3.3.0"
-          }
-        },
-        "extend": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/extend/-/extend-1.3.0.tgz",
-          "integrity": "sha1-0VFvsP9WJNLr+RI+odrFoZlABPg=",
-          "dev": true
-        },
-        "gulp-util": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.0.tgz",
-          "integrity": "sha1-b+7cR9aXKCO6zplH/F9GvYo0Zuc=",
-          "dev": true,
-          "requires": {
-            "chalk": "^0.5.0",
-            "dateformat": "^1.0.7-1.2.3",
-            "lodash": "^2.4.1",
-            "lodash._reinterpolate": "^2.4.1",
-            "lodash.template": "^2.4.1",
-            "minimist": "^0.2.0",
-            "multipipe": "^0.1.0",
-            "through2": "^0.5.0",
-            "vinyl": "^0.2.1"
-          },
-          "dependencies": {
-            "through2": {
-              "version": "0.5.1",
-              "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
-              "integrity": "sha1-390BLrnHAOIyP9M084rGIqs3Lac=",
-              "dev": true,
-              "requires": {
-                "readable-stream": "~1.0.17",
-                "xtend": "~3.0.0"
-              }
-            }
-          }
-        },
-        "has-ansi": {
-          "version": "0.1.0",
-          "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
-          "integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^0.2.0"
-          }
-        },
-        "lodash": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz",
-          "integrity": "sha1-W3cjA03aTSYuWkb7LFjXzCL3FCA=",
-          "dev": true
-        },
-        "lodash._reinterpolate": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz",
-          "integrity": "sha1-TxInqlqHEfxjL1sHofRgequLMiI=",
-          "dev": true
-        },
-        "lodash.escape": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-2.4.1.tgz",
-          "integrity": "sha1-LOEsXghNsKV92l5dHu659dF1o7Q=",
-          "dev": true,
-          "requires": {
-            "lodash._escapehtmlchar": "~2.4.1",
-            "lodash._reunescapedhtml": "~2.4.1",
-            "lodash.keys": "~2.4.1"
-          }
-        },
-        "lodash.keys": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
-          "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=",
-          "dev": true,
-          "requires": {
-            "lodash._isnative": "~2.4.1",
-            "lodash._shimkeys": "~2.4.1",
-            "lodash.isobject": "~2.4.1"
-          }
-        },
-        "lodash.template": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-2.4.1.tgz",
-          "integrity": "sha1-nmEQB+32KRKal0qzxIuBez4c8g0=",
-          "dev": true,
-          "requires": {
-            "lodash._escapestringchar": "~2.4.1",
-            "lodash._reinterpolate": "~2.4.1",
-            "lodash.defaults": "~2.4.1",
-            "lodash.escape": "~2.4.1",
-            "lodash.keys": "~2.4.1",
-            "lodash.templatesettings": "~2.4.1",
-            "lodash.values": "~2.4.1"
-          }
-        },
-        "lodash.templatesettings": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz",
-          "integrity": "sha1-6nbHXRHrhtTb6JqDiTu4YZKaxpk=",
-          "dev": true,
-          "requires": {
-            "lodash._reinterpolate": "~2.4.1",
-            "lodash.escape": "~2.4.1"
-          }
-        },
-        "minimist": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz",
-          "integrity": "sha1-Tf/lJdriuGTGbC4jxicdev3s784=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
-          }
-        },
-        "strip-ansi": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
-          "integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^0.2.1"
-          }
-        },
-        "supports-color": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz",
-          "integrity": "sha1-2S3iaU6z9nMjlz1649i1W0wiGQo=",
-          "dev": true
-        },
-        "through2": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.1.tgz",
-          "integrity": "sha1-90KzKJPovSYUbnieT9LMssB6cX4=",
-          "dev": true,
-          "requires": {
-            "readable-stream": ">=1.0.27-1 <1.1.0-0",
-            "xtend": ">=4.0.0 <4.1.0-0"
-          },
-          "dependencies": {
-            "xtend": {
-              "version": "4.0.2",
-              "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-              "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-              "dev": true
-            }
-          }
-        },
-        "vinyl": {
-          "version": "0.2.3",
-          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.2.3.tgz",
-          "integrity": "sha1-vKk4IJWC7FpJrVOKAPofEl5RMlI=",
-          "dev": true,
-          "requires": {
-            "clone-stats": "~0.0.1"
-          }
-        },
-        "vinyl-fs": {
-          "version": "0.3.7",
-          "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.7.tgz",
-          "integrity": "sha1-LiXP5t9cgIGPl/9Be/XCGkHkpJs=",
-          "dev": true,
-          "requires": {
-            "glob-stream": "^3.1.5",
-            "glob-watcher": "^0.0.6",
-            "graceful-fs": "^3.0.0",
-            "lodash": "^2.4.1",
-            "mkdirp": "^0.5.0",
-            "strip-bom": "^1.0.0",
-            "through2": "^0.6.1",
-            "vinyl": "^0.4.0"
-          },
-          "dependencies": {
-            "vinyl": {
-              "version": "0.4.6",
-              "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
-              "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
-              "dev": true,
-              "requires": {
-                "clone": "^0.2.0",
-                "clone-stats": "^0.0.1"
-              }
-            }
-          }
-        },
-        "xtend": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
-          "integrity": "sha1-XM50B7r2Qsunvs2laBEcST9ZZlo=",
-          "dev": true
-        }
-      }
-    },
-    "gulp-open": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/gulp-open/-/gulp-open-3.0.1.tgz",
-      "integrity": "sha512-dohokw+npnt48AsD0hhvCLEHLnDMqM35F+amvIfJlX1H2nNHYUClR0Oy1rI0TvbL1/pHiHGNLmohhk+kvwIKjA==",
-      "dev": true,
-      "requires": {
-        "colors": "^1.1.2",
-        "opn": "5.2.0",
-        "plugin-log": "^0.1.0",
-        "through2": "^2.0.1"
-      }
-    },
-    "gulp-util": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz",
-      "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=",
-      "dev": true,
-      "requires": {
-        "array-differ": "^1.0.0",
-        "array-uniq": "^1.0.2",
-        "beeper": "^1.0.0",
-        "chalk": "^1.0.0",
-        "dateformat": "^2.0.0",
-        "fancy-log": "^1.1.0",
-        "gulplog": "^1.0.0",
-        "has-gulplog": "^0.1.0",
-        "lodash._reescape": "^3.0.0",
-        "lodash._reevaluate": "^3.0.0",
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.template": "^3.0.0",
-        "minimist": "^1.1.0",
-        "multipipe": "^0.1.2",
-        "object-assign": "^3.0.0",
-        "replace-ext": "0.0.1",
-        "through2": "^2.0.0",
-        "vinyl": "^0.5.0"
-      }
-    },
-    "gulplog": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
-      "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
-      "dev": true,
-      "requires": {
-        "glogg": "^1.0.0"
-      }
-    },
-    "has-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "^2.0.0"
-      }
-    },
-    "has-gulplog": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
-      "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=",
-      "dev": true,
-      "requires": {
-        "sparkles": "^1.0.0"
-      }
-    },
-    "has-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
-      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
-      "dev": true,
-      "requires": {
-        "get-value": "^2.0.6",
-        "has-values": "^1.0.0",
-        "isobject": "^3.0.0"
-      }
-    },
-    "has-values": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
-      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
-      "dev": true,
-      "requires": {
-        "is-number": "^3.0.0",
-        "kind-of": "^4.0.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "homedir-polyfill": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
-      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
-      "dev": true,
-      "requires": {
-        "parse-passwd": "^1.0.0"
-      }
-    },
-    "hosted-git-info": {
-      "version": "2.8.4",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.4.tgz",
-      "integrity": "sha512-pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ==",
-      "dev": true
-    },
-    "http-errors": {
-      "version": "1.6.3",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-      "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
-      "dev": true,
-      "requires": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.0",
-        "statuses": ">= 1.4.0 < 2"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-          "dev": true
-        }
-      }
-    },
-    "http-parser-js": {
-      "version": "0.4.10",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.10.tgz",
-      "integrity": "sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=",
-      "dev": true
-    },
-    "indent-string": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-      "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
-      "dev": true,
-      "requires": {
-        "repeating": "^2.0.0"
-      }
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
-      "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "ini": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
-      "dev": true
-    },
-    "interpret": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz",
-      "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==",
-      "dev": true
-    },
-    "is-absolute": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
-      "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
-      "dev": true,
-      "requires": {
-        "is-relative": "^1.0.0",
-        "is-windows": "^1.0.1"
-      }
-    },
-    "is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-      "dev": true
-    },
-    "is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
-    },
-    "is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "requires": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-          "dev": true
-        }
-      }
-    },
-    "is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true
-    },
-    "is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "dev": true
-    },
-    "is-finite": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
-      "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
-      "dev": true,
-      "requires": {
-        "number-is-nan": "^1.0.0"
-      }
-    },
-    "is-glob": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-      "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-      "dev": true,
-      "requires": {
-        "is-extglob": "^2.1.0"
-      }
-    },
-    "is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "requires": {
-        "isobject": "^3.0.1"
-      }
-    },
-    "is-relative": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
-      "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
-      "dev": true,
-      "requires": {
-        "is-unc-path": "^1.0.0"
-      }
-    },
-    "is-unc-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
-      "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
-      "dev": true,
-      "requires": {
-        "unc-path-regex": "^0.1.2"
-      }
-    },
-    "is-utf8": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
-      "dev": true
-    },
-    "is-windows": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-      "dev": true
-    },
-    "is-wsl": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
-      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
-      "dev": true
-    },
-    "isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-      "dev": true
-    },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
-    },
-    "isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true
-    },
-    "kind-of": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-      "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-      "dev": true
-    },
-    "liftoff": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-2.5.0.tgz",
-      "integrity": "sha1-IAkpG7Mc6oYbvxCnwVooyvdcMew=",
-      "dev": true,
-      "requires": {
-        "extend": "^3.0.0",
-        "findup-sync": "^2.0.0",
-        "fined": "^1.0.1",
-        "flagged-respawn": "^1.0.0",
-        "is-plain-object": "^2.0.4",
-        "object.map": "^1.0.0",
-        "rechoir": "^0.6.2",
-        "resolve": "^1.1.7"
-      }
-    },
-    "livereload-js": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/livereload-js/-/livereload-js-2.4.0.tgz",
-      "integrity": "sha512-XPQH8Z2GDP/Hwz2PCDrh2mth4yFejwA1OZ/81Ti3LgKyhDcEjsSsqFWZojHG0va/duGd+WyosY7eXLDoOyqcPw==",
-      "dev": true
-    },
-    "load-json-file": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^2.2.0",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0",
-        "strip-bom": "^2.0.0"
-      },
-      "dependencies": {
-        "graceful-fs": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
-          "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==",
-          "dev": true
-        },
-        "strip-bom": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-          "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-          "dev": true,
-          "requires": {
-            "is-utf8": "^0.2.0"
-          }
-        }
-      }
-    },
-    "lodash": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz",
-      "integrity": "sha1-j1dWDIO1n8JwvT1WG2kAQ0MOJVE=",
-      "dev": true
-    },
-    "lodash._basecopy": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
-      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
-      "dev": true
-    },
-    "lodash._basetostring": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
-      "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=",
-      "dev": true
-    },
-    "lodash._basevalues": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
-      "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=",
-      "dev": true
-    },
-    "lodash._escapehtmlchar": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz",
-      "integrity": "sha1-32fDu2t+jh6DGrSL+geVuSr+iZ0=",
-      "dev": true,
-      "requires": {
-        "lodash._htmlescapes": "~2.4.1"
-      }
-    },
-    "lodash._escapestringchar": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz",
-      "integrity": "sha1-7P4iYYoq3lC/7qQ5N+Ud9m8O23I=",
-      "dev": true
-    },
-    "lodash._getnative": {
-      "version": "3.9.1",
-      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
-      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
-      "dev": true
-    },
-    "lodash._htmlescapes": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz",
-      "integrity": "sha1-MtFL8IRLbeb4tioFG09nwii2JMs=",
-      "dev": true
-    },
-    "lodash._isiterateecall": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
-      "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
-      "dev": true
-    },
-    "lodash._isnative": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz",
-      "integrity": "sha1-PqZAS3hKe+g2x7V1gOHN95sUgyw=",
-      "dev": true
-    },
-    "lodash._objecttypes": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz",
-      "integrity": "sha1-fAt/admKH3ZSn4kLDNsbTf7BHBE=",
-      "dev": true
-    },
-    "lodash._reescape": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
-      "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=",
-      "dev": true
-    },
-    "lodash._reevaluate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
-      "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=",
-      "dev": true
-    },
-    "lodash._reinterpolate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
-      "dev": true
-    },
-    "lodash._reunescapedhtml": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz",
-      "integrity": "sha1-dHxPxAED6zu4oJduVx96JlnpO6c=",
-      "dev": true,
-      "requires": {
-        "lodash._htmlescapes": "~2.4.1",
-        "lodash.keys": "~2.4.1"
-      },
-      "dependencies": {
-        "lodash.keys": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
-          "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=",
-          "dev": true,
-          "requires": {
-            "lodash._isnative": "~2.4.1",
-            "lodash._shimkeys": "~2.4.1",
-            "lodash.isobject": "~2.4.1"
-          }
-        }
-      }
-    },
-    "lodash._root": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
-      "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=",
-      "dev": true
-    },
-    "lodash._shimkeys": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz",
-      "integrity": "sha1-bpzJZm/wgfC1psl4uD4kLmlJ0gM=",
-      "dev": true,
-      "requires": {
-        "lodash._objecttypes": "~2.4.1"
-      }
-    },
-    "lodash.defaults": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
-      "integrity": "sha1-p+iIXwXmiFEUS24SqPNngCa8TFQ=",
-      "dev": true,
-      "requires": {
-        "lodash._objecttypes": "~2.4.1",
-        "lodash.keys": "~2.4.1"
-      },
-      "dependencies": {
-        "lodash.keys": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
-          "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=",
-          "dev": true,
-          "requires": {
-            "lodash._isnative": "~2.4.1",
-            "lodash._shimkeys": "~2.4.1",
-            "lodash.isobject": "~2.4.1"
-          }
-        }
-      }
-    },
-    "lodash.escape": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
-      "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=",
-      "dev": true,
-      "requires": {
-        "lodash._root": "^3.0.0"
-      }
-    },
-    "lodash.isarguments": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
-      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
-      "dev": true
-    },
-    "lodash.isarray": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
-      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
-      "dev": true
-    },
-    "lodash.isobject": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
-      "integrity": "sha1-Wi5H/mmVPx7mMafrof5k0tBlWPU=",
-      "dev": true,
-      "requires": {
-        "lodash._objecttypes": "~2.4.1"
-      }
-    },
-    "lodash.keys": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
-      "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
-      "dev": true,
-      "requires": {
-        "lodash._getnative": "^3.0.0",
-        "lodash.isarguments": "^3.0.0",
-        "lodash.isarray": "^3.0.0"
-      }
-    },
-    "lodash.restparam": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
-      "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=",
-      "dev": true
-    },
-    "lodash.template": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
-      "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=",
-      "dev": true,
-      "requires": {
-        "lodash._basecopy": "^3.0.0",
-        "lodash._basetostring": "^3.0.0",
-        "lodash._basevalues": "^3.0.0",
-        "lodash._isiterateecall": "^3.0.0",
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.escape": "^3.0.0",
-        "lodash.keys": "^3.0.0",
-        "lodash.restparam": "^3.0.0",
-        "lodash.templatesettings": "^3.0.0"
-      }
-    },
-    "lodash.templatesettings": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz",
-      "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=",
-      "dev": true,
-      "requires": {
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.escape": "^3.0.0"
-      }
-    },
-    "lodash.values": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash.values/-/lodash.values-2.4.1.tgz",
-      "integrity": "sha1-q/UUQ2s8twUAFieXjLzzCxKA7qQ=",
-      "dev": true,
-      "requires": {
-        "lodash.keys": "~2.4.1"
-      },
-      "dependencies": {
-        "lodash.keys": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
-          "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=",
-          "dev": true,
-          "requires": {
-            "lodash._isnative": "~2.4.1",
-            "lodash._shimkeys": "~2.4.1",
-            "lodash.isobject": "~2.4.1"
-          }
-        }
-      }
-    },
-    "loud-rejection": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
-      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
-      "dev": true,
-      "requires": {
-        "currently-unhandled": "^0.4.1",
-        "signal-exit": "^3.0.0"
-      }
-    },
-    "lru-cache": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
-      "integrity": "sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=",
-      "dev": true
-    },
-    "make-iterator": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
-      "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
-      "dev": true,
-      "requires": {
-        "kind-of": "^6.0.2"
-      }
-    },
-    "map-cache": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
-      "dev": true
-    },
-    "map-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-      "dev": true
-    },
-    "map-stream": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz",
-      "integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=",
-      "dev": true
-    },
-    "map-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
-      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
-      "dev": true,
-      "requires": {
-        "object-visit": "^1.0.0"
-      }
-    },
-    "marked": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.2.tgz",
-      "integrity": "sha1-AV2xWIZEOPJKZL3WGgQotBhwbQk=",
-      "dev": true
-    },
-    "meow": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-      "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
-      "dev": true,
-      "requires": {
-        "camelcase-keys": "^2.0.0",
-        "decamelize": "^1.1.2",
-        "loud-rejection": "^1.0.0",
-        "map-obj": "^1.0.1",
-        "minimist": "^1.1.3",
-        "normalize-package-data": "^2.3.4",
-        "object-assign": "^4.0.1",
-        "read-pkg-up": "^1.0.1",
-        "redent": "^1.0.0",
-        "trim-newlines": "^1.0.0"
-      },
-      "dependencies": {
-        "object-assign": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-          "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true
-        }
-      }
-    },
-    "merge-stream": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-0.1.5.tgz",
-      "integrity": "sha1-5oIPet267gA/SMpKWMfFolPV4Fw=",
-      "dev": true,
-      "requires": {
-        "through2": "^0.5.1"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "1.0.34",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
-          }
-        },
-        "through2": {
-          "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
-          "integrity": "sha1-390BLrnHAOIyP9M084rGIqs3Lac=",
-          "dev": true,
-          "requires": {
-            "readable-stream": "~1.0.17",
-            "xtend": "~3.0.0"
-          }
-        },
-        "xtend": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
-          "integrity": "sha1-XM50B7r2Qsunvs2laBEcST9ZZlo=",
-          "dev": true
-        }
-      }
-    },
-    "micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dev": true,
-      "requires": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      }
-    },
-    "mime": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
-      "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
-      "dev": true
-    },
-    "mime-db": {
-      "version": "1.40.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
-      "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==",
-      "dev": true
-    },
-    "mime-types": {
-      "version": "2.1.24",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
-      "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
-      "dev": true,
-      "requires": {
-        "mime-db": "1.40.0"
-      }
-    },
-    "minimatch": {
-      "version": "2.0.10",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-      "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=",
-      "dev": true,
-      "requires": {
-        "brace-expansion": "^1.0.0"
-      }
-    },
-    "minimist": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-      "dev": true
-    },
-    "mixin-deep": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
-      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
-      "dev": true,
-      "requires": {
-        "for-in": "^1.0.2",
-        "is-extendable": "^1.0.1"
-      },
-      "dependencies": {
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        }
-      }
-    },
-    "mkdirp": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-      "dev": true,
-      "requires": {
-        "minimist": "0.0.8"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "dev": true
-        }
-      }
-    },
-    "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "multipipe": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
-      "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=",
-      "dev": true,
-      "requires": {
-        "duplexer2": "0.0.2"
-      }
-    },
-    "nanomatch": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
-      "dev": true,
-      "requires": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "fragment-cache": "^0.2.1",
-        "is-windows": "^1.0.2",
-        "kind-of": "^6.0.2",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      }
-    },
-    "natives": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.6.tgz",
-      "integrity": "sha512-6+TDFewD4yxY14ptjKaS63GVdtKiES1pTPyxn9Jb0rBqPMZ7VcCiooEhPNsr+mqHtMGxa/5c/HhcC4uPEUw/nA==",
-      "dev": true
-    },
-    "negotiator": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
-      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
-      "dev": true
-    },
-    "normalize-package-data": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-      "dev": true,
-      "requires": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
-      }
-    },
-    "number-is-nan": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-      "dev": true
-    },
-    "object-assign": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
-      "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=",
-      "dev": true
-    },
-    "object-copy": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
-      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
-      "dev": true,
-      "requires": {
-        "copy-descriptor": "^0.1.0",
-        "define-property": "^0.2.5",
-        "kind-of": "^3.0.3"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "object-visit": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
-      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
-      "dev": true,
-      "requires": {
-        "isobject": "^3.0.0"
-      }
-    },
-    "object.defaults": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
-      "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=",
-      "dev": true,
-      "requires": {
-        "array-each": "^1.0.1",
-        "array-slice": "^1.0.0",
-        "for-own": "^1.0.0",
-        "isobject": "^3.0.0"
-      }
-    },
-    "object.map": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
-      "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=",
-      "dev": true,
-      "requires": {
-        "for-own": "^1.0.0",
-        "make-iterator": "^1.0.0"
-      }
-    },
-    "object.pick": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
-      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
-      "dev": true,
-      "requires": {
-        "isobject": "^3.0.1"
-      }
-    },
-    "on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-      "dev": true,
-      "requires": {
-        "ee-first": "1.1.1"
-      }
-    },
-    "once": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-      "integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=",
-      "dev": true,
-      "requires": {
-        "wrappy": "1"
-      }
-    },
-    "opn": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/opn/-/opn-5.2.0.tgz",
-      "integrity": "sha512-Jd/GpzPyHF4P2/aNOVmS3lfMSWV9J7cOhCG1s08XCEAsPkB7lp6ddiU0J7XzyQRDUh8BqJ7PchfINjR8jyofRQ==",
-      "dev": true,
-      "requires": {
-        "is-wsl": "^1.1.0"
-      }
-    },
-    "orchestrator": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.8.tgz",
-      "integrity": "sha1-FOfp4nZPcxX7rBhOUGx6pt+UrX4=",
-      "dev": true,
-      "requires": {
-        "end-of-stream": "~0.1.5",
-        "sequencify": "~0.0.7",
-        "stream-consume": "~0.1.0"
-      }
-    },
-    "ordered-read-streams": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz",
-      "integrity": "sha1-/VZamvjrRHO6abbtijQ1LLVS8SY=",
-      "dev": true
-    },
-    "os-homedir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-      "dev": true
-    },
-    "parse-filepath": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
-      "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=",
-      "dev": true,
-      "requires": {
-        "is-absolute": "^1.0.0",
-        "map-cache": "^0.2.0",
-        "path-root": "^0.1.1"
-      }
-    },
-    "parse-json": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-      "dev": true,
-      "requires": {
-        "error-ex": "^1.2.0"
-      }
-    },
-    "parse-node-version": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
-      "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
-      "dev": true
-    },
-    "parse-passwd": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
-      "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
-      "dev": true
-    },
-    "parseurl": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
-      "dev": true
-    },
-    "pascalcase": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
-      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
-      "dev": true
-    },
-    "path": {
-      "version": "0.4.9",
-      "resolved": "https://registry.npmjs.org/path/-/path-0.4.9.tgz",
-      "integrity": "sha1-OAxo0BJz5D+TaNetUP7l4+jUd/A=",
-      "dev": true
-    },
-    "path-exists": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-      "dev": true,
-      "requires": {
-        "pinkie-promise": "^2.0.0"
-      }
-    },
-    "path-parse": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
-      "dev": true
-    },
-    "path-root": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
-      "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=",
-      "dev": true,
-      "requires": {
-        "path-root-regex": "^0.1.0"
-      }
-    },
-    "path-root-regex": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
-      "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=",
-      "dev": true
-    },
-    "path-type": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
-      "dependencies": {
-        "graceful-fs": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
-          "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==",
-          "dev": true
-        }
-      }
-    },
-    "pause-stream": {
-      "version": "0.0.11",
-      "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
-      "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
-      "dev": true,
-      "requires": {
-        "through": "~2.3"
-      }
-    },
-    "pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "dev": true
-    },
-    "pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-      "dev": true
-    },
-    "pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-      "dev": true,
-      "requires": {
-        "pinkie": "^2.0.0"
-      }
-    },
-    "plugin-log": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/plugin-log/-/plugin-log-0.1.0.tgz",
-      "integrity": "sha1-hgSc9qsQgzOYqTHzaJy67nteEzM=",
-      "dev": true,
-      "requires": {
-        "chalk": "^1.1.1",
-        "dateformat": "^1.0.11"
-      },
-      "dependencies": {
-        "dateformat": {
-          "version": "1.0.12",
-          "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
-          "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=",
-          "dev": true,
-          "requires": {
-            "get-stdin": "^4.0.1",
-            "meow": "^3.3.0"
-          }
-        }
-      }
-    },
-    "posix-character-classes": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
-      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
-      "dev": true
-    },
-    "pretty-hrtime": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
-      "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
-      "dev": true
-    },
-    "process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-      "dev": true
-    },
-    "qs": {
-      "version": "6.9.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.0.tgz",
-      "integrity": "sha512-27RP4UotQORTpmNQDX8BHPukOnBP3p1uUJY5UnDhaJB+rMt9iMsok724XL+UHU23bEFOHRMQ2ZhI99qOWUMGFA==",
-      "dev": true
-    },
-    "range-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-      "dev": true
-    },
-    "raw-body": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-1.1.7.tgz",
-      "integrity": "sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU=",
-      "dev": true,
-      "requires": {
-        "bytes": "1",
-        "string_decoder": "0.10"
-      }
-    },
-    "read-pkg": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-      "dev": true,
-      "requires": {
-        "load-json-file": "^1.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^1.0.0"
-      }
-    },
-    "read-pkg-up": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-      "dev": true,
-      "requires": {
-        "find-up": "^1.0.0",
-        "read-pkg": "^1.0.0"
-      }
-    },
-    "readable-stream": {
-      "version": "1.1.14",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-      "dev": true,
-      "requires": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "rechoir": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
-      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
-      "dev": true,
-      "requires": {
-        "resolve": "^1.1.6"
-      }
-    },
-    "redent": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-      "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
-      "dev": true,
-      "requires": {
-        "indent-string": "^2.1.0",
-        "strip-indent": "^1.0.1"
-      }
-    },
-    "regex-not": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
-      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
-      "dev": true,
-      "requires": {
-        "extend-shallow": "^3.0.2",
-        "safe-regex": "^1.1.0"
-      }
-    },
-    "repeat-element": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
-      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
-      "dev": true
-    },
-    "repeat-string": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
-      "dev": true
-    },
-    "repeating": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
-      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
-      "dev": true,
-      "requires": {
-        "is-finite": "^1.0.0"
-      }
-    },
-    "replace-ext": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
-      "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
-      "dev": true
-    },
-    "resolve": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
-      "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
-      "dev": true,
-      "requires": {
-        "path-parse": "^1.0.6"
-      }
-    },
-    "resolve-dir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
-      "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
-      "dev": true,
-      "requires": {
-        "expand-tilde": "^2.0.0",
-        "global-modules": "^1.0.0"
-      }
-    },
-    "resolve-url": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
-      "dev": true
-    },
-    "ret": {
-      "version": "0.1.15",
-      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
-      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
-      "dev": true
-    },
-    "safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
-    },
-    "safe-json-parse": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/safe-json-parse/-/safe-json-parse-1.0.1.tgz",
-      "integrity": "sha1-PnZyPjjf3aE8mx0poeB//uSzC1c=",
-      "dev": true
-    },
-    "safe-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
-      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
-      "dev": true,
-      "requires": {
-        "ret": "~0.1.10"
-      }
-    },
-    "semver": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
-      "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=",
-      "dev": true
-    },
-    "send": {
-      "version": "0.16.2",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
-      "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
-      "dev": true,
-      "requires": {
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "~1.6.2",
-        "mime": "1.4.1",
-        "ms": "2.0.0",
-        "on-finished": "~2.3.0",
-        "range-parser": "~1.2.0",
-        "statuses": "~1.4.0"
-      },
-      "dependencies": {
-        "statuses": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
-          "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==",
-          "dev": true
-        }
-      }
-    },
-    "sequencify": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz",
-      "integrity": "sha1-kM/xnQLgcCf9dn9erT57ldHnOAw=",
-      "dev": true
-    },
-    "serve-index": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
-      "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
-      "dev": true,
-      "requires": {
-        "accepts": "~1.3.4",
-        "batch": "0.6.1",
-        "debug": "2.6.9",
-        "escape-html": "~1.0.3",
-        "http-errors": "~1.6.2",
-        "mime-types": "~2.1.17",
-        "parseurl": "~1.3.2"
-      }
-    },
-    "serve-static": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
-      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
-      "dev": true,
-      "requires": {
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "parseurl": "~1.3.3",
-        "send": "0.17.1"
-      },
-      "dependencies": {
-        "http-errors": {
-          "version": "1.7.3",
-          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz",
-          "integrity": "sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==",
-          "dev": true,
-          "requires": {
-            "depd": "~1.1.2",
-            "inherits": "2.0.4",
-            "setprototypeof": "1.1.1",
-            "statuses": ">= 1.5.0 < 2",
-            "toidentifier": "1.0.0"
-          }
-        },
-        "mime": {
-          "version": "1.6.0",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-          "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-          "dev": true
-        },
-        "send": {
-          "version": "0.17.1",
-          "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
-          "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
-          "dev": true,
-          "requires": {
-            "debug": "2.6.9",
-            "depd": "~1.1.2",
-            "destroy": "~1.0.4",
-            "encodeurl": "~1.0.2",
-            "escape-html": "~1.0.3",
-            "etag": "~1.8.1",
-            "fresh": "0.5.2",
-            "http-errors": "~1.7.2",
-            "mime": "1.6.0",
-            "ms": "2.1.1",
-            "on-finished": "~2.3.0",
-            "range-parser": "~1.2.1",
-            "statuses": "~1.5.0"
-          }
-        },
-        "setprototypeof": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
-          "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==",
-          "dev": true
-        }
-      }
-    },
-    "set-value": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
-      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
-      "dev": true,
-      "requires": {
-        "extend-shallow": "^2.0.1",
-        "is-extendable": "^0.1.1",
-        "is-plain-object": "^2.0.3",
-        "split-string": "^3.0.1"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
-      }
-    },
-    "setprototypeof": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-      "dev": true
-    },
-    "sigmund": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
-      "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=",
-      "dev": true
-    },
-    "signal-exit": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
-      "dev": true
-    },
-    "snapdragon": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-      "dev": true,
-      "requires": {
-        "base": "^0.11.1",
-        "debug": "^2.2.0",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "map-cache": "^0.2.2",
-        "source-map": "^0.5.6",
-        "source-map-resolve": "^0.5.0",
-        "use": "^3.1.0"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
-      }
-    },
-    "snapdragon-node": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
-      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
-      "dev": true,
-      "requires": {
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.0",
-        "snapdragon-util": "^3.0.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        }
-      }
-    },
-    "snapdragon-util": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
-      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.2.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-      "dev": true
-    },
-    "source-map-resolve": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-      "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
-      "dev": true,
-      "requires": {
-        "atob": "^2.1.1",
-        "decode-uri-component": "^0.2.0",
-        "resolve-url": "^0.2.1",
-        "source-map-url": "^0.4.0",
-        "urix": "^0.1.0"
-      }
-    },
-    "source-map-url": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
-      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
-      "dev": true
-    },
-    "sparkles": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz",
-      "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==",
-      "dev": true
-    },
-    "spdx-correct": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
-      "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
-      "dev": true,
-      "requires": {
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "spdx-exceptions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
-      "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==",
-      "dev": true
-    },
-    "spdx-expression-parse": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
-      "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
-      "dev": true,
-      "requires": {
-        "spdx-exceptions": "^2.1.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "spdx-license-ids": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
-      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
-      "dev": true
-    },
-    "split": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
-      "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
-      "dev": true,
-      "requires": {
-        "through": "2"
-      }
-    },
-    "split-string": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
-      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
-      "dev": true,
-      "requires": {
-        "extend-shallow": "^3.0.0"
-      }
-    },
-    "static-extend": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
-      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
-      "dev": true,
-      "requires": {
-        "define-property": "^0.2.5",
-        "object-copy": "^0.1.0"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        }
-      }
-    },
-    "statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
-      "dev": true
-    },
-    "stream-combiner": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.2.2.tgz",
-      "integrity": "sha1-rsjLrBd7Vrb0+kec7YwZEs7lKFg=",
-      "dev": true,
-      "requires": {
-        "duplexer": "~0.1.1",
-        "through": "~2.3.4"
-      }
-    },
-    "stream-consume": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.1.tgz",
-      "integrity": "sha512-tNa3hzgkjEP7XbCkbRXe1jpg+ievoa0O4SCFlMOYEscGSS4JJsckGL8swUyAa/ApGU3Ae4t6Honor4HhL+tRyg==",
-      "dev": true
-    },
-    "string-template": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz",
-      "integrity": "sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=",
-      "dev": true
-    },
-    "string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-      "dev": true
-    },
-    "strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "^2.0.0"
-      }
-    },
-    "strip-bom": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
-      "integrity": "sha1-hbiGLzhEtabV7IRnqTWYFzo295Q=",
-      "dev": true,
-      "requires": {
-        "first-chunk-stream": "^1.0.0",
-        "is-utf8": "^0.2.0"
-      }
-    },
-    "strip-indent": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
-      "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
-      "dev": true,
-      "requires": {
-        "get-stdin": "^4.0.1"
-      }
-    },
-    "supports-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-      "dev": true
-    },
-    "through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
-      "dev": true
-    },
-    "through2": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-      "dev": true,
-      "requires": {
-        "readable-stream": "~2.3.6",
-        "xtend": "~4.0.1"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
-      }
-    },
-    "tildify": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz",
-      "integrity": "sha1-3OwD9V3Km3qj5bBPIYF+tW5jWIo=",
-      "dev": true,
-      "requires": {
-        "os-homedir": "^1.0.0"
-      }
-    },
-    "time-stamp": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
-      "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
-      "dev": true
-    },
-    "tiny-lr": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.1.tgz",
-      "integrity": "sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA==",
-      "dev": true,
-      "requires": {
-        "body": "^5.1.0",
-        "debug": "^3.1.0",
-        "faye-websocket": "~0.10.0",
-        "livereload-js": "^2.3.0",
-        "object-assign": "^4.1.0",
-        "qs": "^6.4.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "object-assign": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-          "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true
-        }
-      }
-    },
-    "to-object-path": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
-      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "to-regex": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
-      "dev": true,
-      "requires": {
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "regex-not": "^1.0.2",
-        "safe-regex": "^1.1.0"
-      }
-    },
-    "to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-      "dev": true,
-      "requires": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      }
-    },
-    "toidentifier": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
-      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
-      "dev": true
-    },
-    "trim-newlines": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
-      "dev": true
-    },
-    "unc-path-regex": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
-      "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
-      "dev": true
-    },
-    "union-value": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
-      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
-      "dev": true,
-      "requires": {
-        "arr-union": "^3.1.0",
-        "get-value": "^2.0.6",
-        "is-extendable": "^0.1.1",
-        "set-value": "^2.0.1"
-      }
-    },
-    "unique-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz",
-      "integrity": "sha1-1ZpKdUJ0R9mqbJHnAmP40mpLEEs=",
-      "dev": true
-    },
-    "unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
-      "dev": true
-    },
-    "unset-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
-      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
-      "dev": true,
-      "requires": {
-        "has-value": "^0.3.1",
-        "isobject": "^3.0.0"
-      },
-      "dependencies": {
-        "has-value": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-          "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
-          "dev": true,
-          "requires": {
-            "get-value": "^2.0.3",
-            "has-values": "^0.1.4",
-            "isobject": "^2.0.0"
-          },
-          "dependencies": {
-            "isobject": {
-              "version": "2.1.0",
-              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-              "dev": true,
-              "requires": {
-                "isarray": "1.0.0"
-              }
-            }
-          }
-        },
-        "has-values": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
-          "dev": true
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        }
-      }
-    },
-    "urix": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
-      "dev": true
-    },
-    "use": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
-      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
-      "dev": true
-    },
-    "user-home": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
-      "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=",
-      "dev": true
-    },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true
-    },
-    "utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
-      "dev": true
-    },
-    "v8flags": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz",
-      "integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=",
-      "dev": true,
-      "requires": {
-        "user-home": "^1.1.1"
-      }
-    },
-    "validate-npm-package-license": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-      "dev": true,
-      "requires": {
-        "spdx-correct": "^3.0.0",
-        "spdx-expression-parse": "^3.0.0"
-      }
-    },
-    "vinyl": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
-      "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=",
-      "dev": true,
-      "requires": {
-        "clone": "^1.0.0",
-        "clone-stats": "^0.0.1",
-        "replace-ext": "0.0.1"
-      }
-    },
-    "vinyl-fs": {
-      "version": "0.3.14",
-      "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.14.tgz",
-      "integrity": "sha1-mmhRzhysHBzqX+hsCTHWIMLPqeY=",
-      "dev": true,
-      "requires": {
-        "defaults": "^1.0.0",
-        "glob-stream": "^3.1.5",
-        "glob-watcher": "^0.0.6",
-        "graceful-fs": "^3.0.0",
-        "mkdirp": "^0.5.0",
-        "strip-bom": "^1.0.0",
-        "through2": "^0.6.1",
-        "vinyl": "^0.4.0"
-      },
-      "dependencies": {
-        "clone": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
-          "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
-          }
-        },
-        "through2": {
-          "version": "0.6.5",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-          "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-          "dev": true,
-          "requires": {
-            "readable-stream": ">=1.0.33-1 <1.1.0-0",
-            "xtend": ">=4.0.0 <4.1.0-0"
-          }
-        },
-        "vinyl": {
-          "version": "0.4.6",
-          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
-          "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
-          "dev": true,
-          "requires": {
-            "clone": "^0.2.0",
-            "clone-stats": "^0.0.1"
-          }
-        }
-      }
-    },
-    "websocket-driver": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.3.tgz",
-      "integrity": "sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==",
-      "dev": true,
-      "requires": {
-        "http-parser-js": ">=0.4.0 <0.4.11",
-        "safe-buffer": ">=5.1.0",
-        "websocket-extensions": ">=0.1.1"
-      }
-    },
-    "websocket-extensions": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz",
-      "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==",
-      "dev": true
-    },
-    "which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
-      "requires": {
-        "isexe": "^2.0.0"
-      }
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
-    },
-    "xtend": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-      "dev": true
-    }
-  }
-}

From fb4c89b1eb0f5d286aa1f5f26f9e9c170401834e Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Wed, 25 Sep 2019 11:58:12 +0200
Subject: [PATCH 712/776] Don't re-add package-lock.json when it gets
 regenerated

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 2478a5e64c..a0ff4d5b27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -133,6 +133,7 @@ preserve.belle
 
 #Ignore Rule for output of generated documentation files from Grunt docserve
 src/Umbraco.Web.UI.Docs/api
+src/Umbraco.Web.UI.Docs/package-lock.json
 src/*.boltdata/
 src/umbraco.sln.ide/*
 src/.vs/

From 1caf7f458720b219488de9e43aafce81ae6838ea Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 25 Sep 2019 13:51:19 +0200
Subject: [PATCH 713/776] Fixes regression issue in nucache causing a panic
 exception

---
 .../PublishedContent/NuCacheChildrenTests.cs  | 193 ++++++++++++++++--
 .../PublishedCache/NuCache/ContentStore.cs    |  25 ++-
 .../NuCache/PublishedSnapshotService.cs       |   7 +
 3 files changed, 195 insertions(+), 30 deletions(-)

diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
index fbcdf7731a..998c9589b0 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
@@ -108,8 +108,8 @@ namespace Umbraco.Tests.PublishedContent
             );
 
             // create a scope provider
-            var scopeProvider = Mock.Of<IScopeProvider>();
-            Mock.Get(scopeProvider)
+            var scopeProvider = new Mock<IScopeProvider>();
+            scopeProvider
                 .Setup(x => x.CreateScope(
                     It.IsAny<IsolationLevel>(),
                     It.IsAny<RepositoryCacheMode>(),
@@ -143,7 +143,7 @@ namespace Umbraco.Tests.PublishedContent
                 _snapshotAccessor,
                 _variationAccesor,
                 Mock.Of<IProfilingLogger>(),
-                scopeProvider,
+                scopeProvider.Object,
                 Mock.Of<IDocumentRepository>(),
                 Mock.Of<IMediaRepository>(),
                 Mock.Of<IMemberRepository>(),
@@ -956,8 +956,10 @@ namespace Umbraco.Tests.PublishedContent
         }
 
         [Test]
-        public void Issue6353()
+        public void Set_All_Fast_Sorted_Ensure_LastChildContentId()
         {
+            //see https://github.com/umbraco/Umbraco-CMS/issues/6353
+
             IEnumerable<ContentNodeKit> GetKits()
             {
                 var paths = new Dictionary<int, string> { { -1, "-1" } };
@@ -968,28 +970,181 @@ namespace Umbraco.Tests.PublishedContent
 
             Init(GetKits());
 
-            var snapshotService = (PublishedSnapshotService) _snapshotService;
-            var contentStoreField = typeof(PublishedSnapshotService).GetField("_contentStore", BindingFlags.Instance | BindingFlags.NonPublic);
-            var contentStore = (ContentStore) contentStoreField.GetValue(snapshotService);
-            var contentNodesField = typeof(ContentStore).GetField("_contentNodes", BindingFlags.Instance | BindingFlags.NonPublic);
-            var contentNodes = (ConcurrentDictionary<int, LinkedNode<ContentNode>>) contentNodesField.GetValue(contentStore);
+            var snapshotService = (PublishedSnapshotService)_snapshotService;
+            var contentStore = snapshotService.GetContentStore();
 
-            var parentNode = contentNodes[1].Value;
-            Assert.AreEqual(-1, parentNode.PreviousSiblingContentId);
-            Assert.AreEqual(-1, parentNode.NextSiblingContentId);
-            Assert.AreEqual(2, parentNode.FirstChildContentId);
-            Assert.AreEqual(2, parentNode.LastChildContentId);
+            var parentNodes = contentStore.Test.GetValues(1);
+            var parentNode = parentNodes[0];
+            AssertLinkedNode(parentNode.contentNode, -1, -1, -1, 2, 2);
 
             _snapshotService.Notify(new[]
             {
                 new ContentCacheRefresher.JsonPayload(2, TreeChangeTypes.Remove)
             }, out _, out _);
 
-            parentNode = contentNodes[1].Value;
-            Assert.AreEqual(-1, parentNode.PreviousSiblingContentId);
-            Assert.AreEqual(-1, parentNode.NextSiblingContentId);
-            Assert.AreEqual(-1, parentNode.FirstChildContentId);
-            Assert.AreEqual(-1, parentNode.LastChildContentId);
+            parentNodes = contentStore.Test.GetValues(1);
+            parentNode = parentNodes[0];
+
+            AssertLinkedNode(parentNode.contentNode, -1, -1, -1, -1, -1);
+        }
+
+        [Test]
+        public void Remove_Node_Ensures_Linked_List()
+        {
+            // NOTE: these tests are not using real scopes, in which case a Scope does not control
+            // how the snapshots generations work. We are forcing new snapshot generations manually.
+
+            IEnumerable<ContentNodeKit> GetKits()
+            {
+                var paths = new Dictionary<int, string> { { -1, "-1" } };
+
+                //root
+                yield return CreateInvariantKit(1, -1, 1, paths);
+
+                //children
+                yield return CreateInvariantKit(2, 1, 1, paths);
+                yield return CreateInvariantKit(3, 1, 2, paths); //middle child
+                yield return CreateInvariantKit(4, 1, 3, paths);
+            }
+
+            Init(GetKits());
+
+            var snapshotService = (PublishedSnapshotService)_snapshotService;
+            var contentStore = snapshotService.GetContentStore();
+
+            Assert.AreEqual(1, contentStore.Test.LiveGen);
+            Assert.IsTrue(contentStore.Test.NextGen);
+
+            var parentNode = contentStore.Test.GetValues(1)[0];
+            Assert.AreEqual(1, parentNode.gen);
+            AssertLinkedNode(parentNode.contentNode, -1, -1, -1, 2, 4);
+
+            var child1 = contentStore.Test.GetValues(2)[0];
+            Assert.AreEqual(1, child1.gen);
+            AssertLinkedNode(child1.contentNode, 1, -1, 3, -1, -1);
+
+            var child2 = contentStore.Test.GetValues(3)[0];
+            Assert.AreEqual(1, child2.gen);
+            AssertLinkedNode(child2.contentNode, 1, 2, 4, -1, -1);
+
+            var child3 = contentStore.Test.GetValues(4)[0];
+            Assert.AreEqual(1, child3.gen);
+            AssertLinkedNode(child3.contentNode, 1, 3, -1, -1, -1);
+
+            //This will set a flag to force creating a new Gen next time the store is locked (i.e. In Notify)
+            contentStore.CreateSnapshot();
+
+            Assert.IsFalse(contentStore.Test.NextGen);
+
+            _snapshotService.Notify(new[]
+            {
+                new ContentCacheRefresher.JsonPayload(3, TreeChangeTypes.Remove) //remove middle child
+            }, out _, out _);
+
+            Assert.AreEqual(2, contentStore.Test.LiveGen);
+            Assert.IsTrue(contentStore.Test.NextGen);
+
+            var parentNodes = contentStore.Test.GetValues(1);
+            Assert.AreEqual(1, parentNodes.Length); // the parent doesn't get changed, not new gen's are added
+            parentNode = parentNodes[0];
+            Assert.AreEqual(1, parentNode.gen); // the parent node's gen has not changed
+            AssertLinkedNode(parentNode.contentNode, -1, -1, -1, 2, 4);
+
+            child1 = contentStore.Test.GetValues(2)[0];
+            Assert.AreEqual(2, child1.gen); // there is now 2x gen's of this item
+            AssertLinkedNode(child1.contentNode, 1, -1, 4, -1, -1);
+
+            child2 = contentStore.Test.GetValues(3)[0];
+            Assert.AreEqual(2, child2.gen); // there is now 2x gen's of this item
+            Assert.IsNull(child2.contentNode);  // because it doesn't exist anymore
+
+            child3 = contentStore.Test.GetValues(4)[0];
+            Assert.AreEqual(2, child3.gen); // there is now 2x gen's of this item
+            AssertLinkedNode(child3.contentNode, 1, 2, -1, -1, -1);
+        }
+
+        [Test]
+        public void Refresh_Branch_Ensures_Linked_List()
+        {
+            // NOTE: these tests are not using real scopes, in which case a Scope does not control
+            // how the snapshots generations work. We are forcing new snapshot generations manually.
+
+            IEnumerable<ContentNodeKit> GetKits()
+            {
+                var paths = new Dictionary<int, string> { { -1, "-1" } };
+
+                //root
+                yield return CreateInvariantKit(1, -1, 1, paths);
+
+                //children
+                yield return CreateInvariantKit(2, 1, 1, paths);
+                yield return CreateInvariantKit(3, 1, 2, paths); //middle child
+                yield return CreateInvariantKit(4, 1, 3, paths);
+            }
+
+            Init(GetKits());
+
+            var snapshotService = (PublishedSnapshotService)_snapshotService;
+            var contentStore = snapshotService.GetContentStore();
+
+            Assert.AreEqual(1, contentStore.Test.LiveGen);
+            Assert.IsTrue(contentStore.Test.NextGen);
+
+            var parentNode = contentStore.Test.GetValues(1)[0];
+            Assert.AreEqual(1, parentNode.gen);
+            AssertLinkedNode(parentNode.contentNode, -1, -1, -1, 2, 4);
+
+            var child1 = contentStore.Test.GetValues(2)[0];
+            Assert.AreEqual(1, child1.gen);
+            AssertLinkedNode(child1.contentNode, 1, -1, 3, -1, -1);
+
+            var child2 = contentStore.Test.GetValues(3)[0];
+            Assert.AreEqual(1, child2.gen);
+            AssertLinkedNode(child2.contentNode, 1, 2, 4, -1, -1);
+
+            var child3 = contentStore.Test.GetValues(4)[0];
+            Assert.AreEqual(1, child3.gen);
+            AssertLinkedNode(child3.contentNode, 1, 3, -1, -1, -1);
+
+            //This will set a flag to force creating a new Gen next time the store is locked (i.e. In Notify)
+            contentStore.CreateSnapshot();
+
+            Assert.IsFalse(contentStore.Test.NextGen);
+
+            _snapshotService.Notify(new[]
+            {
+                new ContentCacheRefresher.JsonPayload(3, TreeChangeTypes.RefreshBranch) //remove middle child
+            }, out _, out _);
+
+            Assert.AreEqual(2, contentStore.Test.LiveGen);
+            Assert.IsTrue(contentStore.Test.NextGen);
+
+            var parentNodes = contentStore.Test.GetValues(1);
+            Assert.AreEqual(1, parentNodes.Length); // the parent doesn't get changed, not new gen's are added
+            parentNode = parentNodes[0];
+            Assert.AreEqual(1, parentNode.gen); // the parent node's gen has not changed
+            AssertLinkedNode(parentNode.contentNode, -1, -1, -1, 2, 4);
+
+            child1 = contentStore.Test.GetValues(2)[0];
+            Assert.AreEqual(2, child1.gen); // there is now 2x gen's of this item
+            AssertLinkedNode(child1.contentNode, 1, -1, 3, -1, -1);
+
+            child2 = contentStore.Test.GetValues(3)[0];
+            Assert.AreEqual(2, child2.gen); // there is now 2x gen's of this item
+            AssertLinkedNode(child2.contentNode, 1, 2, 4, -1, -1);
+
+            child3 = contentStore.Test.GetValues(4)[0];
+            Assert.AreEqual(2, child3.gen); // there is now 2x gen's of this item
+            AssertLinkedNode(child3.contentNode, 1, 3, -1, -1, -1);
+        }
+
+        private void AssertLinkedNode(ContentNode node, int parent, int prevSibling, int nextSibling, int firstChild, int lastChild)
+        {
+            Assert.AreEqual(parent, node.ParentContentId);
+            Assert.AreEqual(prevSibling, node.PreviousSiblingContentId);
+            Assert.AreEqual(nextSibling, node.NextSiblingContentId);
+            Assert.AreEqual(firstChild, node.FirstChildContentId);
+            Assert.AreEqual(lastChild, node.LastChildContentId);
         }
 
         private void AssertDocuments(IPublishedContent[] documents, params string[] names)
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
index c7fc389cb1..f0d695f090 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
@@ -953,8 +953,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
             var parent = parentLink.Value;
 
-            var currentGen = parentLink.Gen;
-
             // if parent has no children, clone parent + add as first child
             if (parent.FirstChildContentId < 0)
             {
@@ -965,7 +963,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             }
 
             // get parent's first child
-            var childLink = GetRequiredLinkedNode(parent.FirstChildContentId, "first child", currentGen);
+            var childLink = GetRequiredLinkedNode(parent.FirstChildContentId, "first child", null);
             var child = childLink.Value;
 
             // if first, clone parent + insert as first child
@@ -985,7 +983,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             }
 
             // get parent's last child
-            var lastChildLink = GetRequiredLinkedNode(parent.LastChildContentId, "last child", currentGen);
+            var lastChildLink = GetRequiredLinkedNode(parent.LastChildContentId, "last child", null);
             var lastChild = lastChildLink.Value;
 
             // if last, clone parent + append as last child
@@ -1010,7 +1008,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             while (child.NextSiblingContentId > 0)
             {
                 // get next child
-                var nextChildLink = GetRequiredLinkedNode(child.NextSiblingContentId, "next child", currentGen);
+                var nextChildLink = GetRequiredLinkedNode(child.NextSiblingContentId, "next child", null);
                 var nextChild = nextChildLink.Value;
 
                 // if here, clone previous + append/insert
@@ -1034,7 +1032,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             }
 
             // should never get here
-            throw new Exception("panic: no more children.");
+            throw new PanicException("No more children.");
         }
 
         // replaces the root node
@@ -1370,7 +1368,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         #endregion
 
-        #region Unit testing
+        #region Internals/Unit testing
 
         private TestHelper _unitTesting;
 
@@ -1393,17 +1391,22 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 set => _store._collectAuto = value;
             }
 
-            public Tuple<long, ContentNode>[] GetValues(int id)
+            /// <summary>
+            /// Return a list of Gen/ContentNode values
+            /// </summary>
+            /// <param name="id"></param>
+            /// <returns></returns>
+            public (long gen, ContentNode contentNode)[] GetValues(int id)
             {
                 _store._contentNodes.TryGetValue(id, out LinkedNode<ContentNode> link); // else null
 
                 if (link == null)
-                    return new Tuple<long, ContentNode>[0];
+                    return Array.Empty<(long, ContentNode)>();
 
-                var tuples = new List<Tuple<long, ContentNode>>();
+                var tuples = new List<(long, ContentNode)>();
                 do
                 {
-                    tuples.Add(Tuple.Create(link.Gen, link.Value));
+                    tuples.Add((link.Gen, link.Value));
                     link = link.Next;
                 } while (link != null);
                 return tuples.ToArray();
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index 4239eda9f5..9522e76622 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -1688,5 +1688,12 @@ AND cmsContentNu.nodeId IS NULL
         }
 
         #endregion
+
+        #region Internals/Testing
+
+        internal ContentStore GetContentStore() => _contentStore;
+        internal ContentStore GetMediaStore() => _mediaStore;
+
+        #endregion
     }
 }

From ebf55f003146fd54d70251852a712e25ac966dab Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 25 Sep 2019 14:18:39 +0200
Subject: [PATCH 714/776] merge issue from previous branch

---
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 11a605eb47..4141b60a3d 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -348,10 +348,6 @@
           <DevelopmentServerPort>8200</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
           <IISUrl>http://localhost:8200/</IISUrl>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <DevelopmentServerPort>8150</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:8150</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

From d963c70580d15bc0bfc1b6cf2a23a297121b8a51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Wed, 25 Sep 2019 15:38:05 +0200
Subject: [PATCH 715/776] using a timeout to ensure that placeholder element
 has been appended to document

---
 .../views/propertyeditors/rte/rte.controller.js    | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
index f78eedab33..3bd26ab095 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
@@ -77,13 +77,17 @@ angular.module("umbraco")
                         model: $scope.model,
                         currentForm: angularHelper.getCurrentForm($scope)
                     });
-    
+                    
                 };
-
+                
                 angular.extend(baseLineConfigObj, standardConfig);
-                /** Loads in the editor */
-                tinymce.init(baseLineConfigObj);
-
+                
+                //we need to add a timeout here, to wait for a redraw so TinyMCE can find its placeholder element.
+                $timeout(function () {                        
+                    tinymce.init(baseLineConfigObj);
+                }, 150, false);
+                
+                
                 //listen for formSubmitting event (the result is callback used to remove the event subscription)
                 var unsubscribe = $scope.$on("formSubmitting", function () {
                     if (tinyMceEditor !== undefined && tinyMceEditor != null && !$scope.isLoading) {

From f6f8e3cbd565178cfbd30f5f981e8074ad033e36 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 25 Sep 2019 15:54:07 +0200
Subject: [PATCH 716/776] Merge branch 'temp-5362' of
 https://github.com/dave0504/Umbraco-CMS into v8/dev

# Conflicts:
#	src/Umbraco.Core/Services/Implement/ContentService.cs
---
 src/Umbraco.Core/Services/Implement/ContentService.cs | 7 +++++--
 src/Umbraco.Tests/Integration/ContentEventsTests.cs   | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs
index faf4744c76..c3695b0d67 100644
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -1286,6 +1286,9 @@ namespace Umbraco.Core.Services.Implement
                 {
                     if (isNew == false && previouslyPublished == false)
                         changeType = TreeChangeTypes.RefreshBranch; // whole branch
+                    else if (isNew == false && previouslyPublished)
+                        changeType = TreeChangeTypes.RefreshNode; // single node
+                    
 
                     // invalidate the node/branch
                     if (!branchOne) // for branches, handled by SaveAndPublishBranch
@@ -2593,7 +2596,7 @@ namespace Umbraco.Core.Services.Implement
             var variesByCulture = content.ContentType.VariesByCulture();
 
             var impactsToPublish = culturesPublishing == null
-                ? new[] {CultureImpact.Invariant} //if it's null it's invariant
+                ? new[] { CultureImpact.Invariant } //if it's null it's invariant
                 : culturesPublishing.Select(x => CultureImpact.Explicit(x, allLangs.Any(lang => lang.IsoCode.InvariantEquals(x) && lang.IsMandatory))).ToArray();
 
             // publish the culture(s)
@@ -2991,7 +2994,7 @@ namespace Umbraco.Core.Services.Implement
             {
                 foreach (var property in blueprint.Properties)
                 {
-					var propertyCulture = property.PropertyType.VariesByCulture() ? culture : null;
+                    var propertyCulture = property.PropertyType.VariesByCulture() ? culture : null;
                     content.SetValue(property.Alias, property.GetValue(propertyCulture), propertyCulture);
                 }
 
diff --git a/src/Umbraco.Tests/Integration/ContentEventsTests.cs b/src/Umbraco.Tests/Integration/ContentEventsTests.cs
index c3708dd8f3..fa9e7b676b 100644
--- a/src/Umbraco.Tests/Integration/ContentEventsTests.cs
+++ b/src/Umbraco.Tests/Integration/ContentEventsTests.cs
@@ -639,7 +639,7 @@ namespace Umbraco.Tests.Integration
             var m = 0;
             Assert.AreEqual($"{m:000}: ContentRepository/Refresh/{content.Id}.p+p", _events[i++].ToString());
             m++;
-            Assert.AreEqual($"{m:000}: ContentCacheRefresher/RefreshBranch/{content.Id}", _events[i++].ToString());
+            Assert.AreEqual($"{m:000}: ContentCacheRefresher/RefreshNode/{content.Id}", _events[i++].ToString());
         }
 
         [Test]

From 351323ea20d48e6ee51a3579da6b6188d02bdcc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Wed, 25 Sep 2019 15:55:50 +0200
Subject: [PATCH 717/776] Fixed toolbar to go on multiple lines in narrow
 spaces

---
 src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
index ba0b32bb0d..852f4411d5 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
@@ -654,6 +654,11 @@
     overflow-y: hidden!important;
 }
 
+// had to overwrite defaults from TinyMCE, needed for buttons panel to float to new line in narrow space.
+.umb-grid .mce-container > div {
+    white-space: normal;
+}
+
 
 // MEDIA EDITOR
 // -------------------------

From b2ee35b3b06ef62e286b069e903eb47fa29bc0b7 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Wed, 25 Sep 2019 20:37:57 +0200
Subject: [PATCH 718/776] Potentially fixes the last security warnings on
 GitHub

---
 src/Umbraco.Web.UI.Client/package-lock.json | 361 +++++---------------
 src/Umbraco.Web.UI.Client/package.json      |   4 +-
 2 files changed, 79 insertions(+), 286 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json
index e8682e746d..9c0011d2f5 100644
--- a/src/Umbraco.Web.UI.Client/package-lock.json
+++ b/src/Umbraco.Web.UI.Client/package-lock.json
@@ -1185,7 +1185,6 @@
       "resolved": "https://registry.npmjs.org/archive-type/-/archive-type-3.2.0.tgz",
       "integrity": "sha1-nNnABpV+vpX62tW9YJiUKoE3N/Y=",
       "dev": true,
-      "optional": true,
       "requires": {
         "file-type": "^3.1.0"
       },
@@ -1194,8 +1193,7 @@
           "version": "3.9.0",
           "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
           "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -1254,8 +1252,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
       "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "array-slice": {
       "version": "1.1.0",
@@ -1633,7 +1630,6 @@
       "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
       "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==",
       "dev": true,
-      "optional": true,
       "requires": {
         "readable-stream": "^2.3.5",
         "safe-buffer": "^5.1.1"
@@ -1643,15 +1639,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -1667,7 +1661,6 @@
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -1817,8 +1810,7 @@
       "version": "0.2.13",
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
       "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "buffer-fill": {
       "version": "1.0.0",
@@ -1837,7 +1829,6 @@
       "resolved": "https://registry.npmjs.org/buffer-to-vinyl/-/buffer-to-vinyl-1.1.0.tgz",
       "integrity": "sha1-APFfruOreh3aLN5tkSG//dB7ImI=",
       "dev": true,
-      "optional": true,
       "requires": {
         "file-type": "^3.1.0",
         "readable-stream": "^2.0.2",
@@ -1849,22 +1840,19 @@
           "version": "3.9.0",
           "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
           "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "isarray": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -1880,7 +1868,6 @@
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -1889,15 +1876,13 @@
           "version": "2.0.3",
           "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
           "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "vinyl": {
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -1979,7 +1964,6 @@
       "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
       "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
       "dev": true,
-      "optional": true,
       "requires": {
         "camelcase": "^2.0.0",
         "map-obj": "^1.0.0"
@@ -1989,8 +1973,7 @@
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
           "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -2016,8 +1999,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz",
       "integrity": "sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "caseless": {
       "version": "0.12.0",
@@ -2030,7 +2012,6 @@
       "resolved": "https://registry.npmjs.org/caw/-/caw-1.2.0.tgz",
       "integrity": "sha1-/7Im/n78VHKI3GLuPpcHPCEtEDQ=",
       "dev": true,
-      "optional": true,
       "requires": {
         "get-proxy": "^1.0.1",
         "is-obj": "^1.0.0",
@@ -2310,8 +2291,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/co/-/co-3.1.0.tgz",
       "integrity": "sha1-TqVOpaCJOBUxheFSEMaNkJK8G3g=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "coa": {
       "version": "2.0.2",
@@ -2465,7 +2445,6 @@
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
       "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
       "dev": true,
-      "optional": true,
       "requires": {
         "graceful-readlink": ">= 1.0.0"
       }
@@ -2666,7 +2645,6 @@
       "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
       "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
       "dev": true,
-      "optional": true,
       "requires": {
         "capture-stack-trace": "^1.0.0"
       }
@@ -2855,7 +2833,6 @@
       "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
       "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
       "dev": true,
-      "optional": true,
       "requires": {
         "array-find-index": "^1.0.1"
       }
@@ -2923,7 +2900,6 @@
       "resolved": "https://registry.npmjs.org/decompress/-/decompress-3.0.0.tgz",
       "integrity": "sha1-rx3VDQbjv8QyRh033hGzjA2ZG+0=",
       "dev": true,
-      "optional": true,
       "requires": {
         "buffer-to-vinyl": "^1.0.0",
         "concat-stream": "^1.4.6",
@@ -2941,7 +2917,6 @@
           "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
           "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
           "dev": true,
-          "optional": true,
           "requires": {
             "arr-flatten": "^1.0.1"
           }
@@ -2950,15 +2925,13 @@
           "version": "0.2.1",
           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
           "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "braces": {
           "version": "1.8.5",
           "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
           "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
           "dev": true,
-          "optional": true,
           "requires": {
             "expand-range": "^1.8.1",
             "preserve": "^0.2.0",
@@ -2970,7 +2943,6 @@
           "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
           "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-posix-bracket": "^0.1.0"
           }
@@ -2980,7 +2952,6 @@
           "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
           "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -2990,7 +2961,6 @@
           "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
           "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
           "dev": true,
-          "optional": true,
           "requires": {
             "inflight": "^1.0.4",
             "inherits": "2",
@@ -3004,7 +2974,6 @@
           "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz",
           "integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=",
           "dev": true,
-          "optional": true,
           "requires": {
             "extend": "^3.0.0",
             "glob": "^5.0.3",
@@ -3020,15 +2989,13 @@
               "version": "0.0.1",
               "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
               "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "readable-stream": {
               "version": "1.0.34",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
               "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
               "dev": true,
-              "optional": true,
               "requires": {
                 "core-util-is": "~1.0.0",
                 "inherits": "~2.0.1",
@@ -3040,15 +3007,13 @@
               "version": "0.10.31",
               "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
               "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "through2": {
               "version": "0.6.5",
               "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
               "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
               "dev": true,
-              "optional": true,
               "requires": {
                 "readable-stream": ">=1.0.33-1 <1.1.0-0",
                 "xtend": ">=4.0.0 <4.1.0-0"
@@ -3060,22 +3025,19 @@
           "version": "4.2.2",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
           "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "is-extglob": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
           "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "is-glob": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
           "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -3084,15 +3046,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -3102,7 +3062,6 @@
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
           "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
           "dev": true,
-          "optional": true,
           "requires": {
             "arr-diff": "^2.0.0",
             "array-unique": "^0.2.1",
@@ -3123,15 +3082,13 @@
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ordered-read-streams": {
           "version": "0.3.0",
           "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz",
           "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-stream": "^1.0.1",
             "readable-stream": "^2.0.1"
@@ -3142,7 +3099,6 @@
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -3158,7 +3114,6 @@
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -3168,7 +3123,6 @@
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
           "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-utf8": "^0.2.0"
           }
@@ -3178,7 +3132,6 @@
           "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
           "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
           "dev": true,
-          "optional": true,
           "requires": {
             "json-stable-stringify-without-jsonify": "^1.0.1",
             "through2-filter": "^3.0.0"
@@ -3189,7 +3142,6 @@
               "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
               "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
               "dev": true,
-              "optional": true,
               "requires": {
                 "through2": "~2.0.0",
                 "xtend": "~4.0.0"
@@ -3202,7 +3154,6 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -3214,7 +3165,6 @@
           "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz",
           "integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=",
           "dev": true,
-          "optional": true,
           "requires": {
             "duplexify": "^3.2.0",
             "glob-stream": "^5.3.2",
@@ -3242,7 +3192,6 @@
       "resolved": "https://registry.npmjs.org/decompress-tar/-/decompress-tar-3.1.0.tgz",
       "integrity": "sha1-IXx4n5uURQ76rcXF5TeXj8MzxGY=",
       "dev": true,
-      "optional": true,
       "requires": {
         "is-tar": "^1.0.0",
         "object-assign": "^2.0.0",
@@ -3256,22 +3205,19 @@
           "version": "0.2.0",
           "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
           "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
           "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "1.0.34",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.1",
@@ -3284,7 +3230,6 @@
           "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
           "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
           "dev": true,
-          "optional": true,
           "requires": {
             "readable-stream": ">=1.0.33-1 <1.1.0-0",
             "xtend": ">=4.0.0 <4.1.0-0"
@@ -3295,7 +3240,6 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^0.2.0",
             "clone-stats": "^0.0.1"
@@ -3308,7 +3252,6 @@
       "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-3.1.0.tgz",
       "integrity": "sha1-iyOTVoE1X58YnYclag+L3ZbZZm0=",
       "dev": true,
-      "optional": true,
       "requires": {
         "is-bzip2": "^1.0.0",
         "object-assign": "^2.0.0",
@@ -3323,22 +3266,19 @@
           "version": "0.2.0",
           "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
           "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
           "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "1.0.34",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.1",
@@ -3351,7 +3291,6 @@
           "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
           "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
           "dev": true,
-          "optional": true,
           "requires": {
             "readable-stream": ">=1.0.33-1 <1.1.0-0",
             "xtend": ">=4.0.0 <4.1.0-0"
@@ -3362,7 +3301,6 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^0.2.0",
             "clone-stats": "^0.0.1"
@@ -3375,7 +3313,6 @@
       "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-3.1.0.tgz",
       "integrity": "sha1-ssE9+YFmJomRtxXWRH9kLpaW9aA=",
       "dev": true,
-      "optional": true,
       "requires": {
         "is-gzip": "^1.0.0",
         "object-assign": "^2.0.0",
@@ -3389,22 +3326,19 @@
           "version": "0.2.0",
           "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
           "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
           "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "1.0.34",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.1",
@@ -3417,7 +3351,6 @@
           "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
           "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
           "dev": true,
-          "optional": true,
           "requires": {
             "readable-stream": ">=1.0.33-1 <1.1.0-0",
             "xtend": ">=4.0.0 <4.1.0-0"
@@ -3428,7 +3361,6 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^0.2.0",
             "clone-stats": "^0.0.1"
@@ -3441,7 +3373,6 @@
       "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-3.4.0.tgz",
       "integrity": "sha1-YUdbQVIGa74/7hL51inRX+ZHjus=",
       "dev": true,
-      "optional": true,
       "requires": {
         "is-zip": "^1.0.0",
         "read-all-stream": "^3.0.0",
@@ -3457,7 +3388,6 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -3470,8 +3400,7 @@
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
       "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "deep-is": {
       "version": "0.1.3",
@@ -3684,7 +3613,6 @@
       "resolved": "https://registry.npmjs.org/download/-/download-4.4.3.tgz",
       "integrity": "sha1-qlX9rTktldS2jowr4D4MKqIbqaw=",
       "dev": true,
-      "optional": true,
       "requires": {
         "caw": "^1.0.1",
         "concat-stream": "^1.4.7",
@@ -3708,7 +3636,6 @@
           "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
           "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
           "dev": true,
-          "optional": true,
           "requires": {
             "arr-flatten": "^1.0.1"
           }
@@ -3717,15 +3644,13 @@
           "version": "0.2.1",
           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
           "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "braces": {
           "version": "1.8.5",
           "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
           "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
           "dev": true,
-          "optional": true,
           "requires": {
             "expand-range": "^1.8.1",
             "preserve": "^0.2.0",
@@ -3737,7 +3662,6 @@
           "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
           "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-posix-bracket": "^0.1.0"
           }
@@ -3747,7 +3671,6 @@
           "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
           "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -3757,7 +3680,6 @@
           "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
           "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
           "dev": true,
-          "optional": true,
           "requires": {
             "inflight": "^1.0.4",
             "inherits": "2",
@@ -3771,7 +3693,6 @@
           "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz",
           "integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=",
           "dev": true,
-          "optional": true,
           "requires": {
             "extend": "^3.0.0",
             "glob": "^5.0.3",
@@ -3787,15 +3708,13 @@
               "version": "0.0.1",
               "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
               "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "readable-stream": {
               "version": "1.0.34",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
               "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
               "dev": true,
-              "optional": true,
               "requires": {
                 "core-util-is": "~1.0.0",
                 "inherits": "~2.0.1",
@@ -3807,15 +3726,13 @@
               "version": "0.10.31",
               "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
               "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "through2": {
               "version": "0.6.5",
               "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
               "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
               "dev": true,
-              "optional": true,
               "requires": {
                 "readable-stream": ">=1.0.33-1 <1.1.0-0",
                 "xtend": ">=4.0.0 <4.1.0-0"
@@ -3827,22 +3744,19 @@
           "version": "4.2.2",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
           "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "is-extglob": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
           "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "is-glob": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
           "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -3851,15 +3765,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -3869,7 +3781,6 @@
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
           "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
           "dev": true,
-          "optional": true,
           "requires": {
             "arr-diff": "^2.0.0",
             "array-unique": "^0.2.1",
@@ -3890,15 +3801,13 @@
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ordered-read-streams": {
           "version": "0.3.0",
           "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz",
           "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-stream": "^1.0.1",
             "readable-stream": "^2.0.1"
@@ -3909,7 +3818,6 @@
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -3925,7 +3833,6 @@
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -3935,7 +3842,6 @@
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
           "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-utf8": "^0.2.0"
           }
@@ -3945,7 +3851,6 @@
           "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
           "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
           "dev": true,
-          "optional": true,
           "requires": {
             "json-stable-stringify-without-jsonify": "^1.0.1",
             "through2-filter": "^3.0.0"
@@ -3956,7 +3861,6 @@
               "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
               "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
               "dev": true,
-              "optional": true,
               "requires": {
                 "through2": "~2.0.0",
                 "xtend": "~4.0.0"
@@ -3969,7 +3873,6 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -3981,7 +3884,6 @@
           "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz",
           "integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=",
           "dev": true,
-          "optional": true,
           "requires": {
             "duplexify": "^3.2.0",
             "glob-stream": "^5.3.2",
@@ -4018,7 +3920,6 @@
       "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
       "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
       "dev": true,
-      "optional": true,
       "requires": {
         "end-of-stream": "^1.0.0",
         "inherits": "^2.0.1",
@@ -4031,7 +3932,6 @@
           "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.3.tgz",
           "integrity": "sha512-cbNhPFS6MlYlWTGncSiDYbdqKhwWFy7kNeb1YSOG6K65i/wPTkLVCJQj0hXA4j0m5Da+hBWnqopEnu1FFelisQ==",
           "dev": true,
-          "optional": true,
           "requires": {
             "once": "^1.4.0"
           }
@@ -4040,15 +3940,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "once": {
           "version": "1.4.0",
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -4058,7 +3956,6 @@
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -4074,7 +3971,6 @@
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -4086,7 +3982,6 @@
       "resolved": "https://registry.npmjs.org/each-async/-/each-async-1.1.1.tgz",
       "integrity": "sha1-3uUim98KtrogEqOV4bhpq/iBNHM=",
       "dev": true,
-      "optional": true,
       "requires": {
         "onetime": "^1.0.0",
         "set-immediate-shim": "^1.0.0"
@@ -4096,8 +3991,7 @@
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
           "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -5074,7 +4968,6 @@
       "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
       "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
       "dev": true,
-      "optional": true,
       "requires": {
         "pend": "~1.2.0"
       }
@@ -5113,15 +5006,13 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-1.0.0.tgz",
       "integrity": "sha1-5hz4BfDeHJhFZ9A4bcXfUO5a9+Q=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "filenamify": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-1.2.1.tgz",
       "integrity": "sha1-qfL/0RxQO+0wABUCknI3jx8TZaU=",
       "dev": true,
-      "optional": true,
       "requires": {
         "filename-reserved-regex": "^1.0.0",
         "strip-outer": "^1.0.0",
@@ -5347,8 +5238,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
       "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "fs-extra": {
       "version": "1.0.0",
@@ -5972,7 +5862,6 @@
       "resolved": "https://registry.npmjs.org/get-proxy/-/get-proxy-1.1.0.tgz",
       "integrity": "sha1-iUhUSRvFkbDxR9euVw9cZ4tyVus=",
       "dev": true,
-      "optional": true,
       "requires": {
         "rc": "^1.1.2"
       }
@@ -5981,8 +5870,7 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
       "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "get-stream": {
       "version": "3.0.0",
@@ -6280,7 +6168,6 @@
       "resolved": "https://registry.npmjs.org/got/-/got-5.7.1.tgz",
       "integrity": "sha1-X4FjWmHkplifGAVp6k44FoClHzU=",
       "dev": true,
-      "optional": true,
       "requires": {
         "create-error-class": "^3.0.1",
         "duplexer2": "^0.1.4",
@@ -6304,7 +6191,6 @@
           "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
           "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
           "dev": true,
-          "optional": true,
           "requires": {
             "readable-stream": "^2.0.2"
           }
@@ -6313,22 +6199,19 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "parse-json": {
           "version": "2.2.0",
           "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
           "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
           "dev": true,
-          "optional": true,
           "requires": {
             "error-ex": "^1.2.0"
           }
@@ -6338,7 +6221,6 @@
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -6354,7 +6236,6 @@
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -6374,8 +6255,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
       "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "growly": {
       "version": "1.3.0",
@@ -6652,7 +6532,6 @@
       "resolved": "https://registry.npmjs.org/gulp-decompress/-/gulp-decompress-1.2.0.tgz",
       "integrity": "sha1-jutlpeAV+O2FMsr+KEVJYGJvDcc=",
       "dev": true,
-      "optional": true,
       "requires": {
         "archive-type": "^3.0.0",
         "decompress": "^3.0.0",
@@ -6664,15 +6543,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -6688,7 +6565,6 @@
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -6975,7 +6851,6 @@
       "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz",
       "integrity": "sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=",
       "dev": true,
-      "optional": true,
       "requires": {
         "convert-source-map": "^1.1.1",
         "graceful-fs": "^4.1.2",
@@ -6988,15 +6863,13 @@
           "version": "4.2.2",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
           "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "strip-bom": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
           "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-utf8": "^0.2.0"
           }
@@ -7006,7 +6879,6 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -7702,7 +7574,6 @@
       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
       "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
       "dev": true,
-      "optional": true,
       "requires": {
         "repeating": "^2.0.0"
       }
@@ -7927,8 +7798,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-bzip2/-/is-bzip2-1.0.0.tgz",
       "integrity": "sha1-XuWOqlounIDiFAe+3yOuWsCRs/w=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-callable": {
       "version": "1.1.4",
@@ -8033,7 +7903,6 @@
       "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
       "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
       "dev": true,
-      "optional": true,
       "requires": {
         "number-is-nan": "^1.0.0"
       }
@@ -8067,8 +7936,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-gzip/-/is-gzip-1.0.0.tgz",
       "integrity": "sha1-bKiwe5nHeZgCWQDlVc7Y7YCHmoM=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-jpg": {
       "version": "1.0.1",
@@ -8081,8 +7949,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-2.1.1.tgz",
       "integrity": "sha1-fUxXKDd+84bD4ZSpkRv1fG3DNec=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-number": {
       "version": "3.0.0",
@@ -8148,8 +8015,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
       "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-regex": {
       "version": "1.0.4",
@@ -8179,8 +8045,7 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz",
       "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-stream": {
       "version": "1.1.0",
@@ -8210,8 +8075,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-tar/-/is-tar-1.0.0.tgz",
       "integrity": "sha1-L2suF5LB9bs2UZrKqdZcDSb+hT0=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-typedarray": {
       "version": "1.0.0",
@@ -8232,8 +8096,7 @@
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz",
       "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-utf8": {
       "version": "0.2.1",
@@ -8245,8 +8108,7 @@
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz",
       "integrity": "sha1-1LVcafUYhvm2XHDWwmItN+KfSP4=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-windows": {
       "version": "1.0.2",
@@ -8264,8 +8126,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-zip/-/is-zip-1.0.0.tgz",
       "integrity": "sha1-R7Co/004p2QxzP2ZqOFaTIa6IyU=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "isarray": {
       "version": "0.0.1",
@@ -8605,7 +8466,6 @@
       "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
       "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
       "dev": true,
-      "optional": true,
       "requires": {
         "readable-stream": "^2.0.5"
       },
@@ -8614,15 +8474,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -8638,7 +8496,6 @@
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -8861,8 +8718,7 @@
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
       "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "lodash.keys": {
       "version": "3.1.2",
@@ -9013,7 +8869,6 @@
       "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
       "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
       "dev": true,
-      "optional": true,
       "requires": {
         "currently-unhandled": "^0.4.1",
         "signal-exit": "^3.0.0"
@@ -9023,8 +8878,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
       "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "lpad-align": {
       "version": "1.1.2",
@@ -9090,8 +8944,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
       "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "map-visit": {
       "version": "1.0.0",
@@ -9159,7 +9012,6 @@
       "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
       "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
       "dev": true,
-      "optional": true,
       "requires": {
         "camelcase-keys": "^2.0.0",
         "decamelize": "^1.1.2",
@@ -9177,8 +9029,7 @@
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -9459,8 +9310,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz",
       "integrity": "sha1-WuVUHQJGRdMqWPzdyc7s6nrjrC8=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "node.extend": {
       "version": "2.0.2",
@@ -12872,8 +12722,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
       "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "p-pipe": {
       "version": "1.2.0",
@@ -13547,8 +13396,7 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
       "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "preserve": {
       "version": "0.2.0",
@@ -13682,7 +13530,6 @@
       "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
       "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
       "dev": true,
-      "optional": true,
       "requires": {
         "deep-extend": "^0.6.0",
         "ini": "~1.3.0",
@@ -13695,7 +13542,6 @@
       "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz",
       "integrity": "sha1-NcPhd/IHjveJ7kv6+kNzB06u9Po=",
       "dev": true,
-      "optional": true,
       "requires": {
         "pinkie-promise": "^2.0.0",
         "readable-stream": "^2.0.0"
@@ -13705,15 +13551,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -13729,7 +13573,6 @@
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -13832,7 +13675,6 @@
       "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
       "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
       "dev": true,
-      "optional": true,
       "requires": {
         "indent-string": "^2.1.0",
         "strip-indent": "^1.0.1"
@@ -13947,7 +13789,6 @@
       "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
       "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
       "dev": true,
-      "optional": true,
       "requires": {
         "is-finite": "^1.0.0"
       }
@@ -14281,7 +14122,6 @@
       "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz",
       "integrity": "sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=",
       "dev": true,
-      "optional": true,
       "requires": {
         "commander": "~2.8.1"
       }
@@ -14339,8 +14179,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
       "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "set-value": {
       "version": "2.0.1",
@@ -14856,8 +14695,7 @@
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-0.2.2.tgz",
       "integrity": "sha1-5sgLYjEj19gM8TLOU480YokHJQI=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "static-extend": {
       "version": "0.1.2",
@@ -14891,7 +14729,6 @@
       "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz",
       "integrity": "sha1-+02KFCDqNidk4hrUeAOXvry0HL4=",
       "dev": true,
-      "optional": true,
       "requires": {
         "duplexer2": "~0.1.0",
         "readable-stream": "^2.0.2"
@@ -14902,7 +14739,6 @@
           "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
           "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
           "dev": true,
-          "optional": true,
           "requires": {
             "readable-stream": "^2.0.2"
           }
@@ -14911,15 +14747,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -14935,7 +14769,6 @@
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -14952,8 +14785,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
       "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "streamroller": {
       "version": "0.7.0",
@@ -15069,7 +14901,6 @@
       "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz",
       "integrity": "sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=",
       "dev": true,
-      "optional": true,
       "requires": {
         "first-chunk-stream": "^1.0.0",
         "strip-bom": "^2.0.0"
@@ -15080,7 +14911,6 @@
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
           "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-utf8": "^0.2.0"
           }
@@ -15092,7 +14922,6 @@
       "resolved": "https://registry.npmjs.org/strip-dirs/-/strip-dirs-1.1.1.tgz",
       "integrity": "sha1-lgu9EoeETzl1pFWKoQOoJV4kVqA=",
       "dev": true,
-      "optional": true,
       "requires": {
         "chalk": "^1.0.0",
         "get-stdin": "^4.0.1",
@@ -15106,15 +14935,13 @@
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "chalk": {
           "version": "1.1.3",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-styles": "^2.2.1",
             "escape-string-regexp": "^1.0.2",
@@ -15128,7 +14955,6 @@
           "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz",
           "integrity": "sha1-hHSREZ/MtftDYhfMc39/qtUPYD8=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-relative": "^0.1.0"
           }
@@ -15137,15 +14963,13 @@
           "version": "0.1.3",
           "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz",
           "integrity": "sha1-kF/uiuhvRbPsYUvDwVyGnfCHboI=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "supports-color": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
           "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -15161,7 +14985,6 @@
       "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
       "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
       "dev": true,
-      "optional": true,
       "requires": {
         "get-stdin": "^4.0.1"
       }
@@ -15177,7 +15000,6 @@
       "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz",
       "integrity": "sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==",
       "dev": true,
-      "optional": true,
       "requires": {
         "escape-string-regexp": "^1.0.2"
       }
@@ -15211,7 +15033,6 @@
       "resolved": "https://registry.npmjs.org/sum-up/-/sum-up-1.0.3.tgz",
       "integrity": "sha1-HGYfZnBX9jvLeHWqFDi8FiUlFW4=",
       "dev": true,
-      "optional": true,
       "requires": {
         "chalk": "^1.0.0"
       },
@@ -15220,15 +15041,13 @@
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "chalk": {
           "version": "1.1.3",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-styles": "^2.2.1",
             "escape-string-regexp": "^1.0.2",
@@ -15241,8 +15060,7 @@
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
           "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -15343,7 +15161,6 @@
       "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz",
       "integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==",
       "dev": true,
-      "optional": true,
       "requires": {
         "bl": "^1.0.0",
         "buffer-alloc": "^1.2.0",
@@ -15359,7 +15176,6 @@
           "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.3.tgz",
           "integrity": "sha512-cbNhPFS6MlYlWTGncSiDYbdqKhwWFy7kNeb1YSOG6K65i/wPTkLVCJQj0hXA4j0m5Da+hBWnqopEnu1FFelisQ==",
           "dev": true,
-          "optional": true,
           "requires": {
             "once": "^1.4.0"
           }
@@ -15368,15 +15184,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "once": {
           "version": "1.4.0",
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -15386,7 +15200,6 @@
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -15402,7 +15215,6 @@
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -15507,7 +15319,6 @@
       "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz",
       "integrity": "sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=",
       "dev": true,
-      "optional": true,
       "requires": {
         "through2": "~2.0.0",
         "xtend": "~4.0.0"
@@ -15532,8 +15343,7 @@
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz",
       "integrity": "sha1-lYYL/MXHbCd/j4Mm/Q9bLiDrohc=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "timers-ext": {
       "version": "0.1.7",
@@ -15575,7 +15385,6 @@
       "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz",
       "integrity": "sha1-HN+kcqnvUMI57maZm2YsoOs5k38=",
       "dev": true,
-      "optional": true,
       "requires": {
         "extend-shallow": "^2.0.1"
       },
@@ -15585,7 +15394,6 @@
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-extendable": "^0.1.0"
           }
@@ -15602,8 +15410,7 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz",
       "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "to-fast-properties": {
       "version": "2.0.0",
@@ -15681,15 +15488,13 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
       "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "trim-repeated": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz",
       "integrity": "sha1-42RqLqTokTEr9+rObPsFOAvAHCE=",
       "dev": true,
-      "optional": true,
       "requires": {
         "escape-string-regexp": "^1.0.2"
       }
@@ -15710,8 +15515,7 @@
       "version": "0.4.3",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
       "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "tweetnacl": {
       "version": "0.14.5",
@@ -15950,8 +15754,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz",
       "integrity": "sha1-uYTwh3/AqJwsdzzB73tbIytbBv4=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "upath": {
       "version": "1.2.0",
@@ -15979,7 +15782,6 @@
       "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
       "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
       "dev": true,
-      "optional": true,
       "requires": {
         "prepend-http": "^1.0.1"
       }
@@ -16065,8 +15867,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz",
       "integrity": "sha1-G5BKWWCfsyjvB4E4Qgk09rhnCaY=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "validate-npm-package-license": {
       "version": "3.0.4",
@@ -16111,7 +15912,6 @@
       "resolved": "https://registry.npmjs.org/vinyl-assign/-/vinyl-assign-1.2.1.tgz",
       "integrity": "sha1-TRmIkbVRWRHXcajNnFSApGoHSkU=",
       "dev": true,
-      "optional": true,
       "requires": {
         "object-assign": "^4.0.1",
         "readable-stream": "^2.0.0"
@@ -16121,22 +15921,19 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -16152,7 +15949,6 @@
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -16335,7 +16131,6 @@
       "resolved": "https://registry.npmjs.org/ware/-/ware-1.3.0.tgz",
       "integrity": "sha1-0bFPOdLiy0q4xAmPdW/ksWTkc9Q=",
       "dev": true,
-      "optional": true,
       "requires": {
         "wrap-fn": "^0.1.0"
       }
@@ -16388,7 +16183,6 @@
       "resolved": "https://registry.npmjs.org/wrap-fn/-/wrap-fn-0.1.5.tgz",
       "integrity": "sha1-8htuQQFv9KfjFyDbxjoJAWvfmEU=",
       "dev": true,
-      "optional": true,
       "requires": {
         "co": "3.1.0"
       }
@@ -16485,7 +16279,6 @@
       "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
       "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
       "dev": true,
-      "optional": true,
       "requires": {
         "buffer-crc32": "~0.2.3",
         "fd-slicer": "~1.1.0"
diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json
index 7f3a7b54f0..06f2d5a8d6 100644
--- a/src/Umbraco.Web.UI.Client/package.json
+++ b/src/Umbraco.Web.UI.Client/package.json
@@ -70,8 +70,8 @@
     "karma-junit-reporter": "^1.2.0",
     "karma-phantomjs-launcher": "1.0.4",
     "less": "3.9.0",
-    "lodash": "4.17.11",
-    "marked": "^0.5.2",
+    "lodash": "4.17.13",
+    "marked": "^0.6.1",
     "merge-stream": "1.0.1",
     "run-sequence": "2.2.1",
     "caniuse-lite": "^1.0.30000966"

From 7d47432e96c30e11ddfad27525de0f08e793992c Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 25 Sep 2019 16:06:41 +0200
Subject: [PATCH 719/776] Ensure we don't add duplicate keys

---
 src/Umbraco.Core/Mapping/UmbracoMapper.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/Mapping/UmbracoMapper.cs b/src/Umbraco.Core/Mapping/UmbracoMapper.cs
index 90f56f3ec1..cfcb6c1561 100644
--- a/src/Umbraco.Core/Mapping/UmbracoMapper.cs
+++ b/src/Umbraco.Core/Mapping/UmbracoMapper.cs
@@ -345,7 +345,8 @@ namespace Umbraco.Core.Mapping
 
             if (_ctors.ContainsKey(sourceType))
                 foreach (var c in sourceCtor)
-                    _ctors[sourceType].Add(c.Key, c.Value);
+                    if (!_ctors[sourceType].TryGetValue(c.Key, out _))
+                        _ctors[sourceType].Add(c.Key, c.Value);
             else
                 _ctors[sourceType] = sourceCtor;
             
@@ -375,7 +376,8 @@ namespace Umbraco.Core.Mapping
 
             if (_maps.ContainsKey(sourceType))
                 foreach(var m in sourceMap)
-                    _maps[sourceType].Add(m.Key, m.Value);
+                    if (!_maps[sourceType].TryGetValue(m.Key, out _))
+                        _maps[sourceType].Add(m.Key, m.Value);
             else
                 _maps[sourceType] = sourceMap;
             

From 40dd68e4bb9ea955ce2fbf5850248e4fe6e0c9b0 Mon Sep 17 00:00:00 2001
From: kfc <kasper@friischristensen.com>
Date: Thu, 26 Sep 2019 00:04:11 +0200
Subject: [PATCH 720/776] Use unique IDs for all password fields in umb-login

---
 .../components/application/umb-login.html     | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
index 7a7d7c4dba..2e81395643 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
@@ -18,11 +18,11 @@
                     </p>
 
                     <div class="control-group" ng-class="{error: vm.setPasswordForm.password.$invalid}">
-                        <label for="umb-password">
+                        <label for="umb-passwordOne">
                             <localize key="user_newPassword">New password</localize>
                             <small style="font-size: 13px;">{{vm.invitedUserPasswordModel.passwordPolicyText}}</small>
                         </label>
-                        <input type="password" ng-model="vm.invitedUserPasswordModel.password" name="password" id="umb-password" class="-full-width-input" umb-auto-focus required val-server-field="value" ng-minlength="{{vm.invitedUserPasswordModel.passwordPolicies.minPasswordLength}}" />
+                        <input type="password" ng-model="vm.invitedUserPasswordModel.password" name="password" id="umb-passwordOne" class="-full-width-input" umb-auto-focus required val-server-field="value" ng-minlength="{{vm.invitedUserPasswordModel.passwordPolicies.minPasswordLength}}" />
                         <span ng-messages="inviteUserPasswordForm.password.$error" show-validation-on-submit >
                             <span class="help-inline" ng-message="required"><localize key="user_passwordIsBlank">Your new password cannot be blank!</localize></span>
                             <span class="help-inline" ng-message="minlength">Minimum {{vm.invitedUserPasswordModel.passwordPolicies.minPasswordLength}} characters</span>
@@ -31,8 +31,8 @@
                     </div>
 
                     <div class="control-group" ng-class="{error: vm.setPasswordForm.confirmPassword.$invalid}">
-                        <label for="umb-confirmPassword"><localize key="user_confirmNewPassword">Confirm new password</localize></label>
-                        <input type="password" ng-model="vm.invitedUserPasswordModel.confirmPassword" name="confirmPassword" id="umb-confirmPassword" class="-full-width-input" required val-compare="password" />
+                        <label for="umb-confirmPasswordOne"><localize key="user_confirmNewPassword">Confirm new password</localize></label>
+                        <input type="password" ng-model="vm.invitedUserPasswordModel.confirmPassword" name="confirmPassword" id="umb-confirmPasswordOne" class="-full-width-input" required val-compare="password" />
                         <span ng-messages="inviteUserPasswordForm.confirmPassword.$error" show-validation-on-submit >
                             <span class="help-inline" ng-message="required"><localize key="general_required">Required</localize></span>
                             <span class="help-inline" ng-message="valCompare"><localize key="user_passwordMismatch">The confirmed password doesn't match the new password!</localize></span>
@@ -157,8 +157,8 @@
                         </div>
 
                         <div class="control-group" ng-class="{error: vm.loginForm.password.$invalid}">
-                            <label for="umb-password"><localize key="general_password">Password</localize></label>
-                            <input type="password" ng-model="vm.password" name="password" id="umb-password" class="-full-width-input" localize="placeholder" placeholder="@placeholders_password" />
+                            <label for="umb-passwordTwo"><localize key="general_password">Password</localize></label>
+                            <input type="password" ng-model="vm.password" name="password" id="umb-passwordTwo" class="-full-width-input" localize="placeholder" placeholder="@placeholders_password" />
                             <div class="password-toggle">
                                 <a href="#" prevent-default ng-click="vm.togglePassword()">
                                     <span class="password-text show"><localize key="login_showPassword">Show password</localize></span>
@@ -222,13 +222,13 @@
                     <form method="POST" name="vm.setPasswordForm" ng-submit="vm.setPasswordSubmit(vm.password, vm.confirmPassword)">
 
                         <div ng-hide="vm.resetComplete" class="control-group" ng-class="{error: vm.setPasswordForm.password.$invalid}">
-                            <label for="umb-password"><localize key="user_newPassword">New password</localize></label>
-                            <input type="password" ng-model="vm.password" name="password" id="umb-password" class="-full-width-input" localize="placeholder" placeholder="@placeholders_password" focus-when="{{vm.view === 'set-password'}}" />
+                            <label for="umb-passwordThree"><localize key="user_newPassword">New password</localize></label>
+                            <input type="password" ng-model="vm.password" name="password" id="umb-passwordThree" class="-full-width-input" localize="placeholder" placeholder="@placeholders_password" focus-when="{{vm.view === 'set-password'}}" />
                         </div>
 
                         <div ng-hide="vm.resetComplete" class="control-group" ng-class="{error: vm.setPasswordForm.confirmPassword.$invalid}">
-                            <label for="umb-confirmPassword"><localize key="user_confirmNewPassword">Confirm new password</localize></label>
-                            <input type="password" ng-model="vm.confirmPassword" name="confirmPassword" id="umb-confirmPassword" class="-full-width-input" localize="placeholder" placeholder="@placeholders_confirmPassword" />
+                            <label for="umb-confirmPasswordThree"><localize key="user_confirmNewPassword">Confirm new password</localize></label>
+                            <input type="password" ng-model="vm.confirmPassword" name="confirmPassword" id="umb-confirmPasswordThree" class="-full-width-input" localize="placeholder" placeholder="@placeholders_confirmPassword" />
                         </div>
 
                         <div ng-hide="vm.resetComplete" class="control-group" ng-show="vm.setPasswordForm.$invalid">

From 1a9ed9523505e437658d8cb98904b766f071b2ec Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 26 Sep 2019 10:05:41 +0200
Subject: [PATCH 721/776] Bumb version to 8.3

---
 src/SolutionInfo.cs                      | 4 ++--
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index a4e859988e..bf3a271d32 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -18,5 +18,5 @@ using System.Resources;
 [assembly: AssemblyVersion("8.0.0")]
 
 // these are FYI and changed automatically
-[assembly: AssemblyFileVersion("8.2.0")]
-[assembly: AssemblyInformationalVersion("8.2.0")]
+[assembly: AssemblyFileVersion("8.3.0")]
+[assembly: AssemblyInformationalVersion("8.3.0")]
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 4141b60a3d..6c20e8c765 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -345,9 +345,9 @@
         <WebProjectProperties>
           <UseIIS>False</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>8200</DevelopmentServerPort>
+          <DevelopmentServerPort>8300</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:8200/</IISUrl>
+          <IISUrl>http://localhost:8300/</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>
@@ -429,4 +429,4 @@
     <Message Text="ConfigFile: $(OriginalFileName) -&gt; $(OutputFileName)" Importance="high" Condition="Exists('$(ModifiedFileName)')" />
     <Copy SourceFiles="$(ModifiedFileName)" DestinationFiles="$(OutputFileName)" OverwriteReadOnlyFiles="true" SkipUnchangedFiles="false" Condition="Exists('$(ModifiedFileName)')" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>

From 1bc7728b6951566008bf4064ccc775b72574a82d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Thu, 26 Sep 2019 10:39:20 +0200
Subject: [PATCH 722/776] Test for Bjarke

---
 .../src/views/propertyeditors/rte/rte.controller.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
index 3bd26ab095..2de3618ddc 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
@@ -28,6 +28,13 @@ angular.module("umbraco")
             $scope.containerOverflow = editorConfig.mode === "distraction-free" ? (height ? "auto" : "inherit") : "inherit";
 
             var promises = [];
+            
+            // we need to make sure that the element is initialized before we can init TinyMCE, because we find the placeholder by ID, so it needs to be appended to document before.
+            var initPromise = new Promise((resolve, reject) => {
+                this.$onInit = resolve;
+            });
+            
+            promises.push(initPromise);
 
             //queue file loading
             tinyMceAssets.forEach(function (tinyJsAsset) {
@@ -82,11 +89,7 @@ angular.module("umbraco")
                 
                 angular.extend(baseLineConfigObj, standardConfig);
                 
-                //we need to add a timeout here, to wait for a redraw so TinyMCE can find its placeholder element.
-                $timeout(function () {                        
-                    tinymce.init(baseLineConfigObj);
-                }, 150, false);
-                
+                tinymce.init(baseLineConfigObj);
                 
                 //listen for formSubmitting event (the result is callback used to remove the event subscription)
                 var unsubscribe = $scope.$on("formSubmitting", function () {

From 36914a1d710d073cf0892e581d59f738973d56fe Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Thu, 26 Sep 2019 10:17:26 +0100
Subject: [PATCH 723/776] Remove the old initEvents that is no longer used

---
 .../src/common/services/tinymce.service.js    | 58 -------------------
 1 file changed, 58 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 9fa4167b65..87b440cd2b 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -217,64 +217,6 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
         xhr.send(formData);
     }
 
-    function initEvents(editor){
-
-        editor.on('SetContent', function (e) {
-
-            var content = e.content;
-
-            // Upload BLOB images (dragged/pasted ones)
-            if(content.indexOf('<img src="blob:') > -1){
-
-                editor.uploadImages(function(data) {
-                    // Once all images have been uploaded
-                    data.forEach(function(item) {
-                        // Select img element
-                        var img = item.element;
-
-                        // Get img src
-                        var imgSrc = img.getAttribute("src");
-                        var tmpLocation = localStorageService.get(`tinymce__${imgSrc}`)
-
-                        // Select the img & add new attr which we can search for
-                        // When its being persisted in RTE property editor
-                        // To create a media item & delete this tmp one etc
-                        tinymce.activeEditor.$(img).attr({ "data-tmpimg": tmpLocation });
-
-                        // Resize the image to the max size configured
-                        // NOTE: no imagesrc passed into func as the src is blob://...
-                        // We will append ImageResizing Querystrings on perist to DB with node save
-                        sizeImageInEditor(editor, img);
-                    });
-
-
-                });
-
-                // Get all img where src starts with blob: AND does NOT have a data=tmpimg attribute
-                // This is most likely seen as a duplicate image that has already been uploaded
-                // editor.uploadImages() does not give us any indiciation that the image been uploaded already
-                var blobImageWithNoTmpImgAttribute = editor.dom.select("img[src^='blob:']:not([data-tmpimg])");
-
-                //For each of these selected items
-                blobImageWithNoTmpImgAttribute.forEach(imageElement => {
-                    var blobSrcUri = editor.dom.getAttrib(imageElement, "src");
-
-                    // Find the same image uploaded (Should be in LocalStorage)
-                    // May already exist in the editor as duplicate image
-                    // OR added to the RTE, deleted & re-added again
-                    // So lets fetch the tempurl out of localstorage for that blob URI item
-                    var tmpLocation = localStorageService.get(`tinymce__${blobSrcUri}`)
-
-                    if(tmpLocation){
-                        sizeImageInEditor(editor, imageElement);
-                        editor.dom.setAttrib(imageElement, "data-tmpimg", tmpLocation);
-                    }
-                });
-
-            }
-        });
-    }
-
     function cleanupPasteData(plugin, args) {
 
         // Remove spans

From b81b92ac640be2f062fb2d1c93f9e1657d2217fb Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Thu, 26 Sep 2019 10:19:23 +0100
Subject: [PATCH 724/776] Fixes up image upload bug - as this got refactored to
 an event. editor is now args.editor * Also adds in the code that was in the
 initEvent function that got missed in merge/refactor * Fix to use
 localStorageService & not native browser one

---
 .../src/common/services/tinymce.service.js    | 35 ++++++++++++++++---
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 87b440cd2b..a91e3d6ecc 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -1253,7 +1253,7 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                 // Upload BLOB images (dragged/pasted ones)
                 if(content.indexOf('<img src="blob:') > -1){
 
-                    editor.uploadImages(function(data) {
+                    args.editor.uploadImages(function(data) {
                         // Once all images have been uploaded
                         data.forEach(function(item) {
                             // Select img element
@@ -1261,18 +1261,43 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
 
                             // Get img src
                             var imgSrc = img.getAttribute("src");
-                            var tmpLocation = localStorage.getItem(`tinymce__${imgSrc}`);
+                            var tmpLocation = localStorageService.get(`tinymce__${imgSrc}`)
 
                             // Select the img & add new attr which we can search for
                             // When its being persisted in RTE property editor
                             // To create a media item & delete this tmp one etc
                             tinymce.activeEditor.$(img).attr({ "data-tmpimg": tmpLocation });
 
-                            // We need to remove the image from the cache, otherwise we can't handle if we upload the exactly 
-                            // same image twice
-                            tinymce.activeEditor.editorUpload.blobCache.removeByUri(imgSrc);
+                            // Resize the image to the max size configured
+                            // NOTE: no imagesrc passed into func as the src is blob://...
+                            // We will append ImageResizing Querystrings on perist to DB with node save
+                            sizeImageInEditor(args.editor, img);
                         });
+
+
                     });
+
+                    // Get all img where src starts with blob: AND does NOT have a data=tmpimg attribute
+                    // This is most likely seen as a duplicate image that has already been uploaded
+                    // editor.uploadImages() does not give us any indiciation that the image been uploaded already
+                    var blobImageWithNoTmpImgAttribute = args.editor.dom.select("img[src^='blob:']:not([data-tmpimg])");
+
+                    //For each of these selected items
+                    blobImageWithNoTmpImgAttribute.forEach(imageElement => {
+                        var blobSrcUri = args.editor.dom.getAttrib(imageElement, "src");
+
+                        // Find the same image uploaded (Should be in LocalStorage)
+                        // May already exist in the editor as duplicate image
+                        // OR added to the RTE, deleted & re-added again
+                        // So lets fetch the tempurl out of localstorage for that blob URI item
+                        var tmpLocation = localStorageService.get(`tinymce__${blobSrcUri}`)
+
+                        if(tmpLocation){
+                            sizeImageInEditor(args.editor, imageElement);
+                            args.editor.dom.setAttrib(imageElement, "data-tmpimg", tmpLocation);
+                        }
+                    });
+
                 }
             });
 

From cb441389202f655e5e5c9fcb14a69516d32fa685 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Thu, 26 Sep 2019 11:23:19 +0200
Subject: [PATCH 725/776] using angular promise instead

---
 .../src/views/propertyeditors/rte/rte.controller.js           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
index 2de3618ddc..8ca698060a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
@@ -30,12 +30,12 @@ angular.module("umbraco")
             var promises = [];
             
             // we need to make sure that the element is initialized before we can init TinyMCE, because we find the placeholder by ID, so it needs to be appended to document before.
-            var initPromise = new Promise((resolve, reject) => {
+            var initPromise = $q((resolve, reject) => {
                 this.$onInit = resolve;
             });
             
             promises.push(initPromise);
-
+            
             //queue file loading
             tinyMceAssets.forEach(function (tinyJsAsset) {
                 promises.push(assetsService.loadJs(tinyJsAsset, $scope));

From c652e47c3ef5958f0ddd14ab259e80a853474cab Mon Sep 17 00:00:00 2001
From: Tobias Klika <cee@live.at>
Date: Mon, 2 Sep 2019 20:33:44 +0200
Subject: [PATCH 726/776] overlay "target"-positioning updates correctly on
 content changes and container resize

---
 .../overlays/umboverlay.directive.js          | 94 ++++++++++---------
 1 file changed, 52 insertions(+), 42 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js
index 0135abd97c..96316f49d6 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js
@@ -208,8 +208,9 @@ Opens an overlay to show a custom YSOD. </br>
          var numberOfOverlays = 0;
          var isRegistered = false;
 
-          var modelCopy = {};
-          var unsubscribe = [];
+
+         var modelCopy = {};
+         var unsubscribe = [];
 
          function activate() {
 
@@ -221,8 +222,23 @@ Opens an overlay to show a custom YSOD. </br>
 
             $timeout(function() {
 
-               if (scope.position === "target") {
+               if (scope.position === "target" && scope.model.event) {
                   setTargetPosition();
+
+                  // update the position of the overlay on content changes
+                  // as these affect the layout/size of the overlay
+                  if ('ResizeObserver' in window)
+                  {
+                     var resizeObserver = new ResizeObserver(setTargetPosition);
+                     var contentArea = document.getElementById("contentwrapper");
+                     resizeObserver.observe(el[0]);
+                     if (contentArea) {
+                        resizeObserver.observe(contentArea);
+                     }
+                     unsubscribe.push(function () {
+                        resizeObserver.disconnect();
+                     });
+                  }
                }
 
                // this has to be done inside a timeout to ensure the destroy
@@ -397,50 +413,44 @@ Opens an overlay to show a custom YSOD. </br>
                bottom: "inherit"
             };
 
-            // if mouse click position is know place element with mouse in center
-            if (scope.model.event && scope.model.event) {
+            // click position
+            mousePositionClickX = scope.model.event.pageX;
+            mousePositionClickY = scope.model.event.pageY;
 
-               // click position
-               mousePositionClickX = scope.model.event.pageX;
-               mousePositionClickY = scope.model.event.pageY;
+            // element size
+            elementHeight = el[0].clientHeight;
+            elementWidth = el[0].clientWidth;
 
-               // element size
-               elementHeight = el[0].clientHeight;
-               elementWidth = el[0].clientWidth;
-
-               // move element to this position
-               position.left = mousePositionClickX - (elementWidth / 2);
-               position.top = mousePositionClickY - (elementHeight / 2);
-
-               // check to see if element is outside screen
-               // outside right
-               if (position.left + elementWidth > containerRight) {
-                  position.right = 10;
-                  position.left = "inherit";
-               }
-
-               // outside bottom
-               if (position.top + elementHeight > containerBottom) {
-                  position.bottom = 10;
-                  position.top = "inherit";
-               }
-
-               // outside left
-               if (position.left < containerLeft) {
-                  position.left = containerLeft + 10;
-                  position.right = "inherit";
-               }
-
-               // outside top
-               if (position.top < containerTop) {
-                  position.top = 10;
-                  position.bottom = "inherit";
-               }
-
-               el.css(position);
+            // move element to this position
+            position.left = mousePositionClickX - (elementWidth / 2);
+            position.top = mousePositionClickY - (elementHeight / 2);
 
+            // check to see if element is outside screen
+            // outside right
+            if (position.left + elementWidth > containerRight) {
+                position.right = 10;
+                position.left = "inherit";
             }
 
+            // outside bottom
+            if (position.top + elementHeight > containerBottom) {
+                position.bottom = 10;
+                position.top = "inherit";
+            }
+
+            // outside left
+            if (position.left < containerLeft) {
+                position.left = containerLeft + 10;
+                position.right = "inherit";
+            }
+
+            // outside top
+            if (position.top < containerTop) {
+                position.top = 10;
+                position.bottom = "inherit";
+            }
+
+            el.css(position);
          }
 
          scope.submitForm = function(model) {

From 713cf2312f46327b99c6397d624419a5e5edcc4b Mon Sep 17 00:00:00 2001
From: Nathan Woulfe <nathan@nathanw.com.au>
Date: Thu, 26 Sep 2019 14:31:48 +1000
Subject: [PATCH 727/776] adding visibility:hidden to the un-hovered list fixes
 the problem. have also tidied up the css a bit to remove duplicate class
 references

---
 .../umb-editor-navigation-item.less           | 366 +++++++++---------
 1 file changed, 181 insertions(+), 185 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less
index 8a8032ee16..c26c89a478 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less
@@ -1,199 +1,195 @@
 .umb-sub-views-nav-item {
     position: relative;
     display: block;
-}
 
-.umb-sub-views-nav-item__action,
-.umb-sub-views-nav-item > a {
-  background: transparent;
-  text-align: center;
-  cursor: pointer;
-  display: block;
-  padding: 4px 10px 0 10px;
-  min-width: 70px;
-  border: 0 none;
-  border-right: 1px solid @gray-9;
-  box-sizing: border-box;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  height: calc(~'@{editorHeaderHeight}' - ~'1px'); // need to offset the 1px border-bottom on .umb-editor-header - avoids overflowing top of the container
-  position: relative;
-  
-  color: @ui-active-type;
-  
-  &:focus,
-  &:hover {
-      color: @ui-active-type-hover !important;
-  }
-  
-  &::after {
-      content: "";
-      height: 0px;
-      left: 8px;
-      right: 8px;
-      background-color: @ui-light-active-border;
-      position: absolute;
-      bottom: 0;
-      border-radius: 3px 3px 0 0;
-      opacity: 0;
-      transition: all .2s linear;
-  }
-}
+    &__action,
+    > a {
+        background: transparent;
+        text-align: center;
+        cursor: pointer;
+        display: block;
+        padding: 4px 10px 0 10px;
+        min-width: 70px;
+        border: 0 none;
+        border-right: 1px solid @gray-9;
+        box-sizing: border-box;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        height: calc(~'@{editorHeaderHeight}'- ~'1px'); // need to offset the 1px border-bottom on .umb-editor-header - avoids overflowing top of the container
+        position: relative;
+        color: @ui-active-type;
 
-.umb-sub-views-nav-item__action:focus,
-.umb-sub-views-nav-item__action:active,
-.umb-sub-views-nav-item > a:active {
-  .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
-}
-.umb-sub-views-nav-item__action:focus,
-.umb-sub-views-nav-item > a:focus {
-  outline: none;
-}
+        &:focus,
+        &:hover {
+            color: @ui-active-type-hover  !important;
+            text-decoration: none;
+        }
 
-.umb-sub-views-nav-item__action:hover,
-.umb-sub-views-nav-item__action:focus,
-.umb-sub-views-nav-item > a:hover,
-.umb-sub-views-nav-item > a:focus {
-  text-decoration: none;
-}
-.umb-sub-views-nav-item__action.is-active,
-.umb-sub-views-nav-item > a.is-active {
-    
-    color: @ui-light-active-type;
-    
-    &::after {
+        &:focus {
+            outline: none;
+        }
+
+        &::after {
+            content: "";
+            height: 0px;
+            left: 8px;
+            right: 8px;
+            background-color: @ui-light-active-border;
+            position: absolute;
+            bottom: 0;
+            border-radius: 3px 3px 0 0;
+            opacity: 0;
+            transition: all .2s linear;
+        }
+
+        &.is-active {
+            color: @ui-light-active-type;
+
+            &::after {
+                opacity: 1;
+                height: 4px;
+            }
+        }
+    }
+
+    &__action:focus,
+    &__action:active,
+    & > a:active {
+        .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
+    }
+
+    &:focus-within &__anchor_dropdown,
+    &:hover &__anchor_dropdown {
+        visibility: visible;
         opacity: 1;
-        height: 4px;
+        transition: opacity 20ms 0;
+    }
+
+    .icon {
+        font-size: 24px;
+        display: block;
+        text-align: center;
+        margin-bottom: 7px;
+    }
+
+    .badge {
+        position: absolute;
+        top: 6px;
+        right: 6px;
+        min-width: 16px;
+        color: @white;
+        background-color: @ui-active-type;
+        border: 2px solid @white;
+        border-radius: 50%;
+        font-size: 10px;
+        font-weight: bold;
+        padding: 2px;
+        line-height: 16px;
+        display: block;
+
+        &.-type-alert {
+            background-color: @red;
+        }
+
+        &.-type-warning {
+            background-color: @yellow-d2;
+        }
+
+        &:empty {
+            height: 12px;
+            min-width: 12px;
+        }
+    }
+
+    &-text {
+        font-size: 12px;
+        line-height: 1em;
+    }
+
+    &__anchor_dropdown {
+        // inherits from .dropdown-menu
+        margin: 0;
+        overflow: hidden;
+
+        // center align horizontal
+        left: 50%;
+        transform: translateX(-50%);
+        opacity: 0;
+        transition: opacity 250ms 250ms;
+        visibility: hidden;
+
+        li {
+            &.is-active a {
+                border-left-color: @ui-selected-border;
+            }
+            
+            a {
+                border-left: 4px solid transparent;
+            }
+        }
+    }
+
+    // Currently Edge 18 does unfortunately not support :focus-within so for now we will use the "old" behavior - Support is coming with the upcoming release of Edge 76
+    // See https://caniuse.com/#search=focus-within
+    @supports (-ms-ime-align:auto) {
+        &:hover &__anchor_dropdown {
+            transition: visibility 0 0, opacity 20ms 0;
+        }
+
+        &__anchor_dropdown {
+            visibility: hidden;
+            transition: visibility 0 500ms, opacity 250ms 250ms;
+        }
+    }
+    
+    // --------------------------------
+    // item__more, appears when there is not enough room for the visible items.
+    // --------------------------------
+
+    &-more__icon {
+        margin-bottom: 10px;
+
+        i {
+            height: 5px;
+            width: 5px;
+            border-radius: 50%;
+            background: @ui-active-type; // fallback if browser doesnt support currentColor
+            background: currentColor;
+            display: inline-block;
+            margin: 0 5px 0 0;
+        }
+
+        i:last-of-type {
+            margin-right: 0;
+        }
+    }
+
+    &-more__dropdown {
+        left: auto;
+        right: 0;
+        display: grid;
+        grid-template-columns: 1fr 1fr 1fr;
+        min-width: auto;
+        margin-top: 10px;
+
+        > li {
+            display: flex;
+        }
+
+        .umb-sub-views-nav-item:first {
+            border-left: none;
+        }
     }
 }
 
+// Validation
 .umb-sub-views-nav-item__action.-has-error,
 .show-validation .umb-sub-views-nav-item > a.-has-error {
-  color: @red;
-  &::after {
-      background-color: @red;
-  }
-}
+    color: @red;
 
-.umb-sub-views-nav-item .icon {
-  font-size: 24px;
-  display: block;
-  text-align: center;
-  margin-bottom: 7px;
-}
-
-.umb-sub-views-nav-item .badge {
-  position: absolute;
-  top: 6px;
-  right: 6px;
-  min-width: 16px;
-  color: @white;
-  background-color: @ui-active-type;
-  border: 2px solid @white;
-  border-radius: 50%;
-  font-size: 10px;
-  font-weight: bold;
-  padding: 2px;
-  line-height: 16px;
-  display: block;
-
-  &.-type-alert {
-    background-color: @red;
-  }
-  &.-type-warning {
-    background-color: @yellow-d2;
-  }
-  &:empty {
-    height: 12px;
-    min-width: 12px;
-  }
-}
-
-.umb-sub-views-nav-item-text {
-  font-size: 12px;
-  line-height: 1em;
-}
-
-
-.umb-sub-views-nav-item__anchor_dropdown {// inherits from .dropdown-menu
-    display: block;
-    margin: 0;
-    overflow: hidden;
-    
-    // center align horizontal
-    left: 50%;
-    transform: translateX(-50%);
-    opacity: 0;
-    transition: opacity 250ms 250ms;
-}
-
-// Currently Edge 18 does unfortunately not support :focus-within so for now we will use the "old" behavior - Support is coming with the upcoming release of Edge 76
-// See https://caniuse.com/#search=focus-within
-@supports (-ms-ime-align:auto) { 
-    .umb-sub-views-nav-item__anchor_dropdown {
-        visibility: hidden;
-        transition: visibility 0 500ms, opacity 250ms 250ms;
+    &::after {
+        background-color: @red;
     }
-}
-
-.umb-sub-views-nav-item__anchor_dropdown li a {
-    border-left: 4px solid transparent;
-}
-.umb-sub-views-nav-item__anchor_dropdown li.is-active a {
-    border-left-color: @ui-selected-border;
-}
-
-.umb-sub-views-nav-item:focus-within .umb-sub-views-nav-item__anchor_dropdown,
-.umb-sub-views-nav-item:hover .umb-sub-views-nav-item__anchor_dropdown {
-    visibility:visible;
-    opacity: 1;
-    transition: opacity 20ms 0;
-}
-
-// Currently Edge 18 does unfortunately not support :focus-within so for now we will use the "old" behavior - Support is coming with the upcoming release of Edge 76
-// See https://caniuse.com/#search=focus-within
-@supports (-ms-ime-align:auto) { 
-    .umb-sub-views-nav-item:hover .umb-sub-views-nav-item__anchor_dropdown {
-        transition: visibility 0 0, opacity 20ms 0;
-    }
-}
-
-
-// --------------------------------
-// item__more, appears when there is not enough room for the visible items.
-// --------------------------------
-
-.umb-sub-views-nav-item-more__icon {
-  margin-bottom: 10px;
-}
-
-.umb-sub-views-nav-item-more__icon i {
-	height: 5px;
-  width: 5px;
-  border-radius: 50%;
-  background: @ui-active-type;// fallback if browser doesnt support currentColor
-  background: currentColor;
-  display: inline-block;
-  margin: 0 5px 0 0;
-}
-
-.umb-sub-views-nav-item-more__icon i:last-of-type {
-  margin-right: 0;
-}
-
-.umb-sub-views-nav-item-more__dropdown {
-  left: auto;
-  right: 0;
-  display: grid;
-  grid-template-columns: 1fr 1fr 1fr;
-  min-width: auto;
-  margin-top: 10px;
-}
-.umb-sub-views-nav-item-more__dropdown > li {
-    display: flex;
-}
-.umb-sub-views-nav-item-more__dropdown .umb-sub-views-nav-item:first {
-    border-left: none;
-}
+}
\ No newline at end of file

From f3496d894b51e5172d500d75263c041e5e40f8c7 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Thu, 26 Sep 2019 11:36:43 +0100
Subject: [PATCH 728/776] Adds contenteditable=false attribute as for whatever
 reason the CSS class of .mceNonEditable is not working when a macro is saved
 & loaded in a content node

---
 .../src/common/services/tinymce.service.js                   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index a91e3d6ecc..2a4f12c4d4 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -803,6 +803,11 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
             //show the throbber
             $macroDiv.addClass("loading");
 
+            // Add the contenteditable="false" attribute
+            // As just the CSS class of .mceNonEditable is not working by itself?!
+            // TODO: At later date - use TinyMCE editor DOM manipulation as opposed to jQuery
+            $macroDiv.attr("contenteditable", "false");
+
             var contentId = $routeParams.id;
 
             //need to wrap in safe apply since this might be occuring outside of angular

From 1fc1de9c73fd67d30af2b9d60a9dbb9814273180 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Thu, 26 Sep 2019 13:13:38 +0200
Subject: [PATCH 729/776] lets not set a specific width, but do it by CSS.

---
 .../src/common/services/tinymce.service.js                 | 7 ++-----
 .../src/less/components/umb-grid.less                      | 2 ++
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 2a4f12c4d4..6b3cb5281f 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -1172,7 +1172,6 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
             var tinyMceRect = editor.editorContainer.getBoundingClientRect();
             var tinyMceTop = tinyMceRect.top;
             var tinyMceBottom = tinyMceRect.bottom;
-            var tinyMceWidth = tinyMceRect.width;
 
             var tinyMceEditArea = tinyMce.find(".mce-edit-area");
 
@@ -1184,15 +1183,13 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                     .css("visibility", "visible")
                     .css("position", "fixed")
                     .css("top", "177px")
-                    .css("margin-top", "0")
-                    .css("width", tinyMceWidth);
+                    .css("margin-top", "0");
             } else {
                 toolbar
                     .css("visibility", "visible")
                     .css("position", "absolute")
                     .css("top", "auto")
-                    .css("margin-top", "0")
-                    .css("width", tinyMceWidth);
+                    .css("margin-top", "0");
             }
 
         },
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
index 852f4411d5..d8df0332ec 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
@@ -657,6 +657,8 @@
 // had to overwrite defaults from TinyMCE, needed for buttons panel to float to new line in narrow space.
 .umb-grid .mce-container > div {
     white-space: normal;
+    left:0;
+    right:0;
 }
 
 

From d3c4aace160b78739a8eeb673cb561e96cc04101 Mon Sep 17 00:00:00 2001
From: Benjamin Howarth <iam@benjaminhowarth.com>
Date: Tue, 24 Sep 2019 17:25:10 +0100
Subject: [PATCH 730/776] #2996 added GlobalSettings.DebugMode switch for JSON
 formatting indentation.

---
 src/Umbraco.Core/Serialization/JsonNetSerializer.cs |  6 ++++--
 src/Umbraco.Web/Editors/BackOfficeController.cs     | 12 ++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Core/Serialization/JsonNetSerializer.cs b/src/Umbraco.Core/Serialization/JsonNetSerializer.cs
index 800278abf0..52f39c6109 100644
--- a/src/Umbraco.Core/Serialization/JsonNetSerializer.cs
+++ b/src/Umbraco.Core/Serialization/JsonNetSerializer.cs
@@ -4,6 +4,7 @@ using System.Reflection;
 using System.Text;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
+using Umbraco.Core.Configuration;
 
 namespace Umbraco.Core.Serialization
 {
@@ -60,7 +61,8 @@ namespace Umbraco.Core.Serialization
         /// <returns></returns>
         public IStreamedResult ToStream(object input)
         {
-            string s = JsonConvert.SerializeObject(input, Formatting.Indented, _settings);
+            var formatting = GlobalSettings.DebugMode ? Formatting.Indented : Formatting.None;
+            string s = JsonConvert.SerializeObject(input, formatting, _settings);
             byte[] bytes = Encoding.UTF8.GetBytes(s);
             MemoryStream ms = new MemoryStream(bytes);
 
@@ -69,4 +71,4 @@ namespace Umbraco.Core.Serialization
 
         #endregion
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
index 093c095b5d..4a79038fc0 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -177,8 +177,8 @@ namespace Umbraco.Web.Editors
                 //the dictionary returned is fine but the delimiter between an 'area' and a 'value' is a '/' but the javascript
                 // in the back office requres the delimiter to be a '_' so we'll just replace it
                 .ToDictionary(key => key.Key.Replace("/", "_"), val => val.Value);
-
-            return new JsonNetResult { Data = textForCulture, Formatting = Formatting.Indented };
+            var formatting = GlobalSettings.DebugMode ? Formatting.Indented : Formatting.None;
+            return new JsonNetResult { Data = textForCulture, Formatting = formatting };
         }
 
         /// <summary>
@@ -230,8 +230,8 @@ namespace Umbraco.Web.Editors
                     typeof(BackOfficeController) + "GetManifestAssetList",
                     () => getResult(),
                     new TimeSpan(0, 10, 0));
-
-            return new JsonNetResult { Data = result, Formatting = Formatting.Indented };
+            var formatting = GlobalSettings.DebugMode ? Formatting.Indented : Formatting.None;
+            return new JsonNetResult { Data = result, Formatting = formatting };
         }
 
         [UmbracoAuthorize(Order = 0)]
@@ -244,8 +244,8 @@ namespace Umbraco.Web.Editors
                 new DirectoryInfo(Server.MapPath(SystemDirectories.AppPlugins)),
                 new DirectoryInfo(Server.MapPath(SystemDirectories.Config)),
                 HttpContext.IsDebuggingEnabled);
-
-            return new JsonNetResult { Data = gridConfig.EditorsConfig.Editors, Formatting = Formatting.Indented };
+            var formatting = GlobalSettings.DebugMode ? Formatting.Indented : Formatting.None;
+            return new JsonNetResult { Data = gridConfig.EditorsConfig.Editors, Formatting = formatting };
         }
 
         

From 16837d018a44c324e620d7c72b63be015a87895c Mon Sep 17 00:00:00 2001
From: Benjamin Howarth <iam@benjaminhowarth.com>
Date: Tue, 24 Sep 2019 21:34:40 +0100
Subject: [PATCH 731/776] #2996 changed formatting to none for both data
 transfer & persistence

---
 src/Umbraco.Core/Serialization/JsonNetSerializer.cs | 3 +--
 src/Umbraco.Web/Editors/BackOfficeController.cs     | 9 +++------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Core/Serialization/JsonNetSerializer.cs b/src/Umbraco.Core/Serialization/JsonNetSerializer.cs
index 52f39c6109..80e123d9ea 100644
--- a/src/Umbraco.Core/Serialization/JsonNetSerializer.cs
+++ b/src/Umbraco.Core/Serialization/JsonNetSerializer.cs
@@ -61,8 +61,7 @@ namespace Umbraco.Core.Serialization
         /// <returns></returns>
         public IStreamedResult ToStream(object input)
         {
-            var formatting = GlobalSettings.DebugMode ? Formatting.Indented : Formatting.None;
-            string s = JsonConvert.SerializeObject(input, formatting, _settings);
+            string s = JsonConvert.SerializeObject(input, Formatting.None, _settings);
             byte[] bytes = Encoding.UTF8.GetBytes(s);
             MemoryStream ms = new MemoryStream(bytes);
 
diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
index 4a79038fc0..414fb9a1df 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -177,8 +177,7 @@ namespace Umbraco.Web.Editors
                 //the dictionary returned is fine but the delimiter between an 'area' and a 'value' is a '/' but the javascript
                 // in the back office requres the delimiter to be a '_' so we'll just replace it
                 .ToDictionary(key => key.Key.Replace("/", "_"), val => val.Value);
-            var formatting = GlobalSettings.DebugMode ? Formatting.Indented : Formatting.None;
-            return new JsonNetResult { Data = textForCulture, Formatting = formatting };
+            return new JsonNetResult { Data = textForCulture, Formatting = Formatting.None };
         }
 
         /// <summary>
@@ -230,8 +229,7 @@ namespace Umbraco.Web.Editors
                     typeof(BackOfficeController) + "GetManifestAssetList",
                     () => getResult(),
                     new TimeSpan(0, 10, 0));
-            var formatting = GlobalSettings.DebugMode ? Formatting.Indented : Formatting.None;
-            return new JsonNetResult { Data = result, Formatting = formatting };
+            return new JsonNetResult { Data = result, Formatting = Formatting.None };
         }
 
         [UmbracoAuthorize(Order = 0)]
@@ -244,8 +242,7 @@ namespace Umbraco.Web.Editors
                 new DirectoryInfo(Server.MapPath(SystemDirectories.AppPlugins)),
                 new DirectoryInfo(Server.MapPath(SystemDirectories.Config)),
                 HttpContext.IsDebuggingEnabled);
-            var formatting = GlobalSettings.DebugMode ? Formatting.Indented : Formatting.None;
-            return new JsonNetResult { Data = gridConfig.EditorsConfig.Editors, Formatting = formatting };
+            return new JsonNetResult { Data = gridConfig.EditorsConfig.Editors, Formatting = Formatting.None };
         }
 
         

From 6793167865ecc7718943b57f3812165852a80e5b Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 26 Sep 2019 14:25:06 +0200
Subject: [PATCH 732/776] fixes brackets

---
 src/Umbraco.Core/Mapping/UmbracoMapper.cs | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Core/Mapping/UmbracoMapper.cs b/src/Umbraco.Core/Mapping/UmbracoMapper.cs
index cfcb6c1561..e41a40e3d9 100644
--- a/src/Umbraco.Core/Mapping/UmbracoMapper.cs
+++ b/src/Umbraco.Core/Mapping/UmbracoMapper.cs
@@ -232,10 +232,10 @@ namespace Umbraco.Core.Mapping
                 if (ctor != null && map != null)
                 {
                     // register (for next time) and do it now (for this time)
-                    object NCtor(object s, MapperContext c) => MapEnumerableInternal<TTarget>((IEnumerable) s, targetGenericArg, ctor, map, c);
+                    object NCtor(object s, MapperContext c) => MapEnumerableInternal<TTarget>((IEnumerable)s, targetGenericArg, ctor, map, c);
                     DefineCtors(sourceType)[targetType] = NCtor;
                     DefineMaps(sourceType)[targetType] = Identity;
-                    return (TTarget) NCtor(source, context);
+                    return (TTarget)NCtor(source, context);
                 }
 
                 throw new InvalidOperationException($"Don't know how to map {sourceGenericArg.FullName} to {targetGenericArg.FullName}, so don't know how to map {sourceType.FullName} to {targetType.FullName}.");
@@ -266,7 +266,7 @@ namespace Umbraco.Core.Mapping
                 target = targetArray;
             }
 
-            return (TTarget) target;
+            return (TTarget)target;
         }
 
         /// <summary>
@@ -344,12 +344,16 @@ namespace Umbraco.Core.Mapping
             if (ctor == null) return null;
 
             if (_ctors.ContainsKey(sourceType))
+            {
                 foreach (var c in sourceCtor)
+                {
                     if (!_ctors[sourceType].TryGetValue(c.Key, out _))
                         _ctors[sourceType].Add(c.Key, c.Value);
+                }   
+            }
             else
                 _ctors[sourceType] = sourceCtor;
-            
+
             return ctor;
         }
 
@@ -375,12 +379,16 @@ namespace Umbraco.Core.Mapping
             if (map == null) return null;
 
             if (_maps.ContainsKey(sourceType))
-                foreach(var m in sourceMap)
+            {
+                foreach (var m in sourceMap)
+                {
                     if (!_maps[sourceType].TryGetValue(m.Key, out _))
                         _maps[sourceType].Add(m.Key, m.Value);
+                }
+            }
             else
                 _maps[sourceType] = sourceMap;
-            
+
             return map;
         }
 

From 1a85c4a635a73fd00e7ed04e7b9d6341e8bc546e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Thu, 26 Sep 2019 15:05:02 +0200
Subject: [PATCH 733/776] overwrite TinyMCE skin to match Umbraco Visuals

---
 .../src/less/components/umb-grid.less         |  3 +-
 src/Umbraco.Web.UI.Client/src/less/rte.less   | 82 ++++++++++++++++++-
 .../propertyeditors/grid/editors/rte.html     |  2 +-
 3 files changed, 80 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
index 852f4411d5..8aac6191dc 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
@@ -637,8 +637,7 @@
 }
 
 .umb-grid .mce-toolbar {
-    border-bottom: 1px solid @gray-8;
-    background-color: rgba(250, 250, 250, 1);
+    border-bottom: 1px solid @gray-7;
     display: none;
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/rte.less b/src/Umbraco.Web.UI.Client/src/less/rte.less
index 01af7c3936..a02b341a06 100644
--- a/src/Umbraco.Web.UI.Client/src/less/rte.less
+++ b/src/Umbraco.Web.UI.Client/src/less/rte.less
@@ -40,6 +40,10 @@
     white-space: normal;
 }
 
+.umb-rte .mce-top-part.mce-container {
+    padding: 1px 0;
+}
+
 .umb-rte .mce-tinymce .mce-edit-area {
     border-radius: 0px !important;
 }
@@ -56,14 +60,15 @@
 }
 */
 
-.mce-ico {
+.umb-rte .mce-ico {
+    text-align: center;
     font-size: 12px !important;
     /*color: @gray-1 !important;*/
 }
 
 /* Special case to support helviticons for the tiny mce button controls */
-.mce-ico.mce-i-custom[class^="icon-"],
-.mce-ico.mce-i-custom[class*=" icon-"] {
+.umb-rte .mce-ico.mce-i-custom[class^="icon-"],
+.umb-rte .mce-ico.mce-i-custom[class*=" icon-"] {
     font-family: icomoon;
     font-size: 16px !important;
 }
@@ -81,6 +86,75 @@
     }
 }
 
-.mce-fullscreen {
+.umb-rte .mce-fullscreen {
     position:absolute;
 }
+
+.umb-rte .mce-toolbar .mce-btn-group {
+    padding: 0;
+}
+
+.umb-rte .mce-btn {
+    color: @ui-action-type;
+    border-radius: 3px;
+}
+
+.umb-rte .mce-btn {
+    button:hover {
+        .mce-caret {
+            border-top-color: @ui-action-type-hover;
+        }
+    }
+}
+
+.umb-rte .mce-btn:hover, .umb-rte .mce-btn:active {
+    background: @ui-action-hover;
+    border-color: transparent;
+    button {
+        color: @ui-action-type-hover;
+        .mce-ico {
+            color: @ui-action-type-hover;
+        }
+    }
+}
+
+.umb-rte .mce-btn.mce-active, .umb-rte .mce-btn.mce-active:active, 
+.umb-rte .mce-btn.mce-active:hover, .umb-rte .mce-btn.mce-active:focus {
+    background: @gray-9;
+    border-color: transparent;
+    button {
+        color: @ui-action-type-hover;
+        .mce-ico {
+            color: @ui-action-type-hover;
+        }
+        .mce-caret {
+            border-top-color: @ui-action-type-hover;
+        }
+    }
+}
+
+
+.mce-menu {
+    border-radius: 3px;
+}
+
+.mce-menu-item.mce-menu-item-normal.mce-stack-layout-item {
+    .mce-text, .mce-ico {
+        color: @ui-action-type;
+    }
+    &:hover {
+        background: @ui-action-hover;
+        .mce-text, .mce-ico {
+            color: @ui-action-type-hover;
+        }
+    }
+}
+
+.mce-menu-item.mce-menu-item-normal.mce-stack-layout-item.mce-active {
+    &, &:hover {
+        background: @gray-9;
+    }
+    .mce-text, .mce-ico {
+        color: @ui-action-type-hover;
+    }
+}
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.html
index 7bfc6d125e..fb6f3b2a4b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.html
@@ -1,4 +1,4 @@
-<div ng-controller="Umbraco.PropertyEditors.Grid.RichTextEditorController as vm">
+<div ng-controller="Umbraco.PropertyEditors.Grid.RichTextEditorController as vm" class="umb-rte">
 
 	<grid-rte
 		configuration="model.config.rte"

From 7e3cce91ebd948d1b1929e8dbf5005876cdc48f4 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 26 Sep 2019 15:27:59 +0200
Subject: [PATCH 734/776] Automatically assign LuceneIndexDiagnostics instead
 of GenericIndexDiagnostics for LuceneIndexes

---
 src/Umbraco.Web/Editors/ExamineManagementController.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/Editors/ExamineManagementController.cs b/src/Umbraco.Web/Editors/ExamineManagementController.cs
index 7c040ae508..0953b41cac 100644
--- a/src/Umbraco.Web/Editors/ExamineManagementController.cs
+++ b/src/Umbraco.Web/Editors/ExamineManagementController.cs
@@ -177,8 +177,12 @@ namespace Umbraco.Web.Editors
             var indexName = index.Name;
 
             if (!(index is IIndexDiagnostics indexDiag))
-                indexDiag = new GenericIndexDiagnostics(index);
-
+            {
+                if (index is LuceneIndex luceneIndex)
+                    indexDiag = new LuceneIndexDiagnostics(luceneIndex, Logger);
+                else
+                    indexDiag = new GenericIndexDiagnostics(index);
+            }
 
             var isHealth = indexDiag.IsHealthy();
             var properties = new Dictionary<string, object>

From 87df6c74c98498daf6994b3080fc5e3ddac42382 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Thu, 26 Sep 2019 14:31:20 +0100
Subject: [PATCH 735/776] * Ensure you can only drag and drop or paste images
 in when the insert image/media button is enabled in thr RTE toolbar/config *
 If disallowed then we add a new native browser event for dragover etc to
 prevent dropping & showing the no/stop sign icon

---
 .../src/common/services/tinymce.service.js    | 48 ++++++++++++++++---
 1 file changed, 42 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index a91e3d6ecc..27b02e7976 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -338,15 +338,28 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                     body_class: "umb-rte",
 
                     //see http://archive.tinymce.com/wiki.php/Configuration:cache_suffix
-                    cache_suffix: "?umb__rnd=" + Umbraco.Sys.ServerVariables.application.cacheBuster,
+                    cache_suffix: "?umb__rnd=" + Umbraco.Sys.ServerVariables.application.cacheBuster
+                };
+
+                // Need to check if we are allowed to UPLOAD images
+                // This is done by checking if the insert image toolbar button is available
+                var insertMediaButtonFound = false;
+                args.toolbar.forEach(toolbarItem => {
+                    if(toolbarItem.indexOf("umbmediapicker") > -1){
+                        insertMediaButtonFound = true;
+                    }
+                });
+
+                if(insertMediaButtonFound){
+                    // Update the TinyMCE Config object to allow pasting
+                    config.images_upload_handler = uploadImageHandler;
+                    config.automatic_uploads = false;
+                    config.images_replace_blob_uris = false;
 
                     // This allows images to be pasted in & stored as Base64 until they get uploaded to server
-                    paste_data_images: true,
+                    config.paste_data_images = true;
+                }
 
-                    images_upload_handler: uploadImageHandler,
-                    automatic_uploads: false,
-                    images_replace_blob_uris: false
-                };
 
                 if (args.htmlId) {
                     config.selector = "#" + args.htmlId;
@@ -1247,6 +1260,29 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                 startWatch();
             }
 
+            // If we can not find the insert image/media toolbar button
+            // Then we need to add an event listener to the editor
+            // That will update native browser drag & drop events
+            // To update the icon to show you can NOT drop something into the editor
+            var insertMediaButtonFound = false;
+            var toolbarItems = args.editor.settings.toolbar;
+            toolbarItems = toolbarItems.split(" ");
+            toolbarItems.forEach(toolbarItem => {
+                if(toolbarItem.indexOf("umbmediapicker") > -1){
+                    insertMediaButtonFound = true;
+                }
+            });
+
+            if(insertMediaButtonFound === false){
+                // Wire up the event listener
+                args.editor.on('dragend dragover draggesture dragdrop drop drag', function (e) {
+                    e.preventDefault();
+                    e.dataTransfer.effectAllowed = "none";
+                    e.dataTransfer.dropEffect = "none";
+                    e.stopPropagation();
+                });
+            }
+
             args.editor.on('SetContent', function (e) {
                 var content = e.content;
 

From b188bfa059c6f2fbb2379b476db0279e86ed5db8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20Ilie=20P=C3=AErvan?= <pirvanandrei@ymail.com>
Date: Thu, 26 Sep 2019 15:25:39 +0200
Subject: [PATCH 736/776] fix issue #6248

---
 .../stylesheets/infiniteeditors/richtextrule/richtextrule.html  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/stylesheets/infiniteeditors/richtextrule/richtextrule.html b/src/Umbraco.Web.UI.Client/src/views/stylesheets/infiniteeditors/richtextrule/richtextrule.html
index 5ff3d90588..cc5487d747 100644
--- a/src/Umbraco.Web.UI.Client/src/views/stylesheets/infiniteeditors/richtextrule/richtextrule.html
+++ b/src/Umbraco.Web.UI.Client/src/views/stylesheets/infiniteeditors/richtextrule/richtextrule.html
@@ -27,7 +27,7 @@
                         </umb-control-group>
 
                         <umb-control-group label="@stylesheet_styles" description="@stylesheet_stylesHelp">
-                            <textarea class="umb-stylesheet-rule-styles" ng-model="model.rule.styles" required></textarea>
+                            <textarea class="umb-stylesheet-rule-styles" ng-model="model.rule.styles" ng-required="model.rule.selector.charAt(0) === '.' || model.rule.selector.charAt(0) === '#' "></textarea>
                         </umb-control-group>
 
                         <umb-control-group label="@stylesheet_preview" description="@stylesheet_previewHelp">

From df858d47c2ae76ecd0215df1238dfadfd954bc8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Thu, 26 Sep 2019 15:40:51 +0200
Subject: [PATCH 737/776] fixing the looks for Grid

---
 src/Umbraco.Web.UI.Client/src/less/rte.less | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/rte.less b/src/Umbraco.Web.UI.Client/src/less/rte.less
index a02b341a06..f33617d03f 100644
--- a/src/Umbraco.Web.UI.Client/src/less/rte.less
+++ b/src/Umbraco.Web.UI.Client/src/less/rte.less
@@ -40,10 +40,6 @@
     white-space: normal;
 }
 
-.umb-rte .mce-top-part.mce-container {
-    padding: 1px 0;
-}
-
 .umb-rte .mce-tinymce .mce-edit-area {
     border-radius: 0px !important;
 }
@@ -99,6 +95,11 @@
     border-radius: 3px;
 }
 
+.umb-rte .mce-btn-group .mce-btn {
+    margin-top:2px;
+    margin-bottom:2px;
+}
+
 .umb-rte .mce-btn {
     button:hover {
         .mce-caret {
@@ -158,3 +159,7 @@
         color: @ui-action-type-hover;
     }
 }
+
+.umb-grid .umb-rte {
+    border: 1px solid #d8d7d9;
+}

From a59fffd891aaadd2510486bc9f76a15368d69172 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Thu, 26 Sep 2019 15:10:23 +0100
Subject: [PATCH 738/776] Keep it DRY

---
 .../src/common/services/tinymce.service.js    | 31 ++++++++-----------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 27b02e7976..16b1c6ec9d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -251,6 +251,16 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
         }
     }
 
+    function isMediaPickerEnabled(toolbarItemArray){
+        var insertMediaButtonFound = false;
+        toolbarItemArray.forEach(toolbarItem => {
+            if(toolbarItem.indexOf("umbmediapicker") > -1){
+                insertMediaButtonFound = true;
+            }
+        });
+        return insertMediaButtonFound;
+    }
+
     return {
 
         /**
@@ -343,14 +353,7 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
 
                 // Need to check if we are allowed to UPLOAD images
                 // This is done by checking if the insert image toolbar button is available
-                var insertMediaButtonFound = false;
-                args.toolbar.forEach(toolbarItem => {
-                    if(toolbarItem.indexOf("umbmediapicker") > -1){
-                        insertMediaButtonFound = true;
-                    }
-                });
-
-                if(insertMediaButtonFound){
+                if(isMediaPickerEnabled(args.toolbar)){
                     // Update the TinyMCE Config object to allow pasting
                     config.images_upload_handler = uploadImageHandler;
                     config.automatic_uploads = false;
@@ -1264,16 +1267,8 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
             // Then we need to add an event listener to the editor
             // That will update native browser drag & drop events
             // To update the icon to show you can NOT drop something into the editor
-            var insertMediaButtonFound = false;
-            var toolbarItems = args.editor.settings.toolbar;
-            toolbarItems = toolbarItems.split(" ");
-            toolbarItems.forEach(toolbarItem => {
-                if(toolbarItem.indexOf("umbmediapicker") > -1){
-                    insertMediaButtonFound = true;
-                }
-            });
-
-            if(insertMediaButtonFound === false){
+            var toolbarItems = args.editor.settings.toolbar.split(" ");
+            if(isMediaPickerEnabled(toolbarItems) === false){
                 // Wire up the event listener
                 args.editor.on('dragend dragover draggesture dragdrop drop drag', function (e) {
                     e.preventDefault();

From 9c366fe42b1a4544d04db0a9804486bf2450b76c Mon Sep 17 00:00:00 2001
From: BatJan <jaskov@gmail.com>
Date: Thu, 26 Sep 2019 15:52:56 +0200
Subject: [PATCH 739/776] Provide text alternatives for non-visual context

Co-authored-by: webdokkeren <thormadsenholm@gmail.com>
---
 .../views/dashboard/settings/healthcheck.html |   17 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/da.xml | 3238 ++++++-------
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml |  768 +--
 .../Umbraco/config/lang/en_us.xml             | 4312 +++++++++--------
 4 files changed, 4181 insertions(+), 4154 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/healthcheck.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/healthcheck.html
index 67d8562f7e..78df1975c8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/healthcheck.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/healthcheck.html
@@ -32,26 +32,41 @@
                             <umb-load-indicator></umb-load-indicator>
                         </div>
 
-                        <div class="umb-healthcheck-messages" ng-hide="group.loading || !group.totalSuccess && !group.totalWarning && !group.totalError && !group.totalInfo">
+                        <div
+                            class="umb-healthcheck-messages"
+                            ng-hide="group.loading || !group.totalSuccess && !group.totalWarning && !group.totalError && !group.totalInfo"
+                        >
 
                             <div class="umb-healthcheck-message" ng-if="group.totalSuccess > 0">
                                 <i class="icon-check color-green" aria-hidden="true"></i>
                                 {{ group.totalSuccess }}
+                                <span class="sr-only">
+                                    <localize key="visuallyHiddenTexts_passed">passed</localize>
+                                </span>
                             </div>
 
                             <div class="umb-healthcheck-message" ng-if="group.totalWarning > 0">
                                 <i class="icon-alert color-orange" aria-hidden="true"></i>
                                 {{ group.totalWarning }}
+                                <span class="sr-only">
+                                    <localize key="visuallyHiddenTexts_warning">warning</localize>
+                                </span>
                             </div>
 
                             <div class="umb-healthcheck-message" ng-if="group.totalError > 0">
                                 <i class="icon-delete color-red" aria-hidden="true"></i>
                                 {{ group.totalError }}
+                                <span class="sr-only">
+                                    <localize key="visuallyHiddenTexts_failed">failed</localize>
+                                </span>
                             </div>
 
                             <div class="umb-healthcheck-message" ng-if="group.totalInfo > 0">
                                 <i class="umb-healthcheck-status-icon icon-info" aria-hidden="true"></i>
                                 {{ group.totalInfo }}
+                                <span class="sr-only">
+                                    <localize key="visuallyHiddenTexts_suggestion">suggestion</localize>
+                                </span>
                             </div>
 
                         </div>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index 35b26f4f18..d44d32172a 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -1,1626 +1,1630 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<language alias="da" intName="Danish" localName="dansk" lcid="6" culture="da-DK">
-  <creator>
-    <name>The Umbraco community</name>
-    <link>https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files</link>
-  </creator>
-  <area alias="actions">
-    <key alias="assignDomain">Tilføj domæne</key>
-    <key alias="auditTrail">Revisionsspor</key>
-    <key alias="browse">Gennemse elementer</key>
-    <key alias="changeDocType">Skift dokumenttype</key>
-    <key alias="copy">Kopier</key>
-    <key alias="create">Opret</key>
-    <key alias="createPackage">Opret pakke</key>
-    <key alias="createGroup">Opret gruppe</key>
-    <key alias="delete">Slet</key>
-    <key alias="disable">Deaktivér</key>
-    <key alias="emptyRecycleBin">Tøm papirkurv</key>
-    <key alias="enable">Aktivér</key>
-    <key alias="exportDocumentType">Eksportér dokumenttype</key>
-    <key alias="importDocumentType">Importér dokumenttype</key>
-    <key alias="importPackage">Importér pakke</key>
-    <key alias="liveEdit">Redigér i Canvas</key>
-    <key alias="logout">Log af</key>
-    <key alias="move">Flyt</key>
-    <key alias="notify">Notificeringer</key>
-    <key alias="protect">Offentlig adgang</key>
-    <key alias="publish">Udgiv</key>
-    <key alias="unpublish">Afpublicér</key>
-    <key alias="refreshNode">Genindlæs elementer</key>
-    <key alias="republish">Genudgiv hele sitet</key>
-    <key alias="rename" version="7.3.0">Omdøb</key>
-    <key alias="restore" version="7.3.0">Gendan</key>
-    <key alias="SetPermissionsForThePage">Sæt rettigheder for siden %0%</key>
-    <key alias="chooseWhereToCopy">Vælg hvor du vil kopiere</key>
-    <key alias="chooseWhereToMove">Vælg hvortil du vil flytte</key>
-    <key alias="toInTheTreeStructureBelow">til i træstrukturen nedenfor</key>
-    <key alias="wasMovedTo">blev flyttet til</key>
-    <key alias="wasCopiedTo">blev kopieret til</key>
-    <key alias="wasDeleted">blev slettet</key>
-    <key alias="rights">Rettigheder</key>
-    <key alias="rollback">Fortryd ændringer</key>
-    <key alias="sendtopublish">Send til udgivelse</key>
-    <key alias="sendToTranslate">Send til oversættelse</key>
-    <key alias="setGroup">Sæt gruppe</key>
-    <key alias="sort">Sortér</key>
-    <key alias="toPublish">Send til udgivelse</key>
-    <key alias="translate">Oversæt</key>
-    <key alias="update">Opdatér</key>
-    <key alias="setPermissions">Sæt rettigheder</key>
-    <key alias="unlock">Lås op</key>
-    <key alias="createblueprint">Opret indholdsskabelon</key>
-    <key alias="defaultValue">Standard værdi</key>
-  </area>
-  <area alias="actionCategories">
-    <key alias="content">Indhold</key>
-    <key alias="administration">Administration</key>
-    <key alias="structure">Struktur</key>
-    <key alias="other">Andet</key>
-  </area>
-  <area alias="actionDescriptions">
-    <key alias="assignDomain">Tillad adgang til at tildele sprog og domæner</key>
-    <key alias="auditTrail">Tillad adgang for at få vist en nodes historik</key>
-    <key alias="browse">Tillad adgang for at få vist en node</key>
-    <key alias="changeDocType">Tillad adgang til at ændre dokumenttype for en node</key>
-    <key alias="copy">Tillad adgang til at kopiere en node</key>
-    <key alias="create">Tillad adgang til at oprette noder</key>
-    <key alias="delete">Tillad adgang til at slette noder</key>
-    <key alias="move">Tillad adgang til at flytte en node</key>
-    <key alias="protect">Tillad adgang til at indstille og ændre offentlig adgang til en node</key>
-    <key alias="publish">Tillad adgang til at udgive en node</key>
-    <key alias="rights">Tillad adgang til at ændre rettigheder for en node</key>
-    <key alias="rollback">Tillad adgang til at returnere en node til en tidligere tilstand</key>
-    <key alias="sendtopublish">Tillad adgang til at sende en node til godkendelse før den udgives</key>
-    <key alias="sendToTranslate">Tillad adgang til at sende en node til oversættelse</key>
-    <key alias="sort">Tillad adgang til at ændre sorteringsrækkefølge for noder</key>
-    <key alias="translate">Tillad adgang til at oversætte en node</key>
-    <key alias="update">Tillad adgang til at gemme en node</key>
-    <key alias="createblueprint">Tillad adgang til at oprette en indholdsskabelon</key>
-  </area>
-  <area alias="apps">
-    <key alias="umbContent">Indhold</key>
-    <key alias="umbInfo">Info</key>
-  </area>
-  <area alias="assignDomain">
-    <key alias="permissionDenied">Tilladelse nægtet.</key>
-    <key alias="addNew">Tilføj nyt domæne</key>
-    <key alias="remove">fjern</key>
-    <key alias="invalidNode">Ugyldig node.</key>
-    <key alias="invalidDomain">Et eller flere domæner har et ugyldigt format.</key>
-    <key alias="duplicateDomain">Domæne er allerede blevet tildelt.</key>
-    <key alias="language">Sprog</key>
-    <key alias="domain">Domæne</key>
-    <key alias="domainCreated">Domænet '%0%' er nu oprettet og tilknyttet siden</key>
-    <key alias="domainDeleted">Domænet '%0%' er nu slettet</key>
-    <key alias="domainExists">Domænet '%0%' er oprettet</key>
-    <key alias="domainUpdated">Domænet '%0%' er nu opdateret</key>
-    <key alias="orEdit">eller rediger nuværende domæner</key>
-    <key alias="domainHelpWithVariants"><![CDATA[Gyldige domænenavne er: "example.com", "www.example.com", "example.com:8080" eller "https://www.example.com/".
-     Yderlgiere understøttes også første niveau af stien efter domænet, f.eks. "Example.com/en" eller "/en". ]]></key>
-    <key alias="inherit">Nedarv</key>
-    <key alias="setLanguage">Sprog</key>
-    <key alias="setLanguageHelp"><![CDATA[Indstil sproget for noder under den aktuelle node,<br /> eller nedarv sprog fra forældre noder. Gælder også<br />
-      for den aktuelle node, medmindre et domæne nedenfor også indstiller et sprog.]]></key>
-    <key alias="setDomains">Domæner</key>
-  </area>
-  <area alias="buttons">
-    <key alias="clearSelection">Ryd valg</key>
-    <key alias="select">Vælg</key>
-    <key alias="somethingElse">Gør noget andet</key>
-    <key alias="bold">Fed</key>
-    <key alias="deindent">Fortryd indryk afsnit</key>
-    <key alias="formFieldInsert">Indsæt formularfelt</key>
-    <key alias="graphicHeadline">Indsæt grafisk overskrift</key>
-    <key alias="htmlEdit">Redigér Html</key>
-    <key alias="indent">Indryk afsnit</key>
-    <key alias="italic">Kursiv</key>
-    <key alias="justifyCenter">Centrér</key>
-    <key alias="justifyLeft">Venstrestil afsnit</key>
-    <key alias="justifyRight">Højrestil afsnit</key>
-    <key alias="linkInsert">Indsæt link</key>
-    <key alias="linkLocal">Indsæt lokalt link (anker)</key>
-    <key alias="listBullet">Punktopstilling</key>
-    <key alias="listNumeric">Nummerorden</key>
-    <key alias="macroInsert">Indsæt makro</key>
-    <key alias="pictureInsert">Indsæt billede</key>
-    <key alias="publishAndClose">Udgiv og luk</key>
-    <key alias="publishDescendants">Udgiv med undersider</key>
-    <key alias="relations">Redigér relationer</key>
-    <key alias="returnToList">Tilbage til listen</key>
-    <key alias="save">Gem</key>
-    <key alias="saveAndClose">Gem og luk</key>
-    <key alias="saveAndPublish">Gem og udgiv</key>
-    <key alias="saveAndSchedule">Gem og planlæg</key>
-    <key alias="saveToPublish">Gem og send til udgivelse</key>
-    <key alias="saveListView">Gem listevisning</key>
-    <key alias="schedulePublish">Planlæg</key>
-    <key alias="showPage">Forhåndsvisning</key>
-    <key alias="showPageDisabled">Forhåndsvisning er deaktiveret fordi der ikke er nogen skabelon tildelt</key>
-    <key alias="styleChoose">Vælg formattering</key>
-    <key alias="styleShow">Vis koder</key>
-    <key alias="tableInsert">Indsæt tabel</key>
-    <key alias="saveAndGenerateModels">Gem og generer modeller</key>
-    <key alias="undo">Fortryd</key>
-    <key alias="redo">Genskab</key>
-    <key alias="deleteTag">Slet tag</key>
-    <key alias="confirmActionCancel">Fortryd</key>
-    <key alias="confirmActionConfirm">Bekræft</key>
-	<key alias="morePublishingOptions">Flere publiseringsmuligheder</key>
-  </area>
-  <area alias="auditTrails">
-    <key alias="atViewingFor">For</key>
-    <key alias="delete">Brugeren har slettet indholdet</key>
-    <key alias="unpublish">Brugeren har afpubliceret indholdet</key>
-    <key alias="publish">Brugeren har gemt og udgivet indholdet</key>
-    <key alias="publishvariant">Brugeren har gemt og udgivet indholdet for sprogene: %0% </key>
-    <key alias="save">Brugeren har gemt indholdet</key>
-    <key alias="move">Brugeren har flyttet indholdet</key>
-    <key alias="copy">Brugeren har kopieret indholdet</key>
-    <key alias="rollback">Brugeren har tilbagerullet indholdet til en tidligere tilstand</key>
-    <key alias="sendtopublish">Brugeren har sendt indholdet til udgivelse</key>
-    <key alias="sendtotranslate">Brugeren har sendt indholdet til oversættelse</key>
-    <key alias="sort">Brugeren har sorteret de underliggende sider</key>
-    <key alias="smallCopy">Kopieret</key>
-    <key alias="smallPublish">Udgivet</key>
-    <key alias="smallMove">Flyttet</key>
-    <key alias="smallSave">Gemt</key>
-    <key alias="smallDelete">Slettet</key>
-    <key alias="smallUnpublish">Afpubliceret</key>
-    <key alias="smallRollBack">Indhold tilbagerullet</key>
-    <key alias="smallSendToPublish">Sendt til udgivelse</key>
-    <key alias="smallSendToTranslate">Sendt til oversættelse</key>
-    <key alias="smallSort">Sorteret</key>
-    <key alias="historyIncludingVariants">Historik (alle sprog)</key>
-  </area>
-  <area alias="changeDocType">
-    <key alias="changeDocTypeInstruction">For at skifte det valgte indholds dokumenttype, skal du først vælge en ny dokumenttype, som er gyldig på denne placering.</key>
-    <key alias="changeDocTypeInstruction2">Kontroller derefter, at alle egenskaber bliver overført rigtigt til den nye dokumenttype, og klik derefter på Gem.</key>
-    <key alias="contentRepublished">Indholdet er blevet genudgivet.</key>
-    <key alias="currentProperty">Nuværende egenskab</key>
-    <key alias="currentType">Nuværende type</key>
-    <key alias="docTypeCannotBeChanged">Du kan ikke skifte dokumenttype, da der ikke er andre gyldige dokumenttyper på denne placering.</key>
-    <key alias="docTypeChanged">Dokumenttype skiftet</key>
-    <key alias="mapProperties">Overfør egenskaber</key>
-    <key alias="mapToProperty">Overfør til egenskab</key>
-    <key alias="newTemplate">Ny skabelon</key>
-    <key alias="newType">Ny type</key>
-    <key alias="none">ingen</key>
-    <key alias="selectedContent">Indhold</key>
-    <key alias="selectNewDocType">Vælg ny dokumenttype</key>
-    <key alias="successMessage">Dokumenttypen på detvalgte indhold blev skiftet til [new type], og følgende egenskaber blev overført:</key>
-    <key alias="to">til</key>
-    <key alias="validationErrorPropertyWithMoreThanOneMapping">Overførsel af egenskaber kunne ikke fuldføres, da en eller flere egenskaber er indstillet til at blive overført mere end én gang.</key>
-    <key alias="validDocTypesNote">Kun andre dokumenttyper, der er gyldige på denne placering, vises.</key>
-  </area>
-  <area alias="codefile">
-    <key alias="createFolderFailedById">Oprettelse af mappen under parent med ID %0% fejlede</key>
-    <key alias="createFolderFailedByName">Oprettelse af mappen under parent med navnet %0% fejlede</key>
-    <key alias="createFolderIllegalChars">Mappens navn må ikke indeholde ugyldige tegn.</key>
-    <key alias="deleteItemFailed">Sletning af filen/mappen fejlede: %0%</key>
-  </area>
-  <area alias="content">
-    <key alias="isPublished" version="7.2">Udgivet</key>
-    <key alias="about">Om siden</key>
-    <key alias="alias">Alias</key>
-    <key alias="alternativeTextHelp">(hvordan ville du f.eks. beskrive billedet via telefonen?)</key>
-    <key alias="alternativeUrls">Alternative links</key>
-    <key alias="clickToEdit">Klik for at redigere dette punkt</key>
-    <key alias="createBy">Oprettet af</key>
-    <key alias="createByDesc" version="7.0">Oprindelig forfatter</key>
-    <key alias="updatedBy" version="7.0">Opdateret af</key>
-    <key alias="createDate">Oprettet den</key>
-    <key alias="createDateDesc" version="7.0">Tidspunkt for oprettelse</key>
-    <key alias="documentType">Dokumenttype</key>
-    <key alias="editing">Redigerer</key>
-    <key alias="expireDate">Nedtagningsdato</key>
-    <key alias="itemChanged">Dette punkt er ændret siden udgivelsen</key>
-    <key alias="itemNotPublished">Dette punkt er endnu ikke udgivet</key>
-    <key alias="lastPublished">Sidst udgivet</key>
-    <key alias="noItemsToShow">Der er ingen elementer at vise</key>
-    <key alias="listViewNoItems" version="7.1.5">Der er ingen elementer at vise på listen.</key>
-    <key alias="listViewNoContent">Intet indhold er blevet tilføjet</key>
-    <key alias="listViewNoMembers">Ingen medlemmer er blevet tilføjet</key>
-    <key alias="mediatype">Medietype</key>
-    <key alias="mediaLinks">Link til medie(r)</key>
-    <key alias="membergroup">Medlemsgruppe</key>
-    <key alias="memberrole">Rolle</key>
-    <key alias="membertype">Medlemstype</key>
-    <key alias="noChanges">Der er endnu ikke lavet nogle ændringer.</key>
-    <key alias="noDate">Ingen dato valgt</key>
-    <key alias="nodeName">Sidetitel</key>
-    <key alias="otherElements">Egenskaber</key>
-    <key alias="parentNotPublished">Dette dokument er udgivet, men ikke synligt da den overliggende side '%0%' ikke er udgivet!</key>
-    <key alias="parentNotPublishedAnomaly">Ups: dette dokument er udgivet, men er ikke i cachen (intern fejl)</key>
-    <key alias="getUrlException">Kunne ikke hente url'en</key>
-    <key alias="routeError">Dette dokument er udgivet, men dets url ville kollidere med indholdet %0%</key>
-    <key alias="publish">Udgiv</key>
-    <key alias="published">Udgivet</key>
-    <key alias="publishedPendingChanges">Udgivet (Ventede ændringer)</key>
-    <key alias="publishStatus">Udgivelsesstatus</key>
-    <key alias="publishDescendantsHelp"><![CDATA[Klik <em>Udgiv med undersider</em> for at udgive <strong>%0%</strong> og alle sider under og dermed gøre deres indhold offentligt tilgængelige.]]></key>
-    <key alias="publishDescendantsWithVariantsHelp"><![CDATA[Klik <em>Udgiv med undersider</em> for at udgive <strong>de valgte sprog</strong> og de samme sprog for sider under og dermed gøre deres indhold offentligt tilgængelige.]]></key>
-    <key alias="releaseDate">Udgivelsesdato</key>
-    <key alias="unpublishDate">Afpubliceringsdato</key>
-    <key alias="removeDate">Fjern dato</key>
-    <key alias="setDate">Vælg dato</key>
-    <key alias="sortDone">Sorteringsrækkefølgen er opdateret</key>
-    <key alias="sortHelp">For at sortere, træk siderne eller klik på en af kolonnehovederne. Du kan vælge flere sider ved at holde "shift" eller "control" nede mens du vælger.</key>
-    <key alias="statistics">Statistik</key>
-    <key alias="titleOptional">Titel (valgfri)</key>
-    <key alias="altTextOptional">Alternativ tekst (valgfri)</key>
-    <key alias="type">Type</key>
-    <key alias="unpublish">Afpublicér</key>
-    <key alias="unpublished">Afpubliceret</key>
-    <key alias="notCreated">Ikke oprettet</key>
-    <key alias="updateDate">Sidst redigeret</key>
-    <key alias="updateDateDesc" version="7.0">Tidspunkt for seneste redigering</key>
-    <key alias="uploadClear">Fjern fil</key>
-    <key alias="urls">Link til dokument</key>
-    <key alias="memberof">Medlem af grupper(ne)</key>
-    <key alias="notmemberof">Ikke medlem af grupper(ne)</key>
-    <key alias="childItems" version="7.0">Undersider</key>
-    <key alias="target" version="7.0">Åben i vindue</key>
-    <key alias="scheduledPublishServerTime">Dette oversætter til den følgende tid på serveren:</key>
-    <key alias="scheduledPublishDocumentation"><![CDATA[<a href="https://our.umbraco.com/documentation/Getting-Started/Data/Scheduled-Publishing/#timezones" target="_blank">Hvad betyder det?</a>]]></key>
-    <key alias="nestedContentDeleteItem">Er du sikker på, at du vil slette dette element?</key>
-    <key alias="nestedContentEditorNotSupported">Egenskaben %0% anvender editoren %1% som ikke er understøttet af Nested Content.</key>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<language alias="da" intName="Danish" localName="dansk" lcid="6" culture="da-DK">
+  <creator>
+    <name>The Umbraco community</name>
+    <link>https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files</link>
+  </creator>
+  <area alias="actions">
+    <key alias="assignDomain">Tilføj domæne</key>
+    <key alias="auditTrail">Revisionsspor</key>
+    <key alias="browse">Gennemse elementer</key>
+    <key alias="changeDocType">Skift dokumenttype</key>
+    <key alias="copy">Kopier</key>
+    <key alias="create">Opret</key>
+    <key alias="createPackage">Opret pakke</key>
+    <key alias="createGroup">Opret gruppe</key>
+    <key alias="delete">Slet</key>
+    <key alias="disable">Deaktivér</key>
+    <key alias="emptyRecycleBin">Tøm papirkurv</key>
+    <key alias="enable">Aktivér</key>
+    <key alias="exportDocumentType">Eksportér dokumenttype</key>
+    <key alias="importDocumentType">Importér dokumenttype</key>
+    <key alias="importPackage">Importér pakke</key>
+    <key alias="liveEdit">Redigér i Canvas</key>
+    <key alias="logout">Log af</key>
+    <key alias="move">Flyt</key>
+    <key alias="notify">Notificeringer</key>
+    <key alias="protect">Offentlig adgang</key>
+    <key alias="publish">Udgiv</key>
+    <key alias="unpublish">Afpublicér</key>
+    <key alias="refreshNode">Genindlæs elementer</key>
+    <key alias="republish">Genudgiv hele sitet</key>
+    <key alias="rename" version="7.3.0">Omdøb</key>
+    <key alias="restore" version="7.3.0">Gendan</key>
+    <key alias="SetPermissionsForThePage">Sæt rettigheder for siden %0%</key>
+    <key alias="chooseWhereToCopy">Vælg hvor du vil kopiere</key>
+    <key alias="chooseWhereToMove">Vælg hvortil du vil flytte</key>
+    <key alias="toInTheTreeStructureBelow">til i træstrukturen nedenfor</key>
+    <key alias="wasMovedTo">blev flyttet til</key>
+    <key alias="wasCopiedTo">blev kopieret til</key>
+    <key alias="wasDeleted">blev slettet</key>
+    <key alias="rights">Rettigheder</key>
+    <key alias="rollback">Fortryd ændringer</key>
+    <key alias="sendtopublish">Send til udgivelse</key>
+    <key alias="sendToTranslate">Send til oversættelse</key>
+    <key alias="setGroup">Sæt gruppe</key>
+    <key alias="sort">Sortér</key>
+    <key alias="toPublish">Send til udgivelse</key>
+    <key alias="translate">Oversæt</key>
+    <key alias="update">Opdatér</key>
+    <key alias="setPermissions">Sæt rettigheder</key>
+    <key alias="unlock">Lås op</key>
+    <key alias="createblueprint">Opret indholdsskabelon</key>
+    <key alias="defaultValue">Standard værdi</key>
+  </area>
+  <area alias="actionCategories">
+    <key alias="content">Indhold</key>
+    <key alias="administration">Administration</key>
+    <key alias="structure">Struktur</key>
+    <key alias="other">Andet</key>
+  </area>
+  <area alias="actionDescriptions">
+    <key alias="assignDomain">Tillad adgang til at tildele sprog og domæner</key>
+    <key alias="auditTrail">Tillad adgang for at få vist en nodes historik</key>
+    <key alias="browse">Tillad adgang for at få vist en node</key>
+    <key alias="changeDocType">Tillad adgang til at ændre dokumenttype for en node</key>
+    <key alias="copy">Tillad adgang til at kopiere en node</key>
+    <key alias="create">Tillad adgang til at oprette noder</key>
+    <key alias="delete">Tillad adgang til at slette noder</key>
+    <key alias="move">Tillad adgang til at flytte en node</key>
+    <key alias="protect">Tillad adgang til at indstille og ændre offentlig adgang til en node</key>
+    <key alias="publish">Tillad adgang til at udgive en node</key>
+    <key alias="rights">Tillad adgang til at ændre rettigheder for en node</key>
+    <key alias="rollback">Tillad adgang til at returnere en node til en tidligere tilstand</key>
+    <key alias="sendtopublish">Tillad adgang til at sende en node til godkendelse før den udgives</key>
+    <key alias="sendToTranslate">Tillad adgang til at sende en node til oversættelse</key>
+    <key alias="sort">Tillad adgang til at ændre sorteringsrækkefølge for noder</key>
+    <key alias="translate">Tillad adgang til at oversætte en node</key>
+    <key alias="update">Tillad adgang til at gemme en node</key>
+    <key alias="createblueprint">Tillad adgang til at oprette en indholdsskabelon</key>
+  </area>
+  <area alias="apps">
+    <key alias="umbContent">Indhold</key>
+    <key alias="umbInfo">Info</key>
+  </area>
+  <area alias="assignDomain">
+    <key alias="permissionDenied">Tilladelse nægtet.</key>
+    <key alias="addNew">Tilføj nyt domæne</key>
+    <key alias="remove">fjern</key>
+    <key alias="invalidNode">Ugyldig node.</key>
+    <key alias="invalidDomain">Et eller flere domæner har et ugyldigt format.</key>
+    <key alias="duplicateDomain">Domæne er allerede blevet tildelt.</key>
+    <key alias="language">Sprog</key>
+    <key alias="domain">Domæne</key>
+    <key alias="domainCreated">Domænet '%0%' er nu oprettet og tilknyttet siden</key>
+    <key alias="domainDeleted">Domænet '%0%' er nu slettet</key>
+    <key alias="domainExists">Domænet '%0%' er oprettet</key>
+    <key alias="domainUpdated">Domænet '%0%' er nu opdateret</key>
+    <key alias="orEdit">eller rediger nuværende domæner</key>
+    <key alias="domainHelpWithVariants"><![CDATA[Gyldige domænenavne er: "example.com", "www.example.com", "example.com:8080" eller "https://www.example.com/".
+     Yderlgiere understøttes også første niveau af stien efter domænet, f.eks. "Example.com/en" eller "/en". ]]></key>
+    <key alias="inherit">Nedarv</key>
+    <key alias="setLanguage">Sprog</key>
+    <key alias="setLanguageHelp"><![CDATA[Indstil sproget for noder under den aktuelle node,<br /> eller nedarv sprog fra forældre noder. Gælder også<br />
+      for den aktuelle node, medmindre et domæne nedenfor også indstiller et sprog.]]></key>
+    <key alias="setDomains">Domæner</key>
+  </area>
+  <area alias="buttons">
+    <key alias="clearSelection">Ryd valg</key>
+    <key alias="select">Vælg</key>
+    <key alias="somethingElse">Gør noget andet</key>
+    <key alias="bold">Fed</key>
+    <key alias="deindent">Fortryd indryk afsnit</key>
+    <key alias="formFieldInsert">Indsæt formularfelt</key>
+    <key alias="graphicHeadline">Indsæt grafisk overskrift</key>
+    <key alias="htmlEdit">Redigér Html</key>
+    <key alias="indent">Indryk afsnit</key>
+    <key alias="italic">Kursiv</key>
+    <key alias="justifyCenter">Centrér</key>
+    <key alias="justifyLeft">Venstrestil afsnit</key>
+    <key alias="justifyRight">Højrestil afsnit</key>
+    <key alias="linkInsert">Indsæt link</key>
+    <key alias="linkLocal">Indsæt lokalt link (anker)</key>
+    <key alias="listBullet">Punktopstilling</key>
+    <key alias="listNumeric">Nummerorden</key>
+    <key alias="macroInsert">Indsæt makro</key>
+    <key alias="pictureInsert">Indsæt billede</key>
+    <key alias="publishAndClose">Udgiv og luk</key>
+    <key alias="publishDescendants">Udgiv med undersider</key>
+    <key alias="relations">Redigér relationer</key>
+    <key alias="returnToList">Tilbage til listen</key>
+    <key alias="save">Gem</key>
+    <key alias="saveAndClose">Gem og luk</key>
+    <key alias="saveAndPublish">Gem og udgiv</key>
+    <key alias="saveAndSchedule">Gem og planlæg</key>
+    <key alias="saveToPublish">Gem og send til udgivelse</key>
+    <key alias="saveListView">Gem listevisning</key>
+    <key alias="schedulePublish">Planlæg</key>
+    <key alias="showPage">Forhåndsvisning</key>
+    <key alias="showPageDisabled">Forhåndsvisning er deaktiveret fordi der ikke er nogen skabelon tildelt</key>
+    <key alias="styleChoose">Vælg formattering</key>
+    <key alias="styleShow">Vis koder</key>
+    <key alias="tableInsert">Indsæt tabel</key>
+    <key alias="saveAndGenerateModels">Gem og generer modeller</key>
+    <key alias="undo">Fortryd</key>
+    <key alias="redo">Genskab</key>
+    <key alias="deleteTag">Slet tag</key>
+    <key alias="confirmActionCancel">Fortryd</key>
+    <key alias="confirmActionConfirm">Bekræft</key>
+	<key alias="morePublishingOptions">Flere publiseringsmuligheder</key>
+  </area>
+  <area alias="auditTrails">
+    <key alias="atViewingFor">For</key>
+    <key alias="delete">Brugeren har slettet indholdet</key>
+    <key alias="unpublish">Brugeren har afpubliceret indholdet</key>
+    <key alias="publish">Brugeren har gemt og udgivet indholdet</key>
+    <key alias="publishvariant">Brugeren har gemt og udgivet indholdet for sprogene: %0% </key>
+    <key alias="save">Brugeren har gemt indholdet</key>
+    <key alias="move">Brugeren har flyttet indholdet</key>
+    <key alias="copy">Brugeren har kopieret indholdet</key>
+    <key alias="rollback">Brugeren har tilbagerullet indholdet til en tidligere tilstand</key>
+    <key alias="sendtopublish">Brugeren har sendt indholdet til udgivelse</key>
+    <key alias="sendtotranslate">Brugeren har sendt indholdet til oversættelse</key>
+    <key alias="sort">Brugeren har sorteret de underliggende sider</key>
+    <key alias="smallCopy">Kopieret</key>
+    <key alias="smallPublish">Udgivet</key>
+    <key alias="smallMove">Flyttet</key>
+    <key alias="smallSave">Gemt</key>
+    <key alias="smallDelete">Slettet</key>
+    <key alias="smallUnpublish">Afpubliceret</key>
+    <key alias="smallRollBack">Indhold tilbagerullet</key>
+    <key alias="smallSendToPublish">Sendt til udgivelse</key>
+    <key alias="smallSendToTranslate">Sendt til oversættelse</key>
+    <key alias="smallSort">Sorteret</key>
+    <key alias="historyIncludingVariants">Historik (alle sprog)</key>
+  </area>
+  <area alias="changeDocType">
+    <key alias="changeDocTypeInstruction">For at skifte det valgte indholds dokumenttype, skal du først vælge en ny dokumenttype, som er gyldig på denne placering.</key>
+    <key alias="changeDocTypeInstruction2">Kontroller derefter, at alle egenskaber bliver overført rigtigt til den nye dokumenttype, og klik derefter på Gem.</key>
+    <key alias="contentRepublished">Indholdet er blevet genudgivet.</key>
+    <key alias="currentProperty">Nuværende egenskab</key>
+    <key alias="currentType">Nuværende type</key>
+    <key alias="docTypeCannotBeChanged">Du kan ikke skifte dokumenttype, da der ikke er andre gyldige dokumenttyper på denne placering.</key>
+    <key alias="docTypeChanged">Dokumenttype skiftet</key>
+    <key alias="mapProperties">Overfør egenskaber</key>
+    <key alias="mapToProperty">Overfør til egenskab</key>
+    <key alias="newTemplate">Ny skabelon</key>
+    <key alias="newType">Ny type</key>
+    <key alias="none">ingen</key>
+    <key alias="selectedContent">Indhold</key>
+    <key alias="selectNewDocType">Vælg ny dokumenttype</key>
+    <key alias="successMessage">Dokumenttypen på detvalgte indhold blev skiftet til [new type], og følgende egenskaber blev overført:</key>
+    <key alias="to">til</key>
+    <key alias="validationErrorPropertyWithMoreThanOneMapping">Overførsel af egenskaber kunne ikke fuldføres, da en eller flere egenskaber er indstillet til at blive overført mere end én gang.</key>
+    <key alias="validDocTypesNote">Kun andre dokumenttyper, der er gyldige på denne placering, vises.</key>
+  </area>
+  <area alias="codefile">
+    <key alias="createFolderFailedById">Oprettelse af mappen under parent med ID %0% fejlede</key>
+    <key alias="createFolderFailedByName">Oprettelse af mappen under parent med navnet %0% fejlede</key>
+    <key alias="createFolderIllegalChars">Mappens navn må ikke indeholde ugyldige tegn.</key>
+    <key alias="deleteItemFailed">Sletning af filen/mappen fejlede: %0%</key>
+  </area>
+  <area alias="content">
+    <key alias="isPublished" version="7.2">Udgivet</key>
+    <key alias="about">Om siden</key>
+    <key alias="alias">Alias</key>
+    <key alias="alternativeTextHelp">(hvordan ville du f.eks. beskrive billedet via telefonen?)</key>
+    <key alias="alternativeUrls">Alternative links</key>
+    <key alias="clickToEdit">Klik for at redigere dette punkt</key>
+    <key alias="createBy">Oprettet af</key>
+    <key alias="createByDesc" version="7.0">Oprindelig forfatter</key>
+    <key alias="updatedBy" version="7.0">Opdateret af</key>
+    <key alias="createDate">Oprettet den</key>
+    <key alias="createDateDesc" version="7.0">Tidspunkt for oprettelse</key>
+    <key alias="documentType">Dokumenttype</key>
+    <key alias="editing">Redigerer</key>
+    <key alias="expireDate">Nedtagningsdato</key>
+    <key alias="itemChanged">Dette punkt er ændret siden udgivelsen</key>
+    <key alias="itemNotPublished">Dette punkt er endnu ikke udgivet</key>
+    <key alias="lastPublished">Sidst udgivet</key>
+    <key alias="noItemsToShow">Der er ingen elementer at vise</key>
+    <key alias="listViewNoItems" version="7.1.5">Der er ingen elementer at vise på listen.</key>
+    <key alias="listViewNoContent">Intet indhold er blevet tilføjet</key>
+    <key alias="listViewNoMembers">Ingen medlemmer er blevet tilføjet</key>
+    <key alias="mediatype">Medietype</key>
+    <key alias="mediaLinks">Link til medie(r)</key>
+    <key alias="membergroup">Medlemsgruppe</key>
+    <key alias="memberrole">Rolle</key>
+    <key alias="membertype">Medlemstype</key>
+    <key alias="noChanges">Der er endnu ikke lavet nogle ændringer.</key>
+    <key alias="noDate">Ingen dato valgt</key>
+    <key alias="nodeName">Sidetitel</key>
+    <key alias="otherElements">Egenskaber</key>
+    <key alias="parentNotPublished">Dette dokument er udgivet, men ikke synligt da den overliggende side '%0%' ikke er udgivet!</key>
+    <key alias="parentNotPublishedAnomaly">Ups: dette dokument er udgivet, men er ikke i cachen (intern fejl)</key>
+    <key alias="getUrlException">Kunne ikke hente url'en</key>
+    <key alias="routeError">Dette dokument er udgivet, men dets url ville kollidere med indholdet %0%</key>
+    <key alias="publish">Udgiv</key>
+    <key alias="published">Udgivet</key>
+    <key alias="publishedPendingChanges">Udgivet (Ventede ændringer)</key>
+    <key alias="publishStatus">Udgivelsesstatus</key>
+    <key alias="publishDescendantsHelp"><![CDATA[Klik <em>Udgiv med undersider</em> for at udgive <strong>%0%</strong> og alle sider under og dermed gøre deres indhold offentligt tilgængelige.]]></key>
+    <key alias="publishDescendantsWithVariantsHelp"><![CDATA[Klik <em>Udgiv med undersider</em> for at udgive <strong>de valgte sprog</strong> og de samme sprog for sider under og dermed gøre deres indhold offentligt tilgængelige.]]></key>
+    <key alias="releaseDate">Udgivelsesdato</key>
+    <key alias="unpublishDate">Afpubliceringsdato</key>
+    <key alias="removeDate">Fjern dato</key>
+    <key alias="setDate">Vælg dato</key>
+    <key alias="sortDone">Sorteringsrækkefølgen er opdateret</key>
+    <key alias="sortHelp">For at sortere, træk siderne eller klik på en af kolonnehovederne. Du kan vælge flere sider ved at holde "shift" eller "control" nede mens du vælger.</key>
+    <key alias="statistics">Statistik</key>
+    <key alias="titleOptional">Titel (valgfri)</key>
+    <key alias="altTextOptional">Alternativ tekst (valgfri)</key>
+    <key alias="type">Type</key>
+    <key alias="unpublish">Afpublicér</key>
+    <key alias="unpublished">Afpubliceret</key>
+    <key alias="notCreated">Ikke oprettet</key>
+    <key alias="updateDate">Sidst redigeret</key>
+    <key alias="updateDateDesc" version="7.0">Tidspunkt for seneste redigering</key>
+    <key alias="uploadClear">Fjern fil</key>
+    <key alias="urls">Link til dokument</key>
+    <key alias="memberof">Medlem af grupper(ne)</key>
+    <key alias="notmemberof">Ikke medlem af grupper(ne)</key>
+    <key alias="childItems" version="7.0">Undersider</key>
+    <key alias="target" version="7.0">Åben i vindue</key>
+    <key alias="scheduledPublishServerTime">Dette oversætter til den følgende tid på serveren:</key>
+    <key alias="scheduledPublishDocumentation"><![CDATA[<a href="https://our.umbraco.com/documentation/Getting-Started/Data/Scheduled-Publishing/#timezones" target="_blank">Hvad betyder det?</a>]]></key>
+    <key alias="nestedContentDeleteItem">Er du sikker på, at du vil slette dette element?</key>
+    <key alias="nestedContentEditorNotSupported">Egenskaben %0% anvender editoren %1% som ikke er understøttet af Nested Content.</key>
     <key alias="nestedContentNoContentTypes">Der er ikke konfigureret nogen indholdstyper for denne egenskab.</key>
-    <key alias="addTextBox">Tilføj en ny tekstboks</key>
-    <key alias="removeTextBox">Fjern denne tekstboks</key>
-    <key alias="contentRoot">Indholdsrod</key>
-    <key alias="includeUnpublished">Medtag udkast: udgiv også ikke-publicerede sider.</key>
-    <key alias="isSensitiveValue">Denne værdi er skjult.Hvis du har brug for adgang til at se denne værdi, bedes du kontakte din web-administrator.</key>
-    <key alias="isSensitiveValue_short">Denne værdi er skjult.</key>
-    <key alias="languagesToPublishForFirstTime">Hvilke sprog vil du gerne udgive? Alle sprog med indhold gemmes!</key>
-    <key alias="languagesToPublish">Hvilke sprog vil du gerne udgive?</key>
-    <key alias="languagesToSave">Hvilke sprog vil du gerne gemme?</key>
-    <key alias="languagesToSaveForFirstTime">Hvilke sprog vil du gerne gemme?</key>
-    <key alias="languagesToSendForApproval">Hvilke sprog vil du gerne sende til godkendelse?</key>
-    <key alias="languagesToSchedule">Hvilke sprog vil du gerne planlægge?</key>
-    <key alias="languagesToUnpublish">Vælg sproget du vil afpublicere. Afpublicering af et obligatorisk sprog vil afpublicere alle sprog.</key>
-    <key alias="publishedLanguages">Udgivne sprog</key>
-    <key alias="unpublishedLanguages">Ikke-udgivne sprog</key>
-    <key alias="unmodifiedLanguages">Uændrede sprog</key>
-    <key alias="untouchedLanguagesForFirstTime">Disse sprog er ikke blevet oprettet</key>
-    <key alias="readyToPublish">Klar til at udgive?</key>
-    <key alias="readyToSave">Klar til at gemme?</key>
-    <key alias="sendForApproval">Send til godkendelse</key>
+    <key alias="addTextBox">Tilføj en ny tekstboks</key>
+    <key alias="removeTextBox">Fjern denne tekstboks</key>
+    <key alias="contentRoot">Indholdsrod</key>
+    <key alias="includeUnpublished">Medtag udkast: udgiv også ikke-publicerede sider.</key>
+    <key alias="isSensitiveValue">Denne værdi er skjult.Hvis du har brug for adgang til at se denne værdi, bedes du kontakte din web-administrator.</key>
+    <key alias="isSensitiveValue_short">Denne værdi er skjult.</key>
+    <key alias="languagesToPublishForFirstTime">Hvilke sprog vil du gerne udgive? Alle sprog med indhold gemmes!</key>
+    <key alias="languagesToPublish">Hvilke sprog vil du gerne udgive?</key>
+    <key alias="languagesToSave">Hvilke sprog vil du gerne gemme?</key>
+    <key alias="languagesToSaveForFirstTime">Hvilke sprog vil du gerne gemme?</key>
+    <key alias="languagesToSendForApproval">Hvilke sprog vil du gerne sende til godkendelse?</key>
+    <key alias="languagesToSchedule">Hvilke sprog vil du gerne planlægge?</key>
+    <key alias="languagesToUnpublish">Vælg sproget du vil afpublicere. Afpublicering af et obligatorisk sprog vil afpublicere alle sprog.</key>
+    <key alias="publishedLanguages">Udgivne sprog</key>
+    <key alias="unpublishedLanguages">Ikke-udgivne sprog</key>
+    <key alias="unmodifiedLanguages">Uændrede sprog</key>
+    <key alias="untouchedLanguagesForFirstTime">Disse sprog er ikke blevet oprettet</key>
+    <key alias="readyToPublish">Klar til at udgive?</key>
+    <key alias="readyToSave">Klar til at gemme?</key>
+    <key alias="sendForApproval">Send til godkendelse</key>
     <key alias="schedulePublishHelp">Vælg dato og klokkeslæt for at udgive og/eller afpublicere indholdet.</key>
     <key alias="createEmpty">Opret ny</key>
-    <key alias="createFromClipboard">Indsæt fra udklipsmappen</key>
-  </area>
-  <area alias="blueprints">
-    <key alias="createBlueprintFrom">Opret en ny indholdsskabelon fra '%0%'</key>
-    <key alias="blankBlueprint">Blank</key>
-    <key alias="selectBlueprint">Vælg en indholdsskabelon</key>
-    <key alias="createdBlueprintHeading">Indholdsskabelon oprettet</key>
-    <key alias="createdBlueprintMessage">En indholdsskabelon blev oprettet fra '%0%'</key>
-    <key alias="duplicateBlueprintMessage">En anden indholdsskabelon med samme navn eksisterer allerede</key>
-    <key alias="blueprintDescription">En indholdskabelon er foruddefineret indhold, som en redaktør kan vælge at bruge som grundlag for at oprette nyt indhold</key>
-  </area>
-  <area alias="media">
-    <key alias="clickToUpload">Klik for at uploade</key>
-    <key alias="orClickHereToUpload">eller klik her for at vælge filer</key>
-    <key alias="dragFilesHereToUpload">Du kan trække filer herind for at uploade.</key>
-    <key alias="disallowedFileType">Kan ikke uploade denne fil, den har ikke en godkendt filtype</key>
-    <key alias="maxFileSize">Maks filstørrelse er</key>
-    <key alias="mediaRoot">Medie rod</key>
-    <key alias="moveFailed">Flytning af mediet fejlede</key>
-    <key alias="copyFailed">Kopiering af mediet fejlede</key>
-    <key alias="createFolderFailed">Oprettelse af mappen under parent med id %0% fejlede</key>
-    <key alias="renameFolderFailed">Omdøbning af mappen med id %0% fejlede</key>
-    <key alias="dragAndDropYourFilesIntoTheArea">Træk og slip dine filer ind i dropzonen</key>
-  </area>
-  <area alias="member">
-    <key alias="createNewMember">Opret et nyt medlem</key>
-    <key alias="allMembers">Alle medlemmer</key>
-    <key alias="memberGroupNoProperties">Medlemgrupper har ingen yderligere egenskaber til redigering.</key>
-  </area>
-  <area alias="create">
-    <key alias="chooseNode">Hvor ønsker du at oprette den nye %0%</key>
-    <key alias="createUnder">Opret under</key>
-    <key alias="createContentBlueprint">Vælg den dokumenttype, du vil oprette en indholdsskabelon til</key>
-    <key alias="enterFolderName">Angiv et navn for mappen</key>
-    <key alias="updateData">Vælg en type og skriv en titel</key>
-    <key alias="noDocumentTypes" version="7.0"><![CDATA[Der kunne ikke findes nogen tilladte dokument typer. Du skal tillade disse i indstillinger under <strong>"dokument typer"</strong>.]]></key>
-    <key alias="noMediaTypes" version="7.0"><![CDATA[Der kunne ikke findes nogen tilladte media typer. Du skal tillade disse i indstillinger under <strong>"media typer"</strong>.]]></key>
-    <key alias="documentTypeWithoutTemplate">Dokumenttype uden skabelon</key>
-    <key alias="newFolder">Ny mappe</key>
-    <key alias="newDataType">Ny datatype</key>
-    <key alias="newJavascriptFile">Ny JavaScript-fil</key>
-    <key alias="newEmptyPartialView">Ny tom partial view</key>
-    <key alias="newPartialViewMacro">Ny partial view makro</key>
-    <key alias="newPartialViewFromSnippet">Ny partial view fra snippet</key>
-    <key alias="newPartialViewMacroFromSnippet">Ny partial view makro fra snippet</key>
-    <key alias="newPartialViewMacroNoMacro">Ny partial view makro (uden makro)</key>
-    <key alias="newStyleSheetFile">Ny stylesheet-fil</key>
-    <key alias="newRteStyleSheetFile">Ny Rich Text Editor stylesheet-fil</key>
-  </area>
-  <area alias="dashboard">
-    <key alias="browser">Til dit website</key>
-    <key alias="dontShowAgain">- Skjul</key>
-    <key alias="nothinghappens">Hvis Umbraco ikke starter, kan det skyldes at din browser ikke tillader pop-up vinduer</key>
-    <key alias="openinnew">er åbnet i nyt vindue</key>
-    <key alias="restart">Genstart</key>
-    <key alias="visit">Besøg</key>
-    <key alias="welcome">Velkommen</key>
-  </area>
-  <area alias="prompt">
-    <key alias="stay">Bliv</key>
-    <key alias="discardChanges">Kassér ændringer</key>
-    <key alias="unsavedChanges">Du har ikke-gemte ændringer</key>
-    <key alias="unsavedChangesWarning">Er du sikker på du vil navigere væk fra denne side? - du har ikke-gemte ændringer</key>
-    <key alias="confirmUnpublish">Afpublicering vil fjerne denne side og alle dets undersider fra websitet.</key>
-    <key alias="doctypeChangeWarning">Du har ikke-gemte ændringer. Hvis du ændrer dokumenttype, kasseres ændringerne.</key>
-  </area>
-  <area alias="bulk">
-    <key alias="done">Færdig</key>
-    <key alias="deletedItem">Slettede %0% element</key>
-    <key alias="deletedItems">Slettede %0% elementer</key>
-    <key alias="deletedItemOfItem">Slettede %0% ud af %1% element</key>
-    <key alias="deletedItemOfItems">Slettede %0% ud af %1% elementer</key>
-    <key alias="publishedItem">Udgav %0% element</key>
-    <key alias="publishedItems">Udgav %0% elementer</key>
-    <key alias="publishedItemOfItem">Udgav %0% ud af %1% element</key>
-    <key alias="publishedItemOfItems">Udgav %0% ud af %1% elementer</key>
-    <key alias="unpublishedItem">Fjernede %0% element fra udgivelse</key>
-    <key alias="unpublishedItems">Fjernede %0% elementer fra udgivelse</key>
-    <key alias="unpublishedItemOfItem">Fjernede %0% ud af %1% element fra udgivelse</key>
-    <key alias="unpublishedItemOfItems">Fjernede %0% ud af %1% elementer fra udgivelse</key>
-    <key alias="movedItem">Flyttede %0% element</key>
-    <key alias="movedItems">Flyttede %0% elementer</key>
-    <key alias="movedItemOfItem">Flyttede %0% ud af %1% element</key>
-    <key alias="movedItemOfItems">Flyttede %0% ud af %1% elementer</key>
-    <key alias="copiedItem">Kopierede %0% element</key>
-    <key alias="copiedItems">Kopierede %0% elementer</key>
-    <key alias="copiedItemOfItem">Kopierede %0% ud af %1% element</key>
-    <key alias="copiedItemOfItems">Kopierede %0% ud af %1% elementer</key>
-  </area>
-  <area alias="defaultdialogs">
-    <key alias="nodeNameLinkPicker">Link titel</key>
-    <key alias="urlLinkPicker">Link</key>
-    <key alias="anchorInsert">Navn på lokalt link</key>
-    <key alias="assignDomain">Rediger domæner</key>
-    <key alias="closeThisWindow">Luk denne dialog</key>
-    <key alias="confirmdelete">Er du sikker på at du vil slette</key>
-    <key alias="confirmdisable">Er du sikker på du vil deaktivere</key>
-    <key alias="confirmlogout">Er du sikker på at du vil forlade Umbraco?</key>
-    <key alias="confirmSure">Er du sikker?</key>
-    <key alias="cut">Klip</key>
-    <key alias="editdictionary">Rediger ordbogsnøgle</key>
-    <key alias="editlanguage">Rediger sprog</key>
-    <key alias="insertAnchor">Indsæt lokalt link</key>
-    <key alias="insertCharacter">Indsæt tegn</key>
-    <key alias="insertgraphicheadline">Indsæt grafisk overskrift</key>
-    <key alias="insertimage">Indsæt billede</key>
-    <key alias="insertlink">Indsæt link</key>
-    <key alias="insertMacro">Indsæt makro</key>
-    <key alias="inserttable">Indsæt tabel</key>
-    <key alias="languagedeletewarning">Dette vil slette sproget</key>
-    <key alias="lastEdited">Sidst redigeret</key>
-    <key alias="link">Link</key>
-    <key alias="linkinternal">Internt link:</key>
-    <key alias="linklocaltip">Ved lokalt link, indsæt da en "#" foran linket</key>
-    <key alias="linknewwindow">Åben i nyt vindue?</key>
-    <key alias="macroContainerSettings">Makroindstillinger</key>
-    <key alias="macroDoesNotHaveProperties">Denne makro har ingen egenskaber du kan redigere</key>
-    <key alias="paste">Indsæt tekst</key>
-    <key alias="permissionsEdit">Rediger rettigheder for</key>
-    <key alias="permissionsSet">Sæt rettigheder for</key>
-    <key alias="permissionsSetForGroup">Sæt rettigheder for %0% for brugergruppe %1%</key>
-    <key alias="permissionsHelp">Vælg de brugergrupper, du vil angive tilladelser til</key>
-    <key alias="recycleBinDeleting">Elementerne i papirkurven slettes. Luk venligst ikke dette vindue mens sletningen foregår</key>
-    <key alias="recycleBinIsEmpty">Papirkurven er nu tom</key>
-    <key alias="recycleBinWarning">Når elementer slettes fra papirkurven, slettes de for altid</key>
-    <key alias="regexSearchError"><![CDATA[<a target='_blank' href='http://regexlib.com'>regexlib.com</a>'s webservice oplever i øjeblikket problemer, vi ikke har kontrol over. Beklager ulejligheden. ]]></key>
-    <key alias="regexSearchHelp">Søg efter et regulært udtryk for at tilføje validering til et formularfelt. Eksempel: 'e-mail', 'postnr.', 'url'</key>
-    <key alias="removeMacro">Fjern makro</key>
-    <key alias="requiredField">Obligatorisk</key>
-    <key alias="sitereindexed">Sitet er genindekseret</key>
-    <key alias="siterepublished">Sitet er nu genudgivet</key>
-    <key alias="siterepublishHelp">Websitets cache vil blive genopfrisket. Alt udgivet indhold vil blive opdateret, mens upubliceret indhold vil forblive upubliceret.</key>
-    <key alias="tableColumns">Antal kolonner</key>
-    <key alias="tableRows">Antal rækker</key>
-    <key alias="thumbnailimageclickfororiginal">Klik på billedet for at se den fulde størrelse</key>
-    <key alias="treepicker">Vælg</key>
-    <key alias="viewCacheItem">Se cache element</key>
-    <key alias="relateToOriginalLabel">Relatér til original</key>
-    <key alias="includeDescendants">Inkludér undersider</key>
-    <key alias="linkToPage">Link til side</key>
-    <key alias="openInNewWindow">Åben linket i et nyt vindue eller fane</key>
-    <key alias="linkToMedia">Link til medie</key>
-    <key alias="selectContentStartNode">Vælg indhold startnode</key>
-    <key alias="selectMedia">Vælg medie</key>
-    <key alias="selectMediaType">Vælg medietype</key>
-    <key alias="selectIcon">Vælg ikon</key>
-    <key alias="selectItem">Vælg item</key>
-    <key alias="selectLink">Vælg link</key>
-    <key alias="selectMacro">Vælg makro</key>
-    <key alias="selectContent">Vælg indhold</key>
-    <key alias="selectContentType">Vælg indholdstype</key>
-    <key alias="selectMediaStartNode">Vælg medie startnode</key>
-    <key alias="selectMember">Vælg medlem</key>
-    <key alias="selectMemberGroup">Vælg medlemsgruppe</key>
-    <key alias="selectMemberType">Vælg medlemstype</key>
-    <key alias="selectNode">Vælg node</key>
-    <key alias="selectSections">Vælg sektioner</key>
-    <key alias="selectUsers">Vælg brugere</key>
-    <key alias="noIconsFound">Ingen ikoner blev fundet</key>
-    <key alias="noMacroParams">Der er ingen parametre for denne makro</key>
-    <key alias="noMacros">Der er ikke tilføjet nogen makroer</key>
-    <key alias="linkYour">Link dit</key>
-    <key alias="unLinkYour">Fjern link fra dit</key>
-    <key alias="account">konto</key>
-    <key alias="selectEditor">Vælg editor</key>
-    <key alias="selectSnippet">Vælg snippet</key>
-    <key alias="variantdeletewarning">Dette vil slette noden og alle dets sprog. Hvis du kun vil slette et sprog, så afpublicér det i stedet.</key>
-  </area>
-  <area alias="dictionary">
-    <key alias="noItems">Der er ingen ordbogselementer.</key>
-  </area>
-  <area alias="dictionaryItem">
-    <key alias="description"><![CDATA[
-      Rediger de forskellige sprogversioner for ordbogselementet '%0%' herunder.<br />Du tilføjer flere sprog under 'sprog' i menuen til venstre </key>
-      ]]></key>
-    <key alias="displayName">Kulturnavn</key>
-    <key alias="changeKeyError"><![CDATA[
-      Navnet '%0%' eksisterer allerede.
-   ]]></key>
-    <key alias="overviewTitle">Ordbogsoversigt</key>
-  </area>
-  <area alias="examineManagement">
-    <key alias="configuredSearchers">Konfigurerede søgere</key>
-    <key alias="configuredSearchersDescription">Viser egenskaber og værktøjer til enhver konfigureret søger (dvs. som en multi-indekssøger)</key>
-    <key alias="fieldValues">Feltværdier</key>
-    <key alias="healthStatus">Sundhedstilstand</key>
-    <key alias="healthStatusDescription">Indeksets sundhedstilstand, og hvis det kan læses</key>
-    <key alias="indexers">Indeksører</key>
-    <key alias="indexInfo">Indeksinfo</key>
-    <key alias="indexInfoDescription">Viser indeksets egenskaber</key>
-    <key alias="manageIndexes">Administrer Examine indekserne</key>
-    <key alias="manageIndexesDescription">Giver dig mulighed for at se detaljerne for hvert indeks og giver nogle værktøjer til styring af indeksørerne</key>
-    <key alias="rebuildIndex">Genopbyg indeks</key>
-    <key alias="rebuildIndexWarning"><![CDATA[
-        Dette vil medføre, at indekset genopbygges.<br />
-        Afhængigt af hvor meget indhold der er på dit website, kan det tage et stykke tid.<br />
-        Det anbefales ikke at genopbygge et indeks i perioder med høj websitetrafik eller når redaktører redigerer indhold.
-     ]]>
-    </key>
-    <key alias="searchers">Søgere</key>
-    <key alias="searchDescription">Søg i indekset og se resultaterne</key>
-    <key alias="tools">Værktøjer</key>
-    <key alias="toolsDescription">Værktøjer til at administrere indekset</key>
-  </area>
-  <area alias="placeholders">
-    <key alias="username">Indtast dit brugernavn</key>
-    <key alias="password">Indtast dit kodeord</key>
-    <key alias="confirmPassword">Bekræft dit kodeord</key>
-    <key alias="nameentity">Navngiv %0%...</key>
-    <key alias="entername">Indtast navn...</key>
-    <key alias="enteremail">Indtast en e-mail...</key>
-    <key alias="enterusername">Indtast et brugernavn...</key>
-    <key alias="label">Label...</key>
-    <key alias="enterDescription">Indtast beskrivelse</key>
-    <key alias="search">Søg...</key>
-    <key alias="filter">Filtrer...</key>
-    <key alias="enterTags">Indtast nøgleord (tryk på Enter efter hvert nøgleord)...</key>
-    <key alias="email">Indtast din e-mail</key>
-    <key alias="enterMessage">Indtast en besked...</key>
-    <key alias="usernameHint">Dit brugernavn er typisk din e-mailadresse</key>
-    <key alias="enterAlias">Indtast alias...</key>
-    <key alias="generatingAlias">Genererer alias...</key>
-  </area>
-  <area alias="editcontenttype">
-    <key alias="createListView" version="7.2">Opret brugerdefineret listevisning</key>
-    <key alias="removeListView" version="7.2">Fjern brugerdefineret listevisning</key>
-  </area>
-  <area alias="renamecontainer">
-    <key alias="renamed">Omdøbt</key>
-    <key alias="enterNewFolderName">Indtast et ny mappenavn her</key>
-    <key alias="folderWasRenamed">%0% was renamed to %1%</key>
-  </area>
-  <area alias="editdatatype">
-    <key alias="addPrevalue">Tilføj førværdi</key>
-    <key alias="dataBaseDatatype">Database-datatype</key>
-    <key alias="guid">Data Editor GUID</key>
-    <key alias="renderControl">Visningskontrol</key>
-    <key alias="rteButtons">Knapper</key>
-    <key alias="rteEnableAdvancedSettings">Aktiver avancerede indstillinger for</key>
-    <key alias="rteEnableContextMenu">Aktiver kontekstmenu</key>
-    <key alias="rteMaximumDefaultImgSize">Maks. std. størrelse på indsatte billeder</key>
-    <key alias="rteRelatedStylesheets">Relaterede stylesheets</key>
-    <key alias="rteShowLabel">Vis label</key>
-    <key alias="rteWidthAndHeight">Bredde og højde</key>
-    <key alias="allPropTypes">All property types &amp; property data</key>
-    <key alias="willBeDeleted">using this data type will be deleted permanently, please confirm you want to delete these as well</key>
-    <key alias="yesDelete">Ja, slet</key>
-    <key alias="andAllRelated">and all property types &amp; property data using this data type</key>
-    <key alias="selectFolder">Vælg den mappe, der skal flyttes</key>
-    <key alias="inTheTree">til i træstrukturen nedenfor</key>
-    <key alias="wasMoved">blev flyttet under</key>
-  </area>
-  <area alias="errorHandling">
-    <key alias="errorButDataWasSaved">Dine data er blevet gemt, men før du kan udgive denne side er der nogle fejl der skal rettes:</key>
-    <key alias="errorChangingProviderPassword">Den nuværende membership-provider understøtter ikke skift af kodeord (EnablePasswordRetrieval skal være true)</key>
-    <key alias="errorExistsWithoutTab">%0% der findes allerede</key>
-    <key alias="errorHeader">Der var fejl i dokumentet:</key>
-    <key alias="errorHeaderWithoutTab">Der var fejl i formularen:</key>
-    <key alias="errorInPasswordFormat">Kodeordet skal være på minimum %0% tegn og indeholde mindst %1% alfanumeriske karakterer</key>
-    <key alias="errorIntegerWithoutTab">%0% skal være et heltal</key>
-    <key alias="errorMandatory">%0% under %1% er et obligatorisk felt og skal udfyldes</key>
-    <key alias="errorMandatoryWithoutTab">%0% er et obligatorisk felt og skal udfyldes</key>
-    <key alias="errorRegExp">%0% under %1% er ikke i et korrekt format</key>
-    <key alias="errorRegExpWithoutTab">%0% er ikke i et korrekt format</key>
-  </area>
-  <area alias="errors">
-    <key alias="receivedErrorFromServer">Der skete en fejl på severen</key>
-    <key alias="dissallowedMediaType">Denne filttype er blevet deaktiveret af administratoren</key>
-    <key alias="codemirroriewarning">OBS! Selvom CodeMirror er slået til i konfigurationen, så er den deaktiveret i Internet Explorer fordi den ikke er stabil nok.</key>
-    <key alias="contentTypeAliasAndNameNotNull">Du skal udfylde både Alias &amp; Navn på den nye egenskabstype!</key>
-    <key alias="filePermissionsError">Der mangler læse/skrive rettigheder til bestemte filer og mapper</key>
-    <key alias="missingTitle">Skriv venligst en titel</key>
-    <key alias="missingType">Du skal vælge en type</key>
-    <key alias="pictureResizeBiggerThanOrg">Du er ved at gøre billedet større end originalen. Det vil forringe kvaliteten af billedet. Ønsker du at fortsætte?</key>
-    <key alias="startNodeDoesNotExists">Startnode er slettet, kontakt systemadministrator</key>
-    <key alias="stylesMustMarkBeforeSelect">Du skal markere noget indhold, før du kan ændre stylen</key>
-    <key alias="stylesNoStylesOnPage">Der er ingen aktive styles eller formatteringer på denne side</key>
-    <key alias="tableColMergeLeft">Du skal stå til venstre for de 2 celler du ønsker at samle!</key>
-    <key alias="tableSplitNotSplittable">Du kan ikke opdele en celle, som ikke allerede er delt.</key>
-    <key alias="propertyHasErrors">Denne egenskab er ugyldig</key>
-  </area>
-  <area alias="general">
-    <key alias="about">Om</key>
-    <key alias="action">Handling</key>
-    <key alias="actions">Muligheder</key>
-    <key alias="add">Tilføj</key>
-    <key alias="alias">Alias</key>
-    <key alias="areyousure">Er du sikker?</key>
-    <key alias="back">Tilbage</key>
-    <key alias="backToOverview">Tilbage til oversigt</key>
-    <key alias="border">Kant</key>
-    <key alias="by">af</key>
-    <key alias="cancel">Fortryd</key>
-    <key alias="cellMargin">Celle margen</key>
-    <key alias="choose">Vælg</key>
-    <key alias="close">Luk</key>
-    <key alias="closewindow">Luk vindue</key>
-    <key alias="comment">Kommentar</key>
-    <key alias="confirm">Bekræft</key>
-    <key alias="constrain">Proportioner</key>
-    <key alias="constrainProportions">Behold proportioner</key>
-    <key alias="content">Indhold</key>
-    <key alias="continue">Fortsæt</key>
-    <key alias="copy">Kopiér</key>
-    <key alias="create">Opret</key>
-    <key alias="database">Database</key>
-    <key alias="date">Dato</key>
-    <key alias="default">Standard</key>
-    <key alias="delete">Slet</key>
-    <key alias="deleted">Slettet</key>
-    <key alias="deleting">Sletter...</key>
-    <key alias="design">Design</key>
-    <key alias="dimensions">Dimensioner</key>
-    <key alias="down">Ned</key>
-    <key alias="download">Hent</key>
-    <key alias="edit">Rediger</key>
-    <key alias="edited">Redigeret</key>
-    <key alias="elements">Elementer</key>
-    <key alias="email">E-mail</key>
-    <key alias="error">Fejl</key>
-    <key alias="field">Felt</key>
-    <key alias="findDocument">Find</key>
-    <key alias="first">Første</key>
-    <key alias="general">Generelt</key>
-    <key alias="groups">Grupper</key>
-    <key alias="group">Gruppe</key>
-    <key alias="height">Højde</key>
-    <key alias="help">Hjælp</key>
-    <key alias="hide">Skjul</key>
-    <key alias="history">Historik</key>
-    <key alias="icon">Ikon</key>
-    <key alias="id">Id</key>
-    <key alias="import">Importer</key>
-    <key alias="includeFromsubFolders">Inkludér undermapper i søgning</key>
-    <key alias="innerMargin">Indre margen</key>
-    <key alias="insert">Indsæt</key>
-    <key alias="install">Installér</key>
-    <key alias="invalid">Ugyldig</key>
-    <key alias="justify">Justering</key>
-    <key alias="language">Sprog</key>
-    <key alias="last">Sidste</key>
-    <key alias="layout">Layout</key>
-    <key alias="loading">Henter</key>
-    <key alias="locked">Låst</key>
-    <key alias="login">Log ind</key>
-    <key alias="logoff">Log af</key>
-    <key alias="logout">Log ud</key>
-    <key alias="macro">Makro</key>
-    <key alias="mandatory">Påkrævet</key>
-    <key alias="message">Besked</key>
-    <key alias="move">Flyt</key>
-    <key alias="name">Navn</key>
-    <key alias="new">Ny</key>
-    <key alias="next">Næste</key>
-    <key alias="no">Nej</key>
-    <key alias="of">af</key>
-    <key alias="ok">OK</key>
-    <key alias="open">Åben</key>
-    <key alias="or">eller</key>
-    <key alias="orderBy">Sortér efter</key>
-    <key alias="password">Kodeord</key>
-    <key alias="path">Sti</key>
-    <key alias="pleasewait">Et øjeblik...</key>
-    <key alias="previous">Forrige</key>
-    <key alias="properties">Egenskaber</key>
-    <key alias="rebuild">Genopbyg</key>
-    <key alias="reciept">E-mail der skal modtage indhold af formular</key>
-    <key alias="recycleBin">Papirkurv</key>
-    <key alias="recycleBinEmpty">Din papirkurv er tom</key>
-    <key alias="reload">Genindlæs</key>
-    <key alias="remaining">Mangler</key>
-    <key alias="remove">Fjern</key>
-    <key alias="rename">Omdøb</key>
-    <key alias="renew">Forny</key>
-    <key alias="required" version="7.0">Påkrævet</key>
-    <key alias="retrieve">Hent</key>
-    <key alias="retry">Prøv igen</key>
-    <key alias="rights">Rettigheder</key>
-    <key alias="scheduledPublishing">Planlagt publicering</key>
-    <key alias="search">Søg</key>
-    <key alias="searchNoResult">Beklager, vi kan ikke finde det, du leder efter.</key>
-    <key alias="noItemsInList">Ingen elementer er blevet tilføjet</key>
-    <key alias="server">Server</key>
-    <key alias="settings">Indstillinger</key>
-    <key alias="show">Vis</key>
-    <key alias="showPageOnSend">Hvilken side skal vises efter at formularen er sendt</key>
-    <key alias="size">Størrelse</key>
-    <key alias="sort">Sortér</key>
-    <key alias="status">Status</key>
-    <key alias="submit">Indsend</key>
-    <key alias="type">Type</key>
-    <key alias="typeToSearch">Skriv for at søge...</key>
-    <key alias="up">Op</key>
-    <key alias="update">Opdatér</key>
-    <key alias="upgrade">Opdatér</key>
-    <key alias="upload">Upload</key>
-    <key alias="url">Url</key>
-    <key alias="user">Bruger</key>
-    <key alias="username">Brugernavn</key>
-    <key alias="value">Værdi</key>
-    <key alias="view">Vis</key>
-    <key alias="welcome">Velkommen...</key>
-    <key alias="width">Bredde</key>
-    <key alias="yes">Ja</key>
-    <key alias="folder">Mappe</key>
-    <key alias="searchResults">Søgeresultater</key>
-    <key alias="reorder">Sorter</key>
-    <key alias="reorderDone">Afslut sortering</key>
-    <key alias="preview">Eksempel</key>
-    <key alias="changePassword">Skift kodeord</key>
-    <key alias="to">til</key>
-    <key alias="listView">Listevisning</key>
-    <key alias="saving">Gemmer...</key>
-    <key alias="current">nuværende</key>
-    <key alias="embed">Indlejring</key>
-    <key alias="selected">valgt</key>
-  </area>
-  <area alias="colors">
-    <key alias="blue">Blå</key>
-  </area>
-  <area alias="shortcuts">
-    <key alias="addGroup">Tilføj fane</key>
-    <key alias="addProperty">Tilføj egenskab</key>
-    <key alias="addEditor">Tilføj editor</key>
-    <key alias="addTemplate">Tilføj skabelon</key>
-    <key alias="addChildNode">Tilføj child node</key>
-    <key alias="addChild">Tilføj child</key>
-    <key alias="editDataType">Rediger datatype</key>
-    <key alias="navigateSections">Naviger sektioner</key>
-    <key alias="shortcut">Genveje</key>
-    <key alias="showShortcuts">Vis genveje</key>
-    <key alias="toggleListView">Brug listevisning</key>
-    <key alias="toggleAllowAsRoot">Tillad på rodniveau</key>
-    <key alias="commentLine">Comment/Uncomment lines</key>
-    <key alias="removeLine">Remove line</key>
-    <key alias="copyLineUp">Copy Lines Up</key>
-    <key alias="copyLineDown">Copy Lines Down</key>
-    <key alias="moveLineUp">Move Lines Up</key>
-    <key alias="moveLineDown">Move Lines Down</key>
-    <key alias="generalHeader">Generelt</key>
-    <key alias="editorHeader">Editor</key>
-  </area>
-  <area alias="graphicheadline">
-    <key alias="backgroundcolor">Baggrundsfarve</key>
-    <key alias="bold">Fed</key>
-    <key alias="color">Tekstfarve</key>
-    <key alias="font">Skrifttype</key>
-    <key alias="text">Tekst</key>
-  </area>
-  <area alias="headers">
-    <key alias="page">Side</key>
-  </area>
-  <area alias="installer">
-    <key alias="databaseErrorCannotConnect">Installeringsprogrammet kan ikke forbinde til databasen.</key>
-    <key alias="databaseErrorWebConfig">Kunne ikke gemme web.config filen. Du bedes venligst manuelt ændre database forbindelses strengen.</key>
-    <key alias="databaseFound">Din database er blevet fundet og identificeret som</key>
-    <key alias="databaseHeader">Database konfiguration</key>
-    <key alias="databaseInstall"><![CDATA[
-      Klik på <strong>installér</strong> knappen for at installere Umbraco %0% databasen
-    ]]></key>
-    <key alias="databaseInstallDone"><![CDATA[Umbraco %0% er nu blevet kopieret til din database. Tryk på <string>Næste</strong> for at fortsætte.]]></key>
-    <key alias="databaseNotFound"><![CDATA[<p>Databasen er ikke fundet. Kontrollér venligst at informationen i database forbindelsesstrengen i "web.config" filen er korrekt.</p>
-<p>For at fortsætte bedes du venligst rette "web.config" filen (ved at bruge Visual Studio eller dit favoritprogram), scroll til bunden, tilføj forbindelsesstrengen til din database i feltet som hedder "umbracoDbDSN" og gem filen.</p><p>Klik på <strong>Forsøg igen</strong> knappen når du er færdig.<br/><a href="https://our.umbraco.com/documentation/Using-Umbraco/Config-files/webconfig7" target="_blank">Mere information om at redigere web.config her.</a></p>]]></key>
-    <key alias="databaseText"><![CDATA[For at afslutte dette skridt er du nødt til at have nogle informationer om din database parat ("database forbindelsesstrengen").<br/>Kontakt venligst din ISP hvis det er nødvendigt. Hvis du installerer på en lokal maskine eller server kan du muligvis få informationerne fra din systemadministrator.]]></key>
-    <key alias="databaseUpgrade"><![CDATA[<p>Tryk på <strong>Opgradér</strong> knappen for at opgradere din database til Umbraco %0%</p><p>Bare rolig - intet indhold vil blive slettet og alt vil stadig fungere bagefter!</p>]]></key>
-    <key alias="databaseUpgradeDone"><![CDATA[Din database er blevet opgraderet til den endelige version %0%.<br/>Tryk på <strong>Næste</strong> for at fortsætte.]]></key>
-    <key alias="databaseUpToDate"><![CDATA[Din database er up-to-date!. Klik på <strong>Næste</strong> for at fortsætte med konfigurationsguiden.]]></key>
-    <key alias="defaultUserChangePass"><![CDATA[<strong>Normalbrugerens adgangskode er nødt til at blive ændret!</strong>]]></key>
-    <key alias="defaultUserDisabled"><![CDATA[<p><strong>Normalbrugeren er blevet gjort utjenstdygtig eller har ikke adgang til Umbraco!</strong></p><p>Du behøver ikke foretage yderligere handlinger. Tryk på <strong>Næste</strong> for at fortsætte.</p>]]></key>
-    <key alias="defaultUserPassChanged"><![CDATA[<p><strong>Normalbrugerens adgangskode er på succesfuld vis blevet ændret siden installationen!</strong></p><p>Du behøver ikke foretage yderligere handlinger. Tryk på <strong>Næste</strong> for at fortsætte.</p>]]></key>
-    <key alias="defaultUserPasswordChanged">Adgangskoden er blevet ændret!</key>
-    <key alias="greatStart">Få en fremragende start, se vores videoer</key>
-    <key alias="licenseText">Ved at klikke på næste knappen (eller ved at ændre UmbracoConfigurationStatus i web.config filen), accepterer du licensaftalen for denne software, som specificeret i boksen nedenfor. Bemærk venligst at denne Umbraco distribution består af to forskellige licenser, MIT's Open Source Licens for frameworket og Umbraco Freeware Licensen som dækker UI'en.</key>
-    <key alias="None">Endnu ikke installeret</key>
-    <key alias="permissionsAffectedFolders">Berørte filer og foldere</key>
-    <key alias="permissionsAffectedFoldersMoreInfo">Flere informationer om at opsætte rettigheder for Umbraco her</key>
-    <key alias="permissionsAffectedFoldersText">Du er nødt til at give ASP.NET 'modify' rettigheder på følgende filer/foldere</key>
-    <key alias="permissionsAlmostPerfect"><![CDATA[<strong>Dine rettighedsindstillinger er næsten perfekte!</strong><br/><br/>Du kan køre Umbraco uden problemer, men du vil ikke være i stand til at installere pakker, som er anbefalet for at få fuldt udbytte af Umbraco.]]></key>
-    <key alias="permissionsHowtoResolve">Hvorledes besluttes</key>
-    <key alias="permissionsHowtoResolveLink">Klik her for at læse tekstversionen</key>
-    <key alias="permissionsHowtoResolveText"><![CDATA[Se vores <strong>video tutorials</strong> om at opsætte folderrettigheder for Umbraco eller læs tekstversionen.]]></key>
-    <key alias="permissionsMaybeAnIssue"><![CDATA[<strong>Dine rettighedsindstillinger kan være et problem!</strong><br/><br/>Du kan afvikle Umbraco uden problemer, men du vil ikke være i stand til at oprette foldere eller installere pakker, hvilket er anbefalet for at få fuldt udbytte af Umbraco.]]></key>
-    <key alias="permissionsNotReady"><![CDATA[<strong>Dine rettighedsindstillinger er ikke klar til Umbraco!</strong><br/><br/>For at afvikle Umbraco er du nødt til at opdatere dine rettighedsindstillinger.]]></key>
-    <key alias="permissionsPerfect"><![CDATA[<strong>Dine rettighedsindstillinger er perfekte!</strong><br/><br/>Du er nu parat til at afvikle Umbraco og installere pakker!]]></key>
-    <key alias="permissionsResolveFolderIssues">Løser folder problem</key>
-    <key alias="permissionsResolveFolderIssuesLink">Følg dette link for mere information om udfordringer med ASP.NET og oprettelse af foldere</key>
-    <key alias="permissionsSettingUpPermissions">Sætter folderrettigheder op</key>
-    <key alias="permissionsText">Umbraco har behov for 'write/modify' adgang til bestemte foldere, for at kunne gemme filer som billeder og PDF'er. Umbraco gemmer også midlertidige data (eksempelvis cachen) for at forbedre ydelsen på dit website.</key>
-    <key alias="runwayFromScratch">Jeg har lyst til at begynde på bar bund</key>
-    <key alias="runwayFromScratchText"><![CDATA[Dit website er helt tomt for øjeblikket, så det er perfekt hvis du ønsker at begynde på bar bund og oprette dine egne dokumenttyper og skabeloner. (<a href="http://Umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">lær hvordan</a>) Du kan stadig vælge at installere Runway senere. Gå venligst til Udvikler-sektionen og vælg Pakker.]]></key>
-    <key alias="runwayHeader">Du har lige opsat en ren Umbraco-platform. Hvad ønsker du nu at gøre?</key>
-    <key alias="runwayInstalled">Runway er installeret</key>
-    <key alias="runwayInstalledText"><![CDATA[Du har fundamentet på plads. Vælg hvilke moduler du ønsker at installere ovenpå det.<br/>Dette er vores liste over anbefalede moduler. Kryds dem af du ønsker at installere eller se den <a href="#" onclick="toggleModules(); return false;" id="toggleModuleList">fulde liste af moduler</a>  ]]></key>
-    <key alias="runwayOnlyProUsers">Kun anbefalet for erfarne brugere</key>
-    <key alias="runwaySimpleSite">Jeg ønsker at begynder med et simpelt website</key>
-    <key alias="runwaySimpleSiteText"><![CDATA[<p>"Runway" er et simpelt website som stiller nogle basale dokumenttyper og skabeloner til rådighed. Installeringsprogrammet kan automatisk opsætte Runway for dig, men du kan nemt redigere, udvide eller fjerne det. Det er ikke nødvendigt og du kan sagtens bruge Umbraco uden. Men Runway tilbyder et fundament, som er baseret på 'Best Practices', som får dig igang hurtigere end nogensinde før. Hvis du vælger at installere Runway, kan du efter eget valg vælge de grundlæggende byggesten kaldet 'Runway Modules' til at forbedre dine Runway-sider.</p><p><small><em>Inkluderet med Runway:</em>Home Page, Getting Started page, Installing Modules page.<br /> <em>Valgfri Moduler:</em> Top Navigation, Sitemap, Contact, Gallery. </small></p>]]></key>
-    <key alias="runwayWhatIsRunway">Hvad er Runway</key>
-    <key alias="step1">Skridt 1/5: Acceptér licens</key>
-    <key alias="step2">Skridt 2/5: Database-konfiguration</key>
-    <key alias="step3">Skridt 3/5: Validerer filrettigheder</key>
-    <key alias="step4">Skridt 4/5: Kontrollér Umbraco sikkerhed</key>
-    <key alias="step5">Skridt 5/5: Umbraco er parat til at få dig igang</key>
-    <key alias="thankYou">Tak fordi du valgte Umbraco</key>
-    <key alias="theEndBrowseSite"><![CDATA[<h3>Gennemse dit nye site</h3> Du installerede Runway, så hvorfor ikke se hvordan dit nye website ser ud.]]></key>
-    <key alias="theEndFurtherHelp"><![CDATA[<h3>Yderligere hjælpe og informationer</h3> Få hjælp fra vores prisvindende fællesskab, gennemse dokumentationen eller se nogle gratis videoer om hvordan du opsætter et simpelt site, hvordan du bruger pakker og en 'quick guide' til Umbraco terminologier]]></key>
-    <key alias="theEndHeader">Umbraco %0% er installeret og klar til brug</key>
-    <key alias="theEndInstallFailed"><![CDATA[For at afslutte installationen er du nødt til manuelt at rette <strong>/web.config filen</strong> og opdatére 'AppSetting' feltet <strong>UmbracoConfigurationStatus</strong> i bunden til <strong>'%0%'</strong>.]]></key>
-    <key alias="theEndInstallSuccess"><![CDATA[Du kan <strong>komme igang med det samme</strong> ved at klikke på "Start Umbraco" knappen nedenfor.<br/>Hvis du er <strong>ny med Umbraco</strong>, kan du finde masser af ressourcer på vores 'getting started' sider.
-]]></key>
-    <key alias="theEndOpenUmbraco"><![CDATA[<h3>Start Umbraco</h3>For at administrere dit website skal du blot åbne Umbraco administrationen og begynde at tilføje indhold, opdatere skabelonerne og stylesheets'ene eller tilføje ny funktionalitet.]]></key>
-    <key alias="Unavailable">Forbindelse til databasen fejlede.</key>
-    <key alias="Version3">Umbraco Version 3</key>
-    <key alias="Version4">Umbraco Version 4</key>
-    <key alias="watch">Se</key>
-    <key alias="welcomeIntro"><![CDATA[Denne guide vil bringe dig gennem konfigurationsprocessen af <strong>Umbraco %0%</strong> for en frisk installation eller for en opgradering fra version 3.0.<br/><br/>Tryk på <strong>Næste</strong> for at begynde på guiden.]]></key>
-  </area>
-  <area alias="language">
-    <key alias="cultureCode">Culture Code</key>
-    <key alias="displayName">Culture Name</key>
-  </area>
-  <area alias="lockout">
-    <key alias="lockoutWillOccur">Du har været inaktiv, og du vil blive logget ud om</key>
-    <key alias="renewSession">Forny for at gemme dine ændringer</key>
-  </area>
-  <area alias="login">
-    <key alias="greeting0">Så er det søndag!</key>
-    <key alias="greeting1">Smil, det er mandag!</key>
-    <key alias="greeting2">Hurra, det er tirsdag!</key>
-    <key alias="greeting3">Hvilken herlig onsdag!</key>
-    <key alias="greeting4">Glædelig torsdag!</key>
-    <key alias="greeting5">Endelig fredag!</key>
-    <key alias="greeting6">Glædelig lørdag</key>
-    <key alias="instruction">Log ind nedenfor</key>
-    <key alias="signInWith">Log ind med</key>
-    <key alias="timeout">Din session er udløbet</key>
-    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="http://umbraco.com" style="text-decoration: none" target="_blank">umbraco.com</a></p> ]]></key>
-    <key alias="forgottenPassword">Glemt adgangskode?</key>
-    <key alias="forgottenPasswordInstruction">En e-mail vil blive sendt til den angivne adresse med et link til at nulstille din adgangskode</key>
-    <key alias="requestPasswordResetConfirmation">En e-mail med instruktioner for nulstilling af adgangskoden vil blive sendt til den angivne adresse, hvis det matcher vores optegnelser</key>
-    <key alias="showPassword">Vis adgangskode</key>
-    <key alias="hidePassword">Skjul adgangskode</key>
-    <key alias="returnToLogin">Tilbage til login formular</key>
-    <key alias="setPasswordInstruction">Angiv en ny adgangskode</key>
-    <key alias="setPasswordConfirmation">Din adgangskode er blevet opdateret</key>
-    <key alias="resetCodeExpired">Det link, du har klikket på, er ugyldigt eller udløbet</key>
-    <key alias="resetPasswordEmailCopySubject">Umbraco: Nulstil adgangskode</key>
-    <key alias="resetPasswordEmailCopyFormat"><![CDATA[<p>Dit brugernavn til at logge på Umbraco backoffice er: <strong>%0%</strong></p><p>Klik <a href="%1%"><strong>her</strong></a> for at nulstille din adgangskode eller kopier/indsæt denne URL i din browser:</p><p><em>%1%</em></p>]]></key>
-  </area>
-  <area alias="main">
-    <key alias="dashboard">Skrivebord</key>
-    <key alias="sections">Sektioner</key>
-    <key alias="tree">Indhold</key>
-  </area>
-  <area alias="moveOrCopy">
-    <key alias="choose">Vælg siden ovenover...</key>
-    <key alias="copyDone">%0% er nu kopieret til %1%</key>
-    <key alias="copyTo">Kopier til</key>
-    <key alias="moveDone">%0% er nu flyttet til %1%</key>
-    <key alias="moveTo">Flyt til</key>
-    <key alias="nodeSelected">er blevet valgt som roden for dit nye indhold, klik 'ok' nedenunder.</key>
-    <key alias="noNodeSelected">Intet element valgt, vælg et element i listen ovenfor før der klikkes 'fortsæt'</key>
-    <key alias="notAllowedByContentType">Det nuværende element kan ikke lægges under denne pga. sin type</key>
-    <key alias="notAllowedByPath">Det nuværende element kan ikke ligge under en af dens undersider</key>
-    <key alias="notAllowedAtRoot">Dette element må ikke findes på rodniveau</key>
-    <key alias="notValid">Denne handling er ikke tilladt fordi du ikke har de fornødne rettigheder på et eller flere af under-dokumenterne</key>
-    <key alias="relateToOriginal">Relater det kopierede element til originalen</key>
-  </area>
-  <area alias="notifications">
-    <key alias="editNotifications"><![CDATA[Vælg dine notificeringer for <strong>%0%</strong>]]></key>
-    <key alias="notificationsSavedFor">Notificeringer er gemt for</key>
-    <key alias="mailBody"><![CDATA[
-Hej %0%
-
-Dette er en automatisk mail for at fortælle at handlingen '%1%'
-er blevet udført på siden '%2%'
-af brugeren '%3%'
-
-Gå til http://%4%/#/content/content/edit/%5% for at redigere.
-
-Ha' en dejlig dag!
-
-Mange hilsner fra Umbraco robotten
-		]]></key>
-    <key alias="mailBodyHtml"><![CDATA[<p>Hej %0%</p>
-    <p>Dette er en automatisk mail for at informere dig om at opgaven <strong>'%1%'</strong>
-    er blevet udførtpå siden <a href="http://%4%/#/content/content/edit/%5%"><strong>'%2%'</strong></a> af brugeren <strong>'%3%'</strong> </p>
-    <div style="margin: 8px 0; padding: 8px; display: block;"> <br />
-    <a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/#/content/content/edit/%5%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;RET&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a> &nbsp; <br /> </div> <p> <h3>Opdateringssammendrag:</h3> <table style="width: 100%;"> %6% </table> </p> <div style="margin: 8px 0; padding: 8px; display: block;"> <br /> <a style="color: white; font-weight: bold; background-color: #66cc66; text-decoration : none; margin-right: 20px; border: 8px solid #66cc66; width: 150px;" href="http://%4%/actions/publish.aspx?id=%5%">&nbsp;&nbsp;PUBLISÉR&nbsp;&nbsp;</a> &nbsp; <a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/#/content/content/edit/%5%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;RET&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a> &nbsp; <a style="color: white; font-weight: bold; background-color: #ca4a4a; text-decoration : none; margin-right: 20px; border: 8px solid #ca4a4a; width: 150px;" href="http://%4%/actions/delete.aspx?id=%5%">&nbsp;&nbsp;&nbsp;&nbsp;SLET&nbsp;&nbsp;&nbsp;&nbsp;</a> <br /> </div> <p>Hav en fortsat god dag!<br /><br /> De bedste hilsner fra umbraco robotten </p>]]></key>
-    <key alias="mailSubject">[%0%] Notificering om %1% udført på %2%</key>
-    <key alias="notifications">Notificeringer</key>
-  </area>
-  <area alias="packager">
-    <key alias="actions">Handlinger</key>
-    <key alias="created">Oprettet</key>
-    <key alias="createPackage">Opret pakke</key>
-    <key alias="chooseLocalPackageText">Vælg pakken fra din computer. Umbraco pakker er oftest en ".zip" fil</key>
-    <key alias="deletewarning">Dette vil slette pakken</key>
-    <key alias="dropHere">Slip her for at uploade</key>
-    <key alias="includeAllChildNodes">Inkludér alle underliggende sider</key>
-    <key alias="orClickHereToUpload">eller klik her for at vælge pakkefil</key>
-    <key alias="uploadPackage">Upload pakke</key>
-    <key alias="localPackageDescription">Installer en lokal pakke ved at vælge den fra din computer. Installer kun pakker fra kilder, du kender og stoler på</key>
-    <key alias="uploadAnother">Upload en anden pakke</key>
-    <key alias="cancelAndUploadAnother">Annuller og upload en anden pakke</key>
-    <key alias="accept">Jeg accepterer</key>
-    <key alias="termsOfUse">betingelser for anvendelse</key>
-    <key alias="pathToFile">Sti til fil</key>
-    <key alias="pathToFileDescription">Absolut sti til fil (f.eks.: /bin/umbraco.bin)</key>
-    <key alias="installed">Installeret</key>
-    <key alias="installedPackages">Installeret pakker</key>
-    <key alias="installLocal">Installér lokal</key>
-    <key alias="installFinish">Afslut</key>
-    <key alias="noConfigurationView">Denne pakke har ingen konfigurationsvisning</key>
-    <key alias="noPackagesCreated">Der er ikke blevet oprettet nogle pakker endnu</key>
-    <key alias="noPackages">Du har ingen pakker installeret</key>
-    <key alias="noPackagesDescription"><![CDATA[Du har ikke nogen pakker installeret. Du kan enten installere en lokal pakke ved at vælge den fra din computer eller gennemse de tilgængelige pakker ved hjælp af ikonet <strong>'Pakker'</strong> øverst til højre på din skærm]]></key>
-    <key alias="packageActions">Pakkehandlinger</key>
-    <key alias="packageAuthorUrl">Forfatter URL</key>
-    <key alias="packageContent">Pakkeindhold</key>
-    <key alias="packageFiles">Pakkefiler</key>
-    <key alias="packageIconUrl">Ikon URL</key>
-    <key alias="packageInstall">Installér pakke</key>
-    <key alias="packageLicense">Licens</key>
-    <key alias="packageLicenseUrl">Licens URL</key>
-    <key alias="packageProperties">Pakkeegenskaber</key>
-    <key alias="packageSearch">Søg efter pakker</key>
-    <key alias="packageSearchResults">Resultater for</key>
-    <key alias="packageNoResults">Vi kunne ikke finde resultater for</key>
-    <key alias="packageNoResultsDescription">Prøv venligst at søge efter en anden pakke eller gennemse kategorierne</key>
-    <key alias="packagesPopular">Populære</key>
-    <key alias="packagesNew">Nye udgivelser</key>
-    <key alias="packageHas">har</key>
-    <key alias="packageKarmaPoints">karma points</key>
-    <key alias="packageInfo">Information</key>
-    <key alias="packageOwner">Ejer</key>
-    <key alias="packageContrib">Bidragsydere</key>
-    <key alias="packageCreated">Oprettet</key>
-    <key alias="packageCurrentVersion">Nuværende version</key>
-    <key alias="packageNetVersion">.NET version</key>
-    <key alias="packageDownloads">Downloads</key>
-    <key alias="packageLikes">Likes</key>
-    <key alias="packageCompatibility">Kompatibilitet</key>
-    <key alias="packageCompatibilityDescription">Denne pakke er kompatibel med de følgende versioner af Umbraco, som rapporteret af community-medlemmer. Fuld kompatibilitet kan ikke garanteres for versioner rapporteret nedenfor 100%</key>
-    <key alias="packageExternalSources">Eksterne kilder</key>
-    <key alias="packageAuthor">Forfatter</key>
-    <key alias="packageDocumentation">Dokumentation</key>
-    <key alias="packageMetaData">Pakke meta data</key>
-    <key alias="packageName">Pakkenavn</key>
-    <key alias="packageNoItemsHeader">Pakken indeholder ingen elementer</key>
-    <key alias="packageNoItemsText"><![CDATA[Denne pakkefil indeholder ingen elementer som kan af-installeres.<br/><br/>Du kan roligt fjerne denne fra systemet ved at klikke på "Fjern pakke" nedenfor.]]></key>
-    <key alias="packageOptions">Pakkevalg</key>
-    <key alias="packageReadme">Pakke læs mig</key>
-    <key alias="packageRepository">Pakke opbevaringsbase</key>
-    <key alias="packageUninstallConfirm">Bekræft af-installering</key>
-    <key alias="packageUninstalledHeader">Pakken blev fjernet</key>
-    <key alias="packageUninstalledText">Pakken er på succesfuld vis blevet fjernet</key>
-    <key alias="packageUninstallHeader">Afinstallér pakke</key>
-    <key alias="packageUninstallText"><![CDATA[Du kan fjerne markeringen på elementer du ikke ønsker at fjerne, på dette tidspunkt, nedenfor. Når du klikker 'bekræft' vil alle afkrydsede elemenet blive fjernet <br/>
-<span style="color: Red; font-weight: bold;">Bemærk:</span> at dokumenter og medier som afhænger af denne pakke vil muligvis holde op med at virke, så vær forsigtig. Hvis i tvivl, kontakt personen som har udviklet pakken.]]></key>
-    <key alias="packageVersion">Pakke version</key>
-    <key alias="packageAlreadyInstalled">Pakke allerede installeret</key>
-    <key alias="targetVersionMismatch">Denne pakke kan ikke installeres, den kræver en minimum Umbraco version af</key>
-    <key alias="installStateUninstalling">Afinstallerer...</key>
-    <key alias="installStateDownloading">Downloader...</key>
-    <key alias="installStateImporting">Importeret...</key>
-    <key alias="installStateInstalling">Installerer...</key>
-    <key alias="installStateRestarting">Genstarter, vent venligst...</key>
-    <key alias="installStateComplete">Færdig, din browser opdateres nu, vent venligst...</key>
-    <key alias="installStateCompleted">Klik venligst på 'Afslut' for at gennemføre installation og opdatere siden.</key>
-    <key alias="installStateUploading">Uploader pakke...</key>
-  </area>
-  <area alias="paste">
-    <key alias="doNothing">Indsæt med fuld formattering (Anbefales ikke)</key>
-    <key alias="errorMessage">Den tekst du er ved at indsætte indeholder specialtegn eller formattering. Dette kan skyldes at du kopierer fra f.eks. Microsoft Word. Umbraco kan fjerne denne specialformattering automatisk så indholdet er mere velegnet til visning på en webside.</key>
-    <key alias="removeAll">Indsæt som ren tekst, dvs. fjern al formattering</key>
-    <key alias="removeSpecialFormattering">Indsæt, men fjern formattering som ikke bør være på en webside (Anbefales)</key>
-  </area>
-  <area alias="publicAccess">
-    <key alias="paGroups">Gruppebaseret beskyttelse</key>
-    <key alias="paGroupsHelp">Hvis du ønsker at give adgang til alle medlemmer af specifikke medlemsgrupper</key>
-    <key alias="paGroupsNoGroups">Du skal oprette en medlemsgruppe før du kan bruge gruppebaseret beskyttelse</key>
-    <key alias="paErrorPage">Fejlside</key>
-    <key alias="paErrorPageHelp">Brugt når folk er logget ind, men ingen adgang</key>
-    <key alias="paHowWould"><![CDATA[Vælg hvordan siden <strong>%0%</strong> skal beskyttes]]></key>
-    <key alias="paIsProtected"><![CDATA[<strong>%0%</strong> er nu beskyttet]]></key>
-    <key alias="paIsRemoved"><![CDATA[Beskyttelse fjernet fra <strong>%0%</strong>]]></key>
-    <key alias="paLoginPage">Log ind-side</key>
-    <key alias="paLoginPageHelp">Vælg siden der indeholder log ind-formularen</key>
-    <key alias="paRemoveProtection">Fjern beskyttelse...</key>
-    <key alias="paRemoveProtectionConfirm"><![CDATA[Er du sikker på at du vil fjerne beskyttelsen fra siden <strong>%0%</strong>?]]></key>
-    <key alias="paSelectPages">Vælg siderne der indeholder log ind-formularer og fejlmeddelelser</key>
-    <key alias="paSelectGroups"><![CDATA[Vælg de grupper der har adgang til siden <strong>%0%</strong>]]></key>
-    <key alias="paSelectMembers"><![CDATA[Vælg de medlemmer der har adgang til siden <strong>%0%</strong>]]></key>
-    <key alias="paMembers">Adgang til enkelte medlemmer</key>
-    <key alias="paMembersHelp">Hvis du ønsker at give adgang til enkelte medlemmer</key>
-  </area>
-  <area alias="publish">
-    <key alias="contentPublishedFailedAwaitingRelease">Udgivelsen kunne ikke udgives da publiceringsdato er sat</key>
-    <key alias="contentPublishedFailedExpired"><![CDATA[
-      %0% Udgivelsen kunne ikke blive publiceret da publiceringsdatoen er overskredet
-     ]]></key>
-    <key alias="contentPublishedFailedInvalid"><![CDATA[
-    %0% kunne ikke publiceres da følgende egenskaber :  %1%  ikke overholdte valderingsreglerne.
-    ]]></key>
-    <key alias="contentPublishedFailedByEvent">%0% kunne ikke udgives, fordi et 3. parts modul annullerede handlingen</key>
-    <key alias="contentPublishedFailedByMissingName"><![CDATA[%0% kan ikke udgives, fordi det mangler et navn.]]></key>
-    <key alias="includeUnpublished">Medtag ikke-udgivede undersider</key>
-    <key alias="inProgress">Publicerer - vent venligst...</key>
-    <key alias="inProgressCounter">%0% ud af %1% sider er blevet udgivet...</key>
-    <key alias="nodePublish">%0% er nu publiceret</key>
-    <key alias="nodePublishAll">%0% og alle undersider er nu publiceret</key>
-    <key alias="publishAll">Publicér alle undersider</key>
-    <key alias="publishHelp"><![CDATA[Klik <em>ok</em> for at udgive <strong>%0%</strong> og derved gøre indholdet offentligt tilgængeligt..<br/><br /> Du kan udgive denne side og dens undersider ved at klikke <em>Udgiv alle undersider</em> forneden]]></key>
-  </area>
-  <area alias="colorpicker">
-    <key alias="noColors">Du har ikke konfigureret nogen godkendte farver</key>
-  </area>
-  <area alias="contentPicker">
-    <key alias="allowedItemTypes">Du kan kun vælge følgende type(r) dokumenter: %0%</key>
-    <key alias="pickedTrashedItem">Du har valgt et dokument som er slettet eller lagt i papirkurven</key>
-    <key alias="pickedTrashedItems">Du har valgt dokumenter som er slettede eller lagt i papirkurven</key>
-  </area>
-  <area alias="mediaPicker">
-    <key alias="pickedTrashedItem">Du har valgt et medie som er slettet eller lagt i papirkurven</key>
-    <key alias="pickedTrashedItems">Du har valgt medier som er slettede eller lagt i papirkurven</key>
-  </area>
-  <area alias="relatedlinks">
-    <key alias="enterExternal">indtast eksternt link</key>
-    <key alias="chooseInternal">vælg en intern side</key>
-    <key alias="caption">Tekst</key>
-    <key alias="link">Link</key>
-    <key alias="newWindow">Nyt vindue</key>
-    <key alias="captionPlaceholder">Indtast en tekst</key>
-    <key alias="externalLinkPlaceholder">Indtast et link</key>
-  </area>
-  <area alias="imagecropper">
-    <key alias="reset">Nulstil</key>
-    <key alias="updateEditCrop">Acceptér</key>
-    <key alias="undoEditCrop">Fortryd</key>
-  </area>
-  <area alias="rollback">
-    <key alias="headline">Vælg en version at sammenligne med den nuværende version</key>
-    <key alias="currentVersion">Nuværende version</key>
-    <key alias="diffHelp"><![CDATA[Her vises forskellene mellem den nuværende version og den valgte version<br /><del>Rød</del> tekst vil ikke blive vist i den valgte version. <ins>Grøn betyder tilføjet</ins>]]></key>
-    <key alias="documentRolledBack">Dokument tilbagerullet</key>
-    <key alias="htmlHelp">Her vises den valgte version som html. Hvis du ønsker at se forskellen mellem de 2 versioner på samme tid, brug 'diff'-oversigten</key>
-    <key alias="rollbackTo">Tilbagerulning til</key>
-    <key alias="selectVersion">Vælg version</key>
-    <key alias="view">Vis</key>
-  </area>
-  <area alias="scripts">
-    <key alias="editscript">Rediger script</key>
-  </area>
-  <area alias="sections">
-    <key alias="concierge">Concierge</key>
-    <key alias="content">Indhold</key>
-    <key alias="courier">Courier</key>
-    <key alias="developer">Udvikler</key>
-    <key alias="installer">Umbraco konfigurationsguide</key>
-    <key alias="media">Mediearkiv</key>
-    <key alias="member">Medlemmer</key>
-    <key alias="packages">Pakker</key>
-    <key alias="newsletters">Nyhedsbreve</key>
-    <key alias="settings">Indstillinger</key>
-    <key alias="statistics">Statistik</key>
-    <key alias="translation">Oversættelse</key>
-    <key alias="users">Brugere</key>
-    <key alias="help">Hjælp</key>
-    <key alias="forms">Formularer</key>
-  </area>
-  <area alias="help">
-    <key alias="theBestUmbracoVideoTutorials">De bedste Umbraco video tutorials</key>
-  </area>
-  <area alias="settings">
-    <key alias="defaulttemplate">Standardskabelon</key>
-    <key alias="importDocumentTypeHelp">For at importere en dokumenttype, find ".udt"-filen på din computer ved at klikke på "Gennemse"-knappen og klik "Import" (Du vil blive bedt om bekræftelse på næste skærmbillede)</key>
-    <key alias="newtabname">Ny titel på faneblad</key>
-    <key alias="nodetype">Nodetype</key>
-    <key alias="objecttype">Type</key>
-    <key alias="stylesheet">Stylesheet</key>
-    <key alias="script">Script</key>
-    <key alias="tab">Faneblad</key>
-    <key alias="tabname">Titel på faneblad</key>
-    <key alias="tabs">Faneblade</key>
-  </area>
-  <area alias="sort">
-    <key alias="sortOrder">Sorteringsrækkefølge</key>
-    <key alias="sortCreationDate">Oprettelsesdato</key>
-    <key alias="sortDone">Sortering udført</key>
-    <key alias="sortHelp">Træk de forskellige sider op eller ned for at indstille hvordan de skal arrangeres, eller klik på kolonnehovederne for at sortere hele rækken af sider</key>
-    <key alias="sortPleaseWait"><![CDATA[Vent venligst mens siderne sorteres. Det kan tage et stykke tid.]]></key>
-  </area>
-  <area alias="speechBubbles">
-    <key alias="validationFailedHeader">Validering</key>
-    <key alias="validationFailedMessage">Valideringsfejl skal rettes før elementet kan gemmes</key>
-    <key alias="operationFailedHeader">Fejlet</key>
-    <key alias="operationSavedHeader">Gemt</key>
-    <key alias="invalidUserPermissionsText">Utilstrækkelige brugerrettigheder, kunne ikke fuldføre handlingen</key>
-    <key alias="operationCancelledHeader">Annulleret</key>
-    <key alias="operationCancelledText">Handlingen blev annulleret af et 3. part tilføjelsesprogram</key>
-    <key alias="contentTypeDublicatePropertyType">Property type eksisterer allerede</key>
-    <key alias="contentTypePropertyTypeCreated">Egenskabstype oprettet</key>
-    <key alias="contentTypePropertyTypeCreatedText"><![CDATA[Navn: %0% <br /> DataType: %1%]]></key>
-    <key alias="contentTypePropertyTypeDeleted">Egenskabs type slettet</key>
-    <key alias="contentTypeSavedHeader">Indholdstype gemt</key>
-    <key alias="contentTypeTabCreated">Du har oprettet et faneblad</key>
-    <key alias="contentTypeTabDeleted">Faneblad slettet</key>
-    <key alias="contentTypeTabDeletedText">Faneblad med id: %0% slettet</key>
-    <key alias="cssErrorHeader">Stylesheetet blev ikke gemt</key>
-    <key alias="cssSavedHeader">Stylesheet gemt</key>
-    <key alias="cssSavedText">Stylesheet gemt uden fejl</key>
-    <key alias="dataTypeSaved">Datatype gemt</key>
-    <key alias="dictionaryItemSaved">Ordbogsnøgle gemt</key>
-    <key alias="editContentPublishedHeader">Indhold publiceret</key>
-    <key alias="editContentPublishedText">og nu synligt for besøgende</key>
-    <key alias="editContentSavedHeader">Indhold gemt</key>
-    <key alias="editContentSavedText">Husk at publicere for at gøre det synligt for besøgende</key>
-    <key alias="editContentSendToPublish">Send til Godkendelse</key>
-    <key alias="editContentSendToPublishText">Rettelser er blevet sendt til godkendelse</key>
-    <key alias="editMediaSaved">Medie gemt</key>
-    <key alias="editMediaSavedText">Medie gemt uden problemer</key>
-    <key alias="editMemberSaved">Medlem gemt</key>
-    <key alias="editMemberGroupSaved">Medlemsgruppe gemt</key>
-    <key alias="editStylesheetPropertySaved">Stylesheetegenskab gemt</key>
-    <key alias="editStylesheetSaved">Stylesheet gemt</key>
-    <key alias="editTemplateSaved">Skabelon gemt</key>
-    <key alias="editUserError">Der er opstået en fejl under redigering</key>
-    <key alias="editUserSaved">Bruger gemt</key>
-    <key alias="editUserTypeSaved">Brugertype gemt</key>
-    <key alias="editUserGroupSaved">Brugergruppe gemt</key>
-    <key alias="fileErrorHeader">Fil ikke gemt</key>
-    <key alias="fileErrorText">Filen kunne ikke gemmes. Tjek filrettighederne</key>
-    <key alias="fileSavedHeader">Fil gemt</key>
-    <key alias="fileSavedText">Fil gemt uden fejl</key>
-    <key alias="languageSaved">Sprog gemt</key>
-    <key alias="mediaTypeSavedHeader">Medietype gemt</key>
-    <key alias="memberTypeSavedHeader">Medlemstype gemt</key>
-    <key alias="memberGroupSavedHeader">Medlemsgruppe gemt</key>
-    <key alias="templateErrorHeader">Skabelon ikke gemt</key>
-    <key alias="templateErrorText">Undgå venligst at du har 2 templates med samme alias</key>
-    <key alias="templateSavedHeader">Skabelon gemt</key>
-    <key alias="templateSavedText">Skabelon gemt uden fejl!</key>
-    <key alias="contentUnpublished">Indhold fjernet fra udgivelse</key>
-    <key alias="partialViewSavedHeader">Partial view gemt</key>
-    <key alias="partialViewSavedText">Partial view gemt uden fejl!</key>
-    <key alias="partialViewErrorHeader">Partial view ikke gemt</key>
-    <key alias="partialViewErrorText">Der opstod en fejl ved at gemme filen.</key>
-    <key alias="permissionsSavedFor">Rettigheder gemt for</key>
-    <key alias="deleteUserGroupsSuccess">Slettede %0% brugergrupper</key>
-    <key alias="deleteUserGroupSuccess">%0% blev slettet</key>
-    <key alias="enableUsersSuccess">Aktiverede %0% brugere</key>
-    <key alias="disableUsersSuccess">Deaktiverede %0% brugere</key>
-    <key alias="enableUserSuccess">%0% er nu aktiveret</key>
-    <key alias="disableUserSuccess">%0% er nu deaktiveret</key>
-    <key alias="setUserGroupOnUsersSuccess">Brugergrupper er blevet indstillet</key>
-    <key alias="unlockUsersSuccess">Låste %0% brugere op</key>
-    <key alias="unlockUserSuccess">%0% er nu låst op</key>
-  </area>
-  <area alias="stylesheet">
-    <key alias="addRule">Tilføj style</key>
-    <key alias="editRule">Redigér style</key>
-    <key alias="editorRules">Teksteditor-styles</key>
-    <key alias="editorRulesHelp">Definér de styles, der skal være tilgængelige i teksteditoren for dette stylesheet</key>
-    <key alias="selector">Selector</key>
-    <key alias="selectorHelp">Bruger CSS-syntaks, f.eks. "h1" eller ".redheader"</key>
-    <key alias="editstylesheet">Rediger stylesheet</key>
-    <key alias="editstylesheetproperty">Rediger CSS-egenskab</key>
-    <key alias="nameHelp">Det navn der vises i teksteditoren</key>
-    <key alias="preview">Forhåndsvisning</key>
-    <key alias="previewHelp">Hvordan teksten vil se ud i teksteditoren.</key>
-    <key alias="styles">Styles</key>
-    <key alias="stylesHelp">Den CSS der skal anvendes i teksteditoren, f.eks. "color:red;"</key>
-    <key alias="tabCode">Kode</key>
-    <key alias="tabRules">Editor</key>
-  </area>
-  <area alias="template">
-    <key alias="deleteByIdFailed">Sletning af skabelonen med ID %0% fejlede</key>
-    <key alias="edittemplate">Rediger skabelon</key>
-    <key alias="insertSections">Sektioner</key>
-    <key alias="insertContentArea">Indsæt indholdsområde</key>
-    <key alias="insertContentAreaPlaceHolder">Indsæt pladsholder for indholdsområde</key>
-    <key alias="insert">Indsæt</key>
-    <key alias="insertDesc">Hvad vil du indsætte?</key>
-    <key alias="insertDictionaryItem">Oversættelse</key>
-    <key alias="insertDictionaryItemDesc">Indsætter en oversætbar tekst, som skifter efter det sprog, som websitet vises i.</key>
-    <key alias="insertMacro">Makro</key>
-    <key alias="insertMacroDesc">
-      En makro er et element, som kan have forskellige indstillinger, når det indsættes.
-      Brug det som en genbrugelig del af dit design såsom gallerier, formularer og lister.
-    </key>
-    <key alias="insertPageField">Sideværdi</key>
-    <key alias="insertPageFieldDesc">
-      Viser værdien af et felt fra den nuværende side. Kan indstilles til at bruge rekursive værdier eller
-      vise en standardværdi i tilfælde af, at feltet er tomt.
-    </key>
-    <key alias="insertPartialView">Partial view</key>
-    <key alias="insertPartialViewDesc">
-      Et Partial View er et skabelonelement, som kan indsættes i andre skabeloner og derved
-      genbruges og deles på tværs af sideskabelonerne.
-    </key>
-    <key alias="mastertemplate">Master skabelon</key>
-    <key alias="quickGuide">Lynguide til Umbracos skabelontags</key>
-    <key alias="noMaster">Ingen master</key>
-    <key alias="renderBody">Indsæt en underliggende skabelon</key>
-    <key alias="renderBodyDesc"><![CDATA[
-      Henter indholdet af en underliggende skabelon ind, ved at
-      indsætte et <code>@RenderBody()</code> element.
-      ]]></key>
-    <key alias="defineSection">Definer en sektion</key>
-    <key alias="defineSectionDesc"><![CDATA[
-         Definerer en del af din skabelon som en navngivet sektion, ved at
-         omkranse den i <code>@section { ... }</code>. Herefter kan denne sektion flettes ind i
-         overliggende skabelon ved at indsætte et <code>@RenderSection</code> element.
-      ]]></key>
-    <key alias="renderSection">Indsæt en sektion</key>
-    <key alias="renderSectionDesc"><![CDATA[
-      Henter indholdet af en sektion fra den underliggende skabelon ind, ved at indsætte et
-      <code>@RenderSection(name)</code> element. Den underliggende skabelon skal have
-      defineret en sektion via et <code>@section [name]{ ... }</code> element.
-      ]]></key>
-    <key alias="sectionName">Sektionsnavn</key>
-    <key alias="sectionMandatory">Sektionen er obligatorisk</key>
-    <key alias="sectionMandatoryDesc">
-      Hvis obligatorisk, skal underskabelonen indeholde en <code>@section</code> -definition.
-    </key>
-    <key alias="queryBuilder">Query builder</key>
-    <key alias="itemsReturned">sider returneret, på</key>
-    <key alias="iWant">Returner</key>
-    <key alias="allContent">alt indhold</key>
-    <key alias="contentOfType">indhold af typen "%0%"</key>
-    <key alias="from">fra</key>
-    <key alias="websiteRoot">mit website</key>
-    <key alias="where">hvor</key>
-    <key alias="and">og</key>
-    <key alias="is">er</key>
-    <key alias="isNot">ikke er</key>
-    <key alias="before">er før</key>
-    <key alias="beforeIncDate">er før (inkl. valgte dato)</key>
-    <key alias="after">er efter</key>
-    <key alias="afterIncDate">er efter (inkl. valgte dato)</key>
-    <key alias="equals">er</key>
-    <key alias="doesNotEqual">ikke er</key>
-    <key alias="contains">indeholder</key>
-    <key alias="doesNotContain">ikke indeholder</key>
-    <key alias="greaterThan">er større end</key>
-    <key alias="greaterThanEqual">er større end eller det samme som</key>
-    <key alias="lessThan">er mindre end</key>
-    <key alias="lessThanEqual">er mindre end eller det samme som</key>
-    <key alias="id">Id</key>
-    <key alias="name">Navn</key>
-    <key alias="createdDate">Oprettelsesdato</key>
-    <key alias="lastUpdatedDate">Sidste opdatering</key>
-    <key alias="orderBy">Sortér efter</key>
-    <key alias="ascending">stigende rækkefølge</key>
-    <key alias="descending">faldende rækkefølge</key>
-    <key alias="template">Skabelon</key>
-  </area>
-  <area alias="grid">
-    <key alias="media">Billede</key>
-    <key alias="macro">Macro</key>
-    <key alias="insertControl">Vælg indholdstype</key>
-    <key alias="chooseLayout">Vælg layout</key>
-    <key alias="addRows">Tilføj række</key>
-    <key alias="addElement">Tilføj indhold</key>
-    <key alias="dropElement">Slip indhold</key>
-    <key alias="settingsApplied">Indstillinger tilføjet</key>
-    <key alias="contentNotAllowed">Indholdet er ikke tilladt her</key>
-    <key alias="contentAllowed">Indholdet er tilladt her</key>
-    <key alias="clickToEmbed">Klik for at indlejre</key>
-    <key alias="clickToInsertImage">Klik for at indsætte et billede</key>
-    <key alias="placeholderImageCaption">Billedtekst...</key>
-    <key alias="placeholderWriteHere">Skriv her...</key>
-    <key alias="gridLayouts">Grid layout</key>
-    <key alias="gridLayoutsDetail">Et layout er det overordnede arbejdsområde til dit grid - du vil typisk kun behøve ét eller to</key>
-    <key alias="addGridLayout">Tilføj grid layout</key>
-    <key alias="addGridLayoutDetail">Juster dit layout ved at justere kolonnebredder og tilføj yderligere sektioner</key>
-    <key alias="rowConfigurations">Rækkekonfigurationer</key>
-    <key alias="rowConfigurationsDetail">Rækker er foruddefinerede celler, der arrangeres vandret</key>
-    <key alias="addRowConfiguration">Tilføj rækkekonfiguration</key>
-    <key alias="addRowConfigurationDetail">Juster rækken ved at indstille cellebredder og tilføje yderligere celler</key>
-    <key alias="columns">Kolonner</key>
-    <key alias="columnsDetails">Det totale antal kolonner i dit grid</key>
-    <key alias="settings">Indstillinger</key>
-    <key alias="settingsDetails">Konfigurer, hvilket indstillinger, brugeren kan ændre</key>
-    <key alias="styles">Typografi</key>
-    <key alias="stylesDetails">Vælg hvilke typografiværdier en redaktør kan ændre</key>
-    <key alias="allowAllEditors">Tillad alle editorer</key>
-    <key alias="allowAllRowConfigurations">Tillad alle rækkekonfigurationer</key>
-    <key alias="setAsDefault">Sæt som standard</key>
-    <key alias="chooseExtra">Vælg ekstra</key>
-    <key alias="chooseDefault">Vælg standard</key>
-    <key alias="areAdded">er tilføjet</key>
-    <key alias="maxItems">Maksimalt emner</key>
-    <key alias="maxItemsDescription">Efterlad blank eller sæt til 0 for ubegrænset</key>
-  </area>
-  <area alias="contentTypeEditor">
-    <key alias="compositions">Kompositioner</key>
-    <key alias="group">Gruppe</key>
-    <key alias="noGroups">Du har ikke tilføjet nogen grupper</key>
-    <key alias="addGroup">Tilføj gruppe</key>
-    <key alias="inheritedFrom">Nedarvet fra</key>
-    <key alias="addProperty">Tilføj egenskab</key>
-    <key alias="requiredLabel">Påkrævet label</key>
-    <key alias="enableListViewHeading">Aktivér listevisning</key>
-    <key alias="enableListViewDescription">Konfigurér indholdet til at blive vist i en sortérbar og søgbar liste; undersider vil ikke blive vist i træet</key>
-    <key alias="allowedTemplatesHeading">Tilladte skabeloner</key>
-    <key alias="allowedTemplatesDescription">Vælg hvilke skabeloner der er tilladt at bruge på dette indhold</key>
-    <key alias="allowAsRootHeading">Tillad på rodniveau</key>
-    <key alias="allowAsRootDescription">Kun dokumenttyper med denne indstilling aktiveret kan oprettes i rodniveau under indhold og mediearkiv</key>
-    <key alias="childNodesHeading">Tilladte typer</key>
-    <key alias="childNodesDescription">Tillad at oprette indhold af en specifik type under denne</key>
-    <key alias="chooseChildNode">Vælg child node</key>
-    <key alias="compositionsDescription">Nedarv faner og egenskaber fra en anden dokumenttype. Nye faner vil blive tilføjet den nuværende dokumenttype eller sammenflettet hvis fanenavnene er ens.</key>
-    <key alias="compositionInUse">Indholdstypen bliver brugt i en komposition og kan derfor ikke blive anvendt som komposition</key>
-    <key alias="noAvailableCompositions">Der er ingen indholdstyper tilgængelige at bruge som komposition</key>
-    <key alias="availableEditors">Tilgængelige editors</key>
-    <key alias="reuse">Genbrug</key>
-    <key alias="editorSettings">Editor indstillinger</key>
-    <key alias="configuration">Konfiguration</key>
-    <key alias="yesDelete">Ja, slet</key>
-    <key alias="movedUnderneath">blev flyttet til</key>
-    <key alias="folderToMove">Vælg hvor</key>
-    <key alias="structureBelow">skal flyttes til</key>
-    <key alias="allDocumentTypes">Alle dokumenttyper</key>
-    <key alias="allDocuments">Alle dokumenter</key>
-    <key alias="allMediaItems">Alle medier</key>
-    <key alias="usingThisDocument">som benytter denne dokumenttype vil blive slettet permanent. Bekræft at du også vil slette dem.</key>
-    <key alias="usingThisMedia">som benytter denne medietype vil blive slettet permanent. Bekræft at du også vil slette dem.</key>
-    <key alias="usingThisMember">som benytter denne medlemstype vil blive slettet permanent. Bekræft at du også vil slette dem.</key>
-    <key alias="andAllDocuments">og alle dokumenter, som benytter denne type</key>
-    <key alias="andAllMediaItems">og alle medier, som benytter denne type</key>
-    <key alias="andAllMembers">og alle medlemmer, som benytter denne type</key>
-    <key alias="memberCanEdit">Medlem kan redigere</key>
-    <key alias="showOnMemberProfile">Vis på medlemsprofil</key>
-    <key alias="tabHasNoSortOrder">fane har ingen sorteringsrækkefølge</key>
-    <key alias="elementType">Element-type</key>
-    <key alias="elementHeading">Er en Element-type</key>
-    <key alias="elementDescription">En Element-type er tiltænkt brug i f.eks. Nested Content, ikke i indholdstræet</key>
-    <key alias="elementDoesNotSupport">Dette benyttes ikke for en Element-type</key>
-    <key alias="propertyHasChanges">Du har lavet ændringer til denne egenskab. Er du sikker på at du vil kassere dem?</key>
-  </area>
-  <area alias="languages">
-    <key alias="addLanguage">Tilføj sprog</key>
-    <key alias="mandatoryLanguage">Påkrævet sprog</key>
-    <key alias="mandatoryLanguageHelp">Egenskaber på dette sprog skal være udfyldt før noden kan blive udgivet.</key>
-    <key alias="defaultLanguage">Standardsprog</key>
-    <key alias="defaultLanguageHelp">Et Umbraco-site kan kun have ét standardsprog.</key>
-    <key alias="changingDefaultLanguageWarning">At skifte standardsprog kan resultere i at standardindhold mangler.</key>
-    <key alias="fallsbackToLabel">Fallback til</key>
-    <key alias="noFallbackLanguageOption">Intet fallback-sprog</key>
-    <key alias="fallbackLanguageDescription">For at tillade flersproget indhold, som ikke er tilgængeligt i det anmodede sprog, skal du her vælge et sprog at falde tilbage på.</key>
-    <key alias="fallbackLanguage">Fallback-sprog</key>
-  </area>
-  <area alias="macro">
-    <key alias="addParameter">Tilføj parameter</key>
-    <key alias="editParameter">Redigér parameter</key>
-    <key alias="enterMacroName">Indtast makronavn</key>
-    <key alias="parameters">Parametre</key>
-    <key alias="parametersDescription">Definér de parametre der skal være tilgængelige, når du bruger denne makro.</key>
-    <key alias="selectViewFile">Vælg partial view makrofil</key>
-  </area>
-  <area alias="templateEditor">
-    <key alias="alternativeField">Alternativt felt</key>
-    <key alias="alternativeText">Alternativ tekst</key>
-    <key alias="casing">Casing</key>
-    <key alias="chooseField">Felt som skal indsættes</key>
-    <key alias="convertLineBreaks">Konvertér linieskift</key>
-    <key alias="convertLineBreaksHelp">Erstatter et linieskift med html-tag'et &amp;lt;br&amp;gt;</key>
-    <key alias="dateOnly">Ja, kun dato</key>
-    <key alias="formatAsDate">Formatér som dato</key>
-    <key alias="htmlEncode">HTML indkod</key>
-    <key alias="htmlEncodeHelp">Vil erstatte specielle karakterer med deres HTML jævnbyrdige.</key>
-    <key alias="insertedAfter">Denne tekst vil blive sat ind lige efter værdien af feltet</key>
-    <key alias="insertedBefore">Denne tekst vil blive sat ind lige før værdien af feltet</key>
-    <key alias="lowercase">Lowercase</key>
-    <key alias="none">Ingen</key>
-    <key alias="postContent">Indsæt efter felt</key>
-    <key alias="preContent">Indsæt før felt</key>
-    <key alias="recursive">Rekursivt</key>
-    <key alias="removeParagraph">Fjern paragraf-tags</key>
-    <key alias="removeParagraphHelp">Fjerner eventuelle &amp;lt;P&amp;gt; omkring teksten</key>
-    <key alias="standardFields">Standard felter</key>
-    <key alias="uppercase">Store bogstaver</key>
-    <key alias="urlEncode">URL encode</key>
-    <key alias="urlEncodeHelp">Hvis indholdet af felterne skal sendes til en url, skal denne slåes til så specialtegn formateres</key>
-    <key alias="usedIfAllEmpty">Denne tekst bruges hvis ovenstående felter er tomme</key>
-    <key alias="usedIfEmpty">Dette felt vil blive brugt hvis ovenstående felt er tomt</key>
-    <key alias="withTime">Ja, med klokkeslæt. Dato/tid separator: </key>
-  </area>
-  <area alias="translation">
-    <key alias="details">Oversættelsesdetaljer</key>
-    <key alias="DownloadXmlDTD">Download XML DTD</key>
-    <key alias="fields">Felter</key>
-    <key alias="includeSubpages">Inkluder undersider</key>
-    <key alias="mailBody">Hej %0%. Dette er en automatisk mail sendt for at informere dig om at dokumentet '%1' har en forespørgsel omkring oversættelse til '%5%' af %2%. Gå til http://%3%/translation/details.aspx?id=%4% for at redigere. Eller log ind i Umbraco for at få en oversigt over dine oversættelsesopgaver: http://%3%/Umbraco Hav en god dag! Mange hilsner Umbraco-robotten</key>
-    <key alias="noTranslators">Ingen oversættelsesbrugere er fundet. Opret venligst en oversættelsesbruger før du begynder at sende indhold til oversættelse</key>
-    <key alias="pageHasBeenSendToTranslation">Siden '%0%' er blevet sent til oversættelse</key>
-    <key alias="sendToTranslate">Send siden '%0%' til oversættelse</key>
-    <key alias="totalWords">Totalt antal ord</key>
-    <key alias="translateTo">Oversæt til</key>
-    <key alias="translationDone">Oversættelse gennemført.</key>
-    <key alias="translationDoneHelp">Du kan gennemse de sider, som du lige har oversat, ved at klikke nedenfor. Hvis den originale side bliver fundet, vil du blive præsenteret for en sammenligning af de to sider.</key>
-    <key alias="translationFailed">Oversættelse fejlede, XML-filen kan være korrupt (indeholde fejl)</key>
-    <key alias="translationOptions">Oversættelsesmuligheder</key>
-    <key alias="translator">Oversætter</key>
-    <key alias="uploadTranslationXml">Upload oversættelse (xml)</key>
-  </area>
-  <area alias="treeHeaders">
-    <key alias="content">Indhold</key>
-    <key alias="contentBlueprints">Indholdsskabeloner</key>
-    <key alias="media">Mediearkiv</key>
-    <key alias="cacheBrowser">Cacheviser</key>
-    <key alias="contentRecycleBin">Papirkurv</key>
-    <key alias="createdPackages">Oprettede pakker</key>
-    <key alias="dataTypes">Datatyper</key>
-    <key alias="dictionary">Ordbog</key>
-    <key alias="installedPackages">Installerede pakker</key>
-    <key alias="installSkin">Installér et skin</key>
-    <key alias="installStarterKit">Installér et starterkit</key>
-    <key alias="languages">Sprog</key>
-    <key alias="localPackage">Installér lokal pakke</key>
-    <key alias="macros">Makroer</key>
-    <key alias="mediaTypes">Medietyper</key>
-    <key alias="member">Medlemmer</key>
-    <key alias="memberGroups">Medlemsgrupper</key>
-    <key alias="memberRoles">Roller</key>
-    <key alias="memberTypes">Medlemstyper</key>
-    <key alias="documentTypes">Dokumenttyper</key>
-    <key alias="relationTypes">Relationstyper</key>
-    <key alias="packager">Pakker</key>
-    <key alias="packages">Pakker</key>
-    <key alias="partialViews">Partial Views</key>
-    <key alias="partialViewMacros">Partial View makrofiler</key>
-    <key alias="repositories">Installer fra "repository"</key>
-    <key alias="runway">Installer Runway</key>
-    <key alias="runwayModules">Runway-moduler</key>
-    <key alias="scripting">Scripting filer</key>
-    <key alias="scripts">Scripts</key>
-    <key alias="stylesheets">Stylesheets</key>
-    <key alias="templates">Skabeloner</key>
-    <key alias="userPermissions">Brugertilladelser</key>
-    <key alias="userTypes">Brugertyper</key>
-    <key alias="users">Brugere</key>
-    <key alias="settingsGroup">Indstillinger</key>
-    <key alias="templatingGroup">Design og layout</key>
-    <key alias="thirdPartyGroup">Tredjepart</key>
-  </area>
-  <area alias="update">
-    <key alias="updateAvailable">Ny opdatering er klar</key>
-    <key alias="updateDownloadText">%0% er klar, klik her for at downloade</key>
-    <key alias="updateNoServer">Ingen forbindelse til server</key>
-    <key alias="updateNoServerError">Der kunne ikke tjekkes for ny opdatering. Se trace for mere info.</key>
-  </area>
-  <area alias="user">
-    <key alias="access">Adgang</key>
-    <key alias="accessHelp">Baseret på de tildelte grupper og startnoder har brugeren adgang til følgende noder</key>
-    <key alias="assignAccess">Tildel adgang</key>
-    <key alias="administrators">Administrator</key>
-    <key alias="categoryField">Kategorifelt</key>
-    <key alias="createDate">Bruger oprettet</key>
-    <key alias="changePassword">Skift dit kodeord</key>
-    <key alias="changePhoto">Skift billede</key>
-    <key alias="newPassword">Nyt kodeord</key>
-    <key alias="noLockouts">er ikke blevet låst ude</key>
-    <key alias="noPasswordChange">Kodeordet er ikke blevet ændret</key>
-    <key alias="confirmNewPassword">Gentag dit nye kodeord</key>
-    <key alias="changePasswordDescription">Du kan ændre dit kodeord, som giver dig adgang til Umbraco Back Office ved at udfylde formularen og klikke på knappen 'Skift dit kodeord'</key>
-    <key alias="contentChannel">Indholdskanal</key>
-    <key alias="createUserHelp">Opret nye brugere for at give dem adgang til Umbraco. Når en ny bruger oprettes, genereres der en adgangskode, som du kan dele med brugeren.</key>
-    <key alias="descriptionField">Beskrivelsesfelt</key>
-    <key alias="disabled">Deaktivér bruger</key>
-    <key alias="documentType">Dokumenttype</key>
-    <key alias="editors">Redaktør</key>
-    <key alias="excerptField">Uddragsfelt</key>
-    <key alias="failedPasswordAttempts">Fejlede loginforsøg</key>
-    <key alias="goToProfile">Gå til brugerprofil</key>
-    <key alias="groupsHelp">Tilføj grupper for at tildele adgang og tilladelser</key>
-    <key alias="inviteAnotherUser">Invitér anden bruger</key>
-    <key alias="inviteUserHelp">Invitér nye brugere til at give dem adgang til Umbraco. En invitation vil blive sendt via e-mail til brugeren med oplysninger om, hvordan man logger ind i Umbraco.</key>
-    <key alias="language">Sprog</key>
-    <key alias="languageHelp">Indstil det sprog, du vil se i menuer og dialoger</key>
-    <key alias="lastLockoutDate">Seneste låst ude dato</key>
-    <key alias="lastLogin">Seneste login</key>
-    <key alias="lastPasswordChangeDate">Kodeord sidst ændret</key>
-    <key alias="loginname">Brugernavn</key>
-    <key alias="mediastartnode">Startnode i mediearkivet</key>
-    <key alias="mediastartnodehelp">Begræns mediebiblioteket til en bestemt startnode</key>
-    <key alias="mediastartnodes">Medie startnoder</key>
-    <key alias="mediastartnodeshelp">Begræns mediebiblioteket til bestemte startnoder</key>
-    <key alias="modules">Moduler</key>
-    <key alias="noConsole">Deaktivér adgang til Umbraco</key>
-    <key alias="noLogin">har endnu ikke logget ind</key>
-    <key alias="oldPassword">Gammelt kodeord</key>
-    <key alias="password">Adgangskode</key>
-    <key alias="resetPassword">Nulstil kodeord</key>
-    <key alias="passwordChanged">Dit kodeord er blevet ændret!</key>
-    <key alias="passwordConfirm">Bekræft venligst dit nye kodeord</key>
-    <key alias="passwordEnterNew">Indtast dit nye kodeord</key>
-    <key alias="passwordCurrent">Nuværende kodeord</key>
-    <key alias="passwordInvalid">ugyldig nuværende kodeord</key>
-    <key alias="passwordIsBlank">Dit nye kodeord må ikke være tomt!</key>
-    <key alias="passwordIsDifferent">Dit nye kodeord og dit bekræftede kodeord var ikke ens, forsøg venligst igen!</key>
-    <key alias="passwordMismatch">Det bekræftede kodeord matcher ikke det nye kodeord</key>
-    <key alias="permissionReplaceChildren">Erstat underelement-rettigheder</key>
-    <key alias="permissionSelectedPages">Du ændrer i øjeblikket rettigheder for siderne:</key>
-    <key alias="permissionSelectPages">Vælg sider for at ændre deres rettigheder</key>
-    <key alias="removePhoto">Fjern billede</key>
-    <key alias="permissionsDefault">Standard rettigheder</key>
-    <key alias="permissionsGranular">Granulære rettigheder</key>
-    <key alias="permissionsGranularHelp">Sæt rettigheder for specifikke noder</key>
-    <key alias="profile">Profil</key>
-    <key alias="searchAllChildren">Søg alle 'børn'</key>
-    <key alias="startnode">Startnode</key>
-    <key alias="sectionsHelp">Tilføj sektioner for at give brugerne adgang</key>
-    <key alias="selectUserGroups">Vælg brugergrupper</key>
-    <key alias="noStartNode">Ingen startnode valgt</key>
-    <key alias="noStartNodes">Ingen startnoder valgt</key>
-    <key alias="startnodehelp">Begræns indholdstræet til en bestemt startnode</key>
-    <key alias="startnodes">Indhold startnoder</key>
-    <key alias="startnodeshelp">Begræns indholdstræet til bestemte startnoder</key>
-    <key alias="updateDate">Bruger sidst opdateret</key>
-    <key alias="userCreated">er blevet oprettet</key>
-    <key alias="userCreatedSuccessHelp">Den nye bruger er blevet oprettet. For at logge ind i Umbraco skal du bruge adgangskoden nedenfor.</key>
-    <key alias="userManagement">Brugeradministration</key>
-    <key alias="username">Navn</key>
-    <key alias="userPermissions">Brugertilladelser</key>
-    <key alias="usergroup">Brugergruppe</key>
-    <key alias="userInvited">er blevet inviteret</key>
-    <key alias="userInvitedSuccessHelp">En invitation er blevet sendt til den nye bruger med oplysninger om, hvordan man logger ind i Umbraco.</key>
-    <key alias="userinviteWelcomeMessage">Hej og velkommen til Umbraco! På bare 1 minut vil du være klar til at komme i gang, vi skal bare have dig til at oprette en adgangskode og tilføje et billede til din avatar.</key>
-    <key alias="userinviteAvatarMessage">Hvis du uploader et billede af dig selv, gør du det nemt for andre brugere at genkende dig. Klik på cirklen ovenfor for at uploade et billede.</key>
-    <key alias="writer">Forfatter</key>
-    <key alias="change">Skift</key>
-    <key alias="yourProfile">Din profil</key>
-    <key alias="yourHistory">Din historik</key>
-    <key alias="sessionExpires">Session udløber</key>
-    <key alias="inviteUser">Invitér bruger</key>
-    <key alias="createUser">Opret bruger</key>
-    <key alias="sendInvite">Send invitation</key>
-    <key alias="backToUsers">Tilbage til brugere</key>
-    <key alias="inviteEmailCopySubject">Umbraco: Invitation</key>
-    <key alias="inviteEmailCopyFormat"><![CDATA[<html><body><p>Hej %0%, du er blevet inviteret af %1% til Umbraco backoffice.</p><p>Besked fra %1%: <em>%2%</em></p><p>Klik på dette <a href="%3%" target="_blank">link</a> for acceptere invitationen</p><p><small>Hvis du ikke kan klikke på linket, så kopier og indsæt denne URL i dit browservindue<br/><br/>%3%</small></p></body></html>]]></key>
-    <key alias="stateAll">Alle</key>
-    <key alias="stateActive">Aktiv</key>
-    <key alias="stateDisabled">Deaktiveret</key>
-    <key alias="stateLockedOut">Låst ude</key>
-    <key alias="stateInvited">Inviteret</key>
-    <key alias="stateInactive">Inaktiv</key>
-    <key alias="sortNameAscending">Navn (A-Å)</key>
-    <key alias="sortNameDescending">Navn (Å-A)</key>
-    <key alias="sortCreateDateAscending">Nyeste</key>
-    <key alias="sortCreateDateDescending">Ældste</key>
-    <key alias="sortLastLoginDateDescending">Sidst logget ind</key>
-  </area>
-  <area alias="validation">
-    <key alias="validation">Validering</key>
-    <key alias="validateAsEmail">Valider som e-mail</key>
-    <key alias="validateAsNumber">Valider som tal</key>
-    <key alias="validateAsUrl">Valider som Url</key>
-    <key alias="enterCustomValidation">...eller indtast din egen validering</key>
-    <key alias="fieldIsMandatory">Feltet er påkrævet</key>
-    <key alias="validationRegExp">Indtast et regulært udtryk</key>
-    <key alias="minCount">Du skal tilføje mindst</key>
-    <key alias="maxCount">Du kan kun have</key>
-    <key alias="items">elementer</key>
-    <key alias="itemsSelected">elementer valgt</key>
-    <key alias="invalidDate">Ugyldig dato</key>
-    <key alias="invalidNumber">Ikke et tal</key>
-    <key alias="invalidEmail">Ugyldig e-mail</key>
-  </area>
-  <area alias="redirectUrls">
-    <key alias="disableUrlTracker">Slå URL tracker fra</key>
-    <key alias="enableUrlTracker">Slå URL tracker til</key>
-    <key alias="originalUrl">Original URL</key>
-    <key alias="redirectedTo">Viderestillet til</key>
-    <key alias="noRedirects">Der er ikke lavet nogen viderestillinger</key>
-    <key alias="noRedirectsDescription">Når en udgivet side bliver omdøbt eller flyttet, vil en viderestilling automatisk blive lavet til den nye side.</key>
-    <key alias="confirmRemove">Er du sikker på at du vil fjerne viderestillingen fra '%0%' til '%1%'?</key>
-    <key alias="redirectRemoved">Viderestillings URL fjernet.</key>
-    <key alias="redirectRemoveError">Fejl under fjernelse af viderestillings URL.</key>
-    <key alias="redirectRemoveWarning">Dette vil fjerne viderestillingen</key>
-    <key alias="confirmDisable">Er du sikker på at du vil slå URL trackeren fra?</key>
-    <key alias="disabledConfirm">URL tracker er nu slået fra.</key>
-    <key alias="disableError">Der opstod en fejl under forsøget på at slå URL trackeren fra, der findes mere information i logfilen.</key>
-    <key alias="enabledConfirm">URL tracker er nu slået fra.</key>
-    <key alias="enableError">Der opstod en fejl under forsøget på at slå URL trackeren til, der findes mere information i logfilen.</key>
-  </area>
-  <area alias="emptyStates">
-    <key alias="emptyDictionaryTree">Ingen ordbog elementer at vælge imellem</key>
-  </area>
+    <key alias="createFromClipboard">Indsæt fra udklipsmappen</key>
+  </area>
+  <area alias="blueprints">
+    <key alias="createBlueprintFrom">Opret en ny indholdsskabelon fra '%0%'</key>
+    <key alias="blankBlueprint">Blank</key>
+    <key alias="selectBlueprint">Vælg en indholdsskabelon</key>
+    <key alias="createdBlueprintHeading">Indholdsskabelon oprettet</key>
+    <key alias="createdBlueprintMessage">En indholdsskabelon blev oprettet fra '%0%'</key>
+    <key alias="duplicateBlueprintMessage">En anden indholdsskabelon med samme navn eksisterer allerede</key>
+    <key alias="blueprintDescription">En indholdskabelon er foruddefineret indhold, som en redaktør kan vælge at bruge som grundlag for at oprette nyt indhold</key>
+  </area>
+  <area alias="media">
+    <key alias="clickToUpload">Klik for at uploade</key>
+    <key alias="orClickHereToUpload">eller klik her for at vælge filer</key>
+    <key alias="dragFilesHereToUpload">Du kan trække filer herind for at uploade.</key>
+    <key alias="disallowedFileType">Kan ikke uploade denne fil, den har ikke en godkendt filtype</key>
+    <key alias="maxFileSize">Maks filstørrelse er</key>
+    <key alias="mediaRoot">Medie rod</key>
+    <key alias="moveFailed">Flytning af mediet fejlede</key>
+    <key alias="copyFailed">Kopiering af mediet fejlede</key>
+    <key alias="createFolderFailed">Oprettelse af mappen under parent med id %0% fejlede</key>
+    <key alias="renameFolderFailed">Omdøbning af mappen med id %0% fejlede</key>
+    <key alias="dragAndDropYourFilesIntoTheArea">Træk og slip dine filer ind i dropzonen</key>
+  </area>
+  <area alias="member">
+    <key alias="createNewMember">Opret et nyt medlem</key>
+    <key alias="allMembers">Alle medlemmer</key>
+    <key alias="memberGroupNoProperties">Medlemgrupper har ingen yderligere egenskaber til redigering.</key>
+  </area>
+  <area alias="create">
+    <key alias="chooseNode">Hvor ønsker du at oprette den nye %0%</key>
+    <key alias="createUnder">Opret under</key>
+    <key alias="createContentBlueprint">Vælg den dokumenttype, du vil oprette en indholdsskabelon til</key>
+    <key alias="enterFolderName">Angiv et navn for mappen</key>
+    <key alias="updateData">Vælg en type og skriv en titel</key>
+    <key alias="noDocumentTypes" version="7.0"><![CDATA[Der kunne ikke findes nogen tilladte dokument typer. Du skal tillade disse i indstillinger under <strong>"dokument typer"</strong>.]]></key>
+    <key alias="noMediaTypes" version="7.0"><![CDATA[Der kunne ikke findes nogen tilladte media typer. Du skal tillade disse i indstillinger under <strong>"media typer"</strong>.]]></key>
+    <key alias="documentTypeWithoutTemplate">Dokumenttype uden skabelon</key>
+    <key alias="newFolder">Ny mappe</key>
+    <key alias="newDataType">Ny datatype</key>
+    <key alias="newJavascriptFile">Ny JavaScript-fil</key>
+    <key alias="newEmptyPartialView">Ny tom partial view</key>
+    <key alias="newPartialViewMacro">Ny partial view makro</key>
+    <key alias="newPartialViewFromSnippet">Ny partial view fra snippet</key>
+    <key alias="newPartialViewMacroFromSnippet">Ny partial view makro fra snippet</key>
+    <key alias="newPartialViewMacroNoMacro">Ny partial view makro (uden makro)</key>
+    <key alias="newStyleSheetFile">Ny stylesheet-fil</key>
+    <key alias="newRteStyleSheetFile">Ny Rich Text Editor stylesheet-fil</key>
+  </area>
+  <area alias="dashboard">
+    <key alias="browser">Til dit website</key>
+    <key alias="dontShowAgain">- Skjul</key>
+    <key alias="nothinghappens">Hvis Umbraco ikke starter, kan det skyldes at din browser ikke tillader pop-up vinduer</key>
+    <key alias="openinnew">er åbnet i nyt vindue</key>
+    <key alias="restart">Genstart</key>
+    <key alias="visit">Besøg</key>
+    <key alias="welcome">Velkommen</key>
+  </area>
+  <area alias="prompt">
+    <key alias="stay">Bliv</key>
+    <key alias="discardChanges">Kassér ændringer</key>
+    <key alias="unsavedChanges">Du har ikke-gemte ændringer</key>
+    <key alias="unsavedChangesWarning">Er du sikker på du vil navigere væk fra denne side? - du har ikke-gemte ændringer</key>
+    <key alias="confirmUnpublish">Afpublicering vil fjerne denne side og alle dets undersider fra websitet.</key>
+    <key alias="doctypeChangeWarning">Du har ikke-gemte ændringer. Hvis du ændrer dokumenttype, kasseres ændringerne.</key>
+  </area>
+  <area alias="bulk">
+    <key alias="done">Færdig</key>
+    <key alias="deletedItem">Slettede %0% element</key>
+    <key alias="deletedItems">Slettede %0% elementer</key>
+    <key alias="deletedItemOfItem">Slettede %0% ud af %1% element</key>
+    <key alias="deletedItemOfItems">Slettede %0% ud af %1% elementer</key>
+    <key alias="publishedItem">Udgav %0% element</key>
+    <key alias="publishedItems">Udgav %0% elementer</key>
+    <key alias="publishedItemOfItem">Udgav %0% ud af %1% element</key>
+    <key alias="publishedItemOfItems">Udgav %0% ud af %1% elementer</key>
+    <key alias="unpublishedItem">Fjernede %0% element fra udgivelse</key>
+    <key alias="unpublishedItems">Fjernede %0% elementer fra udgivelse</key>
+    <key alias="unpublishedItemOfItem">Fjernede %0% ud af %1% element fra udgivelse</key>
+    <key alias="unpublishedItemOfItems">Fjernede %0% ud af %1% elementer fra udgivelse</key>
+    <key alias="movedItem">Flyttede %0% element</key>
+    <key alias="movedItems">Flyttede %0% elementer</key>
+    <key alias="movedItemOfItem">Flyttede %0% ud af %1% element</key>
+    <key alias="movedItemOfItems">Flyttede %0% ud af %1% elementer</key>
+    <key alias="copiedItem">Kopierede %0% element</key>
+    <key alias="copiedItems">Kopierede %0% elementer</key>
+    <key alias="copiedItemOfItem">Kopierede %0% ud af %1% element</key>
+    <key alias="copiedItemOfItems">Kopierede %0% ud af %1% elementer</key>
+  </area>
+  <area alias="defaultdialogs">
+    <key alias="nodeNameLinkPicker">Link titel</key>
+    <key alias="urlLinkPicker">Link</key>
+    <key alias="anchorInsert">Navn på lokalt link</key>
+    <key alias="assignDomain">Rediger domæner</key>
+    <key alias="closeThisWindow">Luk denne dialog</key>
+    <key alias="confirmdelete">Er du sikker på at du vil slette</key>
+    <key alias="confirmdisable">Er du sikker på du vil deaktivere</key>
+    <key alias="confirmlogout">Er du sikker på at du vil forlade Umbraco?</key>
+    <key alias="confirmSure">Er du sikker?</key>
+    <key alias="cut">Klip</key>
+    <key alias="editdictionary">Rediger ordbogsnøgle</key>
+    <key alias="editlanguage">Rediger sprog</key>
+    <key alias="insertAnchor">Indsæt lokalt link</key>
+    <key alias="insertCharacter">Indsæt tegn</key>
+    <key alias="insertgraphicheadline">Indsæt grafisk overskrift</key>
+    <key alias="insertimage">Indsæt billede</key>
+    <key alias="insertlink">Indsæt link</key>
+    <key alias="insertMacro">Indsæt makro</key>
+    <key alias="inserttable">Indsæt tabel</key>
+    <key alias="languagedeletewarning">Dette vil slette sproget</key>
+    <key alias="lastEdited">Sidst redigeret</key>
+    <key alias="link">Link</key>
+    <key alias="linkinternal">Internt link:</key>
+    <key alias="linklocaltip">Ved lokalt link, indsæt da en "#" foran linket</key>
+    <key alias="linknewwindow">Åben i nyt vindue?</key>
+    <key alias="macroContainerSettings">Makroindstillinger</key>
+    <key alias="macroDoesNotHaveProperties">Denne makro har ingen egenskaber du kan redigere</key>
+    <key alias="paste">Indsæt tekst</key>
+    <key alias="permissionsEdit">Rediger rettigheder for</key>
+    <key alias="permissionsSet">Sæt rettigheder for</key>
+    <key alias="permissionsSetForGroup">Sæt rettigheder for %0% for brugergruppe %1%</key>
+    <key alias="permissionsHelp">Vælg de brugergrupper, du vil angive tilladelser til</key>
+    <key alias="recycleBinDeleting">Elementerne i papirkurven slettes. Luk venligst ikke dette vindue mens sletningen foregår</key>
+    <key alias="recycleBinIsEmpty">Papirkurven er nu tom</key>
+    <key alias="recycleBinWarning">Når elementer slettes fra papirkurven, slettes de for altid</key>
+    <key alias="regexSearchError"><![CDATA[<a target='_blank' href='http://regexlib.com'>regexlib.com</a>'s webservice oplever i øjeblikket problemer, vi ikke har kontrol over. Beklager ulejligheden. ]]></key>
+    <key alias="regexSearchHelp">Søg efter et regulært udtryk for at tilføje validering til et formularfelt. Eksempel: 'e-mail', 'postnr.', 'url'</key>
+    <key alias="removeMacro">Fjern makro</key>
+    <key alias="requiredField">Obligatorisk</key>
+    <key alias="sitereindexed">Sitet er genindekseret</key>
+    <key alias="siterepublished">Sitet er nu genudgivet</key>
+    <key alias="siterepublishHelp">Websitets cache vil blive genopfrisket. Alt udgivet indhold vil blive opdateret, mens upubliceret indhold vil forblive upubliceret.</key>
+    <key alias="tableColumns">Antal kolonner</key>
+    <key alias="tableRows">Antal rækker</key>
+    <key alias="thumbnailimageclickfororiginal">Klik på billedet for at se den fulde størrelse</key>
+    <key alias="treepicker">Vælg</key>
+    <key alias="viewCacheItem">Se cache element</key>
+    <key alias="relateToOriginalLabel">Relatér til original</key>
+    <key alias="includeDescendants">Inkludér undersider</key>
+    <key alias="linkToPage">Link til side</key>
+    <key alias="openInNewWindow">Åben linket i et nyt vindue eller fane</key>
+    <key alias="linkToMedia">Link til medie</key>
+    <key alias="selectContentStartNode">Vælg indhold startnode</key>
+    <key alias="selectMedia">Vælg medie</key>
+    <key alias="selectMediaType">Vælg medietype</key>
+    <key alias="selectIcon">Vælg ikon</key>
+    <key alias="selectItem">Vælg item</key>
+    <key alias="selectLink">Vælg link</key>
+    <key alias="selectMacro">Vælg makro</key>
+    <key alias="selectContent">Vælg indhold</key>
+    <key alias="selectContentType">Vælg indholdstype</key>
+    <key alias="selectMediaStartNode">Vælg medie startnode</key>
+    <key alias="selectMember">Vælg medlem</key>
+    <key alias="selectMemberGroup">Vælg medlemsgruppe</key>
+    <key alias="selectMemberType">Vælg medlemstype</key>
+    <key alias="selectNode">Vælg node</key>
+    <key alias="selectSections">Vælg sektioner</key>
+    <key alias="selectUsers">Vælg brugere</key>
+    <key alias="noIconsFound">Ingen ikoner blev fundet</key>
+    <key alias="noMacroParams">Der er ingen parametre for denne makro</key>
+    <key alias="noMacros">Der er ikke tilføjet nogen makroer</key>
+    <key alias="linkYour">Link dit</key>
+    <key alias="unLinkYour">Fjern link fra dit</key>
+    <key alias="account">konto</key>
+    <key alias="selectEditor">Vælg editor</key>
+    <key alias="selectSnippet">Vælg snippet</key>
+    <key alias="variantdeletewarning">Dette vil slette noden og alle dets sprog. Hvis du kun vil slette et sprog, så afpublicér det i stedet.</key>
+  </area>
+  <area alias="dictionary">
+    <key alias="noItems">Der er ingen ordbogselementer.</key>
+  </area>
+  <area alias="dictionaryItem">
+    <key alias="description"><![CDATA[
+      Rediger de forskellige sprogversioner for ordbogselementet '%0%' herunder.<br />Du tilføjer flere sprog under 'sprog' i menuen til venstre </key>
+      ]]></key>
+    <key alias="displayName">Kulturnavn</key>
+    <key alias="changeKeyError"><![CDATA[
+      Navnet '%0%' eksisterer allerede.
+   ]]></key>
+    <key alias="overviewTitle">Ordbogsoversigt</key>
+  </area>
+  <area alias="examineManagement">
+    <key alias="configuredSearchers">Konfigurerede søgere</key>
+    <key alias="configuredSearchersDescription">Viser egenskaber og værktøjer til enhver konfigureret søger (dvs. som en multi-indekssøger)</key>
+    <key alias="fieldValues">Feltværdier</key>
+    <key alias="healthStatus">Sundhedstilstand</key>
+    <key alias="healthStatusDescription">Indeksets sundhedstilstand, og hvis det kan læses</key>
+    <key alias="indexers">Indeksører</key>
+    <key alias="indexInfo">Indeksinfo</key>
+    <key alias="indexInfoDescription">Viser indeksets egenskaber</key>
+    <key alias="manageIndexes">Administrer Examine indekserne</key>
+    <key alias="manageIndexesDescription">Giver dig mulighed for at se detaljerne for hvert indeks og giver nogle værktøjer til styring af indeksørerne</key>
+    <key alias="rebuildIndex">Genopbyg indeks</key>
+    <key alias="rebuildIndexWarning"><![CDATA[
+        Dette vil medføre, at indekset genopbygges.<br />
+        Afhængigt af hvor meget indhold der er på dit website, kan det tage et stykke tid.<br />
+        Det anbefales ikke at genopbygge et indeks i perioder med høj websitetrafik eller når redaktører redigerer indhold.
+     ]]>
+    </key>
+    <key alias="searchers">Søgere</key>
+    <key alias="searchDescription">Søg i indekset og se resultaterne</key>
+    <key alias="tools">Værktøjer</key>
+    <key alias="toolsDescription">Værktøjer til at administrere indekset</key>
+  </area>
+  <area alias="placeholders">
+    <key alias="username">Indtast dit brugernavn</key>
+    <key alias="password">Indtast dit kodeord</key>
+    <key alias="confirmPassword">Bekræft dit kodeord</key>
+    <key alias="nameentity">Navngiv %0%...</key>
+    <key alias="entername">Indtast navn...</key>
+    <key alias="enteremail">Indtast en e-mail...</key>
+    <key alias="enterusername">Indtast et brugernavn...</key>
+    <key alias="label">Label...</key>
+    <key alias="enterDescription">Indtast beskrivelse</key>
+    <key alias="search">Søg...</key>
+    <key alias="filter">Filtrer...</key>
+    <key alias="enterTags">Indtast nøgleord (tryk på Enter efter hvert nøgleord)...</key>
+    <key alias="email">Indtast din e-mail</key>
+    <key alias="enterMessage">Indtast en besked...</key>
+    <key alias="usernameHint">Dit brugernavn er typisk din e-mailadresse</key>
+    <key alias="enterAlias">Indtast alias...</key>
+    <key alias="generatingAlias">Genererer alias...</key>
+  </area>
+  <area alias="editcontenttype">
+    <key alias="createListView" version="7.2">Opret brugerdefineret listevisning</key>
+    <key alias="removeListView" version="7.2">Fjern brugerdefineret listevisning</key>
+  </area>
+  <area alias="renamecontainer">
+    <key alias="renamed">Omdøbt</key>
+    <key alias="enterNewFolderName">Indtast et ny mappenavn her</key>
+    <key alias="folderWasRenamed">%0% was renamed to %1%</key>
+  </area>
+  <area alias="editdatatype">
+    <key alias="addPrevalue">Tilføj førværdi</key>
+    <key alias="dataBaseDatatype">Database-datatype</key>
+    <key alias="guid">Data Editor GUID</key>
+    <key alias="renderControl">Visningskontrol</key>
+    <key alias="rteButtons">Knapper</key>
+    <key alias="rteEnableAdvancedSettings">Aktiver avancerede indstillinger for</key>
+    <key alias="rteEnableContextMenu">Aktiver kontekstmenu</key>
+    <key alias="rteMaximumDefaultImgSize">Maks. std. størrelse på indsatte billeder</key>
+    <key alias="rteRelatedStylesheets">Relaterede stylesheets</key>
+    <key alias="rteShowLabel">Vis label</key>
+    <key alias="rteWidthAndHeight">Bredde og højde</key>
+    <key alias="allPropTypes">All property types &amp; property data</key>
+    <key alias="willBeDeleted">using this data type will be deleted permanently, please confirm you want to delete these as well</key>
+    <key alias="yesDelete">Ja, slet</key>
+    <key alias="andAllRelated">and all property types &amp; property data using this data type</key>
+    <key alias="selectFolder">Vælg den mappe, der skal flyttes</key>
+    <key alias="inTheTree">til i træstrukturen nedenfor</key>
+    <key alias="wasMoved">blev flyttet under</key>
+  </area>
+  <area alias="errorHandling">
+    <key alias="errorButDataWasSaved">Dine data er blevet gemt, men før du kan udgive denne side er der nogle fejl der skal rettes:</key>
+    <key alias="errorChangingProviderPassword">Den nuværende membership-provider understøtter ikke skift af kodeord (EnablePasswordRetrieval skal være true)</key>
+    <key alias="errorExistsWithoutTab">%0% der findes allerede</key>
+    <key alias="errorHeader">Der var fejl i dokumentet:</key>
+    <key alias="errorHeaderWithoutTab">Der var fejl i formularen:</key>
+    <key alias="errorInPasswordFormat">Kodeordet skal være på minimum %0% tegn og indeholde mindst %1% alfanumeriske karakterer</key>
+    <key alias="errorIntegerWithoutTab">%0% skal være et heltal</key>
+    <key alias="errorMandatory">%0% under %1% er et obligatorisk felt og skal udfyldes</key>
+    <key alias="errorMandatoryWithoutTab">%0% er et obligatorisk felt og skal udfyldes</key>
+    <key alias="errorRegExp">%0% under %1% er ikke i et korrekt format</key>
+    <key alias="errorRegExpWithoutTab">%0% er ikke i et korrekt format</key>
+  </area>
+  <area alias="errors">
+    <key alias="receivedErrorFromServer">Der skete en fejl på severen</key>
+    <key alias="dissallowedMediaType">Denne filttype er blevet deaktiveret af administratoren</key>
+    <key alias="codemirroriewarning">OBS! Selvom CodeMirror er slået til i konfigurationen, så er den deaktiveret i Internet Explorer fordi den ikke er stabil nok.</key>
+    <key alias="contentTypeAliasAndNameNotNull">Du skal udfylde både Alias &amp; Navn på den nye egenskabstype!</key>
+    <key alias="filePermissionsError">Der mangler læse/skrive rettigheder til bestemte filer og mapper</key>
+    <key alias="missingTitle">Skriv venligst en titel</key>
+    <key alias="missingType">Du skal vælge en type</key>
+    <key alias="pictureResizeBiggerThanOrg">Du er ved at gøre billedet større end originalen. Det vil forringe kvaliteten af billedet. Ønsker du at fortsætte?</key>
+    <key alias="startNodeDoesNotExists">Startnode er slettet, kontakt systemadministrator</key>
+    <key alias="stylesMustMarkBeforeSelect">Du skal markere noget indhold, før du kan ændre stylen</key>
+    <key alias="stylesNoStylesOnPage">Der er ingen aktive styles eller formatteringer på denne side</key>
+    <key alias="tableColMergeLeft">Du skal stå til venstre for de 2 celler du ønsker at samle!</key>
+    <key alias="tableSplitNotSplittable">Du kan ikke opdele en celle, som ikke allerede er delt.</key>
+    <key alias="propertyHasErrors">Denne egenskab er ugyldig</key>
+  </area>
+  <area alias="general">
+    <key alias="about">Om</key>
+    <key alias="action">Handling</key>
+    <key alias="actions">Muligheder</key>
+    <key alias="add">Tilføj</key>
+    <key alias="alias">Alias</key>
+    <key alias="areyousure">Er du sikker?</key>
+    <key alias="back">Tilbage</key>
+    <key alias="backToOverview">Tilbage til oversigt</key>
+    <key alias="border">Kant</key>
+    <key alias="by">af</key>
+    <key alias="cancel">Fortryd</key>
+    <key alias="cellMargin">Celle margen</key>
+    <key alias="choose">Vælg</key>
+    <key alias="close">Luk</key>
+    <key alias="closewindow">Luk vindue</key>
+    <key alias="comment">Kommentar</key>
+    <key alias="confirm">Bekræft</key>
+    <key alias="constrain">Proportioner</key>
+    <key alias="constrainProportions">Behold proportioner</key>
+    <key alias="content">Indhold</key>
+    <key alias="continue">Fortsæt</key>
+    <key alias="copy">Kopiér</key>
+    <key alias="create">Opret</key>
+    <key alias="database">Database</key>
+    <key alias="date">Dato</key>
+    <key alias="default">Standard</key>
+    <key alias="delete">Slet</key>
+    <key alias="deleted">Slettet</key>
+    <key alias="deleting">Sletter...</key>
+    <key alias="design">Design</key>
+    <key alias="dimensions">Dimensioner</key>
+    <key alias="down">Ned</key>
+    <key alias="download">Hent</key>
+    <key alias="edit">Rediger</key>
+    <key alias="edited">Redigeret</key>
+    <key alias="elements">Elementer</key>
+    <key alias="email">E-mail</key>
+    <key alias="error">Fejl</key>
+    <key alias="field">Felt</key>
+    <key alias="findDocument">Find</key>
+    <key alias="first">Første</key>
+    <key alias="general">Generelt</key>
+    <key alias="groups">Grupper</key>
+    <key alias="group">Gruppe</key>
+    <key alias="height">Højde</key>
+    <key alias="help">Hjælp</key>
+    <key alias="hide">Skjul</key>
+    <key alias="history">Historik</key>
+    <key alias="icon">Ikon</key>
+    <key alias="id">Id</key>
+    <key alias="import">Importer</key>
+    <key alias="includeFromsubFolders">Inkludér undermapper i søgning</key>
+    <key alias="innerMargin">Indre margen</key>
+    <key alias="insert">Indsæt</key>
+    <key alias="install">Installér</key>
+    <key alias="invalid">Ugyldig</key>
+    <key alias="justify">Justering</key>
+    <key alias="language">Sprog</key>
+    <key alias="last">Sidste</key>
+    <key alias="layout">Layout</key>
+    <key alias="loading">Henter</key>
+    <key alias="locked">Låst</key>
+    <key alias="login">Log ind</key>
+    <key alias="logoff">Log af</key>
+    <key alias="logout">Log ud</key>
+    <key alias="macro">Makro</key>
+    <key alias="mandatory">Påkrævet</key>
+    <key alias="message">Besked</key>
+    <key alias="move">Flyt</key>
+    <key alias="name">Navn</key>
+    <key alias="new">Ny</key>
+    <key alias="next">Næste</key>
+    <key alias="no">Nej</key>
+    <key alias="of">af</key>
+    <key alias="ok">OK</key>
+    <key alias="open">Åben</key>
+    <key alias="or">eller</key>
+    <key alias="orderBy">Sortér efter</key>
+    <key alias="password">Kodeord</key>
+    <key alias="path">Sti</key>
+    <key alias="pleasewait">Et øjeblik...</key>
+    <key alias="previous">Forrige</key>
+    <key alias="properties">Egenskaber</key>
+    <key alias="rebuild">Genopbyg</key>
+    <key alias="reciept">E-mail der skal modtage indhold af formular</key>
+    <key alias="recycleBin">Papirkurv</key>
+    <key alias="recycleBinEmpty">Din papirkurv er tom</key>
+    <key alias="reload">Genindlæs</key>
+    <key alias="remaining">Mangler</key>
+    <key alias="remove">Fjern</key>
+    <key alias="rename">Omdøb</key>
+    <key alias="renew">Forny</key>
+    <key alias="required" version="7.0">Påkrævet</key>
+    <key alias="retrieve">Hent</key>
+    <key alias="retry">Prøv igen</key>
+    <key alias="rights">Rettigheder</key>
+    <key alias="scheduledPublishing">Planlagt publicering</key>
+    <key alias="search">Søg</key>
+    <key alias="searchNoResult">Beklager, vi kan ikke finde det, du leder efter.</key>
+    <key alias="noItemsInList">Ingen elementer er blevet tilføjet</key>
+    <key alias="server">Server</key>
+    <key alias="settings">Indstillinger</key>
+    <key alias="show">Vis</key>
+    <key alias="showPageOnSend">Hvilken side skal vises efter at formularen er sendt</key>
+    <key alias="size">Størrelse</key>
+    <key alias="sort">Sortér</key>
+    <key alias="status">Status</key>
+    <key alias="submit">Indsend</key>
+    <key alias="type">Type</key>
+    <key alias="typeToSearch">Skriv for at søge...</key>
+    <key alias="up">Op</key>
+    <key alias="update">Opdatér</key>
+    <key alias="upgrade">Opdatér</key>
+    <key alias="upload">Upload</key>
+    <key alias="url">Url</key>
+    <key alias="user">Bruger</key>
+    <key alias="username">Brugernavn</key>
+    <key alias="value">Værdi</key>
+    <key alias="view">Vis</key>
+    <key alias="welcome">Velkommen...</key>
+    <key alias="width">Bredde</key>
+    <key alias="yes">Ja</key>
+    <key alias="folder">Mappe</key>
+    <key alias="searchResults">Søgeresultater</key>
+    <key alias="reorder">Sorter</key>
+    <key alias="reorderDone">Afslut sortering</key>
+    <key alias="preview">Eksempel</key>
+    <key alias="changePassword">Skift kodeord</key>
+    <key alias="to">til</key>
+    <key alias="listView">Listevisning</key>
+    <key alias="saving">Gemmer...</key>
+    <key alias="current">nuværende</key>
+    <key alias="embed">Indlejring</key>
+    <key alias="selected">valgt</key>
+  </area>
+  <area alias="colors">
+    <key alias="blue">Blå</key>
+  </area>
+  <area alias="shortcuts">
+    <key alias="addGroup">Tilføj fane</key>
+    <key alias="addProperty">Tilføj egenskab</key>
+    <key alias="addEditor">Tilføj editor</key>
+    <key alias="addTemplate">Tilføj skabelon</key>
+    <key alias="addChildNode">Tilføj child node</key>
+    <key alias="addChild">Tilføj child</key>
+    <key alias="editDataType">Rediger datatype</key>
+    <key alias="navigateSections">Naviger sektioner</key>
+    <key alias="shortcut">Genveje</key>
+    <key alias="showShortcuts">Vis genveje</key>
+    <key alias="toggleListView">Brug listevisning</key>
+    <key alias="toggleAllowAsRoot">Tillad på rodniveau</key>
+    <key alias="commentLine">Comment/Uncomment lines</key>
+    <key alias="removeLine">Remove line</key>
+    <key alias="copyLineUp">Copy Lines Up</key>
+    <key alias="copyLineDown">Copy Lines Down</key>
+    <key alias="moveLineUp">Move Lines Up</key>
+    <key alias="moveLineDown">Move Lines Down</key>
+    <key alias="generalHeader">Generelt</key>
+    <key alias="editorHeader">Editor</key>
+  </area>
+  <area alias="graphicheadline">
+    <key alias="backgroundcolor">Baggrundsfarve</key>
+    <key alias="bold">Fed</key>
+    <key alias="color">Tekstfarve</key>
+    <key alias="font">Skrifttype</key>
+    <key alias="text">Tekst</key>
+  </area>
+  <area alias="headers">
+    <key alias="page">Side</key>
+  </area>
+  <area alias="installer">
+    <key alias="databaseErrorCannotConnect">Installeringsprogrammet kan ikke forbinde til databasen.</key>
+    <key alias="databaseErrorWebConfig">Kunne ikke gemme web.config filen. Du bedes venligst manuelt ændre database forbindelses strengen.</key>
+    <key alias="databaseFound">Din database er blevet fundet og identificeret som</key>
+    <key alias="databaseHeader">Database konfiguration</key>
+    <key alias="databaseInstall"><![CDATA[
+      Klik på <strong>installér</strong> knappen for at installere Umbraco %0% databasen
+    ]]></key>
+    <key alias="databaseInstallDone"><![CDATA[Umbraco %0% er nu blevet kopieret til din database. Tryk på <string>Næste</strong> for at fortsætte.]]></key>
+    <key alias="databaseNotFound"><![CDATA[<p>Databasen er ikke fundet. Kontrollér venligst at informationen i database forbindelsesstrengen i "web.config" filen er korrekt.</p>
+<p>For at fortsætte bedes du venligst rette "web.config" filen (ved at bruge Visual Studio eller dit favoritprogram), scroll til bunden, tilføj forbindelsesstrengen til din database i feltet som hedder "umbracoDbDSN" og gem filen.</p><p>Klik på <strong>Forsøg igen</strong> knappen når du er færdig.<br/><a href="https://our.umbraco.com/documentation/Using-Umbraco/Config-files/webconfig7" target="_blank">Mere information om at redigere web.config her.</a></p>]]></key>
+    <key alias="databaseText"><![CDATA[For at afslutte dette skridt er du nødt til at have nogle informationer om din database parat ("database forbindelsesstrengen").<br/>Kontakt venligst din ISP hvis det er nødvendigt. Hvis du installerer på en lokal maskine eller server kan du muligvis få informationerne fra din systemadministrator.]]></key>
+    <key alias="databaseUpgrade"><![CDATA[<p>Tryk på <strong>Opgradér</strong> knappen for at opgradere din database til Umbraco %0%</p><p>Bare rolig - intet indhold vil blive slettet og alt vil stadig fungere bagefter!</p>]]></key>
+    <key alias="databaseUpgradeDone"><![CDATA[Din database er blevet opgraderet til den endelige version %0%.<br/>Tryk på <strong>Næste</strong> for at fortsætte.]]></key>
+    <key alias="databaseUpToDate"><![CDATA[Din database er up-to-date!. Klik på <strong>Næste</strong> for at fortsætte med konfigurationsguiden.]]></key>
+    <key alias="defaultUserChangePass"><![CDATA[<strong>Normalbrugerens adgangskode er nødt til at blive ændret!</strong>]]></key>
+    <key alias="defaultUserDisabled"><![CDATA[<p><strong>Normalbrugeren er blevet gjort utjenstdygtig eller har ikke adgang til Umbraco!</strong></p><p>Du behøver ikke foretage yderligere handlinger. Tryk på <strong>Næste</strong> for at fortsætte.</p>]]></key>
+    <key alias="defaultUserPassChanged"><![CDATA[<p><strong>Normalbrugerens adgangskode er på succesfuld vis blevet ændret siden installationen!</strong></p><p>Du behøver ikke foretage yderligere handlinger. Tryk på <strong>Næste</strong> for at fortsætte.</p>]]></key>
+    <key alias="defaultUserPasswordChanged">Adgangskoden er blevet ændret!</key>
+    <key alias="greatStart">Få en fremragende start, se vores videoer</key>
+    <key alias="licenseText">Ved at klikke på næste knappen (eller ved at ændre UmbracoConfigurationStatus i web.config filen), accepterer du licensaftalen for denne software, som specificeret i boksen nedenfor. Bemærk venligst at denne Umbraco distribution består af to forskellige licenser, MIT's Open Source Licens for frameworket og Umbraco Freeware Licensen som dækker UI'en.</key>
+    <key alias="None">Endnu ikke installeret</key>
+    <key alias="permissionsAffectedFolders">Berørte filer og foldere</key>
+    <key alias="permissionsAffectedFoldersMoreInfo">Flere informationer om at opsætte rettigheder for Umbraco her</key>
+    <key alias="permissionsAffectedFoldersText">Du er nødt til at give ASP.NET 'modify' rettigheder på følgende filer/foldere</key>
+    <key alias="permissionsAlmostPerfect"><![CDATA[<strong>Dine rettighedsindstillinger er næsten perfekte!</strong><br/><br/>Du kan køre Umbraco uden problemer, men du vil ikke være i stand til at installere pakker, som er anbefalet for at få fuldt udbytte af Umbraco.]]></key>
+    <key alias="permissionsHowtoResolve">Hvorledes besluttes</key>
+    <key alias="permissionsHowtoResolveLink">Klik her for at læse tekstversionen</key>
+    <key alias="permissionsHowtoResolveText"><![CDATA[Se vores <strong>video tutorials</strong> om at opsætte folderrettigheder for Umbraco eller læs tekstversionen.]]></key>
+    <key alias="permissionsMaybeAnIssue"><![CDATA[<strong>Dine rettighedsindstillinger kan være et problem!</strong><br/><br/>Du kan afvikle Umbraco uden problemer, men du vil ikke være i stand til at oprette foldere eller installere pakker, hvilket er anbefalet for at få fuldt udbytte af Umbraco.]]></key>
+    <key alias="permissionsNotReady"><![CDATA[<strong>Dine rettighedsindstillinger er ikke klar til Umbraco!</strong><br/><br/>For at afvikle Umbraco er du nødt til at opdatere dine rettighedsindstillinger.]]></key>
+    <key alias="permissionsPerfect"><![CDATA[<strong>Dine rettighedsindstillinger er perfekte!</strong><br/><br/>Du er nu parat til at afvikle Umbraco og installere pakker!]]></key>
+    <key alias="permissionsResolveFolderIssues">Løser folder problem</key>
+    <key alias="permissionsResolveFolderIssuesLink">Følg dette link for mere information om udfordringer med ASP.NET og oprettelse af foldere</key>
+    <key alias="permissionsSettingUpPermissions">Sætter folderrettigheder op</key>
+    <key alias="permissionsText">Umbraco har behov for 'write/modify' adgang til bestemte foldere, for at kunne gemme filer som billeder og PDF'er. Umbraco gemmer også midlertidige data (eksempelvis cachen) for at forbedre ydelsen på dit website.</key>
+    <key alias="runwayFromScratch">Jeg har lyst til at begynde på bar bund</key>
+    <key alias="runwayFromScratchText"><![CDATA[Dit website er helt tomt for øjeblikket, så det er perfekt hvis du ønsker at begynde på bar bund og oprette dine egne dokumenttyper og skabeloner. (<a href="http://Umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">lær hvordan</a>) Du kan stadig vælge at installere Runway senere. Gå venligst til Udvikler-sektionen og vælg Pakker.]]></key>
+    <key alias="runwayHeader">Du har lige opsat en ren Umbraco-platform. Hvad ønsker du nu at gøre?</key>
+    <key alias="runwayInstalled">Runway er installeret</key>
+    <key alias="runwayInstalledText"><![CDATA[Du har fundamentet på plads. Vælg hvilke moduler du ønsker at installere ovenpå det.<br/>Dette er vores liste over anbefalede moduler. Kryds dem af du ønsker at installere eller se den <a href="#" onclick="toggleModules(); return false;" id="toggleModuleList">fulde liste af moduler</a>  ]]></key>
+    <key alias="runwayOnlyProUsers">Kun anbefalet for erfarne brugere</key>
+    <key alias="runwaySimpleSite">Jeg ønsker at begynder med et simpelt website</key>
+    <key alias="runwaySimpleSiteText"><![CDATA[<p>"Runway" er et simpelt website som stiller nogle basale dokumenttyper og skabeloner til rådighed. Installeringsprogrammet kan automatisk opsætte Runway for dig, men du kan nemt redigere, udvide eller fjerne det. Det er ikke nødvendigt og du kan sagtens bruge Umbraco uden. Men Runway tilbyder et fundament, som er baseret på 'Best Practices', som får dig igang hurtigere end nogensinde før. Hvis du vælger at installere Runway, kan du efter eget valg vælge de grundlæggende byggesten kaldet 'Runway Modules' til at forbedre dine Runway-sider.</p><p><small><em>Inkluderet med Runway:</em>Home Page, Getting Started page, Installing Modules page.<br /> <em>Valgfri Moduler:</em> Top Navigation, Sitemap, Contact, Gallery. </small></p>]]></key>
+    <key alias="runwayWhatIsRunway">Hvad er Runway</key>
+    <key alias="step1">Skridt 1/5: Acceptér licens</key>
+    <key alias="step2">Skridt 2/5: Database-konfiguration</key>
+    <key alias="step3">Skridt 3/5: Validerer filrettigheder</key>
+    <key alias="step4">Skridt 4/5: Kontrollér Umbraco sikkerhed</key>
+    <key alias="step5">Skridt 5/5: Umbraco er parat til at få dig igang</key>
+    <key alias="thankYou">Tak fordi du valgte Umbraco</key>
+    <key alias="theEndBrowseSite"><![CDATA[<h3>Gennemse dit nye site</h3> Du installerede Runway, så hvorfor ikke se hvordan dit nye website ser ud.]]></key>
+    <key alias="theEndFurtherHelp"><![CDATA[<h3>Yderligere hjælpe og informationer</h3> Få hjælp fra vores prisvindende fællesskab, gennemse dokumentationen eller se nogle gratis videoer om hvordan du opsætter et simpelt site, hvordan du bruger pakker og en 'quick guide' til Umbraco terminologier]]></key>
+    <key alias="theEndHeader">Umbraco %0% er installeret og klar til brug</key>
+    <key alias="theEndInstallFailed"><![CDATA[For at afslutte installationen er du nødt til manuelt at rette <strong>/web.config filen</strong> og opdatére 'AppSetting' feltet <strong>UmbracoConfigurationStatus</strong> i bunden til <strong>'%0%'</strong>.]]></key>
+    <key alias="theEndInstallSuccess"><![CDATA[Du kan <strong>komme igang med det samme</strong> ved at klikke på "Start Umbraco" knappen nedenfor.<br/>Hvis du er <strong>ny med Umbraco</strong>, kan du finde masser af ressourcer på vores 'getting started' sider.
+]]></key>
+    <key alias="theEndOpenUmbraco"><![CDATA[<h3>Start Umbraco</h3>For at administrere dit website skal du blot åbne Umbraco administrationen og begynde at tilføje indhold, opdatere skabelonerne og stylesheets'ene eller tilføje ny funktionalitet.]]></key>
+    <key alias="Unavailable">Forbindelse til databasen fejlede.</key>
+    <key alias="Version3">Umbraco Version 3</key>
+    <key alias="Version4">Umbraco Version 4</key>
+    <key alias="watch">Se</key>
+    <key alias="welcomeIntro"><![CDATA[Denne guide vil bringe dig gennem konfigurationsprocessen af <strong>Umbraco %0%</strong> for en frisk installation eller for en opgradering fra version 3.0.<br/><br/>Tryk på <strong>Næste</strong> for at begynde på guiden.]]></key>
+  </area>
+  <area alias="language">
+    <key alias="cultureCode">Culture Code</key>
+    <key alias="displayName">Culture Name</key>
+  </area>
+  <area alias="lockout">
+    <key alias="lockoutWillOccur">Du har været inaktiv, og du vil blive logget ud om</key>
+    <key alias="renewSession">Forny for at gemme dine ændringer</key>
+  </area>
+  <area alias="login">
+    <key alias="greeting0">Så er det søndag!</key>
+    <key alias="greeting1">Smil, det er mandag!</key>
+    <key alias="greeting2">Hurra, det er tirsdag!</key>
+    <key alias="greeting3">Hvilken herlig onsdag!</key>
+    <key alias="greeting4">Glædelig torsdag!</key>
+    <key alias="greeting5">Endelig fredag!</key>
+    <key alias="greeting6">Glædelig lørdag</key>
+    <key alias="instruction">Log ind nedenfor</key>
+    <key alias="signInWith">Log ind med</key>
+    <key alias="timeout">Din session er udløbet</key>
+    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="http://umbraco.com" style="text-decoration: none" target="_blank">umbraco.com</a></p> ]]></key>
+    <key alias="forgottenPassword">Glemt adgangskode?</key>
+    <key alias="forgottenPasswordInstruction">En e-mail vil blive sendt til den angivne adresse med et link til at nulstille din adgangskode</key>
+    <key alias="requestPasswordResetConfirmation">En e-mail med instruktioner for nulstilling af adgangskoden vil blive sendt til den angivne adresse, hvis det matcher vores optegnelser</key>
+    <key alias="showPassword">Vis adgangskode</key>
+    <key alias="hidePassword">Skjul adgangskode</key>
+    <key alias="returnToLogin">Tilbage til login formular</key>
+    <key alias="setPasswordInstruction">Angiv en ny adgangskode</key>
+    <key alias="setPasswordConfirmation">Din adgangskode er blevet opdateret</key>
+    <key alias="resetCodeExpired">Det link, du har klikket på, er ugyldigt eller udløbet</key>
+    <key alias="resetPasswordEmailCopySubject">Umbraco: Nulstil adgangskode</key>
+    <key alias="resetPasswordEmailCopyFormat"><![CDATA[<p>Dit brugernavn til at logge på Umbraco backoffice er: <strong>%0%</strong></p><p>Klik <a href="%1%"><strong>her</strong></a> for at nulstille din adgangskode eller kopier/indsæt denne URL i din browser:</p><p><em>%1%</em></p>]]></key>
+  </area>
+  <area alias="main">
+    <key alias="dashboard">Skrivebord</key>
+    <key alias="sections">Sektioner</key>
+    <key alias="tree">Indhold</key>
+  </area>
+  <area alias="moveOrCopy">
+    <key alias="choose">Vælg siden ovenover...</key>
+    <key alias="copyDone">%0% er nu kopieret til %1%</key>
+    <key alias="copyTo">Kopier til</key>
+    <key alias="moveDone">%0% er nu flyttet til %1%</key>
+    <key alias="moveTo">Flyt til</key>
+    <key alias="nodeSelected">er blevet valgt som roden for dit nye indhold, klik 'ok' nedenunder.</key>
+    <key alias="noNodeSelected">Intet element valgt, vælg et element i listen ovenfor før der klikkes 'fortsæt'</key>
+    <key alias="notAllowedByContentType">Det nuværende element kan ikke lægges under denne pga. sin type</key>
+    <key alias="notAllowedByPath">Det nuværende element kan ikke ligge under en af dens undersider</key>
+    <key alias="notAllowedAtRoot">Dette element må ikke findes på rodniveau</key>
+    <key alias="notValid">Denne handling er ikke tilladt fordi du ikke har de fornødne rettigheder på et eller flere af under-dokumenterne</key>
+    <key alias="relateToOriginal">Relater det kopierede element til originalen</key>
+  </area>
+  <area alias="notifications">
+    <key alias="editNotifications"><![CDATA[Vælg dine notificeringer for <strong>%0%</strong>]]></key>
+    <key alias="notificationsSavedFor">Notificeringer er gemt for</key>
+    <key alias="mailBody"><![CDATA[
+Hej %0%
+
+Dette er en automatisk mail for at fortælle at handlingen '%1%'
+er blevet udført på siden '%2%'
+af brugeren '%3%'
+
+Gå til http://%4%/#/content/content/edit/%5% for at redigere.
+
+Ha' en dejlig dag!
+
+Mange hilsner fra Umbraco robotten
+		]]></key>
+    <key alias="mailBodyHtml"><![CDATA[<p>Hej %0%</p>
+    <p>Dette er en automatisk mail for at informere dig om at opgaven <strong>'%1%'</strong>
+    er blevet udførtpå siden <a href="http://%4%/#/content/content/edit/%5%"><strong>'%2%'</strong></a> af brugeren <strong>'%3%'</strong> </p>
+    <div style="margin: 8px 0; padding: 8px; display: block;"> <br />
+    <a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/#/content/content/edit/%5%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;RET&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a> &nbsp; <br /> </div> <p> <h3>Opdateringssammendrag:</h3> <table style="width: 100%;"> %6% </table> </p> <div style="margin: 8px 0; padding: 8px; display: block;"> <br /> <a style="color: white; font-weight: bold; background-color: #66cc66; text-decoration : none; margin-right: 20px; border: 8px solid #66cc66; width: 150px;" href="http://%4%/actions/publish.aspx?id=%5%">&nbsp;&nbsp;PUBLISÉR&nbsp;&nbsp;</a> &nbsp; <a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/#/content/content/edit/%5%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;RET&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a> &nbsp; <a style="color: white; font-weight: bold; background-color: #ca4a4a; text-decoration : none; margin-right: 20px; border: 8px solid #ca4a4a; width: 150px;" href="http://%4%/actions/delete.aspx?id=%5%">&nbsp;&nbsp;&nbsp;&nbsp;SLET&nbsp;&nbsp;&nbsp;&nbsp;</a> <br /> </div> <p>Hav en fortsat god dag!<br /><br /> De bedste hilsner fra umbraco robotten </p>]]></key>
+    <key alias="mailSubject">[%0%] Notificering om %1% udført på %2%</key>
+    <key alias="notifications">Notificeringer</key>
+  </area>
+  <area alias="packager">
+    <key alias="actions">Handlinger</key>
+    <key alias="created">Oprettet</key>
+    <key alias="createPackage">Opret pakke</key>
+    <key alias="chooseLocalPackageText">Vælg pakken fra din computer. Umbraco pakker er oftest en ".zip" fil</key>
+    <key alias="deletewarning">Dette vil slette pakken</key>
+    <key alias="dropHere">Slip her for at uploade</key>
+    <key alias="includeAllChildNodes">Inkludér alle underliggende sider</key>
+    <key alias="orClickHereToUpload">eller klik her for at vælge pakkefil</key>
+    <key alias="uploadPackage">Upload pakke</key>
+    <key alias="localPackageDescription">Installer en lokal pakke ved at vælge den fra din computer. Installer kun pakker fra kilder, du kender og stoler på</key>
+    <key alias="uploadAnother">Upload en anden pakke</key>
+    <key alias="cancelAndUploadAnother">Annuller og upload en anden pakke</key>
+    <key alias="accept">Jeg accepterer</key>
+    <key alias="termsOfUse">betingelser for anvendelse</key>
+    <key alias="pathToFile">Sti til fil</key>
+    <key alias="pathToFileDescription">Absolut sti til fil (f.eks.: /bin/umbraco.bin)</key>
+    <key alias="installed">Installeret</key>
+    <key alias="installedPackages">Installeret pakker</key>
+    <key alias="installLocal">Installér lokal</key>
+    <key alias="installFinish">Afslut</key>
+    <key alias="noConfigurationView">Denne pakke har ingen konfigurationsvisning</key>
+    <key alias="noPackagesCreated">Der er ikke blevet oprettet nogle pakker endnu</key>
+    <key alias="noPackages">Du har ingen pakker installeret</key>
+    <key alias="noPackagesDescription"><![CDATA[Du har ikke nogen pakker installeret. Du kan enten installere en lokal pakke ved at vælge den fra din computer eller gennemse de tilgængelige pakker ved hjælp af ikonet <strong>'Pakker'</strong> øverst til højre på din skærm]]></key>
+    <key alias="packageActions">Pakkehandlinger</key>
+    <key alias="packageAuthorUrl">Forfatter URL</key>
+    <key alias="packageContent">Pakkeindhold</key>
+    <key alias="packageFiles">Pakkefiler</key>
+    <key alias="packageIconUrl">Ikon URL</key>
+    <key alias="packageInstall">Installér pakke</key>
+    <key alias="packageLicense">Licens</key>
+    <key alias="packageLicenseUrl">Licens URL</key>
+    <key alias="packageProperties">Pakkeegenskaber</key>
+    <key alias="packageSearch">Søg efter pakker</key>
+    <key alias="packageSearchResults">Resultater for</key>
+    <key alias="packageNoResults">Vi kunne ikke finde resultater for</key>
+    <key alias="packageNoResultsDescription">Prøv venligst at søge efter en anden pakke eller gennemse kategorierne</key>
+    <key alias="packagesPopular">Populære</key>
+    <key alias="packagesNew">Nye udgivelser</key>
+    <key alias="packageHas">har</key>
+    <key alias="packageKarmaPoints">karma points</key>
+    <key alias="packageInfo">Information</key>
+    <key alias="packageOwner">Ejer</key>
+    <key alias="packageContrib">Bidragsydere</key>
+    <key alias="packageCreated">Oprettet</key>
+    <key alias="packageCurrentVersion">Nuværende version</key>
+    <key alias="packageNetVersion">.NET version</key>
+    <key alias="packageDownloads">Downloads</key>
+    <key alias="packageLikes">Likes</key>
+    <key alias="packageCompatibility">Kompatibilitet</key>
+    <key alias="packageCompatibilityDescription">Denne pakke er kompatibel med de følgende versioner af Umbraco, som rapporteret af community-medlemmer. Fuld kompatibilitet kan ikke garanteres for versioner rapporteret nedenfor 100%</key>
+    <key alias="packageExternalSources">Eksterne kilder</key>
+    <key alias="packageAuthor">Forfatter</key>
+    <key alias="packageDocumentation">Dokumentation</key>
+    <key alias="packageMetaData">Pakke meta data</key>
+    <key alias="packageName">Pakkenavn</key>
+    <key alias="packageNoItemsHeader">Pakken indeholder ingen elementer</key>
+    <key alias="packageNoItemsText"><![CDATA[Denne pakkefil indeholder ingen elementer som kan af-installeres.<br/><br/>Du kan roligt fjerne denne fra systemet ved at klikke på "Fjern pakke" nedenfor.]]></key>
+    <key alias="packageOptions">Pakkevalg</key>
+    <key alias="packageReadme">Pakke læs mig</key>
+    <key alias="packageRepository">Pakke opbevaringsbase</key>
+    <key alias="packageUninstallConfirm">Bekræft af-installering</key>
+    <key alias="packageUninstalledHeader">Pakken blev fjernet</key>
+    <key alias="packageUninstalledText">Pakken er på succesfuld vis blevet fjernet</key>
+    <key alias="packageUninstallHeader">Afinstallér pakke</key>
+    <key alias="packageUninstallText"><![CDATA[Du kan fjerne markeringen på elementer du ikke ønsker at fjerne, på dette tidspunkt, nedenfor. Når du klikker 'bekræft' vil alle afkrydsede elemenet blive fjernet <br/>
+<span style="color: Red; font-weight: bold;">Bemærk:</span> at dokumenter og medier som afhænger af denne pakke vil muligvis holde op med at virke, så vær forsigtig. Hvis i tvivl, kontakt personen som har udviklet pakken.]]></key>
+    <key alias="packageVersion">Pakke version</key>
+    <key alias="packageAlreadyInstalled">Pakke allerede installeret</key>
+    <key alias="targetVersionMismatch">Denne pakke kan ikke installeres, den kræver en minimum Umbraco version af</key>
+    <key alias="installStateUninstalling">Afinstallerer...</key>
+    <key alias="installStateDownloading">Downloader...</key>
+    <key alias="installStateImporting">Importeret...</key>
+    <key alias="installStateInstalling">Installerer...</key>
+    <key alias="installStateRestarting">Genstarter, vent venligst...</key>
+    <key alias="installStateComplete">Færdig, din browser opdateres nu, vent venligst...</key>
+    <key alias="installStateCompleted">Klik venligst på 'Afslut' for at gennemføre installation og opdatere siden.</key>
+    <key alias="installStateUploading">Uploader pakke...</key>
+  </area>
+  <area alias="paste">
+    <key alias="doNothing">Indsæt med fuld formattering (Anbefales ikke)</key>
+    <key alias="errorMessage">Den tekst du er ved at indsætte indeholder specialtegn eller formattering. Dette kan skyldes at du kopierer fra f.eks. Microsoft Word. Umbraco kan fjerne denne specialformattering automatisk så indholdet er mere velegnet til visning på en webside.</key>
+    <key alias="removeAll">Indsæt som ren tekst, dvs. fjern al formattering</key>
+    <key alias="removeSpecialFormattering">Indsæt, men fjern formattering som ikke bør være på en webside (Anbefales)</key>
+  </area>
+  <area alias="publicAccess">
+    <key alias="paGroups">Gruppebaseret beskyttelse</key>
+    <key alias="paGroupsHelp">Hvis du ønsker at give adgang til alle medlemmer af specifikke medlemsgrupper</key>
+    <key alias="paGroupsNoGroups">Du skal oprette en medlemsgruppe før du kan bruge gruppebaseret beskyttelse</key>
+    <key alias="paErrorPage">Fejlside</key>
+    <key alias="paErrorPageHelp">Brugt når folk er logget ind, men ingen adgang</key>
+    <key alias="paHowWould"><![CDATA[Vælg hvordan siden <strong>%0%</strong> skal beskyttes]]></key>
+    <key alias="paIsProtected"><![CDATA[<strong>%0%</strong> er nu beskyttet]]></key>
+    <key alias="paIsRemoved"><![CDATA[Beskyttelse fjernet fra <strong>%0%</strong>]]></key>
+    <key alias="paLoginPage">Log ind-side</key>
+    <key alias="paLoginPageHelp">Vælg siden der indeholder log ind-formularen</key>
+    <key alias="paRemoveProtection">Fjern beskyttelse...</key>
+    <key alias="paRemoveProtectionConfirm"><![CDATA[Er du sikker på at du vil fjerne beskyttelsen fra siden <strong>%0%</strong>?]]></key>
+    <key alias="paSelectPages">Vælg siderne der indeholder log ind-formularer og fejlmeddelelser</key>
+    <key alias="paSelectGroups"><![CDATA[Vælg de grupper der har adgang til siden <strong>%0%</strong>]]></key>
+    <key alias="paSelectMembers"><![CDATA[Vælg de medlemmer der har adgang til siden <strong>%0%</strong>]]></key>
+    <key alias="paMembers">Adgang til enkelte medlemmer</key>
+    <key alias="paMembersHelp">Hvis du ønsker at give adgang til enkelte medlemmer</key>
+  </area>
+  <area alias="publish">
+    <key alias="contentPublishedFailedAwaitingRelease">Udgivelsen kunne ikke udgives da publiceringsdato er sat</key>
+    <key alias="contentPublishedFailedExpired"><![CDATA[
+      %0% Udgivelsen kunne ikke blive publiceret da publiceringsdatoen er overskredet
+     ]]></key>
+    <key alias="contentPublishedFailedInvalid"><![CDATA[
+    %0% kunne ikke publiceres da følgende egenskaber :  %1%  ikke overholdte valderingsreglerne.
+    ]]></key>
+    <key alias="contentPublishedFailedByEvent">%0% kunne ikke udgives, fordi et 3. parts modul annullerede handlingen</key>
+    <key alias="contentPublishedFailedByMissingName"><![CDATA[%0% kan ikke udgives, fordi det mangler et navn.]]></key>
+    <key alias="includeUnpublished">Medtag ikke-udgivede undersider</key>
+    <key alias="inProgress">Publicerer - vent venligst...</key>
+    <key alias="inProgressCounter">%0% ud af %1% sider er blevet udgivet...</key>
+    <key alias="nodePublish">%0% er nu publiceret</key>
+    <key alias="nodePublishAll">%0% og alle undersider er nu publiceret</key>
+    <key alias="publishAll">Publicér alle undersider</key>
+    <key alias="publishHelp"><![CDATA[Klik <em>ok</em> for at udgive <strong>%0%</strong> og derved gøre indholdet offentligt tilgængeligt..<br/><br /> Du kan udgive denne side og dens undersider ved at klikke <em>Udgiv alle undersider</em> forneden]]></key>
+  </area>
+  <area alias="colorpicker">
+    <key alias="noColors">Du har ikke konfigureret nogen godkendte farver</key>
+  </area>
+  <area alias="contentPicker">
+    <key alias="allowedItemTypes">Du kan kun vælge følgende type(r) dokumenter: %0%</key>
+    <key alias="pickedTrashedItem">Du har valgt et dokument som er slettet eller lagt i papirkurven</key>
+    <key alias="pickedTrashedItems">Du har valgt dokumenter som er slettede eller lagt i papirkurven</key>
+  </area>
+  <area alias="mediaPicker">
+    <key alias="pickedTrashedItem">Du har valgt et medie som er slettet eller lagt i papirkurven</key>
+    <key alias="pickedTrashedItems">Du har valgt medier som er slettede eller lagt i papirkurven</key>
+  </area>
+  <area alias="relatedlinks">
+    <key alias="enterExternal">indtast eksternt link</key>
+    <key alias="chooseInternal">vælg en intern side</key>
+    <key alias="caption">Tekst</key>
+    <key alias="link">Link</key>
+    <key alias="newWindow">Nyt vindue</key>
+    <key alias="captionPlaceholder">Indtast en tekst</key>
+    <key alias="externalLinkPlaceholder">Indtast et link</key>
+  </area>
+  <area alias="imagecropper">
+    <key alias="reset">Nulstil</key>
+    <key alias="updateEditCrop">Acceptér</key>
+    <key alias="undoEditCrop">Fortryd</key>
+  </area>
+  <area alias="rollback">
+    <key alias="headline">Vælg en version at sammenligne med den nuværende version</key>
+    <key alias="currentVersion">Nuværende version</key>
+    <key alias="diffHelp"><![CDATA[Her vises forskellene mellem den nuværende version og den valgte version<br /><del>Rød</del> tekst vil ikke blive vist i den valgte version. <ins>Grøn betyder tilføjet</ins>]]></key>
+    <key alias="documentRolledBack">Dokument tilbagerullet</key>
+    <key alias="htmlHelp">Her vises den valgte version som html. Hvis du ønsker at se forskellen mellem de 2 versioner på samme tid, brug 'diff'-oversigten</key>
+    <key alias="rollbackTo">Tilbagerulning til</key>
+    <key alias="selectVersion">Vælg version</key>
+    <key alias="view">Vis</key>
+  </area>
+  <area alias="scripts">
+    <key alias="editscript">Rediger script</key>
+  </area>
+  <area alias="sections">
+    <key alias="concierge">Concierge</key>
+    <key alias="content">Indhold</key>
+    <key alias="courier">Courier</key>
+    <key alias="developer">Udvikler</key>
+    <key alias="installer">Umbraco konfigurationsguide</key>
+    <key alias="media">Mediearkiv</key>
+    <key alias="member">Medlemmer</key>
+    <key alias="packages">Pakker</key>
+    <key alias="newsletters">Nyhedsbreve</key>
+    <key alias="settings">Indstillinger</key>
+    <key alias="statistics">Statistik</key>
+    <key alias="translation">Oversættelse</key>
+    <key alias="users">Brugere</key>
+    <key alias="help">Hjælp</key>
+    <key alias="forms">Formularer</key>
+  </area>
+  <area alias="help">
+    <key alias="theBestUmbracoVideoTutorials">De bedste Umbraco video tutorials</key>
+  </area>
+  <area alias="settings">
+    <key alias="defaulttemplate">Standardskabelon</key>
+    <key alias="importDocumentTypeHelp">For at importere en dokumenttype, find ".udt"-filen på din computer ved at klikke på "Gennemse"-knappen og klik "Import" (Du vil blive bedt om bekræftelse på næste skærmbillede)</key>
+    <key alias="newtabname">Ny titel på faneblad</key>
+    <key alias="nodetype">Nodetype</key>
+    <key alias="objecttype">Type</key>
+    <key alias="stylesheet">Stylesheet</key>
+    <key alias="script">Script</key>
+    <key alias="tab">Faneblad</key>
+    <key alias="tabname">Titel på faneblad</key>
+    <key alias="tabs">Faneblade</key>
+  </area>
+  <area alias="sort">
+    <key alias="sortOrder">Sorteringsrækkefølge</key>
+    <key alias="sortCreationDate">Oprettelsesdato</key>
+    <key alias="sortDone">Sortering udført</key>
+    <key alias="sortHelp">Træk de forskellige sider op eller ned for at indstille hvordan de skal arrangeres, eller klik på kolonnehovederne for at sortere hele rækken af sider</key>
+    <key alias="sortPleaseWait"><![CDATA[Vent venligst mens siderne sorteres. Det kan tage et stykke tid.]]></key>
+  </area>
+  <area alias="speechBubbles">
+    <key alias="validationFailedHeader">Validering</key>
+    <key alias="validationFailedMessage">Valideringsfejl skal rettes før elementet kan gemmes</key>
+    <key alias="operationFailedHeader">Fejlet</key>
+    <key alias="operationSavedHeader">Gemt</key>
+    <key alias="invalidUserPermissionsText">Utilstrækkelige brugerrettigheder, kunne ikke fuldføre handlingen</key>
+    <key alias="operationCancelledHeader">Annulleret</key>
+    <key alias="operationCancelledText">Handlingen blev annulleret af et 3. part tilføjelsesprogram</key>
+    <key alias="contentTypeDublicatePropertyType">Property type eksisterer allerede</key>
+    <key alias="contentTypePropertyTypeCreated">Egenskabstype oprettet</key>
+    <key alias="contentTypePropertyTypeCreatedText"><![CDATA[Navn: %0% <br /> DataType: %1%]]></key>
+    <key alias="contentTypePropertyTypeDeleted">Egenskabs type slettet</key>
+    <key alias="contentTypeSavedHeader">Indholdstype gemt</key>
+    <key alias="contentTypeTabCreated">Du har oprettet et faneblad</key>
+    <key alias="contentTypeTabDeleted">Faneblad slettet</key>
+    <key alias="contentTypeTabDeletedText">Faneblad med id: %0% slettet</key>
+    <key alias="cssErrorHeader">Stylesheetet blev ikke gemt</key>
+    <key alias="cssSavedHeader">Stylesheet gemt</key>
+    <key alias="cssSavedText">Stylesheet gemt uden fejl</key>
+    <key alias="dataTypeSaved">Datatype gemt</key>
+    <key alias="dictionaryItemSaved">Ordbogsnøgle gemt</key>
+    <key alias="editContentPublishedHeader">Indhold publiceret</key>
+    <key alias="editContentPublishedText">og nu synligt for besøgende</key>
+    <key alias="editContentSavedHeader">Indhold gemt</key>
+    <key alias="editContentSavedText">Husk at publicere for at gøre det synligt for besøgende</key>
+    <key alias="editContentSendToPublish">Send til Godkendelse</key>
+    <key alias="editContentSendToPublishText">Rettelser er blevet sendt til godkendelse</key>
+    <key alias="editMediaSaved">Medie gemt</key>
+    <key alias="editMediaSavedText">Medie gemt uden problemer</key>
+    <key alias="editMemberSaved">Medlem gemt</key>
+    <key alias="editMemberGroupSaved">Medlemsgruppe gemt</key>
+    <key alias="editStylesheetPropertySaved">Stylesheetegenskab gemt</key>
+    <key alias="editStylesheetSaved">Stylesheet gemt</key>
+    <key alias="editTemplateSaved">Skabelon gemt</key>
+    <key alias="editUserError">Der er opstået en fejl under redigering</key>
+    <key alias="editUserSaved">Bruger gemt</key>
+    <key alias="editUserTypeSaved">Brugertype gemt</key>
+    <key alias="editUserGroupSaved">Brugergruppe gemt</key>
+    <key alias="fileErrorHeader">Fil ikke gemt</key>
+    <key alias="fileErrorText">Filen kunne ikke gemmes. Tjek filrettighederne</key>
+    <key alias="fileSavedHeader">Fil gemt</key>
+    <key alias="fileSavedText">Fil gemt uden fejl</key>
+    <key alias="languageSaved">Sprog gemt</key>
+    <key alias="mediaTypeSavedHeader">Medietype gemt</key>
+    <key alias="memberTypeSavedHeader">Medlemstype gemt</key>
+    <key alias="memberGroupSavedHeader">Medlemsgruppe gemt</key>
+    <key alias="templateErrorHeader">Skabelon ikke gemt</key>
+    <key alias="templateErrorText">Undgå venligst at du har 2 templates med samme alias</key>
+    <key alias="templateSavedHeader">Skabelon gemt</key>
+    <key alias="templateSavedText">Skabelon gemt uden fejl!</key>
+    <key alias="contentUnpublished">Indhold fjernet fra udgivelse</key>
+    <key alias="partialViewSavedHeader">Partial view gemt</key>
+    <key alias="partialViewSavedText">Partial view gemt uden fejl!</key>
+    <key alias="partialViewErrorHeader">Partial view ikke gemt</key>
+    <key alias="partialViewErrorText">Der opstod en fejl ved at gemme filen.</key>
+    <key alias="permissionsSavedFor">Rettigheder gemt for</key>
+    <key alias="deleteUserGroupsSuccess">Slettede %0% brugergrupper</key>
+    <key alias="deleteUserGroupSuccess">%0% blev slettet</key>
+    <key alias="enableUsersSuccess">Aktiverede %0% brugere</key>
+    <key alias="disableUsersSuccess">Deaktiverede %0% brugere</key>
+    <key alias="enableUserSuccess">%0% er nu aktiveret</key>
+    <key alias="disableUserSuccess">%0% er nu deaktiveret</key>
+    <key alias="setUserGroupOnUsersSuccess">Brugergrupper er blevet indstillet</key>
+    <key alias="unlockUsersSuccess">Låste %0% brugere op</key>
+    <key alias="unlockUserSuccess">%0% er nu låst op</key>
+  </area>
+  <area alias="stylesheet">
+    <key alias="addRule">Tilføj style</key>
+    <key alias="editRule">Redigér style</key>
+    <key alias="editorRules">Teksteditor-styles</key>
+    <key alias="editorRulesHelp">Definér de styles, der skal være tilgængelige i teksteditoren for dette stylesheet</key>
+    <key alias="selector">Selector</key>
+    <key alias="selectorHelp">Bruger CSS-syntaks, f.eks. "h1" eller ".redheader"</key>
+    <key alias="editstylesheet">Rediger stylesheet</key>
+    <key alias="editstylesheetproperty">Rediger CSS-egenskab</key>
+    <key alias="nameHelp">Det navn der vises i teksteditoren</key>
+    <key alias="preview">Forhåndsvisning</key>
+    <key alias="previewHelp">Hvordan teksten vil se ud i teksteditoren.</key>
+    <key alias="styles">Styles</key>
+    <key alias="stylesHelp">Den CSS der skal anvendes i teksteditoren, f.eks. "color:red;"</key>
+    <key alias="tabCode">Kode</key>
+    <key alias="tabRules">Editor</key>
+  </area>
+  <area alias="template">
+    <key alias="deleteByIdFailed">Sletning af skabelonen med ID %0% fejlede</key>
+    <key alias="edittemplate">Rediger skabelon</key>
+    <key alias="insertSections">Sektioner</key>
+    <key alias="insertContentArea">Indsæt indholdsområde</key>
+    <key alias="insertContentAreaPlaceHolder">Indsæt pladsholder for indholdsområde</key>
+    <key alias="insert">Indsæt</key>
+    <key alias="insertDesc">Hvad vil du indsætte?</key>
+    <key alias="insertDictionaryItem">Oversættelse</key>
+    <key alias="insertDictionaryItemDesc">Indsætter en oversætbar tekst, som skifter efter det sprog, som websitet vises i.</key>
+    <key alias="insertMacro">Makro</key>
+    <key alias="insertMacroDesc">
+      En makro er et element, som kan have forskellige indstillinger, når det indsættes.
+      Brug det som en genbrugelig del af dit design såsom gallerier, formularer og lister.
+    </key>
+    <key alias="insertPageField">Sideværdi</key>
+    <key alias="insertPageFieldDesc">
+      Viser værdien af et felt fra den nuværende side. Kan indstilles til at bruge rekursive værdier eller
+      vise en standardværdi i tilfælde af, at feltet er tomt.
+    </key>
+    <key alias="insertPartialView">Partial view</key>
+    <key alias="insertPartialViewDesc">
+      Et Partial View er et skabelonelement, som kan indsættes i andre skabeloner og derved
+      genbruges og deles på tværs af sideskabelonerne.
+    </key>
+    <key alias="mastertemplate">Master skabelon</key>
+    <key alias="quickGuide">Lynguide til Umbracos skabelontags</key>
+    <key alias="noMaster">Ingen master</key>
+    <key alias="renderBody">Indsæt en underliggende skabelon</key>
+    <key alias="renderBodyDesc"><![CDATA[
+      Henter indholdet af en underliggende skabelon ind, ved at
+      indsætte et <code>@RenderBody()</code> element.
+      ]]></key>
+    <key alias="defineSection">Definer en sektion</key>
+    <key alias="defineSectionDesc"><![CDATA[
+         Definerer en del af din skabelon som en navngivet sektion, ved at
+         omkranse den i <code>@section { ... }</code>. Herefter kan denne sektion flettes ind i
+         overliggende skabelon ved at indsætte et <code>@RenderSection</code> element.
+      ]]></key>
+    <key alias="renderSection">Indsæt en sektion</key>
+    <key alias="renderSectionDesc"><![CDATA[
+      Henter indholdet af en sektion fra den underliggende skabelon ind, ved at indsætte et
+      <code>@RenderSection(name)</code> element. Den underliggende skabelon skal have
+      defineret en sektion via et <code>@section [name]{ ... }</code> element.
+      ]]></key>
+    <key alias="sectionName">Sektionsnavn</key>
+    <key alias="sectionMandatory">Sektionen er obligatorisk</key>
+    <key alias="sectionMandatoryDesc">
+      Hvis obligatorisk, skal underskabelonen indeholde en <code>@section</code> -definition.
+    </key>
+    <key alias="queryBuilder">Query builder</key>
+    <key alias="itemsReturned">sider returneret, på</key>
+    <key alias="iWant">Returner</key>
+    <key alias="allContent">alt indhold</key>
+    <key alias="contentOfType">indhold af typen "%0%"</key>
+    <key alias="from">fra</key>
+    <key alias="websiteRoot">mit website</key>
+    <key alias="where">hvor</key>
+    <key alias="and">og</key>
+    <key alias="is">er</key>
+    <key alias="isNot">ikke er</key>
+    <key alias="before">er før</key>
+    <key alias="beforeIncDate">er før (inkl. valgte dato)</key>
+    <key alias="after">er efter</key>
+    <key alias="afterIncDate">er efter (inkl. valgte dato)</key>
+    <key alias="equals">er</key>
+    <key alias="doesNotEqual">ikke er</key>
+    <key alias="contains">indeholder</key>
+    <key alias="doesNotContain">ikke indeholder</key>
+    <key alias="greaterThan">er større end</key>
+    <key alias="greaterThanEqual">er større end eller det samme som</key>
+    <key alias="lessThan">er mindre end</key>
+    <key alias="lessThanEqual">er mindre end eller det samme som</key>
+    <key alias="id">Id</key>
+    <key alias="name">Navn</key>
+    <key alias="createdDate">Oprettelsesdato</key>
+    <key alias="lastUpdatedDate">Sidste opdatering</key>
+    <key alias="orderBy">Sortér efter</key>
+    <key alias="ascending">stigende rækkefølge</key>
+    <key alias="descending">faldende rækkefølge</key>
+    <key alias="template">Skabelon</key>
+  </area>
+  <area alias="grid">
+    <key alias="media">Billede</key>
+    <key alias="macro">Macro</key>
+    <key alias="insertControl">Vælg indholdstype</key>
+    <key alias="chooseLayout">Vælg layout</key>
+    <key alias="addRows">Tilføj række</key>
+    <key alias="addElement">Tilføj indhold</key>
+    <key alias="dropElement">Slip indhold</key>
+    <key alias="settingsApplied">Indstillinger tilføjet</key>
+    <key alias="contentNotAllowed">Indholdet er ikke tilladt her</key>
+    <key alias="contentAllowed">Indholdet er tilladt her</key>
+    <key alias="clickToEmbed">Klik for at indlejre</key>
+    <key alias="clickToInsertImage">Klik for at indsætte et billede</key>
+    <key alias="placeholderImageCaption">Billedtekst...</key>
+    <key alias="placeholderWriteHere">Skriv her...</key>
+    <key alias="gridLayouts">Grid layout</key>
+    <key alias="gridLayoutsDetail">Et layout er det overordnede arbejdsområde til dit grid - du vil typisk kun behøve ét eller to</key>
+    <key alias="addGridLayout">Tilføj grid layout</key>
+    <key alias="addGridLayoutDetail">Juster dit layout ved at justere kolonnebredder og tilføj yderligere sektioner</key>
+    <key alias="rowConfigurations">Rækkekonfigurationer</key>
+    <key alias="rowConfigurationsDetail">Rækker er foruddefinerede celler, der arrangeres vandret</key>
+    <key alias="addRowConfiguration">Tilføj rækkekonfiguration</key>
+    <key alias="addRowConfigurationDetail">Juster rækken ved at indstille cellebredder og tilføje yderligere celler</key>
+    <key alias="columns">Kolonner</key>
+    <key alias="columnsDetails">Det totale antal kolonner i dit grid</key>
+    <key alias="settings">Indstillinger</key>
+    <key alias="settingsDetails">Konfigurer, hvilket indstillinger, brugeren kan ændre</key>
+    <key alias="styles">Typografi</key>
+    <key alias="stylesDetails">Vælg hvilke typografiværdier en redaktør kan ændre</key>
+    <key alias="allowAllEditors">Tillad alle editorer</key>
+    <key alias="allowAllRowConfigurations">Tillad alle rækkekonfigurationer</key>
+    <key alias="setAsDefault">Sæt som standard</key>
+    <key alias="chooseExtra">Vælg ekstra</key>
+    <key alias="chooseDefault">Vælg standard</key>
+    <key alias="areAdded">er tilføjet</key>
+    <key alias="maxItems">Maksimalt emner</key>
+    <key alias="maxItemsDescription">Efterlad blank eller sæt til 0 for ubegrænset</key>
+  </area>
+  <area alias="contentTypeEditor">
+    <key alias="compositions">Kompositioner</key>
+    <key alias="group">Gruppe</key>
+    <key alias="noGroups">Du har ikke tilføjet nogen grupper</key>
+    <key alias="addGroup">Tilføj gruppe</key>
+    <key alias="inheritedFrom">Nedarvet fra</key>
+    <key alias="addProperty">Tilføj egenskab</key>
+    <key alias="requiredLabel">Påkrævet label</key>
+    <key alias="enableListViewHeading">Aktivér listevisning</key>
+    <key alias="enableListViewDescription">Konfigurér indholdet til at blive vist i en sortérbar og søgbar liste; undersider vil ikke blive vist i træet</key>
+    <key alias="allowedTemplatesHeading">Tilladte skabeloner</key>
+    <key alias="allowedTemplatesDescription">Vælg hvilke skabeloner der er tilladt at bruge på dette indhold</key>
+    <key alias="allowAsRootHeading">Tillad på rodniveau</key>
+    <key alias="allowAsRootDescription">Kun dokumenttyper med denne indstilling aktiveret kan oprettes i rodniveau under indhold og mediearkiv</key>
+    <key alias="childNodesHeading">Tilladte typer</key>
+    <key alias="childNodesDescription">Tillad at oprette indhold af en specifik type under denne</key>
+    <key alias="chooseChildNode">Vælg child node</key>
+    <key alias="compositionsDescription">Nedarv faner og egenskaber fra en anden dokumenttype. Nye faner vil blive tilføjet den nuværende dokumenttype eller sammenflettet hvis fanenavnene er ens.</key>
+    <key alias="compositionInUse">Indholdstypen bliver brugt i en komposition og kan derfor ikke blive anvendt som komposition</key>
+    <key alias="noAvailableCompositions">Der er ingen indholdstyper tilgængelige at bruge som komposition</key>
+    <key alias="availableEditors">Tilgængelige editors</key>
+    <key alias="reuse">Genbrug</key>
+    <key alias="editorSettings">Editor indstillinger</key>
+    <key alias="configuration">Konfiguration</key>
+    <key alias="yesDelete">Ja, slet</key>
+    <key alias="movedUnderneath">blev flyttet til</key>
+    <key alias="folderToMove">Vælg hvor</key>
+    <key alias="structureBelow">skal flyttes til</key>
+    <key alias="allDocumentTypes">Alle dokumenttyper</key>
+    <key alias="allDocuments">Alle dokumenter</key>
+    <key alias="allMediaItems">Alle medier</key>
+    <key alias="usingThisDocument">som benytter denne dokumenttype vil blive slettet permanent. Bekræft at du også vil slette dem.</key>
+    <key alias="usingThisMedia">som benytter denne medietype vil blive slettet permanent. Bekræft at du også vil slette dem.</key>
+    <key alias="usingThisMember">som benytter denne medlemstype vil blive slettet permanent. Bekræft at du også vil slette dem.</key>
+    <key alias="andAllDocuments">og alle dokumenter, som benytter denne type</key>
+    <key alias="andAllMediaItems">og alle medier, som benytter denne type</key>
+    <key alias="andAllMembers">og alle medlemmer, som benytter denne type</key>
+    <key alias="memberCanEdit">Medlem kan redigere</key>
+    <key alias="showOnMemberProfile">Vis på medlemsprofil</key>
+    <key alias="tabHasNoSortOrder">fane har ingen sorteringsrækkefølge</key>
+    <key alias="elementType">Element-type</key>
+    <key alias="elementHeading">Er en Element-type</key>
+    <key alias="elementDescription">En Element-type er tiltænkt brug i f.eks. Nested Content, ikke i indholdstræet</key>
+    <key alias="elementDoesNotSupport">Dette benyttes ikke for en Element-type</key>
+    <key alias="propertyHasChanges">Du har lavet ændringer til denne egenskab. Er du sikker på at du vil kassere dem?</key>
+  </area>
+  <area alias="languages">
+    <key alias="addLanguage">Tilføj sprog</key>
+    <key alias="mandatoryLanguage">Påkrævet sprog</key>
+    <key alias="mandatoryLanguageHelp">Egenskaber på dette sprog skal være udfyldt før noden kan blive udgivet.</key>
+    <key alias="defaultLanguage">Standardsprog</key>
+    <key alias="defaultLanguageHelp">Et Umbraco-site kan kun have ét standardsprog.</key>
+    <key alias="changingDefaultLanguageWarning">At skifte standardsprog kan resultere i at standardindhold mangler.</key>
+    <key alias="fallsbackToLabel">Fallback til</key>
+    <key alias="noFallbackLanguageOption">Intet fallback-sprog</key>
+    <key alias="fallbackLanguageDescription">For at tillade flersproget indhold, som ikke er tilgængeligt i det anmodede sprog, skal du her vælge et sprog at falde tilbage på.</key>
+    <key alias="fallbackLanguage">Fallback-sprog</key>
+  </area>
+  <area alias="macro">
+    <key alias="addParameter">Tilføj parameter</key>
+    <key alias="editParameter">Redigér parameter</key>
+    <key alias="enterMacroName">Indtast makronavn</key>
+    <key alias="parameters">Parametre</key>
+    <key alias="parametersDescription">Definér de parametre der skal være tilgængelige, når du bruger denne makro.</key>
+    <key alias="selectViewFile">Vælg partial view makrofil</key>
+  </area>
+  <area alias="templateEditor">
+    <key alias="alternativeField">Alternativt felt</key>
+    <key alias="alternativeText">Alternativ tekst</key>
+    <key alias="casing">Casing</key>
+    <key alias="chooseField">Felt som skal indsættes</key>
+    <key alias="convertLineBreaks">Konvertér linieskift</key>
+    <key alias="convertLineBreaksHelp">Erstatter et linieskift med html-tag'et &amp;lt;br&amp;gt;</key>
+    <key alias="dateOnly">Ja, kun dato</key>
+    <key alias="formatAsDate">Formatér som dato</key>
+    <key alias="htmlEncode">HTML indkod</key>
+    <key alias="htmlEncodeHelp">Vil erstatte specielle karakterer med deres HTML jævnbyrdige.</key>
+    <key alias="insertedAfter">Denne tekst vil blive sat ind lige efter værdien af feltet</key>
+    <key alias="insertedBefore">Denne tekst vil blive sat ind lige før værdien af feltet</key>
+    <key alias="lowercase">Lowercase</key>
+    <key alias="none">Ingen</key>
+    <key alias="postContent">Indsæt efter felt</key>
+    <key alias="preContent">Indsæt før felt</key>
+    <key alias="recursive">Rekursivt</key>
+    <key alias="removeParagraph">Fjern paragraf-tags</key>
+    <key alias="removeParagraphHelp">Fjerner eventuelle &amp;lt;P&amp;gt; omkring teksten</key>
+    <key alias="standardFields">Standard felter</key>
+    <key alias="uppercase">Store bogstaver</key>
+    <key alias="urlEncode">URL encode</key>
+    <key alias="urlEncodeHelp">Hvis indholdet af felterne skal sendes til en url, skal denne slåes til så specialtegn formateres</key>
+    <key alias="usedIfAllEmpty">Denne tekst bruges hvis ovenstående felter er tomme</key>
+    <key alias="usedIfEmpty">Dette felt vil blive brugt hvis ovenstående felt er tomt</key>
+    <key alias="withTime">Ja, med klokkeslæt. Dato/tid separator: </key>
+  </area>
+  <area alias="translation">
+    <key alias="details">Oversættelsesdetaljer</key>
+    <key alias="DownloadXmlDTD">Download XML DTD</key>
+    <key alias="fields">Felter</key>
+    <key alias="includeSubpages">Inkluder undersider</key>
+    <key alias="mailBody">Hej %0%. Dette er en automatisk mail sendt for at informere dig om at dokumentet '%1' har en forespørgsel omkring oversættelse til '%5%' af %2%. Gå til http://%3%/translation/details.aspx?id=%4% for at redigere. Eller log ind i Umbraco for at få en oversigt over dine oversættelsesopgaver: http://%3%/Umbraco Hav en god dag! Mange hilsner Umbraco-robotten</key>
+    <key alias="noTranslators">Ingen oversættelsesbrugere er fundet. Opret venligst en oversættelsesbruger før du begynder at sende indhold til oversættelse</key>
+    <key alias="pageHasBeenSendToTranslation">Siden '%0%' er blevet sent til oversættelse</key>
+    <key alias="sendToTranslate">Send siden '%0%' til oversættelse</key>
+    <key alias="totalWords">Totalt antal ord</key>
+    <key alias="translateTo">Oversæt til</key>
+    <key alias="translationDone">Oversættelse gennemført.</key>
+    <key alias="translationDoneHelp">Du kan gennemse de sider, som du lige har oversat, ved at klikke nedenfor. Hvis den originale side bliver fundet, vil du blive præsenteret for en sammenligning af de to sider.</key>
+    <key alias="translationFailed">Oversættelse fejlede, XML-filen kan være korrupt (indeholde fejl)</key>
+    <key alias="translationOptions">Oversættelsesmuligheder</key>
+    <key alias="translator">Oversætter</key>
+    <key alias="uploadTranslationXml">Upload oversættelse (xml)</key>
+  </area>
+  <area alias="treeHeaders">
+    <key alias="content">Indhold</key>
+    <key alias="contentBlueprints">Indholdsskabeloner</key>
+    <key alias="media">Mediearkiv</key>
+    <key alias="cacheBrowser">Cacheviser</key>
+    <key alias="contentRecycleBin">Papirkurv</key>
+    <key alias="createdPackages">Oprettede pakker</key>
+    <key alias="dataTypes">Datatyper</key>
+    <key alias="dictionary">Ordbog</key>
+    <key alias="installedPackages">Installerede pakker</key>
+    <key alias="installSkin">Installér et skin</key>
+    <key alias="installStarterKit">Installér et starterkit</key>
+    <key alias="languages">Sprog</key>
+    <key alias="localPackage">Installér lokal pakke</key>
+    <key alias="macros">Makroer</key>
+    <key alias="mediaTypes">Medietyper</key>
+    <key alias="member">Medlemmer</key>
+    <key alias="memberGroups">Medlemsgrupper</key>
+    <key alias="memberRoles">Roller</key>
+    <key alias="memberTypes">Medlemstyper</key>
+    <key alias="documentTypes">Dokumenttyper</key>
+    <key alias="relationTypes">Relationstyper</key>
+    <key alias="packager">Pakker</key>
+    <key alias="packages">Pakker</key>
+    <key alias="partialViews">Partial Views</key>
+    <key alias="partialViewMacros">Partial View makrofiler</key>
+    <key alias="repositories">Installer fra "repository"</key>
+    <key alias="runway">Installer Runway</key>
+    <key alias="runwayModules">Runway-moduler</key>
+    <key alias="scripting">Scripting filer</key>
+    <key alias="scripts">Scripts</key>
+    <key alias="stylesheets">Stylesheets</key>
+    <key alias="templates">Skabeloner</key>
+    <key alias="userPermissions">Brugertilladelser</key>
+    <key alias="userTypes">Brugertyper</key>
+    <key alias="users">Brugere</key>
+    <key alias="settingsGroup">Indstillinger</key>
+    <key alias="templatingGroup">Design og layout</key>
+    <key alias="thirdPartyGroup">Tredjepart</key>
+  </area>
+  <area alias="update">
+    <key alias="updateAvailable">Ny opdatering er klar</key>
+    <key alias="updateDownloadText">%0% er klar, klik her for at downloade</key>
+    <key alias="updateNoServer">Ingen forbindelse til server</key>
+    <key alias="updateNoServerError">Der kunne ikke tjekkes for ny opdatering. Se trace for mere info.</key>
+  </area>
+  <area alias="user">
+    <key alias="access">Adgang</key>
+    <key alias="accessHelp">Baseret på de tildelte grupper og startnoder har brugeren adgang til følgende noder</key>
+    <key alias="assignAccess">Tildel adgang</key>
+    <key alias="administrators">Administrator</key>
+    <key alias="categoryField">Kategorifelt</key>
+    <key alias="createDate">Bruger oprettet</key>
+    <key alias="changePassword">Skift dit kodeord</key>
+    <key alias="changePhoto">Skift billede</key>
+    <key alias="newPassword">Nyt kodeord</key>
+    <key alias="noLockouts">er ikke blevet låst ude</key>
+    <key alias="noPasswordChange">Kodeordet er ikke blevet ændret</key>
+    <key alias="confirmNewPassword">Gentag dit nye kodeord</key>
+    <key alias="changePasswordDescription">Du kan ændre dit kodeord, som giver dig adgang til Umbraco Back Office ved at udfylde formularen og klikke på knappen 'Skift dit kodeord'</key>
+    <key alias="contentChannel">Indholdskanal</key>
+    <key alias="createUserHelp">Opret nye brugere for at give dem adgang til Umbraco. Når en ny bruger oprettes, genereres der en adgangskode, som du kan dele med brugeren.</key>
+    <key alias="descriptionField">Beskrivelsesfelt</key>
+    <key alias="disabled">Deaktivér bruger</key>
+    <key alias="documentType">Dokumenttype</key>
+    <key alias="editors">Redaktør</key>
+    <key alias="excerptField">Uddragsfelt</key>
+    <key alias="failedPasswordAttempts">Fejlede loginforsøg</key>
+    <key alias="goToProfile">Gå til brugerprofil</key>
+    <key alias="groupsHelp">Tilføj grupper for at tildele adgang og tilladelser</key>
+    <key alias="inviteAnotherUser">Invitér anden bruger</key>
+    <key alias="inviteUserHelp">Invitér nye brugere til at give dem adgang til Umbraco. En invitation vil blive sendt via e-mail til brugeren med oplysninger om, hvordan man logger ind i Umbraco.</key>
+    <key alias="language">Sprog</key>
+    <key alias="languageHelp">Indstil det sprog, du vil se i menuer og dialoger</key>
+    <key alias="lastLockoutDate">Seneste låst ude dato</key>
+    <key alias="lastLogin">Seneste login</key>
+    <key alias="lastPasswordChangeDate">Kodeord sidst ændret</key>
+    <key alias="loginname">Brugernavn</key>
+    <key alias="mediastartnode">Startnode i mediearkivet</key>
+    <key alias="mediastartnodehelp">Begræns mediebiblioteket til en bestemt startnode</key>
+    <key alias="mediastartnodes">Medie startnoder</key>
+    <key alias="mediastartnodeshelp">Begræns mediebiblioteket til bestemte startnoder</key>
+    <key alias="modules">Moduler</key>
+    <key alias="noConsole">Deaktivér adgang til Umbraco</key>
+    <key alias="noLogin">har endnu ikke logget ind</key>
+    <key alias="oldPassword">Gammelt kodeord</key>
+    <key alias="password">Adgangskode</key>
+    <key alias="resetPassword">Nulstil kodeord</key>
+    <key alias="passwordChanged">Dit kodeord er blevet ændret!</key>
+    <key alias="passwordConfirm">Bekræft venligst dit nye kodeord</key>
+    <key alias="passwordEnterNew">Indtast dit nye kodeord</key>
+    <key alias="passwordCurrent">Nuværende kodeord</key>
+    <key alias="passwordInvalid">ugyldig nuværende kodeord</key>
+    <key alias="passwordIsBlank">Dit nye kodeord må ikke være tomt!</key>
+    <key alias="passwordIsDifferent">Dit nye kodeord og dit bekræftede kodeord var ikke ens, forsøg venligst igen!</key>
+    <key alias="passwordMismatch">Det bekræftede kodeord matcher ikke det nye kodeord</key>
+    <key alias="permissionReplaceChildren">Erstat underelement-rettigheder</key>
+    <key alias="permissionSelectedPages">Du ændrer i øjeblikket rettigheder for siderne:</key>
+    <key alias="permissionSelectPages">Vælg sider for at ændre deres rettigheder</key>
+    <key alias="removePhoto">Fjern billede</key>
+    <key alias="permissionsDefault">Standard rettigheder</key>
+    <key alias="permissionsGranular">Granulære rettigheder</key>
+    <key alias="permissionsGranularHelp">Sæt rettigheder for specifikke noder</key>
+    <key alias="profile">Profil</key>
+    <key alias="searchAllChildren">Søg alle 'børn'</key>
+    <key alias="startnode">Startnode</key>
+    <key alias="sectionsHelp">Tilføj sektioner for at give brugerne adgang</key>
+    <key alias="selectUserGroups">Vælg brugergrupper</key>
+    <key alias="noStartNode">Ingen startnode valgt</key>
+    <key alias="noStartNodes">Ingen startnoder valgt</key>
+    <key alias="startnodehelp">Begræns indholdstræet til en bestemt startnode</key>
+    <key alias="startnodes">Indhold startnoder</key>
+    <key alias="startnodeshelp">Begræns indholdstræet til bestemte startnoder</key>
+    <key alias="updateDate">Bruger sidst opdateret</key>
+    <key alias="userCreated">er blevet oprettet</key>
+    <key alias="userCreatedSuccessHelp">Den nye bruger er blevet oprettet. For at logge ind i Umbraco skal du bruge adgangskoden nedenfor.</key>
+    <key alias="userManagement">Brugeradministration</key>
+    <key alias="username">Navn</key>
+    <key alias="userPermissions">Brugertilladelser</key>
+    <key alias="usergroup">Brugergruppe</key>
+    <key alias="userInvited">er blevet inviteret</key>
+    <key alias="userInvitedSuccessHelp">En invitation er blevet sendt til den nye bruger med oplysninger om, hvordan man logger ind i Umbraco.</key>
+    <key alias="userinviteWelcomeMessage">Hej og velkommen til Umbraco! På bare 1 minut vil du være klar til at komme i gang, vi skal bare have dig til at oprette en adgangskode og tilføje et billede til din avatar.</key>
+    <key alias="userinviteAvatarMessage">Hvis du uploader et billede af dig selv, gør du det nemt for andre brugere at genkende dig. Klik på cirklen ovenfor for at uploade et billede.</key>
+    <key alias="writer">Forfatter</key>
+    <key alias="change">Skift</key>
+    <key alias="yourProfile">Din profil</key>
+    <key alias="yourHistory">Din historik</key>
+    <key alias="sessionExpires">Session udløber</key>
+    <key alias="inviteUser">Invitér bruger</key>
+    <key alias="createUser">Opret bruger</key>
+    <key alias="sendInvite">Send invitation</key>
+    <key alias="backToUsers">Tilbage til brugere</key>
+    <key alias="inviteEmailCopySubject">Umbraco: Invitation</key>
+    <key alias="inviteEmailCopyFormat"><![CDATA[<html><body><p>Hej %0%, du er blevet inviteret af %1% til Umbraco backoffice.</p><p>Besked fra %1%: <em>%2%</em></p><p>Klik på dette <a href="%3%" target="_blank">link</a> for acceptere invitationen</p><p><small>Hvis du ikke kan klikke på linket, så kopier og indsæt denne URL i dit browservindue<br/><br/>%3%</small></p></body></html>]]></key>
+    <key alias="stateAll">Alle</key>
+    <key alias="stateActive">Aktiv</key>
+    <key alias="stateDisabled">Deaktiveret</key>
+    <key alias="stateLockedOut">Låst ude</key>
+    <key alias="stateInvited">Inviteret</key>
+    <key alias="stateInactive">Inaktiv</key>
+    <key alias="sortNameAscending">Navn (A-Å)</key>
+    <key alias="sortNameDescending">Navn (Å-A)</key>
+    <key alias="sortCreateDateAscending">Nyeste</key>
+    <key alias="sortCreateDateDescending">Ældste</key>
+    <key alias="sortLastLoginDateDescending">Sidst logget ind</key>
+  </area>
+  <area alias="validation">
+    <key alias="validation">Validering</key>
+    <key alias="validateAsEmail">Valider som e-mail</key>
+    <key alias="validateAsNumber">Valider som tal</key>
+    <key alias="validateAsUrl">Valider som Url</key>
+    <key alias="enterCustomValidation">...eller indtast din egen validering</key>
+    <key alias="fieldIsMandatory">Feltet er påkrævet</key>
+    <key alias="validationRegExp">Indtast et regulært udtryk</key>
+    <key alias="minCount">Du skal tilføje mindst</key>
+    <key alias="maxCount">Du kan kun have</key>
+    <key alias="items">elementer</key>
+    <key alias="itemsSelected">elementer valgt</key>
+    <key alias="invalidDate">Ugyldig dato</key>
+    <key alias="invalidNumber">Ikke et tal</key>
+    <key alias="invalidEmail">Ugyldig e-mail</key>
+  </area>
+  <area alias="redirectUrls">
+    <key alias="disableUrlTracker">Slå URL tracker fra</key>
+    <key alias="enableUrlTracker">Slå URL tracker til</key>
+    <key alias="originalUrl">Original URL</key>
+    <key alias="redirectedTo">Viderestillet til</key>
+    <key alias="noRedirects">Der er ikke lavet nogen viderestillinger</key>
+    <key alias="noRedirectsDescription">Når en udgivet side bliver omdøbt eller flyttet, vil en viderestilling automatisk blive lavet til den nye side.</key>
+    <key alias="confirmRemove">Er du sikker på at du vil fjerne viderestillingen fra '%0%' til '%1%'?</key>
+    <key alias="redirectRemoved">Viderestillings URL fjernet.</key>
+    <key alias="redirectRemoveError">Fejl under fjernelse af viderestillings URL.</key>
+    <key alias="redirectRemoveWarning">Dette vil fjerne viderestillingen</key>
+    <key alias="confirmDisable">Er du sikker på at du vil slå URL trackeren fra?</key>
+    <key alias="disabledConfirm">URL tracker er nu slået fra.</key>
+    <key alias="disableError">Der opstod en fejl under forsøget på at slå URL trackeren fra, der findes mere information i logfilen.</key>
+    <key alias="enabledConfirm">URL tracker er nu slået fra.</key>
+    <key alias="enableError">Der opstod en fejl under forsøget på at slå URL trackeren til, der findes mere information i logfilen.</key>
+  </area>
+  <area alias="emptyStates">
+    <key alias="emptyDictionaryTree">Ingen ordbog elementer at vælge imellem</key>
+  </area>
   <area alias="textbox">
     <key alias="characters_left"><![CDATA[<strong>%0%</strong> tegn tilbage.]]></key>
-    <key alias="characters_exceed"><![CDATA[Maksimum %0% tegn, <strong>%1%</strong> for mange.]]></key>
-  </area>
-  <area alias="recycleBin">
-    <key alias="contentTrashed">Slettet indhold med Id: {0} Relateret til original "parent" med id: {1}</key>
-    <key alias="mediaTrashed">Slettet medie med Id: {0} relateret til original "parent" / mappe med id: {1}</key>
-    <key alias="itemCannotBeRestored">Kan ikke automatisk genoprette dette element</key>
-    <key alias="itemCannotBeRestoredHelpText">Der er ikke nogen placering hvor dette element automatisk kan genoprettes. Du kan flytte elementet manuelt i træet nedenfor.</key>
-    <key alias="wasRestored">blev genoprettet under</key>
-  </area>
-  <area alias="relationType">
-    <key alias="direction">Retning</key>
-    <key alias="parentToChild">Forælder til barn</key>
-    <key alias="bidirectional">Tovejs</key>
-    <key alias="parent">Forælder</key>
-    <key alias="child">Barn</key>
-    <key alias="count">Antal</key>
-    <key alias="relations">Relationer</key>
-    <key alias="created">Oprettet</key>
-    <key alias="comment">Kommentar</key>
-    <key alias="name">Navn</key>
-    <key alias="noRelations">Der er ingen relationer for denne relationstype.</key>
-    <key alias="tabRelationType">Relationstype</key>
-    <key alias="tabRelations">Relationer</key>
-  </area>
-  <area alias="dashboardTabs">
-    <key alias="contentIntro">Kom godt i gang</key>
-    <key alias="contentRedirectManager">Redirects håndtering</key>
-    <key alias="mediaFolderBrowser">Indhold</key>
-    <key alias="settingsWelcome">Velkommen</key>
-    <key alias="settingsExamine">Examine Management</key>
-    <key alias="settingsPublishedStatus">Published Cache</key>
-    <key alias="settingsModelsBuilder">Models Builder</key>
-    <key alias="settingsHealthCheck">Health Check</key>
+    <key alias="characters_exceed"><![CDATA[Maksimum %0% tegn, <strong>%1%</strong> for mange.]]></key>
+  </area>
+  <area alias="recycleBin">
+    <key alias="contentTrashed">Slettet indhold med Id: {0} Relateret til original "parent" med id: {1}</key>
+    <key alias="mediaTrashed">Slettet medie med Id: {0} relateret til original "parent" / mappe med id: {1}</key>
+    <key alias="itemCannotBeRestored">Kan ikke automatisk genoprette dette element</key>
+    <key alias="itemCannotBeRestoredHelpText">Der er ikke nogen placering hvor dette element automatisk kan genoprettes. Du kan flytte elementet manuelt i træet nedenfor.</key>
+    <key alias="wasRestored">blev genoprettet under</key>
+  </area>
+  <area alias="relationType">
+    <key alias="direction">Retning</key>
+    <key alias="parentToChild">Forælder til barn</key>
+    <key alias="bidirectional">Tovejs</key>
+    <key alias="parent">Forælder</key>
+    <key alias="child">Barn</key>
+    <key alias="count">Antal</key>
+    <key alias="relations">Relationer</key>
+    <key alias="created">Oprettet</key>
+    <key alias="comment">Kommentar</key>
+    <key alias="name">Navn</key>
+    <key alias="noRelations">Der er ingen relationer for denne relationstype.</key>
+    <key alias="tabRelationType">Relationstype</key>
+    <key alias="tabRelations">Relationer</key>
+  </area>
+  <area alias="dashboardTabs">
+    <key alias="contentIntro">Kom godt i gang</key>
+    <key alias="contentRedirectManager">Redirects håndtering</key>
+    <key alias="mediaFolderBrowser">Indhold</key>
+    <key alias="settingsWelcome">Velkommen</key>
+    <key alias="settingsExamine">Examine Management</key>
+    <key alias="settingsPublishedStatus">Published Cache</key>
+    <key alias="settingsModelsBuilder">Models Builder</key>
+    <key alias="settingsHealthCheck">Health Check</key>
     <key alias="settingsProfiler">Profiling</key>
-    <key alias="memberIntro">Kom godt i gang</key>
-    <key alias="formsInstall">Installer Umbraco Forms</key>
-  </area>
-  <area alias="visuallyHiddenTexts">
+    <key alias="memberIntro">Kom godt i gang</key>
+    <key alias="formsInstall">Installer Umbraco Forms</key>
+  </area>
+  <area alias="visuallyHiddenTexts">
     <key alias="goBack">Gå tilbage</key>
     <key alias="activeListLayout">Aktivt layout:</key>
     <key alias="jumpTo">Gå til</key>
-    <key alias="group">gruppe</key>    
-  </area>
-</language>
+    <key alias="group">gruppe</key>
+    <key alias="passed">bestået</key>
+    <key alias="warning">advarsel</key>
+    <key alias="failed">fejlet</key>
+    <key alias="suggestion">forslag</key>
+  </area>
+</language>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 4a49a94823..1cb73e8e1e 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -98,12 +98,12 @@
     <key alias="domainUpdated">Domain '%0%' has been updated</key>
     <key alias="orEdit">Edit Current Domains</key>
     <key alias="domainHelpWithVariants">
-    	<![CDATA[Valid domain names are: "example.com", "www.example.com", "example.com:8080", or "https://www.example.com/".
+    	<![CDATA[Valid domain names are: "example.com", "www.example.com", "example.com:8080", or "https://www.example.com/".
      Furthermore also one-level paths in domains are supported, eg. "example.com/en" or "/en".]]></key>
     <key alias="inherit">Inherit</key>
     <key alias="setLanguage">Culture</key>
         <key alias="setLanguageHelp">
-            <![CDATA[Set the culture for nodes below the current node,<br /> or inherit culture from parent nodes. Will also apply<br />
+            <![CDATA[Set the culture for nodes below the current node,<br /> or inherit culture from parent nodes. Will also apply<br />
       to the current node, unless a domain below applies too.]]>
         </key>
     <key alias="setDomains">Domains</key>
@@ -482,12 +482,12 @@
     <key alias="noItems">There are no dictionary items.</key>
   </area>
   <area alias="dictionaryItem">
-    <key alias="description"><![CDATA[
-      Edit the different language versions for the dictionary item '<em>%0%</em>' below
+    <key alias="description"><![CDATA[
+      Edit the different language versions for the dictionary item '<em>%0%</em>' below
    ]]></key>
     <key alias="displayName">Culture Name</key>
-    <key alias="changeKeyError"><![CDATA[
-      The key '%0%' already exists.
+    <key alias="changeKeyError"><![CDATA[
+      The key '%0%' already exists.
    ]]></key>
     <key alias="overviewTitle">Dictionary overview</key>
   </area>
@@ -503,10 +503,10 @@
     <key alias="manageIndexes">Manage Examine's indexes</key>
     <key alias="manageIndexesDescription">Allows you to view the details of each index and provides some tools for managing the indexes</key>
     <key alias="rebuildIndex">Rebuild index</key>
-    <key alias="rebuildIndexWarning"><![CDATA[
-      This will cause the index to be rebuilt.<br />
-      Depending on how much content there is in your site this could take a while.<br />
-      It is not recommended to rebuild an index during times of high website traffic or when editors are editing content.
+    <key alias="rebuildIndexWarning"><![CDATA[
+      This will cause the index to be rebuilt.<br />
+      Depending on how much content there is in your site this could take a while.<br />
+      It is not recommended to rebuild an index during times of high website traffic or when editors are editing content.
      ]]>
     </key>
     <key alias="searchers">Searchers</key>
@@ -784,28 +784,28 @@
     <key alias="databaseFound">Your database has been found and is identified as</key>
     <key alias="databaseHeader">Database configuration</key>
         <key alias="databaseInstall">
-            <![CDATA[
-      Press the <strong>install</strong> button to install the Umbraco %0% database
+            <![CDATA[
+      Press the <strong>install</strong> button to install the Umbraco %0% database
     ]]>
         </key>
     <key alias="databaseInstallDone"><![CDATA[Umbraco %0% has now been copied to your database. Press <strong>Next</strong> to proceed.]]></key>
-    <key alias="databaseNotFound"><![CDATA[<p>Database not found! Please check that the information in the "connection string" of the "web.config" file is correct.</p>
-              <p>To proceed, please edit the "web.config" file (using Visual Studio or your favourite text editor), scroll to the bottom, add the connection string for your database in the key named "UmbracoDbDSN" and save the file. </p>
-              <p>
-              Click the <strong>retry</strong> button when
-              done.<br /><a href="https://our.umbraco.com/documentation/Using-Umbraco/Config-files/webconfig7" target="_blank">
+    <key alias="databaseNotFound"><![CDATA[<p>Database not found! Please check that the information in the "connection string" of the "web.config" file is correct.</p>
+              <p>To proceed, please edit the "web.config" file (using Visual Studio or your favourite text editor), scroll to the bottom, add the connection string for your database in the key named "UmbracoDbDSN" and save the file. </p>
+              <p>
+              Click the <strong>retry</strong> button when
+              done.<br /><a href="https://our.umbraco.com/documentation/Using-Umbraco/Config-files/webconfig7" target="_blank">
 			              More information on editing web.config here.</a></p>]]></key>
-    <key alias="databaseText"><![CDATA[To complete this step, you must know some information regarding your database server ("connection string").<br />
-        Please contact your ISP if necessary.
+    <key alias="databaseText"><![CDATA[To complete this step, you must know some information regarding your database server ("connection string").<br />
+        Please contact your ISP if necessary.
         If you're installing on a local machine or server you might need information from your system administrator.]]></key>
-    <key alias="databaseUpgrade"><![CDATA[
-      <p>
-      Press the <strong>upgrade</strong> button to upgrade your database to Umbraco %0%</p>
-      <p>
-      Don't worry - no content will be deleted and everything will continue working afterwards!
-      </p>
+    <key alias="databaseUpgrade"><![CDATA[
+      <p>
+      Press the <strong>upgrade</strong> button to upgrade your database to Umbraco %0%</p>
+      <p>
+      Don't worry - no content will be deleted and everything will continue working afterwards!
+      </p>
       ]]></key>
-    <key alias="databaseUpgradeDone"><![CDATA[Your database has been upgraded to the final version %0%.<br />Press <strong>Next</strong> to
+    <key alias="databaseUpgradeDone"><![CDATA[Your database has been upgraded to the final version %0%.<br />Press <strong>Next</strong> to
       proceed. ]]></key>
     <key alias="databaseUpToDate"><![CDATA[Your current database is up-to-date!. Click <strong>next</strong> to continue the configuration wizard]]></key>
     <key alias="defaultUserChangePass"><![CDATA[<strong>The Default users' password needs to be changed!</strong>]]></key>
@@ -818,51 +818,51 @@
     <key alias="permissionsAffectedFolders">Affected files and folders</key>
     <key alias="permissionsAffectedFoldersMoreInfo">More information on setting up permissions for Umbraco here</key>
     <key alias="permissionsAffectedFoldersText">You need to grant ASP.NET modify permissions to the following files/folders</key>
-    <key alias="permissionsAlmostPerfect"><![CDATA[<strong>Your permission settings are almost perfect!</strong><br /><br />
+    <key alias="permissionsAlmostPerfect"><![CDATA[<strong>Your permission settings are almost perfect!</strong><br /><br />
         You can run Umbraco without problems, but you will not be able to install packages which are recommended to take full advantage of Umbraco.]]></key>
     <key alias="permissionsHowtoResolve">How to Resolve</key>
     <key alias="permissionsHowtoResolveLink">Click here to read the text version</key>
     <key alias="permissionsHowtoResolveText"><![CDATA[Watch our <strong>video tutorial</strong> on setting up folder permissions for Umbraco or read the text version.]]></key>
-    <key alias="permissionsMaybeAnIssue"><![CDATA[<strong>Your permission settings might be an issue!</strong>
-      <br/><br />
+    <key alias="permissionsMaybeAnIssue"><![CDATA[<strong>Your permission settings might be an issue!</strong>
+      <br/><br />
       You can run Umbraco without problems, but you will not be able to create folders or install packages which are recommended to take full advantage of Umbraco.]]></key>
-    <key alias="permissionsNotReady"><![CDATA[<strong>Your permission settings are not ready for Umbraco!</strong>
-          <br /><br />
+    <key alias="permissionsNotReady"><![CDATA[<strong>Your permission settings are not ready for Umbraco!</strong>
+          <br /><br />
           In order to run Umbraco, you'll need to update your permission settings.]]></key>
-    <key alias="permissionsPerfect"><![CDATA[<strong>Your permission settings are perfect!</strong><br /><br />
+    <key alias="permissionsPerfect"><![CDATA[<strong>Your permission settings are perfect!</strong><br /><br />
               You are ready to run Umbraco and install packages!]]></key>
     <key alias="permissionsResolveFolderIssues">Resolving folder issue</key>
     <key alias="permissionsResolveFolderIssuesLink">Follow this link for more information on problems with ASP.NET and creating folders</key>
     <key alias="permissionsSettingUpPermissions">Setting up folder permissions</key>
-    <key alias="permissionsText"><![CDATA[
-      Umbraco needs write/modify access to certain directories in order to store files like pictures and PDF's.
-      It also stores temporary data (aka: cache) for enhancing the performance of your website.
+    <key alias="permissionsText"><![CDATA[
+      Umbraco needs write/modify access to certain directories in order to store files like pictures and PDF's.
+      It also stores temporary data (aka: cache) for enhancing the performance of your website.
     ]]></key>
     <key alias="runwayFromScratch">I want to start from scratch</key>
-    <key alias="runwayFromScratchText"><![CDATA[
-        Your website is completely empty at the moment, so that's perfect if you want to start from scratch and create your own document types and templates.
-        (<a href="http://Umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">learn how</a>)
-        You can still choose to install Runway later on. Please go to the Developer section and choose Packages.
+    <key alias="runwayFromScratchText"><![CDATA[
+        Your website is completely empty at the moment, so that's perfect if you want to start from scratch and create your own document types and templates.
+        (<a href="http://Umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">learn how</a>)
+        You can still choose to install Runway later on. Please go to the Developer section and choose Packages.
       ]]></key>
     <key alias="runwayHeader">You've just set up a clean Umbraco platform. What do you want to do next?</key>
     <key alias="runwayInstalled">Runway is installed</key>
-    <key alias="runwayInstalledText"><![CDATA[
-      You have the foundation in place. Select what modules you wish to install on top of it.<br />
-      This is our list of recommended modules, check off the ones you would like to install, or view the <a href="#" onclick="toggleModules(); return false;" id="toggleModuleList">full list of modules</a>
+    <key alias="runwayInstalledText"><![CDATA[
+      You have the foundation in place. Select what modules you wish to install on top of it.<br />
+      This is our list of recommended modules, check off the ones you would like to install, or view the <a href="#" onclick="toggleModules(); return false;" id="toggleModuleList">full list of modules</a>
       ]]></key>
     <key alias="runwayOnlyProUsers">Only recommended for experienced users</key>
     <key alias="runwaySimpleSite">I want to start with a simple website</key>
-    <key alias="runwaySimpleSiteText"><![CDATA[
-      <p>
-      "Runway" is a simple website providing some basic document types and templates. The installer can set up Runway for you automatically,
-        but you can easily edit, extend or remove it. It's not necessary and you can perfectly use Umbraco without it. However,
-        Runway offers an easy foundation based on best practices to get you started faster than ever.
-        If you choose to install Runway, you can optionally select basic building blocks called Runway Modules to enhance your Runway pages.
-        </p>
-        <small>
-        <em>Included with Runway:</em> Home page, Getting Started page, Installing Modules page.<br />
-        <em>Optional Modules:</em> Top Navigation, Sitemap, Contact, Gallery.
-        </small>
+    <key alias="runwaySimpleSiteText"><![CDATA[
+      <p>
+      "Runway" is a simple website providing some basic document types and templates. The installer can set up Runway for you automatically,
+        but you can easily edit, extend or remove it. It's not necessary and you can perfectly use Umbraco without it. However,
+        Runway offers an easy foundation based on best practices to get you started faster than ever.
+        If you choose to install Runway, you can optionally select basic building blocks called Runway Modules to enhance your Runway pages.
+        </p>
+        <small>
+        <em>Included with Runway:</em> Home page, Getting Started page, Installing Modules page.<br />
+        <em>Optional Modules:</em> Top Navigation, Sitemap, Contact, Gallery.
+        </small>
       ]]></key>
     <key alias="runwayWhatIsRunway">What is Runway</key>
     <key alias="step1">Step 1/5 Accept license</key>
@@ -871,23 +871,23 @@
     <key alias="step4">Step 4/5: Check Umbraco security</key>
     <key alias="step5">Step 5/5: Umbraco is ready to get you started</key>
     <key alias="thankYou">Thank you for choosing Umbraco</key>
-    <key alias="theEndBrowseSite"><![CDATA[<h3>Browse your new site</h3>
+    <key alias="theEndBrowseSite"><![CDATA[<h3>Browse your new site</h3>
 You installed Runway, so why not see how your new website looks.]]></key>
-    <key alias="theEndFurtherHelp"><![CDATA[<h3>Further help and information</h3>
+    <key alias="theEndFurtherHelp"><![CDATA[<h3>Further help and information</h3>
 Get help from our award winning community, browse the documentation or watch some free videos on how to build a simple site, how to use packages and a quick guide to the Umbraco terminology]]></key>
     <key alias="theEndHeader">Umbraco %0% is installed and ready for use</key>
-    <key alias="theEndInstallFailed"><![CDATA[To finish the installation, you'll need to
+    <key alias="theEndInstallFailed"><![CDATA[To finish the installation, you'll need to
         manually edit the <strong>/web.config file</strong> and update the AppSetting key <strong>UmbracoConfigurationStatus</strong> in the bottom to the value of <strong>'%0%'</strong>.]]></key>
-    <key alias="theEndInstallSuccess"><![CDATA[You can get <strong>started instantly</strong> by clicking the "Launch Umbraco" button below. <br />If you are <strong>new to Umbraco</strong>,
+    <key alias="theEndInstallSuccess"><![CDATA[You can get <strong>started instantly</strong> by clicking the "Launch Umbraco" button below. <br />If you are <strong>new to Umbraco</strong>,
 you can find plenty of resources on our getting started pages.]]></key>
-    <key alias="theEndOpenUmbraco"><![CDATA[<h3>Launch Umbraco</h3>
+    <key alias="theEndOpenUmbraco"><![CDATA[<h3>Launch Umbraco</h3>
 To manage your website, simply open the Umbraco back office and start adding content, updating the templates and stylesheets or add new functionality]]></key>
     <key alias="Unavailable">Connection to database failed.</key>
     <key alias="Version3">Umbraco Version 3</key>
     <key alias="Version4">Umbraco Version 4</key>
     <key alias="watch">Watch</key>
-    <key alias="welcomeIntro"><![CDATA[This wizard will guide you through the process of configuring <strong>Umbraco %0%</strong> for a fresh install or upgrading from version 3.0.
-                                <br /><br />
+    <key alias="welcomeIntro"><![CDATA[This wizard will guide you through the process of configuring <strong>Umbraco %0%</strong> for a fresh install or upgrading from version 3.0.
+                                <br /><br />
                                 Press <strong>"next"</strong> to start the wizard.]]></key>
   </area>
   <area alias="language">
@@ -920,86 +920,86 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="setPasswordConfirmation">Your Password has been updated</key>
     <key alias="resetCodeExpired">The link you have clicked on is invalid or has expired</key>
     <key alias="resetPasswordEmailCopySubject">Umbraco: Reset Password</key>
-    <key alias="resetPasswordEmailCopyFormat"><![CDATA[
-        <html>
-			<head>
-				<meta name='viewport' content='width=device-width'>
-				<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
-			</head>
-			<body class='' style='font-family: sans-serif; -webkit-font-smoothing: antialiased; font-size: 14px; color: #392F54; line-height: 22px; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; background: #1d1333; margin: 0; padding: 0;' bgcolor='#1d1333'>
-				<style type='text/css'> @media only screen and (max-width: 620px) {table[class=body] h1 {font-size: 28px !important; margin-bottom: 10px !important; } table[class=body] .wrapper {padding: 32px !important; } table[class=body] .article {padding: 32px !important; } table[class=body] .content {padding: 24px !important; } table[class=body] .container {padding: 0 !important; width: 100% !important; } table[class=body] .main {border-left-width: 0 !important; border-radius: 0 !important; border-right-width: 0 !important; } table[class=body] .btn table {width: 100% !important; } table[class=body] .btn a {width: 100% !important; } table[class=body] .img-responsive {height: auto !important; max-width: 100% !important; width: auto !important; } } .btn-primary table td:hover {background-color: #34495e !important; } .btn-primary a:hover {background-color: #34495e !important; border-color: #34495e !important; } .btn  a:visited {color:#FFFFFF;} </style>
-				<table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;" bgcolor="#1d1333">
-					<tr>
-						<td style="font-family: sans-serif; font-size: 14px; vertical-align: top; padding: 24px;" valign="top">
-							<table style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
-								<tr>
-									<td background="https://umbraco.com/umbraco/assets/img/application/logo.png" bgcolor="#1d1333" width="28" height="28" valign="top" style="font-family: sans-serif; font-size: 14px; vertical-align: top;">
-										<!--[if gte mso 9]> <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="width:30px;height:30px;"> <v:fill type="tile" src="https://umbraco.com/umbraco/assets/img/application/logo.png" color="#1d1333" /> <v:textbox inset="0,0,0,0"> <![endif]-->
-										<div> </div>
-										<!--[if gte mso 9]> </v:textbox> </v:rect> <![endif]-->
-									</td>
-									<td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top"></td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-				</table>
-				<table border='0' cellpadding='0' cellspacing='0' class='body' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;' bgcolor='#1d1333'>
-					<tr>
-						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
-						<td class='container' style='font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; max-width: 560px; width: 560px; margin: 0 auto; padding: 10px;' valign='top'>
-							<div class='content' style='box-sizing: border-box; display: block; max-width: 560px; margin: 0 auto; padding: 10px;'>
-								<br>
-								<table class='main' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; border-radius: 3px; background: #FFFFFF;' bgcolor='#FFFFFF'>
-									<tr>
-										<td class='wrapper' style='font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 50px;' valign='top'>
-											<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;'>
-												<tr>
-													<td style='line-height: 24px; font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'>
-														<h1 style='color: #392F54; font-family: sans-serif; font-weight: bold; line-height: 1.4; font-size: 24px; text-align: left; text-transform: capitalize; margin: 0 0 30px;' align='left'>
-															Password reset requested
-														</h1>
-														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
-															Your username to login to the Umbraco back-office is: <strong>%0%</strong>
-														</p>
-														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
-															<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'>
-																<tbody>
-																	<tr>
-																		<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
-																			<a href='%1%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
-																				Click this link to reset your password
-																			</a>
-																		</td>
-																	</tr>
-																</tbody>
-															</table>
-														</p>
-														<p style='max-width: 400px; display: block; color: #392F54; font-family: sans-serif; font-size: 14px; line-height: 20px; font-weight: normal; margin: 15px 0;'>If you cannot click on the link, copy and paste this URL into your browser window:</p>
-															<table border='0' cellpadding='0' cellspacing='0'>
-																<tr>
-																	<td style='-ms-word-break: break-all; word-break: break-all; font-family: sans-serif; font-size: 11px; line-height:14px;'>
-																		<font style="-ms-word-break: break-all; word-break: break-all; font-size: 11px; line-height:14px;">
-																			<a style='-ms-word-break: break-all; word-break: break-all; color: #392F54; text-decoration: underline; font-size: 11px; line-height:15px;' href='%1%'>%1%</a>
-																		</font>
-																	</td>
-																</tr>
-															</table>
-														</p>
-													</td>
-												</tr>
-											</table>
-										</td>
-									</tr>
-								</table>
-								<br><br><br>
-							</div>
-						</td>
-						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
-					</tr>
-				</table>
-			</body>
-		</html>
+    <key alias="resetPasswordEmailCopyFormat"><![CDATA[
+        <html>
+			<head>
+				<meta name='viewport' content='width=device-width'>
+				<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
+			</head>
+			<body class='' style='font-family: sans-serif; -webkit-font-smoothing: antialiased; font-size: 14px; color: #392F54; line-height: 22px; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; background: #1d1333; margin: 0; padding: 0;' bgcolor='#1d1333'>
+				<style type='text/css'> @media only screen and (max-width: 620px) {table[class=body] h1 {font-size: 28px !important; margin-bottom: 10px !important; } table[class=body] .wrapper {padding: 32px !important; } table[class=body] .article {padding: 32px !important; } table[class=body] .content {padding: 24px !important; } table[class=body] .container {padding: 0 !important; width: 100% !important; } table[class=body] .main {border-left-width: 0 !important; border-radius: 0 !important; border-right-width: 0 !important; } table[class=body] .btn table {width: 100% !important; } table[class=body] .btn a {width: 100% !important; } table[class=body] .img-responsive {height: auto !important; max-width: 100% !important; width: auto !important; } } .btn-primary table td:hover {background-color: #34495e !important; } .btn-primary a:hover {background-color: #34495e !important; border-color: #34495e !important; } .btn  a:visited {color:#FFFFFF;} </style>
+				<table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;" bgcolor="#1d1333">
+					<tr>
+						<td style="font-family: sans-serif; font-size: 14px; vertical-align: top; padding: 24px;" valign="top">
+							<table style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
+								<tr>
+									<td background="https://umbraco.com/umbraco/assets/img/application/logo.png" bgcolor="#1d1333" width="28" height="28" valign="top" style="font-family: sans-serif; font-size: 14px; vertical-align: top;">
+										<!--[if gte mso 9]> <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="width:30px;height:30px;"> <v:fill type="tile" src="https://umbraco.com/umbraco/assets/img/application/logo.png" color="#1d1333" /> <v:textbox inset="0,0,0,0"> <![endif]-->
+										<div> </div>
+										<!--[if gte mso 9]> </v:textbox> </v:rect> <![endif]-->
+									</td>
+									<td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top"></td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+				</table>
+				<table border='0' cellpadding='0' cellspacing='0' class='body' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;' bgcolor='#1d1333'>
+					<tr>
+						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
+						<td class='container' style='font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; max-width: 560px; width: 560px; margin: 0 auto; padding: 10px;' valign='top'>
+							<div class='content' style='box-sizing: border-box; display: block; max-width: 560px; margin: 0 auto; padding: 10px;'>
+								<br>
+								<table class='main' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; border-radius: 3px; background: #FFFFFF;' bgcolor='#FFFFFF'>
+									<tr>
+										<td class='wrapper' style='font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 50px;' valign='top'>
+											<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;'>
+												<tr>
+													<td style='line-height: 24px; font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'>
+														<h1 style='color: #392F54; font-family: sans-serif; font-weight: bold; line-height: 1.4; font-size: 24px; text-align: left; text-transform: capitalize; margin: 0 0 30px;' align='left'>
+															Password reset requested
+														</h1>
+														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+															Your username to login to the Umbraco back-office is: <strong>%0%</strong>
+														</p>
+														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+															<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'>
+																<tbody>
+																	<tr>
+																		<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
+																			<a href='%1%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
+																				Click this link to reset your password
+																			</a>
+																		</td>
+																	</tr>
+																</tbody>
+															</table>
+														</p>
+														<p style='max-width: 400px; display: block; color: #392F54; font-family: sans-serif; font-size: 14px; line-height: 20px; font-weight: normal; margin: 15px 0;'>If you cannot click on the link, copy and paste this URL into your browser window:</p>
+															<table border='0' cellpadding='0' cellspacing='0'>
+																<tr>
+																	<td style='-ms-word-break: break-all; word-break: break-all; font-family: sans-serif; font-size: 11px; line-height:14px;'>
+																		<font style="-ms-word-break: break-all; word-break: break-all; font-size: 11px; line-height:14px;">
+																			<a style='-ms-word-break: break-all; word-break: break-all; color: #392F54; text-decoration: underline; font-size: 11px; line-height:15px;' href='%1%'>%1%</a>
+																		</font>
+																	</td>
+																</tr>
+															</table>
+														</p>
+													</td>
+												</tr>
+											</table>
+										</td>
+									</tr>
+								</table>
+								<br><br><br>
+							</div>
+						</td>
+						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
+					</tr>
+				</table>
+			</body>
+		</html>
 	]]></key>
   </area>
   <area alias="main">
@@ -1024,100 +1024,100 @@ To manage your website, simply open the Umbraco back office and start adding con
   <area alias="notifications">
     <key alias="editNotifications"><![CDATA[Select your notification for <strong>%0%</strong>]]></key>
     <key alias="notificationsSavedFor">Notification settings saved for</key>
-    <key alias="mailBody"><![CDATA[
-      Hi %0%
-
-      This is an automated mail to inform you that the task '%1%'
-      has been performed on the page '%2%'
-      by the user '%3%'
-
-      Go to http://%4%/#/content/content/edit/%5% to edit.
-
-      %6%
-
-      Have a nice day!
-
-      Cheers from the Umbraco robot
+    <key alias="mailBody"><![CDATA[
+      Hi %0%
+
+      This is an automated mail to inform you that the task '%1%'
+      has been performed on the page '%2%'
+      by the user '%3%'
+
+      Go to http://%4%/#/content/content/edit/%5% to edit.
+
+      %6%
+
+      Have a nice day!
+
+      Cheers from the Umbraco robot
     ]]></key>
     <key alias="mailBodyVariantSummary">The following languages have been modified %0%</key>
-    <key alias="mailBodyHtml"><![CDATA[
-        <html>
-			<head>
-				<meta name='viewport' content='width=device-width'>
-				<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
-			</head>
-			<body class='' style='font-family: sans-serif; -webkit-font-smoothing: antialiased; font-size: 14px; color: #392F54; line-height: 22px; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; background: #1d1333; margin: 0; padding: 0;' bgcolor='#1d1333'>
-				<style type='text/css'> @media only screen and (max-width: 620px) {table[class=body] h1 {font-size: 28px !important; margin-bottom: 10px !important; } table[class=body] .wrapper {padding: 32px !important; } table[class=body] .article {padding: 32px !important; } table[class=body] .content {padding: 24px !important; } table[class=body] .container {padding: 0 !important; width: 100% !important; } table[class=body] .main {border-left-width: 0 !important; border-radius: 0 !important; border-right-width: 0 !important; } table[class=body] .btn table {width: 100% !important; } table[class=body] .btn a {width: 100% !important; } table[class=body] .img-responsive {height: auto !important; max-width: 100% !important; width: auto !important; } } .btn-primary table td:hover {background-color: #34495e !important; } .btn-primary a:hover {background-color: #34495e !important; border-color: #34495e !important; } .btn  a:visited {color:#FFFFFF;} </style>
-				<table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;" bgcolor="#1d1333">
-					<tr>
-						<td style="font-family: sans-serif; font-size: 14px; vertical-align: top; padding: 24px;" valign="top">
-							<table style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
-								<tr>
-									<td background="https://umbraco.com/umbraco/assets/img/application/logo.png" bgcolor="#1d1333" width="28" height="28" valign="top" style="font-family: sans-serif; font-size: 14px; vertical-align: top;">
-										<!--[if gte mso 9]> <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="width:30px;height:30px;"> <v:fill type="tile" src="https://umbraco.com/umbraco/assets/img/application/logo.png" color="#1d1333" /> <v:textbox inset="0,0,0,0"> <![endif]-->
-										<div> </div>
-										<!--[if gte mso 9]> </v:textbox> </v:rect> <![endif]-->
-									</td>
-									<td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top"></td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-				</table>
-				<table border='0' cellpadding='0' cellspacing='0' class='body' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;' bgcolor='#1d1333'>
-					<tr>
-						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
-						<td class='container' style='font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; max-width: 560px; width: 560px; margin: 0 auto; padding: 10px;' valign='top'>
-							<div class='content' style='box-sizing: border-box; display: block; max-width: 560px; margin: 0 auto; padding: 10px;'>
-								<br>
-								<table class='main' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; border-radius: 3px; background: #FFFFFF;' bgcolor='#FFFFFF'>
-									<tr>
-										<td class='wrapper' style='font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 50px;' valign='top'>
-											<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;'>
-												<tr>
-													<td style='line-height: 24px; font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'>
-														<h1 style='color: #392F54; font-family: sans-serif; font-weight: bold; line-height: 1.4; font-size: 24px; text-align: left; text-transform: capitalize; margin: 0 0 30px;' align='left'>
-															Hi %0%,
-														</h1>
-														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
-															This is an automated mail to inform you that the task <strong>'%1%'</strong> has been performed on the page <a style="color: #392F54; text-decoration: none; -ms-word-break: break-all; word-break: break-all;" href="http://%4%/#/content/content/edit/%5%"><strong>'%2%'</strong></a> by the user <strong>'%3%'</strong>
-														</p>
-														<table border='0' cellpadding='0' cellspacing='0' class='btn btn-primary' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;'>
-															<tbody>
-																<tr>
-																	<td align='left' style='font-family: sans-serif; font-size: 14px; vertical-align: top; padding-bottom: 15px;' valign='top'>
-																		<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'><tbody><tr>
-																			<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
-																				<a href='http://%4%/#/content/content/edit/%5%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>EDIT</a> </td> </tr></tbody></table>
-																	</td>
-																</tr>
-															</tbody>
-														</table>
-														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
-															<h3>Update summary:</h3>
-															%6%
-														</p>
-														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
-															Have a nice day!<br /><br />
-															Cheers from the Umbraco robot
-														</p>
-													</td>
-												</tr>
-											</table>
-										</td>
-									</tr>
-								</table>
-								<br><br><br>
-							</div>
-						</td>
-						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
-					</tr>
-				</table>
-			</body>
-		</html>
+    <key alias="mailBodyHtml"><![CDATA[
+        <html>
+			<head>
+				<meta name='viewport' content='width=device-width'>
+				<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
+			</head>
+			<body class='' style='font-family: sans-serif; -webkit-font-smoothing: antialiased; font-size: 14px; color: #392F54; line-height: 22px; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; background: #1d1333; margin: 0; padding: 0;' bgcolor='#1d1333'>
+				<style type='text/css'> @media only screen and (max-width: 620px) {table[class=body] h1 {font-size: 28px !important; margin-bottom: 10px !important; } table[class=body] .wrapper {padding: 32px !important; } table[class=body] .article {padding: 32px !important; } table[class=body] .content {padding: 24px !important; } table[class=body] .container {padding: 0 !important; width: 100% !important; } table[class=body] .main {border-left-width: 0 !important; border-radius: 0 !important; border-right-width: 0 !important; } table[class=body] .btn table {width: 100% !important; } table[class=body] .btn a {width: 100% !important; } table[class=body] .img-responsive {height: auto !important; max-width: 100% !important; width: auto !important; } } .btn-primary table td:hover {background-color: #34495e !important; } .btn-primary a:hover {background-color: #34495e !important; border-color: #34495e !important; } .btn  a:visited {color:#FFFFFF;} </style>
+				<table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;" bgcolor="#1d1333">
+					<tr>
+						<td style="font-family: sans-serif; font-size: 14px; vertical-align: top; padding: 24px;" valign="top">
+							<table style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
+								<tr>
+									<td background="https://umbraco.com/umbraco/assets/img/application/logo.png" bgcolor="#1d1333" width="28" height="28" valign="top" style="font-family: sans-serif; font-size: 14px; vertical-align: top;">
+										<!--[if gte mso 9]> <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="width:30px;height:30px;"> <v:fill type="tile" src="https://umbraco.com/umbraco/assets/img/application/logo.png" color="#1d1333" /> <v:textbox inset="0,0,0,0"> <![endif]-->
+										<div> </div>
+										<!--[if gte mso 9]> </v:textbox> </v:rect> <![endif]-->
+									</td>
+									<td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top"></td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+				</table>
+				<table border='0' cellpadding='0' cellspacing='0' class='body' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;' bgcolor='#1d1333'>
+					<tr>
+						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
+						<td class='container' style='font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; max-width: 560px; width: 560px; margin: 0 auto; padding: 10px;' valign='top'>
+							<div class='content' style='box-sizing: border-box; display: block; max-width: 560px; margin: 0 auto; padding: 10px;'>
+								<br>
+								<table class='main' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; border-radius: 3px; background: #FFFFFF;' bgcolor='#FFFFFF'>
+									<tr>
+										<td class='wrapper' style='font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 50px;' valign='top'>
+											<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;'>
+												<tr>
+													<td style='line-height: 24px; font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'>
+														<h1 style='color: #392F54; font-family: sans-serif; font-weight: bold; line-height: 1.4; font-size: 24px; text-align: left; text-transform: capitalize; margin: 0 0 30px;' align='left'>
+															Hi %0%,
+														</h1>
+														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+															This is an automated mail to inform you that the task <strong>'%1%'</strong> has been performed on the page <a style="color: #392F54; text-decoration: none; -ms-word-break: break-all; word-break: break-all;" href="http://%4%/#/content/content/edit/%5%"><strong>'%2%'</strong></a> by the user <strong>'%3%'</strong>
+														</p>
+														<table border='0' cellpadding='0' cellspacing='0' class='btn btn-primary' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;'>
+															<tbody>
+																<tr>
+																	<td align='left' style='font-family: sans-serif; font-size: 14px; vertical-align: top; padding-bottom: 15px;' valign='top'>
+																		<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'><tbody><tr>
+																			<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
+																				<a href='http://%4%/#/content/content/edit/%5%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>EDIT</a> </td> </tr></tbody></table>
+																	</td>
+																</tr>
+															</tbody>
+														</table>
+														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+															<h3>Update summary:</h3>
+															%6%
+														</p>
+														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+															Have a nice day!<br /><br />
+															Cheers from the Umbraco robot
+														</p>
+													</td>
+												</tr>
+											</table>
+										</td>
+									</tr>
+								</table>
+								<br><br><br>
+							</div>
+						</td>
+						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
+					</tr>
+				</table>
+			</body>
+		</html>
 	]]></key>
-    <key alias="mailBodyVariantHtmlSummary"><![CDATA[<p>The following languages have been modified:</p>
-        %0%
+    <key alias="mailBodyVariantHtmlSummary"><![CDATA[<p>The following languages have been modified:</p>
+        %0%
     ]]></key>
     <key alias="mailSubject">[%0%] Notification about %1% performed on %2%</key>
     <key alias="notifications">Notifications</key>
@@ -1126,9 +1126,9 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="actions">Actions</key>
     <key alias="created">Created</key>
     <key alias="createPackage">Create package</key>
-    <key alias="chooseLocalPackageText"><![CDATA[
-      Choose Package from your machine, by clicking the Browse<br />
-         button and locating the package. Umbraco packages usually have a ".umb" or ".zip" extension.
+    <key alias="chooseLocalPackageText"><![CDATA[
+      Choose Package from your machine, by clicking the Browse<br />
+         button and locating the package. Umbraco packages usually have a ".umb" or ".zip" extension.
       ]]></key>
     <key alias="deletewarning">This will delete the package</key>
     <key alias="dropHere">Drop to upload</key>
@@ -1184,7 +1184,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="packageMetaData">Package meta data</key>
     <key alias="packageName">Package name</key>
     <key alias="packageNoItemsHeader">Package doesn't contain any items</key>
-    <key alias="packageNoItemsText"><![CDATA[This package file doesn't contain any items to uninstall.<br/><br/>
+    <key alias="packageNoItemsText"><![CDATA[This package file doesn't contain any items to uninstall.<br/><br/>
       You can safely remove this from the system by clicking "uninstall package" below.]]></key>
     <key alias="packageOptions">Package options</key>
     <key alias="packageReadme">Package readme</key>
@@ -1193,8 +1193,8 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="packageUninstalledHeader">Package was uninstalled</key>
     <key alias="packageUninstalledText">The package was successfully uninstalled</key>
     <key alias="packageUninstallHeader">Uninstall package</key>
-    <key alias="packageUninstallText"><![CDATA[You can unselect items you do not wish to remove, at this time, below. When you click "confirm uninstall" all checked-off items will be removed.<br />
-      <span style="color: Red; font-weight: bold;">Notice:</span> any documents, media etc depending on the items you remove, will stop working, and could lead to system instability,
+    <key alias="packageUninstallText"><![CDATA[You can unselect items you do not wish to remove, at this time, below. When you click "confirm uninstall" all checked-off items will be removed.<br />
+      <span style="color: Red; font-weight: bold;">Notice:</span> any documents, media etc depending on the items you remove, will stop working, and could lead to system instability,
       so uninstall with caution. If in doubt, contact the package author.]]></key>
     <key alias="packageVersion">Package version</key>
     <key alias="packageAlreadyInstalled">Package already installed</key>
@@ -1234,20 +1234,20 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="paMembersHelp">If you wish to grant access to specific members</key>
   </area>
   <area alias="publish">
-    <key alias="contentPublishedFailedAwaitingRelease"><![CDATA[
-      %0% could not be published because the item is scheduled for release.
+    <key alias="contentPublishedFailedAwaitingRelease"><![CDATA[
+      %0% could not be published because the item is scheduled for release.
     ]]></key>
-    <key alias="contentPublishedFailedExpired"><![CDATA[
-      %0% could not be published because the item has expired.
+    <key alias="contentPublishedFailedExpired"><![CDATA[
+      %0% could not be published because the item has expired.
     ]]></key>
-    <key alias="contentPublishedFailedInvalid"><![CDATA[
-      %0% could not be published because these properties:  %1%  did not pass validation rules.
+    <key alias="contentPublishedFailedInvalid"><![CDATA[
+      %0% could not be published because these properties:  %1%  did not pass validation rules.
     ]]></key>
-    <key alias="contentPublishedFailedByEvent"><![CDATA[
-      %0% could not be published, a 3rd party add-in cancelled the action.
+    <key alias="contentPublishedFailedByEvent"><![CDATA[
+      %0% could not be published, a 3rd party add-in cancelled the action.
     ]]></key>
-    <key alias="contentPublishedFailedByParent"><![CDATA[
-      %0% can not be published, because a parent page is not published.
+    <key alias="contentPublishedFailedByParent"><![CDATA[
+      %0% can not be published, because a parent page is not published.
     ]]></key>
     <key alias="contentPublishedFailedByMissingName"><![CDATA[%0% can not be published, because its missing a name.]]></key>
     <key alias="includeUnpublished">Include unpublished subpages</key>
@@ -1256,8 +1256,8 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="nodePublish">%0% has been published</key>
     <key alias="nodePublishAll">%0% and subpages have been published</key>
     <key alias="publishAll">Publish %0% and all its subpages</key>
-    <key alias="publishHelp"><![CDATA[Click <em>Publish</em> to publish <strong>%0%</strong> and thereby making its content publicly available.<br/><br />
-      You can publish this page and all its subpages by checking <em>Include unpublished subpages</em> below.
+    <key alias="publishHelp"><![CDATA[Click <em>Publish</em> to publish <strong>%0%</strong> and thereby making its content publicly available.<br/><br />
+      You can publish this page and all its subpages by checking <em>Include unpublished subpages</em> below.
       ]]></key>
   </area>
   <area alias="colorpicker">
@@ -1465,20 +1465,20 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="mastertemplate">Master template</key>
     <key alias="noMaster">No master</key>
     <key alias="renderBody">Render child template</key>
-    <key alias="renderBodyDesc"><![CDATA[
-     Renders the contents of a child template, by inserting a
-     <code>@RenderBody()</code> placeholder.
+    <key alias="renderBodyDesc"><![CDATA[
+     Renders the contents of a child template, by inserting a
+     <code>@RenderBody()</code> placeholder.
       ]]></key>
     <key alias="defineSection">Define a named section</key>
-    <key alias="defineSectionDesc"><![CDATA[
-         Defines a part of your template as a named section by wrapping it in
-          <code>@section { ... }</code>. This can be rendered in a
-          specific area of the parent of this template, by using <code>@RenderSection</code>.
+    <key alias="defineSectionDesc"><![CDATA[
+         Defines a part of your template as a named section by wrapping it in
+          <code>@section { ... }</code>. This can be rendered in a
+          specific area of the parent of this template, by using <code>@RenderSection</code>.
       ]]></key>
     <key alias="renderSection">Render a named section</key>
-    <key alias="renderSectionDesc"><![CDATA[
-      Renders a named area of a child template, by inserting a <code>@RenderSection(name)</code> placeholder.
-      This renders an area of a child template which is wrapped in a corresponding <code>@section [name]{ ... }</code> definition.
+    <key alias="renderSectionDesc"><![CDATA[
+      Renders a named area of a child template, by inserting a <code>@RenderSection(name)</code> placeholder.
+      This renders an area of a child template which is wrapped in a corresponding <code>@section [name]{ ... }</code> definition.
       ]]></key>
     <key alias="sectionName">Section Name</key>
     <key alias="sectionMandatory">Section is mandatory</key>
@@ -1684,20 +1684,20 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="DownloadXmlDTD">Download XML DTD</key>
     <key alias="fields">Fields</key>
     <key alias="includeSubpages">Include subpages</key>
-    <key alias="mailBody"><![CDATA[
-      Hi %0%
-
-      This is an automated mail to inform you that the document '%1%'
-      has been requested for translation into '%5%' by %2%.
-
-      Go to http://%3%/translation/details.aspx?id=%4% to edit.
-
-      Or log into Umbraco to get an overview of your translation tasks
-      http://%3%
-
-      Have a nice day!
-
-      Cheers from the Umbraco robot
+    <key alias="mailBody"><![CDATA[
+      Hi %0%
+
+      This is an automated mail to inform you that the document '%1%'
+      has been requested for translation into '%5%' by %2%.
+
+      Go to http://%3%/translation/details.aspx?id=%4% to edit.
+
+      Or log into Umbraco to get an overview of your translation tasks
+      http://%3%
+
+      Have a nice day!
+
+      Cheers from the Umbraco robot
     ]]></key>
     <key alias="noTranslators">No translator users found. Please create a translator user before you start sending content to translation</key>
     <key alias="pageHasBeenSendToTranslation">The page '%0%' has been send to translation</key>
@@ -1846,96 +1846,96 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="sendInvite">Send invite</key>
     <key alias="backToUsers">Back to users</key>
     <key alias="inviteEmailCopySubject">Umbraco: Invitation</key>
-    <key alias="inviteEmailCopyFormat"><![CDATA[
-        <html>
-			<head>
-				<meta name='viewport' content='width=device-width'>
-				<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
-			</head>
-			<body class='' style='font-family: sans-serif; -webkit-font-smoothing: antialiased; font-size: 14px; color: #392F54; line-height: 22px; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; background: #1d1333; margin: 0; padding: 0;' bgcolor='#1d1333'>
-				<style type='text/css'> @media only screen and (max-width: 620px) {table[class=body] h1 {font-size: 28px !important; margin-bottom: 10px !important; } table[class=body] .wrapper {padding: 32px !important; } table[class=body] .article {padding: 32px !important; } table[class=body] .content {padding: 24px !important; } table[class=body] .container {padding: 0 !important; width: 100% !important; } table[class=body] .main {border-left-width: 0 !important; border-radius: 0 !important; border-right-width: 0 !important; } table[class=body] .btn table {width: 100% !important; } table[class=body] .btn a {width: 100% !important; } table[class=body] .img-responsive {height: auto !important; max-width: 100% !important; width: auto !important; } } .btn-primary table td:hover {background-color: #34495e !important; } .btn-primary a:hover {background-color: #34495e !important; border-color: #34495e !important; } .btn  a:visited {color:#FFFFFF;} </style>
-				<table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;" bgcolor="#1d1333">
-					<tr>
-						<td style="font-family: sans-serif; font-size: 14px; vertical-align: top; padding: 24px;" valign="top">
-							<table style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
-								<tr>
-									<td background="https://umbraco.com/umbraco/assets/img/application/logo.png" bgcolor="#1d1333" width="28" height="28" valign="top" style="font-family: sans-serif; font-size: 14px; vertical-align: top;">
-										<!--[if gte mso 9]> <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="width:30px;height:30px;"> <v:fill type="tile" src="https://umbraco.com/umbraco/assets/img/application/logo.png" color="#1d1333" /> <v:textbox inset="0,0,0,0"> <![endif]-->
-										<div> </div>
-										<!--[if gte mso 9]> </v:textbox> </v:rect> <![endif]-->
-									</td>
-									<td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top"></td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-				</table>
-				<table border='0' cellpadding='0' cellspacing='0' class='body' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;' bgcolor='#1d1333'>
-					<tr>
-						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
-						<td class='container' style='font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; max-width: 560px; width: 560px; margin: 0 auto; padding: 10px;' valign='top'>
-							<div class='content' style='box-sizing: border-box; display: block; max-width: 560px; margin: 0 auto; padding: 10px;'>
-								<br>
-								<table class='main' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; border-radius: 3px; background: #FFFFFF;' bgcolor='#FFFFFF'>
-									<tr>
-										<td class='wrapper' style='font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 50px;' valign='top'>
-											<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;'>
-												<tr>
-													<td style='line-height: 24px; font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'>
-														<h1 style='color: #392F54; font-family: sans-serif; font-weight: bold; line-height: 1.4; font-size: 24px; text-align: left; text-transform: capitalize; margin: 0 0 30px;' align='left'>
-															Hi %0%,
-														</h1>
-														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
-															You have been invited by <a href="mailto:%4%" style="text-decoration: underline; color: #392F54; -ms-word-break: break-all; word-break: break-all;">%1%</a> to the Umbraco Back Office.
-														</p>
-														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
-															Message from <a href="mailto:%1%" style="text-decoration: none; color: #392F54; -ms-word-break: break-all; word-break: break-all;">%1%</a>:
-															<br/>
-															<em>%2%</em>
-														</p>
-														<table border='0' cellpadding='0' cellspacing='0' class='btn btn-primary' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;'>
-															<tbody>
-																<tr>
-																	<td align='left' style='font-family: sans-serif; font-size: 14px; vertical-align: top; padding-bottom: 15px;' valign='top'>
-																		<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'>
-																			<tbody>
-																				<tr>
-																					<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
-																						<a href='%3%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
-																							Click this link to accept the invite
-																						</a>
-																					</td>
-																				</tr>
-																			</tbody>
-																		</table>
-																	</td>
-																</tr>
-															</tbody>
-														</table>
-														<p style='max-width: 400px; display: block; color: #392F54; font-family: sans-serif; font-size: 14px; line-height: 20px; font-weight: normal; margin: 15px 0;'>If you cannot click on the link, copy and paste this URL into your browser window:</p>
-															<table border='0' cellpadding='0' cellspacing='0'>
-																<tr>
-																	<td style='-ms-word-break: break-all; word-break: break-all; font-family: sans-serif; font-size: 11px; line-height:14px;'>
-																		<font style="-ms-word-break: break-all; word-break: break-all; font-size: 11px; line-height:14px;">
-																			<a style='-ms-word-break: break-all; word-break: break-all; color: #392F54; text-decoration: underline; font-size: 11px; line-height:15px;' href='%3%'>%3%</a>
-																		</font>
-																	</td>
-																</tr>
-															</table>
-														</p>
-													</td>
-												</tr>
-											</table>
-										</td>
-									</tr>
-								</table>
-								<br><br><br>
-							</div>
-						</td>
-						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
-					</tr>
-				</table>
-			</body>
+    <key alias="inviteEmailCopyFormat"><![CDATA[
+        <html>
+			<head>
+				<meta name='viewport' content='width=device-width'>
+				<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
+			</head>
+			<body class='' style='font-family: sans-serif; -webkit-font-smoothing: antialiased; font-size: 14px; color: #392F54; line-height: 22px; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; background: #1d1333; margin: 0; padding: 0;' bgcolor='#1d1333'>
+				<style type='text/css'> @media only screen and (max-width: 620px) {table[class=body] h1 {font-size: 28px !important; margin-bottom: 10px !important; } table[class=body] .wrapper {padding: 32px !important; } table[class=body] .article {padding: 32px !important; } table[class=body] .content {padding: 24px !important; } table[class=body] .container {padding: 0 !important; width: 100% !important; } table[class=body] .main {border-left-width: 0 !important; border-radius: 0 !important; border-right-width: 0 !important; } table[class=body] .btn table {width: 100% !important; } table[class=body] .btn a {width: 100% !important; } table[class=body] .img-responsive {height: auto !important; max-width: 100% !important; width: auto !important; } } .btn-primary table td:hover {background-color: #34495e !important; } .btn-primary a:hover {background-color: #34495e !important; border-color: #34495e !important; } .btn  a:visited {color:#FFFFFF;} </style>
+				<table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;" bgcolor="#1d1333">
+					<tr>
+						<td style="font-family: sans-serif; font-size: 14px; vertical-align: top; padding: 24px;" valign="top">
+							<table style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
+								<tr>
+									<td background="https://umbraco.com/umbraco/assets/img/application/logo.png" bgcolor="#1d1333" width="28" height="28" valign="top" style="font-family: sans-serif; font-size: 14px; vertical-align: top;">
+										<!--[if gte mso 9]> <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="width:30px;height:30px;"> <v:fill type="tile" src="https://umbraco.com/umbraco/assets/img/application/logo.png" color="#1d1333" /> <v:textbox inset="0,0,0,0"> <![endif]-->
+										<div> </div>
+										<!--[if gte mso 9]> </v:textbox> </v:rect> <![endif]-->
+									</td>
+									<td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top"></td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+				</table>
+				<table border='0' cellpadding='0' cellspacing='0' class='body' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;' bgcolor='#1d1333'>
+					<tr>
+						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
+						<td class='container' style='font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; max-width: 560px; width: 560px; margin: 0 auto; padding: 10px;' valign='top'>
+							<div class='content' style='box-sizing: border-box; display: block; max-width: 560px; margin: 0 auto; padding: 10px;'>
+								<br>
+								<table class='main' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; border-radius: 3px; background: #FFFFFF;' bgcolor='#FFFFFF'>
+									<tr>
+										<td class='wrapper' style='font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 50px;' valign='top'>
+											<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;'>
+												<tr>
+													<td style='line-height: 24px; font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'>
+														<h1 style='color: #392F54; font-family: sans-serif; font-weight: bold; line-height: 1.4; font-size: 24px; text-align: left; text-transform: capitalize; margin: 0 0 30px;' align='left'>
+															Hi %0%,
+														</h1>
+														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+															You have been invited by <a href="mailto:%4%" style="text-decoration: underline; color: #392F54; -ms-word-break: break-all; word-break: break-all;">%1%</a> to the Umbraco Back Office.
+														</p>
+														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+															Message from <a href="mailto:%1%" style="text-decoration: none; color: #392F54; -ms-word-break: break-all; word-break: break-all;">%1%</a>:
+															<br/>
+															<em>%2%</em>
+														</p>
+														<table border='0' cellpadding='0' cellspacing='0' class='btn btn-primary' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;'>
+															<tbody>
+																<tr>
+																	<td align='left' style='font-family: sans-serif; font-size: 14px; vertical-align: top; padding-bottom: 15px;' valign='top'>
+																		<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'>
+																			<tbody>
+																				<tr>
+																					<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
+																						<a href='%3%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
+																							Click this link to accept the invite
+																						</a>
+																					</td>
+																				</tr>
+																			</tbody>
+																		</table>
+																	</td>
+																</tr>
+															</tbody>
+														</table>
+														<p style='max-width: 400px; display: block; color: #392F54; font-family: sans-serif; font-size: 14px; line-height: 20px; font-weight: normal; margin: 15px 0;'>If you cannot click on the link, copy and paste this URL into your browser window:</p>
+															<table border='0' cellpadding='0' cellspacing='0'>
+																<tr>
+																	<td style='-ms-word-break: break-all; word-break: break-all; font-family: sans-serif; font-size: 11px; line-height:14px;'>
+																		<font style="-ms-word-break: break-all; word-break: break-all; font-size: 11px; line-height:14px;">
+																			<a style='-ms-word-break: break-all; word-break: break-all; color: #392F54; text-decoration: underline; font-size: 11px; line-height:15px;' href='%3%'>%3%</a>
+																		</font>
+																	</td>
+																</tr>
+															</table>
+														</p>
+													</td>
+												</tr>
+											</table>
+										</td>
+									</tr>
+								</table>
+								<br><br><br>
+							</div>
+						</td>
+						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
+					</tr>
+				</table>
+			</body>
     </html>]]></key>
     <key alias="invite">Invite</key>
     <key alias="defaultInvitationMessage">Resending invitation...</key>
@@ -1972,19 +1972,19 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="customValidation">Custom validation</key>
   </area>
   <area alias="healthcheck">
-    <!-- The following keys get these tokens passed in:
-	     0: Current value
-		   1: Recommended value
-		   2: XPath
-		   3: Configuration file path
+    <!-- The following keys get these tokens passed in:
+	     0: Current value
+		   1: Recommended value
+		   2: XPath
+		   3: Configuration file path
 	  -->
     <key alias="checkSuccessMessage">Value is set to the recommended value: '%0%'.</key>
     <key alias="rectifySuccessMessage">Value was set to '%1%' for XPath '%2%' in configuration file '%3%'.</key>
     <key alias="checkErrorMessageDifferentExpectedValue">Expected value '%1%' for '%2%' in configuration file '%3%', but found '%0%'.</key>
     <key alias="checkErrorMessageUnexpectedValue">Found unexpected value '%0%' for '%2%' in configuration file '%3%'.</key>
-    <!-- The following keys get these tokens passed in:
-	     0: Current value
-		   1: Recommended value
+    <!-- The following keys get these tokens passed in:
+	     0: Current value
+		   1: Recommended value
 	  -->
     <key alias="customErrorsCheckSuccessMessage">Custom errors are set to '%0%'.</key>
     <key alias="customErrorsCheckErrorMessage">Custom errors are currently set to '%0%'. It is recommended to set this to '%1%' before go live.</key>
@@ -1992,10 +1992,10 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="macroErrorModeCheckSuccessMessage">MacroErrors are set to '%0%'.</key>
     <key alias="macroErrorModeCheckErrorMessage">MacroErrors are set to '%0%' which will prevent some or all pages in your site from loading completely if there are any errors in macros. Rectifying this will set the value to '%1%'.</key>
     <key alias="macroErrorModeCheckRectifySuccessMessage">MacroErrors are now set to '%0%'.</key>
-    <!-- The following keys get these tokens passed in:
-	     0: Current value
-		   1: Recommended value
-		   2: Server version
+    <!-- The following keys get these tokens passed in:
+	     0: Current value
+		   1: Recommended value
+		   2: Server version
 	  -->
     <key alias="trySkipIisCustomErrorsCheckSuccessMessage">Try Skip IIS Custom Errors is set to '%0%' and you're using IIS version '%1%'.</key>
     <key alias="trySkipIisCustomErrorsCheckErrorMessage">Try Skip IIS Custom Errors is currently '%0%'. It is recommended to set this to '%1%' for your IIS version (%2%).</key>
@@ -2031,14 +2031,14 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="traceModeCheckErrorMessage">Trace mode is currently enabled. It is recommended to disable this setting before go live.</key>
     <key alias="traceModeCheckRectifySuccessMessage">Trace mode successfully disabled.</key>
     <key alias="folderPermissionsCheckMessage">All folders have the correct permissions set.</key>
-    <!-- The following keys get these tokens passed in:
-	    0: Comma delimitted list of failed folder paths
+    <!-- The following keys get these tokens passed in:
+	    0: Comma delimitted list of failed folder paths
   	-->
     <key alias="requiredFolderPermissionFailed"><![CDATA[The following folders must be set up with modify permissions but could not be acccessed: <strong>%0%</strong>.]]></key>
     <key alias="optionalFolderPermissionFailed"><![CDATA[The following folders must be set up with modify permissions for certain Umbraco operations to function but could not be acccessed: <strong>%0%</strong>. If they aren't being written to no action need be taken.]]></key>
     <key alias="filePermissionsCheckMessage">All files have the correct permissions set.</key>
-    <!-- The following keys get these tokens passed in:
-	    0: Comma delimitted list of failed folder paths
+    <!-- The following keys get these tokens passed in:
+	    0: Comma delimitted list of failed folder paths
   	-->
     <key alias="requiredFilePermissionFailed"><![CDATA[The following files must be set up with write permissions but could not be acccessed: <strong>%0%</strong>.]]></key>
     <key alias="optionalFilePermissionFailed"><![CDATA[The following files must be set up with write permissions for certain Umbraco operations to function but could not be acccessed: <strong>%0%</strong>. If they aren't being written to no action need be taken.]]></key>
@@ -2060,8 +2060,8 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="xssProtectionCheckHeaderNotFound"><![CDATA[The header <strong>X-XSS-Protection</strong> was not found.]]></key>
     <key alias="xssProtectionSetHeaderInConfigDescription">Adds the header 'X-XSS-Protection' with the value '1; mode=block' to the httpProtocol/customHeaders section of web.config. </key>
     <key alias="xssProtectionSetHeaderInConfigSuccess">The X-XSS-Protection header has been added to your web.config file.</key>
-    <!-- The following key get these tokens passed in:
-	    0: Comma delimitted list of headers found
+    <!-- The following key get these tokens passed in:
+	    0: Comma delimitted list of headers found
   	-->
     <key alias="excessiveHeadersFound"><![CDATA[The following headers revealing information about the website technology were found: <strong>%0%</strong>.]]></key>
     <key alias="excessiveHeadersNotFound">No headers revealing information about the website technology were found.</key>
@@ -2139,6 +2139,10 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="goBack">Go back</key>
     <key alias="activeListLayout">Active layout:</key>
     <key alias="jumpTo">Jump to</key>
-    <key alias="group">group</key>    
+    <key alias="group">group</key>
+    <key alias="passed">passed</key>
+    <key alias="warning">warning</key>
+    <key alias="failed">failed</key>
+    <key alias="suggestion">suggestion</key>
   </area>
 </language>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index faf336d94d..1236d057ed 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -1,2158 +1,2162 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<language alias="en_us" intName="English (US)" localName="English (US)" lcid="" culture="en-US">
-  <creator>
-    <name>The Umbraco community</name>
-    <link>https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files</link>
-  </creator>
-  <area alias="actions">
-    <key alias="assignDomain">Culture and Hostnames</key>
-    <key alias="auditTrail">Audit Trail</key>
-    <key alias="browse">Browse Node</key>
-    <key alias="changeDocType">Change Document Type</key>
-    <key alias="copy">Copy</key>
-    <key alias="create">Create</key>
-    <key alias="export">Export</key>
-    <key alias="createPackage">Create Package</key>
-    <key alias="createGroup">Create group</key>
-    <key alias="delete">Delete</key>
-    <key alias="disable">Disable</key>
-    <key alias="emptyRecycleBin">Empty recycle bin</key>
-    <key alias="enable">Enable</key>
-    <key alias="exportDocumentType">Export Document Type</key>
-    <key alias="importDocumentType">Import Document Type</key>
-    <key alias="importPackage">Import Package</key>
-    <key alias="liveEdit">Edit in Canvas</key>
-    <key alias="logout">Exit</key>
-    <key alias="move">Move</key>
-    <key alias="notify">Notifications</key>
-    <key alias="protect">Public access</key>
-    <key alias="publish">Publish</key>
-    <key alias="unpublish">Unpublish</key>
-    <key alias="refreshNode">Reload</key>
-    <key alias="republish">Republish entire site</key>
-    <key alias="rename" version="7.3.0">Rename</key>
-    <key alias="restore" version="7.3.0">Restore</key>
-    <key alias="SetPermissionsForThePage">Set permissions for the page %0%</key>
-    <key alias="chooseWhereToCopy">Choose where to copy</key>
-    <key alias="chooseWhereToMove">Choose where to move</key>
-    <key alias="toInTheTreeStructureBelow">to in the tree structure below</key>
-    <key alias="wasMovedTo">was moved to</key>
-    <key alias="wasCopiedTo">was copied to</key>
-    <key alias="wasDeleted">was deleted</key>
-    <key alias="rights">Permissions</key>
-    <key alias="rollback">Rollback</key>
-    <key alias="sendtopublish">Send To Publish</key>
-    <key alias="sendToTranslate">Send To Translation</key>
-    <key alias="setGroup">Set group</key>
-    <key alias="sort">Sort</key>
-    <key alias="translate">Translate</key>
-    <key alias="update">Update</key>
-    <key alias="setPermissions">Set permissions</key>
-    <key alias="unlock">Unlock</key>
-    <key alias="createblueprint">Create Content Template</key>
-    <key alias="resendInvite">Resend Invitation</key>
-  </area>
-  <area alias="actionCategories">
-    <key alias="content">Content</key>
-    <key alias="administration">Administration</key>
-    <key alias="structure">Structure</key>
-    <key alias="other">Other</key>
-  </area>
-  <area alias="actionDescriptions">
-    <key alias="assignDomain">Allow access to assign culture and hostnames</key>
-    <key alias="auditTrail">Allow access to view a node's history log</key>
-    <key alias="browse">Allow access to view a node</key>
-    <key alias="changeDocType">Allow access to change document type for a node</key>
-    <key alias="copy">Allow access to copy a node</key>
-    <key alias="create">Allow access to create nodes</key>
-    <key alias="delete">Allow access to delete nodes</key>
-    <key alias="move">Allow access to move a node</key>
-    <key alias="protect">Allow access to set and change public access for a node</key>
-    <key alias="publish">Allow access to publish a node</key>
-    <key alias="unpublish">Allow access to unpublish a node</key>
-    <key alias="rights">Allow access to change permissions for a node</key>
-    <key alias="rollback">Allow access to roll back a node to a previous state</key>
-    <key alias="sendtopublish">Allow access to send a node for approval before publishing</key>
-    <key alias="sendToTranslate">Allow access to send a node for translation</key>
-    <key alias="sort">Allow access to change the sort order for nodes</key>
-    <key alias="translate">Allow access to translate a node</key>
-    <key alias="update">Allow access to save a node</key>
-    <key alias="createblueprint">Allow access to create a Content Template</key>
-  </area>
-  <area alias="apps">
-    <key alias="umbContent">Content</key>
-    <key alias="umbInfo">Info</key>
-  </area>
-  <area alias="assignDomain">
-    <key alias="permissionDenied">Permission denied.</key>
-    <key alias="addNew">Add new Domain</key>
-    <key alias="remove">remove</key>
-    <key alias="invalidNode">Invalid node.</key>
-    <key alias="invalidDomain">One or more domains have an invalid format.</key>
-    <key alias="duplicateDomain">Domain has already been assigned.</key>
-    <key alias="language">Language</key>
-    <key alias="domain">Domain</key>
-    <key alias="domainCreated">New domain '%0%' has been created</key>
-    <key alias="domainDeleted">Domain '%0%' is deleted</key>
-    <key alias="domainExists">Domain '%0%' has already been assigned</key>
-    <key alias="domainUpdated">Domain '%0%' has been updated</key>
-    <key alias="orEdit">Edit Current Domains</key>
-    <key alias="domainHelpWithVariants">
-    	<![CDATA[Valid domain names are: "example.com", "www.example.com", "example.com:8080", or "https://www.example.com/".
-     Furthermore also one-level paths in domains are supported, eg. "example.com/en" or "/en".]]></key>
-    <key alias="inherit">Inherit</key>
-    <key alias="setLanguage">Culture</key>
-    <key alias="setLanguageHelp"><![CDATA[Set the culture for nodes below the current node,<br /> or inherit culture from parent nodes. Will also apply<br />
-      to the current node, unless a domain below applies too.]]></key>
-    <key alias="setDomains">Domains</key>
-  </area>
-  <area alias="buttons">
-    <key alias="clearSelection">Clear selection</key>
-    <key alias="select">Select</key>
-    <key alias="somethingElse">Do something else</key>
-    <key alias="bold">Bold</key>
-    <key alias="deindent">Cancel Paragraph Indent</key>
-    <key alias="formFieldInsert">Insert form field</key>
-    <key alias="graphicHeadline">Insert graphic headline</key>
-    <key alias="htmlEdit">Edit Html</key>
-    <key alias="indent">Indent Paragraph</key>
-    <key alias="italic">Italic</key>
-    <key alias="justifyCenter">Center</key>
-    <key alias="justifyLeft">Justify Left</key>
-    <key alias="justifyRight">Justify Right</key>
-    <key alias="linkInsert">Insert Link</key>
-    <key alias="linkLocal">Insert local link (anchor)</key>
-    <key alias="listBullet">Bullet List</key>
-    <key alias="listNumeric">Numeric List</key>
-    <key alias="macroInsert">Insert macro</key>
-    <key alias="pictureInsert">Insert picture</key>
-    <key alias="publishAndClose">Publish and close</key>
-    <key alias="publishDescendants">Publish with descendants</key>
-    <key alias="relations">Edit relations</key>
-    <key alias="returnToList">Return to list</key>
-    <key alias="save">Save</key>
-    <key alias="saveAndClose">Save and close</key>
-    <key alias="saveAndPublish">Save and publish</key>
-    <key alias="saveAndSchedule">Save and schedule</key>
-    <key alias="saveToPublish">Send for approval</key>
-    <key alias="saveListView">Save list view</key>
-    <key alias="schedulePublish">Schedule</key>
-    <key alias="showPage">Preview</key>
-    <key alias="showPageDisabled">Preview is disabled because there's no template assigned</key>
-    <key alias="styleChoose">Choose style</key>
-    <key alias="styleShow">Show styles</key>
-    <key alias="tableInsert">Insert table</key>
-    <key alias="generateModelsAndClose">Generate models and close</key>
-    <key alias="saveAndGenerateModels">Save and generate models</key>
-    <key alias="undo">Undo</key>
-    <key alias="redo">Redo</key>
-    <key alias="rollback">Rollback</key>
-    <key alias="deleteTag">Delete tag</key>
-    <key alias="confirmActionCancel">Cancel</key>
-    <key alias="confirmActionConfirm">Confirm</key>
-	<key alias="morePublishingOptions">More publishing options</key>
-  </area>
-  <area alias="auditTrails">
-    <key alias="atViewingFor">Viewing for</key>
-    <key alias="delete">Content deleted</key>
-    <key alias="unpublish">Content unpublished</key>
-    <key alias="unpublishvariant">Content unpublished for languages: %0% </key>
-    <key alias="publish">Content published</key>
-    <key alias="publishvariant">Content published for languages: %0% </key>
-    <key alias="save">Content saved</key>
-    <key alias="savevariant">Content saved for languages: %0%</key>
-    <key alias="move">Content moved</key>
-    <key alias="copy">Content copied</key>
-    <key alias="rollback">Content rolled back</key>
-    <key alias="sendtopublish">Content sent for publishing</key>
-    <key alias="sendtopublishvariant">Content sent for publishing for languages: %0%</key>
-    <key alias="sort">Sort child items performed by user</key>
-    <key alias="smallCopy">Copy</key>
-    <key alias="smallPublish">Publish</key>
-    <key alias="smallPublishVariant">Publish</key>
-    <key alias="smallMove">Move</key>
-    <key alias="smallSave">Save</key>
-    <key alias="smallSaveVariant">Save</key>
-    <key alias="smallDelete">Delete</key>
-    <key alias="smallUnpublish">Unpublish</key>
-    <key alias="smallUnpublishVariant">Unpublish</key>
-    <key alias="smallRollBack">Rollback</key>
-    <key alias="smallSendToPublish">Send To Publish</key>
-    <key alias="smallSendToPublishVariant">Send To Publish</key>
-    <key alias="smallSort">Sort</key>
-    <key alias="historyIncludingVariants">History (all variants)</key>
-  </area>
-  <area alias="changeDocType">
-    <key alias="changeDocTypeInstruction">To change the document type for the selected content, first select from the list of valid types for this location.</key>
-    <key alias="changeDocTypeInstruction2">Then confirm and/or amend the mapping of properties from the current type to the new, and click Save.</key>
-    <key alias="contentRepublished">The content has been re-published.</key>
-    <key alias="currentProperty">Current Property</key>
-    <key alias="currentType">Current type</key>
-    <key alias="docTypeCannotBeChanged">The document type cannot be changed, as there are no alternatives valid for this location.  An alternative will be valid if it is allowed under the parent of the selected content item and that all existing child content items are allowed to be created under it.</key>
-    <key alias="docTypeChanged">Document Type Changed</key>
-    <key alias="mapProperties">Map Properties</key>
-    <key alias="mapToProperty">Map to Property</key>
-    <key alias="newTemplate">New Template</key>
-    <key alias="newType">New Type</key>
-    <key alias="none">none</key>
-    <key alias="selectedContent">Content</key>
-    <key alias="selectNewDocType">Select New Document Type</key>
-    <key alias="successMessage">The document type of the selected content has been successfully changed to [new type] and the following properties mapped:</key>
-    <key alias="to">to</key>
-    <key alias="validationErrorPropertyWithMoreThanOneMapping">Could not complete property mapping as one or more properties have more than one mapping defined.</key>
-    <key alias="validDocTypesNote">Only alternate types valid for the current location are displayed.</key>
-  </area>
-  <area alias="codefile">
-    <key alias="createFolderFailedById">Failed to create a folder under parent with ID %0%</key>
-    <key alias="createFolderFailedByName">Failed to create a folder under parent with name %0%</key>
-    <key alias="createFolderIllegalChars">The folder name cannot contain illegal characters.</key>
-    <key alias="deleteItemFailed">Failed to delete item: %0%</key>
-  </area>
-  <area alias="content">
-    <key alias="isPublished" version="7.2">Is Published</key>
-    <key alias="about">About this page</key>
-    <key alias="alias">Alias</key>
-    <key alias="alternativeTextHelp">(how would you describe the picture over the phone)</key>
-    <key alias="alternativeUrls">Alternative Links</key>
-    <key alias="clickToEdit">Click to edit this item</key>
-    <key alias="createBy">Created by</key>
-    <key alias="createByDesc" version="7.0">Original author</key>
-    <key alias="updatedBy" version="7.0">Updated by</key>
-    <key alias="createDate">Created</key>
-    <key alias="createDateDesc" version="7.0">Date/time this document was created</key>
-    <key alias="documentType">Document Type</key>
-    <key alias="editing">Editing</key>
-    <key alias="expireDate">Remove at</key>
-    <key alias="itemChanged">This item has been changed after publication</key>
-    <key alias="itemNotPublished">This item is not published</key>
-    <key alias="lastPublished">Last published</key>
-    <key alias="noItemsToShow">There are no items to show</key>
-    <key alias="listViewNoItems" version="7.1.5">There are no items to show in the list.</key>
-    <key alias="listViewNoContent">No child items have been added</key>
-    <key alias="listViewNoMembers">No members have been added</key>
-    <key alias="mediatype">Media Type</key>
-    <key alias="mediaLinks">Link to media item(s)</key>
-    <key alias="membergroup">Member Group</key>
-    <key alias="memberrole">Role</key>
-    <key alias="membertype">Member Type</key>
-    <key alias="noChanges">No changes have been made</key>
-    <key alias="noDate">No date chosen</key>
-    <key alias="nodeName">Page title</key>
-    <key alias="noMediaLink">This media item has no link</key>
-    <key alias="noProperties">No content can be added for this item</key>
-    <key alias="otherElements">Properties</key>
-    <key alias="parentNotPublished">This document is published but is not visible because the parent '%0%' is unpublished</key>
-    <key alias="parentCultureNotPublished">This culture is published but is not visible because it is unpublished on parent '%0%'</key>
-    <key alias="parentNotPublishedAnomaly">This document is published but is not in the cache</key>
-    <key alias="getUrlException">Could not get the url</key>
-    <key alias="routeError">This document is published but its url would collide with content %0%</key>
-    <key alias="routeErrorCannotRoute">This document is published but its url cannot be routed</key>
-    <key alias="publish">Publish</key>
-    <key alias="published">Published</key>
-    <key alias="publishedPendingChanges">Published (pending changes)</key>&gt;
-    <key alias="publishStatus">Publication Status</key>
-    <key alias="publishDescendantsHelp"><![CDATA[Click <em>Publish with descendants</em> to publish <strong>%0%</strong> and all content items underneath and thereby making their content publicly available.]]></key>
-    <key alias="publishDescendantsWithVariantsHelp"><![CDATA[Click <em>Publish with descendants</em> to publish <strong>the selected languages</strong> and the same languages of content items underneath and thereby making their content publicly available.]]></key>
-    <key alias="releaseDate">Publish at</key>
-    <key alias="unpublishDate">Unpublish at</key>
-    <key alias="removeDate">Clear Date</key>
-    <key alias="setDate">Set date</key>
-    <key alias="sortDone">Sortorder is updated</key>
-    <key alias="sortHelp">To sort the nodes, simply drag the nodes or click one of the column headers. You can select multiple nodes by holding the "shift" or "control" key while selecting</key>
-    <key alias="statistics">Statistics</key>
-    <key alias="titleOptional">Title (optional)</key>
-    <key alias="altTextOptional">Alternative text (optional)</key>
-    <key alias="type">Type</key>
-    <key alias="unpublish">Unpublish</key>
-    <key alias="unpublished">Draft</key>
-    <key alias="notCreated">Not created</key>
-    <key alias="updateDate">Last edited</key>
-    <key alias="updateDateDesc" version="7.0">Date/time this document was edited</key>
-    <key alias="uploadClear">Remove file(s)</key>
-    <key alias="urls">Link to document</key>
-    <key alias="memberof">Member of group(s)</key>
-    <key alias="notmemberof">Not a member of group(s)</key>
-    <key alias="childItems" version="7.0">Child items</key>
-    <key alias="target" version="7.0">Target</key>
-    <key alias="scheduledPublishServerTime">This translates to the following time on the server:</key>
-    <key alias="scheduledPublishDocumentation"><![CDATA[<a href="https://our.umbraco.com/documentation/Getting-Started/Data/Scheduled-Publishing/#timezones" target="_blank">What does this mean?</a>]]></key>
-    <key alias="nestedContentDeleteItem">Are you sure you want to delete this item?</key>
-    <key alias="nestedContentEditorNotSupported">Property %0% uses editor %1% which is not supported by Nested Content.</key>
-    <key alias="nestedContentNoContentTypes">No content types are configured for this property.</key>
-    <key alias="nestedContentCopyAllItemsName">%0% from %1%</key>
-    <key alias="addTextBox">Add another text box</key>
-    <key alias="removeTextBox">Remove this text box</key>
-    <key alias="contentRoot">Content root</key>
-    <key alias="includeUnpublished">Include drafts: also publish unpublished content items.</key>
-    <key alias="isSensitiveValue">This value is hidden. If you need access to view this value please contact your website administrator.</key>
-    <key alias="isSensitiveValue_short">This value is hidden.</key>
-    <key alias="languagesToPublishForFirstTime">What languages would you like to publish? All languages with content are saved!</key>
-    <key alias="languagesToPublish">What languages would you like to publish?</key>
-    <key alias="languagesToSave">What languages would you like to save?</key>
-    <key alias="languagesToSaveForFirstTime">All languages with content are saved on creation!</key>
-    <key alias="languagesToSendForApproval">What languages would you like to send for approval?</key>
-    <key alias="languagesToSchedule">What languages would you like to schedule?</key>
-    <key alias="languagesToUnpublish">Select the languages to unpublish. Unpublishing a mandatory language will unpublish all languages.</key>
-    <key alias="publishedLanguages">Published Languages</key>
-    <key alias="unpublishedLanguages">Unpublished Languages</key>
-    <key alias="unmodifiedLanguages">Unmodified Languages</key>
-    <key alias="untouchedLanguagesForFirstTime">These languages haven't been created</key>
-    <key alias="readyToPublish">Ready to Publish?</key>
-    <key alias="readyToSave">Ready to Save?</key>
-    <key alias="sendForApproval">Send for approval</key>
-    <key alias="schedulePublishHelp">Select the date and time to publish and/or unpublish the content item.</key>
-    <key alias="createEmpty">Create new</key>
-    <key alias="createFromClipboard">Paste from clipboard</key>
-  </area>
-  <area alias="blueprints">
-    <key alias="createBlueprintFrom">Create a new Content Template from '%0%'</key>
-    <key alias="blankBlueprint">Blank</key>
-    <key alias="selectBlueprint">Select a Content Template</key>
-    <key alias="createdBlueprintHeading">Content Template created</key>
-    <key alias="createdBlueprintMessage">A Content Template was created from '%0%'</key>
-    <key alias="duplicateBlueprintMessage">Another Content Template with the same name already exists</key>
-    <key alias="blueprintDescription">A Content Template is predefined content that an editor can select to use as the basis for creating new content</key>
-  </area>
-  <area alias="media">
-    <key alias="clickToUpload">Click to upload</key>
-    <key alias="orClickHereToUpload">or click here to choose files</key>
-        <key alias="dragFilesHereToUpload">You can drag files here to upload.</key>
-    <key alias="disallowedFileType">Cannot upload this file, it does not have an approved file type</key>
-    <key alias="maxFileSize">Max file size is</key>
-    <key alias="mediaRoot">Media root</key>
-    <key alias="moveFailed">Failed to move media</key>
-    <key alias="moveToSameFolderFailed">Parent and destination folders cannot be the same</key>
-    <key alias="copyFailed">Failed to copy media</key>
-    <key alias="createFolderFailed">Failed to create a folder under parent id %0%</key>
-    <key alias="renameFolderFailed">Failed to rename the folder with id %0%</key>
-    <key alias="dragAndDropYourFilesIntoTheArea">Drag and drop your file(s) into the area</key>
-  </area>
-  <area alias="member">
-    <key alias="createNewMember">Create a new member</key>
-    <key alias="allMembers">All Members</key>
-    <key alias="memberGroupNoProperties">Member groups have no additional properties for editing.</key>
-  </area>
-  <area alias="create">
-    <key alias="chooseNode">Where do you want to create the new %0%</key>
-    <key alias="createUnder">Create an item under</key>
-    <key alias="createContentBlueprint">Select the document type you want to make a content template for</key>
-    <key alias="enterFolderName">Enter a folder name</key>
-    <key alias="updateData">Choose a type and a title</key>
-    <key alias="noDocumentTypes" version="7.0"><![CDATA[There are no allowed document types available for creating content here. You must enable these in <strong>Document Types</strong> within the <strong>Settings</strong> section, by editing the <strong>Allowed child node types</strong> under <strong>Permissions</strong>.]]></key>
-    <key alias="noDocumentTypesWithNoSettingsAccess">The selected page in the content tree doesn't allow for any pages to be created below it.</key>
-    <key alias="noDocumentTypesEditPermissions">Edit permissions for this document type</key>
-    <key alias="noMediaTypes" version="7.0"><![CDATA[There are no allowed media types available for creating media here. You must enable these in <strong>Media Types Types</strong> within the <strong>Settings</strong> section, by editing the <strong>Allowed child node types</strong> under <strong>Permissions</strong>.]]></key>
-    <key alias="noMediaTypesWithNoSettingsAccess">The selected media in the tree doesn't allow for any other media to be created below it.</key>
-    <key alias="noMediaTypesEditPermissions">Edit permissions for this media type</key>    <key alias="documentTypeWithoutTemplate">Document Type without a template</key>
-    <key alias="newFolder">New folder</key>
-    <key alias="newDataType">New data type</key>
-    <key alias="newJavascriptFile">New JavaScript file</key>
-    <key alias="newEmptyPartialView">New empty partial view</key>
-    <key alias="newPartialViewMacro">New partial view macro</key>
-    <key alias="newPartialViewFromSnippet">New partial view from snippet</key>
-    <key alias="newPartialViewMacroFromSnippet">New partial view macro from snippet</key>
-    <key alias="newPartialViewMacroNoMacro">New partial view macro (without macro)</key>
-    <key alias="newStyleSheetFile">New style sheet file</key>
-    <key alias="newRteStyleSheetFile">New Rich Text Editor style sheet file</key>
-  </area>
-  <area alias="dashboard">
-    <key alias="browser">Browse your website</key>
-    <key alias="dontShowAgain">- Hide</key>
-    <key alias="nothinghappens">If Umbraco isn't opening, you might need to allow popups from this site</key>
-    <key alias="openinnew">has opened in a new window</key>
-    <key alias="restart">Restart</key>
-    <key alias="visit">Visit</key>
-    <key alias="welcome">Welcome</key>
-  </area>
-  <area alias="prompt">
-    <key alias="stay">Stay</key>
-    <key alias="discardChanges">Discard changes</key>
-    <key alias="unsavedChanges">You have unsaved changes</key>
-    <key alias="unsavedChangesWarning">Are you sure you want to navigate away from this page? - you have unsaved changes</key>
-    <key alias="confirmListViewPublish">Publishing will make the selected items visible on the site.</key>
-    <key alias="confirmListViewUnpublish">Unpublishing will remove the selected items and all their descendants from the site.</key>
-    <key alias="confirmUnpublish">Unpublishing will remove this page and all its descendants from the site.</key>
-    <key alias="doctypeChangeWarning">You have unsaved changes. Making changes to the Document Type will discard the changes.</key>
-  </area>
-  <area alias="bulk">
-    <key alias="done">Done</key>
-    <key alias="deletedItem">Deleted %0% item</key>
-    <key alias="deletedItems">Deleted %0% items</key>
-    <key alias="deletedItemOfItem">Deleted %0% out of %1% item</key>
-    <key alias="deletedItemOfItems">Deleted %0% out of %1% items</key>
-    <key alias="publishedItem">Published %0% item</key>
-    <key alias="publishedItems">Published %0% items</key>
-    <key alias="publishedItemOfItem">Published %0% out of %1% item</key>
-    <key alias="publishedItemOfItems">Published %0% out of %1% items</key>
-    <key alias="unpublishedItem">Unpublished %0% item</key>
-    <key alias="unpublishedItems">Unpublished %0% items</key>
-    <key alias="unpublishedItemOfItem">Unpublished %0% out of %1% item</key>
-    <key alias="unpublishedItemOfItems">Unpublished %0% out of %1% items</key>
-    <key alias="movedItem">Moved %0% item</key>
-    <key alias="movedItems">Moved %0% items</key>
-    <key alias="movedItemOfItem">Moved %0% out of %1% item</key>
-    <key alias="movedItemOfItems">Moved %0% out of %1% items</key>
-    <key alias="copiedItem">Copied %0% item</key>
-    <key alias="copiedItems">Copied %0% items</key>
-    <key alias="copiedItemOfItem">Copied %0% out of %1% item</key>
-    <key alias="copiedItemOfItems">Copied %0% out of %1% items</key>
-  </area>
-  <area alias="defaultdialogs">
-    <key alias="nodeNameLinkPicker">Link title</key>
-    <key alias="urlLinkPicker">Link</key>
-    <key alias="anchorLinkPicker">Anchor / querystring</key>
-    <key alias="anchorInsert">Name</key>
-    <key alias="closeThisWindow">Close this window</key>
-    <key alias="confirmdelete">Are you sure you want to delete</key>
-    <key alias="confirmdisable">Are you sure you want to disable</key>
-    <key alias="confirmlogout">Are you sure?</key>
-    <key alias="confirmSure">Are you sure?</key>
-    <key alias="cut">Cut</key>
-    <key alias="editdictionary">Edit Dictionary Item</key>
-    <key alias="editlanguage">Edit Language</key>
-    <key alias="insertAnchor">Insert local link</key>
-    <key alias="insertCharacter">Insert character</key>
-    <key alias="insertgraphicheadline">Insert graphic headline</key>
-    <key alias="insertimage">Insert picture</key>
-    <key alias="insertlink">Insert link</key>
-    <key alias="insertMacro">Click to add a Macro</key>
-    <key alias="inserttable">Insert table</key>
-    <key alias="languagedeletewarning">This will delete the language</key>
-    <key alias="lastEdited">Last Edited</key>
-    <key alias="link">Link</key>
-    <key alias="linkinternal">Internal link:</key>
-    <key alias="linklocaltip">When using local links, insert "#" in front of link</key>
-    <key alias="linknewwindow">Open in new window?</key>
-    <key alias="macroContainerSettings">Macro Settings</key>
-    <key alias="macroDoesNotHaveProperties">This macro does not contain any properties you can edit</key>
-    <key alias="paste">Paste</key>
-    <key alias="permissionsEdit">Edit permissions for</key>
-    <key alias="permissionsSet">Set permissions for</key>
-    <key alias="permissionsSetForGroup">Set permissions for %0% for user group %1%</key>
-    <key alias="permissionsHelp">Select the users groups you want to set permissions for</key>
-    <key alias="recycleBinDeleting">The items in the recycle bin are now being deleted. Please do not close this window while this operation takes place</key>
-    <key alias="recycleBinIsEmpty">The recycle bin is now empty</key>
-    <key alias="recycleBinWarning">When items are deleted from the recycle bin, they will be gone forever</key>
-    <key alias="regexSearchError"><![CDATA[<a target='_blank' href='http://regexlib.com'>regexlib.com</a>'s webservice is currently experiencing some problems, which we have no control over. We are very sorry for this inconvenience.]]></key>
-    <key alias="regexSearchHelp">Search for a regular expression to add validation to a form field. Example: 'email, 'zip-code' 'url'</key>
-    <key alias="removeMacro">Remove Macro</key>
-    <key alias="requiredField">Required Field</key>
-    <key alias="sitereindexed">Site is reindexed</key>
-    <key alias="siterepublished">The website cache has been refreshed. All publish content is now up to date. While all unpublished content is still unpublished</key>
-    <key alias="siterepublishHelp">The website cache will be refreshed. All published content will be updated, while unpublished content will stay unpublished.</key>
-    <key alias="tableColumns">Number of columns</key>
-    <key alias="tableRows">Number of rows</key>
-    <key alias="thumbnailimageclickfororiginal">Click on the image to see full size</key>
-    <key alias="treepicker">Pick item</key>
-    <key alias="viewCacheItem">View Cache Item</key>
-    <key alias="relateToOriginalLabel">Relate to original</key>
-    <key alias="includeDescendants">Include descendants</key>
-    <key alias="theFriendliestCommunity">The friendliest community</key>
-    <key alias="linkToPage">Link to page</key>
-    <key alias="openInNewWindow">Opens the linked document in a new window or tab</key>
-    <key alias="linkToMedia">Link to media</key>
-    <key alias="selectContentStartNode">Select content start node</key>
-    <key alias="selectMedia">Select media</key>
-    <key alias="selectMediaType">Select media type</key>
-    <key alias="selectIcon">Select icon</key>
-    <key alias="selectItem">Select item</key>
-    <key alias="selectLink">Select link</key>
-    <key alias="selectMacro">Select macro</key>
-    <key alias="selectContent">Select content</key>
-    <key alias="selectContentType">Select content type</key>
-    <key alias="selectMediaStartNode">Select media start node</key>
-    <key alias="selectMember">Select member</key>
-    <key alias="selectMemberGroup">Select member group</key>
-    <key alias="selectMemberType">Select member type</key>
-    <key alias="selectNode">Select node</key>
-    <key alias="selectSections">Select sections</key>
-    <key alias="selectUsers">Select users</key>
-    <key alias="noIconsFound">No icons were found</key>
-    <key alias="noMacroParams">There are no parameters for this macro</key>
-    <key alias="noMacros">There are no macros available to insert</key>
-    <key alias="externalLoginProviders">External login providers</key>
-    <key alias="exceptionDetail">Exception Details</key>
-    <key alias="stacktrace">Stacktrace</key>
-    <key alias="innerException">Inner Exception</key>
-    <key alias="linkYour">Link your</key>
-    <key alias="unLinkYour">Un-link your</key>
-    <key alias="account">account</key>
-    <key alias="selectEditor">Select editor</key>
-    <key alias="selectSnippet">Select snippet</key>
-    <key alias="variantdeletewarning">This will delete the node and all its languages. If you only want to delete one language go and unpublish it instead.</key>
-  </area>
-  <area alias="dictionary">
-    <key alias="noItems">There are no dictionary items.</key>
-  </area>
-  <area alias="dictionaryItem">
-    <key alias="description"><![CDATA[
-      Edit the different language versions for the dictionary item '<em>%0%</em>' below
-   ]]></key>
-    <key alias="displayName">Culture Name</key>
-    <key alias="changeKeyError"><![CDATA[
-      The key '%0%' already exists.
-   ]]></key>
-    <key alias="overviewTitle">Dictionary overview</key>
-  </area>
-  <area alias="examineManagement">
-    <key alias="configuredSearchers">Configured Searchers</key>
-    <key alias="configuredSearchersDescription">Shows properties and tools for any configured Searcher (i.e. such as a multi-index searcher)</key>
-    <key alias="fieldValues">Field values</key>
-    <key alias="healthStatus">Health status</key>
-    <key alias="healthStatusDescription">The health status of the index and if it can be read</key>
-    <key alias="indexers">Indexers</key>
-    <key alias="indexInfo">Index info</key>
-    <key alias="indexInfoDescription">Lists the properties of the index</key>
-    <key alias="manageIndexes">Manage Examine's indexes</key>
-    <key alias="manageIndexesDescription">Allows you to view the details of each index and provides some tools for managing the indexes</key>
-    <key alias="rebuildIndex">Rebuild index</key>
-    <key alias="rebuildIndexWarning"><![CDATA[
-      This will cause the index to be rebuilt.<br />
-      Depending on how much content there is in your site this could take a while.<br />
-      It is not recommended to rebuild an index during times of high website traffic or when editors are editing content.
-     ]]>
-    </key>
-    <key alias="searchers">Searchers</key>
-    <key alias="searchDescription">Search the index and view the results</key>
-    <key alias="tools">Tools</key>
-    <key alias="toolsDescription">Tools to manage the index</key>
-  </area>
-  <area alias="placeholders">
-    <key alias="username">Enter your username</key>
-    <key alias="password">Enter your password</key>
-    <key alias="confirmPassword">Confirm your password</key>
-    <key alias="nameentity">Name the %0%...</key>
-    <key alias="entername">Enter a name...</key>
-    <key alias="enteremail">Enter an email...</key>
-    <key alias="enterusername">Enter a username...</key>
-    <key alias="label">Label...</key>
-    <key alias="enterDescription">Enter a description...</key>
-    <key alias="search">Type to search...</key>
-    <key alias="filter">Type to filter...</key>
-    <key alias="enterTags">Type to add tags (press enter after each tag)...</key>
-    <key alias="email">Enter your email</key>
-    <key alias="enterMessage">Enter a message...</key>
-    <key alias="usernameHint">Your username is usually your email</key>
-    <key alias="anchor">#value or ?key=value</key>
-    <key alias="enterAlias">Enter alias...</key>
-    <key alias="generatingAlias">Generating alias...</key>
-    <key alias="a11yCreateItem">Create item</key>
-    <key alias="a11yEdit">Edit</key>
-    <key alias="a11yName">Name</key>
-  </area>
-  <area alias="editcontenttype">
-    <key alias="createListView" version="7.2">Create custom list view</key>
-    <key alias="removeListView" version="7.2">Remove custom list view</key>
-    <key alias="aliasAlreadyExists">A content type, media type or member type with this alias already exists</key>
-  </area>
-  <area alias="renamecontainer">
-    <key alias="renamed">Renamed</key>
-    <key alias="enterNewFolderName">Enter a new folder name here</key>
-    <key alias="folderWasRenamed">%0% was renamed to %1%</key>
-  </area>
-  <area alias="editdatatype">
-    <key alias="addPrevalue">Add prevalue</key>
-    <key alias="dataBaseDatatype">Database datatype</key>
-    <key alias="guid">Property editor GUID</key>
-    <key alias="renderControl">Property editor</key>
-    <key alias="rteButtons">Buttons</key>
-    <key alias="rteEnableAdvancedSettings">Enable advanced settings for</key>
-    <key alias="rteEnableContextMenu">Enable context menu</key>
-    <key alias="rteMaximumDefaultImgSize">Maximum default size of inserted images</key>
-    <key alias="rteRelatedStylesheets">Related stylesheets</key>
-    <key alias="rteShowLabel">Show label</key>
-    <key alias="rteWidthAndHeight">Width and height</key>
-    <key alias="allPropTypes">All property types &amp; property data</key>
-    <key alias="willBeDeleted">using this data type will be deleted permanently, please confirm you want to delete these as well</key>
-    <key alias="yesDelete">Yes, delete</key>
-    <key alias="andAllRelated">and all property types &amp; property data using this data type</key>
-    <key alias="selectFolder">Select the folder to move</key>
-    <key alias="inTheTree">to in the tree structure below</key>
-    <key alias="wasMoved">was moved underneath</key>
-  </area>
-  <area alias="errorHandling">
-    <key alias="errorButDataWasSaved">Your data has been saved, but before you can publish this page there are some errors you need to fix first:</key>
-    <key alias="errorChangingProviderPassword">The current membership provider does not support changing password (EnablePasswordRetrieval need to be true)</key>
-    <key alias="errorExistsWithoutTab">%0% already exists</key>
-    <key alias="errorHeader">There were errors:</key>
-    <key alias="errorHeaderWithoutTab">There were errors:</key>
-    <key alias="errorInPasswordFormat">The password should be a minimum of %0% characters long and contain at least %1% non-alpha numeric character(s)</key>
-    <key alias="errorIntegerWithoutTab">%0% must be an integer</key>
-    <key alias="errorMandatory">The %0% field in the %1% tab is mandatory</key>
-    <key alias="errorMandatoryWithoutTab">%0% is a mandatory field</key>
-    <key alias="errorRegExp">%0% at %1% is not in a correct format</key>
-    <key alias="errorRegExpWithoutTab">%0% is not in a correct format</key>
-  </area>
-  <area alias="errors">
-    <key alias="receivedErrorFromServer">Received an error from the server</key>
-    <key alias="dissallowedMediaType">The specified file type has been disallowed by the administrator</key>
-    <key alias="codemirroriewarning">NOTE! Even though CodeMirror is enabled by configuration, it is disabled in Internet Explorer because it's not stable enough.</key>
-    <key alias="contentTypeAliasAndNameNotNull">Please fill both alias and name on the new property type!</key>
-    <key alias="filePermissionsError">There is a problem with read/write access to a specific file or folder</key>
-    <key alias="macroErrorLoadingPartialView">Error loading Partial View script (file: %0%)</key>
-    <key alias="missingTitle">Please enter a title</key>
-    <key alias="missingType">Please choose a type</key>
-    <key alias="pictureResizeBiggerThanOrg">You're about to make the picture larger than the original size. Are you sure that you want to proceed?</key>
-    <key alias="startNodeDoesNotExists">Startnode deleted, please contact your administrator</key>
-    <key alias="stylesMustMarkBeforeSelect">Please mark content before changing style</key>
-    <key alias="stylesNoStylesOnPage">No active styles available</key>
-    <key alias="tableColMergeLeft">Please place cursor at the left of the two cells you wish to merge</key>
-    <key alias="tableSplitNotSplittable">You cannot split a cell that hasn't been merged.</key>
-    <key alias="propertyHasErrors">This property is invalid</key>
-  </area>
-  <area alias="general">
-    <key alias="options">Options</key>
-    <key alias="about">About</key>
-    <key alias="action">Action</key>
-    <key alias="actions">Actions</key>
-    <key alias="add">Add</key>
-    <key alias="alias">Alias</key>
-    <key alias="all">All</key>
-    <key alias="areyousure">Are you sure?</key>
-    <key alias="back">Back</key>
-    <key alias="backToOverview">Back to overview</key>
-    <key alias="border">Border</key>
-    <key alias="by">by</key>
-    <key alias="cancel">Cancel</key>
-    <key alias="cellMargin">Cell margin</key>
-    <key alias="choose">Choose</key>
-    <key alias="close">Close</key>
-    <key alias="closewindow">Close Window</key>
-    <key alias="comment">Comment</key>
-    <key alias="confirm">Confirm</key>
-    <key alias="constrain">Constrain</key>
-    <key alias="constrainProportions">Constrain proportions</key>
-    <key alias="content">Content</key>
-    <key alias="continue">Continue</key>
-    <key alias="copy">Copy</key>
-    <key alias="create">Create</key>
-    <key alias="database">Database</key>
-    <key alias="date">Date</key>
-    <key alias="default">Default</key>
-    <key alias="delete">Delete</key>
-    <key alias="deleted">Deleted</key>
-    <key alias="deleting">Deleting...</key>
-    <key alias="design">Design</key>
-    <key alias="dictionary">Dictionary</key>
-    <key alias="dimensions">Dimensions</key>
-    <key alias="down">Down</key>
-    <key alias="download">Download</key>
-    <key alias="edit">Edit</key>
-    <key alias="edited">Edited</key>
-    <key alias="elements">Elements</key>
-    <key alias="email">Email</key>
-    <key alias="error">Error</key>
-    <key alias="field">Field</key>
-    <key alias="findDocument">Find</key>
-    <key alias="first">First</key>
-    <key alias="general">General</key>
-    <key alias="groups">Groups</key>
-    <key alias="group">Group</key>
-    <key alias="height">Height</key>
-    <key alias="help">Help</key>
-    <key alias="hide">Hide</key>
-    <key alias="history">History</key>
-    <key alias="icon">Icon</key>
-    <key alias="id">Id</key>
-    <key alias="import">Import</key>
-    <key alias="includeFromsubFolders">Include subfolders in search</key>
-    <key alias="info">Info</key>
-    <key alias="innerMargin">Inner margin</key>
-    <key alias="insert">Insert</key>
-    <key alias="install">Install</key>
-    <key alias="invalid">Invalid</key>
-    <key alias="justify">Justify</key>
-    <key alias="label">Label</key>
-    <key alias="language">Language</key>
-    <key alias="last">Last</key>
-    <key alias="layout">Layout</key>
-    <key alias="links">Links</key>
-    <key alias="loading">Loading</key>
-    <key alias="locked">Locked</key>
-    <key alias="login">Login</key>
-    <key alias="logoff">Log off</key>
-    <key alias="logout">Logout</key>
-    <key alias="macro">Macro</key>
-    <key alias="mandatory">Mandatory</key>
-    <key alias="message">Message</key>
-    <key alias="move">Move</key>
-    <key alias="name">Name</key>
-    <key alias="new">New</key>
-    <key alias="next">Next</key>
-    <key alias="no">No</key>
-    <key alias="of">of</key>
-    <key alias="off">Off</key>
-    <key alias="ok">OK</key>
-    <key alias="open">Open</key>
-    <key alias="on">On</key>
-    <key alias="or">or</key>
-    <key alias="orderBy">Order by</key>
-    <key alias="password">Password</key>
-    <key alias="path">Path</key>
-    <key alias="pleasewait">One moment please...</key>
-    <key alias="previous">Previous</key>
-    <key alias="properties">Properties</key>
-    <key alias="rebuild">Rebuild</key>
-    <key alias="reciept">Email to receive form data</key>
-    <key alias="recycleBin">Recycle Bin</key>
-    <key alias="recycleBinEmpty">Your recycle bin is empty</key>
-    <key alias="reload">Reload</key>
-    <key alias="remaining">Remaining</key>
-    <key alias="remove">Remove</key>
-    <key alias="rename">Rename</key>
-    <key alias="renew">Renew</key>
-    <key alias="required" version="7.0">Required</key>
-    <key alias="retrieve">Retrieve</key>
-    <key alias="retry">Retry</key>
-    <key alias="rights">Permissions</key>
-    <key alias="scheduledPublishing">Scheduled Publishing</key>
-    <key alias="search">Search</key>
-    <key alias="searchNoResult">Sorry, we can not find what you are looking for.</key>
-    <key alias="noItemsInList">No items have been added</key>
-    <key alias="server">Server</key>
-    <key alias="settings">Settings</key>
-    <key alias="show">Show</key>
-    <key alias="showPageOnSend">Show page on Send</key>
-    <key alias="size">Size</key>
-    <key alias="sort">Sort</key>
-    <key alias="status">Status</key>
-    <key alias="submit">Submit</key>
-    <key alias="type">Type</key>
-    <key alias="typeToSearch">Type to search...</key>
-    <key alias="under">under</key>
-    <key alias="up">Up</key>
-    <key alias="update">Update</key>
-    <key alias="upgrade">Upgrade</key>
-    <key alias="upload">Upload</key>
-    <key alias="url">Url</key>
-    <key alias="user">User</key>
-    <key alias="username">Username</key>
-    <key alias="value">Value</key>
-    <key alias="view">View</key>
-    <key alias="welcome">Welcome...</key>
-    <key alias="width">Width</key>
-    <key alias="yes">Yes</key>
-    <key alias="folder">Folder</key>
-    <key alias="searchResults">Search results</key>
-    <key alias="reorder">Reorder</key>
-    <key alias="reorderDone">I am done reordering</key>
-    <key alias="preview">Preview</key>
-    <key alias="changePassword">Change password</key>
-    <key alias="to">to</key>
-    <key alias="listView">List view</key>
-    <key alias="saving">Saving...</key>
-    <key alias="current">current</key>
-    <key alias="embed">Embed</key>
-    <key alias="selected">selected</key>
-  </area>
-  <area alias="colors">
-    <key alias="blue">Blue</key>
-  </area>
-  <area alias="shortcuts">
-    <key alias="addGroup">Add group</key>
-    <key alias="addProperty">Add property</key>
-    <key alias="addEditor">Add editor</key>
-    <key alias="addTemplate">Add template</key>
-    <key alias="addChildNode">Add child node</key>
-    <key alias="addChild">Add child</key>
-    <key alias="editDataType">Edit data type</key>
-    <key alias="navigateSections">Navigate sections</key>
-    <key alias="shortcut">Shortcuts</key>
-    <key alias="showShortcuts">show shortcuts</key>
-    <key alias="toggleListView">Toggle list view</key>
-    <key alias="toggleAllowAsRoot">Toggle allow as root</key>
-    <key alias="commentLine">Comment/Uncomment lines</key>
-    <key alias="removeLine">Remove line</key>
-    <key alias="copyLineUp">Copy Lines Up</key>
-    <key alias="copyLineDown">Copy Lines Down</key>
-    <key alias="moveLineUp">Move Lines Up</key>
-    <key alias="moveLineDown">Move Lines Down</key>
-    <key alias="generalHeader">General</key>
-    <key alias="editorHeader">Editor</key>
-    <key alias="toggleAllowCultureVariants">Toggle allow culture variants</key>
-  </area>
-  <area alias="graphicheadline">
-    <key alias="backgroundcolor">Background color</key>
-    <key alias="bold">Bold</key>
-    <key alias="color">Text color</key>
-    <key alias="font">Font</key>
-    <key alias="text">Text</key>
-  </area>
-  <area alias="headers">
-    <key alias="page">Page</key>
-  </area>
-  <area alias="installer">
-    <key alias="databaseErrorCannotConnect">The installer cannot connect to the database.</key>
-    <key alias="databaseErrorWebConfig">Could not save the web.config file. Please modify the connection string manually.</key>
-    <key alias="databaseFound">Your database has been found and is identified as</key>
-    <key alias="databaseHeader">Database configuration</key>
-    <key alias="databaseInstall"><![CDATA[
-      Press the <strong>install</strong> button to install the Umbraco %0% database
-    ]]></key>
-    <key alias="databaseInstallDone"><![CDATA[Umbraco %0% has now been copied to your database. Press <strong>Next</strong> to proceed.]]></key>
-    <key alias="databaseNotFound"><![CDATA[<p>Database not found! Please check that the information in the "connection string" of the "web.config" file is correct.</p>
-              <p>To proceed, please edit the "web.config" file (using Visual Studio or your favourite text editor), scroll to the bottom, add the connection string for your database in the key named "UmbracoDbDSN" and save the file. </p>
-              <p>
-              Click the <strong>retry</strong> button when
-              done.<br /><a href="https://our.umbraco.com/documentation/Using-Umbraco/Config-files/webconfig7" target="_blank">
-			              More information on editing web.config here.</a></p>]]></key>
-    <key alias="databaseText"><![CDATA[To complete this step, you must know some information regarding your database server ("connection string").<br />
-        Please contact your ISP if necessary.
-        If you're installing on a local machine or server you might need information from your system administrator.]]></key>
-    <key alias="databaseUpgrade"><![CDATA[
-      <p>
-      Press the <strong>upgrade</strong> button to upgrade your database to Umbraco %0%</p>
-      <p>
-      Don't worry - no content will be deleted and everything will continue working afterwards!
-      </p>
-      ]]></key>
-    <key alias="databaseUpgradeDone"><![CDATA[Your database has been upgraded to the final version %0%.<br/>Press <strong>Next</strong> to
-      proceed. ]]></key>
-    <key alias="databaseUpToDate"><![CDATA[Your current database is up-to-date!. Click <strong>next</strong> to continue the configuration wizard]]></key>
-    <key alias="defaultUserChangePass"><![CDATA[<strong>The Default users' password needs to be changed!</strong>]]></key>
-    <key alias="defaultUserDisabled"><![CDATA[<strong>The Default user has been disabled or has no access to Umbraco!</strong></p><p>No further actions needs to be taken. Click <b>Next</b> to proceed.]]></key>
-    <key alias="defaultUserPassChanged"><![CDATA[<strong>The Default user's password has been successfully changed since the installation!</strong></p><p>No further actions needs to be taken. Click <strong>Next</strong> to proceed.]]></key>
-    <key alias="defaultUserPasswordChanged">The password is changed!</key>
-    <key alias="greatStart">Get a great start, watch our introduction videos</key>
-    <key alias="licenseText">By clicking the next button (or modifying the umbracoConfigurationStatus in web.config), you accept the license for this software as specified in the box below. Notice that this Umbraco distribution consists of two different licenses, the open source MIT license for the framework and the Umbraco freeware license that covers the UI.</key>
-    <key alias="None">Not installed yet.</key>
-    <key alias="permissionsAffectedFolders">Affected files and folders</key>
-    <key alias="permissionsAffectedFoldersMoreInfo">More information on setting up permissions for Umbraco here</key>
-    <key alias="permissionsAffectedFoldersText">You need to grant ASP.NET modify permissions to the following files/folders</key>
-    <key alias="permissionsAlmostPerfect"><![CDATA[<strong>Your permission settings are almost perfect!</strong><br /><br />
-        You can run Umbraco without problems, but you will not be able to install packages which are recommended to take full advantage of Umbraco.]]></key>
-    <key alias="permissionsHowtoResolve">How to Resolve</key>
-    <key alias="permissionsHowtoResolveLink">Click here to read the text version</key>
-    <key alias="permissionsHowtoResolveText"><![CDATA[Watch our <strong>video tutorial</strong> on setting up folder permissions for Umbraco or read the text version.]]></key>
-    <key alias="permissionsMaybeAnIssue"><![CDATA[<strong>Your permission settings might be an issue!</strong>
-      <br/><br />
-      You can run Umbraco without problems, but you will not be able to create folders or install packages which are recommended to take full advantage of Umbraco.]]></key>
-    <key alias="permissionsNotReady"><![CDATA[<strong>Your permission settings are not ready for Umbraco!</strong>
-          <br /><br />
-          In order to run Umbraco, you'll need to update your permission settings.]]></key>
-    <key alias="permissionsPerfect"><![CDATA[<strong>Your permission settings are perfect!</strong><br /><br />
-              You are ready to run Umbraco and install packages!]]></key>
-    <key alias="permissionsResolveFolderIssues">Resolving folder issue</key>
-    <key alias="permissionsResolveFolderIssuesLink">Follow this link for more information on problems with ASP.NET and creating folders</key>
-    <key alias="permissionsSettingUpPermissions">Setting up folder permissions</key>
-    <key alias="permissionsText"><![CDATA[
-      Umbraco needs write/modify access to certain directories in order to store files like pictures and PDF's.
-      It also stores temporary data (aka: cache) for enhancing the performance of your website.
-    ]]></key>
-    <key alias="runwayFromScratch">I want to start from scratch</key>
-    <key alias="runwayFromScratchText"><![CDATA[
-        Your website is completely empty at the moment, so that's perfect if you want to start from scratch and create your own document types and templates.
-        (<a href="http://Umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">learn how</a>)
-        You can still choose to install Runway later on. Please go to the Developer section and choose Packages.
-      ]]></key>
-    <key alias="runwayHeader">You've just set up a clean Umbraco platform. What do you want to do next?</key>
-    <key alias="runwayInstalled">Runway is installed</key>
-    <key alias="runwayInstalledText"><![CDATA[
-      You have the foundation in place. Select what modules you wish to install on top of it.<br />
-      This is our list of recommended modules, check off the ones you would like to install, or view the <a href="#" onclick="toggleModules(); return false;" id="toggleModuleList">full list of modules</a>
-      ]]></key>
-    <key alias="runwayOnlyProUsers">Only recommended for experienced users</key>
-    <key alias="runwaySimpleSite">I want to start with a simple website</key>
-    <key alias="runwaySimpleSiteText"><![CDATA[
-      <p>
-      "Runway" is a simple website providing some basic document types and templates. The installer can set up Runway for you automatically,
-        but you can easily edit, extend or remove it. It's not necessary and you can perfectly use Umbraco without it. However,
-        Runway offers an easy foundation based on best practices to get you started faster than ever.
-        If you choose to install Runway, you can optionally select basic building blocks called Runway Modules to enhance your Runway pages.
-        </p>
-        <small>
-        <em>Included with Runway:</em> Home page, Getting Started page, Installing Modules page.<br />
-        <em>Optional Modules:</em> Top Navigation, Sitemap, Contact, Gallery.
-        </small>
-      ]]></key>
-    <key alias="runwayWhatIsRunway">What is Runway</key>
-    <key alias="step1">Step 1/5 Accept license</key>
-    <key alias="step2">Step 2/5: Database configuration</key>
-    <key alias="step3">Step 3/5: Validating File Permissions</key>
-    <key alias="step4">Step 4/5: Check Umbraco security</key>
-    <key alias="step5">Step 5/5: Umbraco is ready to get you started</key>
-    <key alias="thankYou">Thank you for choosing Umbraco</key>
-    <key alias="theEndBrowseSite"><![CDATA[<h3>Browse your new site</h3>
-You installed Runway, so why not see how your new website looks.]]></key>
-    <key alias="theEndFurtherHelp"><![CDATA[<h3>Further help and information</h3>
-Get help from our award winning community, browse the documentation or watch some free videos on how to build a simple site, how to use packages and a quick guide to the Umbraco terminology]]></key>
-    <key alias="theEndHeader">Umbraco %0% is installed and ready for use</key>
-    <key alias="theEndInstallFailed"><![CDATA[To finish the installation, you'll need to
-        manually edit the <strong>/web.config file</strong> and update the AppSetting key <strong>UmbracoConfigurationStatus</strong> in the bottom to the value of <strong>'%0%'</strong>.]]></key>
-    <key alias="theEndInstallSuccess"><![CDATA[You can get <strong>started instantly</strong> by clicking the "Launch Umbraco" button below. <br />If you are <strong>new to Umbraco</strong>,
-you can find plenty of resources on our getting started pages.]]></key>
-    <key alias="theEndOpenUmbraco"><![CDATA[<h3>Launch Umbraco</h3>
-To manage your website, simply open the Umbraco back office and start adding content, updating the templates and stylesheets or add new functionality]]></key>
-    <key alias="Unavailable">Connection to database failed.</key>
-    <key alias="Version3">Umbraco Version 3</key>
-    <key alias="Version4">Umbraco Version 4</key>
-    <key alias="watch">Watch</key>
-    <key alias="welcomeIntro"><![CDATA[This wizard will guide you through the process of configuring <strong>Umbraco %0%</strong> for a fresh install or upgrading from version 3.0.
-                                <br /><br />
-                                Press <strong>"next"</strong> to start the wizard.]]></key>
-  </area>
-  <area alias="language">
-    <key alias="cultureCode">Culture Code</key>
-    <key alias="displayName">Culture Name</key>
-  </area>
-  <area alias="lockout">
-    <key alias="lockoutWillOccur">You've been idle and logout will automatically occur in</key>
-    <key alias="renewSession">Renew now to save your work</key>
-  </area>
-  <area alias="login">
-    <key alias="greeting0">Happy super Sunday</key>
-    <key alias="greeting1">Happy manic Monday </key>
-    <key alias="greeting2">Happy tubular Tuesday</key>
-    <key alias="greeting3">Happy wonderful Wednesday</key>
-    <key alias="greeting4">Happy thunderous Thursday</key>
-    <key alias="greeting5">Happy funky Friday</key>
-    <key alias="greeting6">Happy Caturday</key>
-    <key alias="instruction">Log in below</key>
-    <key alias="signInWith">Sign in with</key>
-    <key alias="timeout">Session timed out</key>
-    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="http://umbraco.com" style="text-decoration: none" target="_blank">Umbraco.com</a></p> ]]></key>
-    <key alias="forgottenPassword">Forgotten password?</key>
-    <key alias="forgottenPasswordInstruction">An email will be sent to the address specified with a link to reset your password</key>
-    <key alias="requestPasswordResetConfirmation">An email with password reset instructions will be sent to the specified address if it matched our records</key>
-    <key alias="showPassword">Show password</key>
-    <key alias="hidePassword">Hide password</key>
-    <key alias="returnToLogin">Return to login form</key>
-    <key alias="setPasswordInstruction">Please provide a new password</key>
-    <key alias="setPasswordConfirmation">Your Password has been updated</key>
-    <key alias="resetCodeExpired">The link you have clicked on is invalid or has expired</key>
-    <key alias="resetPasswordEmailCopySubject">Umbraco: Reset Password</key>
-    <key alias="resetPasswordEmailCopyFormat"><![CDATA[
-        <html>
-			<head>
-				<meta name='viewport' content='width=device-width'>
-				<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
-			</head>
-			<body class='' style='font-family: sans-serif; -webkit-font-smoothing: antialiased; font-size: 14px; color: #392F54; line-height: 22px; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; background: #1d1333; margin: 0; padding: 0;' bgcolor='#1d1333'>
-				<style type='text/css'> @media only screen and (max-width: 620px) {table[class=body] h1 {font-size: 28px !important; margin-bottom: 10px !important; } table[class=body] .wrapper {padding: 32px !important; } table[class=body] .article {padding: 32px !important; } table[class=body] .content {padding: 24px !important; } table[class=body] .container {padding: 0 !important; width: 100% !important; } table[class=body] .main {border-left-width: 0 !important; border-radius: 0 !important; border-right-width: 0 !important; } table[class=body] .btn table {width: 100% !important; } table[class=body] .btn a {width: 100% !important; } table[class=body] .img-responsive {height: auto !important; max-width: 100% !important; width: auto !important; } } .btn-primary table td:hover {background-color: #34495e !important; } .btn-primary a:hover {background-color: #34495e !important; border-color: #34495e !important; } .btn  a:visited {color:#FFFFFF;} </style>
-				<table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;" bgcolor="#1d1333">
-					<tr>
-						<td style="font-family: sans-serif; font-size: 14px; vertical-align: top; padding: 24px;" valign="top">
-							<table style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
-								<tr>
-									<td background="https://umbraco.com/umbraco/assets/img/application/logo.png" bgcolor="#1d1333" width="28" height="28" valign="top" style="font-family: sans-serif; font-size: 14px; vertical-align: top;">
-										<!--[if gte mso 9]> <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="width:30px;height:30px;"> <v:fill type="tile" src="https://umbraco.com/umbraco/assets/img/application/logo.png" color="#1d1333" /> <v:textbox inset="0,0,0,0"> <![endif]-->
-										<div> </div>
-										<!--[if gte mso 9]> </v:textbox> </v:rect> <![endif]-->
-									</td>
-									<td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top"></td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-				</table>
-				<table border='0' cellpadding='0' cellspacing='0' class='body' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;' bgcolor='#1d1333'>
-					<tr>
-						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
-						<td class='container' style='font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; max-width: 560px; width: 560px; margin: 0 auto; padding: 10px;' valign='top'>
-							<div class='content' style='box-sizing: border-box; display: block; max-width: 560px; margin: 0 auto; padding: 10px;'>
-								<br>
-								<table class='main' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; border-radius: 3px; background: #FFFFFF;' bgcolor='#FFFFFF'>
-									<tr>
-										<td class='wrapper' style='font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 50px;' valign='top'>
-											<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;'>
-												<tr>
-													<td style='line-height: 24px; font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'>
-														<h1 style='color: #392F54; font-family: sans-serif; font-weight: bold; line-height: 1.4; font-size: 24px; text-align: left; text-transform: capitalize; margin: 0 0 30px;' align='left'>
-															Password reset requested
-														</h1>
-														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
-															Your username to login to the Umbraco back-office is: <strong>%0%</strong>
-														</p>
-														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
-															<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'>
-																<tbody>
-																	<tr>
-																		<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
-																			<a href='%1%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
-																				Click this link to reset your password
-																			</a>
-																		</td>
-																	</tr>
-																</tbody>
-															</table>
-														</p>
-														<p style='max-width: 400px; display: block; color: #392F54; font-family: sans-serif; font-size: 14px; line-height: 20px; font-weight: normal; margin: 15px 0;'>If you cannot click on the link, copy and paste this URL into your browser window:</p>
-															<table border='0' cellpadding='0' cellspacing='0'>
-																<tr>
-																	<td style='-ms-word-break: break-all; word-break: break-all; font-family: sans-serif; font-size: 11px; line-height:14px;'>
-																		<font style="-ms-word-break: break-all; word-break: break-all; font-size: 11px; line-height:14px;">
-																			<a style='-ms-word-break: break-all; word-break: break-all; color: #392F54; text-decoration: underline; font-size: 11px; line-height:15px;' href='%1%'>%1%</a>
-																		</font>
-																	</td>
-																</tr>
-															</table>
-														</p>
-													</td>
-												</tr>
-											</table>
-										</td>
-									</tr>
-								</table>
-								<br><br><br>
-							</div>
-						</td>
-						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
-					</tr>
-				</table>
-			</body>
-		</html>
-	]]></key>
-  </area>
-  <area alias="main">
-    <key alias="dashboard">Dashboard</key>
-    <key alias="sections">Sections</key>
-    <key alias="tree">Content</key>
-  </area>
-  <area alias="moveOrCopy">
-    <key alias="choose">Choose page above...</key>
-    <key alias="copyDone">%0% has been copied to %1%</key>
-    <key alias="copyTo">Select where the document %0% should be copied to below</key>
-    <key alias="moveDone">%0% has been moved to %1%</key>
-    <key alias="moveTo">Select where the document %0% should be moved to below</key>
-    <key alias="nodeSelected">has been selected as the root of your new content, click 'ok' below.</key>
-    <key alias="noNodeSelected">No node selected yet, please select a node in the list above before clicking 'ok'</key>
-    <key alias="notAllowedByContentType">The current node is not allowed under the chosen node because of its type</key>
-    <key alias="notAllowedByPath">The current node cannot be moved to one of its subpages</key>
-    <key alias="notAllowedAtRoot">The current node cannot exist at the root</key>
-    <key alias="notValid">The action isn't allowed since you have insufficient permissions on 1 or more child documents.</key>
-    <key alias="relateToOriginal">Relate copied items to original</key>
-  </area>
-  <area alias="notifications">
-    <key alias="editNotifications"><![CDATA[Select your notification for <strong>%0%</strong>]]></key>
-    <key alias="notificationsSavedFor">Notification settings saved for</key>
-    <key alias="mailBody"><![CDATA[
-      Hi %0%
-
-      This is an automated mail to inform you that the task '%1%'
-      has been performed on the page '%2%'
-      by the user '%3%'
-
-      Go to http://%4%/#/content/content/edit/%5% to edit.
-
-      %6%
-
-      Have a nice day!
-
-      Cheers from the Umbraco robot
-    ]]></key>
-    <key alias="mailBodyVariantSummary">The following languages have been modified %0%</key>
-    <key alias="mailBodyHtml"><![CDATA[
-        <html>
-			<head>
-				<meta name='viewport' content='width=device-width'>
-				<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
-			</head>
-			<body class='' style='font-family: sans-serif; -webkit-font-smoothing: antialiased; font-size: 14px; color: #392F54; line-height: 22px; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; background: #1d1333; margin: 0; padding: 0;' bgcolor='#1d1333'>
-				<style type='text/css'> @media only screen and (max-width: 620px) {table[class=body] h1 {font-size: 28px !important; margin-bottom: 10px !important; } table[class=body] .wrapper {padding: 32px !important; } table[class=body] .article {padding: 32px !important; } table[class=body] .content {padding: 24px !important; } table[class=body] .container {padding: 0 !important; width: 100% !important; } table[class=body] .main {border-left-width: 0 !important; border-radius: 0 !important; border-right-width: 0 !important; } table[class=body] .btn table {width: 100% !important; } table[class=body] .btn a {width: 100% !important; } table[class=body] .img-responsive {height: auto !important; max-width: 100% !important; width: auto !important; } } .btn-primary table td:hover {background-color: #34495e !important; } .btn-primary a:hover {background-color: #34495e !important; border-color: #34495e !important; } .btn  a:visited {color:#FFFFFF;} </style>
-				<table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;" bgcolor="#1d1333">
-					<tr>
-						<td style="font-family: sans-serif; font-size: 14px; vertical-align: top; padding: 24px;" valign="top">
-							<table style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
-								<tr>
-									<td background="https://umbraco.com/umbraco/assets/img/application/logo.png" bgcolor="#1d1333" width="28" height="28" valign="top" style="font-family: sans-serif; font-size: 14px; vertical-align: top;">
-										<!--[if gte mso 9]> <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="width:30px;height:30px;"> <v:fill type="tile" src="https://umbraco.com/umbraco/assets/img/application/logo.png" color="#1d1333" /> <v:textbox inset="0,0,0,0"> <![endif]-->
-										<div> </div>
-										<!--[if gte mso 9]> </v:textbox> </v:rect> <![endif]-->
-									</td>
-									<td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top"></td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-				</table>
-				<table border='0' cellpadding='0' cellspacing='0' class='body' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;' bgcolor='#1d1333'>
-					<tr>
-						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
-						<td class='container' style='font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; max-width: 560px; width: 560px; margin: 0 auto; padding: 10px;' valign='top'>
-							<div class='content' style='box-sizing: border-box; display: block; max-width: 560px; margin: 0 auto; padding: 10px;'>
-								<br>
-								<table class='main' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; border-radius: 3px; background: #FFFFFF;' bgcolor='#FFFFFF'>
-									<tr>
-										<td class='wrapper' style='font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 50px;' valign='top'>
-											<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;'>
-												<tr>
-													<td style='line-height: 24px; font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'>
-														<h1 style='color: #392F54; font-family: sans-serif; font-weight: bold; line-height: 1.4; font-size: 24px; text-align: left; text-transform: capitalize; margin: 0 0 30px;' align='left'>
-															Hi %0%,
-														</h1>
-														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
-															This is an automated mail to inform you that the task <strong>'%1%'</strong> has been performed on the page <a style="color: #392F54; text-decoration: none; -ms-word-break: break-all; word-break: break-all;" href="http://%4%/#/content/content/edit/%5%"><strong>'%2%'</strong></a> by the user <strong>'%3%'</strong>
-														</p>
-														<table border='0' cellpadding='0' cellspacing='0' class='btn btn-primary' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;'>
-															<tbody>
-																<tr>
-																	<td align='left' style='font-family: sans-serif; font-size: 14px; vertical-align: top; padding-bottom: 15px;' valign='top'>
-																		<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'><tbody><tr>
-																			<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
-																				<a href='http://%4%/#/content/content/edit/%5%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>EDIT</a> </td> </tr></tbody></table>
-																	</td>
-																</tr>
-															</tbody>
-														</table>
-														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
-															<h3>Update summary:</h3>
-															%6%
-														</p>
-														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
-															Have a nice day!<br /><br />
-															Cheers from the Umbraco robot
-														</p>
-													</td>
-												</tr>
-											</table>
-										</td>
-									</tr>
-								</table>
-								<br><br><br>
-							</div>
-						</td>
-						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
-					</tr>
-				</table>
-			</body>
-		</html>
-	]]></key>
-    <key alias="mailBodyVariantHtmlSummary"><![CDATA[<p>The following languages have been modified:</p>
-        %0%
-    ]]></key>
-    <key alias="mailSubject">[%0%] Notification about %1% performed on %2%</key>
-    <key alias="notifications">Notifications</key>
-  </area>
-  <area alias="packager">
-    <key alias="actions">Actions</key>
-    <key alias="created">Created</key>
-    <key alias="createPackage">Create package</key>
-    <key alias="chooseLocalPackageText"><![CDATA[
-      Choose Package from your machine, by clicking the Browse<br />
-         button and locating the package. Umbraco packages usually have a ".umb" or ".zip" extension.
-      ]]></key>
-    <key alias="deletewarning">This will delete the package</key>
-    <key alias="dropHere">Drop to upload</key>
-    <key alias="includeAllChildNodes">Include all child nodes</key>
-    <key alias="orClickHereToUpload">or click here to choose package file</key>
-    <key alias="uploadPackage">Upload package</key>
-    <key alias="localPackageDescription">Install a local package by selecting it from your machine. Only install packages from sources you know and trust</key>
-    <key alias="uploadAnother">Upload another package</key>
-    <key alias="cancelAndUploadAnother">Cancel and upload another package</key>
-    <key alias="accept">I accept</key>
-    <key alias="termsOfUse">terms of use</key>
-    <key alias="pathToFile">Path to file</key>
-    <key alias="pathToFileDescription">Absolute path to file (ie: /bin/umbraco.bin)</key>
-    <key alias="installed">Installed</key>
-    <key alias="installedPackages">Installed packages</key>
-    <key alias="installLocal">Install local</key>
-    <key alias="installFinish">Finish</key>
-    <key alias="noConfigurationView">This package has no configuration view</key>
-    <key alias="noPackagesCreated">No packages have been created yet</key>
-    <key alias="noPackages">You don’t have any packages installed</key>
-    <key alias="noPackagesDescription"><![CDATA[You don’t have any packages installed. Either install a local package by selecting it from your machine, or browse through available packages using the <strong>'Packages'</strong> icon in the top right of your screen]]></key>
-    <key alias="packageActions">Package Actions</key>
-    <key alias="packageAuthorUrl">Author URL</key>
-    <key alias="packageContent">Package Content</key>
-    <key alias="packageFiles">Package Files</key>
-    <key alias="packageIconUrl">Icon URL</key>
-    <key alias="packageInstall">Install package</key>
-    <key alias="packageLicense">License</key>
-    <key alias="packageLicenseUrl">License URL</key>
-    <key alias="packageProperties">Package Properties</key>
-    <key alias="packageSearch">Search for packages</key>
-    <key alias="packageSearchResults">Results for</key>
-    <key alias="packageNoResults">We couldn’t find anything for</key>
-    <key alias="packageNoResultsDescription">Please try searching for another package or browse through the categories</key>
-    <key alias="packagesPopular">Popular</key>
-    <key alias="packagesNew">New releases</key>
-    <key alias="packageHas">has</key>
-    <key alias="packageKarmaPoints">karma points</key>
-    <key alias="packageInfo">Information</key>
-    <key alias="packageOwner">Owner</key>
-    <key alias="packageContrib">Contributors</key>
-    <key alias="packageCreated">Created</key>
-    <key alias="packageCurrentVersion">Current version</key>
-    <key alias="packageNetVersion">.NET version</key>
-    <key alias="packageDownloads">Downloads</key>
-    <key alias="packageLikes">Likes</key>
-    <key alias="packageCompatibility">Compatibility</key>
-    <key alias="packageCompatibilityDescription">This package is compatible with the following versions of Umbraco, as reported by community members. Full compatability cannot be guaranteed for versions reported below 100%</key>
-    <key alias="packageExternalSources">External sources</key>
-    <key alias="packageAuthor">Author</key>
-    <key alias="packageDocumentation">Documentation</key>
-    <key alias="packageMetaData">Package meta data</key>
-    <key alias="packageName">Package name</key>
-    <key alias="packageNoItemsHeader">Package doesn't contain any items</key>
-    <key alias="packageNoItemsText"><![CDATA[This package file doesn't contain any items to uninstall.<br/><br/>
-      You can safely remove this from the system by clicking "uninstall package" below.]]></key>
-    <key alias="packageOptions">Package options</key>
-    <key alias="packageReadme">Package readme</key>
-    <key alias="packageRepository">Package repository</key>
-    <key alias="packageUninstallConfirm">Confirm package uninstall</key>
-    <key alias="packageUninstalledHeader">Package was uninstalled</key>
-    <key alias="packageUninstalledText">The package was successfully uninstalled</key>
-    <key alias="packageUninstallHeader">Uninstall package</key>
-    <key alias="packageUninstallText"><![CDATA[You can unselect items you do not wish to remove, at this time, below. When you click "confirm uninstall" all checked-off items will be removed.<br />
-      <span style="color: Red; font-weight: bold;">Notice:</span> any documents, media etc depending on the items you remove, will stop working, and could lead to system instability,
-      so uninstall with caution. If in doubt, contact the package author.]]></key>
-    <key alias="packageVersion">Package version</key>
-    <key alias="packageVersionUpgrade">Upgrading from version</key>
-    <key alias="packageAlreadyInstalled">Package already installed</key>
-    <key alias="targetVersionMismatch">This package cannot be installed, it requires a minimum Umbraco version of</key>
-    <key alias="installStateUninstalling">Uninstalling...</key>
-    <key alias="installStateDownloading">Downloading...</key>
-    <key alias="installStateImporting">Importing...</key>
-    <key alias="installStateInstalling">Installing...</key>
-    <key alias="installStateRestarting">Restarting, please wait...</key>
-    <key alias="installStateComplete">All done, your browser will now refresh, please wait...</key>
-    <key alias="installStateCompleted">Please click 'Finish' to complete installation and reload the page.</key>
-    <key alias="installStateUploading">Uploading package...</key>
-  </area>
-  <area alias="paste">
-    <key alias="doNothing">Paste with full formatting (Not recommended)</key>
-    <key alias="errorMessage">The text you're trying to paste contains special characters or formatting. This could be caused by copying text from Microsoft Word. Umbraco can remove special characters or formatting automatically, so the pasted content will be more suitable for the web.</key>
-    <key alias="removeAll">Paste as raw text without any formatting at all</key>
-    <key alias="removeSpecialFormattering">Paste, but remove formatting (Recommended)</key>
-  </area>
-  <area alias="publicAccess">
-    <key alias="paGroups">Group based protection</key>
-    <key alias="paGroupsHelp">If you want to grant access to all members of specific member groups</key>
-    <key alias="paGroupsNoGroups">You need to create a member group before you can use group based authentication</key>
-    <key alias="paErrorPage">Error Page</key>
-    <key alias="paErrorPageHelp">Used when people are logged on, but do not have access</key>
-    <key alias="paHowWould"><![CDATA[Choose how to restrict access to the page <strong>%0%</strong>]]></key>
-    <key alias="paIsProtected"><![CDATA[<strong>%0%</strong> is now protected]]></key>
-    <key alias="paIsRemoved"><![CDATA[Protection removed from <strong>%0%</strong>]]></key>
-    <key alias="paLoginPage">Login Page</key>
-    <key alias="paLoginPageHelp">Choose the page that contains the login form</key>
-    <key alias="paRemoveProtection">Remove protection...</key>
-    <key alias="paRemoveProtectionConfirm"><![CDATA[Are you sure you want to remove the protection from the page <strong>%0%</strong>?]]></key>
-    <key alias="paSelectPages">Select the pages that contain login form and error messages</key>
-    <key alias="paSelectGroups"><![CDATA[Select the groups who have access to the page <strong>%0%</strong>]]></key>
-    <key alias="paSelectMembers"><![CDATA[Select the members who have access to the page <strong>%0%</strong>]]></key>
-    <key alias="paMembers">Specific members protection</key>
-    <key alias="paMembersHelp">If you wish to grant access to specific members</key>
-  </area>
-  <area alias="publish">
-    <key alias="invalidPublishBranchPermissions">Insufficient user permissions to publish all descendant documents</key>
-    <key alias="contentPublishedFailedIsTrashed"><![CDATA[
-      %0% could not be published because the item is in the recycle bin.
-    ]]></key>
-    <key alias="contentPublishedFailedAwaitingRelease"><![CDATA[
-      %0% could not be published because the item is scheduled for release.
-    ]]></key>
-    <key alias="contentPublishedFailedExpired"><![CDATA[
-      %0% could not be published because the item has expired.
-    ]]></key>
-    <key alias="contentPublishedFailedInvalid"><![CDATA[
-      %0% could not be published because some properties did not pass validation rules.
-    ]]></key>
-    <key alias="contentPublishedFailedByEvent"><![CDATA[
-      %0% could not be published, a 3rd party add-in cancelled the action.
-    ]]></key>
-    <key alias="contentPublishedFailedByParent"><![CDATA[
-      %0% can not be published, because a parent page is not published.
-    ]]></key>
-    <key alias="contentPublishedFailedByMissingName"><![CDATA[%0% can not be published, because its missing a name.]]></key>
-    <key alias="contentPublishedFailedReqCultureValidationError">Validation failed for required language '%0%'. This language was saved but not published.</key>
-    <key alias="inProgress">Publishing in progress - please wait...</key>
-    <key alias="inProgressCounter">%0% out of %1% pages have been published...</key>
-    <key alias="nodePublish">%0% has been published</key>
-    <key alias="nodePublishAll">%0% and subpages have been published</key>
-    <key alias="publishAll">Publish %0% and all its subpages</key>
-    <key alias="publishHelp"><![CDATA[Click <em>Publish</em> to publish <strong>%0%</strong> and thereby making its content publicly available.<br/><br />
-      You can publish this page and all its subpages by checking <em>Include unpublished subpages</em> below.
-      ]]></key>
-  </area>
-  <area alias="colorpicker">
-    <key alias="noColors">You have not configured any approved colors</key>
-  </area>
-  <area alias="contentPicker">
-    <key alias="allowedItemTypes">You can only select items of type(s): %0%</key>
-    <key alias="pickedTrashedItem">You have picked a content item currently deleted or in the recycle bin</key>
-    <key alias="pickedTrashedItems">You have picked content items currently deleted or in the recycle bin</key>
-  </area>
-  <area alias="mediaPicker">
-    <key alias="pickedTrashedItem">You have picked a media item currently deleted or in the recycle bin</key>
-    <key alias="pickedTrashedItems">You have picked media items currently deleted or in the recycle bin</key>
-    <key alias="trashed">Trashed</key>
-  </area>
-  <area alias="relatedlinks">
-    <key alias="enterExternal">enter external link</key>
-    <key alias="chooseInternal">choose internal page</key>
-    <key alias="caption">Caption</key>
-    <key alias="link">Link</key>
-    <key alias="newWindow">Open in new window</key>
-    <key alias="captionPlaceholder">enter the display caption</key>
-    <key alias="externalLinkPlaceholder">Enter the link</key>
-  </area>
-  <area alias="imagecropper">
-        <key alias="reset">Reset crop</key>
-    <key alias="saveCrop">Save crop</key>
-    <key alias="addCrop">Add new crop</key>
-        <key alias="updateEditCrop">Done</key>
-        <key alias="undoEditCrop">Undo edits</key>
-  </area>
-  <area alias="rollback">
-    <key alias="headline">Select a version to compare with the current version</key>
-    <key alias="currentVersion">Current version</key>
-    <key alias="diffHelp"><![CDATA[This shows the differences between the current version and the selected version<br /><del>Red</del> text will not be shown in the selected version. , <ins>green means added</ins>]]></key>
-    <key alias="documentRolledBack">Document has been rolled back</key>
-    <key alias="htmlHelp">This displays the selected version as HTML, if you wish to see the difference between 2 versions at the same time, use the diff view</key>
-    <key alias="rollbackTo">Rollback to</key>
-    <key alias="selectVersion">Select version</key>
-    <key alias="view">View</key>
-  </area>
-  <area alias="scripts">
-    <key alias="editscript">Edit script file</key>
-  </area>
-  <area alias="sections">
-    <key alias="content">Content</key>
-    <key alias="forms">Forms</key>
-    <key alias="media">Media</key>
-    <key alias="member">Members</key>
-    <key alias="packages">Packages</key>
-    <key alias="settings">Settings</key>
-    <key alias="translation">Translation</key>
-    <key alias="users">Users</key>
-  </area>
-  <area alias="help">
-    <key alias="theBestUmbracoVideoTutorials">The best Umbraco video tutorials</key>
-  </area>
-  <area alias="settings">
-    <key alias="defaulttemplate">Default template</key>
-    <key alias="importDocumentTypeHelp">To import a document type, find the ".udt" file on your computer by clicking the "Browse" button and click "Import" (you'll be asked for confirmation on the next screen)</key>
-    <key alias="newtabname">New Tab Title</key>
-    <key alias="nodetype">Node type</key>
-    <key alias="objecttype">Type</key>
-    <key alias="stylesheet">Stylesheet</key>
-    <key alias="script">Script</key>
-    <key alias="tab">Tab</key>
-    <key alias="tabname">Tab Title</key>
-    <key alias="tabs">Tabs</key>
-    <key alias="contentTypeEnabled">Master Content Type enabled</key>
-    <key alias="contentTypeUses">This Content Type uses</key>
-    <key alias="asAContentMasterType">as a Master Content Type. Tabs from Master Content Types are not shown and can only be edited on the Master Content Type itself</key>
-    <key alias="noPropertiesDefinedOnTab">No properties defined on this tab. Click on the "add a new property" link at the top to create a new property.</key>
-    <key alias="createMatchingTemplate">Create matching template</key>
-    <key alias="addIcon">Add icon</key>
-  </area>
-  <area alias="sort">
-    <key alias="sortOrder">Sort order</key>
-    <key alias="sortCreationDate">Creation date</key>
-    <key alias="sortDone">Sorting complete.</key>
-    <key alias="sortHelp">Drag the different items up or down below to set how they should be arranged. Or click the column headers to sort the entire collection of items</key>
-    <key alias="sortPleaseWait"><![CDATA[Please wait. Items are being sorted, this can take a while.]]></key>
-    <key alias="sortEmptyState">This node has no child nodes to sort</key>
-  </area>
-  <area alias="speechBubbles">
-    <key alias="validationFailedHeader">Validation</key>
-    <key alias="validationFailedMessage">Validation errors must be fixed before the item can be saved</key>
-    <key alias="operationFailedHeader">Failed</key>
-    <key alias="operationSavedHeader">Saved</key>
-    <key alias="invalidUserPermissionsText">Insufficient user permissions, could not complete the operation</key>
-    <key alias="operationCancelledHeader">Cancelled</key>
-    <key alias="operationCancelledText">Operation was cancelled by a 3rd party add-in</key>
-    <key alias="contentTypeDublicatePropertyType">Property type already exists</key>
-    <key alias="contentTypePropertyTypeCreated">Property type created</key>
-    <key alias="contentTypePropertyTypeCreatedText"><![CDATA[Name: %0% <br /> DataType: %1%]]></key>
-    <key alias="contentTypePropertyTypeDeleted">Propertytype deleted</key>
-    <key alias="contentTypeSavedHeader">Document Type saved</key>
-    <key alias="contentTypeTabCreated">Tab created</key>
-    <key alias="contentTypeTabDeleted">Tab deleted</key>
-    <key alias="contentTypeTabDeletedText">Tab with id: %0% deleted</key>
-    <key alias="cssErrorHeader">Stylesheet not saved</key>
-    <key alias="cssSavedHeader">Stylesheet saved</key>
-    <key alias="cssSavedText">Stylesheet saved without any errors</key>
-    <key alias="dataTypeSaved">Datatype saved</key>
-    <key alias="dictionaryItemSaved">Dictionary item saved</key>
-    <key alias="editContentPublishedHeader">Content published</key>
-    <key alias="editContentPublishedText">and is visible on the website</key>
-    <key alias="editMultiContentPublishedText">%0% documents published and visible on the website</key>
-    <key alias="editVariantPublishedText">%0% published and visible on the website</key>
-    <key alias="editMultiVariantPublishedText">%0% documents published for languages %1% and visible on the website</key>
-    <key alias="editContentSavedHeader">Content saved</key>
-    <key alias="editContentSavedText">Remember to publish to make changes visible</key>
-    <key alias="editContentScheduledSavedText">A schedule for publishing has been updated</key>
-    <key alias="editVariantSavedText">%0% saved</key>
-    <key alias="editContentSendToPublish">Sent For Approval</key>
-    <key alias="editContentSendToPublishText">Changes have been sent for approval</key>
-    <key alias="editVariantSendToPublishText">%0% changes have been sent for approval</key>
-    <key alias="editMediaSaved">Media saved</key>
-    <key alias="editMediaSavedText">Media saved without any errors</key>
-    <key alias="editMemberSaved">Member saved</key>
-    <key alias="editMemberGroupSaved">Member group saved</key>
-    <key alias="editStylesheetPropertySaved">Stylesheet Property Saved</key>
-    <key alias="editStylesheetSaved">Stylesheet saved</key>
-    <key alias="editTemplateSaved">Template saved</key>
-    <key alias="editUserError">Error saving user (check log)</key>
-    <key alias="editUserSaved">User Saved</key>
-    <key alias="editUserTypeSaved">User type saved</key>
-    <key alias="editUserGroupSaved">User group saved</key>
-    <key alias="fileErrorHeader">File not saved</key>
-    <key alias="fileErrorText">file could not be saved. Please check file permissions</key>
-    <key alias="fileSavedHeader">File saved</key>
-    <key alias="fileSavedText">File saved without any errors</key>
-    <key alias="languageSaved">Language saved</key>
-    <key alias="mediaTypeSavedHeader">Media Type saved</key>
-    <key alias="memberTypeSavedHeader">Member Type saved</key>
-    <key alias="memberGroupSavedHeader">Member Group saved</key>
-    <key alias="templateErrorHeader">Template not saved</key>
-    <key alias="templateErrorText">Please make sure that you do not have 2 templates with the same alias</key>
-    <key alias="templateSavedHeader">Template saved</key>
-    <key alias="templateSavedText">Template saved without any errors!</key>
-    <key alias="contentUnpublished">Content unpublished</key>
-    <key alias="contentCultureUnpublished">Content variation %0% unpublished</key>
-    <key alias="contentMandatoryCultureUnpublished">The mandatory language '%0%' was unpublished. All languages for this content item are now unpublished.</key>
-    <key alias="partialViewSavedHeader">Partial view saved</key>
-    <key alias="partialViewSavedText">Partial view saved without any errors!</key>
-    <key alias="partialViewErrorHeader">Partial view not saved</key>
-    <key alias="partialViewErrorText">An error occurred saving the file.</key>
-    <key alias="permissionsSavedFor">Permissions saved for</key>
-    <key alias="deleteUserGroupsSuccess">Deleted %0% user groups</key>
-    <key alias="deleteUserGroupSuccess">%0% was deleted</key>
-    <key alias="enableUsersSuccess">Enabled %0% users</key>
-    <key alias="disableUsersSuccess">Disabled %0% users</key>
-    <key alias="enableUserSuccess">%0% is now enabled</key>
-    <key alias="disableUserSuccess">%0% is now disabled</key>
-    <key alias="setUserGroupOnUsersSuccess">User groups have been set</key>
-    <key alias="unlockUsersSuccess">Unlocked %0% users</key>
-    <key alias="unlockUserSuccess">%0% is now unlocked</key>
-    <key alias="memberExportedSuccess">Member was exported to file</key>
-    <key alias="memberExportedError">An error occurred while exporting the member</key>
-    <key alias="deleteUserSuccess">User %0% was deleted</key>
-    <key alias="resendInviteHeader">Invite user</key>
-    <key alias="resendInviteSuccess">Invitation has been re-sent to %0%</key>
-    <key alias="contentReqCulturePublishError">Cannot publish the document since the required '%0%' is not published</key>
-    <key alias="contentCultureValidationError">Validation failed for language '%0%'</key>
-    <key alias="documentTypeExportedSuccess">Document type was exported to file</key>
-    <key alias="documentTypeExportedError">An error occurred while exporting the document type</key>
-    <key alias="scheduleErrReleaseDate1">The release date cannot be in the past</key>
-    <key alias="scheduleErrReleaseDate2">Cannot schedule the document for publishing since the required '%0%' is not published</key>
-    <key alias="scheduleErrReleaseDate3">Cannot schedule the document for publishing since the required '%0%' has a publish date later than a non mandatory language</key>
-    <key alias="scheduleErrExpireDate1">The expire date cannot be in the past</key>
-    <key alias="scheduleErrExpireDate2">The expire date cannot be before the release date</key>
-  </area>
-  <area alias="stylesheet">
-    <key alias="addRule">Add style</key>
-    <key alias="editRule">Edit style</key>
-    <key alias="editorRules">Rich text editor styles</key>
-    <key alias="editorRulesHelp">Define the styles that should be available in the rich text editor for this stylesheet</key>
-    <key alias="editstylesheet">Edit stylesheet</key>
-    <key alias="editstylesheetproperty">Edit stylesheet property</key>
-    <key alias="nameHelp">The name displayed in the editor style selector</key>
-    <key alias="preview">Preview</key>
-    <key alias="previewHelp">How the text will look like in the rich text editor.</key>
-    <key alias="selector">Selector</key>
-    <key alias="selectorHelp">Uses CSS syntax, e.g. "h1" or ".redHeader"</key>
-    <key alias="styles">Styles</key>
-    <key alias="stylesHelp">The CSS that should be applied in the rich text editor, e.g. "color:red;"</key>
-    <key alias="tabCode">Code</key>
-    <key alias="tabRules">Rich Text Editor</key>
-  </area>
-  <area alias="template">
-    <key alias="deleteByIdFailed">Failed to delete template with ID %0%</key>
-    <key alias="edittemplate">Edit template</key>
-    <key alias="insertSections">Sections</key>
-    <key alias="insertContentArea">Insert content area</key>
-    <key alias="insertContentAreaPlaceHolder">Insert content area placeholder</key>
-    <key alias="insert">Insert</key>
-    <key alias="insertDesc">Choose what to insert into your template</key>
-    <key alias="insertDictionaryItem">Dictionary item</key>
-    <key alias="insertDictionaryItemDesc">A dictionary item is a placeholder for a translatable piece of text, which makes it easy to create designs for multilingual websites.</key>
-    <key alias="insertMacro">Macro</key>
-    <key alias="insertMacroDesc">
-            A Macro is a configurable component which is great for
-            reusable parts of your design, where you need the option to provide parameters,
-            such as galleries, forms and lists.
-        </key>
-    <key alias="insertPageField">Value</key>
-    <key alias="insertPageFieldDesc">Displays the value of a named field from the current page, with options to modify the value or fallback to alternative values.</key>
-    <key alias="insertPartialView">Partial view</key>
-    <key alias="insertPartialViewDesc">
-            A partial view is a separate template file which can be rendered inside another
-            template, it's great for reusing markup or for separating complex templates into separate files.
-        </key>
-    <key alias="mastertemplate">Master template</key>
-    <key alias="noMaster">No master</key>
-    <key alias="renderBody">Render child template</key>
-    <key alias="renderBodyDesc"><![CDATA[
-     Renders the contents of a child template, by inserting a
-     <code>@RenderBody()</code> placeholder.
-      ]]></key>
-    <key alias="defineSection">Define a named section</key>
-    <key alias="defineSectionDesc"><![CDATA[
-         Defines a part of your template as a named section by wrapping it in
-          <code>@section { ... }</code>. This can be rendered in a
-          specific area of the parent of this template, by using <code>@RenderSection</code>.
-      ]]></key>
-    <key alias="renderSection">Render a named section</key>
-    <key alias="renderSectionDesc"><![CDATA[
-      Renders a named area of a child template, by inserting a <code>@RenderSection(name)</code> placeholder.
-      This renders an area of a child template which is wrapped in a corresponding <code>@section [name]{ ... }</code> definition.
-      ]]></key>
-    <key alias="sectionName">Section Name</key>
-    <key alias="sectionMandatory">Section is mandatory</key>
-    <key alias="sectionMandatoryDesc">
-            If mandatory, the child template must contain a <code>@section</code> definition, otherwise an error is shown.
-        </key>
-    <key alias="queryBuilder">Query builder</key>
-    <key alias="itemsReturned">items returned, in</key>
-    <key alias="iWant">I want</key>
-    <key alias="allContent">all content</key>
-    <key alias="contentOfType">content of type "%0%"</key>
-    <key alias="from">from</key>
-    <key alias="websiteRoot">my website</key>
-    <key alias="where">where</key>
-    <key alias="and">and</key>
-    <key alias="is">is</key>
-    <key alias="isNot">is not</key>
-    <key alias="before">before</key>
-    <key alias="beforeIncDate">before (including selected date)</key>
-    <key alias="after">after</key>
-    <key alias="afterIncDate">after (including selected date)</key>
-    <key alias="equals">equals</key>
-    <key alias="doesNotEqual">does not equal</key>
-    <key alias="contains">contains</key>
-    <key alias="doesNotContain">does not contain</key>
-    <key alias="greaterThan">greater than</key>
-    <key alias="greaterThanEqual">greater than or equal to</key>
-    <key alias="lessThan">less than</key>
-    <key alias="lessThanEqual">less than or equal to</key>
-    <key alias="id">Id</key>
-    <key alias="name">Name</key>
-    <key alias="createdDate">Created Date</key>
-    <key alias="lastUpdatedDate">Last Updated Date</key>
-    <key alias="orderBy">order by</key>
-    <key alias="ascending">ascending</key>
-    <key alias="descending">descending</key>
-    <key alias="template">Template</key>
-  </area>
-  <area alias="grid">
-    <key alias="media">Image</key>
-    <key alias="macro">Macro</key>
-    <key alias="insertControl">Choose type of content</key>
-    <key alias="chooseLayout">Choose a layout</key>
-    <key alias="addRows">Add a row</key>
-    <key alias="addElement">Add content</key>
-    <key alias="dropElement">Drop content</key>
-    <key alias="settingsApplied">Settings applied</key>
-    <key alias="contentNotAllowed">This content is not allowed here</key>
-    <key alias="contentAllowed">This content is allowed here</key>
-    <key alias="clickToEmbed">Click to embed</key>
-    <key alias="clickToInsertImage">Click to insert image</key>
-    <key alias="placeholderImageCaption">Image caption...</key>
-    <key alias="placeholderWriteHere">Write here...</key>
-    <key alias="gridLayouts">Grid Layouts</key>
-    <key alias="gridLayoutsDetail">Layouts are the overall work area for the grid editor, usually you only need one or two different layouts</key>
-    <key alias="addGridLayout">Add Grid Layout</key>
-    <key alias="addGridLayoutDetail">Adjust the layout by setting column widths and adding additional sections</key>
-    <key alias="rowConfigurations">Row configurations</key>
-    <key alias="rowConfigurationsDetail">Rows are predefined cells arranged horizontally</key>
-    <key alias="addRowConfiguration">Add row configuration</key>
-    <key alias="addRowConfigurationDetail">Adjust the row by setting cell widths and adding additional cells</key>
-    <key alias="columns">Columns</key>
-    <key alias="columnsDetails">Total combined number of columns in the grid layout</key>
-    <key alias="settings">Settings</key>
-    <key alias="settingsDetails">Configure what settings editors can change</key>
-    <key alias="styles">Styles</key>
-    <key alias="stylesDetails">Configure what styling editors can change</key>
-    <key alias="allowAllEditors">Allow all editors</key>
-    <key alias="allowAllRowConfigurations">Allow all row configurations</key>
-    <key alias="maxItems">Maximum items</key>
-    <key alias="maxItemsDescription">Leave blank or set to 0 for unlimited</key>
-    <key alias="setAsDefault">Set as default</key>
-    <key alias="chooseExtra">Choose extra</key>
-    <key alias="chooseDefault">Choose default</key>
-    <key alias="areAdded">are added</key>
-  </area>
-  <area alias="contentTypeEditor">
-    <key alias="compositions">Compositions</key>
-    <key alias="group">Group</key>
-    <key alias="noGroups">You have not added any groups</key>
-    <key alias="addGroup">Add group</key>
-    <key alias="inheritedFrom">Inherited from</key>
-    <key alias="addProperty">Add property</key>
-    <key alias="requiredLabel">Required label</key>
-    <key alias="enableListViewHeading">Enable list view</key>
-    <key alias="enableListViewDescription">Configures the content item to show a sortable and searchable list of its children, the children will not be shown in the tree</key>
-    <key alias="allowedTemplatesHeading">Allowed Templates</key>
-    <key alias="allowedTemplatesDescription">Choose which templates editors are allowed to use on content of this type</key>
-    <key alias="allowAsRootHeading">Allow as root</key>
-    <key alias="allowAsRootDescription">Allow editors to create content of this type in the root of the content tree</key>
-    <key alias="childNodesHeading">Allowed child node types</key>
-    <key alias="childNodesDescription">Allow content of the specified types to be created underneath content of this type</key>
-    <key alias="chooseChildNode">Choose child node</key>
-    <key alias="compositionsDescription">Inherit tabs and properties from an existing document type. New tabs will be added to the current document type or merged if a tab with an identical name exists.</key>
-    <key alias="compositionInUse">This content type is used in a composition, and therefore cannot be composed itself.</key>
-    <key alias="noAvailableCompositions">There are no content types available to use as a composition.</key>
-    <key alias="availableEditors">Create new</key>
-    <key alias="reuse">Use existing</key>
-    <key alias="editorSettings">Editor settings</key>
-    <key alias="configuration">Configuration</key>
-    <key alias="yesDelete">Yes, delete</key>
-    <key alias="movedUnderneath">was moved underneath</key>
-    <key alias="copiedUnderneath">was copied underneath</key>
-    <key alias="folderToMove">Select the folder to move</key>
-    <key alias="folderToCopy">Select the folder to copy</key>
-    <key alias="structureBelow">to in the tree structure below</key>
-    <key alias="allDocumentTypes">All Document types</key>
-    <key alias="allDocuments">All Documents</key>
-    <key alias="allMediaItems">All media items</key>
-    <key alias="usingThisDocument">using this document type will be deleted permanently, please confirm you want to delete these as well.</key>
-    <key alias="usingThisMedia">using this media type will be deleted permanently, please confirm you want to delete these as well.</key>
-    <key alias="usingThisMember">using this member type will be deleted permanently, please confirm you want to delete these as well</key>
-    <key alias="andAllDocuments">and all documents using this type</key>
-    <key alias="andAllMediaItems">and all media items using this type</key>
-    <key alias="andAllMembers">and all members using this type</key>
-    <key alias="memberCanEdit">Member can edit</key>
-    <key alias="memberCanEditDescription">Allow this property value to be edited by the member on their profile page</key>
-    <key alias="isSensitiveData">Is sensitive data</key>
-    <key alias="isSensitiveDataDescription">Hide this property value from content editors that don't have access to view sensitive information</key>
-    <key alias="showOnMemberProfile">Show on member profile</key>
-    <key alias="showOnMemberProfileDescription">Allow this property value to be displayed on the member profile page</key>
-    <key alias="tabHasNoSortOrder">tab has no sort order</key>
-    <key alias="compositionUsageHeading">Where is this composition used?</key>
-    <key alias="compositionUsageSpecification">This composition is currently used in the composition of the following content types:</key>
-    <key alias="variantsHeading">Allow varying by culture</key>
-    <key alias="variantsDescription">Allow editors to create content of this type in different languages</key>
-    <key alias="allowVaryByCulture">Allow varying by culture</key>
-    <key alias="elementType">Element type</key>
-    <key alias="elementHeading">Is an Element type</key>
-    <key alias="elementDescription">An Element type is meant to be used for instance in Nested Content, and not in the tree</key>
-    <key alias="elementDoesNotSupport">This is not applicable for an Element type</key>
-    <key alias="propertyHasChanges">You have made changes to this property. Are you sure you want to discard them?</key>
-  </area>
-  <area alias="languages">
-    <key alias="addLanguage">Add language</key>
-    <key alias="mandatoryLanguage">Mandatory language</key>
-    <key alias="mandatoryLanguageHelp">Properties on this language have to be filled out before the node can be published.</key>
-    <key alias="defaultLanguage">Default language</key>
-    <key alias="defaultLanguageHelp">An Umbraco site can only have one default language set.</key>
-    <key alias="changingDefaultLanguageWarning">Switching default language may result in default content missing.</key>
-    <key alias="fallsbackToLabel">Falls back to</key>
-    <key alias="noFallbackLanguageOption">No fall back language</key>
-    <key alias="fallbackLanguageDescription">To allow multi-lingual content to fall back to another language if not present in the requested language, select it here.</key>
-    <key alias="fallbackLanguage">Fall back language</key>
-  </area>
-  <area alias="macro">
-    <key alias="addParameter">Add parameter</key>
-    <key alias="editParameter">Edit parameter</key>
-    <key alias="enterMacroName">Enter macro name</key>
-    <key alias="parameters">Parameters</key>
-    <key alias="parametersDescription">Define the parameters that should be available when using this macro.</key>
-    <key alias="selectViewFile">Select partial view macro file</key>
-  </area>
-  <area alias="modelsBuilder">
-    <key alias="buildingModels">Building models</key>
-    <key alias="waitingMessage">this can take a bit of time, don't worry</key>
-    <key alias="modelsGenerated">Models generated</key>
-    <key alias="modelsGeneratedError">Models could not be generated</key>
-    <key alias="modelsExceptionInUlog">Models generation has failed, see exception in U log</key>
-  </area>
-  <area alias="templateEditor">
-    <key alias="addFallbackField">Add fallback field</key>
-    <key alias="fallbackField">Fallback field</key>
-    <key alias="addDefaultValue">Add default value</key>
-    <key alias="defaultValue">Default value</key>
-    <key alias="alternativeField">Fallback field</key>
-    <key alias="alternativeText">Default value</key>
-    <key alias="casing">Casing</key>
-    <key alias="encoding">Encoding</key>
-    <key alias="chooseField">Choose field</key>
-    <key alias="convertLineBreaks">Convert line breaks</key>
-    <key alias="convertLineBreaksDescription">Yes, convert line breaks</key>
-    <key alias="convertLineBreaksHelp">Replaces line breaks with 'br' html tag</key>
-    <key alias="customFields">Custom Fields</key>
-    <key alias="dateOnly">Date only</key>
-    <key alias="formatAndEncoding">Format and encoding</key>
-    <key alias="formatAsDate">Format as date</key>
-    <key alias="formatAsDateDescr">Format the value as a date, or a date with time, according to the active culture</key>
-    <key alias="htmlEncode">HTML encode</key>
-    <key alias="htmlEncodeHelp">Will replace special characters by their HTML equivalent.</key>
-    <key alias="insertedAfter">Will be inserted after the field value</key>
-    <key alias="insertedBefore">Will be inserted before the field value</key>
-    <key alias="lowercase">Lowercase</key>
-    <key alias="modifyOutput">Modify output</key>
-    <key alias="none">None</key>
-    <key alias="outputSample">Output sample</key>
-    <key alias="postContent">Insert after field</key>
-    <key alias="preContent">Insert before field</key>
-    <key alias="recursive">Recursive</key>
-    <key alias="recursiveDescr">Yes, make it recursive</key>
-    <key alias="separator">Separator</key>
-    <key alias="standardFields">Standard Fields</key>
-    <key alias="uppercase">Uppercase</key>
-    <key alias="urlEncode">URL encode</key>
-    <key alias="urlEncodeHelp">Will format special characters in URLs</key>
-    <key alias="usedIfAllEmpty">Will only be used when the field values above are empty</key>
-    <key alias="usedIfEmpty">This field will only be used if the primary field is empty</key>
-    <key alias="withTime">Date and time</key>
-  </area>
-  <area alias="translation">
-    <key alias="details">Translation details</key>
-    <key alias="DownloadXmlDTD">Download XML DTD</key>
-    <key alias="fields">Fields</key>
-    <key alias="includeSubpages">Include subpages</key>
-    <key alias="mailBody"><![CDATA[
-      Hi %0%
-
-      This is an automated mail to inform you that the document '%1%'
-      has been requested for translation into '%5%' by %2%.
-
-      Go to http://%3%/translation/details.aspx?id=%4% to edit.
-
-      Or log into Umbraco to get an overview of your translation tasks
-      http://%3%
-
-      Have a nice day!
-
-      Cheers from the Umbraco robot
-    ]]></key>
-    <key alias="noTranslators">No translator users found. Please create a translator user before you start sending content to translation</key>
-    <key alias="pageHasBeenSendToTranslation">The page '%0%' has been send to translation</key>
-    <key alias="sendToTranslate">Send the page '%0%' to translation</key>
-    <key alias="totalWords">Total words</key>
-    <key alias="translateTo">Translate to</key>
-    <key alias="translationDone">Translation completed.</key>
-    <key alias="translationDoneHelp">You can preview the pages, you've just translated, by clicking below. If the original page is found, you will get a comparison of the 2 pages.</key>
-    <key alias="translationFailed">Translation failed, the XML file might be corrupt</key>
-    <key alias="translationOptions">Translation options</key>
-    <key alias="translator">Translator</key>
-    <key alias="uploadTranslationXml">Upload translation XML</key>
-  </area>
-  <area alias="treeHeaders">
-    <key alias="content">Content</key>
-    <key alias="contentBlueprints">Content Templates</key>
-    <key alias="media">Media</key>
-    <key alias="cacheBrowser">Cache Browser</key>
-    <key alias="contentRecycleBin">Recycle Bin</key>
-    <key alias="createdPackages">Created packages</key>
-    <key alias="dataTypes">Data Types</key>
-    <key alias="dictionary">Dictionary</key>
-    <key alias="installedPackages">Installed packages</key>
-    <key alias="installSkin">Install skin</key>
-    <key alias="installStarterKit">Install starter kit</key>
-    <key alias="languages">Languages</key>
-    <key alias="localPackage">Install local package</key>
-    <key alias="macros">Macros</key>
-    <key alias="mediaTypes">Media Types</key>
-    <key alias="member">Members</key>
-    <key alias="memberGroups">Member Groups</key>
-    <key alias="memberRoles">Member Roles</key>
-    <key alias="memberTypes">Member Types</key>
-    <key alias="documentTypes">Document Types</key>
-    <key alias="relationTypes">Relation Types</key>
-    <key alias="packager">Packages</key>
-    <key alias="packages">Packages</key>
-    <key alias="partialViews">Partial Views</key>
-    <key alias="partialViewMacros">Partial View Macro Files</key>
-    <key alias="repositories">Install from repository</key>
-    <key alias="runway">Install Runway</key>
-    <key alias="runwayModules">Runway modules</key>
-    <key alias="scripting">Scripting Files</key>
-    <key alias="scripts">Scripts</key>
-    <key alias="stylesheets">Stylesheets</key>
-    <key alias="templates">Templates</key>
-    <key alias="logViewer">Log Viewer</key>
-    <key alias="users">Users</key>
-    <key alias="settingsGroup">Settings</key>
-    <key alias="templatingGroup">Templating</key>
-    <key alias="thirdPartyGroup">Third Party</key>
-  </area>
-  <area alias="update">
-    <key alias="updateAvailable">New update ready</key>
-    <key alias="updateDownloadText">%0% is ready, click here for download</key>
-    <key alias="updateNoServer">No connection to server</key>
-    <key alias="updateNoServerError">Error checking for update. Please review trace-stack for further information</key>
-  </area>
-  <area alias="user">
-    <key alias="access">Access</key>
-    <key alias="accessHelp">Based on the assigned groups and start nodes, the user has access to the following nodes</key>
-    <key alias="assignAccess">Assign access</key>
-    <key alias="administrators">Administrator</key>
-    <key alias="categoryField">Category field</key>
-    <key alias="createDate">User created</key>
-    <key alias="changePassword">Change Your Password</key>
-    <key alias="changePhoto">Change photo</key>
-    <key alias="newPassword">New password</key>
-    <key alias="noLockouts">hasn't been locked out</key>
-    <key alias="noPasswordChange">The password hasn't been changed</key>
-    <key alias="confirmNewPassword">Confirm new password</key>
-    <key alias="changePasswordDescription">You can change your password for accessing the Umbraco Back Office by filling out the form below and click the 'Change Password' button</key>
-    <key alias="contentChannel">Content Channel</key>
-    <key alias="createAnotherUser">Create another user</key>
-    <key alias="createUserHelp">Create new users to give them access to Umbraco. When a new user is created a password will be generated that you can share with the user.</key>
-    <key alias="descriptionField">Description field</key>
-    <key alias="disabled">Disable User</key>
-    <key alias="documentType">Document Type</key>
-    <key alias="editors">Editor</key>
-    <key alias="excerptField">Excerpt field</key>
-    <key alias="failedPasswordAttempts">Failed login attempts</key>
-    <key alias="goToProfile">Go to user profile</key>
-    <key alias="groupsHelp">Add groups to assign access and permissions</key>
-    <key alias="inviteAnotherUser">Invite another user</key>
-    <key alias="inviteUserHelp">Invite new users to give them access to Umbraco. An invite email will be sent to the user with information on how to log in to Umbraco. Invites last for 72 hours.</key>
-    <key alias="language">Language</key>
-    <key alias="languageHelp">Set the language you will see in menus and dialogs</key>
-    <key alias="lastLockoutDate">Last lockout date</key>
-    <key alias="lastLogin">Last login</key>
-    <key alias="lastPasswordChangeDate">Password last changed</key>
-    <key alias="loginname">Username</key>
-    <key alias="mediastartnode">Media start node</key>
-    <key alias="mediastartnodehelp">Limit the media library to a specific start node</key>
-    <key alias="mediastartnodes">Media start nodes</key>
-    <key alias="mediastartnodeshelp">Limit the media library to specific start nodes</key>
-    <key alias="modules">Sections</key>
-    <key alias="noConsole">Disable Umbraco Access</key>
-    <key alias="noLogin">has not logged in yet</key>
-    <key alias="oldPassword">Old password</key>
-    <key alias="password">Password</key>
-    <key alias="resetPassword">Reset password</key>
-    <key alias="passwordChanged">Your password has been changed!</key>
-    <key alias="passwordConfirm">Please confirm the new password</key>
-    <key alias="passwordEnterNew">Enter your new password</key>
-    <key alias="passwordIsBlank">Your new password cannot be blank!</key>
-    <key alias="passwordCurrent">Current password</key>
-    <key alias="passwordInvalid">Invalid current password</key>
-    <key alias="passwordIsDifferent">There was a difference between the new password and the confirmed password. Please try again!</key>
-    <key alias="passwordMismatch">The confirmed password doesn't match the new password!</key>
-    <key alias="permissionReplaceChildren">Replace child node permissions</key>
-    <key alias="permissionSelectedPages">You are currently modifying permissions for the pages:</key>
-    <key alias="permissionSelectPages">Select pages to modify their permissions</key>
-    <key alias="removePhoto">Remove photo</key>
-    <key alias="permissionsDefault">Default permissions</key>
-    <key alias="permissionsGranular">Granular permissions</key>
-    <key alias="permissionsGranularHelp">Set permissions for specific nodes</key>
-    <key alias="profile">Profile</key>
-    <key alias="searchAllChildren">Search all children</key>
-    <key alias="sectionsHelp">Add sections to give users access</key>
-    <key alias="selectUserGroups">Select user groups</key>
-    <key alias="noStartNode">No start node selected</key>
-    <key alias="noStartNodes">No start nodes selected</key>
-    <key alias="startnode">Content start node</key>
-    <key alias="startnodehelp">Limit the content tree to a specific start node</key>
-    <key alias="startnodes">Content start nodes</key>
-    <key alias="startnodeshelp">Limit the content tree to specific start nodes</key>
-    <key alias="updateDate">User last updated</key>
-    <key alias="userCreated">has been created</key>
-    <key alias="userCreatedSuccessHelp">The new user has successfully been created. To log in to Umbraco use the password below.</key>
-    <key alias="userManagement">User management</key>
-    <key alias="username">Name</key>
-    <key alias="userPermissions">User permissions</key>
-    <key alias="usergroup">User group</key>
-    <key alias="userInvited">has been invited</key>
-    <key alias="userInvitedSuccessHelp">An invitation has been sent to the new user with details about how to log in to Umbraco.</key>
-    <key alias="userinviteWelcomeMessage">Hello there and welcome to Umbraco! In just 1 minute you’ll be good to go, we just need you to setup a password and add a picture for your avatar.</key>
-    <key alias="userinviteExpiredMessage">Welcome to Umbraco! Unfortunately your invite has expired. Please contact your administrator and ask them to resend it.</key>
-    <key alias="userinviteAvatarMessage">Uploading a photo of yourself will make it easy for other users to recognize you. Click the circle above to upload your photo.</key>
-    <key alias="writer">Writer</key>
-    <key alias="change">Change</key>
-    <key alias="yourProfile" version="7.0">Your profile</key>
-    <key alias="yourHistory" version="7.0">Your recent history</key>
-    <key alias="sessionExpires" version="7.0">Session expires in</key>
-    <key alias="inviteUser">Invite user</key>
-    <key alias="createUser">Create user</key>
-    <key alias="sendInvite">Send invite</key>
-    <key alias="backToUsers">Back to users</key>
-    <key alias="inviteEmailCopySubject">Umbraco: Invitation</key>
-    <key alias="inviteEmailCopyFormat"><![CDATA[
-        <html>
-			<head>
-				<meta name='viewport' content='width=device-width'>
-				<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
-			</head>
-			<body class='' style='font-family: sans-serif; -webkit-font-smoothing: antialiased; font-size: 14px; color: #392F54; line-height: 22px; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; background: #1d1333; margin: 0; padding: 0;' bgcolor='#1d1333'>
-				<style type='text/css'> @media only screen and (max-width: 620px) {table[class=body] h1 {font-size: 28px !important; margin-bottom: 10px !important; } table[class=body] .wrapper {padding: 32px !important; } table[class=body] .article {padding: 32px !important; } table[class=body] .content {padding: 24px !important; } table[class=body] .container {padding: 0 !important; width: 100% !important; } table[class=body] .main {border-left-width: 0 !important; border-radius: 0 !important; border-right-width: 0 !important; } table[class=body] .btn table {width: 100% !important; } table[class=body] .btn a {width: 100% !important; } table[class=body] .img-responsive {height: auto !important; max-width: 100% !important; width: auto !important; } } .btn-primary table td:hover {background-color: #34495e !important; } .btn-primary a:hover {background-color: #34495e !important; border-color: #34495e !important; } .btn  a:visited {color:#FFFFFF;} </style>
-				<table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;" bgcolor="#1d1333">
-					<tr>
-						<td style="font-family: sans-serif; font-size: 14px; vertical-align: top; padding: 24px;" valign="top">
-							<table style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
-								<tr>
-									<td background="https://umbraco.com/umbraco/assets/img/application/logo.png" bgcolor="#1d1333" width="28" height="28" valign="top" style="font-family: sans-serif; font-size: 14px; vertical-align: top;">
-										<!--[if gte mso 9]> <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="width:30px;height:30px;"> <v:fill type="tile" src="https://umbraco.com/umbraco/assets/img/application/logo.png" color="#1d1333" /> <v:textbox inset="0,0,0,0"> <![endif]-->
-										<div> </div>
-										<!--[if gte mso 9]> </v:textbox> </v:rect> <![endif]-->
-									</td>
-									<td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top"></td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-				</table>
-				<table border='0' cellpadding='0' cellspacing='0' class='body' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;' bgcolor='#1d1333'>
-					<tr>
-						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
-						<td class='container' style='font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; max-width: 560px; width: 560px; margin: 0 auto; padding: 10px;' valign='top'>
-							<div class='content' style='box-sizing: border-box; display: block; max-width: 560px; margin: 0 auto; padding: 10px;'>
-								<br>
-								<table class='main' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; border-radius: 3px; background: #FFFFFF;' bgcolor='#FFFFFF'>
-									<tr>
-										<td class='wrapper' style='font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 50px;' valign='top'>
-											<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;'>
-												<tr>
-													<td style='line-height: 24px; font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'>
-														<h1 style='color: #392F54; font-family: sans-serif; font-weight: bold; line-height: 1.4; font-size: 24px; text-align: left; text-transform: capitalize; margin: 0 0 30px;' align='left'>
-															Hi %0%,
-														</h1>
-														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
-															You have been invited by <a href="mailto:%4%" style="text-decoration: underline; color: #392F54; -ms-word-break: break-all; word-break: break-all;">%1%</a> to the Umbraco Back Office.
-														</p>
-														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
-															Message from <a href="mailto:%1%" style="text-decoration: none; color: #392F54; -ms-word-break: break-all; word-break: break-all;">%1%</a>:
-															<br/>
-															<em>%2%</em>
-														</p>
-														<table border='0' cellpadding='0' cellspacing='0' class='btn btn-primary' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;'>
-															<tbody>
-																<tr>
-																	<td align='left' style='font-family: sans-serif; font-size: 14px; vertical-align: top; padding-bottom: 15px;' valign='top'>
-																		<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'>
-																			<tbody>
-																				<tr>
-																					<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
-																						<a href='%3%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
-																							Click this link to accept the invite
-																						</a>
-																					</td>
-																				</tr>
-																			</tbody>
-																		</table>
-																	</td>
-																</tr>
-															</tbody>
-														</table>
-														<p style='max-width: 400px; display: block; color: #392F54; font-family: sans-serif; font-size: 14px; line-height: 20px; font-weight: normal; margin: 15px 0;'>If you cannot click on the link, copy and paste this URL into your browser window:</p>
-															<table border='0' cellpadding='0' cellspacing='0'>
-																<tr>
-																	<td style='-ms-word-break: break-all; word-break: break-all; font-family: sans-serif; font-size: 11px; line-height:14px;'>
-																		<font style="-ms-word-break: break-all; word-break: break-all; font-size: 11px; line-height:14px;">
-																			<a style='-ms-word-break: break-all; word-break: break-all; color: #392F54; text-decoration: underline; font-size: 11px; line-height:15px;' href='%3%'>%3%</a>
-																		</font>
-																	</td>
-																</tr>
-															</table>
-														</p>
-													</td>
-												</tr>
-											</table>
-										</td>
-									</tr>
-								</table>
-								<br><br><br>
-							</div>
-						</td>
-						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
-					</tr>
-				</table>
-			</body>
-    </html>]]></key>
-    <key alias="invite">Invite</key>
-    <key alias="defaultInvitationMessage">Resending invitation...</key>
-    <key alias="deleteUser">Delete User</key>
-    <key alias="deleteUserConfirmation">Are you sure you wish to delete this user account?</key>
-    <key alias="stateAll">All</key>
-    <key alias="stateActive">Active</key>
-    <key alias="stateDisabled">Disabled</key>
-    <key alias="stateLockedOut">Locked out</key>
-    <key alias="stateInvited">Invited</key>
-    <key alias="stateInactive">Inactive</key>
-    <key alias="sortNameAscending">Name (A-Z)</key>
-    <key alias="sortNameDescending">Name (Z-A)</key>
-    <key alias="sortCreateDateAscending">Newest</key>
-    <key alias="sortCreateDateDescending">Oldest</key>
-    <key alias="sortLastLoginDateDescending">Last login</key>
-  </area>
-  <area alias="validation">
-    <key alias="validation">Validation</key>
-    <key alias="validateAsEmail">Validate as an email address</key>
-    <key alias="validateAsNumber">Validate as a number</key>
-    <key alias="validateAsUrl">Validate as a URL</key>
-    <key alias="enterCustomValidation">...or enter a custom validation</key>
-    <key alias="fieldIsMandatory">Field is mandatory</key>
-    <key alias="validationRegExp">Enter a regular expression</key>
-    <key alias="minCount">You need to add at least</key>
-    <key alias="maxCount">You can only have</key>
-    <key alias="items">items</key>
-    <key alias="itemsSelected">items selected</key>
-    <key alias="invalidDate">Invalid date</key>
-    <key alias="invalidNumber">Not a number</key>
-    <key alias="invalidEmail">Invalid email</key>
-    <key alias="invalidNull">Value cannot be null</key>
-    <key alias="invalidEmpty">Value cannot be empty</key>
-    <key alias="invalidPattern">Value is invalid, it does not match the correct pattern</key>
-    <key alias="customValidation">Custom validation</key>
-  </area>
-  <area alias="healthcheck">
-    <!-- The following keys get these tokens passed in:
-	     0: Current value
-		   1: Recommended value
-		   2: XPath
-		   3: Configuration file path
-	  -->
-    <key alias="checkSuccessMessage">Value is set to the recommended value: '%0%'.</key>
-    <key alias="rectifySuccessMessage">Value was set to '%1%' for XPath '%2%' in configuration file '%3%'.</key>
-    <key alias="checkErrorMessageDifferentExpectedValue">Expected value '%1%' for '%2%' in configuration file '%3%', but found '%0%'.</key>
-    <key alias="checkErrorMessageUnexpectedValue">Found unexpected value '%0%' for '%2%' in configuration file '%3%'.</key>
-    <!-- The following keys get these tokens passed in:
-	     0: Current value
-		   1: Recommended value
-	  -->
-    <key alias="customErrorsCheckSuccessMessage">Custom errors are set to '%0%'.</key>
-    <key alias="customErrorsCheckErrorMessage">Custom errors are currently set to '%0%'. It is recommended to set this to '%1%' before go live.</key>
-    <key alias="customErrorsCheckRectifySuccessMessage">Custom errors successfully set to '%0%'.</key>
-    <key alias="macroErrorModeCheckSuccessMessage">MacroErrors are set to '%0%'.</key>
-    <key alias="macroErrorModeCheckErrorMessage">MacroErrors are set to '%0%' which will prevent some or all pages in your site from loading completely if there are any errors in macros. Rectifying this will set the value to '%1%'.</key>
-    <key alias="macroErrorModeCheckRectifySuccessMessage">MacroErrors are now set to '%0%'.</key>
-    <!-- The following keys get these tokens passed in:
-	     0: Current value
-		   1: Recommended value
-		   2: Server version
-	  -->
-    <key alias="trySkipIisCustomErrorsCheckSuccessMessage">Try Skip IIS Custom Errors is set to '%0%' and you're using IIS version '%1%'.</key>
-    <key alias="trySkipIisCustomErrorsCheckErrorMessage">Try Skip IIS Custom Errors is currently '%0%'. It is recommended to set this to '%1%' for your IIS version (%2%).</key>
-    <key alias="trySkipIisCustomErrorsCheckRectifySuccessMessage">Try Skip IIS Custom Errors successfully set to '%0%'.</key>
-    <!-- The following keys get predefined tokens passed in that are not all the same, like above -->
-    <key alias="configurationServiceFileNotFound">File does not exist: '%0%'.</key>
-    <key alias="configurationServiceNodeNotFound"><![CDATA[Unable to find <strong>'%0%'</strong> in config file <strong>'%1%'</strong>.]]></key>
-    <key alias="configurationServiceError">There was an error, check log for full error: %0%.</key>
-    <key alias="databaseSchemaValidationCheckDatabaseOk">Database - The database schema is correct for this version of Umbraco</key>
-    <key alias="databaseSchemaValidationCheckDatabaseErrors">%0% problems were detected with your database schema (Check the log for details)</key>
-    <key alias="databaseSchemaValidationCheckDatabaseLogMessage">Some errors were detected while validating the database schema against the current version of Umbraco.</key>
-    <key alias="httpsCheckValidCertificate">Your website's certificate is valid.</key>
-    <key alias="httpsCheckInvalidCertificate">Certificate validation error: '%0%'</key>
-    <key alias="httpsCheckExpiredCertificate">Your website's SSL certificate has expired.</key>
-    <key alias="httpsCheckExpiringCertificate">Your website's SSL certificate is expiring in %0% days.</key>
-    <key alias="healthCheckInvalidUrl">Error pinging the URL %0% - '%1%'</key>
-    <key alias="httpsCheckIsCurrentSchemeHttps">You are currently %0% viewing the site using the HTTPS scheme.</key>
-    <key alias="httpsCheckConfigurationRectifyNotPossible">The appSetting 'Umbraco.Core.UseHttps' is set to 'false' in your web.config file. Once you access this site using the HTTPS scheme, that should be set to 'true'.</key>
-    <key alias="httpsCheckConfigurationCheckResult">The appSetting 'Umbraco.Core.UseHttps' is set to '%0%' in your web.config file, your cookies are %1% marked as secure.</key>
-    <key alias="httpsCheckEnableHttpsError">Could not update the 'Umbraco.Core.UseHttps' setting in your web.config file. Error: %0%</key>
-    <!-- The following keys don't get tokens passed in -->
-    <key alias="httpsCheckEnableHttpsButton">Enable HTTPS</key>
-    <key alias="httpsCheckEnableHttpsDescription">Sets umbracoSSL setting to true in the appSettings of the web.config file.</key>
-    <key alias="httpsCheckEnableHttpsSuccess">The appSetting 'Umbraco.Core.UseHttps' is now set to 'true' in your web.config file, your cookies will be marked as secure.</key>
-    <key alias="rectifyButton">Fix</key>
-    <key alias="cannotRectifyShouldNotEqual">Cannot fix a check with a value comparison type of 'ShouldNotEqual'.</key>
-    <key alias="cannotRectifyShouldEqualWithValue">Cannot fix a check with a value comparison type of 'ShouldEqual' with a provided value.</key>
-    <key alias="valueToRectifyNotProvided">Value to fix check not provided.</key>
-    <key alias="compilationDebugCheckSuccessMessage">Debug compilation mode is disabled.</key>
-    <key alias="compilationDebugCheckErrorMessage">Debug compilation mode is currently enabled. It is recommended to disable this setting before go live.</key>
-    <key alias="compilationDebugCheckRectifySuccessMessage">Debug compilation mode successfully disabled.</key>
-    <key alias="traceModeCheckSuccessMessage">Trace mode is disabled.</key>
-    <key alias="traceModeCheckErrorMessage">Trace mode is currently enabled. It is recommended to disable this setting before go live.</key>
-    <key alias="traceModeCheckRectifySuccessMessage">Trace mode successfully disabled.</key>
-    <key alias="folderPermissionsCheckMessage">All folders have the correct permissions set.</key>
-    <!-- The following keys get these tokens passed in:
-	    0: Comma delimitted list of failed folder paths
-  	-->
-    <key alias="requiredFolderPermissionFailed"><![CDATA[The following folders must be set up with modify permissions but could not be acccessed: <strong>%0%</strong>.]]></key>
-    <key alias="optionalFolderPermissionFailed"><![CDATA[The following folders must be set up with modify permissions for certain Umbraco operations to function but could not be acccessed: <strong>%0%</strong>. If they aren't being written to no action need be taken.]]></key>
-    <key alias="filePermissionsCheckMessage">All files have the correct permissions set.</key>
-    <!-- The following keys get these tokens passed in:
-	    0: Comma delimitted list of failed folder paths
-  	-->
-    <key alias="requiredFilePermissionFailed"><![CDATA[The following files must be set up with write permissions but could not be acccessed: <strong>%0%</strong>.]]></key>
-    <key alias="optionalFilePermissionFailed"><![CDATA[The following files must be set up with write permissions for certain Umbraco operations to function but could not be acccessed: <strong>%0%</strong>. If they aren't being written to no action need be taken.]]></key>
-    <key alias="clickJackingCheckHeaderFound"><![CDATA[The header or meta-tag <strong>X-Frame-Options</strong> used to control whether a site can be IFRAMEd by another was found.]]></key>
-    <key alias="clickJackingCheckHeaderNotFound"><![CDATA[The header or meta-tag <strong>X-Frame-Options</strong> used to control whether a site can be IFRAMEd by another was not found.]]></key>
-    <key alias="setHeaderInConfig">Set Header in Config</key>
-    <key alias="clickJackingSetHeaderInConfigDescription">Adds a value to the httpProtocol/customHeaders section of web.config to prevent the site being IFRAMEd by other websites.</key>
-    <key alias="clickJackingSetHeaderInConfigSuccess">A setting to create a header preventing IFRAMEing of the site by other websites has been added to your web.config file.</key>
-    <key alias="setHeaderInConfigError">Could not update web.config file. Error: %0%</key>
-    <key alias="noSniffCheckHeaderFound"><![CDATA[The header or meta-tag <strong>X-Content-Type-Options</strong> used to protect against MIME sniffing vulnerabilities was found.]]></key>
-    <key alias="noSniffCheckHeaderNotFound"><![CDATA[The header or meta-tag <strong>X-Content-Type-Options</strong> used to protect against MIME sniffing vulnerabilities was not found.]]></key>
-    <key alias="noSniffSetHeaderInConfigDescription">Adds a value to the httpProtocol/customHeaders section of web.config to protect against MIME sniffing vulnerabilities.</key>
-    <key alias="noSniffSetHeaderInConfigSuccess">A setting to create a header protecting against MIME sniffing vulnerabilities has been added to your web.config file.</key>
-    <key alias="hSTSCheckHeaderFound"><![CDATA[The header <strong>Strict-Transport-Security</strong>, also known as the HSTS-header, was found.]]></key>
-    <key alias="hSTSCheckHeaderNotFound"><![CDATA[The header <strong>Strict-Transport-Security</strong> was not found.]]></key>
-    <key alias="hSTSSetHeaderInConfigDescription">Adds the header 'Strict-Transport-Security' with the value 'max-age=10886400' to the httpProtocol/customHeaders section of web.config. Use this fix only if you will have your domains running with https for the next 18 weeks (minimum).</key>
-    <key alias="hSTSSetHeaderInConfigSuccess">The HSTS header has been added to your web.config file.</key>
-    <key alias="xssProtectionCheckHeaderFound"><![CDATA[The header <strong>X-XSS-Protection</strong> was found.]]></key>
-    <key alias="xssProtectionCheckHeaderNotFound"><![CDATA[The header <strong>X-XSS-Protection</strong> was not found.]]></key>
-    <key alias="xssProtectionSetHeaderInConfigDescription">Adds the header 'X-XSS-Protection' with the value '1; mode=block' to the httpProtocol/customHeaders section of web.config. </key>
-    <key alias="xssProtectionSetHeaderInConfigSuccess">The X-XSS-Protection header has been added to your web.config file.</key>
-    <!-- The following key get these tokens passed in:
-	    0: Comma delimitted list of headers found
-  	-->
-    <key alias="excessiveHeadersFound"><![CDATA[The following headers revealing information about the website technology were found: <strong>%0%</strong>.]]></key>
-    <key alias="excessiveHeadersNotFound">No headers revealing information about the website technology were found.</key>
-    <key alias="smtpMailSettingsNotFound">In the Web.config file, system.net/mailsettings could not be found.</key>
-    <key alias="smtpMailSettingsHostNotConfigured">In the Web.config file system.net/mailsettings section, the host is not configured.</key>
-    <key alias="smtpMailSettingsConnectionSuccess">SMTP settings are configured correctly and the service is operating as expected.</key>
-    <key alias="smtpMailSettingsConnectionFail">The SMTP server configured with host '%0%' and port '%1%' could not be reached. Please check to ensure the SMTP settings in the Web.config file system.net/mailsettings are correct.</key>
-    <key alias="notificationEmailsCheckSuccessMessage"><![CDATA[Notification email has been set to <strong>%0%</strong>.]]></key>
-    <key alias="notificationEmailsCheckErrorMessage"><![CDATA[Notification email is still set to the default value of <strong>%0%</strong>.]]></key>
-    <key alias="scheduledHealthCheckEmailBody"><![CDATA[<html><body><p>Results of the scheduled Umbraco Health Checks run on %0% at %1% are as follows:</p>%2%</body></html>]]></key>
-    <key alias="scheduledHealthCheckEmailSubject">Umbraco Health Check Status: %0%</key>
-  </area>
-  <area alias="redirectUrls">
-    <key alias="disableUrlTracker">Disable URL tracker</key>
-    <key alias="enableUrlTracker">Enable URL tracker</key>
-    <key alias="culture">Culture</key>
-    <key alias="originalUrl">Original URL</key>
-    <key alias="redirectedTo">Redirected To</key>
-    <key alias="redirectUrlManagement">Redirect Url Management</key>
-    <key alias="panelInformation">The following URLs redirect to this content item:</key>
-    <key alias="noRedirects">No redirects have been made</key>
-    <key alias="noRedirectsDescription">When a published page gets renamed or moved a redirect will automatically be made to the new page.</key>
-    <key alias="confirmRemove">Are you sure you want to remove the redirect from '%0%' to '%1%'?</key>
-    <key alias="redirectRemoved">Redirect URL removed.</key>
-    <key alias="redirectRemoveError">Error removing redirect URL.</key>
-    <key alias="redirectRemoveWarning">This will remove the redirect</key>
-    <key alias="confirmDisable">Are you sure you want to disable the URL tracker?</key>
-    <key alias="disabledConfirm">URL tracker has now been disabled.</key>
-    <key alias="disableError">Error disabling the URL tracker, more information can be found in your log file.</key>
-    <key alias="enabledConfirm">URL tracker has now been enabled.</key>
-    <key alias="enableError">Error enabling the URL tracker, more information can be found in your log file.</key>
-  </area>
-  <area alias="emptyStates">
-    <key alias="emptyDictionaryTree">No Dictionary items to choose from</key>
-  </area>
-  <area alias="textbox">
-    <key alias="characters_left"><![CDATA[<strong>%0%</strong> characters left.]]></key>
-    <key alias="characters_exceed"><![CDATA[Maximum %0% characters, <strong>%1%</strong> too many.]]></key>
-  </area>
-  <area alias="recycleBin">
-    <key alias="contentTrashed">Trashed content with Id: {0} related to original parent content with Id: {1}</key>
-    <key alias="mediaTrashed">Trashed media with Id: {0} related to original parent media item with Id: {1}</key>
-    <key alias="itemCannotBeRestored">Cannot automatically restore this item</key>
-    <key alias="itemCannotBeRestoredHelpText">There is no location where this item can be automatically restored. You can move the item manually using the tree below.</key>
-    <key alias="wasRestored">was restored under</key>
-  </area>
-  <area alias="relationType">
-    <key alias="direction">Direction</key>
-    <key alias="parentToChild">Parent to child</key>
-    <key alias="bidirectional">Bidirectional</key>
-    <key alias="parent">Parent</key>
-    <key alias="child">Child</key>
-    <key alias="count">Count</key>
-    <key alias="relations">Relations</key>
-    <key alias="created">Created</key>
-    <key alias="comment">Comment</key>
-    <key alias="name">Name</key>
-    <key alias="noRelations">No relations for this relation type.</key>
-    <key alias="tabRelationType">Relation Type</key>
-    <key alias="tabRelations">Relations</key>
-  </area>
-  <area alias="dashboardTabs">
-    <key alias="contentIntro">Getting Started</key>
-    <key alias="contentRedirectManager">Redirect URL Management</key>
-    <key alias="mediaFolderBrowser">Content</key>
-    <key alias="settingsWelcome">Welcome</key>
-    <key alias="settingsExamine">Examine Management</key>
-    <key alias="settingsPublishedStatus">Published Status</key>
-    <key alias="settingsModelsBuilder">Models Builder</key>
-    <key alias="settingsHealthCheck">Health Check</key>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<language alias="en_us" intName="English (US)" localName="English (US)" lcid="" culture="en-US">
+  <creator>
+    <name>The Umbraco community</name>
+    <link>https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files</link>
+  </creator>
+  <area alias="actions">
+    <key alias="assignDomain">Culture and Hostnames</key>
+    <key alias="auditTrail">Audit Trail</key>
+    <key alias="browse">Browse Node</key>
+    <key alias="changeDocType">Change Document Type</key>
+    <key alias="copy">Copy</key>
+    <key alias="create">Create</key>
+    <key alias="export">Export</key>
+    <key alias="createPackage">Create Package</key>
+    <key alias="createGroup">Create group</key>
+    <key alias="delete">Delete</key>
+    <key alias="disable">Disable</key>
+    <key alias="emptyRecycleBin">Empty recycle bin</key>
+    <key alias="enable">Enable</key>
+    <key alias="exportDocumentType">Export Document Type</key>
+    <key alias="importDocumentType">Import Document Type</key>
+    <key alias="importPackage">Import Package</key>
+    <key alias="liveEdit">Edit in Canvas</key>
+    <key alias="logout">Exit</key>
+    <key alias="move">Move</key>
+    <key alias="notify">Notifications</key>
+    <key alias="protect">Public access</key>
+    <key alias="publish">Publish</key>
+    <key alias="unpublish">Unpublish</key>
+    <key alias="refreshNode">Reload</key>
+    <key alias="republish">Republish entire site</key>
+    <key alias="rename" version="7.3.0">Rename</key>
+    <key alias="restore" version="7.3.0">Restore</key>
+    <key alias="SetPermissionsForThePage">Set permissions for the page %0%</key>
+    <key alias="chooseWhereToCopy">Choose where to copy</key>
+    <key alias="chooseWhereToMove">Choose where to move</key>
+    <key alias="toInTheTreeStructureBelow">to in the tree structure below</key>
+    <key alias="wasMovedTo">was moved to</key>
+    <key alias="wasCopiedTo">was copied to</key>
+    <key alias="wasDeleted">was deleted</key>
+    <key alias="rights">Permissions</key>
+    <key alias="rollback">Rollback</key>
+    <key alias="sendtopublish">Send To Publish</key>
+    <key alias="sendToTranslate">Send To Translation</key>
+    <key alias="setGroup">Set group</key>
+    <key alias="sort">Sort</key>
+    <key alias="translate">Translate</key>
+    <key alias="update">Update</key>
+    <key alias="setPermissions">Set permissions</key>
+    <key alias="unlock">Unlock</key>
+    <key alias="createblueprint">Create Content Template</key>
+    <key alias="resendInvite">Resend Invitation</key>
+  </area>
+  <area alias="actionCategories">
+    <key alias="content">Content</key>
+    <key alias="administration">Administration</key>
+    <key alias="structure">Structure</key>
+    <key alias="other">Other</key>
+  </area>
+  <area alias="actionDescriptions">
+    <key alias="assignDomain">Allow access to assign culture and hostnames</key>
+    <key alias="auditTrail">Allow access to view a node's history log</key>
+    <key alias="browse">Allow access to view a node</key>
+    <key alias="changeDocType">Allow access to change document type for a node</key>
+    <key alias="copy">Allow access to copy a node</key>
+    <key alias="create">Allow access to create nodes</key>
+    <key alias="delete">Allow access to delete nodes</key>
+    <key alias="move">Allow access to move a node</key>
+    <key alias="protect">Allow access to set and change public access for a node</key>
+    <key alias="publish">Allow access to publish a node</key>
+    <key alias="unpublish">Allow access to unpublish a node</key>
+    <key alias="rights">Allow access to change permissions for a node</key>
+    <key alias="rollback">Allow access to roll back a node to a previous state</key>
+    <key alias="sendtopublish">Allow access to send a node for approval before publishing</key>
+    <key alias="sendToTranslate">Allow access to send a node for translation</key>
+    <key alias="sort">Allow access to change the sort order for nodes</key>
+    <key alias="translate">Allow access to translate a node</key>
+    <key alias="update">Allow access to save a node</key>
+    <key alias="createblueprint">Allow access to create a Content Template</key>
+  </area>
+  <area alias="apps">
+    <key alias="umbContent">Content</key>
+    <key alias="umbInfo">Info</key>
+  </area>
+  <area alias="assignDomain">
+    <key alias="permissionDenied">Permission denied.</key>
+    <key alias="addNew">Add new Domain</key>
+    <key alias="remove">remove</key>
+    <key alias="invalidNode">Invalid node.</key>
+    <key alias="invalidDomain">One or more domains have an invalid format.</key>
+    <key alias="duplicateDomain">Domain has already been assigned.</key>
+    <key alias="language">Language</key>
+    <key alias="domain">Domain</key>
+    <key alias="domainCreated">New domain '%0%' has been created</key>
+    <key alias="domainDeleted">Domain '%0%' is deleted</key>
+    <key alias="domainExists">Domain '%0%' has already been assigned</key>
+    <key alias="domainUpdated">Domain '%0%' has been updated</key>
+    <key alias="orEdit">Edit Current Domains</key>
+    <key alias="domainHelpWithVariants">
+    	<![CDATA[Valid domain names are: "example.com", "www.example.com", "example.com:8080", or "https://www.example.com/".
+     Furthermore also one-level paths in domains are supported, eg. "example.com/en" or "/en".]]></key>
+    <key alias="inherit">Inherit</key>
+    <key alias="setLanguage">Culture</key>
+    <key alias="setLanguageHelp"><![CDATA[Set the culture for nodes below the current node,<br /> or inherit culture from parent nodes. Will also apply<br />
+      to the current node, unless a domain below applies too.]]></key>
+    <key alias="setDomains">Domains</key>
+  </area>
+  <area alias="buttons">
+    <key alias="clearSelection">Clear selection</key>
+    <key alias="select">Select</key>
+    <key alias="somethingElse">Do something else</key>
+    <key alias="bold">Bold</key>
+    <key alias="deindent">Cancel Paragraph Indent</key>
+    <key alias="formFieldInsert">Insert form field</key>
+    <key alias="graphicHeadline">Insert graphic headline</key>
+    <key alias="htmlEdit">Edit Html</key>
+    <key alias="indent">Indent Paragraph</key>
+    <key alias="italic">Italic</key>
+    <key alias="justifyCenter">Center</key>
+    <key alias="justifyLeft">Justify Left</key>
+    <key alias="justifyRight">Justify Right</key>
+    <key alias="linkInsert">Insert Link</key>
+    <key alias="linkLocal">Insert local link (anchor)</key>
+    <key alias="listBullet">Bullet List</key>
+    <key alias="listNumeric">Numeric List</key>
+    <key alias="macroInsert">Insert macro</key>
+    <key alias="pictureInsert">Insert picture</key>
+    <key alias="publishAndClose">Publish and close</key>
+    <key alias="publishDescendants">Publish with descendants</key>
+    <key alias="relations">Edit relations</key>
+    <key alias="returnToList">Return to list</key>
+    <key alias="save">Save</key>
+    <key alias="saveAndClose">Save and close</key>
+    <key alias="saveAndPublish">Save and publish</key>
+    <key alias="saveAndSchedule">Save and schedule</key>
+    <key alias="saveToPublish">Send for approval</key>
+    <key alias="saveListView">Save list view</key>
+    <key alias="schedulePublish">Schedule</key>
+    <key alias="showPage">Preview</key>
+    <key alias="showPageDisabled">Preview is disabled because there's no template assigned</key>
+    <key alias="styleChoose">Choose style</key>
+    <key alias="styleShow">Show styles</key>
+    <key alias="tableInsert">Insert table</key>
+    <key alias="generateModelsAndClose">Generate models and close</key>
+    <key alias="saveAndGenerateModels">Save and generate models</key>
+    <key alias="undo">Undo</key>
+    <key alias="redo">Redo</key>
+    <key alias="rollback">Rollback</key>
+    <key alias="deleteTag">Delete tag</key>
+    <key alias="confirmActionCancel">Cancel</key>
+    <key alias="confirmActionConfirm">Confirm</key>
+	<key alias="morePublishingOptions">More publishing options</key>
+  </area>
+  <area alias="auditTrails">
+    <key alias="atViewingFor">Viewing for</key>
+    <key alias="delete">Content deleted</key>
+    <key alias="unpublish">Content unpublished</key>
+    <key alias="unpublishvariant">Content unpublished for languages: %0% </key>
+    <key alias="publish">Content published</key>
+    <key alias="publishvariant">Content published for languages: %0% </key>
+    <key alias="save">Content saved</key>
+    <key alias="savevariant">Content saved for languages: %0%</key>
+    <key alias="move">Content moved</key>
+    <key alias="copy">Content copied</key>
+    <key alias="rollback">Content rolled back</key>
+    <key alias="sendtopublish">Content sent for publishing</key>
+    <key alias="sendtopublishvariant">Content sent for publishing for languages: %0%</key>
+    <key alias="sort">Sort child items performed by user</key>
+    <key alias="smallCopy">Copy</key>
+    <key alias="smallPublish">Publish</key>
+    <key alias="smallPublishVariant">Publish</key>
+    <key alias="smallMove">Move</key>
+    <key alias="smallSave">Save</key>
+    <key alias="smallSaveVariant">Save</key>
+    <key alias="smallDelete">Delete</key>
+    <key alias="smallUnpublish">Unpublish</key>
+    <key alias="smallUnpublishVariant">Unpublish</key>
+    <key alias="smallRollBack">Rollback</key>
+    <key alias="smallSendToPublish">Send To Publish</key>
+    <key alias="smallSendToPublishVariant">Send To Publish</key>
+    <key alias="smallSort">Sort</key>
+    <key alias="historyIncludingVariants">History (all variants)</key>
+  </area>
+  <area alias="changeDocType">
+    <key alias="changeDocTypeInstruction">To change the document type for the selected content, first select from the list of valid types for this location.</key>
+    <key alias="changeDocTypeInstruction2">Then confirm and/or amend the mapping of properties from the current type to the new, and click Save.</key>
+    <key alias="contentRepublished">The content has been re-published.</key>
+    <key alias="currentProperty">Current Property</key>
+    <key alias="currentType">Current type</key>
+    <key alias="docTypeCannotBeChanged">The document type cannot be changed, as there are no alternatives valid for this location.  An alternative will be valid if it is allowed under the parent of the selected content item and that all existing child content items are allowed to be created under it.</key>
+    <key alias="docTypeChanged">Document Type Changed</key>
+    <key alias="mapProperties">Map Properties</key>
+    <key alias="mapToProperty">Map to Property</key>
+    <key alias="newTemplate">New Template</key>
+    <key alias="newType">New Type</key>
+    <key alias="none">none</key>
+    <key alias="selectedContent">Content</key>
+    <key alias="selectNewDocType">Select New Document Type</key>
+    <key alias="successMessage">The document type of the selected content has been successfully changed to [new type] and the following properties mapped:</key>
+    <key alias="to">to</key>
+    <key alias="validationErrorPropertyWithMoreThanOneMapping">Could not complete property mapping as one or more properties have more than one mapping defined.</key>
+    <key alias="validDocTypesNote">Only alternate types valid for the current location are displayed.</key>
+  </area>
+  <area alias="codefile">
+    <key alias="createFolderFailedById">Failed to create a folder under parent with ID %0%</key>
+    <key alias="createFolderFailedByName">Failed to create a folder under parent with name %0%</key>
+    <key alias="createFolderIllegalChars">The folder name cannot contain illegal characters.</key>
+    <key alias="deleteItemFailed">Failed to delete item: %0%</key>
+  </area>
+  <area alias="content">
+    <key alias="isPublished" version="7.2">Is Published</key>
+    <key alias="about">About this page</key>
+    <key alias="alias">Alias</key>
+    <key alias="alternativeTextHelp">(how would you describe the picture over the phone)</key>
+    <key alias="alternativeUrls">Alternative Links</key>
+    <key alias="clickToEdit">Click to edit this item</key>
+    <key alias="createBy">Created by</key>
+    <key alias="createByDesc" version="7.0">Original author</key>
+    <key alias="updatedBy" version="7.0">Updated by</key>
+    <key alias="createDate">Created</key>
+    <key alias="createDateDesc" version="7.0">Date/time this document was created</key>
+    <key alias="documentType">Document Type</key>
+    <key alias="editing">Editing</key>
+    <key alias="expireDate">Remove at</key>
+    <key alias="itemChanged">This item has been changed after publication</key>
+    <key alias="itemNotPublished">This item is not published</key>
+    <key alias="lastPublished">Last published</key>
+    <key alias="noItemsToShow">There are no items to show</key>
+    <key alias="listViewNoItems" version="7.1.5">There are no items to show in the list.</key>
+    <key alias="listViewNoContent">No child items have been added</key>
+    <key alias="listViewNoMembers">No members have been added</key>
+    <key alias="mediatype">Media Type</key>
+    <key alias="mediaLinks">Link to media item(s)</key>
+    <key alias="membergroup">Member Group</key>
+    <key alias="memberrole">Role</key>
+    <key alias="membertype">Member Type</key>
+    <key alias="noChanges">No changes have been made</key>
+    <key alias="noDate">No date chosen</key>
+    <key alias="nodeName">Page title</key>
+    <key alias="noMediaLink">This media item has no link</key>
+    <key alias="noProperties">No content can be added for this item</key>
+    <key alias="otherElements">Properties</key>
+    <key alias="parentNotPublished">This document is published but is not visible because the parent '%0%' is unpublished</key>
+    <key alias="parentCultureNotPublished">This culture is published but is not visible because it is unpublished on parent '%0%'</key>
+    <key alias="parentNotPublishedAnomaly">This document is published but is not in the cache</key>
+    <key alias="getUrlException">Could not get the url</key>
+    <key alias="routeError">This document is published but its url would collide with content %0%</key>
+    <key alias="routeErrorCannotRoute">This document is published but its url cannot be routed</key>
+    <key alias="publish">Publish</key>
+    <key alias="published">Published</key>
+    <key alias="publishedPendingChanges">Published (pending changes)</key>&gt;
+    <key alias="publishStatus">Publication Status</key>
+    <key alias="publishDescendantsHelp"><![CDATA[Click <em>Publish with descendants</em> to publish <strong>%0%</strong> and all content items underneath and thereby making their content publicly available.]]></key>
+    <key alias="publishDescendantsWithVariantsHelp"><![CDATA[Click <em>Publish with descendants</em> to publish <strong>the selected languages</strong> and the same languages of content items underneath and thereby making their content publicly available.]]></key>
+    <key alias="releaseDate">Publish at</key>
+    <key alias="unpublishDate">Unpublish at</key>
+    <key alias="removeDate">Clear Date</key>
+    <key alias="setDate">Set date</key>
+    <key alias="sortDone">Sortorder is updated</key>
+    <key alias="sortHelp">To sort the nodes, simply drag the nodes or click one of the column headers. You can select multiple nodes by holding the "shift" or "control" key while selecting</key>
+    <key alias="statistics">Statistics</key>
+    <key alias="titleOptional">Title (optional)</key>
+    <key alias="altTextOptional">Alternative text (optional)</key>
+    <key alias="type">Type</key>
+    <key alias="unpublish">Unpublish</key>
+    <key alias="unpublished">Draft</key>
+    <key alias="notCreated">Not created</key>
+    <key alias="updateDate">Last edited</key>
+    <key alias="updateDateDesc" version="7.0">Date/time this document was edited</key>
+    <key alias="uploadClear">Remove file(s)</key>
+    <key alias="urls">Link to document</key>
+    <key alias="memberof">Member of group(s)</key>
+    <key alias="notmemberof">Not a member of group(s)</key>
+    <key alias="childItems" version="7.0">Child items</key>
+    <key alias="target" version="7.0">Target</key>
+    <key alias="scheduledPublishServerTime">This translates to the following time on the server:</key>
+    <key alias="scheduledPublishDocumentation"><![CDATA[<a href="https://our.umbraco.com/documentation/Getting-Started/Data/Scheduled-Publishing/#timezones" target="_blank">What does this mean?</a>]]></key>
+    <key alias="nestedContentDeleteItem">Are you sure you want to delete this item?</key>
+    <key alias="nestedContentEditorNotSupported">Property %0% uses editor %1% which is not supported by Nested Content.</key>
+    <key alias="nestedContentNoContentTypes">No content types are configured for this property.</key>
+    <key alias="nestedContentCopyAllItemsName">%0% from %1%</key>
+    <key alias="addTextBox">Add another text box</key>
+    <key alias="removeTextBox">Remove this text box</key>
+    <key alias="contentRoot">Content root</key>
+    <key alias="includeUnpublished">Include drafts: also publish unpublished content items.</key>
+    <key alias="isSensitiveValue">This value is hidden. If you need access to view this value please contact your website administrator.</key>
+    <key alias="isSensitiveValue_short">This value is hidden.</key>
+    <key alias="languagesToPublishForFirstTime">What languages would you like to publish? All languages with content are saved!</key>
+    <key alias="languagesToPublish">What languages would you like to publish?</key>
+    <key alias="languagesToSave">What languages would you like to save?</key>
+    <key alias="languagesToSaveForFirstTime">All languages with content are saved on creation!</key>
+    <key alias="languagesToSendForApproval">What languages would you like to send for approval?</key>
+    <key alias="languagesToSchedule">What languages would you like to schedule?</key>
+    <key alias="languagesToUnpublish">Select the languages to unpublish. Unpublishing a mandatory language will unpublish all languages.</key>
+    <key alias="publishedLanguages">Published Languages</key>
+    <key alias="unpublishedLanguages">Unpublished Languages</key>
+    <key alias="unmodifiedLanguages">Unmodified Languages</key>
+    <key alias="untouchedLanguagesForFirstTime">These languages haven't been created</key>
+    <key alias="readyToPublish">Ready to Publish?</key>
+    <key alias="readyToSave">Ready to Save?</key>
+    <key alias="sendForApproval">Send for approval</key>
+    <key alias="schedulePublishHelp">Select the date and time to publish and/or unpublish the content item.</key>
+    <key alias="createEmpty">Create new</key>
+    <key alias="createFromClipboard">Paste from clipboard</key>
+  </area>
+  <area alias="blueprints">
+    <key alias="createBlueprintFrom">Create a new Content Template from '%0%'</key>
+    <key alias="blankBlueprint">Blank</key>
+    <key alias="selectBlueprint">Select a Content Template</key>
+    <key alias="createdBlueprintHeading">Content Template created</key>
+    <key alias="createdBlueprintMessage">A Content Template was created from '%0%'</key>
+    <key alias="duplicateBlueprintMessage">Another Content Template with the same name already exists</key>
+    <key alias="blueprintDescription">A Content Template is predefined content that an editor can select to use as the basis for creating new content</key>
+  </area>
+  <area alias="media">
+    <key alias="clickToUpload">Click to upload</key>
+    <key alias="orClickHereToUpload">or click here to choose files</key>
+        <key alias="dragFilesHereToUpload">You can drag files here to upload.</key>
+    <key alias="disallowedFileType">Cannot upload this file, it does not have an approved file type</key>
+    <key alias="maxFileSize">Max file size is</key>
+    <key alias="mediaRoot">Media root</key>
+    <key alias="moveFailed">Failed to move media</key>
+    <key alias="moveToSameFolderFailed">Parent and destination folders cannot be the same</key>
+    <key alias="copyFailed">Failed to copy media</key>
+    <key alias="createFolderFailed">Failed to create a folder under parent id %0%</key>
+    <key alias="renameFolderFailed">Failed to rename the folder with id %0%</key>
+    <key alias="dragAndDropYourFilesIntoTheArea">Drag and drop your file(s) into the area</key>
+  </area>
+  <area alias="member">
+    <key alias="createNewMember">Create a new member</key>
+    <key alias="allMembers">All Members</key>
+    <key alias="memberGroupNoProperties">Member groups have no additional properties for editing.</key>
+  </area>
+  <area alias="create">
+    <key alias="chooseNode">Where do you want to create the new %0%</key>
+    <key alias="createUnder">Create an item under</key>
+    <key alias="createContentBlueprint">Select the document type you want to make a content template for</key>
+    <key alias="enterFolderName">Enter a folder name</key>
+    <key alias="updateData">Choose a type and a title</key>
+    <key alias="noDocumentTypes" version="7.0"><![CDATA[There are no allowed document types available for creating content here. You must enable these in <strong>Document Types</strong> within the <strong>Settings</strong> section, by editing the <strong>Allowed child node types</strong> under <strong>Permissions</strong>.]]></key>
+    <key alias="noDocumentTypesWithNoSettingsAccess">The selected page in the content tree doesn't allow for any pages to be created below it.</key>
+    <key alias="noDocumentTypesEditPermissions">Edit permissions for this document type</key>
+    <key alias="noMediaTypes" version="7.0"><![CDATA[There are no allowed media types available for creating media here. You must enable these in <strong>Media Types Types</strong> within the <strong>Settings</strong> section, by editing the <strong>Allowed child node types</strong> under <strong>Permissions</strong>.]]></key>
+    <key alias="noMediaTypesWithNoSettingsAccess">The selected media in the tree doesn't allow for any other media to be created below it.</key>
+    <key alias="noMediaTypesEditPermissions">Edit permissions for this media type</key>    <key alias="documentTypeWithoutTemplate">Document Type without a template</key>
+    <key alias="newFolder">New folder</key>
+    <key alias="newDataType">New data type</key>
+    <key alias="newJavascriptFile">New JavaScript file</key>
+    <key alias="newEmptyPartialView">New empty partial view</key>
+    <key alias="newPartialViewMacro">New partial view macro</key>
+    <key alias="newPartialViewFromSnippet">New partial view from snippet</key>
+    <key alias="newPartialViewMacroFromSnippet">New partial view macro from snippet</key>
+    <key alias="newPartialViewMacroNoMacro">New partial view macro (without macro)</key>
+    <key alias="newStyleSheetFile">New style sheet file</key>
+    <key alias="newRteStyleSheetFile">New Rich Text Editor style sheet file</key>
+  </area>
+  <area alias="dashboard">
+    <key alias="browser">Browse your website</key>
+    <key alias="dontShowAgain">- Hide</key>
+    <key alias="nothinghappens">If Umbraco isn't opening, you might need to allow popups from this site</key>
+    <key alias="openinnew">has opened in a new window</key>
+    <key alias="restart">Restart</key>
+    <key alias="visit">Visit</key>
+    <key alias="welcome">Welcome</key>
+  </area>
+  <area alias="prompt">
+    <key alias="stay">Stay</key>
+    <key alias="discardChanges">Discard changes</key>
+    <key alias="unsavedChanges">You have unsaved changes</key>
+    <key alias="unsavedChangesWarning">Are you sure you want to navigate away from this page? - you have unsaved changes</key>
+    <key alias="confirmListViewPublish">Publishing will make the selected items visible on the site.</key>
+    <key alias="confirmListViewUnpublish">Unpublishing will remove the selected items and all their descendants from the site.</key>
+    <key alias="confirmUnpublish">Unpublishing will remove this page and all its descendants from the site.</key>
+    <key alias="doctypeChangeWarning">You have unsaved changes. Making changes to the Document Type will discard the changes.</key>
+  </area>
+  <area alias="bulk">
+    <key alias="done">Done</key>
+    <key alias="deletedItem">Deleted %0% item</key>
+    <key alias="deletedItems">Deleted %0% items</key>
+    <key alias="deletedItemOfItem">Deleted %0% out of %1% item</key>
+    <key alias="deletedItemOfItems">Deleted %0% out of %1% items</key>
+    <key alias="publishedItem">Published %0% item</key>
+    <key alias="publishedItems">Published %0% items</key>
+    <key alias="publishedItemOfItem">Published %0% out of %1% item</key>
+    <key alias="publishedItemOfItems">Published %0% out of %1% items</key>
+    <key alias="unpublishedItem">Unpublished %0% item</key>
+    <key alias="unpublishedItems">Unpublished %0% items</key>
+    <key alias="unpublishedItemOfItem">Unpublished %0% out of %1% item</key>
+    <key alias="unpublishedItemOfItems">Unpublished %0% out of %1% items</key>
+    <key alias="movedItem">Moved %0% item</key>
+    <key alias="movedItems">Moved %0% items</key>
+    <key alias="movedItemOfItem">Moved %0% out of %1% item</key>
+    <key alias="movedItemOfItems">Moved %0% out of %1% items</key>
+    <key alias="copiedItem">Copied %0% item</key>
+    <key alias="copiedItems">Copied %0% items</key>
+    <key alias="copiedItemOfItem">Copied %0% out of %1% item</key>
+    <key alias="copiedItemOfItems">Copied %0% out of %1% items</key>
+  </area>
+  <area alias="defaultdialogs">
+    <key alias="nodeNameLinkPicker">Link title</key>
+    <key alias="urlLinkPicker">Link</key>
+    <key alias="anchorLinkPicker">Anchor / querystring</key>
+    <key alias="anchorInsert">Name</key>
+    <key alias="closeThisWindow">Close this window</key>
+    <key alias="confirmdelete">Are you sure you want to delete</key>
+    <key alias="confirmdisable">Are you sure you want to disable</key>
+    <key alias="confirmlogout">Are you sure?</key>
+    <key alias="confirmSure">Are you sure?</key>
+    <key alias="cut">Cut</key>
+    <key alias="editdictionary">Edit Dictionary Item</key>
+    <key alias="editlanguage">Edit Language</key>
+    <key alias="insertAnchor">Insert local link</key>
+    <key alias="insertCharacter">Insert character</key>
+    <key alias="insertgraphicheadline">Insert graphic headline</key>
+    <key alias="insertimage">Insert picture</key>
+    <key alias="insertlink">Insert link</key>
+    <key alias="insertMacro">Click to add a Macro</key>
+    <key alias="inserttable">Insert table</key>
+    <key alias="languagedeletewarning">This will delete the language</key>
+    <key alias="lastEdited">Last Edited</key>
+    <key alias="link">Link</key>
+    <key alias="linkinternal">Internal link:</key>
+    <key alias="linklocaltip">When using local links, insert "#" in front of link</key>
+    <key alias="linknewwindow">Open in new window?</key>
+    <key alias="macroContainerSettings">Macro Settings</key>
+    <key alias="macroDoesNotHaveProperties">This macro does not contain any properties you can edit</key>
+    <key alias="paste">Paste</key>
+    <key alias="permissionsEdit">Edit permissions for</key>
+    <key alias="permissionsSet">Set permissions for</key>
+    <key alias="permissionsSetForGroup">Set permissions for %0% for user group %1%</key>
+    <key alias="permissionsHelp">Select the users groups you want to set permissions for</key>
+    <key alias="recycleBinDeleting">The items in the recycle bin are now being deleted. Please do not close this window while this operation takes place</key>
+    <key alias="recycleBinIsEmpty">The recycle bin is now empty</key>
+    <key alias="recycleBinWarning">When items are deleted from the recycle bin, they will be gone forever</key>
+    <key alias="regexSearchError"><![CDATA[<a target='_blank' href='http://regexlib.com'>regexlib.com</a>'s webservice is currently experiencing some problems, which we have no control over. We are very sorry for this inconvenience.]]></key>
+    <key alias="regexSearchHelp">Search for a regular expression to add validation to a form field. Example: 'email, 'zip-code' 'url'</key>
+    <key alias="removeMacro">Remove Macro</key>
+    <key alias="requiredField">Required Field</key>
+    <key alias="sitereindexed">Site is reindexed</key>
+    <key alias="siterepublished">The website cache has been refreshed. All publish content is now up to date. While all unpublished content is still unpublished</key>
+    <key alias="siterepublishHelp">The website cache will be refreshed. All published content will be updated, while unpublished content will stay unpublished.</key>
+    <key alias="tableColumns">Number of columns</key>
+    <key alias="tableRows">Number of rows</key>
+    <key alias="thumbnailimageclickfororiginal">Click on the image to see full size</key>
+    <key alias="treepicker">Pick item</key>
+    <key alias="viewCacheItem">View Cache Item</key>
+    <key alias="relateToOriginalLabel">Relate to original</key>
+    <key alias="includeDescendants">Include descendants</key>
+    <key alias="theFriendliestCommunity">The friendliest community</key>
+    <key alias="linkToPage">Link to page</key>
+    <key alias="openInNewWindow">Opens the linked document in a new window or tab</key>
+    <key alias="linkToMedia">Link to media</key>
+    <key alias="selectContentStartNode">Select content start node</key>
+    <key alias="selectMedia">Select media</key>
+    <key alias="selectMediaType">Select media type</key>
+    <key alias="selectIcon">Select icon</key>
+    <key alias="selectItem">Select item</key>
+    <key alias="selectLink">Select link</key>
+    <key alias="selectMacro">Select macro</key>
+    <key alias="selectContent">Select content</key>
+    <key alias="selectContentType">Select content type</key>
+    <key alias="selectMediaStartNode">Select media start node</key>
+    <key alias="selectMember">Select member</key>
+    <key alias="selectMemberGroup">Select member group</key>
+    <key alias="selectMemberType">Select member type</key>
+    <key alias="selectNode">Select node</key>
+    <key alias="selectSections">Select sections</key>
+    <key alias="selectUsers">Select users</key>
+    <key alias="noIconsFound">No icons were found</key>
+    <key alias="noMacroParams">There are no parameters for this macro</key>
+    <key alias="noMacros">There are no macros available to insert</key>
+    <key alias="externalLoginProviders">External login providers</key>
+    <key alias="exceptionDetail">Exception Details</key>
+    <key alias="stacktrace">Stacktrace</key>
+    <key alias="innerException">Inner Exception</key>
+    <key alias="linkYour">Link your</key>
+    <key alias="unLinkYour">Un-link your</key>
+    <key alias="account">account</key>
+    <key alias="selectEditor">Select editor</key>
+    <key alias="selectSnippet">Select snippet</key>
+    <key alias="variantdeletewarning">This will delete the node and all its languages. If you only want to delete one language go and unpublish it instead.</key>
+  </area>
+  <area alias="dictionary">
+    <key alias="noItems">There are no dictionary items.</key>
+  </area>
+  <area alias="dictionaryItem">
+    <key alias="description"><![CDATA[
+      Edit the different language versions for the dictionary item '<em>%0%</em>' below
+   ]]></key>
+    <key alias="displayName">Culture Name</key>
+    <key alias="changeKeyError"><![CDATA[
+      The key '%0%' already exists.
+   ]]></key>
+    <key alias="overviewTitle">Dictionary overview</key>
+  </area>
+  <area alias="examineManagement">
+    <key alias="configuredSearchers">Configured Searchers</key>
+    <key alias="configuredSearchersDescription">Shows properties and tools for any configured Searcher (i.e. such as a multi-index searcher)</key>
+    <key alias="fieldValues">Field values</key>
+    <key alias="healthStatus">Health status</key>
+    <key alias="healthStatusDescription">The health status of the index and if it can be read</key>
+    <key alias="indexers">Indexers</key>
+    <key alias="indexInfo">Index info</key>
+    <key alias="indexInfoDescription">Lists the properties of the index</key>
+    <key alias="manageIndexes">Manage Examine's indexes</key>
+    <key alias="manageIndexesDescription">Allows you to view the details of each index and provides some tools for managing the indexes</key>
+    <key alias="rebuildIndex">Rebuild index</key>
+    <key alias="rebuildIndexWarning"><![CDATA[
+      This will cause the index to be rebuilt.<br />
+      Depending on how much content there is in your site this could take a while.<br />
+      It is not recommended to rebuild an index during times of high website traffic or when editors are editing content.
+     ]]>
+    </key>
+    <key alias="searchers">Searchers</key>
+    <key alias="searchDescription">Search the index and view the results</key>
+    <key alias="tools">Tools</key>
+    <key alias="toolsDescription">Tools to manage the index</key>
+  </area>
+  <area alias="placeholders">
+    <key alias="username">Enter your username</key>
+    <key alias="password">Enter your password</key>
+    <key alias="confirmPassword">Confirm your password</key>
+    <key alias="nameentity">Name the %0%...</key>
+    <key alias="entername">Enter a name...</key>
+    <key alias="enteremail">Enter an email...</key>
+    <key alias="enterusername">Enter a username...</key>
+    <key alias="label">Label...</key>
+    <key alias="enterDescription">Enter a description...</key>
+    <key alias="search">Type to search...</key>
+    <key alias="filter">Type to filter...</key>
+    <key alias="enterTags">Type to add tags (press enter after each tag)...</key>
+    <key alias="email">Enter your email</key>
+    <key alias="enterMessage">Enter a message...</key>
+    <key alias="usernameHint">Your username is usually your email</key>
+    <key alias="anchor">#value or ?key=value</key>
+    <key alias="enterAlias">Enter alias...</key>
+    <key alias="generatingAlias">Generating alias...</key>
+    <key alias="a11yCreateItem">Create item</key>
+    <key alias="a11yEdit">Edit</key>
+    <key alias="a11yName">Name</key>
+  </area>
+  <area alias="editcontenttype">
+    <key alias="createListView" version="7.2">Create custom list view</key>
+    <key alias="removeListView" version="7.2">Remove custom list view</key>
+    <key alias="aliasAlreadyExists">A content type, media type or member type with this alias already exists</key>
+  </area>
+  <area alias="renamecontainer">
+    <key alias="renamed">Renamed</key>
+    <key alias="enterNewFolderName">Enter a new folder name here</key>
+    <key alias="folderWasRenamed">%0% was renamed to %1%</key>
+  </area>
+  <area alias="editdatatype">
+    <key alias="addPrevalue">Add prevalue</key>
+    <key alias="dataBaseDatatype">Database datatype</key>
+    <key alias="guid">Property editor GUID</key>
+    <key alias="renderControl">Property editor</key>
+    <key alias="rteButtons">Buttons</key>
+    <key alias="rteEnableAdvancedSettings">Enable advanced settings for</key>
+    <key alias="rteEnableContextMenu">Enable context menu</key>
+    <key alias="rteMaximumDefaultImgSize">Maximum default size of inserted images</key>
+    <key alias="rteRelatedStylesheets">Related stylesheets</key>
+    <key alias="rteShowLabel">Show label</key>
+    <key alias="rteWidthAndHeight">Width and height</key>
+    <key alias="allPropTypes">All property types &amp; property data</key>
+    <key alias="willBeDeleted">using this data type will be deleted permanently, please confirm you want to delete these as well</key>
+    <key alias="yesDelete">Yes, delete</key>
+    <key alias="andAllRelated">and all property types &amp; property data using this data type</key>
+    <key alias="selectFolder">Select the folder to move</key>
+    <key alias="inTheTree">to in the tree structure below</key>
+    <key alias="wasMoved">was moved underneath</key>
+  </area>
+  <area alias="errorHandling">
+    <key alias="errorButDataWasSaved">Your data has been saved, but before you can publish this page there are some errors you need to fix first:</key>
+    <key alias="errorChangingProviderPassword">The current membership provider does not support changing password (EnablePasswordRetrieval need to be true)</key>
+    <key alias="errorExistsWithoutTab">%0% already exists</key>
+    <key alias="errorHeader">There were errors:</key>
+    <key alias="errorHeaderWithoutTab">There were errors:</key>
+    <key alias="errorInPasswordFormat">The password should be a minimum of %0% characters long and contain at least %1% non-alpha numeric character(s)</key>
+    <key alias="errorIntegerWithoutTab">%0% must be an integer</key>
+    <key alias="errorMandatory">The %0% field in the %1% tab is mandatory</key>
+    <key alias="errorMandatoryWithoutTab">%0% is a mandatory field</key>
+    <key alias="errorRegExp">%0% at %1% is not in a correct format</key>
+    <key alias="errorRegExpWithoutTab">%0% is not in a correct format</key>
+  </area>
+  <area alias="errors">
+    <key alias="receivedErrorFromServer">Received an error from the server</key>
+    <key alias="dissallowedMediaType">The specified file type has been disallowed by the administrator</key>
+    <key alias="codemirroriewarning">NOTE! Even though CodeMirror is enabled by configuration, it is disabled in Internet Explorer because it's not stable enough.</key>
+    <key alias="contentTypeAliasAndNameNotNull">Please fill both alias and name on the new property type!</key>
+    <key alias="filePermissionsError">There is a problem with read/write access to a specific file or folder</key>
+    <key alias="macroErrorLoadingPartialView">Error loading Partial View script (file: %0%)</key>
+    <key alias="missingTitle">Please enter a title</key>
+    <key alias="missingType">Please choose a type</key>
+    <key alias="pictureResizeBiggerThanOrg">You're about to make the picture larger than the original size. Are you sure that you want to proceed?</key>
+    <key alias="startNodeDoesNotExists">Startnode deleted, please contact your administrator</key>
+    <key alias="stylesMustMarkBeforeSelect">Please mark content before changing style</key>
+    <key alias="stylesNoStylesOnPage">No active styles available</key>
+    <key alias="tableColMergeLeft">Please place cursor at the left of the two cells you wish to merge</key>
+    <key alias="tableSplitNotSplittable">You cannot split a cell that hasn't been merged.</key>
+    <key alias="propertyHasErrors">This property is invalid</key>
+  </area>
+  <area alias="general">
+    <key alias="options">Options</key>
+    <key alias="about">About</key>
+    <key alias="action">Action</key>
+    <key alias="actions">Actions</key>
+    <key alias="add">Add</key>
+    <key alias="alias">Alias</key>
+    <key alias="all">All</key>
+    <key alias="areyousure">Are you sure?</key>
+    <key alias="back">Back</key>
+    <key alias="backToOverview">Back to overview</key>
+    <key alias="border">Border</key>
+    <key alias="by">by</key>
+    <key alias="cancel">Cancel</key>
+    <key alias="cellMargin">Cell margin</key>
+    <key alias="choose">Choose</key>
+    <key alias="close">Close</key>
+    <key alias="closewindow">Close Window</key>
+    <key alias="comment">Comment</key>
+    <key alias="confirm">Confirm</key>
+    <key alias="constrain">Constrain</key>
+    <key alias="constrainProportions">Constrain proportions</key>
+    <key alias="content">Content</key>
+    <key alias="continue">Continue</key>
+    <key alias="copy">Copy</key>
+    <key alias="create">Create</key>
+    <key alias="database">Database</key>
+    <key alias="date">Date</key>
+    <key alias="default">Default</key>
+    <key alias="delete">Delete</key>
+    <key alias="deleted">Deleted</key>
+    <key alias="deleting">Deleting...</key>
+    <key alias="design">Design</key>
+    <key alias="dictionary">Dictionary</key>
+    <key alias="dimensions">Dimensions</key>
+    <key alias="down">Down</key>
+    <key alias="download">Download</key>
+    <key alias="edit">Edit</key>
+    <key alias="edited">Edited</key>
+    <key alias="elements">Elements</key>
+    <key alias="email">Email</key>
+    <key alias="error">Error</key>
+    <key alias="field">Field</key>
+    <key alias="findDocument">Find</key>
+    <key alias="first">First</key>
+    <key alias="general">General</key>
+    <key alias="groups">Groups</key>
+    <key alias="group">Group</key>
+    <key alias="height">Height</key>
+    <key alias="help">Help</key>
+    <key alias="hide">Hide</key>
+    <key alias="history">History</key>
+    <key alias="icon">Icon</key>
+    <key alias="id">Id</key>
+    <key alias="import">Import</key>
+    <key alias="includeFromsubFolders">Include subfolders in search</key>
+    <key alias="info">Info</key>
+    <key alias="innerMargin">Inner margin</key>
+    <key alias="insert">Insert</key>
+    <key alias="install">Install</key>
+    <key alias="invalid">Invalid</key>
+    <key alias="justify">Justify</key>
+    <key alias="label">Label</key>
+    <key alias="language">Language</key>
+    <key alias="last">Last</key>
+    <key alias="layout">Layout</key>
+    <key alias="links">Links</key>
+    <key alias="loading">Loading</key>
+    <key alias="locked">Locked</key>
+    <key alias="login">Login</key>
+    <key alias="logoff">Log off</key>
+    <key alias="logout">Logout</key>
+    <key alias="macro">Macro</key>
+    <key alias="mandatory">Mandatory</key>
+    <key alias="message">Message</key>
+    <key alias="move">Move</key>
+    <key alias="name">Name</key>
+    <key alias="new">New</key>
+    <key alias="next">Next</key>
+    <key alias="no">No</key>
+    <key alias="of">of</key>
+    <key alias="off">Off</key>
+    <key alias="ok">OK</key>
+    <key alias="open">Open</key>
+    <key alias="on">On</key>
+    <key alias="or">or</key>
+    <key alias="orderBy">Order by</key>
+    <key alias="password">Password</key>
+    <key alias="path">Path</key>
+    <key alias="pleasewait">One moment please...</key>
+    <key alias="previous">Previous</key>
+    <key alias="properties">Properties</key>
+    <key alias="rebuild">Rebuild</key>
+    <key alias="reciept">Email to receive form data</key>
+    <key alias="recycleBin">Recycle Bin</key>
+    <key alias="recycleBinEmpty">Your recycle bin is empty</key>
+    <key alias="reload">Reload</key>
+    <key alias="remaining">Remaining</key>
+    <key alias="remove">Remove</key>
+    <key alias="rename">Rename</key>
+    <key alias="renew">Renew</key>
+    <key alias="required" version="7.0">Required</key>
+    <key alias="retrieve">Retrieve</key>
+    <key alias="retry">Retry</key>
+    <key alias="rights">Permissions</key>
+    <key alias="scheduledPublishing">Scheduled Publishing</key>
+    <key alias="search">Search</key>
+    <key alias="searchNoResult">Sorry, we can not find what you are looking for.</key>
+    <key alias="noItemsInList">No items have been added</key>
+    <key alias="server">Server</key>
+    <key alias="settings">Settings</key>
+    <key alias="show">Show</key>
+    <key alias="showPageOnSend">Show page on Send</key>
+    <key alias="size">Size</key>
+    <key alias="sort">Sort</key>
+    <key alias="status">Status</key>
+    <key alias="submit">Submit</key>
+    <key alias="type">Type</key>
+    <key alias="typeToSearch">Type to search...</key>
+    <key alias="under">under</key>
+    <key alias="up">Up</key>
+    <key alias="update">Update</key>
+    <key alias="upgrade">Upgrade</key>
+    <key alias="upload">Upload</key>
+    <key alias="url">Url</key>
+    <key alias="user">User</key>
+    <key alias="username">Username</key>
+    <key alias="value">Value</key>
+    <key alias="view">View</key>
+    <key alias="welcome">Welcome...</key>
+    <key alias="width">Width</key>
+    <key alias="yes">Yes</key>
+    <key alias="folder">Folder</key>
+    <key alias="searchResults">Search results</key>
+    <key alias="reorder">Reorder</key>
+    <key alias="reorderDone">I am done reordering</key>
+    <key alias="preview">Preview</key>
+    <key alias="changePassword">Change password</key>
+    <key alias="to">to</key>
+    <key alias="listView">List view</key>
+    <key alias="saving">Saving...</key>
+    <key alias="current">current</key>
+    <key alias="embed">Embed</key>
+    <key alias="selected">selected</key>
+  </area>
+  <area alias="colors">
+    <key alias="blue">Blue</key>
+  </area>
+  <area alias="shortcuts">
+    <key alias="addGroup">Add group</key>
+    <key alias="addProperty">Add property</key>
+    <key alias="addEditor">Add editor</key>
+    <key alias="addTemplate">Add template</key>
+    <key alias="addChildNode">Add child node</key>
+    <key alias="addChild">Add child</key>
+    <key alias="editDataType">Edit data type</key>
+    <key alias="navigateSections">Navigate sections</key>
+    <key alias="shortcut">Shortcuts</key>
+    <key alias="showShortcuts">show shortcuts</key>
+    <key alias="toggleListView">Toggle list view</key>
+    <key alias="toggleAllowAsRoot">Toggle allow as root</key>
+    <key alias="commentLine">Comment/Uncomment lines</key>
+    <key alias="removeLine">Remove line</key>
+    <key alias="copyLineUp">Copy Lines Up</key>
+    <key alias="copyLineDown">Copy Lines Down</key>
+    <key alias="moveLineUp">Move Lines Up</key>
+    <key alias="moveLineDown">Move Lines Down</key>
+    <key alias="generalHeader">General</key>
+    <key alias="editorHeader">Editor</key>
+    <key alias="toggleAllowCultureVariants">Toggle allow culture variants</key>
+  </area>
+  <area alias="graphicheadline">
+    <key alias="backgroundcolor">Background color</key>
+    <key alias="bold">Bold</key>
+    <key alias="color">Text color</key>
+    <key alias="font">Font</key>
+    <key alias="text">Text</key>
+  </area>
+  <area alias="headers">
+    <key alias="page">Page</key>
+  </area>
+  <area alias="installer">
+    <key alias="databaseErrorCannotConnect">The installer cannot connect to the database.</key>
+    <key alias="databaseErrorWebConfig">Could not save the web.config file. Please modify the connection string manually.</key>
+    <key alias="databaseFound">Your database has been found and is identified as</key>
+    <key alias="databaseHeader">Database configuration</key>
+    <key alias="databaseInstall"><![CDATA[
+      Press the <strong>install</strong> button to install the Umbraco %0% database
+    ]]></key>
+    <key alias="databaseInstallDone"><![CDATA[Umbraco %0% has now been copied to your database. Press <strong>Next</strong> to proceed.]]></key>
+    <key alias="databaseNotFound"><![CDATA[<p>Database not found! Please check that the information in the "connection string" of the "web.config" file is correct.</p>
+              <p>To proceed, please edit the "web.config" file (using Visual Studio or your favourite text editor), scroll to the bottom, add the connection string for your database in the key named "UmbracoDbDSN" and save the file. </p>
+              <p>
+              Click the <strong>retry</strong> button when
+              done.<br /><a href="https://our.umbraco.com/documentation/Using-Umbraco/Config-files/webconfig7" target="_blank">
+			              More information on editing web.config here.</a></p>]]></key>
+    <key alias="databaseText"><![CDATA[To complete this step, you must know some information regarding your database server ("connection string").<br />
+        Please contact your ISP if necessary.
+        If you're installing on a local machine or server you might need information from your system administrator.]]></key>
+    <key alias="databaseUpgrade"><![CDATA[
+      <p>
+      Press the <strong>upgrade</strong> button to upgrade your database to Umbraco %0%</p>
+      <p>
+      Don't worry - no content will be deleted and everything will continue working afterwards!
+      </p>
+      ]]></key>
+    <key alias="databaseUpgradeDone"><![CDATA[Your database has been upgraded to the final version %0%.<br/>Press <strong>Next</strong> to
+      proceed. ]]></key>
+    <key alias="databaseUpToDate"><![CDATA[Your current database is up-to-date!. Click <strong>next</strong> to continue the configuration wizard]]></key>
+    <key alias="defaultUserChangePass"><![CDATA[<strong>The Default users' password needs to be changed!</strong>]]></key>
+    <key alias="defaultUserDisabled"><![CDATA[<strong>The Default user has been disabled or has no access to Umbraco!</strong></p><p>No further actions needs to be taken. Click <b>Next</b> to proceed.]]></key>
+    <key alias="defaultUserPassChanged"><![CDATA[<strong>The Default user's password has been successfully changed since the installation!</strong></p><p>No further actions needs to be taken. Click <strong>Next</strong> to proceed.]]></key>
+    <key alias="defaultUserPasswordChanged">The password is changed!</key>
+    <key alias="greatStart">Get a great start, watch our introduction videos</key>
+    <key alias="licenseText">By clicking the next button (or modifying the umbracoConfigurationStatus in web.config), you accept the license for this software as specified in the box below. Notice that this Umbraco distribution consists of two different licenses, the open source MIT license for the framework and the Umbraco freeware license that covers the UI.</key>
+    <key alias="None">Not installed yet.</key>
+    <key alias="permissionsAffectedFolders">Affected files and folders</key>
+    <key alias="permissionsAffectedFoldersMoreInfo">More information on setting up permissions for Umbraco here</key>
+    <key alias="permissionsAffectedFoldersText">You need to grant ASP.NET modify permissions to the following files/folders</key>
+    <key alias="permissionsAlmostPerfect"><![CDATA[<strong>Your permission settings are almost perfect!</strong><br /><br />
+        You can run Umbraco without problems, but you will not be able to install packages which are recommended to take full advantage of Umbraco.]]></key>
+    <key alias="permissionsHowtoResolve">How to Resolve</key>
+    <key alias="permissionsHowtoResolveLink">Click here to read the text version</key>
+    <key alias="permissionsHowtoResolveText"><![CDATA[Watch our <strong>video tutorial</strong> on setting up folder permissions for Umbraco or read the text version.]]></key>
+    <key alias="permissionsMaybeAnIssue"><![CDATA[<strong>Your permission settings might be an issue!</strong>
+      <br/><br />
+      You can run Umbraco without problems, but you will not be able to create folders or install packages which are recommended to take full advantage of Umbraco.]]></key>
+    <key alias="permissionsNotReady"><![CDATA[<strong>Your permission settings are not ready for Umbraco!</strong>
+          <br /><br />
+          In order to run Umbraco, you'll need to update your permission settings.]]></key>
+    <key alias="permissionsPerfect"><![CDATA[<strong>Your permission settings are perfect!</strong><br /><br />
+              You are ready to run Umbraco and install packages!]]></key>
+    <key alias="permissionsResolveFolderIssues">Resolving folder issue</key>
+    <key alias="permissionsResolveFolderIssuesLink">Follow this link for more information on problems with ASP.NET and creating folders</key>
+    <key alias="permissionsSettingUpPermissions">Setting up folder permissions</key>
+    <key alias="permissionsText"><![CDATA[
+      Umbraco needs write/modify access to certain directories in order to store files like pictures and PDF's.
+      It also stores temporary data (aka: cache) for enhancing the performance of your website.
+    ]]></key>
+    <key alias="runwayFromScratch">I want to start from scratch</key>
+    <key alias="runwayFromScratchText"><![CDATA[
+        Your website is completely empty at the moment, so that's perfect if you want to start from scratch and create your own document types and templates.
+        (<a href="http://Umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">learn how</a>)
+        You can still choose to install Runway later on. Please go to the Developer section and choose Packages.
+      ]]></key>
+    <key alias="runwayHeader">You've just set up a clean Umbraco platform. What do you want to do next?</key>
+    <key alias="runwayInstalled">Runway is installed</key>
+    <key alias="runwayInstalledText"><![CDATA[
+      You have the foundation in place. Select what modules you wish to install on top of it.<br />
+      This is our list of recommended modules, check off the ones you would like to install, or view the <a href="#" onclick="toggleModules(); return false;" id="toggleModuleList">full list of modules</a>
+      ]]></key>
+    <key alias="runwayOnlyProUsers">Only recommended for experienced users</key>
+    <key alias="runwaySimpleSite">I want to start with a simple website</key>
+    <key alias="runwaySimpleSiteText"><![CDATA[
+      <p>
+      "Runway" is a simple website providing some basic document types and templates. The installer can set up Runway for you automatically,
+        but you can easily edit, extend or remove it. It's not necessary and you can perfectly use Umbraco without it. However,
+        Runway offers an easy foundation based on best practices to get you started faster than ever.
+        If you choose to install Runway, you can optionally select basic building blocks called Runway Modules to enhance your Runway pages.
+        </p>
+        <small>
+        <em>Included with Runway:</em> Home page, Getting Started page, Installing Modules page.<br />
+        <em>Optional Modules:</em> Top Navigation, Sitemap, Contact, Gallery.
+        </small>
+      ]]></key>
+    <key alias="runwayWhatIsRunway">What is Runway</key>
+    <key alias="step1">Step 1/5 Accept license</key>
+    <key alias="step2">Step 2/5: Database configuration</key>
+    <key alias="step3">Step 3/5: Validating File Permissions</key>
+    <key alias="step4">Step 4/5: Check Umbraco security</key>
+    <key alias="step5">Step 5/5: Umbraco is ready to get you started</key>
+    <key alias="thankYou">Thank you for choosing Umbraco</key>
+    <key alias="theEndBrowseSite"><![CDATA[<h3>Browse your new site</h3>
+You installed Runway, so why not see how your new website looks.]]></key>
+    <key alias="theEndFurtherHelp"><![CDATA[<h3>Further help and information</h3>
+Get help from our award winning community, browse the documentation or watch some free videos on how to build a simple site, how to use packages and a quick guide to the Umbraco terminology]]></key>
+    <key alias="theEndHeader">Umbraco %0% is installed and ready for use</key>
+    <key alias="theEndInstallFailed"><![CDATA[To finish the installation, you'll need to
+        manually edit the <strong>/web.config file</strong> and update the AppSetting key <strong>UmbracoConfigurationStatus</strong> in the bottom to the value of <strong>'%0%'</strong>.]]></key>
+    <key alias="theEndInstallSuccess"><![CDATA[You can get <strong>started instantly</strong> by clicking the "Launch Umbraco" button below. <br />If you are <strong>new to Umbraco</strong>,
+you can find plenty of resources on our getting started pages.]]></key>
+    <key alias="theEndOpenUmbraco"><![CDATA[<h3>Launch Umbraco</h3>
+To manage your website, simply open the Umbraco back office and start adding content, updating the templates and stylesheets or add new functionality]]></key>
+    <key alias="Unavailable">Connection to database failed.</key>
+    <key alias="Version3">Umbraco Version 3</key>
+    <key alias="Version4">Umbraco Version 4</key>
+    <key alias="watch">Watch</key>
+    <key alias="welcomeIntro"><![CDATA[This wizard will guide you through the process of configuring <strong>Umbraco %0%</strong> for a fresh install or upgrading from version 3.0.
+                                <br /><br />
+                                Press <strong>"next"</strong> to start the wizard.]]></key>
+  </area>
+  <area alias="language">
+    <key alias="cultureCode">Culture Code</key>
+    <key alias="displayName">Culture Name</key>
+  </area>
+  <area alias="lockout">
+    <key alias="lockoutWillOccur">You've been idle and logout will automatically occur in</key>
+    <key alias="renewSession">Renew now to save your work</key>
+  </area>
+  <area alias="login">
+    <key alias="greeting0">Happy super Sunday</key>
+    <key alias="greeting1">Happy manic Monday </key>
+    <key alias="greeting2">Happy tubular Tuesday</key>
+    <key alias="greeting3">Happy wonderful Wednesday</key>
+    <key alias="greeting4">Happy thunderous Thursday</key>
+    <key alias="greeting5">Happy funky Friday</key>
+    <key alias="greeting6">Happy Caturday</key>
+    <key alias="instruction">Log in below</key>
+    <key alias="signInWith">Sign in with</key>
+    <key alias="timeout">Session timed out</key>
+    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="http://umbraco.com" style="text-decoration: none" target="_blank">Umbraco.com</a></p> ]]></key>
+    <key alias="forgottenPassword">Forgotten password?</key>
+    <key alias="forgottenPasswordInstruction">An email will be sent to the address specified with a link to reset your password</key>
+    <key alias="requestPasswordResetConfirmation">An email with password reset instructions will be sent to the specified address if it matched our records</key>
+    <key alias="showPassword">Show password</key>
+    <key alias="hidePassword">Hide password</key>
+    <key alias="returnToLogin">Return to login form</key>
+    <key alias="setPasswordInstruction">Please provide a new password</key>
+    <key alias="setPasswordConfirmation">Your Password has been updated</key>
+    <key alias="resetCodeExpired">The link you have clicked on is invalid or has expired</key>
+    <key alias="resetPasswordEmailCopySubject">Umbraco: Reset Password</key>
+    <key alias="resetPasswordEmailCopyFormat"><![CDATA[
+        <html>
+			<head>
+				<meta name='viewport' content='width=device-width'>
+				<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
+			</head>
+			<body class='' style='font-family: sans-serif; -webkit-font-smoothing: antialiased; font-size: 14px; color: #392F54; line-height: 22px; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; background: #1d1333; margin: 0; padding: 0;' bgcolor='#1d1333'>
+				<style type='text/css'> @media only screen and (max-width: 620px) {table[class=body] h1 {font-size: 28px !important; margin-bottom: 10px !important; } table[class=body] .wrapper {padding: 32px !important; } table[class=body] .article {padding: 32px !important; } table[class=body] .content {padding: 24px !important; } table[class=body] .container {padding: 0 !important; width: 100% !important; } table[class=body] .main {border-left-width: 0 !important; border-radius: 0 !important; border-right-width: 0 !important; } table[class=body] .btn table {width: 100% !important; } table[class=body] .btn a {width: 100% !important; } table[class=body] .img-responsive {height: auto !important; max-width: 100% !important; width: auto !important; } } .btn-primary table td:hover {background-color: #34495e !important; } .btn-primary a:hover {background-color: #34495e !important; border-color: #34495e !important; } .btn  a:visited {color:#FFFFFF;} </style>
+				<table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;" bgcolor="#1d1333">
+					<tr>
+						<td style="font-family: sans-serif; font-size: 14px; vertical-align: top; padding: 24px;" valign="top">
+							<table style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
+								<tr>
+									<td background="https://umbraco.com/umbraco/assets/img/application/logo.png" bgcolor="#1d1333" width="28" height="28" valign="top" style="font-family: sans-serif; font-size: 14px; vertical-align: top;">
+										<!--[if gte mso 9]> <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="width:30px;height:30px;"> <v:fill type="tile" src="https://umbraco.com/umbraco/assets/img/application/logo.png" color="#1d1333" /> <v:textbox inset="0,0,0,0"> <![endif]-->
+										<div> </div>
+										<!--[if gte mso 9]> </v:textbox> </v:rect> <![endif]-->
+									</td>
+									<td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top"></td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+				</table>
+				<table border='0' cellpadding='0' cellspacing='0' class='body' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;' bgcolor='#1d1333'>
+					<tr>
+						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
+						<td class='container' style='font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; max-width: 560px; width: 560px; margin: 0 auto; padding: 10px;' valign='top'>
+							<div class='content' style='box-sizing: border-box; display: block; max-width: 560px; margin: 0 auto; padding: 10px;'>
+								<br>
+								<table class='main' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; border-radius: 3px; background: #FFFFFF;' bgcolor='#FFFFFF'>
+									<tr>
+										<td class='wrapper' style='font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 50px;' valign='top'>
+											<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;'>
+												<tr>
+													<td style='line-height: 24px; font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'>
+														<h1 style='color: #392F54; font-family: sans-serif; font-weight: bold; line-height: 1.4; font-size: 24px; text-align: left; text-transform: capitalize; margin: 0 0 30px;' align='left'>
+															Password reset requested
+														</h1>
+														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+															Your username to login to the Umbraco back-office is: <strong>%0%</strong>
+														</p>
+														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+															<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'>
+																<tbody>
+																	<tr>
+																		<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
+																			<a href='%1%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
+																				Click this link to reset your password
+																			</a>
+																		</td>
+																	</tr>
+																</tbody>
+															</table>
+														</p>
+														<p style='max-width: 400px; display: block; color: #392F54; font-family: sans-serif; font-size: 14px; line-height: 20px; font-weight: normal; margin: 15px 0;'>If you cannot click on the link, copy and paste this URL into your browser window:</p>
+															<table border='0' cellpadding='0' cellspacing='0'>
+																<tr>
+																	<td style='-ms-word-break: break-all; word-break: break-all; font-family: sans-serif; font-size: 11px; line-height:14px;'>
+																		<font style="-ms-word-break: break-all; word-break: break-all; font-size: 11px; line-height:14px;">
+																			<a style='-ms-word-break: break-all; word-break: break-all; color: #392F54; text-decoration: underline; font-size: 11px; line-height:15px;' href='%1%'>%1%</a>
+																		</font>
+																	</td>
+																</tr>
+															</table>
+														</p>
+													</td>
+												</tr>
+											</table>
+										</td>
+									</tr>
+								</table>
+								<br><br><br>
+							</div>
+						</td>
+						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
+					</tr>
+				</table>
+			</body>
+		</html>
+	]]></key>
+  </area>
+  <area alias="main">
+    <key alias="dashboard">Dashboard</key>
+    <key alias="sections">Sections</key>
+    <key alias="tree">Content</key>
+  </area>
+  <area alias="moveOrCopy">
+    <key alias="choose">Choose page above...</key>
+    <key alias="copyDone">%0% has been copied to %1%</key>
+    <key alias="copyTo">Select where the document %0% should be copied to below</key>
+    <key alias="moveDone">%0% has been moved to %1%</key>
+    <key alias="moveTo">Select where the document %0% should be moved to below</key>
+    <key alias="nodeSelected">has been selected as the root of your new content, click 'ok' below.</key>
+    <key alias="noNodeSelected">No node selected yet, please select a node in the list above before clicking 'ok'</key>
+    <key alias="notAllowedByContentType">The current node is not allowed under the chosen node because of its type</key>
+    <key alias="notAllowedByPath">The current node cannot be moved to one of its subpages</key>
+    <key alias="notAllowedAtRoot">The current node cannot exist at the root</key>
+    <key alias="notValid">The action isn't allowed since you have insufficient permissions on 1 or more child documents.</key>
+    <key alias="relateToOriginal">Relate copied items to original</key>
+  </area>
+  <area alias="notifications">
+    <key alias="editNotifications"><![CDATA[Select your notification for <strong>%0%</strong>]]></key>
+    <key alias="notificationsSavedFor">Notification settings saved for</key>
+    <key alias="mailBody"><![CDATA[
+      Hi %0%
+
+      This is an automated mail to inform you that the task '%1%'
+      has been performed on the page '%2%'
+      by the user '%3%'
+
+      Go to http://%4%/#/content/content/edit/%5% to edit.
+
+      %6%
+
+      Have a nice day!
+
+      Cheers from the Umbraco robot
+    ]]></key>
+    <key alias="mailBodyVariantSummary">The following languages have been modified %0%</key>
+    <key alias="mailBodyHtml"><![CDATA[
+        <html>
+			<head>
+				<meta name='viewport' content='width=device-width'>
+				<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
+			</head>
+			<body class='' style='font-family: sans-serif; -webkit-font-smoothing: antialiased; font-size: 14px; color: #392F54; line-height: 22px; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; background: #1d1333; margin: 0; padding: 0;' bgcolor='#1d1333'>
+				<style type='text/css'> @media only screen and (max-width: 620px) {table[class=body] h1 {font-size: 28px !important; margin-bottom: 10px !important; } table[class=body] .wrapper {padding: 32px !important; } table[class=body] .article {padding: 32px !important; } table[class=body] .content {padding: 24px !important; } table[class=body] .container {padding: 0 !important; width: 100% !important; } table[class=body] .main {border-left-width: 0 !important; border-radius: 0 !important; border-right-width: 0 !important; } table[class=body] .btn table {width: 100% !important; } table[class=body] .btn a {width: 100% !important; } table[class=body] .img-responsive {height: auto !important; max-width: 100% !important; width: auto !important; } } .btn-primary table td:hover {background-color: #34495e !important; } .btn-primary a:hover {background-color: #34495e !important; border-color: #34495e !important; } .btn  a:visited {color:#FFFFFF;} </style>
+				<table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;" bgcolor="#1d1333">
+					<tr>
+						<td style="font-family: sans-serif; font-size: 14px; vertical-align: top; padding: 24px;" valign="top">
+							<table style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
+								<tr>
+									<td background="https://umbraco.com/umbraco/assets/img/application/logo.png" bgcolor="#1d1333" width="28" height="28" valign="top" style="font-family: sans-serif; font-size: 14px; vertical-align: top;">
+										<!--[if gte mso 9]> <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="width:30px;height:30px;"> <v:fill type="tile" src="https://umbraco.com/umbraco/assets/img/application/logo.png" color="#1d1333" /> <v:textbox inset="0,0,0,0"> <![endif]-->
+										<div> </div>
+										<!--[if gte mso 9]> </v:textbox> </v:rect> <![endif]-->
+									</td>
+									<td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top"></td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+				</table>
+				<table border='0' cellpadding='0' cellspacing='0' class='body' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;' bgcolor='#1d1333'>
+					<tr>
+						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
+						<td class='container' style='font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; max-width: 560px; width: 560px; margin: 0 auto; padding: 10px;' valign='top'>
+							<div class='content' style='box-sizing: border-box; display: block; max-width: 560px; margin: 0 auto; padding: 10px;'>
+								<br>
+								<table class='main' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; border-radius: 3px; background: #FFFFFF;' bgcolor='#FFFFFF'>
+									<tr>
+										<td class='wrapper' style='font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 50px;' valign='top'>
+											<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;'>
+												<tr>
+													<td style='line-height: 24px; font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'>
+														<h1 style='color: #392F54; font-family: sans-serif; font-weight: bold; line-height: 1.4; font-size: 24px; text-align: left; text-transform: capitalize; margin: 0 0 30px;' align='left'>
+															Hi %0%,
+														</h1>
+														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+															This is an automated mail to inform you that the task <strong>'%1%'</strong> has been performed on the page <a style="color: #392F54; text-decoration: none; -ms-word-break: break-all; word-break: break-all;" href="http://%4%/#/content/content/edit/%5%"><strong>'%2%'</strong></a> by the user <strong>'%3%'</strong>
+														</p>
+														<table border='0' cellpadding='0' cellspacing='0' class='btn btn-primary' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;'>
+															<tbody>
+																<tr>
+																	<td align='left' style='font-family: sans-serif; font-size: 14px; vertical-align: top; padding-bottom: 15px;' valign='top'>
+																		<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'><tbody><tr>
+																			<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
+																				<a href='http://%4%/#/content/content/edit/%5%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>EDIT</a> </td> </tr></tbody></table>
+																	</td>
+																</tr>
+															</tbody>
+														</table>
+														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+															<h3>Update summary:</h3>
+															%6%
+														</p>
+														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+															Have a nice day!<br /><br />
+															Cheers from the Umbraco robot
+														</p>
+													</td>
+												</tr>
+											</table>
+										</td>
+									</tr>
+								</table>
+								<br><br><br>
+							</div>
+						</td>
+						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
+					</tr>
+				</table>
+			</body>
+		</html>
+	]]></key>
+    <key alias="mailBodyVariantHtmlSummary"><![CDATA[<p>The following languages have been modified:</p>
+        %0%
+    ]]></key>
+    <key alias="mailSubject">[%0%] Notification about %1% performed on %2%</key>
+    <key alias="notifications">Notifications</key>
+  </area>
+  <area alias="packager">
+    <key alias="actions">Actions</key>
+    <key alias="created">Created</key>
+    <key alias="createPackage">Create package</key>
+    <key alias="chooseLocalPackageText"><![CDATA[
+      Choose Package from your machine, by clicking the Browse<br />
+         button and locating the package. Umbraco packages usually have a ".umb" or ".zip" extension.
+      ]]></key>
+    <key alias="deletewarning">This will delete the package</key>
+    <key alias="dropHere">Drop to upload</key>
+    <key alias="includeAllChildNodes">Include all child nodes</key>
+    <key alias="orClickHereToUpload">or click here to choose package file</key>
+    <key alias="uploadPackage">Upload package</key>
+    <key alias="localPackageDescription">Install a local package by selecting it from your machine. Only install packages from sources you know and trust</key>
+    <key alias="uploadAnother">Upload another package</key>
+    <key alias="cancelAndUploadAnother">Cancel and upload another package</key>
+    <key alias="accept">I accept</key>
+    <key alias="termsOfUse">terms of use</key>
+    <key alias="pathToFile">Path to file</key>
+    <key alias="pathToFileDescription">Absolute path to file (ie: /bin/umbraco.bin)</key>
+    <key alias="installed">Installed</key>
+    <key alias="installedPackages">Installed packages</key>
+    <key alias="installLocal">Install local</key>
+    <key alias="installFinish">Finish</key>
+    <key alias="noConfigurationView">This package has no configuration view</key>
+    <key alias="noPackagesCreated">No packages have been created yet</key>
+    <key alias="noPackages">You don’t have any packages installed</key>
+    <key alias="noPackagesDescription"><![CDATA[You don’t have any packages installed. Either install a local package by selecting it from your machine, or browse through available packages using the <strong>'Packages'</strong> icon in the top right of your screen]]></key>
+    <key alias="packageActions">Package Actions</key>
+    <key alias="packageAuthorUrl">Author URL</key>
+    <key alias="packageContent">Package Content</key>
+    <key alias="packageFiles">Package Files</key>
+    <key alias="packageIconUrl">Icon URL</key>
+    <key alias="packageInstall">Install package</key>
+    <key alias="packageLicense">License</key>
+    <key alias="packageLicenseUrl">License URL</key>
+    <key alias="packageProperties">Package Properties</key>
+    <key alias="packageSearch">Search for packages</key>
+    <key alias="packageSearchResults">Results for</key>
+    <key alias="packageNoResults">We couldn’t find anything for</key>
+    <key alias="packageNoResultsDescription">Please try searching for another package or browse through the categories</key>
+    <key alias="packagesPopular">Popular</key>
+    <key alias="packagesNew">New releases</key>
+    <key alias="packageHas">has</key>
+    <key alias="packageKarmaPoints">karma points</key>
+    <key alias="packageInfo">Information</key>
+    <key alias="packageOwner">Owner</key>
+    <key alias="packageContrib">Contributors</key>
+    <key alias="packageCreated">Created</key>
+    <key alias="packageCurrentVersion">Current version</key>
+    <key alias="packageNetVersion">.NET version</key>
+    <key alias="packageDownloads">Downloads</key>
+    <key alias="packageLikes">Likes</key>
+    <key alias="packageCompatibility">Compatibility</key>
+    <key alias="packageCompatibilityDescription">This package is compatible with the following versions of Umbraco, as reported by community members. Full compatability cannot be guaranteed for versions reported below 100%</key>
+    <key alias="packageExternalSources">External sources</key>
+    <key alias="packageAuthor">Author</key>
+    <key alias="packageDocumentation">Documentation</key>
+    <key alias="packageMetaData">Package meta data</key>
+    <key alias="packageName">Package name</key>
+    <key alias="packageNoItemsHeader">Package doesn't contain any items</key>
+    <key alias="packageNoItemsText"><![CDATA[This package file doesn't contain any items to uninstall.<br/><br/>
+      You can safely remove this from the system by clicking "uninstall package" below.]]></key>
+    <key alias="packageOptions">Package options</key>
+    <key alias="packageReadme">Package readme</key>
+    <key alias="packageRepository">Package repository</key>
+    <key alias="packageUninstallConfirm">Confirm package uninstall</key>
+    <key alias="packageUninstalledHeader">Package was uninstalled</key>
+    <key alias="packageUninstalledText">The package was successfully uninstalled</key>
+    <key alias="packageUninstallHeader">Uninstall package</key>
+    <key alias="packageUninstallText"><![CDATA[You can unselect items you do not wish to remove, at this time, below. When you click "confirm uninstall" all checked-off items will be removed.<br />
+      <span style="color: Red; font-weight: bold;">Notice:</span> any documents, media etc depending on the items you remove, will stop working, and could lead to system instability,
+      so uninstall with caution. If in doubt, contact the package author.]]></key>
+    <key alias="packageVersion">Package version</key>
+    <key alias="packageVersionUpgrade">Upgrading from version</key>
+    <key alias="packageAlreadyInstalled">Package already installed</key>
+    <key alias="targetVersionMismatch">This package cannot be installed, it requires a minimum Umbraco version of</key>
+    <key alias="installStateUninstalling">Uninstalling...</key>
+    <key alias="installStateDownloading">Downloading...</key>
+    <key alias="installStateImporting">Importing...</key>
+    <key alias="installStateInstalling">Installing...</key>
+    <key alias="installStateRestarting">Restarting, please wait...</key>
+    <key alias="installStateComplete">All done, your browser will now refresh, please wait...</key>
+    <key alias="installStateCompleted">Please click 'Finish' to complete installation and reload the page.</key>
+    <key alias="installStateUploading">Uploading package...</key>
+  </area>
+  <area alias="paste">
+    <key alias="doNothing">Paste with full formatting (Not recommended)</key>
+    <key alias="errorMessage">The text you're trying to paste contains special characters or formatting. This could be caused by copying text from Microsoft Word. Umbraco can remove special characters or formatting automatically, so the pasted content will be more suitable for the web.</key>
+    <key alias="removeAll">Paste as raw text without any formatting at all</key>
+    <key alias="removeSpecialFormattering">Paste, but remove formatting (Recommended)</key>
+  </area>
+  <area alias="publicAccess">
+    <key alias="paGroups">Group based protection</key>
+    <key alias="paGroupsHelp">If you want to grant access to all members of specific member groups</key>
+    <key alias="paGroupsNoGroups">You need to create a member group before you can use group based authentication</key>
+    <key alias="paErrorPage">Error Page</key>
+    <key alias="paErrorPageHelp">Used when people are logged on, but do not have access</key>
+    <key alias="paHowWould"><![CDATA[Choose how to restrict access to the page <strong>%0%</strong>]]></key>
+    <key alias="paIsProtected"><![CDATA[<strong>%0%</strong> is now protected]]></key>
+    <key alias="paIsRemoved"><![CDATA[Protection removed from <strong>%0%</strong>]]></key>
+    <key alias="paLoginPage">Login Page</key>
+    <key alias="paLoginPageHelp">Choose the page that contains the login form</key>
+    <key alias="paRemoveProtection">Remove protection...</key>
+    <key alias="paRemoveProtectionConfirm"><![CDATA[Are you sure you want to remove the protection from the page <strong>%0%</strong>?]]></key>
+    <key alias="paSelectPages">Select the pages that contain login form and error messages</key>
+    <key alias="paSelectGroups"><![CDATA[Select the groups who have access to the page <strong>%0%</strong>]]></key>
+    <key alias="paSelectMembers"><![CDATA[Select the members who have access to the page <strong>%0%</strong>]]></key>
+    <key alias="paMembers">Specific members protection</key>
+    <key alias="paMembersHelp">If you wish to grant access to specific members</key>
+  </area>
+  <area alias="publish">
+    <key alias="invalidPublishBranchPermissions">Insufficient user permissions to publish all descendant documents</key>
+    <key alias="contentPublishedFailedIsTrashed"><![CDATA[
+      %0% could not be published because the item is in the recycle bin.
+    ]]></key>
+    <key alias="contentPublishedFailedAwaitingRelease"><![CDATA[
+      %0% could not be published because the item is scheduled for release.
+    ]]></key>
+    <key alias="contentPublishedFailedExpired"><![CDATA[
+      %0% could not be published because the item has expired.
+    ]]></key>
+    <key alias="contentPublishedFailedInvalid"><![CDATA[
+      %0% could not be published because some properties did not pass validation rules.
+    ]]></key>
+    <key alias="contentPublishedFailedByEvent"><![CDATA[
+      %0% could not be published, a 3rd party add-in cancelled the action.
+    ]]></key>
+    <key alias="contentPublishedFailedByParent"><![CDATA[
+      %0% can not be published, because a parent page is not published.
+    ]]></key>
+    <key alias="contentPublishedFailedByMissingName"><![CDATA[%0% can not be published, because its missing a name.]]></key>
+    <key alias="contentPublishedFailedReqCultureValidationError">Validation failed for required language '%0%'. This language was saved but not published.</key>
+    <key alias="inProgress">Publishing in progress - please wait...</key>
+    <key alias="inProgressCounter">%0% out of %1% pages have been published...</key>
+    <key alias="nodePublish">%0% has been published</key>
+    <key alias="nodePublishAll">%0% and subpages have been published</key>
+    <key alias="publishAll">Publish %0% and all its subpages</key>
+    <key alias="publishHelp"><![CDATA[Click <em>Publish</em> to publish <strong>%0%</strong> and thereby making its content publicly available.<br/><br />
+      You can publish this page and all its subpages by checking <em>Include unpublished subpages</em> below.
+      ]]></key>
+  </area>
+  <area alias="colorpicker">
+    <key alias="noColors">You have not configured any approved colors</key>
+  </area>
+  <area alias="contentPicker">
+    <key alias="allowedItemTypes">You can only select items of type(s): %0%</key>
+    <key alias="pickedTrashedItem">You have picked a content item currently deleted or in the recycle bin</key>
+    <key alias="pickedTrashedItems">You have picked content items currently deleted or in the recycle bin</key>
+  </area>
+  <area alias="mediaPicker">
+    <key alias="pickedTrashedItem">You have picked a media item currently deleted or in the recycle bin</key>
+    <key alias="pickedTrashedItems">You have picked media items currently deleted or in the recycle bin</key>
+    <key alias="trashed">Trashed</key>
+  </area>
+  <area alias="relatedlinks">
+    <key alias="enterExternal">enter external link</key>
+    <key alias="chooseInternal">choose internal page</key>
+    <key alias="caption">Caption</key>
+    <key alias="link">Link</key>
+    <key alias="newWindow">Open in new window</key>
+    <key alias="captionPlaceholder">enter the display caption</key>
+    <key alias="externalLinkPlaceholder">Enter the link</key>
+  </area>
+  <area alias="imagecropper">
+        <key alias="reset">Reset crop</key>
+    <key alias="saveCrop">Save crop</key>
+    <key alias="addCrop">Add new crop</key>
+        <key alias="updateEditCrop">Done</key>
+        <key alias="undoEditCrop">Undo edits</key>
+  </area>
+  <area alias="rollback">
+    <key alias="headline">Select a version to compare with the current version</key>
+    <key alias="currentVersion">Current version</key>
+    <key alias="diffHelp"><![CDATA[This shows the differences between the current version and the selected version<br /><del>Red</del> text will not be shown in the selected version. , <ins>green means added</ins>]]></key>
+    <key alias="documentRolledBack">Document has been rolled back</key>
+    <key alias="htmlHelp">This displays the selected version as HTML, if you wish to see the difference between 2 versions at the same time, use the diff view</key>
+    <key alias="rollbackTo">Rollback to</key>
+    <key alias="selectVersion">Select version</key>
+    <key alias="view">View</key>
+  </area>
+  <area alias="scripts">
+    <key alias="editscript">Edit script file</key>
+  </area>
+  <area alias="sections">
+    <key alias="content">Content</key>
+    <key alias="forms">Forms</key>
+    <key alias="media">Media</key>
+    <key alias="member">Members</key>
+    <key alias="packages">Packages</key>
+    <key alias="settings">Settings</key>
+    <key alias="translation">Translation</key>
+    <key alias="users">Users</key>
+  </area>
+  <area alias="help">
+    <key alias="theBestUmbracoVideoTutorials">The best Umbraco video tutorials</key>
+  </area>
+  <area alias="settings">
+    <key alias="defaulttemplate">Default template</key>
+    <key alias="importDocumentTypeHelp">To import a document type, find the ".udt" file on your computer by clicking the "Browse" button and click "Import" (you'll be asked for confirmation on the next screen)</key>
+    <key alias="newtabname">New Tab Title</key>
+    <key alias="nodetype">Node type</key>
+    <key alias="objecttype">Type</key>
+    <key alias="stylesheet">Stylesheet</key>
+    <key alias="script">Script</key>
+    <key alias="tab">Tab</key>
+    <key alias="tabname">Tab Title</key>
+    <key alias="tabs">Tabs</key>
+    <key alias="contentTypeEnabled">Master Content Type enabled</key>
+    <key alias="contentTypeUses">This Content Type uses</key>
+    <key alias="asAContentMasterType">as a Master Content Type. Tabs from Master Content Types are not shown and can only be edited on the Master Content Type itself</key>
+    <key alias="noPropertiesDefinedOnTab">No properties defined on this tab. Click on the "add a new property" link at the top to create a new property.</key>
+    <key alias="createMatchingTemplate">Create matching template</key>
+    <key alias="addIcon">Add icon</key>
+  </area>
+  <area alias="sort">
+    <key alias="sortOrder">Sort order</key>
+    <key alias="sortCreationDate">Creation date</key>
+    <key alias="sortDone">Sorting complete.</key>
+    <key alias="sortHelp">Drag the different items up or down below to set how they should be arranged. Or click the column headers to sort the entire collection of items</key>
+    <key alias="sortPleaseWait"><![CDATA[Please wait. Items are being sorted, this can take a while.]]></key>
+    <key alias="sortEmptyState">This node has no child nodes to sort</key>
+  </area>
+  <area alias="speechBubbles">
+    <key alias="validationFailedHeader">Validation</key>
+    <key alias="validationFailedMessage">Validation errors must be fixed before the item can be saved</key>
+    <key alias="operationFailedHeader">Failed</key>
+    <key alias="operationSavedHeader">Saved</key>
+    <key alias="invalidUserPermissionsText">Insufficient user permissions, could not complete the operation</key>
+    <key alias="operationCancelledHeader">Cancelled</key>
+    <key alias="operationCancelledText">Operation was cancelled by a 3rd party add-in</key>
+    <key alias="contentTypeDublicatePropertyType">Property type already exists</key>
+    <key alias="contentTypePropertyTypeCreated">Property type created</key>
+    <key alias="contentTypePropertyTypeCreatedText"><![CDATA[Name: %0% <br /> DataType: %1%]]></key>
+    <key alias="contentTypePropertyTypeDeleted">Propertytype deleted</key>
+    <key alias="contentTypeSavedHeader">Document Type saved</key>
+    <key alias="contentTypeTabCreated">Tab created</key>
+    <key alias="contentTypeTabDeleted">Tab deleted</key>
+    <key alias="contentTypeTabDeletedText">Tab with id: %0% deleted</key>
+    <key alias="cssErrorHeader">Stylesheet not saved</key>
+    <key alias="cssSavedHeader">Stylesheet saved</key>
+    <key alias="cssSavedText">Stylesheet saved without any errors</key>
+    <key alias="dataTypeSaved">Datatype saved</key>
+    <key alias="dictionaryItemSaved">Dictionary item saved</key>
+    <key alias="editContentPublishedHeader">Content published</key>
+    <key alias="editContentPublishedText">and is visible on the website</key>
+    <key alias="editMultiContentPublishedText">%0% documents published and visible on the website</key>
+    <key alias="editVariantPublishedText">%0% published and visible on the website</key>
+    <key alias="editMultiVariantPublishedText">%0% documents published for languages %1% and visible on the website</key>
+    <key alias="editContentSavedHeader">Content saved</key>
+    <key alias="editContentSavedText">Remember to publish to make changes visible</key>
+    <key alias="editContentScheduledSavedText">A schedule for publishing has been updated</key>
+    <key alias="editVariantSavedText">%0% saved</key>
+    <key alias="editContentSendToPublish">Sent For Approval</key>
+    <key alias="editContentSendToPublishText">Changes have been sent for approval</key>
+    <key alias="editVariantSendToPublishText">%0% changes have been sent for approval</key>
+    <key alias="editMediaSaved">Media saved</key>
+    <key alias="editMediaSavedText">Media saved without any errors</key>
+    <key alias="editMemberSaved">Member saved</key>
+    <key alias="editMemberGroupSaved">Member group saved</key>
+    <key alias="editStylesheetPropertySaved">Stylesheet Property Saved</key>
+    <key alias="editStylesheetSaved">Stylesheet saved</key>
+    <key alias="editTemplateSaved">Template saved</key>
+    <key alias="editUserError">Error saving user (check log)</key>
+    <key alias="editUserSaved">User Saved</key>
+    <key alias="editUserTypeSaved">User type saved</key>
+    <key alias="editUserGroupSaved">User group saved</key>
+    <key alias="fileErrorHeader">File not saved</key>
+    <key alias="fileErrorText">file could not be saved. Please check file permissions</key>
+    <key alias="fileSavedHeader">File saved</key>
+    <key alias="fileSavedText">File saved without any errors</key>
+    <key alias="languageSaved">Language saved</key>
+    <key alias="mediaTypeSavedHeader">Media Type saved</key>
+    <key alias="memberTypeSavedHeader">Member Type saved</key>
+    <key alias="memberGroupSavedHeader">Member Group saved</key>
+    <key alias="templateErrorHeader">Template not saved</key>
+    <key alias="templateErrorText">Please make sure that you do not have 2 templates with the same alias</key>
+    <key alias="templateSavedHeader">Template saved</key>
+    <key alias="templateSavedText">Template saved without any errors!</key>
+    <key alias="contentUnpublished">Content unpublished</key>
+    <key alias="contentCultureUnpublished">Content variation %0% unpublished</key>
+    <key alias="contentMandatoryCultureUnpublished">The mandatory language '%0%' was unpublished. All languages for this content item are now unpublished.</key>
+    <key alias="partialViewSavedHeader">Partial view saved</key>
+    <key alias="partialViewSavedText">Partial view saved without any errors!</key>
+    <key alias="partialViewErrorHeader">Partial view not saved</key>
+    <key alias="partialViewErrorText">An error occurred saving the file.</key>
+    <key alias="permissionsSavedFor">Permissions saved for</key>
+    <key alias="deleteUserGroupsSuccess">Deleted %0% user groups</key>
+    <key alias="deleteUserGroupSuccess">%0% was deleted</key>
+    <key alias="enableUsersSuccess">Enabled %0% users</key>
+    <key alias="disableUsersSuccess">Disabled %0% users</key>
+    <key alias="enableUserSuccess">%0% is now enabled</key>
+    <key alias="disableUserSuccess">%0% is now disabled</key>
+    <key alias="setUserGroupOnUsersSuccess">User groups have been set</key>
+    <key alias="unlockUsersSuccess">Unlocked %0% users</key>
+    <key alias="unlockUserSuccess">%0% is now unlocked</key>
+    <key alias="memberExportedSuccess">Member was exported to file</key>
+    <key alias="memberExportedError">An error occurred while exporting the member</key>
+    <key alias="deleteUserSuccess">User %0% was deleted</key>
+    <key alias="resendInviteHeader">Invite user</key>
+    <key alias="resendInviteSuccess">Invitation has been re-sent to %0%</key>
+    <key alias="contentReqCulturePublishError">Cannot publish the document since the required '%0%' is not published</key>
+    <key alias="contentCultureValidationError">Validation failed for language '%0%'</key>
+    <key alias="documentTypeExportedSuccess">Document type was exported to file</key>
+    <key alias="documentTypeExportedError">An error occurred while exporting the document type</key>
+    <key alias="scheduleErrReleaseDate1">The release date cannot be in the past</key>
+    <key alias="scheduleErrReleaseDate2">Cannot schedule the document for publishing since the required '%0%' is not published</key>
+    <key alias="scheduleErrReleaseDate3">Cannot schedule the document for publishing since the required '%0%' has a publish date later than a non mandatory language</key>
+    <key alias="scheduleErrExpireDate1">The expire date cannot be in the past</key>
+    <key alias="scheduleErrExpireDate2">The expire date cannot be before the release date</key>
+  </area>
+  <area alias="stylesheet">
+    <key alias="addRule">Add style</key>
+    <key alias="editRule">Edit style</key>
+    <key alias="editorRules">Rich text editor styles</key>
+    <key alias="editorRulesHelp">Define the styles that should be available in the rich text editor for this stylesheet</key>
+    <key alias="editstylesheet">Edit stylesheet</key>
+    <key alias="editstylesheetproperty">Edit stylesheet property</key>
+    <key alias="nameHelp">The name displayed in the editor style selector</key>
+    <key alias="preview">Preview</key>
+    <key alias="previewHelp">How the text will look like in the rich text editor.</key>
+    <key alias="selector">Selector</key>
+    <key alias="selectorHelp">Uses CSS syntax, e.g. "h1" or ".redHeader"</key>
+    <key alias="styles">Styles</key>
+    <key alias="stylesHelp">The CSS that should be applied in the rich text editor, e.g. "color:red;"</key>
+    <key alias="tabCode">Code</key>
+    <key alias="tabRules">Rich Text Editor</key>
+  </area>
+  <area alias="template">
+    <key alias="deleteByIdFailed">Failed to delete template with ID %0%</key>
+    <key alias="edittemplate">Edit template</key>
+    <key alias="insertSections">Sections</key>
+    <key alias="insertContentArea">Insert content area</key>
+    <key alias="insertContentAreaPlaceHolder">Insert content area placeholder</key>
+    <key alias="insert">Insert</key>
+    <key alias="insertDesc">Choose what to insert into your template</key>
+    <key alias="insertDictionaryItem">Dictionary item</key>
+    <key alias="insertDictionaryItemDesc">A dictionary item is a placeholder for a translatable piece of text, which makes it easy to create designs for multilingual websites.</key>
+    <key alias="insertMacro">Macro</key>
+    <key alias="insertMacroDesc">
+            A Macro is a configurable component which is great for
+            reusable parts of your design, where you need the option to provide parameters,
+            such as galleries, forms and lists.
+        </key>
+    <key alias="insertPageField">Value</key>
+    <key alias="insertPageFieldDesc">Displays the value of a named field from the current page, with options to modify the value or fallback to alternative values.</key>
+    <key alias="insertPartialView">Partial view</key>
+    <key alias="insertPartialViewDesc">
+            A partial view is a separate template file which can be rendered inside another
+            template, it's great for reusing markup or for separating complex templates into separate files.
+        </key>
+    <key alias="mastertemplate">Master template</key>
+    <key alias="noMaster">No master</key>
+    <key alias="renderBody">Render child template</key>
+    <key alias="renderBodyDesc"><![CDATA[
+     Renders the contents of a child template, by inserting a
+     <code>@RenderBody()</code> placeholder.
+      ]]></key>
+    <key alias="defineSection">Define a named section</key>
+    <key alias="defineSectionDesc"><![CDATA[
+         Defines a part of your template as a named section by wrapping it in
+          <code>@section { ... }</code>. This can be rendered in a
+          specific area of the parent of this template, by using <code>@RenderSection</code>.
+      ]]></key>
+    <key alias="renderSection">Render a named section</key>
+    <key alias="renderSectionDesc"><![CDATA[
+      Renders a named area of a child template, by inserting a <code>@RenderSection(name)</code> placeholder.
+      This renders an area of a child template which is wrapped in a corresponding <code>@section [name]{ ... }</code> definition.
+      ]]></key>
+    <key alias="sectionName">Section Name</key>
+    <key alias="sectionMandatory">Section is mandatory</key>
+    <key alias="sectionMandatoryDesc">
+            If mandatory, the child template must contain a <code>@section</code> definition, otherwise an error is shown.
+        </key>
+    <key alias="queryBuilder">Query builder</key>
+    <key alias="itemsReturned">items returned, in</key>
+    <key alias="iWant">I want</key>
+    <key alias="allContent">all content</key>
+    <key alias="contentOfType">content of type "%0%"</key>
+    <key alias="from">from</key>
+    <key alias="websiteRoot">my website</key>
+    <key alias="where">where</key>
+    <key alias="and">and</key>
+    <key alias="is">is</key>
+    <key alias="isNot">is not</key>
+    <key alias="before">before</key>
+    <key alias="beforeIncDate">before (including selected date)</key>
+    <key alias="after">after</key>
+    <key alias="afterIncDate">after (including selected date)</key>
+    <key alias="equals">equals</key>
+    <key alias="doesNotEqual">does not equal</key>
+    <key alias="contains">contains</key>
+    <key alias="doesNotContain">does not contain</key>
+    <key alias="greaterThan">greater than</key>
+    <key alias="greaterThanEqual">greater than or equal to</key>
+    <key alias="lessThan">less than</key>
+    <key alias="lessThanEqual">less than or equal to</key>
+    <key alias="id">Id</key>
+    <key alias="name">Name</key>
+    <key alias="createdDate">Created Date</key>
+    <key alias="lastUpdatedDate">Last Updated Date</key>
+    <key alias="orderBy">order by</key>
+    <key alias="ascending">ascending</key>
+    <key alias="descending">descending</key>
+    <key alias="template">Template</key>
+  </area>
+  <area alias="grid">
+    <key alias="media">Image</key>
+    <key alias="macro">Macro</key>
+    <key alias="insertControl">Choose type of content</key>
+    <key alias="chooseLayout">Choose a layout</key>
+    <key alias="addRows">Add a row</key>
+    <key alias="addElement">Add content</key>
+    <key alias="dropElement">Drop content</key>
+    <key alias="settingsApplied">Settings applied</key>
+    <key alias="contentNotAllowed">This content is not allowed here</key>
+    <key alias="contentAllowed">This content is allowed here</key>
+    <key alias="clickToEmbed">Click to embed</key>
+    <key alias="clickToInsertImage">Click to insert image</key>
+    <key alias="placeholderImageCaption">Image caption...</key>
+    <key alias="placeholderWriteHere">Write here...</key>
+    <key alias="gridLayouts">Grid Layouts</key>
+    <key alias="gridLayoutsDetail">Layouts are the overall work area for the grid editor, usually you only need one or two different layouts</key>
+    <key alias="addGridLayout">Add Grid Layout</key>
+    <key alias="addGridLayoutDetail">Adjust the layout by setting column widths and adding additional sections</key>
+    <key alias="rowConfigurations">Row configurations</key>
+    <key alias="rowConfigurationsDetail">Rows are predefined cells arranged horizontally</key>
+    <key alias="addRowConfiguration">Add row configuration</key>
+    <key alias="addRowConfigurationDetail">Adjust the row by setting cell widths and adding additional cells</key>
+    <key alias="columns">Columns</key>
+    <key alias="columnsDetails">Total combined number of columns in the grid layout</key>
+    <key alias="settings">Settings</key>
+    <key alias="settingsDetails">Configure what settings editors can change</key>
+    <key alias="styles">Styles</key>
+    <key alias="stylesDetails">Configure what styling editors can change</key>
+    <key alias="allowAllEditors">Allow all editors</key>
+    <key alias="allowAllRowConfigurations">Allow all row configurations</key>
+    <key alias="maxItems">Maximum items</key>
+    <key alias="maxItemsDescription">Leave blank or set to 0 for unlimited</key>
+    <key alias="setAsDefault">Set as default</key>
+    <key alias="chooseExtra">Choose extra</key>
+    <key alias="chooseDefault">Choose default</key>
+    <key alias="areAdded">are added</key>
+  </area>
+  <area alias="contentTypeEditor">
+    <key alias="compositions">Compositions</key>
+    <key alias="group">Group</key>
+    <key alias="noGroups">You have not added any groups</key>
+    <key alias="addGroup">Add group</key>
+    <key alias="inheritedFrom">Inherited from</key>
+    <key alias="addProperty">Add property</key>
+    <key alias="requiredLabel">Required label</key>
+    <key alias="enableListViewHeading">Enable list view</key>
+    <key alias="enableListViewDescription">Configures the content item to show a sortable and searchable list of its children, the children will not be shown in the tree</key>
+    <key alias="allowedTemplatesHeading">Allowed Templates</key>
+    <key alias="allowedTemplatesDescription">Choose which templates editors are allowed to use on content of this type</key>
+    <key alias="allowAsRootHeading">Allow as root</key>
+    <key alias="allowAsRootDescription">Allow editors to create content of this type in the root of the content tree</key>
+    <key alias="childNodesHeading">Allowed child node types</key>
+    <key alias="childNodesDescription">Allow content of the specified types to be created underneath content of this type</key>
+    <key alias="chooseChildNode">Choose child node</key>
+    <key alias="compositionsDescription">Inherit tabs and properties from an existing document type. New tabs will be added to the current document type or merged if a tab with an identical name exists.</key>
+    <key alias="compositionInUse">This content type is used in a composition, and therefore cannot be composed itself.</key>
+    <key alias="noAvailableCompositions">There are no content types available to use as a composition.</key>
+    <key alias="availableEditors">Create new</key>
+    <key alias="reuse">Use existing</key>
+    <key alias="editorSettings">Editor settings</key>
+    <key alias="configuration">Configuration</key>
+    <key alias="yesDelete">Yes, delete</key>
+    <key alias="movedUnderneath">was moved underneath</key>
+    <key alias="copiedUnderneath">was copied underneath</key>
+    <key alias="folderToMove">Select the folder to move</key>
+    <key alias="folderToCopy">Select the folder to copy</key>
+    <key alias="structureBelow">to in the tree structure below</key>
+    <key alias="allDocumentTypes">All Document types</key>
+    <key alias="allDocuments">All Documents</key>
+    <key alias="allMediaItems">All media items</key>
+    <key alias="usingThisDocument">using this document type will be deleted permanently, please confirm you want to delete these as well.</key>
+    <key alias="usingThisMedia">using this media type will be deleted permanently, please confirm you want to delete these as well.</key>
+    <key alias="usingThisMember">using this member type will be deleted permanently, please confirm you want to delete these as well</key>
+    <key alias="andAllDocuments">and all documents using this type</key>
+    <key alias="andAllMediaItems">and all media items using this type</key>
+    <key alias="andAllMembers">and all members using this type</key>
+    <key alias="memberCanEdit">Member can edit</key>
+    <key alias="memberCanEditDescription">Allow this property value to be edited by the member on their profile page</key>
+    <key alias="isSensitiveData">Is sensitive data</key>
+    <key alias="isSensitiveDataDescription">Hide this property value from content editors that don't have access to view sensitive information</key>
+    <key alias="showOnMemberProfile">Show on member profile</key>
+    <key alias="showOnMemberProfileDescription">Allow this property value to be displayed on the member profile page</key>
+    <key alias="tabHasNoSortOrder">tab has no sort order</key>
+    <key alias="compositionUsageHeading">Where is this composition used?</key>
+    <key alias="compositionUsageSpecification">This composition is currently used in the composition of the following content types:</key>
+    <key alias="variantsHeading">Allow varying by culture</key>
+    <key alias="variantsDescription">Allow editors to create content of this type in different languages</key>
+    <key alias="allowVaryByCulture">Allow varying by culture</key>
+    <key alias="elementType">Element type</key>
+    <key alias="elementHeading">Is an Element type</key>
+    <key alias="elementDescription">An Element type is meant to be used for instance in Nested Content, and not in the tree</key>
+    <key alias="elementDoesNotSupport">This is not applicable for an Element type</key>
+    <key alias="propertyHasChanges">You have made changes to this property. Are you sure you want to discard them?</key>
+  </area>
+  <area alias="languages">
+    <key alias="addLanguage">Add language</key>
+    <key alias="mandatoryLanguage">Mandatory language</key>
+    <key alias="mandatoryLanguageHelp">Properties on this language have to be filled out before the node can be published.</key>
+    <key alias="defaultLanguage">Default language</key>
+    <key alias="defaultLanguageHelp">An Umbraco site can only have one default language set.</key>
+    <key alias="changingDefaultLanguageWarning">Switching default language may result in default content missing.</key>
+    <key alias="fallsbackToLabel">Falls back to</key>
+    <key alias="noFallbackLanguageOption">No fall back language</key>
+    <key alias="fallbackLanguageDescription">To allow multi-lingual content to fall back to another language if not present in the requested language, select it here.</key>
+    <key alias="fallbackLanguage">Fall back language</key>
+  </area>
+  <area alias="macro">
+    <key alias="addParameter">Add parameter</key>
+    <key alias="editParameter">Edit parameter</key>
+    <key alias="enterMacroName">Enter macro name</key>
+    <key alias="parameters">Parameters</key>
+    <key alias="parametersDescription">Define the parameters that should be available when using this macro.</key>
+    <key alias="selectViewFile">Select partial view macro file</key>
+  </area>
+  <area alias="modelsBuilder">
+    <key alias="buildingModels">Building models</key>
+    <key alias="waitingMessage">this can take a bit of time, don't worry</key>
+    <key alias="modelsGenerated">Models generated</key>
+    <key alias="modelsGeneratedError">Models could not be generated</key>
+    <key alias="modelsExceptionInUlog">Models generation has failed, see exception in U log</key>
+  </area>
+  <area alias="templateEditor">
+    <key alias="addFallbackField">Add fallback field</key>
+    <key alias="fallbackField">Fallback field</key>
+    <key alias="addDefaultValue">Add default value</key>
+    <key alias="defaultValue">Default value</key>
+    <key alias="alternativeField">Fallback field</key>
+    <key alias="alternativeText">Default value</key>
+    <key alias="casing">Casing</key>
+    <key alias="encoding">Encoding</key>
+    <key alias="chooseField">Choose field</key>
+    <key alias="convertLineBreaks">Convert line breaks</key>
+    <key alias="convertLineBreaksDescription">Yes, convert line breaks</key>
+    <key alias="convertLineBreaksHelp">Replaces line breaks with 'br' html tag</key>
+    <key alias="customFields">Custom Fields</key>
+    <key alias="dateOnly">Date only</key>
+    <key alias="formatAndEncoding">Format and encoding</key>
+    <key alias="formatAsDate">Format as date</key>
+    <key alias="formatAsDateDescr">Format the value as a date, or a date with time, according to the active culture</key>
+    <key alias="htmlEncode">HTML encode</key>
+    <key alias="htmlEncodeHelp">Will replace special characters by their HTML equivalent.</key>
+    <key alias="insertedAfter">Will be inserted after the field value</key>
+    <key alias="insertedBefore">Will be inserted before the field value</key>
+    <key alias="lowercase">Lowercase</key>
+    <key alias="modifyOutput">Modify output</key>
+    <key alias="none">None</key>
+    <key alias="outputSample">Output sample</key>
+    <key alias="postContent">Insert after field</key>
+    <key alias="preContent">Insert before field</key>
+    <key alias="recursive">Recursive</key>
+    <key alias="recursiveDescr">Yes, make it recursive</key>
+    <key alias="separator">Separator</key>
+    <key alias="standardFields">Standard Fields</key>
+    <key alias="uppercase">Uppercase</key>
+    <key alias="urlEncode">URL encode</key>
+    <key alias="urlEncodeHelp">Will format special characters in URLs</key>
+    <key alias="usedIfAllEmpty">Will only be used when the field values above are empty</key>
+    <key alias="usedIfEmpty">This field will only be used if the primary field is empty</key>
+    <key alias="withTime">Date and time</key>
+  </area>
+  <area alias="translation">
+    <key alias="details">Translation details</key>
+    <key alias="DownloadXmlDTD">Download XML DTD</key>
+    <key alias="fields">Fields</key>
+    <key alias="includeSubpages">Include subpages</key>
+    <key alias="mailBody"><![CDATA[
+      Hi %0%
+
+      This is an automated mail to inform you that the document '%1%'
+      has been requested for translation into '%5%' by %2%.
+
+      Go to http://%3%/translation/details.aspx?id=%4% to edit.
+
+      Or log into Umbraco to get an overview of your translation tasks
+      http://%3%
+
+      Have a nice day!
+
+      Cheers from the Umbraco robot
+    ]]></key>
+    <key alias="noTranslators">No translator users found. Please create a translator user before you start sending content to translation</key>
+    <key alias="pageHasBeenSendToTranslation">The page '%0%' has been send to translation</key>
+    <key alias="sendToTranslate">Send the page '%0%' to translation</key>
+    <key alias="totalWords">Total words</key>
+    <key alias="translateTo">Translate to</key>
+    <key alias="translationDone">Translation completed.</key>
+    <key alias="translationDoneHelp">You can preview the pages, you've just translated, by clicking below. If the original page is found, you will get a comparison of the 2 pages.</key>
+    <key alias="translationFailed">Translation failed, the XML file might be corrupt</key>
+    <key alias="translationOptions">Translation options</key>
+    <key alias="translator">Translator</key>
+    <key alias="uploadTranslationXml">Upload translation XML</key>
+  </area>
+  <area alias="treeHeaders">
+    <key alias="content">Content</key>
+    <key alias="contentBlueprints">Content Templates</key>
+    <key alias="media">Media</key>
+    <key alias="cacheBrowser">Cache Browser</key>
+    <key alias="contentRecycleBin">Recycle Bin</key>
+    <key alias="createdPackages">Created packages</key>
+    <key alias="dataTypes">Data Types</key>
+    <key alias="dictionary">Dictionary</key>
+    <key alias="installedPackages">Installed packages</key>
+    <key alias="installSkin">Install skin</key>
+    <key alias="installStarterKit">Install starter kit</key>
+    <key alias="languages">Languages</key>
+    <key alias="localPackage">Install local package</key>
+    <key alias="macros">Macros</key>
+    <key alias="mediaTypes">Media Types</key>
+    <key alias="member">Members</key>
+    <key alias="memberGroups">Member Groups</key>
+    <key alias="memberRoles">Member Roles</key>
+    <key alias="memberTypes">Member Types</key>
+    <key alias="documentTypes">Document Types</key>
+    <key alias="relationTypes">Relation Types</key>
+    <key alias="packager">Packages</key>
+    <key alias="packages">Packages</key>
+    <key alias="partialViews">Partial Views</key>
+    <key alias="partialViewMacros">Partial View Macro Files</key>
+    <key alias="repositories">Install from repository</key>
+    <key alias="runway">Install Runway</key>
+    <key alias="runwayModules">Runway modules</key>
+    <key alias="scripting">Scripting Files</key>
+    <key alias="scripts">Scripts</key>
+    <key alias="stylesheets">Stylesheets</key>
+    <key alias="templates">Templates</key>
+    <key alias="logViewer">Log Viewer</key>
+    <key alias="users">Users</key>
+    <key alias="settingsGroup">Settings</key>
+    <key alias="templatingGroup">Templating</key>
+    <key alias="thirdPartyGroup">Third Party</key>
+  </area>
+  <area alias="update">
+    <key alias="updateAvailable">New update ready</key>
+    <key alias="updateDownloadText">%0% is ready, click here for download</key>
+    <key alias="updateNoServer">No connection to server</key>
+    <key alias="updateNoServerError">Error checking for update. Please review trace-stack for further information</key>
+  </area>
+  <area alias="user">
+    <key alias="access">Access</key>
+    <key alias="accessHelp">Based on the assigned groups and start nodes, the user has access to the following nodes</key>
+    <key alias="assignAccess">Assign access</key>
+    <key alias="administrators">Administrator</key>
+    <key alias="categoryField">Category field</key>
+    <key alias="createDate">User created</key>
+    <key alias="changePassword">Change Your Password</key>
+    <key alias="changePhoto">Change photo</key>
+    <key alias="newPassword">New password</key>
+    <key alias="noLockouts">hasn't been locked out</key>
+    <key alias="noPasswordChange">The password hasn't been changed</key>
+    <key alias="confirmNewPassword">Confirm new password</key>
+    <key alias="changePasswordDescription">You can change your password for accessing the Umbraco Back Office by filling out the form below and click the 'Change Password' button</key>
+    <key alias="contentChannel">Content Channel</key>
+    <key alias="createAnotherUser">Create another user</key>
+    <key alias="createUserHelp">Create new users to give them access to Umbraco. When a new user is created a password will be generated that you can share with the user.</key>
+    <key alias="descriptionField">Description field</key>
+    <key alias="disabled">Disable User</key>
+    <key alias="documentType">Document Type</key>
+    <key alias="editors">Editor</key>
+    <key alias="excerptField">Excerpt field</key>
+    <key alias="failedPasswordAttempts">Failed login attempts</key>
+    <key alias="goToProfile">Go to user profile</key>
+    <key alias="groupsHelp">Add groups to assign access and permissions</key>
+    <key alias="inviteAnotherUser">Invite another user</key>
+    <key alias="inviteUserHelp">Invite new users to give them access to Umbraco. An invite email will be sent to the user with information on how to log in to Umbraco. Invites last for 72 hours.</key>
+    <key alias="language">Language</key>
+    <key alias="languageHelp">Set the language you will see in menus and dialogs</key>
+    <key alias="lastLockoutDate">Last lockout date</key>
+    <key alias="lastLogin">Last login</key>
+    <key alias="lastPasswordChangeDate">Password last changed</key>
+    <key alias="loginname">Username</key>
+    <key alias="mediastartnode">Media start node</key>
+    <key alias="mediastartnodehelp">Limit the media library to a specific start node</key>
+    <key alias="mediastartnodes">Media start nodes</key>
+    <key alias="mediastartnodeshelp">Limit the media library to specific start nodes</key>
+    <key alias="modules">Sections</key>
+    <key alias="noConsole">Disable Umbraco Access</key>
+    <key alias="noLogin">has not logged in yet</key>
+    <key alias="oldPassword">Old password</key>
+    <key alias="password">Password</key>
+    <key alias="resetPassword">Reset password</key>
+    <key alias="passwordChanged">Your password has been changed!</key>
+    <key alias="passwordConfirm">Please confirm the new password</key>
+    <key alias="passwordEnterNew">Enter your new password</key>
+    <key alias="passwordIsBlank">Your new password cannot be blank!</key>
+    <key alias="passwordCurrent">Current password</key>
+    <key alias="passwordInvalid">Invalid current password</key>
+    <key alias="passwordIsDifferent">There was a difference between the new password and the confirmed password. Please try again!</key>
+    <key alias="passwordMismatch">The confirmed password doesn't match the new password!</key>
+    <key alias="permissionReplaceChildren">Replace child node permissions</key>
+    <key alias="permissionSelectedPages">You are currently modifying permissions for the pages:</key>
+    <key alias="permissionSelectPages">Select pages to modify their permissions</key>
+    <key alias="removePhoto">Remove photo</key>
+    <key alias="permissionsDefault">Default permissions</key>
+    <key alias="permissionsGranular">Granular permissions</key>
+    <key alias="permissionsGranularHelp">Set permissions for specific nodes</key>
+    <key alias="profile">Profile</key>
+    <key alias="searchAllChildren">Search all children</key>
+    <key alias="sectionsHelp">Add sections to give users access</key>
+    <key alias="selectUserGroups">Select user groups</key>
+    <key alias="noStartNode">No start node selected</key>
+    <key alias="noStartNodes">No start nodes selected</key>
+    <key alias="startnode">Content start node</key>
+    <key alias="startnodehelp">Limit the content tree to a specific start node</key>
+    <key alias="startnodes">Content start nodes</key>
+    <key alias="startnodeshelp">Limit the content tree to specific start nodes</key>
+    <key alias="updateDate">User last updated</key>
+    <key alias="userCreated">has been created</key>
+    <key alias="userCreatedSuccessHelp">The new user has successfully been created. To log in to Umbraco use the password below.</key>
+    <key alias="userManagement">User management</key>
+    <key alias="username">Name</key>
+    <key alias="userPermissions">User permissions</key>
+    <key alias="usergroup">User group</key>
+    <key alias="userInvited">has been invited</key>
+    <key alias="userInvitedSuccessHelp">An invitation has been sent to the new user with details about how to log in to Umbraco.</key>
+    <key alias="userinviteWelcomeMessage">Hello there and welcome to Umbraco! In just 1 minute you’ll be good to go, we just need you to setup a password and add a picture for your avatar.</key>
+    <key alias="userinviteExpiredMessage">Welcome to Umbraco! Unfortunately your invite has expired. Please contact your administrator and ask them to resend it.</key>
+    <key alias="userinviteAvatarMessage">Uploading a photo of yourself will make it easy for other users to recognize you. Click the circle above to upload your photo.</key>
+    <key alias="writer">Writer</key>
+    <key alias="change">Change</key>
+    <key alias="yourProfile" version="7.0">Your profile</key>
+    <key alias="yourHistory" version="7.0">Your recent history</key>
+    <key alias="sessionExpires" version="7.0">Session expires in</key>
+    <key alias="inviteUser">Invite user</key>
+    <key alias="createUser">Create user</key>
+    <key alias="sendInvite">Send invite</key>
+    <key alias="backToUsers">Back to users</key>
+    <key alias="inviteEmailCopySubject">Umbraco: Invitation</key>
+    <key alias="inviteEmailCopyFormat"><![CDATA[
+        <html>
+			<head>
+				<meta name='viewport' content='width=device-width'>
+				<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
+			</head>
+			<body class='' style='font-family: sans-serif; -webkit-font-smoothing: antialiased; font-size: 14px; color: #392F54; line-height: 22px; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; background: #1d1333; margin: 0; padding: 0;' bgcolor='#1d1333'>
+				<style type='text/css'> @media only screen and (max-width: 620px) {table[class=body] h1 {font-size: 28px !important; margin-bottom: 10px !important; } table[class=body] .wrapper {padding: 32px !important; } table[class=body] .article {padding: 32px !important; } table[class=body] .content {padding: 24px !important; } table[class=body] .container {padding: 0 !important; width: 100% !important; } table[class=body] .main {border-left-width: 0 !important; border-radius: 0 !important; border-right-width: 0 !important; } table[class=body] .btn table {width: 100% !important; } table[class=body] .btn a {width: 100% !important; } table[class=body] .img-responsive {height: auto !important; max-width: 100% !important; width: auto !important; } } .btn-primary table td:hover {background-color: #34495e !important; } .btn-primary a:hover {background-color: #34495e !important; border-color: #34495e !important; } .btn  a:visited {color:#FFFFFF;} </style>
+				<table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;" bgcolor="#1d1333">
+					<tr>
+						<td style="font-family: sans-serif; font-size: 14px; vertical-align: top; padding: 24px;" valign="top">
+							<table style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
+								<tr>
+									<td background="https://umbraco.com/umbraco/assets/img/application/logo.png" bgcolor="#1d1333" width="28" height="28" valign="top" style="font-family: sans-serif; font-size: 14px; vertical-align: top;">
+										<!--[if gte mso 9]> <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="width:30px;height:30px;"> <v:fill type="tile" src="https://umbraco.com/umbraco/assets/img/application/logo.png" color="#1d1333" /> <v:textbox inset="0,0,0,0"> <![endif]-->
+										<div> </div>
+										<!--[if gte mso 9]> </v:textbox> </v:rect> <![endif]-->
+									</td>
+									<td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top"></td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+				</table>
+				<table border='0' cellpadding='0' cellspacing='0' class='body' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;' bgcolor='#1d1333'>
+					<tr>
+						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
+						<td class='container' style='font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; max-width: 560px; width: 560px; margin: 0 auto; padding: 10px;' valign='top'>
+							<div class='content' style='box-sizing: border-box; display: block; max-width: 560px; margin: 0 auto; padding: 10px;'>
+								<br>
+								<table class='main' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; border-radius: 3px; background: #FFFFFF;' bgcolor='#FFFFFF'>
+									<tr>
+										<td class='wrapper' style='font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 50px;' valign='top'>
+											<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;'>
+												<tr>
+													<td style='line-height: 24px; font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'>
+														<h1 style='color: #392F54; font-family: sans-serif; font-weight: bold; line-height: 1.4; font-size: 24px; text-align: left; text-transform: capitalize; margin: 0 0 30px;' align='left'>
+															Hi %0%,
+														</h1>
+														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+															You have been invited by <a href="mailto:%4%" style="text-decoration: underline; color: #392F54; -ms-word-break: break-all; word-break: break-all;">%1%</a> to the Umbraco Back Office.
+														</p>
+														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+															Message from <a href="mailto:%1%" style="text-decoration: none; color: #392F54; -ms-word-break: break-all; word-break: break-all;">%1%</a>:
+															<br/>
+															<em>%2%</em>
+														</p>
+														<table border='0' cellpadding='0' cellspacing='0' class='btn btn-primary' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;'>
+															<tbody>
+																<tr>
+																	<td align='left' style='font-family: sans-serif; font-size: 14px; vertical-align: top; padding-bottom: 15px;' valign='top'>
+																		<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'>
+																			<tbody>
+																				<tr>
+																					<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
+																						<a href='%3%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
+																							Click this link to accept the invite
+																						</a>
+																					</td>
+																				</tr>
+																			</tbody>
+																		</table>
+																	</td>
+																</tr>
+															</tbody>
+														</table>
+														<p style='max-width: 400px; display: block; color: #392F54; font-family: sans-serif; font-size: 14px; line-height: 20px; font-weight: normal; margin: 15px 0;'>If you cannot click on the link, copy and paste this URL into your browser window:</p>
+															<table border='0' cellpadding='0' cellspacing='0'>
+																<tr>
+																	<td style='-ms-word-break: break-all; word-break: break-all; font-family: sans-serif; font-size: 11px; line-height:14px;'>
+																		<font style="-ms-word-break: break-all; word-break: break-all; font-size: 11px; line-height:14px;">
+																			<a style='-ms-word-break: break-all; word-break: break-all; color: #392F54; text-decoration: underline; font-size: 11px; line-height:15px;' href='%3%'>%3%</a>
+																		</font>
+																	</td>
+																</tr>
+															</table>
+														</p>
+													</td>
+												</tr>
+											</table>
+										</td>
+									</tr>
+								</table>
+								<br><br><br>
+							</div>
+						</td>
+						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
+					</tr>
+				</table>
+			</body>
+    </html>]]></key>
+    <key alias="invite">Invite</key>
+    <key alias="defaultInvitationMessage">Resending invitation...</key>
+    <key alias="deleteUser">Delete User</key>
+    <key alias="deleteUserConfirmation">Are you sure you wish to delete this user account?</key>
+    <key alias="stateAll">All</key>
+    <key alias="stateActive">Active</key>
+    <key alias="stateDisabled">Disabled</key>
+    <key alias="stateLockedOut">Locked out</key>
+    <key alias="stateInvited">Invited</key>
+    <key alias="stateInactive">Inactive</key>
+    <key alias="sortNameAscending">Name (A-Z)</key>
+    <key alias="sortNameDescending">Name (Z-A)</key>
+    <key alias="sortCreateDateAscending">Newest</key>
+    <key alias="sortCreateDateDescending">Oldest</key>
+    <key alias="sortLastLoginDateDescending">Last login</key>
+  </area>
+  <area alias="validation">
+    <key alias="validation">Validation</key>
+    <key alias="validateAsEmail">Validate as an email address</key>
+    <key alias="validateAsNumber">Validate as a number</key>
+    <key alias="validateAsUrl">Validate as a URL</key>
+    <key alias="enterCustomValidation">...or enter a custom validation</key>
+    <key alias="fieldIsMandatory">Field is mandatory</key>
+    <key alias="validationRegExp">Enter a regular expression</key>
+    <key alias="minCount">You need to add at least</key>
+    <key alias="maxCount">You can only have</key>
+    <key alias="items">items</key>
+    <key alias="itemsSelected">items selected</key>
+    <key alias="invalidDate">Invalid date</key>
+    <key alias="invalidNumber">Not a number</key>
+    <key alias="invalidEmail">Invalid email</key>
+    <key alias="invalidNull">Value cannot be null</key>
+    <key alias="invalidEmpty">Value cannot be empty</key>
+    <key alias="invalidPattern">Value is invalid, it does not match the correct pattern</key>
+    <key alias="customValidation">Custom validation</key>
+  </area>
+  <area alias="healthcheck">
+    <!-- The following keys get these tokens passed in:
+	     0: Current value
+		   1: Recommended value
+		   2: XPath
+		   3: Configuration file path
+	  -->
+    <key alias="checkSuccessMessage">Value is set to the recommended value: '%0%'.</key>
+    <key alias="rectifySuccessMessage">Value was set to '%1%' for XPath '%2%' in configuration file '%3%'.</key>
+    <key alias="checkErrorMessageDifferentExpectedValue">Expected value '%1%' for '%2%' in configuration file '%3%', but found '%0%'.</key>
+    <key alias="checkErrorMessageUnexpectedValue">Found unexpected value '%0%' for '%2%' in configuration file '%3%'.</key>
+    <!-- The following keys get these tokens passed in:
+	     0: Current value
+		   1: Recommended value
+	  -->
+    <key alias="customErrorsCheckSuccessMessage">Custom errors are set to '%0%'.</key>
+    <key alias="customErrorsCheckErrorMessage">Custom errors are currently set to '%0%'. It is recommended to set this to '%1%' before go live.</key>
+    <key alias="customErrorsCheckRectifySuccessMessage">Custom errors successfully set to '%0%'.</key>
+    <key alias="macroErrorModeCheckSuccessMessage">MacroErrors are set to '%0%'.</key>
+    <key alias="macroErrorModeCheckErrorMessage">MacroErrors are set to '%0%' which will prevent some or all pages in your site from loading completely if there are any errors in macros. Rectifying this will set the value to '%1%'.</key>
+    <key alias="macroErrorModeCheckRectifySuccessMessage">MacroErrors are now set to '%0%'.</key>
+    <!-- The following keys get these tokens passed in:
+	     0: Current value
+		   1: Recommended value
+		   2: Server version
+	  -->
+    <key alias="trySkipIisCustomErrorsCheckSuccessMessage">Try Skip IIS Custom Errors is set to '%0%' and you're using IIS version '%1%'.</key>
+    <key alias="trySkipIisCustomErrorsCheckErrorMessage">Try Skip IIS Custom Errors is currently '%0%'. It is recommended to set this to '%1%' for your IIS version (%2%).</key>
+    <key alias="trySkipIisCustomErrorsCheckRectifySuccessMessage">Try Skip IIS Custom Errors successfully set to '%0%'.</key>
+    <!-- The following keys get predefined tokens passed in that are not all the same, like above -->
+    <key alias="configurationServiceFileNotFound">File does not exist: '%0%'.</key>
+    <key alias="configurationServiceNodeNotFound"><![CDATA[Unable to find <strong>'%0%'</strong> in config file <strong>'%1%'</strong>.]]></key>
+    <key alias="configurationServiceError">There was an error, check log for full error: %0%.</key>
+    <key alias="databaseSchemaValidationCheckDatabaseOk">Database - The database schema is correct for this version of Umbraco</key>
+    <key alias="databaseSchemaValidationCheckDatabaseErrors">%0% problems were detected with your database schema (Check the log for details)</key>
+    <key alias="databaseSchemaValidationCheckDatabaseLogMessage">Some errors were detected while validating the database schema against the current version of Umbraco.</key>
+    <key alias="httpsCheckValidCertificate">Your website's certificate is valid.</key>
+    <key alias="httpsCheckInvalidCertificate">Certificate validation error: '%0%'</key>
+    <key alias="httpsCheckExpiredCertificate">Your website's SSL certificate has expired.</key>
+    <key alias="httpsCheckExpiringCertificate">Your website's SSL certificate is expiring in %0% days.</key>
+    <key alias="healthCheckInvalidUrl">Error pinging the URL %0% - '%1%'</key>
+    <key alias="httpsCheckIsCurrentSchemeHttps">You are currently %0% viewing the site using the HTTPS scheme.</key>
+    <key alias="httpsCheckConfigurationRectifyNotPossible">The appSetting 'Umbraco.Core.UseHttps' is set to 'false' in your web.config file. Once you access this site using the HTTPS scheme, that should be set to 'true'.</key>
+    <key alias="httpsCheckConfigurationCheckResult">The appSetting 'Umbraco.Core.UseHttps' is set to '%0%' in your web.config file, your cookies are %1% marked as secure.</key>
+    <key alias="httpsCheckEnableHttpsError">Could not update the 'Umbraco.Core.UseHttps' setting in your web.config file. Error: %0%</key>
+    <!-- The following keys don't get tokens passed in -->
+    <key alias="httpsCheckEnableHttpsButton">Enable HTTPS</key>
+    <key alias="httpsCheckEnableHttpsDescription">Sets umbracoSSL setting to true in the appSettings of the web.config file.</key>
+    <key alias="httpsCheckEnableHttpsSuccess">The appSetting 'Umbraco.Core.UseHttps' is now set to 'true' in your web.config file, your cookies will be marked as secure.</key>
+    <key alias="rectifyButton">Fix</key>
+    <key alias="cannotRectifyShouldNotEqual">Cannot fix a check with a value comparison type of 'ShouldNotEqual'.</key>
+    <key alias="cannotRectifyShouldEqualWithValue">Cannot fix a check with a value comparison type of 'ShouldEqual' with a provided value.</key>
+    <key alias="valueToRectifyNotProvided">Value to fix check not provided.</key>
+    <key alias="compilationDebugCheckSuccessMessage">Debug compilation mode is disabled.</key>
+    <key alias="compilationDebugCheckErrorMessage">Debug compilation mode is currently enabled. It is recommended to disable this setting before go live.</key>
+    <key alias="compilationDebugCheckRectifySuccessMessage">Debug compilation mode successfully disabled.</key>
+    <key alias="traceModeCheckSuccessMessage">Trace mode is disabled.</key>
+    <key alias="traceModeCheckErrorMessage">Trace mode is currently enabled. It is recommended to disable this setting before go live.</key>
+    <key alias="traceModeCheckRectifySuccessMessage">Trace mode successfully disabled.</key>
+    <key alias="folderPermissionsCheckMessage">All folders have the correct permissions set.</key>
+    <!-- The following keys get these tokens passed in:
+	    0: Comma delimitted list of failed folder paths
+  	-->
+    <key alias="requiredFolderPermissionFailed"><![CDATA[The following folders must be set up with modify permissions but could not be acccessed: <strong>%0%</strong>.]]></key>
+    <key alias="optionalFolderPermissionFailed"><![CDATA[The following folders must be set up with modify permissions for certain Umbraco operations to function but could not be acccessed: <strong>%0%</strong>. If they aren't being written to no action need be taken.]]></key>
+    <key alias="filePermissionsCheckMessage">All files have the correct permissions set.</key>
+    <!-- The following keys get these tokens passed in:
+	    0: Comma delimitted list of failed folder paths
+  	-->
+    <key alias="requiredFilePermissionFailed"><![CDATA[The following files must be set up with write permissions but could not be acccessed: <strong>%0%</strong>.]]></key>
+    <key alias="optionalFilePermissionFailed"><![CDATA[The following files must be set up with write permissions for certain Umbraco operations to function but could not be acccessed: <strong>%0%</strong>. If they aren't being written to no action need be taken.]]></key>
+    <key alias="clickJackingCheckHeaderFound"><![CDATA[The header or meta-tag <strong>X-Frame-Options</strong> used to control whether a site can be IFRAMEd by another was found.]]></key>
+    <key alias="clickJackingCheckHeaderNotFound"><![CDATA[The header or meta-tag <strong>X-Frame-Options</strong> used to control whether a site can be IFRAMEd by another was not found.]]></key>
+    <key alias="setHeaderInConfig">Set Header in Config</key>
+    <key alias="clickJackingSetHeaderInConfigDescription">Adds a value to the httpProtocol/customHeaders section of web.config to prevent the site being IFRAMEd by other websites.</key>
+    <key alias="clickJackingSetHeaderInConfigSuccess">A setting to create a header preventing IFRAMEing of the site by other websites has been added to your web.config file.</key>
+    <key alias="setHeaderInConfigError">Could not update web.config file. Error: %0%</key>
+    <key alias="noSniffCheckHeaderFound"><![CDATA[The header or meta-tag <strong>X-Content-Type-Options</strong> used to protect against MIME sniffing vulnerabilities was found.]]></key>
+    <key alias="noSniffCheckHeaderNotFound"><![CDATA[The header or meta-tag <strong>X-Content-Type-Options</strong> used to protect against MIME sniffing vulnerabilities was not found.]]></key>
+    <key alias="noSniffSetHeaderInConfigDescription">Adds a value to the httpProtocol/customHeaders section of web.config to protect against MIME sniffing vulnerabilities.</key>
+    <key alias="noSniffSetHeaderInConfigSuccess">A setting to create a header protecting against MIME sniffing vulnerabilities has been added to your web.config file.</key>
+    <key alias="hSTSCheckHeaderFound"><![CDATA[The header <strong>Strict-Transport-Security</strong>, also known as the HSTS-header, was found.]]></key>
+    <key alias="hSTSCheckHeaderNotFound"><![CDATA[The header <strong>Strict-Transport-Security</strong> was not found.]]></key>
+    <key alias="hSTSSetHeaderInConfigDescription">Adds the header 'Strict-Transport-Security' with the value 'max-age=10886400' to the httpProtocol/customHeaders section of web.config. Use this fix only if you will have your domains running with https for the next 18 weeks (minimum).</key>
+    <key alias="hSTSSetHeaderInConfigSuccess">The HSTS header has been added to your web.config file.</key>
+    <key alias="xssProtectionCheckHeaderFound"><![CDATA[The header <strong>X-XSS-Protection</strong> was found.]]></key>
+    <key alias="xssProtectionCheckHeaderNotFound"><![CDATA[The header <strong>X-XSS-Protection</strong> was not found.]]></key>
+    <key alias="xssProtectionSetHeaderInConfigDescription">Adds the header 'X-XSS-Protection' with the value '1; mode=block' to the httpProtocol/customHeaders section of web.config. </key>
+    <key alias="xssProtectionSetHeaderInConfigSuccess">The X-XSS-Protection header has been added to your web.config file.</key>
+    <!-- The following key get these tokens passed in:
+	    0: Comma delimitted list of headers found
+  	-->
+    <key alias="excessiveHeadersFound"><![CDATA[The following headers revealing information about the website technology were found: <strong>%0%</strong>.]]></key>
+    <key alias="excessiveHeadersNotFound">No headers revealing information about the website technology were found.</key>
+    <key alias="smtpMailSettingsNotFound">In the Web.config file, system.net/mailsettings could not be found.</key>
+    <key alias="smtpMailSettingsHostNotConfigured">In the Web.config file system.net/mailsettings section, the host is not configured.</key>
+    <key alias="smtpMailSettingsConnectionSuccess">SMTP settings are configured correctly and the service is operating as expected.</key>
+    <key alias="smtpMailSettingsConnectionFail">The SMTP server configured with host '%0%' and port '%1%' could not be reached. Please check to ensure the SMTP settings in the Web.config file system.net/mailsettings are correct.</key>
+    <key alias="notificationEmailsCheckSuccessMessage"><![CDATA[Notification email has been set to <strong>%0%</strong>.]]></key>
+    <key alias="notificationEmailsCheckErrorMessage"><![CDATA[Notification email is still set to the default value of <strong>%0%</strong>.]]></key>
+    <key alias="scheduledHealthCheckEmailBody"><![CDATA[<html><body><p>Results of the scheduled Umbraco Health Checks run on %0% at %1% are as follows:</p>%2%</body></html>]]></key>
+    <key alias="scheduledHealthCheckEmailSubject">Umbraco Health Check Status: %0%</key>
+  </area>
+  <area alias="redirectUrls">
+    <key alias="disableUrlTracker">Disable URL tracker</key>
+    <key alias="enableUrlTracker">Enable URL tracker</key>
+    <key alias="culture">Culture</key>
+    <key alias="originalUrl">Original URL</key>
+    <key alias="redirectedTo">Redirected To</key>
+    <key alias="redirectUrlManagement">Redirect Url Management</key>
+    <key alias="panelInformation">The following URLs redirect to this content item:</key>
+    <key alias="noRedirects">No redirects have been made</key>
+    <key alias="noRedirectsDescription">When a published page gets renamed or moved a redirect will automatically be made to the new page.</key>
+    <key alias="confirmRemove">Are you sure you want to remove the redirect from '%0%' to '%1%'?</key>
+    <key alias="redirectRemoved">Redirect URL removed.</key>
+    <key alias="redirectRemoveError">Error removing redirect URL.</key>
+    <key alias="redirectRemoveWarning">This will remove the redirect</key>
+    <key alias="confirmDisable">Are you sure you want to disable the URL tracker?</key>
+    <key alias="disabledConfirm">URL tracker has now been disabled.</key>
+    <key alias="disableError">Error disabling the URL tracker, more information can be found in your log file.</key>
+    <key alias="enabledConfirm">URL tracker has now been enabled.</key>
+    <key alias="enableError">Error enabling the URL tracker, more information can be found in your log file.</key>
+  </area>
+  <area alias="emptyStates">
+    <key alias="emptyDictionaryTree">No Dictionary items to choose from</key>
+  </area>
+  <area alias="textbox">
+    <key alias="characters_left"><![CDATA[<strong>%0%</strong> characters left.]]></key>
+    <key alias="characters_exceed"><![CDATA[Maximum %0% characters, <strong>%1%</strong> too many.]]></key>
+  </area>
+  <area alias="recycleBin">
+    <key alias="contentTrashed">Trashed content with Id: {0} related to original parent content with Id: {1}</key>
+    <key alias="mediaTrashed">Trashed media with Id: {0} related to original parent media item with Id: {1}</key>
+    <key alias="itemCannotBeRestored">Cannot automatically restore this item</key>
+    <key alias="itemCannotBeRestoredHelpText">There is no location where this item can be automatically restored. You can move the item manually using the tree below.</key>
+    <key alias="wasRestored">was restored under</key>
+  </area>
+  <area alias="relationType">
+    <key alias="direction">Direction</key>
+    <key alias="parentToChild">Parent to child</key>
+    <key alias="bidirectional">Bidirectional</key>
+    <key alias="parent">Parent</key>
+    <key alias="child">Child</key>
+    <key alias="count">Count</key>
+    <key alias="relations">Relations</key>
+    <key alias="created">Created</key>
+    <key alias="comment">Comment</key>
+    <key alias="name">Name</key>
+    <key alias="noRelations">No relations for this relation type.</key>
+    <key alias="tabRelationType">Relation Type</key>
+    <key alias="tabRelations">Relations</key>
+  </area>
+  <area alias="dashboardTabs">
+    <key alias="contentIntro">Getting Started</key>
+    <key alias="contentRedirectManager">Redirect URL Management</key>
+    <key alias="mediaFolderBrowser">Content</key>
+    <key alias="settingsWelcome">Welcome</key>
+    <key alias="settingsExamine">Examine Management</key>
+    <key alias="settingsPublishedStatus">Published Status</key>
+    <key alias="settingsModelsBuilder">Models Builder</key>
+    <key alias="settingsHealthCheck">Health Check</key>
     <key alias="settingsProfiler">Profiling</key>
-    <key alias="memberIntro">Getting Started</key>
-    <key alias="formsInstall">Install Umbraco Forms</key>
-  </area>
-  <area alias="visuallyHiddenTexts">
+    <key alias="memberIntro">Getting Started</key>
+    <key alias="formsInstall">Install Umbraco Forms</key>
+  </area>
+  <area alias="visuallyHiddenTexts">
     <key alias="goBack">Go back</key>
     <key alias="activeListLayout">Active layout:</key>
     <key alias="jumpTo">Jump to</key>
-    <key alias="group">group</key>    
-  </area>
-</language>
+    <key alias="group">group</key>
+    <key alias="passed">passed</key>
+    <key alias="warning">warning</key>
+    <key alias="failed">failed</key>
+    <key alias="suggestion">suggestion</key>
+  </area>
+</language>

From 93df9c4dfd68017a1b49793a3e2d1ecfc0d30757 Mon Sep 17 00:00:00 2001
From: elitsa <elm@umbraco.dk>
Date: Fri, 13 Sep 2019 12:03:33 +0200
Subject: [PATCH 740/776] Renamed angular filter so it doesn't collide with the
 "truncate" one in Forms.

---
 .../{truncate.filter.js => advancedtruncate.filter.js}      | 6 +++---
 .../src/views/common/overlays/itempicker/itempicker.html    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename src/Umbraco.Web.UI.Client/src/common/filters/{truncate.filter.js => advancedtruncate.filter.js} (86%)

diff --git a/src/Umbraco.Web.UI.Client/src/common/filters/truncate.filter.js b/src/Umbraco.Web.UI.Client/src/common/filters/advancedtruncate.filter.js
similarity index 86%
rename from src/Umbraco.Web.UI.Client/src/common/filters/truncate.filter.js
rename to src/Umbraco.Web.UI.Client/src/common/filters/advancedtruncate.filter.js
index 5efe0f5fff..266c444fe5 100644
--- a/src/Umbraco.Web.UI.Client/src/common/filters/truncate.filter.js
+++ b/src/Umbraco.Web.UI.Client/src/common/filters/advancedtruncate.filter.js
@@ -1,7 +1,7 @@
 /**
  * @ngdoc filter
- * @name umbraco.filters.filter:truncate
- * @namespace truncateFilter
+ * @name umbraco.filters.filter:advancedTruncate
+ * @namespace advancedTruncateFilter
  * 
  * param {any} wordwise if true, the string will be cut after last fully displayed word.
  * param {any} max max length of the outputtet string
@@ -10,7 +10,7 @@
  * @description
  * Limits the length of a string, if a cut happens only the string will be appended with three dots to indicate that more is available.
  */
-angular.module("umbraco.filters").filter('truncate', 
+angular.module("umbraco.filters").filter('advancedTruncate', 
     function () {
         return function (value, wordwise, max, tail) {
             if (!value) return '';
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
index a9f57fe304..1594d6139e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
@@ -24,7 +24,7 @@
             <a class="umb-card-grid-item" href="" title="{{ pasteItem.name }}">
                 <span>
                     <i class="{{ pasteItem.icon }}"></i>
-                    {{ pasteItem.name | truncate:true:36 }}
+                    {{ pasteItem.name | advancedTruncate:true:36 }}
                 </span>
             </a>
         </li>

From 2c18a125c6e8178a221700dbf05ea8755fdccacc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Fri, 13 Sep 2019 13:46:15 +0200
Subject: [PATCH 741/776] Revert "Renamed angular filter so it doesn't collide
 with the "truncate" one in Forms."

This reverts commit f1cb89b249bdea3faf4b6d6ccf248f64b2056040.
---
 .../{advancedtruncate.filter.js => truncate.filter.js}      | 6 +++---
 .../src/views/common/overlays/itempicker/itempicker.html    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename src/Umbraco.Web.UI.Client/src/common/filters/{advancedtruncate.filter.js => truncate.filter.js} (86%)

diff --git a/src/Umbraco.Web.UI.Client/src/common/filters/advancedtruncate.filter.js b/src/Umbraco.Web.UI.Client/src/common/filters/truncate.filter.js
similarity index 86%
rename from src/Umbraco.Web.UI.Client/src/common/filters/advancedtruncate.filter.js
rename to src/Umbraco.Web.UI.Client/src/common/filters/truncate.filter.js
index 266c444fe5..5efe0f5fff 100644
--- a/src/Umbraco.Web.UI.Client/src/common/filters/advancedtruncate.filter.js
+++ b/src/Umbraco.Web.UI.Client/src/common/filters/truncate.filter.js
@@ -1,7 +1,7 @@
 /**
  * @ngdoc filter
- * @name umbraco.filters.filter:advancedTruncate
- * @namespace advancedTruncateFilter
+ * @name umbraco.filters.filter:truncate
+ * @namespace truncateFilter
  * 
  * param {any} wordwise if true, the string will be cut after last fully displayed word.
  * param {any} max max length of the outputtet string
@@ -10,7 +10,7 @@
  * @description
  * Limits the length of a string, if a cut happens only the string will be appended with three dots to indicate that more is available.
  */
-angular.module("umbraco.filters").filter('advancedTruncate', 
+angular.module("umbraco.filters").filter('truncate', 
     function () {
         return function (value, wordwise, max, tail) {
             if (!value) return '';
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
index 1594d6139e..a9f57fe304 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
@@ -24,7 +24,7 @@
             <a class="umb-card-grid-item" href="" title="{{ pasteItem.name }}">
                 <span>
                     <i class="{{ pasteItem.icon }}"></i>
-                    {{ pasteItem.name | advancedTruncate:true:36 }}
+                    {{ pasteItem.name | truncate:true:36 }}
                 </span>
             </a>
         </li>

From 3d9c2fee7c99399e32c35c7590c509dce85fdead Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Fri, 13 Sep 2019 14:55:52 +0200
Subject: [PATCH 742/776] new Angular Truncate Filter, that supports Legacy
 version from Umbraco Forms, plus updated code for even prettier truncated
 content.

---
 .../src/common/filters/truncate.filter.js     | 38 +++++++++++++++----
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/filters/truncate.filter.js b/src/Umbraco.Web.UI.Client/src/common/filters/truncate.filter.js
index 5efe0f5fff..395300014d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/filters/truncate.filter.js
+++ b/src/Umbraco.Web.UI.Client/src/common/filters/truncate.filter.js
@@ -4,28 +4,52 @@
  * @namespace truncateFilter
  * 
  * param {any} wordwise if true, the string will be cut after last fully displayed word.
- * param {any} max max length of the outputtet string
- * param {any} tail option tail, defaults to: ' ...'
- *
+ * param {any} max where to cut the string.
+ * param {any} tail option tail, defaults to: '…'
+ * 
+ * Legacy version:
+ * parameter noOfChars(wordwise) Where to cut the string.
+ * parameter appendDots(max) If true dots will be appended in the end.
+ * 
  * @description
  * Limits the length of a string, if a cut happens only the string will be appended with three dots to indicate that more is available.
  */
 angular.module("umbraco.filters").filter('truncate', 
     function () {
         return function (value, wordwise, max, tail) {
+            
             if (!value) return '';
+            
+            // Overload-fix to support Forms Legacy Version:
+            if (typeof(wordwise) !== 'boolean') {
+                // switch arguments around to fit Forms version.
+                if (max !== true) {
+                    tail = '';
+                }
+                max = wordwise;
+                wordwise = false;
+            }
+            // !end of overload fix.
+            
             max = parseInt(max, 10);
             if (!max) return value;
             if (value.length <= max) return value;
-
+            
+            tail = (!tail && tail !== '') ? '…' : tail;
+            
+            if (wordwise && value.substr(max, 1) === ' ') {
+                max++;
+            }
             value = value.substr(0, max);
+            
             if (wordwise) {
                 var lastspace = value.lastIndexOf(' ');
-                if (lastspace != -1) {
-                    value = value.substr(0, lastspace);
+                if (lastspace !== -1) {
+                    value = value.substr(0, lastspace+1);
                 }
             }
-            return value + (tail || (wordwise ? ' …' : '…'));
+            
+            return value + tail;
         };
     }
 );

From 759c8b8b98f5ebeb7064f8fb6671dad4a8aa8bf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Thu, 26 Sep 2019 15:55:35 +0200
Subject: [PATCH 743/776] updated comment

---
 .../src/common/filters/truncate.filter.js                 | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/filters/truncate.filter.js b/src/Umbraco.Web.UI.Client/src/common/filters/truncate.filter.js
index 395300014d..37c560b519 100644
--- a/src/Umbraco.Web.UI.Client/src/common/filters/truncate.filter.js
+++ b/src/Umbraco.Web.UI.Client/src/common/filters/truncate.filter.js
@@ -20,7 +20,13 @@ angular.module("umbraco.filters").filter('truncate',
             
             if (!value) return '';
             
-            // Overload-fix to support Forms Legacy Version:
+            /* 
+            Overload-fix to support Forms Legacy Version:
+
+            We are making this hack to support the old Forms version of the truncate filter.
+            The old version took different attributes, this code block checks if the first argument isnt a boolean, meaning its not the new version, meaning that the filter is begin used in the old way.
+            Therefor we use the second argument(max) to indicate wether we want a tail (…) and using the first argument(wordwise) as the second argument(max amount of characters)
+            */
             if (typeof(wordwise) !== 'boolean') {
                 // switch arguments around to fit Forms version.
                 if (max !== true) {

From 99dcbd3272d5247947008a7f949824c73613441e Mon Sep 17 00:00:00 2001
From: Martin Jensen <mfj@aarhusit.dk>
Date: Thu, 26 Sep 2019 16:27:24 +0200
Subject: [PATCH 744/776] Removing unnecessary delete confirmation (#6448)

---
 .../views/content/content.delete.controller.js | 18 ++++++++++++++++--
 .../src/views/content/delete.html              |  2 +-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js
index 855afc2bd2..60a04732f0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js
@@ -1,12 +1,12 @@
 /**
  * @ngdoc controller
- * @name Umbraco.Editors.ContentDeleteController
+ * @name Umbraco.Editors.Content.DeleteController
  * @function
  * 
  * @description
  * The controller for deleting content
  */
-function ContentDeleteController($scope, $timeout, contentResource, treeService, navigationService, editorState, $location, overlayService) {
+function ContentDeleteController($scope, $timeout, contentResource, treeService, navigationService, editorState, $location, overlayService, languageResource) {
 
     /**
      * Used to toggle UI elements during delete operations
@@ -80,6 +80,20 @@ function ContentDeleteController($scope, $timeout, contentResource, treeService,
     $scope.close = function () {
         navigationService.hideDialog();
     };
+
+  
+    languageResource.getAll().then(function (data) {
+
+        $scope.hasMoreThanOneLanguage = data.length > 1;
+    }, function (err) {
+        toggleDeleting(false);
+
+        //check if response is ysod
+        if (err.status && err.status >= 500) {
+            // TODO: All YSOD handling should be done with an interceptor
+            overlayService.ysod(err);
+        }
+    });
 }
 
 angular.module("umbraco").controller("Umbraco.Editors.Content.DeleteController", ContentDeleteController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/delete.html b/src/Umbraco.Web.UI.Client/src/views/content/delete.html
index 52e5d02178..721139c6e9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/delete.html
@@ -14,7 +14,7 @@
                 <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong>?
             </p>
 
-            <div class="umb-alert umb-alert--warning">
+            <div class="umb-alert umb-alert--warning" ng-show="hasMoreThanOneLanguage">
                 <localize key="defaultdialogs_variantdeletewarning">This will delete the node and all its languages. If you only want to delete one language go and unpublish it instead.</localize>
             </div>
 

From 885f0f0caec8cf77e2fd57c173033ea2d586ffcb Mon Sep 17 00:00:00 2001
From: BatJan <jaskov@gmail.com>
Date: Thu, 26 Sep 2019 14:50:35 +0200
Subject: [PATCH 745/776] Lower the z-index so it does not clash with the
 publishing menu

---
 .../less/components/editor/subheader/umb-editor-sub-header.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less b/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less
index 649aa89055..44cd86a189 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less
@@ -32,7 +32,7 @@
 [umb-sticky-bar] {
     transition: box-shadow 240ms;
     position:sticky;
-    z-index: 99;
+    z-index: 30;
     
     &.umb-sticky-bar--active {
         box-shadow: 0 6px 3px -3px rgba(0,0,0,.16);

From 6beb84442c5c20685530d1a524fd07c78ab2579f Mon Sep 17 00:00:00 2001
From: Rasmus John Pedersen <mail@rjp.dk>
Date: Thu, 26 Sep 2019 16:32:58 +0200
Subject: [PATCH 746/776] Disable rename alias of system user groups

---
 .../editor/umbeditorheader.directive.js        |  3 ++-
 .../src/less/components/umb-locked-field.less  |  3 ++-
 .../components/editor/umb-editor-header.html   |  2 +-
 .../views/components/umb-generate-alias.html   |  2 +-
 .../src/views/users/group.html                 |  1 +
 .../Filters/UserGroupValidateAttribute.cs      | 13 +++++++++++++
 .../Models/ContentEditing/UserGroupBasic.cs    |  6 ++++++
 .../Models/Mapping/UserMapDefinition.cs        | 18 +++++++++++-------
 8 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js
index 76c2e585f8..ebb780c36e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js
@@ -195,6 +195,7 @@ Use this directive to construct a header inside the main editor window.
 @param {string=} icon Show and edit the content icon. Opens an overlay to change the icon.
 @param {boolean=} hideIcon Set to <code>true</code> to hide icon.
 @param {string=} alias show and edit the content alias.
+@param {boolean=} aliasLocked Set to <code>true</code> to lock the alias.
 @param {boolean=} hideAlias Set to <code>true</code> to hide alias.
 @param {string=} description Add a description to the content.
 @param {boolean=} hideDescription Set to <code>true</code> to hide description.
@@ -207,7 +208,6 @@ Use this directive to construct a header inside the main editor window.
     function EditorHeaderDirective(editorService) {
 
         function link(scope) {
-
             scope.vm = {};
             scope.vm.dropdownOpen = false;
             scope.vm.currentVariant = "";
@@ -262,6 +262,7 @@ Use this directive to construct a header inside the main editor window.
                 icon: "=",
                 hideIcon: "@",
                 alias: "=",
+                aliasLocked: "<",
                 hideAlias: "=",
                 description: "=",
                 hideDescription: "@",
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-locked-field.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-locked-field.less
index 8d9ae86ce7..3dd169e892 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-locked-field.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-locked-field.less
@@ -29,7 +29,8 @@
    color: @gray-3;
 }
 
-input.umb-locked-field__input {
+input.umb-locked-field__input,
+.umb-locked-field__text {
   background: rgba(255, 255, 255, 0); // if using transparent it will hide the text in safari
   border-color: transparent !important;
   font-size: 13px;
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
index aca27da7be..824caa87a9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
@@ -46,7 +46,7 @@
                                         ng-if="!hideAlias"
                                         alias="$parent.alias"
                                         alias-from="$parent.name"
-                                        enable-lock="true"
+                                        enable-lock="aliasLocked !== true"
                                         validation-position="'right'"
                                         server-validation-field="Alias">
                     </umb-generate-alias>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-generate-alias.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-generate-alias.html
index 9d68ea1b63..836e8fc3f1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-generate-alias.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-generate-alias.html
@@ -1,5 +1,5 @@
 <div>
-    <span ng-show="!enableLock">{{ alias }}</span>
+    <span class="umb-locked-field__text" ng-show="!enableLock">{{ alias }}</span>
     <div ng-show="enableLock">
     <umb-locked-field
       locked="locked"
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/group.html b/src/Umbraco.Web.UI.Client/src/views/users/group.html
index 1688553bb9..0244819655 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/group.html
+++ b/src/Umbraco.Web.UI.Client/src/views/users/group.html
@@ -9,6 +9,7 @@
             <umb-editor-header
                 name="vm.userGroup.name"
                 alias="vm.userGroup.alias"
+                alias-locked="vm.userGroup.isSystemUserGroup"
                 icon="vm.userGroup.icon"
                 hide-description="true"
                 on-back="vm.goToPage(vm.breadcrumbs[0])"
diff --git a/src/Umbraco.Web/Editors/Filters/UserGroupValidateAttribute.cs b/src/Umbraco.Web/Editors/Filters/UserGroupValidateAttribute.cs
index 1bd7f766d4..7d465a9ddc 100644
--- a/src/Umbraco.Web/Editors/Filters/UserGroupValidateAttribute.cs
+++ b/src/Umbraco.Web/Editors/Filters/UserGroupValidateAttribute.cs
@@ -50,6 +50,19 @@ namespace Umbraco.Web.Editors.Filters
                         actionContext.Response = actionContext.Request.CreateErrorResponse(HttpStatusCode.NotFound, message);
                         return;
                     }
+
+                    if (persisted.Alias != userGroupSave.Alias)
+                    {
+                        if (persisted.Alias == Constants.Security.AdminGroupAlias
+                            || persisted.Alias == Constants.Security.SensitiveDataGroupAlias
+                            || persisted.Alias == Constants.Security.TranslatorGroupAlias)
+                        {
+                            var message = $"User group with alias: {persisted.Alias} cannot be changed";
+                            actionContext.Response = actionContext.Request.CreateErrorResponse(HttpStatusCode.BadRequest, message);
+                            return;
+                        }
+                    }
+
                     //map the model to the persisted instance
                     Mapper.Map(userGroupSave, persisted);
                     break;
diff --git a/src/Umbraco.Web/Models/ContentEditing/UserGroupBasic.cs b/src/Umbraco.Web/Models/ContentEditing/UserGroupBasic.cs
index 0457711c6c..0446ed6d34 100644
--- a/src/Umbraco.Web/Models/ContentEditing/UserGroupBasic.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/UserGroupBasic.cs
@@ -33,5 +33,11 @@ namespace Umbraco.Web.Models.ContentEditing
         /// </summary>
         [DataMember(Name = "userCount")]
         public int UserCount { get; set; }
+
+        /// <summary>
+        /// Is the user group a system group e.g. "Administrators", "Sensitive data" or "Translators"
+        /// </summary>
+        [DataMember(Name = "isSystemUserGroup")]
+        public bool IsSystemUserGroup { get; set; }
     }
 }
diff --git a/src/Umbraco.Web/Models/Mapping/UserMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/UserMapDefinition.cs
index 4acda1e552..abbb67c4aa 100644
--- a/src/Umbraco.Web/Models/Mapping/UserMapDefinition.cs
+++ b/src/Umbraco.Web/Models/Mapping/UserMapDefinition.cs
@@ -138,7 +138,7 @@ namespace Umbraco.Web.Models.Mapping
         }
 
         // Umbraco.Code.MapAll -ContentStartNode -UserCount -MediaStartNode -Key -Sections
-        // Umbraco.Code.MapAll -Notifications -Udi -Trashed -AdditionalData
+        // Umbraco.Code.MapAll -Notifications -Udi -Trashed -AdditionalData -IsSystemUserGroup
         private void Map(IReadOnlyUserGroup source, UserGroupBasic target, MapperContext context)
         {
             target.Alias = source.Alias;
@@ -147,11 +147,11 @@ namespace Umbraco.Web.Models.Mapping
             target.Name = source.Name;
             target.ParentId = -1;
             target.Path = "-1," + source.Id;
-            MapUserGroupBasic(target, source.AllowedSections, source.StartContentId, source.StartMediaId, context);
+            MapUserGroupBasic(target, source.Alias, source.AllowedSections, source.StartContentId, source.StartMediaId, context);
         }
 
         // Umbraco.Code.MapAll -ContentStartNode -MediaStartNode -Sections -Notifications
-        // Umbraco.Code.MapAll -Udi -Trashed -AdditionalData
+        // Umbraco.Code.MapAll -Udi -Trashed -AdditionalData -IsSystemUserGroup
         private void Map(IUserGroup source, UserGroupBasic target, MapperContext context)
         {
             target.Alias = source.Alias;
@@ -162,7 +162,7 @@ namespace Umbraco.Web.Models.Mapping
             target.ParentId = -1;
             target.Path = "-1," + source.Id;
             target.UserCount = source.UserCount;
-            MapUserGroupBasic(target, source.AllowedSections, source.StartContentId, source.StartMediaId, context);
+            MapUserGroupBasic(target, source.Alias, source.AllowedSections, source.StartContentId, source.StartMediaId, context);
         }
 
         // Umbraco.Code.MapAll -Udi -Trashed -AdditionalData -AssignedPermissions
@@ -198,7 +198,7 @@ namespace Umbraco.Web.Models.Mapping
         }
 
         // Umbraco.Code.MapAll -ContentStartNode -MediaStartNode -Sections -Notifications -Udi
-        // Umbraco.Code.MapAll -Trashed -AdditionalData -Users -AssignedPermissions
+        // Umbraco.Code.MapAll -Trashed -AdditionalData -Users -AssignedPermissions -IsSystemUserGroup
         private void Map(IUserGroup source, UserGroupDisplay target, MapperContext context)
         {
             target.Alias = source.Alias;
@@ -211,7 +211,7 @@ namespace Umbraco.Web.Models.Mapping
             target.Path = "-1," + source.Id;
             target.UserCount = source.UserCount;
 
-            MapUserGroupBasic(target, source.AllowedSections, source.StartContentId, source.StartMediaId, context);
+            MapUserGroupBasic(target, source.Alias, source.AllowedSections, source.StartContentId, source.StartMediaId, context);
 
             //Important! Currently we are never mapping to multiple UserGroupDisplay objects but if we start doing that
             // this will cause an N+1 and we'll need to change how this works.
@@ -334,8 +334,12 @@ namespace Umbraco.Web.Models.Mapping
 
         // helpers
 
-        private void MapUserGroupBasic(UserGroupBasic target, IEnumerable<string> sourceAllowedSections, int? sourceStartContentId, int? sourceStartMediaId, MapperContext context)
+        private void MapUserGroupBasic(UserGroupBasic target, string alias, IEnumerable<string> sourceAllowedSections, int? sourceStartContentId, int? sourceStartMediaId, MapperContext context)
         {
+            target.IsSystemUserGroup = alias == Constants.Security.AdminGroupAlias
+                               || alias == Constants.Security.TranslatorGroupAlias
+                               || alias == Constants.Security.SensitiveDataGroupAlias;
+
             var allSections = _sectionService.GetSections();
             target.Sections = context.MapEnumerable<ISection, Section>(allSections.Where(x => sourceAllowedSections.Contains(x.Alias)));
 

From d67a89114c7b1d54b41dfeb93ff638901e0a835c Mon Sep 17 00:00:00 2001
From: Jan Skovgaard <jaskov@gmail.com>
Date: Thu, 26 Sep 2019 18:38:38 +0200
Subject: [PATCH 747/776] Health Check - Text alternatives for icons missing
 (In Groups) (#6453)

---
 .../src/less/dashboards/healthcheck.less       |  5 ++++-
 .../views/dashboard/settings/healthcheck.html  | 18 ++++++++++++++++--
 src/Umbraco.Web.UI/Umbraco/config/lang/da.xml  |  2 ++
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml  |  4 +++-
 .../Umbraco/config/lang/en_us.xml              |  2 ++
 5 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/dashboards/healthcheck.less b/src/Umbraco.Web.UI.Client/src/less/dashboards/healthcheck.less
index b3af476406..3a448f557d 100644
--- a/src/Umbraco.Web.UI.Client/src/less/dashboards/healthcheck.less
+++ b/src/Umbraco.Web.UI.Client/src/less/dashboards/healthcheck.less
@@ -120,7 +120,10 @@
 /* DETAILS */
 
 .umb-healthcheck-back-link {
-	font-weight: bold;
+    background: transparent;
+    border: 0 none;
+    padding: 0;
+    font-weight: bold;
 	color: @black;
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/healthcheck.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/healthcheck.html
index 78df1975c8..657afc9898 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/healthcheck.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/healthcheck.html
@@ -82,7 +82,9 @@
 
         <umb-editor-sub-header>
             <umb-editor-sub-header-content-left>
-                <a class="umb-healthcheck-back-link" href="" ng-click="vm.setViewState('list');">&larr; Back to overview</a>
+                <button type="button" class="umb-healthcheck-back-link" ng-click="vm.setViewState('list');">
+                    <span aria-hidden="true">&larr;</span> Back to overview
+                </button>
             </umb-editor-sub-header-content-left>
         </umb-editor-sub-header>
 
@@ -111,7 +113,7 @@
 
                         <div class="umb-panel-group__details-status" ng-repeat="status in check.status">
 
-                            <div class="umb-panel-group__details-status-icon-container">
+                            <div class="umb-panel-group__details-status-icon-container" aria-hidden="true">
                                 <i class="umb-healthcheck-status-icon icon-check color-green" ng-if="status.resultType === 0"></i>
                                 <i class="umb-healthcheck-status-icon icon-alert icon-alert color-yellow" ng-if="status.resultType === 1"></i>
                                 <i class="umb-healthcheck-status-icon icon-delete icon-delete color-red" ng-if="status.resultType === 2"></i>
@@ -121,6 +123,18 @@
                             <div class="umb-panel-group__details-status-content">
 
                                 <div class="umb-panel-group__details-status-text">
+                                    <span class="sr-only" ng-if="status.resultType === 0">
+                                        <localize key="visuallyHiddenTexts_checkPassed">Check passed</localize>:
+                                    </span>
+                                    <span class="sr-only" ng-if="status.resultType === 1">
+                                        <localize key="visuallyHiddenTexts_warning">warning</localize>:
+                                    </span>
+                                    <span class="sr-only" ng-if="status.resultType === 2">
+                                        <localize key="visuallyHiddenTexts_checkFailed">Check failed</localize>:
+                                    </span>
+                                    <span class="sr-only" ng-if="status.resultType === 3">
+                                        <localize key="visuallyHiddenTexts_suggestion">suggestion</localize>:
+                                    </span>
                                     <div ng-bind-html="status.message"></div>
                                     <div ng-if="status.description" ng-bind-html="status.description"></div>
                                 </div>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index d44d32172a..2dc88b315a 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -1626,5 +1626,7 @@ Mange hilsner fra Umbraco robotten
     <key alias="warning">advarsel</key>
     <key alias="failed">fejlet</key>
     <key alias="suggestion">forslag</key>
+    <key alias="checkPassed">Test bestået</key>
+    <key alias="checkFailed">Test fejlet</key>
   </area>
 </language>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 1cb73e8e1e..100f4c81d2 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -2143,6 +2143,8 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="passed">passed</key>
     <key alias="warning">warning</key>
     <key alias="failed">failed</key>
-    <key alias="suggestion">suggestion</key>
+    <key alias="suggestion">suggestion</key>
+    <key alias="checkPassed">Check passed</key>
+    <key alias="checkFailed">Check failed</key>
   </area>
 </language>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index 1236d057ed..6a7070e7e0 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -2158,5 +2158,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="warning">warning</key>
     <key alias="failed">failed</key>
     <key alias="suggestion">suggestion</key>
+    <key alias="checkPassed">Check passed</key>
+    <key alias="checkFailed">Check failed</key>
   </area>
 </language>

From 52c4a572473a47daed3973285a5798b424f4b83f Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 26 Sep 2019 18:43:09 +0200
Subject: [PATCH 748/776] In addition to #6236 - now this now longer keeps
 appending the content name on each change of the language dropdown

---
 .../umbeditorcontentheader.directive.js       | 288 +++++++++---------
 src/Umbraco.Web.UI.Client/src/init.js         |  10 +-
 2 files changed, 153 insertions(+), 145 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js
index 8668d62d4f..b26113c9d1 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js
@@ -3,10 +3,10 @@
 
     function EditorContentHeader(serverValidationManager, localizationService, editorState) {
 
+
         function link(scope, el, attr, ctrl) {
-            
             var unsubscribe = [];
-            
+
             if (!scope.serverValidationNameField) {
                 scope.serverValidationNameField = "Name";
             }
@@ -15,15 +15,16 @@
             }
 
             scope.isNew = scope.content.state == "NotCreated";
-
+            
             localizationService.localizeMany([
-                    scope.isNew ? "placeholders_a11yCreateItem" : "placeholders_a11yEdit",
+                scope.isNew ? "placeholders_a11yCreateItem" : "placeholders_a11yEdit",
                 "placeholders_a11yName",
-                    scope.isNew?"general_new":"general_edit"]
+                scope.isNew ? "general_new" : "general_edit"]
             ).then(function (data) {
+
                 scope.a11yMessage = data[0];
                 scope.a11yName = data[1];
-                var title = data[2] +":";
+                var title = data[2] + ": ";
                 if (!scope.isNew) {
                     scope.a11yMessage += " " + scope.content.name;
                     title += scope.content.name;
@@ -33,16 +34,17 @@
                     scope.a11yName = name + " " + scope.a11yName;
                     title += name;
                 }
-                scope.$root.locationTitle = title + " - " + scope.$root.locationTitle ;
+                
+                $rootScope.$emit("$changeTitle", title);
             });
             scope.vm = {};
             scope.vm.dropdownOpen = false;
             scope.vm.currentVariant = "";
             scope.vm.variantsWithError = [];
             scope.vm.defaultVariant = null;
-            
+
             scope.vm.errorsOnOtherVariants = false;// indicating wether to show that other variants, than the current, have errors.
-            
+
             function checkErrorsOnOtherVariants() {
                 var check = false;
                 angular.forEach(scope.content.variants, function (variant) {
@@ -52,10 +54,10 @@
                 });
                 scope.vm.errorsOnOtherVariants = check;
             }
-            
+
             function onCultureValidation(valid, errors, allErrors, culture) {
                 var index = scope.vm.variantsWithError.indexOf(culture);
-                if(valid === true) {
+                if (valid === true) {
                     if (index !== -1) {
                         scope.vm.variantsWithError.splice(index, 1);
                     }
@@ -66,165 +68,165 @@
                 }
                 checkErrorsOnOtherVariants();
             }
-            
+
             function onInit() {
-                
+
                 // find default.
                 angular.forEach(scope.content.variants, function (variant) {
                     if (variant.language.isDefault) {
                         scope.vm.defaultVariant = variant;
                     }
                 });
-                
+
                 setCurrentVariant();
-                
+
                 angular.forEach(scope.content.apps, (app) => {
                     if (app.alias === "umbContent") {
                         app.anchors = scope.content.tabs;
                     }
                 });
-                
-                
-                angular.forEach(scope.content.variants, function (variant) {
-                    unsubscribe.push(serverValidationManager.subscribe(null, variant.language.culture, null, onCultureValidation));
-                });
-                
-                unsubscribe.push(serverValidationManager.subscribe(null, null, null, onCultureValidation));
-                
-                
-                
-            }
 
-            function setCurrentVariant() {
-                angular.forEach(scope.content.variants, function (variant) {
-                    if (variant.active) {
-                        scope.vm.currentVariant = variant;
-                        checkErrorsOnOtherVariants();
-                    }
-                });
-            }
 
-            scope.goBack = function () {
-                if (scope.onBack) {
-                    scope.onBack();
-                }
-            };
+            angular.forEach(scope.content.variants, function (variant) {
+                unsubscribe.push(serverValidationManager.subscribe(null, variant.language.culture, null, onCultureValidation));
+            });
 
-            scope.selectVariant = function (event, variant) {
+            unsubscribe.push(serverValidationManager.subscribe(null, null, null, onCultureValidation));
 
-                if (scope.onSelectVariant) {
-                    scope.vm.dropdownOpen = false;
-                    scope.onSelectVariant({ "variant": variant });
-                }
-            };
 
-            scope.selectNavigationItem = function(item) {
-                if(scope.onSelectNavigationItem) {
-                    scope.onSelectNavigationItem({"item": item});
-                }
-            }
 
-            scope.selectAnchorItem = function(item, anchor) {
-                if(scope.onSelectAnchorItem) {
-                    scope.onSelectAnchorItem({"item": item, "anchor": anchor});
-                }
-            }
+        }
 
-            scope.closeSplitView = function () {
-                if (scope.onCloseSplitView) {
-                    scope.onCloseSplitView();
-                }
-            };
-
-            scope.openInSplitView = function (event, variant) {
-                if (scope.onOpenInSplitView) {
-                    scope.vm.dropdownOpen = false;
-                    scope.onOpenInSplitView({ "variant": variant });
-                }
-            };
-
-            /**
-             * keep track of open variants - this is used to prevent the same variant to be open in more than one split view
-             * @param {any} culture
-             */
-            scope.variantIsOpen = function(culture) {
-                return (scope.openVariants.indexOf(culture) !== -1);
-            }
-            
-            /**
-             * Check whether a variant has a error, used to display errors in variant switcher.
-             * @param {any} culture
-             */
-            scope.variantHasError = function(culture) {
-                // if we are looking for the default language we also want to check for invariant.
-                if (culture === scope.vm.defaultVariant.language.culture) {
-                    if(scope.vm.variantsWithError.indexOf("invariant") !== -1) {
-                        return true;
-                    }
-                }
-                if(scope.vm.variantsWithError.indexOf(culture) !== -1) {
-                    return true;
-                }
-                return false;
-            }
-
-            onInit();
-
-            //watch for the active culture changing, if it changes, update the current variant
-            if (scope.content.variants) {
-                scope.$watch(function () {
-                    for (var i = 0; i < scope.content.variants.length; i++) {
-                        var v = scope.content.variants[i];
-                        if (v.active) {
-                            return v.language.culture;
-                        }
-                    }
-                    return scope.vm.currentVariant.language.culture; //should never get here
-                }, function (newValue, oldValue) {
-                    if (newValue !== scope.vm.currentVariant.language.culture) {
-                        setCurrentVariant();
-                    }
-                });
-            }
-            
-            scope.$on('$destroy', function () {
-                for (var u in unsubscribe) {
-                    unsubscribe[u]();
+        function setCurrentVariant() {
+            angular.forEach(scope.content.variants, function (variant) {
+                if (variant.active) {
+                    scope.vm.currentVariant = variant;
+                    checkErrorsOnOtherVariants();
                 }
             });
         }
 
-
-        var directive = {
-            transclude: true,
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/editor/umb-editor-content-header.html',
-            scope: {
-                name: "=",
-                nameDisabled: "<?",
-                menu: "=",
-                hideActionsMenu: "<?",
-                content: "=",
-                openVariants: "<",
-                hideChangeVariant: "<?",
-                onSelectNavigationItem: "&?",
-                onSelectAnchorItem: "&?",
-                showBackButton: "<?",
-                onBack: "&?",
-                splitViewOpen: "=?",
-                onOpenInSplitView: "&?",
-                onCloseSplitView: "&?",
-                onSelectVariant: "&?",
-                serverValidationNameField: "@?",
-                serverValidationAliasField: "@?"
-            },
-            link: link
+        scope.goBack = function () {
+            if (scope.onBack) {
+                scope.onBack();
+            }
         };
 
-        return directive;
+        scope.selectVariant = function (event, variant) {
+
+            if (scope.onSelectVariant) {
+                scope.vm.dropdownOpen = false;
+                scope.onSelectVariant({ "variant": variant });
+            }
+        };
+
+        scope.selectNavigationItem = function (item) {
+            if (scope.onSelectNavigationItem) {
+                scope.onSelectNavigationItem({ "item": item });
+            }
+        }
+
+        scope.selectAnchorItem = function (item, anchor) {
+            if (scope.onSelectAnchorItem) {
+                scope.onSelectAnchorItem({ "item": item, "anchor": anchor });
+            }
+        }
+
+        scope.closeSplitView = function () {
+            if (scope.onCloseSplitView) {
+                scope.onCloseSplitView();
+            }
+        };
+
+        scope.openInSplitView = function (event, variant) {
+            if (scope.onOpenInSplitView) {
+                scope.vm.dropdownOpen = false;
+                scope.onOpenInSplitView({ "variant": variant });
+            }
+        };
+
+        /**
+         * keep track of open variants - this is used to prevent the same variant to be open in more than one split view
+         * @param {any} culture
+         */
+        scope.variantIsOpen = function (culture) {
+            return (scope.openVariants.indexOf(culture) !== -1);
+        }
+
+        /**
+         * Check whether a variant has a error, used to display errors in variant switcher.
+         * @param {any} culture
+         */
+        scope.variantHasError = function (culture) {
+            // if we are looking for the default language we also want to check for invariant.
+            if (culture === scope.vm.defaultVariant.language.culture) {
+                if (scope.vm.variantsWithError.indexOf("invariant") !== -1) {
+                    return true;
+                }
+            }
+            if (scope.vm.variantsWithError.indexOf(culture) !== -1) {
+                return true;
+            }
+            return false;
+        }
+
+        onInit();
+
+        //watch for the active culture changing, if it changes, update the current variant
+        if (scope.content.variants) {
+            scope.$watch(function () {
+                for (var i = 0; i < scope.content.variants.length; i++) {
+                    var v = scope.content.variants[i];
+                    if (v.active) {
+                        return v.language.culture;
+                    }
+                }
+                return scope.vm.currentVariant.language.culture; //should never get here
+            }, function (newValue, oldValue) {
+                if (newValue !== scope.vm.currentVariant.language.culture) {
+                    setCurrentVariant();
+                }
+            });
+        }
+
+        scope.$on('$destroy', function () {
+            for (var u in unsubscribe) {
+                unsubscribe[u]();
+            }
+        });
     }
 
+
+    var directive = {
+        transclude: true,
+        restrict: 'E',
+        replace: true,
+        templateUrl: 'views/components/editor/umb-editor-content-header.html',
+        scope: {
+            name: "=",
+            nameDisabled: "<?",
+            menu: "=",
+            hideActionsMenu: "<?",
+            content: "=",
+            openVariants: "<",
+            hideChangeVariant: "<?",
+            onSelectNavigationItem: "&?",
+            onSelectAnchorItem: "&?",
+            showBackButton: "<?",
+            onBack: "&?",
+            splitViewOpen: "=?",
+            onOpenInSplitView: "&?",
+            onCloseSplitView: "&?",
+            onSelectVariant: "&?",
+            serverValidationNameField: "@?",
+            serverValidationAliasField: "@?"
+        },
+        link: link
+    };
+
+    return directive;
+}
+
     angular.module('umbraco.directives').directive('umbEditorContentHeader', EditorContentHeader);
 
-})();
+}) ();
diff --git a/src/Umbraco.Web.UI.Client/src/init.js b/src/Umbraco.Web.UI.Client/src/init.js
index e169d78b36..b8b210db9e 100644
--- a/src/Umbraco.Web.UI.Client/src/init.js
+++ b/src/Umbraco.Web.UI.Client/src/init.js
@@ -43,7 +43,13 @@ app.run(['$rootScope', '$route', '$location', 'urlHelper', 'navigationService',
         }
 
         var currentRouteParams = null;
-        
+
+        var originalTitle = "";
+
+        $rootScope.$on('$changeTitle',function (event, titlePrefix) {
+            $rootScope.locationTitle = titlePrefix;
+        });
+
         /** execute code on each successful route */
         $rootScope.$on('$routeChangeSuccess', function (event, current, previous) {
 
@@ -90,7 +96,7 @@ app.run(['$rootScope', '$route', '$location', 'urlHelper', 'navigationService',
 
                 $rootScope.locationTitle = "Umbraco - " + $location.$$host;
             }
-
+            originalTitle = $rootScope.locationTitle;
         });
 
         /** When the route change is rejected - based on checkAuth - we'll prevent the rejected route from executing including

From 35a7283952ebcfb48f3d4aacce3f4fb06f8beaea Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 27 Sep 2019 10:49:48 +0200
Subject: [PATCH 749/776] Fixes #2997 - ContentService returns outdated result

---
 src/Umbraco.Tests/Cache/RefresherTests.cs     |  6 ++--
 .../PublishedContent/NuCacheChildrenTests.cs  | 32 +++++++++----------
 .../Cache/ContentCacheRefresher.cs            |  8 +++--
 .../Cache/DistributedCacheExtensions.cs       |  8 ++---
 src/Umbraco.Web/Cache/MediaCacheRefresher.cs  |  6 ++--
 ...aseServerRegistrarAndMessengerComponent.cs |  4 +--
 .../NuCache/PublishedSnapshotService.cs       |  4 +--
 7 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/src/Umbraco.Tests/Cache/RefresherTests.cs b/src/Umbraco.Tests/Cache/RefresherTests.cs
index b1d0ad7b1a..eb8580c9e2 100644
--- a/src/Umbraco.Tests/Cache/RefresherTests.cs
+++ b/src/Umbraco.Tests/Cache/RefresherTests.cs
@@ -12,20 +12,22 @@ namespace Umbraco.Tests.Cache
         [Test]
         public void MediaCacheRefresherCanDeserializeJsonPayload()
         {
-            var source = new[] { new MediaCacheRefresher.JsonPayload(1234, TreeChangeTypes.None) };
+            var source = new[] { new MediaCacheRefresher.JsonPayload(1234, Guid.NewGuid(), TreeChangeTypes.None) };
             var json = JsonConvert.SerializeObject(source);
             var payload = JsonConvert.DeserializeObject<MediaCacheRefresher.JsonPayload[]>(json);
             Assert.AreEqual(source[0].Id, payload[0].Id);
+            Assert.AreEqual(source[0].Key, payload[0].Key);
             Assert.AreEqual(source[0].ChangeTypes, payload[0].ChangeTypes);
         }
 
         [Test]
         public void ContentCacheRefresherCanDeserializeJsonPayload()
         {
-            var source = new[] { new ContentCacheRefresher.JsonPayload(1234, TreeChangeTypes.None) };
+            var source = new[] { new ContentCacheRefresher.JsonPayload(1234, Guid.NewGuid(), TreeChangeTypes.None) };
             var json = JsonConvert.SerializeObject(source);
             var payload = JsonConvert.DeserializeObject<ContentCacheRefresher.JsonPayload[]>(json);
             Assert.AreEqual(source[0].Id, payload[0].Id);
+            Assert.AreEqual(source[0].Key, payload[0].Key);
             Assert.AreEqual(source[0].ChangeTypes, payload[0].ChangeTypes);
         }
 
diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
index 998c9589b0..ac3ac7d455 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
@@ -458,7 +458,7 @@ namespace Umbraco.Tests.PublishedContent
             };
 
             // notify
-            _snapshotService.Notify(new[] { new ContentCacheRefresher.JsonPayload(10, TreeChangeTypes.RefreshBranch) }, out _, out _);
+            _snapshotService.Notify(new[] { new ContentCacheRefresher.JsonPayload(10, Guid.Empty, TreeChangeTypes.RefreshBranch) }, out _, out _);
 
             // changes that *I* make are immediately visible on the current snapshot
             var documents = snapshot.Content.GetAtRoot().ToArray();
@@ -500,7 +500,7 @@ namespace Umbraco.Tests.PublishedContent
             };
 
             // notify
-            _snapshotService.Notify(new[] { new ContentCacheRefresher.JsonPayload(1, TreeChangeTypes.RefreshBranch) }, out _, out _);
+            _snapshotService.Notify(new[] { new ContentCacheRefresher.JsonPayload(1, Guid.Empty, TreeChangeTypes.RefreshBranch) }, out _, out _);
 
             // changes that *I* make are immediately visible on the current snapshot
             var documents = snapshot.Content.GetAtRoot().ToArray();
@@ -580,7 +580,7 @@ namespace Umbraco.Tests.PublishedContent
             };
 
             // notify
-            _snapshotService.Notify(new[] { new ContentCacheRefresher.JsonPayload(kit.Node.ParentContentId, TreeChangeTypes.RefreshBranch) }, out _, out _);
+            _snapshotService.Notify(new[] { new ContentCacheRefresher.JsonPayload(kit.Node.ParentContentId, Guid.Empty, TreeChangeTypes.RefreshBranch) }, out _, out _);
 
             // changes that *I* make are immediately visible on the current snapshot
             var documents = snapshot.Content.GetById(kit.Node.ParentContentId).Children().ToArray();
@@ -677,8 +677,8 @@ namespace Umbraco.Tests.PublishedContent
             _snapshotService.Notify(new[]
             {
                 // removal must come first
-                new ContentCacheRefresher.JsonPayload(2, TreeChangeTypes.RefreshBranch),
-                new ContentCacheRefresher.JsonPayload(1, TreeChangeTypes.RefreshBranch)
+                new ContentCacheRefresher.JsonPayload(2, Guid.Empty, TreeChangeTypes.RefreshBranch),
+                new ContentCacheRefresher.JsonPayload(1, Guid.Empty, TreeChangeTypes.RefreshBranch)
             }, out _, out _);
 
             // changes that *I* make are immediately visible on the current snapshot
@@ -873,9 +873,9 @@ namespace Umbraco.Tests.PublishedContent
             // notify
             _snapshotService.Notify(new[]
             {
-                new ContentCacheRefresher.JsonPayload(3, TreeChangeTypes.Remove), // remove last
-                new ContentCacheRefresher.JsonPayload(5, TreeChangeTypes.Remove), // remove middle
-                new ContentCacheRefresher.JsonPayload(9, TreeChangeTypes.Remove), // remove first
+                new ContentCacheRefresher.JsonPayload(3, Guid.Empty, TreeChangeTypes.Remove), // remove last
+                new ContentCacheRefresher.JsonPayload(5, Guid.Empty, TreeChangeTypes.Remove), // remove middle
+                new ContentCacheRefresher.JsonPayload(9, Guid.Empty, TreeChangeTypes.Remove), // remove first
             }, out _, out _);
 
             documents = snapshot.Content.GetAtRoot().ToArray();
@@ -890,9 +890,9 @@ namespace Umbraco.Tests.PublishedContent
             // notify
             _snapshotService.Notify(new[]
             {
-                new ContentCacheRefresher.JsonPayload(1, TreeChangeTypes.Remove), // remove first
-                new ContentCacheRefresher.JsonPayload(8, TreeChangeTypes.Remove), // remove
-                new ContentCacheRefresher.JsonPayload(7, TreeChangeTypes.Remove), // remove
+                new ContentCacheRefresher.JsonPayload(1, Guid.Empty, TreeChangeTypes.Remove), // remove first
+                new ContentCacheRefresher.JsonPayload(8, Guid.Empty, TreeChangeTypes.Remove), // remove
+                new ContentCacheRefresher.JsonPayload(7, Guid.Empty, TreeChangeTypes.Remove), // remove
             }, out _, out _);
 
             documents = snapshot.Content.GetAtRoot().ToArray();
@@ -922,8 +922,8 @@ namespace Umbraco.Tests.PublishedContent
             // notify
             _snapshotService.Notify(new[]
             {
-                new ContentCacheRefresher.JsonPayload(1, TreeChangeTypes.RefreshBranch),
-                new ContentCacheRefresher.JsonPayload(2, TreeChangeTypes.RefreshNode),
+                new ContentCacheRefresher.JsonPayload(1, Guid.Empty, TreeChangeTypes.RefreshBranch),
+                new ContentCacheRefresher.JsonPayload(2, Guid.Empty, TreeChangeTypes.RefreshNode),
             }, out _, out _);
 
             documents = snapshot.Content.GetAtRoot().ToArray();
@@ -979,7 +979,7 @@ namespace Umbraco.Tests.PublishedContent
 
             _snapshotService.Notify(new[]
             {
-                new ContentCacheRefresher.JsonPayload(2, TreeChangeTypes.Remove)
+                new ContentCacheRefresher.JsonPayload(2, Guid.Empty, TreeChangeTypes.Remove)
             }, out _, out _);
 
             parentNodes = contentStore.Test.GetValues(1);
@@ -1038,7 +1038,7 @@ namespace Umbraco.Tests.PublishedContent
 
             _snapshotService.Notify(new[]
             {
-                new ContentCacheRefresher.JsonPayload(3, TreeChangeTypes.Remove) //remove middle child
+                new ContentCacheRefresher.JsonPayload(3, Guid.Empty, TreeChangeTypes.Remove) //remove middle child
             }, out _, out _);
 
             Assert.AreEqual(2, contentStore.Test.LiveGen);
@@ -1113,7 +1113,7 @@ namespace Umbraco.Tests.PublishedContent
 
             _snapshotService.Notify(new[]
             {
-                new ContentCacheRefresher.JsonPayload(3, TreeChangeTypes.RefreshBranch) //remove middle child
+                new ContentCacheRefresher.JsonPayload(3, Guid.Empty, TreeChangeTypes.RefreshBranch) //remove middle child
             }, out _, out _);
 
             Assert.AreEqual(2, contentStore.Test.LiveGen);
diff --git a/src/Umbraco.Web/Cache/ContentCacheRefresher.cs b/src/Umbraco.Web/Cache/ContentCacheRefresher.cs
index 21b97d980d..423e0e3cea 100644
--- a/src/Umbraco.Web/Cache/ContentCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/ContentCacheRefresher.cs
@@ -51,7 +51,10 @@ namespace Umbraco.Web.Cache
 
             foreach (var payload in payloads.Where(x => x.Id != default))
             {
+                //By INT Id
                 isolatedCache.Clear(RepositoryCacheKeys.GetKey<IContent>(payload.Id));
+                //By GUID Key
+                isolatedCache.Clear(RepositoryCacheKeys.GetKey<IContent>(payload.Key));
 
                 _idkMap.ClearCache(payload.Id);
 
@@ -137,14 +140,15 @@ namespace Umbraco.Web.Cache
 
         public class JsonPayload
         {
-            public JsonPayload(int id, TreeChangeTypes changeTypes)
+            public JsonPayload(int id, Guid? key, TreeChangeTypes changeTypes)
             {
                 Id = id;
+                Key = key;
                 ChangeTypes = changeTypes;
             }
 
             public int Id { get; }
-
+            public Guid? Key { get; }
             public TreeChangeTypes ChangeTypes { get; }
         }
 
diff --git a/src/Umbraco.Web/Cache/DistributedCacheExtensions.cs b/src/Umbraco.Web/Cache/DistributedCacheExtensions.cs
index 80c49e279c..65b29aabc6 100644
--- a/src/Umbraco.Web/Cache/DistributedCacheExtensions.cs
+++ b/src/Umbraco.Web/Cache/DistributedCacheExtensions.cs
@@ -106,7 +106,7 @@ namespace Umbraco.Web.Cache
 
         public static void RefreshAllContentCache(this DistributedCache dc)
         {
-            var payloads = new[] { new ContentCacheRefresher.JsonPayload(0, TreeChangeTypes.RefreshAll) };
+            var payloads = new[] { new ContentCacheRefresher.JsonPayload(0, null, TreeChangeTypes.RefreshAll) };
 
             // note: refresh all content cache does refresh content types too
             dc.RefreshByPayload(ContentCacheRefresher.UniqueId, payloads);
@@ -117,7 +117,7 @@ namespace Umbraco.Web.Cache
             if (changes.Length == 0) return;
 
             var payloads = changes
-                .Select(x => new ContentCacheRefresher.JsonPayload(x.Item.Id, x.ChangeTypes));
+                .Select(x => new ContentCacheRefresher.JsonPayload(x.Item.Id, x.Item.Key, x.ChangeTypes));
 
             dc.RefreshByPayload(ContentCacheRefresher.UniqueId, payloads);
         }
@@ -157,7 +157,7 @@ namespace Umbraco.Web.Cache
 
         public static void RefreshAllMediaCache(this DistributedCache dc)
         {
-            var payloads = new[] { new MediaCacheRefresher.JsonPayload(0, TreeChangeTypes.RefreshAll) };
+            var payloads = new[] { new MediaCacheRefresher.JsonPayload(0, null, TreeChangeTypes.RefreshAll) };
 
             // note: refresh all media cache does refresh content types too
             dc.RefreshByPayload(MediaCacheRefresher.UniqueId, payloads);
@@ -168,7 +168,7 @@ namespace Umbraco.Web.Cache
             if (changes.Length == 0) return;
 
             var payloads = changes
-                .Select(x => new MediaCacheRefresher.JsonPayload(x.Item.Id, x.ChangeTypes));
+                .Select(x => new MediaCacheRefresher.JsonPayload(x.Item.Id, x.Item.Key, x.ChangeTypes));
 
             dc.RefreshByPayload(MediaCacheRefresher.UniqueId, payloads);
         }
diff --git a/src/Umbraco.Web/Cache/MediaCacheRefresher.cs b/src/Umbraco.Web/Cache/MediaCacheRefresher.cs
index fc62d38e62..1f54b62c5b 100644
--- a/src/Umbraco.Web/Cache/MediaCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/MediaCacheRefresher.cs
@@ -62,6 +62,7 @@ namespace Umbraco.Web.Cache
                     // it *was* done for each pathId but really that does not make sense
                     // only need to do it for the current media
                     mediaCache.Result.Clear(RepositoryCacheKeys.GetKey<IMedia>(payload.Id));
+                    mediaCache.Result.Clear(RepositoryCacheKeys.GetKey<IMedia>(payload.Key));
 
                     // remove those that are in the branch
                     if (payload.ChangeTypes.HasTypesAny(TreeChangeTypes.RefreshBranch | TreeChangeTypes.Remove))
@@ -104,14 +105,15 @@ namespace Umbraco.Web.Cache
 
         public class JsonPayload
         {
-            public JsonPayload(int id, TreeChangeTypes changeTypes)
+            public JsonPayload(int id, Guid? key, TreeChangeTypes changeTypes)
             {
                 Id = id;
+                Key = key;
                 ChangeTypes = changeTypes;
             }
 
             public int Id { get; }
-
+            public Guid? Key { get; }
             public TreeChangeTypes ChangeTypes { get; }
         }
 
diff --git a/src/Umbraco.Web/Compose/DatabaseServerRegistrarAndMessengerComponent.cs b/src/Umbraco.Web/Compose/DatabaseServerRegistrarAndMessengerComponent.cs
index 7850125970..6dfad8c45b 100644
--- a/src/Umbraco.Web/Compose/DatabaseServerRegistrarAndMessengerComponent.cs
+++ b/src/Umbraco.Web/Compose/DatabaseServerRegistrarAndMessengerComponent.cs
@@ -54,8 +54,8 @@ namespace Umbraco.Web.Compose
                         // note: refresh all content & media caches does refresh content types too
                         var svc = Current.PublishedSnapshotService;
                         svc.Notify(new[] { new DomainCacheRefresher.JsonPayload(0, DomainChangeTypes.RefreshAll) });
-                        svc.Notify(new[] { new ContentCacheRefresher.JsonPayload(0, TreeChangeTypes.RefreshAll) }, out _, out _);
-                        svc.Notify(new[] { new MediaCacheRefresher.JsonPayload(0, TreeChangeTypes.RefreshAll) }, out _);
+                        svc.Notify(new[] { new ContentCacheRefresher.JsonPayload(0, null, TreeChangeTypes.RefreshAll) }, out _, out _);
+                        svc.Notify(new[] { new MediaCacheRefresher.JsonPayload(0, null, TreeChangeTypes.RefreshAll) }, out _);
                     },
 
                     //rebuild indexes if the server is not synced
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index 9522e76622..629f5694bc 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -801,8 +801,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 using (_contentStore.GetScopedWriteLock(_scopeProvider))
                 using (_mediaStore.GetScopedWriteLock(_scopeProvider))
                 {
-                    NotifyLocked(new[] { new ContentCacheRefresher.JsonPayload(0, TreeChangeTypes.RefreshAll) }, out var draftChanged, out var publishedChanged);
-                    NotifyLocked(new[] { new MediaCacheRefresher.JsonPayload(0, TreeChangeTypes.RefreshAll) }, out var anythingChanged);
+                    NotifyLocked(new[] { new ContentCacheRefresher.JsonPayload(0, null, TreeChangeTypes.RefreshAll) }, out var draftChanged, out var publishedChanged);
+                    NotifyLocked(new[] { new MediaCacheRefresher.JsonPayload(0, null, TreeChangeTypes.RefreshAll) }, out var anythingChanged);
                 }
             }
 

From 7de7e59f5543031fa0635499306509a42f57f3d7 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Sat, 28 Sep 2019 11:29:04 +0200
Subject: [PATCH 750/776] Something went wrong with the title update

Instead of $rootScope, which is not injected, we need to use scope
The title prefix didn't include the original title
---
 .../components/editor/umbeditorcontentheader.directive.js     | 2 +-
 src/Umbraco.Web.UI.Client/src/init.js                         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js
index b26113c9d1..b3948bd7c4 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js
@@ -35,7 +35,7 @@
                     title += name;
                 }
                 
-                $rootScope.$emit("$changeTitle", title);
+                scope.$emit("$changeTitle", title);
             });
             scope.vm = {};
             scope.vm.dropdownOpen = false;
diff --git a/src/Umbraco.Web.UI.Client/src/init.js b/src/Umbraco.Web.UI.Client/src/init.js
index b8b210db9e..aa9b7b920f 100644
--- a/src/Umbraco.Web.UI.Client/src/init.js
+++ b/src/Umbraco.Web.UI.Client/src/init.js
@@ -46,8 +46,8 @@ app.run(['$rootScope', '$route', '$location', 'urlHelper', 'navigationService',
 
         var originalTitle = "";
 
-        $rootScope.$on('$changeTitle',function (event, titlePrefix) {
-            $rootScope.locationTitle = titlePrefix;
+        $rootScope.$on('$changeTitle', function (event, titlePrefix) {
+            $rootScope.locationTitle = titlePrefix + " - " + originalTitle;
         });
 
         /** execute code on each successful route */

From 8a06f2f0624ece957e196147ff7dcb6f9ba3c811 Mon Sep 17 00:00:00 2001
From: Gunnar <gunni@starcraft.is>
Date: Fri, 27 Sep 2019 14:08:03 +0000
Subject: [PATCH 751/776] fixed xml comment for GridConfigurationEditor

---
 src/Umbraco.Web/PropertyEditors/GridConfigurationEditor.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/PropertyEditors/GridConfigurationEditor.cs b/src/Umbraco.Web/PropertyEditors/GridConfigurationEditor.cs
index 902cd5b41b..e6b1462df0 100644
--- a/src/Umbraco.Web/PropertyEditors/GridConfigurationEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/GridConfigurationEditor.cs
@@ -8,7 +8,7 @@ using Umbraco.Core.PropertyEditors.Validators;
 namespace Umbraco.Web.PropertyEditors
 {
     /// <summary>
-    /// Represents the configuration for the grid value editor.
+    /// Represents the configuration editor for the grid value editor.
     /// </summary>
     public class GridConfigurationEditor : ConfigurationEditor<GridConfiguration>
     {

From ea0dc9d68fdeef17defc5d608a260b331d31cd52 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Sun, 29 Sep 2019 11:49:29 +0200
Subject: [PATCH 752/776] v8: Package repo categories selection updates (#6459)

---
 .../views/packages/views/repo.controller.js   | 31 +++++++-----
 .../src/views/packages/views/repo.html        | 47 ++++++++++---------
 2 files changed, 45 insertions(+), 33 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.controller.js b/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.controller.js
index dc3e67db15..4a2a3f29a7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.controller.js
@@ -34,7 +34,9 @@
 
         var labels = {};
 
-        var currSort = "Latest";
+        var defaultSort = "Latest";
+        var currSort = defaultSort;
+
         //used to cancel any request in progress if another one needs to take it's place
         var canceler = null;
 
@@ -92,24 +94,30 @@
         }
 
         function selectCategory(selectedCategory, categories) {
-            var reset = false;
+
             for (var i = 0; i < categories.length; i++) {
                 var category = categories[i];
-                if (category.name === selectedCategory.name && category.active === true) {
+                if (category.name === selectedCategory.name) {
                     //it's already selected, let's unselect to show all again
-                    reset = true;
+                    if (category.active === true) {
+                        category.active = false;
+                    }
+                    else {
+                        category.active = true;
+                    }
+                }
+                else {
+                    category.active = false;
                 }
-                category.active = false;
             }
 
             vm.loading = true;
             vm.searchQuery = "";
-            var searchCategory = selectedCategory.name;
-            if (reset === true) {
-                searchCategory = "";
-            }
 
-            currSort = "Latest";
+            var reset = selectedCategory.active === false;
+            var searchCategory = reset ? "" : selectedCategory.name;
+
+            currSort = defaultSort;
 
             $q.all([
                 ourPackageRepositoryResource.getPopular(8, searchCategory)
@@ -122,10 +130,9 @@
                         vm.pagination.totalPages = Math.ceil(pack.total / vm.pagination.pageSize);
                         vm.pagination.pageNumber = 1;
                     })
-            ])
+                ])
                 .then(function () {
                     vm.loading = false;
-                    selectedCategory.active = reset === false;
                 });
         }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html b/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html
index d0c0c3744c..9b422ad183 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html
+++ b/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html
@@ -11,21 +11,21 @@
             </div>
         </div>
 
+        <div class="umb-packages-section" ng-if="vm.searchQuery == ''">
+            <div class="umb-packages-categories">
+                <a href=""
+                   class="umb-packages-category"
+                   ng-click="vm.selectCategory(category, vm.categories)"
+                   ng-repeat="category in vm.categories"
+                   ng-class="{'-active': category.active, '-first': $first, '-last': $last}">
+                    <div>{{category.name}}</div>
+                </a>
+            </div>
+        </div>
+
         <div ng-show="vm.loading === false">
 
-            <div class="umb-packages-section" ng-if="vm.searchQuery == ''">
-                <div class="umb-packages-categories">
-                    <a href=""
-                       class="umb-packages-category"
-                       ng-click="vm.selectCategory(category, vm.categories)"
-                       ng-repeat="category in vm.categories"
-                       ng-class="{'-active': category.active, '-first': $first, '-last': $last}">
-                        <div>{{ category.name }}</div>
-                    </a>
-                </div>
-            </div>
-
-            <div class="umb-packages-section" ng-if="vm.searchQuery == ''">
+            <div class="umb-packages-section" ng-if="vm.searchQuery == '' && vm.popular.length > 0">
                 <h4><strong><localize key="packager_packagesPopular">Popular</localize></strong></h4>
                 <div class="umb-packages">
 
@@ -37,15 +37,15 @@
                             </div>
 
                             <div class="umb-package-info">
-                                <div class="umb-package-name">{{ package.name }}</div>
-                                <div class="umb-package-description">{{ package.excerpt | limitTo: 40 }}<span ng-if="package.excerpt > (package.excerpt | limitTo: 40)">...</span></div>
+                                <div class="umb-package-name">{{package.name}}</div>
+                                <div class="umb-package-description">{{package.excerpt | limitTo: 40}}<span ng-if="package.excerpt > (package.excerpt | limitTo: 40)">...</span></div>
 
                                 <div class="umb-package-numbers">
                                     <small class="umb-package-downloads">
-                                        <i class="icon-download-alt"></i> <strong>{{ package.downloads }}</strong>
+                                        <i class="icon-download-alt"></i> <strong>{{package.downloads}}</strong>
                                     </small>
                                     <small class="umb-package-likes">
-                                        <i class="icon-hearts"></i> <strong>{{ package.likes }}</strong>
+                                        <i class="icon-hearts"></i> <strong>{{package.likes}}</strong>
                                     </small>
                                 </div>
 
@@ -67,7 +67,7 @@
                         <a class="umb-package-link" href="" ng-click="vm.showPackageDetails(package)">
 
                             <div class="umb-package-icon">
-                                <img ng-src="{{ package.icon }}" alt="" />
+                                <img ng-src="{{package.icon}}" alt="" />
                             </div>
 
                             <div class="umb-package-info">
@@ -102,13 +102,18 @@
             </div>
 
             <!-- Empty state -->
-            <umb-empty-state
-                ng-if="vm.packages.length === 0 && vm.loading === false && vm.searchQuery !== ''"
-                position="center">
+            <umb-empty-state ng-if="vm.packages.length === 0 && vm.loading === false && vm.searchQuery !== ''"
+                             position="center">
                 <h4><strong><localize key="packager_packageNoResults">We couldn't find anything for</localize> '{{ vm.searchQuery }}'</strong></h4>
                 <p class="faded"><localize key="packager_packageNoResultsDescription">Please try searching for another package or browse through the categories</localize>.</p>
             </umb-empty-state>
 
+            <umb-empty-state ng-if="vm.popular.length === 0 && vm.loading === false && vm.searchQuery === ''"
+                             position="center">
+                <h4><strong><localize key="general_searchNoResult">Sorry, we can not find what you are looking for.</localize></strong></h4>
+                <p class="faded"><localize key="packager_packageNoResultsDescription">Please try searching for another package or browse through the categories</localize>.</p>
+            </umb-empty-state>
+
         </div>
 
     </div>

From 7ad97de848c02564efee7d9c865ceb02587f8d9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Kottal?= <snielsen43@gmail.com>
Date: Fri, 27 Sep 2019 08:38:22 +0200
Subject: [PATCH 753/776] enables infinite editing for members

---
 .../src/views/member/edit.html                | 38 +++++++++++--------
 .../views/member/member.edit.controller.js    | 34 ++++++++++-------
 2 files changed, 42 insertions(+), 30 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/member/edit.html b/src/Umbraco.Web.UI.Client/src/views/member/edit.html
index dbaf96abc2..1bb3b34981 100644
--- a/src/Umbraco.Web.UI.Client/src/views/member/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/member/edit.html
@@ -48,23 +48,29 @@
 
             <umb-editor-footer-content-right>
 
-               <umb-button
-                  ng-if="page.listViewPath"
-                  type="link"
-                  href="#{{page.listViewPath}}"
-                  button-style="link"
-                  label="Return to list"
-                  label-key="buttons_returnToList">
-               </umb-button>
+                <umb-button ng-if="page.listViewPath"
+                            type="link"
+                            href="#{{page.listViewPath}}"
+                            button-style="link"
+                            label="Return to list"
+                            label-key="buttons_returnToList">
+                </umb-button>
 
-               <umb-button
-                  type="submit"
-                  label="Save"
-                  label-key="buttons_save"
-                  button-style="success"
-                  shortcut="ctrl+s"
-                  state="page.saveButtonState">
-               </umb-button>
+                <umb-button ng-if="model.infiniteMode"
+                            type="button"
+                            button-style="link"
+                            label-key="general_close"
+                            shortcut="esc"
+                            action="model.close(model)">
+                </umb-button>
+
+                <umb-button type="submit"
+                            label="Save"
+                            label-key="buttons_save"
+                            button-style="success"
+                            shortcut="ctrl+s"
+                            state="page.saveButtonState">
+                </umb-button>
 
             </umb-editor-footer-content-right>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
index 18b5c300db..245381d9fe 100644
--- a/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
@@ -8,6 +8,11 @@
  */
 function MemberEditController($scope, $routeParams, $location, appState, memberResource, entityResource, navigationService, notificationsService, localizationService, serverValidationManager, contentEditingHelper, fileManager, formHelper, editorState, umbRequestHelper, $http) {
 
+    var infiniteMode = $scope.model && $scope.model.infiniteMode;
+    var id = infiniteMode ? $scope.model.id : $routeParams.id;
+    var create = infiniteMode ? $scope.model.create : $routeParams.create;
+    var listName = infiniteMode ? $scope.model.listname : $routeParams.listName;
+
     //setup scope vars
     $scope.page = {};
     $scope.page.loading = true;
@@ -20,17 +25,17 @@ function MemberEditController($scope, $routeParams, $location, appState, memberR
 
     //build a path to sync the tree with
     function buildTreePath(data) {
-        return $routeParams.listName ? "-1," + $routeParams.listName : "-1";
+        return listName ? "-1," + listName : "-1";
     }
 
-    if ($routeParams.create) {
+    if (create) {
 
         //if there is no doc type specified then we are going to assume that
         // we are not using the umbraco membership provider
-        if ($routeParams.doctype) {
+        if (doctype) {
 
             //we are creating so get an empty member item
-            memberResource.getScaffold($routeParams.doctype)
+            memberResource.getScaffold(doctype)
                 .then(function(data) {
 
                     $scope.content = data;
@@ -66,16 +71,16 @@ function MemberEditController($scope, $routeParams, $location, appState, memberR
         //The reason this might be an INT is due to the routing used for the member list view
         //but this is now configured to use the key, so this is just a fail safe
 
-        if ($routeParams.id && $routeParams.id.length < 9) {
+        if (id && id.length < 9) {
 
-            entityResource.getById($routeParams.id, "Member").then(function(entity) {
+            entityResource.getById(id, "Member").then(function(entity) {
                 $location.path("/member/member/edit/" + entity.key);
             });
         }
         else {
 
             //we are editing so get the content item from the server
-            memberResource.getByKey($routeParams.id)
+            memberResource.getByKey(id)
                 .then(function(data) {
 
                     $scope.content = data;
@@ -84,11 +89,12 @@ function MemberEditController($scope, $routeParams, $location, appState, memberR
 
                     editorState.set($scope.content);
 
-                    var path = buildTreePath(data);
-
-                    //sync the tree (only for ui purposes)
-                    navigationService.syncTree({ tree: "member", path: path.split(",") });
+                    if (!infiniteMode) {
+                        var path = buildTreePath(data);
 
+                        //sync the tree (only for ui purposes)
+                        navigationService.syncTree({ tree: "member", path: path.split(",") });
+                    }
                     //it's the initial load of the editor, we need to get the tree node
                     // from the server so that we can load in the actions menu.
                     umbRequestHelper.resourcePromise(
@@ -144,7 +150,7 @@ function MemberEditController($scope, $routeParams, $location, appState, memberR
                 passwordProp.value.reset = !passwordProp.value.oldPassword && passwordProp.config.allowManuallyChangingPassword;
             }
 
-            memberResource.save($scope.content, $routeParams.create, fileManager.getFiles())
+            memberResource.save($scope.content, create, fileManager.getFiles())
                 .then(function(data) {
 
                     formHelper.resetForm({ scope: $scope });
@@ -184,12 +190,12 @@ function MemberEditController($scope, $routeParams, $location, appState, memberR
     };
 
     $scope.showBack = function () {
-        return !!$routeParams.listName;
+        return !!listName;
     }
 
     /** Callback for when user clicks the back-icon */
     $scope.onBack = function () {
-        $location.path("/member/member/list/" + $routeParams.listName);
+        $location.path("/member/member/list/" + listName);
         $location.search("listName", null);
         if ($routeParams.page) {
             $location.search("page", $routeParams.page);

From 5b79d780f7f4cc4a97d39cd2bd5c7a373fefffcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Kottal?= <snielsen43@gmail.com>
Date: Fri, 27 Sep 2019 08:39:36 +0200
Subject: [PATCH 754/776] enables infinite editing for partial views

---
 .../src/views/partialviews/edit.controller.js | 28 +++++++++++++------
 .../src/views/partialviews/edit.html          | 22 ++++++++++-----
 2 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.controller.js
index 51cca0b5af..ddeab9d1cd 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.controller.js
@@ -4,6 +4,18 @@
     function PartialViewsEditController($scope, $routeParams, codefileResource, assetsService, notificationsService, editorState, navigationService, appState, macroService, angularHelper, $timeout, contentEditingHelper, localizationService, templateHelper, editorService) {
 
         var vm = this;
+        var infiniteMode = $scope.model && $scope.model.infiniteMode;
+        var id = infiniteMode ? $scope.model.id : $routeParams.id;
+        var create = infiniteMode ? $scope.model.create : $routeParams.create;
+        var snippet = infiniteMode ? $scope.model.snippet : $routeParams.snippet;
+
+        function close() {
+            if ($scope.model.close) {
+                $scope.model.close($scope.model);
+            }
+        }
+
+        vm.close = close;
 
         vm.page = {};
         vm.page.loading = true;
@@ -249,20 +261,18 @@
             //we need to load this somewhere, for now its here.
             assetsService.loadCss("lib/ace-razor-mode/theme/razor_chrome.css", $scope);
 
-            if ($routeParams.create) {
-                
-                var snippet = "Empty";
+            if (create) {
 
-                if($routeParams.snippet) {
-                    snippet = $routeParams.snippet;
+                if (!snippet) {
+                    snippet = "Empty";
                 }
 
-                codefileResource.getScaffold("partialViews", $routeParams.id, snippet).then(function (partialView) {
+                codefileResource.getScaffold("partialViews", id, snippet).then(function (partialView) {
                     ready(partialView, false);
                 });
                 
             } else {
-                codefileResource.getByPath('partialViews', $routeParams.id).then(function (partialView) {
+                codefileResource.getByPath('partialViews', id).then(function (partialView) {
                     ready(partialView, true);
                 });
             }
@@ -277,7 +287,7 @@
             //sync state
             editorState.set(vm.partialView);
 
-            if (syncTree) {
+            if (!infiniteMode && syncTree) {
                 navigationService.syncTree({ tree: "partialViews", path: vm.partialView.path, forceReload: true }).then(function (syncArgs) {
                     vm.page.menu.currentNode = syncArgs.node;
                 });
@@ -362,7 +372,7 @@
                     // initial cursor placement
                     // Keep cursor in name field if we are create a new template
                     // else set the cursor at the bottom of the code editor
-                    if(!$routeParams.create) {
+                    if(!create) {
                         $timeout(function(){
                             vm.editor.navigateFileEnd();
                             vm.editor.focus();
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.html b/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.html
index 8bffd55748..0b218f927c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.html
@@ -69,13 +69,21 @@
                 </umb-editor-footer-content-left>
 
                 <umb-editor-footer-content-right>
-                    <umb-button
-                        type="submit"
-                        button-style="success"
-                        state="vm.page.saveButtonState"
-                        shortcut="ctrl+s"
-                        label="Save"
-                        label-key="buttons_save">
+
+                    <umb-button ng-if="model.infiniteMode"
+                                type="button"
+                                button-style="link"
+                                label-key="general_close"
+                                shortcut="esc"
+                                action="vm.close()">
+                    </umb-button>
+                        
+                    <umb-button type="submit"
+                                button-style="success"
+                                state="vm.page.saveButtonState"
+                                shortcut="ctrl+s"
+                                label="Save"
+                                label-key="buttons_save">
                     </umb-button>
                 </umb-editor-footer-content-right>
 

From b87fc4a779ea6c837c3ecfeb91f97af48e83db9b Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Sun, 29 Sep 2019 13:35:40 +0200
Subject: [PATCH 755/776] Fix #6461 - declares missing variable

---
 .../src/views/member/member.edit.controller.js               | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
index 245381d9fe..b04a549f13 100644
--- a/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
@@ -12,6 +12,7 @@ function MemberEditController($scope, $routeParams, $location, appState, memberR
     var id = infiniteMode ? $scope.model.id : $routeParams.id;
     var create = infiniteMode ? $scope.model.create : $routeParams.create;
     var listName = infiniteMode ? $scope.model.listname : $routeParams.listName;
+    var docType = infiniteMode ? $scope.model.doctype : $routeParams.doctype;
 
     //setup scope vars
     $scope.page = {};
@@ -32,10 +33,10 @@ function MemberEditController($scope, $routeParams, $location, appState, memberR
 
         //if there is no doc type specified then we are going to assume that
         // we are not using the umbraco membership provider
-        if (doctype) {
+        if (docType) {
 
             //we are creating so get an empty member item
-            memberResource.getScaffold(doctype)
+            memberResource.getScaffold(docType)
                 .then(function(data) {
 
                     $scope.content = data;

From 9ec1c05304e67f8d13064e23448b568d4a23e3ed Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Sun, 29 Sep 2019 13:48:00 +0200
Subject: [PATCH 756/776] v8: Use umb-radiobutton component in relation types
 (#6454)

---
 .../forms/umbradiobutton.directive.js         |  6 +-
 .../components/forms/umb-radiobutton.html     |  3 +-
 .../views/relationtypes/edit.controller.js    | 11 ++-
 .../relationtypes/views/relationType.html     | 70 +++++++++----------
 .../views/relationType.settings.controller.js | 31 ++++++++
 5 files changed, 80 insertions(+), 41 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/views/relationtypes/views/relationType.settings.controller.js

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
index 0036f6904b..df45181991 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
@@ -46,7 +46,7 @@
                     vm.onChange({ model: vm.model, value: vm.value });
                 }, 0);
             }
-        }     
+        }    
     }
 
     var component = {
@@ -58,8 +58,8 @@
             value: "@",
             name: "@",
             text: "@",
-            disabled: "=",
-            required: "=",
+            disabled: "<",
+            required: "<",
             onChange: "&?"
         }
     };
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-radiobutton.html b/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-radiobutton.html
index 5ac82c316a..f3daa652d6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-radiobutton.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-radiobutton.html
@@ -1,5 +1,6 @@
 <label class="radio umb-form-check umb-form-check--radiobutton" ng-class="{ 'umb-form-check--disabled': vm.disabled }">
-    <input type="radio" name="{{vm.name}}"
+    <input type="radio"
+        name="{{vm.name}}"
         value="{{vm.value}}"
         class="umb-form-check__input"
         ng-model="vm.model"
diff --git a/src/Umbraco.Web.UI.Client/src/views/relationtypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/relationtypes/edit.controller.js
index 7bcbe0716e..138e3e90e2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/relationtypes/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/relationtypes/edit.controller.js
@@ -22,7 +22,12 @@ function RelationTypeEditController($scope, $routeParams, relationTypeResource,
     function init() {
         vm.page.loading = true;
 
-        localizationService.localizeMany(["relationType_tabRelationType", "relationType_tabRelations"]).then(function (data) {
+        var labelKeys = [
+            "relationType_tabRelationType",
+            "relationType_tabRelations"
+        ];
+
+        localizationService.localizeMany(labelKeys).then(function (data) {
             vm.page.navigation = [
                 {
                     "name": data[0],
@@ -51,6 +56,10 @@ function RelationTypeEditController($scope, $routeParams, relationTypeResource,
         formatDates(relationType.relations);
         getRelationNames(relationType);
 
+        // Convert property value to string, since the umb-radiobutton component at the moment only handle string values.
+        // Sometime later the umb-radiobutton might be able to handle value as boolean.
+        relationType.isBidirectional = (relationType.isBidirectional || false).toString();
+
         vm.relationType = relationType;
 
         editorState.set(vm.relationType);
diff --git a/src/Umbraco.Web.UI.Client/src/views/relationtypes/views/relationType.html b/src/Umbraco.Web.UI.Client/src/views/relationtypes/views/relationType.html
index 7f31461e69..043ced9a5f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/relationtypes/views/relationType.html
+++ b/src/Umbraco.Web.UI.Client/src/views/relationtypes/views/relationType.html
@@ -1,40 +1,38 @@
-<umb-box>
-    <umb-box-content>
-        <!-- ID -->
-        <umb-control-group label="Id">
-            <div>{{model.relationType.id}}</div>
-            <small>{{model.relationType.key}}</small>
-        </umb-control-group>
+<div ng-controller="Umbraco.Editors.RelationTypes.SettingsController as vm">
+    <umb-box>
+        <umb-box-content>
+            <!-- ID -->
+            <umb-control-group label="Id">
+                <div>{{model.relationType.id}}</div>
+                <small>{{model.relationType.key}}</small>
+            </umb-control-group>
 
-        <!-- Direction -->
-        <umb-control-group label="@relationType_direction">
-            <ul class="unstyled">
-                <li>
-                    <label class="radio">
-                        <input type="radio" name="relationType-direction" ng-model="model.relationType.isBidirectional" ng-value="false"> <localize key="relationType_parentToChild">Parent to child</localize>
-                    </label>
-                </li>
-                <li>
-                    <label class="radio">
-                        <input type="radio" name="relationType-direction" ng-model="model.relationType.isBidirectional" ng-value="true"> <localize key="relationType_bidirectional">Bidirectional</localize>
-                    </label>
-                </li>
-            </ul>
-        </umb-control-group>
+            <!-- Direction -->
+            <umb-control-group label="@relationType_direction">
+                <ul class="unstyled">
+                    <li>
+                        <umb-radiobutton name="relationTypeDirection" value="false" model="model.relationType.isBidirectional" text="{{vm.labels.parentToChild}}"></umb-radiobutton>
+                    </li>
+                    <li>
+                        <umb-radiobutton name="relationTypeDirection" value="true" model="model.relationType.isBidirectional" text="{{vm.labels.bidirectional}}"></umb-radiobutton>
+                    </li>
+                </ul>
+            </umb-control-group>
 
-        <!-- Parent-->
-        <umb-control-group label="@relationType_parent">
-            <div>{{model.relationType.parentObjectTypeName}}</div>
-        </umb-control-group>
+            <!-- Parent-->
+            <umb-control-group label="@relationType_parent">
+                <div>{{model.relationType.parentObjectTypeName}}</div>
+            </umb-control-group>
 
-        <!-- Child -->
-        <umb-control-group label="@relationType_child">
-            <div>{{model.relationType.childObjectTypeName}}</div>
-        </umb-control-group>
+            <!-- Child -->
+            <umb-control-group label="@relationType_child">
+                <div>{{model.relationType.childObjectTypeName}}</div>
+            </umb-control-group>
 
-        <!-- Relation count -->
-        <umb-control-group label="@relationType_count" ng-if="model.relationType.relations.length > 0">
-            <div>{{model.relationType.relations.length}}</div>
-        </umb-control-group>
-    </umb-box-content>
-</umb-box>
+            <!-- Relation count -->
+            <umb-control-group label="@relationType_count" ng-if="model.relationType.relations.length > 0">
+                <div>{{model.relationType.relations.length}}</div>
+            </umb-control-group>
+        </umb-box-content>
+    </umb-box>
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/relationtypes/views/relationType.settings.controller.js b/src/Umbraco.Web.UI.Client/src/views/relationtypes/views/relationType.settings.controller.js
new file mode 100644
index 0000000000..c8e0af0aa9
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/relationtypes/views/relationType.settings.controller.js
@@ -0,0 +1,31 @@
+/**
+ * @ngdoc controller
+ * @name Umbraco.Editors.RelationTypes.SettingsController
+ * @function
+ *
+ * @description
+ * The controller for editing relation type settings.
+ */
+function RelationTypeSettingsController($scope, localizationService) {
+
+    var vm = this;
+
+    vm.labels = {};
+
+    function init() {
+
+        var labelKeys = [
+            "relationType_parentToChild",
+            "relationType_bidirectional"
+        ];
+
+        localizationService.localizeMany(labelKeys).then(function (data) {
+            vm.labels.parentToChild = data[0];
+            vm.labels.bidirectional = data[1];
+        });
+    }
+
+    init();
+}
+
+angular.module("umbraco").controller("Umbraco.Editors.RelationTypes.SettingsController", RelationTypeSettingsController);

From e20437d8dbd44ebc06d97ea1b714f5140df2429a Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Sun, 29 Sep 2019 13:49:17 +0200
Subject: [PATCH 757/776] v8: Change confirm delete button style (#6429)

---
 .../src/views/languages/overview.controller.js                   | 1 +
 .../src/views/propertyeditors/listview/listview.controller.js    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/views/languages/overview.controller.js b/src/Umbraco.Web.UI.Client/src/views/languages/overview.controller.js
index c1972ec067..d1b984ed5b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/languages/overview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/languages/overview.controller.js
@@ -70,6 +70,7 @@
                 view: "views/languages/overlays/delete.html",
                 language: language,
                 submitButtonLabelKey: "contentTypeEditor_yesDelete",
+                submitButtonStyle: "danger",
                 submit: function (model) {
                     performDelete(model.language);
                     overlayService.close();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
index 7e44295ed2..e50411fe8b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
@@ -383,6 +383,7 @@ function listViewController($scope, $routeParams, $injector, $timeout, currentUs
             view: "views/propertyeditors/listview/overlays/delete.html",
             deletesVariants: selectionHasVariants(),
             submitButtonLabelKey: "contentTypeEditor_yesDelete",
+            submitButtonStyle: "danger",
             submit: function (model) {
                 performDelete();
                 overlayService.close();

From fa0bdd5aaf2d72e1d825c858b939c1a585b6acf1 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Sun, 29 Sep 2019 14:28:00 +0200
Subject: [PATCH 758/776] v8: Fix media picker svg preview (#6418)

---
 .../components/umbmediagrid.directive.js      |  14 +-
 .../common/services/mediahelper.service.js    |  20 +-
 .../src/less/property-editors.less            |   5 +-
 .../mediapicker/mediapicker.controller.js     | 312 ++++++++++--------
 .../mediapicker/mediapicker.html              |  71 ++--
 .../mediapicker/mediapicker.controller.js     |  79 ++---
 .../mediapicker/mediapicker.html              |  22 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/da.xml |   2 +
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml |   3 +-
 .../Umbraco/config/lang/en_us.xml             |   1 +
 10 files changed, 293 insertions(+), 236 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js
index 4fe823cae5..766c0107b2 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js
@@ -122,17 +122,16 @@ Use this directive to generate a thumbnail grid of media items.
                     item.selectable = getSelectableState(item);
                     
                     // remove non images when onlyImages is set to true
-                    if( scope.onlyImages === "true" && !item.isFolder && !item.thumbnail){
+                    if (scope.onlyImages === "true" && !item.isFolder && !item.thumbnail){
                         scope.items.splice(i, 1);
                         i--;
                     }
 
-
                     // If subfolder search is not enabled remove the media items that's not needed
                     // Make sure that includeSubFolder is not undefined since the directive is used
                     // in contexts where it should not be used. Currently only used when we trigger
                     // a media picker
-                    if(scope.includeSubFolders !== undefined){
+                    if (scope.includeSubFolders !== undefined) {
                         if (scope.includeSubFolders !== 'true') {
                             if (item.parentId !== parseInt(scope.currentFolderId)) {
                                 scope.items.splice(i, 1);
@@ -146,13 +145,12 @@ Use this directive to generate a thumbnail grid of media items.
                 if (scope.items.length > 0) {
                     setFlexValues(scope.items);
                 }
-                
             }
 
             function setItemData(item) {
 
                 // check if item is a folder
-                if(item.image) {
+                if (item.image) {
                     // if is has an image path, it is not a folder
                     item.isFolder = false;
                 } else {
@@ -163,7 +161,7 @@ Use this directive to generate a thumbnail grid of media items.
                 if (!item.isFolder && !item.thumbnail) {
 
                     // handle entity
-                    if(item.image) {
+                    if (item.image) {
                         item.thumbnail = mediaHelper.resolveFileFromEntity(item, true);
                         item.extension = mediaHelper.getFileExtension(item.image);
                     // handle full media object
@@ -288,10 +286,8 @@ Use this directive to generate a thumbnail grid of media items.
                         "min-height": itemMinHeight + "px"
                     };
 
-                        mediaItem.flexStyle = flexStyle;
-
+                    mediaItem.flexStyle = flexStyle;
                 }
-
             }
             
             scope.clickItem = function(item, $event, $index) {
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
index c8acdec353..decdc429fa 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
@@ -143,22 +143,27 @@ function mediaHelper(umbRequestHelper, $log) {
          */
         resolveFileFromEntity: function (mediaEntity, thumbnail) {
 
-            if (!angular.isObject(mediaEntity.metaData) || !mediaEntity.metaData.MediaPath) {
+            var mediaPath = angular.isObject(mediaEntity.metaData) ? mediaEntity.metaData.MediaPath : null;
+
+            if (!mediaPath) {
                 //don't throw since this image legitimately might not contain a media path, but output a warning
                 $log.warn("Cannot resolve the file url from the mediaEntity, it does not contain the required metaData");
                 return null;
             }
 
             if (thumbnail) {
-                if (this.detectIfImageByExtension(mediaEntity.metaData.MediaPath)) {
-                    return this.getThumbnailFromPath(mediaEntity.metaData.MediaPath);
+                if (this.detectIfImageByExtension(mediaPath)) {
+                    return this.getThumbnailFromPath(mediaPath);
+                }
+                else if (this.getFileExtension(mediaPath) === "svg") {
+                    return this.getThumbnailFromPath(mediaPath);
                 }
                 else {
                     return null;
                 }
             }
             else {
-                return mediaEntity.metaData.MediaPath;
+                return mediaPath;
             }            
         },
 
@@ -294,7 +299,12 @@ function mediaHelper(umbRequestHelper, $log) {
          */
         getThumbnailFromPath: function (imagePath) {
 
-            //If the path is not an image we cannot get a thumb
+            // Check if file is a svg
+            if (this.getFileExtension(imagePath) === "svg") {
+                return imagePath;
+            }
+
+            // If the path is not an image we cannot get a thumb
             if (!this.detectIfImageByExtension(imagePath)) {
                 return null;
             }
diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
index 186ac42f4a..78470be2ca 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -279,8 +279,8 @@
     }
 }
 
-.umb-mediapicker .label{
-    &__trashed{
+.umb-mediapicker .label {
+    &__trashed {
         background-color: @red;
         position: absolute;
         top: 50%;
@@ -288,6 +288,7 @@
         z-index: 1;
         transform: translate3d(-50%,-50%,0);
         margin: 0;
+        pointer-events: none;
     }
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
index 837c0ebc9d..b562a50f65 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
@@ -2,17 +2,28 @@
 angular.module("umbraco")
     .controller("Umbraco.Editors.MediaPickerController",
         function ($scope, mediaResource, entityResource, userService, mediaHelper, mediaTypeHelper, eventsService, treeService, localStorageService, localizationService, editorService) {
+
+            var vm = this;
             
+            vm.submit = submit;
+            vm.close = close;
             
-            if (!$scope.model.title) {
-                localizationService.localizeMany(["defaultdialogs_selectMedia", "general_includeFromsubFolders"])
-                    .then(function (data) {
-                        $scope.labels = {
-                            title: data[0],
-                            includeSubFolders: data[1]
-                        }
-                    });
-            }
+            vm.toggle = toggle;
+            vm.upload = upload;
+            vm.dragLeave = dragLeave;
+            vm.dragEnter = dragEnter;
+            vm.onUploadComplete = onUploadComplete;
+            vm.onFilesQueue = onFilesQueue;
+            vm.changeSearch = changeSearch;
+            vm.submitFolder = submitFolder;
+            vm.enterSubmitFolder = enterSubmitFolder;
+            vm.focalPointChanged = focalPointChanged;
+            vm.changePagination = changePagination;
+
+            vm.clickHandler = clickHandler;
+            vm.clickItemName = clickItemName;
+            vm.editMediaItem = editMediaItem;
+            vm.gotoFolder = gotoFolder;
 
             var dialogOptions = $scope.model;
             
@@ -31,33 +42,35 @@ angular.module("umbraco")
 
             var umbracoSettings = Umbraco.Sys.ServerVariables.umbracoSettings;
             var allowedUploadFiles = mediaHelper.formatFileTypes(umbracoSettings.allowedUploadFiles);
+
             if ($scope.onlyImages) {
-                $scope.acceptedFileTypes = mediaHelper.formatFileTypes(umbracoSettings.imageFileTypes);
+                vm.acceptedFileTypes = mediaHelper.formatFileTypes(umbracoSettings.imageFileTypes);
             } else {
                 // Use whitelist of allowed file types if provided
                 if (allowedUploadFiles !== '') {
-                    $scope.acceptedFileTypes = allowedUploadFiles;
+                    vm.acceptedFileTypes = allowedUploadFiles;
                 } else {
                     // If no whitelist, we pass in a blacklist by adding ! to the file extensions, allowing everything EXCEPT for disallowedUploadFiles
-                    $scope.acceptedFileTypes = !mediaHelper.formatFileTypes(umbracoSettings.disallowedUploadFiles);
+                    vm.acceptedFileTypes = !mediaHelper.formatFileTypes(umbracoSettings.disallowedUploadFiles);
                 }
             }
 
-            $scope.maxFileSize = umbracoSettings.maxFileSize + "KB";
+            vm.maxFileSize = umbracoSettings.maxFileSize + "KB";
 
             $scope.model.selection = [];
 
-            $scope.acceptedMediatypes = [];
+            vm.acceptedMediatypes = [];
             mediaTypeHelper.getAllowedImagetypes($scope.startNodeId)
                 .then(function (types) {
-                    $scope.acceptedMediatypes = types;
+                    vm.acceptedMediatypes = types;
                 });
 
             var dataTypeKey = null;
-            if($scope.model && $scope.model.dataTypeKey) {
+            if ($scope.model && $scope.model.dataTypeKey) {
                 dataTypeKey = $scope.model.dataTypeKey;
             }
-            $scope.searchOptions = {
+
+            vm.searchOptions = {
                 pageNumber: 1,
                 pageSize: 100,
                 totalItems: 0,
@@ -66,13 +79,26 @@ angular.module("umbraco")
                 dataTypeKey: dataTypeKey
             };
 
-            //preload selected item
-            $scope.target = undefined;
+            // preload selected item
+            $scope.target = null;
+
             if (dialogOptions.currentTarget) {
                 $scope.target = dialogOptions.currentTarget;
             }
 
+            function setTitle() {
+                if (!$scope.model.title) {
+                    localizationService.localize("defaultdialogs_selectMedia")
+                        .then(function (data) {
+                            $scope.model.title = data;
+                        });
+                }
+            }
+
             function onInit() {
+
+                setTitle();
+
                 userService.getCurrentUser().then(function (userData) {
                     userStartNodes = userData.startMediaIds;
 
@@ -106,29 +132,28 @@ angular.module("umbraco")
                         .then(function (node) {
                             $scope.target = node;
                             if (ensureWithinStartNode(node)) {
-                                selectImage(node);
+                                selectMedia(node);
                                 $scope.target.url = mediaHelper.resolveFile(node);
                                 $scope.target.altText = altText;
-                                $scope.openDetailsDialog();
+                                openDetailsDialog();
                             }
-                        },
-                            gotoStartNode);
+                        }, gotoStartNode);
                 }
             }
 
-            $scope.upload = function (v) {
+            function upload(v) {
                 angular.element(".umb-file-dropzone .file-select").trigger("click");
-            };
+            }
 
-            $scope.dragLeave = function (el, event) {
+            function dragLeave(el, event) {
                 $scope.activeDrag = false;
-            };
+            }
 
-            $scope.dragEnter = function (el, event) {
+            function dragEnter(el, event) {
                 $scope.activeDrag = true;
-            };
+            }
 
-            $scope.submitFolder = function () {
+            function submitFolder() {
                 if ($scope.model.newFolderName) {
                     $scope.model.creatingFolder = true;
                     mediaResource
@@ -140,25 +165,25 @@ angular.module("umbraco")
                                 childrenOf: data.parentId //clear the children of the parent
                             });
                             $scope.model.creatingFolder = false;
-                            $scope.gotoFolder(data);
+                            gotoFolder(data);
                             $scope.model.showFolderInput = false;
                             $scope.model.newFolderName = "";
                         });
                 } else {
                     $scope.model.showFolderInput = false;
                 }
-            };
+            }
 
-            $scope.enterSubmitFolder = function (event) {
+            function enterSubmitFolder(event) {
                 if (event.keyCode === 13) {
-                    $scope.submitFolder();
+                    submitFolder();
                     event.stopPropagation();
                 }
-            };
+            }
 
-            $scope.gotoFolder = function (folder) {
+            function gotoFolder(folder) {
                 if (!$scope.multiPicker) {
-                    deselectAllImages($scope.model.selection);
+                    deselectAllMedia($scope.model.selection);
                 }
 
                 if (!folder) {
@@ -176,96 +201,97 @@ angular.module("umbraco")
 
                     mediaTypeHelper.getAllowedImagetypes(folder.id)
                         .then(function (types) {
-                            $scope.acceptedMediatypes = types;
+                            vm.acceptedMediatypes = types;
                         });
                 } else {
                     $scope.path = [];
                 }
 
                 $scope.lockedFolder = (folder.id === -1 && $scope.model.startNodeIsVirtual) || hasFolderAccess(folder) === false;
-
                 $scope.currentFolder = folder;
-                localStorageService.set("umbLastOpenedMediaNodeId", folder.id);
-                return getChildren(folder.id);
-            };
 
-            $scope.clickHandler = function (image, event, index) {
+                localStorageService.set("umbLastOpenedMediaNodeId", folder.id);
+
+                return getChildren(folder.id);
+            }
+
+            function clickHandler(media, event, index) {
                 
-                if (image.isFolder) {
+                if (media.isFolder) {
                     if ($scope.disableFolderSelect) {
-                        $scope.gotoFolder(image);
+                        gotoFolder(media);
                     } else {
-                        selectImage(image);
+                        selectMedia(media);
                     }
                 } else {
                     if ($scope.showDetails) {
                         
-                        $scope.target = image;
+                        $scope.target = media;
                         
                         // handle both entity and full media object
-                        if (image.image) {
-                            $scope.target.url = image.image;
+                        if (media.image) {
+                            $scope.target.url = media.image;
                         } else {
-                            $scope.target.url = mediaHelper.resolveFile(image);
+                            $scope.target.url = mediaHelper.resolveFile(media);
                         }
                         
-                        $scope.openDetailsDialog();
+                        openDetailsDialog();
                     } else {
-                        selectImage(image);
+                        selectMedia(media);
                     }
                 }
-            };
+            }
 
-            $scope.clickItemName = function (item) {
+            function clickItemName(item) {
                 if (item.isFolder) {
-                    $scope.gotoFolder(item);
+                    gotoFolder(item);
                 }
-            };
+            }
 
-            function selectImage(image) {
-                if(!image.selectable) {
+            function selectMedia(media) {
+                if (!media.selectable) {
                     return;
                 }
-                if (image.selected) {
+                if (media.selected) {
                     for (var i = 0; $scope.model.selection.length > i; i++) {
                         var imageInSelection = $scope.model.selection[i];
-                        if (image.key === imageInSelection.key) {
-                            image.selected = false;
+                        if (media.key === imageInSelection.key) {
+                            media.selected = false;
                             $scope.model.selection.splice(i, 1);
                         }
                     }
                 } else {
                     if (!$scope.multiPicker) {
-                        deselectAllImages($scope.model.selection);
+                        deselectAllMedia($scope.model.selection);
                     }
-                    eventsService.emit("dialogs.mediaPicker.select", image);
-                    image.selected = true;
-                    $scope.model.selection.push(image);
+                    eventsService.emit("dialogs.mediaPicker.select", media);
+                    media.selected = true;
+                    $scope.model.selection.push(media);
                 }
             }
 
-            function deselectAllImages(images) {
-                for (var i = 0; i < images.length; i++) {
-                    var image = images[i];
-                    image.selected = false;
+            function deselectAllMedia(medias) {
+                for (var i = 0; i < medias.length; i++) {
+                    var media = medias[i];
+                    media.selected = false;
                 }
-                images.length = 0;
+                medias.length = 0;
             }
 
-            $scope.onUploadComplete = function (files) {
-                $scope.gotoFolder($scope.currentFolder).then(function () {
+            function onUploadComplete(files) {
+                gotoFolder($scope.currentFolder).then(function () {
                     if (files.length === 1 && $scope.model.selection.length === 0) {
                         var image = $scope.images[$scope.images.length - 1];
                         $scope.target = image;
                         $scope.target.url = mediaHelper.resolveFile(image);
-                        selectImage(image);
+                        selectMedia(image);
                     }
-                });
-            };
+                })
+            }
 
-            $scope.onFilesQueue = function () {
+            function onFilesQueue() {
                 $scope.activeDrag = false;
-            };
+            }
 
             function ensureWithinStartNode(node) {
                 // make sure that last opened node is on the same path as start node
@@ -273,10 +299,10 @@ angular.module("umbraco")
 
                 // also make sure the node is not trashed
                 if (nodePath.indexOf($scope.startNodeId.toString()) !== -1 && node.trashed === false) {
-                    $scope.gotoFolder({ id: $scope.lastOpenedNode, name: "Media", icon: "icon-folder", path: node.path });
+                    gotoFolder({ id: $scope.lastOpenedNode, name: "Media", icon: "icon-folder", path: node.path });
                     return true;
                 } else {
-                    $scope.gotoFolder({ id: $scope.startNodeId, name: "Media", icon: "icon-folder" });
+                    gotoFolder({ id: $scope.startNodeId, name: "Media", icon: "icon-folder" });
                     return false;
                 }
             }
@@ -293,36 +319,36 @@ angular.module("umbraco")
             }
 
             function gotoStartNode(err) {
-                $scope.gotoFolder({ id: $scope.startNodeId, name: "Media", icon: "icon-folder" });
+                gotoFolder({ id: $scope.startNodeId, name: "Media", icon: "icon-folder" });
             }
 
-            $scope.openDetailsDialog = function () {
+            function openDetailsDialog() {
 
-                $scope.mediaPickerDetailsOverlay = {};
-                $scope.mediaPickerDetailsOverlay.show = true;
+                vm.mediaPickerDetailsOverlay = {
+                    show: true,
+                    submit: function (model) {
 
-                $scope.mediaPickerDetailsOverlay.submit = function (model) {
-                    $scope.model.selection.push($scope.target);
-                    $scope.model.submit($scope.model);
+                        $scope.model.selection.push($scope.target);
+                        $scope.model.submit($scope.model);
 
-                    $scope.mediaPickerDetailsOverlay.show = false;
-                    $scope.mediaPickerDetailsOverlay = null;
-                };
-
-                $scope.mediaPickerDetailsOverlay.close = function (oldModel) {
-                    $scope.mediaPickerDetailsOverlay.show = false;
-                    $scope.mediaPickerDetailsOverlay = null;
+                        vm.mediaPickerDetailsOverlay.show = false;
+                        vm.mediaPickerDetailsOverlay = null;
+                    },
+                    close: function (oldModel) {
+                        vm.mediaPickerDetailsOverlay.show = false;
+                        vm.mediaPickerDetailsOverlay = null;
+                    }
                 };
             };
 
             var debounceSearchMedia = _.debounce(function () {
                 $scope.$apply(function () {
-                    if ($scope.searchOptions.filter) {
+                    if (vm.searchOptions.filter) {
                         searchMedia();
                     } else {
                         
                         // reset pagination
-                        $scope.searchOptions = {
+                        vm.searchOptions = {
                             pageNumber: 1,
                             pageSize: 100,
                             totalItems: 0,
@@ -330,47 +356,52 @@ angular.module("umbraco")
                             filter: '',
                             dataTypeKey: dataTypeKey
                         };
+                        
                         getChildren($scope.currentFolder.id);
                     }
                 });
             }, 500);
 
-            $scope.changeSearch = function () {
-                $scope.loading = true;
+            function changeSearch() {
+                vm.loading = true;
                 debounceSearchMedia();
-            };
-
-            $scope.toggle = function () {
-                // Make sure to activate the changeSearch function everytime the toggle is clicked
-                $scope.changeSearch();
             }
 
-            $scope.changePagination = function (pageNumber) {
-                $scope.loading = true;
-                $scope.searchOptions.pageNumber = pageNumber;
+            function toggle() {
+                // Make sure to activate the changeSearch function everytime the toggle is clicked
+                changeSearch();
+            }
+
+            function changePagination(pageNumber) {
+                vm.loading = true;
+                vm.searchOptions.pageNumber = pageNumber;
                 searchMedia();
             };
 
             function searchMedia() {
-                $scope.loading = true;
-                entityResource.getPagedDescendants($scope.currentFolder.id, "Media", $scope.searchOptions)
+                vm.loading = true;
+                entityResource.getPagedDescendants($scope.currentFolder.id, "Media", vm.searchOptions)
                     .then(function (data) {
                         // update image data to work with image grid
                         angular.forEach(data.items, function (mediaItem) {
                             setMediaMetaData(mediaItem);
                         });
+
                         // update images
                         $scope.images = data.items ? data.items : [];
+
                         // update pagination
                         if (data.pageNumber > 0)
-                            $scope.searchOptions.pageNumber = data.pageNumber;
+                            vm.searchOptions.pageNumber = data.pageNumber;
                         if (data.pageSize > 0)
-                            $scope.searchOptions.pageSize = data.pageSize;
-                        $scope.searchOptions.totalItems = data.totalItems;
-                        $scope.searchOptions.totalPages = data.totalPages;
-                        // set already selected images to selected
-                        preSelectImages();
-                        $scope.loading = false;
+                            vm.searchOptions.pageSize = data.pageSize;
+
+                        vm.searchOptions.totalItems = data.totalItems;
+                        vm.searchOptions.totalPages = data.totalPages;
+
+                        // set already selected medias to selected
+                        preSelectMedia();
+                        vm.loading = false;
                     });
             }
 
@@ -378,6 +409,7 @@ angular.module("umbraco")
                 // set thumbnail and src
                 mediaItem.thumbnail = mediaHelper.resolveFileFromEntity(mediaItem, true);
                 mediaItem.image = mediaHelper.resolveFileFromEntity(mediaItem, false);
+
                 // set properties to match a media object
                 if (mediaItem.metaData) {
                     mediaItem.properties = [];
@@ -409,33 +441,35 @@ angular.module("umbraco")
             }
 
             function getChildren(id) {
-                $scope.loading = true;
-                return entityResource.getChildren(id, "Media", $scope.searchOptions)
-                    .then(function (data) {
+                vm.loading = true;
+                return entityResource.getChildren(id, "Media", vm.searchOptions).then(function (data) {
+                        
                         for (var i = 0; i < data.length; i++) {
                             if (data[i].metaData.MediaPath !== null) {
                                 data[i].thumbnail = mediaHelper.resolveFileFromEntity(data[i], true);
                                 data[i].image = mediaHelper.resolveFileFromEntity(data[i], false);
                             }
                         }
-                        $scope.searchOptions.filter = "";
+
+                        vm.searchOptions.filter = "";
                         $scope.images = data ? data : [];
-                        // set already selected images to selected
-                        preSelectImages();
-                        $scope.loading = false;
+
+                        // set already selected medias to selected
+                        preSelectMedia();
+                        vm.loading = false;
                     });
             }
 
-            function preSelectImages() {
-                for (var folderImageIndex = 0; folderImageIndex < $scope.images.length; folderImageIndex++) {
-                    var folderImage = $scope.images[folderImageIndex];
+            function preSelectMedia() {
+                for (var folderIndex = 0; folderIndex < $scope.images.length; folderIndex++) {
+                    var folderImage = $scope.images[folderIndex];
                     var imageIsSelected = false;
 
                     if ($scope.model && angular.isArray($scope.model.selection)) {
-                        for (var selectedImageIndex = 0;
-                            selectedImageIndex < $scope.model.selection.length;
-                            selectedImageIndex++) {
-                            var selectedImage = $scope.model.selection[selectedImageIndex];
+                        for (var selectedIndex = 0;
+                            selectedIndex < $scope.model.selection.length;
+                            selectedIndex++) {
+                            var selectedImage = $scope.model.selection[selectedIndex];
 
                             if (folderImage.key === selectedImage.key) {
                                 imageIsSelected = true;
@@ -449,7 +483,7 @@ angular.module("umbraco")
                 }
             }
 
-            $scope.editMediaItem = function (item) {
+            function editMediaItem(item) {
                 var mediaEditor = {
                     id: item.id,
                     submit: function (model) {
@@ -475,12 +509,12 @@ angular.module("umbraco")
             };
 
             /**
-             * Called when the umgImageGravity component updates the focal point value
+             * Called when the umbImageGravity component updates the focal point value
              * @param {any} left
              * @param {any} top
              */
-            $scope.focalPointChanged = function (left, top) {
-                //update the model focalpoint value
+            function focalPointChanged(left, top) {
+                // update the model focalpoint value
                 $scope.target.focalPoint = {
                     left: left,
                     top: top
@@ -494,18 +528,18 @@ angular.module("umbraco")
                 }
             }
 
-            $scope.submit = function () {
-                if ($scope.model.submit) {
+            function submit() {
+                if ($scope.model && $scope.model.submit) {
                     $scope.model.submit($scope.model);
                 }
-            };
+            }
 
-            $scope.close = function () {
-                if ($scope.model.close) {
+            function close() {
+                if ($scope.model && $scope.model.close) {
                     $scope.model.close($scope.model);
                 }
-            };
+            }
 
             onInit();
 
-        });
\ No newline at end of file
+        });
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
index 9e2193f07c..a08395143f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
@@ -13,27 +13,27 @@
 
         <form id="fileupload" method="POST" enctype="multipart/form-data" umb-image-upload="options">
 
-            <div on-drag-leave="dragLeave()" on-drag-end="dragLeave()" on-drag-enter="dragEnter()">
+            <div on-drag-leave="vm.dragLeave()" on-drag-end="vm.dragLeave()" on-drag-enter="vm.dragEnter()">
 
                 <div class="umb-control-group umb-mediapicker-upload">
 
                     <umb-load-indicator
-                        ng-if="loading">
+                        ng-if="vm.loading">
                     </umb-load-indicator>
 
                     <div class="form-search">
-                        <i class="icon-search"></i>
+                        <i class="icon-search" aria-hidden="true"></i>
                         <input class="umb-search-field search-query -full-width-input"
-                               ng-model="searchOptions.filter"
+                               ng-model="vm.searchOptions.filter"
                                localize="placeholder"
                                placeholder="@placeholders_search"
-                               ng-change="changeSearch()"
+                               ng-change="vm.changeSearch()"
                                type="text"
                                no-dirty-check />
 
                         <div class="form-search__toggle">
                             <label>
-                                <input type="checkbox" ng-model="showChilds" ng-change="toggle()" />
+                                <input type="checkbox" ng-model="showChilds" ng-change="vm.toggle()" />
                                 <localize key="general_includeFromsubFolders">Include subfolders in search</localize>
                             </label>
                         </div>
@@ -43,7 +43,7 @@
                         <umb-button
                             type="button"
                             label-key="general_upload"
-                            action="upload()"
+                            action="vm.upload()"
                             disabled="lockedFolder"
                             button-style="action">
                         </umb-button>
@@ -51,15 +51,15 @@
 
                 </div>
 
-                <div class="row umb-control-group" ng-show="!searchOptions.filter">
+                <div class="row umb-control-group" ng-show="!vm.searchOptions.filter">
                     <ul class="umb-breadcrumbs">
                         <li ng-hide="startNodeId != -1" class="umb-breadcrumbs__ancestor">
-                            <a href ng-click="gotoFolder()" prevent-default>Media</a>
+                            <a href ng-click="vm.gotoFolder()" prevent-default><localize key="treeHeaders_media">Media</localize></a>
                             <span class="umb-breadcrumbs__separator">&#47;</span>
                         </li>
 
                         <li ng-repeat="item in path" class="umb-breadcrumbs__ancestor">
-                            <a href ng-click="gotoFolder(item)" prevent-default>{{item.name}}</a>
+                            <a href ng-click="vm.gotoFolder(item)" prevent-default>{{item.name}}</a>
                             <span class="umb-breadcrumbs__separator">&#47;</span>
                         </li>
 
@@ -69,30 +69,30 @@
                             </a>
 
                             <input type="text" class="umb-breadcrumbs__add-ancestor" ng-show="model.showFolderInput" ng-model="model.newFolderName" ng-keydown="enterSubmitFolder($event)"
-                                ng-blur="submitFolder()" focus-when="{{model.showFolderInput}}" />
+                                ng-blur="vm.submitFolder()" focus-when="{{model.showFolderInput}}" />
                         </li>
                     </ul>
                     <div class="umb-loader" ng-if="model.creatingFolder"></div>
                 </div>
 
                 <umb-file-dropzone
-                    ng-if="acceptedMediatypes.length > 0 && !loading && !lockedFolder"
-                    accepted-mediatypes="acceptedMediatypes"
+                    ng-if="vm.acceptedMediatypes.length > 0 && !vm.loading && !lockedFolder"
+                    accepted-mediatypes="vm.acceptedMediatypes"
                     parent-id="{{currentFolder.id}}"
-                    files-uploaded="onUploadComplete"
-                    files-queued="onFilesQueue"
-                    accept="{{acceptedFileTypes}}"
-                    max-file-size="{{maxFileSize}}"
-                    hide-dropzone="{{!activeDrag && images.length > 0 || searchOptions.filter }}"
+                    files-uploaded="vm.onUploadComplete"
+                    files-queued="vm.onFilesQueue"
+                    accept="{{vm.acceptedFileTypes}}"
+                    max-file-size="{{vm.maxFileSize}}"
+                    hide-dropzone="{{ !activeDrag && (images.length > 0 || vm.searchOptions.filter !== '') }}"
                     compact="{{ images.length > 0 }}">
                 </umb-file-dropzone>
 
                 <umb-media-grid
-                        ng-if="!loading"
+                        ng-if="!vm.loading"
                         items="images"
-                        on-click="clickHandler"
-                        on-click-name="clickItemName"
-                        on-click-edit="editMediaItem(item)"
+                        on-click="vm.clickHandler"
+                        on-click-name="vm.clickItemName"
+                        on-click-edit="vm.editMediaItem(item)"
                         allow-on-click-edit="{{allowMediaEdit}}"
                         item-max-width="150"
                         item-max-height="150"
@@ -102,25 +102,25 @@
                         only-images={{onlyImages}}
                         only-folders={{onlyFolders}}
                         include-sub-folders={{showChilds}}
-                        current-Folder-id="{{currentFolder.id}}">
+                        current-folder-id="{{currentFolder.id}}">
                 </umb-media-grid>
 
                 <div class="flex justify-center">
                     <umb-pagination
-                        ng-if="searchOptions.totalPages > 0 && !loading"
-                        page-number="searchOptions.pageNumber"
-                        total-pages="searchOptions.totalPages"
-                        on-change="changePagination(pageNumber)">
+                        ng-if="vm.searchOptions.totalPages > 0 && !vm.loading"
+                        page-number="vm.searchOptions.pageNumber"
+                        total-pages="vm.searchOptions.totalPages"
+                        on-change="vm.changePagination(pageNumber)">
                     </umb-pagination>
                 </div>
 
-                <umb-empty-state ng-if="searchOptions.filter && images.length === 0 && !loading" position="center">
+                <umb-empty-state ng-if="vm.searchOptions.filter && images.length === 0 && !vm.loading && !activeDrag" position="center">
                     <localize key="general_searchNoResult"></localize>
                 </umb-empty-state>
 
             </div>
 
-            <umb-overlay ng-if="mediaPickerDetailsOverlay.show" model="mediaPickerDetailsOverlay" position="right">
+            <umb-overlay ng-if="vm.mediaPickerDetailsOverlay.show" model="vm.mediaPickerDetailsOverlay" position="right">
 
                 <div class="umb-control-group">
 
@@ -128,7 +128,7 @@
                         <umb-image-gravity
                             src="target.url"
                             center="target.focalPoint"
-							on-value-changed="focalPointChanged(left, top)">
+							on-value-changed="vm.focalPointChanged(left, top)">
                         </umb-image-gravity>
                     </div>
 
@@ -138,8 +138,11 @@
                             <localize key="general_preview">Preview</localize>
                         </h5>
 
-                        <umb-image-thumbnail center="target.focalPoint" src="target.url" height="{{cropSize.height}}" width="{{cropSize.width}}"
-                            max-size="400">
+                        <umb-image-thumbnail center="target.focalPoint"
+                                             src="target.url"
+                                             height="{{cropSize.height}}"
+                                             width="{{cropSize.width}}"
+                                             max-size="400">
                         </umb-image-thumbnail>
 
                     </div>
@@ -172,7 +175,7 @@
         <umb-editor-footer-content-right>
 
             <umb-button
-                action="close()"
+                action="vm.close()"
                 button-style="link"
                 shortcut="esc"
                 label-key="general_close"
@@ -184,7 +187,7 @@
                 label-key="buttons_select"
                 type="button"
                 disabled="model.selection.length === 0"
-                action="submit(model)">
+                action="vm.submit(model)">
             </umb-button>
 
         </umb-editor-footer-content-right>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
index d7bf31bbe9..80e2fa7ce7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
@@ -3,11 +3,15 @@
 angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerController",
     function ($scope, entityResource, mediaHelper, $timeout, userService, localizationService, editorService, angularHelper) {
 
-        var vm = {
-            labels: {
-                 mediaPicker_deletedItem: ""
-            }
-        }
+        var vm = this;
+
+        vm.labels = {};
+        vm.labels.deletedItem = "";
+
+        vm.add = add;
+        vm.remove = remove;
+        vm.editItem = editItem;
+        vm.showAdd = showAdd;
 
         //check the pre-values for multi-picker
         var multiPicker = $scope.model.config.multiPicker && $scope.model.config.multiPicker !== '0' ? true : false;
@@ -57,7 +61,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
                                 return found;
                             } else {
                                 return {
-                                    name: vm.labels.mediaPicker_deletedItem,
+                                    name: vm.labels.deletedItem,
                                     id: $scope.model.config.idType !== "udi" ? id : null,
                                     udi: $scope.model.config.idType === "udi" ? id : null,
                                     icon: "icon-picture",
@@ -77,10 +81,6 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
                             // if there is no thumbnail, try getting one if the media is not a placeholder item
                             if (!media.thumbnail && media.id && media.metaData) {
                                 media.thumbnail = mediaHelper.resolveFileFromEntity(media, true);
-
-                                if (!media.thumbnail && media.extension === "svg") {
-                                    media.thumbnail = media.metaData.MediaPath;
-                                }
                             }
 
                             $scope.mediaItems.push(media);
@@ -126,22 +126,29 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
 
         function init() {
 
-            localizationService.localizeMany(["mediaPicker_deletedItem"])
+            // localize labels
+            var labelKeys = [
+                "mediaPicker_deletedItem",
+                "mediaPicker_trashed"
+            ];
+
+            localizationService.localizeMany(labelKeys)
                 .then(function(data) {
-                    vm.labels.mediaPicker_deletedItem = data[0];
+                    vm.labels.deletedItem = data[0];
+                    vm.labels.trashed = data[1];
 
                     userService.getCurrentUser().then(function (userData) {
 
                         if (!$scope.model.config.startNodeId) {
-                    if ($scope.model.config.ignoreUserStartNodes === true) {
-                        $scope.model.config.startNodeId = -1;
-                        $scope.model.config.startNodeIsVirtual = true;
-                    }
-                    else {
-                        $scope.model.config.startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
-                        $scope.model.config.startNodeIsVirtual = userData.startMediaIds.length !== 1;
-                    }  
-                }
+                            if ($scope.model.config.ignoreUserStartNodes === true) {
+                                $scope.model.config.startNodeId = -1;
+                                $scope.model.config.startNodeIsVirtual = true;
+                            }
+                            else {
+                                $scope.model.config.startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
+                                $scope.model.config.startNodeIsVirtual = userData.startMediaIds.length !== 1;
+                            }  
+                        }
 
                         // only allow users to add and edit media if they have access to the media section
                         var hasAccessToMedia = userData.allowedSections.indexOf("media") !== -1;
@@ -153,14 +160,14 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
                 });
         }
 
-        $scope.remove = function (index) {
+        function remove(index) {
             $scope.mediaItems.splice(index, 1);
             $scope.ids.splice(index, 1);
             sync();
             setDirty();
-        };
+        }
 
-        $scope.editItem = function (item) {
+        function editItem(item) {
             var mediaEditor = {
                 id: item.id,
                 submit: function (model) {
@@ -187,9 +194,9 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
                 }
             };
             editorService.mediaEditor(mediaEditor);
-        };
+        }
 
-        $scope.add = function () {
+        function add() {
             var mediaPicker = {
                 startNodeId: $scope.model.config.startNodeId,
                 startNodeIsVirtual: $scope.model.config.startNodeIsVirtual,
@@ -197,7 +204,6 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
                 multiPicker: multiPicker,
                 onlyImages: onlyImages,
                 disableFolderSelect: disableFolderSelect,
-
                 allowMediaEdit: true,
                 submit: function (model) {
 
@@ -230,8 +236,16 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
             }
 
             editorService.mediaPicker(mediaPicker);
+        }
 
-        };
+        function showAdd() {
+            if (!multiPicker) {
+                if ($scope.model.value && $scope.model.value !== "") {
+                    return false;
+                }
+            }
+            return true;
+        }
 
         $scope.sortableOptions = {
             containment: 'parent',
@@ -255,15 +269,6 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
             }
         };
 
-        $scope.showAdd = function () {
-            if (!multiPicker) {
-                if ($scope.model.value && $scope.model.value !== "") {
-                    return false;
-                }
-            }
-            return true;
-        };
-
         init();
 
     });
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
index 47aaa7e4f3..d522e92303 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
@@ -1,4 +1,4 @@
-<div class="umb-property-editor umb-mediapicker" ng-class="{'umb-mediapicker-multi':isMultiPicker, 'umb-mediapicker-single':!isMultiPicker}" ng-controller="Umbraco.PropertyEditors.MediaPickerController">
+<div class="umb-property-editor umb-mediapicker" ng-class="{'umb-mediapicker-multi':isMultiPicker, 'umb-mediapicker-single':!isMultiPicker}" ng-controller="Umbraco.PropertyEditors.MediaPickerController as vm">
 
     <p ng-if="(mediaItems|filter:{trashed:true}).length == 1"><localize key="mediaPicker_pickedTrashedItem"></localize></p>
     <p ng-if="(mediaItems|filter:{trashed:true}).length > 1"><localize key="mediaPicker_pickedTrashedItems"></localize></p>
@@ -19,16 +19,20 @@
                 <!-- IMAGE -->
                 <img ng-if="media.thumbnail && media.extension !== 'svg'"
                      ng-class="{'trashed': media.trashed}" ng-src="{{media.thumbnail}}"
-                     alt="{{media.name}}" title="{{media.trashed ? 'Trashed: ' + media.name : media.name}}" />
+                     ng-attr-title="{{media.trashed ? (vm.labels.trashed || 'Trashed') + ': ' + media.name : media.name}}"
+                     alt="{{media.name}}" />
 
                 <!-- SVG -->
                 <img ng-if="media.thumbnail && media.extension === 'svg'"
                      ng-class="{'trashed': media.trashed}" ng-src="{{media.thumbnail}}"
-                     alt="{{media.name}}"
-                     title="{{media.trashed ? 'Trashed: ' + media.name : media.name}}" />
+                     ng-attr-title="{{media.trashed ? (vm.labels.trashed || 'Trashed') + ': ' + media.name : media.name}}"
+                     alt="{{media.name}}" />
 
                 <!-- FILE -->
-                <div ng-class="{'trashed': media.trashed}" class="umb-icon-holder" ng-hide="media.thumbnail">
+                <div ng-class="{'trashed': media.trashed}"
+                     ng-attr-title="{{media.trashed ? (vm.labels.trashed || 'Trashed') + ': ' + media.name : media.name}}"
+                     ng-hide="media.thumbnail"
+                     class="umb-icon-holder">
                     <span class="file-icon">
                         <i class="icon {{media.icon}}"></i>
                         <span ng-if="media.extension">.{{media.extension}}</span>
@@ -37,16 +41,16 @@
                 </div>
 
                 <div class="umb-sortable-thumbnails__actions" data-element="sortable-thumbnail-actions">
-                    <a ng-if="allowEditMedia" class="umb-sortable-thumbnails__action" data-element="action-edit" href="" ng-click="editItem(media)">
+                    <a ng-if="allowEditMedia" class="umb-sortable-thumbnails__action" data-element="action-edit" href="" ng-click="vm.editItem(media)">
                         <i class="icon icon-edit"></i>
                     </a>
-                    <a class="umb-sortable-thumbnails__action -red" data-element="action-remove" href="" ng-click="remove($index)">
+                    <a class="umb-sortable-thumbnails__action -red" data-element="action-remove" href="" ng-click="vm.remove($index)">
                         <i class="icon icon-delete"></i>
                     </a>
                 </div>
             </li>
-            <li style="border: none;" class="add-wrapper unsortable" ng-if="showAdd() && allowAddMedia">
-                <a data-element="sortable-thumbnails-add" href="#" class="add-link" ng-click="add()" ng-class="{'add-link-square': (mediaItems.length === 0 || isMultiPicker)}" prevent-default>
+            <li style="border: none;" class="add-wrapper unsortable" ng-if="vm.showAdd() && allowAddMedia">
+                <a data-element="sortable-thumbnails-add" href="#" class="add-link" ng-click="vm.add()" ng-class="{'add-link-square': (mediaItems.length === 0 || isMultiPicker)}" prevent-default>
                     <i class="icon icon-add large"></i>
                 </a>
             </li>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index 2dc88b315a..59653529a1 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -1011,8 +1011,10 @@ Mange hilsner fra Umbraco robotten
     <key alias="pickedTrashedItems">Du har valgt dokumenter som er slettede eller lagt i papirkurven</key>
   </area>
   <area alias="mediaPicker">
+    <key alias="deletedItem">Slettet medie</key>
     <key alias="pickedTrashedItem">Du har valgt et medie som er slettet eller lagt i papirkurven</key>
     <key alias="pickedTrashedItems">Du har valgt medier som er slettede eller lagt i papirkurven</key>
+    <key alias="trashed">Slettet</key>
   </area>
   <area alias="relatedlinks">
     <key alias="enterExternal">indtast eksternt link</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 100f4c81d2..80b73cea26 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -1269,8 +1269,9 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="pickedTrashedItems">You have picked content items currently deleted or in the recycle bin</key>
   </area>
   <area alias="mediaPicker">
+    <key alias="deletedItem">Deleted item</key>
     <key alias="pickedTrashedItem">You have picked a media item currently deleted or in the recycle bin</key>
-    <key alias="pickedTrashedItems">You have picked media items currently deleted or in the recycle bin</key>
+    <key alias="pickedTrashedItems">You have picked media items currently deleted or in the recycle bin</key>
     <key alias="trashed">Trashed</key>
   </area>
   <area alias="relatedlinks">
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index 6a7070e7e0..0d79911ea7 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -1274,6 +1274,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="pickedTrashedItems">You have picked content items currently deleted or in the recycle bin</key>
   </area>
   <area alias="mediaPicker">
+    <key alias="deletedItem">Deleted item</key>
     <key alias="pickedTrashedItem">You have picked a media item currently deleted or in the recycle bin</key>
     <key alias="pickedTrashedItems">You have picked media items currently deleted or in the recycle bin</key>
     <key alias="trashed">Trashed</key>

From 795b64dadd0c8bcdcd582566d19a20ecfff3903b Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Sun, 29 Sep 2019 15:16:50 +0200
Subject: [PATCH 759/776] v8: Change button style for "create package" and
 "show more" (in the log viewer) (#6428)

---
 .../views/logviewer/overview.controller.js    |  5 ++++
 .../src/views/logviewer/overview.html         | 23 +++++++++++--------
 .../src/views/logviewer/search.controller.js  |  1 -
 .../src/views/logviewer/search.html           |  4 ++--
 .../src/views/packages/views/created.html     |  2 +-
 5 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.controller.js b/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.controller.js
index 690d7e0829..0136d6ecb7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.controller.js
@@ -4,6 +4,7 @@
     function LogViewerOverviewController($q, $location, $timeout, logViewerResource, navigationService) {
 
         var vm = this;
+
         vm.loading = false;
         vm.canLoadLogs = false;
         vm.searches = [];
@@ -50,6 +51,7 @@
         vm.searchLogQuery = searchLogQuery;
         vm.findMessageTemplate = findMessageTemplate;
         vm.searchErrors = searchErrors;
+        vm.showMore = showMore;
 
         function preFlightCheck(){
             vm.loading = true;
@@ -66,6 +68,9 @@
             });
         }
 
+        function showMore() {
+            vm.commonLogMessagesCount += 10;
+        }
 
         function init() {
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html b/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html
index 300c824329..b58d3c035e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html
@@ -53,17 +53,22 @@
                                 <em>Total Unique Message types</em>: {{ vm.commonLogMessages.length }}
                                 <table class="table table-hover">
                                     <tbody>
-                                    <tr ng-repeat="template in vm.commonLogMessages | limitTo:vm.commonLogMessagesCount" ng-click="vm.findMessageTemplate(template)" style="cursor: pointer;">
-                                        <td>
-                                            {{ template.MessageTemplate }}
-                                        </td>
-                                        <td>
-                                            {{ template.Count }}
-                                        </td>
-                                    </tr>
+                                        <tr ng-repeat="template in vm.commonLogMessages | limitTo:vm.commonLogMessagesCount" ng-click="vm.findMessageTemplate(template)" style="cursor: pointer;">
+                                            <td>
+                                                {{ template.MessageTemplate }}
+                                            </td>
+                                            <td>
+                                                {{ template.Count }}
+                                            </td>
+                                        </tr>
                                     </tbody>
                                 </table>
-                                <a class="btn btn-primary" ng-if="vm.commonLogMessagesCount < vm.commonLogMessages.length" ng-click="vm.commonLogMessagesCount = vm.commonLogMessagesCount +10">Show More</a>
+                                <umb-button ng-if="vm.commonLogMessagesCount < vm.commonLogMessages.length"
+                                            button-style="action"
+                                            type="button"
+                                            action="vm.showMore()"
+                                            label="Show More">
+                                </umb-button>
                             </umb-box-content>
                         </umb-box>
                     </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/logviewer/search.controller.js b/src/Umbraco.Web.UI.Client/src/views/logviewer/search.controller.js
index fb627855b6..eb1a0bb8b3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/logviewer/search.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/logviewer/search.controller.js
@@ -88,7 +88,6 @@
         vm.deleteSavedSearch = deleteSavedSearch;
         vm.back = back;
 
-
         function init() {
 
             //If we have a Querystring set for lq (log query)
diff --git a/src/Umbraco.Web.UI.Client/src/views/logviewer/search.html b/src/Umbraco.Web.UI.Client/src/views/logviewer/search.html
index 7a7ea7699c..e64bf4a538 100644
--- a/src/Umbraco.Web.UI.Client/src/views/logviewer/search.html
+++ b/src/Umbraco.Web.UI.Client/src/views/logviewer/search.html
@@ -87,9 +87,9 @@
                 </umb-editor-sub-header>
             </form>
 
-            <div class=" ng-if="!vm.loading">
+            <div ng-if="!vm.loading">
 
-                <div class="">
+                <div>
 
                     <!-- Loader for the main logs content when paging -->
                     <umb-load-indicator ng-if="vm.logsLoading"></umb-load-indicator>
diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/views/created.html b/src/Umbraco.Web.UI.Client/src/views/packages/views/created.html
index 05fc9d11ad..189b6ce482 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packages/views/created.html
+++ b/src/Umbraco.Web.UI.Client/src/views/packages/views/created.html
@@ -4,7 +4,7 @@
 
         <umb-editor-sub-header-content-left>
             <umb-button
-                button-style="success"
+                button-style="action"
                 type="button" 
                 action="vm.createPackage()"
                 label="Create package"

From e1d28608cf21585b61d5ab2cccb49171721aea81 Mon Sep 17 00:00:00 2001
From: BatJan <jaskov@gmail.com>
Date: Sun, 22 Sep 2019 18:04:31 +0200
Subject: [PATCH 760/776] Ensure notifications are announced by screen readers
 and tweak semanics and a litle styling too

---
 .../less/components/notifications/umb-notifications.less | 9 ++++++---
 .../components/notifications/umb-notifications.html      | 8 +++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/notifications/umb-notifications.less b/src/Umbraco.Web.UI.Client/src/less/components/notifications/umb-notifications.less
index 5d78bed2a3..1065082820 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/notifications/umb-notifications.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/notifications/umb-notifications.less
@@ -14,7 +14,7 @@
     list-style: none;
     margin: 0;
     position: relative;
-} 
+}
 
 .umb-notifications__notification {
     padding: 5px 20px;
@@ -24,11 +24,14 @@
     position: relative;
     border-radius: 10px;
     margin: 10px;
-    
+
     .close {
+        position: absolute;
         top: 0;
-        right: -6px;
+        bottom: 0;
+        right: 6px;
         opacity: 0.4;
+        margin: auto 0;
     }
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/notifications/umb-notifications.html b/src/Umbraco.Web.UI.Client/src/views/components/notifications/umb-notifications.html
index dbbe871597..769cd422ef 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/notifications/umb-notifications.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/notifications/umb-notifications.html
@@ -1,11 +1,9 @@
 <div class="umb-notifications" id="umb-notifications-wrapper" ng-cloak>
-    <ul class="umb-notifications__notifications">
+    <ul class="umb-notifications__notifications" aria-live="assertive" aria-relevant="additions">
         <li ng-repeat="notification in notifications"
             class="alert alert-block alert-{{notification.type}} umb-notifications__notification animated -half-second fadeIn"
             ng-class="{'-no-border -extra-padding': notification.type === 'form'}">
 
-            <a class='close -align-right' ng-click="removeNotification($index)" prevent-default href>&times;</a>
-
             <div ng-if="notification.view">
                 <div ng-include="notification.view"></div>
             </div>
@@ -19,6 +17,10 @@
                     <span ng-bind-html="notification.message"></span>
                 </div>
             </div>
+
+            <button type="button" class='close -align-right' ng-click="removeNotification($index)" aria-hidden="true">
+                <span aria-hidden="true">&times;</span>
+            </button>
         </li>
     </ul>
 </div>

From d9840142586cac4593f89669c3213f699406e02c Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland@zonedigital.com>
Date: Sun, 29 Sep 2019 15:37:09 +0200
Subject: [PATCH 761/776] =?UTF-8?q?Fixes=20#6400:=20Content=20Templates=20?=
 =?UTF-8?q?don't=20set=20name=20correctly=20when=20cr=E2=80=A6=20(#6404)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/Implement/ContentService.cs       | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs
index c3695b0d67..ce63be9f2c 100644
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Globalization;
 using System.Linq;
-using System.Text.RegularExpressions;
 using Umbraco.Core.Events;
 using Umbraco.Core.Exceptions;
 using Umbraco.Core.Logging;
@@ -12,7 +11,6 @@ using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.Repositories;
-using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Scoping;
 using Umbraco.Core.Services.Changes;
 
@@ -2988,8 +2986,22 @@ namespace Umbraco.Core.Services.Implement
             content.CreatorId = userId;
             content.WriterId = userId;
 
+            IEnumerable<string> cultures = ArrayOfOneNullString;
+            if (blueprint.CultureInfos.Count > 0)
+            {
+                cultures = blueprint.CultureInfos.Values.Select(x => x.Culture);
+                using (var scope = ScopeProvider.CreateScope())
+                {
+                    if (blueprint.CultureInfos.TryGetValue(_languageRepository.GetDefaultIsoCode(), out var defaultCulture))
+                    {
+                        defaultCulture.Name = name;
+                    }
+
+                    scope.Complete();
+                }
+            }
+
             var now = DateTime.Now;
-            var cultures = blueprint.CultureInfos.Count > 0 ? blueprint.CultureInfos.Values.Select(x => x.Culture) : ArrayOfOneNullString;
             foreach (var culture in cultures)
             {
                 foreach (var property in blueprint.Properties)

From cb5b9ed7e4e3cf6ee36b056459d1b31549bea423 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland@zonedigital.com>
Date: Sun, 22 Sep 2019 12:25:35 +0200
Subject: [PATCH 762/776] Hide settings and delete option when re-ordering doc
 type properties

---
 .../src/views/components/umb-groups-builder.html                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
index 2770a8a02b..8abf9f1ff6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
@@ -248,7 +248,7 @@
                             </div>
 
                             <!-- row tools -->
-                            <div class="umb-group-builder__property-actions">
+                            <div class="umb-group-builder__property-actions" ng-if="!sortingMode">
 
                                 <div ng-if="!property.inherited">
 

From 2cd92e73947db2c8dfedd67e459ee46f22a61c92 Mon Sep 17 00:00:00 2001
From: Jan Skovgaard <jaskov@gmail.com>
Date: Sun, 29 Sep 2019 15:54:04 +0200
Subject: [PATCH 763/776] Use aria attributes in dialog markup (#6402)

---
 .../src/less/components/overlays.less         | 26 +++++++++----------
 .../components/overlays/umb-overlay.html      | 23 ++++++++--------
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/overlays.less b/src/Umbraco.Web.UI.Client/src/less/components/overlays.less
index c8f0195ea5..c2c4f26535 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/overlays.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/overlays.less
@@ -6,6 +6,10 @@
     animation: fadeIn 0.2s;
     box-shadow: 0 10px 50px rgba(0,0,0,0.1), 0 6px 20px rgba(0,0,0,0.16);
     text-align: left;
+
+    .scoped-view{
+        display: none;
+    }
 }
 
 .umb-overlay__form {
@@ -20,7 +24,6 @@
     margin-top: 0;
     flex-grow: 0;
     flex-shrink: 0;
-    
     padding: 20px 30px 0;
 }
 
@@ -28,11 +31,11 @@
     width: 100%;
     margin-top:30px;
     margin-bottom: 10px;
-    
+
     h5 {
         display: inline;
     }
-    
+
     button {
         display: inline;
         float: right;
@@ -47,6 +50,7 @@
 .umb-overlay__title {
     font-size: @fontSizeLarge;
     color: @black;
+    line-height: 20px;
     font-weight: bold;
     margin: 7px 0;
 }
@@ -62,8 +66,7 @@
     flex-shrink: 1;
     flex-basis: auto;
     position: relative;
-    
-    padding: 0px 30px;
+    padding: 0 30px;
     margin-bottom: 10px;
     max-height: calc(100vh - 170px);
     overflow-y: auto;
@@ -75,7 +78,6 @@
     flex-basis: 31px;
     padding: 10px 20px;
     margin: 0;
-
     background: @gray-10;
     border-top: 1px solid @purple-l3;
 }
@@ -124,11 +126,7 @@
     max-height: 100vh;
     box-sizing: border-box;
     border-radius: @baseBorderRadius;
-    /* default:
-    &.umb-overlay--small {
-        width: 400px;
-    }
-    */
+
     &.umb-overlay--medium {
         width: 480px;
     }
@@ -228,12 +226,12 @@
 }
 
 .umb-overlay__item-details-title {
-    margin-top: 0;
-    margin-bottom: 0;
+    margin: 0;
+    font-size: 15px;
 }
 
 .umb-overlay__item-details-description {
-    margin-top: 10px;
+    margin: 10px 0 0;
     font-size: 12px;
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/overlays/umb-overlay.html b/src/Umbraco.Web.UI.Client/src/views/components/overlays/umb-overlay.html
index ae3cfcc776..a19cf40e1a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/overlays/umb-overlay.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/overlays/umb-overlay.html
@@ -1,33 +1,32 @@
-<div data-element="overlay" class="umb-overlay umb-overlay-{{position}} umb-overlay--{{size}}" on-outside-click="outSideClick()">
+<div data-element="overlay" class="umb-overlay umb-overlay-{{position}} umb-overlay--{{size}}" on-outside-click="outSideClick()" role="dialog" aria-labelledby="umb-overlay-title" aria-describedby="umb-overlay-description">
     <ng-form class="umb-overlay__form" name="overlayForm" novalidate val-form-manager>
-
         <div data-element="overlay-header" class="umb-overlay-header">
-            <h4 class="umb-overlay__title">{{model.title}}</h4>
-            <p class="umb-overlay__subtitle">{{model.subtitle}}</p>
+            <h1 class="umb-overlay__title" id="umb-overlay-title">{{model.title}}</h1>
+            <p class="umb-overlay__subtitle" id="umb-overlay-description" ng-if="model.subtitle">{{model.subtitle}}</p>
         </div>
 
         <div data-element="overlay-content" class="umb-overlay-container form-horizontal">
             <ng-transclude></ng-transclude>
             <div ng-if="view && !parentScope" ng-include="view"></div>
-            <div class="scoped-view" style="display: none;"></div>
+            <div class="scoped-view"></div>
         </div>
 
+        <!-- If model contains the property of "itemDetails" we render  the relevant content here -->
         <div class="umb-overlay__item-details" ng-if="model.itemDetails">
-
             <div class="umb-overlay__item-details-title-wrapper" ng-if="model.itemDetails.icon || model.itemDetails.title">
-                <i class="{{ model.itemDetails.icon }} umb-overlay__item-details-icon" ng-if="model.itemDetails.icon"></i>
-                <h5 class="umb-overlay__item-details-title" ng-if="model.itemDetails.title">{{ model.itemDetails.title }}</h5>
+                <i class="{{ model.itemDetails.icon }} umb-overlay__item-details-icon" ng-if="model.itemDetails.icon" aria-hidden="true"></i>
+                <h2 class="umb-overlay__item-details-title" ng-if="model.itemDetails.title">{{ model.itemDetails.title }}</h2>
             </div>
-
-            <div class="umb-overlay__item-details-description" ng-if="model.itemDetails.description">{{ model.itemDetails.description }}</div>
-
+            <p class="umb-overlay__item-details-description" ng-if="model.itemDetails.description">{{ model.itemDetails.description }}</p>
         </div>
 
         <div data-element="overlay-footer" class="umb-overlay-drawer" ng-class="{'-auto-height': model.confirmSubmit.show}">
 
             <div ng-if="model.confirmSubmit.show">
 
-                <h5 class="red" ng-if="model.confirmSubmit.title"><i class="icon-alert"></i> {{ model.confirmSubmit.title }}</h5>
+                <h2 class="red" ng-if="model.confirmSubmit.title">
+                    <i class="icon-alert" aria-hidden="true"></i> {{ model.confirmSubmit.title }}
+                </h2>
                 <p ng-if="model.confirmSubmit.description">{{ model.confirmSubmit.description }}</p>
 
                 <label class="checkbox no-indent">

From 1acb6f52151154f1791e69dc8375d21b42631e79 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland@zonedigital.com>
Date: Sun, 22 Sep 2019 11:10:02 +0200
Subject: [PATCH 764/776] Re-ordered and updatesd language delete clauses in
 language repository to ensure any tags for the language are deleted before
 the language itself is deleted

---
 .../Repositories/Implement/LanguageRepository.cs   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/LanguageRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/LanguageRepository.cs
index 8597bbf19f..1a8b2b8821 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/LanguageRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/LanguageRepository.cs
@@ -102,17 +102,17 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         protected override IEnumerable<string> GetDeleteClauses()
         {
-
             var list = new List<string>
                            {
                                //NOTE: There is no constraint between the Language and cmsDictionary/cmsLanguageText tables (?)
                                // but we still need to remove them
-                               "DELETE FROM cmsLanguageText WHERE languageId = @id",
-                               "DELETE FROM umbracoPropertyData WHERE languageId = @id",
-                               "DELETE FROM umbracoContentVersionCultureVariation WHERE languageId = @id",
-                               "DELETE FROM umbracoDocumentCultureVariation WHERE languageId = @id",
-                               "DELETE FROM umbracoLanguage WHERE id = @id",
-                               "DELETE FROM " + Constants.DatabaseSchema.Tables.Tag + " WHERE languageId = @id"
+                               "DELETE FROM " + Constants.DatabaseSchema.Tables.DictionaryValue + " WHERE languageId = @id",
+                               "DELETE FROM " + Constants.DatabaseSchema.Tables.PropertyData + " WHERE languageId = @id",
+                               "DELETE FROM " + Constants.DatabaseSchema.Tables.ContentVersionCultureVariation + " WHERE languageId = @id",
+                               "DELETE FROM " + Constants.DatabaseSchema.Tables.DocumentCultureVariation + " WHERE languageId = @id",
+                               "DELETE FROM " + Constants.DatabaseSchema.Tables.TagRelationship + " WHERE tagId IN (SELECT id FROM " + Constants.DatabaseSchema.Tables.Tag + " WHERE languageId = @id)",
+                               "DELETE FROM " + Constants.DatabaseSchema.Tables.Tag + " WHERE languageId = @id",
+                               "DELETE FROM " + Constants.DatabaseSchema.Tables.Language + " WHERE id = @id"
                            };
             return list;
         }

From ca8d5b948cceb34a1b16edfe17deabbd4ab995f8 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Fri, 20 Sep 2019 16:33:37 +0200
Subject: [PATCH 765/776] Don't YSOD when editing doctype from content that
 hasn't been saved yet

---
 .../components/content/edit.controller.js     | 54 ++++++++++++-------
 .../content/umbcontentnodeinfo.directive.js   |  2 -
 .../services/contenteditinghelper.service.js  | 22 ++++----
 .../views/documenttypes/edit.controller.js    |  1 +
 4 files changed, 48 insertions(+), 31 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
index aa01df35dc..8e30ef66c5 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
@@ -153,9 +153,16 @@
 
         function reload() {
             $scope.page.loading = true;
-            loadContent().then(function () {
-                $scope.page.loading = false;
-            });
+
+            if ($scope.page.isNew) {
+                loadScaffold().then(function () {
+                    $scope.page.loading = false;
+                });
+            } else {
+                loadContent().then(function () {
+                    $scope.page.loading = false;
+                });
+            }
         }
 
         function bindEvents() {
@@ -224,6 +231,28 @@
 
         }
 
+        /**
+        *  This loads the content scaffold for when creating new content
+        */
+        function loadScaffold() {
+            //we are creating so get an empty content item
+            return $scope.getScaffoldMethod()()
+                .then(function (data) {
+
+                    $scope.content = data;
+
+                    init();
+                    startWatches($scope.content);
+
+                    resetLastListPageNumber($scope.content);
+
+                    eventsService.emit("content.newReady", { content: $scope.content });
+
+                    return $q.resolve($scope.content);
+
+                });
+        }
+
         /**
          * Create the save/publish/preview buttons for the view
          * @param {any} content the content node
@@ -489,22 +518,9 @@
 
             $scope.page.loading = true;
 
-            //we are creating so get an empty content item
-            $scope.getScaffoldMethod()()
-                .then(function (data) {
-
-                    $scope.content = data;
-
-                    init();
-                    startWatches($scope.content);
-
-                    resetLastListPageNumber($scope.content);
-
-                    eventsService.emit("content.newReady", { content: $scope.content });
-
-                    $scope.page.loading = false;
-
-                });
+            loadScaffold().then(function () {
+                $scope.page.loading = false;
+            });
         }
         else {
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
index a1df6c2914..a289f8c225 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
@@ -150,8 +150,6 @@
                 const editor = {
                     id: documentType.id,
                     submit: function (model) {
-                        const args = { node: scope.node };
-                        eventsService.emit("editors.content.reload", args);
                         editorService.close();
                     },
                     close: function () {
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
index 200e61ee96..20d0d5b69a 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
@@ -80,17 +80,19 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, editorSt
 
                         formHelper.resetForm({ scope: args.scope });
 
-                        self.handleSuccessfulSave({
-                            scope: args.scope,
-                            savedContent: data,
-                            softRedirect: args.softRedirect,
-                            rebindCallback: function () {
-                                rebindCallback.apply(self, [args.content, data]);
-                            }
-                        });
+                        if (!args.infiniteMode) {
+                            self.handleSuccessfulSave({
+                                scope: args.scope,
+                                savedContent: data,
+                                softRedirect: args.softRedirect,
+                                rebindCallback: function () {
+                                    rebindCallback.apply(self, [args.content, data]);
+                                }
+                            });
 
-                        //update editor state to what is current
-                        editorState.set(args.content);
+                            //update editor state to what is current
+                            editorState.set(args.content);
+                        }
 
                         return $q.resolve(data);
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
index f261cf9b14..e12a26ba52 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
@@ -338,6 +338,7 @@
                     saveMethod: contentTypeResource.save,
                     scope: $scope,
                     content: vm.contentType,
+                    infiniteMode: infiniteMode,
                     // we need to rebind... the IDs that have been created!
                     rebindCallback: function (origContentType, savedContentType) {
                         vm.contentType.id = savedContentType.id;

From 88c6bb9c2147ab5ec8c072f120e64c110d0284f8 Mon Sep 17 00:00:00 2001
From: Steve Megson <steve@megson.org>
Date: Sun, 29 Sep 2019 15:49:04 +0100
Subject: [PATCH 766/776] V8: Redirect tracking on move (#6344)

---
 .../Routing/RedirectTrackingComponent.cs      | 223 ++++++------------
 1 file changed, 69 insertions(+), 154 deletions(-)

diff --git a/src/Umbraco.Web/Routing/RedirectTrackingComponent.cs b/src/Umbraco.Web/Routing/RedirectTrackingComponent.cs
index 77aa3c65a1..fcf6f55f44 100644
--- a/src/Umbraco.Web/Routing/RedirectTrackingComponent.cs
+++ b/src/Umbraco.Web/Routing/RedirectTrackingComponent.cs
@@ -1,16 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Events;
 using Umbraco.Core.Models;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;
-using Umbraco.Core.Sync;
-using Umbraco.Web.Cache;
-using Current = Umbraco.Web.Composing.Current;
+using Umbraco.Web.PublishedCache;
 
 namespace Umbraco.Web.Routing
 {
@@ -23,64 +20,17 @@ namespace Umbraco.Web.Routing
     /// <para>recycle bin = moving to and from does nothing: to = the node is gone, where would we redirect? from = same</para>
     public sealed class RedirectTrackingComponent : IComponent
     {
-        private const string ContextKey1 = "Umbraco.Web.Redirects.RedirectTrackingEventHandler.1";
-        private const string ContextKey2 = "Umbraco.Web.Redirects.RedirectTrackingEventHandler.2";
-        private const string ContextKey3 = "Umbraco.Web.Redirects.RedirectTrackingEventHandler.3";
+        private const string _eventStateKey = "Umbraco.Web.Redirects.RedirectTrackingEventHandler";
 
         private readonly IUmbracoSettingsSection _umbracoSettings;
+        private readonly IPublishedSnapshotAccessor _publishedSnapshotAccessor;
+        private readonly IRedirectUrlService _redirectUrlService;
 
-        public RedirectTrackingComponent(IUmbracoSettingsSection umbracoSettings)
+        public RedirectTrackingComponent(IUmbracoSettingsSection umbracoSettings, IPublishedSnapshotAccessor publishedSnapshotAccessor, IRedirectUrlService redirectUrlService)
         {
             _umbracoSettings = umbracoSettings;
-        }
-
-        private static Dictionary<ContentIdAndCulture, ContentKeyAndOldRoute> OldRoutes
-        {
-            get
-            {
-                var oldRoutes = (Dictionary<ContentIdAndCulture, ContentKeyAndOldRoute>) Current.UmbracoContext.HttpContext.Items[ContextKey3];
-                if (oldRoutes == null)
-                    Current.UmbracoContext.HttpContext.Items[ContextKey3] = oldRoutes = new Dictionary<ContentIdAndCulture, ContentKeyAndOldRoute>();
-                return oldRoutes;
-            }
-        }
-
-        private static bool HasOldRoutes
-        {
-            get
-            {
-                if (Current.UmbracoContext == null) return false;
-                if (Current.UmbracoContext.HttpContext == null) return false;
-                if (Current.UmbracoContext.HttpContext.Items[ContextKey3] == null) return false;
-                return true;
-            }
-        }
-
-        private static bool LockedEvents
-        {
-            get => Moving && Current.UmbracoContext.HttpContext.Items[ContextKey2] != null;
-            set
-            {
-                if (Moving && value)
-                    Current.UmbracoContext.HttpContext.Items[ContextKey2] = true;
-                else
-                    Current.UmbracoContext.HttpContext.Items.Remove(ContextKey2);
-            }
-        }
-
-        private static bool Moving
-        {
-            get => Current.UmbracoContext.HttpContext.Items[ContextKey1] != null;
-            set
-            {
-                if (value)
-                    Current.UmbracoContext.HttpContext.Items[ContextKey1] = true;
-                else
-                {
-                    Current.UmbracoContext.HttpContext.Items.Remove(ContextKey1);
-                    Current.UmbracoContext.HttpContext.Items.Remove(ContextKey2);
-                }
-            }
+            _publishedSnapshotAccessor = publishedSnapshotAccessor;
+            _redirectUrlService = redirectUrlService;
         }
 
         public void Initialize()
@@ -88,26 +38,11 @@ namespace Umbraco.Web.Routing
             // don't let the event handlers kick in if Redirect Tracking is turned off in the config
             if (_umbracoSettings.WebRouting.DisableRedirectUrlTracking) return;
 
-            // events are weird
-            // on 'published' we 'could' get the old or the new route depending on event handlers order
-            // so it is not reliable. getting the old route in 'publishing' to be sure and storing in http
-            // context. then for the same reason, we have to process these old items only when the cache
-            // is ready
-            // when moving, the moved node is also published, which is causing all sorts of troubles with
-            // descendants, so when moving, we lock events so that neither 'published' nor 'publishing'
-            // are processed more than once
-            // we cannot rely only on ContentCacheRefresher because when CacheUpdated triggers the old
-            // route is gone
-            //
-            // this is all very weird but it seems to work
-
             ContentService.Publishing += ContentService_Publishing;
             ContentService.Published += ContentService_Published;
             ContentService.Moving += ContentService_Moving;
             ContentService.Moved += ContentService_Moved;
 
-            ContentCacheRefresher.CacheUpdated += ContentCacheRefresher_CacheUpdated;
-
             // kill all redirects once a content is deleted
             //ContentService.Deleted += ContentService_Deleted;
             // BUT, doing it here would prevent content deletion due to FK
@@ -119,102 +54,79 @@ namespace Umbraco.Web.Routing
         public void Terminate()
         { }
 
-        private static void ContentCacheRefresher_CacheUpdated(ContentCacheRefresher sender, CacheRefresherEventArgs args)
+        private void ContentService_Publishing(IContentService sender, PublishEventArgs<IContent> args)
         {
-            // that event is a distributed even that triggers on all nodes
-            // BUT it should totally NOT run on nodes other that the one that handled the other events
-            // and besides, it cannot run on a background thread!
-            if (!HasOldRoutes)
-                return;
-
-            // sanity checks
-            if (args.MessageType != MessageType.RefreshByPayload)
-            {
-                throw new InvalidOperationException("ContentCacheRefresher MessageType should be ByPayload.");
-            }
-
-            if (args.MessageObject == null)
-            {
-                return;
-            }
-
-            if (!(args.MessageObject is ContentCacheRefresher.JsonPayload[]))
-            {
-                throw new InvalidOperationException("ContentCacheRefresher MessageObject should be JsonPayload[].");
-            }
-
-            // manage routes
-            var removeKeys = new List<ContentIdAndCulture>();
-
-            foreach (var oldRoute in OldRoutes)
-            {
-                // assuming we cannot have 'CacheUpdated' for only part of the infos else we'd need
-                // to set a flag in 'Published' to indicate which entities have been refreshed ok
-                CreateRedirect(oldRoute.Key.ContentId, oldRoute.Key.Culture, oldRoute.Value.ContentKey, oldRoute.Value.OldRoute);
-                removeKeys.Add(oldRoute.Key);
-            }
-
-            foreach (var k in removeKeys)
-            {
-                OldRoutes.Remove(k);
-            }
-        }
-
-        private static void ContentService_Publishing(IContentService sender, PublishEventArgs<IContent> args)
-        {
-            if (LockedEvents) return;
-
-            var contentCache = Current.UmbracoContext.Content;
+            var oldRoutes = GetOldRoutes(args.EventState);
             foreach (var entity in args.PublishedEntities)
             {
-                var entityContent = contentCache.GetById(entity.Id);
-                if (entityContent == null) continue;
+                StoreOldRoute(entity, oldRoutes);
+            }
+        }
 
-                // get the default affected cultures by going up the tree until we find the first culture variant entity (default to no cultures) 
-                var defaultCultures = entityContent.AncestorsOrSelf()?.FirstOrDefault(a => a.Cultures.Any())?.Cultures.Keys.ToArray()
-                    ?? new[] {(string) null};
-                foreach (var x in entityContent.DescendantsOrSelf())
-                {
-                    // if this entity defines specific cultures, use those instead of the default ones
-                    var cultures = x.Cultures.Any() ? x.Cultures.Keys : defaultCultures;
+        private void ContentService_Published(IContentService sender, ContentPublishedEventArgs args)
+        {
+            var oldRoutes = GetOldRoutes(args.EventState);
+            CreateRedirects(oldRoutes);
+        }
 
-                    foreach (var culture in cultures)
-                    {
-                        var route = contentCache.GetRouteById(x.Id, culture);
-                        if (IsNotRoute(route)) return;
-                        OldRoutes[new ContentIdAndCulture(x.Id, culture)] = new ContentKeyAndOldRoute(x.Key, route);
-                    }
-                }
+        private void ContentService_Moving(IContentService sender, MoveEventArgs<IContent> args)
+        {
+            var oldRoutes = GetOldRoutes(args.EventState);
+            foreach (var info in args.MoveInfoCollection)
+            {
+                StoreOldRoute(info.Entity, oldRoutes);
+            }
+        }
+
+        private void ContentService_Moved(IContentService sender, MoveEventArgs<IContent> args)
+        {
+            var oldRoutes = GetOldRoutes(args.EventState);
+            CreateRedirects(oldRoutes);
+        }
+
+        private OldRoutesDictionary GetOldRoutes(IDictionary<string, object> eventState)
+        {
+            if (! eventState.ContainsKey(_eventStateKey))
+            {
+                eventState[_eventStateKey] = new OldRoutesDictionary();
             }
 
-            LockedEvents = true; // we only want to see the "first batch"
+            return eventState[_eventStateKey] as OldRoutesDictionary;
         }
 
-        private static void ContentService_Published(IContentService sender, PublishEventArgs<IContent> e)
+        private void StoreOldRoute(IContent entity, OldRoutesDictionary oldRoutes)
         {
-            // look note in CacheUpdated
-            // we might want to set a flag on the entities we are seeing here
+            var contentCache = _publishedSnapshotAccessor.PublishedSnapshot.Content;
+            var entityContent = contentCache.GetById(entity.Id);
+            if (entityContent == null) return;            
+
+            // get the default affected cultures by going up the tree until we find the first culture variant entity (default to no cultures) 
+            var defaultCultures = entityContent.AncestorsOrSelf()?.FirstOrDefault(a => a.Cultures.Any())?.Cultures.Keys.ToArray()
+                ?? new[] { (string)null };
+            foreach (var x in entityContent.DescendantsOrSelf())
+            {
+                // if this entity defines specific cultures, use those instead of the default ones
+                var cultures = x.Cultures.Any() ? x.Cultures.Keys : defaultCultures;
+
+                foreach (var culture in cultures)
+                {
+                    var route = contentCache.GetRouteById(x.Id, culture);
+                    if (IsNotRoute(route)) continue;
+                    oldRoutes[new ContentIdAndCulture(x.Id, culture)] = new ContentKeyAndOldRoute(x.Key, route);
+                }
+            }
         }
 
-        private static void ContentService_Moving(IContentService sender, MoveEventArgs<IContent> e)
+        private void CreateRedirects(OldRoutesDictionary oldRoutes)
         {
-            // TODO: Use the new e.EventState to track state between Moving/Moved events!
-            Moving = true;
-        }
+            var contentCache = _publishedSnapshotAccessor.PublishedSnapshot.Content;
 
-        private static void ContentService_Moved(IContentService sender, MoveEventArgs<IContent> e)
-        {
-            Moving = false;
-            LockedEvents = false;
-        }
-
-        private static void CreateRedirect(int contentId, string culture, Guid contentKey, string oldRoute)
-        {
-            var contentCache = Current.UmbracoContext.Content;
-            var newRoute = contentCache.GetRouteById(contentId, culture);
-            if (IsNotRoute(newRoute) || oldRoute == newRoute) return;
-            var redirectUrlService = Current.Services.RedirectUrlService;
-            redirectUrlService.Register(oldRoute, contentKey, culture);
+            foreach (var oldRoute in oldRoutes)
+            {
+                var newRoute = contentCache.GetRouteById(oldRoute.Key.ContentId, oldRoute.Key.Culture);
+                if (IsNotRoute(newRoute) || oldRoute.Value.OldRoute == newRoute) continue;
+                _redirectUrlService.Register(oldRoute.Value.OldRoute, oldRoute.Value.ContentKey, oldRoute.Key.Culture);
+            }
         }
 
         private static bool IsNotRoute(string route)
@@ -243,5 +155,8 @@ namespace Umbraco.Web.Routing
             public Guid ContentKey => Item1;
             public string OldRoute => Item2;
         }
+
+        private class OldRoutesDictionary : Dictionary<ContentIdAndCulture, ContentKeyAndOldRoute>
+        { }
     }
 }

From ca824b01d68bfb062a7209778ca8ccd48014078d Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Sun, 29 Sep 2019 17:02:12 +0200
Subject: [PATCH 767/776] v8: Add confirm overlay when deleting user account
 (#5487)

---
 .../common/overlays/confirm/confirm.html      | 13 ++++++++
 .../src/views/users/user.controller.js        | 31 ++++++++++++++++---
 2 files changed, 39 insertions(+), 5 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/views/common/overlays/confirm/confirm.html

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/confirm/confirm.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/confirm/confirm.html
new file mode 100644
index 0000000000..79dd6bd4f6
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/confirm/confirm.html
@@ -0,0 +1,13 @@
+<div>
+
+    <div ng-if="model.confirmMessage"
+         class="umb-alert mb2"
+         ng-class="{ 'umb-alert--warning': model.confirmMessageStyle === 'warning',
+                     'umb-alert--danger': model.confirmMessageStyle === 'danger',
+                     'umb-alert--info': model.confirmMessageStyle === 'info'}">
+        {{model.confirmMessage}}
+    </div>
+
+    <p>{{model.content}}</p>
+
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
index 4cbd779236..bbce18f017 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
@@ -1,7 +1,7 @@
 (function () {
     "use strict";
 
-    function UserEditController($scope, eventsService, $q, $timeout, $location, $routeParams, formHelper, usersResource, userService, contentEditingHelper, localizationService, notificationsService, mediaHelper, Upload, umbRequestHelper, usersHelper, authResource, dateHelper, editorService) {
+    function UserEditController($scope, eventsService, $q, $location, $routeParams, formHelper, usersResource, userService, contentEditingHelper, localizationService, mediaHelper, Upload, umbRequestHelper, usersHelper, authResource, dateHelper, editorService, overlayService) {
 
         var vm = this;
 
@@ -372,11 +372,32 @@
             vm.deleteNotLoggedInUserButtonState = "busy";
 
             var confirmationMessage = vm.labels.deleteUserConfirmation;
-            if (!confirm(confirmationMessage)) {
-                vm.deleteNotLoggedInUserButtonState = "danger";
-                return;
-            }
 
+            localizationService.localizeMany(["general_delete", "general_cancel", "contentTypeEditor_yesDelete"])
+                .then(function (data) {
+
+                    const overlay = {
+                        view: "confirm",
+                        title: data[0],
+                        content: confirmationMessage,
+                        closeButtonLabel: data[1],
+                        submitButtonLabel: data[2],
+                        submitButtonStyle: "danger",
+                        close: function () {
+                            vm.deleteNotLoggedInUserButtonState = "danger";
+                            overlayService.close();
+                        },
+                        submit: function () {
+                            performDelete();
+                            overlayService.close();
+                        }
+                    };
+                    overlayService.open(overlay);
+
+                });
+        }
+
+        function performDelete() {
             usersResource.deleteNonLoggedInUser(vm.user.id).then(function (data) {
                 formHelper.showNotifications(data);
                 goToPage(vm.breadcrumbs[0]);

From a83b72ed47d9e800e7e50f6c0ffa7753dc9134e7 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Sun, 29 Sep 2019 17:51:17 +0200
Subject: [PATCH 768/776] v8: Add umb file icon component (#6293)

---
 .../components/umbbadge.directive.js          | 27 ++++++-
 .../components/umbfileicon.directive.js       | 51 +++++++++++++
 .../components/umbprogresscircle.directive.js |  4 +-
 src/Umbraco.Web.UI.Client/src/less/belle.less |  2 +-
 .../src/less/components/umb-file-icon.less    | 60 ++++++++++++++++
 .../src/less/components/umb-media-grid.less   | 23 ------
 .../src/less/property-editors.less            | 71 -------------------
 .../src/views/components/umb-file-icon.html   |  7 ++
 .../src/views/components/umb-media-grid.html  | 11 +--
 .../upload/umb-property-file-upload.html      | 24 +++----
 .../mediapicker/mediapicker.html              | 15 ++--
 11 files changed, 169 insertions(+), 126 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/common/directives/components/umbfileicon.directive.js
 create mode 100644 src/Umbraco.Web.UI.Client/src/less/components/umb-file-icon.less
 create mode 100644 src/Umbraco.Web.UI.Client/src/views/components/umb-file-icon.html

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbbadge.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbbadge.directive.js
index ee2c53eba0..b12a1267b8 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbbadge.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbbadge.directive.js
@@ -1,4 +1,29 @@
-(function() {
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbBadge
+@restrict E
+@scope
+
+@description
+Use this directive to render a badge.
+
+<h3>Markup example</h3>
+<pre>
+    <div>
+
+        <umb-badge
+            size="s"
+            color="secondary">
+        </umb-badge>
+
+	</div>
+</pre>
+
+@param {string} size (<code>attribute</code>): The size (xxs, xs, s, m, l, xl).
+@param {string} color (<code>attribute</code>): The color of the highlight (primary, secondary, success, warning, danger, gray).
+**/
+
+(function () {
     'use strict';
 
     function BadgeDirective() {
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbfileicon.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbfileicon.directive.js
new file mode 100644
index 0000000000..b9c88d1600
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbfileicon.directive.js
@@ -0,0 +1,51 @@
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbFileIcon
+@restrict E
+@scope
+
+@description
+Use this directive to render a file icon.
+
+<h3>Markup example</h3>
+<pre>
+    <div>
+
+        <umb-file-icon
+            extension="pdf"
+            size="s">
+        </umb-file-icon>
+
+	</div>
+</pre>
+
+@param {string} size (<code>attribute</code>): This parameter defines the size of the file icon (s, m).
+**/
+
+(function () {
+    'use strict';
+
+    function umbFileIconController() {
+
+        var vm = this;
+
+        if (!vm.icon) {
+            vm.icon = 'icon-document';
+        }
+    }
+
+    var component = {
+        templateUrl: 'views/components/umb-file-icon.html',
+        bindings: {
+            extension: "@?",
+            icon: "@?",
+            size: "@?",
+            text: "@?"
+        },
+        controllerAs: 'vm',
+        controller: umbFileIconController
+    };
+
+    angular.module('umbraco.directives').component('umbFileIcon', component);
+
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbprogresscircle.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbprogresscircle.directive.js
index ad79cb2e3b..871ae771d5 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbprogresscircle.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbprogresscircle.directive.js
@@ -22,7 +22,7 @@ Use this directive to render a circular progressbar.
 
 @param {string} size (<code>attribute</code>): This parameter defines the width and the height of the circle in pixels.
 @param {string} percentage (<code>attribute</code>): Takes a number between 0 and 100 and applies it to the circle's highlight length.
-@param {string} color (<code>attribute</code>): the color of the highlight (primary, secondary, success, warning, danger). Success by default. 
+@param {string} color (<code>attribute</code>): The color of the highlight (primary, secondary, success, warning, danger). Success by default. 
 **/
 
 (function (){
@@ -85,4 +85,4 @@ Use this directive to render a circular progressbar.
 
     angular.module('umbraco.directives').directive('umbProgressCircle', ProgressCircleDirective);
 
-})();
\ No newline at end of file
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/less/belle.less b/src/Umbraco.Web.UI.Client/src/less/belle.less
index b0b7e80762..83d254c73c 100644
--- a/src/Umbraco.Web.UI.Client/src/less/belle.less
+++ b/src/Umbraco.Web.UI.Client/src/less/belle.less
@@ -102,7 +102,6 @@
 @import "components/tree/umb-actions.less";
 @import "components/tree/umb-tree-item.less";
 
-
 @import "components/editor.less";
 @import "components/overlays.less";
 @import "components/card.less";
@@ -140,6 +139,7 @@
 @import "components/umb-property-editor.less";
 @import "components/umb-color-swatches.less";
 @import "components/check-circle.less";
+@import "components/umb-file-icon.less";
 @import "components/umb-iconpicker.less";
 @import "components/umb-insert-code-box.less";
 @import "components/umb-packages.less";
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-file-icon.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-file-icon.less
new file mode 100644
index 0000000000..febee80a97
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-file-icon.less
@@ -0,0 +1,60 @@
+.umb-file-icon {
+    text-align: center;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+
+    .file-icon {
+        display: flex;
+        flex-direction: column;
+        align-items: flex-start;
+        position: relative;
+
+        > .icon {
+            font-size: 50px;
+            line-height: 100%;
+            color: @gray-4;
+            display: block;
+            text-align: center;
+        }
+
+        > span {
+            position: absolute;
+            color: @white;
+            background: @ui-active;
+            padding: 1px 3px;
+            font-size: 10px;
+            line-height: 130%;
+            display: block;
+            margin-bottom: 0.75rem;
+            min-width: 1.2rem;
+            bottom: 0;
+        }
+
+        & + small {
+            display: block;
+            margin-top: 0.25rem;
+        }
+    }
+}
+
+.umb-file-icon--s {
+    .file-icon {
+        > .icon {
+
+        }
+    }
+}
+
+.umb-file-icon--m {
+    .file-icon {
+        > .icon {
+            font-size: 70px;
+        }
+        > span {
+            font-size: 14px;
+            margin-bottom: 0.95rem;
+            min-width: 1.5rem;
+        }
+    }
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
index d023a00138..50244c2079 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
@@ -82,33 +82,10 @@
 }
 
 .umb-media-grid__item-file-icon {
-    display: flex;
-    flex-direction: column;
-    align-items: flex-start;
     transform: translate(-50%,-50%);
     position: absolute;
     top: 45%;
     left: 50%;
-
-    .umb-media-grid__item-icon {
-        display: flex;
-        flex-direction: column;
-        align-items: flex-start;
-        color: @gray-4;
-        font-size: 50px !important;
-    }
-
-    > span {
-        color: @white;
-        background: @ui-active;
-        padding: 1px 3px;
-        font-size: 10px;
-        line-height: 130%;
-        display: block;
-        margin-top: -15px;
-        margin-left: 5px;
-        position: relative;
-    }
 }
 
 .umb-media-grid__item:hover {
diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
index 78470be2ca..9916000963 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -401,43 +401,6 @@
     max-height: none !important;
 }
 
-.umb-sortable-thumbnails .umb-icon-holder {
-    text-align: center;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-
-    .file-icon {
-        display: flex;
-        flex-direction: column;
-        align-items: flex-start;
-
-        > .icon {
-            font-size: 50px;
-            line-height: 50px;
-            color: @gray-4;
-            display: block;
-            text-align: center;
-        }
-
-        > span {
-            color: @white;
-            background: @ui-active;
-            padding: 1px 3px;
-            font-size: 10px;
-            line-height: 130%;
-            display: block;
-            margin-top: -25px;
-            min-width: 2em;
-        }
-
-        & + small {
-            display: block;
-            margin-top: 1em;
-        }
-    }
-}
-
 .umb-sortable-thumbnails .umb-sortable-thumbnails__wrapper {
     width: 124px;
     height: 124px;
@@ -803,40 +766,6 @@
   padding-top: 27px;
 }
 
-.umb-fileupload .umb-icon-holder {
-    text-align: center;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-
-    .file-icon {
-        display: flex;
-        flex-direction: column;
-        align-items: flex-start;
-        position: relative;
-        padding: 15px 0;
-
-        > .icon {
-            display: block;
-            font-size: 70px;
-            line-height: 110%;
-            color: @gray-4;
-            text-align: center;
-        }
-
-        > span {
-            color: @white;
-            background: @ui-active;
-            padding: 1px 3px;
-            font-size: 12px;
-            line-height: 130%;
-            display: block;
-            margin-top: -35px;
-            min-width: 2em;
-        }
-    }
-}
-
 .umb-fileupload input {
   font-size: 12px;
   line-height: 1;
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-file-icon.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-file-icon.html
new file mode 100644
index 0000000000..24d17e70de
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-file-icon.html
@@ -0,0 +1,7 @@
+<span class="umb-file-icon umb-file-icon--{{vm.size}}">
+    <span class="file-icon">
+        <i class="icon {{vm.icon}}" aria-hidden="true"></i>
+        <span ng-if="vm.extension">.{{vm.extension}}</span>
+    </span>
+    <small ng-if="vm.text">{{vm.text}}</small>
+</span>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html
index 60f407f06b..0ab15437b9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html
@@ -22,10 +22,13 @@
             <img class="umb-media-grid__item-image-placeholder" ng-if="!item.thumbnail && item.extension !== 'svg'" src="assets/img/transparent.png" alt="{{item.name}}" draggable="false" />
 
             <!-- Icon for files -->
-            <span class="umb-media-grid__item-file-icon" ng-if="!item.thumbnail && item.extension !== 'svg'">
-                <i class="umb-media-grid__item-icon {{item.icon}}"></i>
-                <span ng-if="item.extension">.{{item.extension}}</span>
-            </span>
+            <umb-file-icon ng-if="!item.thumbnail && item.extension !== 'svg'"
+                           class="umb-media-grid__item-file-icon"
+                           extension="{{item.extension}}"
+                           icon="{{item.icon}}"
+                           size="s">
+            </umb-file-icon>
+
         </div>
     </div>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-property-file-upload.html b/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-property-file-upload.html
index 5f728f47e4..14ecedfde3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-property-file-upload.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-property-file-upload.html
@@ -28,22 +28,18 @@
 
                     <div ng-if="!file.isImage && file.extension !== 'svg'">
                         <a class="span6 thumbnail tc" ng-show="!file.isClientSide" ng-href="{{file.fileName}}" target="_blank">
-                            <span class="umb-icon-holder">
-                                <span class="file-icon">
-                                    <i class="icon icon-document"></i>
-                                    <span ng-if="file.extension">.{{file.extension}}</span>
-                                </span>
-                            </span>
-                            <div>{{file.fileName}}</div>
+                            <umb-file-icon
+                                extension="{{file.extension}}"
+                                size="m">
+                            </umb-file-icon>
+                            <div class="mt2">{{file.fileName}}</div>
                         </a>
                         <div class="span6 thumbnail tc" ng-show="file.isClientSide">
-                            <span class="umb-icon-holder">
-                                <span class="file-icon">
-                                    <i class="icon icon-document"></i>
-                                    <span ng-if="file.extension">.{{file.extension}}</span>
-                                </span>
-                            </span>
-                            <div>{{file.fileName}}</div>
+                            <umb-file-icon
+                                extension="{{file.extension}}"
+                                size="m">
+                            </umb-file-icon>
+                            <div class="mt2">{{file.fileName}}</div>
                         </div>
                     </div>
                 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
index d522e92303..29e3a970e2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
@@ -29,16 +29,11 @@
                      alt="{{media.name}}" />
 
                 <!-- FILE -->
-                <div ng-class="{'trashed': media.trashed}"
-                     ng-attr-title="{{media.trashed ? (vm.labels.trashed || 'Trashed') + ': ' + media.name : media.name}}"
-                     ng-hide="media.thumbnail"
-                     class="umb-icon-holder">
-                    <span class="file-icon">
-                        <i class="icon {{media.icon}}"></i>
-                        <span ng-if="media.extension">.{{media.extension}}</span>
-                    </span>
-                    <small>{{media.name}}</small>
-                </div>
+                <umb-file-icon ng-hide="media.thumbnail" ng-class="{'trashed': media.trashed}"
+                               extension="{{media.extension}}"
+                               size="s"
+                               text="{{media.name}}">
+                </umb-file-icon>
 
                 <div class="umb-sortable-thumbnails__actions" data-element="sortable-thumbnail-actions">
                     <a ng-if="allowEditMedia" class="umb-sortable-thumbnails__action" data-element="action-edit" href="" ng-click="vm.editItem(media)">

From f3086cf22eab4b79d6d8e3a8476f354f81d31d76 Mon Sep 17 00:00:00 2001
From: Jan Skovgaard <jaskov@gmail.com>
Date: Mon, 30 Sep 2019 10:55:41 +0200
Subject: [PATCH 769/776] Fix minor issues in umb-app-header (#6457)

---
 .../application/umb-app-header.html           |  22 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/da.xml |   3 +
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml | 789 +++++++++---------
 .../Umbraco/config/lang/en_us.xml             |   3 +
 4 files changed, 416 insertions(+), 401 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-app-header.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-app-header.html
index 93c3a9b50d..c6c4f98e25 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-app-header.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-app-header.html
@@ -2,7 +2,6 @@
 <div>
 
     <div class="umb-app-header">
-
         <umb-sections
             ng-if="authenticated"
             sections="sections">
@@ -11,19 +10,26 @@
         <div class="flex items-center">
             <ul class="umb-app-header__actions">
                 <li data-element="global-search" class="umb-app-header__action">
-                    <button class="umb-app-header__button btn-reset" hotkey="ctrl+space" ng-click="searchClick()" ng-mousedown="rememberFocus()" prevent-default style="font-size: 20px;">
-                        <span class="sr-only">Open/Close backoffice search</span>
-                        <i class="umb-app-header__action-icon icon-search"></i>
+                    <button type="button" class="umb-app-header__button btn-reset" hotkey="ctrl+space" ng-click="searchClick()" ng-mousedown="rememberFocus()">
+                        <span class="sr-only">
+                            <localize key="visuallyHiddenTexts_openBackofficeSearch">Open backoffice search</localize>...
+                        </span>
+                        <i class="umb-app-header__action-icon icon-search" aria-hidden="true"></i>
                     </button>
                 </li>
                 <li data-element="global-help" class="umb-app-header__action">
-                    <button class="umb-app-header__button btn-reset" hotkey="ctrl+shift+h" ng-click="helpClick()" prevent-default>
-                        <span class="sr-only">Open/Close backoffice help window</span>
-                        <i class="umb-app-header__action-icon icon-help-alt"></i>
+                    <button type="button" class="umb-app-header__button btn-reset" hotkey="ctrl+shift+h" ng-click="helpClick()">
+                        <span class="sr-only">
+                            <localize key="visuallyHiddenTexts_openCloseBackofficeHelp">Open/Close backoffice help</localize>...
+                        </span>
+                        <i class="umb-app-header__action-icon icon-help-alt" aria-hidden="true"></i>
                     </button>
                 </li>
                 <li data-element="global-user" class="umb-app-header__action">
-                   <button class="umb-app-header__button btn-reset" ng-click="avatarClick()" hotkey="ctrl+shift+u" title="{{user.name}}" aria-label="Open/Close your profile options window" prevent-default>
+                   <button type="button" class="umb-app-header__button btn-reset" ng-click="avatarClick()" hotkey="ctrl+shift+u" title="{{user.name}}">
+                        <span class="sr-only">
+                            <localize key="visuallyHiddenTexts_openCloseBackofficeProfileOptions">Open/Close your profile options</localize>...
+                        </span>
                         <umb-avatar
                             class="umb-app-header__action-icon"
                             size="xxs"
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index 59653529a1..e1d7fd45d5 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -1630,5 +1630,8 @@ Mange hilsner fra Umbraco robotten
     <key alias="suggestion">forslag</key>
     <key alias="checkPassed">Test bestået</key>
     <key alias="checkFailed">Test fejlet</key>
+    <key alias="openBackofficeSearch">Åben backoffice søgning</key>
+    <key alias="openCloseBackofficeHelp">Åben/Luk backoffice hjælp</key>
+    <key alias="openCloseBackofficeProfileOptions">Åben/Luk dine profil indstillinger</key>
   </area>
 </language>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 80b73cea26..922f248326 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -98,12 +98,12 @@
     <key alias="domainUpdated">Domain '%0%' has been updated</key>
     <key alias="orEdit">Edit Current Domains</key>
     <key alias="domainHelpWithVariants">
-    	<![CDATA[Valid domain names are: "example.com", "www.example.com", "example.com:8080", or "https://www.example.com/".
+    	<![CDATA[Valid domain names are: "example.com", "www.example.com", "example.com:8080", or "https://www.example.com/".
      Furthermore also one-level paths in domains are supported, eg. "example.com/en" or "/en".]]></key>
     <key alias="inherit">Inherit</key>
     <key alias="setLanguage">Culture</key>
         <key alias="setLanguageHelp">
-            <![CDATA[Set the culture for nodes below the current node,<br /> or inherit culture from parent nodes. Will also apply<br />
+            <![CDATA[Set the culture for nodes below the current node,<br /> or inherit culture from parent nodes. Will also apply<br />
       to the current node, unless a domain below applies too.]]>
         </key>
     <key alias="setDomains">Domains</key>
@@ -338,7 +338,7 @@
     <key alias="noDocumentTypesEditPermissions">Edit permissions for this document type</key>
     <key alias="noMediaTypes" version="7.0"><![CDATA[There are no allowed media types available for creating media here. You must enable these in <strong>Media Types Types</strong> within the <strong>Settings</strong> section, by editing the <strong>Allowed child node types</strong> under <strong>Permissions</strong>.]]></key>
     <key alias="noMediaTypesWithNoSettingsAccess">The selected media in the tree doesn't allow for any other media to be created below it.</key>
-    <key alias="noMediaTypesEditPermissions">Edit permissions for this media type</key>
+    <key alias="noMediaTypesEditPermissions">Edit permissions for this media type</key>
     <key alias="documentTypeWithoutTemplate">Document Type without a template</key>
     <key alias="newFolder">New folder</key>
     <key alias="newDataType">New data type</key>
@@ -482,12 +482,12 @@
     <key alias="noItems">There are no dictionary items.</key>
   </area>
   <area alias="dictionaryItem">
-    <key alias="description"><![CDATA[
-      Edit the different language versions for the dictionary item '<em>%0%</em>' below
+    <key alias="description"><![CDATA[
+      Edit the different language versions for the dictionary item '<em>%0%</em>' below
    ]]></key>
     <key alias="displayName">Culture Name</key>
-    <key alias="changeKeyError"><![CDATA[
-      The key '%0%' already exists.
+    <key alias="changeKeyError"><![CDATA[
+      The key '%0%' already exists.
    ]]></key>
     <key alias="overviewTitle">Dictionary overview</key>
   </area>
@@ -503,10 +503,10 @@
     <key alias="manageIndexes">Manage Examine's indexes</key>
     <key alias="manageIndexesDescription">Allows you to view the details of each index and provides some tools for managing the indexes</key>
     <key alias="rebuildIndex">Rebuild index</key>
-    <key alias="rebuildIndexWarning"><![CDATA[
-      This will cause the index to be rebuilt.<br />
-      Depending on how much content there is in your site this could take a while.<br />
-      It is not recommended to rebuild an index during times of high website traffic or when editors are editing content.
+    <key alias="rebuildIndexWarning"><![CDATA[
+      This will cause the index to be rebuilt.<br />
+      Depending on how much content there is in your site this could take a while.<br />
+      It is not recommended to rebuild an index during times of high website traffic or when editors are editing content.
      ]]>
     </key>
     <key alias="searchers">Searchers</key>
@@ -784,28 +784,28 @@
     <key alias="databaseFound">Your database has been found and is identified as</key>
     <key alias="databaseHeader">Database configuration</key>
         <key alias="databaseInstall">
-            <![CDATA[
-      Press the <strong>install</strong> button to install the Umbraco %0% database
+            <![CDATA[
+      Press the <strong>install</strong> button to install the Umbraco %0% database
     ]]>
         </key>
     <key alias="databaseInstallDone"><![CDATA[Umbraco %0% has now been copied to your database. Press <strong>Next</strong> to proceed.]]></key>
-    <key alias="databaseNotFound"><![CDATA[<p>Database not found! Please check that the information in the "connection string" of the "web.config" file is correct.</p>
-              <p>To proceed, please edit the "web.config" file (using Visual Studio or your favourite text editor), scroll to the bottom, add the connection string for your database in the key named "UmbracoDbDSN" and save the file. </p>
-              <p>
-              Click the <strong>retry</strong> button when
-              done.<br /><a href="https://our.umbraco.com/documentation/Using-Umbraco/Config-files/webconfig7" target="_blank">
+    <key alias="databaseNotFound"><![CDATA[<p>Database not found! Please check that the information in the "connection string" of the "web.config" file is correct.</p>
+              <p>To proceed, please edit the "web.config" file (using Visual Studio or your favourite text editor), scroll to the bottom, add the connection string for your database in the key named "UmbracoDbDSN" and save the file. </p>
+              <p>
+              Click the <strong>retry</strong> button when
+              done.<br /><a href="https://our.umbraco.com/documentation/Using-Umbraco/Config-files/webconfig7" target="_blank">
 			              More information on editing web.config here.</a></p>]]></key>
-    <key alias="databaseText"><![CDATA[To complete this step, you must know some information regarding your database server ("connection string").<br />
-        Please contact your ISP if necessary.
+    <key alias="databaseText"><![CDATA[To complete this step, you must know some information regarding your database server ("connection string").<br />
+        Please contact your ISP if necessary.
         If you're installing on a local machine or server you might need information from your system administrator.]]></key>
-    <key alias="databaseUpgrade"><![CDATA[
-      <p>
-      Press the <strong>upgrade</strong> button to upgrade your database to Umbraco %0%</p>
-      <p>
-      Don't worry - no content will be deleted and everything will continue working afterwards!
-      </p>
+    <key alias="databaseUpgrade"><![CDATA[
+      <p>
+      Press the <strong>upgrade</strong> button to upgrade your database to Umbraco %0%</p>
+      <p>
+      Don't worry - no content will be deleted and everything will continue working afterwards!
+      </p>
       ]]></key>
-    <key alias="databaseUpgradeDone"><![CDATA[Your database has been upgraded to the final version %0%.<br />Press <strong>Next</strong> to
+    <key alias="databaseUpgradeDone"><![CDATA[Your database has been upgraded to the final version %0%.<br />Press <strong>Next</strong> to
       proceed. ]]></key>
     <key alias="databaseUpToDate"><![CDATA[Your current database is up-to-date!. Click <strong>next</strong> to continue the configuration wizard]]></key>
     <key alias="defaultUserChangePass"><![CDATA[<strong>The Default users' password needs to be changed!</strong>]]></key>
@@ -818,51 +818,51 @@
     <key alias="permissionsAffectedFolders">Affected files and folders</key>
     <key alias="permissionsAffectedFoldersMoreInfo">More information on setting up permissions for Umbraco here</key>
     <key alias="permissionsAffectedFoldersText">You need to grant ASP.NET modify permissions to the following files/folders</key>
-    <key alias="permissionsAlmostPerfect"><![CDATA[<strong>Your permission settings are almost perfect!</strong><br /><br />
+    <key alias="permissionsAlmostPerfect"><![CDATA[<strong>Your permission settings are almost perfect!</strong><br /><br />
         You can run Umbraco without problems, but you will not be able to install packages which are recommended to take full advantage of Umbraco.]]></key>
     <key alias="permissionsHowtoResolve">How to Resolve</key>
     <key alias="permissionsHowtoResolveLink">Click here to read the text version</key>
     <key alias="permissionsHowtoResolveText"><![CDATA[Watch our <strong>video tutorial</strong> on setting up folder permissions for Umbraco or read the text version.]]></key>
-    <key alias="permissionsMaybeAnIssue"><![CDATA[<strong>Your permission settings might be an issue!</strong>
-      <br/><br />
+    <key alias="permissionsMaybeAnIssue"><![CDATA[<strong>Your permission settings might be an issue!</strong>
+      <br/><br />
       You can run Umbraco without problems, but you will not be able to create folders or install packages which are recommended to take full advantage of Umbraco.]]></key>
-    <key alias="permissionsNotReady"><![CDATA[<strong>Your permission settings are not ready for Umbraco!</strong>
-          <br /><br />
+    <key alias="permissionsNotReady"><![CDATA[<strong>Your permission settings are not ready for Umbraco!</strong>
+          <br /><br />
           In order to run Umbraco, you'll need to update your permission settings.]]></key>
-    <key alias="permissionsPerfect"><![CDATA[<strong>Your permission settings are perfect!</strong><br /><br />
+    <key alias="permissionsPerfect"><![CDATA[<strong>Your permission settings are perfect!</strong><br /><br />
               You are ready to run Umbraco and install packages!]]></key>
     <key alias="permissionsResolveFolderIssues">Resolving folder issue</key>
     <key alias="permissionsResolveFolderIssuesLink">Follow this link for more information on problems with ASP.NET and creating folders</key>
     <key alias="permissionsSettingUpPermissions">Setting up folder permissions</key>
-    <key alias="permissionsText"><![CDATA[
-      Umbraco needs write/modify access to certain directories in order to store files like pictures and PDF's.
-      It also stores temporary data (aka: cache) for enhancing the performance of your website.
+    <key alias="permissionsText"><![CDATA[
+      Umbraco needs write/modify access to certain directories in order to store files like pictures and PDF's.
+      It also stores temporary data (aka: cache) for enhancing the performance of your website.
     ]]></key>
     <key alias="runwayFromScratch">I want to start from scratch</key>
-    <key alias="runwayFromScratchText"><![CDATA[
-        Your website is completely empty at the moment, so that's perfect if you want to start from scratch and create your own document types and templates.
-        (<a href="http://Umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">learn how</a>)
-        You can still choose to install Runway later on. Please go to the Developer section and choose Packages.
+    <key alias="runwayFromScratchText"><![CDATA[
+        Your website is completely empty at the moment, so that's perfect if you want to start from scratch and create your own document types and templates.
+        (<a href="http://Umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">learn how</a>)
+        You can still choose to install Runway later on. Please go to the Developer section and choose Packages.
       ]]></key>
     <key alias="runwayHeader">You've just set up a clean Umbraco platform. What do you want to do next?</key>
     <key alias="runwayInstalled">Runway is installed</key>
-    <key alias="runwayInstalledText"><![CDATA[
-      You have the foundation in place. Select what modules you wish to install on top of it.<br />
-      This is our list of recommended modules, check off the ones you would like to install, or view the <a href="#" onclick="toggleModules(); return false;" id="toggleModuleList">full list of modules</a>
+    <key alias="runwayInstalledText"><![CDATA[
+      You have the foundation in place. Select what modules you wish to install on top of it.<br />
+      This is our list of recommended modules, check off the ones you would like to install, or view the <a href="#" onclick="toggleModules(); return false;" id="toggleModuleList">full list of modules</a>
       ]]></key>
     <key alias="runwayOnlyProUsers">Only recommended for experienced users</key>
     <key alias="runwaySimpleSite">I want to start with a simple website</key>
-    <key alias="runwaySimpleSiteText"><![CDATA[
-      <p>
-      "Runway" is a simple website providing some basic document types and templates. The installer can set up Runway for you automatically,
-        but you can easily edit, extend or remove it. It's not necessary and you can perfectly use Umbraco without it. However,
-        Runway offers an easy foundation based on best practices to get you started faster than ever.
-        If you choose to install Runway, you can optionally select basic building blocks called Runway Modules to enhance your Runway pages.
-        </p>
-        <small>
-        <em>Included with Runway:</em> Home page, Getting Started page, Installing Modules page.<br />
-        <em>Optional Modules:</em> Top Navigation, Sitemap, Contact, Gallery.
-        </small>
+    <key alias="runwaySimpleSiteText"><![CDATA[
+      <p>
+      "Runway" is a simple website providing some basic document types and templates. The installer can set up Runway for you automatically,
+        but you can easily edit, extend or remove it. It's not necessary and you can perfectly use Umbraco without it. However,
+        Runway offers an easy foundation based on best practices to get you started faster than ever.
+        If you choose to install Runway, you can optionally select basic building blocks called Runway Modules to enhance your Runway pages.
+        </p>
+        <small>
+        <em>Included with Runway:</em> Home page, Getting Started page, Installing Modules page.<br />
+        <em>Optional Modules:</em> Top Navigation, Sitemap, Contact, Gallery.
+        </small>
       ]]></key>
     <key alias="runwayWhatIsRunway">What is Runway</key>
     <key alias="step1">Step 1/5 Accept license</key>
@@ -871,23 +871,23 @@
     <key alias="step4">Step 4/5: Check Umbraco security</key>
     <key alias="step5">Step 5/5: Umbraco is ready to get you started</key>
     <key alias="thankYou">Thank you for choosing Umbraco</key>
-    <key alias="theEndBrowseSite"><![CDATA[<h3>Browse your new site</h3>
+    <key alias="theEndBrowseSite"><![CDATA[<h3>Browse your new site</h3>
 You installed Runway, so why not see how your new website looks.]]></key>
-    <key alias="theEndFurtherHelp"><![CDATA[<h3>Further help and information</h3>
+    <key alias="theEndFurtherHelp"><![CDATA[<h3>Further help and information</h3>
 Get help from our award winning community, browse the documentation or watch some free videos on how to build a simple site, how to use packages and a quick guide to the Umbraco terminology]]></key>
     <key alias="theEndHeader">Umbraco %0% is installed and ready for use</key>
-    <key alias="theEndInstallFailed"><![CDATA[To finish the installation, you'll need to
+    <key alias="theEndInstallFailed"><![CDATA[To finish the installation, you'll need to
         manually edit the <strong>/web.config file</strong> and update the AppSetting key <strong>UmbracoConfigurationStatus</strong> in the bottom to the value of <strong>'%0%'</strong>.]]></key>
-    <key alias="theEndInstallSuccess"><![CDATA[You can get <strong>started instantly</strong> by clicking the "Launch Umbraco" button below. <br />If you are <strong>new to Umbraco</strong>,
+    <key alias="theEndInstallSuccess"><![CDATA[You can get <strong>started instantly</strong> by clicking the "Launch Umbraco" button below. <br />If you are <strong>new to Umbraco</strong>,
 you can find plenty of resources on our getting started pages.]]></key>
-    <key alias="theEndOpenUmbraco"><![CDATA[<h3>Launch Umbraco</h3>
+    <key alias="theEndOpenUmbraco"><![CDATA[<h3>Launch Umbraco</h3>
 To manage your website, simply open the Umbraco back office and start adding content, updating the templates and stylesheets or add new functionality]]></key>
     <key alias="Unavailable">Connection to database failed.</key>
     <key alias="Version3">Umbraco Version 3</key>
     <key alias="Version4">Umbraco Version 4</key>
     <key alias="watch">Watch</key>
-    <key alias="welcomeIntro"><![CDATA[This wizard will guide you through the process of configuring <strong>Umbraco %0%</strong> for a fresh install or upgrading from version 3.0.
-                                <br /><br />
+    <key alias="welcomeIntro"><![CDATA[This wizard will guide you through the process of configuring <strong>Umbraco %0%</strong> for a fresh install or upgrading from version 3.0.
+                                <br /><br />
                                 Press <strong>"next"</strong> to start the wizard.]]></key>
   </area>
   <area alias="language">
@@ -920,86 +920,86 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="setPasswordConfirmation">Your Password has been updated</key>
     <key alias="resetCodeExpired">The link you have clicked on is invalid or has expired</key>
     <key alias="resetPasswordEmailCopySubject">Umbraco: Reset Password</key>
-    <key alias="resetPasswordEmailCopyFormat"><![CDATA[
-        <html>
-			<head>
-				<meta name='viewport' content='width=device-width'>
-				<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
-			</head>
-			<body class='' style='font-family: sans-serif; -webkit-font-smoothing: antialiased; font-size: 14px; color: #392F54; line-height: 22px; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; background: #1d1333; margin: 0; padding: 0;' bgcolor='#1d1333'>
-				<style type='text/css'> @media only screen and (max-width: 620px) {table[class=body] h1 {font-size: 28px !important; margin-bottom: 10px !important; } table[class=body] .wrapper {padding: 32px !important; } table[class=body] .article {padding: 32px !important; } table[class=body] .content {padding: 24px !important; } table[class=body] .container {padding: 0 !important; width: 100% !important; } table[class=body] .main {border-left-width: 0 !important; border-radius: 0 !important; border-right-width: 0 !important; } table[class=body] .btn table {width: 100% !important; } table[class=body] .btn a {width: 100% !important; } table[class=body] .img-responsive {height: auto !important; max-width: 100% !important; width: auto !important; } } .btn-primary table td:hover {background-color: #34495e !important; } .btn-primary a:hover {background-color: #34495e !important; border-color: #34495e !important; } .btn  a:visited {color:#FFFFFF;} </style>
-				<table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;" bgcolor="#1d1333">
-					<tr>
-						<td style="font-family: sans-serif; font-size: 14px; vertical-align: top; padding: 24px;" valign="top">
-							<table style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
-								<tr>
-									<td background="https://umbraco.com/umbraco/assets/img/application/logo.png" bgcolor="#1d1333" width="28" height="28" valign="top" style="font-family: sans-serif; font-size: 14px; vertical-align: top;">
-										<!--[if gte mso 9]> <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="width:30px;height:30px;"> <v:fill type="tile" src="https://umbraco.com/umbraco/assets/img/application/logo.png" color="#1d1333" /> <v:textbox inset="0,0,0,0"> <![endif]-->
-										<div> </div>
-										<!--[if gte mso 9]> </v:textbox> </v:rect> <![endif]-->
-									</td>
-									<td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top"></td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-				</table>
-				<table border='0' cellpadding='0' cellspacing='0' class='body' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;' bgcolor='#1d1333'>
-					<tr>
-						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
-						<td class='container' style='font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; max-width: 560px; width: 560px; margin: 0 auto; padding: 10px;' valign='top'>
-							<div class='content' style='box-sizing: border-box; display: block; max-width: 560px; margin: 0 auto; padding: 10px;'>
-								<br>
-								<table class='main' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; border-radius: 3px; background: #FFFFFF;' bgcolor='#FFFFFF'>
-									<tr>
-										<td class='wrapper' style='font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 50px;' valign='top'>
-											<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;'>
-												<tr>
-													<td style='line-height: 24px; font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'>
-														<h1 style='color: #392F54; font-family: sans-serif; font-weight: bold; line-height: 1.4; font-size: 24px; text-align: left; text-transform: capitalize; margin: 0 0 30px;' align='left'>
-															Password reset requested
-														</h1>
-														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
-															Your username to login to the Umbraco back-office is: <strong>%0%</strong>
-														</p>
-														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
-															<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'>
-																<tbody>
-																	<tr>
-																		<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
-																			<a href='%1%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
-																				Click this link to reset your password
-																			</a>
-																		</td>
-																	</tr>
-																</tbody>
-															</table>
-														</p>
-														<p style='max-width: 400px; display: block; color: #392F54; font-family: sans-serif; font-size: 14px; line-height: 20px; font-weight: normal; margin: 15px 0;'>If you cannot click on the link, copy and paste this URL into your browser window:</p>
-															<table border='0' cellpadding='0' cellspacing='0'>
-																<tr>
-																	<td style='-ms-word-break: break-all; word-break: break-all; font-family: sans-serif; font-size: 11px; line-height:14px;'>
-																		<font style="-ms-word-break: break-all; word-break: break-all; font-size: 11px; line-height:14px;">
-																			<a style='-ms-word-break: break-all; word-break: break-all; color: #392F54; text-decoration: underline; font-size: 11px; line-height:15px;' href='%1%'>%1%</a>
-																		</font>
-																	</td>
-																</tr>
-															</table>
-														</p>
-													</td>
-												</tr>
-											</table>
-										</td>
-									</tr>
-								</table>
-								<br><br><br>
-							</div>
-						</td>
-						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
-					</tr>
-				</table>
-			</body>
-		</html>
+    <key alias="resetPasswordEmailCopyFormat"><![CDATA[
+        <html>
+			<head>
+				<meta name='viewport' content='width=device-width'>
+				<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
+			</head>
+			<body class='' style='font-family: sans-serif; -webkit-font-smoothing: antialiased; font-size: 14px; color: #392F54; line-height: 22px; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; background: #1d1333; margin: 0; padding: 0;' bgcolor='#1d1333'>
+				<style type='text/css'> @media only screen and (max-width: 620px) {table[class=body] h1 {font-size: 28px !important; margin-bottom: 10px !important; } table[class=body] .wrapper {padding: 32px !important; } table[class=body] .article {padding: 32px !important; } table[class=body] .content {padding: 24px !important; } table[class=body] .container {padding: 0 !important; width: 100% !important; } table[class=body] .main {border-left-width: 0 !important; border-radius: 0 !important; border-right-width: 0 !important; } table[class=body] .btn table {width: 100% !important; } table[class=body] .btn a {width: 100% !important; } table[class=body] .img-responsive {height: auto !important; max-width: 100% !important; width: auto !important; } } .btn-primary table td:hover {background-color: #34495e !important; } .btn-primary a:hover {background-color: #34495e !important; border-color: #34495e !important; } .btn  a:visited {color:#FFFFFF;} </style>
+				<table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;" bgcolor="#1d1333">
+					<tr>
+						<td style="font-family: sans-serif; font-size: 14px; vertical-align: top; padding: 24px;" valign="top">
+							<table style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
+								<tr>
+									<td background="https://umbraco.com/umbraco/assets/img/application/logo.png" bgcolor="#1d1333" width="28" height="28" valign="top" style="font-family: sans-serif; font-size: 14px; vertical-align: top;">
+										<!--[if gte mso 9]> <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="width:30px;height:30px;"> <v:fill type="tile" src="https://umbraco.com/umbraco/assets/img/application/logo.png" color="#1d1333" /> <v:textbox inset="0,0,0,0"> <![endif]-->
+										<div> </div>
+										<!--[if gte mso 9]> </v:textbox> </v:rect> <![endif]-->
+									</td>
+									<td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top"></td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+				</table>
+				<table border='0' cellpadding='0' cellspacing='0' class='body' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;' bgcolor='#1d1333'>
+					<tr>
+						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
+						<td class='container' style='font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; max-width: 560px; width: 560px; margin: 0 auto; padding: 10px;' valign='top'>
+							<div class='content' style='box-sizing: border-box; display: block; max-width: 560px; margin: 0 auto; padding: 10px;'>
+								<br>
+								<table class='main' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; border-radius: 3px; background: #FFFFFF;' bgcolor='#FFFFFF'>
+									<tr>
+										<td class='wrapper' style='font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 50px;' valign='top'>
+											<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;'>
+												<tr>
+													<td style='line-height: 24px; font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'>
+														<h1 style='color: #392F54; font-family: sans-serif; font-weight: bold; line-height: 1.4; font-size: 24px; text-align: left; text-transform: capitalize; margin: 0 0 30px;' align='left'>
+															Password reset requested
+														</h1>
+														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+															Your username to login to the Umbraco back-office is: <strong>%0%</strong>
+														</p>
+														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+															<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'>
+																<tbody>
+																	<tr>
+																		<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
+																			<a href='%1%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
+																				Click this link to reset your password
+																			</a>
+																		</td>
+																	</tr>
+																</tbody>
+															</table>
+														</p>
+														<p style='max-width: 400px; display: block; color: #392F54; font-family: sans-serif; font-size: 14px; line-height: 20px; font-weight: normal; margin: 15px 0;'>If you cannot click on the link, copy and paste this URL into your browser window:</p>
+															<table border='0' cellpadding='0' cellspacing='0'>
+																<tr>
+																	<td style='-ms-word-break: break-all; word-break: break-all; font-family: sans-serif; font-size: 11px; line-height:14px;'>
+																		<font style="-ms-word-break: break-all; word-break: break-all; font-size: 11px; line-height:14px;">
+																			<a style='-ms-word-break: break-all; word-break: break-all; color: #392F54; text-decoration: underline; font-size: 11px; line-height:15px;' href='%1%'>%1%</a>
+																		</font>
+																	</td>
+																</tr>
+															</table>
+														</p>
+													</td>
+												</tr>
+											</table>
+										</td>
+									</tr>
+								</table>
+								<br><br><br>
+							</div>
+						</td>
+						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
+					</tr>
+				</table>
+			</body>
+		</html>
 	]]></key>
   </area>
   <area alias="main">
@@ -1024,100 +1024,100 @@ To manage your website, simply open the Umbraco back office and start adding con
   <area alias="notifications">
     <key alias="editNotifications"><![CDATA[Select your notification for <strong>%0%</strong>]]></key>
     <key alias="notificationsSavedFor">Notification settings saved for</key>
-    <key alias="mailBody"><![CDATA[
-      Hi %0%
-
-      This is an automated mail to inform you that the task '%1%'
-      has been performed on the page '%2%'
-      by the user '%3%'
-
-      Go to http://%4%/#/content/content/edit/%5% to edit.
-
-      %6%
-
-      Have a nice day!
-
-      Cheers from the Umbraco robot
+    <key alias="mailBody"><![CDATA[
+      Hi %0%
+
+      This is an automated mail to inform you that the task '%1%'
+      has been performed on the page '%2%'
+      by the user '%3%'
+
+      Go to http://%4%/#/content/content/edit/%5% to edit.
+
+      %6%
+
+      Have a nice day!
+
+      Cheers from the Umbraco robot
     ]]></key>
     <key alias="mailBodyVariantSummary">The following languages have been modified %0%</key>
-    <key alias="mailBodyHtml"><![CDATA[
-        <html>
-			<head>
-				<meta name='viewport' content='width=device-width'>
-				<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
-			</head>
-			<body class='' style='font-family: sans-serif; -webkit-font-smoothing: antialiased; font-size: 14px; color: #392F54; line-height: 22px; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; background: #1d1333; margin: 0; padding: 0;' bgcolor='#1d1333'>
-				<style type='text/css'> @media only screen and (max-width: 620px) {table[class=body] h1 {font-size: 28px !important; margin-bottom: 10px !important; } table[class=body] .wrapper {padding: 32px !important; } table[class=body] .article {padding: 32px !important; } table[class=body] .content {padding: 24px !important; } table[class=body] .container {padding: 0 !important; width: 100% !important; } table[class=body] .main {border-left-width: 0 !important; border-radius: 0 !important; border-right-width: 0 !important; } table[class=body] .btn table {width: 100% !important; } table[class=body] .btn a {width: 100% !important; } table[class=body] .img-responsive {height: auto !important; max-width: 100% !important; width: auto !important; } } .btn-primary table td:hover {background-color: #34495e !important; } .btn-primary a:hover {background-color: #34495e !important; border-color: #34495e !important; } .btn  a:visited {color:#FFFFFF;} </style>
-				<table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;" bgcolor="#1d1333">
-					<tr>
-						<td style="font-family: sans-serif; font-size: 14px; vertical-align: top; padding: 24px;" valign="top">
-							<table style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
-								<tr>
-									<td background="https://umbraco.com/umbraco/assets/img/application/logo.png" bgcolor="#1d1333" width="28" height="28" valign="top" style="font-family: sans-serif; font-size: 14px; vertical-align: top;">
-										<!--[if gte mso 9]> <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="width:30px;height:30px;"> <v:fill type="tile" src="https://umbraco.com/umbraco/assets/img/application/logo.png" color="#1d1333" /> <v:textbox inset="0,0,0,0"> <![endif]-->
-										<div> </div>
-										<!--[if gte mso 9]> </v:textbox> </v:rect> <![endif]-->
-									</td>
-									<td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top"></td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-				</table>
-				<table border='0' cellpadding='0' cellspacing='0' class='body' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;' bgcolor='#1d1333'>
-					<tr>
-						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
-						<td class='container' style='font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; max-width: 560px; width: 560px; margin: 0 auto; padding: 10px;' valign='top'>
-							<div class='content' style='box-sizing: border-box; display: block; max-width: 560px; margin: 0 auto; padding: 10px;'>
-								<br>
-								<table class='main' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; border-radius: 3px; background: #FFFFFF;' bgcolor='#FFFFFF'>
-									<tr>
-										<td class='wrapper' style='font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 50px;' valign='top'>
-											<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;'>
-												<tr>
-													<td style='line-height: 24px; font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'>
-														<h1 style='color: #392F54; font-family: sans-serif; font-weight: bold; line-height: 1.4; font-size: 24px; text-align: left; text-transform: capitalize; margin: 0 0 30px;' align='left'>
-															Hi %0%,
-														</h1>
-														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
-															This is an automated mail to inform you that the task <strong>'%1%'</strong> has been performed on the page <a style="color: #392F54; text-decoration: none; -ms-word-break: break-all; word-break: break-all;" href="http://%4%/#/content/content/edit/%5%"><strong>'%2%'</strong></a> by the user <strong>'%3%'</strong>
-														</p>
-														<table border='0' cellpadding='0' cellspacing='0' class='btn btn-primary' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;'>
-															<tbody>
-																<tr>
-																	<td align='left' style='font-family: sans-serif; font-size: 14px; vertical-align: top; padding-bottom: 15px;' valign='top'>
-																		<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'><tbody><tr>
-																			<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
-																				<a href='http://%4%/#/content/content/edit/%5%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>EDIT</a> </td> </tr></tbody></table>
-																	</td>
-																</tr>
-															</tbody>
-														</table>
-														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
-															<h3>Update summary:</h3>
-															%6%
-														</p>
-														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
-															Have a nice day!<br /><br />
-															Cheers from the Umbraco robot
-														</p>
-													</td>
-												</tr>
-											</table>
-										</td>
-									</tr>
-								</table>
-								<br><br><br>
-							</div>
-						</td>
-						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
-					</tr>
-				</table>
-			</body>
-		</html>
+    <key alias="mailBodyHtml"><![CDATA[
+        <html>
+			<head>
+				<meta name='viewport' content='width=device-width'>
+				<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
+			</head>
+			<body class='' style='font-family: sans-serif; -webkit-font-smoothing: antialiased; font-size: 14px; color: #392F54; line-height: 22px; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; background: #1d1333; margin: 0; padding: 0;' bgcolor='#1d1333'>
+				<style type='text/css'> @media only screen and (max-width: 620px) {table[class=body] h1 {font-size: 28px !important; margin-bottom: 10px !important; } table[class=body] .wrapper {padding: 32px !important; } table[class=body] .article {padding: 32px !important; } table[class=body] .content {padding: 24px !important; } table[class=body] .container {padding: 0 !important; width: 100% !important; } table[class=body] .main {border-left-width: 0 !important; border-radius: 0 !important; border-right-width: 0 !important; } table[class=body] .btn table {width: 100% !important; } table[class=body] .btn a {width: 100% !important; } table[class=body] .img-responsive {height: auto !important; max-width: 100% !important; width: auto !important; } } .btn-primary table td:hover {background-color: #34495e !important; } .btn-primary a:hover {background-color: #34495e !important; border-color: #34495e !important; } .btn  a:visited {color:#FFFFFF;} </style>
+				<table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;" bgcolor="#1d1333">
+					<tr>
+						<td style="font-family: sans-serif; font-size: 14px; vertical-align: top; padding: 24px;" valign="top">
+							<table style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
+								<tr>
+									<td background="https://umbraco.com/umbraco/assets/img/application/logo.png" bgcolor="#1d1333" width="28" height="28" valign="top" style="font-family: sans-serif; font-size: 14px; vertical-align: top;">
+										<!--[if gte mso 9]> <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="width:30px;height:30px;"> <v:fill type="tile" src="https://umbraco.com/umbraco/assets/img/application/logo.png" color="#1d1333" /> <v:textbox inset="0,0,0,0"> <![endif]-->
+										<div> </div>
+										<!--[if gte mso 9]> </v:textbox> </v:rect> <![endif]-->
+									</td>
+									<td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top"></td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+				</table>
+				<table border='0' cellpadding='0' cellspacing='0' class='body' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;' bgcolor='#1d1333'>
+					<tr>
+						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
+						<td class='container' style='font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; max-width: 560px; width: 560px; margin: 0 auto; padding: 10px;' valign='top'>
+							<div class='content' style='box-sizing: border-box; display: block; max-width: 560px; margin: 0 auto; padding: 10px;'>
+								<br>
+								<table class='main' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; border-radius: 3px; background: #FFFFFF;' bgcolor='#FFFFFF'>
+									<tr>
+										<td class='wrapper' style='font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 50px;' valign='top'>
+											<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;'>
+												<tr>
+													<td style='line-height: 24px; font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'>
+														<h1 style='color: #392F54; font-family: sans-serif; font-weight: bold; line-height: 1.4; font-size: 24px; text-align: left; text-transform: capitalize; margin: 0 0 30px;' align='left'>
+															Hi %0%,
+														</h1>
+														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+															This is an automated mail to inform you that the task <strong>'%1%'</strong> has been performed on the page <a style="color: #392F54; text-decoration: none; -ms-word-break: break-all; word-break: break-all;" href="http://%4%/#/content/content/edit/%5%"><strong>'%2%'</strong></a> by the user <strong>'%3%'</strong>
+														</p>
+														<table border='0' cellpadding='0' cellspacing='0' class='btn btn-primary' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;'>
+															<tbody>
+																<tr>
+																	<td align='left' style='font-family: sans-serif; font-size: 14px; vertical-align: top; padding-bottom: 15px;' valign='top'>
+																		<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'><tbody><tr>
+																			<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
+																				<a href='http://%4%/#/content/content/edit/%5%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>EDIT</a> </td> </tr></tbody></table>
+																	</td>
+																</tr>
+															</tbody>
+														</table>
+														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+															<h3>Update summary:</h3>
+															%6%
+														</p>
+														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+															Have a nice day!<br /><br />
+															Cheers from the Umbraco robot
+														</p>
+													</td>
+												</tr>
+											</table>
+										</td>
+									</tr>
+								</table>
+								<br><br><br>
+							</div>
+						</td>
+						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
+					</tr>
+				</table>
+			</body>
+		</html>
 	]]></key>
-    <key alias="mailBodyVariantHtmlSummary"><![CDATA[<p>The following languages have been modified:</p>
-        %0%
+    <key alias="mailBodyVariantHtmlSummary"><![CDATA[<p>The following languages have been modified:</p>
+        %0%
     ]]></key>
     <key alias="mailSubject">[%0%] Notification about %1% performed on %2%</key>
     <key alias="notifications">Notifications</key>
@@ -1126,9 +1126,9 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="actions">Actions</key>
     <key alias="created">Created</key>
     <key alias="createPackage">Create package</key>
-    <key alias="chooseLocalPackageText"><![CDATA[
-      Choose Package from your machine, by clicking the Browse<br />
-         button and locating the package. Umbraco packages usually have a ".umb" or ".zip" extension.
+    <key alias="chooseLocalPackageText"><![CDATA[
+      Choose Package from your machine, by clicking the Browse<br />
+         button and locating the package. Umbraco packages usually have a ".umb" or ".zip" extension.
       ]]></key>
     <key alias="deletewarning">This will delete the package</key>
     <key alias="dropHere">Drop to upload</key>
@@ -1184,7 +1184,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="packageMetaData">Package meta data</key>
     <key alias="packageName">Package name</key>
     <key alias="packageNoItemsHeader">Package doesn't contain any items</key>
-    <key alias="packageNoItemsText"><![CDATA[This package file doesn't contain any items to uninstall.<br/><br/>
+    <key alias="packageNoItemsText"><![CDATA[This package file doesn't contain any items to uninstall.<br/><br/>
       You can safely remove this from the system by clicking "uninstall package" below.]]></key>
     <key alias="packageOptions">Package options</key>
     <key alias="packageReadme">Package readme</key>
@@ -1193,8 +1193,8 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="packageUninstalledHeader">Package was uninstalled</key>
     <key alias="packageUninstalledText">The package was successfully uninstalled</key>
     <key alias="packageUninstallHeader">Uninstall package</key>
-    <key alias="packageUninstallText"><![CDATA[You can unselect items you do not wish to remove, at this time, below. When you click "confirm uninstall" all checked-off items will be removed.<br />
-      <span style="color: Red; font-weight: bold;">Notice:</span> any documents, media etc depending on the items you remove, will stop working, and could lead to system instability,
+    <key alias="packageUninstallText"><![CDATA[You can unselect items you do not wish to remove, at this time, below. When you click "confirm uninstall" all checked-off items will be removed.<br />
+      <span style="color: Red; font-weight: bold;">Notice:</span> any documents, media etc depending on the items you remove, will stop working, and could lead to system instability,
       so uninstall with caution. If in doubt, contact the package author.]]></key>
     <key alias="packageVersion">Package version</key>
     <key alias="packageAlreadyInstalled">Package already installed</key>
@@ -1234,20 +1234,20 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="paMembersHelp">If you wish to grant access to specific members</key>
   </area>
   <area alias="publish">
-    <key alias="contentPublishedFailedAwaitingRelease"><![CDATA[
-      %0% could not be published because the item is scheduled for release.
+    <key alias="contentPublishedFailedAwaitingRelease"><![CDATA[
+      %0% could not be published because the item is scheduled for release.
     ]]></key>
-    <key alias="contentPublishedFailedExpired"><![CDATA[
-      %0% could not be published because the item has expired.
+    <key alias="contentPublishedFailedExpired"><![CDATA[
+      %0% could not be published because the item has expired.
     ]]></key>
-    <key alias="contentPublishedFailedInvalid"><![CDATA[
-      %0% could not be published because these properties:  %1%  did not pass validation rules.
+    <key alias="contentPublishedFailedInvalid"><![CDATA[
+      %0% could not be published because these properties:  %1%  did not pass validation rules.
     ]]></key>
-    <key alias="contentPublishedFailedByEvent"><![CDATA[
-      %0% could not be published, a 3rd party add-in cancelled the action.
+    <key alias="contentPublishedFailedByEvent"><![CDATA[
+      %0% could not be published, a 3rd party add-in cancelled the action.
     ]]></key>
-    <key alias="contentPublishedFailedByParent"><![CDATA[
-      %0% can not be published, because a parent page is not published.
+    <key alias="contentPublishedFailedByParent"><![CDATA[
+      %0% can not be published, because a parent page is not published.
     ]]></key>
     <key alias="contentPublishedFailedByMissingName"><![CDATA[%0% can not be published, because its missing a name.]]></key>
     <key alias="includeUnpublished">Include unpublished subpages</key>
@@ -1256,8 +1256,8 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="nodePublish">%0% has been published</key>
     <key alias="nodePublishAll">%0% and subpages have been published</key>
     <key alias="publishAll">Publish %0% and all its subpages</key>
-    <key alias="publishHelp"><![CDATA[Click <em>Publish</em> to publish <strong>%0%</strong> and thereby making its content publicly available.<br/><br />
-      You can publish this page and all its subpages by checking <em>Include unpublished subpages</em> below.
+    <key alias="publishHelp"><![CDATA[Click <em>Publish</em> to publish <strong>%0%</strong> and thereby making its content publicly available.<br/><br />
+      You can publish this page and all its subpages by checking <em>Include unpublished subpages</em> below.
       ]]></key>
   </area>
   <area alias="colorpicker">
@@ -1271,7 +1271,7 @@ To manage your website, simply open the Umbraco back office and start adding con
   <area alias="mediaPicker">
     <key alias="deletedItem">Deleted item</key>
     <key alias="pickedTrashedItem">You have picked a media item currently deleted or in the recycle bin</key>
-    <key alias="pickedTrashedItems">You have picked media items currently deleted or in the recycle bin</key>
+    <key alias="pickedTrashedItems">You have picked media items currently deleted or in the recycle bin</key>
     <key alias="trashed">Trashed</key>
   </area>
   <area alias="relatedlinks">
@@ -1466,20 +1466,20 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="mastertemplate">Master template</key>
     <key alias="noMaster">No master</key>
     <key alias="renderBody">Render child template</key>
-    <key alias="renderBodyDesc"><![CDATA[
-     Renders the contents of a child template, by inserting a
-     <code>@RenderBody()</code> placeholder.
+    <key alias="renderBodyDesc"><![CDATA[
+     Renders the contents of a child template, by inserting a
+     <code>@RenderBody()</code> placeholder.
       ]]></key>
     <key alias="defineSection">Define a named section</key>
-    <key alias="defineSectionDesc"><![CDATA[
-         Defines a part of your template as a named section by wrapping it in
-          <code>@section { ... }</code>. This can be rendered in a
-          specific area of the parent of this template, by using <code>@RenderSection</code>.
+    <key alias="defineSectionDesc"><![CDATA[
+         Defines a part of your template as a named section by wrapping it in
+          <code>@section { ... }</code>. This can be rendered in a
+          specific area of the parent of this template, by using <code>@RenderSection</code>.
       ]]></key>
     <key alias="renderSection">Render a named section</key>
-    <key alias="renderSectionDesc"><![CDATA[
-      Renders a named area of a child template, by inserting a <code>@RenderSection(name)</code> placeholder.
-      This renders an area of a child template which is wrapped in a corresponding <code>@section [name]{ ... }</code> definition.
+    <key alias="renderSectionDesc"><![CDATA[
+      Renders a named area of a child template, by inserting a <code>@RenderSection(name)</code> placeholder.
+      This renders an area of a child template which is wrapped in a corresponding <code>@section [name]{ ... }</code> definition.
       ]]></key>
     <key alias="sectionName">Section Name</key>
     <key alias="sectionMandatory">Section is mandatory</key>
@@ -1685,20 +1685,20 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="DownloadXmlDTD">Download XML DTD</key>
     <key alias="fields">Fields</key>
     <key alias="includeSubpages">Include subpages</key>
-    <key alias="mailBody"><![CDATA[
-      Hi %0%
-
-      This is an automated mail to inform you that the document '%1%'
-      has been requested for translation into '%5%' by %2%.
-
-      Go to http://%3%/translation/details.aspx?id=%4% to edit.
-
-      Or log into Umbraco to get an overview of your translation tasks
-      http://%3%
-
-      Have a nice day!
-
-      Cheers from the Umbraco robot
+    <key alias="mailBody"><![CDATA[
+      Hi %0%
+
+      This is an automated mail to inform you that the document '%1%'
+      has been requested for translation into '%5%' by %2%.
+
+      Go to http://%3%/translation/details.aspx?id=%4% to edit.
+
+      Or log into Umbraco to get an overview of your translation tasks
+      http://%3%
+
+      Have a nice day!
+
+      Cheers from the Umbraco robot
     ]]></key>
     <key alias="noTranslators">No translator users found. Please create a translator user before you start sending content to translation</key>
     <key alias="pageHasBeenSendToTranslation">The page '%0%' has been send to translation</key>
@@ -1847,96 +1847,96 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="sendInvite">Send invite</key>
     <key alias="backToUsers">Back to users</key>
     <key alias="inviteEmailCopySubject">Umbraco: Invitation</key>
-    <key alias="inviteEmailCopyFormat"><![CDATA[
-        <html>
-			<head>
-				<meta name='viewport' content='width=device-width'>
-				<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
-			</head>
-			<body class='' style='font-family: sans-serif; -webkit-font-smoothing: antialiased; font-size: 14px; color: #392F54; line-height: 22px; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; background: #1d1333; margin: 0; padding: 0;' bgcolor='#1d1333'>
-				<style type='text/css'> @media only screen and (max-width: 620px) {table[class=body] h1 {font-size: 28px !important; margin-bottom: 10px !important; } table[class=body] .wrapper {padding: 32px !important; } table[class=body] .article {padding: 32px !important; } table[class=body] .content {padding: 24px !important; } table[class=body] .container {padding: 0 !important; width: 100% !important; } table[class=body] .main {border-left-width: 0 !important; border-radius: 0 !important; border-right-width: 0 !important; } table[class=body] .btn table {width: 100% !important; } table[class=body] .btn a {width: 100% !important; } table[class=body] .img-responsive {height: auto !important; max-width: 100% !important; width: auto !important; } } .btn-primary table td:hover {background-color: #34495e !important; } .btn-primary a:hover {background-color: #34495e !important; border-color: #34495e !important; } .btn  a:visited {color:#FFFFFF;} </style>
-				<table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;" bgcolor="#1d1333">
-					<tr>
-						<td style="font-family: sans-serif; font-size: 14px; vertical-align: top; padding: 24px;" valign="top">
-							<table style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
-								<tr>
-									<td background="https://umbraco.com/umbraco/assets/img/application/logo.png" bgcolor="#1d1333" width="28" height="28" valign="top" style="font-family: sans-serif; font-size: 14px; vertical-align: top;">
-										<!--[if gte mso 9]> <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="width:30px;height:30px;"> <v:fill type="tile" src="https://umbraco.com/umbraco/assets/img/application/logo.png" color="#1d1333" /> <v:textbox inset="0,0,0,0"> <![endif]-->
-										<div> </div>
-										<!--[if gte mso 9]> </v:textbox> </v:rect> <![endif]-->
-									</td>
-									<td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top"></td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-				</table>
-				<table border='0' cellpadding='0' cellspacing='0' class='body' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;' bgcolor='#1d1333'>
-					<tr>
-						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
-						<td class='container' style='font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; max-width: 560px; width: 560px; margin: 0 auto; padding: 10px;' valign='top'>
-							<div class='content' style='box-sizing: border-box; display: block; max-width: 560px; margin: 0 auto; padding: 10px;'>
-								<br>
-								<table class='main' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; border-radius: 3px; background: #FFFFFF;' bgcolor='#FFFFFF'>
-									<tr>
-										<td class='wrapper' style='font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 50px;' valign='top'>
-											<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;'>
-												<tr>
-													<td style='line-height: 24px; font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'>
-														<h1 style='color: #392F54; font-family: sans-serif; font-weight: bold; line-height: 1.4; font-size: 24px; text-align: left; text-transform: capitalize; margin: 0 0 30px;' align='left'>
-															Hi %0%,
-														</h1>
-														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
-															You have been invited by <a href="mailto:%4%" style="text-decoration: underline; color: #392F54; -ms-word-break: break-all; word-break: break-all;">%1%</a> to the Umbraco Back Office.
-														</p>
-														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
-															Message from <a href="mailto:%1%" style="text-decoration: none; color: #392F54; -ms-word-break: break-all; word-break: break-all;">%1%</a>:
-															<br/>
-															<em>%2%</em>
-														</p>
-														<table border='0' cellpadding='0' cellspacing='0' class='btn btn-primary' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;'>
-															<tbody>
-																<tr>
-																	<td align='left' style='font-family: sans-serif; font-size: 14px; vertical-align: top; padding-bottom: 15px;' valign='top'>
-																		<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'>
-																			<tbody>
-																				<tr>
-																					<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
-																						<a href='%3%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
-																							Click this link to accept the invite
-																						</a>
-																					</td>
-																				</tr>
-																			</tbody>
-																		</table>
-																	</td>
-																</tr>
-															</tbody>
-														</table>
-														<p style='max-width: 400px; display: block; color: #392F54; font-family: sans-serif; font-size: 14px; line-height: 20px; font-weight: normal; margin: 15px 0;'>If you cannot click on the link, copy and paste this URL into your browser window:</p>
-															<table border='0' cellpadding='0' cellspacing='0'>
-																<tr>
-																	<td style='-ms-word-break: break-all; word-break: break-all; font-family: sans-serif; font-size: 11px; line-height:14px;'>
-																		<font style="-ms-word-break: break-all; word-break: break-all; font-size: 11px; line-height:14px;">
-																			<a style='-ms-word-break: break-all; word-break: break-all; color: #392F54; text-decoration: underline; font-size: 11px; line-height:15px;' href='%3%'>%3%</a>
-																		</font>
-																	</td>
-																</tr>
-															</table>
-														</p>
-													</td>
-												</tr>
-											</table>
-										</td>
-									</tr>
-								</table>
-								<br><br><br>
-							</div>
-						</td>
-						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
-					</tr>
-				</table>
-			</body>
+    <key alias="inviteEmailCopyFormat"><![CDATA[
+        <html>
+			<head>
+				<meta name='viewport' content='width=device-width'>
+				<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
+			</head>
+			<body class='' style='font-family: sans-serif; -webkit-font-smoothing: antialiased; font-size: 14px; color: #392F54; line-height: 22px; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; background: #1d1333; margin: 0; padding: 0;' bgcolor='#1d1333'>
+				<style type='text/css'> @media only screen and (max-width: 620px) {table[class=body] h1 {font-size: 28px !important; margin-bottom: 10px !important; } table[class=body] .wrapper {padding: 32px !important; } table[class=body] .article {padding: 32px !important; } table[class=body] .content {padding: 24px !important; } table[class=body] .container {padding: 0 !important; width: 100% !important; } table[class=body] .main {border-left-width: 0 !important; border-radius: 0 !important; border-right-width: 0 !important; } table[class=body] .btn table {width: 100% !important; } table[class=body] .btn a {width: 100% !important; } table[class=body] .img-responsive {height: auto !important; max-width: 100% !important; width: auto !important; } } .btn-primary table td:hover {background-color: #34495e !important; } .btn-primary a:hover {background-color: #34495e !important; border-color: #34495e !important; } .btn  a:visited {color:#FFFFFF;} </style>
+				<table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;" bgcolor="#1d1333">
+					<tr>
+						<td style="font-family: sans-serif; font-size: 14px; vertical-align: top; padding: 24px;" valign="top">
+							<table style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
+								<tr>
+									<td background="https://umbraco.com/umbraco/assets/img/application/logo.png" bgcolor="#1d1333" width="28" height="28" valign="top" style="font-family: sans-serif; font-size: 14px; vertical-align: top;">
+										<!--[if gte mso 9]> <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="width:30px;height:30px;"> <v:fill type="tile" src="https://umbraco.com/umbraco/assets/img/application/logo.png" color="#1d1333" /> <v:textbox inset="0,0,0,0"> <![endif]-->
+										<div> </div>
+										<!--[if gte mso 9]> </v:textbox> </v:rect> <![endif]-->
+									</td>
+									<td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top"></td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+				</table>
+				<table border='0' cellpadding='0' cellspacing='0' class='body' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;' bgcolor='#1d1333'>
+					<tr>
+						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
+						<td class='container' style='font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; max-width: 560px; width: 560px; margin: 0 auto; padding: 10px;' valign='top'>
+							<div class='content' style='box-sizing: border-box; display: block; max-width: 560px; margin: 0 auto; padding: 10px;'>
+								<br>
+								<table class='main' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; border-radius: 3px; background: #FFFFFF;' bgcolor='#FFFFFF'>
+									<tr>
+										<td class='wrapper' style='font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 50px;' valign='top'>
+											<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;'>
+												<tr>
+													<td style='line-height: 24px; font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'>
+														<h1 style='color: #392F54; font-family: sans-serif; font-weight: bold; line-height: 1.4; font-size: 24px; text-align: left; text-transform: capitalize; margin: 0 0 30px;' align='left'>
+															Hi %0%,
+														</h1>
+														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+															You have been invited by <a href="mailto:%4%" style="text-decoration: underline; color: #392F54; -ms-word-break: break-all; word-break: break-all;">%1%</a> to the Umbraco Back Office.
+														</p>
+														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+															Message from <a href="mailto:%1%" style="text-decoration: none; color: #392F54; -ms-word-break: break-all; word-break: break-all;">%1%</a>:
+															<br/>
+															<em>%2%</em>
+														</p>
+														<table border='0' cellpadding='0' cellspacing='0' class='btn btn-primary' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;'>
+															<tbody>
+																<tr>
+																	<td align='left' style='font-family: sans-serif; font-size: 14px; vertical-align: top; padding-bottom: 15px;' valign='top'>
+																		<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'>
+																			<tbody>
+																				<tr>
+																					<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
+																						<a href='%3%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
+																							Click this link to accept the invite
+																						</a>
+																					</td>
+																				</tr>
+																			</tbody>
+																		</table>
+																	</td>
+																</tr>
+															</tbody>
+														</table>
+														<p style='max-width: 400px; display: block; color: #392F54; font-family: sans-serif; font-size: 14px; line-height: 20px; font-weight: normal; margin: 15px 0;'>If you cannot click on the link, copy and paste this URL into your browser window:</p>
+															<table border='0' cellpadding='0' cellspacing='0'>
+																<tr>
+																	<td style='-ms-word-break: break-all; word-break: break-all; font-family: sans-serif; font-size: 11px; line-height:14px;'>
+																		<font style="-ms-word-break: break-all; word-break: break-all; font-size: 11px; line-height:14px;">
+																			<a style='-ms-word-break: break-all; word-break: break-all; color: #392F54; text-decoration: underline; font-size: 11px; line-height:15px;' href='%3%'>%3%</a>
+																		</font>
+																	</td>
+																</tr>
+															</table>
+														</p>
+													</td>
+												</tr>
+											</table>
+										</td>
+									</tr>
+								</table>
+								<br><br><br>
+							</div>
+						</td>
+						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
+					</tr>
+				</table>
+			</body>
     </html>]]></key>
     <key alias="invite">Invite</key>
     <key alias="defaultInvitationMessage">Resending invitation...</key>
@@ -1973,19 +1973,19 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="customValidation">Custom validation</key>
   </area>
   <area alias="healthcheck">
-    <!-- The following keys get these tokens passed in:
-	     0: Current value
-		   1: Recommended value
-		   2: XPath
-		   3: Configuration file path
+    <!-- The following keys get these tokens passed in:
+	     0: Current value
+		   1: Recommended value
+		   2: XPath
+		   3: Configuration file path
 	  -->
     <key alias="checkSuccessMessage">Value is set to the recommended value: '%0%'.</key>
     <key alias="rectifySuccessMessage">Value was set to '%1%' for XPath '%2%' in configuration file '%3%'.</key>
     <key alias="checkErrorMessageDifferentExpectedValue">Expected value '%1%' for '%2%' in configuration file '%3%', but found '%0%'.</key>
     <key alias="checkErrorMessageUnexpectedValue">Found unexpected value '%0%' for '%2%' in configuration file '%3%'.</key>
-    <!-- The following keys get these tokens passed in:
-	     0: Current value
-		   1: Recommended value
+    <!-- The following keys get these tokens passed in:
+	     0: Current value
+		   1: Recommended value
 	  -->
     <key alias="customErrorsCheckSuccessMessage">Custom errors are set to '%0%'.</key>
     <key alias="customErrorsCheckErrorMessage">Custom errors are currently set to '%0%'. It is recommended to set this to '%1%' before go live.</key>
@@ -1993,10 +1993,10 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="macroErrorModeCheckSuccessMessage">MacroErrors are set to '%0%'.</key>
     <key alias="macroErrorModeCheckErrorMessage">MacroErrors are set to '%0%' which will prevent some or all pages in your site from loading completely if there are any errors in macros. Rectifying this will set the value to '%1%'.</key>
     <key alias="macroErrorModeCheckRectifySuccessMessage">MacroErrors are now set to '%0%'.</key>
-    <!-- The following keys get these tokens passed in:
-	     0: Current value
-		   1: Recommended value
-		   2: Server version
+    <!-- The following keys get these tokens passed in:
+	     0: Current value
+		   1: Recommended value
+		   2: Server version
 	  -->
     <key alias="trySkipIisCustomErrorsCheckSuccessMessage">Try Skip IIS Custom Errors is set to '%0%' and you're using IIS version '%1%'.</key>
     <key alias="trySkipIisCustomErrorsCheckErrorMessage">Try Skip IIS Custom Errors is currently '%0%'. It is recommended to set this to '%1%' for your IIS version (%2%).</key>
@@ -2032,14 +2032,14 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="traceModeCheckErrorMessage">Trace mode is currently enabled. It is recommended to disable this setting before go live.</key>
     <key alias="traceModeCheckRectifySuccessMessage">Trace mode successfully disabled.</key>
     <key alias="folderPermissionsCheckMessage">All folders have the correct permissions set.</key>
-    <!-- The following keys get these tokens passed in:
-	    0: Comma delimitted list of failed folder paths
+    <!-- The following keys get these tokens passed in:
+	    0: Comma delimitted list of failed folder paths
   	-->
     <key alias="requiredFolderPermissionFailed"><![CDATA[The following folders must be set up with modify permissions but could not be acccessed: <strong>%0%</strong>.]]></key>
     <key alias="optionalFolderPermissionFailed"><![CDATA[The following folders must be set up with modify permissions for certain Umbraco operations to function but could not be acccessed: <strong>%0%</strong>. If they aren't being written to no action need be taken.]]></key>
     <key alias="filePermissionsCheckMessage">All files have the correct permissions set.</key>
-    <!-- The following keys get these tokens passed in:
-	    0: Comma delimitted list of failed folder paths
+    <!-- The following keys get these tokens passed in:
+	    0: Comma delimitted list of failed folder paths
   	-->
     <key alias="requiredFilePermissionFailed"><![CDATA[The following files must be set up with write permissions but could not be acccessed: <strong>%0%</strong>.]]></key>
     <key alias="optionalFilePermissionFailed"><![CDATA[The following files must be set up with write permissions for certain Umbraco operations to function but could not be acccessed: <strong>%0%</strong>. If they aren't being written to no action need be taken.]]></key>
@@ -2061,8 +2061,8 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="xssProtectionCheckHeaderNotFound"><![CDATA[The header <strong>X-XSS-Protection</strong> was not found.]]></key>
     <key alias="xssProtectionSetHeaderInConfigDescription">Adds the header 'X-XSS-Protection' with the value '1; mode=block' to the httpProtocol/customHeaders section of web.config. </key>
     <key alias="xssProtectionSetHeaderInConfigSuccess">The X-XSS-Protection header has been added to your web.config file.</key>
-    <!-- The following key get these tokens passed in:
-	    0: Comma delimitted list of headers found
+    <!-- The following key get these tokens passed in:
+	    0: Comma delimitted list of headers found
   	-->
     <key alias="excessiveHeadersFound"><![CDATA[The following headers revealing information about the website technology were found: <strong>%0%</strong>.]]></key>
     <key alias="excessiveHeadersNotFound">No headers revealing information about the website technology were found.</key>
@@ -2132,20 +2132,23 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="settingsPublishedStatus">Published Status</key>
     <key alias="settingsModelsBuilder">Models Builder</key>
     <key alias="settingsHealthCheck">Health Check</key>
-    <key alias="settingsProfiler">Profiling</key>
+    <key alias="settingsProfiler">Profiling</key>
     <key alias="memberIntro">Getting Started</key>
     <key alias="formsInstall">Install Umbraco Forms</key>
   </area>
   <area alias="visuallyHiddenTexts">
-    <key alias="goBack">Go back</key>
-    <key alias="activeListLayout">Active layout:</key>
-    <key alias="jumpTo">Jump to</key>
-    <key alias="group">group</key>
-    <key alias="passed">passed</key>
-    <key alias="warning">warning</key>
-    <key alias="failed">failed</key>
-    <key alias="suggestion">suggestion</key>
-    <key alias="checkPassed">Check passed</key>
+    <key alias="goBack">Go back</key>
+    <key alias="activeListLayout">Active layout:</key>
+    <key alias="jumpTo">Jump to</key>
+    <key alias="group">group</key>
+    <key alias="passed">passed</key>
+    <key alias="warning">warning</key>
+    <key alias="failed">failed</key>
+    <key alias="suggestion">suggestion</key>
+    <key alias="checkPassed">Check passed</key>
     <key alias="checkFailed">Check failed</key>
+    <key alias="openBackofficeSearch">Open backoffice search</key>
+    <key alias="openCloseBackofficeHelp">Open/Close backoffice help</key>
+    <key alias="openCloseBackofficeProfileOptions">Open/Close your profile options</key>
   </area>
 </language>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index 0d79911ea7..5369822936 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -2161,5 +2161,8 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="suggestion">suggestion</key>
     <key alias="checkPassed">Check passed</key>
     <key alias="checkFailed">Check failed</key>
+    <key alias="openBackofficeSearch">Open backoffice search</key>
+    <key alias="openCloseBackofficeHelp">Open/Close backoffice help</key>
+    <key alias="openCloseBackofficeProfileOptions">Open/Close your profile options</key>
   </area>
 </language>

From b4f2b023ded58859caa62f16d4dd2a7293640e06 Mon Sep 17 00:00:00 2001
From: "mh@ecreo.dk" <mh@ecreo.dk>
Date: Mon, 30 Sep 2019 13:26:45 +0200
Subject: [PATCH 770/776] adds missing language key

---
 src/Umbraco.Web.UI/Umbraco/config/lang/da.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index e1d7fd45d5..05a637e255 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -155,6 +155,7 @@
     <key alias="publish">Brugeren har gemt og udgivet indholdet</key>
     <key alias="publishvariant">Brugeren har gemt og udgivet indholdet for sprogene: %0% </key>
     <key alias="save">Brugeren har gemt indholdet</key>
+    <key alias="savevariant">Brugeren har gemt indholdet for sprogene: %0%</key>
     <key alias="move">Brugeren har flyttet indholdet</key>
     <key alias="copy">Brugeren har kopieret indholdet</key>
     <key alias="rollback">Brugeren har tilbagerullet indholdet til en tidligere tilstand</key>

From 79bf9b753caf97a55d474c5c6db8821a33ca398f Mon Sep 17 00:00:00 2001
From: Benjamin Howarth <322383+benjaminhowarth1@users.noreply.github.com>
Date: Mon, 30 Sep 2019 16:54:28 +0100
Subject: [PATCH 771/776] #2996 resubmitting ContentExtensions and
 ObjectExtensions fixes (#6473)

---
 src/Umbraco.Core/ObjectExtensions.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Umbraco.Core/ObjectExtensions.cs b/src/Umbraco.Core/ObjectExtensions.cs
index 479e425c99..5c1c5fdeac 100644
--- a/src/Umbraco.Core/ObjectExtensions.cs
+++ b/src/Umbraco.Core/ObjectExtensions.cs
@@ -8,7 +8,10 @@ using System.Linq.Expressions;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Xml;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using Umbraco.Core.Collections;
+using Formatting = Newtonsoft.Json.Formatting;
 
 namespace Umbraco.Core
 {
@@ -125,6 +128,11 @@ namespace Umbraco.Core
                     return Attempt.Succeed(input);
                 }
 
+                if (target == typeof(string) && inputType == typeof(JObject))
+                {
+                    return Attempt<object>.Succeed(JsonConvert.SerializeObject(input, Formatting.None));
+                }
+
                 // Check for string so that overloaders of ToString() can take advantage of the conversion.
                 if (target == typeof(string))
                 {

From 1101391659b60cf42d972e3cc83ae5b14b075d9d Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Mon, 30 Sep 2019 18:21:50 +0200
Subject: [PATCH 772/776] Remove the GUID input hover title (#4829)

---
 .../src/views/components/editor/umb-editor-header.html           | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
index 824caa87a9..bc4a88cd33 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
@@ -26,7 +26,6 @@
                     <ng-form name="headerNameForm">
                         <input data-element="editor-name-field"
                                no-password-manager
-                               title="{{key}}"
                                type="text"
                                class="umb-editor-header__name-input"
                                localize="placeholder"

From 48fbd4aec231d9e903b70e527b0459c7c518c843 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bf@oerskov.dk>
Date: Thu, 4 Jul 2019 22:05:35 +0200
Subject: [PATCH 773/776] Update noUiSlider to latest patch version

---
 src/Umbraco.Web.UI.Client/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json
index 06f2d5a8d6..c8acd0f88d 100644
--- a/src/Umbraco.Web.UI.Client/package.json
+++ b/src/Umbraco.Web.UI.Client/package.json
@@ -34,7 +34,7 @@
     "lazyload-js": "1.0.0",
     "moment": "2.22.2",
     "ng-file-upload": "12.2.13",
-    "nouislider": "14.0.1",
+    "nouislider": "14.0.2",
     "npm": "^6.4.1",
     "signalr": "2.4.0",
     "spectrum-colorpicker": "1.8.0",

From 37dd442682bca8514aad30166f54cfc3d052ded3 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Mon, 30 Sep 2019 18:30:18 +0200
Subject: [PATCH 774/776] V8: Fix alignment between dashboard headers and root
 nodes (#5787)

---
 .../src/less/components/application/umb-dashboard.less       | 1 -
 .../src/less/components/tree/umb-tree.less                   | 5 ++++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-dashboard.less b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-dashboard.less
index 17fdcc905e..52ff2c2b01 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-dashboard.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-dashboard.less
@@ -12,7 +12,6 @@
     flex: 0 0 @editorHeaderHeight;
     background: @white;
     border-bottom: 1px solid @gray-9;
-    padding: 20px 0 0 0;
     box-sizing: border-box;
     display: flex;
     justify-content: flex-end;
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
index 93850656f0..0a0fb29eed 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
@@ -67,7 +67,6 @@ body.touch .umb-tree {
     display: flex;
     flex-wrap: nowrap;
     align-items: center;  
-    border:2px solid transparent;
     
     color: @ui-option-type;
     a {
@@ -98,6 +97,10 @@ body.touch .umb-tree {
     }
 }
 
+.umb-tree-item__inner {
+    border: 2px solid transparent;
+}
+
 .umb-tree-header {
     display: flex;
     padding: 20px 0 20px 20px;

From 53a129ab22cf4823d8b3721c13305ca69d29d199 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Mon, 30 Sep 2019 18:32:25 +0200
Subject: [PATCH 775/776] V8: Support multiple URL aliases in umbracoUrlAlias
 (#5875)

---
 src/Umbraco.Web/Routing/AliasUrlProvider.cs | 27 +++++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Web/Routing/AliasUrlProvider.cs b/src/Umbraco.Web/Routing/AliasUrlProvider.cs
index efd48af2d4..f84ac608d2 100644
--- a/src/Umbraco.Web/Routing/AliasUrlProvider.cs
+++ b/src/Umbraco.Web/Routing/AliasUrlProvider.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
@@ -83,12 +84,17 @@ namespace Umbraco.Web.Routing
                     yield break;
 
                 var umbracoUrlName = node.Value<string>(Constants.Conventions.Content.UrlAlias);
-                if (string.IsNullOrWhiteSpace(umbracoUrlName))
+                var aliases = umbracoUrlName?.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+
+                if (aliases == null || aliases.Any() == false)
                     yield break;
 
-                var path = "/" + umbracoUrlName;
-                var uri = new Uri(path, UriKind.Relative);
-                yield return UrlInfo.Url(UriUtility.UriFromUmbraco(uri, _globalSettings, _requestConfig).ToString());
+                foreach (var alias in aliases.Distinct())
+                {
+                    var path = "/" + alias;
+                    var uri = new Uri(path, UriKind.Relative);
+                    yield return UrlInfo.Url(UriUtility.UriFromUmbraco(uri, _globalSettings, _requestConfig).ToString());
+                }
             }
             else
             {
@@ -105,12 +111,17 @@ namespace Umbraco.Web.Routing
                         ? node.Value<string>(Constants.Conventions.Content.UrlAlias, culture: domainUri.Culture.Name)
                         : node.Value<string>(Constants.Conventions.Content.UrlAlias);
 
-                    if (string.IsNullOrWhiteSpace(umbracoUrlName))
+                    var aliases = umbracoUrlName?.Split(new [] {','}, StringSplitOptions.RemoveEmptyEntries);
+
+                    if (aliases == null || aliases.Any() == false)
                         continue;
 
-                    var path = "/" + umbracoUrlName;
-                    var uri = new Uri(CombinePaths(domainUri.Uri.GetLeftPart(UriPartial.Path), path));
-                    yield return UrlInfo.Url(UriUtility.UriFromUmbraco(uri, _globalSettings, _requestConfig).ToString(), domainUri.Culture.Name);
+                    foreach(var alias in aliases.Distinct())
+                    {
+                        var path = "/" + alias;
+                        var uri = new Uri(CombinePaths(domainUri.Uri.GetLeftPart(UriPartial.Path), path));
+                        yield return UrlInfo.Url(UriUtility.UriFromUmbraco(uri, _globalSettings, _requestConfig).ToString(), domainUri.Culture.Name);
+                    }
                 }
             }
         }

From 765d1576e040ace67fc48a0f060556096a717086 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Mon, 30 Sep 2019 18:35:35 +0200
Subject: [PATCH 776/776] Hide the icon from screen readers

---
 .../src/views/components/umb-locked-field.html                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-locked-field.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-locked-field.html
index 5d5f10218f..edc96ee1f6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-locked-field.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-locked-field.html
@@ -3,11 +3,11 @@
     <div class="umb-locked-field__wrapper">
 
         <button ng-if="locked" ng-click="unlock()" class="umb-locked-field__toggle">
-            <i class="umb-locked-field__lock-icon icon-lock"></i>
+            <i class="umb-locked-field__lock-icon icon-lock" aria-hidden="true"></i>
         </button>
 
         <button ng-if="!locked" ng-click="lock()" class="umb-locked-field__toggle">
-            <i class="umb-locked-field__lock-icon icon-unlocked -unlocked"></i>
+            <i class="umb-locked-field__lock-icon icon-unlocked -unlocked" aria-hidden="true"></i>
         </button>
 
         <input type="text"